diff options
114 files changed, 9485 insertions, 716 deletions
diff --git a/CTAN.sites b/CTAN.sites index 42da113900..c56c478b94 100644 --- a/CTAN.sites +++ b/CTAN.sites @@ -307,7 +307,7 @@ by country): URL: https://mirror.dogado.de/tex-archive/ mirror.funkfreundelandshut.de (Germany) - URL: http://mirror.funkfreundelandshut.de/latex/ + URL: https://mirror.funkfreundelandshut.de/latex/ mirror.physik.tu-berlin.de (Germany) URL: ftp://mirror.physik-pool.tu-berlin.de/pub/CTAN/ diff --git a/FILES.byname b/FILES.byname index e92b01346b..c74780e559 100644 --- a/FILES.byname +++ b/FILES.byname @@ -2056,12 +2056,12 @@ 2023/04/13 | 1675 | biblio/citation-style-language/README.md 2023/04/13 | 11957 | biblio/citation-style-language/vancouver.csl 2023/04/13 | 4516625 | biblio/citation-style-language.zip -2023/06/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/06/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx 2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx -2023/06/04 | 2787771 | biblio/ctan-bibdata/ctan.bib -2023/06/04 | 3677417 | biblio/ctan-bibdata/ctan.pdf +2023/06/05 | 2788130 | biblio/ctan-bibdata/ctan.bib +2023/06/05 | 3677738 | biblio/ctan-bibdata/ctan.pdf 2023/01/16 | 1489 | biblio/ctan-bibdata/README -2023/06/04 | 4075917 | biblio/ctan-bibdata.zip +2023/06/05 | 4077217 | 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 @@ -5417,7 +5417,7 @@ 1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp 1990/10/02 | 812 | dviware/vutex/vaxvms.ins 1990/10/02 | 127576 | dviware/vutex/vutex.web -2023/06/04 | 61658 | FILES.last07days +2023/06/05 | 60454 | 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 @@ -161196,6 +161196,12 @@ 2023/03/23 | 30990 | graphics/pgf/contrib/tikzviolinplots/tikzviolinplots.tex 2023/03/23 | 615 | graphics/pgf/contrib/tikzviolinplots/WPR.csv 2023/03/23 | 353626 | graphics/pgf/contrib/tikzviolinplots.zip +2023/06/03 | 388 | graphics/pgf/contrib/tilings/README +2023/06/03 | 107698 | graphics/pgf/contrib/tilings/tilings_code.dtx +2023/06/02 | 521939 | graphics/pgf/contrib/tilings/tilings_code.pdf +2023/06/05 | 612029 | graphics/pgf/contrib/tilings/tilings.pdf +2023/06/05 | 41283 | graphics/pgf/contrib/tilings/tilings.tex +2023/06/05 | 1081438 | graphics/pgf/contrib/tilings.zip 2013/08/21 | 95067 | graphics/pgf/contrib/timing-diagrams/diagrams-examples.pdf 2013/08/21 | 9102 | graphics/pgf/contrib/timing-diagrams/diagrams-examples.tex 2013/08/21 | 550 | graphics/pgf/contrib/timing-diagrams/Makefile @@ -194419,7 +194425,7 @@ 2023/04/19 | 972462 | install/macros/latex/contrib/l3backend.tds.zip 2023/03/27 | 819288 | install/macros/latex/contrib/l3build.tds.zip 2023/05/11 | 4460074 | install/macros/latex/contrib/l3experimental.tds.zip -2023/05/22 | 13882014 | install/macros/latex/contrib/l3kernel.tds.zip +2023/06/05 | 13993568 | install/macros/latex/contrib/l3kernel.tds.zip 2023/02/02 | 2252631 | install/macros/latex/contrib/l3packages.tds.zip 2023/04/12 | 596346 | install/macros/latex/contrib/lastpage.tds.zip 2009/09/02 | 556672 | install/macros/latex/contrib/layouts.tds.zip @@ -202093,7 +202099,7 @@ 2013/04/01 | 14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi 2018/03/05 | 11 | macros/context/contrib/context-visualcounter/VERSION 2018/03/22 | 276789 | macros/context/contrib/context-visualcounter.zip -2023/06/01 | 115300387 | macros/context/latest/cont-tmf.zip +2023/06/04 | 115339485 | macros/context/latest/cont-tmf.zip 2016/04/21 | 32846 | macros/cstex/base/cmexb.tar.gz 2016/06/26 | 1728262 | macros/cstex/base/csfonts-t1.tar.gz 2007/03/01 | 187106 | macros/cstex/base/csfonts.tar.gz @@ -227535,110 +227541,110 @@ 2023/05/11 | 1624 | macros/latex/contrib/l3experimental/xgalley.ins 2023/05/11 | 299962 | macros/latex/contrib/l3experimental/xgalley.pdf 2023/05/11 | 4421989 | macros/latex/contrib/l3experimental.zip -2023/05/22 | 49066 | macros/latex/contrib/l3kernel/CHANGELOG.md -2023/05/22 | 70859 | macros/latex/contrib/l3kernel/expl3.dtx -2023/05/22 | 623197 | macros/latex/contrib/l3kernel/expl3.pdf -2023/05/22 | 1717276 | macros/latex/contrib/l3kernel/interface3.pdf -2023/05/22 | 2038 | macros/latex/contrib/l3kernel/interface3.tex -2023/05/22 | 131748 | macros/latex/contrib/l3kernel/l3basics.dtx -2023/05/22 | 12743 | macros/latex/contrib/l3kernel/l3bootstrap.dtx -2023/05/22 | 87744 | macros/latex/contrib/l3kernel/l3box.dtx -2023/05/22 | 16709 | macros/latex/contrib/l3kernel/l3candidates.dtx -2023/05/22 | 32409 | macros/latex/contrib/l3kernel/l3cctab.dtx -2023/05/22 | 82605 | macros/latex/contrib/l3kernel/l3clist.dtx -2023/05/22 | 88106 | macros/latex/contrib/l3kernel/l3coffins.dtx -2023/05/22 | 112274 | macros/latex/contrib/l3kernel/l3color.dtx -2023/05/22 | 43211 | macros/latex/contrib/l3kernel/l3debug.dtx -2023/05/22 | 24496 | macros/latex/contrib/l3kernel/l3deprecation.dtx -2023/05/22 | 155616 | macros/latex/contrib/l3kernel/l3doc.dtx -2023/05/22 | 558160 | macros/latex/contrib/l3kernel/l3doc.pdf -2023/05/22 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx -2023/05/22 | 151946 | macros/latex/contrib/l3kernel/l3docstrip.pdf -2023/05/22 | 89128 | macros/latex/contrib/l3kernel/l3expan.dtx -2023/05/22 | 137193 | macros/latex/contrib/l3kernel/l3file.dtx -2023/05/22 | 10328 | macros/latex/contrib/l3kernel/l3flag.dtx -2023/05/22 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx -2023/05/22 | 7472 | macros/latex/contrib/l3kernel/l3fp-assign.dtx -2023/05/22 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx -2023/05/22 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx -2023/05/22 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx -2023/05/22 | 70679 | macros/latex/contrib/l3kernel/l3fp.dtx -2023/05/22 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx -2023/05/22 | 51059 | macros/latex/contrib/l3kernel/l3fp-extended.dtx -2023/05/22 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx -2023/05/22 | 105012 | macros/latex/contrib/l3kernel/l3fp-parse.dtx -2023/05/22 | 23574 | macros/latex/contrib/l3kernel/l3fp-random.dtx -2023/05/22 | 18532 | macros/latex/contrib/l3kernel/l3fp-round.dtx -2023/05/22 | 12777 | macros/latex/contrib/l3kernel/l3fp-traps.dtx -2023/05/22 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx -2023/05/22 | 6224 | macros/latex/contrib/l3kernel/l3.ins -2023/05/22 | 30508 | macros/latex/contrib/l3kernel/l3intarray.dtx -2023/05/22 | 92755 | macros/latex/contrib/l3kernel/l3int.dtx -2023/05/22 | 27248 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx -2023/05/22 | 127036 | macros/latex/contrib/l3kernel/l3keys.dtx -2023/05/22 | 4574 | macros/latex/contrib/l3kernel/l3legacy.dtx -2023/05/22 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx -2023/05/22 | 78493 | macros/latex/contrib/l3kernel/l3msg.dtx -2023/05/22 | 78297 | macros/latex/contrib/l3kernel/l3names.dtx -2023/05/22 | 122710 | macros/latex/contrib/l3kernel/l3news01.pdf -2023/05/22 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex -2023/05/22 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf -2023/05/22 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex -2023/05/22 | 148706 | macros/latex/contrib/l3kernel/l3news03.pdf -2023/05/22 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex -2023/05/22 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf -2023/05/22 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex -2023/05/22 | 112485 | macros/latex/contrib/l3kernel/l3news05.pdf -2023/05/22 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex -2023/05/22 | 151569 | macros/latex/contrib/l3kernel/l3news06.pdf -2023/05/22 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex -2023/05/22 | 128316 | macros/latex/contrib/l3kernel/l3news07.pdf -2023/05/22 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex -2023/05/22 | 163456 | macros/latex/contrib/l3kernel/l3news08.pdf -2023/05/22 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex -2023/05/22 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf -2023/05/22 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex -2023/05/22 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf -2023/05/22 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex -2023/05/22 | 170076 | macros/latex/contrib/l3kernel/l3news11.pdf -2023/05/22 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex -2023/05/22 | 204992 | macros/latex/contrib/l3kernel/l3news12.pdf -2023/05/22 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex -2023/05/22 | 395876 | macros/latex/contrib/l3kernel/l3news.pdf -2023/05/22 | 4890 | macros/latex/contrib/l3kernel/l3news.tex -2023/05/22 | 19237 | macros/latex/contrib/l3kernel/l3pdf.dtx -2023/05/22 | 46204 | macros/latex/contrib/l3kernel/l3prefixes.csv -2023/05/22 | 81696 | macros/latex/contrib/l3kernel/l3prefixes.pdf -2023/05/22 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex -2023/05/22 | 70224 | macros/latex/contrib/l3kernel/l3prg.dtx -2023/05/22 | 56411 | macros/latex/contrib/l3kernel/l3prop.dtx -2023/05/22 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx -2023/05/22 | 304307 | macros/latex/contrib/l3kernel/l3regex.dtx -2023/05/22 | 97599 | macros/latex/contrib/l3kernel/l3seq.dtx -2023/05/22 | 91124 | macros/latex/contrib/l3kernel/l3skip.dtx -2023/05/22 | 40728 | macros/latex/contrib/l3kernel/l3sort.dtx -2023/05/22 | 113435 | macros/latex/contrib/l3kernel/l3str-convert.dtx -2023/05/22 | 79261 | macros/latex/contrib/l3kernel/l3str.dtx -2023/05/22 | 296462 | macros/latex/contrib/l3kernel/l3styleguide.pdf -2023/05/22 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex -2023/05/22 | 243101 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf -2023/05/22 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex -2023/05/22 | 35188 | macros/latex/contrib/l3kernel/l3sys.dtx -2023/05/22 | 218265 | macros/latex/contrib/l3kernel/l3term-glossary.pdf -2023/05/22 | 7079 | macros/latex/contrib/l3kernel/l3term-glossary.tex -2023/05/22 | 69893 | macros/latex/contrib/l3kernel/l3text-case.dtx -2023/05/22 | 49498 | macros/latex/contrib/l3kernel/l3text.dtx -2023/05/22 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx -2023/05/22 | 20464 | macros/latex/contrib/l3kernel/l3text-purify.dtx -2023/05/22 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx -2023/05/22 | 144152 | macros/latex/contrib/l3kernel/l3tl.dtx -2023/05/22 | 119129 | macros/latex/contrib/l3kernel/l3token.dtx -2023/05/22 | 32935 | macros/latex/contrib/l3kernel/l3unicode.dtx -2023/05/22 | 3116 | macros/latex/contrib/l3kernel/README.md -2023/05/22 | 24841 | macros/latex/contrib/l3kernel/source3body.tex -2023/05/22 | 7237559 | macros/latex/contrib/l3kernel/source3.pdf -2023/05/22 | 2229 | macros/latex/contrib/l3kernel/source3.tex -2023/05/22 | 13624009 | macros/latex/contrib/l3kernel.zip +2023/06/05 | 49722 | macros/latex/contrib/l3kernel/CHANGELOG.md +2023/06/05 | 70780 | macros/latex/contrib/l3kernel/expl3.dtx +2023/06/05 | 623094 | macros/latex/contrib/l3kernel/expl3.pdf +2023/06/05 | 1722452 | macros/latex/contrib/l3kernel/interface3.pdf +2023/06/05 | 2038 | macros/latex/contrib/l3kernel/interface3.tex +2023/06/05 | 131575 | macros/latex/contrib/l3kernel/l3basics.dtx +2023/06/05 | 12743 | macros/latex/contrib/l3kernel/l3bootstrap.dtx +2023/06/05 | 87744 | macros/latex/contrib/l3kernel/l3box.dtx +2023/06/05 | 16709 | macros/latex/contrib/l3kernel/l3candidates.dtx +2023/06/05 | 33709 | macros/latex/contrib/l3kernel/l3cctab.dtx +2023/06/05 | 83077 | macros/latex/contrib/l3kernel/l3clist.dtx +2023/06/05 | 88106 | macros/latex/contrib/l3kernel/l3coffins.dtx +2023/06/05 | 112274 | macros/latex/contrib/l3kernel/l3color.dtx +2023/06/05 | 43225 | macros/latex/contrib/l3kernel/l3debug.dtx +2023/06/05 | 25249 | macros/latex/contrib/l3kernel/l3deprecation.dtx +2023/06/05 | 155620 | macros/latex/contrib/l3kernel/l3doc.dtx +2023/06/05 | 558448 | macros/latex/contrib/l3kernel/l3doc.pdf +2023/06/05 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx +2023/06/05 | 152256 | macros/latex/contrib/l3kernel/l3docstrip.pdf +2023/06/05 | 89764 | macros/latex/contrib/l3kernel/l3expan.dtx +2023/06/05 | 140307 | macros/latex/contrib/l3kernel/l3file.dtx +2023/06/05 | 10328 | macros/latex/contrib/l3kernel/l3flag.dtx +2023/06/05 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx +2023/06/05 | 7472 | macros/latex/contrib/l3kernel/l3fp-assign.dtx +2023/06/05 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx +2023/06/05 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx +2023/06/05 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx +2023/06/05 | 70679 | macros/latex/contrib/l3kernel/l3fp.dtx +2023/06/05 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx +2023/06/05 | 51081 | macros/latex/contrib/l3kernel/l3fp-extended.dtx +2023/06/05 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx +2023/06/05 | 105012 | macros/latex/contrib/l3kernel/l3fp-parse.dtx +2023/06/05 | 23574 | macros/latex/contrib/l3kernel/l3fp-random.dtx +2023/06/05 | 18532 | macros/latex/contrib/l3kernel/l3fp-round.dtx +2023/06/05 | 12777 | macros/latex/contrib/l3kernel/l3fp-traps.dtx +2023/06/05 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx +2023/06/05 | 6224 | macros/latex/contrib/l3kernel/l3.ins +2023/06/05 | 30508 | macros/latex/contrib/l3kernel/l3intarray.dtx +2023/06/05 | 92818 | macros/latex/contrib/l3kernel/l3int.dtx +2023/06/05 | 27270 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx +2023/06/05 | 127498 | macros/latex/contrib/l3kernel/l3keys.dtx +2023/06/05 | 4574 | macros/latex/contrib/l3kernel/l3legacy.dtx +2023/06/05 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx +2023/06/05 | 77774 | macros/latex/contrib/l3kernel/l3msg.dtx +2023/06/05 | 78297 | macros/latex/contrib/l3kernel/l3names.dtx +2023/06/05 | 122712 | macros/latex/contrib/l3kernel/l3news01.pdf +2023/06/05 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex +2023/06/05 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf +2023/06/05 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex +2023/06/05 | 148700 | macros/latex/contrib/l3kernel/l3news03.pdf +2023/06/05 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex +2023/06/05 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf +2023/06/05 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex +2023/06/05 | 112483 | macros/latex/contrib/l3kernel/l3news05.pdf +2023/06/05 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex +2023/06/05 | 151568 | macros/latex/contrib/l3kernel/l3news06.pdf +2023/06/05 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex +2023/06/05 | 128313 | macros/latex/contrib/l3kernel/l3news07.pdf +2023/06/05 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex +2023/06/05 | 163457 | macros/latex/contrib/l3kernel/l3news08.pdf +2023/06/05 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex +2023/06/05 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf +2023/06/05 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex +2023/06/05 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf +2023/06/05 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex +2023/06/05 | 170073 | macros/latex/contrib/l3kernel/l3news11.pdf +2023/06/05 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex +2023/06/05 | 204998 | macros/latex/contrib/l3kernel/l3news12.pdf +2023/06/05 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex +2023/06/05 | 395887 | macros/latex/contrib/l3kernel/l3news.pdf +2023/06/05 | 4890 | macros/latex/contrib/l3kernel/l3news.tex +2023/06/05 | 19237 | macros/latex/contrib/l3kernel/l3pdf.dtx +2023/06/05 | 46204 | macros/latex/contrib/l3kernel/l3prefixes.csv +2023/06/05 | 81695 | macros/latex/contrib/l3kernel/l3prefixes.pdf +2023/06/05 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex +2023/06/05 | 70482 | macros/latex/contrib/l3kernel/l3prg.dtx +2023/06/05 | 56559 | macros/latex/contrib/l3kernel/l3prop.dtx +2023/06/05 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx +2023/06/05 | 304307 | macros/latex/contrib/l3kernel/l3regex.dtx +2023/06/05 | 97640 | macros/latex/contrib/l3kernel/l3seq.dtx +2023/06/05 | 91740 | macros/latex/contrib/l3kernel/l3skip.dtx +2023/06/05 | 40728 | macros/latex/contrib/l3kernel/l3sort.dtx +2023/06/05 | 113435 | macros/latex/contrib/l3kernel/l3str-convert.dtx +2023/06/05 | 79261 | macros/latex/contrib/l3kernel/l3str.dtx +2023/06/05 | 296797 | macros/latex/contrib/l3kernel/l3styleguide.pdf +2023/06/05 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex +2023/06/05 | 243431 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf +2023/06/05 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex +2023/06/05 | 35188 | macros/latex/contrib/l3kernel/l3sys.dtx +2023/06/05 | 218589 | macros/latex/contrib/l3kernel/l3term-glossary.pdf +2023/06/05 | 7079 | macros/latex/contrib/l3kernel/l3term-glossary.tex +2023/06/05 | 69893 | macros/latex/contrib/l3kernel/l3text-case.dtx +2023/06/05 | 49498 | macros/latex/contrib/l3kernel/l3text.dtx +2023/06/05 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx +2023/06/05 | 20464 | macros/latex/contrib/l3kernel/l3text-purify.dtx +2023/06/05 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx +2023/06/05 | 141613 | macros/latex/contrib/l3kernel/l3tl.dtx +2023/06/05 | 119051 | macros/latex/contrib/l3kernel/l3token.dtx +2023/06/05 | 32935 | macros/latex/contrib/l3kernel/l3unicode.dtx +2023/06/05 | 3116 | macros/latex/contrib/l3kernel/README.md +2023/06/05 | 24896 | macros/latex/contrib/l3kernel/source3body.tex +2023/06/05 | 7352030 | macros/latex/contrib/l3kernel/source3.pdf +2023/06/05 | 2229 | macros/latex/contrib/l3kernel/source3.tex +2023/06/05 | 13734749 | macros/latex/contrib/l3kernel.zip 2023/02/02 | 7253 | macros/latex/contrib/l3packages/CHANGELOG.md 2023/02/02 | 1444 | macros/latex/contrib/l3packages/l3keys2e-demo.tex 2023/02/02 | 12312 | macros/latex/contrib/l3packages/l3keys2e.dtx @@ -233126,11 +233132,11 @@ 1999/08/14 | 2754 | macros/latex/contrib/postcards/postcards.cls 1999/08/14 | 559 | macros/latex/contrib/postcards/README 2005/04/30 | 2990 | macros/latex/contrib/postcards.zip -2023/05/31 | 438342 | macros/latex/contrib/postit/doc/postit-doc.pdf -2023/05/31 | 12254 | macros/latex/contrib/postit/doc/postit-doc.tex +2023/06/05 | 494921 | macros/latex/contrib/postit/doc/postit-doc.pdf +2023/06/05 | 18930 | macros/latex/contrib/postit/doc/postit-doc.tex 2023/05/30 | 365 | macros/latex/contrib/postit/README.md -2023/05/31 | 5449 | macros/latex/contrib/postit/tex/postit.sty -2023/05/31 | 433073 | macros/latex/contrib/postit.zip +2023/06/05 | 24568 | macros/latex/contrib/postit/tex/postit.sty +2023/06/05 | 491142 | macros/latex/contrib/postit.zip 2023/02/21 | 2966 | macros/latex/contrib/postnotes/CHANGELOG.md 2023/02/21 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt 2023/02/21 | 840032 | macros/latex/contrib/postnotes/postnotes-code.pdf @@ -233734,6 +233740,13 @@ 2023/04/13 | 6608 | macros/latex/contrib/proflycee/tex/proflycee-tools-suites.tex 2023/05/03 | 42723 | macros/latex/contrib/proflycee/tex/proflycee-tools-trigo.tex 2023/06/02 | 2136700 | macros/latex/contrib/proflycee.zip +2023/06/04 | 169331 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf +2023/06/04 | 35693 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex +2023/05/27 | 17412 | macros/latex/contrib/profmaquette/doc/TestParcoursPerso.pdf +2023/05/28 | 756 | macros/latex/contrib/profmaquette/doc/TestParcoursPerso.tex +2023/06/04 | 59278 | macros/latex/contrib/profmaquette/latex/ProfMaquette.sty +2023/06/04 | 355 | macros/latex/contrib/profmaquette/README +2023/06/05 | 194139 | macros/latex/contrib/profmaquette.zip 1996/02/05 | 1760 | macros/latex/contrib/progkeys/demo/demo.tex 1996/02/05 | 459 | macros/latex/contrib/progkeys/demo/prog1.tex 1996/02/05 | 347 | macros/latex/contrib/progkeys/demo/prog2.tex @@ -290349,13 +290362,13 @@ 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.amd64-freebsd.r65257.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.amd64-netbsd.r65257.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.armhf-linux.r65257.tar.xz -2023/05/21 | 358760 | systems/texlive/tlnet/archive/bibcop.doc.r67168.tar.xz +2023/06/05 | 359132 | systems/texlive/tlnet/archive/bibcop.doc.r67278.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.i386-freebsd.r65257.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.i386-linux.r65257.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.i386-netbsd.r65257.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.i386-solaris.r65257.tar.xz -2023/05/21 | 7532 | systems/texlive/tlnet/archive/bibcop.r67168.tar.xz -2023/05/21 | 6032 | systems/texlive/tlnet/archive/bibcop.source.r67168.tar.xz +2023/06/05 | 7732 | systems/texlive/tlnet/archive/bibcop.r67278.tar.xz +2023/06/05 | 6152 | systems/texlive/tlnet/archive/bibcop.source.r67278.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.universal-darwin.r65257.tar.xz 2023/02/20 | 2304 | systems/texlive/tlnet/archive/bibcop.windows.r65891.tar.xz 2022/12/13 | 340 | systems/texlive/tlnet/archive/bibcop.x86_64-cygwin.r65257.tar.xz @@ -291551,7 +291564,7 @@ 2023/06/02 | 1596 | systems/texlive/tlnet/archive/collection-pictures.r67254.tar.xz 2023/01/26 | 976 | systems/texlive/tlnet/archive/collection-plaingeneric.r65622.tar.xz 2022/12/27 | 816 | systems/texlive/tlnet/archive/collection-pstricks.r65367.tar.xz -2023/04/20 | 1696 | systems/texlive/tlnet/archive/collection-publishers.r66894.tar.xz +2023/06/05 | 1700 | systems/texlive/tlnet/archive/collection-publishers.r67281.tar.xz 2020/03/04 | 340 | systems/texlive/tlnet/archive/collection-texworks.r54074.tar.xz 2023/02/20 | 388 | systems/texlive/tlnet/archive/collection-wintools.r65952.tar.xz 2022/11/08 | 660 | systems/texlive/tlnet/archive/collection-xetex.r64951.tar.xz @@ -291730,8 +291743,8 @@ 2019/02/28 | 7688 | systems/texlive/tlnet/archive/context-simplefonts.r47085.tar.xz 2023/05/12 | 849560 | systems/texlive/tlnet/archive/context-simpleslides.doc.r67070.tar.xz 2023/05/12 | 29160 | systems/texlive/tlnet/archive/context-simpleslides.r67070.tar.xz -2023/05/24 | 1552 | systems/texlive/tlnet/archive/context-sudoku.doc.r67201.tar.xz -2023/05/24 | 7316 | systems/texlive/tlnet/archive/context-sudoku.r67201.tar.xz +2023/06/05 | 1632 | systems/texlive/tlnet/archive/context-sudoku.doc.r67279.tar.xz +2023/06/05 | 7692 | systems/texlive/tlnet/archive/context-sudoku.r67279.tar.xz 2023/04/24 | 1052 | systems/texlive/tlnet/archive/context-texlive.r66924.tar.xz 2019/02/28 | 23088 | systems/texlive/tlnet/archive/context-title.doc.r47085.tar.xz 2019/02/28 | 2208 | systems/texlive/tlnet/archive/context-title.r47085.tar.xz @@ -295247,6 +295260,8 @@ 2022/10/02 | 1097100 | systems/texlive/tlnet/archive/josefin.r64569.tar.xz 2022/12/17 | 117948 | systems/texlive/tlnet/archive/jourcl.doc.r65290.tar.xz 2022/12/17 | 3024 | systems/texlive/tlnet/archive/jourcl.r65290.tar.xz +2023/06/05 | 101624 | systems/texlive/tlnet/archive/jourrr.doc.r67281.tar.xz +2023/06/05 | 2644 | systems/texlive/tlnet/archive/jourrr.r67281.tar.xz 2022/07/15 | 160748 | systems/texlive/tlnet/archive/jpneduenumerate.doc.r63893.tar.xz 2022/07/15 | 2720 | systems/texlive/tlnet/archive/jpneduenumerate.r63893.tar.xz 2022/07/11 | 327416 | systems/texlive/tlnet/archive/jpnedumathsymbols.doc.r63864.tar.xz @@ -297635,9 +297650,9 @@ 2019/02/28 | 7064 | systems/texlive/tlnet/archive/niceframe.source.r36086.tar.xz 2019/02/28 | 604 | systems/texlive/tlnet/archive/niceframe-type1.doc.r44671.tar.xz 2019/02/28 | 276328 | systems/texlive/tlnet/archive/niceframe-type1.r44671.tar.xz -2023/05/26 | 2076592 | systems/texlive/tlnet/archive/nicematrix.doc.r67216.tar.xz -2023/05/26 | 39292 | systems/texlive/tlnet/archive/nicematrix.r67216.tar.xz -2023/05/26 | 84736 | systems/texlive/tlnet/archive/nicematrix.source.r67216.tar.xz +2023/06/05 | 2089668 | systems/texlive/tlnet/archive/nicematrix.doc.r67280.tar.xz +2023/06/05 | 39448 | systems/texlive/tlnet/archive/nicematrix.r67280.tar.xz +2023/06/05 | 84976 | systems/texlive/tlnet/archive/nicematrix.source.r67280.tar.xz 2019/02/28 | 2473836 | systems/texlive/tlnet/archive/nicetext.doc.r38914.tar.xz 2019/02/28 | 54740 | systems/texlive/tlnet/archive/nicetext.r38914.tar.xz 2019/02/28 | 28908 | systems/texlive/tlnet/archive/nicetext.source.r38914.tar.xz @@ -300991,7 +301006,7 @@ 2022/09/13 | 600 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r64356.tar.xz -2023/06/04 | 427044 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67274.tar.xz +2023/06/05 | 427044 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67277.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.aarch64-linux.r53577.tar.xz 2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-freebsd.r53577.tar.xz 2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.amd64-netbsd.r53577.tar.xz @@ -301013,7 +301028,7 @@ 2022/09/13 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r64356.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r64356.tar.xz -2023/06/04 | 114072 | systems/texlive/tlnet/archive/texlive-scripts.r67274.tar.xz +2023/06/05 | 114068 | systems/texlive/tlnet/archive/texlive-scripts.r67277.tar.xz 2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz 2023/05/14 | 60312 | systems/texlive/tlnet/archive/texlive-scripts.windows.r67095.tar.xz 2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz @@ -302877,16 +302892,16 @@ 2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz 2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz 2023/03/12 | 125532 | systems/texlive/tlnet/install-tl -2023/06/04 | 5735941 | systems/texlive/tlnet/install-tl-unx.tar.gz -2023/06/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/06/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/06/05 | 5735744 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/06/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/06/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc 2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat -2023/06/04 | 21036422 | systems/texlive/tlnet/install-tl-windows.exe -2023/06/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/06/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/06/04 | 26025293 | systems/texlive/tlnet/install-tl.zip -2023/06/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/06/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/06/05 | 21036567 | systems/texlive/tlnet/install-tl-windows.exe +2023/06/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/06/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/06/05 | 26025297 | systems/texlive/tlnet/install-tl.zip +2023/06/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/06/05 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc 2023/03/19 | 1229 | systems/texlive/tlnet/README.md 2023/03/19 | 0 | systems/texlive/tlnet/TEXLIVE_2023 2023/01/17 | 8401 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg @@ -302896,7 +302911,7 @@ 2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg 2023/01/17 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess 2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt -2023/06/03 | 7396 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +2023/06/04 | 7427 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/05/31 | 215902 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt 2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe 2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt @@ -302938,12 +302953,12 @@ 2023/02/21 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm 2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm 2023/04/08 | 28167 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm -2023/06/04 | 18116790 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2023/06/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/06/05 | 18118934 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/06/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 2023/02/20 | 86803 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm -2023/06/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 -2023/06/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/06/04 | 2452912 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/06/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/06/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/06/05 | 2452292 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm 2023/02/26 | 42350 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm 2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm @@ -313456,7 +313471,7 @@ 2014/07/05 | 611 | systems/win32/yandy/README 2014/07/05 | 1004628 | systems/win32/yandy/yandy-src.tar.xz 2014/07/05 | 1012416 | systems/win32/yandy.zip -2023/06/05 | 186 | timestamp +2023/06/06 | 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 Binary files differindex 36cfbad310..9bb3976e01 100644 --- a/FILES.byname.gz +++ b/FILES.byname.gz diff --git a/FILES.last07days b/FILES.last07days index 0a238fb2ee..c5d3550bce 100644 --- a/FILES.last07days +++ b/FILES.last07days @@ -1,63 +1,193 @@ +2023/06/05 | 9999 | macros/latex/contrib/l3kernel/l3news10.tex +2023/06/05 | 97640 | macros/latex/contrib/l3kernel/l3seq.dtx +2023/06/05 | 9465 | macros/latex/contrib/l3kernel/l3news08.tex +2023/06/05 | 92818 | macros/latex/contrib/l3kernel/l3int.dtx +2023/06/05 | 91740 | macros/latex/contrib/l3kernel/l3skip.dtx +2023/06/05 | 89764 | macros/latex/contrib/l3kernel/l3expan.dtx +2023/06/05 | 88106 | macros/latex/contrib/l3kernel/l3coffins.dtx +2023/06/05 | 87744 | macros/latex/contrib/l3kernel/l3box.dtx +2023/06/05 | 84976 | systems/texlive/tlnet/archive/nicematrix.source.r67280.tar.xz +2023/06/05 | 8481 | macros/latex/contrib/l3kernel/l3news11.tex +2023/06/05 | 84785 | macros/latex/contrib/l3kernel/l3fp-basics.dtx +2023/06/05 | 83077 | macros/latex/contrib/l3kernel/l3clist.dtx +2023/06/05 | 81695 | macros/latex/contrib/l3kernel/l3prefixes.pdf +2023/06/05 | 79261 | macros/latex/contrib/l3kernel/l3str.dtx +2023/06/05 | 78297 | macros/latex/contrib/l3kernel/l3names.dtx +2023/06/05 | 77774 | macros/latex/contrib/l3kernel/l3msg.dtx +2023/06/05 | 7732 | systems/texlive/tlnet/archive/bibcop.r67278.tar.xz +2023/06/05 | 7692 | systems/texlive/tlnet/archive/context-sudoku.r67279.tar.xz +2023/06/05 | 7472 | macros/latex/contrib/l3kernel/l3fp-assign.dtx +2023/06/05 | 73835 | macros/latex/contrib/l3kernel/l3fp-trig.dtx +2023/06/05 | 7352030 | macros/latex/contrib/l3kernel/source3.pdf +2023/06/05 | 7079 | macros/latex/contrib/l3kernel/l3term-glossary.tex +2023/06/05 | 70780 | macros/latex/contrib/l3kernel/expl3.dtx +2023/06/05 | 70679 | macros/latex/contrib/l3kernel/l3fp.dtx +2023/06/05 | 70482 | macros/latex/contrib/l3kernel/l3prg.dtx +2023/06/05 | 69893 | macros/latex/contrib/l3kernel/l3text-case.dtx +2023/06/05 | 6677 | macros/latex/contrib/l3kernel/l3news02.tex +2023/06/05 | 6482 | macros/latex/contrib/l3kernel/l3news03.tex +2023/06/05 | 6433 | macros/latex/contrib/l3kernel/l3news06.tex +2023/06/05 | 62840 | macros/latex/contrib/l3kernel/l3tl-analysis.dtx +2023/06/05 | 6267 | macros/latex/contrib/l3kernel/l3syntax-changes.tex +2023/06/05 | 623094 | macros/latex/contrib/l3kernel/expl3.pdf +2023/06/05 | 6224 | macros/latex/contrib/l3kernel/l3.ins +2023/06/05 | 6152 | systems/texlive/tlnet/archive/bibcop.source.r67278.tar.xz +2023/06/05 | 612029 | graphics/pgf/contrib/tilings/tilings.pdf +2023/06/05 | 5735744 | systems/texlive/tlnet/install-tl-unx.tar.gz +2023/06/05 | 56559 | macros/latex/contrib/l3kernel/l3prop.dtx +2023/06/05 | 558448 | macros/latex/contrib/l3kernel/l3doc.pdf +2023/06/05 | 5429 | macros/latex/contrib/l3kernel/l3news04.tex +2023/06/05 | 51081 | macros/latex/contrib/l3kernel/l3fp-extended.dtx +2023/06/05 | 4977 | macros/latex/contrib/l3kernel/l3news07.tex +2023/06/05 | 49722 | macros/latex/contrib/l3kernel/CHANGELOG.md +2023/06/05 | 49498 | macros/latex/contrib/l3kernel/l3text.dtx +2023/06/05 | 494921 | macros/latex/contrib/postit/doc/postit-doc.pdf +2023/06/05 | 4937 | macros/latex/contrib/l3kernel/l3news01.tex +2023/06/05 | 49311 | macros/latex/contrib/l3kernel/l3fp-expo.dtx +2023/06/05 | 491142 | macros/latex/contrib/postit.zip +2023/06/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +2023/06/05 | 4890 | macros/latex/contrib/l3kernel/l3news.tex +2023/06/05 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc +2023/06/05 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc +2023/06/05 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc +2023/06/05 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc +2023/06/05 | 47216 | macros/latex/contrib/l3kernel/l3fp-aux.dtx +2023/06/05 | 4716 | macros/latex/contrib/l3kernel/l3news05.tex +2023/06/05 | 46204 | macros/latex/contrib/l3kernel/l3prefixes.csv +2023/06/05 | 4574 | macros/latex/contrib/l3kernel/l3legacy.dtx +2023/06/05 | 43225 | macros/latex/contrib/l3kernel/l3debug.dtx +2023/06/05 | 427044 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67277.tar.xz +2023/06/05 | 41283 | graphics/pgf/contrib/tilings/tilings.tex +2023/06/05 | 4077217 | biblio/ctan-bibdata.zip +2023/06/05 | 40728 | macros/latex/contrib/l3kernel/l3sort.dtx +2023/06/05 | 395887 | macros/latex/contrib/l3kernel/l3news.pdf +2023/06/05 | 39448 | systems/texlive/tlnet/archive/nicematrix.r67280.tar.xz +2023/06/05 | 3677738 | biblio/ctan-bibdata/ctan.pdf +2023/06/05 | 359132 | systems/texlive/tlnet/archive/bibcop.doc.r67278.tar.xz +2023/06/05 | 35441 | macros/latex/contrib/l3kernel/l3quark.dtx +2023/06/05 | 35188 | macros/latex/contrib/l3kernel/l3sys.dtx +2023/06/05 | 33709 | macros/latex/contrib/l3kernel/l3cctab.dtx +2023/06/05 | 32935 | macros/latex/contrib/l3kernel/l3unicode.dtx +2023/06/05 | 3116 | macros/latex/contrib/l3kernel/README.md +2023/06/05 | 30508 | macros/latex/contrib/l3kernel/l3intarray.dtx +2023/06/05 | 304307 | macros/latex/contrib/l3kernel/l3regex.dtx +2023/06/05 | 296797 | macros/latex/contrib/l3kernel/l3styleguide.pdf +2023/06/05 | 2821 | macros/latex/contrib/l3kernel/l3prefixes.tex +2023/06/05 | 2788130 | biblio/ctan-bibdata/ctan.bib +2023/06/05 | 27270 | macros/latex/contrib/l3kernel/l3kernel-functions.dtx +2023/06/05 | 2644 | systems/texlive/tlnet/archive/jourrr.r67281.tar.xz +2023/06/05 | 26025297 | systems/texlive/tlnet/install-tl.zip +2023/06/05 | 25249 | macros/latex/contrib/l3kernel/l3deprecation.dtx +2023/06/05 | 250136 | macros/latex/contrib/l3kernel/l3news09.pdf +2023/06/05 | 24896 | macros/latex/contrib/l3kernel/source3body.tex +2023/06/05 | 24568 | macros/latex/contrib/postit/tex/postit.sty +2023/06/05 | 2452292 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +2023/06/05 | 243431 | macros/latex/contrib/l3kernel/l3syntax-changes.pdf +2023/06/05 | 2390 | macros/latex/contrib/l3kernel/l3docstrip.dtx +2023/06/05 | 23866 | macros/latex/contrib/l3kernel/l3luatex.dtx +2023/06/05 | 23574 | macros/latex/contrib/l3kernel/l3fp-random.dtx +2023/06/05 | 23011 | macros/latex/contrib/l3kernel/l3fp-logic.dtx +2023/06/05 | 2229 | macros/latex/contrib/l3kernel/source3.tex +2023/06/05 | 218589 | macros/latex/contrib/l3kernel/l3term-glossary.pdf +2023/06/05 | 21036567 | systems/texlive/tlnet/install-tl-windows.exe +2023/06/05 | 2089668 | systems/texlive/tlnet/archive/nicematrix.doc.r67280.tar.xz +2023/06/05 | 204998 | macros/latex/contrib/l3kernel/l3news12.pdf +2023/06/05 | 20464 | macros/latex/contrib/l3kernel/l3text-purify.dtx +2023/06/05 | 2038 | macros/latex/contrib/l3kernel/interface3.tex +2023/06/05 | 19641 | macros/latex/contrib/l3kernel/l3fp-convert.dtx +2023/06/05 | 194139 | macros/latex/contrib/profmaquette.zip +2023/06/05 | 19237 | macros/latex/contrib/l3kernel/l3pdf.dtx +2023/06/05 | 18930 | macros/latex/contrib/postit/doc/postit-doc.tex +2023/06/05 | 18532 | macros/latex/contrib/l3kernel/l3fp-round.dtx +2023/06/05 | 18118934 | systems/texlive/tlnet/tlpkg/texlive.tlpdb +2023/06/05 | 1722452 | macros/latex/contrib/l3kernel/interface3.pdf +2023/06/05 | 1700 | systems/texlive/tlnet/archive/collection-publishers.r67281.tar.xz +2023/06/05 | 170073 | macros/latex/contrib/l3kernel/l3news11.pdf +2023/06/05 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/06/05 | 16709 | macros/latex/contrib/l3kernel/l3candidates.dtx +2023/06/05 | 16633 | macros/latex/contrib/l3kernel/l3text-map.dtx +2023/06/05 | 163457 | macros/latex/contrib/l3kernel/l3news08.pdf +2023/06/05 | 1632 | systems/texlive/tlnet/archive/context-sudoku.doc.r67279.tar.xz +2023/06/05 | 155620 | macros/latex/contrib/l3kernel/l3doc.dtx +2023/06/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 +2023/06/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 +2023/06/05 | 152256 | macros/latex/contrib/l3kernel/l3docstrip.pdf +2023/06/05 | 151568 | macros/latex/contrib/l3kernel/l3news06.pdf +2023/06/05 | 150674 | macros/latex/contrib/l3kernel/l3news02.pdf +2023/06/05 | 150283 | macros/latex/contrib/l3kernel/l3news10.pdf +2023/06/05 | 14913 | macros/latex/contrib/l3kernel/l3news12.tex +2023/06/05 | 148700 | macros/latex/contrib/l3kernel/l3news03.pdf +2023/06/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 +2023/06/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +2023/06/05 | 141613 | macros/latex/contrib/l3kernel/l3tl.dtx +2023/06/05 | 140307 | macros/latex/contrib/l3kernel/l3file.dtx +2023/06/05 | 13993568 | install/macros/latex/contrib/l3kernel.tds.zip +2023/06/05 | 13734749 | macros/latex/contrib/l3kernel.zip +2023/06/05 | 131575 | macros/latex/contrib/l3kernel/l3basics.dtx +2023/06/05 | 128313 | macros/latex/contrib/l3kernel/l3news07.pdf +2023/06/05 | 12777 | macros/latex/contrib/l3kernel/l3fp-traps.dtx +2023/06/05 | 127498 | macros/latex/contrib/l3kernel/l3keys.dtx +2023/06/05 | 12743 | macros/latex/contrib/l3kernel/l3bootstrap.dtx +2023/06/05 | 122712 | macros/latex/contrib/l3kernel/l3news01.pdf +2023/06/05 | 119051 | macros/latex/contrib/l3kernel/l3token.dtx +2023/06/05 | 11884 | macros/latex/contrib/l3kernel/l3styleguide.tex +2023/06/05 | 11781 | macros/latex/contrib/l3kernel/l3fparray.dtx +2023/06/05 | 114586 | macros/latex/contrib/l3kernel/l3news04.pdf +2023/06/05 | 114068 | systems/texlive/tlnet/archive/texlive-scripts.r67277.tar.xz +2023/06/05 | 113435 | macros/latex/contrib/l3kernel/l3str-convert.dtx +2023/06/05 | 112483 | macros/latex/contrib/l3kernel/l3news05.pdf +2023/06/05 | 112274 | macros/latex/contrib/l3kernel/l3color.dtx +2023/06/05 | 1081438 | graphics/pgf/contrib/tilings.zip +2023/06/05 | 107383 | macros/latex/contrib/l3kernel/l3news09.tex +2023/06/05 | 105012 | macros/latex/contrib/l3kernel/l3fp-parse.dtx +2023/06/05 | 10328 | macros/latex/contrib/l3kernel/l3flag.dtx +2023/06/05 | 101624 | systems/texlive/tlnet/archive/jourrr.doc.r67281.tar.xz 2023/06/04 | 958 | biblio/bibtex/utils/bibcop/bibcop.1 2023/06/04 | 911018 | macros/latex/contrib/nicematrix/nicematrix-code.pdf 2023/06/04 | 82561 | macros/latex/contrib/jourrr/jourrr.pdf +2023/06/04 | 7427 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/06/04 | 59767 | macros/latex/contrib/starray/latex/starray.sty 2023/06/04 | 596415 | macros/latex/contrib/nicematrix/nicematrix.pdf +2023/06/04 | 59278 | macros/latex/contrib/profmaquette/latex/ProfMaquette.sty 2023/06/04 | 5821 | macros/latex/contrib/jourrr/jourrr.cls 2023/06/04 | 581333 | macros/latex/contrib/nicematrix/nicematrix-french.pdf -2023/06/04 | 5735941 | systems/texlive/tlnet/install-tl-unx.tar.gz 2023/06/04 | 551525 | macros/latex/contrib/nicematrix/nicematrix-code.dtx 2023/06/04 | 5504 | macros/latex/contrib/jourrr/jourrr.tex 2023/06/04 | 5100 | biblio/bibtex/utils/bibcop/bibcop-logo.pdf -2023/06/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 -2023/06/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc -2023/06/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc -2023/06/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc -2023/06/04 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc -2023/06/04 | 427044 | systems/texlive/tlnet/archive/texlive-scripts.doc.r67274.tar.xz -2023/06/04 | 4075917 | biblio/ctan-bibdata.zip 2023/06/04 | 40732 | systems/texlive/tlnet/archive/proflycee.r67275.tar.xz 2023/06/04 | 3735 | macros/latex/contrib/jourrr/README.md -2023/06/04 | 3677417 | biblio/ctan-bibdata/ctan.pdf 2023/06/04 | 366136 | biblio/bibtex/utils/bibcop.zip +2023/06/04 | 35693 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex +2023/06/04 | 355 | macros/latex/contrib/profmaquette/README 2023/06/04 | 347548 | biblio/bibtex/utils/bibcop/bibcop.pdf 2023/06/04 | 33990 | macros/latex/contrib/starray/doc/starray.tex -2023/06/04 | 2787771 | biblio/ctan-bibdata/ctan.bib 2023/06/04 | 2709 | biblio/bibtex/utils/bibcop/README.md 2023/06/04 | 266418 | macros/latex/contrib/starray/doc/starray.pdf 2023/06/04 | 2628 | biblio/bibtex/utils/bibcop/bibcop.ins -2023/06/04 | 26025293 | systems/texlive/tlnet/install-tl.zip 2023/06/04 | 25192 | biblio/bibtex/utils/bibcop/bibcop.pl 2023/06/04 | 24 | biblio/bibtex/utils/bibcop/DEPENDS.txt 2023/06/04 | 246979 | macros/latex/contrib/nicematrix/nicematrix.tex -2023/06/04 | 2452912 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz 2023/06/04 | 2381 | macros/latex/contrib/starray/README.md 2023/06/04 | 236927 | macros/latex/contrib/nicematrix/nicematrix-french.tex 2023/06/04 | 235031 | macros/latex/contrib/starray.zip 2023/06/04 | 2257347 | macros/latex/contrib/nicematrix.zip -2023/06/04 | 21036422 | systems/texlive/tlnet/install-tl-windows.exe 2023/06/04 | 20131 | macros/latex/contrib/jourrr/LICENSE 2023/06/04 | 1955816 | systems/texlive/tlnet/archive/proflycee.doc.r67275.tar.xz -2023/06/04 | 18116790 | systems/texlive/tlnet/tlpkg/texlive.tlpdb -2023/06/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx +2023/06/04 | 169331 | macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf 2023/06/04 | 16048 | biblio/bibtex/utils/bibcop/bibcop.dtx -2023/06/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512 -2023/06/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512 -2023/06/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512 -2023/06/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 2023/06/04 | 13842 | macros/latex/contrib/jourrr/imgs/jourrr-signature.png 2023/06/04 | 12071 | macros/context/contrib/context-sudoku.zip -2023/06/04 | 114072 | systems/texlive/tlnet/archive/texlive-scripts.r67274.tar.xz +2023/06/04 | 115339485 | macros/context/latest/cont-tmf.zip 2023/06/04 | 1083 | biblio/bibtex/utils/bibcop/LICENSE.txt 2023/06/04 | 105130 | macros/latex/contrib/jourrr.zip 2023/06/03 | 893016 | systems/texlive/tlnet/archive/dynkin-diagrams.doc.r67267.tar.xz -2023/06/03 | 7396 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl 2023/06/03 | 6929 | macros/context/contrib/context-sudoku/tex/context/third/sudoku/t-sudoku.mkvi 2023/06/03 | 6912 | systems/texlive/tlnet/archive/babel-greek.r67268.tar.xz 2023/06/03 | 67824 | systems/texlive/tlnet/archive/revtex.r67271.tar.xz 2023/06/03 | 65944 | systems/texlive/tlnet/archive/movement-arrows.doc.r67270.tar.xz 2023/06/03 | 550764 | systems/texlive/tlnet/archive/covington.doc.r67269.tar.xz 2023/06/03 | 5065364 | systems/texlive/tlnet/archive/revtex.doc.r67271.tar.xz +2023/06/03 | 388 | graphics/pgf/contrib/tilings/README 2023/06/03 | 37295 | macros/context/contrib/context-sudoku/tex/context/third/sudoku/t-sudoku.lua 2023/06/03 | 2772028 | systems/texlive/tlnet/archive/simpleicons.r67266.tar.xz 2023/06/03 | 24712 | systems/texlive/tlnet/archive/babel-greek.source.r67268.tar.xz @@ -72,6 +202,7 @@ 2023/06/03 | 11 | macros/context/contrib/context-sudoku/VERSION 2023/06/03 | 11 | macros/context/contrib/context-sudoku/tex/context/third/sudoku/VERSION 2023/06/03 | 1086388 | systems/texlive/tlnet/archive/tex4ht.r67272.tar.xz +2023/06/03 | 107698 | graphics/pgf/contrib/tilings/tilings_code.dtx 2023/06/03 | 10152 | systems/texlive/tlnet/archive/covington.r67269.tar.xz 2023/06/02 | 915392 | graphics/pgf/contrib/dynkin-diagrams.zip 2023/06/02 | 9120 | systems/texlive/tlnet/archive/invoice2.source.r67263.tar.xz @@ -102,6 +233,7 @@ 2023/06/02 | 546693 | macros/latex/contrib/revtex/ltxfront.pdf 2023/06/02 | 533391 | macros/latex/contrib/covington/covington.pdf 2023/06/02 | 529 | macros/latex/contrib/proflycee/doc/testscript.py +2023/06/02 | 521939 | graphics/pgf/contrib/tilings/tilings_code.pdf 2023/06/02 | 517321 | macros/latex/contrib/revtex/aip4-2.pdf 2023/06/02 | 5159732 | systems/texlive/tlnet/archive/pgf-periodictable.doc.r67250.tar.xz 2023/06/02 | 510356 | systems/texlive/tlnet/archive/pgf-periodictable.r67250.tar.xz @@ -269,7 +401,6 @@ 2023/06/01 | 134468 | macros/xetex/latex/exam-zh/examples/example-single.pdf 2023/06/01 | 1211 | macros/latex/contrib/babel-contrib/greek/README.md 2023/06/01 | 11537 | macros/xetex/latex/exam-zh/README.md -2023/06/01 | 115300387 | macros/context/latest/cont-tmf.zip 2023/06/01 | 11463 | macros/xetex/latex/exam-zh/examples/example-single.tex 2023/06/01 | 10386 | macros/xetex/latex/exam-zh/CHANGELOG.md 2023/05/31 | 991 | graphics/circuit_macros/examples/Byte.m4 @@ -386,7 +517,6 @@ 2023/05/31 | 5485 | graphics/circuit_macros/examples/rose.m4 2023/05/31 | 5485 | graphics/circuit_macros/examples/dpv/roseDPV.m4 2023/05/31 | 5469 | graphics/circuit_macros/examples/dpv/graysurfDPV.m4 -2023/05/31 | 5449 | macros/latex/contrib/postit/tex/postit.sty 2023/05/31 | 538 | graphics/circuit_macros/examples/dpv/AmpTableDPV.m4 2023/05/31 | 5365 | graphics/circuit_macros/examples/dpv/fetDPV.m4 2023/05/31 | 535 | graphics/circuit_macros/doc/Tline.m4 @@ -432,10 +562,8 @@ 2023/05/31 | 449 | graphics/circuit_macros/examples/extras/Wheat.m4 2023/05/31 | 449 | graphics/circuit_macros/doc/woodchips.m4 2023/05/31 | 4475 | graphics/circuit_macros/doc/Circuit_macros.bib -2023/05/31 | 438342 | macros/latex/contrib/postit/doc/postit-doc.pdf 2023/05/31 | 4376 | graphics/circuit_macros/examples/dpv/slddiagsDPV.m4 2023/05/31 | 4340 | graphics/circuit_macros/examples/dpv/AlogixDPV.m4 -2023/05/31 | 433073 | macros/latex/contrib/postit.zip 2023/05/31 | 4313 | graphics/circuit_macros/examples/ex09.m4 2023/05/31 | 4299 | language/korean/cjk-ko/README 2023/05/31 | 4292 | graphics/circuit_macros/examples/dpv/InclepsDPV.m4 @@ -720,7 +848,6 @@ 2023/05/31 | 1230 | graphics/circuit_macros/examples/Antennas.m4 2023/05/31 | 1230 | graphics/circuit_macros/doc/AntennasMan.m4 2023/05/31 | 1229 | graphics/circuit_macros/doc/fbfilter.m4 -2023/05/31 | 12254 | macros/latex/contrib/postit/doc/postit-doc.tex 2023/05/31 | 1222 | graphics/circuit_macros/examples/Chips.m4 2023/05/31 | 1217 | graphics/circuit_macros/examples/extras/Egg.m4 2023/05/31 | 1214 | graphics/circuit_macros/examples/dpv/ChipsDPV.m4 @@ -792,40 +919,3 @@ 2023/05/30 | 2659 | macros/latex/contrib/counterz/counterz.ins 2023/05/30 | 1884 | graphics/pgf/contrib/pgf-periodictable/README 2023/05/30 | 1302448 | systems/texlive/tlnet/archive/texshade.doc.r67243.tar.xz -2023/05/29 | 9188 | macros/latex/contrib/ufrgscca/latex/ufrgscca-en-forms.def -2023/05/29 | 8941 | macros/latex/contrib/ufrgscca/latex/ufrgscca-formsTR.sty -2023/05/29 | 885084 | systems/texlive/tlnet/archive/mcf2graph.doc.r67238.tar.xz -2023/05/29 | 8816 | macros/latex/contrib/ufrgscca/latex/ufrgscca-en-coord.def -2023/05/29 | 8596 | macros/latex/contrib/ufrgscca/latex/ufrgscca-curr-tab.sty -2023/05/29 | 804456 | install/macros/luatex/latex/luacas.tds.zip -2023/05/29 | 7738 | macros/luatex/latex/luacas/tex/luacas.sty -2023/05/29 | 7477 | macros/latex/contrib/ufrgscca/latex/ufrgscca.cls -2023/05/29 | 70005 | macros/latex/contrib/ufrgscca/doc/ufrgscca.tex -2023/05/29 | 632266 | macros/latex/contrib/ufrgscca/doc/ufrgscca.pdf -2023/05/29 | 626176 | macros/latex/contrib/ufrgscca.zip -2023/05/29 | 579240 | systems/texlive/tlnet/archive/tikz2d-fr.doc.r67239.tar.xz -2023/05/29 | 5380 | macros/latex/contrib/ufrgscca/README.md -2023/05/29 | 5349 | macros/latex/contrib/ufrgscca/latex/ufrgscca-curr.sty -2023/05/29 | 5122 | macros/latex/contrib/texshade/README -2023/05/29 | 4852 | macros/latex/contrib/ufrgscca/latex/ufrgscca-gen.sty -2023/05/29 | 4819 | macros/latex/contrib/ufrgscca/latex/ufrgscca-formsintern.sty -2023/05/29 | 4564 | macros/latex/contrib/ufrgscca/latex/ufrgscca-curr-graph.sty -2023/05/29 | 448 | systems/texlive/tlnet/archive/mcf2graph.r67238.tar.xz -2023/05/29 | 4069 | macros/latex/contrib/ufrgscca/latex/ufrgscca-ptBR-core.def -2023/05/29 | 34300 | macros/latex/contrib/ufrgscca/latex/ufrgscca-coord.sty -2023/05/29 | 2760 | systems/texlive/tlnet/archive/tikz2d-fr.r67239.tar.xz -2023/05/29 | 2696 | macros/latex/contrib/ufrgscca/latex/ufrgscca-lists.sty -2023/05/29 | 2545 | macros/latex/contrib/texshade/texshade.ins -2023/05/29 | 2481 | macros/latex/contrib/ufrgscca/latex/ufrgscca-en-core.def -2023/05/29 | 2223 | macros/latex/contrib/ufrgscca/latex/ufrgscca-en-base.def -2023/05/29 | 2205 | macros/latex/contrib/ufrgscca/latex/ufrgscca-ptBR-base.def -2023/05/29 | 20486 | macros/latex/contrib/ufrgscca/latex/ufrgscca-ppc.sty -2023/05/29 | 20150 | macros/latex/contrib/ufrgscca/latex/ufrgscca-forms.sty -2023/05/29 | 17368 | macros/latex/contrib/ufrgscca/latex/ufrgscca-abnt.sty -2023/05/29 | 16303 | macros/latex/contrib/ufrgscca/latex/ufrgscca-ptBR-forms.def -2023/05/29 | 1565024 | macros/latex/contrib/texshade/texshade.pdf -2023/05/29 | 1507451 | macros/latex/contrib/texshade.zip -2023/05/29 | 1478681 | macros/latex/contrib/texshade/texshade.dtx -2023/05/29 | 14403 | macros/latex/contrib/ufrgscca/latex/ufrgscca-ptBR-coord.def -2023/05/29 | 11522 | macros/latex/contrib/ufrgscca/latex/ufrgscca-core.sty -2023/05/29 | 11489 | macros/latex/contrib/ufrgscca/latex/ufrgscca-cover.sty diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib index 8b8706fd33..f405927226 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 05-06-2023, 02:00:47 +%% created at 06-06-2023, 02:00:59 %% %% This file is provided under the terms of the LPPL v1.3 or @@ -23854,7 +23854,7 @@ title = {The \texttt{expl3} package}, subtitle = {Wrapper package for experimental \LaTeX{}3}, author = {{The \LaTeX{} Project Team}}, - date = {2023-05-22}, + date = {2023-06-05}, version = {}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel}, @@ -35086,7 +35086,7 @@ title = {The \texttt{jourrr} package}, subtitle = {A \LaTeX{} template for journal rebuttal letters}, author = {Rok Kukovec}, - date = {2023-06-04}, + date = {2023-06-05}, version = {}, license = {cc-by-sa-4}, mirror = {https://mirror.ctan.org/macros/latex/contrib/jourrr}, @@ -36522,7 +36522,7 @@ title = {The \texttt{l3docstrip} package}, subtitle = {Strip documentation in \LaTeX{}3 source}, author = {{The \LaTeX{} Project Team}}, - date = {2023-05-22}, + date = {2023-06-05}, version = {}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel}, @@ -36544,7 +36544,7 @@ title = {The \texttt{l3kernel} package}, subtitle = {LaTeX3 programming conventions}, author = {{The \LaTeX{} Project Team}}, - date = {2023-05-22}, + date = {2023-06-05}, version = {}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel}, @@ -36577,7 +36577,7 @@ title = {The \texttt{l3regex} package}, subtitle = {Regular expression facilities for \LaTeX{}}, author = {{The \LaTeX{} Project Team}}, - date = {2023-05-22}, + date = {2023-06-05}, version = {}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/l3kernel/l3regex.dtx}, @@ -51822,19 +51822,11 @@ title = {The \texttt{penrose} package}, subtitle = {A TikZ library for producing Penrose tilings}, author = {Andrew Stacey}, - date = {2021-01-23}, + date = {2023-06-05}, version = {1.4}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/graphics/pgf/contrib/penrose}, url = {https://ctan.org/pkg/penrose}, - annotation = {This package provides a library - for drawing Penrose tiles. - It currently supports the kite/dart, rhombus, and pentagon tile sets. - There are two main methods for their placement: - one that automatically generates a tiling, - and one that allows for “by hand” placement. - Furthermore, the tiles themselves can be deformed and - will still (hopefully!) fit together in the correct fashion.}, } @manual{ctan-perception, @@ -53898,8 +53890,8 @@ title = {The \texttt{postit} package}, subtitle = {A \LaTeX{} package for displaying Post-it notes}, author = {Cédric Pierquet}, - date = {2023-06-03}, - version = {0.1.0}, + date = {2023-06-05}, + version = {0.1.1}, license = {lppl1.3c}, mirror = {https://mirror.ctan.org/macros/latex/contrib/postit}, url = {https://ctan.org/pkg/postit}, @@ -54413,6 +54405,17 @@ url = {https://ctan.org/pkg/proflycee}, } +@manual{ctan-profmaquette, + title = {The \texttt{profmaquette} package}, + subtitle = {Use exercises in different types of documents}, + author = {Christophe Poulain}, + date = {2023-06-05}, + version = {0.15}, + license = {lppl1.3c}, + mirror = {https://mirror.ctan.org/macros/latex/contrib/profmaquette}, + url = {https://ctan.org/pkg/profmaquette}, +} + @manual{ctan-progkeys, title = {The \texttt{progkeys} package}, subtitle = {Typeset programs, recognising keywords}, @@ -69674,6 +69677,24 @@ packaged into a single PDF file.}, } +@manual{ctan-tilings, + title = {The \texttt{tilings} package}, + subtitle = {A TikZ library for producing tilings,such as Penrose tilings + and aperiodical polykite tilings}, + author = {Andrew Stacey}, + date = {2023-06-05}, + version = {2.0}, + license = {lppl1.3c}, + mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tilings}, + url = {https://ctan.org/pkg/tilings}, + annotation = {This package provides a library + for working with tiles, tilings, and tessellations. + Using it, one can define tiles, place tiles, deform tiles, and - + in some cases - apply replacement rules to generate tessellations. + It has pre-defined tiles for most of the Penrose tile sets and + the aperiodical polykite tiles.}, +} + @manual{ctan-timbreicmc, title = {The \texttt{timbreicmc} package}, subtitle = {Typeset documents with ICMC/USP watermarks}, diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf Binary files differindex 1e310b996d..2e812772f2 100644 --- a/biblio/ctan-bibdata/ctan.pdf +++ b/biblio/ctan-bibdata/ctan.pdf diff --git a/graphics/pgf/contrib/tilings/README b/graphics/pgf/contrib/tilings/README new file mode 100644 index 0000000000..975c66e2f3 --- /dev/null +++ b/graphics/pgf/contrib/tilings/README @@ -0,0 +1,8 @@ +---------------------------------------------------------------- +penrose --- TikZ library for producing tiling patterns +E-mail: loopspace@mathforge.org +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +---------------------------------------------------------------- + +This package is for the creation of Penrose and similar tilings. diff --git a/graphics/pgf/contrib/tilings/tilings.pdf b/graphics/pgf/contrib/tilings/tilings.pdf Binary files differnew file mode 100644 index 0000000000..03349e4224 --- /dev/null +++ b/graphics/pgf/contrib/tilings/tilings.pdf diff --git a/graphics/pgf/contrib/tilings/tilings.tex b/graphics/pgf/contrib/tilings/tilings.tex new file mode 100644 index 0000000000..0ca5d2799d --- /dev/null +++ b/graphics/pgf/contrib/tilings/tilings.tex @@ -0,0 +1,1159 @@ +%\immediate\write18{tex tilings_code.dtx} +\documentclass{ltxdoc} +\usepackage[T1]{fontenc} +\usepackage{trace} +\usepackage{lmodern} +\usepackage{morefloats} +\usepackage{multicol} +\usepackage[svgnames]{xcolor} +\usepackage{tikz} +\usetikzlibrary{ + external, + tilings.polykite, + tilings.penrose +} + +\usepackage[numbered]{hypdoc} +\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9} + +\usepackage{listings} +\lstloadlanguages{[LaTeX]TeX} +\lstset{ + breakatwhitespace=true, + breaklines=true, + language=[LaTeX]TeX, + basicstyle=\small\ttfamily, + keepspaces=true, + columns=fullflexible +} + +\usepackage{fancyvrb} + +\newenvironment{example} + {\VerbatimEnvironment + \begin{VerbatimOut}{example.out}} + {\end{VerbatimOut} + \begin{center} + \setlength{\parindent}{0pt} + \fbox{\begin{minipage}{.9\linewidth} + \lstinputlisting[]{example.out} + \end{minipage}} + + \fbox{\begin{minipage}{.9\linewidth} + \centering + \input{example.out} + \end{minipage}} +\end{center} +} + +\newenvironment{justexample} + {\VerbatimEnvironment + \begin{VerbatimOut}{example.out}} + {\end{VerbatimOut} + \begin{center} + \setlength{\parindent}{0pt} + \fbox{\begin{minipage}{.9\linewidth} + \lstinputlisting[]{example.out} + \end{minipage}} +\end{center} +} + +\colorlet{thinRhombus}{DarkOrchid} +\colorlet{thickRhombus}{DarkSlateGray} +\colorlet{circleArc}{RosyBrown} +\colorlet{longArc}{LawnGreen} + +\colorlet{kite}{HotPink} +\colorlet{dart}{Fuchsia} + +\colorlet{goldenTriangle}{Gold} +\colorlet{reverseGoldenTriangle}{Magenta} +\colorlet{goldenGnomon}{Cyan} +\colorlet{reverseGoldenGnomon}{LimeGreen} + +\makeatletter +\tikzset{ + tint fill colour/.code={% + \edef\@temp{% + \def\noexpand\tikz@fillcolor{\tikz@fillcolor!#1}% + \noexpand\tikz@addoption{\noexpand\pgfsetfillcolor{\tikz@fillcolor!#1}}% + }% + \@temp + } +} +\makeatother + + \tikzexternalize + \tikzsetexternalprefix{tiling-doc-} + +\providecommand*{\url}{\texttt} +\GetFileInfo{tikzlibrarytilings.code.tex} + +\title{The \textsf{Tilings} Package: Documentation} +\author{Andrew Stacey\texorpdfstring{\\ \url{loopspace@mathforge.org}}{}} + \date{\fileversion~from \filedate} + +\begin{document} + +\maketitle + +\tableofcontents + +\section{Introduction} + +The \textsf{Tilings} package is a TikZ library for drawing tiles and tilings, such as Penrose tilings (indeed, it was originally called the \textbf{Penrose} package). +It currently supports natively the various Penrose tile sets -- kite/dart, rhombus, and pentagon -- and the aperiodical polykites, but has provision for defining new tiles. +There are two main methods for their placement: one that automatically generates a tiling, and one that allows for ``by hand'' placement. +Furthermore, the tiles themselves can be deformed and will still (hopefully!) fit together in the correct fashion. + +\section{Initialisation} + +This is actually several libraries. +There is a core library called \Verb+tilings+ which defines the main functionality for working with tiles and tilings but which doesn't define any tiles itself. +For that, there are currently two sublibraries: +% +\begin{itemize} +\item \Verb+tilings.penrose+ for Penrose tiles, +\item \Verb+tilings.polykite+ for the aperiodical polykite tiles. +\end{itemize} +% +The sublibraries automatically load the core library. + +So to use this package, load the \Verb+tikz+ package and load one of the tilings libraries as a TikZ library. +Specifically, your preamble should contain: + +\begin{verbatim} +\usepackage{tikz} +\end{verbatim} + +\noindent and at least one of the following lines: + +\begin{verbatim} +\usetikzlibrary{tilings} +\usetikzlibrary{tilings.penrose} +\usetikzlibrary{tilings.polykite} +\end{verbatim} + +The original version of this package concerned itself only with Penrose tiles so was named \Verb+penrose+. +Since then it has been extended and is more general and so has been renamed \Verb+tilings+. +Some commands have been renamed, but there is a wrapper library which aims to provide backwards compatibility with the original naming scheme. +This is now the \Verb+penrose+ TikZ library, meaning that old documents that use the \Verb+penrose+ TikZ library should still work (please report any that don't on the \href{https://github.com/loopspace/penrose}{issue tracker}). +New documents shouldn't be written using it. + + +\section{Defining the Tiles} + +This package includes the capability to define new tiles. +The command to do this is: +% +\begin{verbatim} +\DefineTile{<name>}{<sides>}{<vertices>} +\end{verbatim} +% +For example, +% +\begin{verbatim} +\DefineTile {square}{a A a A} +{ + {0,0} + {1,0} + {1,1} + {0,1} +} +\end{verbatim} + +The \Verb!<sides>! is a list of letters representing sides for matching rules and positioning. +The first letter in the list corresponds to the edge between the first two vertices, through to the last side which corresponds to the edge between the last and first vertices. + +Each letter used matches against its opposite case (so it is possible to create a side that matches against itself by using a symbol that \TeX\ regards as having the same upper as lower case; not all symbols work, I've used numbers and \Verb+!+ successfully). +These are also used in path replacing, both a letter and its opposite case are replaced by the corresponding path (but in opposite directions) when the tile is ``baked''. + +The vertices can be written in cartesian form: \Verb+{<x>,<y>}+, or in polar: \Verb+{<angle>:<length>}+ (with the angle in degrees). +The vertex can be preceded by upto two \Verb!+! signs which have the same interpretation as in TikZ: the vertex description is taken relative to the previously saved point with a single \Verb!+! additionally not updating the last saved point. +The initial saved point is the origin, so the following defines a hexagonal tile. +% +\begin{verbatim} +\DefineTile {hexagon}{a A a A a A} +{ + +{0:1} + +{60:1} + +{120:1} + +{180:1} + +{240:1} + +{300:1} +} +\end{verbatim} + +The numbers are passed to the \Verb!fp! module of \LaTeX3 so can involve complicated expressions. +Note that the trigonometric functions for angles in degrees are \Verb!cosd!, \Verb!sind!, and \Verb!tand!. + +The tile must be baked via the command \Verb!\BakeTile! before it can be used. + +\begin{example} +\DefineTile {square}{a A a A} +{ + {0,0} + {1,0} + {1,1} + {0,1} +} + +\begin{tikzpicture} +\path[save tiling path=a] (0,0) to[out=45,in=135] (1,0); +\BakeTile{square} +\pic[square,name=A,fill=green]; +\pic[square,align with=A along a1 using 2,name=B,fill=red]; +\pic[square,align with=A along A1 using 2,fill=red]; +\pic[square,align with=A along A2 using 1,fill=red]; +\pic[square,align with=B along a1 using 2,fill=green]; +\pic[square,align with=B along a2 using 1,fill=green]; +\end{tikzpicture} +\end{example} + +\subsection{Predefined Tiles: Penrose} + +The sublibrary \Verb+tilings.penrose+ defines a slew of tiles based on Penrose tilings. + +\tikzset{ + every tile pic/.style={draw,ultra thick}, + every circle arc/.style={draw,thin}, + every long arc/.style={draw,thin}, +} + +\begin{itemize} +\item kite \tikz[baseline=-.5ex] \pic[draw,kite]; +\item dart \tikz[baseline=-.5ex] \pic[draw,dart]; +\item thin rhombus \tikz[baseline=-.5ex] \pic[draw,thin rhombus]; +\item thick rhombus \tikz[baseline=-.5ex] \pic[draw,thick rhombus]; +\item pentagon \(2\), \(3\), and \(5\) \tikz[baseline=-.5ex] \pic[draw, pentagon 5]; +The number signifies how many pentagons it goes next to. +\item pentagram \tikz[baseline=-.5ex] \pic[draw, pentagram]; +\item boat \tikz[baseline=-.5ex] \pic[draw, boat]; +\item diamond \tikz[baseline=-.5ex] \pic[draw, diamond]; +\item golden triangle \tikz[baseline=-.5ex] \pic[draw,golden triangle]; +\item reverse golden triangle \tikz[baseline=-.5ex] \pic[draw,reverse golden triangle]; +\item golden gnomon \tikz[baseline=-.5ex] \pic[draw,golden gnomon]; +\item reverse golden gnomon \tikz[baseline=-.5ex] \pic[draw,reverse golden gnomon]; +\end{itemize} + +The main tiles can have arcs drawn on them to illustrate the matching rules. +The triangles and gnomon are not true Penrose tiles but rather can be used to build tilings so they do not have the arcs. +The two types of each triangle and gnomon are actually different in that they have different matching rules. +This is best illustrated by deforming the paths (see Section~\ref{sec:pathdeform}). + +The edge labelling is as follows. +For the \Verb+pentagon 5+, for example, the edges are all the same and the numbers are used to distinguish between them. + +\begin{multicols}{2} + +\foreach \tile/\edges in { + kite/{a,A,c,C}, + dart/{a,A,c,C}, + thin rhombus/{a,A,b,B}, + thick rhombus/{a,A,b,B}, + pentagon 5/{a1,a2,a3,a4,a5}, + pentagon 3/{A,b1,a1,a2,b2}, + pentagon 2/{d,A1,e,c,A2}, + pentagram/{C1,E1,C2,E2,C3,E3,C4,E4,C5,E5}, + boat/{C1,E1,C2,E2,B1,D,B2}, + diamond/{D1,B1,B2,D2}, + golden triangle/{a,b,c}, + reverse golden triangle/{A,B,C}, + golden gnomon/{A,b,C}, + reverse golden gnomon/{a,B,c}} { + +\begin{tikzpicture} +\pic[draw,\tile,name=tile]; +\foreach \e in \edges { + \path (tile-edge \e\space start) -- node[fill=white,fill opacity=.5,text opacity=1] {\e} (tile-edge \e\space end); +} +\end{tikzpicture} + +} + +\end{multicols} + +\subsection{Predefined Tiles: Polykite} + +The sublibrary \Verb+tilings.polykite+ defines a slew of tiles based on the aperiodical polykite tilings as described in \href{https://arxiv.org/abs/2303.10798}{An Aperiodic Monotile} and \href{https://arxiv.org/abs/2305.17743}{A Chiral Aperiodic Monotile}. +It also defines a wrapper around the \Verb+\DefineTile+ command for creating one of the family of polykite tiles described in that article: + +\begin{verbatim} +\DefinePolykiteTile{<name>}{<a>}{<b>} +\DefinePolykiteTile*{<name>}{<a>}{<b>} +\DefinePolykiteTile{aperiodical hat}{sqrt(3)/2}{1/2} +\end{verbatim} + +The polykite tiles have two types of edge corresponding to the two lengths. +The starred option swaps the labels on these edges so that, for example, the hat and turtle tiles can be used in the same diagram. +Predefined polykite tiles are the \texttt{aperiodical hat}, \texttt{aperiodical turtle}, \texttt{spectral hat}, and \texttt{spectral turtle}. +The aperiodical versions can be swapped in for each other as they have the same edge labelling but the spectral versions have the opposite. +(In actual fact, the aperiodical and spectral hats are the same.) + +The equilateral polykite tile also exists as a \texttt{spectre} with alternating edge matching, as in the second paper \href{https://arxiv.org/abs/2305.17743}{A Chiral Aperiodic Monotile}. + +\begin{itemize} +\item Aperiodical Hat \tikz[baseline=-.5ex] \pic[draw,aperiodical hat]; +\item Aperiodical Turtle \tikz[baseline=-.5ex] \pic[draw,aperiodical turtle]; +\item Spectral Hat \tikz[baseline=-.5ex] \pic[draw,spectral hat]; +\item Spectral Turtle \tikz[baseline=-.5ex] \pic[draw,spectral turtle]; +\item Spectre \tikz[baseline=-.5ex] \pic[draw,spectre]; +\item Meta Cluster H \tikz[baseline=-.5ex] \pic[scale=.5,draw,meta cluster H]; +\item Meta Cluster F \tikz[baseline=-.5ex] \pic[scale=.5,draw,meta cluster F]; +\item Meta Cluster T \tikz[baseline=-.5ex] \pic[scale=.5,draw,meta cluster T]; +\item Meta Cluster P \tikz[baseline=-.5ex] \pic[scale=.5,draw,meta cluster P]; +\item Super Cluster H \tikz[baseline=-.5ex] \pic[scale=.3,draw,super cluster H]; +\item Super Cluster F \tikz[baseline=-.5ex] \pic[scale=.3,draw,super cluster F]; +\item Super Cluster T \tikz[baseline=-.5ex] \pic[scale=.3,draw,super cluster T]; +\item Super Cluster P \tikz[baseline=-.5ex] \pic[scale=.3,draw,super cluster P]; +\item Subcluster H \tikz[baseline=-.5ex] \pic[scale=.5,draw,subcluster H]; +\item Subcluster F \tikz[baseline=-.5ex] \pic[scale=.5,draw,subcluster F]; +\item Subcluster T \tikz[baseline=-.5ex] \pic[scale=.5,draw,subcluster T]; +\item Subcluster P \tikz[baseline=-.5ex] \pic[scale=.5,draw,subcluster P]; +\end{itemize} + +The edges of the meta and super cluster tiles are actually multi-edges for the matching rules. + +The subcluster tiles are a bit different to the others. +The \(H\) and \(T\) tiles are actually equilateral triangles but they have edge deformations applied by default so that they have the appearance of the aperiodical hat tile. +The \(P\) and \(F\) tiles have no area (so are not clipped by default) which means that the edge labels aren't fully clear as to which side they are on. +They match the diagrams given in the \href{https://arxiv.org/abs/2303.10798}{paper}, with the \(L\) sides being the sides labelled \(11\) and \(12\). + +\begin{multicols}{2} + +\tikzset{ + every super cluster scope/.style={ + scale=.3 + }, + every super cluster T scope/.style={every super cluster scope}, + every super cluster P scope/.style={every super cluster scope}, + every super cluster F scope/.style={every super cluster scope}, + every super cluster H scope/.style={every super cluster scope}, + every meta cluster scope/.style={ + scale=.7 + }, + every meta cluster T scope/.style={every meta cluster scope}, + every meta cluster P scope/.style={every meta cluster scope}, + every meta cluster F scope/.style={every meta cluster scope}, + every meta cluster H scope/.style={every meta cluster scope}, +} + +\foreach \tile/\edges in { + aperiodical hat/{11,21,22,23,24,12,13,25,26,14,15,27,28,16}, + aperiodical turtle/{11,21,22,23,24,12,13,25,26,14,15,27,28,16}, + spectral hat/{11,21,22,23,24,12,13,25,26,14,15,27,28,16}, + spectral turtle/{11,21,22,23,24,12,13,25,26,14,15,17,18,16}, + spectre/{a1,a2,a3,a4,a5,a6,a7,A1,A2,A3,A4,A5,A6,A7}, + meta cluster T/{A1,A2,b}, + meta cluster P/{A, 11, D1, d1, b, 12, D2, d2}, + meta cluster F/{11, D1, c, C, d1, b, 12, D2, d2}, + meta cluster H/{a, D1, d1, B1, D2, d2, B2, D3, d3}, + super cluster T/{A1,A2,b}, + super cluster P/{A, 11, D1, d1, b, 12, D2, d2}, + super cluster F/{11, D1, c, C, d1, b, 12, D2, d2}, + super cluster H/{a, D1, d1, B1, D2, d2, B2, D3, d3}, + subcluster T/{A1,A2,b}, + subcluster H/{B1,B2,a}, + subcluster P/{11, A, 12, b}, + subcluster F/{11, 12, F, f, b}% +}{ +\begin{tikzpicture} +\pic[draw,\tile,name=tile]; +\foreach \e in \edges { + \path (tile-edge \e\space start) -- node[fill=white,fill opacity=.5,text opacity=1] {\e} (tile-edge \e\space end); +} +\end{tikzpicture} + +} + +\end{multicols} + + +\section{Using the Tiles} + +\subsection{Positioning} + +The main way to use the tiles is via the \Verb+pic+ syntax that was introduced in TikZ3.0. +These are mini-drawings that are node-like in style, but a little more geared towards repeatable \emph{drawings} than boxes containing text. + +There are two ways in TikZ to specify the \Verb+pic+ type: either as the ``contents'' of the pic or as the argument to the \Verb+pic type+ key. +Each of the tiles comes with a shorthand key which specifies the \Verb+pic type+ and also invokes the keys \Verb+every tile pic+ and \Verb+every <tile type> pic+. +That is, the key \Verb+dart+ calls the \Verb+every tile pic+ and \Verb+every dart pic+ keys and specifies the \Verb+pic type+ as \Verb+dart+. + +The tiles can be placed using standard TikZ methods. +One important thing to note is that by default, \Verb+pic+s are like \Verb+nodes+ in that they only respond to ambient translations, and not to rotations and scaling. +To make them notice this, use the key \Verb+transform shape+ or specify the transformation to the \Verb+pic+ directly. +If the shortcut keys are used to specify the tiles, this can be put in the \Verb+every tile pic+ style. + +TikZ \Verb+pic+s can be named, using the \Verb+name=<name>+ key or using the \Verb+(name)+ syntax (see the TikZ documentation for more details). +When a tile has been named then it can be used for positioning other tiles. +Each edge is assigned a label and a new tile can be aligned with an old one along a matching edge (\Verb+a+ matches with \Verb+A+ and so on). + +To align a tile with an existing one, use the following key: +% +\begin{verbatim} +align with=<tile> along <edge> +\end{verbatim} +% +where \Verb+<tile>+ is the name given to an existing tile, and \Verb+<edge>+ is the label on the existing tile. +If the tile being placed has edges that are identical (for example, \Verb+pentagon 5+), this syntax extends to +% +\begin{verbatim} +align with=<tile> along <edge> using <number> +\end{verbatim} +% +to specify which of the edges on the new tile to use. + +Lastly, it is possible to reflect a tile either in use or in definition in which case the edges might be backwards so the key can be modified with the word \Verb+back+ as in: +% +\begin{verbatim} +align with=<tile> back along <edge> +\end{verbatim} +% +and similarly with \Verb+using ...+. + +A similar key can be used to place the tile so that an edge starts and ends at specified coordinates: +% +\begin{verbatim} +align between=<coordinate> and <coordinate> using <edge> +\end{verbatim} +% +Here, the \Verb+edge+ has to be specified in full since the start and end coordinates don't contain the information about which edge should stretch between them. +To obtain the equivalent of \Verb+back along+ then simply swap the coordinates. + +\begin{example} +\begin{tikzpicture} +\pic[kite,name=tile]; +\pic[dart,align with=tile along c]; +\pic[pentagon 5,name=ptile,at={(3,0)}]; +\pic[pentagon 3,align with=ptile along a1]; +\end{tikzpicture} +\end{example} + +With judicious use of loops, quite complicated pictures can be rendered using simple code. +(Note that the \Verb+transform shape+ is \emph{not} needed to apply the transformations needed to place a tile using this syntax.) + +\begin{example} +\begin{tikzpicture}[ + every rhombus/.style={ + draw=black, + ultra thick, + }, + every thin rhombus/.style={ + every rhombus/.try, + fill=thinRhombus, + }, + every thick rhombus/.style={ + every rhombus/.try, + fill=thickRhombus, + }, + every circle arc/.style={ + draw=circleArc + }, + every long arc/.style={ + draw=longArc + } +] +\pic[rotate=18,thick rhombus,name=a0]; +\foreach[evaluate=\k as \kmo using int(\k-1)] \k in {1,...,4} +{ + \pic[thick rhombus,name=a\k,align with={a\kmo} along A]; +} +\foreach \k in {0,...,4} +{ + \pic[thin rhombus,name=b\k,align with={a\k} along B]; + \pic[thick rhombus,name=c\k,align with={b\k} along A]; + \pic[thick rhombus,name=d\k,align with={b\k} along a]; + \pic[thick rhombus,name=e\k,align with={c\k} along A]; + \foreach \l/\a in {{0/b},{1/B}} + \pic[thin rhombus,name=f\k\l,align with={e\k} along \a]; +} +\pic[thin rhombus,name=g0,align with={f10} along a]; +\pic[thin rhombus,name=g1,align with={f21} along A]; +\foreach \l/\a in {{0/a},{1/A}} + \pic[thick rhombus,name=h\l,align with={g\l} along \a]; +\pic[thick rhombus,name=i,align with=g0 along B]; +\foreach \l/\a in {{0/a},{1/A}} + \pic[thick rhombus,name=j\l,align with=i along \a]; +\end{tikzpicture} +\end{example} + +\subsection{Styling} + +The tiles can be styled, either directly or using various keys. +When a tile is placed then there are various actions that happen with associated keys. +The actions and keys are: +% +\begin{enumerate} +\item A scope is started and the following keys are tried. +% +\begin{enumerate} +\item \Verb+every tile scope+ +\item \Verb+every <name> scope+ where \Verb+name+ is the tile name (not the pic name) +\item \Verb+this tile scope+ +\end{enumerate} + +\item The tile path is used with the intention of it being a clipping path. +The keys for this action are: +% +\begin{enumerate} +\item \Verb+every tile clip+ by default this is set to \Verb+clip+ +\item \Verb+every <name> clip+ +\item \Verb+this tile clip+ +\end{enumerate} + +\item A set of keys are used to allow arbitrary code to be executed before the tile path is rendered. +These are: + +\begin{enumerate} +\item \Verb+every tile before path+ +\item \Verb+every <name> before path+ +\item \Verb+this tile before path+ +\end{enumerate} + +\item The tile path is rendered. +The keys for this action are: +% +\begin{enumerate} +\item \Verb+every tile+ +\item \Verb+every <name>+ +\item \Verb+this tile+ +\item \Verb+pic actions+ +\end{enumerate} + +\item A set of keys are used to allow arbitrary code to be executed after the tile path is rendered. +These are: + +\begin{enumerate} +\item \Verb+every tile after path+ +\item \Verb+every <name> after path+ +\item \Verb+this tile after path+ +\end{enumerate} +\end{enumerate} + + +The \Verb+pic actions+ are any actions given directly to the tile, as in \Verb+\pic[draw,thin rhombus];+. +The kite, dart, and rhombus tiles also have arcs drawn on them which are inserted via the \Verb+every <name> after path+ keys, and these are themselves styled ussing \Verb+every circle arc+ and \Verb+every long arc+. +The names come from the way the arcs look on the rhombus shapes. + +One other point is important to note about the tiles. +They are actually clipped against themselves. +This ensures that the tiles do not overstep their bounds and so when placed alongside each other then they do not go over each other. +In practical terms, this means that if drawn then the line width is half that which might be expected (but when placed next to another tile, the two halves combine to the expected width). + +\subsection{Placing Tiles Automatically} + +There is a way to specify certain tilings using \emph{Lindenmayer systems}. +In brief, this takes a seed pattern and successively applies \emph{substitution rules} which are meant to simulate replacing a tile by smaller versions of it (and others from the same set). +This is implemented for the Penrose tiles and the various clusters related to the aperiodical polykite tile. + +The Penrose rules are \emph{positional} in that when replacing a Penrose tile by smaller versions of it the new tiles can be placed solely based on information about the position and orientation of the original tile. +This is true also for the \emph{super cluster} tiles of the aperiodical polykite, but not for the meta cluster or subclusters. + +The meta and subclusters work on a different system. +The structure that is built up is that of a \emph{tree} with a root tile. +That root tile is positioned, and then the other tiles are placed next to previously placed tiles. +This is a slower process and can mean that the overall shape is different to what might be expected, but from the user's perspective it is the same. + +The user command is one of: +% +\begin{verbatim} +\TilingDecomposition{<type>}{<level>}{<seed>} +\pic{decomposition={<type>}{<level>}{<seed>}}; +\end{verbatim} +% +where \Verb+<type>+ is one of: +% +\begin{itemize} +\item \Verb+kite+ for the kite and dart tiling, +\item \Verb+rhombus+ for the rhombus tiling, +\item \Verb+pentagon+ for the pentagon tiling. +\item \Verb+ktriangle+ for the triangular decomposition used to form the kite and dart tiling but with the individual triangles +\item \Verb+rtriangle+ for the triangular decomposition used to form the rhombus tiling but with the individual triangles. +\item \Verb+supercluster+ for the super cluster substitution system that works on a positional basis. +\item \Verb+cluster+ for the cluster substitution system that uses the neighbour information. +The choice of super, meta, or subcluster is determined by the value of the key \Verb!cluster type!. +\end{itemize} + +The \Verb+<seed>+ is a ``word'' that will be used to initiate the Lindenmayer system. +The key letters in the alphabet for the kite/darts and rhombuses are \Verb+T+, \Verb+t+, \Verb+G+, and \Verb+g+. +These actually correspond to the two triangles and two gnomons. +For the pentagons, the key letters are \Verb+P+, \Verb+Q+, \Verb+R+, \Verb+G+, \Verb+B+, \Verb+D+. +These correspond to the three pentagons, the pentagram, the boat, and the diamond. +For the clusters, the key letters are \Verb+H+, \Verb+T+, \Verb+P+, and \Verb+F+. +Other permitted letters are \Verb+[+, \Verb+]+, \Verb+s+, \Verb+f+, \Verb!+!, \Verb+*+, \Verb+-+, \Verb+_+, \Verb+>+. +These refer to various transformations (for details, see the implementation). + +The \Verb+<level>+ controls how far to take the iteration. +The code is not particularly optimised for speed, and once \Verb+<level>+ gets to about \(5\) or \(6\) then we are at the ``make a cup of tea while compiling'' stage, depending on the processor. + +\begin{example} +\begin{tikzpicture}[ + every tile/.style={draw}, + tiling step=2cm, +] +\TilingDecomposition{kite}{0}{T} +\end{tikzpicture} +\end{example} + +The two types of substitution rules -- positional and neighbourly -- are rendered slightly differently. +The positional tiles are drawn directly but the neighbour ones are drawn via the \Verb!\pic! mechanism. +This is to exploit the existing code for aligning against existing tiles. +This means that the \Verb!\pic! styling options are available for the latter type of decomposition but not for the former. +For the former, only the following keys are used: + +\begin{verbatim} +every tile +every <tile type> +\end{verbatim} + +There are, however, some additional styles which allow styling the tiles by their number: a count is kept of the number of tiles and each tile knows its own number. +Specifically, two keys are tried: +% +\begin{enumerate} +\item \Verb+tile <number>+, and +\item \Verb+tile={<number>}{<total>}+ +\end{enumerate} +% +A word of warning is in order on the second of these. +The \Verb+<total>+ is not guaranteed to be correct. +It is done by a quick count at the start of the process and counts those letters which \emph{might} result in a rendered tile. +Not every letter in the resulting word actually does. +Nevertheless, this can be used to style a tile based on what proportion of tiles have been rendered. + +Lastly, \Verb+tiling step+ is used to control the size of the resulting picture. + +\begin{example} +\begin{tikzpicture}[ + every tile/.style={draw}, + tiling step=4cm, + tile/.code 2 args={ + \pgfmathsetmacro\tint{100*#1/#2} + \pgfkeysalso{fill=black!\tint} + } +] +\TilingDecomposition{rhombus}{3}{T} +\end{tikzpicture} +\end{example} + +Here's the super, meta, and subcluster combinatorial decompositions. +These decompositions also define a style \Verb!first tile! which is applied to the initial tile (that isn't placed next to an existing tile). + +\begin{example} +\begin{tikzpicture}[ + every tile/.style={draw}, + first tile/.style={ + transform shape + }, +] + +\TilingDecomposition[scale=.25,cluster type=super cluster]{cluster}{1}{H} +\TilingDecomposition[xshift=3cm,scale=.5,cluster type=meta cluster]{cluster}{1}{H} +\TilingDecomposition[xshift=5cm,cluster type=subcluster]{cluster}{1}{H} +\end{tikzpicture} +\end{example} + +Here is a subcluster decomposition showing just the \(F_0\) and \(P_0\) tiles. + +\begin{example} +\begin{tikzpicture}[ + every tile/.style={}, + every tile pic/.style={}, + every subcluster F/.style={draw=magenta, ultra thin}, + every subcluster P/.style={draw=magenta, ultra thin}, +] +\pic[ + first tile/.style={transform shape}, + cluster type=subcluster, + scale=3 +] {decomposition={cluster}{3}{H}}; +\end{tikzpicture} +\end{example} + + +\section{Deforming Paths} +\label{sec:pathdeform} + +This package provides the ability to deform the edges of the tiles. +The tiles are built from labelled paths together with their reverses. +By changing these paths, one can get a wide variety of different tiles with the same fundamental matching rules. +Indeed, by using asymmetric paths, the matching rules can be enforced without the need for additional decoration. + +Internally, the \Verb+tiling+ library uses the \Verb+spath3+ package for storing and manipulating the paths. + +To create a new edge path, use the key \Verb+save tiling path=<edge>+ where \Verb+<edge>+ is a symbol used in the edge description of a tile. +There are no constraints on the size of the path as all paths are scaled and transformed to fit the tiles. +Once the edge paths have been specified, they are welded together into the tiles using the following command: +% +\begin{verbatim} +\BakeTile{<name>} +\end{verbatim} +% +Here, \Verb+<name>+ is one of the names of the tiles. +This has global effect, as does the definition of the edge paths. +Paths, both sides and tiles, can be cloned via: +% +\begin{verbatim} +\tikzset{clone tiling side path={target}{source}} +\tikzset{clone tile path={target}{source}} +\end{verbatim} +% +and restored with the same command (but names switched). + +\begin{example} +\begin{tikzpicture} +\pic[draw,dart,name=dart]; +\pic[draw,kite,align with=dart along c]; +\pic[draw,kite,align with=dart along C]; +\tikzset{clone tile path={original kite}{kite}} +\tikzset{clone tile path={original dart}{dart}} +\path[save tiling path=a] (0,0) to[out=-30,in=100] (1,0); +\path[save tiling path=c] (0,0) to[out=-40,in=140] (1,0); +\BakeTile{kite} +\BakeTile{dart} +\pic[xshift=2cm,draw,dart,name=dart]; +\pic[draw,kite,align with=dart along c]; +\pic[draw,kite,align with=dart along C]; +\tikzset{clone tile path={kite}{original kite}} +\tikzset{clone tile path={dart}{original dart}} +\pic[xshift=4cm,draw,dart,name=dart]; +\pic[draw,kite,align with=dart along c]; +\pic[draw,kite,align with=dart along C]; +\end{tikzpicture} +\end{example} + +With deformed tiles there is no guarantee that the inner arcs on the Penrose tiles will match up perfectly. + +Note that the subcluster tiles from the polykite subpackage are actually already deformed tiles. + +\begin{example} +\begin{tikzpicture}[ + every subcluster F/.style={draw, ultra thick}, + every subcluster P/.style={draw, thick}, + every subcluster H/.style={draw, fill, fill opacity=.5} +] +\pic[subcluster F, name=F1, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along 12 using 1, name=F2, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along 11 using 2, name=F3, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along F,name=F1-2]; +\pic[subcluster F, align with=F1 along f,name=F1-3]; +\pic[subcluster F, align with=F2 along F,name=F2-2]; +\pic[subcluster F, align with=F2 along f,name=F2-3]; +\pic[subcluster F, align with=F3 along F,name=F3-2]; +\pic[subcluster F, align with=F3 along f,name=F3-3]; +\pic[subcluster H, align with=F1 along b using 2, fill=red]; +\pic[subcluster H, align with=F2 along b using 2, fill=green]; +\pic[subcluster H, align with=F3 along b using 2, fill=blue]; +\pic[subcluster H, align with=F1-2 along b using 1, fill=yellow]; +\pic[subcluster H, align with=F2-2 along b using 1, fill=cyan]; +\pic[subcluster H, align with=F3-2 along b using 1, fill=magenta]; +\end{tikzpicture} +\end{example} + +\begin{example} +\begin{tikzpicture}[ + every tile pic/.style={}, +% every subcluster F/.style={draw, ultra thick}, +% every subcluster P/.style={draw, thick}, + every subcluster H/.style={draw, fill, fill opacity=.5} +] +\path[save tiling path=a] (0,0) -- (1,0); +\path[save tiling path=b] (0,0) -- (1,0); +\path[save tiling path=f] (0,0) -- (1,0); +\BakeTile{subcluster H} +\BakeTile{subcluster T} +\BakeTile{subcluster P} +\BakeTile{subcluster F} + +\pic[subcluster F, name=F1, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along 12 using 1, name=F2, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along 11 using 2, name=F3, this tile/.style={line width=1mm}]; +\pic[subcluster F, align with=F1 along F,name=F1-2]; +\pic[subcluster F, align with=F1 along f,name=F1-3]; +\pic[subcluster F, align with=F2 along F,name=F2-2]; +\pic[subcluster F, align with=F2 along f,name=F2-3]; +\pic[subcluster F, align with=F3 along F,name=F3-2]; +\pic[subcluster F, align with=F3 along f,name=F3-3]; +\pic[subcluster H, align with=F1 along b using 2, fill=red]; +\pic[subcluster H, align with=F2 along b using 2, fill=green]; +\pic[subcluster H, align with=F3 along b using 2, fill=blue]; +\pic[subcluster H, align with=F1-2 along b using 1, fill=yellow]; +\pic[subcluster H, align with=F2-2 along b using 1, fill=cyan]; +\pic[subcluster H, align with=F3-2 along b using 1, fill=magenta]; +\end{tikzpicture} +\end{example} + +The spectre tile, from \href{https://arxiv.org/abs/2305.17743}{A Chiral Aperiodic Monotile}, is a natural for deformation as that can be used to force aperiodicity. + +\begin{example} +\begin{tikzpicture}[ + every spectre/.style={ + draw, + thick, + }, + every tile pic/.style={scale=.5,rotate=105}, +] +\pic[spectre]; +\path[save tiling path=a] (0,0) to[out=30,in=150] (1,0); +\BakeTile{spectre} +\pic[spectre,at={(3,0)}]; +\path[save tiling path=a] (0,0) to[out=30,in=210] (1,0); +\BakeTile{spectre} +\pic[spectre,at={(6,0)}]; +\path[save tiling path=a] (0,0) .. controls +(30:1) and +(210:.75) .. (1,0); +\BakeTile{spectre} +\pic[spectre,at={(9,0)}]; +\end{tikzpicture} +\end{example} + +\section{More Examples} + +Let's set some aesthetically pleasing shapes. +Note that I'm using the TikZ \Verb!external! library in creating this document so to deform the paths in the examples I need to add the deformation code to every picture (otherwise the externalisation skips it). +I've saved it into a key \Verb!deform tiles! to avoid overwhelming the example code. +In a document without externalisation then adding the following code will achieve the same effect. + +\begin{justexample} +\begin{tikzpicture} +\path[save tiling path=a] (0,0) to[out=-30,in=100] (1,0); +\path[save tiling path=b] (0,0) to[out=0,in=140] (1,0); +\path[save tiling path=c] (0,0) to[out=-40,in=140] (1,0); +\BakeTile{thin rhombus} +\BakeTile{thick rhombus} +\BakeTile{golden triangle} +\BakeTile{reverse golden triangle} +\BakeTile{golden gnomon} +\BakeTile{reverse golden gnomon} +\BakeTile{kite} +\BakeTile{dart} +\end{tikzpicture} +\end{justexample} + +\tikzset{ + deform tiles/.code={% + \path[save tiling path=a] (0,0) to[out=-30,in=100] (1,0); + \path[save tiling path=b] (0,0) to[out=0,in=140] (1,0); + \path[save tiling path=c] (0,0) to[out=-40,in=140] (1,0); + \BakeTile{thin rhombus} + \BakeTile{thick rhombus} + \BakeTile{golden triangle} + \BakeTile{reverse golden triangle} + \BakeTile{golden gnomon} + \BakeTile{reverse golden gnomon} + \BakeTile{kite} + \BakeTile{dart} + } +} + +Styling the first tile. +Note that as the pattern is formed by repeating two different initial seeds \(5\) times, there are \(10\) ``first tiles'' in each overall pattern. + +\begin{example} +\begin{tikzpicture}[ + deform tiles/.try, + every tile/.style={draw}, + tile 1/.style={fill=yellow}, +] +\foreach \tp/\pos in {rhombus/0cm,rtriangle/2.5cm,kite/5cm,ktriangle/7.5cm} +{ +\begin{scope}[xshift=\pos] +\foreach[evaluate=\k as \mk using {\k+Mod(\k,2)},evaluate=\k as \ax using {Mod(\k,2) == 0 ? "T" : "t"}] \k in {0,...,9} { + \begin{scope}[rotate=\mk*36] + \TilingDecomposition{\tp}{1}{\ax} + \end{scope} +} +\end{scope} +} +\end{tikzpicture} +\end{example} + + + +A more detailed decomposition, with more and more tinting applied to each tile. +Roughly half of the counted tiles are rendered, and the ordering in which they are rendered is not at first an obvious one (though it is in general from ``outside in''). + +Note that the key \Verb+tint fill colour+ is not a TikZ native. +It is defined as: + +\begin{verbatim} +\makeatletter +\tikzset{ + tint fill colour/.code={% + \edef\@temp{% + \def\noexpand\tikz@fillcolor{\tikz@fillcolor!#1}% + \noexpand\tikz@addoption{% + \noexpand\pgfsetfillcolor{\tikz@fillcolor!#1}% + }% + }% + \@temp + } +} +\makeatother +\end{verbatim} + +\begin{example} +\begin{tikzpicture}[ + deform tiles/.try, + every tile/.style={draw}, + every kite/.style={fill=reverseGoldenTriangle}, + every dart/.style={fill=goldenTriangle}, + tile/.code 2 args={ + \pgfmathsetmacro\tint{100*(1 - 1.5*#1/#2))} + \pgfkeysalso{tint fill colour=\tint} + } +] +\foreach[evaluate=\k as \mk using {\k+Mod(\k,2)},evaluate=\k as \ax using {Mod(\k,2) == 0 ? "T" : "t"}] \k in {0,...,9} { + \begin{scope}[rotate=\mk*36] + \TilingDecomposition[tiling step=5cm]{kite}{4}{\ax} + \end{scope} +} +\end{tikzpicture} +\end{example} + +An example with ``manual placement''. + +\begin{example} +\begin{tikzpicture}[ + deform tiles/.try, + every tile/.style={ + draw=black, + ultra thick, + }, + every kite/.style={ + fill=kite, + }, + every dart/.style={ + fill=dart, + }, + every circle arc/.style={ + draw=circleArc + }, + every long arc/.style={ + draw=longArc + } +] +\pic[dart,name=a0]; +\foreach[evaluate=\k as \kmo using int(\k-1)] \k in {1,...,4} { + \pic[dart,name=a\k,align with={a\kmo} along a]; +} +\foreach \k in {0,...,4} { + \foreach \l/\e/\ee in {0/c/a,1/C/A} { + \pic[kite,name=b\l\k,align with={a\k} along \e]; + \pic[dart,name=c\l\k,align with={b\l\k} along \ee]; + \pic[kite,name=d\l\k,align with={c\l\k} along \e]; + } + \pic[kite,name=e\k,align with={c0\k} along C]; + \pic[dart,name=f\k,align with={c0\k} along a]; + \foreach \e in {c,C} { + \pic[kite,name=g\k,align with={f\k} along \e]; + } +} +\end{tikzpicture} +\end{example} + + +The decomposition rules for the Lindenmayer system can be illustrated by drawing each tile together with the result of one decomposition superimposed on top. + +\begin{example} +\foreach \ax in {T,t,G,g} { + +\begin{tikzpicture}[ + deform tiles/.try, +] +\foreach \tp/\pos in {rhombus/0cm,rtriangle/2cm,kite/4cm,ktriangle/6cm} +{ +\begin{scope}[xshift=\pos] + \TilingDecomposition[every path/.style={draw=red,ultra thick}]{\tp}{0}{\ax} + \TilingDecomposition[every path/.style={fill=gray!50,fill opacity=.5,draw=black}]{\tp}{1}{\ax} +\end{scope} +} +\end{tikzpicture} + +} +\end{example} + +The tiles can make interesting forms by themselves. + +\begin{example} +\begin{tikzpicture}[ + deform tiles/.try, + scale=2, + every tile pic/.style={ + transform shape, + }, + every golden triangle/.style={ + draw=black, + ultra thick, + fill=goldenTriangle, + }, + every reverse golden triangle/.style={ + draw=black, + ultra thick, + fill=reverseGoldenTriangle, + }, + every golden gnomon/.style={ + draw=black, + ultra thick, + fill=goldenGnomon, + }, + every reverse golden gnomon/.style={ + draw=black, + ultra thick, + fill=reverseGoldenGnomon, + }, +] +\pic[golden triangle,name=a]; +\pic[reverse golden triangle,align with=a along a]; +\pic[reverse golden triangle,align with=a along b]; +\pic[reverse golden triangle,align with=a along c]; +\begin{scope}[xshift=2cm] +\pic[reverse golden triangle,name=a]; +\pic[golden triangle,align with=a along A]; +\pic[golden triangle,align with=a along B]; +\pic[golden triangle,align with=a along C]; +\end{scope} +\begin{scope}[yshift=-3cm] +\pic[golden gnomon,name=a]; +\pic[reverse golden gnomon,align with=a along C]; +\pic[reverse golden gnomon,align with=a along b]; +\pic[reverse golden gnomon,align with=a along A]; +\begin{scope}[xshift=2cm] +\pic[reverse golden gnomon,name=a]; +\pic[golden gnomon,align with=a along c]; +\pic[golden gnomon,align with=a along B]; +\pic[golden gnomon,align with=a along a]; +\end{scope} +\end{scope} +\end{tikzpicture} +\end{example} + +\begin{example} +\begin{tikzpicture}[ + deform tiles/.try, + every rhombus/.style={ + draw=black, + ultra thick, + }, + every thin rhombus/.style={ + every rhombus/.try, + fill=thinRhombus, + }, + every thick rhombus/.style={ + every rhombus/.try, + fill=thickRhombus, + }, + every circle arc/.style={ + draw=circleArc + }, + every long arc/.style={ + draw=longArc + } +] +\pic[rotate=18,thick rhombus,name=a0]; +\foreach[evaluate=\k as \kmo using int(\k-1)] \k in {1,...,4} +{ + \pic[thick rhombus,name=a\k,align with={a\kmo} along A]; +} +\foreach \k in {0,...,4} +{ + \pic[thin rhombus,name=b\k,align with={a\k} along B]; + \pic[thick rhombus,name=c\k,align with={b\k} along A]; + \pic[thick rhombus,name=d\k,align with={b\k} along a]; + \pic[thick rhombus,name=e\k,align with={c\k} along A]; + \foreach \l/\a in {{0/b},{1/B}} + \pic[thin rhombus,name=f\k\l,align with={e\k} along \a]; +} +\pic[thin rhombus,name=g0,align with={f10} along a]; +\pic[thin rhombus,name=g1,align with={f21} along A]; +\foreach \l/\a in {{0/a},{1/A}} + \pic[thick rhombus,name=h\l,align with={g\l} along \a]; +\pic[thick rhombus,name=i,align with=g0 along B]; +\foreach \l/\a in {{0/a},{1/A}} + \pic[thick rhombus,name=j\l,align with=i along \a]; +\end{tikzpicture} +\end{example} + +Lastly, here's an example that generates full page patterns. + +\begin{justexample} +\foreach \tp/\lvl in {rhombus/5,rhombus/6,kite/5,kite/6} +{ +\tikzset{external/export next=false} +\begin{tikzpicture}[ + every tile/.style={draw}, + remember picture, + overlay, + scale=20 +] +\coordinate (a) at (current page.center); +\begin{scope}[shift={(a)}] +\foreach[evaluate=\k as \mk using {\k+Mod(\k,2)},evaluate=\k as \ax using {Mod(\k,2) == 0 ? "T" : "t"}] \k in {0,...,9} { + \begin{scope}[rotate=\mk*36] + \TilingDecomposition{\tp}{\lvl}{\ax} + \end{scope} +} +\end{scope} +\end{tikzpicture} +\newpage +} +\end{justexample} +\end{document} + +\begin{tikzpicture} +\path[save tiling path=a] (0,0) -- (1,0); +\path[save tiling path=b] (0,0) -- (1,0); +\path[save tiling path=c] (0,0) -- (1,0); +\BakeTile{thin rhombus} +\BakeTile{thick rhombus} +\BakeTile{golden triangle} +\BakeTile{reverse golden triangle} +\BakeTile{golden gnomon} +\BakeTile{reverse golden gnomon} +\BakeTile{kite} +\BakeTile{dart} +\end{tikzpicture} + +\newpage + +\foreach \tp/\lvl in {rhombus/5,rhombus/6,kite/5,kite/6} +{ +\begin{tikzpicture}[ + every tile/.style={draw}, + remember picture, + overlay, + scale=20 +] +\coordinate (a) at (current page.center); +\begin{scope}[shift={(a)}] +\foreach[evaluate=\k as \mk using {\k+Mod(\k,2)},evaluate=\k as \ax using {Mod(\k,2) == 0 ? "T" : "t"}] \k in {0,...,9} { + \begin{scope}[rotate=\mk*36] + \TilingDecomposition{\tp}{\lvl}{\ax} + \end{scope} +} +\end{scope} +\end{tikzpicture} +\newpage +} + + + +%% \foreach \lvl in {5,6} +%% { +%% \begin{tikzpicture}[ +%% every tile/.style={draw}, +%% remember picture, +%% overlay, +%% scale=180 +%% ] +%% \coordinate (a) at (current page.center); +%% \TilingDecomposition{pentagon}{\lvl}{D} +%% \end{tikzpicture} +%% \newpage +%% } + + +\end{document} + +% Local Variables: +% tex-output-type: "pdf18" +% End: diff --git a/graphics/pgf/contrib/tilings/tilings_code.dtx b/graphics/pgf/contrib/tilings/tilings_code.dtx new file mode 100644 index 0000000000..f550e10d4d --- /dev/null +++ b/graphics/pgf/contrib/tilings/tilings_code.dtx @@ -0,0 +1,3780 @@ +% \iffalse meta-comment +%<*internal> +\iffalse +%</internal> +%<*readme> +---------------------------------------------------------------- +penrose --- TikZ library for producing tiling patterns +E-mail: loopspace@mathforge.org +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +---------------------------------------------------------------- + +This package is for the creation of Penrose and similar tilings. +%</readme> +%<*internal> +\fi +\def\nameofplainTeX{plain} +\ifx\fmtname\nameofplainTeX\else + \expandafter\begingroup +\fi +%</internal> +%<*install> +\input l3docstrip.tex +\keepsilent +\askforoverwritefalse +\preamble +---------------------------------------------------------------- +tilings --- TikZ library for producing tilings +E-mail: loopspace@mathforge.org +Released under the LaTeX Project Public License v1.3c or later +See http://www.latex-project.org/lppl.txt +---------------------------------------------------------------- + +\endpreamble +\postamble + +Copyright (C) 2014-2023 by Andrew Stacey <loopspace@mathforge.org> + +This work may be distributed and/or modified under the +conditions of the LaTeX Project Public License (LPPL), either +version 1.3c of this license or (at your option) any later +version. The latest version of this license is in the file: + +http://www.latex-project.org/lppl.txt + +This work is "maintained" (as per LPPL maintenance status) by +Andrew Stacey. + +This work consists of the files penrose_code.dtx + penrose.tex +and the derived files penrose.ins + penrose_code.pdf + penrose.pdf + tikzlibrarytilings.code.tex + tikzlibrarytilings.penrose.code.tex + tikzlibrarytilings.polykite.code.tex + tikzlibrarypenrose.code.tex + README.txt + +\endpostamble +\usedir{tex/latex/penrose} +\generate{ + \file{tikzlibrarytilings.code.tex}{\from{\jobname.dtx}{tilings}} +} +\generate{ + \file{tikzlibrarytilings.penrose.code.tex}{\from{\jobname.dtx}{penrose}} +} +\generate{ + \file{tikzlibrarytilings.polykite.code.tex}{\from{\jobname.dtx}{polykite}} +} +\generate{ + \file{tikzlibrarypenrose.code.tex}{\from{\jobname.dtx}{penrosedep}} +} +%</install> +%<install>\endbatchfile +%<*internal> +\usedir{source/latex/penrose} +\generate{ + \file{\jobname.ins}{\from{\jobname.dtx}{install}} +} +\nopreamble\nopostamble +\usedir{doc/latex/penrose} +\generate{ + \file{README.txt}{\from{\jobname.dtx}{readme}} +} +\ifx\fmtname\nameofplainTeX + \expandafter\endbatchfile +\else + \expandafter\endgroup +\fi +%</internal> +%<*driver> +\documentclass{l3doc} +\usepackage[scale=.8]{geometry} +\usepackage[T1]{fontenc} +\usepackage{lmodern} +\usepackage{tikz} +\usepackage{amsmath} +%\usepackage{trace} +\usetikzlibrary{penrose} +%\traceoff +%\usepackage[numbered]{hypdoc} +\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9} + +\usepackage{listings} +\lstloadlanguages{[LaTeX]TeX} +\lstset{breakatwhitespace=true,breaklines=true,language=TeX} + +\usepackage{fancyvrb} + +\newenvironment{example} + {\VerbatimEnvironment + \begin{VerbatimOut}[gobble=2]{example.out}} + {\end{VerbatimOut} + \begin{center} +% \setlength{\parindent}{0pt} + \fbox{\begin{minipage}{.9\linewidth} + \lstset{breakatwhitespace=true,breaklines=true,language=TeX,basicstyle=\small} + \lstinputlisting[]{example.out} + \end{minipage}} + + \fbox{\begin{minipage}{.9\linewidth} + \input{example.out} + \end{minipage}} +\end{center} +} +\EnableCrossrefs +\CodelineIndex +\RecordChanges +\begin{document} + \DocInput{\jobname.dtx} +\end{document} +%</driver> +% \fi +% +% \CheckSum{2944} +% +% \CharacterTable +% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% +% \changes{1.0}{2014/05/07}{Converted to DTX file} +% \changes{1.2}{2019/02/23}{Added general tile creation code} +% \changes{1.4}{2021/01/22}{Adapted to latest version of spath3} +% \changes{1.6}{2023/03/22}{Included aperiodical hat} +% \changes{1.8}{2023/05/11}{LMS systems for aperiodical tiles} +% \changes{2.0}{2023/06/01}{Major version change for CTAN} +% +% \DoNotIndex +% { +% \begingroup, +% \catcode, +% \active, +% \csname, +% \endcsname, +% }% +% +% +% \providecommand*{\url}{\texttt} +% \GetFileInfo{tikzlibrarytilings.code.tex} +% \title{The \textsf{Tilings} package: code} +% \author{Andrew Stacey\texorpdfstring{\\ \url{loopspace@mathforge.org}}{}} +% \date{\fileversion~from \filedate} +% +% +% \maketitle +% +% \tableofcontents +% +% \begin{documentation} +% +% \section{Introduction} +% +% This is a TikZ library for drawing tiles, such as Penrose tiles (kite/dart, rhombus, and pentagon versions) and the aperiodical polykite tiles. +% It provides two methods of drawing: one in which an automatic pattern is built, and one where the tiles can be placed ``by hand''. +% The tiles can be shaped and (hopefully!) still fit together. +% For full user documentation, see the \Verb+tilings.pdf+ file. +% +% +% \end{documentation} +% +% \begin{implementation} +% +% \section{Implementation} +% +% +% \iffalse +%<*tilings> +% \fi +% +% \begin{macrocode} +%<@@=tilings> +% \end{macrocode} +% +% \subsection{Initialisation} +% +% +% We use the \Verb+spath3+ library for manipulating the paths that will make up the tiles. +% +% \begin{macrocode} +\ProvidesExplFile + {tikzlibrarytilings.code.tex} + {2023/06/01} + {2.0} + {TikZ pics for tilings such as Penrose tiles} +\RequirePackage{tikz} +\usetikzlibrary{spath3} +% \end{macrocode} +% Now we move in to the realm of \LaTeX3. +% \begin{macrocode} +\ExplSyntaxOn +% \end{macrocode} +% +% Start with some basic paths (lines) for the sides of the tiles so that we know that we have well-defined tiles at the outset. +% These are globally defined as we will frequently want to define them in one tikzpicture and use them in another. +% +% \begin{macrocode} +\tl_new:N \g_@@_side_a_tl +\tl_new:N \g_@@_side_b_tl +\tl_new:N \g_@@_side_c_tl +\tl_new:N \g_@@_side_d_tl +\tl_new:N \g_@@_side_e_tl +\tl_new:N \g_@@_side_A_tl +\tl_new:N \g_@@_side_B_tl +\tl_new:N \g_@@_side_C_tl +\tl_new:N \g_@@_side_D_tl +\tl_new:N \g_@@_side_E_tl +\tl_new:c {g_@@_side_1_tl} +\tl_new:c {g_@@_side_2_tl} +\tl_new:c {g_@@_side_3_tl} +\tl_gset:Nn \g_@@_side_a_tl +{ + \pgfsyssoftpath@movetotoken{0pt}{0pt} + \pgfsyssoftpath@linetotoken{1pt}{0pt} +} +\tl_gset_eq:NN \g_@@_side_b_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_c_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_d_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_e_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_A_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_B_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_C_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_D_tl \g_@@_side_a_tl +\tl_gset_eq:NN \g_@@_side_E_tl \g_@@_side_a_tl +\tl_gset_eq:cN {g_@@_side_1_tl} \g_@@_side_a_tl +\tl_gset_eq:cN {g_@@_side_2_tl} \g_@@_side_a_tl +\tl_gset_eq:cN {g_@@_side_3_tl} \g_@@_side_a_tl +% \end{macrocode} +% +% \begin{variable}{\l_@@_tmpa_fp, \l_@@_tmpb_fp, \l_@@_tmpc_fp, \l_@@_saved_x_fp, \l_@@_saved_y_fp, \l_@@_tmpa_str, \l_@@_tmpb_str, \l_@@_tmpa_seq, \l_@@_tmpa_tl, \l_@@_tmpb_tl, \l_@@_tmpc_tl, \l_@@_tmpd_tl, \l_@@_tmpa_int, \l_@@_tmpb_int, \l_@@_xa_dim, \l_@@_ya_dim, \l_@@_xb_dim, \l_@@_yb_dim, \g_@@_xa_dim, \g_@@_ya_dim, \g_@@_xb_dim, \g_@@_yb_dim, \l_@@_tmpa_prop, \l_@@_cw_bool, \l_@@_update_saved_bool, \l_@@_relative_bool, \g_@@_output_tl} +% We need a few temporary variables to hold intermediate calculations. +% +% \begin{macrocode} +\fp_new:N \l_@@_tmpa_fp +\fp_new:N \l_@@_tmpb_fp +\fp_new:N \l_@@_tmpc_fp +\fp_new:N \l_@@_saved_x_fp +\fp_new:N \l_@@_saved_y_fp +\str_new:N \l_@@_tmpa_str +\str_new:N \l_@@_tmpb_str +\seq_new:N \l_@@_tmpa_seq +\tl_new:N \l_@@_tmpa_tl +\tl_new:N \l_@@_tmpb_tl +\tl_new:N \l_@@_tmpc_tl +\tl_new:N \l_@@_tmpd_tl +\tl_new:N \l_@@_tmp_tile_path_tl +\tl_new:N \l_@@_action_lms_tl +\tl_new:N \l_@@_parameters_lms_tl +\int_new:N \l_@@_tmpa_int +\int_new:N \l_@@_tmpb_int +\fp_new:N \l_@@_xa_fp +\fp_new:N \l_@@_ya_fp +\fp_new:N \l_@@_xb_fp +\fp_new:N \l_@@_yb_fp +\dim_new:N \l_@@_xa_dim +\dim_new:N \l_@@_ya_dim +\dim_new:N \l_@@_xb_dim +\dim_new:N \l_@@_yb_dim +\dim_new:N \g_@@_xa_dim +\dim_new:N \g_@@_ya_dim +\dim_new:N \g_@@_xb_dim +\dim_new:N \g_@@_yb_dim +\prop_new:N \l_@@_tmpa_prop +\bool_new:N \l_@@_cw_bool +\bool_new:N \l_@@_update_saved_bool +\bool_new:N \l_@@_relative_bool +\bool_new:N \l_@@_edge_bool +\str_const:Nn \c_@@_colon_str {:} +\str_const:Nn \c_@@_comma_str {,} +\fp_const:Nn \c_@@_cm_fp {\dim_to_fp:n {1cm}} +\tl_new:N \g_@@_output_tl +\fp_new:N \g_@@_output_a_fp +\fp_new:N \g_@@_output_b_fp +\prop_new:N \g_@@_tilenames_prop +\regex_const:Nn \c_@@_anchor_regex {\s\w+\Z} +\cs_generate_variant:Nn \seq_set_split:Nnn {NVV} +\cs_generate_variant:Nn \regex_extract_once:NnNTF {NVNTF} +\cs_generate_variant:Nn \tl_if_eq:nnT {nVT} +\cs_generate_variant:Nn \tl_if_in:NnT {NVT} +\cs_generate_variant:Nn \prop_item:Nn {cV} +\cs_generate_variant:Nn \tl_if_head_is_group_p:n {V} +% \end{macrocode} +% \end{variable} +% +% \subsection{Helpful Error Messages} +% +% \begin{macrocode} +\msg_new:nnn { tilings }{ not baked } +{ Tile~ #1~ has~ not~ been~ baked. } +\msg_new:nnn { tilings }{ no tile } +{ Tile~ #1~ has~ not~ been~ defined. } +\msg_new:nnn { tilings }{ no side } +{ Tile~ side~ #1~ has~ not~ been~ defined,~ using~ default. } +\msg_new:nnn { tilings }{ tile no edge } +{ Tile~ #1~ doesn't~ have~ an~ edge~ labelled~ #2; + ~ available~ edges~ are~ #3.} +\msg_new:nnn { tilings }{ no edge } +{ Either~ tile~ #1~ doesn't~ exist + ~ or~ it~ doesn't~ have~ an~ edge~ labelled~ #2.} +% \end{macrocode} +% +% \subsection{Creating the Tiles} +% +% \begin{macro}[internal]{\@@_normalise_path:Nn} +% When defining the path for a side, we normalise so that it starts at the origin and ends at \Verb+(1pt,0pt)+. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_normalise_path:Nn #1#2 +{ +% \end{macrocode} +% Get the initial point of the path and convert to floating point. +% \begin{macrocode} + \group_begin: + \spath_initialpoint:Nn \l_@@_tmpa_tl {#2} + \fp_set:Nn \l_@@_tmpa_fp {\tl_head:N \l_@@_tmpa_tl} + \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl} + \fp_set:Nn \l_@@_tmpb_fp {\tl_head:N \l_@@_tmpa_tl} +% \end{macrocode} +% Get the final point of the path, and compute the difference of the final and initial points. +% +% The resulting numbers, say \(a\) and \(b\), will be put into a matrix to rotate and scale the path. +% The formula for the matrix is: +%^^A +% \[ +% \frac{1}{a^2 + b^2} +% \begin{bmatrix} a & b \\ -b & a \end{bmatrix} +% \] +% +% \begin{macrocode} + \spath_finalpoint:Nn \l_@@_tmpa_tl {#2} + \fp_set:Nn \l_@@_tmpa_fp + {\tl_head:N \l_@@_tmpa_tl - \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl} + \fp_set:Nn \l_@@_tmpb_fp + {\tl_head:N \l_@@_tmpa_tl - \l_@@_tmpb_fp} +% \end{macrocode} +% Now compute the square of the length of the path for scaling. +% \begin{macrocode} + \fp_set:Nn \l_@@_tmpc_fp + {\l_@@_tmpa_fp^2 + \l_@@_tmpb_fp^2} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_tmpa_fp/\l_@@_tmpc_fp} + \fp_set:Nn \l_@@_tmpb_fp {\l_@@_tmpb_fp/\l_@@_tmpc_fp} + \fp_set:Nn \l_@@_tmpc_fp {-\l_@@_tmpb_fp} +% \end{macrocode} +% Now construct the matrix. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpb_tl + { + {\fp_use:N \l_@@_tmpa_fp} + {\fp_use:N \l_@@_tmpc_fp} % swapped + {\fp_use:N \l_@@_tmpb_fp} % swapped + {\fp_use:N \l_@@_tmpa_fp} + } +% \end{macrocode} +% Get the initial point back again for the translation part. +% \begin{macrocode} + \spath_initialpoint:Nn \l_@@_tmpa_tl {#2} +% \end{macrocode} +% But we need to premultiply by the matrix because of how the transformations are applied. +% \begin{macrocode} + \fp_set:Nn \l_@@_tmpa_fp + { + (-1) * \l_@@_tmpa_fp * \tl_head:N \l_@@_tmpa_tl + + (-1) * \l_@@_tmpb_fp * \tl_tail:N \l_@@_tmpa_tl + } + \fp_set:Nn \l_@@_tmpb_fp + { + (-1) * \l_@@_tmpa_fp * \tl_tail:N \l_@@_tmpa_tl + + \l_@@_tmpb_fp * \tl_head:N \l_@@_tmpa_tl + } +% \end{macrocode} +% Finally, we apply the transformation to the path. +% \begin{macrocode} + \tl_put_right:Nx \l_@@_tmpb_tl { + {\fp_to_dim:N \l_@@_tmpa_fp} + {\fp_to_dim:N \l_@@_tmpb_fp} + } + \spath_transform:NnV \l_@@_tmpa_tl {#2} \l_@@_tmpb_tl + \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl + \group_end: + \tl_set_eq:NN #1 \g_@@_output_tl + \tl_gclear:N \g_@@_output_tl +} +\cs_generate_variant:Nn \@@_normalise_path:Nn {NV, cn, cV} +\cs_new_protected_nopar:Npn \@@_normalise_path:N #1 +{ + \@@_normalise_path:NV #1#1 +} +\cs_generate_variant:Nn \@@_normalise_path:N {c} +% \end{macrocode} +% \end{macro} +% +% \begin{function}{\SetTilingPath} +% This sets the path corresponding to a particular side to the current path, and normalises it. +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_set_tiling_path:n #1 +{ + \group_begin: + \pgfsyssoftpath@getcurrentpath\l_@@_tmpa_tl + \@@_normalise_path:N \l_@@_tmpa_tl + \tl_gset_eq:cN {g_@@_side_#1_tl} \l_@@_tmpa_tl + \group_end: +} + +\NewDocumentCommand \SetTilingPath { m } +{ + \@@_set_tiling_path:n {#1} +} +% \end{macrocode} +% \end{function} +% +% \begin{macro}[internal]{\tikz_scan_point:n} +% This is a wrapper around \Verb+\tikz@scan@one@point+ to make it easier to use with \LaTeX3 variables. +% \begin{macrocode} +\cs_new_nopar:Npn \tikz_scan_point:n #1 +{ + \tikz@scan@one@point\pgfutil@firstofone#1\relax +} +\cs_generate_variant:Nn \tikz_scan_point:n {V} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\tikz_node_if_defined:TF} +% This extracts the code that tests if a node is defined. +% \begin{macrocode} +\prg_new_conditional:Npnn \tikz_node_if_defined:n #1 {p,T,F,TF} +{ + \tl_if_exist:cTF {pgf@sh@ns@\use:c{tikz@pp@name}{#1}} + { + \prg_return_true: + }{ + \tl_if_exist:cTF + {pgf@sh@ns@not yet positionedPGFINTERNAL\use:c{tikz@pp@name}{#1}} + { + \pgf_return_true: + } + { + \prg_return_false: + } + } +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_keys_get:Nn,\pgfkeys_get:n} +% This is a wrapper around \Verb+\pgfkeysgetvalue+ to make it easier to use with \LaTeX3 variables. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_keys_get:Nn #1#2 +{ + \pgfkeysgetvalue{/tikz/tiling/#2}{#1} +} +\cs_new_nopar:Npn \@@_keys_get:n #1 +{ + \pgfkeysvalueof{/tikz/tiling/#1} +} +\cs_new_nopar:Npn \@@_tikz_keys_get:Nn #1#2 +{ + \pgfkeysgetvalue{/tikz/#2}{#1} +} +\cs_new_nopar:Npn \@@_tikz_keys_get:n #1 +{ + \pgfkeysvalueof{/tikz/#1} +} +\cs_new_nopar:Npn \@@_pgf_keys_get:Nn #1#2 +{ + \pgfkeysgetvalue{#2}{#1} +} +\cs_new_nopar:Npn \@@_pgf_keys_get:n #1 +{ + \pgfkeysvalueof{#1} +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_make_tile:nnn} +% This builds the tile path from its pieces. +% The arguments are the name of the tile, the descriptions of the sides, and a token list of the coordinates. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_make_tile:nnn #1#2#3 +{ +% \end{macrocode} +% Get the first coordinate and initialise the path with a move to this point. +% \begin{macrocode} + \group_begin: + \tl_set:Nn \l_@@_tmpa_tl {#3} + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl} + \tl_set:Nn \l_@@_tmpa_tl {\pgfsyssoftpath@movetotoken} + \tl_put_right:Nx \l_@@_tmpa_tl + { + { + \fp_to_dim:n + {(\tl_item:Nn \l_@@_tmpb_tl {1}) * \c_@@_cm_fp} + } + { + \fp_to_dim:n + {(\tl_item:Nn \l_@@_tmpb_tl {2}) * \c_@@_cm_fp} + } + } + \tl_set_eq:NN \l_@@_tmp_tile_path_tl \l_@@_tmpa_tl +% \end{macrocode} +% Now we have our path initialised, we can start appending the side paths according to the specification in the second argument. +% +% We append the initial coordinate to the end of the list to make a closed cycle. +% \begin{macrocode} + \tl_set:Nn \l_@@_tmpa_tl {#3} + \tl_put_right:Nx \l_@@_tmpa_tl {{\tl_head:N \l_@@_tmpa_tl}} +% \end{macrocode} +% Now we walk through the description of the sides, adding the specified paths to our tile path. +% \begin{macrocode} + \tl_map_inline:nn {#2} { +% \end{macrocode} +% Clone the path for this side. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_head:n {##1}} + \tl_if_exist:cF {g_@@_side_ \tl_use:N \l_@@_tmpc_tl _tl} + { + \msg_error:nnx { tilings }{ no side } { \tl_use:N \l_@@_tmpc_tl } + \tl_gset_eq:cc + {g_@@_side_ \tl_use:N \l_@@_tmpc_tl _tl} + {g_@@_side_a_tl} + } + \tl_set_eq:Nc \l_@@_tmpd_tl + {g_@@_side_ \tl_use:N \l_@@_tmpc_tl _tl} +% \end{macrocode} +% Strip off the next coordinate, and convert it to a point. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl} + \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl} +% \end{macrocode} +% Store the resulting coordinate. +% \begin{macrocode} + \fp_set:Nn \l_@@_tmpa_fp + { \tl_item:Nn \l_@@_tmpb_tl {1} } + \fp_set:Nn \l_@@_tmpb_fp + { \tl_item:Nn \l_@@_tmpb_tl {2} } +% \end{macrocode} +% Now get the next coordinate. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl} +% \end{macrocode} +% We want the difference between the two coordinates. +% \begin{macrocode} + \fp_set:Nn \l_@@_tmpa_fp + {\tl_item:Nn \l_@@_tmpb_tl {1} - \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpb_fp + {\tl_item:Nn \l_@@_tmpb_tl {2} - \l_@@_tmpb_fp} +% \end{macrocode} +% This is converted into a transformation matrix. +% \begin{macrocode} + \fp_set:Nn \l_@@_tmpc_fp {-\l_@@_tmpb_fp} + \tl_set:Nx \l_@@_tmpb_tl + { + {\fp_to_dim:n { \l_@@_tmpa_fp * \c_@@_cm_fp }} + {\fp_to_dim:n { \l_@@_tmpb_fp * \c_@@_cm_fp }}% not swapped + {\fp_to_dim:n { \l_@@_tmpc_fp * \c_@@_cm_fp }}% not swapped + {\fp_to_dim:n { \l_@@_tmpa_fp * \c_@@_cm_fp }} + {0} + {0} + } +% \end{macrocode} +% The transformation is applied to the cloned path. +% \begin{macrocode} + \spath_transform:NV \l_@@_tmpd_tl \l_@@_tmpb_tl +% \end{macrocode} +% And this is welded to the tile path. +% \begin{macrocode} + \spath_weld:NV \l_@@_tmp_tile_path_tl \l_@@_tmpd_tl + } +% \end{macrocode} +% At the end we close the path. +% \begin{macrocode} + \spath_close:N \l_@@_tmp_tile_path_tl + \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmp_tile_path_tl + \group_end: + \tl_gclear_new:c {g_@@_tile_#1_tl} + \tl_gset_eq:cN {g_@@_tile_#1_tl} \g_@@_output_tl + \tl_gclear:N \g_@@_output_tl +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_make_tile:nn} +% A wrapper around the above which allows us to specify the second two arguments as two items in a token list. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_make_tile:nn #1#2 +{ + \@@_make_tile:nnn {#1} #2 +} +\cs_generate_variant:Nn \@@_make_tile:nn {nV} +% \end{macrocode} +% \end{macro} +% +% \subsection{Specifying the Tiles} +% +% The tile specifications are contained in a \Verb+prop+. +% \begin{macrocode} +\prop_new:N \g_@@_tiles_prop +% \end{macrocode} +% +% \begin{macro}[internal]{\@@_add_coordinate:Nnn, \@@_add_coordinate:w} +% Process a coordinate through \Verb+fp+ and adds it to a token list. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_add_coordinate:Nnn #1#2#3 { + \group_begin: + \fp_set:Nn \l_@@_tmpa_fp {#2} + \fp_set:Nn \l_@@_tmpb_fp {#3} + \bool_if:NT \l_@@_relative_bool + { + \fp_add:Nn \l_@@_tmpa_fp {\l_@@_saved_x_fp} + \fp_add:Nn \l_@@_tmpb_fp {\l_@@_saved_y_fp} + } + \fp_gset_eq:NN \g_@@_output_a_fp \l_@@_tmpa_fp + \fp_gset_eq:NN \g_@@_output_b_fp \l_@@_tmpb_fp + \group_end: + \tl_put_right:Nx #1 + { + {{\fp_use:N \g_@@_output_a_fp}{\fp_use:N \g_@@_output_b_fp}} + } + \bool_if:NT \l_@@_update_saved_bool + { + \fp_set_eq:NN \l_@@_saved_x_fp \g_@@_output_a_fp + \fp_set_eq:NN \l_@@_saved_y_fp \g_@@_output_b_fp + } + \fp_gzero:N \g_@@_output_a_fp + \fp_gzero:N \g_@@_output_b_fp +} +% \end{macrocode} +% Wrapper around the add coordinate command to split at a comma. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_add_xy_coordinate:w #1#2,#3 \q_stop +{ + \@@_add_coordinate:Nnn #1 {#2}{#3} +} +% \end{macrocode} +% +% Wrapper around the add coordinate command to split at a colon. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_add_rth_coordinate:w #1#2:#3 \q_stop +{ + \@@_add_coordinate:Nnn #1 {(#3) * cosd(#2)}{(#3) * sind(#2)} +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_transform_side_to_axis:Nnn} +% Apply a transformation to make a given side lie on the x-axis. +% Second argument is the tile, third is the side, first is whether to reverse the side. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_transform_side_to_axis:Nnn #1#2#3 +{ +% \end{macrocode} +% Get our tile data, checking if the tile exists. +% \begin{macrocode} + \group_begin: + \prop_get:NnNTF \g_@@_tiles_prop {#2} \l_@@_tmpa_tl + { +% \end{macrocode} +% Start with the edge list. +% +% Initialise the counter. +% \begin{macrocode} + \int_zero:N \l_@@_tmpb_int + \int_incr:N \l_@@_tmpb_int +% \end{macrocode} +% Get the path type list. +% +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl} +% \end{macrocode} +% +% Iterate through the path type list, looking for the requested path. +% \begin{macrocode} + \bool_set_false:N \l_@@_edge_bool + \tl_map_inline:Nn \l_@@_tmpc_tl { + \str_if_eq:nnT {##1} {#3} { + \bool_set_true:N \l_@@_edge_bool + \tl_map_break: + } + \int_incr:N \l_@@_tmpb_int + } + \bool_if:NTF \l_@@_edge_bool + { +% \end{macrocode} +% Get the coordinate list. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpa_tl} +% \end{macrocode} +% Strip off the outer braces. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_item:Nn \l_@@_tmpc_tl {1}} +% \end{macrocode} +% Add the first coordinate at the end. +% \begin{macrocode} + \tl_put_right:Nx \l_@@_tmpc_tl + {{\tl_item:Nn \l_@@_tmpc_tl {1}}} +% \end{macrocode} +% Get the coordinates for this edge. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpa_tl + {\tl_item:Nn \l_@@_tmpc_tl {\int_use:N \l_@@_tmpb_int}} + \tl_set:Nx \l_@@_tmpb_tl + {\tl_item:Nn \l_@@_tmpc_tl {\int_use:N \l_@@_tmpb_int + 1}} +% \end{macrocode} +% Possibly swap the ends. +% \begin{macrocode} + \bool_if:NT #1 + { + \tl_set:NV \l_@@_tmpc_tl \l_@@_tmpa_tl + \tl_set:NV \l_@@_tmpa_tl \l_@@_tmpb_tl + \tl_set:NV \l_@@_tmpb_tl \l_@@_tmpc_tl + } +% \end{macrocode} +% Get the coordinates of the first point, which will be the origin of the transformation. +% \begin{macrocode} + \fp_set:Nn \l_@@_xa_fp {\tl_item:Nn \l_@@_tmpb_tl {1}} + \fp_set:Nn \l_@@_ya_fp {\tl_item:Nn \l_@@_tmpb_tl {2}} +% \end{macrocode} +% Get the coordinates of the second point and adjust relative to the first. +% \begin{macrocode} + \fp_set:Nn \l_@@_xb_fp + {\tl_item:Nn \l_@@_tmpa_tl {1} - \l_@@_xa_fp} + \fp_set:Nn \l_@@_yb_fp + {\tl_item:Nn \l_@@_tmpa_tl {2} - \l_@@_ya_fp} +% \end{macrocode} +% And normalise the vector along it. +% \begin{macrocode} +% \fp_set:Nn \l_@@_xb_fp {\l_@@_xb_fp / \c_@@_cm_fp} +% \fp_set:Nn \l_@@_yb_fp {\l_@@_yb_fp / \c_@@_cm_fp} + \fp_set:Nn \l_@@_tmpa_fp + {(\l_@@_xb_fp)^2 + (\l_@@_yb_fp)^2} + \fp_set:Nn \l_@@_xb_fp { \l_@@_xb_fp / \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_yb_fp { \l_@@_yb_fp / \l_@@_tmpa_fp} +% \end{macrocode} +% Now rotate so that the \(x\)--axis lies along the edge. +% \begin{macrocode} + \tl_gset:Nx \g_@@_output_tl + { + \exp_not:N \pgftransformtriangle + { + \exp_not:N \pgfpoint{0pt}{0pt} + } + { + \exp_not:N \pgfpoint + {\fp_to_dim:N \l_@@_xb_fp}{\fp_to_dim:n {-\l_@@_yb_fp}} + } + { + \exp_not:N \pgfpoint + {\fp_to_dim:N \l_@@_yb_fp}{\fp_to_dim:N \l_@@_xb_fp} + } + \exp_not:N \pgftransformshift + { + \exp_not:N \pgfpoint + { + \fp_to_dim:n {-\l_@@_xa_fp * \c_@@_cm_fp} + } + { + \fp_to_dim:n {-\l_@@_ya_fp * \c_@@_cm_fp} + } + } + } + } + { + \msg_error:nnxxx {tilings} {tile no edge} {#2} {#3} + {\tl_use:N \l_@@_tmpc_tl } + \tl_gclear:N \g_@@_output_tl + } + } + { + \msg_error:nnn {tilings} {no tile} {#2} + \tl_gclear:N \g_@@_output_tl + } + \group_end: + \tl_use:N \g_@@_output_tl + \tl_gclear:N \g_@@_output_tl +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\cs_generate_variant:Nn +\@@_transform_side_to_axis:Nnn {Nnx,NnV,NVV} +% \end{macrocode} +% +% \begin{macro}[internal]{\@@_translate_vertex_to_origin:Nnn} +% Apply a transformation to make a given vertex sit at the origin. +% Second argument is the tile, third is the side, first is a boolean to determine whether to use the start or end. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_translate_vertex_to_origin:Nnn #1#2#3 +{ +% \end{macrocode} +% Get our tile data, checking if the tile exists. +% \begin{macrocode} + \group_begin: + \prop_get:NnNTF \g_@@_tiles_prop {#2} \l_@@_tmpa_tl + { +% \end{macrocode} +% Start with the edge list. +% +% Initialise the counter. +% \begin{macrocode} + \int_zero:N \l_@@_tmpb_int + \int_incr:N \l_@@_tmpb_int +% \end{macrocode} +% Get the path type list. +% +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl} +% \end{macrocode} +% +% Iterate through the path type list, looking for the requested path. +% \begin{macrocode} + \bool_set_false:N \l_@@_edge_bool + \tl_map_inline:Nn \l_@@_tmpc_tl { + \str_if_eq:nnT {##1} {#3} { + \bool_set_true:N \l_@@_edge_bool + \tl_map_break: + } + \int_incr:N \l_@@_tmpb_int + } + \bool_if:NTF \l_@@_edge_bool + { +% \end{macrocode} +% Get the coordinate list. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpa_tl} +% \end{macrocode} +% Strip off the outer braces. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_item:Nn \l_@@_tmpc_tl {1}} +% \end{macrocode} +% Add the first coordinate at the end. +% \begin{macrocode} + \tl_put_right:Nx \l_@@_tmpc_tl + {{\tl_item:Nn \l_@@_tmpc_tl {1}}} +% \end{macrocode} +% Get the coordinates for this edge. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpa_tl + {\tl_item:Nn \l_@@_tmpc_tl {\int_use:N \l_@@_tmpb_int}} + \tl_set:Nx \l_@@_tmpb_tl + {\tl_item:Nn \l_@@_tmpc_tl {\int_use:N \l_@@_tmpb_int + 1}} +% \end{macrocode} +% Possibly swap the ends. +% \begin{macrocode} + \bool_if:NT #1 + { + \tl_set:NV \l_@@_tmpc_tl \l_@@_tmpa_tl + \tl_set:NV \l_@@_tmpa_tl \l_@@_tmpb_tl + \tl_set:NV \l_@@_tmpb_tl \l_@@_tmpc_tl + } +% \end{macrocode} +% Get the coordinates of the first point, which will be the origin of the transformation. +% \begin{macrocode} + \fp_set:Nn \l_@@_xa_fp {\tl_item:Nn \l_@@_tmpb_tl {1}} + \fp_set:Nn \l_@@_ya_fp {\tl_item:Nn \l_@@_tmpb_tl {2}} +% \end{macrocode} +% Shift to place the selected vertex at the origin. +% \begin{macrocode} + \tl_gset:Nx \g_@@_output_tl + { + \exp_not:N \pgftransformshift + { + \exp_not:N \pgfpoint + { + \fp_to_dim:n {-\l_@@_xa_fp * \c_@@_cm_fp} + } + { + \fp_to_dim:n {-\l_@@_ya_fp * \c_@@_cm_fp} + } + } + } + } + { + \msg_error:nnxxx {tilings} {tile no edge} {#2} {#3} + {\tl_use:N \l_@@_tmpc_tl } + \tl_gclear:N \g_@@_output_tl + } + } + { + \msg_error:nnn {tilings} {no tile} {#2} + \tl_gclear:N \g_@@_output_tl + } + \group_end: + \tl_use:N \g_@@_output_tl + \tl_gclear:N \g_@@_output_tl +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\cs_generate_variant:Nn +\@@_translate_vertex_to_origin:Nnn {Nnx,NnV,NVV} +% \end{macrocode} +% +% \begin{macro}[internal]{\TransformAlongSide} +% Make this available outside the \LaTeX3 environment. +% The starred version allows for reversing the side. +% \begin{macrocode} +\DeclareDocumentCommand \TransformAlongSide {s m m} +{ +% \end{macrocode} +% Store the star +% \begin{macrocode} + \IfBooleanTF {#1} + { + \bool_set_true:N \l_@@_cw_bool + } + { + \bool_set_false:N \l_@@_cw_bool + } + \@@_transform_side_to_axis:Nnx \l_@@_cw_bool {#2}{#3} +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_coordinates_at_vertices:n} +% This places TikZ coordinates at the vertices of the tile. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_coordinates_at_vertices:n #1 +{ + \group_begin: +% \end{macrocode} +% Get our tile data +% \begin{macrocode} + \prop_get:NnN \g_@@_tiles_prop {#1} \l_@@_tmpa_tl +% \end{macrocode} +% Start with the edge list +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl} +% \end{macrocode} +% Get the coordinate list +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpa_tl} +% \end{macrocode} +% Strip off the outer braces +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl + {\tl_item:Nn \l_@@_tmpc_tl {1}} +% \end{macrocode} +% Add the first coordinate at the end +% \begin{macrocode} + \tl_put_right:Nx \l_@@_tmpc_tl + {{\tl_item:Nn \l_@@_tmpc_tl {1}}} +% \end{macrocode} +% Get the first coordinate +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpa_tl {\tl_head:N \l_@@_tmpc_tl} + \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpc_tl} +% \end{macrocode} +% Iterate through the edge list, placing coordinates +% \begin{macrocode} + \tl_map_inline:Nn \l_@@_tmpb_tl { + \tl_set:Nx \l_@@_tmpd_tl { + \exp_not:N \coordinate + (-edge~ ##1~ start)~ + at ( + \tl_item:Nn \l_@@_tmpa_tl {1}, + \tl_item:Nn \l_@@_tmpa_tl {2} + ); + } + \tl_use:N \l_@@_tmpd_tl + \tl_set:Nx \l_@@_tmpa_tl {\tl_head:N \l_@@_tmpc_tl} + \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpc_tl} + \tl_set:Nx \l_@@_tmpd_tl { + \exp_not:N \coordinate + (-edge~ ##1~ end)~ + at ( + \tl_item:Nn \l_@@_tmpa_tl {1}, + \tl_item:Nn \l_@@_tmpa_tl {2} + ); + } + \tl_use:N \l_@@_tmpd_tl + } + \group_end: +} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\CoordinatesAtVertices} +% User-accessible wrapper around the above. +% \begin{macrocode} +\DeclareDocumentCommand \CoordinatesAtVertices {m} +{ + \@@_coordinates_at_vertices:n {#1} +} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macrocode} +\tikzset{ + transform~ to~ tile/.code~ args={#1~ along~ #2}{% + \group_begin: + \tl_if_in:nnTF {#1} {back} + { + \tikzset{ + tiling/alignment~ set~ location=#1, + tiling/alignment~ direction={backwards} + } + } + { + \tikzset{ + tiling/alignment~ location=#1, + tiling/alignment~ direction={forewards} + } + } + \tl_if_in:nnTF {#2} {using} + { + \tikzset{ + tiling/alignment~ set~ edges=#2, + } + } + { + \tikzset{ + tiling/alignment~ edge=#2, + } + } + \tikz_scan_point:n { + (\@@_keys_get:n {alignment~ location} + -edge~ \@@_keys_get:n {alignment~ edge}~ start) + } + \dim_set_eq:Nc \l_@@_xa_dim {pgf@x} + \dim_set_eq:Nc \l_@@_ya_dim {pgf@y} + \tikz_scan_point:n { + (\@@_keys_get:n {alignment~ location} + -edge~ \@@_keys_get:n {alignment~ edge}~ end) + } + \dim_set_eq:Nc \l_@@_xb_dim {pgf@x} + \dim_set_eq:Nc \l_@@_yb_dim {pgf@y} + \@@_keys_get:Nn \l_@@_tmpb_tl {alignment~ direction} + \tl_if_eq:NnTF \l_@@_tmpb_tl {forewards} + { + \dim_gset_eq:NN \g_@@_xa_dim \l_@@_xa_dim + \dim_gset_eq:NN \g_@@_ya_dim \l_@@_ya_dim + \dim_gset_eq:NN \g_@@_xb_dim \l_@@_xb_dim + \dim_gset_eq:NN \g_@@_yb_dim \l_@@_yb_dim + } + { + \dim_gset_eq:NN \g_@@_xa_dim \l_@@_xb_dim + \dim_gset_eq:NN \g_@@_ya_dim \l_@@_yb_dim + \dim_gset_eq:NN \g_@@_xb_dim \l_@@_xa_dim + \dim_gset_eq:NN \g_@@_yb_dim \l_@@_ya_dim + } + \dim_gsub:Nn \g_@@_xb_dim {\g_@@_xa_dim} + \dim_gsub:Nn \g_@@_yb_dim {\g_@@_ya_dim} + \dim_gset:Nn \g_@@_xb_dim + {\g_@@_xb_dim * \dim_ratio:nn {1pt}{1cm}} + \dim_gset:Nn \g_@@_yb_dim + {\g_@@_yb_dim * \dim_ratio:nn {1pt}{1cm}} + \group_end: +% \end{macrocode} +% We store the initial points in \Verb+\pgf@xa+ and \Verb+\pgf@ya+ but we want \Verb+\pgf@xb+ and \Verb+\pgf@yb+ to be a vector along the edge. +% \begin{macrocode} +% \end{macrocode} +% We shift to the start of the edge. +% \begin{macrocode} + \pgftransformshift{\pgfpoint{\g_@@_xa_dim}{\g_@@_ya_dim}} +% \end{macrocode} +% Now rotate so that the \(x\)--axis lies along the edge. +% \begin{macrocode} + \pgftransformtriangle + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{\g_@@_xb_dim}{\g_@@_yb_dim}} + {\pgfpoint{-\g_@@_yb_dim}{\g_@@_xb_dim}} + }, + align~ with/.code~ args={#1~ along~ #2}{% + \tl_if_in:nnTF {#1} {back} + { + \tikzset{ + tiling/alignment~ set~ location=#1, + tiling/alignment~ direction={backwards} + } + } + { + \tikzset{ + tiling/alignment~ location=#1, + tiling/alignment~ direction={forewards} + } + } + \tl_if_in:nnTF {#2} {using} + { + \tikzset{ + tiling/alignment~ set~ edges=#2, + } + } + { + \tikzset{ + tiling/alignment~ edge=#2, + } + } + \tikz_node_if_defined:nTF + { + \@@_keys_get:n {alignment~ location} + -edge~ \@@_keys_get:n {alignment~ edge}~ start + } + { + \tikzset{ + tiling/alignment~ start/.expanded={ + (\@@_keys_get:n {alignment~ location} + -edge~ \@@_keys_get:n {alignment~ edge}~ start) + }, + tiling/alignment~ end/.expanded={ + (\@@_keys_get:n {alignment~ location} + -edge~ \@@_keys_get:n {alignment~ edge}~ end) + }, + } + } + { + \@@_keys_get:Nn \l_@@_tmpa_tl {alignment~ location} + \tl_set:Nx \l_@@_tmpa_tl {\tl_use:N \l_@@_tmpa_tl} + \prop_get:NVNTF \g_@@_tilenames_prop + \l_@@_tmpa_tl \l_@@_tmpb_tl + { + \prop_get:NVN \g_@@_tiles_prop + \l_@@_tmpb_tl \l_@@_tmpc_tl + \msg_error:nnxxx { tilings }{ tile no edge } + { + \tl_use:N \l_@@_tmpa_tl \c_space_tl + (type~ \tl_use:N \l_@@_tmpb_tl) + } + {\@@_keys_get:n {alignment~ edge} } + { \tl_item:Nn \l_@@_tmpc_tl {1} } + } + { + \msg_error:nnx { tilings }{ no tile } + {\@@_keys_get:n {alignment~ location} } + } + } + }, + tiling/.is~ family, + tiling/alignment~ set~ location/.code~ args={#1~ back}{ + \tikzset{ + tiling/alignment~ location=#1, + } + }, + tiling/alignment~ set~ edges/.code~ args={#1~ using~ #2}{ + \tikzset{ + tiling/alignment~ edge=#1, + tiling/alignment~ new~ edge=#2 + } + }, + align~ between/.code~ args={#1~ and~ #2~ using~ #3}{ + \tikzset{ + tiling/alignment~ start={#1}, + tiling/alignment~ end={#2}, + } + \str_set:Nn \l_@@_tmpa_str {#3} + \str_set:Nx \l_@@_tmpb_str {\str_tail:N \l_@@_tmpa_str} + \tikzset{ + tiling/alignment~ new~ edge/.expanded={\str_use:N \l_@@_tmpb_str} + } + \str_set:Nx \l_@@_tmpa_str {\str_head:N \l_@@_tmpa_str} + \str_set:Nx \l_@@_tmpb_str {\str_lowercase:f { \l_@@_tmpa_str}} + \str_if_eq:NNT \l_@@_tmpa_str \l_@@_tmpb_str + { + \str_set:Nx \l_@@_tmpb_str + {\str_uppercase:f { \l_@@_tmpa_str}} + } + \tikzset{ + tiling/alignment~ edge/.expanded={\str_use:N \l_@@_tmpb_str}, + } + }, + tiling/alignment~ location/.initial={}, + tiling/alignment~ edge/.initial=a, + tiling/alignment~ new~ edge/.initial={}, + tiling/alignment~ direction/.initial={forewards}, + tiling/alignment~ start/.initial={}, + tiling/alignment~ end/.initial={}, + tiling/anchor/.initial={}, +% \end{macrocode} +% Default clipping style. +% \begin{macrocode} + every~ tile~ clip/.style={clip} +} +% \end{macrocode} +% +% \begin{function}{\DefineTile} +% This is the user function for defining a tile. +% \begin{macrocode} +\DeclareDocumentCommand \DefineTile { s m m m } +{ +% \end{macrocode} +% Clear the temporary variable. +% \begin{macrocode} + \tl_clear:N \l_@@_tmpa_tl +% \end{macrocode} +% The 3rd parameter is a list of coordinates at vertices, iterate through them and add them to the list. +% \begin{macrocode} + \int_zero:N \l_@@_tmpa_int + \fp_zero:N \l_@@_saved_x_fp + \fp_zero:N \l_@@_saved_y_fp + \tl_map_inline:nn {#4} { + \str_set:Nn \l_@@_tmpa_str {##1} + \str_if_eq:VnTF \l_@@_tmpa_str {+} + { + \int_incr:N \l_@@_tmpa_int + } + { + \int_case:nn {\l_@@_tmpa_int} + { + {0} { + \bool_set_false:N \l_@@_relative_bool + \bool_set_true:N \l_@@_update_saved_bool + } + {1} { + \bool_set_true:N \l_@@_relative_bool + \bool_set_false:N \l_@@_update_saved_bool + } + {2} { + \bool_set_true:N \l_@@_relative_bool + \bool_set_true:N \l_@@_update_saved_bool + } + + } + \str_if_in:NnTF \l_@@_tmpa_str {:} + { + \seq_set_split:NVV \l_@@_tmpa_seq \c_@@_colon_str \l_@@_tmpa_str + \@@_add_coordinate:Nnn \l_@@_tmpa_tl + { + (\seq_item:Nn \l_@@_tmpa_seq {2}) * cosd (\seq_item:Nn \l_@@_tmpa_seq {1}) + } + { + (\seq_item:Nn \l_@@_tmpa_seq {2}) * sind (\seq_item:Nn \l_@@_tmpa_seq {1}) + } + } + { + \seq_set_split:NVV \l_@@_tmpa_seq \c_@@_comma_str \l_@@_tmpa_str + \@@_add_coordinate:Nnn \l_@@_tmpa_tl + { + (\seq_item:Nn \l_@@_tmpa_seq {1}) + } + { + (\seq_item:Nn \l_@@_tmpa_seq {2}) + } + } + \int_zero:N \l_@@_tmpa_int + } + } +% \end{macrocode} +% Now we make a list of the edge types (from the 2nd parameter), using a prop to keep track of whether an edge is repeated. +% \begin{macrocode} + \prop_clear:N \l_@@_tmpa_prop + \tl_map_inline:nn {#3} { + \prop_if_in:NnTF \l_@@_tmpa_prop {##1} + { + \prop_put:Nnn \l_@@_tmpa_prop {##1} {1} + } + { + \prop_put:Nnn \l_@@_tmpa_prop {##1} {0} + } + } +% \end{macrocode} +% Having established their multiplicity, we now create the edges with their names, appending numbers to their names if used more than once. +% \begin{macrocode} + \tl_clear:N \l_@@_tmpb_tl + \tl_map_inline:nn {#3} + { + \tl_clear:N \l_@@_tmpc_tl + \tl_put_right:Nn \l_@@_tmpc_tl {##1} + \int_compare:nF {\prop_item:Nn \l_@@_tmpa_prop {##1} == 0} { + \tl_put_right:Nx \l_@@_tmpc_tl + {\prop_item:Nn \l_@@_tmpa_prop {##1}} + \prop_put:Nnx \l_@@_tmpa_prop {##1} + {\int_eval:n {\prop_item:Nn \l_@@_tmpa_prop {##1} + 1}} + } + \tl_put_right:Nx \l_@@_tmpb_tl {{ \l_@@_tmpc_tl }} + } +% \end{macrocode} +% Finally, we can create our tile and add it to the global tile prop. +% \begin{macrocode} + \prop_gput:Nnx \g_@@_tiles_prop {#2} + {{\tl_use:N \l_@@_tmpb_tl} {\tl_use:N \l_@@_tmpa_tl}} +% \end{macrocode} +% Having created the tile, we make a TikZ pic to place it on the page. +% \begin{macrocode} + \tikzset{ + #2/.pic={ + \begin{scope}[ + every~ tile~ scope/.try, + every~ #2~ scope/.try, + this~ tile~ scope/.try + ] +% \end{macrocode} +% Save the name and tile type +% \begin{macrocode} + \tikz@fig@mustbenamed + \prop_gput:NVn \g_@@_tilenames_prop \tikz@fig@name {#2} +% \end{macrocode} +% Were we given coordinates to align ourselves against? +% \begin{macrocode} + \@@_keys_get:Nn \l_@@_tmpa_tl {alignment~ start} + \tl_if_empty:NTF \l_@@_tmpa_tl + { +% \end{macrocode} +% No alignment information was given, was an anchor specified? +% \begin{macrocode} + \prop_get:NnN \g_@@_tiles_prop {#2} \l_@@_tmpa_tl + \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl} + \@@_keys_get:Nn \l_@@_tmpa_tl {anchor} + \tl_if_empty:NTF \l_@@_tmpa_tl + { +% \end{macrocode} +% No positioning information given, but we might have been asked to flip the tile +% \begin{macrocode} + \bool_if:NT \l_@@_cw_bool + { + \pgftransformxscale {-1} + } + } + { + \regex_extract_once:NVNTF + \c_@@_anchor_regex \l_@@_tmpa_tl \l_@@_tmpb_tl + { + \regex_replace_once:NnN \c_@@_anchor_regex {} \l_@@_tmpa_tl + \tl_if_eq:NnTF \l_@@_tmpb_tl {~end} + { + \bool_set_true:N \l_@@_cw_bool + } + { + \bool_set_false:N \l_@@_cw_bool + } + } + { + \bool_set_false:N \l_@@_cw_bool + } + \tl_set:Nx \l_@@_tmpb_tl {{\tl_use:N \l_@@_tmpa_tl}} + \tl_if_in:NVT \l_@@_tmpc_tl \l_@@_tmpb_tl + { + \@@_translate_vertex_to_origin:NnV + \l_@@_cw_bool {#2} \l_@@_tmpa_tl + } + } + } + { +% \end{macrocode} +% Yes, we were. +% So we adjust our position accordingly. +% The first job is to transform so that we're aligned with the specified coordinates. +% \begin{macrocode} + \group_begin: +% \end{macrocode} +% We get the locations of the start and ending coordinates. +% \begin{macrocode} + \tikzset{ + name~ prefix~ .. + } + \tikz_scan_point:n { + \@@_keys_get:n {alignment~ start} + } + \dim_set_eq:Nc \l_@@_xa_dim {pgf@x} + \dim_set_eq:Nc \l_@@_ya_dim {pgf@y} + \tikz_scan_point:n { + \@@_keys_get:n {alignment~ end} + } + \dim_set_eq:Nc \l_@@_xb_dim {pgf@x} + \dim_set_eq:Nc \l_@@_yb_dim {pgf@y} + \@@_keys_get:Nn \l_@@_tmpb_tl {alignment~ direction} + \tl_if_eq:NnTF \l_@@_tmpb_tl {forewards} + { + \dim_gset_eq:NN \g_@@_xa_dim \l_@@_xa_dim + \dim_gset_eq:NN \g_@@_ya_dim \l_@@_ya_dim + \dim_gset_eq:NN \g_@@_xb_dim \l_@@_xb_dim + \dim_gset_eq:NN \g_@@_yb_dim \l_@@_yb_dim + } + { + \dim_gset_eq:NN \g_@@_xa_dim \l_@@_xb_dim + \dim_gset_eq:NN \g_@@_ya_dim \l_@@_yb_dim + \dim_gset_eq:NN \g_@@_xb_dim \l_@@_xa_dim + \dim_gset_eq:NN \g_@@_yb_dim \l_@@_ya_dim + } + \dim_gsub:Nn \g_@@_xb_dim {\g_@@_xa_dim} + \dim_gsub:Nn \g_@@_yb_dim {\g_@@_ya_dim} + \dim_gset:Nn \g_@@_xb_dim {\g_@@_xb_dim * \dim_ratio:nn {1pt}{1cm}} + \dim_gset:Nn \g_@@_yb_dim {\g_@@_yb_dim * \dim_ratio:nn {1pt}{1cm}} + \group_end: +% \end{macrocode} +% We shift to the start of the edge. +% \begin{macrocode} + \pgftransformshift{\pgfpoint{\g_@@_xa_dim}{\g_@@_ya_dim}} +% \end{macrocode} +% And normalise the vector along it. +% \begin{macrocode} +% \pgfpointnormalised{\pgfpoint{\g_@@_xb_dim}{\g_@@_yb_dim}} +% \dim_gset_eq:Nc \g_@@_xb_dim {pgf@x} +% \dim_gset_eq:Nc \g_@@_yb_dim {pgf@y} +% \end{macrocode} +% Now rotate so that the \(x\)--axis lies along the edge. +% \begin{macrocode} + \pgftransformtriangle + {\pgfpoint{0pt}{0pt}} + {\pgfpoint{\g_@@_xb_dim}{\g_@@_yb_dim}} + {\pgfpoint{-\g_@@_yb_dim}{\g_@@_xb_dim}} +% \end{macrocode} +% The next job is to shift and rotate the current tile so that the correct edge ends up against the receiving tile. +% \begin{macrocode} + \str_set:Nx \l_@@_tmpa_str + {\@@_keys_get:n {alignment~ edge}} + \str_set:Nx \l_@@_tmpa_str {\str_head:N \l_@@_tmpa_str} + \str_put_right:Nx \l_@@_tmpa_str + {\@@_keys_get:n {alignment~ new~ edge}} + \str_set:Nx \l_@@_tmpb_str {\str_lowercase:f { \l_@@_tmpa_str}} + \str_if_eq:NNT \l_@@_tmpa_str \l_@@_tmpb_str + { + \str_set:Nx \l_@@_tmpb_str + {\str_uppercase:f { \l_@@_tmpa_str}} + } + + \IfBooleanT {#1} + { + \bool_set:Nn \l_@@_cw_bool {!\l_@@_cw_bool} + } + \bool_if:NT \l_@@_cw_bool + { + \pgftransformyscale {-1} + } + \@@_transform_side_to_axis:NnV \l_@@_cw_bool {#2} \l_@@_tmpb_str + } +% \end{macrocode} +% Now that the transformation is finalised, we can render the tile. +% We clip against the tile path so that the tiles don't ``bleed''. +% If we didn't do this, drawing the tile would result in overlaps which can look a bit ugly. +% On the other hand, tight clipping can lead to ``gaps'' between the tiles so we make this optional by enclosing it in a style. +% +% We start by putting coordinates at each vertex, labelled by which edge they are. +% \begin{macrocode} + \@@_coordinates_at_vertices:n {#2} +% \end{macrocode} +% And one at the origin of the pic +% \begin{macrocode} + \coordinate[alias=-center] (-centre) at (0,0); +% \end{macrocode} +% +% The first action is to clip against the tile path. +% \begin{macrocode} + \UseTile[ + every~ tile~ clip/.try, + every~ #2~ clip/.try, + this~ tile~ clip/.try + ]{#2} +% \end{macrocode} +% Any pre-actions? +% \begin{macrocode} + \tikzset{ + every~ tile~ before~ path/.try, + every~ #2~ before~ path/.try, + this~ tile~ before~ path/.try + } +% \end{macrocode} +% Now we render the tile path +% \begin{macrocode} + \UseTile[ + every~ tile/.try, + every~ #2/.try, + this~ tile/.try, + pic~ actions + ]{#2} +% \end{macrocode} +% After drawing the tile and placing the coordinates, +% \begin{macrocode} + \tikzset{ + every~ tile~ after~ path/.try, + every~ #2~ after~ path/.try, + this~ tile~ after~ path/.try + } + \end{scope} + }, +% \end{macrocode} +% This is a shortcut for installing the \Verb+pic+ type. +% \begin{macrocode} + #2/.style={ + every~ tile~ pic/.try, + every~ #2~ pic/.try, + pic~ type=#2, + } + } +} +% \end{macrocode} +% \end{function} +% +% \begin{function}{\BakeTile} +% This is the user wrapper around the tile creation macros. +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_bake_tile:n #1 +{ + \prop_get:NnN \g_@@_tiles_prop {#1} \l_@@_tmpa_tl + \@@_make_tile:nV {#1} \l_@@_tmpa_tl +} + +\NewDocumentCommand \BakeTile {m} +{ + \@@_bake_tile:n {#1} +} +% \end{macrocode} +% \end{function} +% +% \begin{function}{\UseTile} +% This is the command that actually places a tile on the page. +% The first argument is optional and is for styling. +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_use_tile:nn #1#2 +{ +% \end{macrocode} +% We need to transform the tile to correspond to the current transformation matrix. +% To ensure that we only transform the current tile, we clone it first. +% \begin{macrocode} + \tl_if_exist:cTF {g_@@_tile_#2_tl} + { + \tl_set_eq:Nc \l_@@_tmp_tile_path_tl {g_@@_tile_#2_tl} +% \end{macrocode} +% We get the current transformation to apply to this path. +% \begin{macrocode} + \pgfgettransform \l_@@_tmpa_tl +% \end{macrocode} +% Apply the transformation, protocol the path, and render it. +% \begin{macrocode} + \spath_transform:NV \l_@@_tmp_tile_path_tl \l_@@_tmpa_tl + \spath_tikz_path:nV {#1} \l_@@_tmp_tile_path_tl + } + { + \msg_error:nnn { tilings }{ not baked }{#2} + } +} + +\NewDocumentCommand \UseTile {O{} m} +{ + \@@_use_tile:nn {#1}{#2} +} +% \end{macrocode} +% \end{function} +% +% \begin{macro}{save tiling path} +% This is a style for a user to take a path and make it into the path for one of the sides. +% It needs to store both that side and the reverse. +% \begin{macrocode} +\tikzset{ + save~ tiling~ path/.code={ + \tikz@addmode{ +% \end{macrocode} +% Get the current path. +% \begin{macrocode} + \pgfsyssoftpath@getcurrentpath\l_@@_tmpa_tl +% \end{macrocode} +% Normalise the path and save. +% \begin{macrocode} + \@@_normalise_path:N \l_@@_tmpa_tl + \tl_gclear_new:c {g_@@_side_#1_tl} + \tl_gset_eq:cN {g_@@_side_#1_tl} \l_@@_tmpa_tl +% \end{macrocode} +% Now create the reverse path. +% The name is the upper case version. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpb_tl {\str_uppercase:n {#1}} +% \end{macrocode} +% Reverse the path, and relocate to the interval \([0,1]\). +% \begin{macrocode} + \spath_reverse:N \l_@@_tmpa_tl + \spath_transform:Nnnnnnn \l_@@_tmpa_tl {-1} {0} {0} {-1} {1} {0} + \tl_gclear_new:c {g_@@_side_ \tl_use:N \l_@@_tmpb_tl _tl} + \tl_gset_eq:cN {g_@@_side_ \tl_use:N \l_@@_tmpb_tl _tl} \l_@@_tmpa_tl + } + }, + clone~ tiling~ side~ path/.style~ 2~ args={ + spath/set~ name=tiling~ side, + spath/clone~ global={#1}{#2} + }, + flip~ tile/.code={ + \tl_set:Nn \l_@@_tmpa_tl {#1} + \tl_set:Nn \l_@@_tmpb_tl {true} + \bool_set:Nn \l_@@_cw_bool {\tl_if_eq_p:NN \l_@@_tmpa_tl \l_@@_tmpb_tl} + }, + flip~ tile/.default={true}, + spath/prefix/tiling~side/.style={ + spath/set~ prefix=g_@@_side_, + }, + spath/suffix/tiling~side/.style={ + spath/set~ suffix=_tl, + }, + clone~ tile~ path/.style~ 2~ args={ + spath/set~ name=tiling~tile, + spath/clone~ global={#1}{#2} + }, + spath/prefix/tiling~tile/.style={ + spath/set~ prefix=g_@@_tile_, + }, + spath/suffix/tiling~tile/.style={ + spath/set~ suffix=_tl, + }, + expand~ key/.code={ + \exp_args:NV \pgfkeysalso #1 + } +} +% \end{macrocode} +% \end{macro} +% +% \subsection{Lindenmayer System} +% +% This is an implementation of the Lindenmayer System description of Penrose and other tilings as a way of generating tilings from a specific starting seed. +% +% The implementation uses \Verb+prop+s to store \emph{rules} and \emph{actions}. +% The rules are used to expand the starting seed to a certain level, after which the actions are carried out. +% The syntax is based on the PGF library, but as we're already using \LaTeX3 it is reimplemented in that. +% +% \begin{macro}[internal]{\@@_make_lms:Nnnn} +% This creates the token list of actions, starting with the seed. +% The arguments are: a token list to store the result in, the name of the system, the number of iterations, and the initial state. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_make_lms:Nnnn #1#2#3#4 +{ + \group_begin: +% \end{macrocode} +% On the first time round, we start with the given seed. +% \begin{macrocode} + \tl_set:Nn \l_@@_tmpb_tl {#4} +% \end{macrocode} +% We repeat the specified number of times. +% \begin{macrocode} + \prg_replicate:nn {#3} { +% \end{macrocode} +% Duplicate the current state. +% \begin{macrocode} + \tl_set_eq:NN \l_@@_tmpa_tl \l_@@_tmpb_tl +% \end{macrocode} +% Clear the receiving token list. +% \begin{macrocode} + \tl_clear:N \l_@@_tmpb_tl +% \end{macrocode} +% Walk through the current list, appending to the receiving list according to the rules. +% \begin{macrocode} + \tl_map_inline:Nn \l_@@_tmpa_tl + { +% \end{macrocode} +% If a rule exists, copy that. +% \begin{macrocode} + \tl_set:Nx \l_@@_action_lms_tl {\tl_head:n {##1}} + \tl_set:Nx \l_@@_parameters_lms_tl {\tl_tail:n {##1}} + \prop_if_in:cVTF {g_@@_#2_lms_rule_prop} \l_@@_action_lms_tl + { + \prop_get:cVN {g_@@_#2_lms_rule_prop} \l_@@_action_lms_tl \l_@@_tmpc_tl + \tl_put_right:Nx \l_@@_tmpb_tl {\tl_use:N \l_@@_tmpc_tl} +% {\prop_item:cn {g_@@_#2_lms_rule_prop} {##1} } + } + { +% \end{macrocode} +% Otherwise, just copy the token. +% \begin{macrocode} + \tl_if_single:nTF {##1} + { + \tl_put_right:Nn \l_@@_tmpb_tl {##1} + } + { + \tl_put_right:Nn \l_@@_tmpb_tl {{##1}} + } + } + } + } +% \end{macrocode} +% We've done all this inside a group, now pass the result outside. +% \begin{macrocode} + \tl_set:Nn \l_@@_tmpa_tl { + \group_end: + \tl_set:Nn #1 + } + \tl_put_right:Nx \l_@@_tmpa_tl {{\tl_use:N \l_@@_tmpb_tl}} + \tl_use:N \l_@@_tmpa_tl +} +\cs_generate_variant:Nn \@@_make_lms:Nnnn {Nnnx} +% \end{macrocode} +% \end{macro} +% +% \begin{macro}[internal]{\@@_invoke_lms:nn} +% This carries out the actions specified by the resulting rules. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_invoke_lms:nn #1#2 +{ + \group_begin: +% \end{macrocode} +% Walk through the given list, carrying out the corresponding action if it exists. +% If not, look at the default. +% Otherwise, just do nothing. +% \begin{macrocode} + \tl_map_inline:nn {#1} { + \tl_set:Nx \l_@@_action_lms_tl {\tl_head:n {##1}} + \tl_set:Nx \l_@@_parameters_lms_tl {\tl_tail:n {##1}} + \prop_if_in:cVTF {g_@@_#2_lms_action_prop} \l_@@_action_lms_tl + { + \prop_item:cV {g_@@_#2_lms_action_prop} \l_@@_action_lms_tl + } + { + \prop_if_in:cVT {g_@@_default_lms_action_prop} \l_@@_action_lms_tl + { + \prop_item:cV {g_@@_default_lms_action_prop} \l_@@_action_lms_tl + } + } + } + \group_end: +} +\cs_generate_variant:Nn \@@_invoke_lms:nn {Vn} +% \end{macrocode} +% \end{macro} +% +% +% We need some parameters. +% \begin{macrocode} +\dim_new:N \l_@@_step_dim +\dim_set:Nn \l_@@_step_dim {1cm} +% \end{macrocode} +% +% These are the defaults, which will be used in all the rule sets. +% \begin{macrocode} +\prop_new:N \g_@@_default_lms_action_prop +\prop_gput:Nnn \g_@@_default_lms_action_prop {[} {\group_begin:} +\prop_gput:Nnn \g_@@_default_lms_action_prop {]} {\group_end:} +\prop_gput:Nnn \g_@@_default_lms_action_prop {f} +{\pgftransformxshift{\l_@@_step_dim}} +\prop_gput:Nnn \g_@@_default_lms_action_prop {b} +{\pgftransformxshift{-\l_@@_step_dim}} +% \end{macrocode} +% +% Holds a list of the tiles that actually draw for each tile set +% \begin{macrocode} +\prop_new:N \g_@@_drawables_lms_prop +% \end{macrocode} +% +% We keep track of the number of tiles. +% \begin{macrocode} +\int_new:N \g_@@_tile_int +\int_new:N \g_@@_tiles_int +% \end{macrocode} +% +% \begin{function}{\TilingDecomposition} +% This is the user macro to invoke the decomposition. +% The arguments are: optional styles, the name, number of iterations, and starting seed. +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_tiling_decomposition:nnnn #1#2#3#4 +{ + \group_begin: + \tikzset{ + every~ #2~ decomposition/.try, + #1 + } + \@@_make_lms:Nnnx \l_@@_tmpa_tl {#2} {#3} {#4} + \@@_count_lms:Vn \l_@@_tmpa_tl {#2} + \int_gzero:N \g_@@_tile_int + \@@_invoke_lms:Vn \l_@@_tmpa_tl {#2} + \group_end: +} +\cs_new_protected_nopar:Npn \@@_tiling_decomposition:nnn #1#2#3 +{ + \@@_tiling_decomposition:nnnn {}{#1}{#2}{#3} +} +\cs_generate_variant:Nn \@@_tiling_decomposition:nnn {VVV} + +\NewDocumentCommand \TilingDecomposition { O{} m m m } +{ + \@@_tiling_decomposition:nnnn {#1}{#2}{#3}{#4} +} + +\tikzset{ + pics/decomposition/.style~ n~ args={3}{ + code={ + \@@_tiling_decomposition:nnn {#1}{#2}{#3} + } + } +} +% \end{macrocode} +% \end{function} +% +% \begin{macro}[internal]{\@@_count_lms:nn} +% This counts the number of tiles in the string. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_count_lms:nn #1#2 +{ + \group_begin: + \int_gzero:N \g_@@_tiles_int + \prop_get:NnNT \g_@@_drawables_lms_prop {#2} \l_@@_tmpa_tl + { + \tl_map_variable:nNn {#1} \l_@@_tmpb_tl + { + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpb_tl} + \bool_do_while:nn + { + !\tl_if_empty_p:N \l_@@_tmpb_tl + && + \tl_if_head_is_group_p:V \l_@@_tmpb_tl + } + { + \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpb_tl} + } + \tl_if_in:NVT \l_@@_tmpa_tl \l_@@_tmpb_tl + { + \int_gincr:N \g_@@_tiles_int + } + } + } + \group_end: +} +\cs_generate_variant:Nn \@@_count_lms:nn {Vn} +% \end{macrocode} +% \end{macro} +% +% This is a \Verb+\tikzset+ mechanism for setting the dimensions of the tiling. +% \begin{macrocode} +\tikzset{ + tiling~ step/.code={ + \dim_set:Nn \l_@@_step_dim {#1} + } +} +% \end{macrocode} +% +% \begin{macrocode} +\ExplSyntaxOff +% \end{macrocode} +% +% \iffalse +%</tilings> +% \fi +% +% +% \iffalse +%<*penrose> +% \fi +% +% \begin{macrocode} +\RequirePackage{tikz} +\usetikzlibrary{tilings} +\ProvidesFile {tikzlibrarytilings.penrose.code.tex} +[2023/06/01 v2.0 TikZ pics for Penrose tiles] +% \end{macrocode} +% +% +% Create the pre-defined tile shapes. +% +% \begin{itemize} +% \item Thin Rhombus. +% \begin{macrocode} +\DefineTile{thin rhombus}{a A B b} +{ + {0 , 0} + {cosd(18) , sind(18)} + {2*cosd(18) , 0} + {cosd(18) , -sind(18)} +} +% \end{macrocode} +% +% \item Thick Rhombus. +% \begin{macrocode} +\DefineTile{thick rhombus}{B a A b} +{ + {0 , 0} + {cosd(36) , sind(36)} + {2*cosd(36) , 0} + {cosd(36) , -sind(36)} +} +% \end{macrocode} +% +% \item Dart. +% \begin{macrocode} +\DefineTile{dart}{c a A C} +{ + {0 , 0} + {2*sind(18)*cosd(108) , 2*sind(18)*sind(108)} + {2*sind(18) , 0} + {2*sind(18)*cosd(108) , -2*sind(18)*sind(108)} +} +% \end{macrocode} +% +% \item Kite. +% \begin{macrocode} +\DefineTile{kite}{a c C A} +{ + {0 , 0} + {cosd(36) , sind(36)} + {1 , 0} + {cosd(36) , -sind(36)} +} +% \end{macrocode} +% +% \item Golden Triangle. +% \begin{macrocode} +\DefineTile{golden triangle}{a c b} +{ + {0 , 0} + {cosd(18) , sind(18)} + {cosd(18) , -sind(18)} +} +% \end{macrocode} +% +% \item Reverse Golden Triangle. +% \begin{macrocode} +\DefineTile {reverse golden triangle}{B C A} +{ + {0 , 0} + {cosd(18) , sind(18)} + {cosd(18) , -sind(18)} +} +% \end{macrocode} +% +% \item Golden Gnomon +% \begin{macrocode} +\DefineTile {golden gnomon}{C b A} +{ + {0 , 0} + {cosd(36) , sind(36)} + {2*cosd(36) , 0} +} +% \end{macrocode} +% +% \item Reverse Golden Gnomon +% \begin{macrocode} +\DefineTile {reverse golden gnomon}{a B c} +{ + {0 , 0} + {2*cosd(36) , 0} + {cosd(36) , -sind(36)} +} +% \end{macrocode} +% +% \item Primary Pentagon (pentagon 5) +% \begin{macrocode} +\DefineTile {pentagon 5}{a a a a a} +{ + {0 , 0} + {cosd(108) , sind(108)} + {1+cosd(72)+cosd(144) , sind(72)+sind(144)} + {1+cosd(72) , sind(72)} + {1 , 0} +} +% \end{macrocode} +% +% \item Secondary Pentagon (pentagon 3) +% \begin{macrocode} +\DefineTile {pentagon 3}{A b a a b} +{ + {0 , 0} + {cosd(108) , sind(108)} + {1+cosd(72)+cosd(144) , sind(72)+sind(144)} + {1+cosd(72) , sind(72)} + {1 , 0} +} +% \end{macrocode} +% +% \item Tertiary Pentagon (pentagon 2) +% \begin{macrocode} +\DefineTile {pentagon 2}{d A e c A} +{ + {0 , 0} + {cosd(108) , sind(108)} + {1+cosd(72)+cosd(144) , sind(72)+sind(144)} + {1+cosd(72) , sind(72)} + {1 , 0} +} +% \end{macrocode} +% +% \item Pentagram +% \begin{macrocode} +\DefineTile {pentagram}{C E C E C E C E C E} +{ + {1 , 0} + {1-cosd(36) , -sind(36)} + {1-cosd(36)-cosd(108) , -sind(36)-sind(108)} + {cosd(108) , -sind(108)} + {-1+3*cosd(108)+cosd(36) , -sind(36)-sind(108)} + {-1+2*cosd(108)+cosd(36) , -sind(36)} + {-1+2*cosd(108) , 0} + {2*cosd(108) , 0} + {cosd(108) , sind(108)} + {0 , 0} +} +% \end{macrocode} +% +% \item Boat +% \begin{macrocode} +\DefineTile {boat}{C E C E B D B} +{ + {-1+2*cosd(108) , 0} + {2*cosd(108) , 0} + {cosd(108) , sind(108)} + {0 , 0} + {1 , 0} + {1-cosd(36) , -sind(36)} + {-1+2*cosd(108)+cosd(36) , -sind(36)} +} +% \end{macrocode} +% +% \item Diamond. +% \begin{macrocode} +\DefineTile {diamond}{D B B D} +{ + {0 , 0} + {cosd(18) , sind(18)} + {2*cosd(18) , 0} + {cosd(18) , -sind(18)} +} +% \end{macrocode} +% \end{itemize} +% +% +% Place the arcs +% \begin{macrocode} +\tikzset{ + every thin rhombus before path/.code={ + \path[every circle arc/.try] (-edge a end) circle[radius=1/4]; + \path[every long arc/.try] (-edge b start) circle[radius=1/4]; + }, + every thick rhombus before path/.code={ + \path[every circle arc/.try] (-edge a end) circle[radius=1/4]; + \path[every long arc/.try] (-edge B start) circle[radius=3/4]; + }, + every kite before path/.code={ + \path[every circle arc/.try] (-edge a start) circle[radius=2/(sqrt(5)+1)]; + \path[every long arc/.try] (-edge c end) circle[radius=2/(3+sqrt(5))]; + }, + every dart before path/.code={ + \path[every circle arc/.try] (-edge a end) circle[radius=1 - 2/(sqrt(5)+1)]; + \path[every long arc/.try] (-edge c start) circle[radius=2/(sqrt(5)+1) - 2/(3+sqrt(5))]; + } +} +% \end{macrocode} +% +% Now bake the tiles. +% +% \begin{macrocode} +\BakeTile {thin rhombus} +\BakeTile {thick rhombus} +\BakeTile {dart} +\BakeTile {kite} +\BakeTile {golden triangle} +\BakeTile {reverse golden triangle} +\BakeTile {golden gnomon} +\BakeTile {reverse golden gnomon} +\BakeTile {pentagon 5} +\BakeTile {pentagon 3} +\BakeTile {pentagon 2} +\BakeTile {pentagram} +\BakeTile {boat} +\BakeTile {diamond} +% \end{macrocode} +% +% +% \subsection{Lindenmayer System} +% +% \begin{macrocode} +\ExplSyntaxOn +% \end{macrocode} +% +% These are the rules for generating rhombus tilings with the Lindenmayer System procedure. +% +% \begin{macrocode} +\prop_new:N \g_@@_rhombus_lms_rule_prop +\prop_gput:Nnn \g_@@_rhombus_lms_rule_prop {T} {[f*sT][f>g]} +\prop_gput:Nnn \g_@@_rhombus_lms_rule_prop {t} {[f_st][f>G]} +\prop_gput:Nnn \g_@@_rhombus_lms_rule_prop {G} {[f+sG][sf>g][sf*sT]} +\prop_gput:Nnn \g_@@_rhombus_lms_rule_prop {g} {[f-sg][sf>G][sf_st]} +% \end{macrocode} +% +% These are the rules for generating kite and dart tilings. +% \begin{macrocode} +\prop_new:N \g_@@_kite_lms_rule_prop +\prop_gput:Nnn \g_@@_kite_lms_rule_prop {T} {[f*sT][f>st][+sg]} +\prop_gput:Nnn \g_@@_kite_lms_rule_prop {t} {[f_st][f>sT][-sG]} +\prop_gput:Nnn \g_@@_kite_lms_rule_prop {G} {[f*+sG][sT]} +\prop_gput:Nnn \g_@@_kite_lms_rule_prop {g} {[f-_sg][st]} +% \end{macrocode} +% +% These are the rules for generating pentagon tilings. +% \begin{macrocode} +\prop_new:N \g_@@_pentagon_lms_rule_prop +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {P} +{[s>P][1sF+Q][1+sF+Q][1*sF+Q][1-sF+Q][1_sF+Q]} % pentagon 5 +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {Q} +{[s>P][1+sFR][1*sF*R][1-sF+Q][1_sF+Q][1sF+Q][->fsD]} % pentagon 3 +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {R} +{[s>P][1-sF+Q][1+sF*R][1*sFR][1_sF*R][1sFR][_>fsD][>fsD]} % pentagon 2 +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {G} +{ + [s>G] + [se[>d+R][e1B]] + [+se[>d+R][e1B]] + [-se[>d+R][e1B]] + [*se[>d+R][e1B]] + [_se[>d+R][e1B]] +} % pentagram +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {B} +{ + [s>G] + [se[>d+R][e1B]] + [+se[>d+R][e1B]] + [-se[>d+R][e1B]] +} % boat +\prop_gput:Nnn \g_@@_pentagon_lms_rule_prop {D} +{[s>d+R][s>eG][se1B]} % diamond +% \end{macrocode} +% +% Each of the standard tilings can also be drawn using triangles using the same rules. +% \begin{macrocode} +\prop_gset_eq:NN \g_@@_rtriangle_lms_rule_prop +\g_@@_rhombus_lms_rule_prop +\prop_gset_eq:NN \g_@@_ktriangle_lms_rule_prop +\g_@@_kite_lms_rule_prop +% \end{macrocode} +% +% These are the lists of tokens that actually draw things +% \begin{macrocode} +\prop_gput:Nnn \g_@@_drawables_lms_prop {rhombus} {TG} +\prop_gput:Nnn \g_@@_drawables_lms_prop {kite} {Tg} +\prop_gput:Nnn \g_@@_drawables_lms_prop {rtriangle} {TtGg} +\prop_gput:Nnn \g_@@_drawables_lms_prop {ktriangle} {TtGg} +\prop_gput:Nnn \g_@@_drawables_lms_prop {pentagon} {PQRGBD} +% \end{macrocode} +% +% +% These hold the various actions. +% \begin{macrocode} +\prop_new:N \g_@@_rhombus_lms_action_prop +\prop_new:N \g_@@_kite_lms_action_prop +\prop_new:N \g_@@_rtriangle_lms_action_prop +\prop_new:N \g_@@_ktriangle_lms_action_prop +\prop_new:N \g_@@_pentagon_lms_action_prop +% \end{macrocode} +% +% The rhombus rules need a variety of turns. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {+} +{\pgftransformrotate{144}} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {*} +{\pgftransformrotate{108}} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {-} +{\pgftransformrotate{216}} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {_} +{\pgftransformrotate{252}} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {>} +{\pgftransformrotate{180}} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {s} { + \fp_set:Nn \l_@@_tmpa_fp { 2 * sind(18) * \l_@@_step_dim } + \dim_set:Nn \l_@@_step_dim {\fp_to_dim:N \l_@@_tmpa_fp} +} +% \end{macrocode} +% +% Up to now, the actions for the rhombus and its triangle replacement are the same. +% \begin{macrocode} +\prop_gset_eq:NN \g_@@_rtriangle_lms_action_prop +\g_@@_rhombus_lms_action_prop +% \end{macrocode} +% +% Now we do the actions that actually draw something. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {T} { + \group_begin: +% \end{macrocode} +% As we go through, we keep track of how many tiles we've drawn. +% \begin{macrocode} + \int_gincr:N \g_@@_tile_int +% \end{macrocode} +% Set up the position, size, and angle correctly. +% \begin{macrocode} + \pgftransformrotate{198} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*2*cosd(18)} + \pgftransformxshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} +% \end{macrocode} +% Now we draw the thin rhombus, applying every style we can possibly imagine. +% The \Verb+tile+ style gets the current tile and total tile numbers passed to it. +% \begin{macrocode} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ thin~ rhombus/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{thin~rhombus} + \group_end: +} +% \end{macrocode} +% +% Same for the thick rhombus. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rhombus_lms_action_prop {G} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)/(2*cosd(36))} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ thick~ rhombus/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{thick~rhombus} + \group_end: +} +% \end{macrocode} +% +% Now we do the same for the kite and dart tiling. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {+} {\pgftransformrotate{36}} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {*} {\pgftransformrotate{108}} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {-} {\pgftransformrotate{-36}} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {_} +{\pgftransformrotate{-108}} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {>} {\pgftransformrotate{180}} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {s} { + \fp_set:Nn \l_@@_tmpa_fp { 2 * sind(18) * \l_@@_step_dim } + \dim_set:Nn \l_@@_step_dim {\fp_to_dim:N \l_@@_tmpa_fp} +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gset_eq:NN \g_@@_ktriangle_lms_action_prop +\g_@@_kite_lms_action_prop +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {T} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{36} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ kite/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{kite} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_kite_lms_action_prop {g} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{144} + \pgftransformxshift{-\l_@@_step_dim * 2 * sin(18)} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ dart/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{dart} + \group_end: +} +% \end{macrocode} +% +% Now we set up the actions for the triangle variations. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rtriangle_lms_action_prop {T} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{18} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ reverse~ golden~ triangle/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{reverse~ golden~ triangle} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rtriangle_lms_action_prop {t} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{-18} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ golden~ triangle/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{golden~ triangle} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rtriangle_lms_action_prop {G} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{180} + \pgftransformxshift{-\l_@@_step_dim} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)/(2*cosd(36))} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ reverse~ golden~ gnomon/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{reverse~ golden~ gnomon} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_rtriangle_lms_action_prop {g} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{180} + \pgftransformxshift{-\l_@@_step_dim} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)/(2*cosd(36))} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ golden~ gnomon/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{golden~ gnomon} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_ktriangle_lms_action_prop {T} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{18} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ reverse~ golden~ triangle/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{reverse~ golden~ triangle} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_ktriangle_lms_action_prop {t} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{-18} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ golden~ triangle/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{golden~ triangle} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_ktriangle_lms_action_prop {G} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{180} + \pgftransformxshift{-\l_@@_step_dim} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)/(2*cosd(36))} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ reverse~ golden~ gnomon/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{reverse~ golden~ gnomon} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_ktriangle_lms_action_prop {g} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{180} + \pgftransformxshift{-\l_@@_step_dim} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)/(2*cosd(36))} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ golden~ gnomon/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{golden~ gnomon} + \group_end: +} +% \end{macrocode} +% +% Now we do the same for the pentagonal tilings. +% +% The rules need a variety of turns. +% \begin{macrocode} +\int_new:N \l_@@_pentagon_parity_int +\seq_new:N \l_@@_pentagon_parity_seq +\seq_set_from_clist:Nn \l_@@_pentagon_parity_seq {odd,even} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {1} { + \int_set:Nn \l_@@_pentagon_parity_int + {3 - \l_@@_pentagon_parity_int} +} +\tikzset{ + every~ pentagon~ decomposition/.code={% + \int_set:Nn \l_@@_pentagon_parity_int {2} + } +} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {+} +{\pgftransformrotate{72}} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {*} +{\pgftransformrotate{144}} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {-} +{\pgftransformrotate{288}} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {_} +{\pgftransformrotate{216}} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {>} +{\pgftransformrotate{180}} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {|} +{\pgftransformxscale{-1}} +% \end{macrocode} +% The scale factor is different. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {s} { + \fp_set:Nn \l_@@_tmpa_fp + { + 1/(2 + 2 * cosd(72) ) * \l_@@_step_dim + } + \dim_set:Nn \l_@@_step_dim {\fp_to_dim:N \l_@@_tmpa_fp} +} +% \end{macrocode} +% And we tend to work better vertically. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {f} { + \fp_set:Nn \l_@@_tmpa_fp { tand(54)/2 * \l_@@_step_dim } + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} +} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {F} { + \fp_set:Nn \l_@@_tmpa_fp { tand(54) * \l_@@_step_dim } + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} +} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {d} { + \fp_set:Nn \l_@@_tmpa_fp + { + (tand(54)/2 - tand(72)/2 + sind(36) ) * \l_@@_step_dim + } + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} +} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {e} { + \fp_set:Nn \l_@@_tmpa_fp + { + tand(54) * cosd(36) * \l_@@_step_dim + } + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {P} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/2} + \pgftransformxshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*tand(54)/2} + \pgftransformyshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ pentagon/.try, + every~ + \seq_item:Nn \l_@@_pentagon_parity_seq + {\l_@@_pentagon_parity_int} + \space pentagon/.try, + every~ pentagon~ 5/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{pentagon~5} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {Q} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/2} + \pgftransformxshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*tand(54)/2} + \pgftransformyshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ pentagon/.try, + every~ + \seq_item:Nn \l_@@_pentagon_parity_seq + {\l_@@_pentagon_parity_int} + \space pentagon/.try, + every~ pentagon~ 3/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{pentagon~3} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {R} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/2} + \pgftransformxshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*tand(54)/2} + \pgftransformyshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ pentagon/.try, + every~ + \seq_item:Nn \l_@@_pentagon_parity_seq + {\l_@@_pentagon_parity_int} + \space pentagon/.try, + every~ pentagon~ 2/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{pentagon~2} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {G} { + \group_begin: + \int_gincr:N \g_@@_tile_int +% \pgftransformrotate{198} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*cosd(72)} + \pgftransformxshift{\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*tand(54)*cosd(72)} + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ pentagram/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{pentagram} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {B} { + \group_begin: + \int_gincr:N \g_@@_tile_int +% \pgftransformrotate{198} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*cosd(72)} + \pgftransformxshift{\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*tand(54)*cosd(72)} + \pgftransformyshift{\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ boat/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{boat} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_pentagon_lms_action_prop {D} { + \group_begin: + \int_gincr:N \g_@@_tile_int + \pgftransformrotate{90} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim*cosd(18)} + \pgftransformxshift{-\fp_to_dim:N \l_@@_tmpa_fp} + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ diamond/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{diamond} + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +\ExplSyntaxOff +% \end{macrocode} +% +% \iffalse +%</penrose> +% \fi +% +% \iffalse +%<*polykite> +% \fi +% +% \begin{macrocode} +\RequirePackage{tikz} +\usetikzlibrary{tilings} +\ProvidesFile {tikzlibrarytilings.polykite.code.tex} + [2023/06/01 v2.0 TikZ pics for Aperiodical Polykite tiles] +% \end{macrocode} +% +% \begin{function}{\DefinePolykiteTile} +% Define one of the family of polykite tiles. +% Needs a name and length parameters. +% A star option switches the side labels to enable the hat-turtle pairing of a tile with its ``opposite''. +% \begin{macrocode} +\DeclareDocumentCommand \DefinePolykiteTile {s m m m} +{ + \IfBooleanTF {#1} + { + \DefineTile {#2} {2 2 1 1 2 2 1 1 1 1 2 2 1 1} + } + { + \DefineTile {#2} {1 1 2 2 1 1 2 2 2 2 1 1 2 2} + } + { + {0 : #4} + ++{90 : #3} + ++{150 : #3} + ++{240 : #4} + ++{180 : #4} + ++{-90 : #3} + ++{210 : #3} + ++{-60 : #4} + ++{0 : #4} + ++{0 : #4} + ++{60 : #4} + ++{-30 : #3} + ++{30 : #3} + ++{120 : #4} + } +} +% \end{macrocode} +% \end{function} +% +% Some predefined tiles. +% The aperiodical hat and turtle can be swapped in for each other as they use the same edge definitions. +% The spectral hat and turtle are designed to be used in the same diagram. +% Technically, the spectral and aperiodical hats are the same, but I figured it better to have two names for the two uses. +% The spectre uses the alternating edge scheme. +% +% \begin{itemize} +% \item Aperiodical and Spectral Hat. +% \begin{macrocode} +\DefinePolykiteTile{aperiodical hat}{sqrt(3)/2}{1/2} +\DefinePolykiteTile{spectral hat}{sqrt(3)/2}{1/2} +% \end{macrocode} +% \item Aperiodical and Spectral Turtles. +% \begin{macrocode} +\DefinePolykiteTile{aperiodical turtle}{1/2}{sqrt(3)/2} +\DefinePolykiteTile*{spectral turtle}{1/2}{sqrt(3)/2} +% \end{macrocode} +% \item Aperiodical Spectre. +% \begin{macrocode} +\DefineTile {spectre} {a A a A a A a A a A a A a A} + { + {0 : .75} + ++{90 : .75} + ++{150 : .75} + ++{240 : .75} + ++{180 : .75} + ++{-90 : .75} + ++{210 : .75} + ++{-60 : .75} + ++{0 : .75} + ++{0 : .75} + ++{60 : .75} + ++{-30 : .75} + ++{30 : .75} + ++{120 : .75} + } +% \end{macrocode} +% +% \item Meta Clusters +% +% The mapping between the notation in the \href{preprint}{https://arxiv.org/abs/2303.10798} is: +% +% \begin{align*} +% A^+, A^- &\mapsto a, A \\ +% B^+, B^- &\mapsto b, B\\ +% F^+, F^- &\mapsto c, C\\ +% X^+, X^- &\mapsto d, D\\ +% L &\mapsto 1 +% \end{align*} +% +% \begin{macrocode} +\DefineTile{meta cluster T}{A A b} +{ +{ -1.5 , -sqrt(3)/2 } +{ 1.5 , -sqrt(3)/2 } +{ 0 , sqrt(3) } +} +\DefineTile{meta cluster P}{1 D d A 1 D d b} +{ +{ -2.5, sqrt(3)/2 } +{ -2, 0 } +{ -1.5, -sqrt(3)/2 } +{ -0.5 , -sqrt(3)/2 } +{ 2.5 , -sqrt(3)/2 } +{ 2 , 0 } +{ 1.5 , sqrt(3)/2 } +{ .5 , sqrt(3)/2 } +} +\DefineTile{meta cluster F}{1 D d 1 D c C d b} +{ +{ -2.5, sqrt(3)/2 } +{ -2, 0 } +{ -1.5, -sqrt(3)/2 } +{ -0.5 , -sqrt(3)/2 } +{ .5 , -sqrt(3)/2 } +{ 1.5 , -sqrt(3)/2 } +{ 2 , 0 } +{ 1.5 , sqrt(3)/2 } +{ .5 , sqrt(3)/2 } +} +\DefineTile{meta cluster H}{B D d B D d a D d} +{ +{ -2, -sqrt(3) } +{ 1, -sqrt(3) } +{ 2, -sqrt(3) } +{ 2.5, -sqrt(3)/2 } +{ 1, sqrt(3)} +{ .5 , 3*sqrt(3)/2 } +{ -.5 , 3*sqrt(3)/2 } +{ -2, 0 } +{ -2.5, -sqrt(3)/2 } +} +% \end{macrocode} +% \item Super Clusters +% +% \begin{macrocode} +\DefineTile{super cluster T}{A A b} +{ +{ -30 : 3 * (1 + sqrt(5))/2 / sqrt(3) } +{ 90 : 3 * (1 + sqrt(5))/2 / sqrt(3) } +{ 210 : 3 * (1 + sqrt(5))/2 / sqrt(3) } +} +% 1 + 3phi, 1 + 2phi +\DefineTile{super cluster P}{1 D d A 1 D d b} +{ +{ - 1.75 - sqrt(5), (sqrt(5)/2 + 1) * sqrt(3)/2 } +++{ -60 : 1 + sqrt(5) } +++{ -60 : 1} +++{ 1, 0} +++{ 3*(1 + sqrt(5))/2, 0 } +++{ 120 : 1 + sqrt(5) } +++{ 120 : 1 } +++{ -1, 0 } +} +\DefineTile{super cluster F}{1 D d 1 D c C d b} +{ +{ - 1.75 - sqrt(5), (sqrt(5)/2 + 1) * sqrt(3)/2 } +++{ -60 : 1 + sqrt(5) } +++{ -60 : 1} +++{ 1, 0} +++{ 1 + sqrt(5), 0 } +++{ 1, 0 } ++{ -.75 + (2 + sqrt(5)) * sqrt(3)/4 * sqrt(3)/3, + (2 + sqrt(5)) * sqrt(3)/4 + 3/4 * sqrt(3)/3 } +++{ -1.5, (2 + sqrt(5)) * sqrt(3)/2 } +++{ -1, 0 } +} +\DefineTile{super cluster H}{B D d B D d a D d} +{ +{1.75 + 3*sqrt(5)/4, -(1 + sqrt(5))*sqrt(3)/4} +++{120 : 3*(1+sqrt(5))/2 } +++{120 : 1 } +++{-1,0} +++{240 : 3*(1+sqrt(5))/2} +++{240 : 1} +++{300 : 1} +++{ 3*(1+sqrt(5))/2, 0 } +++{1, 0} +++{60 : 1} +} +% \end{macrocode} +% \item Subclusters +% +% \begin{macrocode} +\DefineTile{subcluster H}{B B a} +{ + { 0, 0 } + { 3, 0 } + { 60 : 3 } +} +\DefineTile{subcluster T}{A A b} +{ + { 0, 0 } + { 3, 0 } + { 60 : 3 } +} +\DefineTile{subcluster P}{ 1 A 1 b } +{ + { 0, 0 } + { 1, 0 } + { 4, 0 } + { 3, 0 } +} +\DefineTile{subcluster F}{ 1 1 f F b } +{ + { 0, 0 } + { 1, 0 } + +{ 60 : 1 } + { 2, 0 } + { 3, 0 } +} +% \end{macrocode} +% \end{itemize} +% +% The P and F subclusters have no area, so clipping against them is not helpful. +% \begin{macrocode} +\tikzset{ + no clip/.code={% + \tikz@addmode{\tikz@mode@clipfalse}% + }, + every subcluster P clip/.style={no clip}, + every subcluster F clip/.style={no clip}, +} +% \end{macrocode} +% +% +% \begin{macrocode} +\BakeTile {aperiodical hat} +\BakeTile {aperiodical turtle} +\BakeTile {spectral hat} +\BakeTile {spectral turtle} +\BakeTile {spectre} +\BakeTile {meta cluster T} +\BakeTile {meta cluster P} +\BakeTile {meta cluster F} +\BakeTile {meta cluster H} +\BakeTile {super cluster T} +\BakeTile {super cluster P} +\BakeTile {super cluster F} +\BakeTile {super cluster H} +% \end{macrocode} +% +% The subclusters are deformed by default. +% +% \begin{macrocode} +\ExplSyntaxOn +\clist_map_inline:nn {a,A,b,B,f,F} +{ + \tl_new:c {g_@@_side_polykite_#1_tl} + \tl_if_exist:cF {g_@@_side_#1_tl} + { + \tl_new:c {g_@@_side_#1_tl} + } +} + +\tl_gset:cn {g_@@_side_polykite_A_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{-0.3333332942822268pt} + \pgfsyssoftpath@linetotoken {0.0833331478405773pt}{-0.1889954840909892pt} + \pgfsyssoftpath@linetotoken {0.3333332942822268pt}{-0.3333332942822268pt} + \pgfsyssoftpath@linetotoken {0.5833333235705567pt}{-0.1889954840909892pt} + \pgfsyssoftpath@linetotoken {0.6666667057177732pt}{-0.3333332942822268pt} + \pgfsyssoftpath@linetotoken {1pt}{-0.3333332942822268pt} +} +\tl_gset:cn {g_@@_side_polykite_a_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{0.33333pt} + \pgfsyssoftpath@linetotoken {0.33333pt}{0.33333pt} + \pgfsyssoftpath@linetotoken {0.41667pt}{0.189pt} + \pgfsyssoftpath@linetotoken {0.66667pt}{0.33333pt} + \pgfsyssoftpath@linetotoken {0.91667pt}{0.189pt} + \pgfsyssoftpath@linetotoken {1pt}{0.33333pt} +} +\tl_gset:cn {g_@@_side_polykite_B_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{0pt} + \pgfsyssoftpath@linetotoken {0.3333332942822268pt}{0pt} + \pgfsyssoftpath@linetotoken {0.4166665592761237pt}{0.1443378101912376pt} + \pgfsyssoftpath@linetotoken {0.6666667057177732pt}{0pt} + \pgfsyssoftpath@linetotoken {0.9166666178527835pt}{0.1443378101912376pt} + \pgfsyssoftpath@linetotoken {1pt}{0pt} +} +\tl_gset:cn {g_@@_side_polykite_b_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{0pt} + \pgfsyssoftpath@linetotoken {0.08333pt}{-0.14433pt} + \pgfsyssoftpath@linetotoken {0.33333pt}{0pt} + \pgfsyssoftpath@linetotoken {0.58333pt}{-0.14433pt} + \pgfsyssoftpath@linetotoken {0.66667pt}{0pt} + \pgfsyssoftpath@linetotoken {1pt}{0pt} +} +\tl_gset:cn {g_@@_side_polykite_F_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{-2.00000070292pt} + \pgfsyssoftpath@linetotoken {0.74999982427pt}{-1.566987221617321pt} + \pgfsyssoftpath@linetotoken {1pt}{-2.00000070292pt} +} +\tl_gset:cn {g_@@_side_polykite_f_tl} +{ + \pgfsyssoftpath@movetotoken {0pt}{2pt} + \pgfsyssoftpath@linetotoken {0.25pt}{1.56699pt} + \pgfsyssoftpath@linetotoken {1pt}{2pt} +} + +\clist_map_inline:nn {a,A,b,B,f,F} +{ + \tl_gclear_new:c {g_@@_side_backup_#1_tl} + \tl_gset_eq:cc {g_@@_side_backup_#1_tl} {g_@@_side_#1_tl} + \tl_gclear_new:c {g_@@_side_#1_tl} + \tl_gset_eq:cc {g_@@_side_#1_tl}{g_@@_side_polykite_#1_tl} +} + +\BakeTile{subcluster~ H} +\BakeTile{subcluster~ T} +\BakeTile{subcluster~ P} +\BakeTile{subcluster~ F} + +\clist_map_inline:nn {a,A,b,B,f,F} +{ + \tl_gset_eq:cc {g_@@_side_#1_tl} {g_@@_side_backup_#1_tl} +} +% \end{macrocode} +% +% \subsection{Lindenmayer System} +% +% These are the rules for generating the super cluster tilings with the Lindenmayer System procedure. +% +% \begin{macro}[internal]{\@@_place_cluster_tile:nn} +% Useful auxiliary for placing a cluster tile from a particular set +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_place_cluster_tile:nn #1#2 +{ + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \pgftransformscale{\fp_use:N \l_@@_tmpa_fp} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \UseTile[ + every~ tile/.try, + every~ #1~#2/.try, + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try/.expand~ once=\l_@@_tmpc_tl + ]{#1~ #2} + \group_end: +} +\cs_generate_variant:Nn \@@_place_cluster_tile:nn {Vn} +% \end{macrocode} +% \end{macro} +% +% +% \begin{macrocode} +\prop_new:N \g_@@_supercluster_lms_rule_prop +\prop_gput:Nnn \g_@@_supercluster_lms_rule_prop {T} +{ + [s H] +} +\prop_gput:Nnn \g_@@_supercluster_lms_rule_prop {H} +{ + [s {r{-60}} T] + [s {x{\fp_to_decimal:n{1}}} {y{\fp_to_decimal:n{(1+2*\c_@@_phi_fp)}}} H] + [s + {x{\fp_to_decimal:n{-2-3*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-\c_@@_phi_fp}}} + H] + [s + {x{\fp_to_decimal:n{1+3*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-1-\c_@@_phi_fp}}} + {r{-120}} + H] + [s + {x{\fp_to_decimal:n{-1.5-3.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{2.5*\c_@@_phi_fp+1.5}}} + {r{-120}} + P] + [s + {x{\fp_to_decimal:n{-1.5-2*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-1.5-3*\c_@@_phi_fp}}} + {r{180}} + P] + [s + {x{\fp_to_decimal:n{3+5.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5*\c_@@_phi_fp}}} + {r{120}} + P] + [s + {x{\fp_to_decimal:n{-4.5-6.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5-.5*\c_@@_phi_fp}}} + {r{-120}} + F] + [s + {x{\fp_to_decimal:n{1.5+4*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-2.5-3*\c_@@_phi_fp}}} + F] + [s + {x{\fp_to_decimal:n{3+2.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{2+3.5*\c_@@_phi_fp}}} + {r{120}} + F] +} +\prop_gput:Nnn \g_@@_supercluster_lms_rule_prop {P} +{ + [s {r{60}} P] + [s + {x{\fp_to_decimal:n{2.5+3.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-.5-.5*\c_@@_phi_fp}}} + {r{-120}} + H] + [s + {x{\fp_to_decimal:n{-2.5-3.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5+.5*\c_@@_phi_fp}}} + {r{180}} + H] + [s + {x{\fp_to_decimal:n{4.5+6*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5+\c_@@_phi_fp}}} + {r{120}} + F] + [s + {x{\fp_to_decimal:n{-4.5-6*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-.5-\c_@@_phi_fp}}} + {r{-60}} + F] +} +\prop_gput:Nnn \g_@@_supercluster_lms_rule_prop {F} +{ + [s {r{60}} P] + [s + {x{\fp_to_decimal:n{2.5+3.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-.5-.5*\c_@@_phi_fp}}} + {r{-120}} + H] + [s + {x{\fp_to_decimal:n{-2.5-3.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5+.5*\c_@@_phi_fp}}} + {r{180}} + H] + [s + {x{\fp_to_decimal:n{4.5+6*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{.5+\c_@@_phi_fp}}} + {r{120}} + F] + [s + {x{\fp_to_decimal:n{-4.5-6*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-.5-\c_@@_phi_fp}}} + {r{-60}} + F] + [s + {x{\fp_to_decimal:n{3+4.5*\c_@@_phi_fp}}} + {y{\fp_to_decimal:n{-2-2.5*\c_@@_phi_fp}}} + F] +} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_drawables_lms_prop {supercluster} {HTPF} +% \end{macrocode} +% +% \begin{macrocode} +\fp_const:Nn \c_@@_phi_fp {(1 + sqrt(5))/2} +\prop_new:N \g_@@_supercluster_lms_action_prop + +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {r} +{ + \pgftransformrotate{\l_@@_parameters_lms_tl} +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {x} +{ + \pgftransformxshift{ + \fp_to_dim:n + {.5 * (\l_@@_parameters_lms_tl) * \l_@@_step_dim} + } +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {y} +{ + \pgftransformyshift{ + \fp_to_dim:n + {.5 * sqrt(3) * (\l_@@_parameters_lms_tl) * \l_@@_step_dim} + } +} + +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {s} +{ + \fp_set:Nn \l_@@_tmpa_fp { + \l_@@_step_dim + / + \c_@@_phi_fp + / + \c_@@_phi_fp + } + \dim_set:Nn \l_@@_step_dim {\fp_to_dim:N \l_@@_tmpa_fp} +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {H} +{ + \@@_place_cluster_tile:nn {super~ cluster}{H} +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {T} +{ + \@@_place_cluster_tile:nn {super~ cluster}{T} +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {P} +{ + \@@_place_cluster_tile:nn {super~ cluster}{P} +} +\prop_gput:Nnn \g_@@_supercluster_lms_action_prop {F} +{ + \@@_place_cluster_tile:nn {super~ cluster}{F} +} +% \end{macrocode} +% +% +% Parameters: +% \begin{enumerate} +% \item Cluster type (super cluster, meta cluster, subcluster) +% \item This tile type (H, T, P, F) +% \item This tile's name +% \item Alignment tile's name +% \item Edge to align along +% \item Edge to align with +% \end{enumerate} +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_place_cluster_tile_as_pic:nnnnnn #1#2#3#4#5#6 +{ + \group_begin: + \int_gincr:N \g_@@_tile_int + \fp_set:Nn \l_@@_tmpa_fp {\l_@@_step_dim/(1cm)} + \tl_set:Nx \l_@@_tmpc_tl + { + {\int_use:N \g_@@_tile_int} + {\int_use:N \g_@@_tiles_int} + } + \tl_clear:N \l_@@_tmpa_tl + \tl_put_right:Nn \l_@@_tmpa_tl + { + \pic[ + every~ tile/.try, + every~ #1~#2/.try, + } + \tl_put_right:Nx \l_@@_tmpa_tl + { + tile~ \int_use:N \g_@@_tile_int/.try, + tile/.try=\l_@@_tmpc_tl, + scale=\fp_use:N \l_@@_tmpa_fp, + } + \tl_put_right:Nn \l_@@_tmpa_tl + { + name=#3, + } + \tl_if_empty:nTF {#4} + { + \tl_put_right:Nn \l_@@_tmpa_tl + { + first~ tile/.try, + } + } + { + \tl_put_right:Nn \l_@@_tmpa_tl + { + align~ with=#4~along~#5 + } + \tl_if_single:nF {#6} + { + \tl_put_right:Nx \l_@@_tmpa_tl + { + \c_space_tl using~\tl_tail:n {#6} + } + } + \tl_put_right:Nn \l_@@_tmpa_tl {,} + } + \tl_put_right:Nn \l_@@_tmpa_tl + { + #1~ #2 + ]; + } + \tl_use:N \l_@@_tmpa_tl + \group_end: +} +\cs_generate_variant:Nn \@@_place_cluster_tile_as_pic:nnnnnn { + Vnnnnn, VnVnnn, VnVVnn +} +\tikzset{ + cluster~ type/.initial=super~ cluster, + first~ file/.style={transform~ shape} +} +\prop_new:N \g_@@_cluster_lms_rule_prop +% \end{macrocode} +% +% The first set of rules govern when the tile being replaced is a root tile, in which case one of the new tiles becomes the new root and all others are placed with respect to them. +% +% It's convenient for code readability to have aliases for the labels for the parent and adjoining tiles, which are stored in the \Verb!\l_@@_parameters_lms_tl! token list. +% \begin{macrocode} +\cs_new_nopar:Npn \@@_tile_label: +{ + \tl_item:Nn \l_@@_parameters_lms_tl {1} +} +\cs_new_nopar:Npn \@@_adjoint_label: +{ + \tl_item:Nn \l_@@_parameters_lms_tl {2} +} +% \end{macrocode} +% +% A single \(T\) tile is replaced by a single \(H\) tile +% \begin{macrocode} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {T} +{ + [s {H{\@@_tile_label:0}{}}] +} +% \end{macrocode} +% +% An \(H\) tile is replaced by \(10\) tiles, consisting of a \(T\) tile and \(3\) each of \(H\), \(P\), and \(F\). +% \begin{macrocode} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {H} +{ + [s {r{-60}} {T{\@@_tile_label:0}{}}] + [{ {HTa{A1}} {\@@_tile_label:1} {\@@_tile_label:0} }] + [{ {HTa{A2}} {\@@_tile_label:2} {\@@_tile_label:0} }] + [{ {HT{B1}b} {\@@_tile_label:3} {\@@_tile_label:0} }] + [{ {PHb{B2}} {\@@_tile_label:4} {\@@_tile_label:1} }] + [{ {PHb{B2}} {\@@_tile_label:5} {\@@_tile_label:2} }] + [{ {PHAa} {\@@_tile_label:6} {\@@_tile_label:3} }] + [{ {FHb{B1}} {\@@_tile_label:7} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:8} {\@@_tile_label:2} }] + [{ {FHb{B2}} {\@@_tile_label:9} {\@@_tile_label:3} }] +} +% \end{macrocode} +% +% Lastly, the \(P\) and \(F\) tile substitutions. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {P} +{ + [s {r{60}} {P{\@@_tile_label:0}{}}] + [{ {HPaA} {\@@_tile_label:1} {\@@_tile_label:0} }] + [{ {HP{B2}b} {\@@_tile_label:2} {\@@_tile_label:0} }] + [{ {FHb{B2}} {\@@_tile_label:3} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:4} {\@@_tile_label:2} }] +} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {F} +{ + [s {r{60}} {P{\@@_tile_label:0}{}}] + [{ {HPaA} {\@@_tile_label:1} {\@@_tile_label:0} }] + [{ {HP{B2}b} {\@@_tile_label:2} {\@@_tile_label:0} }] + [{ {FHb{B2}} {\@@_tile_label:3} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:4} {\@@_tile_label:2} }] + [{ {FHb{B1}} {\@@_tile_label:5} {\@@_tile_label:1} }] +} +% \end{macrocode} +% +% The rest of the rules are for when the tile being replaced was itself positioned by aligning it with another tile. +% For these tiles, one of its edge tiles will be its root and positioned alongside one of the edge tiles of the replacement of the original tile's alignment tile. +% Then all the other tiles are positioned out from that root. +% The labelling has to be the same regardless of the order of drawing the tiles. +% +% Not every edge pairing is necessary to generate a pattern as the edges that can be created are all between \(A^\pm\) edges and between \(B^\pm\) edges. +% However, to avoid errors in case they are part of the seed then for now we create blank substitution rules that will effectively remove any such rogue elements. +% \begin{macrocode} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {TH{A1}a} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {TH{A2}a} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {THb{B1}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {THb{B2}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HTa{A1}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HTa{A2}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HT{B1}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HT{B2}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HPaA} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HP{B1}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HP{B2}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HF{B1}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {HF{B2}b} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PHAa} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PHb{B1}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PHb{B2}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PF{11}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PF{12}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PF{11}{12}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {PF{12}{12}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FHb{B1}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FHb{B2}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FP{11}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FP{12}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FP{11}{12}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FP{12}{12}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FFfF} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FFFf} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FF{11}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FF{12}{11}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FF{11}{12}} {} +\prop_gput:Nnn \g_@@_cluster_lms_rule_prop {FF{12}{12}} {} +% \end{macrocode} +% +% To help create the rules then we start with some helper macros. +% Each of these creates the substitution rule for a tile given certain information about where the parent tile is positioned. +% Most of the substitution information consists of placing the tiles next to each other, so only the first tile needs to know about a tile from a different set. +% This makes it relatively easy to set up some templates for the substitution rules. +% \begin{macrocode} +\cs_new_nopar:cpn {@@_T{A1}_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {T#1{A1}#2} + { + [{ {H#3{B1}#4} {\@@_tile_label:0} {\@@_adjoint_label:#5} }] + } +} +\cs_new_nopar:cpn {@@_T{A2}_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {T#1{A2}#2} + { + [{ {H#3{B2}#4} {\@@_tile_label:0} {\@@_adjoint_label:#5} }] + } +} +\cs_new_nopar:cpn {@@_Tb_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {T#1b#2} + { + [{ {H#3a#4} {\@@_tile_label:0} {\@@_adjoint_label:#5} }] + } +} + +\cs_new_nopar:cpn {@@_H{B1}_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {H#1{B1}#2} + { + [{ {P#3A#4} {\@@_tile_label:4} {\@@_adjoint_label:#5} }] + + [{ {HP{B2}b} {\@@_tile_label:1} {\@@_tile_label:4} }] + [{ {TH{A1}a} {\@@_tile_label:0} {\@@_tile_label:1} }] + + [{ {HTa{A2}} {\@@_tile_label:2} {\@@_tile_label:0} }] + [{ {PHb{B2}} {\@@_tile_label:5} {\@@_tile_label:2} }] + + [{ {HT{B1}b} {\@@_tile_label:3} {\@@_tile_label:0} }] + [{ {PHAa} {\@@_tile_label:6} {\@@_tile_label:3} }] + + [{ {FHb{B1}} {\@@_tile_label:7} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:8} {\@@_tile_label:2} }] + [{ {FHb{B2}} {\@@_tile_label:9} {\@@_tile_label:3} }] + } +} + +\cs_new_nopar:cpn {@@_H{B2}_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {H#1{B2}#2} + { + [{ {P#3A#4} {\@@_tile_label:5} {\@@_adjoint_label:#5} }] + + [{ {HP{B2}b} {\@@_tile_label:2} {\@@_tile_label:5} }] + [{ {TH{A2}a} {\@@_tile_label:0} {\@@_tile_label:2} }] + + [{ {HTa{A1}} {\@@_tile_label:1} {\@@_tile_label:0} }] + [{ {PHb{B2}} {\@@_tile_label:4} {\@@_tile_label:1} }] + + [{ {HT{B1}b} {\@@_tile_label:3} {\@@_tile_label:0} }] + [{ {PHAa} {\@@_tile_label:6} {\@@_tile_label:3} }] + + [{ {FHb{B1}} {\@@_tile_label:7} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:8} {\@@_tile_label:2} }] + [{ {FHb{B2}} {\@@_tile_label:9} {\@@_tile_label:3} }] + } +} + +\cs_new_nopar:cpn {@@_Ha_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {H#1a#2} + { + [{ {P#3b#4} {\@@_tile_label:6} {\@@_adjoint_label:#5} }] + + [{ {HPaA} {\@@_tile_label:3} {\@@_tile_label:6} }] + [{ {THb{B1}} {\@@_tile_label:0} {\@@_tile_label:3} }] + + [{ {HTa{A1}} {\@@_tile_label:1} {\@@_tile_label:0} }] + [{ {PHb{B2}} {\@@_tile_label:4} {\@@_tile_label:1} }] + + [{ {HTa{A2}} {\@@_tile_label:2} {\@@_tile_label:0} }] + [{ {PHb{B2}} {\@@_tile_label:5} {\@@_tile_label:2} }] + + [{ {FHb{B1}} {\@@_tile_label:7} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:8} {\@@_tile_label:2} }] + [{ {FHb{B2}} {\@@_tile_label:9} {\@@_tile_label:3} }] + } +} + +\cs_new_nopar:cpn {@@_PA_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {P#1A#2} + { + [{ {H#3{B1}#4} {\@@_tile_label:1} {\@@_adjoint_label:#5} }] + [{ {PHAa} {\@@_tile_label:0} {\@@_tile_label:1} }] + [{ {HP{B2}b} {\@@_tile_label:2} {\@@_tile_label:0} }] + + [{ {FHb{B2}} {\@@_tile_label:3} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:4} {\@@_tile_label:2} }] + } +} + +\cs_new_nopar:cpn {@@_Pb_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {P#1b#2} + { + [{ {H#3a#4} {\@@_tile_label:2} {\@@_adjoint_label:#5} }] + [{ {PHb{B2}} {\@@_tile_label:0}{\@@_tile_label:2} }] + [{ {HPaA} {\@@_tile_label:1} {\@@_tile_label:0} }] + + [{ {FHb{B2}} {\@@_tile_label:3} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:4} {\@@_tile_label:2} }] + } +} + +\cs_new_nopar:cpn {@@_Fb_creator:nnnnn} #1#2#3#4#5 +{ + \prop_gput:Nnn \g_@@_cluster_lms_rule_prop {F#1b#2} + { + [{ {H#3a#4} {\@@_tile_label:2} {\@@_adjoint_label:#5} }] + [{ {PHb{B2}} {\@@_tile_label:0}{\@@_tile_label:2} }] + [{ {HPaA} {\@@_tile_label:1} {\@@_tile_label:0} }] + + [{ {FHb{B2}} {\@@_tile_label:3} {\@@_tile_label:1} }] + [{ {FHb{B1}} {\@@_tile_label:4} {\@@_tile_label:2} }] + [{ {FHb{B1}} {\@@_tile_label:5} {\@@_tile_label:1} }] + } +} +% \end{macrocode} +% +% Now that the creators are set up it is time to invoke them. +% \begin{macrocode} +\clist_map_inline:nn +{ + TH{{A1}}a HP{{{B1}}}b06, + TH{{A2}}a HP{{{B2}}}b06, + THb{{B1}} HPaA04, + THb{{B2}} HPaA05, + PHAa HP{{{B1}}}b16, + PHb{{B1}} HPaA24, + PHb{{B2}} HPaA25, + FHb{{B1}} HPaA24, + FHb{{B2}} HPaA25, +} +{ + \tl_clear:N \l_@@_tmpa_tl + \tl_put_right:Nn \l_@@_tmpa_tl { \use:c } + \tl_put_right:Nx \l_@@_tmpa_tl + { + {@@_ \tl_item:nn {#1}{2}\tl_item:nn {#1}{4} _creator:nnnnn} + {\tl_item:nn {#1}{1}}{\tl_item:nn{#1}{3}} + \tl_item:nn {#1}{5}\tl_item:nn{#1}{7} + \tl_item:nn {#1}{9} + } + \tl_use:N \l_@@_tmpa_tl + \tl_clear:N \l_@@_tmpa_tl + \tl_put_right:Nn \l_@@_tmpa_tl { \use:c } + \tl_put_right:Nx \l_@@_tmpa_tl + { + {@@_ \tl_item:nn {#1}{1}\tl_item:nn {#1}{3} _creator:nnnnn} + {\tl_item:nn {#1}{2}}{\tl_item:nn{#1}{4}} + \tl_item:nn {#1}{6}\tl_item:nn{#1}{8} + \tl_item:nn {#1}{10} + } + \tl_use:N \l_@@_tmpa_tl +} + +% \end{macrocode} +% +% \begin{macrocode} +\prop_new:N \g_@@_cluster_lms_action_prop +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_drawables_lms_prop {cluster} {HTPF} +% \end{macrocode} +% +% \begin{macrocode} +\prop_gput:Nnn \g_@@_cluster_lms_action_prop {r} +{ + \pgftransformrotate{\l_@@_parameters_lms_tl} +} +\prop_gput:Nnn \g_@@_cluster_lms_action_prop {x} +{ + \pgftransformxshift{ + \fp_to_dim:n + {.5 * (\l_@@_parameters_lms_tl) * \l_@@_step_dim} + } +} +\prop_gput:Nnn \g_@@_cluster_lms_action_prop {y} +{ + \pgftransformyshift{ + \fp_to_dim:n + {.5 * sqrt(3) * (\l_@@_parameters_lms_tl) * \l_@@_step_dim} + } +} + +\prop_gput:Nnn \g_@@_cluster_lms_action_prop {s} +{ + \fp_set:Nn \l_@@_tmpa_fp { + \l_@@_step_dim + / + \c_@@_phi_fp + / + \c_@@_phi_fp + } + \dim_set:Nn \l_@@_step_dim {\fp_to_dim:N \l_@@_tmpa_fp} +} +% \end{macrocode} +% +% The first set of actions are for when this tile is the root so doesn't have a parent +% \begin{macrocode} +\clist_map_inline:nn {H,T,P,F} +{ + + \prop_gput:Nnn \g_@@_cluster_lms_action_prop {#1} + { + \@@_tikz_keys_get:Nn \l_@@_tmpa_tl {cluster~type} + \tl_set:Nx \l_@@_tmpb_tl {\tl_item:Nn \l_@@_parameters_lms_tl {1}} + \@@_place_cluster_tile_as_pic:VnVnnn + \l_@@_tmpa_tl {#1} \l_@@_tmpb_tl {}{}{} + } +} +% \end{macrocode} +% +% The second set is for when there is an adjoining edge +% \begin{macrocode} +\cs_new_protected_nopar:Npn \@@_place_cluster_tile_as_pic_aux:nnnn #1#2#3#4 +{ + \@@_tikz_keys_get:Nn \l_@@_tmpa_tl {cluster~type} + \tl_set:Nx \l_@@_tmpb_tl {\@@_tile_label:} + \tl_set:Nx \l_@@_tmpc_tl {\@@_adjoint_label:} + \@@_place_cluster_tile_as_pic:VnVVnn + \l_@@_tmpa_tl {#1} \l_@@_tmpb_tl \l_@@_tmpc_tl {#4}{#3} +} + +\clist_map_inline:nn { + TH{A1}a, + TH{A2}a, + THb{B1}, + THb{B2}, + HTa{A1}, + HTa{A2}, + HT{B1}b, + HT{B2}b, + HPaA, + HP{B1}b, + HP{B2}b, + HF{B1}b, + HF{B2}b, + PHAa, + PHb{B1}, + PHb{B2}, + PF{11}{11}, + PF{12}{11}, + PF{11}{12}, + PF{12}{12}, + FHb{B1}, + FHb{B2}, + FP{11}{11}, + FP{12}{11}, + FP{11}{12}, + FP{12}{12}, + FFfF, + FFFf, + FF{11}{11}, + FF{12}{11}, + FF{11}{12}, + FF{12}{12} +} +{ + \prop_gput:Nnn \g_@@_cluster_lms_action_prop {#1} + { + \@@_place_cluster_tile_as_pic_aux:nnnn #1 + } +} + +\ExplSyntaxOff +% \end{macrocode} +% +% \iffalse +%</polykite> +% \fi +% +% \iffalse +%<*penrosedep> +% \fi +% +% \begin{macrocode} +\ProvidesFile {tikzlibrarypenrose.code.tex} + [2023/06/01 v2.0 TikZ pics for Penrose tiles] +\usetikzlibrary{tilings.penrose} +% \end{macrocode} +% +% Backwards compatibility mode: +% +% \begin{itemize} +% \item \Verb+\SetPenrosePath+ is \Verb+\SetTilingPath+ +% \item \Verb+\BakePenroseTile+ and \Verb+\MakePenroseTile+ are \Verb+\BakeTile+ +% \item \Verb+\UsePenroseTile+ is \Verb+\UseTile+ +% \item \Verb+\PenroseDecomposition+ is \Verb+\TilingDecomposition+ +% \end{itemize} +% \begin{macrocode} +\ExplSyntaxOn +\NewDocumentCommand \SetPenrosePath { m } +{ + \@@_set_tiling_path:n {#1} +} +\NewDocumentCommand \BakePenroseTile {m} +{ + \@@_bake_tile:n {#1} +} +\NewDocumentCommand \MakePenroseTile {m} +{ + \@@_bake_tile:n {#1} +} +\NewDocumentCommand \UsePenroseTile {O{} m} +{ + \@@_use_tile:nn {#1}{#2} +} +\NewDocumentCommand \PenroseDecomposition { O{} m m m } +{ + \@@_tiling_decomposition:nnnn {#1}{#2}{#3}{#4} +} +\ExplSyntaxOff +% \end{macrocode} +% +% \begin{macrocode} +\tikzset{ + save Penrose path/.forward to=/tikz/save tiling path, + clone Penrose side path/.forward to=/tikz/clone tiling side path, + spath/prefix/Penrose side/.forward to=/tikz/spath/prefix/tiling side, + spath/suffix/Penrose side/.forward to=/tikz/spath/suffix/tiling side, + clone Penrose tile path/.forward to=/tikz/clone tiling tile path, + spath/prefix/Penrose tile/.forward to=/tikz/spath/prefix/tiling tile, + spath/suffix/Penrose tile/.forward to=/tikz/spath/suffix/tiling tile, + Penrose step/.forward to=/tikz/tiling step, + every tile/.append style={ + every Penrose tile/.try + }, + every tile clip/.append style={ + every Penrose tile clip/.try + }, + every tile pic/.append style={ + every Penrose pic/.try + }, + tile/.append style={ + Penrose tile #1/.try, + Penrose tile/.try=#1 + } +} +% \end{macrocode} +% +% \iffalse +%</penrosedep> +% \fi +% +% \end{implementation} +%\Finale +\endinput diff --git a/graphics/pgf/contrib/tilings/tilings_code.pdf b/graphics/pgf/contrib/tilings/tilings_code.pdf Binary files differnew file mode 100644 index 0000000000..d9a672e1df --- /dev/null +++ b/graphics/pgf/contrib/tilings/tilings_code.pdf diff --git a/macros/latex/contrib/l3kernel/CHANGELOG.md b/macros/latex/contrib/l3kernel/CHANGELOG.md index d418810401..2ad6244fbd 100644 --- a/macros/latex/contrib/l3kernel/CHANGELOG.md +++ b/macros/latex/contrib/l3kernel/CHANGELOG.md @@ -7,6 +7,24 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2023-06-05] + +### Added +- `\cctab_gsave_current:N`, `\g_tmpa_cctab` and `\g_tmpb_cctab` (issue \#1089) +- `\prg_gset_eq_conditional:NNn` (issue \#1212) +- `\iow_shell_open:Nn` (issue \#1122) + +## Deprecated +- `\tl_case:Nn(TF)` +- `expl3` package option `enable-debug` (no longer required) + +### Fixed +- Set `\l_keys_value_tl` in `.initial:n` (issue \#1013) +- Support for boolean values in `expl3` package options + `check-declarations` and `log-functions` (issue \#978) +- Allow for optional `/` at end of `\input@path` entries + (see latex3/latex2e\#1076) + ## [2023-05-22] ### Added @@ -15,6 +33,7 @@ this project uses date-based 'snapshot' version identifiers. - `\coffin_(g)reset_poles:N` - `\dim_to_decimal_in_<unit>:n`, for `<unit>` types `cc`, `cm`, `dd`, `in`, `mm` and `pc` +- `\file_input_raw:n` - `\int_if_zero:n(TF)` - `\str_mdfive_hash:n` @@ -1432,7 +1451,8 @@ this project uses date-based 'snapshot' version identifiers. - Step functions have been added for dim variables, e.g. `\dim_step_inline:nnnn` -[Unreleased]: https://github.com/latex3/latex3/compare/2023-05-22...HEAD +[Unreleased]: https://github.com/latex3/latex3/compare/2023-06-05...HEAD +[2023-06-05]: https://github.com/latex3/latex3/compare/2023-05-22...2023-06-05 [2023-05-22]: https://github.com/latex3/latex3/compare/2023-05-15...2023-05-22 [2023-05-15]: https://github.com/latex3/latex3/compare/2023-05-11...2023-05-15 [2023-05-11]: https://github.com/latex3/latex3/compare/2023-05-05...2023-05-11 diff --git a/macros/latex/contrib/l3kernel/README.md b/macros/latex/contrib/l3kernel/README.md index dd571168c5..e340b712e0 100644 --- a/macros/latex/contrib/l3kernel/README.md +++ b/macros/latex/contrib/l3kernel/README.md @@ -1,7 +1,7 @@ LaTeX3 Programming Conventions ============================== -Release 2023-05-22 +Release 2023-06-05 Overview -------- diff --git a/macros/latex/contrib/l3kernel/expl3.dtx b/macros/latex/contrib/l3kernel/expl3.dtx index 622593cf8f..9066920e35 100644 --- a/macros/latex/contrib/l3kernel/expl3.dtx +++ b/macros/latex/contrib/l3kernel/expl3.dtx @@ -24,7 +24,7 @@ % %<*driver|generic|package|2ekernel> %</driver|generic|package|2ekernel> -\def\ExplFileDate{2023-05-22}% +\def\ExplFileDate{2023-06-05}% %<*driver> \documentclass[full]{l3doc} \usepackage{graphicx} @@ -51,7 +51,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -643,15 +643,15 @@ % as the argument, be it an integer, a length-type register, a token % list variable or similar. The value is passed to the function as a % braced token list. Can be applied to variables which have a -% \cs{\meta{var}_use:N} function (other than floating points and -% boxes), and which therefore deliver a single \enquote{value}. +% \cs{\meta{var}_use:N} function (other than boxes), +% and which therefore deliver a single \enquote{value}. % \item[v] Value of a register, constructed from a character string % used as a command name.\\ % This is a combination of |c| and |V| which first constructs a % control sequence from the argument and then passes the value of % the resulting register to the function. Can be applied to % variables which have a \cs{\meta{var}_use:N} function (other than -% floating points and boxes), and which therefore deliver a single +% boxes), and which therefore deliver a single % \enquote{value}. % \item[x] Fully-expanded token or braced token list.\\ % This means that the argument is expanded as in the replacement @@ -914,14 +914,6 @@ % required by the bootstrap code). See also \cs{debug_on:n} % \texttt{\{log-functions\}} in \pkg{l3candidates} for finer control. % -% \DescribeOption{enable-debug} -% To allow more localized checking and logging than provided by -% \texttt{check-declarations} and \texttt{log-functions}, \pkg{expl3} -% provides a few \cs[no-index]{debug_\ldots{}} functions (described -% elsewhere) that turn on the corresponding checks within a group. -% These functions can only be used if \pkg{expl3} is loaded with the -% \texttt{enable-debug} option. -% % \DescribeOption{backend} % Selects the backend to be used for color, graphics and related operations that % are backend-dependent. Options available are @@ -1392,19 +1384,28 @@ backend .choices:nn = { dvipdfmx , dvips , dvisvgm , luatex , pdftex , pdfmode , xdvipdfmx , xetex } { \sys_load_backend:n {#1} } , - check-declarations .code:n = + check-declarations .choice: , + check-declarations / true .code:n = + { \debug_on:n { check-declarations } } , + check-declarations / false .code:n = { - \sys_load_debug: - \debug_on:n { check-declarations } + \__kernel_if_debug:TF + { \debug_off:n { check-declarations } } + { } } , + check-declarations .default:n = true , driver .meta:n = { backend = #1 } , - enable-debug .code:n = - \sys_load_debug: , - log-functions .code:n = + enable-debug .code:n = {} , % A stub + log-functions .choice: , + log-functions / true .code:n = + { \debug_on:n { log-functions } } , + log-functions / false .code:n = { - \sys_load_debug: - \debug_on:n { log-functions } + \__kernel_if_debug:TF + { \debug_off:n { log-functions } } + { } } , + log-functions .default:n = true , suppress-backend-headers .bool_gset_inverse:N = \g__kernel_backend_header_bool , suppress-backend-headers .initial:n = false , diff --git a/macros/latex/contrib/l3kernel/expl3.pdf b/macros/latex/contrib/l3kernel/expl3.pdf Binary files differindex 9d6d1226ec..abe1806c37 100644 --- a/macros/latex/contrib/l3kernel/expl3.pdf +++ b/macros/latex/contrib/l3kernel/expl3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.pdf b/macros/latex/contrib/l3kernel/interface3.pdf Binary files differindex e5733b848b..4c97703ece 100644 --- a/macros/latex/contrib/l3kernel/interface3.pdf +++ b/macros/latex/contrib/l3kernel/interface3.pdf diff --git a/macros/latex/contrib/l3kernel/interface3.tex b/macros/latex/contrib/l3kernel/interface3.tex index f20b8d2d99..48deef820b 100644 --- a/macros/latex/contrib/l3kernel/interface3.tex +++ b/macros/latex/contrib/l3kernel/interface3.tex @@ -62,7 +62,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2023-05-22} +\date{Released 2023-06-05} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/l3basics.dtx b/macros/latex/contrib/l3kernel/l3basics.dtx index 291e93bf7b..da72c5cba9 100644 --- a/macros/latex/contrib/l3kernel/l3basics.dtx +++ b/macros/latex/contrib/l3kernel/l3basics.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -601,6 +601,7 @@ % \begin{function}[updated = 2012-01-14] % { % \cs_generate_from_arg_count:NNnn, +% \cs_generate_from_arg_count:NNno, % \cs_generate_from_arg_count:cNnn, % \cs_generate_from_arg_count:Ncnn % } @@ -870,7 +871,7 @@ % \end{texnote} % \end{function} % -% \begin{function}[EXP, added = 2019-02-27]{\cs_replacement_spec:N} +% \begin{function}[EXP, added = 2019-02-27]{\cs_replacement_spec:N, \cs_replacement_spec:c} % \begin{syntax} % \cs{cs_replacement_spec:N} \meta{token} % \end{syntax} @@ -1148,11 +1149,6 @@ % conditionals described above. % \end{description} % -% \begin{variable}{\c_true_bool, \c_false_bool} -% Constants that represent |true| and |false|, respectively. Used to -% implement predicates. -% \end{variable} -% % \subsection{Tests on control sequences} % % \begin{function}[EXP,pTF]{\cs_if_eq:NN} @@ -1291,7 +1287,7 @@ % % \section{Debugging support} % -% \begin{function}[added = 2017-07-16, updated = 2017-08-02]{\debug_on:n, \debug_off:n} +% \begin{function}[added = 2017-07-16, updated = 2023-05-23]{\debug_on:n, \debug_off:n} % \begin{syntax} % \cs{debug_on:n} |{| \meta{comma-separated list} |}| % \cs{debug_off:n} |{| \meta{comma-separated list} |}| @@ -1313,8 +1309,7 @@ % Providing these as switches rather than options allows testing code % even if it relies on other packages: load all other packages, call % \cs{debug_on:n}, and load the code that one is interested in -% testing. These functions can only be used in \LaTeXe{} package mode -% loaded with \texttt{enable-debug} or another option implying it. +% testing. % \end{function} % % \begin{function}[added = 2017-11-28]{\debug_suspend:, \debug_resume:} @@ -1803,13 +1798,13 @@ % \begin{macrocode} \cs_set_protected:Npn \debug_on:n #1 { - \msg_error:nnx { debug } { enable-debug } - { \tl_to_str:n { \debug_on:n {#1} } } + \sys_load_debug: + \debug_on:n {#1} } \cs_set_protected:Npn \debug_off:n #1 { - \msg_error:nnx { debug } { enable-debug } - { \tl_to_str:n { \debug_off:n {#1} } } + \sys_load_debug: + \debug_off:n {#1} } % \end{macrocode} % \end{macro} @@ -2161,7 +2156,12 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\prg_set_eq_conditional:NNn, \prg_new_eq_conditional:NNn} +% \begin{macro} +% { +% \prg_set_eq_conditional:NNn , +% \prg_gset_eq_conditional:NNn, +% \prg_new_eq_conditional:NNn +% } % \begin{macro}{\@@_set_eq_conditional:NNNn} % The setting-equal functions. Split both functions and feed % \Arg{name_1} \Arg{signature_1} \meta{boolean_1} @@ -2172,6 +2172,8 @@ % \begin{macrocode} \cs_set_protected:Npn \prg_set_eq_conditional:NNn { \@@_set_eq_conditional:NNNn \cs_set_eq:cc } +\cs_set_protected:Npn \prg_gset_eq_conditional:NNn + { \@@_set_eq_conditional:NNNn \cs_gset_eq:cc } \cs_set_protected:Npn \prg_new_eq_conditional:NNn { \@@_set_eq_conditional:NNNn \cs_new_eq:cc } \cs_set_protected:Npn \@@_set_eq_conditional:NNNn #1#2#3#4 @@ -3343,8 +3345,8 @@ % The approach here is different to that used by \LaTeXe{} or plain \TeX{}, % which unbox a void box to force horizontal mode. That inserts the % \tn{everypar} tokens \emph{before} the re-inserted unboxing tokens. The -% approach here uses either the \tn{quitvmode} primitive or the equivalent -% protected macro. In vertical mode, the \tn{indent} primitive is inserted: +% approach here uses a protected macro, equivalent to the \tn{quitvmode} +% primitive. In vertical mode, the \tn{indent} primitive is inserted: % this will switch to horizontal mode and insert \tn{everypar} tokens and % nothing else. Unlike the \LaTeXe{} version, the availability of \eTeX{} % means using a mode test can be done at for example the start of an diff --git a/macros/latex/contrib/l3kernel/l3bootstrap.dtx b/macros/latex/contrib/l3kernel/l3bootstrap.dtx index 8f69c22be3..152ace24f6 100644 --- a/macros/latex/contrib/l3kernel/l3bootstrap.dtx +++ b/macros/latex/contrib/l3kernel/l3bootstrap.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3box.dtx b/macros/latex/contrib/l3kernel/l3box.dtx index 3dc1a966de..093a1b23cd 100644 --- a/macros/latex/contrib/l3kernel/l3box.dtx +++ b/macros/latex/contrib/l3kernel/l3box.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3candidates.dtx b/macros/latex/contrib/l3kernel/l3candidates.dtx index 03639af043..fb60287e47 100644 --- a/macros/latex/contrib/l3kernel/l3candidates.dtx +++ b/macros/latex/contrib/l3kernel/l3candidates.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3cctab.dtx b/macros/latex/contrib/l3kernel/l3cctab.dtx index 2cbe46be18..f4e8088e3d 100644 --- a/macros/latex/contrib/l3kernel/l3cctab.dtx +++ b/macros/latex/contrib/l3kernel/l3cctab.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -52,7 +52,9 @@ % A category code table enables rapid switching of all category codes in % one operation. For \LuaTeX{}, this is possible over the entire Unicode % range. For other engines, only the $8$-bit range ($0$--$255$) is covered by -% such tables. +% such tables. The implementation of category code tables in \pkg{expl3} +% also saves and restores the \TeX{} \tn{endlinechar} primitive value, meaning +% they could be used for example to implement \cs{ExplSyntaxOn}. % % \section{Creating and initialising category code tables} % @@ -87,6 +89,15 @@ % can include a call to \cs{cctab_select:N}. % \end{function} % +% \begin{function}[added = 2023-05-26] +% {\cctab_gsave_current:N,\cctab_gsave_current:c} +% \begin{syntax} +% \cs{cctab_gsave_current:N} \meta{category code table} +% \end{syntax} +% Saves the current prevailing category codes in the +% \meta{category code table}. +% \end{function} +% % \section{Using category code tables} % % \begin{function}[updated = 2020-07-02]{\cctab_begin:N,\cctab_begin:c} @@ -141,19 +152,20 @@ % category code table. % \end{function} % -% \section{Constant category code tables} +% \section{Constant and scratch category code tables} % % \begin{variable}[updated = 2020-07-10]{\c_code_cctab} % Category code table for the \pkg{expl3} code environment; this does % \emph{not} include \texttt{@}, which is retained as an \enquote{other} -% character. +% character. Sets the \tn{endlinechar} value to $32$ (a space). % \end{variable} % % \begin{variable}[updated = 2020-07-08]{\c_document_cctab} % Category code table for a standard \LaTeX{} document, as set by the \LaTeX{} % kernel. In particular, the upper-half of the $8$-bit range will be set to % \enquote{active} with \pdfTeX{} \emph{only}. No \pkg{babel} shorthands -% will be activated. +% will be activated. Sets the \tn{endlinechar} value to $13$ (normal +% line ending). % \end{variable} % % \begin{variable}[updated = 2020-07-02]{\c_initex_cctab} @@ -162,13 +174,17 @@ % % \begin{variable}[updated = 2020-07-02]{\c_other_cctab} % Category code table where all characters have category code $12$ -% (other). +% (other). Sets the \tn{endlinechar} value to $-1$. % \end{variable} % % \begin{variable}[updated = 2020-07-02]{\c_str_cctab} % Category code table where all characters have category code $12$ % (other) with the exception of spaces, which have category code -% $10$ (space). +% $10$ (space). Sets the \tn{endlinechar} value to $-1$. +% \end{variable} +% +% \begin{variable}[added = 2023-05-26]{\g_tmpa_cctab, \g_tmpb_cctab} +% Scratch category code tables. % \end{variable} % % \end{documentation} @@ -363,6 +379,18 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}{\cctab_gsave_current:N, \cctab_gsave_current:c} +% Very simple. +% \begin{macrocode} +\cs_new_protected:Npn \cctab_gsave_current:N #1 + { + \@@_chk_if_valid:NT #1 + { \@@_gset:n {#1} } + } +\cs_generate_variant:Nn \cctab_gsave_current:N { c } +% \end{macrocode} +% \end{macro} +% % \subsection{Using category code tables} % % \begin{variable}{\g_@@_internal_cctab} @@ -864,6 +892,13 @@ % \end{macrocode} % \end{variable} % +% \begin{variable}{\g_tmpa_cctab, \g_tmpb_cctab} +% \begin{macrocode} +\cctab_new:N \g_tmpa_cctab +\cctab_new:N \g_tmpb_cctab +% \end{macrocode} +% \end{variable} +% % \subsection{Messages} % % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3clist.dtx b/macros/latex/contrib/l3kernel/l3clist.dtx index f25ff97911..4d712152b5 100644 --- a/macros/latex/contrib/l3kernel/l3clist.dtx +++ b/macros/latex/contrib/l3kernel/l3clist.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -241,12 +241,16 @@ % \begin{function}[updated = 2011-09-05] % { % \clist_put_left:Nn, \clist_put_left:NV, +% \clist_put_left:Nv, % \clist_put_left:No, \clist_put_left:Nx, % \clist_put_left:cn, \clist_put_left:cV, +% \clist_put_left:cv, % \clist_put_left:co, \clist_put_left:cx, % \clist_gput_left:Nn, \clist_gput_left:NV, +% \clist_gput_left:Nv, % \clist_gput_left:No, \clist_gput_left:Nx, % \clist_gput_left:cn, \clist_gput_left:cV, +% \clist_gput_left:cv, % \clist_gput_left:co, \clist_gput_left:cx % } % \begin{syntax} @@ -264,12 +268,16 @@ % \begin{function}[updated = 2011-09-05] % { % \clist_put_right:Nn, \clist_put_right:NV, +% \clist_put_right:Nv, % \clist_put_right:No, \clist_put_right:Nx, % \clist_put_right:cn, \clist_put_right:cV, +% \clist_put_right:cv, % \clist_put_right:co, \clist_put_right:cx, % \clist_gput_right:Nn, \clist_gput_right:NV, +% \clist_gput_right:Nv, % \clist_gput_right:No, \clist_gput_right:Nx, % \clist_gput_right:cn, \clist_gput_right:cV, +% \clist_gput_right:cv, % \clist_gput_right:co, \clist_gput_right:cx % } % \begin{syntax} @@ -1158,16 +1166,20 @@ % \begin{macro} % { % \clist_put_left:Nn, \clist_put_left:NV, +% \clist_put_left:Nv, % \clist_put_left:No, \clist_put_left:Nx, % \clist_put_left:cn, \clist_put_left:cV, +% \clist_put_left:cv, % \clist_put_left:co, \clist_put_left:cx % } % \UnitTested % \begin{macro} % { % \clist_gput_left:Nn, \clist_gput_left:NV, +% \clist_gput_left:Nv, % \clist_gput_left:No, \clist_gput_left:Nx, % \clist_gput_left:cn, \clist_gput_left:cV, +% \clist_gput_left:cv, % \clist_gput_left:co, \clist_gput_left:cx % } % \UnitTested @@ -1185,10 +1197,10 @@ #2 \l_@@_internal_clist {#4} #1 #3 \l_@@_internal_clist #3 } -\cs_generate_variant:Nn \clist_put_left:Nn { NV , No , Nx } -\cs_generate_variant:Nn \clist_put_left:Nn { c , cV , co , cx } -\cs_generate_variant:Nn \clist_gput_left:Nn { NV , No , Nx } -\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , co , cx } +\cs_generate_variant:Nn \clist_put_left:Nn { NV , Nv , No , Nx } +\cs_generate_variant:Nn \clist_put_left:Nn { c , cV , cv , co , cx } +\cs_generate_variant:Nn \clist_gput_left:Nn { NV , Nv , No , Nx } +\cs_generate_variant:Nn \clist_gput_left:Nn { c , cV , cv , co , cx } % \end{macrocode} % \end{macro} % \end{macro} @@ -1197,16 +1209,20 @@ % \begin{macro} % { % \clist_put_right:Nn, \clist_put_right:NV, +% \clist_put_right:Nv, % \clist_put_right:No, \clist_put_right:Nx, % \clist_put_right:cn, \clist_put_right:cV, +% \clist_put_right:cv, % \clist_put_right:co, \clist_put_right:cx % } % \UnitTested % \begin{macro} % { % \clist_gput_right:Nn, \clist_gput_right:NV, +% \clist_gput_right:Nv, % \clist_gput_right:No, \clist_gput_right:Nx, % \clist_gput_right:cn, \clist_gput_right:cV, +% \clist_gput_right:cv, % \clist_gput_right:co, \clist_gput_right:cx % } % \UnitTested @@ -1221,10 +1237,10 @@ #2 \l_@@_internal_clist {#4} #1 #3 #3 \l_@@_internal_clist } -\cs_generate_variant:Nn \clist_put_right:Nn { NV , No , Nx } -\cs_generate_variant:Nn \clist_put_right:Nn { c , cV , co , cx } -\cs_generate_variant:Nn \clist_gput_right:Nn { NV , No , Nx } -\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , co , cx } +\cs_generate_variant:Nn \clist_put_right:Nn { NV , Nv , No , Nx } +\cs_generate_variant:Nn \clist_put_right:Nn { c , cV , cv , co , cx } +\cs_generate_variant:Nn \clist_gput_right:Nn { NV , Nv , No , Nx } +\cs_generate_variant:Nn \clist_gput_right:Nn { c , cV , cv , co , cx } % \end{macrocode} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/l3kernel/l3coffins.dtx b/macros/latex/contrib/l3kernel/l3coffins.dtx index f44299c55d..39fdb7700e 100644 --- a/macros/latex/contrib/l3kernel/l3coffins.dtx +++ b/macros/latex/contrib/l3kernel/l3coffins.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3color.dtx b/macros/latex/contrib/l3kernel/l3color.dtx index c03bd0c4bb..fd20fd7903 100644 --- a/macros/latex/contrib/l3kernel/l3color.dtx +++ b/macros/latex/contrib/l3kernel/l3color.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3debug.dtx b/macros/latex/contrib/l3kernel/l3debug.dtx index b6d6099031..fe3e669c56 100644 --- a/macros/latex/contrib/l3kernel/l3debug.dtx +++ b/macros/latex/contrib/l3kernel/l3debug.dtx @@ -43,12 +43,18 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % % \begin{documentation} % +% \end{documentation} +% +% \begin{implementation} +% +% \section{\pkg{l3debug} implementation} +% % \begin{function}{\__kernel_chk_var_local:N, \__kernel_chk_var_global:N} % \begin{syntax} % \cs{__kernel_chk_var_local:N} \meta{var} @@ -112,12 +118,6 @@ % This function is only created if debugging is enabled. % \end{function} % -% \end{documentation} -% -% \begin{implementation} -% -% \section{\pkg{l3debug} implementation} -% % \begin{macrocode} %<*package> % \end{macrocode} @@ -602,7 +602,8 @@ \cs_new:Npn \@@_arg_return:N #1 { \exp_after:wN #1 \exp:w \exp_end_continue_f:w } % \end{macrocode} -% \end{variable} +% \end{macro} +% \end{macro} % % \begin{macro}{ % \__kernel_patch:nnn, @@ -1471,7 +1472,7 @@ \\ LaTeX~will~create~the~variable~and~continue. } -% \end{macrocode} +% \end{macrocode} % % \begin{macro}{\__kernel_if_debug:TF} % Flip the switch for deprecated code. diff --git a/macros/latex/contrib/l3kernel/l3deprecation.dtx b/macros/latex/contrib/l3kernel/l3deprecation.dtx index 05264251e4..806c62670e 100644 --- a/macros/latex/contrib/l3kernel/l3deprecation.dtx +++ b/macros/latex/contrib/l3kernel/l3deprecation.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -583,6 +583,22 @@ % \end{macrocode} % \end{macro} % +% \begin{macro}[noTF]{\tl_case:Nn, \tl_case:cn} +% \begin{macrocode} +\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:Nn } +\cs_gset:Npn \tl_case:Nn { \token_case_meaning:Nn } +\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnT } +\cs_gset:Npn \tl_case:NnT { \token_case_meaning:NnT } +\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnF } +\cs_gset:Npn \tl_case:NnF { \token_case_meaning:NnF } +\__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnTF } +\cs_gset:Npn \tl_case:NnTF { \token_case_meaning:NnTF } +\cs_generate_variant:Nn \tl_case:Nn { c } +\prg_generate_conditional_variant:Nnn \tl_case:Nn + { c } { T , F , TF } +% \end{macrocode} +% \end{macro} +% % \subsection{Deprecated \pkg{l3token} functions} % % \begin{macro}[EXP]{\char_to_utfviii_bytes:n} diff --git a/macros/latex/contrib/l3kernel/l3doc.dtx b/macros/latex/contrib/l3kernel/l3doc.dtx index 1c789c1210..58778973a4 100644 --- a/macros/latex/contrib/l3kernel/l3doc.dtx +++ b/macros/latex/contrib/l3kernel/l3doc.dtx @@ -85,7 +85,7 @@ and all files in that bundle must be distributed together. % require you to do updates, if the class changes.}} % % \author{\Team} -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % \maketitle % \tableofcontents % @@ -3374,7 +3374,7 @@ and all files in that bundle must be distributed together. \seq_set_map:NNn \l_@@_tmpa_seq \g_@@_nested_names_seq { \@@_macro_end_wrap_item:n {##1} } - End~ definition~ for~ + End~ of~ definition~ for~ \int_compare:nTF { \seq_count:N \l_@@_tmpa_seq <= 3 } { \seq_use:Nnnn \l_@@_tmpa_seq diff --git a/macros/latex/contrib/l3kernel/l3doc.pdf b/macros/latex/contrib/l3kernel/l3doc.pdf Binary files differindex c87a456156..4de407b4bf 100644 --- a/macros/latex/contrib/l3kernel/l3doc.pdf +++ b/macros/latex/contrib/l3kernel/l3doc.pdf diff --git a/macros/latex/contrib/l3kernel/l3docstrip.dtx b/macros/latex/contrib/l3kernel/l3docstrip.dtx index 715bceeb30..3d4536d5a4 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.dtx +++ b/macros/latex/contrib/l3kernel/l3docstrip.dtx @@ -63,7 +63,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3docstrip.pdf b/macros/latex/contrib/l3kernel/l3docstrip.pdf Binary files differindex 63e4c7157b..cd86234a1b 100644 --- a/macros/latex/contrib/l3kernel/l3docstrip.pdf +++ b/macros/latex/contrib/l3kernel/l3docstrip.pdf diff --git a/macros/latex/contrib/l3kernel/l3expan.dtx b/macros/latex/contrib/l3kernel/l3expan.dtx index 9288a5271c..8e52b52659 100644 --- a/macros/latex/contrib/l3kernel/l3expan.dtx +++ b/macros/latex/contrib/l3kernel/l3expan.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -134,7 +134,8 @@ % comma-separated list of \meta{variant argument specifiers} is % then used to define variants of the % \meta{original argument specifier} if these are not already -% defined. For each \meta{variant} given, a function is created +% defined; entries which correspond to existing functions are silently +% ingored. For each \meta{variant} given, a function is created % that expands its arguments as detailed and passes them % to the \meta{parent control sequence}. So for example % \begin{verbatim} @@ -150,7 +151,7 @@ % generates the functions |\foo:NV| and |\foo:cV| in the same % way. The \cs{cs_generate_variant:Nn} function should only be applied if % the \meta{parent control sequence} is already defined. (This is only -% enforced if debugging support is enabled.) +% enforced if debugging support \texttt{check-declarations} is enabled.) % If the \meta{parent % control sequence} is protected or if the \meta{variant} involves any % |x|~argument, then the \meta{variant control sequence} is also @@ -158,7 +159,9 @@ % \cs[no-index]{exp_args:N\meta{variant}} function needed to carry out the % expansion. There is no need to re-apply \cs{cs_generate_variant:Nn} after % changing the definition of the parent function: the variant will always -% use the current definition of the parent. +% use the current definition of the parent. Providing variants repeatedly is +% safe as \cs{cs_generate_variant:Nn} will only create new definitions if +% there is not already one available. % % Only |n|~and |N| arguments can be changed to other types. The only % allowed changes are @@ -1729,7 +1732,7 @@ % % The other case where variants should be protected is when the parent % function is a protected macro: then |protected| appears in the -% meaning before the fist occurrence of |macro|. The |ww| auxiliary +% meaning before the first occurrence of |macro|. The |ww| auxiliary % removes everything in the meaning string after the first |ma|. We % use |ma| rather than the full |macro| because the meaning of the % \tn{firstmark} primitive (and four others) can contain an arbitrary @@ -2387,6 +2390,18 @@ % \end{macro} % \end{macro} % +% \subsection{Held-over variant generation} +% +% \begin{macro}{\cs_generate_from_arg_count:NNno} +% \begin{macro}{\cs_replacement_spec:c} +% A couple of variants that are from early functions. +% \begin{macrocode} +\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNno } +\cs_generate_variant:Nn \cs_replacement_spec:N { c } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macrocode} %</package> % \end{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3file.dtx b/macros/latex/contrib/l3kernel/l3file.dtx index c4e5f0b1ce..5e2d8ba74d 100644 --- a/macros/latex/contrib/l3kernel/l3file.dtx +++ b/macros/latex/contrib/l3kernel/l3file.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -157,6 +157,23 @@ % \cs{sys_get_shell:nnNTF}. % \end{function} % +% \begin{function}[added = 2023-05-25]{\iow_shell_open:Nn} +% \begin{syntax} +% \cs{iow_shell_open:Nn} \meta{stream} \Arg{shell~command} +% \end{syntax} +% Opens the \emph{pseudo}-file created by the output of the +% \meta{shell command} for writing using \meta{stream} as the +% control sequence for access. If the \meta{stream} was already +% open it is closed before the new operation begins. The +% \meta{stream} is available for access immediately and will remain +% allocated to \meta{shell command} until a \cs{iow_close:N} instruction +% is given or the \TeX{} run ends. +% If piped system calls are disabled an error is raised. +% +% For details of handling of the \meta{shell command}, see +% \cs{sys_get_shell:nnNTF}. +% \end{function} +% % \begin{function}[updated = 2012-07-31] % {\ior_close:N, \ior_close:c, \iow_close:N, \iow_close:c} % \begin{syntax} @@ -917,6 +934,21 @@ % function. An error is raised if the file is not found. % \end{function} % +% \begin{function}[added = 2023-05-18, EXP]{\file_input_raw:n} +% \begin{syntax} +% \cs{file_input_raw:n} \Arg{file name} +% \end{syntax} +% Searches for \meta{file name} in the path as detailed for +% \cs{file_if_exist:nTF}, and if found reads in the file as +% additional \TeX{} source. No data concerning the file is +% tracked. If the file is not found, no action is taken. +% \begin{texnote} +% This function is intended only for contexts where files must +% be read purely by expansion, for example at the start of a +% table cell in an \tn{halign}. +% \end{texnote} +% \end{function} +% % \begin{function}[added = 2014-07-02]{\file_if_exist_input:n, \file_if_exist_input:nF} % \begin{syntax} % \cs{file_if_exist_input:n} \Arg{file name} @@ -1169,7 +1201,7 @@ { \sys_if_shell:TF { \exp_args:No \@@_shell_open:nN { \tl_to_str:n {#2} } #1 } - { \msg_error:nn { ior } { pipe-failed } } + { \msg_error:nn { kernel } { pipe-failed } } } \cs_new_protected:Npn \@@_shell_open:nN #1#2 { @@ -1180,7 +1212,7 @@ } { \__kernel_ior_open:Nn #2 { |#1 } } } -\msg_new:nnnn { ior } { pipe-failed } +\msg_new:nnnn { kernel } { pipe-failed } { Cannot~run~piped~system~commands. } { LaTeX~tried~to~call~a~system~process~but~this~was~not~possible.\\ @@ -1634,6 +1666,29 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\iow_shell_open:Nn} +% \begin{macro}{\@@_shell_open:nN} +% Very similar to the \texttt{ior} version +% \begin{macrocode} +\cs_new_protected:Npn \iow_shell_open:Nn #1#2 + { + \sys_if_shell:TF + { \exp_args:No \@@_shell_open:nN { \tl_to_str:n {#2} } #1 } + { \msg_error:nn { kernel } { pipe-failed } } + } +\cs_new_protected:Npn \@@_shell_open:nN #1#2 + { + \tl_if_in:nnTF {#1} { " } + { + \msg_error:nnx + { kernel } { quote-in-shell } {#1} + } + { \__kernel_iow_open:Nn #2 { |#1 } } + } +% \end{macrocode} +% \end{macro} +% \end{macro} +% % \begin{macro}{\iow_close:N, \iow_close:c} % Closing a stream is not quite the reverse of opening one. First, % the close operation is easier than the open one, and second as the @@ -2818,7 +2873,9 @@ % % \begin{macro}[EXP]{\file_full_name:n, \@@_full_name:n, \@@_full_name_aux:n} % \begin{macro}[EXP]{\@@_full_name_auxi:nn, \@@_full_name_auxii:nn} -% \begin{macro}[EXP]{\@@_full_name_aux:Nnnn} +% \begin{macro}[EXP]{\@@_full_name_aux:Nnn} +% \begin{macro}[EXP]{\@@_full_name_slash:n} +% \begin{macro}[EXP]{\@@_full_name_slash:w} % \begin{macro}[EXP]{\@@_full_name_aux:nN} % \begin{macro}[EXP]{\@@_full_name_aux:nnN} % \begin{macro}[EXP]{\@@_name_cleanup:w} @@ -2888,11 +2945,11 @@ \tl_if_blank:nTF {#2} { \seq_map_tokens:Nn \l_file_search_path_seq - { \@@_full_name_aux:Nnnn \seq_map_break:n {#1} { / } } + { \@@_full_name_aux:Nnn \seq_map_break:n {#1} } \cs_if_exist:NT \input@path { \tl_map_tokens:Nn \input@path - { \@@_full_name_aux:Nnnn \tl_map_break:n {#1} { } } + { \@@_full_name_aux:Nnn \tl_map_break:n {#1} } } \@@_name_end: } @@ -2902,8 +2959,25 @@ % Two pars to the auxiliary here so we can avoid doing quoting % twice in the event we find the right file. % \begin{macrocode} -\cs_new:Npn \@@_full_name_aux:Nnnn #1#2#3#4 - { \exp_args:Ne \@@_full_name_aux:nN { \tl_to_str:n {#4} #3 #2 } #1 } +\cs_new:Npn \@@_full_name_aux:Nnn #1#2#3 + { + \exp_args:Ne \@@_full_name_aux:nN + { + \exp_args:Ne \@@_full_name_slash:n + { \tl_to_str:n {#3} } #2 + } + #1 + } +\cs_new:Npn \@@_full_name_slash:n #1 + { + \@@_full_name_slash:nw {#1} #1 \q_nil / \q_nil / \q_nil \q_stop + } +\cs_new:Npn \@@_full_name_slash:nw #1#2 / \q_nil / #3 \q_stop + { + \quark_if_nil:nTF {#3} + { #1 / } + { #2 / } + } \cs_new:Npn \@@_full_name_aux:nN #1 { \exp_args:Nne \@@_full_name_aux:nnN {#1} { \@@_full_name_aux:n {#1} } } \cs_new:Npn \@@_full_name_aux:nnN #1 #2 #3 @@ -2971,6 +3045,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % % \begin{macro}{\file_get_full_name:nN, \file_get_full_name:VN} % \begin{macro}[TF]{\file_get_full_name:nN, \file_get_full_name:VN} @@ -3355,6 +3431,30 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\file_input_raw:n, \@@_input_raw:nn} +% No error checking, no tracking. +% \begin{macrocode} +\cs_new:Npn \file_input_raw:n #1 + { \exp_args:Ne \@@_input_raw:nn { \file_full_name:n {#1} } {#1} } +\cs_new:Npx \@@_input_raw:nn #1#2 + { + \exp_not:N \tl_if_blank:nTF {#1} + { + \exp_not:N \exp_args:Nnne \exp_not:N \msg_expandable_error:nnn + { kernel } { file-not-found } + { \exp_not:N \__kernel_file_name_sanitize:n {#2} } + } + { + \exp_not:N \tex_input:D + \sys_if_engine_luatex:TF + { {#1} } + { \exp_not:N \__kernel_file_name_quote:n {#1} \scan_stop: } + } + } +\exp_args_generate:n { nne } +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\file_parse_full_name:n, \file_parse_full_name_apply:nN} % The main parsing macro \cs{file_parse_full_name_apply:nN} passes the % file name |#1| through \cs{__kernel_file_name_sanitize:n} so that we diff --git a/macros/latex/contrib/l3kernel/l3flag.dtx b/macros/latex/contrib/l3kernel/l3flag.dtx index d34922db45..9640a6d2db 100644 --- a/macros/latex/contrib/l3kernel/l3flag.dtx +++ b/macros/latex/contrib/l3kernel/l3flag.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-assign.dtx b/macros/latex/contrib/l3kernel/l3fp-assign.dtx index 1021bfb830..ae30092b63 100644 --- a/macros/latex/contrib/l3kernel/l3fp-assign.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-assign.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-aux.dtx b/macros/latex/contrib/l3kernel/l3fp-aux.dtx index c138c06d2a..025a0af647 100644 --- a/macros/latex/contrib/l3kernel/l3fp-aux.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-aux.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-basics.dtx b/macros/latex/contrib/l3kernel/l3fp-basics.dtx index d041b95689..875027466d 100644 --- a/macros/latex/contrib/l3kernel/l3fp-basics.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-basics.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-convert.dtx b/macros/latex/contrib/l3kernel/l3fp-convert.dtx index ee86a451c8..6651d7931c 100644 --- a/macros/latex/contrib/l3kernel/l3fp-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-convert.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-expo.dtx b/macros/latex/contrib/l3kernel/l3fp-expo.dtx index 312d0a33ca..42a6ebbbf1 100644 --- a/macros/latex/contrib/l3kernel/l3fp-expo.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-expo.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-extended.dtx b/macros/latex/contrib/l3kernel/l3fp-extended.dtx index f11d8f5f2c..6e57dbc01b 100644 --- a/macros/latex/contrib/l3kernel/l3fp-extended.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-extended.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -172,10 +172,10 @@ % \subsection{Multiplying a fixed point number by a short one} % % \begin{macro}[EXP]{\@@_fixed_mul_short:wwn} -% \begin{syntax} +% \begin{syntax}\parskip=0pt\obeylines % \cs{@@_fixed_mul_short:wwn} -% \ \ \Arg{a_1} \Arg{a_2} \Arg{a_3} \Arg{a_4} \Arg{a_5} \Arg{a_6} |;| -% \ \ \Arg{b_0} \Arg{b_1} \Arg{b_2} |;| \Arg{continuation} +% | |\Arg{a_1} \Arg{a_2} \Arg{a_3} \Arg{a_4} \Arg{a_5} \Arg{a_6} |;| +% | |\Arg{b_0} \Arg{b_1} \Arg{b_2} |;| \Arg{continuation} % \end{syntax} % Computes the product $c=ab$ of $a=\sum_i \meta{a_i} 10^{-4i}$ and % $b=\sum_i \meta{b_i} 10^{-4i}$, rounds it to the closest multiple of diff --git a/macros/latex/contrib/l3kernel/l3fp-logic.dtx b/macros/latex/contrib/l3kernel/l3fp-logic.dtx index 1796aa16b5..4f58336b12 100644 --- a/macros/latex/contrib/l3kernel/l3fp-logic.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-logic.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-parse.dtx b/macros/latex/contrib/l3kernel/l3fp-parse.dtx index 93bbc4a799..84ca08a545 100644 --- a/macros/latex/contrib/l3kernel/l3fp-parse.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-parse.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-random.dtx b/macros/latex/contrib/l3kernel/l3fp-random.dtx index 54979b8701..0bb4a9209a 100644 --- a/macros/latex/contrib/l3kernel/l3fp-random.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-random.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-round.dtx b/macros/latex/contrib/l3kernel/l3fp-round.dtx index 14e327ab17..1ceeb011ef 100644 --- a/macros/latex/contrib/l3kernel/l3fp-round.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-round.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp-traps.dtx b/macros/latex/contrib/l3kernel/l3fp-traps.dtx index 23857d73e6..d8c7b6aef5 100644 --- a/macros/latex/contrib/l3kernel/l3fp-traps.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-traps.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % \maketitle % % \begin{documentation} diff --git a/macros/latex/contrib/l3kernel/l3fp-trig.dtx b/macros/latex/contrib/l3kernel/l3fp-trig.dtx index a30c683e6c..6cd98b62d9 100644 --- a/macros/latex/contrib/l3kernel/l3fp-trig.dtx +++ b/macros/latex/contrib/l3kernel/l3fp-trig.dtx @@ -40,7 +40,7 @@ % {latex-team@latex-project.org}^^A % }^^A % } -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fp.dtx b/macros/latex/contrib/l3kernel/l3fp.dtx index 29f1ed453e..3c7144eb28 100644 --- a/macros/latex/contrib/l3kernel/l3fp.dtx +++ b/macros/latex/contrib/l3kernel/l3fp.dtx @@ -49,7 +49,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3fparray.dtx b/macros/latex/contrib/l3kernel/l3fparray.dtx index 33b17da6ad..afc55ae4af 100644 --- a/macros/latex/contrib/l3kernel/l3fparray.dtx +++ b/macros/latex/contrib/l3kernel/l3fparray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3int.dtx b/macros/latex/contrib/l3kernel/l3int.dtx index bf3c413b28..a5bf5279a2 100644 --- a/macros/latex/contrib/l3kernel/l3int.dtx +++ b/macros/latex/contrib/l3kernel/l3int.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -189,7 +189,8 @@ % explict integers, and this may terminate the expression: for % instance, \cs{int_eval:w} \verb*|1 + 1 9| (with explicit space % tokens inserted using |~| in a code setting) expands to \texttt{29} -% since the digit~\texttt{9} is not part of the expression. +% since the digit~\texttt{9} is not part of the expression. Expansion +% details, etc., are as given for \cs{int_eval:n}. % \end{function} % % \begin{function}[EXP, added = 2018-11-03]{\int_sign:n} diff --git a/macros/latex/contrib/l3kernel/l3intarray.dtx b/macros/latex/contrib/l3kernel/l3intarray.dtx index 3978f7f53a..1eeec96a3d 100644 --- a/macros/latex/contrib/l3kernel/l3intarray.dtx +++ b/macros/latex/contrib/l3kernel/l3intarray.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx index f97ddf0a3f..471c3c52dc 100644 --- a/macros/latex/contrib/l3kernel/l3kernel-functions.dtx +++ b/macros/latex/contrib/l3kernel/l3kernel-functions.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -93,9 +93,9 @@ % \end{function} % % \begin{function}{\__kernel_chk_tl_type:NnnT} -% \begin{syntax} +% \begin{syntax}\parskip=0pt\obeylines % \cs{__kernel_chk_tl_type:NnnT} \meta{control sequence} \Arg{specific type} \\ -% \ \ \Arg{reconstruction} \Arg{true code} +% | |\Arg{reconstruction} \Arg{true code} % \end{syntax} % Helper to test that the \meta{control sequence} is a variable of the % given \meta{specific type} of token list. Produces suitable error diff --git a/macros/latex/contrib/l3kernel/l3keys.dtx b/macros/latex/contrib/l3kernel/l3keys.dtx index 84d5bc1d96..d8cec60f8f 100644 --- a/macros/latex/contrib/l3kernel/l3keys.dtx +++ b/macros/latex/contrib/l3kernel/l3keys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -286,6 +286,12 @@ % forbidden. Thus a required value cannot be supplied by a default % value, and giving a default value for a key which cannot take a value % does not trigger an error. +% +% When no value is given for a key as part of \cs{keys_set:nn}, the +% \texttt{.default:n} value provides the value before key properties are +% considered. The only exception is when the \texttt{.value_required:n} +% property is active: a required value cannot be supplied by the default, +% and must be explicitly given as part of \cs{keys_set:nn}. % \end{function} % % \begin{function}[updated = 2020-01-17] @@ -717,7 +723,7 @@ % \section{Setting keys} % % \begin{function}[updated = 2017-11-14] -% {\keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no} +% {\keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no, \keys_set:nx} % \begin{syntax} % \cs{keys_set:nn} \Arg{module} \Arg{keyval list} % \end{syntax} @@ -731,8 +737,8 @@ % {\l_keys_key_str, \l_keys_path_str, \l_keys_value_tl} % For each key processed, information of the full \emph{path} of the % key, the \emph{name} of the key and the \emph{value} of the key is -% available within three token list variables. These may be used within -% the code of the key. +% available within two string and one token list variables. +% These may be used within the code of the key. % % The \emph{value} is everything after the \texttt{=}, which may be % empty if no value was given. This is stored in \cs{l_keys_value_tl}, and @@ -2079,7 +2085,8 @@ \l_keys_path_str \s_@@_stop \l_keys_key_tl \l_keys_key_str \tl_set_eq:NN \l_keys_key_tl \l_keys_key_str - \@@_execute:nn \l_keys_path_str {#1} + \tl_set:Nn \l_keys_value_tl {#1} + \@@_execute:no \l_keys_path_str \l_keys_value_tl } } } @@ -2716,7 +2723,7 @@ % % \begin{macro} % { -% \keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no, +% \keys_set:nn, \keys_set:nV, \keys_set:nv, \keys_set:no, \keys_set:nx, % \@@_set:nn % } % \begin{macro}{\@@_set:nnn} @@ -2742,7 +2749,7 @@ { \exp_not:o \l_@@_relative_tl } } } -\cs_generate_variant:Nn \keys_set:nn { nV , nv , no } +\cs_generate_variant:Nn \keys_set:nn { nV , nv , no , nx } \cs_new_protected:Npn \@@_set:nn #1#2 { \exp_args:No \@@_set:nnn \l_@@_module_str {#1} {#2} } \cs_new_protected:Npn \@@_set:nnn #1#2#3 diff --git a/macros/latex/contrib/l3kernel/l3legacy.dtx b/macros/latex/contrib/l3kernel/l3legacy.dtx index 867d369f12..5e199990a4 100644 --- a/macros/latex/contrib/l3kernel/l3legacy.dtx +++ b/macros/latex/contrib/l3kernel/l3legacy.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3luatex.dtx b/macros/latex/contrib/l3kernel/l3luatex.dtx index 5849266ddb..2735f6efa2 100644 --- a/macros/latex/contrib/l3kernel/l3luatex.dtx +++ b/macros/latex/contrib/l3kernel/l3luatex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3msg.dtx b/macros/latex/contrib/l3kernel/l3msg.dtx index 41812fd5f7..88bf2d8b55 100644 --- a/macros/latex/contrib/l3kernel/l3msg.dtx +++ b/macros/latex/contrib/l3kernel/l3msg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -2056,22 +2056,6 @@ } % \end{macrocode} % -% Some errors are only needed in package mode if debugging is enabled by -% one of the options \texttt{enable-debug}, \texttt{check-declarations}, -% \texttt{log-functions}, or on the contrary if debugging is turned off. -% In format mode the error is somewhat different. -% \begin{macrocode} -\msg_new:nnnn { debug } { enable-debug } - { To~use~'#1'~set~the~'enable-debug'~option. } - { - The~function~'#1'~will~be~ignored~because~it~can~only~work~if~ - some~internal~functions~in~expl3~have~been~appropriately~ - defined.~This~only~happens~if~one~of~the~options~ - 'enable-debug',~'check-declarations'~or~'log-functions'~was~ - given~as~an~option:~see~the~main~expl3~documentation. - } -% \end{macrocode} -% % Some errors only appear in expandable settings, % hence don't need a \enquote{more-text} argument. % \begin{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3names.dtx b/macros/latex/contrib/l3kernel/l3names.dtx index 97f4b0431d..9158270a84 100644 --- a/macros/latex/contrib/l3kernel/l3names.dtx +++ b/macros/latex/contrib/l3kernel/l3names.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3news.pdf b/macros/latex/contrib/l3kernel/l3news.pdf Binary files differindex 28d77fd1d6..9c485f66f1 100644 --- a/macros/latex/contrib/l3kernel/l3news.pdf +++ b/macros/latex/contrib/l3kernel/l3news.pdf diff --git a/macros/latex/contrib/l3kernel/l3news01.pdf b/macros/latex/contrib/l3kernel/l3news01.pdf Binary files differindex 011b51961d..50bb4103ff 100644 --- a/macros/latex/contrib/l3kernel/l3news01.pdf +++ b/macros/latex/contrib/l3kernel/l3news01.pdf diff --git a/macros/latex/contrib/l3kernel/l3news02.pdf b/macros/latex/contrib/l3kernel/l3news02.pdf Binary files differindex 0175fd31b2..a0c6f3f6e4 100644 --- a/macros/latex/contrib/l3kernel/l3news02.pdf +++ b/macros/latex/contrib/l3kernel/l3news02.pdf diff --git a/macros/latex/contrib/l3kernel/l3news03.pdf b/macros/latex/contrib/l3kernel/l3news03.pdf Binary files differindex ad2cd7dd33..2ebae6016e 100644 --- a/macros/latex/contrib/l3kernel/l3news03.pdf +++ b/macros/latex/contrib/l3kernel/l3news03.pdf diff --git a/macros/latex/contrib/l3kernel/l3news04.pdf b/macros/latex/contrib/l3kernel/l3news04.pdf Binary files differindex d283d35e09..a61d3e009f 100644 --- a/macros/latex/contrib/l3kernel/l3news04.pdf +++ b/macros/latex/contrib/l3kernel/l3news04.pdf diff --git a/macros/latex/contrib/l3kernel/l3news05.pdf b/macros/latex/contrib/l3kernel/l3news05.pdf Binary files differindex d1e73ffb4b..b750ca4d87 100644 --- a/macros/latex/contrib/l3kernel/l3news05.pdf +++ b/macros/latex/contrib/l3kernel/l3news05.pdf diff --git a/macros/latex/contrib/l3kernel/l3news06.pdf b/macros/latex/contrib/l3kernel/l3news06.pdf Binary files differindex fe6fb8ad49..5e01a63e75 100644 --- a/macros/latex/contrib/l3kernel/l3news06.pdf +++ b/macros/latex/contrib/l3kernel/l3news06.pdf diff --git a/macros/latex/contrib/l3kernel/l3news07.pdf b/macros/latex/contrib/l3kernel/l3news07.pdf Binary files differindex 8e6967b08a..6e0298e5a2 100644 --- a/macros/latex/contrib/l3kernel/l3news07.pdf +++ b/macros/latex/contrib/l3kernel/l3news07.pdf diff --git a/macros/latex/contrib/l3kernel/l3news08.pdf b/macros/latex/contrib/l3kernel/l3news08.pdf Binary files differindex d32b9bff99..35b0094b1d 100644 --- a/macros/latex/contrib/l3kernel/l3news08.pdf +++ b/macros/latex/contrib/l3kernel/l3news08.pdf diff --git a/macros/latex/contrib/l3kernel/l3news09.pdf b/macros/latex/contrib/l3kernel/l3news09.pdf Binary files differindex 2e54f340e3..dcf4d4ed80 100644 --- a/macros/latex/contrib/l3kernel/l3news09.pdf +++ b/macros/latex/contrib/l3kernel/l3news09.pdf diff --git a/macros/latex/contrib/l3kernel/l3news10.pdf b/macros/latex/contrib/l3kernel/l3news10.pdf Binary files differindex 4039ae74b8..aff50d892b 100644 --- a/macros/latex/contrib/l3kernel/l3news10.pdf +++ b/macros/latex/contrib/l3kernel/l3news10.pdf diff --git a/macros/latex/contrib/l3kernel/l3news11.pdf b/macros/latex/contrib/l3kernel/l3news11.pdf Binary files differindex 308e42b7ea..7d4d2e520e 100644 --- a/macros/latex/contrib/l3kernel/l3news11.pdf +++ b/macros/latex/contrib/l3kernel/l3news11.pdf diff --git a/macros/latex/contrib/l3kernel/l3news12.pdf b/macros/latex/contrib/l3kernel/l3news12.pdf Binary files differindex 086869b52c..86ef749e1e 100644 --- a/macros/latex/contrib/l3kernel/l3news12.pdf +++ b/macros/latex/contrib/l3kernel/l3news12.pdf diff --git a/macros/latex/contrib/l3kernel/l3pdf.dtx b/macros/latex/contrib/l3kernel/l3pdf.dtx index 38896f7d87..c223938d2a 100644 --- a/macros/latex/contrib/l3kernel/l3pdf.dtx +++ b/macros/latex/contrib/l3kernel/l3pdf.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3prefixes.pdf b/macros/latex/contrib/l3kernel/l3prefixes.pdf Binary files differindex 9476774444..bde496ca75 100644 --- a/macros/latex/contrib/l3kernel/l3prefixes.pdf +++ b/macros/latex/contrib/l3kernel/l3prefixes.pdf diff --git a/macros/latex/contrib/l3kernel/l3prg.dtx b/macros/latex/contrib/l3kernel/l3prg.dtx index 7374a8d8b9..27a383899b 100644 --- a/macros/latex/contrib/l3kernel/l3prg.dtx +++ b/macros/latex/contrib/l3kernel/l3prg.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -171,7 +171,12 @@ % state. There must be a return statement for each branch; failing to do % so will result in erroneous output if that branch is executed. % -% \begin{function}{\prg_new_eq_conditional:NNn, \prg_set_eq_conditional:NNn} +% \begin{function}[updated = 2023-05-26] +% { +% \prg_new_eq_conditional:NNn, +% \prg_set_eq_conditional:NNn, +% \prg_gset_eq_conditional:NNn +% } % \begin{syntax} % \cs{prg_new_eq_conditional:NNn} \cs[no-index]{\meta{name_1}:\meta{arg spec_1}} \cs[no-index]{\meta{name_2}:\meta{arg spec_2}} \Arg{conditions} % \end{syntax} @@ -375,7 +380,12 @@ % check that the \meta{boolean} really is a boolean variable. % \end{function} % -% \subsection{Scratch booleans} +% \subsection{Constant and scratch booleans} +% +% \begin{variable}{\c_true_bool, \c_false_bool} +% Constants that represent |true| and |false|, respectively. Used to +% implement predicates. +% \end{variable} % % \begin{variable}{\l_tmpa_bool, \l_tmpb_bool} % A scratch boolean for local assignment. It is never used by diff --git a/macros/latex/contrib/l3kernel/l3prop.dtx b/macros/latex/contrib/l3kernel/l3prop.dtx index 259009a181..d254e43280 100644 --- a/macros/latex/contrib/l3kernel/l3prop.dtx +++ b/macros/latex/contrib/l3kernel/l3prop.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -165,16 +165,16 @@ % % \begin{function}[updated = 2012-07-09] % { -% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nnx, +% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nne, \prop_put:Nnx, % \prop_put:NVn, \prop_put:NVV, \prop_put:NVx, \prop_put:Nvx, % \prop_put:Non, \prop_put:Noo, \prop_put:Nxx, -% \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cnx, +% \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cne, \prop_put:cnx, % \prop_put:cVn, \prop_put:cVV, \prop_put:cVx, \prop_put:cvx, % \prop_put:con, \prop_put:coo, \prop_put:cxx, -% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nnx, +% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx, % \prop_gput:NVn, \prop_gput:NVV, \prop_gput:NVx, \prop_gput:Nvx, % \prop_gput:Non, \prop_gput:Noo, \prop_gput:Nxx, -% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cnx, +% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx, % \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx, % \prop_gput:con, \prop_gput:coo, \prop_gput:cxx % } @@ -1152,19 +1152,19 @@ % % \begin{macro}[tested = m3prop002] % { -% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nnx, +% \prop_put:Nnn, \prop_put:NnV, \prop_put:Nno, \prop_put:Nne, \prop_put:Nnx, % \prop_put:NVn, \prop_put:NVV, \prop_put:NVx, \prop_put:Nvx, % \prop_put:Non, \prop_put:Noo, \prop_put:Nxx, -% \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cnx, +% \prop_put:cnn, \prop_put:cnV, \prop_put:cno, \prop_put:cne, \prop_put:cnx, % \prop_put:cVn, \prop_put:cVV, \prop_put:cVx, \prop_put:cvx, % \prop_put:con, \prop_put:coo, \prop_put:cxx % } % \begin{macro}[tested = m3prop002] % { -% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nnx, +% \prop_gput:Nnn, \prop_gput:NnV, \prop_gput:Nno, \prop_gput:Nne, \prop_gput:Nnx, % \prop_gput:NVn, \prop_gput:NVV, \prop_hput:NVx, \prop_hput:Nvx, % \prop_gput:Non, \prop_gput:Noo, \prop_gput:Nxx, -% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cnx, +% \prop_gput:cnn, \prop_gput:cnV, \prop_gput:cno, \prop_gput:cne, \prop_gput:cnx, % \prop_gput:cVn, \prop_gput:cVV, \prop_gput:cVx, \prop_gput:cvx, % \prop_gput:con, \prop_gput:coo, \prop_gput:cxx % } @@ -1196,13 +1196,13 @@ { #1 #2 { \exp_not:o {#2} \l_@@_internal_tl } } } \cs_generate_variant:Nn \prop_put:Nnn - { NnV , Nno , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx } + { NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx } \cs_generate_variant:Nn \prop_put:Nnn - { c , cnV , cno , cnx , cV , cVV , cVx , cvx , co , coo , cxx } + { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , coo , cxx } \cs_generate_variant:Nn \prop_gput:Nnn - { NnV , Nno , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx } + { NnV , Nno , Nne , Nnx , NV , NVV , NVx , Nvx , No , Noo , Nxx } \cs_generate_variant:Nn \prop_gput:Nnn - { c , cnV , cno , cnx , cV , cVV , cVx , cvx , co , coo , cxx } + { c , cnV , cno , cne , cnx , cV , cVV , cVx , cvx , co , coo , cxx } % \end{macrocode} % \end{macro} % \end{macro} diff --git a/macros/latex/contrib/l3kernel/l3quark.dtx b/macros/latex/contrib/l3kernel/l3quark.dtx index d2f02ae06d..bc18bd95a9 100644 --- a/macros/latex/contrib/l3kernel/l3quark.dtx +++ b/macros/latex/contrib/l3kernel/l3quark.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3regex.dtx b/macros/latex/contrib/l3kernel/l3regex.dtx index 9110d54b85..a87896011a 100644 --- a/macros/latex/contrib/l3kernel/l3regex.dtx +++ b/macros/latex/contrib/l3kernel/l3regex.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3seq.dtx b/macros/latex/contrib/l3kernel/l3seq.dtx index 3044da987c..25b316dfcd 100644 --- a/macros/latex/contrib/l3kernel/l3seq.dtx +++ b/macros/latex/contrib/l3kernel/l3seq.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -931,9 +931,9 @@ % % Adding an \meta{item} to a set \meta{seq~var} can be done by appending % it to the \meta{seq~var} if it is not already in the \meta{seq~var}: -% \begin{quote}\ttfamily -% \cs{seq_if_in:NnF} \meta{seq~var} \Arg{item} \\ -% \ \ \{ \cs{seq_put_right:Nn} \meta{seq~var} \Arg{item} \} +% \begin{quote}\ttfamily\parskip=0pt\obeylines +% \cs{seq_if_in:NnF} \meta{seq~var} \Arg{item} +% | |\{ \cs{seq_put_right:Nn} \meta{seq~var} \Arg{item} \} % \end{quote} % Removing an \meta{item} from a set \meta{seq~var} can be done using % \cs{seq_remove_all:Nn}, @@ -944,13 +944,13 @@ % The intersection of two sets \meta{seq~var_1} and \meta{seq~var_2} can % be stored into \meta{seq~var_3} by collecting items of % \meta{seq~var_1} which are in \meta{seq~var_2}. -% \begin{quote}\ttfamily -% \cs{seq_clear:N} \meta{seq~var_3} \\ -% \cs{seq_map_inline:Nn} \meta{seq~var_1} \\ -% \ \ \{ \\ -% \ \ \ \ \cs{seq_if_in:NnT} \meta{seq~var_2} \{\#1\} \\ -% \ \ \ \ \ \ \{ \cs{seq_put_right:Nn} \meta{seq~var_3} \{\#1\} \} \\ -% \ \ \} +% \begin{quote}\ttfamily\parskip=0pt\obeylines +% \cs{seq_clear:N} \meta{seq~var_3} +% \cs{seq_map_inline:Nn} \meta{seq~var_1} +% | |\{ +% | |\cs{seq_if_in:NnT} \meta{seq~var_2} \{\#1\} +% | |\{ \cs{seq_put_right:Nn} \meta{seq~var_3} \{\#1\} \} +% | |\} % \end{quote} % The code as written here only works if \meta{seq~var_3} is different % from the other two sequence variables. To cover all cases, items @@ -966,13 +966,13 @@ % \cs{seq_remove_duplicates:N} \meta{seq~var_3} % \end{quote} % or by adding items to (a copy of) \meta{seq~var_1} one by one -% \begin{quote}\ttfamily -% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_1} \\ -% \cs{seq_map_inline:Nn} \meta{seq~var_2} \\ -% \ \ \{ \\ -% \ \ \ \ \cs{seq_if_in:NnF} \meta{seq~var_3} \{\#1\} \\ -% \ \ \ \ \ \ \{ \cs{seq_put_right:Nn} \meta{seq~var_3} \{\#1\} \} \\ -% \ \ \} +% \begin{quote}\ttfamily\parskip=0pt\obeylines +% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_1} +% \cs{seq_map_inline:Nn} \meta{seq~var_2} +% | |\{ +% | |\cs{seq_if_in:NnF} \meta{seq~var_3} \{\#1\} +% | |\{ \cs{seq_put_right:Nn} \meta{seq~var_3} \{\#1\} \} +% | |\} % \end{quote} % The second approach is faster than the first when the \meta{seq~var_2} % is short compared to \meta{seq~var_1}. @@ -980,10 +980,10 @@ % The difference of two sets \meta{seq~var_1} and \meta{seq~var_2} can % be stored into \meta{seq~var_3} by removing items of the % \meta{seq~var_2} from (a copy of) the \meta{seq~var_1} one by one. -% \begin{quote}\ttfamily -% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_1} \\ -% \cs{seq_map_inline:Nn} \meta{seq~var_2} \\ -% \ \ \{ \cs{seq_remove_all:Nn} \meta{seq~var_3} \{\#1\} \} +% \begin{quote}\ttfamily\parskip=0pt\obeylines +% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_1} +% \cs{seq_map_inline:Nn} \meta{seq~var_2} +% | |\{ \cs{seq_remove_all:Nn} \meta{seq~var_3} \{\#1\} \} % \end{quote} % % The symmetric difference of two sets \meta{seq~var_1} and @@ -992,13 +992,13 @@ % the result as |\l__|\meta{pkg}|_internal_seq|, then the difference % between \meta{seq~var_2} and \meta{seq~var_1}, and finally % concatenating the two differences to get the symmetric differences. -% \begin{quote}\ttfamily -% \cs{seq_set_eq:NN} |\l__|\meta{pkg}|_internal_seq| \meta{seq~var_1} \\ -% \cs{seq_map_inline:Nn} \meta{seq~var_2} \\ -% \ \ \{ \cs{seq_remove_all:Nn} |\l__|\meta{pkg}|_internal_seq| \{\#1\} \} \\ -% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_2} \\ -% \cs{seq_map_inline:Nn} \meta{seq~var_1} \\ -% \ \ \{ \cs{seq_remove_all:Nn} \meta{seq~var_3} \{\#1\} \} \\ +% \begin{quote}\ttfamily\parskip=0pt\obeylines +% \cs{seq_set_eq:NN} |\l__|\meta{pkg}|_internal_seq| \meta{seq~var_1} +% \cs{seq_map_inline:Nn} \meta{seq~var_2} +% | |\{ \cs{seq_remove_all:Nn} |\l__|\meta{pkg}|_internal_seq| \{\#1\} \} +% \cs{seq_set_eq:NN} \meta{seq~var_3} \meta{seq~var_2} +% \cs{seq_map_inline:Nn} \meta{seq~var_1} +% | |\{ \cs{seq_remove_all:Nn} \meta{seq~var_3} \{\#1\} \} % \cs{seq_concat:NNN} \meta{seq~var_3} \meta{seq~var_3} |\l__|\meta{pkg}|_internal_seq| % \end{quote} % diff --git a/macros/latex/contrib/l3kernel/l3skip.dtx b/macros/latex/contrib/l3kernel/l3skip.dtx index bf174f74dd..23d32a1b87 100644 --- a/macros/latex/contrib/l3kernel/l3skip.dtx +++ b/macros/latex/contrib/l3kernel/l3skip.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -491,7 +491,7 @@ % \end{syntax} % Evaluates the \meta{dim expr}, and leaves the result, % expressed in points (\texttt{pt}) in the input stream, with \emph{no -% units}. The result is rounded by \TeX{} to four or five decimal +% units}. The result is rounded by \TeX{} to at most five decimal % places. If the decimal part of the result is zero, it is omitted, % together with the decimal marker. % @@ -510,7 +510,7 @@ % \end{syntax} % Evaluates the \meta{dim expr}, and leaves the result, % expressed in big points (\texttt{bp}) in the input stream, with \emph{no -% units}. The result is rounded by \TeX{} to four or five decimal +% units}. The result is rounded by \TeX{} to at most five decimal % places. If the decimal part of the result is zero, it is omitted, % together with the decimal marker. % @@ -521,11 +521,14 @@ % leaves |0.99628| in the input stream, \emph{i.e.}~the magnitude of % one (\TeX{}) point when converted to big points. % \begin{texnote} -% The implementation of this functions is re-entrant: the result of +% The implementation of this function is re-entrant: the result of % \begin{verbatim} -% \dim_to_decimal_in_bp:n { <n>bp } +% \dim_compare:nNnTF +% { <x>bp } = +% { \dim_to_decimal_in_bp:n { <x>bp } bp } % \end{verbatim} -% will be the value \meta{n}. +% will be logically \texttt{true}. The decimal representations may +% differ provided they produce the same \TeX{} dimension. % \end{texnote} % \end{function} % @@ -550,28 +553,33 @@ % The maximum \TeX{} allowable dimension value (available as % \tn{maxdimen} in plain \TeX{} and \LaTeX{} and \cs{c_max_dim} in % \pkg{expl3}) can only be expressed exactly in the units -% \texttt{pt}, \texttt{bp} and \texttt{sp}. Expressed in different units, -% the maximum allowable input value to five decimal places is\\ +% \texttt{pt}, \texttt{bp} and \texttt{sp}. The maximum allowable +% input values to five decimal places are\\ % \begin{center} % \begin{tabular}{@{}>{$}r<{$}@{\,}l@{}} % 1276.00215 & cc \\ % 575.83174 & cm \\ -% 226.70540 & in \\ % 15312.02584 & dd \\ +% 226.70540 & in \\ % 5758.31742 & mm \\ % 1365.33333 & pc \\ % \end{tabular} % \end{center} +% (Note that these are not all equal, but rather any larger value will overflow +% due to the way \TeX{} converts to \texttt{sp}.) % Values given to five decimal places larger that these will result in \TeX{} % errors; the behavior if additional decimal places are given depends on the % \TeX{} internals and thus larger values are \emph{not} supported by % \pkg{expl3}. % \begin{texnote} -% The implementation of this functions is re-entrant: the result of +% The implementation of these functions is re-entrant: the result of % \begin{verbatim} -% \dim_to_decimal_in_<unit>:n { <n><unit> } +% \dim_compare:nNnTF +% { <x><unit> } = +% { \dim_to_decimal_in_<unit>:n { <x><unit> } <unit> } % \end{verbatim} -% will be the value \meta{n}. +% will be logically \texttt{true}. The decimal representations may +% differ provided they produce the same \TeX{} dimension. % \end{texnote} % \end{function} % @@ -584,7 +592,7 @@ % units}. The result is necessarily an integer. % \end{function} % -% \begin{function}[added = 2014-07-15, EXP] +% \begin{function}[added = 2014-07-15, updated = 2023-05-20, EXP] % {\dim_to_decimal_in_unit:nn} % \begin{syntax} % \cs{dim_to_decimal_in_unit:nn} \Arg{dim expr_1} \Arg{dim expr_2} @@ -603,11 +611,11 @@ % leaves |0.35278| in the input stream, \emph{i.e.}~the magnitude of % one big point when expressed in millimetres. The conversions do % \emph{not} guarantee that \TeX{} would yield identical results -% for the direct input in an equality test, hence +% for the direct input in an equality test, thus for instance % \begin{verbatim} % \dim_compare:nNnTF -% { \dim_to_decimal_in_unit:nn { 1bp } { 1mm } mm } -% { 1bp } +% { 1bp } = +% { \dim_to_decimal_in_unit:nn { 1bp } { 1mm } mm } % \end{verbatim} % will take the \texttt{false} branch. % \end{function} @@ -1754,7 +1762,7 @@ % The code to do this is contributed by Ruixi Zhang. % % \begin{macro}[EXP]{\dim_to_decimal_in_sp:n} -% The one eeasy case: the only requirement here is that we avoid an +% The one easy case: the only requirement here is that we avoid an % overflow. % \begin{macrocode} \cs_new:Npn \dim_to_decimal_in_sp:n #1 @@ -1798,7 +1806,7 @@ % (1)~$\hbox{midpoint}+\frac{1}{2}>N$ and % (2)~$\hbox{midpoint}+\frac{1}{2}<N+1$. In other words, % $N=\lfloor\hbox{midpoint}+\frac{1}{2}\rfloor$. As long as we can -% rewrite the midpoint as the result of a ``scaling operation'' of \eTeX, +% rewrite the midpoint as the result of a \enquote{scaling operation} of \eTeX, % the $\lfloor\ldots+\frac{1}{2}\rfloor$ part will follow naturally. % Indeed we can: $\hbox{midpoint}=(2X+1)\times(\frac{1}{2}\delta^{-1})$. % @@ -1825,7 +1833,9 @@ % Conversions to other units are now coded. % Consult the pdf\/\TeX{} source for each conversion factor~$\delta$. % Each factor $\frac{1}{2}\delta^{-1}$ is hand-coded -% for accuracy (and speed). +% for accuracy (and speed). As the units \texttt{nc} and \texttt{nd} +% are not supported by \XeTeX{} or (u)p\TeX{}, they are not included +% here. % \begin{macrocode} \@@_tmp:w { in } { 50 / 7227 } % delta = 7227/100 \@@_tmp:w { pc } { 1 / 24 } % delta = 12/1 @@ -1887,7 +1897,7 @@ % |<number2>;{<dimexpr1>}|, where |<number2>| represents |<dimexpr2>| in % |sp| unit. % If |#1| is~|0|$_{12}$, the \enquote{unit} |<dimexpr2>| must also be zero. -% So we throw out a ``division by zero'' error message at this point. +% So we throw out a \enquote{division by zero} error message at this point. % Otherwise, if |#1| is~|-|$_{12}$, we shall negate both |<dimexpr1>| and % |<dimexpr2>| for later procedures. % \begin{macrocode} @@ -1950,8 +1960,8 @@ % output $q+R'/65536$ in decimal. % % Note: $q=\lfloor X/n\rfloor=\lfloor\frac{2X-n}{2n}+\frac{1}{2}\rfloor$ -% represents the ``integer'' part, while $0\le R'\le65536$ represents the -% ``fractional'' part. (Can $R'=65536$ really happen? Didn't investigate.) +% represents the \enquote{integer} part, while $0\le R'\le65536$ represents the +% \enquote{fractional} part. (Can $R'=65536$ really happen? Didn't investigate.) % \begin{macrocode} \cs_new:Npn \@@_branch_unit:w #1;#2; { @@ -1991,12 +2001,12 @@ \token_if_eq_charcode:NNTF #1 - { \exp_after:wN \exp_after:wN \exp_after:wN \@@_get_remainder:w - \int_eval:w ( 2 * #2 - #3 ) / ( 2 * #3 ) ; + \int_eval:n { ( 2 * #2 - #3 ) / ( 2 * #3 ) } ; #2 ; #3 ; - ; } { \exp_after:wN \exp_after:wN \exp_after:wN \@@_get_remainder:w - \int_eval:w ( 2 * #1#2 - #3 ) / ( 2 * #3 ) ; + \int_eval:n { ( 2 * #1#2 - #3 ) / ( 2 * #3 ) } ; #1#2 ; #3 ; ; } } @@ -2012,7 +2022,7 @@ \cs_new:Npn \@@_get_remainder:w #1;#2;#3; { \exp_after:wN \exp_after:wN \exp_after:wN \@@_convert_remainder:w - \int_eval:w #2 - #1 * #3 ; + \int_eval:n { #2 - #1 * #3 } ; #3 ; #1 ; } % \end{macrocode} @@ -2025,7 +2035,7 @@ \cs_new:Npn \@@_convert_remainder:w #1;#2; { \exp_after:wN \exp_after:wN \exp_after:wN \@@_test_candidate:w - \int_eval:w #1 * 65536 / #2 ; + \int_eval:n { #1 * 65536 / #2 } ; #1 ; #2 ; } % \end{macrocode} @@ -2046,8 +2056,7 @@ { \dim_to_decimal:n { #1sp } \@@_eval:w #3sp \@@_eval_end: } { \@@_parse_decimal:w #1 ; } { - \exp_after:wN \@@_parse_decimal:w - \int_eval:w #1 + 1 ; + \@@_parse_decimal:w \int_eval:n { #1 + 1 } ; } } % \end{macrocode} diff --git a/macros/latex/contrib/l3kernel/l3sort.dtx b/macros/latex/contrib/l3kernel/l3sort.dtx index e73b6b39ab..bab6a36448 100644 --- a/macros/latex/contrib/l3kernel/l3sort.dtx +++ b/macros/latex/contrib/l3kernel/l3sort.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str-convert.dtx b/macros/latex/contrib/l3kernel/l3str-convert.dtx index 2f2c4f36c7..ed4e866d73 100644 --- a/macros/latex/contrib/l3kernel/l3str-convert.dtx +++ b/macros/latex/contrib/l3kernel/l3str-convert.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3str.dtx b/macros/latex/contrib/l3kernel/l3str.dtx index 3322a2289d..473e55f6d0 100644 --- a/macros/latex/contrib/l3kernel/l3str.dtx +++ b/macros/latex/contrib/l3kernel/l3str.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3styleguide.pdf b/macros/latex/contrib/l3kernel/l3styleguide.pdf Binary files differindex 1a83be2d01..0726531396 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.pdf +++ b/macros/latex/contrib/l3kernel/l3styleguide.pdf diff --git a/macros/latex/contrib/l3kernel/l3styleguide.tex b/macros/latex/contrib/l3kernel/l3styleguide.tex index 4c1a0087c6..8840a0aca6 100644 --- a/macros/latex/contrib/l3kernel/l3styleguide.tex +++ b/macros/latex/contrib/l3kernel/l3styleguide.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-05-22} +\date{Released 2023-06-05} \begin{document} diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf Binary files differindex aad08104ac..3fef1f71e0 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.pdf +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.pdf diff --git a/macros/latex/contrib/l3kernel/l3syntax-changes.tex b/macros/latex/contrib/l3kernel/l3syntax-changes.tex index 847089ac7a..7dc2f1b9bf 100644 --- a/macros/latex/contrib/l3kernel/l3syntax-changes.tex +++ b/macros/latex/contrib/l3kernel/l3syntax-changes.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-05-22} +\date{Released 2023-06-05} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3sys.dtx b/macros/latex/contrib/l3kernel/l3sys.dtx index 2180d4085b..6b7aab3488 100644 --- a/macros/latex/contrib/l3kernel/l3sys.dtx +++ b/macros/latex/contrib/l3kernel/l3sys.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.pdf b/macros/latex/contrib/l3kernel/l3term-glossary.pdf Binary files differindex 238b5bb93e..abcc44bc3a 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.pdf +++ b/macros/latex/contrib/l3kernel/l3term-glossary.pdf diff --git a/macros/latex/contrib/l3kernel/l3term-glossary.tex b/macros/latex/contrib/l3kernel/l3term-glossary.tex index c70b135373..5fe65ecce4 100644 --- a/macros/latex/contrib/l3kernel/l3term-glossary.tex +++ b/macros/latex/contrib/l3kernel/l3term-glossary.tex @@ -32,7 +32,7 @@ The released version of this bundle is available from CTAN. {latex-team@latex-project.org}% }% } -\date{Released 2023-05-22} +\date{Released 2023-06-05} \newcommand{\TF}{\textit{(TF)}} diff --git a/macros/latex/contrib/l3kernel/l3text-case.dtx b/macros/latex/contrib/l3kernel/l3text-case.dtx index 37172a6eb0..a69a695f49 100644 --- a/macros/latex/contrib/l3kernel/l3text-case.dtx +++ b/macros/latex/contrib/l3kernel/l3text-case.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-map.dtx b/macros/latex/contrib/l3kernel/l3text-map.dtx index 223b778517..a2f9e5fae7 100644 --- a/macros/latex/contrib/l3kernel/l3text-map.dtx +++ b/macros/latex/contrib/l3kernel/l3text-map.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text-purify.dtx b/macros/latex/contrib/l3kernel/l3text-purify.dtx index a851e247a2..d3e8e099fb 100644 --- a/macros/latex/contrib/l3kernel/l3text-purify.dtx +++ b/macros/latex/contrib/l3kernel/l3text-purify.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3text.dtx b/macros/latex/contrib/l3kernel/l3text.dtx index fcd1331b7d..bcdfa869f2 100644 --- a/macros/latex/contrib/l3kernel/l3text.dtx +++ b/macros/latex/contrib/l3kernel/l3text.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx index 8ae8a5d41e..7519981f52 100644 --- a/macros/latex/contrib/l3kernel/l3tl-analysis.dtx +++ b/macros/latex/contrib/l3kernel/l3tl-analysis.dtx @@ -44,7 +44,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/l3tl.dtx b/macros/latex/contrib/l3kernel/l3tl.dtx index 1e113ee3b4..67154547b7 100644 --- a/macros/latex/contrib/l3kernel/l3tl.dtx +++ b/macros/latex/contrib/l3kernel/l3tl.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -161,12 +161,12 @@ % % \begin{function} % { -% \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Nf, \tl_set:Nx, -% \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:cf, \tl_set:cx, +% \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Ne, \tl_set:Nf, \tl_set:Nx, +% \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:ce, \tl_set:cf, \tl_set:cx, % \tl_gset:Nn, \tl_gset:NV, \tl_gset:Nv, -% \tl_gset:No, \tl_gset:Nf, \tl_gset:Nx, +% \tl_gset:No, \tl_gset:Ne, \tl_gset:Nf, \tl_gset:Nx, % \tl_gset:cn, \tl_gset:cV, \tl_gset:cv, -% \tl_gset:co, \tl_gset:cf, \tl_gset:cx +% \tl_gset:co, \tl_gset:ce, \tl_gset:cf, \tl_gset:cx % } % \begin{syntax} % \cs{tl_set:Nn} \meta{tl~var} \Arg{tokens} @@ -350,30 +350,6 @@ % Token groups (|{|\ldots|}|) are not single tokens. % \end{function} % -% \begin{function}[added = 2013-07-24, EXP, noTF]{\tl_case:Nn, \tl_case:cn} -% \begin{syntax} -% \cs{tl_case:NnTF} \meta{test token list variable} \\ -% ~~"{" \\ -% ~~~~\meta{token list variable case_1} \Arg{code case_1} \\ -% ~~~~\meta{token list variable case_2} \Arg{code case_2} \\ -% ~~~~\ldots \\ -% ~~~~\meta{token list variable case_n} \Arg{code case_n} \\ -% ~~"}" \\ -% ~~\Arg{true code} -% ~~\Arg{false code} -% \end{syntax} -% This function compares the \meta{test token list variable} in turn -% with each of the \meta{token list variable cases}. If the two -% are equal (as described for \cs{tl_if_eq:NNTF}) -% then the associated \meta{code} is left in the input -% stream and other cases are discarded. If any of the -% cases are matched, the \meta{true code} is also inserted into the -% input stream (after the code for the appropriate case), while if none -% match then the \meta{false code} is inserted. The function -% \cs{tl_case:Nn}, which does nothing if there is no match, is also -% available. -% \end{function} -% % \subsection{Testing the first token} % % \begin{function}[updated = 2012-07-09, EXP, pTF] @@ -462,7 +438,7 @@ % % \subsection{Using token lists} % -% \begin{function}[EXP]{\tl_to_str:n, \tl_to_str:V, \tl_to_str:v} +% \begin{function}[EXP]{\tl_to_str:n, \tl_to_str:o, \tl_to_str:V, \tl_to_str:v} % \begin{syntax} % \cs{tl_to_str:n} \Arg{token list} % \end{syntax} @@ -670,7 +646,7 @@ % \end{texnote} % \end{function} % -% \begin{function}[updated = 2015-08-07]{\tl_show:n} +% \begin{function}[updated = 2015-08-07]{\tl_show:n, \tl_show:x} % \begin{syntax} % \cs{tl_show:n} \Arg{token list} % \end{syntax} @@ -689,7 +665,7 @@ % \cs{tl_show:N} which displays the result in the terminal. % \end{function} % -% \begin{function}[added = 2014-08-22, updated = 2015-08-07]{\tl_log:n} +% \begin{function}[added = 2014-08-22, updated = 2015-08-07]{\tl_log:n, \tl_log:x} % \begin{syntax} % \cs{tl_log:n} \Arg{token list} % \end{syntax} @@ -1097,8 +1073,10 @@ % % \begin{function}[updated = 2011-08-11] % { -% \tl_replace_once:Nnn, \tl_replace_once:cnn, -% \tl_greplace_once:Nnn, \tl_greplace_once:cnn +% \tl_replace_once:Nnn, \tl_replace_once:Nxx, +% \tl_replace_once:cnn, \tl_replace_once:cxx, +% \tl_greplace_once:Nnn, \tl_greplace_once:Nxx +% \tl_greplace_once:cnn, \tl_greplace_once:cxx % } % \begin{syntax} % \cs{tl_replace_once:Nnn} \meta{tl~var} \Arg{old tokens} \Arg{new tokens} @@ -1112,8 +1090,10 @@ % % \begin{function}[updated = 2011-08-11] % { -% \tl_replace_all:Nnn, \tl_replace_all:cnn, -% \tl_greplace_all:Nnn, \tl_greplace_all:cnn +% \tl_replace_all:Nnn, \tl_replace_all:Nxx, +% \tl_replace_all:cnn, \tl_replace_all:cxx +% \tl_greplace_all:Nnn, \tl_greplace_all:Nxx, +% \tl_greplace_all:cnn, \tl_greplace_all:cxx % } % \begin{syntax} % \cs{tl_replace_all:Nnn} \meta{tl~var} \Arg{old tokens} \Arg{new tokens} @@ -1131,8 +1111,10 @@ % % \begin{function}[updated = 2011-08-11] % { -% \tl_remove_once:Nn, \tl_remove_once:cn, -% \tl_gremove_once:Nn, \tl_gremove_once:cn +% \tl_remove_once:Nn, \tl_remove_once:Nx, +% \tl_remove_once:cn, \tl_remove_once:cx, +% \tl_gremove_once:Nn, \tl_gremove_once:Nx +% \tl_gremove_once:cn, \tl_gremove_once:cx % } % \begin{syntax} % \cs{tl_remove_once:Nn} \meta{tl~var} \Arg{tokens} @@ -1145,8 +1127,10 @@ % % \begin{function}[updated = 2011-08-11] % { -% \tl_remove_all:Nn, \tl_remove_all:cn, -% \tl_gremove_all:Nn, \tl_gremove_all:cn +% \tl_remove_all:Nn, \tl_remove_all:Nx, +% \tl_remove_all:cn, \tl_remove_all:cx, +% \tl_gremove_all:Nn, \tl_gremove_all:Nx +% \tl_gremove_all:cn, \tl_gremove_all:cx % } % \begin{syntax} % \cs{tl_remove_all:Nn} \meta{tl~var} \Arg{tokens} @@ -1211,7 +1195,7 @@ % \end{texnote} % \end{function} % -% \begin{function}[updated = 2015-08-11]{\tl_rescan:nn} +% \begin{function}[updated = 2015-08-11]{\tl_rescan:nn, \tl_rescan:nV} % \begin{syntax} % \cs{tl_rescan:nn} \Arg{setup} \Arg{tokens} % \end{syntax} @@ -1463,15 +1447,15 @@ % % \begin{macro} % { -% \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Nf, \tl_set:Nx, -% \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:cf, \tl_set:cx +% \tl_set:Nn, \tl_set:NV, \tl_set:Nv, \tl_set:No, \tl_set:Ne, \tl_set:Nf, \tl_set:Nx, +% \tl_set:cn, \tl_set:cV, \tl_set:cv, \tl_set:co, \tl_set:ce, \tl_set:cf, \tl_set:cx % } % \begin{macro} % { % \tl_gset:Nn, \tl_gset:NV, \tl_gset:Nv, -% \tl_gset:No, \tl_gset:Nf, \tl_gset:Nx, +% \tl_gset:No, \tl_gset:Ne, \tl_gset:Nf, \tl_gset:Nx, % \tl_gset:cn, \tl_gset:cV, \tl_gset:cv, -% \tl_gset:co, \tl_gset:cf, \tl_gset:cx +% \tl_gset:co, \tl_gset:ce, \tl_gset:cf, \tl_gset:cx % } % By using \cs{exp_not:n} token list variables can contain |#| tokens, % which makes the token list registers provided by \TeX{} @@ -1490,12 +1474,12 @@ { \__kernel_tl_gset:Nx #1 { \__kernel_exp_not:w \exp_after:wN {#2} } } \cs_new_protected:Npn \tl_gset:Nx #1#2 { \__kernel_tl_gset:Nx #1 {#2} } -\cs_generate_variant:Nn \tl_set:Nn { NV , Nv , Nf } -\cs_generate_variant:Nn \tl_set:Nn { c, cV , cv , cf } +\cs_generate_variant:Nn \tl_set:Nn { NV , Nv , Ne , Nf } +\cs_generate_variant:Nn \tl_set:Nn { c, cV , cv , ce , cf } \cs_generate_variant:Nn \tl_set:Nx { c } \cs_generate_variant:Nn \tl_set:No { c } -\cs_generate_variant:Nn \tl_gset:Nn { NV , Nv , Nf } -\cs_generate_variant:Nn \tl_gset:Nn { c, cV , cv , cf } +\cs_generate_variant:Nn \tl_gset:Nn { NV , Nv , Ne , Nf } +\cs_generate_variant:Nn \tl_gset:Nn { c, cV , cv , ce , cf } \cs_generate_variant:Nn \tl_gset:Nx { c } \cs_generate_variant:Nn \tl_gset:No { c } % \end{macrocode} @@ -1677,7 +1661,7 @@ % \tl_gset_rescan:Nnn, \tl_gset_rescan:Nno, \tl_gset_rescan:Nnx, % \tl_gset_rescan:cnn, \tl_gset_rescan:cno, \tl_gset_rescan:cnx % } -% \begin{macro}{\tl_rescan:nn} +% \begin{macro}{\tl_rescan:nn, \tl_rescan:nV} % \begin{macro}{\@@_rescan_aux:} % \begin{macro}{\@@_set_rescan:NNnn, \@@_set_rescan_multi:nNN} % \begin{macro}[EXP]{\@@_rescan:NNw} @@ -1740,6 +1724,7 @@ \exp_after:wN \@@_rescan_aux: \l_@@_internal_a_tl } +\cs_generate_variant:Nn \tl_rescan:nn { nV } \exp_args:NNo \cs_new_protected:Npn \@@_rescan_aux: { \tl_clear:N \l_@@_internal_a_tl } \cs_new_protected:Npn \tl_set_rescan:Nnn @@ -1917,10 +1902,10 @@ { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_next:w \__kernel_tl_set:Nx } \cs_new_protected:Npn \tl_greplace_all:Nnn { \@@_replace:NnNNNnn \q_@@_mark ? \@@_replace_next:w \__kernel_tl_gset:Nx } -\cs_generate_variant:Nn \tl_replace_once:Nnn { c } -\cs_generate_variant:Nn \tl_greplace_once:Nnn { c } -\cs_generate_variant:Nn \tl_replace_all:Nnn { c } -\cs_generate_variant:Nn \tl_greplace_all:Nnn { c } +\cs_generate_variant:Nn \tl_replace_once:Nnn { Nxx , c , cxx } +\cs_generate_variant:Nn \tl_greplace_once:Nnn { Nxx , c , cxx } +\cs_generate_variant:Nn \tl_replace_all:Nnn { Nxx , c , cxx } +\cs_generate_variant:Nn \tl_greplace_all:Nnn { Nxx , c , cxx } % \end{macrocode} % \end{macro} % \end{macro} @@ -2113,8 +2098,8 @@ { \tl_replace_once:Nnn #1 {#2} { } } \cs_new_protected:Npn \tl_gremove_once:Nn #1#2 { \tl_greplace_once:Nnn #1 {#2} { } } -\cs_generate_variant:Nn \tl_remove_once:Nn { c } -\cs_generate_variant:Nn \tl_gremove_once:Nn { c } +\cs_generate_variant:Nn \tl_remove_once:Nn { Nx , c , cx } +\cs_generate_variant:Nn \tl_gremove_once:Nn { Nx , c , cx } % \end{macrocode} % \end{macro} % \end{macro} @@ -2127,8 +2112,8 @@ { \tl_replace_all:Nnn #1 {#2} { } } \cs_new_protected:Npn \tl_gremove_all:Nn #1#2 { \tl_greplace_all:Nnn #1 {#2} { } } -\cs_generate_variant:Nn \tl_remove_all:Nn { c } -\cs_generate_variant:Nn \tl_gremove_all:Nn { c } +\cs_generate_variant:Nn \tl_remove_all:Nn { Nx , c , cx } +\cs_generate_variant:Nn \tl_gremove_all:Nn { Nx , c , cx } % \end{macrocode} % \end{macro} % \end{macro} @@ -2234,14 +2219,7 @@ % Returns \cs{c_true_bool} if and only if the two token list variables are % equal. % \begin{macrocode} -\prg_new_conditional:Npnn \tl_if_eq:NN #1#2 { p , T , F , TF } - { - \if_meaning:w #1 #2 - \prg_return_true: - \else: - \prg_return_false: - \fi: - } +\prg_new_eq_conditional:NNn \tl_if_eq:NN \cs_if_eq:NN { p , T , F , TF } \prg_generate_conditional_variant:Nnn \tl_if_eq:NN { Nc , c , cc } { p , TF , T , F } % \end{macrocode} @@ -2437,69 +2415,6 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}[EXP, noTF]{\tl_case:Nn, \tl_case:cn} -% \begin{macro}[EXP]{\@@_case:nnTF} -% \begin{macro}[EXP]{\@@_case:Nw} -% \begin{macro}[EXP]{\@@_case_end:nw} -% The aim here is to allow the case statement to be evaluated -% using a known number of expansion steps (two), and without -% needing to use an explicit \enquote{end of recursion} marker. -% That is achieved by using the test input as the final case, -% as this is always true. The trick is then to tidy up -% the output such that the appropriate case code plus either -% the \texttt{true} or \texttt{false} branch code is inserted. -% \begin{macrocode} -\cs_new:Npn \tl_case:Nn #1#2 - { - \exp:w - \@@_case:NnTF #1 {#2} { } { } - } -\cs_new:Npn \tl_case:NnT #1#2#3 - { - \exp:w - \@@_case:NnTF #1 {#2} {#3} { } - } -\cs_new:Npn \tl_case:NnF #1#2#3 - { - \exp:w - \@@_case:NnTF #1 {#2} { } {#3} - } -\cs_new:Npn \tl_case:NnTF #1#2 - { - \exp:w - \@@_case:NnTF #1 {#2} - } -\cs_new:Npn \@@_case:NnTF #1#2#3#4 - { \@@_case:Nw #1 #2 #1 { } \s_@@_mark {#3} \s_@@_mark {#4} \s_@@_stop } -\cs_new:Npn \@@_case:Nw #1#2#3 - { - \tl_if_eq:NNTF #1 #2 - { \@@_case_end:nw {#3} } - { \@@_case:Nw #1 } - } -\cs_generate_variant:Nn \tl_case:Nn { c } -\prg_generate_conditional_variant:Nnn \tl_case:Nn - { c } { T , F , TF } -% \end{macrocode} -% To tidy up the recursion, there are two outcomes. If there was a hit to -% one of the cases searched for, then |#1| is the code to insert, -% |#2| is the \emph{next} case to check on and |#3| is all of -% the rest of the cases code. That means that |#4| is the \texttt{true} -% branch code, and |#5| tidies up the spare \cs{s_@@_mark} and the -% \texttt{false} branch. On the other hand, if none of the cases matched -% then we arrive here using the \enquote{termination} case of comparing -% the search with itself. That means that |#1| is empty, |#2| is -% the first \cs{s_@@_mark} and so |#4| is the \texttt{false} code (the -% \texttt{true} code is mopped up by |#3|). -% \begin{macrocode} -\cs_new:Npn \@@_case_end:nw #1#2#3 \s_@@_mark #4#5 \s_@@_stop - { \exp_end: #1 #4 } -% \end{macrocode} -% \end{macro} -% \end{macro} -% \end{macro} -% \end{macro} -% % \subsection{Mapping over token lists} % % \begin{macro} @@ -2642,10 +2557,10 @@ % % \subsection{Using token lists} % -% \begin{macro}{\tl_to_str:n, \tl_to_str:V, \tl_to_str:v} +% \begin{macro}{\tl_to_str:n, \tl_to_str:o, \tl_to_str:V, \tl_to_str:v} % Another name for a primitive: defined in \pkg{l3basics}. % \begin{macrocode} -\cs_generate_variant:Nn \tl_to_str:n { V , v } +\cs_generate_variant:Nn \tl_to_str:n { o , V , v } % \end{macrocode} % \end{macro} % @@ -3578,7 +3493,7 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\tl_show:n, \@@_show:n} +% \begin{macro}{\tl_show:n, \tl_show:x, \@@_show:n} % \begin{macro}[EXP]{\@@_show:w} % Many |show| functions are based on \cs{tl_show:n}. % The argument of \cs{tl_show:n} is line-wrapped using @@ -3598,6 +3513,7 @@ % \begin{macrocode} \cs_new_protected:Npn \tl_show:n #1 { \iow_wrap:nnnN { >~ \tl_to_str:n {#1} . } { } { } \@@_show:n } +\cs_generate_variant:Nn \tl_show:n { x } \cs_new_protected:Npn \@@_show:n #1 { \tl_set:Nf \l_@@_internal_a_tl { \@@_show:w #1 \s_@@_stop } @@ -3615,12 +3531,13 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\tl_log:n} +% \begin{macro}{\tl_log:n, \tl_log:x} % Logging is much easier, simply line-wrap. The |>~| and trailing % period is there to match the output of \cs{tl_show:n}. % \begin{macrocode} \cs_new_protected:Npn \tl_log:n #1 { \iow_wrap:nnnN { > ~ \tl_to_str:n {#1} . } { } { } \iow_log:n } +\cs_generate_variant:Nn \tl_log:n { x } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3kernel/l3token.dtx b/macros/latex/contrib/l3kernel/l3token.dtx index d8eeca44ab..818018d10e 100644 --- a/macros/latex/contrib/l3kernel/l3token.dtx +++ b/macros/latex/contrib/l3kernel/l3token.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % @@ -2071,11 +2071,8 @@ % \begin{macro}[pTF]{\token_if_eq_meaning:NN} % Check if the tokens |#1| and |#2| have same meaning. % \begin{macrocode} -\prg_new_conditional:Npnn \token_if_eq_meaning:NN #1#2 { p , T , F , TF } - { - \if_meaning:w #1 #2 - \prg_return_true: \else: \prg_return_false: \fi: - } +\prg_new_eq_conditional:NNn \token_if_eq_meaning:NN \cs_if_eq:NN + { p , T , F , TF } % \end{macrocode} % \end{macro} % diff --git a/macros/latex/contrib/l3kernel/l3unicode.dtx b/macros/latex/contrib/l3kernel/l3unicode.dtx index f667a37efd..48b121f20a 100644 --- a/macros/latex/contrib/l3kernel/l3unicode.dtx +++ b/macros/latex/contrib/l3kernel/l3unicode.dtx @@ -43,7 +43,7 @@ % }^^A % } % -% \date{Released 2023-05-22} +% \date{Released 2023-06-05} % % \maketitle % diff --git a/macros/latex/contrib/l3kernel/source3.pdf b/macros/latex/contrib/l3kernel/source3.pdf Binary files differindex ffe5d5de9b..5657c614fb 100644 --- a/macros/latex/contrib/l3kernel/source3.pdf +++ b/macros/latex/contrib/l3kernel/source3.pdf diff --git a/macros/latex/contrib/l3kernel/source3.tex b/macros/latex/contrib/l3kernel/source3.tex index 5d7b26ceff..5e66150ee1 100644 --- a/macros/latex/contrib/l3kernel/source3.tex +++ b/macros/latex/contrib/l3kernel/source3.tex @@ -53,7 +53,7 @@ for those people who are interested. {latex-team@latex-project.org}% }% } -\date{Released 2023-05-22} +\date{Released 2023-06-05} \pagenumbering{roman} \maketitle diff --git a/macros/latex/contrib/l3kernel/source3body.tex b/macros/latex/contrib/l3kernel/source3body.tex index c9b0f3448d..a56e37e828 100644 --- a/macros/latex/contrib/l3kernel/source3body.tex +++ b/macros/latex/contrib/l3kernel/source3body.tex @@ -2,7 +2,7 @@ File: source3body.tex -Copyright (C) 1990-2012,2014-2021 The LaTeX Project +Copyright (C) 1990-2012,2014-2023 The LaTeX Project It may be distributed and/or modified under the conditions of the LaTeX Project Public License (LPPL), either version 1.3c of this @@ -607,6 +607,7 @@ used on top of \LaTeXe{} if \cs{outer} tokens are used in the arguments. \ExplSyntaxOn \clist_gput_right:Nn \g_docinput_clist { l3deprecation.dtx } +\clist_gput_right:Nn \g_docinput_clist { l3debug.dtx } \ExplSyntaxOff \endinput diff --git a/macros/latex/contrib/postit/doc/postit-doc.pdf b/macros/latex/contrib/postit/doc/postit-doc.pdf Binary files differindex ba919f1d19..369fc1219d 100644 --- a/macros/latex/contrib/postit/doc/postit-doc.pdf +++ b/macros/latex/contrib/postit/doc/postit-doc.pdf diff --git a/macros/latex/contrib/postit/doc/postit-doc.tex b/macros/latex/contrib/postit/doc/postit-doc.tex index cc6611fadf..f9ee072286 100644 --- a/macros/latex/contrib/postit/doc/postit-doc.tex +++ b/macros/latex/contrib/postit/doc/postit-doc.tex @@ -4,8 +4,8 @@ \documentclass[french,a4paper,11pt]{article} \usepackage[margin=2cm,includefoot]{geometry} -\def\TPversion{0.1} -\def\TPdate{31 Mai 2023} +\def\TPversion{0.1.1} +\def\TPdate{5 juin 2023} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{amsmath,amssymb} @@ -54,6 +54,12 @@ \AddThinSpaceBeforeFootnotes \FrenchFootnotes +\usepackage{listings} + +\usepackage{newverbs} +\newverbcommand{\motcletex}{\color{cyan!75!black}}{} +\newverbcommand{\packagetex}{\color{violet!75!black}}{} + \tcbuselibrary{listingsutf8} \newtcblisting{DemoCode}[1][]{% enhanced,width=0.95\linewidth,center,% @@ -81,7 +87,7 @@ morekeywords={PostIt,\MiniPostIt},% keywordstyle={\color{green!50!black}},% classoffset=3,% - morekeywords={Couleur,CouleurAttache,Attache,Largeur,Hauteur,Inclinaison,Ombre,Coin,DecalAttache,AlignementH,AlignementV,AlignementPostIt,Bordure},% + morekeywords={Couleur,CouleurAttache,Attache,Largeur,Hauteur,Inclinaison,Ombre,Coin,DecalAttache,AlignementH,AlignementV,AlignementPostIt,Bordure,ExtraMargeDroite,Rendu,Titre,PoliceTitre},% keywordstyle={\color{orange}} },% #1 @@ -102,7 +108,7 @@ } } -\newcommand\Cle[1]{{\bfseries\sffamily\textlangle #1\textrangle}} +\newcommand\Cle[1]{{\small\sffamily\textlangle \textcolor{orange}{#1}\textrangle}} \newcommand\cmaj[1]{\tcbox[vignetteMaJ]{#1}\xspace} \begin{document} @@ -126,7 +132,7 @@ \\ {\LARGE Des petits Post-It,} \\ \\ - {\LARGE avec \textsf{tcolorbox}.} \\ + {\LARGE avec \textsf{tcolorbox} ou \textsf{Ti\textit{k}Z}.} \\ \end{tabular} \bigskip @@ -159,11 +165,11 @@ Ceci est un petit Post-It ! Pour rappeler par exemple que \[(a+b)^2=a^2+2ab+b^2.\] \end{PostIt} -\begin{PostIt}[Largeur=8cm,Couleur=orange,Attache=Non,Inclinaison=-5,Coin,AlignementPostIt=center] +\begin{PostIt}[Rendu=tikz,Largeur=8cm,Couleur=orange,Attache=Trombone,CouleurAttache=blue,Inclinaison=-5,AlignementPostIt=center,Titre={- Titre -},PoliceTitre={\color{blue!50!black}\bfseries\small\sffamily}] \lipsum[1][1-4] \end{PostIt} \hfill -\begin{PostIt}[Hauteur=6cm,AlignementV=center,Couleur=pink,Attache=Trombone,CouleurAttache=blue,Inclinaison=15,Coin,AlignementPostIt=center] +\begin{PostIt}[Hauteur=6cm,AlignementV=center,Couleur=pink,Attache=Non,CouleurAttache=blue,Inclinaison=15,Coin,AlignementPostIt=center,Attache=Scotch] \lipsum[1][1-4] \end{PostIt} @@ -198,6 +204,10 @@ \section{Historique} +\verb|v0.1.1|~:~~~~Ajout d'un \motcletex!\vphantom! pour les \textit{mini-}Post-It (hauteur \textit{uniforme}) + Correction de bugs. + +\verb| |~:~~~~Moteurs de rendu alternatif en \TikZ{} + Ajout d'un titre éventuel . + \verb|v0.1.0|~:~~~~Version initiale. \newpage @@ -207,7 +217,7 @@ \subsection{Introduction} \begin{noteblock} -Le package propose de quoi afficher, dans son document \LaTeX, un Post-It (créé à l'aide de \texttt{tcolorbox}), avec la possibilité : +Le package propose de quoi afficher, dans son document \LaTeX, un Post-It (créé à l'aide de \packagetex!tcolorbox! ou de \packagetex!tikz!), avec la possibilité : \begin{itemize} \item de spécifier les dimensions, la couleur ; @@ -215,7 +225,7 @@ Le package propose de quoi afficher, dans son document \LaTeX, un Post-It (cré \item de personnaliser les bordure et le coin. \end{itemize} -Le package propose également de quoi créer un \textit{mini-}Post-It (créé à l'aide d'une \texttt{tcbox}), avec la possibilité de gérer la couleur et l'ombre. +Le package propose également de quoi créer un \textit{mini-}Post-It (créé à l'aide d'une \motcletex!tcbox!), avec la possibilité de gérer la couleur et l'ombre. \end{noteblock} \subsection{Chargement du package, packages utilisés} @@ -223,7 +233,7 @@ Le package propose également de quoi créer un \textit{mini-}Post-It (créé à \begin{importantblock} Le package se charge, de manière classique, dans le préambule. -Il n'existe pas d'option pour le package, et \texttt{xcolor} n'est pas chargé. +Il n'existe pas d'option pour le package, et \packagetex!xcolor! n'est pas chargé. \end{importantblock} \begin{DemoCode}[listing only] @@ -233,11 +243,17 @@ Il n'existe pas d'option pour le package, et \texttt{xcolor} n'est pas chargé. \end{DemoCode} \begin{noteblock} -\textsf{postit} charge les packages suivantes : +\packagetex!postit! charge les packages suivantes : \begin{itemize} - \item \texttt{tcolorbox} avec la librairie \texttt{\textit{tcbox}.skins} ; - \item \texttt{xstring} et \texttt{simplekv}. + \item \packagetex!tcolorbox! avec la librairie \packagetex!tcbox.skins! ; + \item les librairies \packagetex!tikz! : + \begin{itemize} + \item \packagetex!tikz.calc! ; + \item \packagetex!tikz.decorations! ; + \item \packagetex!tikz.decorations.pathmorphing! ; + \end{itemize} + \item \packagetex!settobox!, \packagetex!xstring! et \packagetex!simplekv!. \end{itemize} Il est compatible avec les compilations usuelles en \textsf{latex}, \textsf{pdflatex}, \textsf{lualatex} ou \textsf{xelatex}. @@ -246,7 +262,7 @@ Il est compatible avec les compilations usuelles en \textsf{latex}, \textsf{pdfl \subsection{Compatibilité} \begin{cautionblock} -Si un autre package charge \texttt{tcolorbox}, et notamment avec l'option \Cle{[most]}, il vaut mieux charger \texttt{postit} après, afin d'éviter un \textsf{option clash error\ldots}. +Si un autre package charge \packagetex!tcolorbox!, et notamment avec l'option \Cle{[most]}, il vaut mieux charger \packagetex!postit! après, afin d'éviter un \motcletex!option clash error...!. \end{cautionblock} \begin{DemoCode}[listing only] @@ -266,9 +282,9 @@ Si un autre package charge \texttt{tcolorbox}, et notamment avec l'option \Cle{[ \subsection{Environnement et fonctionnement global} \begin{cautionblock} -L'environnement dédié à la création du Post-It est \texttt{PostIt}. +L'environnement dédié à la création du Post-It est \packagetex!PostIt!. -Il fonctionne avec un système de clés, entre \texttt{[...]} et il est possible, entre \texttt{<...>} de spécifier des options à la \textsf{tcbox}, en langage \textsf{tcbox} ! +Il fonctionne avec un système de clés, entre \texttt{[...]} et il est possible, entre \texttt{<...>} de spécifier des options à la \motcletex!tcbox!, en langage \textsf{tcbox} (inutile avec le rendu en \motcletex!tikz!) ! \end{cautionblock} \begin{DemoCode}[listing only] @@ -279,39 +295,57 @@ Il fonctionne avec un système de clés, entre \texttt{[...]} et il est possible \end{DemoCode} \begin{noteblock} -Comme indiqué dans l'introduction, le Post-It est créé à l'aide d'un environnement \textsf{tcbox}. +Comme indiqué dans l'introduction, le Post-It est créé à l'aide d'un environnement \motcletex!tcbox! ou d'un environnement \motcletex!tikz!. -La majorité des (multiples) paramètres d'une \textsf{tcbox} sont fixés par le code, mais il est possible de spécifier certaines caractéristiques esthétiques du Post-It ! +La majorité des (multiples) paramètres d'une \motcletex!tcbox! et d'une figuure \motcletex!tikz! sont fixés par le code, mais il est possible de spécifier certaines caractéristiques esthétiques du Post-It ! \end{noteblock} \begin{DemoCode}[] -%sortie par défaut, avec un paragraphe issu du package lipsum +%sortie par défaut (rendu tcbox), avec un paragraphe issu du package lipsum \begin{PostIt} \lipsum[1][1-2] \end{PostIt} \end{DemoCode} +\begin{DemoCode}[] +%sortie rendu tikz, avec un paragraphe issu du package lipsum +\begin{PostIt}[Rendu=tikz] + \lipsum[1][1-2] +\end{PostIt} +%sortie rendu tikzv2, avec un paragraphe issu du package lipsum +\begin{PostIt}[Rendu=tikzv2] + \lipsum[1][1-2] +\end{PostIt} +\end{DemoCode} + \begin{tipblock} -Les éventuelles couleurs choisies devront être données de manière \textit{unique}, sans utiliser les \textit{mélanges} (avec \texttt{CouleurA!...!CouleurB}) que propose le package \texttt{xcolor}. +Les éventuelles couleurs choisies devront être données de manière \textit{unique}, sans utiliser les \textit{mélanges} (avec \motcletex|CouleurA!...!CouleurB|) que propose le package \packagetex!xcolor!. Toutefois, toute couleur précédemment définie pourra être utilisée pour le Post-It. \end{tipblock} \begin{tipblock} -Le Post-It créé pourra être intégré dans une \textsf{minipage} ou un \textsf{wrapstuff} si besoin. +Le Post-It créé pourra être intégré dans une \motcletex!minipage! ou un \motcletex!wrapstuff! si besoin. -Pour l'alignement horizontal, il est conseillé d'utiliser des commandes dédiées comme \texttt{\textbackslash hfill} ou des envrionnements dédiées comme \texttt{flush...}. +Pour l'alignement horizontal, il est conseillé d'utiliser des commandes dédiées comme \motcletex!\hfill! ou des environnements dédiés comme \motcletex!flush...!. \end{tipblock} +\begin{warningblock} +Avec une \textit{attache} qui "déborde" verticalement (rendu \textsf{tcbox}), il sera sans doute nécessaire d'ajuster l'espacement vertical précédant le Post-It pour éviter un éventuel chevauchement. +\end{warningblock} + \subsection{Clés et options} \begin{tipblock} Le premier argument, optionnel et entre \texttt{[...]}, propose les \Cle{clés} suivantes : \begin{itemize} - \item \Cle{Largeur} : largeur du Post-It ; \hfill{}défaut : \Cle{6cm} + \item \Cle{Largeur} : largeur (en cm) du Post-It ; \hfill{}défaut : \Cle{6cm} \item \Cle{Couleur} : couleur du Post-It (la bordure sera plus foncée) ; \hfill{}défaut : \Cle{yellow} - \item \Cle{Hauteur} : hauteur du Post-It (par défaut elle est \textit{automatique}) ; \hfill{}défaut : \Cle{auto} + \item \Cle{Hauteur} : hauteur (en cm si déclarée) du Post-It (par défaut elle est \textit{automatique}) ; + + \hfill{}défaut : \Cle{auto} + \item \cmaj{0.1.1} \Cle{Rendu} : moteur du rendu parmi \Cle{tcbox / tikz / tikv2} ; \hfill{}défaut : \Cle{tcbox} \item \Cle{Inclinaison} : inclinaison du Post-It ; \hfill{}défaut : \Cle{0} \item \Cle{Ombre} : booléen pour afficher une ombre portée ; \hfill{}défaut : \Cle{true} \item \Cle{Bordure} : booléen pour afficher une fine bordure ; \hfill{}défaut : \Cle{true} @@ -320,7 +354,12 @@ Le premier argument, optionnel et entre \texttt{[...]}, propose les \Cle{clés} \hfill{}défaut : \Cle{Punaise} \item \Cle{CouleurAttache} : couleur de l'attache ; \hfill{}défaut : \Cle{red} - \item \Cle{DecalAttache} : décalage horizontal de l'attache par rapport à sa position initiale (au centre pour la punaise, à 1~cm du bord droit pour le trombone) ; + \item \Cle{DecalAttache} : décalage horizontal (sans unité, mais en cm) de l'attache par rapport à sa position initiale (au centre pour la punaise, à 1~cm du bord droit pour le trombone) ; + + \hfill{}défaut : \Cle{0} + \item \cmaj{0.1.1} \Cle{Titre} : rajouter un titre (en 1ère ligne et/ou sous l'Attache) ; \hfill{}défaut : \Cle{vide} + \item \cmaj{0.1.1} \Cle{PoliceTitre} : police du titre ; \hfill{}défaut : \Cle{\textbackslash normalfont\textbackslash normalfont} + \item \cmaj{0.1.1} \Cle{ExtraMargeDroite} : rajoute (en rendu \packagetex!tikz!, et en cm) une marge à droite ; \hfill{}défaut : \Cle{0cm} \item \Cle{AlignementV} : gère l'alignement vertical dans le Post-It (parmi \Cle{top/center/bottom}) ; @@ -337,18 +376,35 @@ Le premier argument, optionnel et entre \texttt{[...]}, propose les \Cle{clés} \end{tipblock} \begin{tipblock} -Le second argument, optionnel et entre \texttt{<...>} correspond à des options spécifiques à passer à la \textsf{tcolorbox}, en langage \textsf{tcbox}. +Le second argument, optionnel et entre \texttt{<...>} correspond à des options spécifiques à passer à la \motcletex!tcolorbox!, en langage \textsf{tcbox} (inutile si le rendu est \motcletex!tikz!). Elles permettent de modifier localement des options non paramétrées par des clés présentées précédemment. \end{tipblock} \begin{DemoCode}[] -\begin{PostIt} +\begin{PostIt}%moteur de rendu tcbox (défaut) [Couleur=cyan,Attache=Trombone,Largeur=10cm,Inclinaison=10]<center,right=1.5cm> \lipsum[1][1-3] \end{PostIt} \end{DemoCode} +\begin{DemoCode}[] +\hfill\begin{PostIt}%moteur de rendu tikz + [Rendu=tikz,Couleur=violet,Largeur=9cm,Inclinaison=-10,Attache=Trombone, + CouleurAttache=black,ExtraMargeDroite=1cm,Titre={Petit Titre}, + PoliceTitre={\color{white}\bfseries\small\sffamily}] +\lipsum[1][1-3] +\end{PostIt}\hfill~ +\end{DemoCode} + +\begin{DemoCode}[] +\hfill\begin{PostIt}%moteur de rendu tikzv2 + [Rendu=tikzv2,Couleur=orange,Largeur=9cm,Inclinaison=-10,Attache=Scotch, Titre={Essai}, + PoliceTitre={\color{blue!50!black}\bfseries\itshape\small\ttfamily}] +\lipsum[1][1-3] +\end{PostIt}\hfill~ +\end{DemoCode} + \pagebreak \subsection{Exemples} @@ -365,17 +421,48 @@ Elles permettent de modifier localement des options non paramétrées par des cl \end{DemoCode} \begin{DemoCode}[] +%usepackage{wrapstuff} +\begin{wrapstuff}[r,top=1] +\begin{PostIt}[Inclinaison=5,Rendu=tikz,Couleur=pink, CouleurAttache=blue,Bordure=false] +\lipsum[1][1-2] +\end{PostIt} +\end{wrapstuff} + +\lipsum[1] +\end{DemoCode} + +\begin{DemoCode}[] +%usepackage{wrapstuff} +\begin{wrapstuff}[r,top=1] +\begin{PostIt}[Inclinaison=5,Rendu=tikzv2,Attache=Scotch,Couleur=pink] +\lipsum[1][1-2] +\end{PostIt} +\end{wrapstuff} + +\lipsum[1] +\end{DemoCode} + +\begin{DemoCode}[] Un petit Post-It aligné à droite, et centré verticalement : % -\hfill\begin{PostIt}[Inclinaison=-10,Couleur=orange,Largeur=5cm,Hauteur=5cm, AlignementV=center,Coin,CouleurAttache=yellow, DecalAttache=-1cm,AlignementPostIt=center] +\hfill\begin{PostIt}[Inclinaison=-10,Couleur=orange,Largeur=5cm,Hauteur=5cm, AlignementV=center,Coin,CouleurAttache=yellow, DecalAttache=-1,AlignementPostIt=center] \textsf{\small\lipsum[1][1-2]} \[\mathsf{\displaystyle\sum_{k=1}^{n} k = \dfrac{n(n+1)}{2}}\] - \end{PostIt} \end{DemoCode} -\vfill~ +%\begin{DemoCode}[] +%Un petit Post-It aligné à droite, et centré verticalement : +%% +%\hfill\begin{PostIt}[Inclinaison=-10,Couleur=orange,Largeur=5cm,Hauteur=5cm, AlignementV=center,Rendu=tikz,Attache=Non,AlignementPostIt=center] +% +%\textsf{\small\lipsum[1][1-2]} +%\[\mathsf{\displaystyle\sum_{k=1}^{n} k = \dfrac{n(n+1)}{2}}\] +%\end{PostIt} +%\end{DemoCode} +% +%\vfill~ \pagebreak @@ -390,7 +477,11 @@ Elle fonctionne sous forme autonome, avec uniquement la couleur en \Cle{option}. \smallskip -Cette fois-ci le \textit{mini-} Post-It est créé à l'aide d'une commande \textsf{tcbox}. +Cette fois-ci le \textit{mini-} Post-It est créé à l'aide d'une commande \motcletex!tcbox!. + +\smallskip + +Les dimensions ne sont pas modifiables, et un \motcletex!\vphantom! est inséré au début de la \motcletex!tcbox! afin d'harmoniser la hauteur. \end{cautionblock} \begin{DemoCode}[listing only] @@ -410,9 +501,149 @@ La couleur (\Cle{yellow}), est gérée par l'argument optionnel entre \texttt{[. \begin{DemoCode}[] On va travailler sur une équation diophantienne du type $ax+by=c$. -On va utiliser le \MiniPostIt*[orange]{théorème de Bezout} puis le \MiniPostIt{théorème de Gauss}. +On va utiliser le \MiniPostIt*[orange]{théorème de Bezout}, le \MiniPostIt{théorème de Gauss} sans oublier la \MiniPostIt*[cyan]{réciproque}. Le schéma de résolution est classique, et assez simple à appréhender ! \end{DemoCode} +\pagebreak + +\section{Résumé des styles} + +\subsection{Moteur de rendu tcbox} + +\begin{DemoCode}[text only] +\hfill\begin{PostIt} +\texttt{Ombre/Épingle/Bordure} +\end{PostIt} +\begin{PostIt}[Ombre=false] +\texttt{Épingle/Bordure} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Bordure=false] +\texttt{Ombre/Épingle} +\end{PostIt} +\begin{PostIt}[Bordure=false,Ombre=false] +\texttt{Épingle} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Trombone] +\texttt{Ombre/Trombone/Bordure}\\ +~ +\end{PostIt} +\begin{PostIt}[Attache=Scotch] +\texttt{Ombre/Scotch/Bordure}\\ +~ +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Non] +\texttt{Ombre/Bordure} +\end{PostIt} +\begin{PostIt}[Coin,Attache=Non] +\texttt{Ombre/Bordure/Coin} +\end{PostIt}\hfill~ + +\vspace{1cm} + +\hfill\begin{PostIt}[Titre={Lipsum[1][1-4]},PoliceTitre={\large\sffamily},Inclinaison=5,Couleur=pink,Hauteur=6cm,Attache=Scotch,AlignementV=center,Coin] +\lipsum[1][1-4] +\end{PostIt}\hfill~ +\end{DemoCode} + +\pagebreak + +\subsection{Moteur de rendu tikz} + +\begin{DemoCode}[text only] +\hfill\begin{PostIt}[Rendu=tikz] +\texttt{Ombre/Épingle/Bordure} +\end{PostIt} +\begin{PostIt}[Ombre=false,Rendu=tikz] +\texttt{Épingle/Bordure} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Bordure=false,Rendu=tikz] +\texttt{Ombre/Épingle} +\end{PostIt} +\begin{PostIt}[Bordure=false,Ombre=false,Rendu=tikz] +\texttt{Épingle} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Trombone,Rendu=tikz] +\texttt{Ombre/Trombone/Bordure}\\ +~ +\end{PostIt} +\begin{PostIt}[Attache=Scotch,Rendu=tikz] +\texttt{Ombre/Scotch/Bordure}\\ +~ +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Non,Rendu=tikz] +\texttt{Ombre/Bordure} +\end{PostIt}\hfill~ + +\vspace{1cm} + +\hfill\begin{PostIt}[Rendu=tikz,Titre={Lipsum[1][1-4]},PoliceTitre={\large\sffamily},Inclinaison=5,Couleur=pink,Hauteur=6cm,Attache=Scotch,AlignementV=center,Coin] +\lipsum[1][1-4] +\end{PostIt}\hfill~ +\end{DemoCode} + +\subsection{Moteur de rendu tikzv2} + +\begin{DemoCode}[text only] +\hfill\begin{PostIt}[Rendu=tikzv2] +\texttt{Ombre/Épingle/Bordure} +\end{PostIt} +\begin{PostIt}[Ombre=false,Rendu=tikzv2] +\texttt{Épingle/Bordure} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Bordure=false,Rendu=tikzv2] +\texttt{Ombre/Épingle} +\end{PostIt} +\begin{PostIt}[Bordure=false,Ombre=false,Rendu=tikzv2] +\texttt{Épingle} +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Trombone,Rendu=tikzv2] +\texttt{Ombre/Trombone/Bordure}\\ +~ +\end{PostIt} +\begin{PostIt}[Attache=Scotch,Rendu=tikzv2] +\texttt{Ombre/Scotch/Bordure}\\ +~ +\end{PostIt}\hfill~ + +\medskip + +\hfill\begin{PostIt}[Attache=Non,Rendu=tikzv2] +\texttt{Ombre/Bordure} +\end{PostIt}\hfill~ + +\vspace{1cm} + +\hfill\begin{PostIt}[Rendu=tikzv2,Titre={Lipsum[1][1-4]},PoliceTitre={\large\sffamily},Inclinaison=5,Couleur=pink,Hauteur=6cm,Attache=Scotch,AlignementV=center,Coin] +\lipsum[1][1-4] +\end{PostIt}\hfill~ +\end{DemoCode} + + + \end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/postit/tex/postit.sty b/macros/latex/contrib/postit/tex/postit.sty index 76497257df..13dbd10ace 100644 --- a/macros/latex/contrib/postit/tex/postit.sty +++ b/macros/latex/contrib/postit/tex/postit.sty @@ -3,15 +3,32 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{postit}[2023/05/31 0.1.0 Utiliser des post-it] +\ProvidesPackage{postit}[2023/06/05 0.1.1 Utiliser des post-it] +%0.1.1 Ajout d'un \vphantom pour les mini-post-it + moteur de rendu tikz en supplément %0.1.0 Version initiale %------Packages utiles \RequirePackage{tcolorbox} \RequirePackage{simplekv} \RequirePackage{xstring} +\RequirePackage{settobox} %------Librairies \tcbuselibrary{skins} +\usetikzlibrary{calc,positioning,decorations,decorations.pathmorphing} + +%------variables utiles +\newsavebox{\maboitepostit} +\newlength{\HauteurEssaiTexte} +\def\OffsetOmbreA{3pt} +\def\OffsetOmbreB{2pt} +\def\OffsetOmbreC{1pt} +\def\MarginHGPostIt{0.25} +\def\MarginHDPostIt{0.55} +\def\MarginVHPostIt{3mm} +\def\MarginVBPostIt{2mm} +\def\LargeurStotch{2.5} +\def\HauteurScotch{1} +\def\PostItBorder{0.1mm} %------Clés \defKV[postit]{% @@ -25,7 +42,11 @@ Attache=\def\PostItDeco{#1},% AlignementV=\def\PostItAlignV{#1},% AlignementH=\def\PostItAlignH{#1},% - AlignementPostIt=\def\PostItAlignPostIt{#1} + AlignementPostIt=\def\PostItAlignPostIt{#1},% + Rendu=\def\PostItRender{#1},% + ExtraMargeDroite=\def\PostItExtraMargin{#1},% + Titre=\def\PostItTitre{#1},% + PoliceTitre=\def\PostItPoliceTitre{#1} } \setKVdefault[postit]{% @@ -36,41 +57,54 @@ EchelleAttache=1,% Ombre=true,% Hauteur=auto,% - DecalAttache=0cm,% + DecalAttache=0,% Attache=Punaise,% AlignementV=top,% AlignementH=justify,% AlignementPostIt=bottom,% Bordure=true,% - Coin=false + Coin=false,% + Rendu=tcbox,% + ExtraMargeDroite=0cm,% + Titre={},% + PoliceTitre=\normalfont\normalsize } %------Style principal tcolorbox \tcbset{testpostit/.style={% - on line,enhanced,colback=\PostItCoul!50,colframe=\PostItCoul!50!black,boxrule=\PostItBorder,width=\PostItLarg,sharp corners,halign=\PostItAlignH,valign=\PostItAlignV,% + on line,enhanced,colframe=\PostItCoul!50!black,boxrule=\PostItBorder,width=\PostItLarg,sharp corners,halign=\PostItAlignH,valign=\PostItAlignV,% + %colback=\PostItCoul!50,% finish={\CommandeDecoration},tikz={rotate=\PostItIncline,transform shape},% box align=\PostItAlignPostIt,% + interior style={top color=\PostItCoul!50,bottom color=\PostItCoul!33},% nobeforeafter }% } %------Gestion du coin \NewDocumentCommand\CoinPostIt{ }{% - \path[line width=\PostItBorder,fill=\PostItCoul!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); + \path[line width=\PostItBorder,fill=\PostItCoul!66] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); \path[line width=\PostItBorder,draw=\PostItCoul!50!black,shorten <=-0.05mm,shorten >=-0.05mm,color=\PostItCoul!50!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2); } %------Gestion du trombone \NewDocumentCommand\TrombonePostIt{ }{% - \begin{scope}[shift={([xshift={-1cm+\PostItDeclClip}]frame.north east)},rotate=-15,scale={\PostItCoulScaleClip*0.55},line cap=round] + \begin{scope}[shift={([xshift={-1cm+\PostItDeclClip cm}]frame.north east)},rotate=-15,scale={\PostItCoulScaleClip*0.55},line cap=round] \draw[line width=0.81mm,draw=\PostItCoulClip!66] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; \draw[line width=0.27mm,draw=\PostItCoulClip!33] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; \end{scope} } +%------Gestion du scotch +\NewDocumentCommand\ScotchPostIt{ }{% + \begin{scope}[shift={([xshift=\PostItDeclClip cm]frame.north)},scale={\PostItCoulScaleClip*0.65},line cap=round,rotate=3] + \draw[thin,gray!50,fill=lightgray,fill opacity=0.75] ({-0.5*\LargeurStotch},{-0.5*\HauteurScotch}) to ({0.5*\LargeurStotch},{-0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to ({0.5*\LargeurStotch},{0.5*\HauteurScotch})} to ({-0.5*\LargeurStotch},{0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to cycle} ; + \end{scope} +} + %------Gestion de la punaise \NewDocumentCommand\EpinglePostIt{ }{% - \begin{scope}[shift={([xshift=\PostItDeclClip,yshift=-0.5cm]frame.north)},scale={\PostItCoulScaleClip*0.55},rotate=-40] + \begin{scope}[shift={([xshift=\PostItDeclClip cm,yshift=-0.5cm]frame.north)},scale={\PostItCoulScaleClip*0.55},rotate=-40] \begin{scope}[rotate=-35] \draw[blue!10!gray,line cap=round,line width=2pt] (0,0) -- ++(90:0.85); \fill[blue!10!gray,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; @@ -81,58 +115,444 @@ \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.4) ellipse (.2 and .4); \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.8) ellipse (.4 and .3); - \end{scope} } %------Environnement principal -\NewDocumentEnvironment{PostIt}{ O{} D<>{} }% +\NewDocumentEnvironment{PostIt}{ O{} D<>{} +b }% {% \restoreKV[postit]% \setKV[postit]{#1}% - %choix de la déco et paramètrage - \def\CommandeDecoration{\EpinglePostIt}% - \def\MarginOffsetV{4mm}% - \IfStrEq{\PostItDeco}{Trombone}% - {\def\CommandeDecoration{\TrombonePostIt}\def\MarginOffsetV{0mm}}% - {}% - \IfStrEq{\PostItDeco}{Non}% - {\def\CommandeDecoration{}\def\MarginOffsetV{0mm}}% - {}% - %cas de la bordure - \ifboolKV[postit]{Bordure}% - {% - \def\PostItBorder{0.1mm}% - \tcbset{bordure/.style={}}% - }% + \IfStrEq{\PostItRender}{tcbox}% {% - \def\PostItBorder{0mm}% - \tcbset{bordure/.style={frame hidden}}% - }% - %cas du coin - \ifboolKV[postit]{Coin}% + %choix de la déco et paramètrage + \def\CommandeDecoration{\EpinglePostIt}% + \def\MarginOffsetV{4mm}% + \IfStrEq{\PostItDeco}{Trombone}% + {\def\CommandeDecoration{\TrombonePostIt}\def\MarginOffsetV{0mm}}% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {\def\CommandeDecoration{\ScotchPostIt}\def\MarginOffsetV{1mm}}% + {}% + \IfStrEq{\PostItDeco}{Non}% + {\def\CommandeDecoration{}\def\MarginOffsetV{0mm}}% + {}% + %cas de la bordure + \ifboolKV[postit]{Bordure}% + {% + \def\PostItBorder{0.1mm}% + \tcbset{bordure/.style={}}% + }% + {% + \def\PostItBorder{0mm}% + \tcbset{bordure/.style={frame hidden}}% + }% + %cas du coin + \ifboolKV[postit]{Coin}% + {% + \tcbset{coincoin/.style={rounded corners=southeast,arc is angular,arc=3mm,underlay={\CoinPostIt}}}% + }% + {% + \tcbset{coincoin/.style={}}% + }% + %en fonction de hauteur auto ou non + \IfStrEq{\PostItHauteur}{auto}% + {% + \ifboolKV[postit]{Ombre}% + {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,drop fuzzy shadow,top={2mm+\MarginOffsetV}]}% + {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,top={2mm+\MarginOffsetV}]}% + }% + {% + \ifboolKV[postit]{Ombre}% + {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,drop fuzzy shadow,height=\PostItHauteur,top={2mm+\MarginOffsetV}]}% + {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,height=\PostItHauteur,top={2mm+\MarginOffsetV}]}% + }% + \IfStrEq{\PostItTitre}{}% + {}% + {% + \hfill{}{\PostItPoliceTitre\PostItTitre}\hfill~\\% + }% + #3% + \end{tcolorbox}% + }{}% + \IfStrEq{\PostItRender}{tikz}% {% - \tcbset{coincoin/.style={rounded corners=southeast,arc is angular,arc=3mm,underlay={\CoinPostIt}}}% - }% + \StrDel{\PostItLarg}{cm}[\PostItLarg]% + \StrDel{\PostItExtraMargin}{cm}[\PostItExtraMargin]% + \def\LargeurTextePostIt{\fpeval{\PostItLarg-\MarginHGPostIt-\MarginHDPostIt}}% + \def\TextePostIt{% + \IfStrEq{\PostItTitre}{}{}{\hfill{}{\PostItPoliceTitre\PostItTitre}\hfill~\\}% + #3% + }% + \IfStrEq{\PostItHauteur}{auto}% + {% + \sbox{\maboitepostit}{\parbox{\LargeurTextePostIt cm}{\TextePostIt}}% + \settoboxtotalheight{\HauteurEssaiTexte}{\maboitepostit}% + \addtolength\HauteurEssaiTexte{\MarginVHPostIt}\addtolength\HauteurEssaiTexte{\MarginVBPostIt}% + \IfStrEq{\PostItDeco}{Scotch}% + {\addtolength\HauteurEssaiTexte{0.4cm}}% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {\addtolength\HauteurEssaiTexte{0.2cm}}% + {}% + \IfStrEq{\PostItDeco}{Punaise}% + {\addtolength\HauteurEssaiTexte{0.6cm}}% + {}% + \IfStrEq{\PostItDeco}{Non}% + {\addtolength\HauteurEssaiTexte{0.2cm}}% + {}% + \def\hauteur{\the\HauteurEssaiTexte}% + }% + {% + \def\hauteur{\PostItHauteur}% + }% + \def\OptionTikzPostIt{current bounding box.south}% + \IfStrEq{\PostItAlignPostIt}{center}% + {\def\OptionTikzPostIt{current bounding box.center}}{}% + \IfStrEq{\PostItAlignPostIt}{top}% + {\def\OptionTikzPostIt{current bounding box.north}}{}% + \begin{tikzpicture}[baseline=(\OptionTikzPostIt),rotate=\PostItIncline,line join=bevel,line cap=round] + %tracé + %ombre1/2/3 + \ifboolKV[postit]{Ombre}% + {% + \draw[draw=none,fill=gray,semithick,fill=gray,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=104] ++ ($({0.15},{-\hauteur+0.15})+(\OffsetOmbreA,-\OffsetOmbreA)$) + to[out=182,in=-2] ++ ({-0.15-\PostItLarg-\PostItExtraMargin},{0.13}) + -- cycle ; + \draw[draw=none,fill=gray!50!black,semithick,fill=gray!50!black,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=104] ++ ($({0.15},{-\hauteur+0.15})+(\OffsetOmbreB,-\OffsetOmbreB)$) + to[out=182,in=-2] ++ ({-0.15-\PostItLarg-\PostItExtraMargin},{0.13}) + -- cycle ; + \draw[draw=none,fill=black,semithick,fill=black,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=104] ++ ($({0.15},{-\hauteur+0.15})+(\OffsetOmbreC,-\OffsetOmbreC)$) + to[out=182,in=-2] ++ ({-0.15-\PostItLarg-\PostItExtraMargin},{0.13}) + -- cycle ; + }% + {}% + %postit + \ifboolKV[postit]{Bordure} + {% + \shadedraw[draw=\PostItCoul!50!black,line width=0.1mm,top color=\PostItCoul!50,bottom color=\PostItCoul!33] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=104] ++ ({0.15},{-\hauteur+0.15}) + to[out=182,in=-2] ++ ({-0.15-\PostItLarg-\PostItExtraMargin},{0.13}) + -- cycle ; + }% + {% + \shadedraw[draw=none,top color=\PostItCoul!50,bottom color=\PostItCoul!33] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=104] ++ ({0.15},{-\hauteur+0.15}) + to[out=182,in=-2] ++ ({-0.15-\PostItLarg-\PostItExtraMargin},{0.13}) + -- cycle ; + }% + \IfStrEq{\PostItHauteur}{auto}% + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.4cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {% + \IfStrEq{\PostItAlignV}{top} + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.4cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {}% + \IfStrEq{\PostItAlignV}{center} + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {}% + \IfStrEq{\PostItAlignV}{bottom} + {% + \draw ({0.5*\PostItLarg},{-\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,above=0.6cm,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + %affichage de la punaise + \IfStrEq{\PostItDeco}{Punaise}% + {% + \begin{scope}[shift={(0.5*\PostItLarg+0.5*\PostItExtraMargin+\PostItDeclClip,-0.49)},scale={0.55},rotate=-40] + \begin{scope}[rotate=-35] + \draw[blue!10!gray,line cap=round,line width=2pt] (0,0) -- ++(90:0.85); + \fill[blue!10!gray,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; + \fill[blue!10!gray,scale=0.5] (90:0.85) ++(0,0.4) ellipse (.2 and .4); + \fill[blue!10!gray,scale=0.5] (90:0.85) ++(0,0.8) ellipse (.4 and .3); + \end{scope} + \draw[line cap=round,line width=2pt] (0,0) -- ++(90:0.85); + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.4) ellipse (.2 and .4); + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.8) ellipse (.4 and .3); + \end{scope} + }% + {}% + %affichage du trombone + \IfStrEq{\PostItDeco}{Trombone}% + {% + \begin{scope}[shift={(\PostItLarg+\PostItExtraMargin-1+\PostItDeclClip,0)},rotate=-15,scale={\PostItCoulScaleClip*0.55},line cap=round] + \draw[line width=0.81mm,draw=\PostItCoulClip!66] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; + \draw[line width=0.27mm,draw=\PostItCoulClip!33] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; + \end{scope} + }% + {}% + %affichage du scotch + \IfStrEq{\PostItDeco}{Scotch}% + {% + \begin{scope}[shift={(0.5*\PostItLarg+0.5*\PostItExtraMargin+\PostItDeclClip,0)},scale={0.65},rotate=3,line cap=round] + \draw[thin,gray!50,fill=lightgray,fill opacity=0.75] ({-0.5*\LargeurStotch},{-0.5*\HauteurScotch}) to ({0.5*\LargeurStotch},{-0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to ({0.5*\LargeurStotch},{0.5*\HauteurScotch})} to ({-0.5*\LargeurStotch},{0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to cycle} ; + \end{scope} + }% + {}% + \end{tikzpicture}% + }{}% + \IfStrEq{\PostItRender}{tikzv2}% {% - \tcbset{coincoin/.style={}}% - }% - %en fonction de hauteur auto ou non - \IfStrEq{\PostItHauteur}{auto}% - {% - \ifboolKV[postit]{Ombre}% - {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,drop fuzzy shadow,top={2mm+\MarginOffsetV}]}% - {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,top={2mm+\MarginOffsetV}]}% - }% - {% - \ifboolKV[postit]{Ombre}% - {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,drop fuzzy shadow,height=\PostItHauteur,top={2mm+\MarginOffsetV}]}% - {\begin{tcolorbox}[testpostit,#2,bordure,coincoin,height=\PostItHauteur,top={2mm+\MarginOffsetV}]}% - }% + \StrDel{\PostItLarg}{cm}[\PostItLarg]% + \StrDel{\PostItExtraMargin}{cm}[\PostItExtraMargin]% + \def\LargeurTextePostIt{\fpeval{\PostItLarg-\MarginHGPostIt-\MarginHDPostIt}}% + \def\TextePostIt{% + \IfStrEq{\PostItTitre}{}{}{\hfill{}{\PostItPoliceTitre\PostItTitre}\hfill~\\}% + #3% + }% + \IfStrEq{\PostItHauteur}{auto}% + {% + \sbox{\maboitepostit}{\parbox{\LargeurTextePostIt cm}{\TextePostIt}}% + \settoboxtotalheight{\HauteurEssaiTexte}{\maboitepostit}% + \addtolength\HauteurEssaiTexte{\MarginVHPostIt}\addtolength\HauteurEssaiTexte{\MarginVBPostIt}% + \IfStrEq{\PostItDeco}{Scotch}% + {\addtolength\HauteurEssaiTexte{0.4cm}}% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {\addtolength\HauteurEssaiTexte{0.2cm}}% + {}% + \IfStrEq{\PostItDeco}{Punaise}% + {\addtolength\HauteurEssaiTexte{0.6cm}}% + {}% + \IfStrEq{\PostItDeco}{Non}% + {\addtolength\HauteurEssaiTexte{0.2cm}}% + {}% + \def\hauteur{\the\HauteurEssaiTexte}% + }% + {% + \def\hauteur{\PostItHauteur}% + }% + \def\OptionTikzPostIt{current bounding box.south}% + \IfStrEq{\PostItAlignPostIt}{center}% + {\def\OptionTikzPostIt{current bounding box.center}}{}% + \IfStrEq{\PostItAlignPostIt}{top}% + {\def\OptionTikzPostIt{current bounding box.north}}{}% + \begin{tikzpicture}[baseline=(\OptionTikzPostIt),rotate=\PostItIncline,line join=bevel,line cap=round] + %tracé + %ombre1/2/3 + \ifboolKV[postit]{Ombre}% + {% + \draw[draw=none,fill=gray,semithick,fill=gray,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=91] ++ ($({0.05},{-\hauteur-0.05})+(2pt,-2pt)$) + --++ ($({-\PostItLarg-\PostItExtraMargin-0.1},{0})+(-4pt,0)$) + to[out=89,in=-90] (0,0) ; + \draw[draw=none,fill=gray!50!black,semithick,fill=gray!50!black,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=91] ++ ($({0.05},{-\hauteur-0.05})+(1.25pt,-1.25pt)$) + --++ ($({-\PostItLarg-\PostItExtraMargin-0.1},{0})+(-2.5pt,0)$) + to[out=89,in=-90] (0,0) ; + \draw[draw=none,fill=black,semithick,fill=black,fill opacity=0.5] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=91] ++ ($({0.05},{-\hauteur-0.05})+(0.5pt,-0.5pt)$) + --++ ($({-\PostItLarg-\PostItExtraMargin-0.1},{0})+(-1pt,0)$) + to[out=89,in=-90] (0,0) ; + }% + {}% + %postit + \ifboolKV[postit]{Bordure} + {% + \shadedraw[draw=\PostItCoul!50!black,line width=0.1mm,top color=\PostItCoul!50,bottom color=\PostItCoul!33] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=91] ++ ({0.05},{-\hauteur-0.05}) + --++ ({-\PostItLarg-\PostItExtraMargin-0.1},{0}) + to[out=89,in=-90] (0,0) ; + }% + {% + \shadedraw[draw=none,top color=\PostItCoul!50,bottom color=\PostItCoul!33] + (0,0) --++ ({\PostItLarg+\PostItExtraMargin},0) + to[out=-90,in=91] ++ ({0.05},{-\hauteur-0.05}) + --++ ({-\PostItLarg-\PostItExtraMargin-0.1},{0}) + to[out=89,in=-90] (0,0) ; + }% + \IfStrEq{\PostItHauteur}{auto}% + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.4cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {% + \IfStrEq{\PostItAlignV}{top} + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.4cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,below,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {}% + \IfStrEq{\PostItAlignV}{center} + {% + \IfStrEq{\PostItDeco}{Punaise}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur-\MarginVHPostIt-0.2cm}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Non}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Trombone}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + \IfStrEq{\PostItDeco}{Scotch}% + {% + \draw ({0.5*\PostItLarg},{-0.5*\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + {}% + \IfStrEq{\PostItAlignV}{bottom} + {% + \draw ({0.5*\PostItLarg},{-\hauteur}) node[text width=\LargeurTextePostIt cm,rotate=\PostItIncline,above=0.6cm,align=\PostItAlignH,inner sep=0pt] {\TextePostIt} ; + }% + {}% + }% + %affichage de la punaise + \IfStrEq{\PostItDeco}{Punaise}% + {% + \begin{scope}[shift={(0.5*\PostItLarg+0.5*\PostItExtraMargin+\PostItDeclClip,-0.49)},scale={0.55},rotate=-40] + \begin{scope}[rotate=-35] + \draw[blue!10!gray,line cap=round,line width=2pt] (0,0) -- ++(90:0.85); + \fill[blue!10!gray,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; + \fill[blue!10!gray,scale=0.5] (90:0.85) ++(0,0.4) ellipse (.2 and .4); + \fill[blue!10!gray,scale=0.5] (90:0.85) ++(0,0.8) ellipse (.4 and .3); + \end{scope} + \draw[line cap=round,line width=2pt] (0,0) -- ++(90:0.85); + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ellipse (.65cm and .3cm) ; + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.4) ellipse (.2 and .4); + \fill[ball color=\PostItCoulClip!66,scale=0.5] (90:0.85) ++(0,0.8) ellipse (.4 and .3); + \end{scope} + }% + {}% + %affichage du trombone + \IfStrEq{\PostItDeco}{Trombone}% + {% + \begin{scope}[shift={(\PostItLarg+\PostItExtraMargin-1+\PostItDeclClip,0)},rotate=-15,scale={\PostItCoulScaleClip*0.55},line cap=round] + \draw[line width=0.81mm,draw=\PostItCoulClip!66] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; + \draw[line width=0.27mm,draw=\PostItCoulClip!33] (0,0) --++ (0,0.0) arc (180:0:3.5mm) --++ (0,-1.75) arc (0:-180:3mm) --++ (0,1.25) ; + \end{scope} + }% + {}% + %affichage du scotch + \IfStrEq{\PostItDeco}{Scotch}% + {% + \begin{scope}[shift={(0.5*\PostItLarg+0.5*\PostItExtraMargin+\PostItDeclClip,0)},scale={0.65},rotate=3,line cap=round] + \draw[thin,gray!50,fill=lightgray,fill opacity=0.75] ({-0.5*\LargeurStotch},{-0.5*\HauteurScotch}) to ({0.5*\LargeurStotch},{-0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to ({0.5*\LargeurStotch},{0.5*\HauteurScotch})} to ({-0.5*\LargeurStotch},{0.5*\HauteurScotch}) decorate [decoration={zigzag,segment length=2pt,amplitude=0.5pt}] {to cycle} ; + \end{scope} + }% + {}% + \end{tikzpicture}% + }{}% }% -{% - \end{tcolorbox}% -} +{}% %------Style principal minitcbox \tcbset{testminipostit/.style={% @@ -148,6 +568,7 @@ \NewTCBox{\MiniPostIt}{ s O{yellow} }{% testminipostit,colback=#2!50,colframe=#2!50!black,rounded corners=southeast,arc is angular,arc=2mm,% + before upper=\vphantom{pL}, underlay={ \path[line width=0.1mm,fill=#2!80!black] ([yshift=2mm]interior.south east)--++(-0.25,-0.1)--++(0.05,-0.1); \path[line width=0.1mm,draw=#2!50!black,shorten <=-0.05mm,shorten >=-0.05mm,color=#2!50!black] ([yshift=2mm]interior.south east)--++(-0.25,-0.1)--++(0.05,-0.1); diff --git a/macros/latex/contrib/profmaquette/README b/macros/latex/contrib/profmaquette/README new file mode 100644 index 0000000000..697df2b631 --- /dev/null +++ b/macros/latex/contrib/profmaquette/README @@ -0,0 +1,11 @@ +profmaquette est un package permettant d'adapter facilement différents documents. + +---------------- + +profmaquette is a package useful for change quickly documents. + +--------------- + +Author : Christophe Poulain +email : chrpoulain@gmail.com +Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
\ No newline at end of file diff --git a/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.pdf b/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.pdf Binary files differnew file mode 100644 index 0000000000..b3880c8135 --- /dev/null +++ b/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.pdf diff --git a/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.tex b/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.tex new file mode 100644 index 0000000000..9922ddb0ce --- /dev/null +++ b/macros/latex/contrib/profmaquette/doc/TestParcoursPerso.tex @@ -0,0 +1,31 @@ +\documentclass[12pt,french]{article} +\usepackage[nonamssymb]{ProfCollegeT} +\usepackage{PfMV7} +\input{Christ7} +\usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} +\usepackage{fourier-otf} +\usepackage[a4paper,margin=1.5cm,nohead,includefoot]{geometry} +\setlength{\parindent}{0pt} +\pagestyle{empty} +\usepackage{mflogo} +\usepackage{babel} +\usepackage{lipsum} +\begin{document} +\begin{Maquette}[ParcoursPerso]{Type=Fiche,Fichier=Documentation,Theme=L'alphabet,Niveau=6,Classe=Alpha} + \begin{exercice} + A + \end{exercice} + \begin{exercice} + B + \end{exercice} + \begin{exercice} + C + \end{exercice} + \begin{exercice} + D + \end{exercice} +\end{Maquette} +\end{document} +%%% Local Variables: +%%% TeX-engine: luatex +%%% End:
\ No newline at end of file diff --git a/macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf b/macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf Binary files differnew file mode 100644 index 0000000000..1e1de72f44 --- /dev/null +++ b/macros/latex/contrib/profmaquette/doc/profmaquette-doc.pdf diff --git a/macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex b/macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex new file mode 100644 index 0000000000..2929c9926d --- /dev/null +++ b/macros/latex/contrib/profmaquette/doc/profmaquette-doc.tex @@ -0,0 +1,967 @@ +% with lualatex +\documentclass[12pt,french]{article} +\usepackage[nonamssymb]{ProfCollege} +\usepackage{ProfMaquette} +\input{Christ7} +\usepackage[warnings-off={mathtools-colon,mathtools-overbracket}]{unicode-math} +\usepackage{fourier-otf} +\usepackage[a4paper,margin=1.5cm,nohead,includefoot]{geometry} +\setlength{\parindent}{0pt} +\pagestyle{empty} +\usepackage{mflogo} +\usepackage{babel} + +\def\MPclipOne#1#2#3{ + \begin{mplibcode} + vardef paired (expr d) = + if pair d : d else : (d,d) fi + enddef ; + + primarydef p xyscaled q = + begingroup ; save qq ; pair qq ; qq = paired(q) ; + ( p + if xpart qq<>0 : xscaled (xpart qq) fi + if ypart qq<>0 : yscaled (ypart qq) fi ) + endgroup + enddef ; + + path fullsquare; + fullsquare := unitsquare shifted - center unitsquare ; + + color myyellow; + myyellow = (242/255,226/255,149/255); + + path p; p := fullsquare xyscaled (#1,#2);% squeezed #3; + + %fill (point(0) of p)--(point(1) of p)--(point(2) of p)--(point(3) of p)--cycle; + pair pp; + pp=0.5[point(0) of p,point(2) of p]; + height=2pt; + width=2pt; + p:=(point(0) of p)--(point(1) of p)--(point(2) of p); + + p:=(1/3[point(0) of p,point(1) of p])--(point(1) of p)--(2/3[point(1) of p,point(2) of p]);% withpen pencircle scaled 2bp; + z1=point(0) of p; + x2=x12=xpart(point(length p/6) of p); + x3=x11=xpart(point(2*length p/6) of p); + x4=xpart(point(3*length p/6) of p)+width; + x5=x4-(width/3); + x6=x4-(2*width/3); + x7=xpart(point(length p) of p); + x8=x7-(width/3); + x9=x7-(2*width/3); + x10=x7-width; + y2=ypart(point(length p/6) of p)-(height/3); + y3=ypart(point(2*length p/6) of p)-(2*height/3); + y4=ypart(point(3*length p/6) of p)-height; + y12=ypart(point(length p/6) of p)+(height/3); + y11=ypart(point(2*length p/6) of p)+(2*height/3); + y10=ypart(point(3*length p/6) of p)+height; + y5=y9=ypart(point(4*length p/6) of p); + y6=y8=ypart(point(5*length p/6) of p); + y7=ypart(point(length p) of p); + fill z1--z2--cycle--z3--z4--z5--z6--z7--z8--z9--z10--z11--z12--cycle;% withcolor 0.85myyellow; + fill (z1--z2--cycle--z3--z4--z5--z6--z7--z8--z9--z10--z11--z12--cycle) rotatedabout(pp,180);% withcolor 0.85myyellow; + \end{mplibcode} +} + +\newsavebox{\tacochapterbox} + +\newcommand{\Tacoo}[1]{% + \begin{lrbox}{\tacochapterbox} + #1% + \end{lrbox} + \ooalign{% + \MPclipOne{\mpdim{\wd\tacochapterbox+1pc}}% width + {\mpdim{\ht\tacochapterbox+\dp\tacochapterbox+1pc}}% height + {0pt}% thickness of the curve + \cr\kern0.5pc\raisebox{\ht\tacochapterbox\relax}{\usebox\tacochapterbox}% + } +} + +\NewDocumentEnvironment{CadreMP}{+b}{% + \begin{lrbox}{\tacochapterbox} + \begin{minipage}{0.97\linewidth} + #1% + \end{minipage} + \end{lrbox} + \par + \ooalign{% + \MPclipOne{\mpdim{\wd\tacochapterbox+1pc}}% width + {\mpdim{\ht\tacochapterbox+\dp\tacochapterbox+1pc}}% height + {0pt}% thickness of the curve + \cr\kern0.5pc\raisebox{\ht\tacochapterbox\relax}{\usebox\tacochapterbox}% + }% +}{}% + +\usepackage{pdfpages} + +\title{Factoriser la production de documents} +\author{C.Poulain} +\date{\PfMfiledate} + +\usepackage[colorlinks=true,linkcolor=purple]{hyperref} + +\pagestyle{empty} + +\usepackage{listings} +\lstset{ + language = [LaTeX]TeX, + basicstyle = \ttfamily,% + breaklines = true, + commentstyle = \footnotesize\slshape\color{gray}, + emphstyle=\color{purple}, + columns=fullflexible,% + frame=tb,% + texcsstyle=*\color{black},%pour colorer la contre-oblique + classoffset=5, + texcsstyle=*\color{blue},%pour colorer la contre-oblique + moretexcs={brm,TikzDM,TikzDS,TikzIE,TikzFiche,Competences,TikzParcours,TikzPdT,PfMCompNA,PfMCompECA,PfMCompA,AfficheParcours}, + emph={Maquette,exercice,Solution,Reponse,Indice},% + classoffset=1, + keywords={DM,DS,IE,Fiche,CorrigeFin,CorrigeApres,PdT,Parcours,ParcoursPerso}, + keywordstyle=\color{OliveDrab}, + classoffset=2, + keywords={Theme,Niveau,Classe,Date,Calculatrice,Code,Numero,Sujet,Nom,NumSujet,Fichier,Type}, + keywordstyle=\color{BlueViolet},%DarkMagenta}, + classoffset=3, + keywords={Pouce,Direct,PasCorrige,BaremeDetaille,BaremeTotal,Source,Titre,Oral,Calculatrice,Competence,Trajet}, + keywordstyle=\color{DarkGreen}, +% delim = **[s][\color{purple}]{$}{$}, +% moredelim = **[s][\color{purple}]{\\[}{\\]}, +% moredelim = **[is][\color{black}]{\\Z}{\\Z}, + literate=*{[}{{\textcolor{orange}{[}}}{1} + {]}{{\textcolor{orange}{]}}}{1} + {\{}{\textcolor{amber}{\{}}{1} + {\}}{\textcolor{amber}{\}}}{1} + {\&}{\textcolor{red}{\&}}{1} + {\\[}{{\textcolor{purple}{\textbackslash[}}}{2} + {\\]}{{\textcolor{purple}{\textbackslash]}}}{2} + {$}{{\textcolor{purple}{\$}}}{1}%$ + {_}{{\textcolor{purple}{\_}}}{1}% + {^}{{\textcolor{purple}{\^{}}}}{1}%, +} + +% "Rehook" delimiters char table. +\makeatletter +\lst@AddToHook{SelectCharTable}{\lst@DefDelims} +\makeatother + +\usepackage{textcomp}%pour les < de listings +\usepackage{enumerate} +\usepackage{hhline} +\usepackage{pifont} + +\definecolor{mygray}{RGB}{245,245,245}%pour le background de listing +\definecolor{drab}{rgb}{0.59, 0.44, 0.09} +\definecolor{amber}{rgb}{1.0, 0.75, 0.0} +\definecolor{chocolate}{rgb}{0.82, 0.41, 0.12} +\colorlet{amber}{chocolate} + +\newtcblisting{Codes}[3][]{% + top=0mm,bottom=0mm,left=2mm,right=2mm,middle=0mm,% + colback=white,% + colframe=white!75!black,% + every listing line={#3},% + listing options={% + frame=,% + backgroundcolor=,% + },% + righthand width=#2\linewidth,% + #1% +}% + +\usepackage{menukeys} +\newcommand\metamk[1]{\textlangle#1\textrangle} + +\newcommand\Cle[1]{% + {\sffamily\textlangle #1\textrangle}% +}% + +\newcommand{\Defaut}[1]{% +\hfill valeur par défaut : {\sffamily #1}\par% +}% + +\usepackage{parskip} + +\newenvironment{Description} + {\list{}{\labelwidth0pt \leftmargin0pt \itemindent-\leftmargin + \let\makelabel\Descriptionlabel}} + {\endlist} +\newcommand*\Descriptionlabel[1]{\hspace\labelsep + \normalfont\bfseries #1} + +\parindent0pt + +\newcommand\TIKZ{Ti\textit{k}Z} + +\renewcommand\TikzDM{% + \begin{tcolorbox}[frame hidden,colback=white,enhanced,% + borderline north={3pt}{0pt}{gray!85}, + borderline north={2pt}{0.5pt}{gray!15}, + borderline south={3pt}{0pt}{gray!85}, + borderline south={2pt}{0.5pt}{gray!15}, + ]% + \sffamily Devoir en temps libre \no\useKV[DM]{Numero}\hfill\useKV[DM]{Niveau}\ieme{} \useKV[DM]{Classe}% + \par{\tiny\jobname}\hfill{\scriptsize Pour le \useKV[DM]{Date}}% + \end{tcolorbox}% +} +\renewcommand\TikzDS{% + \begin{tcolorbox}[colback=gray!5,% + enhanced,% + overlay unbroken and first={% + \node[yshift=1em] at (frame.south) {\scriptsize\sffamily-- Calculatrice \ifboolKV[DS]{Calculatrice}{autorisée}{interdite} --}; + } + ]% + \sffamily Devoir surveillé \no\useKV[DS]{Numero} (Sujet \useKV[DS]{Sujet})\hfill\useKV[DS]{Niveau}\ieme{} \useKV[DS]{Classe} + \par{\tiny\jobname}\hfill{\scriptsize\useKV[DS]{Date}} + \end{tcolorbox}% +} +\renewcommand\TikzIE{% + \begin{minipage}{0.6\linewidth} + \begin{tcolorbox}[colback=gray!5, + enhanced,% + overlay unbroken and first={% + \node[yshift=1em] at (frame.south) {\scriptsize\sffamily-- Calculatrice \ifboolKV[IE]{Calculatrice}{autorisée}{interdite} --}; + } + ]% + \sffamily \useKV[IE]{Nom} \no\useKV[IE]{Numero} : \useKV[IE]{Theme} \ifboolKV[IE]{Sujets}{\scriptsize(Sujet \useKV[IE]{NumSujet})}{} + \vspace{1em} + \par{\tiny\jobname}\hfill{\scriptsize\useKV[DS]{Date}} + \end{tcolorbox}% + \end{minipage}\hfill\begin{minipage}{0.35\linewidth} + Nom : \dotfill\\[0.5em] + Prénom : \dotfill\\[0.5em] + Classe : \dotfill + \end{minipage} + \par\bigskip +} + +\renewcommand\TikzFiche{% + \begin{tcolorbox}[%spread outwards=-1cm,spread inwards=-1cm, + colback=gray!5]% + \Large\sffamily \useKV[Fiche]{Theme}\hfill\useKV[Fiche]{Niveau}\ieme{} \useKV[Fiche]{Classe} + \par{\tiny\jobname}\hfill{\scriptsize\useKV[Fiche]{Date}} + \end{tcolorbox}% +} + +\renewcommand\TikzParcours{% + \begin{tcolorbox}[%spread outwards=-1cm,spread inwards=-1cm, + colback=gray!5]% + \Large\sffamily \useKV[Parcours]{Theme}\hfill\useKV[Parcours]{Niveau} \useKV[Parcours]{Classe}% + \par{\tiny\useKV[Parcours]{Code}}\hfill{\scriptsize\useKV[Parcours]{Date}}% + \end{tcolorbox}% +} + +\renewcommand\TikzPdT{% + \begin{tcolorbox}[%spread outwards=-1cm,spread inwards=-1cm, + colback=gray!5]% + \Large\sffamily \useKV[PdT]{Theme}\hfill\useKV[PdT]{Niveau} \useKV[PdT]{Classe}% + \par{\tiny\useKV[PdT]{Code}}\hfill{\scriptsize\useKV[PdT]{Date}}% + \end{tcolorbox}% +} +\begin{document} +\maketitle +\thispagestyle{empty} +Après la création du package \lstinline!ProfCollege!, l'idée de poursuivre la factorisation des méthodes de travail a naturellement germé. Produire des fiches, des devoirs, des évaluations\dots{} avec des méthodes différentes, cela peut vite apparaître fastidieux. Créé pour améliorer cela, cet ensemble de macro-commandes est basé, quasi exclusivement, sur les environnements \lstinline!Maquette! et \lstinline!exercice! : +\begin{itemize} +\item l'environnement \lstinline!Maquette! indique le type de document souhaité et ses caractéristiques; +\item l'environnement \lstinline!exercice! adapte la présentation et les fonctions des exercices en accord avec l'environnement \lstinline!Maquette!. +\end{itemize} +\clearpage +\section*{L'environnement \lstinline!Maquette!} +\begin{Codes}[listing only]{0.4}{} +\begin{Maquette} + +\end{Maquette} +\end{Codes} +C'est lui qui va indiquer : +\begin{itemize} +\item le type de document souhaité (Devoir Maison / Devoir Surveillé / Interrogatin écrite / Fiche d'exercices / Parcours d'exercices / Parcours personnalisé / Plan de travail); +\item et si ce travail est corrigé (à la suite d'un exercice ou à la fin du document) ou pas; +\end{itemize} +puis il indiquera les caractéristiques du document souhaité. +\clearpage +\subsection*{Les devoirs maison} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{DM}]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Numero}]\Defaut{1} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{\{\}} + \item[La clé \Cle{Niveau}]\Defaut{3} + \item[La clé \Cle{Code}\footnotemark]\Defaut{\{\}} + \end{itemize} +\end{Description} +\end{CadreMP} +\footnotetext{Outil personnel de classement.} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[DM]{Numero=3,Niveau=6,Classe=Zola,Date=25 décembre 2020} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +\clearpage +\subsection*{Les devoirs surveillés} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{DS}]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Numero}]\Defaut{1} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{} + \item[La clé \Cle{Niveau}]\Defaut{3} + \item[La clé \Cle{Code}]\Defaut{} + \item[La clé \Cle{Calculatrice}] autorisée ou non\Defaut{false} + \item[La clé \Cle{Sujet}]\Defaut{A} + \end{itemize} +\end{Description} +\end{CadreMP} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[DS]{Numero=3,Niveau=6,Classe=Zola,Date=25 décembre 2020} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +\clearpage +\subsection*{Les évaluations écrites} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{IE}]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Numero}]\Defaut{1} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{} + \item[La clé \Cle{Niveau}]\Defaut{3} + \item[La clé \Cle{Code}]\Defaut{} + \item[La clé \Cle{Calculatrice}] autorisée ou nom\Defaut{false} + \item[La clé \Cle{Sujet}] pour de multiples sujets\Defaut{\{\}} + \item[La clé \Cle{Theme}] Thème de l'évaluation \Defaut{\{\}} + \item[La clé \Cle{Nom}] Pour changer le nom \og \'Evaluation\fg\Defaut{\'Evaluation} + \end{itemize} +\end{Description} +\end{CadreMP} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[IE]{Numero=3,Niveau=6,Classe=Zola,Date=25 décembre 2020,Theme=La géométrie}% + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +\clearpage +\subsection*{Les fiches d'exercices} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{Fiche}]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{Nairobi} + \item[La clé \Cle{Niveau}]\Defaut{6} + \item[La clé \Cle{Theme}] Thème de la fiche \Defaut{Les nombres décimaux} + \item[La clé \Cle{Code}]\Defaut{} + \item[La clé \Cle{NomExercice}] pour modifier le nom des exercices\Defaut{Exercice} + \end{itemize} +\end{Description} +\end{CadreMP} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[Fiche]{Niveau=6,Classe=Zola,Date=25 décembre 2020} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +%\begin{Maquette}[Fiche]{Niveau=6,Classe=Zola,Date=25 décembre 2020} +% On considère un triangle $ABC$\dots +%\end{Maquette} +\clearpage +\subsection*{Les parcours} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{Parcours}\footnotemark]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{Nairobi} + \item[La clé \Cle{Niveau}]\Defaut{6} + \item[La clé \Cle{Theme}] Thème du parcours \Defaut{Les nombres décimaux} + \item[La clé \Cle{Code}]\Defaut{} + \item[La clé \Cle{NomExercice}] pour modifier le nom des exercices\Defaut{Exercice} + \end{itemize} +\end{Description} +\end{CadreMP} + \footnotetext{Il dispose des même clés que la clé \Cle{Fiche} et de la même présentation. Ce n'est pas là son utilité\dots} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[Parcours]{Niveau=6,Classe=Zola,Date=25 décembre 2020} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +\clearpage +\subsection*{Les parcours fléchés} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{PdT}\footnotemark]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Date}]\Defaut{\lstinline!\\today!} + \item[La clé \Cle{Classe}]\Defaut{Nairobi} + \item[La clé \Cle{Niveau}]\Defaut{6} + \item[La clé \Cle{Theme}] Thème du plan de travail \Defaut{Les nombres décimaux} + \item[La clé \Cle{Code}]\Defaut{} + \item[La clé \Cle{NomExercice}] pour modifier le nom des exercices\Defaut{Exercice} + \end{itemize} +\end{Description} +\end{CadreMP} + \footnotetext{Il dispose des même clés que la clé \Cle{Fiche} et de la même présentation. Ce n'est pas là son utilité\dots} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[PdT]{Niveau=6,Classe=Zola,Date=25 décembre 2020} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +%\begin{Maquette}[PdT]{Niveau=6,Classe=Zola,Date=25 décembre 2020} +% On considère un triangle $ABC$\dots +%\end{Maquette} +\clearpage +\subsection*{Les parcours personnalisés} +\begin{CadreMP} + \begin{Description} +\item[La clé \Cle{ParcoursPerso}]\Defaut{false} + \begin{itemize} + \item[La clé \Cle{Fichier}]\Defaut{}\par est le nom du fichier {\ttfamily csv} à utiliser pour créer les parcours personnalisés. + \end{itemize} +\end{Description} +\end{CadreMP} +\begin{Codes}[listing only]{0.4}{} +\begin{Maquette}[ParcoursPerso]{Fichier=Eleves} + On considère un triangle $ABC$\dots +\end{Maquette} +\end{Codes} +\clearpage +Comme on peut le voir, chaque type de travail est associé à une présentation. Ces présentations sont créées par les commandes\footnote{Qu'on peut donc redéfinir. Par exemple, c'est ce que j'ai fait dans ce document pour la commande \lstinline!\\TikzFiche! : elle ne commence plus une nouvelle page.} : \lstinline!\TikzDM/\TikzDMCor! pour la clé \Cle{DM}; \lstinline!\TikzDS/\TikzDSCor! pour la clé \Cle{DS}; \lstinline!\TikzIE/\TikzIECor! pour la clé \Cle{IE}; \lstinline!\TikzFiche/\TikzFicheCor! pour la clé \Cle{Fiche}, \lstinline!\TikzParcours/\TikzParcoursCor! pour la clé \Cle{Parcours} et \lstinline!\TikzPdT! pour la clé \Cle{PdT}. + +On dispose également de la commande \lstinline!\Competences! permettant de construire un tableau de\dots{} compétences données par l'utilisateur; les compétences étant séparées par le symbole \lstinline!/!. +\begin{Codes}[]{0.4}{} +\Competences{Utiliser le compas/Utiliser l'équerre} +\end{Codes} +Les notations \lstinline!NA!, \lstinline!ECA! et \lstinline!A! peuvent être redéfinies par les commandes \lstinline!\PfMCompNA!, \lstinline!\PfMCompECA! et \lstinline!\PfMCompA!. +\begin{Codes}[]{0.4}{} +\renewcommand\PfMCompNA{\rule{0pt}{3ex}\RKangry} +\renewcommand\PfMCompECA{\RKsad} +\renewcommand\PfMCompA{\RKbigsmile} +\Competences{Utiliser le compas/Utiliser l'équerre} +\end{Codes} +Si l'on souhaite davantage de niveaux d'évaluations (ou moins), on utilisera les codes suivants : +\begin{Codes}[]{0.4}{} +\Competences[4]{0§1§2§3/Utiliser le compas/Utiliser l'équerre} +\end{Codes} +\begin{Codes}[]{0.4}{} +\Competences[2]{A§NA/Utiliser le compas/Utiliser l'équerre} +\end{Codes} +\clearpage +\section*{L'environnement \lstinline!exercice!} +\begin{Codes}[listing only]{0.4}{} +\begin{exercice} + +\end{exercice} +\end{Codes} +\subsection*{Habillage des exercices} +L'envionnement \lstinline!exercice! doit {\em impérativement} être inclus dans un environnement \lstinline!Maquette! car le choix de document influence la présentation des exercices. +\begin{Codes}[]{0.5}{} +\begin{Maquette}[IE]{Theme=Les fonctions,Niveau=3,Classe=Gide} + \begin{exercice} + La fonction $f:x\mapsto3x+2$ est-elle une fonction affine ? Justifier. + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Codes}[listing side text]{0.6}{} +\begin{Maquette}[DM]{Numero=50,Niveau=3,Classe=Gide} + \begin{exercice} + La fonction $f:x\mapsto3x+2$ est-elle une fonction affine ? Justifier. + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Codes}[listing side text]{0.6}{} +\begin{Maquette}[DS]{Numero=50,Niveau=3,Classe=Gide} + \begin{exercice} + La fonction $f:x\mapsto3x+2$ est-elle une fonction affine ? Justifier. + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Codes}[]{0.4}{} +\begin{Maquette}[Fiche]{Theme=Les fonctions,Niveau=3,Classe=Gide} + \begin{exercice} + La fonction $f:x\mapsto3x+2$ est-elle une fonction affine ? Justifier. + \end{exercice} +\end{Maquette} +\end{Codes} +%\begin{Maquette}[Fiche]{Theme=Les fonctions,Niveau=3,Classe=Gide} +% \begin{exercice} +% La fonction $f:x\mapsto3x+2$ est-elle une fonction affine ? Justifier. +% \end{exercice} +%\end{Maquette} +\subsection*{Le barème des exercices} +On remarque que certains exercices sont associés à un total de point. C'est une des clés disponibles pour l'environnement \lstinline!exercice!. Voici celles pour les barèmes : +\begin{Description} +\item[La clé \Cle{BaremeTotal}] qui affichera, dans le coin supérieur droit, le total de points de l'exercice. La valeur de cette clé : + \begin{itemize} + \item est {\em fixée} à {\sffamily false} pour la clé \Cle{Fiche}; + \item est positionnée à {\sffamily true} mais {\em modifiable} pour les clés \Cle{DM}, \Cle{DS} et \Cle{IE}. + \end{itemize} +\item[La clé \Cle{BaremeDetaille}]\Defaut{false}\par qui a le même fonctionnement que la clé \Cle{BaremeTotal}. + La commande \lstinline!\brm{}! permet la construction du barème (détaillé et total). +\item[La clé \Cle{MotPoint}]\Defaut{point}\par donnée sous forme de texte puisque le pluriel est géré. + \begin{Codes}[listing only]{0.4}{} +\begin{Maquette}[DS]{Numero=3,Classe=Euler,Niveau=4} + \begin{exercice} % ici le barème est total, pas de détail : comportement par défaut + On considère les expressions $A=2x(3x+5)$ et $B=x(7x-1)$. + \begin{enumerate} + \item\brm{1} Développer l'expression $A$. + \item\brm{1.5} Développer l'expression $B$. + \end{enumerate} + \end{exercice} + \begin{exercice}[BaremeDetaille] %ici le barème est total ET détaillé + On considère les expressions $A=2x(3x+5)$ et $B=x(7x-1)$. + \begin{enumerate} + \item\brm{1} Développer l'expression $A$. + \item\brm{1.5} Développer l'expression $B$. + \end{enumerate} + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Maquette}[DS]{Numero=3,Classe=Euler,Niveau=4} + \begin{exercice} % ici le barème est total, pas de détail : comportement par défaut + On considère les expressions $A=2x(3x+5)$ et $B=x(7x-1)$. + \begin{enumerate} + \item\brm{1} Développer l'expression $A$. + \item\brm{1.5} Développer l'expression $B$. + \end{enumerate} + \end{exercice} + \begin{exercice}[BaremeDetaille] %ici le barème est total ET détaillé + On considère les expressions $A=2x(3x+5)$ et $B=x(7x-1)$. + \begin{enumerate} + \item\brm{1} Développer l'expression $A$. + \item\brm{1.5} Développer l'expression $B$. + \end{enumerate} + \end{exercice} +\end{Maquette} +\end{Description} +\clearpage +\subsection*{Source, compétence et titre} +Si on souhaite citer la source d'un exercice ou lui donner un titre, on dispose des clés : +\begin{Description} +\item[La clé \Cle{Source}] pour citer la source de l'exercice.\Defaut{\{\}} +\item[La clé \Cle{Titre}] pour nommer un exercice.\Defaut{\{\}} +\item[La clé \Cle{Competence}] pour indiquer une compétence associée à l'exercice.\Defaut{\{\}} +\begin{Codes}[listing only]{0.4}{} +\begin{Maquette}[Fiche]{Theme=Algorithmique} + \colorlet{PfMColCpt}{Crimson} + \colorlet{PfMColSrc}{NavyBlue} + \begin{exercice}[Source=Olympiades 2019,Titre=Modifier des mots,Competence=Raisonner] + Dans ce problème, on appellera {\em mot} toute suite de lettres formée des lettres A, D et G. Par exemple : ADD, A, AAADG sont des {\em mots}. + \\Astrid possède un logiciel qui fonctionne de la manière suivante : un utilisateur entre un {\em mot} et, après un clic sur EXÉCUTER, chaque lettre A du {\em mot} (s'il y en a) est remplacée par le {\em mot} AGADADAGA. Ceci donne un nouveau {\em mot}.\\Par exemple, si l'utilisateur rentre le {\em mot} AGA, on obtient le {\em mot} AGADADAGAGAGADADAGA. Un deuxième clic sur EXÉCUTER réitère la transformation décrite ci-dessus au nouveau {\em mot}, et ainsi de suite. + \begin{enumerate} + \item Quels sont les {\em mots} qui restent inchangés quand on clique sur EXÉCUTER ? + \end{enumerate} +\end{exercice} +\end{Maquette} +\end{Codes} +%\clearpage +\begin{Maquette}[Fiche]{Theme=Algorithmique} + \colorlet{PfMColCpt}{Crimson} + \colorlet{PfMColSrc}{NavyBlue} + \begin{exercice}[Source=Olympiades 2019,Titre=Modifier des mots,Competence=Raisonner] + Dans ce problème, on appellera {\em mot} toute suite de lettres formée des lettres A, D et G. Par exemple : ADD, A, AAADG sont des {\em mots}. + \\Astrid possède un logiciel qui fonctionne de la manière suivante : un utilisateur entre un {\em mot} et, après un clic sur EXÉCUTER, chaque lettre A du {\em mot} (s'il y en a) est remplacée par le {\em mot} AGADADAGA. Ceci donne un nouveau {\em mot}.\\Par exemple, si l'utilisateur rentre le {\em mot} AGA, on obtient le {\em mot} AGADADAGAGAGADADAGA. Un deuxième clic sur EXÉCUTER réitère la transformation décrite ci-dessus au nouveau {\em mot}, et ainsi de suite. + \begin{enumerate} + \item Quels sont les {\em mots} qui restent inchangés quand on clique sur EXÉCUTER ? + \end{enumerate} +\end{exercice} +\end{Maquette} +\end{Description} +\clearpage +\subsection*{Des logos ?} +Les clés décrites dans cette partie ne sont disponibles que pour les maquettes +\lstinline!Fiche! / \lstinline!Parcours!. +\begin{Description} +\item[La clé \Cle{Oral}]\Defaut{false}\par + pour indiquer que l'exercice se résoud oralement. +\item[La clé \Cle{Calculatrice}]\Defaut{true}\par + pour afficher que la calculatrice {\em est interdite}. +\end{Description} + \begin{Codes}[listing only,listing options={frame=,escapechar=!}]{0.4}{} +\begin{Maquette}[Fiche]{Theme=Calcul mental} + \begin{exercice}[Oral] + $1+1=?$ + \end{exercice} + \begin{exercice}[!\color{DarkGreen}\ttfamily Calculatrice!=false] + $1+1=?$ + \end{exercice} + % On peut mélanger les deux logos. + \begin{exercice}[!\color{DarkGreen}\ttfamily Calculatrice!=false,Oral] + $1+1=?$ + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Maquette}[Fiche]{Theme=Calcul mental} + \begin{exercice}[Oral] + $1+1=?$ + \end{exercice} + \begin{exercice}[Calculatrice=false] + $1+1=?$ + \end{exercice} + \begin{exercice}[Calculatrice=false,Oral] + $1+1=?$ + \end{exercice} +\end{Maquette} +\clearpage +\subsection*{Focus sur la maquette \lstinline!Parcours!} +Dans le cas de cette maquette, l'environnement \lstinline!exercice! dispose de la clé \Cle{Trajet} permettant de construire automatiquement le ou les parcours. La commande \lstinline!\AfficheParcours{}! représente un schéma associé à un parcours. Ce schéma se construit seul, automatiquement, après que l'enseignant ait utilisé la clé \Cle{Trajet} dans la création de ses exercices. Il faudra néanmoins deux compilations. \`A noter que ce schéma, avec l'utilisation du package \lstinline!hyperref!, dispose de liens cliquables sur les exercices sélectionnés pour le parcours. +\begin{Codes}[listing only,listing options={frame=,escapechar=!}]{0.4}{\small} +\begin{Maquette}[Parcours]{Theme=Calcul mental} + \begin{description} + \item[!Parcours! Padawan] \AfficheParcours{Padawan} + \item[!Parcours! Jedï] \AfficheParcours{Jedi} + \item[!Parcours! Grand Maître] \AfficheParcours{GrandMaitre} + \end{description} + \begin{exercice}[Trajet={Padawan,Jedi,GrandMaitre}] + + \end{exercice} + \begin{exercice}[Trajet={Padawan,Jedi}] + + \end{exercice} + \begin{exercice}[Trajet={Padawan}] + + \end{exercice} +\end{Maquette} +\end{Codes} +\begin{Maquette}[Parcours]{Theme=Calcul mental} + \begin{description} + \item[Parcours Padawan] \AfficheParcours{Padawan} + \item[Parcours Jedï] \AfficheParcours{Jedi} + \item[Parcours Grand Maître] \AfficheParcours{GrandMaitre} + \end{description} + \begin{exercice}[Trajet={Padawan,Jedi,GrandMaitre}] + + \end{exercice} + \begin{exercice}[Trajet={Padawan,Jedi}] + + \end{exercice} + \begin{exercice}[Trajet={Padawan}] + + \end{exercice} +\end{Maquette} +\clearpage +\subsection*{Focus sur la maquette \lstinline!ParcoursPerso!} +Dans le cas de cette maquette, l'environnement \lstinline!exercice! n'admet aucune clé. En effet, cette maquette utilise : +\begin{itemize} +\item et un fichier {\ttfamily *.csv} de la forme : + \begin{Codes}[listing only]{0.4}{} +Anne,Bec,{1,2} +Paul,Isse,{1,3} +Jean,Némar,{1,4} + \end{Codes} +\item une liste d'exercices pour produire les trois pages suivantes à l'aide du code : +\begin{Codes}[listing only]{0.4}{} +\begin{Maquette}[ParcoursPerso]{Type=Fiche,Fichier=Documentation,Theme=L'alphabet,Niveau=6,Classe=Alpha} + \begin{exercice} + A + \end{exercice} + \begin{exercice} + B + \end{exercice} + \begin{exercice} + C + \end{exercice} + \begin{exercice} + D + \end{exercice} +\end{Maquette} +\end{Codes} +\end{itemize} +\clearpage +\includepdf[pages=-]{TestParcoursPerso.pdf} +\clearpage +\subsection*{Focus sur la maquette \lstinline!PdT!} +Dans le cas de cette maquette, la présentation des exercices est modifiée : il n'y a plus de titre afin de gagner de la place. De plus, chaque exercice définit, en fonction de son numéro (non écrit mais présent), huit points d'ancrages :\lstinline!N-5!, \lstinline!S-5!, \lstinline!O-5!, \lstinline!E-5!, \lstinline!NO-5!, \lstinline!NE-5!, \lstinline!SO-5! et \lstinline!SE-5! pour respectivement les points Nord, Sud, Ouest, Est, Nord-Ouest, Nord-Est, Sud-Ouest et Sud-Est du cadre de l'exercice 5. + +On pourra aussi utiliser (avec les même n\oe uds précédés de \lstinline!SOS!) l'environnement \lstinline!SOS! servant d'aide aux élèves en difficulté. + +De plus, deux commandes font leur apparition : +\begin{itemize} +\item \lstinline!\CheminVrai! listant les liaisons entre exercices sous la forme \lstinline!noeud départ/noeud arrivée!; +\item \lstinline!\CheminFaux! listant les liaisons entre exercices sous la forme \lstinline!noeud départ/noeud arrivée!. +\end{itemize} +L'exemple suivant est obtenu par le code présenté à la page suivante. +\begin{Maquette}[PdT]{Theme=Plan de travail : Calcul littéral,Niveau=3,Classe=Alpha,Date={},Code={}} + \setcounter{PfMExo}{0} + \begin{minipage}{0.35\linewidth} + \begin{exercice}%Exercice 1 + A + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.3\linewidth} + \begin{exercice}%Exercice 2 + B + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.15\linewidth} + \begin{SOS}%SOS 1 + Aide A + \end{SOS} + \end{minipage} + + \vspace*{2cm} + + \begin{minipage}{0.35\linewidth} + \begin{exercice}%Exercice 3 + C + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.3\linewidth} + \begin{exercice}%Exercice 4 + D + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.15\linewidth} + \begin{SOS}%SOS 2 + Aide B + \end{SOS} + \end{minipage} + \CheminVrai{S-1/NO-3} + \CheminFaux{E-1/O-2,E-2/SOS-O-1} + \end{Maquette} + \clearpage +\begin{Codes}[listing only]{}{} + \begin{Maquette}[PdT]{Theme=Plan de travail : Calcul littéral,Niveau=3,Classe=Alpha,Date={},Code={}} + \begin{minipage}{0.35\linewidth} + \begin{exercice}%Exercice 1 + A + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.3\linewidth} + \begin{exercice}%Exercice 2 + B + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.15\linewidth} + \begin{SOS}%SOS 1 + Aide A + \end{SOS} + \end{minipage} + + \vspace*{2cm} + + \begin{minipage}{0.35\linewidth} + \begin{exercice}%Exercice 3 + C + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.3\linewidth} + \begin{exercice}%Exercice 4 + D + \end{exercice} + \end{minipage} + \hfill + \begin{minipage}{0.15\linewidth} + \begin{SOS}%SOS 2 + Aide B + \end{SOS} + \end{minipage} + \CheminVrai{S-1/NO-3} + \CheminFaux{E-1/O-2,E-2/SOS-O-1} + \end{Maquette} +\end{Codes} +\clearpage +\subsection*{\og Correction\fg{} des exercices} + Un exercice avec correction aura la forme suivante : + \begin{Codes}[listing only]{0.4}{} +\begin{exercice} + +\end{exercice} +\begin{Solution} + +\end{Solution} +\end{Codes} +On peut gérer la correction des exercices à deux niveaux : +\begin{Description} + \item[Au niveau de l'environnement ]\lstinline!Maquette!, on dispose de deux clés : +\end{Description} + \begin{Description} +\item[la Clé \Cle{CorrigeApres}]\Defaut{false}\par qui affiche le corrigé, s'il existe, après l'énoncé de l'exercice. +\item[la Clé \Cle{CorrigeFin}]\Defaut{false}\par qui affiche les corrigés, s'ils existent, à la fin du document. +\end{Description} + +Pour la maquette \lstinline!ParcoursPerso!, seule la clé \Cle{CorrigeFin} est autorisée. + +\begin{Codes}[listing only]{0.4}{\footnotesize} +\begin{Maquette}[IE,CorrigeApres]{Theme=Calcul littéral} + \begin{exercice}% n'a pas de correction + \begin{enumerate} + \item $1+1=?$. + \end{enumerate} + \end{exercice} + \begin{exercice} + \begin{enumerate} + \item Développer $A=2(x+3)$. + \end{enumerate} + \end{exercice} + \begin{Solution} + \begin{enumerate} + \item $A=2(x+3)=2\times x+2\times3=2x+6$ + \end{enumerate} + \end{Solution} +\end{Maquette} +\end{Codes} +\begin{Maquette}[IE,CorrigeApres]{Theme=Calcul littéral} + \begin{exercice}% n'a pas de correction + \begin{enumerate} + \item $1+1=?$. + \end{enumerate} + \end{exercice} + \begin{exercice} + \begin{enumerate} + \item Développer $A=2(x+3)$. + \end{enumerate} + \end{exercice} + \begin{Solution} + \begin{enumerate} + \item $A=2(x+3)=2\times x+2\times3=2x+6$ + \end{enumerate} + \end{Solution} +\end{Maquette} +\begin{Description} +\item[Au niveau de l'environnement ]\lstinline!exercice!, on peut affiner la correction proposée en écrivant le code de l'exercice sous la forme : +\end{Description} +\begin{Codes}[listing only]{0.4}{} +\begin{exercice} + +\end{exercice} +\begin{Solution} + +\end{Solution} +\begin{Reponse} + +\end{Reponse} +\begin{Indice} + +\end{Indice} +\end{Codes} +L'environnement \lstinline!exercice! dispose alors des clés suivantes : +\begin{Description} +\item[la Clé \Cle{PasCorrige}]\Defaut{false}\par supprime l'affichage de tous types de correction pour l'exercice considéré; +\item[la Clé \Cle{Pouce}]\Defaut{false}\par qui affiche uniquement le contenu de l'environnement \lstinline!Indice!; +\item[la Clé \Cle{Direct}]\Defaut{false}\par qui affiche uniquement le contenu de l'environnement \lstinline!Reponse!. +\end{Description} + +\bigskip + +Cela engendre, si nécessaire, la création de fichier \lstinline!*.sol! pour les solutions, \lstinline!*.rep! pour les réponses et \lstinline!*.cdp! pour les indices. Il conviendra de les effacer à chaque changement de clé (\Cle{PasCorrige}, \Cle{Pouce}, \Cle{Direct}) ou ajout d'exercice(s). En effet, la priorité d'affichage est donnée aux fichiers \lstinline!*.sol! puis \lstinline!*.rep! et enfin \lstinline!*.cdp!. + +\bigskip + +\begin{Codes}[listing only]{0.4}{} +\begin{Maquette}[DS,CorrigeFin]{Numero=3} + \begin{exercice} % La clé CorrigeFin utilise le contenu de l'environnement Solution + $1+\dfrac2{10}=$ + \end{exercice} + \begin{Solution} + $1+\dfrac2{10}=\num{1.2}$ + \end{Solution} + \begin{Reponse} + \num{1.2} + \end{Reponse} + \begin{Indice} + Une unité représente dix dixièmes de l'unité. + \end{Indice} + \begin{exercice}[PasCorrige] % Malgré les environnements Solution, Reponse, Indice + $7(x+5)=$ ? + \end{exercice} + \begin{Solution} + $7(x+5)=7\times x+7\times 5=7x+35$ + \end{Solution} + \begin{Indice} + Utiliser la simple distributivité. + \end{Indice} + \begin{Reponse} + $7x+35$ + \end{Reponse} + \begin{exercice}[Direct] % On affiche uniquement l'environnement Reponse + $\dfrac34-\dfrac25=$? + \end{exercice} + \begin{Solution} + $\dfrac34-\dfrac25=\dfrac{15}{20}-\dfrac8{20}=\dfrac7{20}$ + \end{Solution} + \begin{Reponse} + $\dfrac7{20}$ + \end{Reponse} + \begin{Indice} + C'est une soustraction, il faut réduire au même dénominateur. + \end{Indice} + \begin{exercice}[Pouce] % On affiche uniquement l'environnement Indice + Si $x=3$, que vaut $x^3+4x$ ? + \end{exercice} + \begin{Solution} + $x^3+4x=3^3+4\times3=27+12=39$ + \end{Solution} + \begin{Indice} + Que veut dire $x^3$ ? Que veut dire $4x$ ? + \end{Indice} + \begin{Reponse} + 39 + \end{Reponse} +\end{Maquette} +\end{Codes} +\begin{Maquette}[DS,CorrigeFin]{Numero=3} + \begin{exercice} % La clé CorrigeFin utilise le contenu de l'environnement Solution + $1+\dfrac2{10}=$ + \end{exercice} + \begin{Solution} + $1+\dfrac2{10}=\num{1.2}$ + \end{Solution} + \begin{Reponse} + \num{1.2} + \end{Reponse} + \begin{Indice} + Une unité représente dix dixièmes de l'unité. + \end{Indice} + \begin{exercice}[PasCorrige] + $7(x+5)=$ ? + \end{exercice} + \begin{Solution} + $7(x+5)=7\times x+7\times 5=7x+35$ + \end{Solution} + \begin{Indice} + Utiliser la simple distributivité. + \end{Indice} + \begin{Reponse} + $7x+35$ + \end{Reponse} + \begin{exercice}[Direct] + + $\dfrac34-\dfrac25=$? + \end{exercice} + \begin{Solution} + $\dfrac34-\dfrac25=\dfrac{15}{20}-\dfrac8{20}=\dfrac7{20}$ + \end{Solution} + \begin{Reponse} + $\dfrac7{20}$ + \end{Reponse} + \begin{Indice} + C'est une soustraction, il faut réduire au même dénominateur. + \end{Indice} + \begin{exercice}[Pouce] + Si $x=3$, que vaut $x^3+4x$ ? + \end{exercice} + \begin{Solution} + $x^3+4x=3^3+4\times3=27+12=39$ + \end{Solution} + \begin{Indice} + Que veut dire $x^3$ ? Que veut dire $4x$ ? + \end{Indice} + \begin{Reponse} + 39 + \end{Reponse} +\end{Maquette} +\end{document} +%%% Local Variables: +%%% TeX-engine: luatex +%%% End:
\ No newline at end of file diff --git a/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty b/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty new file mode 100644 index 0000000000..c18029cbe4 --- /dev/null +++ b/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty @@ -0,0 +1,1879 @@ +% Author : Christophe Poulain +% licence : Released under the LaTeX Project Public License v1.3c +% or later, see http://www.latex-project.org/lppl.txtf +\NeedsTeXFormat{LaTeX2e}% +\def\filedate{2023/06/04}% +\let\PfMfiledate\filedate% +\def\fileversion{0.15}% +\let\PfMfileversion\fileversion% +\ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]% + +% packages nécessaires +\RequirePackage{verbatim} + +\RequirePackage{calc} + +\RequirePackage{xlop} + +\RequirePackage[most]{tcolorbox} +\RequirePackage{varwidth} +\RequirePackage{xinttools} + +\RequirePackage{listofitems} +\RequirePackage{array} +\RequirePackage{datatool} + +%définition des clés +\RequirePackage{simplekv} +\setKVdefault[Boulot]{Base=false,BaseHTML=false,Fiche=false,DM=false,DS=false,IE=false,Kholle=false,RecapBrevet=false,PdT=false,Parcours=false,ParcoursPerso=false,CorrigeApres=false,CorrigeFin=false,Brevet=false,BaremeComplet=false,BaremeGlobal=false,AllDirect=false,AllPouce=false}%Les deux derniers pour essayer de mettre tous les exercices d'un même fichier en mode Reponse, en mode Indice. Pas implanté, pas testé +\setKVdefault[DM]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname} +\setKVdefault[DS]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false,Sujet=A} +\setKVdefault[Fiche]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe=Nairobi,Code={},NomExercice=Exercice} +\setKVdefault[PdT]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe=Nairobi,Code={},NomExercice=Exercice} +\setKVdefault[Parcours]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe=Nairobi,Code={},NomExercice=Exercice,Vertical=false} +\setKVdefault[ParcoursPerso]{Fichier={}} +\setKVdefault[IE]{Nom=\'Evaluation,Sujets=false,Theme={},Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false} +\defKV[IE]{Sujet=\setKV[IE]{Sujets}} +\setKVdefault[RecapBrevet]{Theme=Les nombres décimaux,Date=\today,Code={},NomExercice=Exercice} +\setKVdefault[Kholle]{Sujet=1,Numero=1,Date=15,Niveau=TSI-1,Code=\jobname,Lieu=Lycée + du Hainaut (Valenciennes),NomEleve=Albert Einstein,CR=false} +\setKVdefault[ClesExercices]{PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,TitreExo=Exercice,PasCorrige=false,Direct=false,Pouce=false,Parcours=false}% +\defKV[ClesExercices]{Source=\setKV[ClesExercices]{AffichageSource}}% +\defKV[ClesExercices]{Titre=\setKV[ClesExercices]{AffichageTitre}}% +\defKV[ClesExercices]{Competence=\setKV[ClesExercices]{AffichageCompetence}}% +\defKV[ClesExercices]{Trajet=\setKV[ClesExercices]{Parcours}} +\setKVdefault[SchemaParcours]{Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=LightSteelBlue,Csv=false}% +% Definition de longueurs +\newlength\PfMLargeurSchemaParcours +\newlength{\PfMHauteurAppreciation} +\setlength{\PfMHauteurAppreciation}{5cm} +\newlength{\PfMHauteurRemarque} +\setlength{\PfMHauteurRemarque}{5cm} +%définition des compteurs +\newcounter{PfMExo}%Numéro des exercices +\setcounter{PfMExo}{0}% +\newcounter{PfMCorrigeParcoursPerso}%affichage des solutions ou pas dans le cadre d'un parcours perso +\setcounter{PfMCorrigeParcoursPerso}{0}% +\newcounter{PfMSOS}%Numéro des SOS dans les parcours fléchés +\setcounter{PfMSOS}{0}% +\newcounter{PfMAlea}%Pour repérer les valeurs aléatoires construites automatiquement +\setcounter{PfMAlea}{0}% +\newcounter{RetiensSol}%Pour l'affichage des solutions +\newcounter{RetiensRep}%Pour l'affichage des reponses. +\newcounter{RetiensInd}%Pour l'affichage des indices. +\setcounter{RetiensSol}{0}% +\setcounter{RetiensRep}{0}% +\setcounter{RetiensInd}{0}% +\newcounter{PfMNbLogo}%Pour décaler les logos sur la ligne haute de tcolorbox +\setcounter{PfMNbLogo}{0}% +\newcounter{Maquette}%Pour compter le nombres de "travaux" +\setcounter{Maquette}{0}% +\newcount\Orientation%Pour le schéma des parcours +% couleurs +\colorlet{PfMColCpt}{gray!50} +\colorlet{PfMColSrc}{gray!50} +\colorlet{PfMCadreFiche}{gray!50} +\colorlet{PfMCadreDM}{gray!85} +\colorlet{PfMCadreParcours}{gray!50} +% Définitions de commandes +\newcommand\PfMIENom{\dotfill} +\newcommand\PfMIEPrenom{\dotfill} +\newcommand\PfMIEClasse{\dotfill} +\newcommand\PfMCompNA{NA} +\newcommand\PfMCompECA{ECA} +\newcommand\PfMCompA{A} +% Définitions pour les compétences +\NewDocumentCommand\Competences{O{3}m}{% + \setsepchar[*]{/*§}\ignoreemptyitems% + \readlist*\ListeCompetence{#2} + \ifnum#1=3\relax + \buildtabcompetences% + \else + \Buildtabcompetences{#1}{\listlen\ListeCompetence[1]}% + \fi +} + +\def\buildtabcompetences{% + \[\begin{tabular}{|p{0.70\linewidth}|*{3}{>{\centering\arraybackslash}p{0.05\linewidth}|}} + \cline{2-4} + \multicolumn{1}{c|}{}&\PfMCompNA&\PfMCompECA&\PfMCompA\\ + \hline + \xintFor* ##1 in {\xintSeq {1}{\ListeCompetencelen}}\do{\ListeCompetence[##1]&&&\\\hline} + \end{tabular} + \] +}% + +\newlength\PfMLargeurComp + +\def\Buildtabcompetences#1#2{% + \setlength{\PfMLargeurComp}{\fpeval{0.85-0.05*#2}\linewidth}% + \[\begin{tabular}{|p{\PfMLargeurComp}|*{#1}{>{\centering\arraybackslash}p{0.05\linewidth}|}}% + \cline{2-\fpeval{1+#1}}% + \multicolumn{1}{c|}{}\xintFor* ##1 in{\xintSeq{1}{#1}}\do{% + &\ListeCompetence[1,##1]}\\% + \hline% + \xintFor* ##1 in {\xintSeq {2}{\ListeCompetencelen}}\do{\ListeCompetence[##1]% + \xintFor* ##2 in {\xintSeq{1}{#1}}\do{&}% + \\\hline% + }% + \end{tabular}% + \]% +}% + +%%%% +%%% Définitions des environnements pour la correction +\makeatletter +\newwrite\verbatim@out + +\def\SolutionWrite{% + \@bsphack + \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.sol" % + \let\do\@makeother\dospecials + \catcode`\^^M\active + \def\verbatim@processline{% + \immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start} +\def\endSolutionWrite{\immediate\closeout\verbatim@out\@esphack} + +\def\SolutionWritePP{% + \@bsphack + \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.sol" % + \let\do\@makeother\dospecials + \catcode`\^^M\active + \def\verbatim@processline{% + \immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start} +\def\endSolutionWritePP{\immediate\closeout\verbatim@out\@esphack} + +\def\ReponseWrite{% + \@bsphack + \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.rep" % + \let\do\@makeother\dospecials + \catcode`\^^M\active + \def\verbatim@processline{% + \immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start} +\def\endReponseWrite{\immediate\closeout\verbatim@out\@esphack} + +\def\IndiceWrite{% + \@bsphack + \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.cdp" %coup de pouce + \let\do\@makeother\dospecials + \catcode`\^^M\active + \def\verbatim@processline{% + \immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start} +\def\endIndiceWrite{\immediate\closeout\verbatim@out\@esphack} +\makeatother + +\def\SolutionNow{\textbf{Correction de l'exercice --}\par\nopagebreak} +\def\endSolutionNow{\par\goodbreak} + +\def\ReponseNow{\textbf{Réponse(s) de l'exercice --}\par\nopagebreak} +\def\endReponseNow{\par\goodbreak} + +\def\IndiceNow{\textbf{Indice(s) --}\par\nopagebreak} +\def\endIndiceNow{\par\goodbreak} + +\NewDocumentEnvironment{Solution}{}{}{}% +\NewDocumentEnvironment{Reponse}{}{}{}% +\NewDocumentEnvironment{Indice}{}{}{}% + +\NewDocumentCommand\PfMChoixAffichageCorrection{}{% + \ifboolKV[Boulot]{ParcoursPerso}{% + \let\Solution\SolutionWritePP\let\endSolution\endSolutionWritePP + }{% + \ifnum\theRetiensSol=1\relax + \let\Reponse\comment\let\endReponse\endcomment + \let\Indice\comment\let\endIndice\endcomment + \ifboolKV[Boulot]{CorrigeFin}{% + \let\Solution\SolutionWrite\let\endSolution\endSolutionWrite + }{\ifboolKV[Boulot]{CorrigeApres}{% + \let\Solution\SolutionNow\let\endSolution\endSolutionNow + }{}% + }% + \else + \let\Solution\comment\let\endSolution\endcomment + \let\Indice\comment\let\endIndice\endcomment + \ifnum\theRetiensRep=1\relax + \ifboolKV[Boulot]{CorrigeFin}{% + \let\Reponse\ReponseWrite\let\endReponse\endReponseWrite + }{\ifboolKV[Boulot]{CorrigeApres}{% + \let\Reponse\ReponseNow\let\endReponse\endReponseNow + }{}% + }% + \else + \let\Solution\comment\let\endSolution\endcomment + \let\Reponse\comment\let\endReponse\endcomment + \ifnum\theRetiensInd=1\relax + \ifboolKV[Boulot]{CorrigeFin}{% + \let\Indice\IndiceWrite\let\endIndice\endIndiceWrite + }{\ifboolKV[Boulot]{CorrigeApres}{% + \let\Indice\IndiceNow\let\endIndice\endIndiceNow + }{}% + }% + \fi + \fi + \fi + }% +}% + +\NewDocumentCommand\PfMChoixCorrection{}{% + \setcounter{RetiensSol}{0} + \setcounter{RetiensRep}{0} + \setcounter{RetiensInd}{0} + \ifboolKV[Boulot]{CorrigeFin}{% + \setcounter{RetiensSol}{1}% + \setcounter{RetiensRep}{0}% + \setcounter{RetiensInd}{0}% + }{\ifboolKV[Boulot]{CorrigeApres}{% + \setcounter{RetiensSol}{1}% + \setcounter{RetiensRep}{0}% + \setcounter{RetiensInd}{0}% + }{}% + }% + \ifboolKV[ClesExercices]{PasCorrige}{% + \setcounter{RetiensSol}{0} + \setcounter{RetiensRep}{0} + \setcounter{RetiensInd}{0}% + }{% + \ifboolKV[ClesExercices]{Direct}{% + \setcounter{RetiensSol}{0} + \setcounter{RetiensRep}{1} + \setcounter{RetiensInd}{0}% + }{% + \ifboolKV[ClesExercices]{Pouce}{ + \setcounter{RetiensSol}{0} + \setcounter{RetiensRep}{0} + \setcounter{RetiensInd}{1}% + }{}% + }% + }% +}% + +\NewDocumentCommand\PfMAffichageCorrige{}{% + \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% + \IfFileExists{\jobname-Ex##1.sol}{\textbf{Corrigé de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ex##1.rep}{\textbf{Réponse(s) seule(s) de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.rep}\par\goodbreak}{% + \IfFileExists{\jobname-Ex##1.cdp}{\textbf{Indice(s) pour l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.cdp}\par\goodbreak}{} + }% + }% + }% +}% +%%%%%%%% BAREME %%%%%%%%%%% +%% Bareme +\newlength{\brouillon} + +\newcommand*\FranPt[1]{% + \ifboolKV[ClesExercices]{BaremeDetaille}{% + \color{gray!75}(\num{#1})% + }{} +} + +\makeatletter +\newcommand\BaremeEspace@Marge{15pt} +\newcommand\BaremeEspace@MargeCorrection{0pt} +%\f@size est la taille par défaut de la fonte. + +\newcommand*{\brm}[1]{% + \ifboolKV[Boulot]{Fiche}{}{% + \immediate\write\@auxout{% + \string\opadd*{#1}% + {total\the\c@section-\the\c@PfMExo}% + {total\the\c@section-\the\c@PfMExo}% + \string\opcopy{\thePfMExo}{TotalExo}% + }% + \ifboolKV[ClesExercices]{BaremeDetaille}{% + \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}% + \makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}% + \ignorespaces% + }% + }{}% +}% + +\newcommand*{\Brm}[1]{% + \ifboolKV[Boulot]{Fiche}{}{% + \setlength{\brouillon}{\BaremeEspace@MargeCorrection-\linewidth+\textwidth}% + \makebox[0pt][r]{\footnotesize\color{gray!75}(\opprint{#1})\hspace*{\brouillon}}% + \ignorespaces% + }% +}% + +\newcommand\total[1]{% + \@ifundefined{Op@total#1}{recompilez}% + {% + \opunzero{total#1}% on ne sait jamais + \opset{decimalsepsymbol={,}} + \opprint{total#1}~% + \opset{decimalsepsymbol={.}} + \opcmp{total#1}{2}% + \ifopge \useKV[ClesExercices]{MotPoint}s\else \useKV[ClesExercices]{MotPoint}\fi + }% +} + +\newcommand\NoteFinale{% + \@ifundefined{Op@TotalExo}{Recompilez}% + {% + \opexport{TotalExo}{\TotalExo}%Le total d'exercices est \TotalExo. + \xdef\NoteTotale{0}% + \xintFor* ##1 in {\xintSeq{1}{\TotalExo}}\do{% + \opexport{total##1-##1}{\totalUn}% + \xdef\NoteTotale{\fpeval{\NoteTotale+\totalUn}}% + }% + \NoteTotale% + }% +}% + +\newcommand\TableauRecapitulatif{% + \@ifundefined{Op@TotalExo}{Recompilez}% + {% + \opexport{TotalExo}{\TotalExo}% + \begin{tabular}{|c|c|} + \hline + \multicolumn{2}{|c|}{Barème récapitulatif}\\ + \hline + \xintFor* ##1 in {\xintSeq{1}{\TotalExo}}\do{ + Exercice ##1&\total{##1-##1}\\ + } + \hline + \end{tabular} + } +}% +\makeatother +%%%%%%%% FIN BAREME %%%%%%%%%%%%%%%% +%%%Style des différents documents +\tcbset{% + tikzbase/.style={% + before skip=1em, + enhanced, + breakable, + bicolor, + colback=LightSteelBlue, + colbacklower=white, + frame hidden, + } +} + +\tcbset{% + tikzbasehtml/.style={% + before skip=1em, + enhanced, + breakable, + frame hidden, + } +} + +\makeatletter +%%% Base des exercices DM +\tcbset{% + BaseDM/.style={% + lowerbox=ignored, + enhanced, + breakable, + colback=white, + colframe=PfMCadreDM, + fonttitle=\bfseries\sffamily, + title=Exercice \thePfMExo, + attach boxed title to top left={xshift=0.2mm}, + boxed title size=standard, + boxed title style={% + empty, + rounded corners=north, + boxrule=0pt, + bottom=0pt + }, + underlay boxed title={% + \filldraw[rounded corners, gray!85, line width=.5mm] + (title.south east)--++(90:\tcboxedtitleheight)--++(183:\tcboxedtitlewidth)--++(-90:\tcboxedtitleheight)|-cycle; + },% + overlay unbroken and first={% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=gray!50, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{}% + \ifboolKV[ClesExercices]{BaremeTotal}{% + \node[ + fill=white, + anchor=east, + xshift=-10pt, + text=black, + font=\bfseries + ] + at (frame.north east) + {\footnotesize\sffamily \total{\the\c@section-\the\c@PfMExo}}; + }{} + }% + }% +}% + +\newenvironment{exerciceDM}[1][]{% + \setcounter{PfMAlea}{0}% + \useKVdefault[ClesExercices] + \setKV[ClesExercices]{#1} + \refstepcounter{section} + \PfMChoixCorrection% + \refstepcounter{PfMExo} + \immediate\write\@auxout{% + \string\opcopy{\thePfMExo}{TotalExo}% + } + \ifboolKV[ClesExercices]{BaremeTotal}{% + \immediate\write\@auxout{% + \string\opcopy{0}{total\the\c@section-\the\c@PfMExo}% + }}{} + \tcolorbox[% + BaseDM, + label is label, + label=page-\theMaquette-\thePfMExo% + ] +}{% + \endtcolorbox% +} + +%%Parcours + +%\makeatletter +\NewDocumentCommand\AfficheParcours{om}{% + \useKVdefault[SchemaParcours]% + \setKV[SchemaParcours]{#1}% + \setlength{\PfMLargeurSchemaParcours}{\useKV[SchemaParcours]{Largeur}}% + \colorlet{PfMCouleurSP}{\useKV[SchemaParcours]{Couleur}}% + \@ifundefined{Op@ParcoursTotalExo}{Recompilez pour obtenir le parcours.}% + {% + \opexport{ParcoursTotalExo}{\ParcoursTotalExo}% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeExercicesPA{\csname Parcours#2\endcsname} + \reademptyitems% + \xdef\PfCFooTestA{\ListeExercicesPA[1]}% + \ifnum\ListeExercicesPAlen>1\relax% + \xintFor* ##1 in{\xintSeq{2}{\ListeExercicesPAlen}}\do{% + \xdef\PfCFooTestA{\PfCFooTestA,\ListeExercicesPA[##1]}% + }% + \fi% + \ifboolKV[Parcours]{Vertical}{% + \BuildParcoursTikzV{\ParcoursTotalExo}{\PfCFooTestA}% + }{% + \BuildParcoursTikz{\ParcoursTotalExo}{\PfCFooTestA}% + }% + }% +}% +%\makeatother + +\NewDocumentCommand\BuildParcoursTikzV{mm}{% + \setsepchar{,}% + \readlist*\ListeRetiens{#2}% + \begin{tikzpicture}[remember picture,overlay] + % On place les points + \coordinate[xshift=-1cm,yshift=-4cm] (A-1) at (current page.north east);% + \xintFor* ##1 in{\xintSeq{2}{#1}}\do{% + \coordinate[yshift=-1cm] (A-##1) at (A-\fpeval{##1-1});% + }% + \foreach\i in{2,...,#1}{% + \draw[dashed] (A-\fpeval{\i-1}) -- (A-\i);% + }% + \xintFor* ##1 in{\xintSeq{1}{#1}}\do{% + \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};% + }% + \foreachitem\compteur\in\ListeRetiens{% + \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\theMaquette-\ListeRetiens[\compteurcnt]}};% + }% + \end{tikzpicture}% +}% + +\NewDocumentCommand\BuildParcoursTikz{mm}{% + \setsepchar{,}% + \readlist*\ListeRetiens{#2}% + \begin{tikzpicture} + % On place les points + \Orientation=1\relax + \coordinate (A-1) at (0,0);% + \xintFor* ##1 in{\xintSeq{2}{#1}}\do{% + \modulo{##1}{\useKV[SchemaParcours]{Colonnes}}% + \ifnum\remainder=0\relax% + \Orientation=\numexpr\Orientation*(-1)\relax% + \coordinate[yshift=-1cm] (A-##1) at (A-\fpeval{##1-1});% + \else% + \coordinate[xshift=\the\Orientation*\PfMLargeurSchemaParcours] (A-##1) at (A-\fpeval{##1-1});% + \fi% + }% + \foreach\i in{2,...,#1}{% + \draw[dashed] (A-\fpeval{\i-1}) -- (A-\i);% + }% + \xintFor* ##1 in{\xintSeq{1}{#1}}\do{% + \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};% + }% + \foreachitem\compteur\in\ListeRetiens{% + \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\theMaquette-\ListeRetiens[\compteurcnt]}};% + }% + \end{tikzpicture}% +}% + +\NewDocumentCommand\RemplisParcours{m}{% + \ifcsname trajet#1\endcsname + \expandafter\xdef\csname trajet#1\endcsname{\csname trajet#1\endcsname,\thePfMExo}% +% Yes ! + \else +% No ! + \expandafter\xdef\csname trajet#1\endcsname{\thePfMExo}% + \fi + \immediate\write\@auxout{\noexpand\expandafter\gdef\noexpand\csname Parcours#1\endcsname{\csname trajet#1\endcsname}}% +}% + +\def\exerciceParcoursPerso{% + \stepcounter{PfMExo}% + \PfMChoixCorrection% + \@bsphack% + \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.tex" % + \let\do\@makeother\dospecials% + \catcode`\^^M\active% + \def\verbatim@processline{% + \immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start}% + +\def\endexerciceParcoursPerso{\immediate\closeout\verbatim@out\@esphack}% + +\newenvironment{exerciceParcours}[1][]{% + \setcounter{PfMAlea}{0}% + \setcounter{PfMNbLogo}{1}% + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% + \refstepcounter{section}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \immediate\write\@auxout{\string\opcopy{\thePfMExo}{ParcoursTotalExo}}% + % Creation des parcours + \ifboolKV[ClesExercices]{Parcours}{% + \setsepchar{,}% + \xdef\PfMFooListeParcours{\useKV[ClesExercices]{Trajet}} + \readlist*\ListeParcours{\PfMFooListeParcours}% + \foreachitem\compteur\in\ListeParcours{% + \RemplisParcours{\ListeParcours[\compteurcnt]}% + }% + }{}% + % + \tcolorbox[% + tikzparcours, + label is label, + label=page-\theMaquette-\thePfMExo + ] +}{\endtcolorbox% +} + +\newenvironment{exerciceFiche}[1][]{% + \setcounter{PfMAlea}{0}% + \setcounter{PfMNbLogo}{1}% + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% + \refstepcounter{section}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \tcolorbox[% + tikzfiche, + label is label, + label=page-\theMaquette-\thePfMExo + ] +}{\endtcolorbox% +} + +\newenvironment{exerciceDS}[1][]{% + \setcounter{PfMAlea}{0}% + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \refstepcounter{section}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \immediate\write\@auxout{% + \string\opcopy{\thePfMExo}{TotalExo}% + } + \ifboolKV[ClesExercices]{BaremeTotal}{% + \immediate\write\@auxout{% + \string\opcopy{0}{total\the\c@section-\the\c@PfMExo}% + }}{} + \tcolorbox[% + tikzds, + label is label, + label=page-\theMaquette-\thePfMExo + ] +}{\endtcolorbox% +} +\makeatother +%%% Recap Brevet +% Fiche Exercice Brevet +\newcommand\TikzRecapBrevet{% +\begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[RecapBrevet]{Theme} + \par{\tiny\useKV[RecapBrevet]{Code}}\hfill{\scriptsize\useKV[RecapBrevet]{Date}} + \end{tcolorbox}% +} + +\newcommand\TikzRecapBrevetCor[1]{% + \clearpage + \setKV[RecapBrevet]{#1}% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[RecapBrevet]{Theme} (Correction) + \par{\tiny\useKV[RecapBrevet]{Code}}\hfill{\scriptsize\useKV[RecapBrevet]{Date}} + \end{tcolorbox}% +} + +\makeatletter +\newenvironment{ExerciceRecapBrevet}[1][]{% + \setcounter{PfMAlea}{0}% + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \refstepcounter{section}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \ifboolKV[ClesExercices]{BaremeTotal}{% + \immediate\write\@auxout{% + \string\opcopy{0}{total\the\c@section-\the\c@PfMExo}% + }% + }{}% + \tcolorbox[% + tikzrecapbrevet, + label is label, + label=page-\theMaquette-\thePfMExo + ] +}{\endtcolorbox% +} + +\tcbset{% + tikzrecapbrevet/.style={% + before skip=1em,% + enhanced,% + breakable,% + colback=white,% + colframe=PfMCadreFiche,% + overlay unbroken and first={% + \node[% + name=A,% + fill=white,% + anchor=west,% + xshift=10pt,% + ] at (frame.north west){\bfseries\sffamily \useKV[Fiche]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}};% + %% + \node[% + fill=white,% + anchor=east,% + xshift=-10pt,% + text=black,% + font=\bfseries% + ] + at (frame.north east)% + {\footnotesize\sffamily \total{\the\c@section-\the\c@PfMExo}};% + }% + }% +}% +\makeatother +%% PDT +\tcbset{% + tikzpdt/.style={% + top=\ifboolKV[ClesExercices]{PasTitre}{0mm}{2mm},bottom=0mm,left=0mm,right=0mm,% + before skip=1em, + enhanced, + breakable, + colback=white, + colframe=blue!50, + remember, + overlay unbroken and first={% + \coordinate[xshift=2pt,yshift=-2pt] (NO-\thePfMExo) at (frame.north west);% + \coordinate[xshift=-2pt,yshift=-2pt] (NE-\thePfMExo) at (frame.north east);% + \coordinate[xshift=-2pt,yshift=2pt] (SE-\thePfMExo) at (frame.south east);% + \coordinate[xshift=2pt,yshift=2pt] (SO-\thePfMExo) at (frame.south west);% + \coordinate (N-\thePfMExo) at (frame.north); + \coordinate (S-\thePfMExo) at (frame.south); + \coordinate (E-\thePfMExo) at (frame.east); + \coordinate (O-\thePfMExo) at (frame.west); + \ifboolKV[ClesExercices]{PasTitre}{% + \coordinate[xshift=10pt] (A) at (frame.north west); + }{% + \node[% + name=A, + fill=white, + anchor=west, + xshift=10pt, + ] at (frame.north west){\bfseries\sffamily \useKV[PdT]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}}; + } + %% + \ifboolKV[ClesExercices]{Calculatrice}{}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\cancel{\faCalculator}};\stepcounter{PfMNbLogo}} + \ifboolKV[ClesExercices]{Oral}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faBullhorn};\stepcounter{PfMNbLogo}}{}% + %% + \ifboolKV[ClesExercices]{AffichageCompetence}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColCpt,% + ] + at (frame.north east) + {\itshape\scriptsize\sffamily Compétence(s) dominante(s) : \useKV[ClesExercices]{Competence}}; + }{}% + %% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColSrc, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{}% + }% + }% +}% + +\NewDocumentCommand\TikzPdT{}{% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[PdT]{Theme}\hfill\useKV[PdT]{Niveau} \useKV[PdT]{Classe}% + \par{\tiny\useKV[PdT]{Code}}\hfill{\scriptsize\useKV[PdT]{Date}}% + \end{tcolorbox}% +} + +\NewDocumentCommand\TikzPdTCor{m}{% + \clearpage + \setKV[PdT]{#1}% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[PdT]{Theme} (Correction) \hfill\useKV[PdT]{Niveau} \useKV[PdT]{Classe} + \par{\tiny\useKV[PdT]{Code}}\hfill{\scriptsize\useKV[PdT]{Date}} + \end{tcolorbox}% +} + +\newenvironment{exercicePdT}[1][]{% + \setcounter{PfMAlea}{0}% + \setcounter{PfMNbLogo}{1} + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% + \refstepcounter{section}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \tcolorbox[% + tikzpdt + ]% +}{\endtcolorbox% +} + +\newenvironment{SOS}[1][]{% + \stepcounter{PfMSOS}% + \tcolorbox[% + enhanced, + remember,% + tikzsos, + overlay unbroken and first={% + \coordinate[xshift=2pt,yshift=-2pt] (SOS-NO-\thePfMSOS) at (frame.north west);% + \coordinate[xshift=-2pt,yshift=-2pt] (SOS-NE-\thePfMSOS) at (frame.north east);% + \coordinate[xshift=-2pt,yshift=2pt] (SOS-SE-\thePfMSOS) at (frame.south east);% + \coordinate[xshift=2pt,yshift=2pt] (SOS-SO-\thePfMSOS) at (frame.south west);% + \coordinate (SOS-N-\thePfMSOS) at (frame.north); + \coordinate (SOS-S-\thePfMSOS) at (frame.south); + \coordinate (SOS-E-\thePfMSOS) at (frame.east); + \coordinate (SOS-O-\thePfMSOS) at (frame.west); + }% + ]% +}{\endtcolorbox% +} + +\tikzstyle{cheminPdT}=[-stealth] + +\NewDocumentCommand\CheminVrai{m}{% + \setsepchar[*]{,*/}% + \readlist*\ListeCheminVrai{#1}% + \setsepchar{,}% + \begin{tikzpicture}[remember picture,overlay]% + \foreachitem\compteur\in\ListeCheminVrai{% + \draw[cheminPdT] (\ListeCheminVrai[\compteurcnt,1]) to node[midway]{\Large \RKbigsmile}(\ListeCheminVrai[\compteurcnt,2]);% + }% + \end{tikzpicture}% +}% + +\NewDocumentCommand\CheminFaux{m}{% + \setsepchar[*]{,*/}% + \readlist*\ListeCheminVrai{#1}% + \setsepchar{,}% + \begin{tikzpicture}[remember picture,overlay]% + \foreachitem\compteur\in\ListeCheminVrai{% + \draw[cheminPdT] (\ListeCheminVrai[\compteurcnt,1]) to node[midway]{\Large \RKdevilish}(\ListeCheminVrai[\compteurcnt,2]);% + }% + \end{tikzpicture}% +}% + +\tcbset{% + tikzsos/.style={% + left=0pt,right=0pt,top=0pt,bottom=0pt,% + colback=Crimson!15,% + colframe=Crimson!50,% + }% +}% + +%% Kholle +\tcbset{% + tikzkholle/.style={% + before skip=1em, + enhanced, + breakable, + colback=white, + colframe=gray!50, + overlay unbroken and first={% + \node[% + name=A, + fill=white, + anchor=west, + xshift=10pt, + ] at (frame.north west){\ifboolKV[ClesExercices]{AffichageTitre}{% + {\bfseries\sffamily\useKV[ClesExercices]{Titre}}% + }{\bfseries\sffamily Exercice \thePfMExo}% + \xintifboolexpr{\useKV[ClesExercices]{Difficulte}<1}{}{% + ~(\foreach \s in {1,...,\useKV[ClesExercices]{Difficulte}}{% + $\star$% + })% + } + } + ; + %% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[ + fill=white, + anchor=east, + xshift=-10pt, + text=gray!50, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{} + } + } +} + +\newenvironment{CRNote}{% + \tcolorbox[colback=white,height=2cm,title=NOTE,fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white,enhanced,% + overlay unbroken and first={% + \node[% + anchor=east, + yshift=-8pt, + xshift=-10pt, + text=black, + ] + at (frame.north east) + {\sffamily\bfseries \useKV[Kholle]{NomEleve}}; + \node[% + anchor=center, + yshift=-8pt, + text=black, + ] + at (frame.north) + {\sffamily\bfseries \useKV[Kholle]{Date}}; + } + ]% + }{% + \endtcolorbox% +} + +\newlength{\CRRHauteur} +\setlength{\CRRHauteur}{10cm} + +\newenvironment{CRRemarque}{% + \tcolorbox[colback=white,height=\CRRHauteur,title=REMARQUE(S),fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white% + ]} +{% + \endtcolorbox% +}% + +\NewDocumentEnvironment{exerciceKholle}{o}{% + \useKVdefault[ClesExercices]% + \setKV[ClesExercices]{#1}% + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% + \PfMChoixCorrection% + \refstepcounter{PfMExo}% + \tcolorbox[% + tikzkholle, + label is label, + label=page-\theMaquette-\thePfMExo + ] +}{\endtcolorbox% +} + +\newenvironment{exerciceBase}[1][]{% + \setcounter{PfMAlea}{0}% + \setcounter{PfMNbLogo}{1} + \useKVdefault[ClesExercices] + \setKV[ClesExercices]{#1} + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false} + \refstepcounter{PfMExo} + \tcolorbox[% + tikzbase + ] +}{\endtcolorbox% +} + +\newenvironment{exerciceBaseHTML}[1][]{% + \setcounter{PfMAlea}{0}% + \setcounter{PfMNbLogo}{1} + \useKVdefault[ClesExercices] + \setKV[ClesExercices]{#1} + \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false} + \refstepcounter{PfMExo} + \tcolorbox[% + standard jigsaw, opacityback=0, + lowerbox=ignored, + tikzbasehtml + ] +}{\endtcolorbox% +} + +%Alias pour tous les exercices. +\NewDocumentEnvironment{exercice}{}{}{}% + +%%%%%%%%% STyle Kholle%%%%%%%%%% +% Kholle +\newcommand\TikzKholle{% + \clearpage + \begin{tcolorbox}[frame hidden,colback=white,enhanced,% + borderline north={3pt}{0pt}{gray!85}, + borderline north={2pt}{0.5pt}{gray!15}, + borderline south={3pt}{0pt}{gray!85}, + borderline south={2pt}{0.5pt}{gray!15}, + ]% + \sffamily Interrogation Orale \no\useKV[Kholle]{Numero}\hfill + \ifboolKV[Kholle]{CR}{}{Sujet \useKV[Kholle]{Sujet}\hfill}\useKV[Kholle]{Niveau}% + \par\useKV[Kholle]{Lieu}\hfill Le \useKV[Kholle]{Date}% + \end{tcolorbox}% +} + +\newcommand\TikzKholleCor[1]{% + \clearpage + \setKV[Kholle]{#1} + \begin{tcolorbox}[colback=white,height=2cm,title=NOTE,fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white,enhanced,% + overlay unbroken and first={% + \node[% + anchor=east, + yshift=-8pt, + xshift=-10pt, + text=black, + ] + at (frame.north east) + {\sffamily\bfseries Nom : \hbox to5cm{}}; + \node[% + anchor=center, + yshift=-8pt, + text=black, + ] + at (frame.north) + {\sffamily\bfseries \useKV[Kholle]{Date}}; + } + ]% + \end{tcolorbox}% + \begin{tcolorbox}[colback=white,height=2cm,title=EXERCICE(S),fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white% + ]% + \end{tcolorbox}% + \begin{tcolorbox}[colback=white,height=\textheight-5cm,title=REMARQUE(S),fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white% + ]% + \end{tcolorbox}% +} + +%%%%%%%%%% Style DM%%%%%%%%%%%%% +\NewDocumentCommand\TikzDM{}{% + \clearpage% + \begin{tcolorbox}[frame hidden,colback=white,enhanced,% + borderline north={3pt}{0pt}{gray!85},% + borderline north={2pt}{0.5pt}{gray!15},% + borderline south={3pt}{0pt}{gray!85},% + borderline south={2pt}{0.5pt}{gray!15},% + ]% + \sffamily Devoir en temps libre \useKV[DM]{Numero}\hfill\useKV[DM]{Niveau} \useKV[DM]{Classe}%\no + \par{\tiny\useKV[DM]{Code}}\hfill{\scriptsize Pour le \useKV[DM]{Date}}% + \end{tcolorbox}% +}% + +\NewDocumentCommand\TikzDMCor{m}{% + \clearpage + \setKV[DM]{#1} + \begin{tcolorbox}[colback=white,height=\PfMHauteurAppreciation,title=APPR\'ECIATION,fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white,enhanced,% + overlay unbroken and first={% + \node[% + inner sep=0pt, + fill=white, + anchor=east, + yshift=-9pt, + xshift=-10pt, + text=black, + ] + at (frame.north east) + {\scriptsize\sffamily\bfseries \useKV[DM]{Code}}; + } + ]% + \end{tcolorbox}% + \begin{tcolorbox}[colback=white,height=\PfMHauteurRemarque,title=CONSEIL(S) / REMARQUE(S),fonttitle=\color{black}\bfseries\sffamily,colbacktitle=white% + ]% + \end{tcolorbox}% +} +%%%%%%Style Fiche +\NewDocumentCommand\TikzFiche{}{% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[Fiche]{Theme}\hfill\useKV[Fiche]{Niveau} \useKV[Fiche]{Classe}% + \par{\tiny\useKV[Fiche]{Code}}\hfill{\scriptsize\useKV[Fiche]{Date}}% + \end{tcolorbox}% +} + +\NewDocumentCommand\TikzFicheCor{m}{% + \clearpage + \setKV[Fiche]{#1}% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[Fiche]{Theme} (Correction) \hfill\useKV[Fiche]{Niveau} \useKV[Fiche]{Classe} + \par{\tiny\useKV[Fiche]{Code}}\hfill{\scriptsize\useKV[Fiche]{Date}} + \end{tcolorbox}% +} + +\tcbset{% + tikzfiche/.style={% + before skip=1em, + enhanced, + breakable, + colback=white, + colframe=PfMCadreFiche, + overlay unbroken and first={% + \node[% + name=A, + fill=white, + anchor=west, + xshift=10pt, + ] at (frame.north west){\bfseries\sffamily \useKV[Fiche]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}}; + %% + \ifboolKV[ClesExercices]{Calculatrice}{}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\cancel{\faCalculator}};\stepcounter{PfMNbLogo}} + \ifboolKV[ClesExercices]{Oral}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faBullhorn};\stepcounter{PfMNbLogo}}{} + %% + \ifboolKV[ClesExercices]{AffichageCompetence}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColCpt,% + ] + at (frame.north east) + {\itshape\scriptsize\sffamily Compétence(s) dominante(s) : \useKV[ClesExercices]{Competence}}; + }{}% + %% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColSrc, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{}% + }% + }% +}% +%%% Parcours %%% +\NewDocumentCommand\TikzParcours{}{% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[Parcours]{Theme}\hfill\useKV[Parcours]{Niveau} \useKV[Parcours]{Classe}% + \par{\tiny\useKV[Parcours]{Code}}\hfill{\scriptsize\useKV[Parcours]{Date}}% + \end{tcolorbox}% +} + +\NewDocumentCommand\TikzParcoursCor{m}{% + \clearpage + \setKV[Parcours]{#1}% + \begin{tcolorbox}[spread upwards=-1cm,colback=gray!5]% + \Large\sffamily \useKV[Parcours]{Theme} (Correction) \hfill\useKV[Parcours]{Niveau} \useKV[Parcours]{Classe} + \par{\tiny\useKV[Parcours]{Code}}\hfill{\scriptsize\useKV[Parcours]{Date}} + \end{tcolorbox}% +} + +\tcbset{% + tikzparcours/.style={% + before skip=1em, + enhanced, + breakable, + colback=white, + colframe=PfMCadreParcours, + overlay unbroken and first={% + \node[% + name=A, + fill=white, + anchor=west, + xshift=10pt, + ] at (frame.north west){\bfseries\sffamily \useKV[Parcours]{NomExercice} \thePfMExo\ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}}; + %% + \ifboolKV[ClesExercices]{Calculatrice}{}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\cancel{\faCalculator}};\stepcounter{PfMNbLogo}} + \ifboolKV[ClesExercices]{Oral}{\node[fill=white,anchor=west,xshift=(\thePfMNbLogo*2.5+(\thePfMNbLogo-1)*20)*1pt] at (A.east) {\faBullhorn};\stepcounter{PfMNbLogo}}{} + %% + \ifboolKV[ClesExercices]{AffichageCompetence}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColCpt,% + ] + at (frame.north east) + {\itshape\scriptsize\sffamily Compétence(s) dominante(s) : \useKV[ClesExercices]{Competence}}; + }{}% + %% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[% + fill=white, + anchor=east, + xshift=-10pt, + text=PfMColSrc, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{}% + }% + }% +}% +%% Fin Parcours %%% +%%% DS %%% +\newcommand\TikzDS{% + \clearpage + \begin{tcolorbox}[colback=gray!5,% + enhanced,% + overlay unbroken and first={% + \node[yshift=1em] at (frame.south) {\scriptsize\sffamily-- Calculatrice \ifboolKV[DS]{Calculatrice}{autorisée}{interdite} --}; + } + ]% + \sffamily Devoir surveillé \no\useKV[DS]{Numero} (Sujet \useKV[DS]{Sujet})\hfill\useKV[DS]{Niveau} \useKV[DS]{Classe} + \par{\tiny\useKV[DS]{Code}}\hfill{\scriptsize\useKV[DS]{Date}} + \end{tcolorbox}% +}% + +\newcommand\TikzDSCor[1]{% + \clearpage + \setKV[DS]{#1} + \begin{tcolorbox}[colback=gray!5]% + \sffamily Devoir surveillé \no\useKV[DS]{Numero} (Sujet \useKV[DS]{Sujet})\hfill\useKV[DS]{Niveau} \useKV[DS]{Classe}% + \par Correction% + \end{tcolorbox}% +} + +\makeatletter +\tcbset{% + tikzds/.style={% + enhanced, + breakable, + before skip=2mm,after skip=2mm, + colback=white, + attach boxed title to top left={xshift=1cm,yshift*=1mm-\tcboxedtitleheight}, + varwidth boxed title*=-3cm, + boxed title style={frame code={ + \path[fill=tcbcolback!30!black] + ([yshift=-1mm,xshift=-1mm]frame.north west) + arc[start angle=0,end angle=180,radius=1mm] + ([yshift=-1mm,xshift=1mm]frame.north east) + arc[start angle=180,end angle=0,radius=1mm]; + \path[left color=tcbcolback!60!black,right color=tcbcolback!60!black, + middle color=tcbcolback!80!black] + ([xshift=-2mm]frame.north west) -- ([xshift=2mm]frame.north east) + [rounded corners=1mm]-- ([xshift=1mm,yshift=-1mm]frame.north east) + -- (frame.south east) -- (frame.south west) + -- ([xshift=-1mm,yshift=-1mm]frame.north west) + [sharp corners]-- cycle; + },interior engine=empty, + }, + fonttitle=\bfseries\sffamily, + title=Exercice \thePfMExo \ifboolKV[ClesExercices]{AffichageTitre}{ : \useKV[ClesExercices]{Titre}}{}, + overlay unbroken and first={% + \ifboolKV[ClesExercices]{AffichageSource}{% + \node[ + fill=white, + anchor=east, + yshift=0.5pt, + xshift=-10pt, + text=gray!85, + ] + at (frame.south east) + {\scriptsize\sffamily \useKV[ClesExercices]{Source}}; + }{} + \ifboolKV[ClesExercices]{BaremeTotal}{% + \node[ + fill=white, + anchor=east, + xshift=-10pt, + text=black, + font=\bfseries + ] + at (frame.north east) + {\footnotesize\sffamily \total{\the\c@section-\the\c@PfMExo}}; + }{} + }% + }% +}% +\makeatother +%Interrogations écrites +\newcommand\TikzIE{% + \clearpage + \begin{minipage}{0.6\linewidth} + \begin{tcolorbox}[colback=gray!5, + enhanced,% + overlay unbroken and first={% + \node[yshift=1em] at (frame.south) {\scriptsize\sffamily-- Calculatrice \ifboolKV[IE]{Calculatrice}{autorisée}{interdite} --}; + } + ]% + \sffamily \useKV[IE]{Nom} \no\useKV[IE]{Numero} : \useKV[IE]{Theme} \ifboolKV[IE]{Sujets}{\scriptsize(Sujet \useKV[IE]{Sujet})}{} + \vspace{1em} + \par{\tiny\useKV[IE]{Code}}\hfill{\scriptsize\useKV[IE]{Date}} + \end{tcolorbox}% + \end{minipage}\hfill\begin{minipage}{0.35\linewidth} + Nom : \PfMIENom\\[0.5em] + Prénom : \PfMIEPrenom\\[0.5em] + Classe : \PfMIEClasse + \end{minipage} + \par\bigskip +} + +\newcommand\TikzIECor[1]{% + \clearpage + \setKV[IE]{#1} + \begin{tcolorbox}[colback=gray!5, + enhanced,% + overlay unbroken and first={% + \node[yshift=1em] at (frame.south) {\scriptsize\sffamily-- Calculatrice \ifboolKV[DS]{Calculatrice}{autorisée}{interdite} --}; + } + ]% + \sffamily \useKV[IE]{Nom} \no\useKV[IE]{Numero} : \useKV[IE]{Theme} \ifboolKV[IE]{Sujets}{\scriptsize(Sujet \useKV[IE]{Sujet})}{}\hfill Correction% + \par{\tiny\useKV[IE]{Code}}\hfill{\scriptsize\useKV[DS]{Date}} + \end{tcolorbox}% +} + +\NewDocumentCommand\Recapitulatif{m}{% + \DTLforeach*{dataperso}{\Prenom=PrenomEleve,\Nom=NomEleve,\RecapListeExo=ListeExo}{% + \begin{Maquette}[Fiche]{#1,Code=\normalsize\Prenom~\Nom}% + \readlist*\ListeExercices{\RecapListeExo}% + \foreach\i in{1,...,\ListeExerciceslen}{% + \begin{exercice}% + \input{\jobname-PPEx\ListeExercices[\i].tex}% + \end{exercice}% + }% + \end{Maquette}% + }% +}% + +\NewDocumentCommand\RecapitulatifCorrection{m}{% + \DTLforeach*{dataperso}{\Prenom=PrenomEleve,\Nom=NomEleve,\RecapListeExo=ListeExo}{% + \clearpage + \TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}% + \readlist*\ListeExercices{\RecapListeExo}% + \foreach\i in{1,...,\ListeExerciceslen}{% + \IfFileExists{\jobname-PPEx\ListeExercices[\i].sol}{\textbf{Corrigé de l'exercice \i} : \input{\jobname-PPEx\ListeExercices[\i].sol}\par\goodbreak}{}% + }% + }% +}% + +%%%%%%%%%%%%%%% Debut Maquette %%%%%%% +% Environnement englobant le tout. +%\makeatletter +\NewDocumentEnvironment{Maquette}{om}{% + % on remet à zéro le compteur des exercices + \setcounter{PfMExo}{0}% + \setcounter{PfMSOS}{0}% + % nouvelles valeurs. + \stepcounter{Maquette}% + % options de boulot + \IfHookExistsTF{env/Maquette/after}{\RemoveFromHook{env/Maquette/after}[*]}{}% + \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]}{}% + %\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}% + \useKVdefault[Boulot]% + \setKV[Boulot]{#1}% + \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}% + \ifboolKV[Boulot]{RecapBrevet}{% + \setKV[RecapBrevet]{#2}% + \TikzRecapBrevet% + \let\exercice\ExerciceRecapBrevet\let\endexercice\endExerciceRecapBrevet% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzRecapBrevetCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{% + \ifboolKV[Boulot]{ParcoursPerso}{% + \setKV[ParcoursPerso]{#2}% + \DTLloaddb[noheader,keys={PrenomEleve,NomEleve,ListeExo}]{dataperso}{\useKV[ParcoursPerso]{Fichier}.csv}% + \let\exercice\exerciceParcoursPerso% + \let\endexercice\endexerciceParcoursPerso% + \ifboolKV[Boulot]{CorrigeFin}{\setcounter{PfMCorrigeParcoursPerso}{1}}{}% + \setcounter{PfMExo}{0}% + \AtEndDocument{% + \Recapitulatif{#2}% + \ifnum\thePfMCorrigeParcoursPerso=1\relax% + \RecapitulatifCorrection{#2}% + \fi + }% + }{% + \ifboolKV[Boulot]{Parcours}{% + \setKV[Parcours]{#2}\TikzParcours% + \let\exercice\exerciceParcours% + \let\endexercice\endexerciceParcours% + \ifboolKV[Boulot]{CorrigeFin}{% + \PfMAffichageCorrige% + }{}% + }{% + \ifboolKV[Boulot]{PdT}{% + \setKV[PdT]{#2}\TikzPdT% + \let\exercice\exercicePdT + \let\endexercice\endexercicePdT% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzPdTCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{ + \ifboolKV[Boulot]{DM}{% + \setKV[DM]{#2}\TikzDM% + \let\exercice\exerciceDM + \let\endexercice\endexerciceDM% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzDMCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{% + \ifboolKV[Boulot]{Fiche}{% + \setKV[Fiche]{#2}\TikzFiche% + \let\exercice\exerciceFiche + \let\endexercice\endexerciceFiche% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzFicheCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{% + \ifboolKV[Boulot]{DS}{% + \setKV[DS]{#2}\TikzDS% + \let\exercice\exerciceDS + \let\endexercice\endexerciceDS% + \ifboolKV[Boulot]{BaremeComplet}{% + \begin{center} + \TableauRecapitulatif + \end{center} + }{}% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzDSCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{% + \ifboolKV[Boulot]{IE}{% + \setKV[IE]{#2}\TikzIE% + \let\exercice\exerciceDS\let\endexercice\endexerciceDS%On garde exerciceDS + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzIECor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }{% + \ifboolKV[Boulot]{Kholle}{% + \setKV[Kholle]{#2}% + \TikzKholle% + \let\exercice\exerciceKholle\let\endexercice\endexerciceKholle% + \ifboolKV[Kholle]{CR}{}{% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzKholleCor{#2}% + \TikzKholleCor{#2}% + \TikzKholleCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }% + }{}% + }% + }% + }% + }% + }% + }% + }% + }% +}{}% +%\makeatother + +%D'après JCC +% pour gérer les nombres pseudo-aléatoires +\makeatletter +\input{random} + +% Pour toutes les macros de liste, le premier paramètre est le nom de +% la macro représentant la liste. + +% macro pour tester si une liste est vide +\def\empty@list{} + +% Macro pour définir une nouvelle liste +\newcommand\definelist[2]{\def#1{#2}} + +% Macro pour ajouter un élément en fin de liste +\newcommand\push[2]{% + \ifx\\#2\\% + \PackageError{randomlist} + {You can't push an empty value.} + {Arg 2 of \string\pushlist is empty.}% + \else + \ifx#1\empty@list + \def#1{#2}% + \else + \edef#1{#1,#2}% + \fi + \fi +} + +% Macro pour retirer le premier élément d'une liste +\newcommand\pop[2]{% + \getwidth{#1}{\RL@temp}% + \ifnum\RL@temp = 0 + % cas de la liste vide + \PackageError{randomlist} + {You can't pop an empty list.} + {There is no value to pull in list #1.}% + \else\ifnum\RL@temp = 1 + % cas de la liste avec un seul élément + \edef#2{#1}% + \def#1{}% + \else + % cas de la liste avec au moins deux éléments + \expandafter\@@poplist#1,\@nil#1#2% + \fi\fi +} +\def\@@poplist#1,#2,\@nil#3#4{% + \def#4{#1}% + \def#3{#2}% +} + +% Macro comptant le nombre d'élément d'une liste. +\newcount\RL@cnta +\newcommand\getwidth[2]{% + \RL@cnta \z@ + \unless\ifx#1\empty@list + \expandafter\@countlist#1,\@nil,% + \fi + \edef#2{\the\RL@cnta}% +} +\def\@countlist#1,{% + \def\RL@arg{#1}% + \unless\ifx\RL@arg\@nnil + \advance\RL@cnta \@ne + \expandafter\@countlist + \fi +} + +% Macro d'extraction de la nieme valeur +\newcommand\extract[3]{% + % #1 = liste + % #2 = indice + % #3 = macro de retour de la nieme valeur + % On vérifie si la longueur de la liste est suffisante + \getwidth{#1}{\RL@temp}% + \ifnum#2>\RL@temp + \PackageError{randomlist} + {Value number #2 doesn't exist in list #1} + {List #1 has only \RL@temp\ values}% + \else + \RL@cnta #2 + % On initialise une liste temporaire qui se remplira avec les + % éléments non extraits + \def\RL@temp{}% + % Lancement de la lecture récursive de la liste + \expandafter\RL@extract#1,\@nil,% + % On met la valeur extraite dans la macro prévue + \xdef#3{\RL@return}%cp a remplacé edef par xdef + % La liste est celle sans l'élément extrait + \let#1\RL@temp + \fi +} +\def\RL@extract#1,{% + % Dans cette étape, on ne peut pas atteindre la fin de la liste, il + % faut juste repérer l'élément à extraire + \advance\RL@cnta \m@ne + \ifnum\RL@cnta = 0 + % L'élément est atteint, on le sauvegarde + \def\RL@return{#1}% + % et on appelle la macro récursive de fin de lecture. + \expandafter\RL@@extract + \else + % L'élément n'est pas atteint, on augmente la liste temporaire + % on protège d'éventuelles virgule avec des accolades + \edef\RL@temp{\RL@temp,{#1}}% + % et on réalise l'appel récursif + \expandafter\RL@extract + \fi +} +\def\RL@@extract#1,{% + % L'élément a été extrait, on lit le reste de la liste pour mettre à + % jour la liste temporaire + \def\RL@arg{#1}% + \ifx\RL@arg\@nnil + % Si la liste est vide, on place une virgule + \ifx\RL@temp\empty + \def\RL@temp{,}% + \fi + % La fin de la liste est atteinte, il faut supprimer la virgule + % initiale de la liste temporaire + \expandafter\RL@@@extract\RL@temp\@nil + \else + % On n'a pas atteint la fin de liste, on augmente la liste + % temporaire avec l'élément lu et on réalise l'appel récursif + % l'élément ajouté est protégé avec des accolades au cas où il + % contiendrait des virgules. + \edef\RL@temp{\RL@temp,{#1}}% + \expandafter\RL@@extract + \fi +} +\def\RL@@@extract,#1\@nil{\def\RL@temp{#1}} + +% Extraction de l'élément <n> de la liste. Le choix de <n> étant +% aléatoire +\newcount\RL@cntb +\newcommand\randomextract[2]{% + % Le choix aléatoire se fait dans l'intervalle [1,max de la liste] + % donc on commence par récupérer l'indice maximum de la liste. + \getwidth{#1}{\RL@temp}% + % Nombre aléatoire dans le compteur \RL@cntb + \setrannum{\RL@cntb}{1}{\RL@temp}% + % Appel de la macro d'extraction + \extract{#1}{\the\RL@cntb}{#2}% +} +% +% Initialisation du germe en gardant la même valeur toutes les #2 +% compilations. Lors de la première compilation, c'est #1 qui sera le +% germe (si valeur vide, on laisse faire random) +\newcommand\initrandomlist[2][]{% + \ifdefined\randomlistseed + % Si le germe existe, c'est qu'il a été déclaré dans le + % fichier .aux avec le compteur de compilation. Le germe et le + % compteur de compilation existent et sont à jour. + \else + % Si le fichier aux n'a pas déclaré de compteur \randomlistseed + % on considère qu'on est à la première compilation donc qu'on + % compile avec un nouveau germe et un compteur de compilation à + % un. Dans ce cas particulier, on laisse random.tex choisir le + % germe. + \newcount\randomlistseed + \ifx\\#1\\ + % si l'argument optionnel est vide, on laisse faire random + \nextrandom + \randomlistseed \randomi + \else + % sinon, on prend cet argument comme germe initial + \randomlistseed #1 + \fi + \newcount\randomlistcompile + \randomlistcompile \@ne + \fi + % Utilisation du germe adéquat pour la compilation en cours. + \randomi\randomlistseed + % Préparation de la compilation suivante (dans le fichier .aux) + % On regarde si le nombre de compilations est égale à zéro modulo #2 + \ifnum\numexpr(\randomlistcompile/#2)*#2-\randomlistcompile=0 + % Si le nombre de compilations avec le même germe est atteint + % on changera le germe à la prochaine compilation. + \immediate\write\@mainaux{% + \string\newcount\string\randomlistseed + }% + % modification du germe (sans laisser faire random sinon cela ne + % change pas au cours de chaque minute) + \ifnum\randomlistseed>2147483646 + \randomlistseed \z@ + \else + \advance\randomlistseed \@ne + \fi + \immediate\write\@mainaux{% + \string\global\string\randomlistseed=\the\randomlistseed + }% + \else + % Il faut faire encore des compilations avec le même germe, on + % sauvegarde le germe et le compteur de compilation dans le + % fichier .aux. + \immediate\write\@mainaux{% + \string\newcount\string\randomlistseed + }% + \immediate\write\@mainaux{% + \string\global\string\randomlistseed=\the\randomlistseed + }% + \fi + % Dans tous les cas, on augmente le compteur de compilation + \immediate\write\@mainaux{% + \string\newcount\string\randomlistcompile + }% + \advance\randomlistcompile \@ne + \immediate\write\@mainaux{% + \string\global\string\randomlistcompile=\the\randomlistcompile + }% +} +\makeatother +\newcommand\initEnsemblede{% + \definelist{\EnsembleDe}{% + {2,4,6,8,10,12},% + {1,3,5,7,9,11},% + {2,3,5,7,11,13},% + } +} + +\newcommand\GetValeurDe[1]{% + \extract{\EnsembleDe}{#1}{\DeChoisi}% + \randomextract{\DeChoisi}{\NbDeChoisi}% +} + +\newcommand\initpremiers{% + \definelist{\listpremiers}{13,17,19,23,29,31,37,41,43,47}% +} + +\newcommand\initPremiers{% + \definelist{\listPremiers}{71,73,79,83,89,97,101,103,107,109,113,127,131,137,139}% +} + +\newcommand\getpremier{% + \randomextract{\listpremiers}{\NbPremier} +}% + +\newcommand\getPremier{% + \randomextract{\listPremiers}{\NBPremier} +}% + +\newcommand\getpytha{% + \randomextract{\tripletspythaentier}{\triplet}% + \extract{\triplet}{3}{\grand}% le troisième et le plus grand + \randomextract{\triplet}{\cote}% + \randomextract{\triplet}{\autre}% +} + +\newcommand\initalpha{% + \definelist{\alphas}{b,c,d,e,f} +} +\newcommand\getalpha{% + \randomextract{\alphas}{\alphaA}% +}% + +\newcommand\initsommet{% + \definelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ? + N,O,P,Q,R,S,T,U,V,W,X,Y,Z}% +} + +\newcommand\initsommetrep{% + \definelist{\sommets}{A,B,C,D,E,F,G,H,I,J,K,L,M,% pas d'espace ? + N,P,Q,R,S,T,U,V,W,X,Y,Z}% +} + +\newcommand\gettri{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% +} + +\newcommand\getquad{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% +} + +\newcommand\getpenta{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% +} + +\newcommand\gethexa{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% + \randomextract{\sommets}{\pF}% +} + +\newcommand\gethepta{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% + \randomextract{\sommets}{\pF}% + \randomextract{\sommets}{\pG}% +} + +\newcommand\getocto{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% + \randomextract{\sommets}{\pF}% + \randomextract{\sommets}{\pG}% + \randomextract{\sommets}{\pH}% +} + +\newcommand\getnonna{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% + \randomextract{\sommets}{\pF}% + \randomextract{\sommets}{\pG}% + \randomextract{\sommets}{\pH}% + \randomextract{\sommets}{\pI}% +} + +\newcommand\gettreize{% + \randomextract{\sommets}{\pA}% + \randomextract{\sommets}{\pB}% + \randomextract{\sommets}{\pC}% + \randomextract{\sommets}{\pD}% + \randomextract{\sommets}{\pE}% + \randomextract{\sommets}{\pF}% + \randomextract{\sommets}{\pG}% + \randomextract{\sommets}{\pH}% + \randomextract{\sommets}{\pI}% + \randomextract{\sommets}{\pJ}% + \randomextract{\sommets}{\pK}% + \randomextract{\sommets}{\pL}% + \randomextract{\sommets}{\pM}% +} + +\definelist{\quadruplets}{% +{2{,}8,9{,}6,6,8},%10 +{3{,}2,12{,}6,5,12},%13 +{6{,}6,11{,}2,5,12},%13 +{7{,}8,10{,}4,5,12},%13 +{3{,}2,12{,}6,6{,}6,11{,}2},%13 +{3{,}2,12{,}6,7{,}8,10{,}4},%13 +{6{,}6,11{,}2,7{,}8,10{,}4},%13 +{7{,}8,10{,}4,6{,}6,11{,}2},%13 +{4{,}2,14{,}4,9,12},%15 +{2{,}6,16{,}8,7{,}2,15{,}4},%17 +{8,15,10{,}2,13{,}6},%17 +{2{,}6,16{,}8,8,15},%17 +{2{,}6,16{,}8,10{,}2,13{,}6},%17 +{5{,}6,19{,}2,12,16},%20 +{12,16,5{,}6,19{,}2},%20 +{7,24,8{,}8,23{,}4},%25 +{7,24,15,20},%25 +{8{,}8,23{,}4,15,20},%25 +{6{,}4,25{,}2,10,24},%26 +{6{,}4,25{,}2,13{,}2,22{,}4},%26 +{10,24,13{,}2,22{,}4},%26 +{10,24,15{,}6,20{,}8},%26 +{13{,}2,22{,}4,15{,}6,20{,}8},%26 +{9,40,16{,}8,37{,}4},%41 +{24{,}6,32{,}8,26{,}6,31{,}2},%41 +{9,40,26{,}6,31{,}2},%41 +{24{,}6,32{,}8,16{,}8,37{,}4}%41 +}% + +\definelist{\Quadruplets}{%pour un fonctionnement avec \fpeval +{2.8,9.6,6,8},%10 +{3.2,12.6,5,12},%13 +{6.6,11.2,5,12},%13 +{7.8,10.4,5,12},%13 +{3.2,12.6,6.6,11.2},%13 +{3.2,12.6,7.8,10.4},%13 +{6.6,11.2,7.8,10.4},%13 +{7.8,10.4,6.6,11.2},%13 +{4.2,14.4,9,12},%15 +{2.6,16.8,7.2,15.4},%17 +{8,15,10.2,13.6},%17 +{2.6,16.8,8,15},%17 +{2.6,16.8,10.2,13.6},%17 +{5.6,19.2,12,16},%20 +{12,16,5.6,19.2},%20 +{7,24,8.8,23.4},%25 +{7,24,15,20},%25 +{8.8,23.4,15,20},%25 +{6.4,25.2,10,24},%26 +{6.4,25.2,13.2,22.4},%26 +{10,24,13.2,22.4},%26 +{10,24,15.6,20.8},%26 +{13.2,22.4,15.6,20.8},%26 +{9,40,16.8,37.4},%41 +{24.6,32.8,26.6,31.2},%41 +{9,40,26.6,31.2},%41 +{24.6,32.8,16.8,37.4}%41 +}% + +\definelist{\tripletspytha}{{2{,}8,9{,}6,10},{6,8,10},%10 +{3{,}2,12{,}6,13},{5,12,13},%13 +{6{,}6,11{,}2,13},{7{,}8,10{,}4,13},%13 +{4{,}2,14{,}4,15},{9,12,15},%15 +{2{,}6,16{,}8,17},{7{,}2,15{,}4,17},%17 +{8,15,17},{10{,}2,13{,}6,17},%17 +{5{,}6,19{,}2,20},{12,16,20},%20 +{7,24,25},{8{,}8,23{,}4,25},%25 +{15,20,25},%25 +{8{,}8,23{,}4,25},%25 +{6{,}4,25{,}2,26},{10,24,26},%26 +{13{,}2,22{,}4,26},%26 +{15{,}6,20{,}8,26},%26 +{9,40,41},{16{,}8,37{,}4,41},%41 +{24{,}6,32{,}8,41},{26{,}6,31{,}2,41}%41 +}% + +\definelist{\tripletspythaentier}{% +{3,4,5},{5,12,13},{6,8,10},{7,24,25},{8,15,17},{9,12,15},{9,40,41},{10,24,26},{11,60,61},{12,16,20},{12,35,37},{13,84,85},{14,48,50},{15,20,25},{15,36,39},{16,30,34},{16,63,65},{18,24,30},{18,80,82},{20,21,29},{20,48,52},{21,28,35},{21,72,75},{24,32,40},{24,45,51},{24,70,74},{25,60,65},{27,36,45},{28,45,53},{28,96,100},{30,40,50},{30,72,78},{32,60,68},{33,44,55},{33,56,65},{35,84,91},{36,48,60},{36,77,85},{39,52,65},{39,80,89},{40,42,58},{40,75,85},{42,56,70},{45,60,75},{48,55,73},{48,64,80},{51,68,85},{54,72,90},{57,76,95},{60,63,87},{60,80,100},{65,72,97}}%%d'après villement.gerard.free.fr + + +\newcommand\initcarre{% + \definelist{\carres}{4,9,16,25,36,49,64,81,100}% +} +\newcommand\getcarre{% + \randomextract{\carres}{\carreA} +} + +%2009-2018 + % Source https://ec.europa.eu/eurostat/databrowser/view/ENV_AIR_GGE__custom_743354/default/table?lang=en +\definelist{\GazSerreEu}{% + {{la },Belgique,131038.46,123642.9},% + {{la },Bulgarie,58617.88,58595.07},% + {{le },Danemark,65734.85,51299.75},% + {{l'},Allemagne,934202.04,888718.56},% + {{l'},Irlande,63985.03,64241.55},% + {{la },Grèce,127381.2,96113.19},% + {{l'},Espagne,385211.04,352208.55},% + {{la },France,521519.73,462798.66},% + {{l'},Italie,510950.49,439263.95},% + {{les },{Pays Bas},212360.67,200458.52},% + {{la },Pologne,395464.33,415858.2},% + {{la },Norvège,54280.59,53769.04},% + {{la },Suisse,57276.22,52099.15}% +} + +\newcommand\getGazSerre{% + \randomextract{\GazSerreEu}{\GazSerrePays}% + \extract{\GazSerrePays}{1}{\ArticlePaysGS}% + \extract{\GazSerrePays}{1}{\NomPaysGS}% + \extract{\GazSerrePays}{1}{\ConsoAPaysGS}% + \extract{\GazSerrePays}{1}{\ConsoBPaysGS}% +} + + \definelist{\VehiculesINSEE}{% + {2012,13132,22264,8111,15242},% + {2013,12853,22712,8028,15020},% + {2014,12778,23134,8049,14905},% + {2015,12874,23460,8144,14813},% + {2016,13144,23634,8308,14813},% + {2017,13580,23645,8437,14629},% + {2018,14140,23293,8652,14453},% + {2019,14756,22636,8920,14392}% + }% + \newcommand\getVehiculesINSEE{% + \randomextract{\VehiculesINSEE}{\NbVehiculesINSEE}% + \extract{\NbVehiculesINSEE}{1}{\AnneeVehiculesINSEE}% + \extract{\NbVehiculesINSEE}{1}{\EssenceVehiculesINSEE}% + \extract{\NbVehiculesINSEE}{1}{\DieselVehiculesINSEE}% + \extract{\NbVehiculesINSEE}{1}{\KmEssenceVehiculesINSEE}% + \extract{\NbVehiculesINSEE}{1}{\KmDieselVehiculesINSEE}% + }
\ No newline at end of file diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl index 4f4a1f5662..d731a874f6 100644 --- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl +++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl @@ -17,7 +17,6 @@ $mirrors = { 'https://mirrors.hit.edu.cn/CTAN/' => 1, 'https://mirrors.jlu.edu.cn/CTAN/' => 1, 'https://mirrors.nju.edu.cn/CTAN/' => 1, - 'https://mirrors.pku.edu.cn/ctan/' => 1, 'https://mirrors.sustech.edu.cn/CTAN/' => 1, 'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1, 'https://mirrors.ustc.edu.cn/CTAN/' => 1, diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb index b200ba7331..4992cf4d66 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb @@ -26,11 +26,11 @@ depend container_split_src_files/1 depend frozen/0 depend minrelease/2016 depend release/2023 -depend revision/67281 +depend revision/67288 name 00texlive.image category TLCore -revision 67281 +revision 67289 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 @@ -3440,6 +3440,7 @@ runfiles size=13037 tlpkg/tlpsrc/profcollege.tlpsrc tlpkg/tlpsrc/proflabo.tlpsrc tlpkg/tlpsrc/proflycee.tlpsrc + tlpkg/tlpsrc/profmaquette.tlpsrc tlpkg/tlpsrc/program.tlpsrc tlpkg/tlpsrc/progress.tlpsrc tlpkg/tlpsrc/progressbar.tlpsrc @@ -4751,7 +4752,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd name 00texlive.installer category TLCore -revision 67277 +revision 67283 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 @@ -70476,7 +70477,7 @@ containerchecksum c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326 name collection-latexextra category Collection -revision 67187 +revision 67285 shortdesc LaTeX additional packages relocated 1 longdesc A very large collection of add-on packages for LaTeX. @@ -71558,6 +71559,7 @@ depend prettytok depend preview depend printlen depend probsoln +depend profmaquette depend program depend progress depend progressbar @@ -71969,8 +71971,8 @@ depend zref-clever depend zref-vario depend zwgetfdate depend zwpagelayout -containersize 6888 -containerchecksum 4aa62dd19b6379f54f6f13ef51e4bf9c106b0a53bff4718d4a277128c59410a5ad90c80a7c696c6b097ba91e3637a13fdb56558e71423925e6ac7fce52f4dfb8 +containersize 6896 +containerchecksum 7d1b0f2f9b7d508eca527dd6b25683c6d9f13722a8f67d15fc09af6368b1f0a1b0772f9fe27334dc1ea281f29650c30e85a48d77db7be56a161f53b63050af6e name collection-latexrecommended category Collection @@ -80688,23 +80690,22 @@ catalogue-topics context name context-sudoku category ConTeXt -revision 67279 +revision 67289 shortdesc Sudokus for ConTeXt relocated 1 longdesc A port of Peter Norvig's sudoku solver to Lua/ConTeXt. It longdesc provides four basic commands for typesettings sudokus, as well longdesc as a command handler. depend context -containersize 7692 -containerchecksum 73739548addbae4feb9eb8a71e47bdf6e30f1453c49d2da51025d5a821260c809711e60f32c3c287bf28d2940e602bd57b83d194a81f7db03ffa80bb922859e4 +containersize 7604 +containerchecksum b33ece74cc5578c4dca8df816715d7106b674fdc653d149992cf637b11799a21eb03708c0efcc79da9d4658c5f8a801c6bb32dc681f43f3d4b3900dfa588ca99 doccontainersize 1632 -doccontainerchecksum 64b989816befc797dd5f13c819509b7aa7e567fba7775636a3f10fe30a39925cd705ce3363cb439cf37d2dde0bc7bef54877549ec68c4bfababad923b061c87a +doccontainerchecksum e7f9b6c0ae6bad729074ffb2e4e1673336954adb9013ee6525e87715f3d22720efbe1f7e2cb6b695e01940a4d7f58489889612749ea2f4dbcba3ac6faaa741c4 docfiles size=3 RELOC/doc/context/third/sudoku/LICENSE RELOC/doc/context/third/sudoku/README.md details="Readme" RELOC/doc/context/third/sudoku/VERSION -runfiles size=16 - RELOC/tex/context/third/sudoku/VERSION +runfiles size=15 RELOC/tex/context/third/sudoku/t-sudoku-test-01.txt RELOC/tex/context/third/sudoku/t-sudoku-test-02.txt RELOC/tex/context/third/sudoku/t-sudoku-test-03.txt @@ -255710,29 +255711,29 @@ catalogue-version 1.1 name postit category Package -revision 67254 +revision 67284 shortdesc A LaTeX package for displaying Post-it notes relocated 1 longdesc This package provides some commands and options for creating longdesc Post-it-like boxes with tcolorbox: an environment PostIt with longdesc customizations; a command \MiniPostIt to display a simple longdesc Post-It. -containersize 2228 -containerchecksum f00756114477e61f8f0d3f82815fd276d0deb3052827ab3b3263eb37a35ba62a5dc4e585e28f718321eef7804a960da7b5fa8c9be606fd39a89243912360d858 -doccontainersize 432700 -doccontainerchecksum 97ccf86d212bfe506dd329b0c6731bd8298de0acc16d25808e6eeae9d3d0fc13707565177c18fcaac78b04cdb5e8786b01cfc9dc2109adbefaa5d0a1f1de0e3b -docfiles size=112 +containersize 3728 +containerchecksum f5efa2bdade0a5924976e25c481e75b8c8fd8d9a9fa6e5dc6999f9e28b93496107d49fc0b10f94387d62b1449baf506bf1577dc343b75b81997d93c852c0a40a +doccontainersize 488752 +doccontainerchecksum f936916d20e34f7edfba8ce35f62cc036b3a3ebc118b3219b55d55bc9ae41a0d3212b23e417a9fe1c2f6948751329509dcd08050835fa9ac7bdcf1ce8accf371 +docfiles size=127 RELOC/doc/latex/postit/README.md details="Readme" RELOC/doc/latex/postit/postit-doc.pdf details="Package documentation" language="fr" RELOC/doc/latex/postit/postit-doc.tex -runfiles size=2 +runfiles size=6 RELOC/tex/latex/postit/postit.sty catalogue-contact-bugs https://github.com/cpierquet/postit/issues catalogue-contact-repository https://github.com/cpierquet/postit catalogue-ctan /macros/latex/contrib/postit catalogue-license lppl1.3c catalogue-topics decoration boxing -catalogue-version 0.1.0 +catalogue-version 0.1.1 name postnotes category Package @@ -257101,6 +257102,30 @@ catalogue-license lppl1.3c catalogue-topics maths french teaching expl3 pgf-tikz catalogue-version 2.6.7 +name profmaquette +category Package +revision 67285 +shortdesc Use exercises in different types of documents +relocated 1 +longdesc This LaTeX package can help French maths teachers to put one +longdesc and the same exercise into different sorts of documents. +containersize 12148 +containerchecksum cc1b53d3ef00443502c499d76199c07019d8397b517df88fc5c1a7e9a8d6d7c9e55729c23cb48a28a8bd712eacd6f1ceb7781010c3e29d89ff9cb95e64e8d440 +doccontainersize 169160 +doccontainerchecksum 9d716555d5792e165abf9fbb264584a3f46f35d342730eed9f1a7fad85b375fb14d78564cf9303b2ef02afdcf943910691f9bbce7e1f2ea2ed8f0804863656ea +docfiles size=58 + RELOC/doc/latex/profmaquette/README details="Readme" + RELOC/doc/latex/profmaquette/TestParcoursPerso.pdf + RELOC/doc/latex/profmaquette/TestParcoursPerso.tex + RELOC/doc/latex/profmaquette/profmaquette-doc.pdf details="Package documentation" language="fr" + RELOC/doc/latex/profmaquette/profmaquette-doc.tex +runfiles size=15 + RELOC/tex/latex/profmaquette/ProfMaquette.sty +catalogue-ctan /macros/latex/contrib/profmaquette +catalogue-license lppl1.3c +catalogue-topics teaching exercise maths +catalogue-version 0.15 + name program category Package revision 44214 @@ -291962,7 +291987,7 @@ catalogue-version 1.2 name starray category Package -revision 67173 +revision 67286 shortdesc A structured array (of properties) based on expl3 relocated 1 longdesc This package implements vector-like 'structures', like in 'C' @@ -291972,10 +291997,10 @@ longdesc 'functions' are similar to the ones provided for property (or longdesc sequence, or token) lists. The package is based on expl3 and longdesc aimed at package authors, not end users. The name "starray" is longdesc an abbreviation for "structured arrays". -containersize 8772 -containerchecksum 03f5666b166b0855e59a99cb4c1314203bc6eed35ce6a7f7e9bb9e0c79d021cb66a5575d44e7fd248dd1ba8df15a3a08448e99dfca3ceaae7f70b649bb2e0029 -doccontainersize 220368 -doccontainerchecksum ab01cbed13df711c47d7d6000df0962842ea9c5b396a0f3ecfd9e737fb8c3db03d0e13a6896f5a4bc6c6977ae3ad68c63bc37a57f1b9740f56f16a83a44da03d +containersize 9152 +containerchecksum 6e6bec9fe3704e5661f8eeb1b0d2de497140a44a0442ed3687bb1aa8b956e5e59cdb6d2e2723911ed373ac451eaeb5b47416afe80a31d395eb9bc80162ae0ea5 +doccontainersize 220152 +doccontainerchecksum 9c4ea1df2c4f1d01b2e996a36dd03d878e0a37562f7b336f4e3c347320a506d96b332537f81fa979008a16e897539a6e9466c5eba045cb3811c8d4d3267e0445 docfiles size=76 RELOC/doc/latex/starray/README.md details="Readme" RELOC/doc/latex/starray/starray.pdf details="Package documentation" @@ -291987,7 +292012,7 @@ catalogue-contact-repository https://github.com/alceu-frigeri/starray catalogue-ctan /macros/latex/contrib/starray catalogue-license lppl1.3c gpl catalogue-topics package-devel expl3 -catalogue-version 1.2 +catalogue-version 1.3 name startex category Package @@ -312937,7 +312962,7 @@ docfiles size=376 name texlive-scripts category TLCore -revision 67277 +revision 67283 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. @@ -312945,10 +312970,10 @@ depend texlive-scripts.ARCH depend texlive.infra execute addMap mathpple.map postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 114068 -containerchecksum 29249b21cbfd30c7d4e4143cd639ec4ff7e3ad75299d55b89932776971a3e5f0d7fc9d77ccb3f98abb9cadc3e67a4a84800145e97539527227e421714decbb28 -doccontainersize 427044 -doccontainerchecksum c21330d14154d162f8f2d129b5a2234639b33b2f01b758006302bab8f90a84b2e11c41cb1495689615d684ac5d805356440922027229fb7ba73b937c386c6138 +containersize 114060 +containerchecksum cf055c9f2707346846879e6eb8bb47d4cd9b548a9fe95a5f415e3035745a9923715906e9451db3effc3fe3f8dd00413c0860746c3da612a82a0a4f4bb92b31e3 +doccontainersize 427072 +doccontainerchecksum 87c62d681e19e7cb2bb1f5eac2b3982e2ff2994a347a46a63f2264437ab788b3a0c51d92321031573d4103616632920738afa0dba0047660358e2a71a536c93a docfiles size=545 doc.html texmf-dist/doc/man/man1/fmtutil-sys.1 diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 index 532d9d8141..018b5b4b8e 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 @@ -1 +1 @@ -4da93113a12e13f7d87a04459b1693f9 texlive.tlpdb +e7ffd89b9497c4ad056649ccb416e1ba texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 index 853975394a..7fa98b7b2c 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 @@ -1 +1 @@ -5903dd00c411ec9c9459a5c70bad52aaa08f4529083ff2f41fc0b939e667cc21d9631ecb464e63dbe2f0992fe3998aa2b46707bd9f602ba7908e590ae3ecbfec texlive.tlpdb +b5bdb9b228668705ce2e5fbff98d77200f57d9938a9d7948fd4c9913baaab5e4ef94ffd3361923ad802d5a34a1c0fc5fd010864db4f61d24f01aaf8c8478792a texlive.tlpdb diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc index e13a235f1a..fec5ec42b4 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+QqiBBqTOGHfhlDjHAFAmR9Ig0ACgkQTOGHfhlD -jHAj9wf/deHGSXviGMS7uNgjA/Y2ZuxIMQvvkARQp+heTJ4Hgcxp3/dfZWQrvCZn -B5wPXzQJkIRUbR+aDLprScC+Xxf8A+qHhCKGh7n6XZIQHw8K7Q7w3Nx+RY0nH3jh -MsImKXiFeYz036QlXFGdZPVb+x0Wva5S8hNfYgvD1qj/8S8Qyth0yAXnMoLyDRtX -rhWBKhZlS05xSxxm3CkBaejR1MWWVNGbNMUbwQwVAzrZWnSxb/QIK7GezeyZgy6o -JW0GH9k5P0vIHxQECwAMzhZqtDdNQ8qRUUqOleVKK2cmbrpQuVKCuAR9ThFiiNvt -E8Qe4YwALwYSRuPbGPaYi+r64GJWCQ== -=NQWv +iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmR+c1sACgkQTOGHfhlD +jHAWRAf+MWSgq4GGyzZsO7wvUZBw6tIYhJldMixIBX56PFYAlM4xTbmNHhU5X/0k +wRAfmHwopOugTLjT1LyG0SQfibd6zMwH1vBz64Sj3yJpKNHo6JgVoG0kQwDTbvuZ +JxnD19PqIYj/smy0MIe9382nw9TwWOf8DHD8us62f1JT6iajbLkK/zFs+58GdjW4 +uVDrAFA6GIyjdJ/TK+ZAglu5laB8KURZwkQ5ApesWevjIgGvE+n2BcwXXWCj2Q8K +XExBK07eY1X6FjMW2mk0DA2ZCBF59lSZHBbPtpd8TKu8f0ctcXakaqEESEfNWmCD +paJIVNV3OEJj9IOz+BjWrvwDiS/13w== +=n5K0 -----END PGP SIGNATURE----- diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz Binary files differindex 5cb3174a31..fdeeab01fa 100644 --- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz +++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz @@ -2,4 +2,4 @@ # The source CTAN of this site's material: dante.ctan.org # The year-month-day-hour-minute of this site's material: -2023-06-05-02-02 +2023-06-06-02-02 |