summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname131
-rw-r--r--FILES.byname.gzbin2558239 -> 2558366 bytes
-rw-r--r--FILES.last07days121
-rw-r--r--biblio/ctan-bibdata/ctan.bib42
-rw-r--r--graphics/pgf/contrib/wheelchart/README.md8
-rw-r--r--graphics/pgf/contrib/wheelchart/wheelchart.pdfbin659237 -> 1109172 bytes
-rw-r--r--graphics/pgf/contrib/wheelchart/wheelchart.sty3177
-rw-r--r--graphics/pgf/contrib/wheelchart/wheelchart.tex2527
-rw-r--r--macros/generic/ltxcmds/README.md4
-rw-r--r--macros/generic/ltxcmds/ltxcmds.dtx25
-rw-r--r--macros/generic/ltxcmds/ltxcmds.pdfbin397106 -> 419825 bytes
-rw-r--r--macros/latex/contrib/fbox/CHANGELOG1
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.pdfbin46291 -> 48539 bytes
-rw-r--r--macros/latex/contrib/fbox/doc/fbox.tex15
-rw-r--r--macros/latex/contrib/fbox/latex/fbox.sty18
-rw-r--r--macros/latex/contrib/heria/README.md38
-rw-r--r--macros/latex/contrib/heria/heria-proposal.pdfbin0 -> 313877 bytes
-rw-r--r--macros/latex/contrib/heria/heria.dtx2783
-rw-r--r--macros/latex/contrib/heria/heria.ins92
-rw-r--r--macros/latex/contrib/heria/heria.pdfbin0 -> 303966 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.dtx1496
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-code.pdfbin968279 -> 972770 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin600879 -> 598788 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex13
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin617157 -> 614351 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.tex152
-rw-r--r--support/TeX4ht/source/ChangeLog5
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex17
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb168
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc16
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2492912 -> 2491352 bytes
-rw-r--r--timestamp2
35 files changed, 8895 insertions, 1961 deletions
diff --git a/FILES.byname b/FILES.byname
index 466cb3bda1..c0defda825 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2063,12 +2063,12 @@
2023/10/05 | 1710 | biblio/citation-style-language/README.md
2023/10/05 | 12878 | biblio/citation-style-language/vancouver.csl
2023/10/05 | 4531754 | biblio/citation-style-language.zip
-2023/12/03 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/12/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2023/12/03 | 2830630 | biblio/ctan-bibdata/ctan.bib
-2023/12/03 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2023/12/04 | 2830639 | biblio/ctan-bibdata/ctan.bib
+2023/12/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/01/16 | 1489 | biblio/ctan-bibdata/README
-2023/12/03 | 4113768 | biblio/ctan-bibdata.zip
+2023/12/04 | 4113777 | 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
@@ -2225,7 +2225,7 @@
1989/12/11 | 6196 | biblio/tib/tib.man
1989/03/29 | 23265 | biblio/tib/vitaMake
2005/12/15 | 366385 | biblio/tib.zip
-2023/11/26 | 18311 | CTAN.sites
+2023/12/04 | 18238 | CTAN.sites
1990/10/03 | 5032 | dviware/beebe/00readme.txt
1990/10/03 | 479 | dviware/beebe/doc/00dir.cmd
1990/10/03 | 1209 | dviware/beebe/doc/00dir.lst
@@ -5429,7 +5429,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/12/03 | 44547 | FILES.last07days
+2023/12/04 | 61470 | 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
@@ -163731,11 +163731,11 @@
2021/01/05 | 1315 | graphics/pgf/contrib/utfsym/source/usym27BE.tikz
2021/01/05 | 3564 | graphics/pgf/contrib/utfsym/source/usym27BF.tikz
2022/04/18 | 6530598 | graphics/pgf/contrib/utfsym.zip
-2022/09/11 | 884 | graphics/pgf/contrib/wheelchart/README.md
-2022/09/11 | 659237 | graphics/pgf/contrib/wheelchart/wheelchart.pdf
-2022/09/11 | 23777 | graphics/pgf/contrib/wheelchart/wheelchart.sty
-2022/09/11 | 49239 | graphics/pgf/contrib/wheelchart/wheelchart.tex
-2022/09/12 | 667591 | graphics/pgf/contrib/wheelchart.zip
+2023/12/03 | 1202 | graphics/pgf/contrib/wheelchart/README.md
+2023/12/03 | 1109172 | graphics/pgf/contrib/wheelchart/wheelchart.pdf
+2023/12/03 | 128158 | graphics/pgf/contrib/wheelchart/wheelchart.sty
+2023/12/03 | 115154 | graphics/pgf/contrib/wheelchart/wheelchart.tex
+2023/12/04 | 1122683 | graphics/pgf/contrib/wheelchart.zip
2023/09/04 | 284036 | graphics/pgf/contrib/wordle/doc/wordle-doc-en.pdf
2023/09/04 | 10993 | graphics/pgf/contrib/wordle/doc/wordle-doc-en.tex
2023/09/04 | 279989 | graphics/pgf/contrib/wordle/doc/wordle-doc-fr.pdf
@@ -194691,6 +194691,7 @@
2022/06/13 | 1295638 | install/macros/latex/contrib/gzt.tds.zip
2009/09/02 | 158493 | install/macros/latex/contrib/hanging.tds.zip
2011/02/12 | 134911 | install/macros/latex/contrib/hardwrap.tds.zip
+2023/12/04 | 666553 | install/macros/latex/contrib/heria.tds.zip
2016/06/07 | 215651 | install/macros/latex/contrib/he-she.tds.zip
2023/02/26 | 450556 | install/macros/latex/contrib/hrefhide.tds.zip
2016/11/20 | 951051 | install/macros/latex/contrib/hustthesis.tds.zip
@@ -203251,10 +203252,10 @@
2022/10/24 | 494475 | macros/generic/lt3luabridge/lt3luabridge.pdf
2022/10/24 | 896 | macros/generic/lt3luabridge/README.md
2022/10/24 | 492236 | macros/generic/lt3luabridge.zip
-2020/09/22 | 66128 | macros/generic/ltxcmds/ltxcmds.dtx
-2020/09/22 | 397106 | macros/generic/ltxcmds/ltxcmds.pdf
-2020/09/22 | 379 | macros/generic/ltxcmds/README.md
-2020/09/22 | 402977 | macros/generic/ltxcmds.zip
+2023/12/04 | 66238 | macros/generic/ltxcmds/ltxcmds.dtx
+2023/12/04 | 419825 | macros/generic/ltxcmds/ltxcmds.pdf
+2023/12/04 | 379 | macros/generic/ltxcmds/README.md
+2023/12/04 | 417634 | macros/generic/ltxcmds.zip
2016/06/15 | 11734 | macros/generic/luatex85/luatex85.dtx
2016/06/15 | 151 | macros/generic/luatex85/luatex85.ins
2016/06/15 | 170646 | macros/generic/luatex85/luatex85.pdf
@@ -222126,12 +222127,12 @@
2011/02/07 | 687727 | macros/latex/contrib/fbithesis/fbithesis.pdf
2011/02/07 | 5378 | macros/latex/contrib/fbithesis/README
2011/02/07 | 835676 | macros/latex/contrib/fbithesis.zip
-2022/02/20 | 282 | macros/latex/contrib/fbox/CHANGELOG
-2022/02/20 | 46291 | macros/latex/contrib/fbox/doc/fbox.pdf
-2022/02/20 | 6065 | macros/latex/contrib/fbox/doc/fbox.tex
-2022/02/20 | 4019 | macros/latex/contrib/fbox/latex/fbox.sty
+2023/12/04 | 347 | macros/latex/contrib/fbox/CHANGELOG
+2023/12/04 | 48539 | macros/latex/contrib/fbox/doc/fbox.pdf
+2023/12/04 | 6343 | macros/latex/contrib/fbox/doc/fbox.tex
+2023/12/04 | 4248 | macros/latex/contrib/fbox/latex/fbox.sty
2020/06/07 | 653 | macros/latex/contrib/fbox/README.md
-2022/02/20 | 49316 | macros/latex/contrib/fbox.zip
+2023/12/04 | 51602 | macros/latex/contrib/fbox.zip
2017/03/22 | 1106738 | macros/latex/contrib/fc_arith/docs/fc_arithman.pdf
2017/03/22 | 45010 | macros/latex/contrib/fc_arith/docs/fc_arithman.tex
2017/03/22 | 143465 | macros/latex/contrib/fc_arith/examples/fc-acrobat.pdf
@@ -225504,6 +225505,12 @@
2009/11/22 | 439 | macros/latex/contrib/here/here.sty
2009/11/22 | 399 | macros/latex/contrib/here/README
2009/11/22 | 866 | macros/latex/contrib/here.zip
+2023/12/04 | 100137 | macros/latex/contrib/heria/heria.dtx
+2023/12/04 | 3862 | macros/latex/contrib/heria/heria.ins
+2023/12/04 | 303966 | macros/latex/contrib/heria/heria.pdf
+2023/12/04 | 313877 | macros/latex/contrib/heria/heria-proposal.pdf
+2023/12/04 | 1449 | macros/latex/contrib/heria/README.md
+2023/12/04 | 632740 | macros/latex/contrib/heria.zip
2016/06/07 | 207497 | macros/latex/contrib/he-she/he-she.pdf
2016/06/07 | 9277 | macros/latex/contrib/he-she/he-she.sty
2016/06/07 | 13862 | macros/latex/contrib/he-she/he-she.tex
@@ -231888,15 +231895,15 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2023/11/22 | 588951 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
-2023/11/22 | 968279 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
-2023/11/22 | 600879 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2023/11/21 | 249769 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2023/12/04 | 594121 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/12/04 | 972770 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/12/04 | 598788 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/12/03 | 249849 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2023/08/14 | 1428 | macros/latex/contrib/nicematrix/nicematrix.ins
-2023/11/22 | 617157 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2023/11/22 | 259774 | macros/latex/contrib/nicematrix/nicematrix.tex
+2023/12/04 | 614351 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/12/02 | 259852 | macros/latex/contrib/nicematrix/nicematrix.tex
2023/05/15 | 1028 | macros/latex/contrib/nicematrix/README.md
-2023/11/22 | 2364461 | macros/latex/contrib/nicematrix.zip
+2023/12/04 | 2366196 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -287317,7 +287324,7 @@
2021/05/03 | 629 | support/TeX4ht/doc/README
2020/08/24 | 358454 | support/TeX4ht/doc/TeX4ht-doc.tex
2021/05/11 | 262 | support/TeX4ht/README
-2023/11/21 | 237911 | support/TeX4ht/source/ChangeLog
+2023/12/03 | 238067 | support/TeX4ht/source/ChangeLog
2021/05/03 | 1375 | support/TeX4ht/source/checklog.lua
2021/05/03 | 1189 | support/TeX4ht/source/common-code.tex
2021/05/03 | 2727 | support/TeX4ht/source/common-info.tex
@@ -287329,7 +287336,7 @@
2021/05/03 | 1121 | support/TeX4ht/source/README
2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua
2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex
-2023/11/20 | 1171330 | support/TeX4ht/source/tex4ht-4ht.tex
+2023/12/03 | 1171688 | support/TeX4ht/source/tex4ht-4ht.tex
2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex
2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
2023/10/16 | 21307 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -291502,8 +291509,8 @@
2019/02/28 | 524172 | systems/texlive/tlnet/archive/arev.doc.r15878.tar.xz
2019/02/28 | 964648 | systems/texlive/tlnet/archive/arev.r15878.tar.xz
2019/02/28 | 10100 | systems/texlive/tlnet/archive/arev.source.r15878.tar.xz
-2023/11/10 | 181660 | systems/texlive/tlnet/archive/argumentation.doc.r68778.tar.xz
-2023/11/10 | 1812 | systems/texlive/tlnet/archive/argumentation.r68778.tar.xz
+2023/12/04 | 270220 | systems/texlive/tlnet/archive/argumentation.doc.r69023.tar.xz
+2023/12/04 | 2028 | systems/texlive/tlnet/archive/argumentation.r69023.tar.xz
2023/11/24 | 29504 | systems/texlive/tlnet/archive/arimo.doc.r68950.tar.xz
2023/11/24 | 2905304 | systems/texlive/tlnet/archive/arimo.r68950.tar.xz
2022/08/24 | 431480 | systems/texlive/tlnet/archive/armtex.doc.r64182.tar.xz
@@ -293385,7 +293392,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2023/05/16 | 400 | systems/texlive/tlnet/archive/collection-langportuguese.r67125.tar.xz
2023/06/09 | 396 | systems/texlive/tlnet/archive/collection-langspanish.r67307.tar.xz
-2023/11/25 | 7060 | systems/texlive/tlnet/archive/collection-latexextra.r68958.tar.xz
+2023/12/04 | 7048 | systems/texlive/tlnet/archive/collection-latexextra.r69026.tar.xz
2022/06/10 | 700 | systems/texlive/tlnet/archive/collection-latex.r63515.tar.xz
2023/01/11 | 744 | systems/texlive/tlnet/archive/collection-latexrecommended.r65512.tar.xz
2023/11/11 | 1016 | systems/texlive/tlnet/archive/collection-luatex.r68808.tar.xz
@@ -297024,8 +297031,6 @@
2019/02/28 | 127252 | systems/texlive/tlnet/archive/itnumpar.doc.r15878.tar.xz
2019/02/28 | 2268 | systems/texlive/tlnet/archive/itnumpar.r15878.tar.xz
2019/02/28 | 8148 | systems/texlive/tlnet/archive/itnumpar.source.r15878.tar.xz
-2019/02/28 | 396092 | systems/texlive/tlnet/archive/iwhdp.doc.r37552.tar.xz
-2019/02/28 | 10284 | systems/texlive/tlnet/archive/iwhdp.r37552.tar.xz
2019/02/28 | 467416 | systems/texlive/tlnet/archive/iwona.doc.r19611.tar.xz
2023/09/02 | 865668 | systems/texlive/tlnet/archive/iwonamath.doc.r68144.tar.xz
2023/09/02 | 2976 | systems/texlive/tlnet/archive/iwonamath.r68144.tar.xz
@@ -301238,8 +301243,8 @@
2019/02/28 | 340 | systems/texlive/tlnet/archive/purifyeps.x86_64-solaris.r18442.tar.xz
2020/12/30 | 201144 | systems/texlive/tlnet/archive/puyotikz.doc.r57254.tar.xz
2020/12/30 | 3968 | systems/texlive/tlnet/archive/puyotikz.r57254.tar.xz
-2023/10/09 | 11564 | systems/texlive/tlnet/archive/pwebmac.doc.r68486.tar.xz
-2023/10/09 | 8880 | systems/texlive/tlnet/archive/pwebmac.r68486.tar.xz
+2023/12/04 | 15656 | systems/texlive/tlnet/archive/pwebmac.doc.r69027.tar.xz
+2023/12/04 | 8972 | systems/texlive/tlnet/archive/pwebmac.r69027.tar.xz
2023/02/27 | 167592 | systems/texlive/tlnet/archive/pxbase.doc.r66187.tar.xz
2023/02/27 | 12464 | systems/texlive/tlnet/archive/pxbase.r66187.tar.xz
2023/08/30 | 336476 | systems/texlive/tlnet/archive/pxchfon.doc.r68103.tar.xz
@@ -301776,8 +301781,8 @@
2022/04/05 | 367028 | systems/texlive/tlnet/archive/scontents.doc.r62902.tar.xz
2022/04/05 | 8172 | systems/texlive/tlnet/archive/scontents.r62902.tar.xz
2022/04/05 | 29640 | systems/texlive/tlnet/archive/scontents.source.r62902.tar.xz
-2023/01/11 | 883952 | systems/texlive/tlnet/archive/scrabble.doc.r65507.tar.xz
-2023/01/11 | 3072 | systems/texlive/tlnet/archive/scrabble.r65507.tar.xz
+2023/12/04 | 987276 | systems/texlive/tlnet/archive/scrabble.doc.r69024.tar.xz
+2023/12/04 | 3600 | systems/texlive/tlnet/archive/scrabble.r69024.tar.xz
2021/09/27 | 193772 | systems/texlive/tlnet/archive/scrambledenvs.doc.r60615.tar.xz
2021/09/27 | 2408 | systems/texlive/tlnet/archive/scrambledenvs.r60615.tar.xz
2021/09/27 | 5752 | systems/texlive/tlnet/archive/scrambledenvs.source.r60615.tar.xz
@@ -302699,13 +302704,13 @@
2023/08/16 | 108860 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r67940.tar.xz
2023/08/16 | 87320 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r67940.tar.xz
2023/08/16 | 69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r67940.tar.xz
-2023/11/22 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r68930.tar.xz
+2023/12/04 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69028.tar.xz
2023/08/16 | 93764 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r67940.tar.xz
2023/08/16 | 91236 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r67940.tar.xz
2023/08/16 | 76184 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r67940.tar.xz
2023/08/16 | 83936 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r67940.tar.xz
-2023/11/22 | 1106536 | systems/texlive/tlnet/archive/tex4ht.r68930.tar.xz
-2023/11/22 | 1459440 | systems/texlive/tlnet/archive/tex4ht.source.r68930.tar.xz
+2023/12/04 | 1106600 | systems/texlive/tlnet/archive/tex4ht.r69028.tar.xz
+2023/12/04 | 1461884 | systems/texlive/tlnet/archive/tex4ht.source.r69028.tar.xz
2023/08/16 | 184636 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r67940.tar.xz
2023/10/23 | 62056 | systems/texlive/tlnet/archive/tex4ht.windows.r68621.tar.xz
2023/08/16 | 57992 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r67940.tar.xz
@@ -302983,7 +302988,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/12/03 | 430588 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69016.tar.xz
+2023/12/04 | 430612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69021.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
@@ -303005,7 +303010,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/12/03 | 114260 | systems/texlive/tlnet/archive/texlive-scripts.r69016.tar.xz
+2023/12/04 | 114248 | systems/texlive/tlnet/archive/texlive-scripts.r69021.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
@@ -303511,8 +303516,8 @@
2023/11/10 | 2588 | systems/texlive/tlnet/archive/tkz-bernoulli.r68780.tar.xz
2023/10/27 | 34436 | systems/texlive/tlnet/archive/tkz-doc.doc.r68665.tar.xz
2023/10/27 | 6744 | systems/texlive/tlnet/archive/tkz-doc.r68665.tar.xz
-2023/11/11 | 516408 | systems/texlive/tlnet/archive/tkz-elements.doc.r68806.tar.xz
-2023/11/11 | 12796 | systems/texlive/tlnet/archive/tkz-elements.r68806.tar.xz
+2023/12/04 | 627984 | systems/texlive/tlnet/archive/tkz-elements.doc.r69022.tar.xz
+2023/12/04 | 15244 | systems/texlive/tlnet/archive/tkz-elements.r69022.tar.xz
2023/11/08 | 1175256 | systems/texlive/tlnet/archive/tkz-euclide.doc.r68747.tar.xz
2023/11/08 | 41924 | systems/texlive/tlnet/archive/tkz-euclide.r68747.tar.xz
2022/07/16 | 96832 | systems/texlive/tlnet/archive/tkzexample.doc.r63908.tar.xz
@@ -303864,8 +303869,8 @@
2019/02/28 | 3948 | systems/texlive/tlnet/archive/uebungsblatt.r15878.tar.xz
2019/02/28 | 4250444 | systems/texlive/tlnet/archive/uestcthesis.doc.r36371.tar.xz
2019/02/28 | 17228 | systems/texlive/tlnet/archive/uestcthesis.r36371.tar.xz
-2023/12/01 | 536056 | systems/texlive/tlnet/archive/ufrgscca.doc.r69009.tar.xz
-2023/12/01 | 23452 | systems/texlive/tlnet/archive/ufrgscca.r69009.tar.xz
+2023/12/04 | 536700 | systems/texlive/tlnet/archive/ufrgscca.doc.r69025.tar.xz
+2023/12/04 | 24092 | systems/texlive/tlnet/archive/ufrgscca.r69025.tar.xz
2019/02/28 | 872 | systems/texlive/tlnet/archive/uhc.doc.r16791.tar.xz
2019/02/28 | 3600148 | systems/texlive/tlnet/archive/uhc.r16791.tar.xz
2019/02/28 | 380280 | systems/texlive/tlnet/archive/uhhassignment.doc.r44026.tar.xz
@@ -304891,16 +304896,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/08/07 | 125713 | systems/texlive/tlnet/install-tl
-2023/12/03 | 5741860 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2023/12/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/12/04 | 5744291 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/12/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/12/04 | 484 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/05/13 | 5083 | systems/texlive/tlnet/install-tl-windows.bat
-2023/12/03 | 21035788 | systems/texlive/tlnet/install-tl-windows.exe
-2023/12/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/12/03 | 26029643 | systems/texlive/tlnet/install-tl.zip
-2023/12/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/12/04 | 21034900 | systems/texlive/tlnet/install-tl-windows.exe
+2023/12/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/12/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/12/04 | 26029629 | systems/texlive/tlnet/install-tl.zip
+2023/12/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/12/04 | 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
@@ -304910,7 +304915,7 @@
2023/01/17 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2023/09/20 | 50622 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2023/12/02 | 7403 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2023/12/03 | 7354 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/08/23 | 221470 | 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
@@ -304952,12 +304957,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/12/03 | 18371739 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2023/12/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/12/04 | 18371316 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/12/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2023/10/16 | 87924 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2023/12/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2023/12/03 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/12/03 | 2492912 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/12/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/12/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/12/04 | 2491352 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/02/20 | 58928 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2023/06/11 | 42749 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2023/02/21 | 16138 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -315940,7 +315945,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/12/04 | 186 | timestamp
+2023/12/05 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 55c2b1a123..2b9548daee 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index 1d5ea8ad04..27f8f8a86f 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,3 +1,60 @@
+2023/12/04 | 987276 | systems/texlive/tlnet/archive/scrabble.doc.r69024.tar.xz
+2023/12/04 | 972770 | macros/latex/contrib/nicematrix/nicematrix-code.pdf
+2023/12/04 | 8972 | systems/texlive/tlnet/archive/pwebmac.r69027.tar.xz
+2023/12/04 | 7048 | systems/texlive/tlnet/archive/collection-latexextra.r69026.tar.xz
+2023/12/04 | 666553 | install/macros/latex/contrib/heria.tds.zip
+2023/12/04 | 66238 | macros/generic/ltxcmds/ltxcmds.dtx
+2023/12/04 | 6343 | macros/latex/contrib/fbox/doc/fbox.tex
+2023/12/04 | 632740 | macros/latex/contrib/heria.zip
+2023/12/04 | 627984 | systems/texlive/tlnet/archive/tkz-elements.doc.r69022.tar.xz
+2023/12/04 | 614351 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2023/12/04 | 598788 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2023/12/04 | 594121 | macros/latex/contrib/nicematrix/nicematrix-code.dtx
+2023/12/04 | 5744291 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2023/12/04 | 536700 | systems/texlive/tlnet/archive/ufrgscca.doc.r69025.tar.xz
+2023/12/04 | 51602 | macros/latex/contrib/fbox.zip
+2023/12/04 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2023/12/04 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2023/12/04 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2023/12/04 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2023/12/04 | 48539 | macros/latex/contrib/fbox/doc/fbox.pdf
+2023/12/04 | 484 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2023/12/04 | 430612 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69021.tar.xz
+2023/12/04 | 4248 | macros/latex/contrib/fbox/latex/fbox.sty
+2023/12/04 | 419825 | macros/generic/ltxcmds/ltxcmds.pdf
+2023/12/04 | 417634 | macros/generic/ltxcmds.zip
+2023/12/04 | 4113777 | biblio/ctan-bibdata.zip
+2023/12/04 | 3862 | macros/latex/contrib/heria/heria.ins
+2023/12/04 | 379 | macros/generic/ltxcmds/README.md
+2023/12/04 | 3708800 | biblio/ctan-bibdata/ctan.pdf
+2023/12/04 | 3600 | systems/texlive/tlnet/archive/scrabble.r69024.tar.xz
+2023/12/04 | 347 | macros/latex/contrib/fbox/CHANGELOG
+2023/12/04 | 313877 | macros/latex/contrib/heria/heria-proposal.pdf
+2023/12/04 | 303966 | macros/latex/contrib/heria/heria.pdf
+2023/12/04 | 2830639 | biblio/ctan-bibdata/ctan.bib
+2023/12/04 | 270220 | systems/texlive/tlnet/archive/argumentation.doc.r69023.tar.xz
+2023/12/04 | 26029629 | systems/texlive/tlnet/install-tl.zip
+2023/12/04 | 2491352 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2023/12/04 | 24092 | systems/texlive/tlnet/archive/ufrgscca.r69025.tar.xz
+2023/12/04 | 2366196 | macros/latex/contrib/nicematrix.zip
+2023/12/04 | 21034900 | systems/texlive/tlnet/install-tl-windows.exe
+2023/12/04 | 2028 | systems/texlive/tlnet/archive/argumentation.r69023.tar.xz
+2023/12/04 | 18371316 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2023/12/04 | 18238 | CTAN.sites
+2023/12/04 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2023/12/04 | 15656 | systems/texlive/tlnet/archive/pwebmac.doc.r69027.tar.xz
+2023/12/04 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2023/12/04 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2023/12/04 | 15244 | systems/texlive/tlnet/archive/tkz-elements.r69022.tar.xz
+2023/12/04 | 1461884 | systems/texlive/tlnet/archive/tex4ht.source.r69028.tar.xz
+2023/12/04 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2023/12/04 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2023/12/04 | 1449 | macros/latex/contrib/heria/README.md
+2023/12/04 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r69028.tar.xz
+2023/12/04 | 114248 | systems/texlive/tlnet/archive/texlive-scripts.r69021.tar.xz
+2023/12/04 | 1122683 | graphics/pgf/contrib/wheelchart.zip
+2023/12/04 | 1106600 | systems/texlive/tlnet/archive/tex4ht.r69028.tar.xz
+2023/12/04 | 100137 | macros/latex/contrib/heria/heria.dtx
2023/12/03 | 99949 | support/texlab/crates/parser/src/latex/tests.rs
2023/12/03 | 996 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_regular.lua
2023/12/03 | 988 | web/c_cpp/cweb/ctang-pc.ch
@@ -41,6 +98,7 @@
2023/12/03 | 770 | support/texlab/crates/diagnostics/src/types.rs
2023/12/03 | 7581826 | support/texlab.zip
2023/12/03 | 750 | support/texlab/crates/diagnostics/src/util.rs
+2023/12/03 | 7354 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/12/03 | 725 | support/texlab/crates/hover/src/package.rs
2023/12/03 | 710 | support/texlab/crates/distro/src/kpsewhich.rs
2023/12/03 | 7091 | support/texlab/crates/hover/src/tests.rs
@@ -79,7 +137,6 @@
2023/12/03 | 578 | web/c_cpp/cweb/examples/extex.ch
2023/12/03 | 577676 | systems/texlive/tlnet/archive/covington.doc.r69019.tar.xz
2023/12/03 | 5755 | web/c_cpp/cweb/Makefile
-2023/12/03 | 5741860 | systems/texlive/tlnet/install-tl-unx.tar.gz
2023/12/03 | 5727 | support/texlab/crates/base-db/src/graph.rs
2023/12/03 | 5657 | support/texlab/crates/symbols/src/workspace/sort.rs
2023/12/03 | 560 | support/texlab/crates/base-db/src/lib.rs
@@ -102,11 +159,6 @@
2023/12/03 | 499 | support/texlab/crates/symbols/Cargo.toml
2023/12/03 | 4971 | web/c_cpp/cweb/ctang-bs.ch
2023/12/03 | 492 | support/texlab/crates/bibtex-utils/Cargo.toml
-2023/12/03 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2023/12/03 | 488 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2023/12/03 | 488 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2023/12/03 | 488 | support/texlab/crates/citeproc/Cargo.toml
2023/12/03 | 483 | support/texlab/crates/hover/Cargo.toml
2023/12/03 | 479 | web/c_cpp/cweb/cweav-ql.ch
@@ -121,14 +173,12 @@
2023/12/03 | 4412 | support/texlab/crates/base-db/src/config.rs
2023/12/03 | 43806 | support/texlab/Cargo.lock
2023/12/03 | 433 | support/texlab/crates/diagnostics/Cargo.toml
-2023/12/03 | 430588 | systems/texlive/tlnet/archive/texlive-scripts.doc.r69016.tar.xz
2023/12/03 | 4297 | support/texlab/crates/completion/src/providers/environment.rs
2023/12/03 | 42741 | support/texlab/crates/texlab/src/server.rs
2023/12/03 | 4254 | support/texlab/crates/completion/src/providers/command.rs
2023/12/03 | 4240 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-parallelogram.tex
2023/12/03 | 4202 | support/texlab/crates/texlab/src/features/symbols.rs
2023/12/03 | 4144 | support/texlab/crates/diagnostics/src/grammar/tex.rs
-2023/12/03 | 4113768 | biblio/ctan-bibdata.zip
2023/12/03 | 4047 | support/texlab/crates/texlab/src/util/chktex.rs
2023/12/03 | 4004 | support/texlab/crates/texlab/src/util/lsp_enums.rs
2023/12/03 | 3990 | web/c_cpp/cweb/cweb.1
@@ -141,7 +191,6 @@
2023/12/03 | 380190 | support/texlab/images/demo.gif
2023/12/03 | 378 | support/texlab/crates/definition/Cargo.toml
2023/12/03 | 375 | support/texlab/crates/parser/Cargo.toml
-2023/12/03 | 3708800 | biblio/ctan-bibdata/ctan.pdf
2023/12/03 | 3669 | macros/latex/contrib/tkz/tkz-elements/README.md
2023/12/03 | 356 | support/texlab/crates/completion-data/Cargo.toml
2023/12/03 | 355 | support/texlab/crates/folding/Cargo.toml
@@ -181,7 +230,6 @@
2023/12/03 | 2946 | web/c_cpp/cweb/examples/README
2023/12/03 | 2858 | web/c_cpp/cweb/readme.ql
2023/12/03 | 2834 | support/texlab/crates/parser/src/latex/lexer/types.rs
-2023/12/03 | 2830630 | biblio/ctan-bibdata/ctan.bib
2023/12/03 | 273805 | graphics/pgf/contrib/argumentation.zip
2023/12/03 | 2665 | support/texlab/crates/bibtex-utils/src/field/date.rs
2023/12/03 | 2665 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_maths.lua
@@ -191,7 +239,6 @@
2023/12/03 | 2612 | support/texlab/crates/completion/src/providers/glossary.rs
2023/12/03 | 2610 | support/texlab/crates/symbols/src/types.rs
2023/12/03 | 2609 | support/texlab/crates/texlab/src/server/extensions.rs
-2023/12/03 | 26029643 | systems/texlive/tlnet/install-tl.zip
2023/12/03 | 2600 | support/texlab/crates/definition/src/tests.rs
2023/12/03 | 2586 | support/texlab/texlab.tex
2023/12/03 | 2549 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_circles.lua
@@ -201,12 +248,13 @@
2023/12/03 | 2527 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_functions_points.lua
2023/12/03 | 25232 | web/c_cpp/cweb/common.c
2023/12/03 | 251 | support/texlab/crates/links/src/lib.rs
+2023/12/03 | 249849 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2023/12/03 | 2493 | support/texlab/crates/completion/src/providers/argument.rs
-2023/12/03 | 2492912 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2023/12/03 | 2481 | support/texlab/crates/completion/src/providers/import.rs
2023/12/03 | 2470 | support/texlab/crates/texlab/src/features/inlay_hint.rs
2023/12/03 | 2467 | support/texlab/crates/distro/src/miktex.rs
2023/12/03 | 2411 | support/texlab/crates/texlab/src/server/dispatch.rs
+2023/12/03 | 238067 | support/TeX4ht/source/ChangeLog
2023/12/03 | 2371 | support/texlab/crates/base-db/src/semantics/bib.rs
2023/12/03 | 2369 | support/texlab/crates/completion/src/providers/field.rs
2023/12/03 | 23656 | web/pwebmac/pwebmac.tex
@@ -224,7 +272,6 @@
2023/12/03 | 2176 | web/c_cpp/cweb/iso_types.w
2023/12/03 | 2134 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_quadrilateral.lua
2023/12/03 | 2107 | support/texlab/crates/completion/src/providers/color.rs
-2023/12/03 | 21035788 | systems/texlive/tlnet/install-tl-windows.exe
2023/12/03 | 20966 | web/c_cpp/cweb/cwebmac.tex
2023/12/03 | 20913 | web/c_cpp/cweb/examples/wordtest.w
2023/12/03 | 2074 | support/texlab/crates/bibtex-utils/src/field/author.rs
@@ -239,7 +286,6 @@
2023/12/03 | 1897 | support/texlab/crates/texlab/Cargo.toml
2023/12/03 | 1858 | web/c_cpp/cweb/examples/xlib_types.w
2023/12/03 | 18578 | web/c_cpp/cweb/prod.w
-2023/12/03 | 18371739 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2023/12/03 | 181 | support/texlab/CONTRIBUTING.md
2023/12/03 | 18098 | support/texlab/crates/syntax/src/latex/cst.rs
2023/12/03 | 17 | support/texlab/crates/test-utils/src/lib.rs
@@ -256,7 +302,6 @@
2023/12/03 | 1708 | support/texlab/crates/syntax/src/latex/kind.rs
2023/12/03 | 1698 | support/texlab/crates/folding/src/tests.rs
2023/12/03 | 1691 | macros/latex/contrib/tkz/tkz-elements/latex/tkz-elements.sty
-2023/12/03 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2023/12/03 | 1674 | web/c_cpp/cweb/c++lib.w
2023/12/03 | 1658 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_misc.lua
2023/12/03 | 1650 | web/c_cpp/cweb/cweav-vms.ch
@@ -273,8 +318,6 @@
2023/12/03 | 1553 | support/texlab/crates/completion/src/providers/color_model.rs
2023/12/03 | 1546 | support/texlab/crates/symbols/src/document.rs
2023/12/03 | 1542 | web/c_cpp/cweb/makefile.bs
-2023/12/03 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2023/12/03 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2023/12/03 | 1522 | support/texlab/crates/texlab/src/features/definition.rs
2023/12/03 | 1514 | web/pwebmac/Xerrorlog.tex
2023/12/03 | 1510 | support/texlab/crates/rename/src/entry.rs
@@ -282,9 +325,7 @@
2023/12/03 | 1498 | support/texlab/crates/references/src/entry.rs
2023/12/03 | 1496 | support/texlab/crates/texlab/src/util.rs
2023/12/03 | 14836 | support/texlab/crates/texlab/src/features/completion.rs
-2023/12/03 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2023/12/03 | 1453 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_main.lua
-2023/12/03 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2023/12/03 | 14338 | support/texlab/crates/symbols/src/document/tests.rs
2023/12/03 | 1432 | support/texlab/crates/texlab/src/features/folding.rs
2023/12/03 | 1412 | support/texlab/crates/texlab/src/server/progress.rs
@@ -299,20 +340,23 @@
2023/12/03 | 128 | support/texlab/crates/syntax/src/latexmkrc.rs
2023/12/03 | 1287 | support/texlab/crates/distro/src/language.rs
2023/12/03 | 12874 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-classes-circle.tex
+2023/12/03 | 128158 | graphics/pgf/contrib/wheelchart/wheelchart.sty
2023/12/03 | 12672 | web/c_cpp/cweb/examples/extex.w
2023/12/03 | 1254 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_vector.lua
2023/12/03 | 1247 | support/texlab/crates/rename/src/tests.rs
2023/12/03 | 1244 | support/texlab/crates/hover/src/citation.rs
2023/12/03 | 1240 | support/texlab/crates/rename/src/command.rs
2023/12/03 | 12344 | systems/texlive/tlnet/archive/covington.r69019.tar.xz
+2023/12/03 | 1202 | graphics/pgf/contrib/wheelchart/README.md
2023/12/03 | 119095 | macros/latex/contrib/tkz/tkz-elements/doc/latex/TKZdoc-elements-examples.tex
2023/12/03 | 1175 | support/texlab/crates/definition/src/label.rs
+2023/12/03 | 1171688 | support/TeX4ht/source/tex4ht-4ht.tex
2023/12/03 | 1170 | support/texlab/crates/base-db/src/semantics/auxiliary.rs
2023/12/03 | 1166 | support/texlab/crates/texlab/src/features/reference.rs
+2023/12/03 | 115154 | graphics/pgf/contrib/wheelchart/wheelchart.tex
2023/12/03 | 11471 | macros/latex/contrib/tkz/tkz-elements/latex/tkz_elements_triangle.lua
2023/12/03 | 1145 | support/texlab/crates/links/src/tests.rs
2023/12/03 | 11454 | web/c_cpp/cweb/common.h
-2023/12/03 | 114260 | systems/texlive/tlnet/archive/texlive-scripts.r69016.tar.xz
2023/12/03 | 1137 | support/texlab/crates/texlab/src/features/formatting.rs
2023/12/03 | 11379 | graphics/pgf/contrib/scrabble/doc/Scrabble-doc-en.tex
2023/12/03 | 1125 | support/texlab/crates/texlab/src/features/highlight.rs
@@ -320,6 +364,7 @@
2023/12/03 | 11137 | support/texlab/crates/base-db/src/workspace.rs
2023/12/03 | 1112 | support/texlab/crates/base-db/src/semantics.rs
2023/12/03 | 11103 | support/texlab/crates/parser/src/bibtex.rs
+2023/12/03 | 1109172 | graphics/pgf/contrib/wheelchart/wheelchart.pdf
2023/12/03 | 11078 | support/texlab/crates/base-db/src/semantics/tex.rs
2023/12/03 | 1104 | support/texlab/crates/definition/src/lib.rs
2023/12/03 | 1097420 | graphics/pgf/contrib/scrabble.zip
@@ -359,7 +404,6 @@
2023/12/02 | 76201 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2023/12/02 | 759221 | systems/win32/miktex/tm/packages/yquant__doc.tar.lzma
2023/12/02 | 75111 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2023/12/02 | 7403 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2023/12/02 | 73400 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
2023/12/02 | 73388 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2023/12/02 | 73351 | systems/win32/miktex/tm/packages/yamlvars__doc.tar.lzma
@@ -477,6 +521,7 @@
2023/12/02 | 27221 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2023/12/02 | 2677 | systems/win32/miktex/tm/packages/pdfannotations.tar.lzma
2023/12/02 | 266070 | systems/win32/miktex/tm/packages/profmaquette__doc.tar.lzma
+2023/12/02 | 259852 | macros/latex/contrib/nicematrix/nicematrix.tex
2023/12/02 | 259095 | systems/win32/miktex/tm/packages/xcharter-math.tar.lzma
2023/12/02 | 25618 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2023/12/02 | 25609 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
@@ -573,7 +618,6 @@
2023/12/01 | 61788 | systems/texlive/tlnet/archive/vectorlogos.r69010.tar.xz
2023/12/01 | 5782302 | fonts/simpleicons.zip
2023/12/01 | 56588 | systems/texlive/tlnet/archive/coolfn.doc.r69007.tar.xz
-2023/12/01 | 536056 | systems/texlive/tlnet/archive/ufrgscca.doc.r69009.tar.xz
2023/12/01 | 479052 | systems/texlive/tlnet/archive/vectorlogos.doc.r69010.tar.xz
2023/12/01 | 47452 | systems/texlive/tlnet/archive/cjs-rcs-article.source.r69006.tar.xz
2023/12/01 | 46848 | systems/texlive/tlnet/archive/proflycee.r69008.tar.xz
@@ -605,7 +649,6 @@
2023/12/01 | 2507 | fonts/simpleicons/enc/simpleiconsseven.enc
2023/12/01 | 2475 | fonts/simpleicons/enc/simpleiconsfive.enc
2023/12/01 | 2402 | fonts/simpleicons/enc/simpleiconsoneone.enc
-2023/12/01 | 23452 | systems/texlive/tlnet/archive/ufrgscca.r69009.tar.xz
2023/12/01 | 2305605 | fonts/simpleicons/doc/simpleicons.pdf
2023/12/01 | 2228472 | fonts/simpleicons/opentype/SimpleIcons.otf
2023/12/01 | 2060135 | fonts/simpleicons/type1/SimpleIcons.pfb
@@ -762,35 +805,3 @@
2023/11/28 | 1382 | macros/latex/contrib/affilauthor/README.txt
2023/11/28 | 13208 | info/install-latex-guide-zh-cn/chapter/ubuntu.tex
2023/11/28 | 12628 | systems/texlive/tlnet/archive/lni.r68984.tar.xz
-2023/11/27 | 94218 | macros/latex/contrib/lni/lni.dtx
-2023/11/27 | 9260 | systems/texlive/tlnet/archive/cidarticle.r68976.tar.xz
-2023/11/27 | 916 | macros/latex/contrib/kantlipsum/README.md
-2023/11/27 | 89892 | systems/texlive/tlnet/archive/hyperref.r68972.tar.xz
-2023/11/27 | 78688 | systems/texlive/tlnet/archive/yamlvars.doc.r68974.tar.xz
-2023/11/27 | 786192 | macros/latex/contrib/lni.zip
-2023/11/27 | 724741 | macros/latex/contrib/unbtex.zip
-2023/11/27 | 677444 | macros/latex/contrib/kantlipsum/kantlipsum.pdf
-2023/11/27 | 677404 | macros/latex/contrib/kantlipsum.zip
-2023/11/27 | 6738 | macros/latex/contrib/lni/CHANGELOG.md
-2023/11/27 | 6398 | macros/latex/contrib/lni/lni-paper-example-de.tex
-2023/11/27 | 62280 | systems/texlive/tlnet/archive/penlightplus.doc.r68973.tar.xz
-2023/11/27 | 5956 | systems/texlive/tlnet/archive/yamlvars.r68974.tar.xz
-2023/11/27 | 4744 | systems/texlive/tlnet/archive/trivialpursuit.r68971.tar.xz
-2023/11/27 | 463412 | systems/texlive/tlnet/archive/trivialpursuit.doc.r68971.tar.xz
-2023/11/27 | 446252 | systems/texlive/tlnet/archive/cidarticle.doc.r68976.tar.xz
-2023/11/27 | 414412 | systems/texlive/tlnet/archive/hyperref.source.r68972.tar.xz
-2023/11/27 | 4127 | macros/latex/contrib/lni/lni.ins
-2023/11/27 | 4032720 | info/biblio/tugboat.bib
-2023/11/27 | 377740 | macros/latex/contrib/lni/lni.pdf
-2023/11/27 | 3663268 | systems/texlive/tlnet/archive/hyperref.doc.r68972.tar.xz
-2023/11/27 | 3586 | info/biblio/tugboat.ltx
-2023/11/27 | 2370 | macros/latex/contrib/lni/CONTRIBUTING.md
-2023/11/27 | 2150 | macros/latex/contrib/lni/lni-paper-example-de.bib
-2023/11/27 | 2035752 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r68970.tar.xz
-2023/11/27 | 203013 | macros/latex/contrib/kantlipsum/kantlipsum.dtx
-2023/11/27 | 1995 | macros/latex/contrib/lni/README.md
-2023/11/27 | 19514589 | fonts/libertine.zip
-2023/11/27 | 1928 | macros/latex/contrib/lni/lni-author-template.tex
-2023/11/27 | 17664 | systems/texlive/tlnet/archive/cidarticle.source.r68976.tar.xz
-2023/11/27 | 1115636 | systems/texlive/tlnet/archive/kpfonts-otf.r68970.tar.xz
-2023/11/27 | 10004 | systems/texlive/tlnet/archive/penlightplus.r68973.tar.xz
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 82002e6927..180ed2d5ea 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 03-12-2023, 02:00:04
+%% created at 04-12-2023, 02:00:04
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -3114,8 +3114,8 @@
title = {The \texttt{argumentation} package},
subtitle = {Create abstract argumentation frameworks via TikZ},
author = {Lars Bengel},
- date = {2023-11-17},
- version = {1.0},
+ date = {2023-12-03},
+ version = {1.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/argumentation},
url = {https://ctan.org/pkg/argumentation},
@@ -12583,7 +12583,7 @@
title = {The \texttt{cidarticle} package},
subtitle = {A class for submissions to the “Commentarii informaticae didacticae” (CID)},
author = {Martin Sievers},
- date = {2023-11-27},
+ date = {2023-12-03},
version = {1.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/cidarticle},
@@ -12895,7 +12895,7 @@
title = {The \texttt{cjs-rcs-article} package},
subtitle = {Article class for The Canadian Journal of Statistics},
author = {Vincent Goulet},
- date = {2023-12-01},
+ date = {2023-12-03},
version = {1.0},
license = {lppl1.3c,cc-by-sa-4},
mirror = {https://mirror.ctan.org/macros/latex/contrib/cjs-rcs-article},
@@ -16983,8 +16983,8 @@
title = {The \texttt{cweb} package},
subtitle = {A Web system in C},
author = {Donald E. Knuth and Andreas Scherer and Silvio Levy},
- date = {2023-08-19},
- version = {4.10},
+ date = {2023-12-03},
+ version = {4.11},
license = {knuth},
mirror = {https://mirror.ctan.org/web/c_cpp/cweb},
url = {https://ctan.org/pkg/cweb},
@@ -35068,10 +35068,10 @@
title = {The \texttt{iwhdp} package},
subtitle = {Halle Institute for Economic Research (IWH) Discussion Papers},
author = {Wilfried Ehrenfeld},
- date = {2016-06-24},
+ date = {2023-12-03},
version = {0.50},
license = {lppl1.3},
- mirror = {https://mirror.ctan.org/macros/latex/contrib/iwhdp},
+ mirror = {https://mirror.ctan.org/obsolete/macros/latex/contrib/iwhdp},
url = {https://ctan.org/pkg/iwhdp},
}
@@ -52088,7 +52088,7 @@
title = {The \texttt{pdfannotations} package},
subtitle = {Annotate PDF slides},
author = {Chevan Nanayakkara},
- date = {2023-11-25},
+ date = {2023-12-03},
version = {3.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/pdfannotations},
@@ -57716,8 +57716,8 @@
title = {The \texttt{pwebmac} package},
subtitle = {Consolidated WEB macros for DVI and PDF output},
author = {Andreas Scherer},
- date = {2023-10-07},
- version = {4.10},
+ date = {2023-12-03},
+ version = {4.11},
license = {pd},
mirror = {https://mirror.ctan.org/web/pwebmac},
url = {https://ctan.org/pkg/pwebmac},
@@ -61283,8 +61283,8 @@
title = {The \texttt{Scrabble} package},
subtitle = {Commands for Scrabble boards},
author = {Cédric Pierquet},
- date = {2023-01-10},
- version = {0.1.3},
+ date = {2023-12-03},
+ version = {0.1.4},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/scrabble},
url = {https://ctan.org/pkg/scrabble},
@@ -68130,7 +68130,7 @@
title = {The \texttt{TeXBlend} package},
subtitle = {Compile segments of \LaTeX{} documents},
author = {Michal Hoftich},
- date = {2023-11-25},
+ date = {2023-12-03},
version = {0.1},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/support/texblend},
@@ -68544,8 +68544,8 @@
title = {The \texttt{TeXLab} package},
subtitle = {LaTeX Language Server},
author = {Eric Förster},
- date = {2023-11-05},
- version = {5.11.0},
+ date = {2023-12-03},
+ version = {5.12.0},
license = {gpl3},
mirror = {https://mirror.ctan.org/support/texlab},
url = {https://ctan.org/pkg/texlab},
@@ -71206,8 +71206,8 @@
title = {The \texttt{tkz-elements} package},
subtitle = {A Lua library for drawing Euclidean geometry with TikZ or tkz-euclide},
author = {Alain Matthes},
- date = {2023-11-10},
- version = {1.20b},
+ date = {2023-12-03},
+ version = {1.40c},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/tkz/tkz-elements},
url = {https://ctan.org/pkg/tkz-elements},
@@ -72328,7 +72328,7 @@
title = {The \texttt{TrivialPursuit} package},
subtitle = {Insert Trivial Pursuit board game},
author = {Cédric Pierquet},
- date = {2023-12-02},
+ date = {2023-12-03},
version = {0.1.1},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/trivialpursuit},
@@ -75268,7 +75268,7 @@
title = {The \texttt{vectorlogos} package},
subtitle = {Vectorial logos (GeoGebra, Emacs, Scratch, ...) with ‘inline’ support},
author = {Cédric Pierquet},
- date = {2023-11-30},
+ date = {2023-12-03},
version = {0.1.2},
license = {lppl1.3c,cc-by-3,cc-by-4,other-free},
mirror = {https://mirror.ctan.org/macros/latex/contrib/vectorlogos},
diff --git a/graphics/pgf/contrib/wheelchart/README.md b/graphics/pgf/contrib/wheelchart/README.md
index 4df731d7f6..7c40af7e8e 100644
--- a/graphics/pgf/contrib/wheelchart/README.md
+++ b/graphics/pgf/contrib/wheelchart/README.md
@@ -1,13 +1,13 @@
# `wheelchart`
-## Draw wheelcharts with TikZ
+## Draw wheelcharts with Ti*k*Z
-Version 1.0 (2022/09/11)
+Version 2.0 (2023/12/03)
-This package is based on the package [TikZ](https://ctan.org/pkg/pgf) and can be used to draw wheelcharts with TikZ. It provides several options to customize the wheelcharts.
+This package is based on the package [Ti*k*Z](https://ctan.org/pkg/pgf) and can be used to draw various kinds of diagrams such as a bar chart, doughnut chart, infographic, pie chart, ring chart, square chart, sunburst chart, waffle chart and wheel chart with Ti*k*Z. It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams.
%% README.md
-%% Copyright 2022 Matthias Floré
+%% Copyright 2023 Matthias Floré
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
diff --git a/graphics/pgf/contrib/wheelchart/wheelchart.pdf b/graphics/pgf/contrib/wheelchart/wheelchart.pdf
index 2fd89c3fc8..3b9a2780fa 100644
--- a/graphics/pgf/contrib/wheelchart/wheelchart.pdf
+++ b/graphics/pgf/contrib/wheelchart/wheelchart.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/wheelchart/wheelchart.sty b/graphics/pgf/contrib/wheelchart/wheelchart.sty
index c7f9fbc8bb..af15d60654 100644
--- a/graphics/pgf/contrib/wheelchart/wheelchart.sty
+++ b/graphics/pgf/contrib/wheelchart/wheelchart.sty
@@ -1,5 +1,5 @@
%% wheelchart.sty
-%% Copyright 2022 Matthias Floré
+%% Copyright 2023 Matthias Floré
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -16,428 +16,2757 @@
% This work consists of the files wheelchart.pdf, wheelchart.sty,
% wheelchart.tex and README.md.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{wheelchart}[2022/09/11 v1.0 Draw wheelcharts with TikZ]
\RequirePackage{tikz}
\usetikzlibrary{calc}
-\def\wheelchart@slicesstart{}
-\def\wheelchart@slicesend{}
-\newif\ifwheelchart@contour
-\newif\ifwheelchart@counterclockwise
-\newif\ifwheelchart@definnercontour
-\newif\ifwheelchart@draw
-\newif\ifwheelchart@linesextfixed
-\newif\ifwheelchart@middlefill
-\newif\ifwheelchart@pie
-\newif\ifwheelchart@slicesarcadaptangle
-\newif\ifwheelchart@wheellines
-\newcommand{\wheelchart@slicesarcdefmacros}[2]{
-\pgfmathsetmacro{\wheelchart@slicesarcA}{#1}
-\pgfmathsetmacro{\wheelchart@slicesarcB}{#2}
-\pgfmathsetmacro{\wheelchart@slicesarcradius}{(1-(\wheelchart@slicesarcB))*\n1*abs((1/(\wheelchart@slicesarcA))+(\wheelchart@slicesarcA))/2}
-\wheelchart@slicesarcadaptanglefalse
-\ifdim \wheelchart@slicesarcA pt<\z@
-\pgfmathsetmacro{\wheelchart@slicesarccoord}{max(\wheelchart@slicesarcB,0)}
-\wheelchart@slicesarcadaptangletrue
-\ifdim \wheelchart@slicesarcB pt<\z@
-\else
-\pgfmathsetmacro{\wheelchart@halflengthsliceinnerstartplussliceouterstart}{veclen(\x3/\pgf@xx,\y3/\pgf@yy)}
-\pgfmathsetmacro{\wheelchart@slicesarcradiusbound}{sqrt((\wheelchart@halflengthsliceinnerstartplussliceouterstart^2-((\wheelchart@gap)^2)+((\wheelchart@gap-\wheelchart@slicesarcA*(1-(\wheelchart@slicesarcB))*\n1-\wheelchart@slicesarcradius)^2))}
-\pgfmathsetmacro{\wheelchart@slicesarcradiusboundminusslicesarcradius}{\wheelchart@slicesarcradiusbound-\wheelchart@slicesarcradius}
-\pgfmathsetmacro{\wheelchart@slicesarcradiusboundplusslicesarcradius}{\wheelchart@slicesarcradiusbound+\wheelchart@slicesarcradius}
-\ifdim \wheelchart@slicesarcradiusboundminusslicesarcradius pt>\wheelchart@innerradius pt
-\ifdim \wheelchart@slicesarcradiusboundplusslicesarcradius pt<\wheelchart@outerradius pt
-\wheelchart@slicesarcadaptanglefalse
-\fi
-\fi
-\fi
-\else
-\pgfmathsetmacro{\wheelchart@slicesarccoord}{\wheelchart@slicesarcB}
-\fi
-\pgfmathsetmacro{\wheelchart@slicesarccoordtimesnone}{\wheelchart@slicesarccoord*\n1}
-\ifwheelchart@slicesarcadaptangle
-\pgfmathsetmacro{\wheelchart@slicesarcangle}{-acos((2*(\wheelchart@slicesarccoord-1))/((1-(\wheelchart@slicesarcB))*((1/(\wheelchart@slicesarcA))+(\wheelchart@slicesarcA))))}
-\else
-\pgfmathsetmacro{\wheelchart@slicesarcangle}{atan(((1/(\wheelchart@slicesarcA))-(\wheelchart@slicesarcA))/2)}
-\fi
-}
-\newcommand{\wheelchart@slicesarrowdefmacros}[2]{
-\pgfmathsetmacro{\wheelchart@slicesarrowA}{#1}
-\pgfmathsetmacro{\wheelchart@slicesarrowB}{#2}
-\pgfmathsetmacro{\wheelchart@slicesarrowlength}{\n1}
-\ifdim \wheelchart@slicesarrowA pt<\z@
-\pgfmathsetmacro{\wheelchart@slicesarrowcoord}{max(\wheelchart@slicesarrowB,0)}
-\else
-\pgfmathsetmacro{\wheelchart@slicesarrowcoord}{\wheelchart@slicesarrowB}
-\fi
-\pgfmathsetmacro{\wheelchart@slicesarrowtip}{(1-\wheelchart@slicesarrowcoord)*\wheelchart@slicesarrowA}
-}
-\pgfkeys{
-/wheelchart/.is family,
-/wheelchart,
-anchor xsep/.initial=5,
-anchor ysep/.initial=5,
-at/.initial={(0,0)},
-caption/.store in=\wheelchart@caption,
-caption style/.style={caption style@options/.style={#1}},
-caption style@options/.style={},
-caption left/.store in=\wheelchart@captionleft,
-caption left style/.style={caption left style@options/.style={#1}},
-caption left style@options/.style={},
-contour@boolean/.is if=wheelchart@contour,
-contour/.style={contour@boolean=true,contour@options/.style={#1}},
-contour@options/.style={},
-counterclockwise/.is if=wheelchart@counterclockwise,
-data/.initial={\WCvarC},
-data angle shift/.initial=0,
-data sep/.initial=0.2,
-data style/.style={data style@options/.style={#1}},
-data style@options/.style={},
-expand list/.is choice,
-expand list/false/.code={\def\wheelchart@expandlistvalue{false}\def\wheelchart@foreachdeflist##1{\def\wheelchart@foreachlist{##1}}},
-expand list/once/.code={\def\wheelchart@expandlistvalue{true}\def\wheelchart@foreachdeflist##1{\def\wheelchart@foreachlist{\unexpanded\expandafter{##1}}}},
-expand list/true/.code={\def\wheelchart@expandlistvalue{true}\def\wheelchart@foreachdeflist##1{\def\wheelchart@foreachlist{##1}}},
-expand list=once,
-explode/.initial=0,
-explode/.default=0.2,
-gap/.initial=0,
-gap/.default=0.05,
-gap polar/.initial=0,
-gap polar/.default=1,
-inner data/.store in=\wheelchart@innerdata,
-inner data sep/.initial=0.2,
-inner data style/.style={inner data style@options/.style={#1}},
-inner data style@options/.style={},
-inner radius/.initial=2,
-legend/.store in=\wheelchart@legend,
-legend entry/.store in=\wheelchart@legendentry,
-lines/.initial=0,
-lines/.default=1,
-lines ext/.initial=0,
-lines ext/.default=0.5,
-lines ext bottom dir/.is choice,
-lines ext bottom dir/left/.code={\pgfmathsetmacro{\wheelchart@linesextbottomdir}{-1}},
-lines ext bottom dir/right/.code={\pgfmathsetmacro{\wheelchart@linesextbottomdir}{1}},
-lines ext bottom dir=right,
-lines ext dirsep/.initial=0,
-lines ext fixed/.is if=wheelchart@linesextfixed,
-lines ext left anchor/.initial={mid east},
-lines ext right anchor/.initial={mid west},
-lines ext top dir/.is choice,
-lines ext top dir/left/.code={\pgfmathsetmacro{\wheelchart@linesexttopdir}{-1}},
-lines ext top dir/right/.code={\pgfmathsetmacro{\wheelchart@linesexttopdir}{1}},
-lines ext top dir=right,
-lines sep/.initial=0.2,
-lines style/.style={lines style@options/.style={#1}},
-lines style@options/.style={},
-middle/.store in=\wheelchart@middle,
-middle fill@boolean/.is if=wheelchart@middlefill,
-middle fill/.style={middle fill@boolean=true,middle fill@options/.style={#1}},
-middle fill@options/.style={},
-middle style/.style={middle style@options/.style={#1}},
-middle style@options/.style={},
-name/.code={\xdef\wheelchart@name{#1}},
-name=wheelchart@name,
-outer radius/.initial=3,
-perc precision/.initial=0,
-pie/.is if=wheelchart@pie,
-radius/.code 2 args={\pgfkeys{/wheelchart,inner radius={#1},outer radius={#2}}},
-slices/.store in=\wheelchart@slices,
-slices arc/.code 2 args={\pgfkeys{/wheelchart,slices start arc={-(#1)}{#2},slices end arc={#1}{#2}}},
-slices arrow/.code 2 args={\pgfkeys{/wheelchart,slices start arrow={-(#1)}{#2},slices end arrow={#1}{#2}}},
-slices end arc/.code 2 args={\def\wheelchart@slicesend{{[shift={(wheelchart@sliceouterend)},rotate={90-atan2(\p2)},/utils/exec={\wheelchart@slicesarcdefmacros{#1}{#2}}]--({-\wheelchart@slicesarccoordtimesnone},0) arc[start angle={\wheelchart@counterorclockwise*\wheelchart@slicesarcangle},end angle={\wheelchart@counterorclockwise*(sign(#1)*180-\wheelchart@slicesarcangle)},radius={\wheelchart@slicesarcradius}]}}},
-slices end arrow/.code 2 args={\def\wheelchart@slicesend{{[shift={(wheelchart@sliceouterend)},rotate={90-atan2(\p2)},/utils/exec={\wheelchart@slicesarrowdefmacros{#1}{#2}}]--({-\wheelchart@slicesarrowcoord*\wheelchart@slicesarrowlength},0)--({-\wheelchart@slicesarrowlength},{\wheelchart@counterorclockwise*\wheelchart@slicesarrowtip*\wheelchart@slicesarrowlength})--({(\wheelchart@slicesarrowcoord-2)*\wheelchart@slicesarrowlength},0)}}},
-slices start arc/.code 2 args={\def\wheelchart@slicesstart{{[shift={(wheelchart@sliceinnerstart)},rotate={90-atan2(\p1)},/utils/exec={\wheelchart@slicesarcdefmacros{#1}{#2}}]({\wheelchart@slicesarccoordtimesnone},0) arc[start angle={-\wheelchart@counterorclockwise*(sign(#1)*180-\wheelchart@slicesarcangle)},end angle={-\wheelchart@counterorclockwise*\wheelchart@slicesarcangle},radius={\wheelchart@slicesarcradius}]}--}},
-slices start arrow/.code 2 args={\def\wheelchart@slicesstart{{[shift={(wheelchart@sliceinnerstart)},rotate={90-atan2(\p1)},/utils/exec={\wheelchart@slicesarrowdefmacros{#1}{#2}}]({\wheelchart@slicesarrowcoord*\wheelchart@slicesarrowlength},0)--({\wheelchart@slicesarrowlength},{-\wheelchart@counterorclockwise*\wheelchart@slicesarrowtip*\wheelchart@slicesarrowlength})--({(2-\wheelchart@slicesarrowcoord)*\wheelchart@slicesarrowlength},0)}--}},
-slices style/.style={slices style@options/.style={#1}},
-slices style@options/.style={},
-slices style={\WCvarB},
-start angle/.initial=90,
-start half/.store in=\wheelchart@starthalf,
-start half/.default=90,
-title/.store in=\wheelchart@title,
-title style/.style={title style@options/.style={#1}},
-title style@options/.style={},
-title left/.store in=\wheelchart@titleleft,
-title left style/.style={title left style@options/.style={#1}},
-title left style@options/.style={},
-total angle/.initial=360,
-total count/.code={\pgfmathsetmacro{\wheelchart@totalcount}{int(#1)}},
-value/.initial={\WCvarA},
-wheel data/.store in=\wheelchart@wheeldata,
-wheel data pos/.initial=0.66,
-wheel data style/.style={wheel data style@options/.style={#1}},
-wheel data style@options/.style={},
-wheel lines@boolean/.is if=wheelchart@wheellines,
-wheel lines/.style={wheel lines@boolean=true,wheel lines@options/.style={#1}},
-wheel lines@options/.style={},
-}
-\newcommand{\wheelchart@foreachinitial}[2]{\ifcsname wheelchart@totalcount\endcsname\ifnum\wheelchart@totalcount>1\gdef\wheelchart@foreachlist{}\foreach\wheelchart@n in {2,...,\wheelchart@totalcount}{\xdef\wheelchart@foreachlist{\wheelchart@foreachlist,}}\else\ifnum\wheelchart@totalcount=1\gdef\wheelchart@foreachlist{{}}\else\gdef\wheelchart@foreachlist{}\fi\fi\else\wheelchart@foreachdeflist{#1}\fi\foreach\WCvarA/\WCvarB/\WCvarC/\WCvarD/\WCvarE/\WCvarF/\WCvarG/\WCvarH/\WCvarI/\WCvarJ/\WCvarK/\WCvarL/\WCvarM/\WCvarN/\WCvarO/\WCvarP/\WCvarQ/\WCvarR/\WCvarS/\WCvarT/\WCvarU/\WCvarV/\WCvarW/\WCvarX/\WCvarY/\WCvarZ [count=\WCcount,expand list=\wheelchart@expandlistvalue] in \wheelchart@foreachlist{#2}}
-\newcommand{\wheelchart@foreach}[2]{\pgfmathsetmacro{\wheelchart@angle}{\wheelchart@startangle}\wheelchart@foreachinitial{#1}{\pgfmathsetmacro{\wheelchart@outerradius}{\pgfkeysvalueof{/wheelchart/outer radius}}
-\ifwheelchart@pie
-\pgfmathsetmacro{\wheelchart@innerradius}{0}
-\else
-\pgfmathsetmacro{\wheelchart@innerradius}{\pgfkeysvalueof{/wheelchart/inner radius}}
-\fi
-\pgfmathsetmacro{\wheelchart@gap}{\pgfkeysvalueof{/wheelchart/gap}}
-\pgfmathsetmacro{\wheelchart@gappolar}{\pgfkeysvalueof{/wheelchart/gap polar}}
-\pgfmathsetmacro{\wheelchart@value}{\pgfkeysvalueof{/wheelchart/value}}
-\pgfmathsetmacro{\wheelchart@newangle}{\wheelchart@angle+(\wheelchart@counterorclockwise*\wheelchart@value*(\wheelchart@totalangle/\WCtotalnum))}
-\pgfmathsetmacro{\wheelchart@abshalfangleminusnewangle}{abs((\wheelchart@angle-\wheelchart@newangle)/2)}
-\wheelchart@drawfalse
-\pgfmathsetmacro{\wheelchart@abshalfangleminusnewangleminusgappolar}{\wheelchart@abshalfangleminusnewangle-\wheelchart@gappolar}
-\ifdim \wheelchart@abshalfangleminusnewangleminusgappolar pt=180 pt
-\pgfmathsetmacro{\wheelchart@outergap}{asin(\wheelchart@gap/\wheelchart@outerradius)}
-\ifdim \wheelchart@gap pt<\wheelchart@innerradius pt
-\pgfmathsetmacro{\wheelchart@innergap}{asin(\wheelchart@gap/\wheelchart@innerradius)}
-\else
-\pgfmathsetmacro{\wheelchart@innergap}{90}
-\pgfmathsetmacro{\wheelchart@innerradius}{\wheelchart@gap}
-\fi
-\ifdim \wheelchart@innerradius pt<\wheelchart@outerradius pt
-\wheelchart@drawtrue
-\fi
-\else
-\ifdim \wheelchart@abshalfangleminusnewangleminusgappolar pt>\z@
-\pgfmathsetmacro{\wheelchart@outerradiustimessinabshalfangleminusnewangleminusgappolar}{\wheelchart@outerradius*sin(\wheelchart@abshalfangleminusnewangleminusgappolar)}
-\ifdim \wheelchart@outerradiustimessinabshalfangleminusnewangleminusgappolar pt<\wheelchart@gap pt
-\else
-\pgfmathsetmacro{\wheelchart@outergap}{asin(\wheelchart@gap/\wheelchart@outerradius)+\wheelchart@gappolar}
-\pgfmathsetmacro{\wheelchart@innerradiustimessinabshalfangleminusnewangleminusgappolar}{\wheelchart@innerradius*sin(\wheelchart@abshalfangleminusnewangleminusgappolar)}
-\ifdim \wheelchart@innerradiustimessinabshalfangleminusnewangleminusgappolar pt>\wheelchart@gap pt
-\pgfmathsetmacro{\wheelchart@innergap}{asin(\wheelchart@gap/\wheelchart@innerradius)+\wheelchart@gappolar}
-\else
-\pgfmathsetmacro{\wheelchart@innergap}{\wheelchart@abshalfangleminusnewangle}
-\ifdim \wheelchart@innerradiustimessinabshalfangleminusnewangleminusgappolar pt<\wheelchart@gap pt
-\pgfmathsetmacro{\wheelchart@innerradius}{\wheelchart@gap/sin(\wheelchart@abshalfangleminusnewangleminusgappolar)}
-\fi
-\fi
-\ifdim \wheelchart@innerradius pt<\wheelchart@outerradius pt
-\wheelchart@drawtrue
-\fi
-\fi
-\fi
-\fi
-\pgfmathsetmacro{\wheelchart@explode}{\pgfkeysvalueof{/wheelchart/explode}}
-\pgfmathsetmacro{\WCmidangle}{Mod((\wheelchart@angle+\wheelchart@newangle)/2,360)}
-\pgfmathsetmacro{\wheelchart@dataangleshift}{\pgfkeysvalueof{/wheelchart/data angle shift}}
-\pgfmathsetmacro{\WCdataangle}{Mod(\wheelchart@counterorclockwise*\wheelchart@dataangleshift+\WCmidangle,360)}
-\pgfmathsetmacro{\WCpercentage}{\wheelchart@value/(\WCtotalnum/100)}
-\pgfmathprintnumberto[precision=\pgfkeysvalueof{/wheelchart/perc precision}]{\WCpercentage}{\WCpercentagerounded}
-\begin{scope}[shift={(\WCmidangle:\wheelchart@explode)}]
-#2
-\end{scope}
-\global\let\wheelchart@angle=\wheelchart@newangle}}
-\AtBeginDocument{\@ifpackageloaded{siunitx}{\newcommand{\WCperc}{\qty[round-mode=places,round-precision=\pgfkeysvalueof{/wheelchart/perc precision}]{\WCpercentage}{\percent}}}{\newcommand{\WCperc}{\WCpercentagerounded\,\%}}}
-\newcommand{\wheelchart@ifnotext}[3]{%%https://tex.stackexchange.com/questions/42280/expand-away-empty-macros-within-ifthenelse%https://tex.stackexchange.com/questions/44919/proper-way-to-detect-empty-blank-text
-\begingroup%
-\begin{pgfinterruptpicture}%%https://tex.stackexchange.com/questions/459853/savebox-within-tikzpicture-results-in-an-empty-savebox
-\sbox0{#1}%
-\ifdim\wd0=\z@%
-\gdef\wheelchart@node{0}%
-\else%
-\gdef\wheelchart@node{1}%
-\fi%
-\end{pgfinterruptpicture}%
-\endgroup%
-\ifnum\wheelchart@node=0%
-{#2}%%if #1 is empty
-\else%
-{#3}%%if #1 is not empty
-\fi%
-}
-\newcommand{\wheelchart}[2][]{{
-\pgfkeys{/wheelchart,#1}
-\begin{scope}[shift/.expanded={\pgfkeysvalueof{/wheelchart/at}},local bounding box/.expanded=\wheelchart@name]
-\ifwheelchart@counterclockwise
-\pgfmathsetmacro{\wheelchart@counterorclockwise}{1}
-\else
-\pgfmathsetmacro{\wheelchart@counterorclockwise}{-1}
-\fi
-\pgfmathsetmacro{\wheelchart@totalangle}{\pgfkeysvalueof{/wheelchart/total angle}}
-\pgfmathsetmacro{\WCtotalnum}{0}
-\wheelchart@foreachinitial{#2}{
-\pgfmathsetmacro{\wheelchart@value}{\pgfkeysvalueof{/wheelchart/value}}
-\pgfmathparse{\wheelchart@value+\WCtotalnum}
-\global\let\WCtotalnum=\pgfmathresult
-\ifnum\WCcount=1
-\xdef\wheelchart@firstvalue{\wheelchart@value}
-\fi
-\xdef\WCtotalcount{\WCcount}
-}
-\ifcsname wheelchart@starthalf\endcsname
-\pgfmathsetmacro{\wheelchart@startangle}{Mod(\wheelchart@starthalf-(\wheelchart@counterorclockwise*\wheelchart@firstvalue*0.5*(\wheelchart@totalangle/\WCtotalnum)),360)}
-\else
-\pgfmathsetmacro{\wheelchart@startangle}{Mod(\pgfkeysvalueof{/wheelchart/start angle},360)}
-\fi
-\wheelchart@definnercontourfalse
-\ifwheelchart@contour
-\wheelchart@definnercontourtrue
-\xdef\wheelchart@outercontour{}
-\wheelchart@foreach{#2}{
-\xdef\wheelchart@outercontour{(\wheelchart@newangle:\wheelchart@outerradius) arc[start angle=\wheelchart@newangle,end angle=\wheelchart@angle,radius=\wheelchart@outerradius]--\wheelchart@outercontour}
-}
-\else
-\ifwheelchart@middlefill
-\wheelchart@definnercontourtrue
-\fi
-\fi
-\ifwheelchart@definnercontour
-\xdef\wheelchart@innercontour{}
-\wheelchart@foreach{#2}{
-\xdef\wheelchart@innercontour{\wheelchart@innercontour(\wheelchart@angle:\wheelchart@innerradius) arc[start angle=\wheelchart@angle,end angle=\wheelchart@newangle,radius=\wheelchart@innerradius]--}
-}
-\fi
-\ifwheelchart@middlefill
-\fill[/wheelchart/middle fill@options]
-\ifdim \wheelchart@totalangle pt=360 pt
-\else
-(0,0)--
-\fi
-\wheelchart@innercontour cycle;
-\fi
-\wheelchart@foreach{#2}{
-\ifcsname wheelchart@slices\endcsname
-\begin{scope}[shift={(\WCmidangle:{(\wheelchart@innerradius+\wheelchart@outerradius)/2})},rotate=\WCmidangle]
-\fill[/wheelchart/slices style@options] \wheelchart@slices
-\end{scope}
-\else
-\ifwheelchart@draw
-\pgfmathsetmacro{\wheelchart@sliceinnerstartangle}{\wheelchart@angle+(\wheelchart@counterorclockwise*(\wheelchart@innergap))}
-\pgfmathsetmacro{\wheelchart@sliceinnerendangle}{\wheelchart@newangle-(\wheelchart@counterorclockwise*(\wheelchart@innergap))}
-\pgfmathsetmacro{\wheelchart@sliceouterstartangle}{\wheelchart@angle+(\wheelchart@counterorclockwise*(\wheelchart@outergap))}
-\pgfmathsetmacro{\wheelchart@sliceouterendangle}{\wheelchart@newangle-(\wheelchart@counterorclockwise*(\wheelchart@outergap))}
-\coordinate (wheelchart@sliceinnerstart) at (\wheelchart@sliceinnerstartangle:\wheelchart@innerradius);
-\coordinate (wheelchart@sliceinnerend) at (\wheelchart@sliceinnerendangle:\wheelchart@innerradius);
-\coordinate (wheelchart@sliceouterstart) at (\wheelchart@sliceouterstartangle:\wheelchart@outerradius);
-\coordinate (wheelchart@sliceouterend) at (\wheelchart@sliceouterendangle:\wheelchart@outerradius);
-\fill[/wheelchart/slices style@options] let \p1=($(wheelchart@sliceouterstart)-(wheelchart@sliceinnerstart)$),\p2=($(wheelchart@sliceouterend)-(wheelchart@sliceinnerend)$),\p3=($(wheelchart@sliceinnerstart)!0.5!(wheelchart@sliceouterstart)$),\n1={veclen(\x1/\pgf@xx,\y1/\pgf@yy)/2} in \wheelchart@slicesstart(wheelchart@sliceouterstart) arc[start angle=\wheelchart@sliceouterstartangle,end angle=\wheelchart@sliceouterendangle,radius=\wheelchart@outerradius]\wheelchart@slicesend--(wheelchart@sliceinnerend) arc[start angle=\wheelchart@sliceinnerendangle,end angle=\wheelchart@sliceinnerstartangle,radius=\wheelchart@innerradius]--cycle;
-\fi
-\fi
-}
-\ifwheelchart@wheellines
-\ifdim \wheelchart@totalangle pt=360 pt
-\def\wheelchart@start{1}
-\else
-\def\wheelchart@start{0}
-\fi
-\wheelchart@foreach{#2}{
-\foreach\wheelchart@n in {\wheelchart@start,...,\wheelchart@value}{
-\pgfmathsetmacro{\wheelchart@anglewheellines}{\wheelchart@angle+(\wheelchart@counterorclockwise*\wheelchart@n*(\wheelchart@totalangle/\WCtotalnum))}
-\draw[/wheelchart/wheel lines@options] (\wheelchart@anglewheellines:\wheelchart@innerradius)--(\wheelchart@anglewheellines:\wheelchart@outerradius);
-}
-\gdef\wheelchart@start{1}
-}
-\fi
-\ifwheelchart@contour
-\ifdim \wheelchart@totalangle pt=360 pt
-\draw[/wheelchart/contour@options] \wheelchart@innercontour cycle;
-\draw[/wheelchart/contour@options] \wheelchart@outercontour cycle;
-\else
-\draw[/wheelchart/contour@options] \wheelchart@innercontour\wheelchart@outercontour cycle;
-\fi
-\fi
-\wheelchart@foreach{#2}{
-\pgfmathsetmacro{\wheelchart@datasep}{\pgfkeysvalueof{/wheelchart/data sep}}
-\pgfmathsetmacro{\wheelchart@lines}{\pgfkeysvalueof{/wheelchart/lines}}
-\pgfmathsetmacro{\wheelchart@linesext}{\pgfkeysvalueof{/wheelchart/lines ext}}
-\pgfmathsetmacro{\wheelchart@linessep}{\pgfkeysvalueof{/wheelchart/lines sep}}
-\ifdim \wheelchart@linesext pt>\z@
-\pgfmathsetmacro{\wheelchart@linesextdirsep}{\pgfkeysvalueof{/wheelchart/lines ext dirsep}}
-\pgfmathparse{
-(\WCdataangle<90-\wheelchart@linesextdirsep?"1":
-(\WCdataangle<=90+\wheelchart@linesextdirsep?"\wheelchart@linesexttopdir":
-(\WCdataangle<270-\wheelchart@linesextdirsep?"-1":
-(\WCdataangle<=270+\wheelchart@linesextdirsep?"\wheelchart@linesextbottomdir":
-"1"
-))))
-}
-\edef\wheelchart@linesextdir{\pgfmathresult}
-\draw[/wheelchart/lines style@options] let \p1=(\WCdataangle:{\wheelchart@outerradius+\wheelchart@linessep+\wheelchart@lines}) in (\WCdataangle:{\wheelchart@outerradius+\wheelchart@linessep})--(\p1)
-\ifwheelchart@linesextfixed
---({\wheelchart@linesextdir*(\wheelchart@outerradius+\wheelchart@linessep+\wheelchart@lines+\wheelchart@linesext)},\y1)
-\else
---++({\wheelchart@linesextdir*\wheelchart@linesext},0)
-\fi
-coordinate (wheelchart@datacoord);
-\pgfmathparse{
-(\wheelchart@linesextdir==1?"\pgfkeysvalueof{/wheelchart/lines ext right anchor}":
-(\wheelchart@linesextdir==-1?"\pgfkeysvalueof{/wheelchart/lines ext left anchor}":
-))
-}
-\edef\wheelchart@dataanchor{\pgfmathresult}
-\else
-\pgfmathsetmacro{\wheelchart@anchorxsep}{\pgfkeysvalueof{/wheelchart/anchor xsep}}
-\pgfmathsetmacro{\wheelchart@anchorysep}{\pgfkeysvalueof{/wheelchart/anchor ysep}}
-\pgfmathparse{
-(\WCdataangle==0?"west":
-(\WCdataangle==90?"south":
-(\WCdataangle==180?"east":
-(\WCdataangle==270?"north":
-(\WCdataangle<=\wheelchart@anchorysep?"west":
-(\WCdataangle<90-\wheelchart@anchorxsep?"south west":
-(\WCdataangle<=90+\wheelchart@anchorxsep?"south":
-(\WCdataangle<180-\wheelchart@anchorysep?"south east":
-(\WCdataangle<=180+\wheelchart@anchorysep?"east":
-(\WCdataangle<270-\wheelchart@anchorxsep?"north east":
-(\WCdataangle<=270+\wheelchart@anchorxsep?"north":
-(\WCdataangle<360-\wheelchart@anchorysep?"north west":
-"west"
-))))))))))))
-}
-\edef\wheelchart@dataanchor{\pgfmathresult}
-\ifdim \wheelchart@lines pt>\z@
-\draw[/wheelchart/lines style@options] (\WCdataangle:{\wheelchart@outerradius+\wheelchart@linessep})--++(\WCdataangle:\wheelchart@lines) coordinate[shift={(\WCdataangle:\wheelchart@datasep)}] (wheelchart@datacoord);
-\else
-\coordinate (wheelchart@datacoord) at (\WCdataangle:{\wheelchart@outerradius+\wheelchart@datasep});
-\fi
-\fi
-\wheelchart@ifnotext{\pgfkeysvalueof{/wheelchart/data}}{}{\node[anchor=\wheelchart@dataanchor,align=left,/wheelchart/data style@options] at (wheelchart@datacoord) {\pgfkeysvalueof{/wheelchart/data}};}
-\ifcsname wheelchart@innerdata\endcsname
-\wheelchart@ifnotext{\wheelchart@innerdata}{}{%
-\pgfmathsetmacro{\wheelchart@innerdatasep}{\pgfkeysvalueof{/wheelchart/inner data sep}}%
-\node[align=left,/wheelchart/inner data style@options] at (\WCdataangle:{\wheelchart@innerradius-(\wheelchart@innerdatasep)}) {\wheelchart@innerdata};%
-}
-\fi
-\ifcsname wheelchart@wheeldata\endcsname
-\wheelchart@ifnotext{\wheelchart@wheeldata}{}{%
-\pgfmathsetmacro{\wheelchart@wheeldatapos}{\pgfkeysvalueof{/wheelchart/wheel data pos}}%
-\node[align=left,/wheelchart/wheel data style@options] at (\WCdataangle:{\wheelchart@wheeldatapos*\wheelchart@outerradius+(1-\wheelchart@wheeldatapos)*\wheelchart@innerradius}) {\wheelchart@wheeldata};%
-}
-\fi
-\ifcsname wheelchart@legendentry\endcsname
-\wheelchart@legendentry
-\fi
-}
-\ifcsname wheelchart@middle\endcsname
-\wheelchart@ifnotext{\wheelchart@middle}{}{%
-\node[align=center,/wheelchart/middle style@options] at (0,0) {\wheelchart@middle};%
-}
-\fi
-\ifcsname wheelchart@legend\endcsname
-\wheelchart@legend
-\fi
-\end{scope}
-\ifcsname wheelchart@captionleft\endcsname
-\wheelchart@ifnotext{\wheelchart@captionleft}{}{%
-\node[anchor=north west,align=left,/wheelchart/caption left style@options] at ($(\wheelchart@name.south west)-(0,0.5)$) {\wheelchart@captionleft};%
-}
-\fi
-\ifcsname wheelchart@caption\endcsname
-\wheelchart@ifnotext{\wheelchart@caption}{}{%
-\coordinate[shift/.expanded={\pgfkeysvalueof{/wheelchart/at}}] (wheelchart@center) at (0,0);%
-\node[anchor=north,align=center,/wheelchart/caption style@options] at ($(\wheelchart@name.south-|wheelchart@center)-(0,0.5)$) {\wheelchart@caption};%
-}
-\fi
-\ifcsname wheelchart@titleleft\endcsname
-\wheelchart@ifnotext{\wheelchart@titleleft}{}{%
-\node[anchor=south west,align=left,/wheelchart/title left style@options] at ($(\wheelchart@name.north west)+(0,0.5)$) {\wheelchart@titleleft};%
-}
-\fi
-\ifcsname wheelchart@title\endcsname
-\wheelchart@ifnotext{\wheelchart@title}{}{%
-\coordinate[shift/.expanded={\pgfkeysvalueof{/wheelchart/at}}] (wheelchart@center) at (0,0);%
-\node[anchor=south,align=center,/wheelchart/title style@options] at ($(\wheelchart@name.north-|wheelchart@center)+(0,0.5)$) {\wheelchart@title};%
-}
-\fi
-}}
-\endinput \ No newline at end of file
+\ProvidesExplPackage{wheelchart}{2023/12/03}{2.0}{Draw wheelcharts with TikZ}
+
+%%> \subsection{Variables}
+
+\newcounter { g__wheelchart_WCcount_counter }
+
+\bool_new:N \l__wheelchart_arc_bool
+\bool_new:N \l__wheelchart_contour_bool
+\bool_new:N \g__wheelchart_def_angle_radius_shift_bool
+\bool_new:N \l__wheelchart_def_inner_contour_bool
+\bool_new:N \l__wheelchart_discrete_bool
+\bool_new:N \l__wheelchart_etoc_use_name_bool
+\bool_new:N \l__wheelchart_legend_only_bool
+\bool_new:N \l__wheelchart_legend_row_bool
+\bool_new:N \l__wheelchart_lines_ext_dir_bool
+\bool_new:N \l__wheelchart_middle_fill_bool
+\bool_new:N \l__wheelchart_pie_bool
+\bool_new:N \l__wheelchart_plot_bool
+\bool_new:N \l__wheelchart_slices_bool
+\bool_new:N \l__wheelchart_wheel_lines_bool
+
+\box_new:N \l__wheelchart_arc_data_box
+\box_new:N \g__wheelchart_if_text_box
+
+\clist_new:N \l__wheelchart_header_clist
+\clist_new:N \g__wheelchart_slice_range_for_loop_clist
+\clist_new:N \l__wheelchart_slice_range_local_clist
+
+\fp_const:Nn \c__wheelchart_arc_data_end_factor_center_fp { 0.5 }
+\fp_const:Nn \c__wheelchart_arc_data_end_factor_left_fp { 1 }
+\fp_const:Nn \c__wheelchart_arc_data_end_factor_right_fp { 0 }
+\fp_const:Nn \c__wheelchart_arc_data_start_factor_center_fp { -0.5 }
+\fp_const:Nn \c__wheelchart_arc_data_start_factor_left_fp { 0 }
+\fp_const:Nn \c__wheelchart_arc_data_start_factor_right_fp { -1 }
+\fp_new:N \l__wheelchart_abs_half_angle_minus_new_angle_fp
+\fp_new:N \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp
+\fp_new:N \l__wheelchart_anchor_xsep_fp
+\fp_new:N \l__wheelchart_anchor_ysep_fp
+\fp_new:N \g__wheelchart_angle_fp
+\fp_new:N \l__wheelchart_angle_wheel_lines_fp
+\fp_new:N \l__wheelchart_arc_data_angle_pos_fp
+\fp_new:N \l__wheelchart_arc_data_angle_shift_fp
+\fp_new:N \l__wheelchart_arc_data_dir_fp
+\fp_new:N \g__wheelchart_arc_data_factor_fp
+\fp_new:N \l__wheelchart_arc_data_pos_fp
+\fp_new:N \l__wheelchart_arc_data_sep_fp
+\fp_new:N \g__wheelchart_arc_data_slice_length_fp
+\fp_new:N \l__wheelchart_arc_pos_fp
+\fp_new:N \l__wheelchart_arc_sep_fp
+\fp_new:N \l__wheelchart_coord_determinant_fp
+\fp_new:N \l__wheelchart_counter_or_clockwise_fp
+\fp_new:N \l__wheelchart_data_angle_pos_fp
+\fp_new:N \l__wheelchart_data_angle_shift_fp
+\fp_new:N \l__wheelchart_data_pos_fp
+\fp_new:N \l__wheelchart_data_sep_fp
+\fp_new:N \g__wheelchart_def_angle_angle_fp
+\fp_new:N \l__wheelchart_discrete_end_length_fp
+\fp_new:N \l__wheelchart_discrete_factor_fp
+\fp_new:N \l__wheelchart_discrete_inner_length_fp
+\fp_new:N \l__wheelchart_discrete_level_fp
+\fp_new:N \l__wheelchart_discrete_level_end_length_fp
+\fp_new:N \l__wheelchart_discrete_level_start_length_fp
+\fp_new:N \l__wheelchart_discrete_levels_sum_fp
+\fp_new:N \l__wheelchart_discrete_outer_length_fp
+\fp_new:N \l__wheelchart_discrete_start_length_fp
+\fp_new:N \l__wheelchart_discrete_sublevel_end_length_fp
+\fp_new:N \l__wheelchart_discrete_sublevel_start_length_fp
+\fp_new:N \l__wheelchart_explode_fp
+\fp_new:N \l__wheelchart_gap_fp
+\fp_new:N \l__wheelchart_gap_max_angle_fp
+\fp_new:N \l__wheelchart_gap_max_angle_def_fp
+\fp_new:N \l__wheelchart_gap_polar_fp
+\fp_new:N \l__wheelchart_gap_radius_fp
+\fp_new:N \g__wheelchart_half_ex_over_one_cm_fp
+\fp_new:N \l__wheelchart_inner_data_angle_pos_fp
+\fp_new:N \l__wheelchart_inner_data_angle_shift_fp
+\fp_new:N \l__wheelchart_inner_data_pos_fp
+\fp_new:N \l__wheelchart_inner_data_sep_fp
+\fp_new:c { l__wheelchart_inner~end_x_fp }
+\fp_new:c { l__wheelchart_inner~end_y_fp }
+\fp_new:N \l__wheelchart_inner_gap_fp
+\fp_new:N \l__wheelchart_inner_plot_variable_fp
+\fp_new:N \l__wheelchart_inner_radius_fp
+\fp_new:N \l__wheelchart_inner_radius_orig_fp
+\fp_new:c { l__wheelchart_inner~start_x_fp }
+\fp_new:c { l__wheelchart_inner~start_y_fp }
+\fp_new:N \l__wheelchart_lines_fp
+\fp_new:N \l__wheelchart_lines_angle_pos_fp
+\fp_new:N \l__wheelchart_lines_angle_shift_fp
+\fp_new:N \l__wheelchart_lines_ext_fp
+\fp_new:N \l__wheelchart_lines_ext_dirsep_fp
+\fp_new:N \l__wheelchart_lines_ext_fixed_left_fp
+\fp_new:N \l__wheelchart_lines_ext_fixed_right_fp
+\fp_new:N \l__wheelchart_lines_pos_fp
+\fp_new:N \l__wheelchart_lines_sep_fp
+\fp_new:N \g__wheelchart_new_angle_fp
+\fp_new:c { l__wheelchart_outer~end_x_fp }
+\fp_new:c { l__wheelchart_outer~end_y_fp }
+\fp_new:N \l__wheelchart_outer_gap_fp
+\fp_new:N \l__wheelchart_outer_plot_variable_fp
+\fp_new:N \l__wheelchart_outer_radius_fp
+\fp_new:c { l__wheelchart_outer~start_x_fp }
+\fp_new:c { l__wheelchart_outer~start_y_fp }
+\fp_new:N \l__wheelchart_plot_variable_fp
+\fp_new:N \g__wheelchart_previous_x_coord_fp
+\fp_new:N \g__wheelchart_previous_y_coord_fp
+\fp_new:N \l__wheelchart_samples_fp
+\fp_new:N \l__wheelchart_slice_inner_end_angle_fp
+\fp_new:N \l__wheelchart_slice_inner_start_angle_fp
+\fp_new:N \l__wheelchart_slice_outer_end_angle_fp
+\fp_new:N \l__wheelchart_slice_outer_start_angle_fp
+\fp_new:N \l__wheelchart_slices_angle_fp
+\fp_new:N \l__wheelchart_slices_angle_pos_fp
+\fp_new:N \l__wheelchart_slices_angle_shift_fp
+\fp_new:N \l__wheelchart_slices_arc_A_fp
+\fp_new:N \l__wheelchart_slices_arc_A_abs_fp
+\fp_new:N \l__wheelchart_slices_arc_angle_fp
+\fp_new:N \l__wheelchart_slices_arc_B_fp
+\fp_new:N \l__wheelchart_slices_arc_coord_fp
+\fp_new:N \l__wheelchart_slices_arc_rotate_fp
+\fp_new:N \l__wheelchart_slices_arrow_A_fp
+\fp_new:N \l__wheelchart_slices_arrow_B_fp
+\fp_new:N \l__wheelchart_slices_arrow_coord_fp
+\fp_new:N \l__wheelchart_slices_inner_end_angle_shift_fp
+\fp_new:N \l__wheelchart_slices_inner_start_angle_shift_fp
+\fp_new:N \g__wheelchart_slices_orientation_fp
+\fp_new:N \l__wheelchart_slices_orientation_new_angle_fp
+\fp_new:N \l__wheelchart_slices_outer_end_angle_shift_fp
+\fp_new:N \l__wheelchart_slices_outer_start_angle_shift_fp
+\fp_new:N \l__wheelchart_slices_pos_fp
+\fp_new:N \l__wheelchart_slices_sep_fp
+\fp_new:N \l__wheelchart_start_angle_fp
+\fp_new:N \l__wheelchart_total_angle_fp
+\fp_new:N \l__wheelchart_total_count_fp
+\fp_new:N \l__wheelchart_value_fp
+\fp_new:N \g__wheelchart_value_global_fp
+\fp_new:N \l__wheelchart_wheel_data_angle_pos_fp
+\fp_new:N \l__wheelchart_wheel_data_angle_shift_fp
+\fp_new:N \l__wheelchart_wheel_data_pos_fp
+\fp_new:N \l__wheelchart_wheel_data_sep_fp
+\fp_new:N \g__wheelchart_x_coord_fp
+\fp_new:N \g__wheelchart_y_coord_fp
+
+\int_const:Nn \c__wheelchart_lines_ext_dir_left_int { -1 }
+\int_const:Nn \c__wheelchart_lines_ext_dir_right_int { 1 }
+\int_new:N \g__wheelchart_discrete_count_int
+\int_new:N \l__wheelchart_discrete_levels_int
+\int_new:N \l__wheelchart_discrete_partitioning_first_index_int
+\int_new:N \l__wheelchart_discrete_partitioning_second_index_int
+\int_new:N \l__wheelchart_discrete_sort_int
+\int_new:N \l__wheelchart_discrete_space_at_borders_int
+\int_set:Nn \l__wheelchart_discrete_space_at_borders_int { -1 }
+\int_new:N \l__wheelchart_discrete_sublevels_int
+\int_new:N \l__wheelchart_etoc_count_total_pages_int
+\int_new:N \l__wheelchart_legend_columns_int
+\int_new:N \l__wheelchart_legend_rows_int
+\int_new:N \l__wheelchart_lines_ext_bottom_dir_int
+\int_new:N \l__wheelchart_lines_ext_dir_int
+\int_new:N \l__wheelchart_lines_ext_top_dir_int
+\int_new:N \l__wheelchart_slice_range_index_int
+
+\seq_new:N \l__wheelchart_discrete_coefficients_first_seq
+\seq_new:N \l__wheelchart_discrete_coefficients_second_seq
+\seq_new:N \l__wheelchart_discrete_points_seq
+\seq_new:N \l__wheelchart_list_seq
+\seq_new:N \l__wheelchart_list_items_seq
+
+\tl_new:N \l__wheelchart_arc_data_align_tl
+\tl_new:N \l__wheelchart_data_anchor_tl
+\tl_new:N \l__wheelchart_etoc_level_tl
+\tl_new:N \l__wheelchart_etoc_name_tl
+\tl_new:N \l__wheelchart_expand_list_tl
+\tl_new:N \l__wheelchart_expand_list_items_tl
+\tl_new:N \g__wheelchart_inner_contour_tl
+\tl_new:N \l__wheelchart_key_name_tl
+\tl_new:N \l__wheelchart_key_range_tl
+\tl_new:N \l__wheelchart_legend_row_tl
+\tl_new:N \g__wheelchart_name_tl
+\tl_new:N \g__wheelchart_outer_contour_tl
+\tl_new:N \l__wheelchart_slices_tl
+\tl_new:N \l__wheelchart_slices_end_tl
+\tl_set:Nn \l__wheelchart_slices_end_tl
+ { -- ( \fp_use:c { l__wheelchart_inner~end_x_fp } , \fp_use:c { l__wheelchart_inner~end_y_fp } ) }
+\tl_new:N \l__wheelchart_slices_inner_tl
+\tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ \fp_compare:nNnT { \l__wheelchart_inner_radius_fp } > { 0 }
+ {
+ \fp_compare:nNnT { \l__wheelchart_inner_gap_fp } < { \l__wheelchart_abs_half_angle_minus_new_angle_fp }
+ {
+ arc
+ [
+ start~angle = \fp_use:N \l__wheelchart_slice_inner_end_angle_fp ,
+ end~angle = \fp_use:N \l__wheelchart_slice_inner_start_angle_fp ,
+ radius = \fp_use:N \l__wheelchart_inner_radius_fp
+ ]
+ }
+ }
+ }
+\tl_new:N \l__wheelchart_slices_outer_tl
+\tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ arc
+ [
+ start~angle = \fp_use:N \l__wheelchart_slice_outer_start_angle_fp ,
+ end~angle = \fp_use:N \l__wheelchart_slice_outer_end_angle_fp ,
+ radius = \fp_use:N \l__wheelchart_outer_radius_fp
+ ]
+ }
+\tl_new:N \l__wheelchart_slices_start_tl
+\tl_set:Nn \l__wheelchart_slices_start_tl { -- cycle }
+\tl_new:N \l__wheelchart_type_tl
+\tl_set:Nn \l__wheelchart_type_tl { default }
+
+%%> \subsection{Functions}
+
+\cs_generate_variant:Nn \seq_set_split:Nnn { Nen , Neo }
+\cs_generate_variant:Nn \tl_build_put_right:Nn { NV }
+
+\cs_new:Npn \__wheelchart_arc_around_text:nnn #1#2#3
+ {
+ \__wheelchart_convex_comb_coord_plot:nnnnnnn
+ { draw , / wheelchart / arc_style , / wheelchart / arc_#1_half }
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_arc_data_angle_pos_fp + 0.5 * \g__wheelchart_arc_data_factor_fp *
+ (
+ sign ( \l__wheelchart_arc_data_dir_fp ) *
+ (
+ \fp_use:c { c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp }
+ + \fp_use:c { c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp }
+ )
+ + #2
+ )
+ }
+ }
+ {#3}
+ { \l__wheelchart_plot_variable_fp }
+ { 0 }
+ { \l__wheelchart_arc_pos_fp }
+ { \l__wheelchart_arc_sep_fp }
+ }
+
+\cs_new:Npn \__wheelchart_caption_and_title:nnnnn #1#2#3#4#5
+ {
+ \__wheelchart_if_text:nn {#1}
+ {
+ \node [ anchor = #2 , align = #3 , / wheelchart / #1_style ]
+ at ( $ (#4) + ( 0 , { #5 * ( \pgfkeysvalueof { / wheelchart / #1~sep } ) } ) $ )
+ { \pgfkeysvalueof { / wheelchart / #1 } } ;
+ }
+ }
+
+\cs_new:Npn \__wheelchart_convex_comb_coord_aux:n #1 { (#1) }
+
+\cs_generate_variant:Nn \__wheelchart_convex_comb_coord_aux:n { o }
+
+\cs_new:Npn \__wheelchart_convex_comb_coord_def:nnnn #1#2#3#4
+ {
+ $
+ (
+ \__wheelchart_inner_plot:nn
+ {
+ \fp_eval:n
+ {
+ ( 1 - (#1) ) * \l__wheelchart_slice_inner_start_angle_fp
+ + (#1) * \l__wheelchart_slice_inner_end_angle_fp
+ + \l__wheelchart_counter_or_clockwise_fp * (#2)
+ }
+ }
+ { \fp_eval:n { \l__wheelchart_inner_radius_fp - (#4) } }
+ )
+ ! { \fp_eval:n {#3} } !
+ (
+ \__wheelchart_outer_plot:nn
+ {
+ \fp_eval:n
+ {
+ ( 1 - (#1) ) * \l__wheelchart_slice_outer_start_angle_fp
+ + (#1) * \l__wheelchart_slice_outer_end_angle_fp
+ + \l__wheelchart_counter_or_clockwise_fp * (#2)
+ }
+ }
+ { \fp_eval:n { \l__wheelchart_outer_radius_fp + (#4) } }
+ )
+ $%note the () around the #i's to keep these contents together
+ }
+
+\cs_new:Npn \__wheelchart_convex_comb_coord:nnnn #1#2#3#4
+ { \__wheelchart_convex_comb_coord_aux:o { \__wheelchart_convex_comb_coord_def:nnnn {#1} {#2} {#3} {#4} } }
+
+\cs_new:Npn \__wheelchart_convex_comb_coord_plot_aux:nnnn #1#2#3#4
+ {
+ \path [#1] plot
+ [
+ domain = {#2} \c_colon_str {#3} ,
+ samples = \fp_use:N \l__wheelchart_samples_fp ,
+ variable = \l__wheelchart_plot_variable_fp
+ ]
+ ( {#4} ) ;
+ }
+
+\cs_generate_variant:Nn \__wheelchart_convex_comb_coord_plot_aux:nnnn { nnno }
+
+\cs_new:Npn \__wheelchart_convex_comb_coord_plot:nnnnnnn #1#2#3#4#5#6#7
+ {
+ \__wheelchart_convex_comb_coord_plot_aux:nnno {#1} {#2} {#3}
+ { \__wheelchart_convex_comb_coord_def:nnnn {#4} {#5} {#6} { \g__wheelchart_half_ex_over_one_cm_fp + (#7) } }
+ }
+
+\cs_new:Npn \__wheelchart_def_angle:nnnN #1#2#3#4
+ {
+ \path let
+ \p { l__wheelchart_def_angle_1 } = \__wheelchart_convex_comb_coord:nnnn {#1} {#2} { 0 } {#3} ,
+ \p { l__wheelchart_def_angle_2 } = \__wheelchart_convex_comb_coord:nnnn {#1} {#2} { 1 } {#3}
+ in
+ [
+ / utils / exec =
+ {
+ \bool_gset:Nn \g__wheelchart_def_angle_radius_shift_bool
+ {
+ \fp_compare_p:n
+ {
+ \y { l__wheelchart_def_angle_2 } - \y { l__wheelchart_def_angle_1 } == 0
+ &&
+ \x { l__wheelchart_def_angle_2 } - \x { l__wheelchart_def_angle_1 } == 0
+ }
+ }
+ \bool_if:NF \g__wheelchart_def_angle_radius_shift_bool
+ {
+ \fp_gset:Nn \g__wheelchart_def_angle_angle_fp
+ {
+ atand
+ (
+ \y { l__wheelchart_def_angle_2 } - \y { l__wheelchart_def_angle_1 } ,
+ \x { l__wheelchart_def_angle_2 } - \x { l__wheelchart_def_angle_1 }
+ )
+ }%here \pgf@xx and so on are not used
+ }
+ }
+ ]
+ ;
+ \bool_if:NT \g__wheelchart_def_angle_radius_shift_bool
+ {
+ \path let
+ \p { l__wheelchart_def_angle_1 } =
+ \__wheelchart_convex_comb_coord:nnnn {#1} {#2} { 0 } { \fp_eval:n { (#3) + 1 / \l__wheelchart_samples_fp } } ,
+ \p { l__wheelchart_def_angle_2 } =
+ \__wheelchart_convex_comb_coord:nnnn {#1} {#2} { 1 } { \fp_eval:n { (#3) + 1 / \l__wheelchart_samples_fp } }
+ in
+ [
+ / utils / exec =
+ {
+ \fp_gset:Nn \g__wheelchart_def_angle_angle_fp
+ {
+ atand
+ (
+ \y { l__wheelchart_def_angle_2 } - \y { l__wheelchart_def_angle_1 } ,
+ \x { l__wheelchart_def_angle_2 } - \x { l__wheelchart_def_angle_1 }
+ )
+ }
+ }
+ ]
+ ;%here \pgf@xx and so on are not used
+ }
+ \pgfmathsetmacro {#4} { Mod ( \fp_use:N \g__wheelchart_def_angle_angle_fp , 360 ) }
+ }
+
+\cs_new:Npn \__wheelchart_def_coord_aux:nn #1#2
+ {
+ \path let \p { l__wheelchart_coord } = ( \use:c { __wheelchart_#1_plot:nn } {#2} { \fp_use:c { l__wheelchart_#1_radius_fp } } )
+ in
+ [
+ / utils / exec =
+ {
+ \fp_gset:Nn \g__wheelchart_x_coord_fp
+ {
+ ( \pgf@yy * \x { l__wheelchart_coord } - \pgf@yx * \y { l__wheelchart_coord } ) / \l__wheelchart_coord_determinant_fp
+ }
+ \fp_gset:Nn \g__wheelchart_y_coord_fp
+ {
+ ( \pgf@xx * \y { l__wheelchart_coord } - \pgf@xy * \x { l__wheelchart_coord } ) / \l__wheelchart_coord_determinant_fp
+ }
+ }
+ ]
+ ;
+ }
+
+\cs_new:Npn \__wheelchart_def_coord:nn #1#2
+ {
+ \__wheelchart_def_coord_aux:nn {#1} { \fp_use:c { l__wheelchart_slice_#1_#2_angle_fp } }
+ \fp_set_eq:cN { l__wheelchart_#1~#2_x_fp } \g__wheelchart_x_coord_fp
+ \fp_set_eq:cN { l__wheelchart_#1~#2_y_fp } \g__wheelchart_y_coord_fp
+ }
+
+\cs_new:Npn \__wheelchart_def_gap:NN #1#2
+ {
+ \fp_set:Nn #1
+ {
+ (#2) * sind ( min ( \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp , \l__wheelchart_gap_max_angle_def_fp ) )
+ <
+ \l__wheelchart_gap_fp
+ ?
+ min ( \l__wheelchart_abs_half_angle_minus_new_angle_fp , \l__wheelchart_gap_max_angle_def_fp )
+ :
+ asind ( min ( \l__wheelchart_gap_fp / ( (#2) + 1 - sign (#2) ) , 1 ) ) + \l__wheelchart_gap_polar_fp
+ %note the min ( ... , 1 ) such that the asind is always defined
+ %also note the + 1 - sign (#2) such that the denominator is also nonzero if #2 = 0
+ }
+ }
+
+\cs_new:Npn \__wheelchart_def_macro:Nn #1#2
+ {
+ \str_case:enF { \pgfkeysvalueof { / wheelchart / parse } }
+ {
+ { pgfmath }
+ {
+ \pgfmathparse {#2}
+ \fp_set:Nn #1 { \pgfmathresult }
+ }
+ { l3fp }
+ { \fp_set:Nn #1 {#2} }
+ }
+ { \pgfkeys { / errors / unknown~choice~value /. expanded = { parse } { \pgfkeysvalueof { / wheelchart / parse } } } }
+ }
+
+\cs_new:Npn \__wheelchart_def_macros:n #1
+ {
+ \str_case:enF { \pgfkeysvalueof { / wheelchart / parse } }
+ {
+ { pgfmath }
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \pgfmathparse { \pgfkeysvalueof { / wheelchart / ##1 } }
+ \fp_set:cn { l__wheelchart_\str_map_function:nN {##1} \__wheelchart_space_to_underscore:n _fp } { \pgfmathresult }
+ }
+ }
+ { l3fp }
+ {
+ \clist_map_inline:nn {#1}
+ {
+ \fp_set:cn { l__wheelchart_\str_map_function:nN {##1} \__wheelchart_space_to_underscore:n _fp }
+ { \pgfkeysvalueof { / wheelchart / ##1 } }
+ }
+ }
+ }
+ { \pgfkeys { / errors / unknown~choice~value /. expanded = { parse } { \pgfkeysvalueof { / wheelchart / parse } } } }
+ }
+
+\cs_new:Npn \__wheelchart_def_slice_angle:nnnn #1#2#3#4
+ {
+ \bool_if:NTF \l__wheelchart_plot_bool
+ {
+ \fp_set:cn { l__wheelchart_slice_#1_#2_angle_fp }
+ {
+ \fp_use:c { g__wheelchart_#3angle_fp } +
+ (
+ \l__wheelchart_counter_or_clockwise_fp *
+ ( (#4) * \fp_use:c { l__wheelchart_#1_gap_fp } + \fp_use:c { l__wheelchart_slices_#1_#2_angle_shift_fp } )
+ )
+ }
+ }
+ {
+ \fp_set:cn { l__wheelchart_slice_#1_#2_angle_fp }
+ {
+ \fp_use:c { g__wheelchart_#3angle_fp } +
+ (
+ \l__wheelchart_counter_or_clockwise_fp *
+ (
+ (#4) * \fp_use:c { l__wheelchart_#1_gap_fp } + \fp_use:c { l__wheelchart_slices_#1_#2_angle_shift_fp }
+ - asind
+ (
+ \l__wheelchart_inner_radius_fp * sind ( \fp_use:c { l__wheelchart_slices_#1_#2_angle_shift_fp } )
+ / \l__wheelchart_outer_radius_fp
+ )
+ )
+ )
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_def_slice_keys:n #1
+ {
+ {%note the double {{...}} such that the contents is in a group
+ %such that pgfkeys which are specific to the current slice are local for this slice
+ \clist_if_in:NVT \l__wheelchart_slice_range_local_clist \WCcount
+ {
+ \pgfkeys { / wheelchart , slice_final /. expanded = { \exp_not:v { l__wheelchart_slice_\WCcount _keys_clist } } }
+ \pgfkeys{ / wheelchart , slice_final_style }
+ }
+ #1
+ }
+ }
+
+\cs_new:Npn \__wheelchart_def_WClegend:
+ {
+ \int_set:Nn \l__wheelchart_legend_columns_int
+ { \fp_eval:n { ceil ( \WCtotalcount / ceil ( \WCtotalcount / ( \pgfkeysvalueof { / wheelchart / legend~columns } ) ) ) } }
+ \cs_set:Npn \WClegend {}
+ \tl_build_begin:N \WClegend
+ \int_compare:nNnTF { \l__wheelchart_legend_columns_int } = { 1 }
+ { \int_step_inline:nnn { 2 } { \WCtotalcount } { \__wheelchart_legend_append:nn {##1} { \\ } } }
+ {
+ \int_set:Nn \l__wheelchart_legend_rows_int
+ { \fp_eval:n { ceil ( \WCtotalcount / \l__wheelchart_legend_columns_int ) } }
+ \int_step_inline:nn { \l__wheelchart_legend_rows_int - 1 }
+ {
+ \int_step_inline:nn { \l__wheelchart_legend_columns_int - 2 }
+ { \__wheelchart_legend_append:nn { ##1 + \l__wheelchart_legend_rows_int * ####1 } { & } }
+ \int_compare:nNnF { ##1 + ( \l__wheelchart_legend_columns_int - 1 ) * \l__wheelchart_legend_rows_int } > { \WCtotalcount }
+ {
+ \__wheelchart_legend_append:nn
+ { ##1 + ( \l__wheelchart_legend_columns_int - 1 ) * \l__wheelchart_legend_rows_int }
+ { & }
+ }
+ \__wheelchart_legend_append:nn { ##1 + 1 } { \\ }
+ }
+ \int_step_inline:nn { \l__wheelchart_legend_columns_int - 2 }
+ { \__wheelchart_legend_append:nn { \l__wheelchart_legend_rows_int * ( ##1 + 1 ) } { & } }
+ \int_compare:nNnF { \l__wheelchart_legend_columns_int * \l__wheelchart_legend_rows_int } > { \WCtotalcount }
+ { \__wheelchart_legend_append:nn { \l__wheelchart_legend_columns_int * \l__wheelchart_legend_rows_int } { & } }
+ }
+ \__wheelchart_legend_append:nn { 1 } { \\ }%at the moment it is unnecessary to set g__wheelchart_WCcount_counter to 1
+ %but this is done to be future-proof if the contents of \WClegend would be parsed in a way that prohibits the value for
+ %g__wheelchart_WCcount_counter to be larger than \WCtotalcount
+ \tl_build_end:N \WClegend
+ \cs_set:Npn \WCcount { \theg__wheelchart_WCcount_counter }
+ \cs_set:Npn \WCpercentage { \cs:w l__wheelchart_WCpercentage_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCpercentagerounded { \cs:w l__wheelchart_WCpercentagerounded_\theg__wheelchart_WCcount_counter\cs_end: }
+ \str_if_eq:eeTF { \l__wheelchart_type_tl } { etoc }
+ {
+ \cs_set:Npn \WCetocthelinkedname
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthelinkednumber
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthelinkedpage
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthename
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthenumber
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthepage
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_\theg__wheelchart_WCcount_counter\cs_end: }
+ \cs_set:Npn \WCetocthenumberofpages
+ { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_\theg__wheelchart_WCcount_counter\cs_end: }
+ }
+ {
+ \clist_if_empty:NTF \l__wheelchart_header_clist
+ {
+ \int_step_inline:nn { \seq_count:N \l__wheelchart_list_items_seq }
+ {
+ \cs_set:cpn { WCvar\int_to_Alph:n {##1} }
+ { \cs:w l__wheelchart_item_WCvar\int_to_Alph:n {##1}_\theg__wheelchart_WCcount_counter\cs_end: }
+ }
+ }
+ {
+ \int_step_inline:nn { \seq_count:N \l__wheelchart_list_items_seq }
+ {
+ \cs_set:cpn { \pgfkeysvalueof { / wheelchart / header~prefix } \clist_item:Nn \l__wheelchart_header_clist {##1} }
+ {
+ \cs:w
+ l__wheelchart_item_\pgfkeysvalueof { / wheelchart / header~prefix }
+ \clist_item:Nn \l__wheelchart_header_clist {##1}_\theg__wheelchart_WCcount_counter
+ \cs_end:
+ }
+ }
+ }
+ }
+ \setcounter { g__wheelchart_WCcount_counter } { 1 }
+ }
+
+\cs_new:Npn \__wheelchart_diff_atan:nnnn #1#2#3#4
+ {
+ Mod
+ (
+ \fp_eval:n
+ {
+ \g__wheelchart_slices_orientation_fp *
+ (
+ atand
+ (
+ \fp_use:c { l__wheelchart_#3_y_fp } - \fp_use:c { l__wheelchart_#4_y_fp } ,
+ \fp_use:c { l__wheelchart_#3_x_fp } - \fp_use:c { l__wheelchart_#4_x_fp }
+ )
+ - atand
+ (
+ \fp_use:c { l__wheelchart_#1_y_fp } - \fp_use:c { l__wheelchart_#2_y_fp } ,
+ \fp_use:c { l__wheelchart_#1_x_fp } - \fp_use:c { l__wheelchart_#2_x_fp }
+ )
+ )
+ }
+ ,
+ 360
+ )%note the Mod 360 because for example cos(90/2)\neq cos(-270/2)
+ }
+
+\cs_new:Npn \__wheelchart_discrete_algorithm:
+ {
+ \__wheelchart_def_macros:n { discrete~factor , gap~radius , samples }
+ \__wheelchart_def_macro:Nn \l__wheelchart_outer_radius_fp
+ { \pgfkeysvalueof { / wheelchart / outer~radius } - \fp_use:N \l__wheelchart_gap_radius_fp }
+ \bool_if:NTF \l__wheelchart_pie_bool
+ { \fp_set:Nn \l__wheelchart_inner_radius_fp { 0 } }
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_inner_radius_fp
+ { \pgfkeysvalueof { / wheelchart / inner~radius } + \fp_use:N \l__wheelchart_gap_radius_fp }
+ }
+ \int_compare:nNnT { \l__wheelchart_discrete_space_at_borders_int } = { -1 }
+ {
+ \pgfkeys
+ {
+ / errors / boolean~expected /. expanded =
+ { discrete~space~at~borders }
+ { \pgfkeysvalueof { / wheelchart / discrete~space~at~borders } }
+ }
+ }
+ \seq_clear:N \l__wheelchart_discrete_points_seq
+ \bool_if:NTF \l__wheelchart_plot_bool
+ {
+ \fp_zero:N \l__wheelchart_discrete_outer_length_fp
+ \__wheelchart_discrete_def_coord:nn { outer } { 0 }
+ \int_step_inline:nn { \fp_use:N \l__wheelchart_samples_fp - 1 }
+ {
+ \__wheelchart_discrete_def_coord:nn { outer } {##1}
+ \fp_add:Nn \l__wheelchart_discrete_outer_length_fp
+ {
+ sqrt
+ (
+ ( \g__wheelchart_x_coord_fp - \g__wheelchart_previous_x_coord_fp ) ^ 2
+ + ( \g__wheelchart_y_coord_fp - \g__wheelchart_previous_y_coord_fp ) ^ 2
+ )
+ }
+ }
+ \__wheelchart_discrete_def_coord:nn { inner } { \l__wheelchart_samples_fp - 1 }
+ \fp_set:Nn \l__wheelchart_discrete_end_length_fp
+ {
+ sqrt
+ (
+ ( \g__wheelchart_x_coord_fp - \g__wheelchart_previous_x_coord_fp ) ^ 2
+ + ( \g__wheelchart_y_coord_fp - \g__wheelchart_previous_y_coord_fp ) ^ 2
+ )
+ }
+ \fp_zero:N \l__wheelchart_discrete_inner_length_fp
+ \int_step_inline:nnnn { \fp_use:N \l__wheelchart_samples_fp - 2 } { -1 } { 0 }
+ {
+ \__wheelchart_discrete_def_coord:nn { inner } {##1}
+ \fp_add:Nn \l__wheelchart_discrete_inner_length_fp
+ {
+ sqrt
+ (
+ ( \g__wheelchart_x_coord_fp - \g__wheelchart_previous_x_coord_fp ) ^ 2
+ + ( \g__wheelchart_y_coord_fp - \g__wheelchart_previous_y_coord_fp ) ^ 2
+ )
+ }
+ }
+ \__wheelchart_discrete_def_coord:nn { outer } { 0 }
+ \fp_set:Nn \l__wheelchart_discrete_start_length_fp
+ {
+ sqrt
+ (
+ ( \g__wheelchart_x_coord_fp - \g__wheelchart_previous_x_coord_fp ) ^ 2
+ + ( \g__wheelchart_y_coord_fp - \g__wheelchart_previous_y_coord_fp ) ^ 2
+ )
+ }
+ }
+ {
+ \fp_set:Nn \l__wheelchart_discrete_outer_length_fp
+ { abs ( \l__wheelchart_total_angle_fp * deg * \l__wheelchart_outer_radius_fp ) }
+ \fp_set:Nn \l__wheelchart_discrete_end_length_fp { abs ( \l__wheelchart_outer_radius_fp - \l__wheelchart_inner_radius_fp ) }
+ \fp_set:Nn \l__wheelchart_discrete_inner_length_fp
+ { abs ( \l__wheelchart_total_angle_fp * deg * \l__wheelchart_inner_radius_fp ) }
+ %note the abs ( ... ) because \l__wheelchart_total_angle_fp can be negative
+ %and \l__wheelchart_outer_radius_fp can be smaller than \l__wheelchart_inner_radius_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_start_length_fp \l__wheelchart_discrete_end_length_fp
+ }
+ \str_case:enF { \pgfkeysvalueof { / wheelchart / discrete~partitioning } }
+ {
+ { radius }
+ {
+ \int_set:Nn \l__wheelchart_discrete_partitioning_first_index_int { 1 }
+ \int_set:Nn \l__wheelchart_discrete_partitioning_second_index_int { 2 }
+ \fp_set_eq:NN \l__wheelchart_discrete_level_start_length_fp \l__wheelchart_discrete_inner_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_level_end_length_fp \l__wheelchart_discrete_outer_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_sublevel_start_length_fp \l__wheelchart_discrete_start_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_sublevel_end_length_fp \l__wheelchart_discrete_end_length_fp
+ }
+ { angle }
+ {
+ \int_set:Nn \l__wheelchart_discrete_partitioning_first_index_int { 2 }
+ \int_set:Nn \l__wheelchart_discrete_partitioning_second_index_int { 1 }
+ \fp_set_eq:NN \l__wheelchart_discrete_level_start_length_fp \l__wheelchart_discrete_start_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_level_end_length_fp \l__wheelchart_discrete_end_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_sublevel_start_length_fp \l__wheelchart_discrete_inner_length_fp
+ \fp_set_eq:NN \l__wheelchart_discrete_sublevel_end_length_fp \l__wheelchart_discrete_outer_length_fp
+ \int_set:Nn \l__wheelchart_discrete_sort_int { 3 - \l__wheelchart_discrete_sort_int }
+ }
+ }
+ {
+ \pgfkeys
+ {
+ / errors / unknown~choice~value /. expanded =
+ { discrete~partitioning }
+ { \pgfkeysvalueof { / wheelchart / discrete~partitioning } }
+ }
+ }
+ \int_set:Nn \l__wheelchart_discrete_levels_int
+ {
+ \fp_eval:n
+ {
+ max
+ (
+ round
+ (
+ sqrt
+ (
+ (
+ ( \l__wheelchart_discrete_sublevel_start_length_fp + \l__wheelchart_discrete_sublevel_end_length_fp )
+ * \l__wheelchart_discrete_factor_fp
+ / ( \l__wheelchart_discrete_level_start_length_fp + \l__wheelchart_discrete_level_end_length_fp )
+ )
+ * \WCtotalnum
+ )
+ )
+ ,
+ 1
+ )
+ }
+ }
+ \int_gzero:N \g__wheelchart_discrete_count_int
+ \fp_zero:N \l__wheelchart_discrete_levels_sum_fp
+ \int_step_inline:nn { \l__wheelchart_discrete_levels_int - 1 }
+ {
+ \fp_set:Nn \l__wheelchart_discrete_level_fp
+ {
+ ( ##1 - 0.5 * ( 1 + \l__wheelchart_discrete_space_at_borders_int ) )
+ / ( \l__wheelchart_discrete_levels_int - \l__wheelchart_discrete_space_at_borders_int )
+ }
+ \fp_add:Nn \l__wheelchart_discrete_levels_sum_fp { \l__wheelchart_discrete_level_fp }
+ \int_set:Nn \l__wheelchart_discrete_sublevels_int
+ {
+ \fp_eval:n
+ {
+ round
+ (
+ (
+ (
+ ( ##1 ) * \l__wheelchart_discrete_level_start_length_fp
+ + \l__wheelchart_discrete_levels_sum_fp
+ * ( \l__wheelchart_discrete_level_end_length_fp - \l__wheelchart_discrete_level_start_length_fp )
+ )
+ /
+ (
+ \l__wheelchart_discrete_levels_int * 0.5
+ * ( \l__wheelchart_discrete_level_start_length_fp + \l__wheelchart_discrete_level_end_length_fp )
+ )
+ )
+ * \WCtotalnum - \g__wheelchart_discrete_count_int
+ )
+ }
+ }
+ \int_gadd:Nn \g__wheelchart_discrete_count_int { \l__wheelchart_discrete_sublevels_int }
+ \int_compare:nNnTF { \l__wheelchart_discrete_sublevels_int } = { 1 }
+ {
+ \seq_put_right:Ne \l__wheelchart_discrete_points_seq
+ {
+ 0.5
+ /
+ \fp_use:N \l__wheelchart_discrete_level_fp
+ }
+ }
+ {
+ \int_step_inline:nn { \l__wheelchart_discrete_sublevels_int }
+ {
+ \seq_put_right:Ne \l__wheelchart_discrete_points_seq
+ {
+ \fp_eval:n
+ {
+ ( ####1 - 0.5 * ( 1 + \l__wheelchart_discrete_space_at_borders_int ) )
+ / ( \l__wheelchart_discrete_sublevels_int - \l__wheelchart_discrete_space_at_borders_int )
+ }
+ %the denominator is 0 if \l__wheelchart_discrete_sublevels_int = \l__wheelchart_discrete_space_at_borders_int = 1
+ %thus the case when \l__wheelchart_discrete_sublevels_int = 1 is treated separately above
+ /
+ \fp_use:N \l__wheelchart_discrete_level_fp
+ }
+ }
+ }
+ }
+ \int_compare:nNnTF { \l__wheelchart_discrete_levels_int } = { 1 }
+ { \fp_set:Nn \l__wheelchart_discrete_level_fp { 0.5 } }
+ {
+ \fp_set:Nn \l__wheelchart_discrete_level_fp
+ {
+ 1 - 0.5 * ( 1 - \l__wheelchart_discrete_space_at_borders_int )
+ / ( \l__wheelchart_discrete_levels_int - \l__wheelchart_discrete_space_at_borders_int )
+ }
+ }
+ \int_set:Nn \l__wheelchart_discrete_sublevels_int { \fp_eval:n { round ( \WCtotalnum - \g__wheelchart_discrete_count_int ) } }
+ \int_compare:nNnTF { \l__wheelchart_discrete_sublevels_int } = { 1 }
+ {
+ \seq_put_right:Ne \l__wheelchart_discrete_points_seq
+ {
+ 0.5
+ /
+ \fp_use:N \l__wheelchart_discrete_level_fp
+ }
+ }
+ {
+ \int_step_inline:nn { \l__wheelchart_discrete_sublevels_int }
+ {
+ \seq_put_right:Ne \l__wheelchart_discrete_points_seq
+ {
+ \fp_eval:n
+ {
+ ( ##1 - 0.5 * ( 1 + \l__wheelchart_discrete_space_at_borders_int ) )
+ / ( \l__wheelchart_discrete_sublevels_int - \l__wheelchart_discrete_space_at_borders_int )
+ }
+ /
+ \fp_use:N \l__wheelchart_discrete_level_fp
+ }
+ }
+ }
+ \seq_sort:Nn \l__wheelchart_discrete_points_seq
+ {
+ \seq_set_split:Nnn \l__wheelchart_discrete_coefficients_first_seq { / } {##1}
+ \seq_set_split:Nnn \l__wheelchart_discrete_coefficients_second_seq { / } {##2}
+ \fp_compare:nNnTF
+ { \seq_item:Nn \l__wheelchart_discrete_coefficients_first_seq { \l__wheelchart_discrete_sort_int } }
+ >
+ { \seq_item:Nn \l__wheelchart_discrete_coefficients_second_seq { \l__wheelchart_discrete_sort_int } }
+ { \sort_return_swapped: }
+ { \sort_return_same: }
+ }
+ \int_gzero:N \g__wheelchart_discrete_count_int
+ \__wheelchart_for_loop:n
+ {
+ \pgfkeysvalueof { / wheelchart / before~slices }
+ \int_step_inline:nn { \fp_eval:n { round ( \l__wheelchart_value_fp ) } }%note that \fp_eval:n { round ( ... ) } is necessary
+ %even when the value is an integer because if parse=pgfmath then .0 is added and then
+ %\int_step_inline:nn { \fp_use:N \l__wheelchart_value_fp } would give the messages
+ %Missing character: There is no . in font nullfont! Missing character: There is no 0 in font nullfont!
+ {
+ \int_gincr:N \g__wheelchart_discrete_count_int
+ \cs_set:Npe \WCcountdiscrete { \int_use:N \g__wheelchart_discrete_count_int }
+ \seq_set_split:Nne \l__wheelchart_discrete_coefficients_first_seq { / }
+ { \seq_item:Nn \l__wheelchart_discrete_points_seq { \g__wheelchart_discrete_count_int } }
+ %Naturally, an error occurs if the sum of the rounded values of the key value is
+ %greater than the rounded value of \WCtotalnum.
+ %For example if there are 2 values 1.6 and 1.7 then these numbers are 4 and 3 and then there is no 4-th item in the list.
+ %However only positive integer values make practical sense for this diagram.
+ \pic [ / wheelchart / slices_style ] at
+ (
+ $
+ (
+ \__wheelchart_inner_plot:nn
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_start_angle_fp + \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_total_angle_fp *
+ (
+ \seq_item:Nn \l__wheelchart_discrete_coefficients_first_seq
+ { \l__wheelchart_discrete_partitioning_first_index_int }
+ )
+ }
+ }
+ { \fp_use:N \l__wheelchart_inner_radius_fp }
+ )
+ !
+ {
+ \seq_item:Nn \l__wheelchart_discrete_coefficients_first_seq
+ { \l__wheelchart_discrete_partitioning_second_index_int }
+ }
+ !
+ (
+ \__wheelchart_outer_plot:nn
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_start_angle_fp + \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_total_angle_fp *
+ (
+ \seq_item:Nn \l__wheelchart_discrete_coefficients_first_seq
+ { \l__wheelchart_discrete_partitioning_first_index_int }
+ )
+ }
+ }
+ { \fp_use:N \l__wheelchart_outer_radius_fp }
+ )
+ $
+ )
+ { code = { \pgfkeysvalueof { / wheelchart / discrete~pic } } } ;
+ }
+ \pgfkeysvalueof { / wheelchart / after~slices }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_discrete_def_coord:nn #1#2
+ {
+ \fp_gset_eq:NN \g__wheelchart_previous_x_coord_fp \g__wheelchart_x_coord_fp
+ \fp_gset_eq:NN \g__wheelchart_previous_y_coord_fp \g__wheelchart_y_coord_fp
+ \__wheelchart_def_coord_aux:nn
+ {#1}
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_start_angle_fp + ( ( #2 ) / ( \l__wheelchart_samples_fp - 1 ) )
+ * \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_total_angle_fp
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_for_loop:n #1
+ {
+ \fp_gset_eq:NN \g__wheelchart_angle_fp \l__wheelchart_start_angle_fp
+ \__wheelchart_for_loop_initial:n
+ {
+ \__wheelchart_def_slice_keys:n
+ {
+ \fp_set_eq:Nc \l__wheelchart_value_fp { l__wheelchart_value_\WCcount _fp }
+ \cs_set_eq:Nc \WCpercentage { l__wheelchart_WCpercentage_\WCcount }
+ \cs_set_eq:Nc \WCpercentagerounded { l__wheelchart_WCpercentagerounded_\WCcount }
+ \fp_gset:Nn \g__wheelchart_new_angle_fp
+ {
+ \WCcount == \WCtotalcount
+ ?
+ \l__wheelchart_start_angle_fp + \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_total_angle_fp
+ :
+ \g__wheelchart_angle_fp +
+ (
+ \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_value_fp
+ * ( \l__wheelchart_total_angle_fp / \WCtotalnum )
+ )
+ }
+ \__wheelchart_def_macros:n
+ {
+ data~angle~pos ,
+ gap ,
+ gap~max~angle ,
+ gap~polar ,
+ gap~radius ,
+ samples ,
+ slices~inner~end~angle~shift ,
+ slices~inner~start~angle~shift ,
+ slices~outer~end~angle~shift ,
+ slices~outer~start~angle~shift
+ }
+ \__wheelchart_def_macro:Nn \l__wheelchart_outer_radius_fp
+ { \pgfkeysvalueof { / wheelchart / outer~radius } - \fp_use:N \l__wheelchart_gap_radius_fp }
+ \bool_if:NTF \l__wheelchart_pie_bool
+ { \fp_set:Nn \l__wheelchart_inner_radius_fp { 0 } }
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_inner_radius_fp
+ { \pgfkeysvalueof { / wheelchart / inner~radius } + \fp_use:N \l__wheelchart_gap_radius_fp }
+ }
+ \fp_set_eq:NN \l__wheelchart_inner_radius_orig_fp \l__wheelchart_inner_radius_fp
+ \fp_set:Nn \l__wheelchart_abs_half_angle_minus_new_angle_fp
+ { abs ( \g__wheelchart_angle_fp - \g__wheelchart_new_angle_fp ) / 2 }
+ \fp_set:Nn \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp
+ { \l__wheelchart_abs_half_angle_minus_new_angle_fp - \l__wheelchart_gap_polar_fp }
+ \bool_if:NTF \l__wheelchart_plot_bool
+ {
+ \fp_set_eq:NN \l__wheelchart_outer_gap_fp \l__wheelchart_gap_polar_fp
+ \fp_set_eq:NN \l__wheelchart_inner_gap_fp \l__wheelchart_gap_polar_fp
+ }
+ {
+ \fp_set:Nn \l__wheelchart_gap_max_angle_def_fp
+ {
+ \l__wheelchart_inner_radius_fp > 0
+ ?
+ 90
+ :
+ (
+ sind ( \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp ) < 0.001
+ ?
+ (
+ 90 < \l__wheelchart_gap_max_angle_fp && \l__wheelchart_gap_max_angle_fp < 180
+ ?
+ \l__wheelchart_gap_max_angle_fp
+ :
+ 90
+ )
+ :
+ (
+ \l__wheelchart_gap_max_angle_fp < 90 || \l__wheelchart_gap_max_angle_fp > 180
+ ?
+ 180
+ :
+ \l__wheelchart_gap_max_angle_fp
+ )
+ )
+ }
+ \__wheelchart_def_gap:NN \l__wheelchart_outer_gap_fp \l__wheelchart_outer_radius_fp
+ \__wheelchart_def_gap:NN \l__wheelchart_inner_gap_fp \l__wheelchart_inner_radius_fp
+ \fp_compare:nNnT { \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp } > { 0.01 }
+ {
+ \fp_set:Nn \l__wheelchart_inner_radius_fp
+ {
+ max
+ (
+ \l__wheelchart_gap_fp
+ / sind
+ (
+ min
+ (
+ \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp ,
+ \l__wheelchart_gap_max_angle_def_fp
+ )
+ )
+ ,
+ \l__wheelchart_inner_radius_fp
+ )
+ }
+ }
+ }
+ \__wheelchart_def_slice_angle:nnnn { inner } { end } { new_ } { -1 }
+ \__wheelchart_def_slice_angle:nnnn { inner } { start } {} { 1 }
+ \__wheelchart_def_slice_angle:nnnn { outer } { end } { new_ } { -1 }
+ \__wheelchart_def_slice_angle:nnnn { outer } { start } {} { 1 }
+ \__wheelchart_def_angle:nnnN { 0.5 } { 0 } { 0 } \WCmidangle
+ \__wheelchart_def_macros:n { data~angle~shift , data~sep }
+ \__wheelchart_def_angle:nnnN
+ { \l__wheelchart_data_angle_pos_fp }
+ { \l__wheelchart_data_angle_shift_fp }
+ { \l__wheelchart_data_sep_fp }
+ \WCdataangle
+ \__wheelchart_def_macros:n { explode }
+ \pgfkeysvalueof { / wheelchart / for~loop~start }%this must be placed after the definition of macros such as \WCpercentage
+ %such that these macros can be used in the key for loop start
+ \begin { scope }
+ [ shift = { ( \WCmidangle \c_colon_str \fp_use:N \l__wheelchart_explode_fp ) } , / wheelchart / slices_scope ]
+ #1
+ \end { scope }
+ \fp_gset_eq:NN \g__wheelchart_angle_fp \g__wheelchart_new_angle_fp
+ \pgfkeysvalueof { / wheelchart / for~loop~end }
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_for_loop_initial:n #1
+ {
+ \str_case:en { \l__wheelchart_type_tl }
+ {
+ { default }
+ {
+ \clist_if_empty:NTF \l__wheelchart_header_clist
+ {
+ \int_step_inline:nn { \WCtotalcount }
+ {
+ \cs_set:Npe \WCcount {##1}
+ \int_step_inline:nn { \seq_count:N \l__wheelchart_list_items_seq }
+ { \cs_set_eq:cc { WCvar\int_to_Alph:n {####1} } { l__wheelchart_item_WCvar\int_to_Alph:n {####1}_##1 } }
+ #1
+ }
+ }
+ {
+ \int_step_inline:nn { \WCtotalcount }
+ {
+ \cs_set:Npe \WCcount {##1}
+ \int_step_inline:nn { \seq_count:N \l__wheelchart_list_items_seq }
+ {
+ \cs_set_eq:cc
+ { \pgfkeysvalueof { / wheelchart / header~prefix } \clist_item:Nn \l__wheelchart_header_clist {####1} }
+ {
+ l__wheelchart_item_\pgfkeysvalueof { / wheelchart / header~prefix }
+ \clist_item:Nn \l__wheelchart_header_clist {####1}_##1
+ }
+ }
+ #1
+ }
+ }
+ }
+ { totalcount }
+ {
+ \int_step_inline:nn { \WCtotalcount }
+ {
+ \cs_set:Npe \WCcount {##1}
+ #1
+ }
+ }
+ { etoc }
+ {
+ \int_step_inline:nn { \WCtotalcount }
+ {
+ \cs_set:Npe \WCcount {##1}
+ \cs_set_eq:Nc \WCetocthelinkedname { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_##1 }
+ \cs_set_eq:Nc \WCetocthelinkednumber { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_##1 }
+ \cs_set_eq:Nc \WCetocthelinkedpage { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_##1 }
+ \cs_set_eq:Nc \WCetocthename { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_##1 }
+ \cs_set_eq:Nc \WCetocthenumber { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_##1 }
+ \cs_set_eq:Nc \WCetocthepage { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_##1 }
+ \cs_set_eq:Nc \WCetocthenumberofpages { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_##1 }
+ #1
+ }
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_if_text:nn #1#2
+ {
+ %https://tex.stackexchange.com/questions/42280/expand-away-empty-macros-within-ifthenelse
+ %https://tex.stackexchange.com/questions/44919/proper-way-to-detect-empty-blank-text
+ \begin { pgfinterruptpicture }
+ %https://tex.stackexchange.com/questions/459853/savebox-within-tikzpicture-results-in-an-empty-savebox
+ \hbox_gset:Nn \g__wheelchart_if_text_box { \pgfkeysvalueof { / wheelchart / #1 } }
+ \end { pgfinterruptpicture }
+ \dim_compare:nNnT { \box_wd:N \g__wheelchart_if_text_box } > { 0 pt }
+ { {#2} }
+ }
+
+\cs_new:Npn \__wheelchart_initial:n #1
+ {
+ \str_case:en { \l__wheelchart_type_tl }
+ {
+ { default }
+ {
+ \tl_if_empty:nTF {#1}
+ { \cs_set:Npn \WCtotalcount { 0 } }
+ {
+ \use:c { seq_set_split:Ne\l__wheelchart_expand_list_tl }
+ \l__wheelchart_list_seq
+ { \pgfkeysvalueof { / wheelchart / separator~rows } }
+ {#1}
+ \cs_set:Npe \WCtotalcount { \seq_count:N \l__wheelchart_list_seq }
+ \seq_map_indexed_inline:Nn \l__wheelchart_list_seq
+ {
+ \use:c { seq_set_split:Ne\l__wheelchart_expand_list_items_tl }
+ \l__wheelchart_list_items_seq
+ { \pgfkeysvalueof { / wheelchart / separator~columns } }
+ {##2}
+ %make sure that the namespace l__wheelchart_item_ below is unique
+ \clist_if_empty:NTF \l__wheelchart_header_clist
+ {
+ \seq_map_indexed_inline:Nn \l__wheelchart_list_items_seq
+ { \cs_set:cpn { l__wheelchart_item_WCvar\int_to_Alph:n {####1}_##1 } {####2} }
+ }
+ {
+ \seq_map_indexed_inline:Nn \l__wheelchart_list_items_seq
+ {
+ \cs_set:cpn
+ {
+ l__wheelchart_item_\pgfkeysvalueof { / wheelchart / header~prefix }
+ \clist_item:Nn \l__wheelchart_header_clist {####1}_##1
+ }
+ {####2}
+ }
+ }
+ }
+ }
+ }
+ { totalcount }
+ {
+ \cs_set:Npe \WCtotalcount { \fp_use:N \l__wheelchart_total_count_fp }
+ \cs_set:Npn \WCvarA { 1 }
+ \cs_set:Npn \WCvarB {}
+ \cs_set:Npn \WCvarC {}
+ }
+ { etoc }
+ {
+ \bool_if:NTF \l__wheelchart_etoc_use_name_bool
+ {
+ \int_if_exist:cTF { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ { \cs_set:Npe \WCtotalcount { \int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int } } }
+ { \cs_set:Npn \WCtotalcount { 0 } }
+ }
+ {
+ \@ifpackageloaded { etoc } {}
+ { \PackageError { wheelchart } { The~package~etoc~must~be~loaded~to~use~the~key~etoc~level } {} }
+ \etocsetlevel { part } { 0 }
+ \etocsetlevel { chapter } { 0 }
+ \etocsetlevel { section } { 0 }
+ \etocsetlevel { subsection } { 0 }
+ \etocsetlevel { subsubsection } { 0 }
+ \etocsetlevel { paragraph } { 0 }
+ \etocsetlevel { subparagraph } { 0 }
+ \etocsetlevel { \l__wheelchart_etoc_level_tl } { -1 }%these level changes are local to the current group
+ \etocsetnexttocdepth { -1 }%only for the next toc
+ \etocsetstyle { \l__wheelchart_etoc_level_tl } {} {}
+ {
+ \int_compare:nNnT { \int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int } } > { 0 }
+ {
+ \cs_gset:cpe
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_number_of_pages_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ {
+ \int_eval:n
+ {
+ \etocthepage -
+ \cs:w
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_page_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ \cs_end:
+ }
+ }
+ }
+ \int_gincr:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_linked_name_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthelinkedname
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_linked_number_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthelinkednumber
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_linked_page_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthelinkedpage
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_name_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthename
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_number_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthenumber
+ \cs_gset_eq:cN
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_page_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ \etocthepage
+ }
+ {}
+ \int_gzero_new:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ \pgfkeysvalueof { / wheelchart / etoc~code }
+ \int_compare:nNnT { \int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int } } > { 0 }
+ {
+ \cs_gset:cpe
+ {
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_number_of_pages_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ }
+ {
+ \int_eval:n
+ {
+ \l__wheelchart_etoc_count_total_pages_int + 1 -
+ \cs:w
+ g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl
+ _the_page_\int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int }
+ \cs_end:
+ }
+ }
+ }
+ \cs_set:Npe \WCtotalcount { \int_use:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int } }
+ }
+ }
+ }
+ \cs_set:Npn \WCtotalnum { 0 }
+ \__wheelchart_for_loop_initial:n
+ {
+ \__wheelchart_def_slice_keys:n
+ {
+ \__wheelchart_def_macros:n { value }
+ \fp_gset_eq:NN \g__wheelchart_value_global_fp \l__wheelchart_value_fp
+ }
+ \fp_zero_new:c { l__wheelchart_value_\WCcount _fp }
+ \fp_set_eq:cN { l__wheelchart_value_\WCcount _fp } \g__wheelchart_value_global_fp
+ \cs_set:Npe \WCtotalnum { \fp_eval:n { \WCtotalnum + \g__wheelchart_value_global_fp } }
+ }
+ \int_step_inline:nn { \WCtotalcount }
+ {
+ \cs_set:cpe { l__wheelchart_WCpercentage_##1 }
+ { \fp_eval:n { \fp_use:c { l__wheelchart_value_##1_fp } / ( \WCtotalnum / 100 ) } }
+ \cs_set:cpe { l__wheelchart_WCpercentagerounded_##1 }
+ { \fp_eval:n { round ( \cs:w l__wheelchart_WCpercentage_##1\cs_end: , \pgfkeysvalueof { / wheelchart / perc~precision } ) } }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_inner_plot:nn #1#2
+ { {#1} \c_colon_str {#2} }
+
+\cs_new:Npn \__wheelchart_legend_append:nn #1#2
+ {
+ \tl_build_put_right:NV \WClegend \l__wheelchart_legend_row_tl%note the V specifier such that \WClegend can also be combined
+ %with an S column of the package siunitx and such that \WClegend can be used in a tblr environment of the package tabularray
+ %and then the option expand=\WClegend needs to be given to the tblr environment
+ \tl_build_put_right:Nn \WClegend { \protect \setcounter { g__wheelchart_WCcount_counter } }%note the \protect for in case that
+ %\WClegend would be parsed in a particular way
+ %note that the counter g__wheelchart_WCcount_counter is defined globally and at the end of the previous \l__wheelchart_legend_row_tl
+ %such that this value is defined and has the right value at the start of the next \l__wheelchart_legend_row_tl
+ %if \WClegend is used in a tblr environment of the package tabularray then \UseTblrLibrary{counter} is required
+ \tl_build_put_right:Ne \WClegend { { \int_eval:n {#1} } }
+ \tl_build_put_right:Nn \WClegend {#2}
+ }
+
+\cs_new:Npn \__wheelchart_outer_plot:nn #1#2
+ { {#1} \c_colon_str {#2} }
+
+\cs_new:Npn \__wheelchart_slices_arc:nnnnnn #1#2#3#4#5#6
+ {
+ {
+ [
+ / utils / exec =
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_slices_arc_A_fp {#1}
+ #6
+ \fp_set:Nn \l__wheelchart_slices_arc_A_abs_fp { abs ( \l__wheelchart_slices_arc_A_fp ) }
+ \fp_compare:nNnF { \l__wheelchart_slices_arc_A_abs_fp } < { 0.01 }
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_slices_arc_B_fp {#2}
+ \fp_set:Nn \l__wheelchart_slices_arc_rotate_fp
+ {
+ atand
+ (
+ \fp_use:c { l__wheelchart_#3_y_fp } - \fp_use:c { l__wheelchart_#4_y_fp } ,
+ \fp_use:c { l__wheelchart_#3_x_fp } - \fp_use:c { l__wheelchart_#4_x_fp }
+ )
+ }
+ \fp_set:Nn \l__wheelchart_slices_arc_coord_fp
+ {
+ \l__wheelchart_slices_arc_A_fp < 0 && \l__wheelchart_slices_arc_B_fp < 0
+ ?
+ 0
+ :
+ \l__wheelchart_slices_arc_B_fp
+ }
+ \fp_set:Nn \l__wheelchart_slices_arc_angle_fp
+ {
+ \l__wheelchart_slices_arc_A_fp < 0 && \l__wheelchart_slices_arc_B_fp < 0
+ ?
+ acosd
+ (
+ 2 /
+ (
+ ( min ( \l__wheelchart_slices_arc_B_fp , 0 ) - 1 )
+ * ( ( 1 / \l__wheelchart_slices_arc_A_fp ) + \l__wheelchart_slices_arc_A_fp )
+ )
+ )
+ :
+ atand ( ( \l__wheelchart_slices_arc_A_fp - ( 1 / \l__wheelchart_slices_arc_A_fp ) ) / 2 )
+ }%note the min ( \l__wheelchart_slices_arc_B_fp , 0 ) such that the acosd is always defined
+ }
+ }
+ ]
+ \fp_compare:nNnTF { \l__wheelchart_slices_arc_A_abs_fp } < { 0.01 }
+ {#5}
+ {
+ \fp_compare:nNnT { \l__wheelchart_slices_arc_B_fp } < { 1 }
+ {
+ \fp_compare:nNnF { \l__wheelchart_slices_arc_coord_fp } = { 0 }
+ {
+ --
+ (
+ $
+ ( \fp_use:c { l__wheelchart_#3_x_fp } , \fp_use:c { l__wheelchart_#3_y_fp } )
+ ! { \fp_eval:n { \l__wheelchart_slices_arc_coord_fp / 2 } } !
+ ( \fp_use:c { l__wheelchart_#4_x_fp } , \fp_use:c { l__wheelchart_#4_y_fp } )
+ $
+ )
+ }
+ arc
+ [
+ start~angle =
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_slices_arc_rotate_fp
+ - \g__wheelchart_slices_orientation_fp * \l__wheelchart_slices_arc_angle_fp
+ }
+ } ,
+ end~angle =
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_slices_arc_rotate_fp + \g__wheelchart_slices_orientation_fp *
+ ( sign ( \l__wheelchart_slices_arc_A_fp ) * 180 + \l__wheelchart_slices_arc_angle_fp )
+ }
+ } ,
+ radius =
+ {
+ \fp_eval:n
+ {
+ 0.25 * ( 1 - \l__wheelchart_slices_arc_B_fp )
+ * abs ( ( 1 / \l__wheelchart_slices_arc_A_fp ) + \l__wheelchart_slices_arc_A_fp )
+ * sqrt
+ (
+ ( \fp_use:c { l__wheelchart_#3_x_fp } - \fp_use:c { l__wheelchart_#4_x_fp } ) ^ 2
+ + ( \fp_use:c { l__wheelchart_#3_y_fp } - \fp_use:c { l__wheelchart_#4_y_fp } ) ^ 2
+ )
+ }
+ }
+ ]
+ }
+ \fp_compare:nNnF { \l__wheelchart_slices_arc_coord_fp } = { 0 }
+ {#5}
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_slices_arrow:nnnnn #1#2#3#4#5
+ {
+ {
+ [
+ / utils / exec =
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_slices_arrow_A_fp {#1}
+ \fp_compare:nNnF { \l__wheelchart_slices_arrow_A_fp } = { 0 }
+ {
+ \__wheelchart_def_macro:Nn \l__wheelchart_slices_arrow_B_fp {#2}
+ \fp_set:Nn \l__wheelchart_slices_arrow_coord_fp
+ {
+ \l__wheelchart_slices_arrow_A_fp < 0 && \l__wheelchart_slices_arrow_B_fp < 0 ? 0 : \l__wheelchart_slices_arrow_B_fp
+ }
+ }
+ }
+ ]
+ \fp_compare:nNnTF { \l__wheelchart_slices_arrow_A_fp } = { 0 }
+ {#5}
+ {
+ \fp_compare:nNnT { \l__wheelchart_slices_arrow_B_fp } < { 1 }
+ {
+ \fp_compare:nNnF { \l__wheelchart_slices_arrow_coord_fp } = { 0 }
+ {
+ --
+ (
+ $
+ ( \fp_use:c { l__wheelchart_#3_x_fp } , \fp_use:c { l__wheelchart_#3_y_fp } )
+ ! { \fp_eval:n { \l__wheelchart_slices_arrow_coord_fp / 2 } } !
+ ( \fp_use:c { l__wheelchart_#4_x_fp } , \fp_use:c { l__wheelchart_#4_y_fp } )
+ $
+ )
+ }
+ --
+ (
+ \fp_eval:n
+ {
+ (
+ \fp_use:c { l__wheelchart_#3_x_fp } + \fp_use:c { l__wheelchart_#4_x_fp } +
+ (
+ \g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 )
+ * \l__wheelchart_slices_arrow_A_fp
+ * ( \fp_use:c { l__wheelchart_#3_y_fp } - \fp_use:c { l__wheelchart_#4_y_fp } )
+ )
+ )
+ / 2
+ }
+ ,
+ \fp_eval:n
+ {
+ (
+ \fp_use:c { l__wheelchart_#3_y_fp } + \fp_use:c { l__wheelchart_#4_y_fp } +
+ (
+ \g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 )
+ * \l__wheelchart_slices_arrow_A_fp
+ * ( \fp_use:c { l__wheelchart_#4_x_fp } - \fp_use:c { l__wheelchart_#3_x_fp } )
+ )
+ )
+ / 2
+ }
+ )
+ \fp_compare:nNnF { \l__wheelchart_slices_arrow_coord_fp } = { 0 }
+ {
+ --
+ (
+ $
+ ( \fp_use:c { l__wheelchart_#4_x_fp } , \fp_use:c { l__wheelchart_#4_y_fp } )
+ ! { \fp_eval:n { \l__wheelchart_slices_arrow_coord_fp / 2 } } !
+ ( \fp_use:c { l__wheelchart_#3_x_fp } , \fp_use:c { l__wheelchart_#3_y_fp } )
+ $
+ )
+ }
+ }
+ #5
+ }
+ }
+ }
+
+\cs_new:Npn \__wheelchart_slices_to:nn #1#2
+ {
+ to
+ [
+ out = { \fp_eval:n { - \g__wheelchart_slices_orientation_fp * sign ( \l__wheelchart_coord_determinant_fp ) * (#1) } } ,
+ in = { \fp_eval:n { \g__wheelchart_slices_orientation_fp * sign ( \l__wheelchart_coord_determinant_fp ) * ( (#2) - 180 ) } } ,
+ relative
+ ]
+ }
+
+\cs_new:Npn \__wheelchart_space_to_underscore:n #1
+ { \str_if_eq:nnTF {#1} { ~ } { _ } {#1} }
+
+%%> \subsection{Pgfkeys}
+
+\pgfkeys
+ {
+ / wheelchart /. is~family ,
+ / wheelchart ,
+ after~slices /. initial = {} ,
+ anchor~xsep /. initial = 5 ,
+ anchor~ysep /. initial = 5 ,
+ arc /. style =
+ {
+ bool_set_true = \l__wheelchart_arc_bool ,
+ arc_style /. style = {#1}
+ } ,
+ arc_style /. style = {} ,
+ arc~around~text /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn
+ %such that for example \WCvarA can be used as value for this key
+ arc~around~text /. initial = false ,
+ arc~data /. initial = {} ,
+ arc~data~align /. code = { \tl_set:Nn \l__wheelchart_arc_data_align_tl {#1} } ,%this key is not set up with /.is choice
+ %such that for example \WCvarA can be used as value for this key
+ arc~data~align = center ,
+ arc~data~angle~pos /. initial = 0.5 ,
+ arc~data~angle~shift /. initial = 0 ,
+ arc~data~dir /. initial = 1 ,
+ arc~data~pos /. initial = 1 ,
+ arc~data~sep /. initial = 1 ex / 1 cm ,
+ arc~data~style /. style = { arc_data_style /. style = {#1} } ,
+ arc_data_style /. style = {} ,
+ arc~first~half /. style = { arc_first_half /. style = {#1} } ,
+ arc_first_half /. style = {} ,
+ arc~pos /. initial = 1 ,
+ arc~second~half /. style = { arc_second_half /. style = {#1} } ,
+ arc_second_half /. style = {} ,
+ arc~sep /. initial = 1 ex / 1 cm ,
+ at /. initial = { ( 0 , 0 ) } ,
+ before~slices /. initial = {} ,
+ bool_set_true /. code = { \bool_set_true:N #1 } ,
+ caption /. initial = {} ,
+ caption~left /. initial = {} ,
+ caption~left~sep /. initial = 0.5 ,
+ caption~left~style /. style = { caption~left_style /. style = {#1} } ,
+ caption~left_style /. style = {} ,
+ caption~sep /. initial = 0.5 ,
+ caption~style /. style = { caption_style /. style = {#1} } ,
+ caption_style /. style = {} ,
+ contour /. style =
+ {
+ bool_set_true = \l__wheelchart_contour_bool ,
+ contour_style /. style = {#1}
+ } ,
+ contour_style /. style = {} ,
+ counterclockwise /. is~choice ,
+ counterclockwise / false /. code = { \fp_set:Nn \l__wheelchart_counter_or_clockwise_fp { -1 } } ,
+ counterclockwise / false /. value~forbidden ,
+ counterclockwise / true /. code = { \fp_set:Nn \l__wheelchart_counter_or_clockwise_fp { 1 } } ,
+ counterclockwise / true /. value~forbidden ,
+ counterclockwise /. default = true ,
+ counterclockwise = false ,
+ data /. initial = { \WCvarC } ,
+ data~angle~pos /. initial = 0.5 ,
+ data~angle~shift /. initial = 0 ,
+ data~pos /. initial = 1 ,
+ data~sep /. initial = 0.2 ,
+ data~style /. style = { data_style /. style = {#1} } ,
+ data_style /. style = {} ,
+ discrete /. is~choice ,
+ discrete / false /. code = { \bool_set_false:N \l__wheelchart_discrete_bool } ,
+ discrete / false /. value~forbidden ,
+ discrete / true /. code = { \bool_set_true:N \l__wheelchart_discrete_bool } ,
+ discrete / true /. value~forbidden ,
+ discrete /. default = true ,
+ discrete = false ,
+ discrete~factor /. initial = 1 ,
+ discrete~partitioning /. initial = radius ,
+ discrete~pic /. initial = {} ,
+ discrete~sort /. is~choice ,
+ discrete~sort / angle /. code = { \int_set:Nn \l__wheelchart_discrete_sort_int { 1 } } ,
+ discrete~sort / angle /. value~forbidden ,
+ discrete~sort / radius /. code = { \int_set:Nn \l__wheelchart_discrete_sort_int { 2 } } ,
+ discrete~sort / radius /. value~forbidden ,
+ discrete~sort = angle ,
+ discrete~space~at~borders /. is~choice ,%this key is not set up with /.is if because an initial value is unwanted for this key
+ discrete~space~at~borders / false /. code = { \int_set:Nn \l__wheelchart_discrete_space_at_borders_int { 1 } } ,
+ discrete~space~at~borders / false /. value~forbidden ,
+ discrete~space~at~borders / true /. code = { \int_set:Nn \l__wheelchart_discrete_space_at_borders_int { 0 } } ,
+ discrete~space~at~borders / true /. value~forbidden ,
+ discrete~space~at~borders /. default = true ,
+ domain /. style~args /. expanded = { ##1 \c_colon_str ##2 }
+ {
+ counterclockwise ,
+ start~angle = {##1} ,
+ total~angle = { (##2) - (##1) }
+ } ,
+ etoc~code /. initial = { \tableofcontents } ,
+ etoc~count~total~pages /. code = { \int_set:Nn \l__wheelchart_etoc_count_total_pages_int {#1} } ,
+ etoc~level /. code =
+ {
+ \tl_set:Nn \l__wheelchart_type_tl { etoc }
+ \tl_set:Nn \l__wheelchart_etoc_level_tl {#1}
+ } ,
+ etoc~name /. code = { \tl_set:Nn \l__wheelchart_etoc_name_tl {#1} } ,
+ etoc~name = ,
+ etoc~use~name /. code =
+ {
+ \tl_set:Nn \l__wheelchart_etoc_name_tl {#1}
+ \tl_set:Nn \l__wheelchart_type_tl { etoc }
+ \bool_set_true:N \l__wheelchart_etoc_use_name_bool
+ } ,
+ expand~list /. is~choice ,
+ expand~list / false /. code = { \tl_set:Nn \l__wheelchart_expand_list_tl { n } } ,
+ expand~list / false /. value~forbidden ,
+ expand~list / once /. code = { \tl_set:Nn \l__wheelchart_expand_list_tl { o } } ,
+ expand~list / once /. value~forbidden ,
+ expand~list / true /. code = { \tl_set:Nn \l__wheelchart_expand_list_tl { e } } ,
+ expand~list / true /. value~forbidden ,
+ expand~list = once ,
+ expand~list~items /. is~choice ,
+ expand~list~items / false /. code = { \tl_set:Nn \l__wheelchart_expand_list_items_tl { n } } ,
+ expand~list~items / false /. value~forbidden ,
+ expand~list~items / once /. code = { \tl_set:Nn \l__wheelchart_expand_list_items_tl { o } } ,
+ expand~list~items / once /. value~forbidden ,
+ expand~list~items / true /. code = { \tl_set:Nn \l__wheelchart_expand_list_items_tl { e } } ,
+ expand~list~items / true /. value~forbidden ,
+ expand~list~items = false ,
+ explode /. initial = 0 ,
+ explode /. default = 0.2 ,
+ for~loop~end /. initial = {} ,
+ for~loop~start /. initial = {} ,
+ gap /. initial = 0 ,
+ gap /. default = 0.05 ,
+ gap~max~angle /. initial = 180 ,
+ gap~polar /. initial = 0 ,
+ gap~polar /. default = 1 ,
+ gap~radius /. initial = 0 ,
+ gap~radius /. default = 0.05 ,%the same default value as for gap
+ header /. code = { \clist_set:Nn \l__wheelchart_header_clist {#1} } ,
+ header~prefix /. initial = WC ,
+ inner~data /. initial = {} ,
+ inner~data~angle~pos /. initial = 0.5 ,
+ inner~data~angle~shift /. initial = 0 ,
+ inner~data~pos /. initial = 0 ,
+ inner~data~sep /. initial = 0.2 ,
+ inner~data~style /. style = { inner_data_style /. style = {#1} } ,
+ inner_data_style /. style = {} ,
+ inner~plot /. code =
+ {
+ \bool_set_true:N \l__wheelchart_plot_bool
+ \cs_set:Npn \__wheelchart_inner_plot:nn ##1##2 {#1}
+ \tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ -- plot
+ [
+ domain =
+ \fp_use:N \l__wheelchart_slice_inner_end_angle_fp
+ \c_colon_str
+ \fp_use:N \l__wheelchart_slice_inner_start_angle_fp ,
+ samples = \fp_use:N \l__wheelchart_samples_fp ,
+ variable = \l__wheelchart_inner_plot_variable_fp ,
+ / wheelchart / inner_plot_style
+ ]
+ ( \__wheelchart_inner_plot:nn { \l__wheelchart_inner_plot_variable_fp } { \fp_use:N \l__wheelchart_inner_radius_fp } )
+ }
+ } ,
+ inner~plot~style /. style = { inner_plot_style /. style = {#1} } ,
+ inner_plot_style /. style = {} ,
+ inner~radius /. initial = 2 ,
+ legend /. initial = {} ,
+ legend~columns /. initial = 1 ,
+ legend~entry /. initial = {} ,
+ legend~only /. code = { \bool_set:Nn \l__wheelchart_legend_only_bool { \cs:w c_#1_bool\cs_end: } } ,
+ legend~only /. default = true ,
+ legend~only = false ,
+ legend~row /. code =
+ {
+ \bool_set_true:N \l__wheelchart_legend_row_bool
+ \tl_set:Nn \l__wheelchart_legend_row_tl {#1}
+ } ,
+ lines /. initial = 0 ,
+ lines /. default = 1 ,
+ lines~angle~pos /. initial = 0.5 ,
+ lines~angle~shift /. initial = 0 ,
+ lines~ext /. initial = 0 ,
+ lines~ext /. default = 0.5 ,
+ lines~ext~bottom~dir /. code = { \int_set_eq:Nc \l__wheelchart_lines_ext_bottom_dir_int { c__wheelchart_lines_ext_dir_#1_int } } ,
+ lines~ext~bottom~dir = right ,
+ lines~ext~dir /. code =
+ {
+ \bool_set_true:N \l__wheelchart_lines_ext_dir_bool
+ \int_set_eq:Nc \l__wheelchart_lines_ext_dir_int { c__wheelchart_lines_ext_dir_#1_int }
+ } ,
+ lines~ext~dirsep /. initial = 0 ,
+ lines~ext~fixed /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn
+ %such that for example \WCvarA can be used as value for this key
+ lines~ext~fixed /. initial = false ,
+ lines~ext~fixed~left /. initial =
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_lines_ext_dir_int
+ * ( \l__wheelchart_outer_radius_fp + \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp )
+ }
+ } ,
+ lines~ext~fixed~right /. initial =
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_lines_ext_dir_int
+ * ( \l__wheelchart_outer_radius_fp + \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp )
+ }
+ } ,
+ lines~ext~left~anchor /. initial = mid~east ,
+ lines~ext~right~anchor /. initial = mid~west ,
+ lines~ext~top~dir /. code = { \int_set_eq:Nc \l__wheelchart_lines_ext_top_dir_int { c__wheelchart_lines_ext_dir_#1_int } } ,
+ lines~ext~top~dir = right ,
+ lines~pos /. initial = 1 ,
+ lines~sep /. initial = 0.2 ,
+ lines~style /. style = { lines_style /. style = {#1} } ,
+ lines_style /. style = {} ,
+ middle /. initial = {} ,
+ middle~fill /. style =
+ {
+ bool_set_true = \l__wheelchart_middle_fill_bool ,
+ middle_fill /. style = {#1}
+ } ,
+ middle_fill /. style = {} ,
+ middle~style /. style = { middle_style /. style = {#1} } ,
+ middle_style /. style = {} ,
+ name /. code = { \tl_gset:Ne \g__wheelchart_name_tl {#1} } ,
+ name = wheelchart@name ,
+ outer~plot /. code =
+ {
+ \bool_set_true:N \l__wheelchart_plot_bool
+ \cs_set:Npn \__wheelchart_outer_plot:nn ##1##2 {#1}
+ \tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ -- plot
+ [
+ domain =
+ \fp_use:N \l__wheelchart_slice_outer_start_angle_fp
+ \c_colon_str
+ \fp_use:N \l__wheelchart_slice_outer_end_angle_fp ,
+ samples = \fp_use:N \l__wheelchart_samples_fp ,
+ variable = \l__wheelchart_outer_plot_variable_fp ,
+ / wheelchart / outer_plot_style
+ ]
+ ( \__wheelchart_outer_plot:nn { \l__wheelchart_outer_plot_variable_fp } { \fp_use:N \l__wheelchart_outer_radius_fp } )
+ }
+ } ,
+ outer~plot~style /. style = { outer_plot_style /. style = {#1} } ,
+ outer_plot_style /. style = {} ,
+ outer~radius /. initial = 3 ,
+ parse /. initial = pgfmath ,
+ perc~precision /. initial = 0 ,
+ pie /. code = { \bool_set:Nn \l__wheelchart_pie_bool { \cs:w c_#1_bool\cs_end: } } ,
+ pie /. default = true ,
+ pie = false ,
+ plot /. style =
+ {
+ inner~plot = {#1} ,
+ outer~plot = {#1}
+ } ,
+ plot~style /. style =
+ {
+ inner~plot~style = {#1} ,
+ outer~plot~style = {#1}
+ } ,
+ radius /. style~2~args =
+ {
+ inner~radius = {#1} ,
+ outer~radius = {#2}
+ } ,
+ samples /. initial = 25 ,%the same number as /tikz/samples
+ separator~columns /. initial = / ,
+ separator~rows /. initial = { , } ,
+ slice_final /. style = { slice_final_style /. style = {#1} } ,
+ slice_final_style /. style = {} ,
+ slices /. code =
+ {
+ \bool_set_true:N \l__wheelchart_slices_bool
+ \tl_set:Nn \l__wheelchart_slices_tl {#1}
+ } ,
+ slices~angle~pos /. initial = 0.5 ,
+ slices~angle~shift /. initial = 0 ,
+ slices~arc /. style~2~args =
+ {
+ slices~start~arc = { - (#1) } {#2} ,
+ slices~end~arc = {#1} {#2}
+ } ,
+ slices~arc~inner~end /. is~choice ,
+ slices~arc~inner~end / false /. style = {} ,
+ slices~arc~inner~end / false /. value~forbidden ,
+ slices~arc~inner~end / true /. style =
+ { slices~arc~match = { inner } { 1 } { -1 } { 1 } { inner~end } { inner~start } { outer~end } } ,
+ slices~arc~inner~end / true /. value~forbidden ,
+ slices~arc~inner~end /. initial = false ,
+ slices~arc~inner~end /. default = true ,
+ slices~arc~inner~end~start /. is~choice ,
+ slices~arc~inner~end~start / false /. style = {} ,
+ slices~arc~inner~end~start / false /. value~forbidden ,
+ slices~arc~inner~end~start / true /. style =
+ { slices~arc~match = { inner } { 1 } { 1 } { 1 } { inner~end } { inner~start } { outer~end } } ,
+ slices~arc~inner~end~start / true /. value~forbidden ,
+ slices~arc~inner~end~start /. initial = false ,
+ slices~arc~inner~end~start /. default = true ,
+ slices~arc~inner~start /. is~choice ,
+ slices~arc~inner~start / false /. style = {} ,
+ slices~arc~inner~start / false /. value~forbidden ,
+ slices~arc~inner~start / true /. style =
+ { slices~arc~match = { inner } { 1 } { -1 } { -1 } { inner~start } { inner~end } { outer~start } } ,
+ slices~arc~inner~start / true /. value~forbidden ,
+ slices~arc~inner~start /. initial = false ,
+ slices~arc~inner~start /. default = true ,
+ slices~arc~inner~start~end /. is~choice ,
+ slices~arc~inner~start~end / false /. style = {} ,
+ slices~arc~inner~start~end / false /. value~forbidden ,
+ slices~arc~inner~start~end / true /. style =
+ { slices~arc~match = { inner } { -1 } { -1 } { -1 } { inner~start } { inner~end } { outer~start } } ,
+ slices~arc~inner~start~end / true /. value~forbidden ,
+ slices~arc~inner~start~end /. initial = false ,
+ slices~arc~inner~start~end /. default = true ,
+ slices~arc~match /. style~n~args = { 7 }
+ {
+ slices~end~arc = { (#2) * tan ( \__wheelchart_diff_atan:nnnn {#7} {#6} {#5} {#6} / 2 ) } { 0 } ,
+ slices~start~arc = { (#3) * tan ( \__wheelchart_diff_atan:nnnn {#7} {#6} {#5} {#6} / 2 ) } { 0 } ,
+ slices~#1~arc = { (#4) * tan ( \__wheelchart_diff_atan:nnnn {#5} {#7} {#6} {#7} / 2 ) } { 0 }
+ } ,
+ slices~arc~outer~end /. is~choice ,
+ slices~arc~outer~end / false /. style = {} ,
+ slices~arc~outer~end / false /. value~forbidden ,
+ slices~arc~outer~end / true /. style =
+ { slices~arc~match = { outer } { -1 } { 1 } { -1 } { outer~end } { outer~start } { inner~end } } ,
+ slices~arc~outer~end / true /. value~forbidden ,
+ slices~arc~outer~end /. initial = false ,
+ slices~arc~outer~end /. default = true ,
+ slices~arc~outer~end~start /. is~choice ,
+ slices~arc~outer~end~start / false /. style = {} ,
+ slices~arc~outer~end~start / false /. value~forbidden ,
+ slices~arc~outer~end~start / true /. style =
+ { slices~arc~match = { outer } { -1 } { -1 } { -1 } { outer~end } { outer~start } { inner~end } } ,
+ slices~arc~outer~end~start / true /. value~forbidden ,
+ slices~arc~outer~end~start /. initial = false ,
+ slices~arc~outer~end~start /. default = true ,
+ slices~arc~outer~start /. is~choice ,
+ slices~arc~outer~start / false /. style = {} ,
+ slices~arc~outer~start / false /. value~forbidden ,
+ slices~arc~outer~start / true /. style =
+ { slices~arc~match = { outer } { -1 } { 1 } { 1 } { outer~start } { outer~end } { inner~start } } ,
+ slices~arc~outer~start / true /. value~forbidden ,
+ slices~arc~outer~start /. initial = false ,
+ slices~arc~outer~start /. default = true ,
+ slices~arc~outer~start~end /. is~choice ,
+ slices~arc~outer~start~end / false /. style = {} ,
+ slices~arc~outer~start~end / false /. value~forbidden ,
+ slices~arc~outer~start~end / true /. style =
+ { slices~arc~match = { outer } { 1 } { 1 } { 1 } { outer~start } { outer~end } { inner~start } } ,
+ slices~arc~outer~start~end / true /. value~forbidden ,
+ slices~arc~outer~start~end /. initial = false ,
+ slices~arc~outer~start~end /. default = true ,
+ slices~arrow /. style~2~args =
+ {
+ slices~start~arrow = { - (#1) } {#2} ,
+ slices~end~arrow = {#1} {#2}
+ } ,
+ slices~end~arc /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_end_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ {#1}
+ {#2}
+ { outer~end }
+ { inner~end }
+ { -- ( \fp_use:c { l__wheelchart_inner~end_x_fp } , \fp_use:c { l__wheelchart_inner~end_y_fp } ) }
+ {}
+ }
+ } ,
+ slices~end~arrow /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_end_tl
+ {
+ \__wheelchart_slices_arrow:nnnnn
+ {#1}
+ {#2}
+ { outer~end }
+ { inner~end }
+ { -- ( \fp_use:c { l__wheelchart_inner~end_x_fp } , \fp_use:c { l__wheelchart_inner~end_y_fp } ) }
+ }
+ } ,
+ slices~end~to /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_end_tl
+ {
+ \__wheelchart_slices_to:nn {#2} {#1}
+ ( \fp_use:c { l__wheelchart_inner~end_x_fp } , \fp_use:c { l__wheelchart_inner~end_y_fp } )
+ }
+ } ,
+ slices~inner~angle~reduce /. style =
+ {
+ slices~inner~end~angle~shift = { - (#1) } ,
+ slices~inner~start~angle~shift = {#1}
+ } ,
+ slices~inner~angle~shift /. style =
+ {
+ slices~inner~end~angle~shift = {#1} ,
+ slices~inner~start~angle~shift = {#1}
+ } ,
+ slices~inner~arc /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ {#1}
+ {#2}
+ { inner~end }
+ { inner~start }
+ { -- ( \fp_use:c { l__wheelchart_inner~start_x_fp } , \fp_use:c { l__wheelchart_inner~start_y_fp } ) }
+ {}
+ }
+ } ,
+ slices~inner~arc~tangent /. is~choice ,
+ slices~inner~arc~tangent / false /. code = {} ,
+ slices~inner~arc~tangent / false /. value~forbidden ,
+ slices~inner~arc~tangent / true /. code =
+ {
+ \tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ { \__wheelchart_diff_atan:nnnn { outer~start } { inner~start } { outer~end } { inner~end } }
+ { 0 }
+ { inner~end }
+ { inner~start }
+ { -- ( \fp_use:c { l__wheelchart_inner~start_x_fp } , \fp_use:c { l__wheelchart_inner~start_y_fp } ) }
+ {
+ \fp_compare:nNnTF { \l__wheelchart_slices_arc_A_fp } > { 359.99 }
+ { \fp_set:Nn \l__wheelchart_slices_arc_A_fp { 1 } }
+ { \fp_set:Nn \l__wheelchart_slices_arc_A_fp { tand ( 45 - \l__wheelchart_slices_arc_A_fp / 4 ) } }
+ }
+ }
+ } ,
+ slices~inner~arc~tangent / true /. value~forbidden ,
+ slices~inner~arc~tangent /. initial = false ,
+ slices~inner~arc~tangent /. default = true ,
+ slices~inner~arrow /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ \__wheelchart_slices_arrow:nnnnn
+ {#1}
+ {#2}
+ { inner~end }
+ { inner~start }
+ { -- ( \fp_use:c { l__wheelchart_inner~start_x_fp } , \fp_use:c { l__wheelchart_inner~start_y_fp } ) }
+ }
+ } ,
+ slices~inner~end~angle~shift /. initial = 0 ,
+ slices~inner~start~angle~shift /. initial = 0 ,
+ slices~inner~to /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_inner_tl
+ {
+ \__wheelchart_slices_to:nn {#2} {#1}
+ ( \fp_use:c { l__wheelchart_inner~start_x_fp } , \fp_use:c { l__wheelchart_inner~start_y_fp } )
+ }
+ } ,
+ slices~outer~angle~reduce /. style =
+ {
+ slices~outer~end~angle~shift = { - (#1) } ,
+ slices~outer~start~angle~shift = {#1}
+ } ,
+ slices~outer~angle~shift /. style =
+ {
+ slices~outer~end~angle~shift = {#1} ,
+ slices~outer~start~angle~shift = {#1}
+ } ,
+ slices~outer~arc /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ {#1}
+ {#2}
+ { outer~start }
+ { outer~end }
+ { -- ( \fp_use:c { l__wheelchart_outer~end_x_fp } , \fp_use:c { l__wheelchart_outer~end_y_fp } ) }
+ {}
+ }
+ } ,
+ slices~outer~arc~tangent /. is~choice ,
+ slices~outer~arc~tangent / false /. code = {} ,
+ slices~outer~arc~tangent / false /. value~forbidden ,
+ slices~outer~arc~tangent / true /. code =
+ {
+ \tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ { \__wheelchart_diff_atan:nnnn { outer~start } { inner~start } { outer~end } { inner~end } }
+ { 0 }
+ { outer~start }
+ { outer~end }
+ { -- ( \fp_use:c { l__wheelchart_outer~end_x_fp } , \fp_use:c { l__wheelchart_outer~end_y_fp } ) }
+ {
+ \fp_compare:nNnTF { \l__wheelchart_slices_arc_A_fp } > { 359.99 }
+ { \fp_set:Nn \l__wheelchart_slices_arc_A_fp { 1 } }
+ {
+ \fp_compare:nNnTF { \l__wheelchart_slices_arc_A_fp } = { 180 }
+ { \fp_set:Nn \l__wheelchart_slices_arc_A_fp { 0 } }
+ { \fp_set:Nn \l__wheelchart_slices_arc_A_fp { cotd ( 45 - \l__wheelchart_slices_arc_A_fp / 4 ) } }
+ }
+ }
+ }
+ } ,
+ slices~outer~arc~tangent / true /. value~forbidden ,
+ slices~outer~arc~tangent /. initial = false ,
+ slices~outer~arc~tangent /. default = true ,
+ slices~outer~arrow /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ \__wheelchart_slices_arrow:nnnnn
+ {#1}
+ {#2}
+ { outer~start }
+ { outer~end }
+ { -- ( \fp_use:c { l__wheelchart_outer~end_x_fp } , \fp_use:c { l__wheelchart_outer~end_y_fp } ) }
+ }
+ } ,
+ slices~outer~end~angle~shift /. initial = 0 ,
+ slices~outer~start~angle~shift /. initial = 0 ,
+ slices~outer~to /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_outer_tl
+ {
+ \__wheelchart_slices_to:nn {#1} {#2}
+ ( \fp_use:c { l__wheelchart_outer~end_x_fp } , \fp_use:c { l__wheelchart_outer~end_y_fp } )
+ }
+ } ,
+ slices~pos /. initial = 0.5 ,
+ slices~scope /. style = { slices_scope /. style = {#1} } ,
+ slices_scope /. style = {} ,
+ slices~sep /. initial = 0 ,
+ slices~start~arc /. code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_start_tl
+ {
+ \__wheelchart_slices_arc:nnnnnn
+ {#1}
+ {#2}
+ { inner~start }
+ { outer~start }
+ { -- cycle }
+ {}
+ }
+ } ,
+ slices~start~arrow/.code~2~args =
+ {
+ \tl_set:Nn \l__wheelchart_slices_start_tl
+ {
+ \__wheelchart_slices_arrow:nnnnn
+ {#1}
+ {#2}
+ { inner~start }
+ { outer~start }
+ { -- cycle }
+ }
+ } ,
+ slices~start~to /. code~2~args = { \tl_set:Nn \l__wheelchart_slices_start_tl { \__wheelchart_slices_to:nn {#1} {#2} cycle } } ,
+ slices~style /. style = { slices_style /. style = {#1} } ,
+ slices_style /. style = {} ,
+ slices~style = { \WCvarB } ,
+ slices~to /. style~2~args =
+ {
+ slices~end~to = {#1} {#2} ,
+ slices~start~to = { - (#1) } { - (#2) }
+ } ,
+ start~angle /. initial = 90 ,
+ start~half /. style =
+ {
+ start~angle =
+ {
+ (#1) -
+ \fp_eval:n
+ {
+ \l__wheelchart_counter_or_clockwise_fp * \fp_use:c { l__wheelchart_value_1_fp } * 0.5
+ * ( \l__wheelchart_total_angle_fp / \WCtotalnum )
+ }
+ }
+ } ,
+ start~half /. default = 90 ,
+ title /. initial= {} ,
+ title~left /. initial = {} ,
+ title~left~sep /. initial = 0.5 ,
+ title~left~style /. style = { title~left_style /. style = {#1} } ,
+ title~left_style /. style = {} ,
+ title~sep /. initial = 0.5 ,
+ title~style /. style = { title_style /. style = {#1} } ,
+ title_style /. style = {} ,
+ total~angle /. initial = 360 ,
+ total~count /. code =
+ {
+ \tl_set:Nn \l__wheelchart_type_tl { totalcount }
+ \__wheelchart_def_macro:Nn \l__wheelchart_total_count_fp {#1}
+ } ,
+ triangle~proportional~area /. style~2~args =
+ {
+ domain /. expanded = 0 \c_colon_str 1 ,
+ plot = { { (##2) * sqrt ( 1 - (##1) ) * (#1) / 2 } , { - sqrt ( 1 - (##1) ) * (#2) } } ,
+ radius = { -1 } { 1 } ,
+ samples = 2 ,
+ wheel~data~pos = 0.5
+ } ,
+ triangle~proportional~height /. style~2~args =
+ {
+ domain /. expanded = 0 \c_colon_str 1 ,
+ plot = { { (##2) * ( 1 - (##1) ) * (#1) / 2 } , { ( (##1) - 1 ) * (#2) } } ,
+ radius = { -1 } { 1 } ,
+ samples = 2 ,
+ wheel~data~pos = 0.5
+ } ,
+ value /. initial = { \WCvarA } ,
+ WC_list /. code~2~args =
+ {
+ \cs_set:cpn {#1}
+ { \use:e { \clist_item:nn {#2} { \int_mod:nn { \WCcount-1 } { \clist_count:n {#2} } + 1 } } }
+ %note the \use:e such that \WClist<name> also works when given as an argument to pgfmath
+ %if the list contains a macro, for example
+ %\begin{tikzpicture}
+ %\def\n{1}
+ %\wheelchart[
+ % value=\WClistA,
+ % WClistA={\n}
+ %]{\exampleforthismanual}
+ %\end{tikzpicture}
+ %https://tex.stackexchange.com/questions/671298/clist-item-and-pgfmathsetmacro-causing-an-error
+ } ,
+ wheel~data /. initial = {} ,
+ wheel~data~angle~pos /. initial = 0.5 ,
+ wheel~data~angle~shift /. initial = 0 ,
+ wheel~data~pos /. initial = 0.66 ,
+ wheel~data~sep /. initial = 0 ,
+ wheel~data~style /. style = { wheel_data_style /. style = {#1} } ,
+ wheel_data_style /. style = {} ,
+ wheel~lines /. style =
+ {
+ bool_set_true = \l__wheelchart_wheel_lines_bool ,
+ wheel_lines /. style = {#1}
+ } ,
+ wheel_lines /. style = {} ,
+ xbar /. style~2~args =
+ {
+ domain /. expanded = 0 \c_colon_str {#1} ,
+ plot = { {##1} , {##2} } ,
+ radius = { 0 } {#2} ,
+ samples = 2 ,
+ wheel~data~pos = 0.5
+ } ,
+ ybar /. style~2~args =
+ {
+ domain /. expanded = 0 \c_colon_str {#2} ,
+ plot = { {##2} , {##1} } ,
+ radius = { 0 } {#1} ,
+ samples = 2 ,
+ wheel~data~pos = 0.5
+ } ,
+ }
+
+\pgfkeys
+ {
+ / wheelchart /. unknown /. code =
+ {
+ \tl_set:Ne \l__wheelchart_key_name_tl { \pgfkeyscurrentname }%it is necessary to define \l__wheelchart_key_name_tl
+ %because \pgfkeyscurrentname will be overwritten by / errors / unknown~key /. expanded
+ \regex_match:nVTF { \{(.+)\} } \l__wheelchart_key_name_tl
+ {
+ \tl_set:Ne \l__wheelchart_key_range_tl { \pgfkeyscurrentname }
+ \regex_replace_all:nnN { \{(.+)\} } {} \l__wheelchart_key_name_tl
+ \regex_replace_all:nnN { [\w\s]+\{(.+)\} } { \1 } \l__wheelchart_key_range_tl
+ \str_if_eq:eeTF { \l__wheelchart_key_range_tl } { list }
+ {
+ \pgfkeys { / wheelchart , WC_list = { l__wheelchart_list_\l__wheelchart_key_name_tl } {#1} }
+ \pgfkeys
+ {
+ / wheelchart ,
+ \l__wheelchart_key_name_tl /. expand~once = { \cs:w l__wheelchart_list_\l__wheelchart_key_name_tl\cs_end: }
+ }
+ }
+ {
+ \clist_gclear:N \g__wheelchart_slice_range_for_loop_clist
+ \foreach \l__wheelchart_slice_range_index_int [ parse = true ] in \l__wheelchart_key_range_tl
+ {
+ \clist_gput_right:Ne \g__wheelchart_slice_range_for_loop_clist
+ { \fp_eval:n { \l__wheelchart_slice_range_index_int } }
+ }
+ \clist_map_inline:Nn \g__wheelchart_slice_range_for_loop_clist
+ {
+ \clist_put_right:Nn \l__wheelchart_slice_range_local_clist {##1}
+ \clist_if_exist:cF { l__wheelchart_slice_##1_keys_clist }
+ { \clist_new:c { l__wheelchart_slice_##1_keys_clist } }
+ \str_if_eq:eeTF { \l__wheelchart_key_name_tl } { slice }
+ { \clist_put_right:cn { l__wheelchart_slice_##1_keys_clist } {#1} }
+ {
+ \clist_put_right:ce { l__wheelchart_slice_##1_keys_clist }
+ { \exp_not:V \l__wheelchart_key_name_tl \exp_not:n { = {#1} } }
+ }
+ }
+ }
+ }
+ {
+ \str_if_eq:eeTF { \str_range:Nnn \l__wheelchart_key_name_tl { 1 } { 6 } } { WClist }
+ { \pgfkeys { / wheelchart , WC_list = { \l__wheelchart_key_name_tl } {#1} } }
+ { \pgfkeys { / errors / unknown~key /. expanded = { \l__wheelchart_key_name_tl } {#1} } }
+ }
+ }
+ }%this gives an error message if a key of the form <unknown key for wheelchart>{<range>} is given
+
+%%> \subsection{The command \textbackslash wheelchart}
+
+\NewDocumentCommand { \wheelchart } { O{} m }
+ {
+ {%note the double {{...}} such that the contents is in a group and such that & can be used in pgfmath in a tabular
+ \pgfkeys { / wheelchart , #1 }
+ \@ifpackageloaded { siunitx }
+ { \cs_set:Npn \WCperc { \qty { \WCpercentagerounded } { \percent } } }
+ { \cs_set:Npn \WCperc { \WCpercentagerounded \, \% } }%the definition of \WCperc is placed inside the command \wheelchart
+ %such that \WCperc is not defined outside this command
+ \bool_if:NTF \l__wheelchart_legend_only_bool
+ {
+ \__wheelchart_initial:n {#2}
+ \bool_if:NT \l__wheelchart_legend_row_bool
+ { \__wheelchart_def_WClegend: }
+ \pgfkeysvalueof { / wheelchart / legend }
+ }
+ {
+ \fp_set:Nn \l__wheelchart_coord_determinant_fp { \pgf@yy * \pgf@xx - \pgf@yx * \pgf@xy }
+ \begin { scope } [ shift /. expanded = { \pgfkeysvalueof { / wheelchart / at } } ]
+ \begin { scope } [ local~bounding~box /. expanded = \g__wheelchart_name_tl ]
+ \__wheelchart_def_macros:n { total~angle }
+ \__wheelchart_initial:n {#2}
+ \__wheelchart_def_macros:n { start~angle }
+ \bool_if:NF \l__wheelchart_plot_bool
+ {
+ \bool_set_false:N \l__wheelchart_def_inner_contour_bool
+ \bool_if:NTF \l__wheelchart_contour_bool
+ {
+ \bool_set_true:N \l__wheelchart_def_inner_contour_bool
+ \tl_build_gbegin:N \g__wheelchart_outer_contour_tl
+ \__wheelchart_for_loop:n
+ {
+ \tl_build_gput_left:Ne \g__wheelchart_outer_contour_tl
+ {
+ ( \fp_use:N \g__wheelchart_new_angle_fp \c_colon_str \fp_use:N \l__wheelchart_outer_radius_fp )
+ arc
+ [
+ start~angle = \fp_use:N \g__wheelchart_new_angle_fp ,
+ end~angle = \fp_use:N \g__wheelchart_angle_fp ,
+ radius = \fp_use:N \l__wheelchart_outer_radius_fp
+ ]
+ --
+ }
+ }
+ \tl_build_gend:N \g__wheelchart_outer_contour_tl
+ }
+ {
+ \bool_if:NT \l__wheelchart_middle_fill_bool
+ { \bool_set_true:N \l__wheelchart_def_inner_contour_bool }
+ }
+ \bool_if:NT \l__wheelchart_def_inner_contour_bool
+ {
+ \tl_build_gbegin:N \g__wheelchart_inner_contour_tl
+ \__wheelchart_for_loop:n
+ {
+ \tl_build_gput_right:Ne \g__wheelchart_inner_contour_tl
+ {
+ ( \fp_use:N \g__wheelchart_angle_fp \c_colon_str \fp_use:N \l__wheelchart_inner_radius_fp )
+ arc
+ [
+ start~angle = \fp_use:N \g__wheelchart_angle_fp ,
+ end~angle = \fp_use:N \g__wheelchart_new_angle_fp ,
+ radius = \fp_use:N \l__wheelchart_inner_radius_fp
+ ]
+ --
+ }
+ }
+ \tl_build_gend:N \g__wheelchart_inner_contour_tl
+ }
+ \bool_if:NT \l__wheelchart_middle_fill_bool
+ {
+ \fill [ / wheelchart / middle_fill ]
+ \fp_compare:nNnF { \l__wheelchart_total_angle_fp } = { 360 }
+ { ( 0 , 0 ) -- }
+ \g__wheelchart_inner_contour_tl cycle ;
+ }
+ }
+ \bool_if:NTF \l__wheelchart_discrete_bool
+ { \__wheelchart_discrete_algorithm: }
+ {
+ \__wheelchart_for_loop:n
+ {
+ \int_compare:nNnT { \WCcount } = { 1 }
+ {
+ %determine the orientation, this is necessary even if no plot is used, for example if
+ %inner radius > outer radius then \g__wheelchart_slices_orientation_fp is different from
+ %\l__wheelchart_counter_or_clockwise_fp
+ \fp_set:Nn \l__wheelchart_slices_orientation_new_angle_fp
+ {
+ \g__wheelchart_angle_fp +
+ (
+ \g__wheelchart_new_angle_fp == \g__wheelchart_angle_fp
+ ?
+ \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_total_angle_fp
+ :
+ \g__wheelchart_new_angle_fp - \g__wheelchart_angle_fp
+ )
+ / \l__wheelchart_samples_fp
+ }
+ \path let
+ \p { l__wheelchart_slices_orientation_1 } =
+ (
+ \__wheelchart_outer_plot:nn
+ { \fp_use:N \g__wheelchart_angle_fp }
+ { \fp_use:N \l__wheelchart_outer_radius_fp }
+ ) ,
+ \p { l__wheelchart_slices_orientation_2 } =
+ (
+ \__wheelchart_outer_plot:nn
+ { \fp_use:N \l__wheelchart_slices_orientation_new_angle_fp }
+ { \fp_use:N \l__wheelchart_outer_radius_fp }
+ ) ,
+ \p { l__wheelchart_slices_orientation_3 } =
+ (
+ \__wheelchart_inner_plot:nn
+ { \fp_use:N \l__wheelchart_slices_orientation_new_angle_fp }
+ { \fp_use:N \l__wheelchart_inner_radius_fp }
+ ) ,
+ \p { l__wheelchart_slices_orientation_4 } =
+ (
+ \__wheelchart_inner_plot:nn
+ { \fp_use:N \g__wheelchart_angle_fp }
+ { \fp_use:N \l__wheelchart_inner_radius_fp }
+ )
+ in
+ [
+ / utils / exec =
+ {
+ \fp_gset:Nn \g__wheelchart_slices_orientation_fp
+ {
+ sign
+ (
+ 0.1 * \y { l__wheelchart_slices_orientation_1 }
+ * ( \x { l__wheelchart_slices_orientation_4 } - \x { l__wheelchart_slices_orientation_2 } )
+ + 0.1 * \y { l__wheelchart_slices_orientation_2 }
+ * ( \x { l__wheelchart_slices_orientation_1 } - \x { l__wheelchart_slices_orientation_3 } )
+ + 0.1 * \y { l__wheelchart_slices_orientation_3 }
+ * ( \x { l__wheelchart_slices_orientation_2 } - \x { l__wheelchart_slices_orientation_4 } )
+ + 0.1 * \y { l__wheelchart_slices_orientation_4 }
+ * ( \x { l__wheelchart_slices_orientation_3 } - \x { l__wheelchart_slices_orientation_1 } )
+ )
+ * sign ( \l__wheelchart_coord_determinant_fp )
+ }
+ }
+ ]
+ ;%the terms are multiplied with 0.1 to try to avoid an overflow
+ \fp_compare:nNnT { \g__wheelchart_slices_orientation_fp } = { 0 }
+ { \fp_gset_eq:NN \g__wheelchart_slices_orientation_fp \l__wheelchart_counter_or_clockwise_fp }
+ }
+ \pgfkeysvalueof { / wheelchart / before~slices }
+ \bool_if:NTF \l__wheelchart_slices_bool
+ {
+ \__wheelchart_def_macros:n { slices~angle~pos , slices~angle~shift , slices~pos , slices~sep }
+ \__wheelchart_def_angle:nnnN
+ { \l__wheelchart_slices_angle_pos_fp }
+ { \l__wheelchart_slices_angle_shift_fp }
+ { \l__wheelchart_slices_sep_fp }
+ \l__wheelchart_slices_angle_fp
+ \begin { scope }
+ [
+ shift /. expanded =
+ {
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_slices_angle_pos_fp }
+ { \l__wheelchart_slices_angle_shift_fp }
+ { \l__wheelchart_slices_pos_fp }
+ { \l__wheelchart_slices_sep_fp }
+ } ,
+ rotate = \l__wheelchart_slices_angle_fp
+ ]
+ \fill [ / wheelchart / slices_style ] \l__wheelchart_slices_tl
+ \end { scope }
+ }
+ {
+ %Below we define x and y coordinates of the 4 points of the slice.
+ %We do not use the let operation in the path \fill[/wheelchart/slices_style] ... because then
+ %\n, \p, \x and \y can not be used as macro names inside the argument of a key which is applied
+ %on this path such as the key slices inner arc.
+ %First it is necessary to define \g__wheelchart_x_coord_fp and \g__wheelchart_y_coord_fp globally. Then we
+ %define local macros taking these values with an expanded definition. These are defined locally such that
+ %these macros do not interfere with values of another wheelchart, for example if wheelcharts would be nested.
+ %We do not use a \coordinate definition because this would be global which is not suited as explained above.
+ \__wheelchart_def_coord:nn { inner } { end }
+ \__wheelchart_def_coord:nn { inner } { start }
+ \__wheelchart_def_coord:nn { outer } { end }
+ \__wheelchart_def_coord:nn { outer } { start }
+ \fill [ / wheelchart / slices_style ]
+ ( \fp_use:c { l__wheelchart_outer~start_x_fp } , \fp_use:c { l__wheelchart_outer~start_y_fp } )
+ \l__wheelchart_slices_outer_tl
+ \l__wheelchart_slices_end_tl
+ \l__wheelchart_slices_inner_tl
+ \l__wheelchart_slices_start_tl
+ ;
+ }
+ \pgfkeysvalueof { / wheelchart / after~slices }
+ }
+ }
+ \__wheelchart_for_loop:n
+ {
+ \bool_if:NT \l__wheelchart_wheel_lines_bool
+ %this is placed inside \__wheelchart_for_loop:n such that wheel lines can be applied for specific slices
+ {
+ \int_step_inline:nnn { 0 } { \fp_eval:n { round ( \l__wheelchart_value_fp ) } }
+ %note the \fp_eval:n { round ( ... ) } to avoid the messages Missing character: There is no ... in font nullfont!
+ {
+ \fp_set:Nn \l__wheelchart_angle_wheel_lines_fp
+ {
+ \g__wheelchart_angle_fp
+ + ( \l__wheelchart_counter_or_clockwise_fp * (####1) * ( \l__wheelchart_total_angle_fp / \WCtotalnum ) )
+ }
+ \draw [ / wheelchart / wheel_lines ]
+ (
+ \__wheelchart_inner_plot:nn
+ { \fp_use:N \l__wheelchart_angle_wheel_lines_fp }
+ { \fp_use:N \l__wheelchart_inner_radius_fp }
+ )
+ --
+ (
+ \__wheelchart_outer_plot:nn
+ { \fp_use:N \l__wheelchart_angle_wheel_lines_fp }
+ { \fp_use:N \l__wheelchart_outer_radius_fp }
+ )
+ ;
+ }
+ }
+ }
+ \bool_if:NF \l__wheelchart_plot_bool
+ {
+ \bool_if:NT \l__wheelchart_contour_bool
+ {
+ \fp_compare:nNnTF { \l__wheelchart_total_angle_fp } = { 360 }
+ {
+ \draw [ / wheelchart / contour_style ] \g__wheelchart_inner_contour_tl cycle ;
+ \draw [ / wheelchart / contour_style ] \g__wheelchart_outer_contour_tl cycle ;
+ }
+ {
+ \draw [ / wheelchart / contour_style ] \g__wheelchart_inner_contour_tl \g__wheelchart_outer_contour_tl cycle ;
+ }
+ }
+ }
+ \__wheelchart_for_loop:n
+ {
+ \__wheelchart_def_macros:n
+ { data~pos , lines , lines~angle~pos , lines~angle~shift , lines~ext , lines~pos , lines~sep }
+ \fp_compare:nNnF { \l__wheelchart_lines_ext_fp } = { 0 }
+ {
+ \bool_if:NF \l__wheelchart_lines_ext_dir_bool
+ {
+ \__wheelchart_def_macros:n { lines~ext~dirsep }
+ \int_set:Nn \l__wheelchart_lines_ext_dir_int
+ {
+ \fp_eval:n
+ {
+ (
+ \WCdataangle < 90 - \l__wheelchart_lines_ext_dirsep_fp
+ ?
+ 1
+ :
+ (
+ \WCdataangle <= 90 + \l__wheelchart_lines_ext_dirsep_fp
+ ?
+ \l__wheelchart_lines_ext_top_dir_int
+ :
+ (
+ \WCdataangle < 270 - \l__wheelchart_lines_ext_dirsep_fp
+ ?
+ -1
+ :
+ (
+ \WCdataangle <= 270 + \l__wheelchart_lines_ext_dirsep_fp
+ ?
+ \l__wheelchart_lines_ext_bottom_dir_int
+ :
+ 1
+ )
+ )
+ )
+ )
+ }
+ }
+ }
+ \__wheelchart_def_macros:n { lines~ext~fixed~left , lines~ext~fixed~right }
+ }
+ \fp_compare:nF { \l__wheelchart_lines_fp == 0 && \l__wheelchart_lines_ext_fp == 0 }
+ {
+ \draw [ / wheelchart / lines_style ] let \p { l__wheelchart_lines_1 } =
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_data_angle_pos_fp }
+ { \l__wheelchart_data_angle_shift_fp }
+ { \l__wheelchart_data_pos_fp }
+ { \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp }
+ in
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_lines_angle_pos_fp }
+ { \l__wheelchart_lines_angle_shift_fp }
+ { \l__wheelchart_lines_pos_fp }
+ { \l__wheelchart_lines_sep_fp }
+ -- ( \p { l__wheelchart_lines_1 } )
+ \fp_compare:nNnF { \l__wheelchart_lines_ext_fp } = { 0 }
+ {
+ \str_case:enF { \pgfkeysvalueof { / wheelchart / lines~ext~fixed } }
+ {
+ { true }
+ {
+ --
+ (
+ {
+ \fp_eval:n
+ {
+ \l__wheelchart_lines_ext_dir_int == 1
+ ?
+ \l__wheelchart_lines_ext_fixed_right_fp
+ :
+ \l__wheelchart_lines_ext_fixed_left_fp
+ }
+ }
+ ,
+ \y { l__wheelchart_lines_1 }
+ )
+ }
+ { false }
+ { --++ ( { \fp_eval:n { \l__wheelchart_lines_ext_dir_int * \l__wheelchart_lines_ext_fp } } , 0 ) }
+ }
+ {
+ \pgfkeys
+ {
+ / errors / boolean~expected /. expanded =
+ { lines~ext~fixed }
+ { \pgfkeysvalueof { / wheelchart / lines~ext~fixed } }
+ }
+ }
+ coordinate
+ [ shift = { ( { \fp_eval:n { \l__wheelchart_lines_ext_dir_int * \l__wheelchart_data_sep_fp } } , 0 ) } ]
+ ( g__wheelchart_data_coordinate )
+ }
+ ;
+ }
+ \__wheelchart_if_text:nn { data }
+ {
+ \fp_compare:nNnTF { \l__wheelchart_lines_ext_fp } = { 0 }
+ {
+ \__wheelchart_def_macros:n { anchor~xsep , anchor~ysep }
+ \pgfmathparse
+ {
+ ( \WCdataangle == 0 ? "west" \c_colon_str
+ ( \WCdataangle == 90 ? "south" \c_colon_str
+ ( \WCdataangle == 180 ? "east" \c_colon_str
+ ( \WCdataangle == 270 ? "north" \c_colon_str
+ ( \WCdataangle <= \fp_use:N \l__wheelchart_anchor_ysep_fp ? "west" \c_colon_str
+ ( \WCdataangle < 90 - \fp_use:N \l__wheelchart_anchor_xsep_fp ? "south~west" \c_colon_str
+ ( \WCdataangle <= 90 + \fp_use:N \l__wheelchart_anchor_xsep_fp ? "south" \c_colon_str
+ ( \WCdataangle < 180 - \fp_use:N \l__wheelchart_anchor_ysep_fp ? "south~east" \c_colon_str
+ ( \WCdataangle <= 180 + \fp_use:N \l__wheelchart_anchor_ysep_fp ? "east" \c_colon_str
+ ( \WCdataangle < 270 - \fp_use:N \l__wheelchart_anchor_xsep_fp ? "north~east" \c_colon_str
+ ( \WCdataangle <= 270 + \fp_use:N \l__wheelchart_anchor_xsep_fp ? "north" \c_colon_str
+ ( \WCdataangle < 360 - \fp_use:N \l__wheelchart_anchor_ysep_fp ? "north~west" \c_colon_str
+ "west"
+ ))))))))))))
+ }
+ \tl_set:Ne \l__wheelchart_data_anchor_tl { \pgfmathresult }
+ \coordinate
+ [
+ at =
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_data_angle_pos_fp }
+ { \l__wheelchart_data_angle_shift_fp }
+ { \l__wheelchart_data_pos_fp }
+ {
+ \l__wheelchart_data_sep_fp +
+ (
+ \l__wheelchart_lines_fp == 0
+ ?
+ 0
+ :
+ \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp
+ )
+ }
+ ]
+ ( g__wheelchart_data_coordinate ) ;
+ }
+ {
+ \pgfmathparse { \int_use:N \l__wheelchart_lines_ext_dir_int == 1 ? "right" \c_colon_str "left" }
+ \tl_set:Ne \l__wheelchart_data_anchor_tl
+ { \pgfkeysvalueof { / wheelchart / lines~ext~\pgfmathresult \c_space_tl anchor } }
+ }
+ \node [ anchor = \l__wheelchart_data_anchor_tl , align = left , / wheelchart / data_style ]
+ at ( g__wheelchart_data_coordinate )
+ { \pgfkeysvalueof { / wheelchart / data } } ;%a separate \node and not at the end of the \draw with lines_style
+ %such that the key lines style is not passed to this \node
+ }
+ \__wheelchart_def_macros:n { arc~data~angle~pos , arc~data~dir }%these are needed for arc data and arc
+ \pgfinterruptpicture%
+ \fp_gset:Nn \g__wheelchart_half_ex_over_one_cm_fp { 0.5 ex / 1 cm }%
+ \endpgfinterruptpicture%
+ \fp_gset:Nn \g__wheelchart_arc_data_factor_fp { 0 }
+ \__wheelchart_if_text:nn { arc~data }
+ {
+ \__wheelchart_def_macros:n { arc~data~angle~shift , arc~data~pos , arc~data~sep }
+ \hbox_set:Nn \l__wheelchart_arc_data_box
+ { \pgfinterruptpicture { \pgfkeysvalueof { / wheelchart / arc~data } } \endpgfinterruptpicture }
+ \fp_gset:Nn \g__wheelchart_arc_data_slice_length_fp { 1 }%this is necessary if the value is 0
+ \__wheelchart_convex_comb_coord_plot:nnnnnnn
+ {
+ overlay ,
+ decorate ,
+ decoration =
+ {
+ text~along~path ,
+ text = { {} { \fp_gset:Nn \g__wheelchart_arc_data_slice_length_fp { \pgfdecoratedpathlength } } } ,
+ raise = -0.5 ex ,
+ text~align = \l__wheelchart_arc_data_align_tl ,
+ / wheelchart / arc_data_style
+ }
+ }%get the length of the path
+ %note the option overlay such that this does not increase the bounding box
+ %note the {} at the start of text and the braces around \fp_gset:Nn ... such that the compilation does not stall
+ { 0 }
+ { 1 }
+ { \l__wheelchart_plot_variable_fp }
+ { 0 }
+ { \l__wheelchart_arc_data_pos_fp }
+ { \l__wheelchart_arc_data_sep_fp }
+ \__wheelchart_convex_comb_coord_plot:nnnnnnn
+ {
+ decorate ,
+ decoration =
+ {
+ text~along~path ,
+ text =
+ {
+ { { \fp_gset:Nn \g__wheelchart_arc_data_factor_fp { \the \pgfdecoratedcompleteddistance } } }
+ \pgfkeysvalueof { / wheelchart / arc~data }
+ {
+ {
+ \fp_gset:Nn \g__wheelchart_arc_data_factor_fp
+ {
+ ( \the \pgfdecoratedcompleteddistance - \g__wheelchart_arc_data_factor_fp )
+ / \g__wheelchart_arc_data_slice_length_fp
+ }
+ }
+ }
+ } ,
+ raise = -0.5 ex ,
+ text~align = \l__wheelchart_arc_data_align_tl ,
+ / wheelchart / arc_data_style
+ }
+ }%note the double braces around \fp_gset:Nn ... so that for example arc data=text {\qty{5}{\percent}} is allowed
+ %note that \def\mytext{}\path[decorate,decoration={text along path,text={\mytext}}] (0,0)--(1,1);
+ %gives the message Missing character: There is no ... in font nullfont!, then
+ %text={\pgfkeysvalueof { / wheelchart / arc~data }{}} can be used if the \fp_gset:Nn ... would not be present
+ { \fp_use:c { c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp } }
+ { \fp_use:c { c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp } }
+ {
+ \l__wheelchart_plot_variable_fp * \l__wheelchart_arc_data_dir_fp * 1.1
+ * ( \dim_to_fp:n { \box_wd:N \l__wheelchart_arc_data_box } / \g__wheelchart_arc_data_slice_length_fp )
+ + \l__wheelchart_arc_data_angle_pos_fp
+ }
+ { \l__wheelchart_arc_data_angle_shift_fp }
+ { \l__wheelchart_arc_data_pos_fp }
+ { \l__wheelchart_arc_data_sep_fp }
+ \fp_compare:nNnT { \g__wheelchart_arc_data_factor_fp } < { 0 }
+ {
+ \PackageWarning { wheelchart }
+ {
+ The~arc~data~in~slice~\WCcount \c_space_tl did~(possibly)~not~fit.~
+ Increase~the~absolute~value~of~arc~data~dir.
+ }%refer to \WCcount and not to \pgfkeysvalueof { / wheelchart / arc~data }
+ %because the latter is not necessarily unique
+ }
+ }
+ \bool_if:NT \l__wheelchart_arc_bool
+ {
+ \__wheelchart_def_macros:n { arc~pos , arc~sep }
+ \str_case:enF { \pgfkeysvalueof { / wheelchart / arc~around~text } }
+ {
+ { true }
+ {
+ \__wheelchart_arc_around_text:nnn { first } { -1 } { 0 }
+ \__wheelchart_arc_around_text:nnn { second } { 1 } { 1 }
+ }
+ { false }
+ {
+ \__wheelchart_convex_comb_coord_plot:nnnnnnn
+ { draw , / wheelchart / arc_style }
+ { 0 }
+ { 1 }
+ { \l__wheelchart_plot_variable_fp }
+ { 0 }
+ { \l__wheelchart_arc_pos_fp }
+ { \l__wheelchart_arc_sep_fp }
+ }
+ }
+ {
+ \pgfkeys
+ {
+ / errors / boolean~expected /. expanded =
+ { arc~around~text }
+ { \pgfkeysvalueof { / wheelchart / arc~around~text } }
+ }
+ }
+ }
+ \__wheelchart_if_text:nn { inner~data }
+ {
+ \__wheelchart_def_macros:n { inner~data~angle~pos , inner~data~angle~shift , inner~data~pos , inner~data~sep }
+ \node [ align = left , / wheelchart / inner_data_style ] at
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_inner_data_angle_pos_fp }
+ { \l__wheelchart_inner_data_angle_shift_fp }
+ { \l__wheelchart_inner_data_pos_fp }
+ { \l__wheelchart_inner_data_sep_fp }
+ { \pgfkeysvalueof { / wheelchart / inner~data } } ;
+ }
+ \__wheelchart_if_text:nn { wheel~data }
+ {
+ \__wheelchart_def_macros:n { wheel~data~angle~pos , wheel~data~angle~shift , wheel~data~pos , wheel~data~sep }
+ \node [ align = left , / wheelchart / wheel_data_style ] at
+ \__wheelchart_convex_comb_coord:nnnn
+ { \l__wheelchart_wheel_data_angle_pos_fp }
+ { \l__wheelchart_wheel_data_angle_shift_fp }
+ { \l__wheelchart_wheel_data_pos_fp }
+ { \l__wheelchart_wheel_data_sep_fp }
+ { \pgfkeysvalueof { / wheelchart / wheel~data } } ;
+ }
+ \pgfkeysvalueof { / wheelchart / legend~entry }
+ }
+ \bool_if:NT \l__wheelchart_legend_row_bool
+ { \__wheelchart_def_WClegend: }
+ \__wheelchart_if_text:nn { middle }
+ { \node [ align = center , / wheelchart / middle_style ] at ( 0 , 0 ) { \pgfkeysvalueof { / wheelchart / middle } } ; }
+ \pgfkeysvalueof { / wheelchart / legend }
+ \end { scope }
+ \__wheelchart_caption_and_title:nnnnn
+ { caption~left } { north~west } { left } { \g__wheelchart_name_tl .south~west } { -1 }
+ \__wheelchart_caption_and_title:nnnnn
+ { caption } { north } { center } { \g__wheelchart_name_tl .south -| 0 , 0 } { -1 }
+ \__wheelchart_caption_and_title:nnnnn
+ { title~left } { south~west } { left } { \g__wheelchart_name_tl .north~west } { 1 }
+ \__wheelchart_caption_and_title:nnnnn
+ { title } { south } { center } { \g__wheelchart_name_tl .north -| 0 , 0 } { 1 }
+ \end { scope }
+ }
+ }
+ } \ No newline at end of file
diff --git a/graphics/pgf/contrib/wheelchart/wheelchart.tex b/graphics/pgf/contrib/wheelchart/wheelchart.tex
index 23fc9a98e4..bfb1a70cbc 100644
--- a/graphics/pgf/contrib/wheelchart/wheelchart.tex
+++ b/graphics/pgf/contrib/wheelchart/wheelchart.tex
@@ -1,5 +1,5 @@
%% wheelchart.tex
-%% Copyright 2022 Matthias Floré
+%% Copyright 2023 Matthias Floré
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -18,31 +18,114 @@
\documentclass[a4paper,english,dvipsnames]{ltxdoc}
\usepackage[english]{babel}
\usepackage{graphicx}
-\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
+\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm]{geometry}
\usepackage{parskip}
+\usepackage{iftex}
+\ifluatex
+\else
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
+\fi
+\usepackage[page]{totalcount}%\totalpages or \getpagerefnumber{Thesourcecode}-1
\usepackage{mathtools}
\usepackage{amssymb}
\usepackage{interval}
\allowdisplaybreaks
-\usepackage{siunitx}
-\usepackage{etoolbox}
+\usepackage{tabularray}
+\UseTblrLibrary{counter,siunitx}
\usepackage{listofitems}
+\usepackage{pdflscape}
\usepackage{wheelchart}
-\usetikzlibrary{decorations.markings,patterns}
+\usetikzlibrary{decorations.markings,decorations.text,patterns}
+\usepackage{tikzlings}
\input{pgfmanual-en-macros.tex}
-\usepackage[page]{totalcount}
+%The environments commandmeta and commandmetameta and the macros \extractcommandmeta and \extractcommandmetameta below are modified from pgfmanual-en-macros.tex
+\newenvironment{commandmeta}[2]{
+ \begin{pgfmanualentry}
+ \extractcommandmeta#1#2\@@
+ \pgfmanualbody
+}
+{
+ \end{pgfmanualentry}
+}
+\def\extractcommandmeta#1#2\@@{%
+ \removeats{#1}%
+ \pgfmanualentryheadline{%
+ \pgfmanualpdflabel{\textbackslash\strippedat\meta{#2}}{}%
+ \declare{\expandafter\texttt\expandafter{\string#1\meta{#2}}}%
+ }%
+ \index{\strippedat\meta{#2} @\protect\myprintocmmand{\strippedat\meta{#2}}}
+}
+\newenvironment{commandmetameta}[2]{
+ \begin{pgfmanualentry}
+ \extractcommandmetameta#1\@@#2\@@
+ \pgfmanualbody
+}
+{
+ \end{pgfmanualentry}
+}
+\def\extractcommandmetameta#1\@@#2\@@{%
+ \pgfmanualentryheadline{%
+ \pgfmanualpdflabel{\textbackslash\meta{#1}\meta{#2}}{}%
+ \declare{\expandafter\texttt\expandafter{\textbackslash\meta{#1}\meta{#2}}}%
+ }%
+ \index{\meta{#1}\meta{#2} @\protect\myprintocmmand{\meta{#1}\meta{#2}}}
+}
+\usepackage{codehigh}
\usepackage{fancyhdr}
\pagestyle{fancy}
\renewcommand{\headrulewidth}{0pt}
-\cfoot{\iftotalpages\begin{tikzpicture}[scale=0.15]\wheelchart[data={},gap,middle=\thepage,slices style={/utils/exec={\ifnum\thepage=\WCcount\def\WCcolor{Cyan}\else\def\WCcolor{Gray}\fi},\WCcolor},total count={\totalpages-1},value=1]{}\end{tikzpicture}\fi}
-\fancyhead{}
+\addtolength{\headheight}{3pt}
+\addtolength{\topmargin}{-3pt}
+\fancyhead[L,R]{}
+\fancyhead[C]{\iftotalpages\ifnum\thepage<\getpagerefnumber{Usage}\else \begin{tikzpicture}
+\def\WCtotal{16.6}%21-<left=2.25cm>-<right=2.25cm>+2<gap polar=0.05>
+\def\WCarrow{0.8}
+\pgfkeys{
+ /wheelchart,
+ data=,
+ gap polar=0.05
+}
+\wheelchart[
+ etoc use name=wheelchart table of contents,
+ slices end arrow={\WCcount==\WCtotalcount?0:\WCarrow}{0},
+ slices start arrow={\WCcount==1?0:-\WCarrow}{0},
+ slices style={MidnightBlue!\fpeval{\thepage<\WCetocthepage||\thepage>=\WCetocthepage+\WCetocthenumberofpages?20:50}},
+ value=\WCetocthenumberofpages,
+ xbar={\WCtotal}{0.4}
+]{}
+\wheelchart[
+ at={({(\thepage -\getpagerefnumber{Usage})*\WCtotal/(\getpagerefnumber{Thesourcecode}-\getpagerefnumber{Usage})},0)},
+ slices end arrow={\thepage==\getpagerefnumber{Thesourcecode}-1?0:\WCarrow}{0},
+ slices start arrow={\thepage==\getpagerefnumber{Usage}?0:-\WCarrow}{0},
+ xbar={\WCtotal/(\getpagerefnumber{Thesourcecode}-\getpagerefnumber{Usage})}{0.4}
+]{1/PineGreen/}
+\end{tikzpicture}\fi\fi}
+\fancyfoot[C]{\ifdefined\fancyfootdefaultbox\begin{tikzpicture}[scale=0.15]
+\useasboundingbox (-3,-3) rectangle (3,3);
+\node[inner sep=0pt] {\usebox{\fancyfootdefaultbox}};%reusing the box compiles faster
+%\wheelchart[
+% gap,
+% middle=\thepage,
+% slices style=Gray,
+% slices style{\thepage}=Cyan,
+% %slices style={
+% % /utils/exec={\pgfmathsetmacro{\WCcolor}{\thepage==\WCcount?"Cyan":"Gray"}},
+% % \WCcolor
+% %},
+% total count=\getpagerefnumber{Thesourcecode}-1%\totalpages
+%]{}
+\wheelchart[
+ gap,
+ middle=\thepage,
+ start angle={90-(\thepage-1)*(360/(\getpagerefnumber{Thesourcecode}-1))},%\totalpages
+ total angle={360/(\getpagerefnumber{Thesourcecode}-1)},%\totalpages
+]{1/Cyan/}
+\end{tikzpicture}\fi}
\usepackage{etoc}
-\def\WCtableofcontents{}
-\etocsetstyle{section}{}{}{\xappto\WCtableofcontents{,\etocthename/\etocthenumber/\etocthepage}}{}
\etocsettocstyle{\hypersetup{hidelinks}}{}
\etocglobaldefs
+\usepackage[nottoc]{tocbibind}
\usepackage{imakeidx}
\makeindex[program=makeindex,columns=2,intoc=true]
\indexsetup{othercode={\thispagestyle{fancy}}}
@@ -54,41 +137,95 @@
\setcounter{secnumdepth}{2}
\title{The \texttt{wheelchart} package\\[12pt]\large Draw wheelcharts with \tikzname}
\author{Matthias Flor\'e}
-\date{Version 1.0 (2022/09/11)}%\\[12pt]
+\date{Version 2.0 (2023/12/03)}%\\[12pt]
\begin{document}
+\iftotalpages%
+\newsavebox{\fancyfootdefaultbox}%
+\begin{lrbox}{\fancyfootdefaultbox}%note the % to avoid extra space
+\begin{tikzpicture}[scale=0.15]
+\useasboundingbox (-3,-3) rectangle (3,3);
+\wheelchart[
+ gap,
+ slices style=Gray,
+ total count=\getpagerefnumber{Thesourcecode}-1%\totalpages
+]{}
+\end{tikzpicture}%note the % to avoid extra space
+\end{lrbox}%
+\fi%
\maketitle
\thispagestyle{fancy}
\begin{abstract}
-\noindent This package is based on the package |tikz| (see \cite{TtTaPGFp}) and can be used to draw wheelcharts with \tikzname. It provides several options to customize the wheelcharts. Other tools for creating wheelcharts or pie charts can be found in \cite{MpMP}, \cite{JhcIparowcltopotPGFm}, \cite{Tumfdb}, \cite{RSVpaaMfp} and \cite{XdPCbupp}.% This is the manual for version .
+\noindent This package is based on the package |tikz| (see \cite{TtTaPGFp}) and can be used to draw various kinds of diagrams such as a bar chart, doughnut chart, infographic, pie chart, ring chart, square chart, sunburst chart, waffle chart and wheel chart with \tikzname. It provides several options to customize the diagrams. It is also possible to specify a plot for the shape of the chart. Furthermore a legend can be added and the table of contents can be displayed as one of these diagrams. Other tools for creating wheelcharts or pie charts can be found in \cite{MpMP}, \cite{JhcIparowcltopotPGFm}, \cite{Tumfdb}, \cite{XdPCbupp} and \cite{RSVpaaMfp}.% This is the manual for version .
\end{abstract}
\section*{\contentsname}
-\tableofcontents
-\patchcmd{\WCtableofcontents}{,}{}{}{}
-\begin{codeexample}[]
+\iftotalpages
+\begin{codeexample}[preamble={%\usepackage[page]{totalcount}
+\usepackage{etoolbox}
+\usetikzlibrary{decorations.text}
+\usepackage{etoc}
+\etocsettocstyle{\hypersetup{hidelinks}}{}
+\etocglobaldefs
+\usepackage[linktoc=all]{hyperref}}]
\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ for loop start={\colorlet{WCcolor}{MidnightBlue!\fpeval{(\WCcount/\WCtotalcount)*100}}},
+ gap,
+ start angle=0,
+ value=\WCetocthenumberofpages
+}
\wheelchart[
+ after slices={
+ \pgfdeclareradialshading{WCshading}{\pgfpoint{0cm}{0cm}}{
+ color(0bp)=(WCcolor);
+ color(16.66666bp)=(WCcolor);%2/3 * 25bp
+ color(20.83333bp)=(WCcolor!10);%2.5/3 * 25bp
+ color(25bp)=(WCcolor);
+ color(50bp)=(WCcolor)
+ }
+ \shade[even odd rule,shading=WCshading] (0,0) circle[radius=3] circle[radius=2];
+ },
+ data=,
+ etoc count total pages=\getpagerefnumber{Thesourcecode}-1,%\totalpages
+ etoc level=section,
+ etoc name=wheelchart table of contents,
+ slices style={
+ fill=none,
+ clip
+ }
+]{}
+\hypersetup{linkcolor=.}
+\wheelchart[
+ anchor ysep{7,8}=30,
data={%
-\pgfmathsetmacro{\WCcolornumber}{(\WCcount/\WCtotalcount)*100}%
-\ifdefempty{\WCvarB}{\gdef\WChyperlink{section*.3}}{\gdef\WChyperlink{section.\WCcount}}%
-\hyperlink{\WChyperlink}{%
-\textbf{\textcolor{PineGreen!\WCcolornumber}{\Large\ifdefempty{\WCvarB}{}{\WCvarB{} }\WCvarA}}}\\%
-\hyperlink{\WChyperlink}{\textcolor{Cyan}{page \WCvarC}}%
-},
- gap,
+ \textcolor{WCcolor}{%
+ \textbf{\Large\ifdefempty{\WCetocthenumber}{}{\WCetocthelinkednumber{} }\WCetocthelinkedname}}\\%
+ \textcolor{PineGreen}{page \WCetocthelinkedpage}%
+ },
+ etoc use name=wheelchart table of contents,
lines,
- lines style={Cyan,very thick},
+ lines style=PineGreen,
middle={\LARGE The\\[10pt]\huge\texttt{wheelchart}\\[10pt]\LARGE package},
- slices style={
- /utils/exec={\pgfmathsetmacro{\WCcolornumber}{(\WCcount/\WCtotalcount)*100}},
- PineGreen!\WCcolornumber,
- draw=Cyan,
- very thick
+ slice{\getrefnumber{Keys}}={
+ arc={
+ draw=PineGreen,
+ ->
+ },
+ arc around text,
+ arc data=~Options for customization~,
+ arc data style={text color=PineGreen},
+ lines sep=0.5
},
- value=1
-]{\WCtableofcontents}
+ slices style={
+ fill=none,
+ draw=PineGreen,
+ ultra thick
+ }
+]{}
\end{tikzpicture}
\end{codeexample}
-\section{Usage}
+\fi
+\section{Usage}\label{Usage}
The package |wheelchart| can be used by putting the following in the preamble.
\begin{codeexample}[code only]
\usepackage{wheelchart}
@@ -98,17 +235,17 @@ The package |wheelchart| loads the package |tikz| and the \tikzname{} library |c
Many examples in this manual use colors which can be defined by giving |dvipsnames| as an option to |\documentclass|.
\section{The main macro}
\begin{command}{\wheelchart\opt{\oarg{options}}\marg{wheelchart data}}
-This command can be placed inside a |tikzpicture| environment. It draws a wheelchart with \meta{wheelchart data}. The \meta{wheelchart data} is a comma separated list. Each item in this list corresponds to one slice of the wheelchart and consists of data separated by a |/|. The precise syntax of the \meta{wheelchart data} will be explained below. The \meta{options} can be given with the keys described in Section \ref{Keys}.
+This command can be placed inside a |tikzpicture| environment. It draws a wheelchart with \meta{wheelchart data}. With the initial settings, the \meta{wheelchart data} is a comma separated list in which each item corresponds to one slice of the wheelchart and consists of data separated by a |/|. The precise syntax of the \meta{wheelchart data} will be explained below. The \meta{options} can be given with the keys described in Section \ref{Keys}.
\begin{command}{\exampleforthismanual}
To simplify the creation of examples in this manual, we define the \meta{wheelchart data} below.
\begin{codeexample}[]
\gdef\exampleforthismanual{%
-14/Apricot/Apricot/{A, B, C, E, K}/{north east lines}/0/0/Gray,
+14/Apricot/Apricot/{A, B, C, E, K}/north east lines/0/0/Gray,
40/LimeGreen/Lime/{B, C}/grid/0/15/Black,
20/Melon/Melon/{A, C}//0.5/0/none,
16/OliveGreen/Olive/{A, B, E, K}/dots/0/0/none,
-28/Peach/Peach/{A, B, C, E, K}/{fivepointed stars}/0/0/Lavender,
-32/Plum/Plum/{A, B, C, E, K}/bricks/0/{-15}/none,
+28/Peach/Peach/{A, B, C, E, K}/fivepointed stars/0/0/Lavender,
+32/Plum/Plum/{A, B, C, E, K}/bricks/0/-15/none,
50/WildStrawberry/Strawberry/{B, C, E, K}//1/0/DarkOrchid%
}
\end{codeexample}%pattern crosshatch,checkerboard
@@ -120,20 +257,38 @@ The default wheelchart with these data is shown below.
\end{tikzpicture}
\end{codeexample}
\end{command}
+\newpage%such that this section has its own block in the header
\section{Additional macros}
\begin{command}{\WCcount}
This macro gives the current number of the slice in the \meta{wheelchart data}.
-\begin{codeexample}[width=10cm]
-\begin{tikzpicture}
-\wheelchart[
- inner data=\WCcount
-]{\exampleforthismanual}
-\end{tikzpicture}
-\end{codeexample}
+\end{command}
+\begin{command}{\WCcountdiscrete}
+If the key |discrete| is true then this macro gives the current number of the \tikzname{} pic from the key |discrete pic|.
\end{command}
\begin{command}{\WCdataangle}
-This macro stores the sum of the value of the key |data angle shift| (taking into account the key |counterclockwise|) and the macro |\WCmidangle| modulo $360$.
+This macro is similar to |\WCmidangle| but also takes into account the keys |data angle pos|, |data angle shift| and |data sep| (with respect to the key |counterclockwise|).
+\end{command}
+\begin{command}{\WCetocthelinkedname}
+\end{command}
+\begin{command}{\WCetocthelinkednumber}
+\end{command}
+\begin{command}{\WCetocthelinkedpage}
+\end{command}
+\begin{command}{\WCetocthename}
+\end{command}
+\begin{command}{\WCetocthenumber}
\end{command}
+\begin{command}{\WCetocthenumberofpages}
+\end{command}
+\begin{command}{\WCetocthepage}
+\end{command}
+These macros are defined when the key |etoc level| is used.
+\begin{command}{\WClegend}
+If the key |legend row| is used then the resulting legend is stored in the macro |\WClegend|.
+\end{command}
+\begin{commandmeta}{\WClist}{name}
+This macro is defined when the key |WClist|\meta{name} is used and gives the element in the \meta{list} given to the key |WClist|\meta{name} with as index |\WCcount| modulo the length of this \meta{list}. The \meta{name} is the one given to the key |WClist|\meta{name}.
+\end{commandmeta}
\begin{command}{\WCmidangle}
This macro gives the angle in degrees modulo $360$ of the middle of the current slice.
\begin{codeexample}[width=10cm]
@@ -146,29 +301,24 @@ This macro gives the angle in degrees modulo $360$ of the middle of the current
fill=GreenYellow,
anchor=west,
text=Gray
- }
-]{\exampleforthismanual}
-\wheelchart[
- data={},
+ },
inner data={%
\textbackslash WCmidangle%
},
inner data style={
rotate=\WCmidangle,
font=\ttfamily
- },
- slices style={fill=none}
+ }
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
\end{command}
\begin{command}{\WCperc}
-This macro displays |\WCpercentage| rounded up to the number of decimals determined by the key |perc precision| followed by a \unit{\percent} symbol.
+This macro displays |\WCpercentagerounded| followed by a \unit{\percent} symbol.
If the package |siunitx| is loaded then the following code is used. The package |siunitx| can be loaded before or after the package |wheelchart|.
\begin{codeexample}[code only]
-\qty[round-mode=places,
- round-precision=\pgfkeysvalueof{/wheelchart/perc precision}]{\WCpercentage}{\percent}
+\qty{\WCpercentagerounded}{\percent}
\end{codeexample}
If the package |siunitx| is not loaded then the following code is used.
\begin{codeexample}[code only]
@@ -177,13 +327,12 @@ If the package |siunitx| is not loaded then the following code is used.
\end{command}
\begin{command}{\WCpercentage}
This macro gives the percentage of the current slice where the total is computed with the values of the key |value|. Note that rounding errors can occur.
-\begin{codeexample}[]
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
\wheelchart[
- data={\WCvarC\\\WCperc},
+ data=\WCvarC\\\WCperc,
slices style={
- /utils/exec=\pgfmathsetmacro{\WCcolornumber}{4*\WCpercentage},
- \WCvarB!\WCcolornumber
+ \WCvarB!\fpeval{4*\WCpercentage}
}
]{\exampleforthismanual}
\end{tikzpicture}
@@ -200,12 +349,11 @@ This macro gives the sum of all values of the key |value|.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={\WCvarC: \WCvarA},
+ data=\WCvarC: \WCvarA,
middle={%
\textbf{\huge Fruit}\\%
\WCtotalcount{} species\\%
- \pgfmathprintnumber{\WCtotalnum}
- pieces%
+ \WCtotalnum{} pieces%
}
]{\exampleforthismanual}
\end{tikzpicture}
@@ -217,87 +365,113 @@ This macro gives the sum of all values of the key |value|.
\end{command}
\begin{command}{\WCvarC}
\end{command}
-\begin{command}{\WCvarD}
-\end{command}
-\begin{command}{\WCvarE}
-\end{command}
-\begin{command}{\WCvarF}
-\end{command}
-\begin{command}{\WCvarG}
-\end{command}
-\begin{command}{\WCvarH}
-\end{command}
-\begin{command}{\WCvarI}
-\end{command}
-\begin{command}{\WCvarJ}
-\end{command}
-\begin{command}{\WCvarK}
-\end{command}
-\begin{command}{\WCvarL}
-\end{command}
-\begin{command}{\WCvarM}
-\end{command}
-\begin{command}{\WCvarN}
-\end{command}
-\begin{command}{\WCvarO}
-\end{command}
-\begin{command}{\WCvarP}
-\end{command}
-\begin{command}{\WCvarQ}
-\end{command}
-\begin{command}{\WCvarR}
-\end{command}
-\begin{command}{\WCvarS}
-\end{command}
-\begin{command}{\WCvarT}
-\end{command}
-\begin{command}{\WCvarU}
-\end{command}
-\begin{command}{\WCvarV}
-\end{command}
-\begin{command}{\WCvarW}
-\end{command}
-\begin{command}{\WCvarX}
-\end{command}
-\begin{command}{\WCvarY}
-\end{command}
-\begin{command}{\WCvarZ}
-The \meta{wheelchart data} in the command |\wheelchart| is a comma separated list. Each item in this list corresponds to one slice of the wheelchart and consists of data separated by a |/|. These individual data are interpreted as |\WCvarA/\WCvarB/\WCvarC/...| and can be accessed within the \meta{options} of the command |\wheelchart| by the macros |\WCvarA| till |\WCvarZ| except within the keys |at|, |caption|, |caption left|, |caption left style|, |caption style|, |contour|, |counterclockwise|, |expand list|, |middle fill|, |name|, |start angle|, |start half|, |title|, |title left|, |title left style|, |title style|, |total angle| and |total count|. Thus up to 26 data can be given to each slice of the wheelchart.
+\begin{commandmetameta}{prefix}{name}
+The \meta{wheelchart data} in the command |\wheelchart| is a list in which the items are separated by the value of the key |separator rows|. Each item in this list corresponds to one slice of the wheelchart and consists of data separated by the value of the key |separator columns|. The number of such data needs to be the same for each slice. With the initial settings, these individual data are interpreted as the macros |\WCvarA|, |\WCvarB|, |\WCvarC|, \dots, |\WCvarZ|, |\WCvarAA| and so on and can be accessed within the \meta{options} of the command |\wheelchart| if applicable.
+
+The name of these macros can be specified with \meta{prefix} and \meta{name} which are determined by respectively the keys |header prefix| and |header|.
Initially, only |\WCvarA|, |\WCvarB| and |\WCvarC| are used for |value=\WCvarA|, |slices style=\WCvarB| and |data=\WCvarC|.
+
+Other ways to specify data are by using for example a list such as an array with the package |tikz|, a list with the package |listofitems| or with the key |WClist|\meta{name}.
\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{patterns}}]
\begin{tikzpicture}
-\wheelchart[
- data={},
+\pgfkeys{
+ /wheelchart,
gap,
+ header={value,color,text,vitamins,pattern,explode,data angle shift,border},
+ header prefix=my,
+ value=1
+}
+\wheelchart[
+ data=,
radius={0.5}{3},
- slices style={\WCvarB!70,draw=\WCvarH,ultra thick,pattern=\WCvarE,pattern color=\WCvarB!70},
- value=1,
- wheel data=\WCvarC,
+ slices style={\mycolor!70,draw=\myborder,ultra thick,pattern=\mypattern,pattern color=\mycolor!70},
+ wheel data=\mytext,
%wheel data style={shift={(\WCmidangle:0.5)}},
%wheel data pos=0.5
]{\exampleforthismanual}
\wheelchart[
- data={\textcolor{\WCvarB}{Vitamines}\\\WCvarD},
- gap,
+ data={\textcolor{\mycolor}{Vitamins}\\\myvitamins},
radius={3.1}{4},
slices arrow={1}{0.2},
- value=1
+ slices style=\mycolor
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
-\end{command}
+\end{commandmetameta}
\section{Keys}\label{Keys}
The keys in this Section can be given as \meta{options} to the command |\wheelchart|.
+
+If applicable, an optional non-empty \meta{range} between braces can be given to a key after the \meta{key name} except for the key |slice| where the \meta{range} is mandatory. This \meta{range} is processed with |\foreach| with the option |parse=true|. Hereafter the elements are processed with |\fp_eval:n|. If such a \meta{range} is given to a key then the options given to this key will only be applied to a slice if the number of the slice is in the \meta{range}. The \meta{range} only makes sense for a key which is processed for each slice. For example, the \meta{range} does not make sense for the key |middle|.
+
+Furthermore, it is possible to add |{list}| after the \meta{key name}. Then a list can be given to the key. This list is processed analogously as how the key |WClist|\meta{name} works. Then the result is given to the key.
+
+We give some examples for the options \meta{range} and |{list}| below.
+\begin{itemize}
+\item The following wheelchart can be obtained with the 3 possibilities below.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data{list}={
+ An,example,where,some,of,the,
+ keys,are,given,using,a,list
+ },
+ slices style{list}={
+ Thistle,Orchid,Fuchsia
+ },
+ total count=12
+]{}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[code only,preamble={\usepackage{listofitems}}]
+\readlist\WCcolors{Thistle,Orchid,Fuchsia}
+
+\setsepchar{ }
+\readlist\WCdata{An example where some of the keys are given using a list}
+
+data={\WCdata[\WCcount]},
+
+slices style={
+ /utils/exec={\pgfmathsetmacro{\WCcolornumber}{int(Mod({\WCcount-1},\WCcolorslen)+1)}},
+ \WCcolors[\WCcolornumber]
+},
+
+total count=\WCdatalen,
+\end{codeexample}
+\begin{codeexample}[code only]
+slices style{1,4,...,\WCdatalen}=Thistle,
+slices style{2,5,...,\WCdatalen}=Orchid,
+slices style{3,6,...,\WCdatalen}=Fuchsia,
+\end{codeexample}
+\item The following wheelchart can be obtained with the 3 possibilities below.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ explode=\WCvarF,
+ pie
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[code only]
+explode={\WCcount==3?0.5:(\WCcount==7?1:0)},
+\end{codeexample}
+\begin{codeexample}[code only]
+explode{3}=0.5,
+explode{7}=1,
+\end{codeexample}
+\end{itemize}
+\begin{key}{/wheelchart/after slices=\marg{code} (initially \normalfont empty)}
+The \meta{code} given to this key will be executed after each slice of the wheelchart.
+\end{key}
\begin{key}{/wheelchart/anchor xsep=\marg{angle} (initially 5)}
\end{key}
\begin{key}{/wheelchart/anchor ysep=\marg{angle} (initially 5)}
-These keys determine the default anchor of the key |data| in the case that |lines ext=0|.
+These keys determine the default anchor of the key |data| in the case that |lines ext=0|. Note that rounding errors can occur in the computation of the angle which is used to determine the default anchor according to Table \ref{tableanchorofthekeydatainthecasethatlinesextequaltozero}.
\begin{table}[ht]
\centering
\begin{tabular}{ll}
& Anchor of the key |data|\\
-|\WCdataangle| & in the case that |lines ext=0|\\\hline
+Angle (up to rounding errors) & in the case that |lines ext=0|\\\hline
$0$ & west\\
$90$ & south\\
$180$ & east\\
@@ -315,98 +489,124 @@ $[360-\text{|anchor ysep|},360]$ & west\\
\end{tabular}
\caption{Anchor of the key \texttt{data} in the case that \texttt{lines ext=0}.}\label{tableanchorofthekeydatainthecasethatlinesextequaltozero}
\end{table}
-\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{patterns}}]
-\begin{tikzpicture}
-\wheelchart[
- inner data={$\WCvarA^{\circ}$},
- %inner data style={shift={(\WCmidangle:{-0.1})}},
- inner data sep=0.3,
- lines,
- radius={3}{4},
- slices style={pattern=\WCvarD,pattern color=\WCvarB!70},
-]{%
- 10/Maroon/south/{north east lines},
- 70/TealBlue/{south west}/grid,
- 10/Maroon/west/{north east lines},
- 10/Maroon/west/{north east lines},
- 70/TealBlue/{north west}/grid,
- 10/Maroon/north/{north east lines},
- 10/Maroon/north/{north east lines},
- 70/TealBlue/{north east}/grid,
- 10/Maroon/east/{north east lines},
- 10/Maroon/east/{north east lines},
- 70/TealBlue/{south east}/grid,
- 10/Maroon/south/{north east lines}%
-}
-\end{tikzpicture}
-\end{codeexample}
-\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{patterns}}]
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
\wheelchart[
anchor xsep=10,
anchor ysep=15,
- inner data={$\WCvarA^{\circ}$},
- %inner data style={shift={(\WCmidangle:{-0.1})}},
+ data=\WCvarA,
+ data angle pos=\WClistdap,
+ inner data=\ang{\WClistvalue},
+ inner data angle pos=\WClistdap,
inner data sep=0.3,
- lines,
- radius={3}{4},
- slices style={pattern=\WCvarD,pattern color=\WCvarB!70},
+ lines=0.5,
+ lines angle pos=\WClistdap,
+ slices style{list}={
+ Maroon,SeaGreen,Maroon
+ },
+ value=\WClistvalue,
+ WClistdap={0.9,0.5,0.1},
+ WClistvalue={10,65,15,15,65,10}
]{%
- 20/Maroon/south/{north east lines},
- 40/TealBlue/{south west}/grid,
- 30/Maroon/west/{north east lines},
- 30/Maroon/west/{north east lines},
- 40/TealBlue/{north west}/grid,
- 20/Maroon/north/{north east lines},
- 20/Maroon/north/{north east lines},
- 40/TealBlue/{north east}/grid,
- 30/Maroon/east/{north east lines},
- 30/Maroon/east/{north east lines},
- 40/TealBlue/{south east}/grid,
- 20/Maroon/south/{north east lines}%
+ south,
+ south west,
+ west,
+ west,
+ north west,
+ north,
+ north,
+ north east,
+ east,
+ east,
+ south east,
+ south%
}
\end{tikzpicture}
\end{codeexample}
-The anchor of the key |data| can also be specified manually by using the key |data style|.
-\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{patterns}}]
+The anchor of the key |data| can also be specified manually by using |data style={anchor=|\meta{anchor}|}|.
+\end{key}
+\begin{stylekey}{/wheelchart/arc=\marg{options} (initially \normalfont empty)}
+If this key is set then an arc with the style determined by this key will be drawn following the plot for a slice of the wheelchart.
+\end{stylekey}
+\begin{key}{/wheelchart/arc around text=\opt{\meta{boolean}} (default true, initially false)}
+If true then the arc with the style determined by the key |arc| will be split in two parts such that the gap between these two parts leaves space for the contents of the key |arc data|. The space between the arc and the contents of the key |arc data| can be increased with for example |~| in |arc data=~text~|.
+\end{key}
+\begin{key}{/wheelchart/arc data=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed following the plot for a slice of the wheelchart using the decoration |text along path|. This requires the \tikzname{} library |decorations.text|. The style of this decoration is given as follows. First, the option |raise=-0.5ex| is given. Then |text align| is determined by the key |arc data align|. Thereafter, the style of the key |arc data style| is added.
+
+Note that for example |\WCpercentage| follows the arc but |\WCperc| does not. Braces are required around some macros and for example |arc data={{{{\WCperc}}}}| requires 4 pairs of braces.
+\end{key}
+\begin{key}{/wheelchart/arc data align=\mchoice{center,left,right} (initially center)}
+This key determines the alignment of the contents of the key |arc data|.
+\end{key}
+\begin{key}{/wheelchart/arc data angle pos=\marg{value} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/arc data angle shift=\marg{angle} (initially 0)}
+These keys determine the position of the contents of the key |arc data| similar as the corresponding keys for the key |data|.
+\end{key}
+\begin{key}{/wheelchart/arc data dir=\marg{value} (initially 1)}
+This key determines the direction of the contents of the key |arc data|. If the \meta{value} is positive then the direction is the same as the direction of the slice. If the \meta{value} is negative then the direction is reversed. The values |1| and |-1| are recommended. When the contents of the key |arc data| is placed, the corresponding domain for the plot is estimated. A warning is given when the contents of the key |arc data| did (possibly) not fit. In this case, the absolute value of the key |arc data dir| should be increased.
+\end{key}
+\begin{key}{/wheelchart/arc data pos=\marg{value} (initially 1)}
+\end{key}
+\begin{key}{/wheelchart/arc data sep=\marg{value} (initially 1ex/1cm)}
+These keys determine the position of the contents of the key |arc data| similar as the corresponding keys for the key |data|.
+\end{key}
+\begin{stylekey}{/wheelchart/arc data style=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys which will be applied to the decoration for the key |arc data|.
+\end{stylekey}
+\begin{stylekey}{/wheelchart/arc first half=\marg{options} (initially \normalfont empty)}
+If |arc around text| is true then the arc with the style determined by the key |arc| will be split in two parts. The style determined by the key |arc first half| will be appended to the first half of the arc.
+\end{stylekey}
+\begin{key}{/wheelchart/arc pos=\marg{value} (initially 1)}
+This key determines the position of the arc similar as the corresponding key for the key |data|.
+\end{key}
+\begin{stylekey}{/wheelchart/arc second half=\marg{options} (initially \normalfont empty)}
+This key is similar to the key |arc first half| but will be appended to the second half of the arc.
+\end{stylekey}
+\begin{key}{/wheelchart/arc sep=\marg{value} (initially 1ex/1cm)}
+This key determines the position of the arc similar as the corresponding key for the key |data|. Note that the actual distance is given by |0.5ex/1cm| plus |arc sep| to match the option |raise=-0.5ex| given to the decoration for the key |arc data|.
+\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{decorations.text}}]
\begin{tikzpicture}
\wheelchart[
- data style={anchor=\WCvarC},
- inner data={$\WCvarA^{\circ}$},
- %inner data style={shift={(\WCmidangle:{-0.1})}},
- inner data sep=0.3,
- lines,
- radius={3}{4},
- slices style={pattern=\WCvarD,pattern color=\WCvarB!70},
-]{%
- 10/Maroon/{south west}/{north east lines},
- 70/TealBlue/west/grid,
- 10/Maroon/west/{north east lines},
- 10/Maroon/{north west}/{north east lines},
- 70/TealBlue/north/grid,
- 10/Maroon/north/{north east lines},
- 10/Maroon/{north east}/{north east lines},
- 70/TealBlue/east/grid,
- 10/Maroon/{north east}/{north east lines},
- 10/Maroon/east/{north east lines},
- 70/TealBlue/south/grid,
- 10/Maroon/south/{north east lines}%
-}
+ arc=\WCvarB,
+ arc around text,
+ arc data=~\WCvarC~,
+ arc data dir={\WCmidangle<180?1:-1},
+ arc data pos=1.2,
+ arc data style={text color=\WCvarB},
+ arc first half=dashed,
+ arc pos=1.2,
+ arc second half=->,
+ data=,
+ value=width("\WCvarC")
+]{\exampleforthismanual}
+\useasboundingbox (0,0)
+ circle[radius=4];
\end{tikzpicture}
\end{codeexample}
\end{key}
\begin{key}{/wheelchart/at=\marg{point} (initially (0,0))}
This key defines the center of the wheelchart.
\end{key}
-\begin{key}{/wheelchart/caption=\marg{text}}
-This key contains the \meta{text} which will be placed below the wheelchart. The \meta{text} is placed in a node. The $x$ coordinate of this node is the $x$ coordinate of the center of the wheelchart, which is defined by the key |at|. In general, this is \emph{not} the same as the $x$ coordinate of the center of the |local bounding box| around the wheelchart. The $y$ coordinate of this node is |0.5| below the south of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=north,align=center| are given. Thereafter, the style of the key |caption style| is added.
+\begin{key}{/wheelchart/before slices=\marg{code} (initially \normalfont empty)}
+The \meta{code} given to this key will be executed before each slice of the wheelchart.
\end{key}
-\begin{key}{/wheelchart/caption left=\marg{text}}
-This key contains the \meta{text} which will be placed below left of the wheelchart. The \meta{text} is placed in a node. This node is placed |0.5| below the south west of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=north west,align=left| are given. Thereafter, the style of the key |caption left style| is added.
+\begin{key}{/wheelchart/caption=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed below the wheelchart. The \meta{text} is placed in a node. The $x$ coordinate of this node is the $x$ coordinate of the center of the wheelchart, which is defined by the key |at|. In general, this is \emph{not} the same as the $x$ coordinate of the center of the |local bounding box| around the wheelchart. The $y$ coordinate of this node is at a value determined by the key |caption sep| below the south of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=north,align=center| are given. Thereafter, the style of the key |caption style| is added.
+\end{key}
+\begin{key}{/wheelchart/caption left=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed below left of the wheelchart. The \meta{text} is placed in a node. This node is placed at a value determined by the key |caption left sep| below the south west of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=north west,align=left| are given. Thereafter, the style of the key |caption left style| is added.
+\end{key}
+\begin{key}{/wheelchart/caption left sep=\marg{value} (initially 0.5)}
+The node where the contents of the key |caption left| is placed is at \meta{value} below the south west of the |local bounding box| around the wheelchart.
\end{key}
\begin{stylekey}{/wheelchart/caption left style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |caption left| is placed.
\end{stylekey}
+\begin{key}{/wheelchart/caption sep=\marg{value} (initially 0.5)}
+The $y$ coordinate of the node where the contents of the key |caption| is placed is at \meta{value} below the south of the |local bounding box| around the wheelchart.
+\end{key}
\begin{stylekey}{/wheelchart/caption style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |caption| is placed.
\begin{codeexample}[width=10cm]
@@ -415,20 +615,20 @@ This key accepts a list of keys which will be applied to the node where the cont
at={(5,2)},
caption=Caption,
caption style={font=\scshape},
- caption left={Caption left},
+ caption left=Caption left,
caption left style={font=\sffamily},
- middle={\texttt{name=WCname}},
+ middle=\texttt{name=WCname},
name=WCname,
start half,
title=Title,
title style={font=\bfseries},
- title left={Title left},
+ title left=Title left,
title left style={font=\em}
]{%
- 1/Goldenrod/{Text\\with\\multiple\\lines},
- 1/Mahogany/{Text which is longer than the short text},
- 1/JungleGreen/{Another text},
- 1/RoyalBlue/{Short text}%
+ 1/Goldenrod/Text\\with\\multiple\\lines,
+ 1/Mahogany/Text which is longer than the short text,
+ 1/JungleGreen/Another text,
+ 1/RoyalBlue/Short text%
}
\draw[dashed] (WCname.south west) rectangle (WCname.north east);
\foreach\pos in {north,east,south,west}{
@@ -438,32 +638,227 @@ This key accepts a list of keys which will be applied to the node where the cont
\end{codeexample}
\end{stylekey}
\begin{stylekey}{/wheelchart/contour=\marg{options} (initially \normalfont empty)}
-If this key is set then a contour with the style determined by this key will be drawn around the wheelchart.
+If this key is set then a contour with the style determined by this key will be drawn around the wheelchart. This key does \emph{not} apply if a plot is used.
\end{stylekey}
\begin{key}{/wheelchart/counterclockwise=\opt{\meta{boolean}} (default true, initially false)}
If true, the wheelchart will be drawn counterclockwise instead of clockwise.
-\begin{codeexample}[width=10cm]
-\begin{tikzpicture}
-\wheelchart[
- counterclockwise,
- middle=counterclockwise,
- middle style={font=\ttfamily}
-]{\exampleforthismanual}
-\end{tikzpicture}
-\end{codeexample}
\end{key}
\begin{key}{/wheelchart/data=\marg{text} (initially \textbackslash WCvarC)}
-This key contains the \meta{text} which will be placed at the outside of each slice of the wheelchart. This can be suppressed by using |data={}|. The \meta{text} is placed in a node. The style of this node is given as follows. First, the anchor is set following Table \ref{tableanchorofthekeydatainthecasethatlinesextequaltozero} and Table \ref{tableanchorofthekeydatainthecasethatlinesextstrictlylargerthanzero}. Then the option |align=left| is added. Thereafter, the style of the key |data style| is added.
+This key contains the \meta{text} which will be placed at each slice of the wheelchart. This can be suppressed by using |data={}|. The \meta{text} is placed in a node. The style of this node is given as follows. First, the anchor is set following Table \ref{tableanchorofthekeydatainthecasethatlinesextequaltozero} and Table \ref{tableanchorofthekeydatainthecasethatlinesextdifferentfromzero}. Then the option |align=left| is added. Thereafter, the style of the key |data style| is added.
+\end{key}
+\begin{key}{/wheelchart/data angle pos=\marg{value} (initially 0.5)}
\end{key}
\begin{key}{/wheelchart/data angle shift=\marg{angle} (initially 0)}
-The contents of the key |data| is placed at the angle |\WCdataangle|, which is the sum of the value of the key |data angle shift| in degrees (taking into account the key |counterclockwise|) and the macro |\WCmidangle| modulo $360$.
+\end{key}
+\begin{key}{/wheelchart/data pos=\marg{value} (initially 1)}
\end{key}
\begin{key}{/wheelchart/data sep=\marg{value} (initially 0.2)}
-If |lines=0|, this key defines the distance between the wheelchart and the contents of the key |data|. If $\text{|lines|}>0$, this key defines the distance between the end of the lines and the contents of the key |data|.
+The position of the contents of the key |data| is determined as follows.
+\begin{enumerate}
+\item The inner plot is evaluated in the point with as angle the convex combination with as parameter the key |data angle pos| of the inner start angle and the inner end angle, added with the key |data angle shift| in degrees (taking into account the key |counterclockwise|) and as radius the inner radius minus the key |data sep|.
+\item The outer plot is evaluated in the similar point but using the outer start angle, the outer end angle and the outer radius plus the key |data sep|.
+\item If $\text{|lines|}\neq 0$ then the values of the keys |lines sep| and |lines| are added to the radii above, in addition to the key |data sep|.
+\item The contents of the key |data| is placed at the convex combination with as parameter the key |data pos| of the previous two points.
+\end{enumerate}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\wheelchart[
+ data angle pos{2}=0.3,
+ data angle pos{6}=0.8,
+ data angle shift{3}=-0.1,
+ data angle shift{5}=0.1,
+ data pos=\WClistB,
+ data sep=0,
+ lines{1,2,4,6,7}=0.5,
+ lines{3,5}=1,
+ lines angle pos{1}=0.8,
+ lines angle shift{7}=-0.2,
+ lines ext=\WClistA,
+ lines ext dir{1,...,3}=left,
+ lines ext dir{4,...,7}=right,
+ lines ext fixed,
+ lines ext fixed left=-1,
+ lines ext fixed right=7,
+ lines pos=\WClistB,
+ lines sep=0.2*\WClistA,
+ xbar={6}{1.5},
+ WClistA={1,0},
+ WClistB={0,1},
+ wheel data=\WCperc,
+ wheel data pos=0.5,
+ wheel data pos{1}=1,
+ wheel data pos{4}=0,
+ wheel data sep=0.2
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
\end{key}
\begin{stylekey}{/wheelchart/data style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |data| is placed.
\end{stylekey}
+\begin{key}{/wheelchart/discrete=\opt{\meta{boolean}} (default true, initially false)}
+If true then \tikzname{} pics are placed with the \meta{code} determined by the key |discrete pic|. The number of pics is determined by the key |value|. It is required to set the key |discrete space at borders|.
+\end{key}
+\begin{key}{/wheelchart/discrete factor=\marg{value} (initially 1)}
+The algorithm to place the \tikzname{} pics depends on the \meta{value}. The value |1| is recommended.
+\end{key}
+\begin{key}{/wheelchart/discrete partitioning=\mchoice{angle,radius} (initially radius)}
+\begin{description}
+\item[\texttt{angle}] In this case, the \tikzname{} pics are placed uniformly with respect to the angle.
+\item[\texttt{radius}] In this case, the \tikzname{} pics are placed uniformly with respect to the radius.
+\end{description}
+These options are illustrated in the examples below.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ data=,
+ discrete,
+ discrete pic={\fill (0,0) circle[radius=3pt];},
+ discrete space at borders=false,
+ middle style={font=\ttfamily},
+ start angle=180,
+ total angle=180,
+ value=\WCvarA/2
+}
+\foreach\angle in {0,...,27}{
+ \draw ({180*(\angle/27)}:2)--({180*(\angle/27)}:3);
+}
+\wheelchart[
+ discrete partitioning=angle,
+ middle={discrete\\partitioning=angle}
+]{\exampleforthismanual}
+\foreach\radius in {0,...,3}{
+ \draw ({9+\radius/3},0) arc[start angle=0,end angle=180,radius={2+\radius/3}];
+}
+\wheelchart[
+ at={(7,0)},
+ middle={discrete\\partitioning=radius}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/discrete pic=\marg{code} (initially \normalfont empty)}
+The \meta{code} determines the \tikzname{} pics.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[yscale=-1]
+\wheelchart[
+ data=,
+ discrete,
+ discrete pic={
+ \fill[draw=black] (-0.3,-0.3)
+ rectangle +(0.6,0.6);
+ \node[black] at (0,0)
+ {\WCcountdiscrete};
+ },
+ discrete space at borders,
+ value=\WCvarA/2,
+ ybar={8}{8}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/discrete sort=\mchoice{angle,radius} (initially angle)}
+\begin{description}
+\item[\texttt{angle}] In this case, the \tikzname{} pics are ordered with respect to the angle.
+\item[\texttt{radius}] In this case, the \tikzname{} pics are ordered with respect to the radius.
+\end{description}
+These options are illustrated in the examples below.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ data=,
+ discrete,
+ discrete pic={\shade[ball color=\WCvarB] (0,0) circle[radius=4pt];},
+ discrete space at borders=false,
+ middle style={font=\ttfamily},
+ start angle=180,
+ total angle=180,
+ value=\WCvarA/2
+}
+\wheelchart[
+ legend columns=4,
+ legend row={\tikz\shade[ball color=\WCvarB] (0,0) circle[radius=4pt]; & \WCvarC & \WCperc},
+ legend={\node[anchor=north] at (3.5,-1) {\begin{tabular}{*{4}{l@{ }lr}}\WClegend\end{tabular}};},
+ middle={discrete sort=angle}
+]{\exampleforthismanual}
+\wheelchart[
+ at={(7,0)},
+ discrete sort=radius,
+ middle={discrete sort=radius}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/discrete space at borders=\opt{\meta{boolean}} (default true)}
+This key determines whether space is left at the begin and end where the \tikzname{} pics are placed. For example, suppose that $3$ \tikzname{} pics are placed at positions between $0$ and $1$. If |discrete space at borders| is true then these are placed at the positions $\frac{1}{6}$, $\frac{3}{6}$ and $\frac{5}{6}$. If |discrete space at borders| is false then these are placed at the positions $0$, $\frac{1}{2}$ and $1$.
+
+This key deliberately has no initial value in order to force awareness of the consequences of the settings of this key. In the example below, the cyan \tikzname{} pics are aligned if |discrete space at borders| is false while this is \emph{not} the case if |discrete space at borders| is true.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ discrete,
+ discrete pic={\fill (0,0) circle[radius=4pt];},
+ middle style={font=\ttfamily},
+ start angle=180,
+ total angle=180
+}
+\draw[Red,ultra thick] (-3,0.15)--+(6,0);
+\wheelchart[
+ discrete space at borders,
+ middle={discrete space at borders=true}
+]{2/Cyan/,20/Gray/,2/Cyan/}
+\draw[Green,ultra thick] (4,0)--+(6,0);
+\wheelchart[
+ at={(7,0)},
+ discrete space at borders=false,
+ middle={discrete space\\at borders=false}
+]{2/Cyan/,20/Gray/,2/Cyan/}
+\end{tikzpicture}
+\end{codeexample}
+In the example below, the red and green \tikzname{} pics overlap if |discrete space at borders| is false while this is \emph{not} the case if |discrete space at borders| is true.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ discrete,
+ discrete pic={\fill (0,0) circle[radius=\WClistradius pt];},
+ middle style={font=\ttfamily}
+}
+\wheelchart[
+ discrete space at borders,
+ middle={discrete space\\at borders=true},
+ WClistradius=4
+]{2/Red/,40/Gray/,2/Green/}
+\wheelchart[
+ at={(7,0)},
+ discrete space at borders=false,
+ middle={discrete space\\at borders=false},
+ WClistradius={8,4,4}
+]{2/Red/,40/Gray/,2/Green/}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/domain=\marg{start}:\marg{end}}
+This key sets |counterclockwise|, |start angle| to \meta{start} and |total angle| to $\text{\meta{end}}-\text{\meta{start}}$.
+\end{key}
+\begin{key}{/wheelchart/etoc code=\marg{code} (initially \textbackslash tableofcontents)}
+The \meta{code} will be executed to build the \meta{wheelchart data} if the key |etoc level| is used.
+\end{key}
+\begin{key}{/wheelchart/etoc count total pages=\marg{number} (initially 0)}
+If the key |etoc level| is used then the number of pages of the last section depends on \meta{number} which can for example represent the total number of pages in the document or the number of pages before the start of the Appendix or the Index. For example, |etoc count total pages=\totalpages| can be used. To provide the command |\totalpages|, this requires |\usepackage[page]{totalcount}|, which should normally be loaded \emph{before} the package |wheelchart| to give a correct result.
+\end{key}
+\begin{key}{/wheelchart/etoc level=\marg{level}}
+If this key is used then the \meta{wheelchart data} of the command |\wheelchart| can be left empty and is defined to match the sections of the level defined by \meta{level}. Here, |\WCetocthelinkedname| corresponds to |\etocthelinkedname|, |\WCetocthelinkednumber| to |\etocthelinkednumber|, |\WCetocthelinkedpage| to |\etocthelinkedpage|, |\WCetocthename| to |\etocthename|, |\WCetocthenumber| to |\etocthenumber| and |\WCetocthepage| to |\etocthepage|. The package |etoc| is required to provide these commands. Furthermore, |\WCetocthenumberofpages| corresponds to the number of pages of the current section. For the last section, this depends on the value of the key |etoc count total pages|.
+\end{key}
+\begin{key}{/wheelchart/etoc name=\marg{name} (initially \normalfont empty)}
+The resulting \meta{wheelchart data} from the key |etoc level| is stored globally and can be reused later with the key |etoc use name|.
+\end{key}
+\begin{key}{/wheelchart/etoc use name=\marg{name}}
+If this key is used then the \meta{wheelchart data} is reused from where |etoc name| has the same \meta{name}.
+\end{key}
\begin{key}{/wheelchart/expand list=\mchoice{false,once,true} (initially once)}
\begin{description}
\item[\texttt{false}] In this case, the \meta{wheelchart data} of the command |\wheelchart| will not be expanded.
@@ -471,11 +866,7 @@ This key accepts a list of keys which will be applied to the node where the cont
\item[\texttt{true}] In this case, the \meta{wheelchart data} of the command |\wheelchart| will be fully expanded.
\end{description}
The following example illustrates the difference between the possible values of the key |expand list|.
-\begin{codeexample}[width=10cm,preamble={\usepackage{listofitems}}]
-\readlist*\WCcolors{
- Dandelion,CarnationPink,
- SpringGreen,ProcessBlue
-}
+\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\def\WClistA{a,A}
\def\WClistB{b,B}
@@ -487,7 +878,10 @@ The following example illustrates the difference between the possible values of
data=\WCvarA,
expand list=\expandlist,
radius={0}{1},
- slices style={\WCcolors[\WCcount]},
+ slices style{list}={
+ Dandelion,CarnationPink,
+ SpringGreen,ProcessBlue
+ },
title={expand list=\\\expandlist},
title style={font=\ttfamily},
value=1
@@ -503,12 +897,12 @@ The initial setting |expand list=once| works in most situations, even when comma
%expand list=true,%true doesn't work
middle={expand list=\\false %
{\normalfont or} once},
- middle style={font=\ttfamily}
+ middle style={font=\large\ttfamily}
]{%
- 1/Emerald/{Section \ref{Keys}},
- 1/Sepia/{Reference \cite{TtTaPGFp}},
+ 1/Emerald/Section \ref{Keys},
+ 1/Sepia/Reference \cite{TtTaPGFp},
1/YellowOrange/{$e^{i\pi}=-1$},
- 1/Salmon/{\textbf{Text}}%
+ 1/Salmon/\textbf{Text}%
}
\end{tikzpicture}
\end{codeexample}
@@ -516,17 +910,17 @@ In the following example, the \meta{wheelchart data} from the previous example i
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\def\WClist{%
- 1/Emerald/{Section \ref{Keys}},
- 1/Sepia/{Reference \cite{TtTaPGFp}},
+ 1/Emerald/Section \ref{Keys},
+ 1/Sepia/Reference \cite{TtTaPGFp},
1/YellowOrange/{$e^{i\pi}=-1$},
- 1/Salmon/{\textbf{Text}}%
+ 1/Salmon/\textbf{Text}%
}
\wheelchart[
%expand list=false,
%expand list=true,
%false and true do not work
- middle={expand list=\\once},
- middle style={font=\ttfamily}
+ middle={expand list=once},
+ middle style={font=\large\ttfamily}
]{\WClist}
\end{tikzpicture}
\end{codeexample}
@@ -536,12 +930,12 @@ In the example below, we have to use |expand list=true|.
\def\WCcolorsA{Yellow,Red}
\def\WCcolorsB{Green,Blue}
\wheelchart[
- data={},
+ data=,
expand list=true,%false and once
%do not work
middle={expand list=true},
middle style={font=\large\ttfamily},
- slices style={\WCvarA},
+ slices style=\WCvarA,
value=1
]{\WCcolorsA,\WCcolorsB}
\end{tikzpicture}
@@ -557,44 +951,64 @@ In the example below, we have to use |expand list=true| and the command |\expand
expand list=true,%false and once
%do not work
middle={expand list=true},
- middle style={font=\large\ttfamily},
+ middle style={font=\large\ttfamily}
]{\WCsliceAfinal,\WCsliceBfinal}
%\WCsliceA and \WCsliceB do not work
\end{tikzpicture}
\end{codeexample}
\end{key}
-\begin{key}{/wheelchart/explode=\marg{value} (default 0.2, initially 0)}
-This key will shift the slices of the wheelchart with \meta{value} with respect to the center of the wheelchart.
+\begin{key}{/wheelchart/expand list items=\mchoice{false,once,true} (initially false)}
+This key is similar to the key |expand list| but applies to the items in the \meta{wheelchart data} of the command |\wheelchart| which correspond to a slice of the wheelchart.
\begin{codeexample}[width=10cm]
-\begin{tikzpicture}
+\def\WClistA{a/b}%
+\def\WClistB{c/d}%
+\def\WCdata{\WClistA/\WClistB}%
+\texttt{expand list items}%
+\foreach\expandlistitems in
+ {false,once,true}{%
\wheelchart[
- explode=\WCvarF,
- pie
-]{\exampleforthismanual}
-\end{tikzpicture}
+ expand list=false,
+ expand list items=\expandlistitems,
+ legend={; \texttt{\expandlistitems}:
+ \WCvarA},
+ legend only,
+ value=1
+]{\WCdata}%
+}
\end{codeexample}
\end{key}
+\begin{key}{/wheelchart/explode=\marg{value} (default 0.2, initially 0)}
+This key will shift the slices of the wheelchart with \meta{value} with respect to the center of the wheelchart.
+\end{key}
+\begin{key}{/wheelchart/for loop end=\marg{code} (initially \normalfont empty)}
+The slices of the wheelchart, the wheel lines determined by the key |wheel lines| and the different kinds of data are placed in for loops. If the key |for loop end| is set then the \meta{code} given to this key will be executed at the end of the body of these for loops.
+\end{key}
+\begin{key}{/wheelchart/for loop start=\marg{code} (initially \normalfont empty)}
+This key is similar to the key |for loop end| but the \meta{code} given to this key will be executed at the start of the body of the for loops.
+\end{key}
\begin{key}{/wheelchart/gap=\marg{value} (default 0.05, initially 0)}
-The \meta{value} of this key defines half the distance between two slices of the wheelchart.
-
-The following example illustrates the behaviour of the key |gap| when a slice has $360$ degrees.
-\begin{codeexample}[width=10cm]
+The \meta{value} of this key defines half the distance between two slices of the wheelchart. This key does \emph{not} apply if a plot is used.
+\end{key}
+\begin{key}{/wheelchart/gap max angle=\marg{angle} (initially 180)}
+If the value of the key |gap| is too large then a slice can partly disappear such as for example below when |gap max angle| is \ang{155}. The \meta{angle} of the key |gap max angle| determines the inner arc of the slice as illustrated in the examples below.
+\begin{codeexample}[preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
-\foreach\gap [count=\m] in {0,1}{
-\foreach\pie [count=\n] in {false,true}{
+\foreach\gapmaxangle [count=\n] in {90,120,155}{
+\begin{scope}[shift={({5*\n},0)}]
\wheelchart[
- at={({5*\m},{-5*\n})},
- data={},
- gap=\gap,
- middle={gap=\gap\\pie=\pie},
- middle style={font=\ttfamily},
- pie=\pie,
- radius={1.5}{2},
- slices style=Bittersweet,
- total count=1,
- value=1
-]{}
-}
+ gap=1,
+ gap max angle=\gapmaxangle,
+ radius={0}{2},
+ total angle=315
+]{1/CornflowerBlue!50/}
+\fill (0,0) circle[radius=2pt];
+\draw (0,0) circle[radius=2];
+\draw (135:2)--(0:0)--(90:2);
+\draw (0:0)--({135+\gapmaxangle}:{1/sin(\gapmaxangle)}) arc[start angle={135+\gapmaxangle},
+ end angle={450-\gapmaxangle},radius={1/sin(\gapmaxangle)}]--cycle;
+\node at (45:0.6) {\ang{\gapmaxangle}};
+\node at (180:0.6) {\ang{\gapmaxangle}};
+\end{scope}
}
\end{tikzpicture}
\end{codeexample}
@@ -606,7 +1020,6 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
explode=1,
middle={\Large\texttt{explode}},
radius={1}{2},
@@ -615,8 +1028,7 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
fill=none,
ultra thick
},
- total count=6,
- value=1
+ total count=6
]{}
\draw (0,0) circle[radius=2];
\draw (0,0) circle[radius=3];
@@ -625,7 +1037,6 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
gap=0.5,
middle={\Large\texttt{gap}},
slices style={
@@ -633,15 +1044,14 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
fill=none,
ultra thick
},
- total count=6,
- value=1
+ total count=6
]{}
\draw (0,0) circle[radius=2];
\draw (0,0) circle[radius=3];
\foreach\a in {0,60,120}{
\foreach\x in {-0.5,0.5}{
-\draw[rotate=\a] (\x,{sqrt(3^2-0.5^2})--
- (\x,{-sqrt(3^2-0.5^2});
+\draw[rotate=\a] (\x,{sqrt(3^2-0.5^2)})
+ --(\x,{-sqrt(3^2-0.5^2)});
}
}
\end{tikzpicture}
@@ -649,7 +1059,6 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
gap polar=10,
middle={\Large\texttt{gap polar}},
slices style={
@@ -657,8 +1066,7 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
fill=none,
ultra thick
},
- total count=6,
- value=1
+ total count=6
]{}
\draw (0,0) circle[radius=2];
\draw (0,0) circle[radius=3];
@@ -670,153 +1078,294 @@ Note the difference between the keys |explode|, |gap| and |gap polar|. This is i
\end{tikzpicture}
\end{codeexample}
\end{key}
-\begin{key}{/wheelchart/inner data=\marg{text}}
-This key contains the \meta{text} which will be placed at the inside of each slice of the wheelchart. The \meta{text} is placed in a node. The style of this node is given as follows. First, the option |align=left| is given. Thereafter, the style of the key |inner data style| is added.
+\begin{key}{/wheelchart/gap radius=\marg{value} (default 0.05, initially 0)}
+The \meta{value} of this key will be added to |inner radius| and substracted from |outer radius|.
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
+\begin{tikzpicture}
+\def\n{73}
+\wheelchart[
+ data=,
+ gap radius=\WCvarC,
+ middle={\Huge\qty{\n}{\percent}}
+]{%
+ \n/NavyBlue/0,
+ {100-\n}/BurntOrange/0.2%
+}
+\draw[Gray] (0,0) circle[radius=1.9];
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/header=\marg{list}}
+The items in the \meta{list} determine the names in the macros |\|\meta{prefix}\meta{name}.
+\end{key}
+\begin{key}{/wheelchart/header prefix=\marg{prefix} (initially WC)}
+The \meta{prefix} is used in the macros |\|\meta{prefix}\meta{name}.
+\end{key}
+\begin{key}{/wheelchart/inner data=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed at each slice of the wheelchart. The \meta{text} is placed in a node. The style of this node is given as follows. First, the option |align=left| is given. Thereafter, the style of the key |inner data style| is added.
+\end{key}
+\begin{key}{/wheelchart/inner data angle pos=\marg{value} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/inner data angle shift=\marg{angle} (initially 0)}
+\end{key}
+\begin{key}{/wheelchart/inner data pos=\marg{value} (initially 0)}
\end{key}
\begin{key}{/wheelchart/inner data sep=\marg{value} (initially 0.2)}
-This key defines the distance between the wheelchart and the contents of the key |inner data|.
+These keys determine the position of the contents of the key |inner data| similar as the corresponding keys for the key |data|. No lines are drawn for the inner data.
\end{key}
\begin{stylekey}{/wheelchart/inner data style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |inner data| is placed.
\end{stylekey}
+\begin{key}{/wheelchart/inner plot=\marg{code}}
+The \meta{code} is a coordinate definition which will be used for the inner parts of the slices of the wheelchart. In the \meta{code}, |#1| and |#2| can be used where |#1| corresponds to the angle and |#2| corresponds to the radius. For example, a circle can be obtained with |inner plot={{#1}:{#2}}|.
+\end{key}
+\begin{stylekey}{/wheelchart/inner plot style=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys which will be applied to the plot determined by the key |inner plot|.
+\end{stylekey}
\begin{key}{/wheelchart/inner radius=\marg{value} (initially 2)}
The \meta{value} of this key defines the inner radius of the wheelchart.
\end{key}
-\begin{key}{/wheelchart/legend=\marg{code}}
-If this key is set then the \meta{code} given to this key will be executed at the end of the command |\wheelchart|.
+\begin{key}{/wheelchart/legend=\marg{code} (initially \normalfont empty)}
+The \meta{code} given to this key will be executed at the end of the command |\wheelchart|.
\end{key}
-\begin{key}{/wheelchart/legend entry=\marg{code}}
-If this key is set then the \meta{code} given to this key will be executed for each slice of the wheelchart.
-\begin{codeexample}[width=10cm,preamble={\usepackage{etoolbox}}]
+\begin{key}{/wheelchart/legend columns=\marg{number} (initially 1)}
+If the key |legend row| is used then the maximum number of times that the \meta{code} given to the key |legend row| appears on one row is determined by \meta{number}. The environment (for example |tabular|, |tabularx| from the package |tabularx|, |tabulary| from the package |tabulary| or |tblr| from the package |tabularray|) which contains the macro |\WClegend| needs to have a suitable column specification according with \meta{number} and the key |legend row|.
+\end{key}
+\begin{key}{/wheelchart/legend entry=\marg{code} (initially \normalfont empty)}
+The \meta{code} given to this key will be executed for each slice of the wheelchart.
+\end{key}
+\begin{key}{/wheelchart/legend only=\opt{\meta{boolean}} (default true, initially false)}
+If true then only the legend is constructed. This does \emph{not} apply to the key |legend entry|.
+
+In this case it is \emph{not} necessary to place the command |\wheelchart| in a |tikzpicture| environment.
+\begin{codeexample}[width=10cm,preamble={\usepackage{tikzlings}}]
+\wheelchart[
+ header={animal,accessory},
+ legend columns=3,
+ legend only,
+ legend row={\tikz[scale=0.3]{
+ \csname \WCanimal\endcsname[
+ signpost=\WCcount,
+ \WCaccessory
+ ]} & \WCanimal},
+ legend={%
+ \begin{tabular}{*{3}{cl}}
+ \multicolumn{6}{c}{%
+ \WCtotalcount{} animals%
+ from the package%
+ \texttt{tikzlings}}\\\hline
+ \WClegend\hline
+ \end{tabular}%
+ },
+ separator columns={{ }},
+ separator rows=;,
+ value=1
+]{%
+ bear basket;
+ bee book;
+ bug chef;
+ cat crown;
+ elephant football;
+ koala handbag;
+ owl hat;
+ panda icecream;
+ penguin milkshake;
+ snowman santa;
+ squirrel shovel%
+}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/legend row=\marg{code}}
+If this key is set then a legend consisting of rows for an environment such as |tabular|, |tabularx| from the package |tabularx|, |tabulary| from the package |tabulary| or |tblr| from the package |tabularray| is constructed using the \meta{code} for each slice of the wheelchart.
+
+If a |tblr| environment from the package |tabularray| is used then the option |expand=\WClegend| needs to be given to this |tblr| environment and |\UseTblrLibrary{counter}| is required.
+
+The maximum number of times that the \meta{code} appears on one row is determined by the key |legend columns|.
+
+The code automatically inserts |&| and |\\| after the \meta{code} if necessary.
+
+The result is stored in the macro |\WClegend|.
+\begin{codeexample}[preamble={\usepackage{tabularray}
+\UseTblrLibrary{counter,siunitx}}]
\begin{tikzpicture}
-\def\WClegend{}
-\def\WClegendrow#1#2#3#4#5{\tikz\fill[#1] (0,0) rectangle (0.3,0.3); & #2 & $#3$ & #4 & #5\\}
\wheelchart[
- data={},
- legend entry={
- \gappto\WClegend{\WClegendrow}
- \xappto\WClegend{{\WCvarB}{\WCvarC}{\WCvarA}{\WCperc}{\WCvarD}}
+ after slices={
+ \pgfdeclareradialshading{WCshading}{\pgfpoint{0cm}{0cm}}{
+ color(0bp)=(\WCvarB);
+ color(16.66666bp)=(\WCvarB);%2/3 * 25bp
+ color(20.83333bp)=(\WCvarB!10);%2.5/3 * 25bp
+ color(25bp)=(\WCvarB);
+ color(50bp)=(\WCvarB)
+ }
+ \shade[even odd rule,shading=WCshading] (0,0) circle[radius=3] circle[radius=2];
},
+ data=,
+ legend row={\tikz\fill[\WCvarB] (0,0) rectangle (0.3,0.3);%
+ & \WCvarC & \WCvarA & \WCpercentagerounded & \WCvarD},
legend={
\node[anchor=west] at (3.5,0) {%
- \begin{tabular}{l@{ }lrrl}%
- & Fruit & Value & Percentage & Vitamines\\\hline%
- \\[-10pt]%
- \WClegend\hline%
- & \textbf{Total} & $\pgfmathprintnumber{\WCtotalnum}$ & & \\%
- \end{tabular}%
+ \begin{tblr}[expand=\WClegend]{
+ colspec={llS[table-format=3.0]S[table-format=2.0{\,\unit{\percent}}]l},
+ column{1}={rightsep=0pt,appto={\ }},
+ column{2}={leftsep=0pt},
+ cell{2-Y}{4}={appto={\,\unit{\percent}}},
+ row{1}={guard}
+ }
+ & Fruit & Value & Percentage & Vitamins\\\hline
+ \WClegend\hline
+ & \textbf{Total} & \WCtotalnum & & \\
+ \end{tblr}%
};
+ },
+ slices style={
+ fill=none,
+ clip
}
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
\end{key}
\begin{key}{/wheelchart/lines=\marg{value} (default 1, initially 0)}
-This key will draw lines of length \meta{value} between the wheelchart and the contents of the key |data|.
-\begin{codeexample}[width=10cm]
+The \meta{value} is used in the positioning of the contents of the key |data|. The end point of the lines is determined similarly but without the key |data sep|.
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
\def\WCtest#1#2{%
- \ifdim \WCpercentage pt>10 pt%
- #1%
- \else%
- #2%
- \fi%
+ \pgfmathparse{
+ \WCpercentage>10?"#1":"#2"
+ }%
+ \pgfmathresult%
}
\wheelchart[
- data={\WCtest{}{\WCperc}},
- lines={
- 1-max(sign(\WCpercentage-10),0)
- },
+ data=\WCtest{}{\WCperc},
+ lines={\WCpercentage>10?0:0.5},
lines style={dotted,thick},
pie,
- wheel data={\WCtest{\WCperc}{}}
+ slices style={
+ bottom color=\WCvarB,
+ top color=\WCvarB!80!black,
+ shading angle=\WCmidangle-90
+ },
+ wheel data=\WCtest{\WCperc}{}
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
\end{key}
+\begin{key}{/wheelchart/lines angle pos=\marg{value} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/lines angle shift=\marg{angle} (initially 0)}
+These keys are similar to the corresponding keys for |data| but determine the start point of the lines.
+\end{key}
\begin{key}{/wheelchart/lines ext=\marg{value} (default 0.5, initially 0)}
-If the \meta{value} of this key is $>0$ then the lines between the wheelchart and the contents of the key |data| will be extended horizontally with a length defined by \meta{value}.
+If the \meta{value} of this key is nonzero and |lines ext fixed| is false then the lines between the wheelchart and the contents of the key |data| will be extended horizontally with a length defined by \meta{value}.
\end{key}
\begin{key}{/wheelchart/lines ext bottom dir=\mchoice{left,right} (initially right)}
-This key applies when |\WCdataangle|${}\in[270-\text{|lines ext dirsep|},270+\text{|lines ext dirsep|}]$. In this case, this key defines the direction in which the lines between the wheelchart and the contents of the key |data| will be extended horizontally and in this case, this key also determines the anchor of the key |data|.
-\begin{description}
-\item[\texttt{left}] In this case, the lines between the wheelchart and the contents of the key |data| will be extended horizontally to the left and the anchor of the key |data| is the value of the key |lines ext left anchor|.
-\item[\texttt{right}] In this case, the lines between the wheelchart and the contents of the key |data| will be extended horizontally to the right and the anchor of the key |data| is the value of the key |lines ext right anchor|.
-\end{description}
+\end{key}
+\begin{key}{/wheelchart/lines ext dir=\mchoice{left,right}}
+The default direction in which the lines between the wheelchart and the contents of the key |data| will be extended horizontally if $\text{|lines ext|}\neq 0$ is determined by Table \ref{tablelinesextdir} and illustrated in the following example. This can be overruled by giving an explicit value to this key. Note that rounding errors can occur in the computation of the angle which is used to determine the default direction according to Table \ref{tablelinesextdir}.
+\begin{table}[ht]
+\centering
+\begin{tabular}{ll}
+ & The direction in which the lines between the\\
+ & wheelchart and the contents of the key |data| will\\
+ & be extended horizontally if $\text{|lines ext|}\neq 0$ and\\
+Angle (up to rounding errors) & if the key |lines ext dir| is not used\\\hline
+$\rinterval{0}{90-\text{|lines ext dirsep|}}$ & right\\
+$[90-\text{|lines ext dirsep|},90+\text{|lines ext dirsep|}]$ & value of the key |lines ext top dir|\\
+$\ointerval{90+\text{|lines ext dirsep|}}{270-\text{|lines ext dirsep|}}$ & left\\
+$[270-\text{|lines ext dirsep|},270+\text{|lines ext dirsep|}]$ & value of the key |lines ext bottom dir|\\
+$\ointerval{270+\text{|lines ext dirsep|}}{360}$ & right\\
+\end{tabular}
+\caption{The direction in which the lines between the wheelchart and the contents of the key \texttt{data} will be extended horizontally if $\text{\ttfamily lines ext}\neq 0$ and if the key \texttt{lines ext dir} is not used.}\label{tablelinesextdir}
+\end{table}
+\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{patterns}}]
+\begin{tikzpicture}[font=\ttfamily]
+\def\WClinesextdirsep{10}
+\wheelchart[
+ data{1,6}=lines ext top dir,
+ data{2}=right,
+ data{3,4}=lines ext bottom dir,
+ data{5}=left,
+ data angle pos=\WClistdap,
+ data sep=0,
+ inner data angle pos{1,4}=0.1,
+ inner data angle pos{3,6}=0.9,
+ inner data pos=1,
+ inner data sep=0.4,
+ inner data style={anchor=\WClistia},
+ lines=0.6,
+ lines{1,3}=0.2,
+ lines angle pos=\WClistdap,
+ lines ext,
+ lines ext dirsep=\WClinesextdirsep,
+ lines sep{list}={0.7,0.2,0.7},
+ lines style=->,
+ slice{1,3,4,6}={
+ arc=<->,
+ inner data=lines ext dirsep,
+ value=\WClinesextdirsep
+ },
+ slices style={
+ draw,
+ pattern=\WClistpattern
+ },
+ total count=6,
+ value{2,5}=180-2*\WClinesextdirsep,
+ WClistdap={0.9,0.2,0.1},
+ WClistia={west,east},
+ WClistpattern={
+ crosshatch,dots,crosshatch
+ }
+]{}
+\end{tikzpicture}
+\end{codeexample}
\end{key}
\begin{key}{/wheelchart/lines ext dirsep=\marg{angle} (initially 0)}
This key determines half the angle in degrees of the segment to which the keys |lines ext bottom dir| and |lines ext top dir| apply.
\end{key}
\begin{key}{/wheelchart/lines ext fixed=\opt{\meta{boolean}} (default true, initially false)}
-If true, all lines between the wheelchart and the contents of the key |data| will be extended horizontally till the same $x$ coordinate at the left and till the same $x$ coordinate at the right.
+If true, the line between the wheelchart and the contents of the key |data| will be extended horizontally till the $x$ coordinate determined by the keys |lines ext fixed left| and |lines ext fixed right|.
+\end{key}
+\begin{key}{/wheelchart/lines ext fixed left=\marg{value}}
+\end{key}
+\begin{key}{/wheelchart/lines ext fixed right=\marg{value}}
+If |lines ext fixed| is true, the lines are extended horizontally initially to the right till the $x$ coordinate $\text{|outer radius|}+\text{|lines sep|}+\text{|lines|}+\text{|lines ext|}$ and to the left till the opposite of this $x$ coordinate. This can be overruled by giving an explicit value to the key |lines ext fixed left| and/or |lines ext fixed right|.
\end{key}
\begin{key}{/wheelchart/lines ext left anchor=\marg{anchor} (initially mid east)}
-This key defines the anchor of the key |data| when the lines between the wheelchart and the contents of the key |data| are extended horizontally to the left.
\end{key}
\begin{key}{/wheelchart/lines ext right anchor=\marg{anchor} (initially mid west)}
-This key defines the anchor of the key |data| when the lines between the wheelchart and the contents of the key |data| are extended horizontally to the right.
-\end{key}
-\begin{key}{/wheelchart/lines ext top dir=\mchoice{left,right} (initially right)}
-This key applies when |\WCdataangle|${}\in[90-\text{|lines ext dirsep|},90+\text{|lines ext dirsep|}]$. In this case, this key defines the direction in which the lines between the wheelchart and the contents of the key |data| will be extended horizontally and in this case, this key also determines the anchor of the key |data|.
-\begin{description}
-\item[\texttt{left}] In this case, the lines between the wheelchart and the contents of the key |data| will be extended horizontally to the left and the anchor of the key |data| is the value of the key |lines ext left anchor|.
-\item[\texttt{right}] In this case, the lines between the wheelchart and the contents of the key |data| will be extended horizontally to the right and the anchor of the key |data| is the value of the key |lines ext right anchor|.
-\end{description}
\begin{table}[ht]
\centering
\begin{tabular}{ll}
- & Anchor of the key |data|\\
-|\WCdataangle| & in the case that $\text{|lines ext|}>0$\\\hline
-$\rinterval{0}{90-\text{|lines ext dirsep|}}$ & value of the key |lines ext right anchor|\\
-$[90-\text{|lines ext dirsep|},90+\text{|lines ext dirsep|}]$ & value of the key |lines ext left anchor|\\
- & if |lines ext top dir=left|\\
- & value of the key |lines ext right anchor|\\
- & if |lines ext top dir=right|\\
-$\ointerval{90+\text{|lines ext dirsep|}}{270-\text{|lines ext dirsep|}}$ & value of the key |lines ext left anchor|\\
-$[270-\text{|lines ext dirsep|},270+\text{|lines ext dirsep|}]$ & value of the key |lines ext left anchor|\\
- & if |lines ext bottom dir=left|\\
- & value of the key |lines ext right anchor|\\
- & if |lines ext bottom dir=right|\\
-$\ointerval{270+\text{|lines ext dirsep|}}{360}$ & value of the key |lines ext right anchor|\\
+The direction in which the lines between the & \\
+wheelchart and the contents of the key |data| will & \\
+be extended horizontally if $\text{|lines ext|}\neq 0$ & Anchor of the key |data|\\\hline
+left & value of the key |lines ext left anchor|\\
+right & value of the key |lines ext right anchor|\\
\end{tabular}
-\caption{Anchor of the key \texttt{data} in the case that $\text{\ttfamily lines ext}>0$.}\label{tableanchorofthekeydatainthecasethatlinesextstrictlylargerthanzero}
+\caption{Anchor of the key \texttt{data} in the case that $\text{\ttfamily lines ext}\neq 0$.}\label{tableanchorofthekeydatainthecasethatlinesextdifferentfromzero}
\end{table}
-The number of columns in the legend in the example below can be specified with |\WClegendcolumns|.
-\begin{codeexample}[width=10cm,preamble={\usepackage{etoolbox}
+\end{key}
+\begin{key}{/wheelchart/lines ext top dir=\mchoice{left,right} (initially right)}
+\end{key}
+\begin{key}{/wheelchart/lines pos=\marg{value} (initially 1)}
+\end{key}
+\begin{key}{/wheelchart/lines sep=\marg{value} (initially 0.2)}
+These keys are similar to the corresponding keys for |data| but determine the start point of the lines.
+\end{key}
+\begin{stylekey}{/wheelchart/lines style=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys which will be applied to the lines drawn by the key |lines|.
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}
\usetikzlibrary{decorations.markings}}]
\begin{tikzpicture}
-\def\WClegendcolumns{2}%specify the number of columns in the legend
-\def\WClegendrow#1#2#3{\tikz\fill[#1] (0,0) circle[radius=0.15]; & #2 & $#3$}
\wheelchart[
- data={\WCperc},
- data style={outer xsep=4pt},
- legend entry={
- \csgdef{WClegend\WCcount}{}
- \csgappto{WClegend\WCcount}{\WClegendrow}
- \csxappto{WClegend\WCcount}{{\WCvarB}{\WCvarC}{\WCvarA}}
- },
+ data=\WCperc,
+ data angle pos{4}=0.2,
+% data style={outer xsep=4pt},
+ legend columns=2,
+ legend row={\tikz\fill[\WCvarB] (0,0) circle[radius=0.15]; & \WCvarC & $\WCvarA$},
legend={
- \def\WClegend{}
- \pgfmathsetmacro{\WClegendrows}{int(ceil(\WCtotalcount/\WClegendcolumns))}
- \foreach\n in {1,...,\WClegendrows}{
- \foreach\k in {1,...,\WClegendcolumns}{
- \pgfmathparse{int(\n+(\k-1)*\WClegendrows)}
- \ifnum\pgfmathresult>\WCtotalcount
- \gappto\WClegend{ & & }
- \else
- \gappto\WClegend{\csname WClegend}
- \xappto\WClegend{\pgfmathresult}
- \gappto\WClegend{\endcsname}
- \fi
- \ifnum\k=\WClegendcolumns
- \gappto\WClegend{\\}
- \else
- \gappto\WClegend{ & }
- \fi
- }
- }
\node[anchor=north,draw,rounded corners,thick] at (0,-4.5) {%
- \begin{tabular}{*{\WClegendcolumns}{l@{ }lr}}%
+ \begin{tabular}{*{2}{l@{ }lr}}%
\WClegend%
\end{tabular}%
};
@@ -833,15 +1382,13 @@ The number of columns in the legend in the example below can be specified with |
postaction=decorate,
decoration={
markings,
- mark=at position 1 with {
- \fill[\WCvarB] (0,0) circle[radius=0.15];
- }
+ mark=at position 1 with {\fill[\WCvarB] (0,0) circle[radius=0.15];}
}
},
start angle=331.2
]{\exampleforthismanual}
\wheelchart[
- data={},
+ data=,
radius={1.5}{2},
slices style=\WCvarB!70,
start angle=331.2
@@ -851,19 +1398,21 @@ The number of columns in the legend in the example below can be specified with |
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
+ data sep=0,
data style={
inner sep=0pt,
shift={(0,0.1)}
},
- lines,
+ lines=0.5,
lines ext=1.2,
lines ext bottom dir=right,
lines ext dirsep=1,
%lines ext fixed,
- lines ext left anchor={base west},
- lines ext right anchor={base east},
+ lines ext left anchor=base west,
+ lines ext right anchor=base east,
lines ext top dir=left,
- lines sep=-0.5,
+ lines pos=0.5,
+ lines sep=0,
%lines style=\WCvarB,
start angle=331.2
]{\exampleforthismanual}
@@ -872,8 +1421,9 @@ The number of columns in the legend in the example below can be specified with |
\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{decorations.markings}}]
\begin{tikzpicture}
\wheelchart[
- data={\WCvarC: \WCvarA},
+ data=\WCvarC: \WCvarA,
data angle shift=\WCvarG,
+ data sep=0,
data style={draw=\WCvarB,fill=\WCvarB!20},
lines=1.5,
lines ext=1,
@@ -883,9 +1433,7 @@ The number of columns in the legend in the example below can be specified with |
postaction=decorate,
decoration={
markings,
- mark=at position 0 with {
- \fill[Black] (0,0) circle[radius=0.15];
- }
+ mark=at position 0 with {\fill[Black] (0,0) circle[radius=0.15];}
}
},
pie,
@@ -893,23 +1441,16 @@ The number of columns in the legend in the example below can be specified with |
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
-\end{key}
-\begin{key}{/wheelchart/lines sep=\marg{value} (initially 0.2)}
-This key defines the distance between the wheelchart and the start of the lines.
-\end{key}
-\begin{stylekey}{/wheelchart/lines style=\marg{options} (initially \normalfont empty)}
-This key accepts a list of keys which will be applied to the lines drawn by the key |lines|.
\end{stylekey}
-\begin{key}{/wheelchart/middle=\marg{text}}
+\begin{key}{/wheelchart/middle=\marg{text} (initially \normalfont empty)}
This key contains the \meta{text} which will be placed at the center of the wheelchart. The \meta{text} is placed in a node. The style of this node is given as follows. First, the option |align=center| is given. Thereafter, the style of the key |middle style| is added.
\end{key}
\begin{stylekey}{/wheelchart/middle fill=\marg{options} (initially \normalfont empty)}
-If this key is set then the middle of the wheelchart will be filled with this style.
+If this key is set then the middle of the wheelchart will be filled with this style. This key does \emph{not} apply if a plot is used.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
counterclockwise,
- data={},
middle fill={
Green,
draw=Red,
@@ -924,8 +1465,7 @@ If this key is set then the middle of the wheelchart will be filled with this st
},
start angle=0,
total angle=300,
- total count=4,
- value=1
+ total count=4
]{}
\end{tikzpicture}
\end{codeexample}
@@ -936,22 +1476,138 @@ This key accepts a list of keys which will be applied to the node where the cont
\begin{key}{/wheelchart/name=\marg{name} (initially wheelchart@name)}
This key defines the \meta{name} of the |local bounding box| around the wheelchart.
\end{key}
+\begin{key}{/wheelchart/outer plot=\marg{code}}
+This key is similar to the key |inner plot| but determines the outer parts of the slices of the wheelchart.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\wheelchart[
+ inner plot={{#1}:{#2+0.2*(cos(#1*\WCtotalcount)+1)}},
+ outer plot={{#1}:{#2+0.2*(cos(#1*\WCtotalcount*2)+1)}}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\wheelchart[
+ arc data=\WCvarC,
+ arc data pos=0.5,
+ data=,
+ domain=0:450,
+ inner plot={
+ {int((#1)/180)*5+(0.5-((-1)^Mod(int((#1)/180),2))*2.5)*cos(#1)},
+ {(2.5-((-1)^Mod(int((#1)/180),2))*0.5)*sin(#1)}
+ },
+ outer plot={
+ {int((#1)/180)*5+(-0.5-((-1)^Mod(int((#1)/180),2))*2.5)*cos(#1)},
+ {(2.5+((-1)^Mod(int((#1)/180),2))*0.5)*sin(#1)}
+ },
+ value=1
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{stylekey}{/wheelchart/outer plot style=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys which will be applied to the plot determined by the key |outer plot|.
+\end{stylekey}
\begin{key}{/wheelchart/outer radius=\marg{value} (initially 3)}
The \meta{value} of this key defines the outer radius of the wheelchart.
\end{key}
+\begin{key}{/wheelchart/parse=\mchoice{pgfmath,l3fp} (initially pgfmath)}
+\begin{description}
+\item[\texttt{pgfmath}] In this case, the values of applicable keys will be parsed with |\pgfmathparse|.
+\item[\texttt{l3fp}] In this case, the values of applicable keys will be parsed with |\fp_eval:n|.
+\end{description}
+\end{key}
\begin{key}{/wheelchart/perc precision=\marg{number} (initially 0)}
This key defines the number of decimals up to which the percentage in the macros |\WCperc| and |\WCpercentagerounded| are rounded.
\end{key}
\begin{key}{/wheelchart/pie=\opt{\meta{boolean}} (default true, initially false)}
If true, the inner radius of the wheelchart is set to |0|.
\end{key}
+\begin{key}{/wheelchart/plot=\marg{code}}
+This key sets |inner plot| and |outer plot|.
+
+Since the \emph{let operation} from the \tikzname{} library |calc| is used, it is not possible to use the variable names |\n|, |\p|, |\x| and |\y| inside the \meta{code}.
+
+Note that positions depend on the |domain| and \emph{not} on the length of the |plot|. For example below, |data angle pos=0.5|. The corresponding value of the |domain| is $1$ which gives the $x$ coordinate $1$ which is \emph{not} in the middle of the plot. Whereas |wheel data angle pos=sqrt(2)/2|. The corresponding value of the |domain| is $\sqrt{2}$ which gives the $x$ coordinate $2$ which is in the middle of the plot.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ domain=0:2,
+ plot={{(#1)^2},{#2}},
+ wheel data=text B,
+ wheel data angle pos=sqrt(2)/2
+]{1/BrickRed/text A}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ plot={{#1}:{0.5*(sin(#1*3)+1)+#2}}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\wheelchart[
+ domain=0:720,
+ gap polar=5,
+ plot={{#1*3.5/180},{sin(#1)-#2}},
+ radius={0}{2},
+ value=1,
+ wheel data=\WCcount,
+ wheel data pos=0.5
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ arc data=\WCvarC,
+ arc data dir={\WCmidangle<180?-1:1},
+ arc data pos=0.5,
+ data=,
+ domain=0:900,
+ plot={{#1}:
+ {(((#1)*pi/180+15)^2-1)/300
+ +(#2)-0.25}},
+ radius={0}{0.5},
+ slices arrow={1}{0},
+ value=sqrt(3+\WCcount*pi*(pi+6)/7)-
+ sqrt(3+(\WCcount-1)*pi*(pi+6)/7)
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ gap,
+ radius={1.3}{2},
+ start angle=180*(1-2/\WCtotalcount),
+ value=1
+}
+\wheelchart[
+ plot={{#1}:{(#2)*cos(180/\WCtotalcount)/cos(Mod(#1,{360/\WCtotalcount})-180/\WCtotalcount)}}
+]{\exampleforthismanual}
+\wheelchart[
+ at={(8,0)},
+ slices inner arrow={-cot(90*(1-2/\WCtotalcount))}{0},
+ slices outer arrow={cot(90*(1-2/\WCtotalcount))}{0}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{stylekey}{/wheelchart/plot style=\marg{options} (initially \normalfont empty)}
+This key sets |inner plot style| and |outer plot style|.
+\end{stylekey}
\begin{key}{/wheelchart/radius=\marg{inner radius}\marg{outer radius}}
This key defines the inner and outer radius of the wheelchart.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
contour={Green,ultra thick},
- data={},
+ data=,
radius={0.5}{\WCcount},
slices style=\WCvarA,
start angle=180,
@@ -961,70 +1617,38 @@ This key defines the inner and outer radius of the wheelchart.
]{Yellow,Orange,Red,Blue}
\end{tikzpicture}
\end{codeexample}
-\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
-\begin{tikzpicture}
-\def\n{73}
-\wheelchart[
- data={},
- middle={{\Huge\qty{\n}{\percent}}},
- radius={2.5-\WCvarC}{2.5+\WCvarC}
-]{%
- \n/MidnightBlue/0.5,
- {100-\n}/BurntOrange/0.3%
-}
-\draw[Gray] (0,0) circle[radius=1.9];
-\end{tikzpicture}
-\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/samples=\marg{number} (initially 25)}
+This key determines the \meta{number} of samples used in the plots.
+\end{key}
+\begin{key}{/wheelchart/separator columns=\marg{delimiter} (initially /)}
+\end{key}
+\begin{key}{/wheelchart/separator rows=\marg{delimiter} (initially ,)}
+The \meta{wheelchart data} in the command |\wheelchart| is a list in which the items are separated by the value of the key |separator rows|. Each item in this list corresponds to one slice of the wheelchart and consists of data separated by the value of the key |separator columns|.
\end{key}
\begin{key}{/wheelchart/slices=\marg{path}}
If this key is set then the shape of the slices of the wheelchart is defined by \meta{path}.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
- radius={2}{2},
- slices={(90:1) arc[start angle=-30,
- end angle=-90,radius=1]
- arc[start angle=-210,
- end angle=90,radius=1]--cycle;},
- slices style={
- /utils/exec={
- \pgfmathsetmacro
- {\WCcolornumber}
- {(\WCcount/
- \WCtotalcount)*100}
- },
- ForestGreen!\WCcolornumber,
- draw=RedViolet,
- ultra thick
- },
- total count=6,
- value=1,
- wheel data=\WCcount
-]{}
-\end{tikzpicture}
-\end{codeexample}
-\begin{codeexample}[width=10cm]
-\begin{tikzpicture}
-\wheelchart[
radius={2.7}{3.1},
slices={(0,-0.3)--(0.3,0)--(0,0.3)
--cycle;},
value=1
]{\exampleforthismanual}
\wheelchart[
- data={},
+ data=,
value=1
]{\exampleforthismanual}
\wheelchart[
- data={},
+ data=,
radius={2}{2},
slices={(0,0) circle[radius=0.4];},
slices style=White,
value=1
]{\exampleforthismanual}
\wheelchart[
- data={},
+ data=,
radius={2}{2},
slices={(0,0) circle[radius=0.3];},
value=1,
@@ -1032,37 +1656,58 @@ If this key is set then the shape of the slices of the wheelchart is defined by
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
+In the following example, a |;| is placed at the beginning of the argument for the key |slices| because there is no path to be filled. Thereafter, a node is placed still within the argument for the key |slices|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ radius={3.5}{3.5},
+ slices={;\node[
+ bottom color=\WCvarB!60,
+ top color=\WCvarB!10,
+ circle,
+ draw=gray,
+ minimum width=2.5cm
+ ] (WCslice\WCcount)
+ {\WCcount: \WCvarC};},
+ slices style={},
+ start half,
+ value=1
+]{\exampleforthismanual}
+\foreach\n in {1,...,7}{
+\pgfmathsetmacro{\k}{int(Mod(\n,7)+1)}
+\draw[->,line width=2pt] (WCslice\n)
+ to[bend left=10] (WCslice\k);
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices angle pos=\marg{value} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/slices angle shift=\marg{angle} (initially 0)}
+These keys determine the position of the slices if the key |slices| is used similar as the corresponding keys for the key |data|.
\end{key}
+Below we list some keys to modify the shape of the slices. These keys only affect the shape of the slices and \emph{not} the computation of the inner and outer plot. In particular, these keys do \emph{not} affect the placement of |arc data|, |data|, |inner data|, |lines|, |wheel data| and |wheel lines|. If this placement should be changed then the keys |inner plot| and |outer plot| can be used.
\begin{key}{/wheelchart/slices arc=\marg{value 1}\marg{value 2}}
-This key sets both |slices end arc| and |slices start arc|. The effect of \meta{value 1} and \meta{value 2} is shown in the table below.
-
-%\begin{codeexample}[width=10cm]
-\def\exampleslicesarc#1#2{%
-\begin{tikzpicture}[baseline={(0,0)}]
-\draw[Red,ultra thick] (-1,0)--(1,0);
-\pgfmathsetmacro{\angle}{atan(0.5*((1/(#1))-(#1)))}
-\draw (-1,0)--({-(1-(#2))},0) arc[start angle={sign(#1)*180-\angle},end angle={\angle},radius={0.5*(1-(#2))*abs((1/(#1))+(#1))}]--(1,0);
-\end{tikzpicture}%
-}
-\begin{tabular}{l|ccc}
- & $\text{\meta{value 2}}=-0.5$ & $\text{\meta{value 2}}=0$ & $\text{\meta{value 2}}=0.5$\\\hline
-$\text{\meta{value 1}}=2$ & \exampleslicesarc{2}{-0.5} & \exampleslicesarc{2}{0} & \exampleslicesarc{2}{0.5}\\
-$\text{\meta{value 1}}=1$ & \exampleslicesarc{1}{-0.5} & \exampleslicesarc{1}{0} & \exampleslicesarc{1}{0.5}\\
-$\text{\meta{value 1}}=-1$ & \exampleslicesarc{-1}{-0.5} & \exampleslicesarc{-1}{0} & \exampleslicesarc{-1}{0.5}\\
-$\text{\meta{value 1}}=-2$ & \exampleslicesarc{-2}{-0.5} & \exampleslicesarc{-2}{0} & \exampleslicesarc{-2}{0.5}\\
-\end{tabular}
-%\end{codeexample}
+This key sets |slices end arc| and |slices start arc| but uses the opposite of \meta{value 1} for |slices start arc|.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- slices arc={1}{0}
+ slices arc={1}{0},
+ wheel data=\WCcount,
+ wheel data angle pos=1,
+ wheel data pos=0.5,
+ wheel data style={
+ circle,
+ fill=\WCvarB!50
+ }
]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
+ data=,
radius={1}{4.5},
slices arc={1}{0.66},
slices style=\WCvarA,
@@ -1075,17 +1720,183 @@ $\text{\meta{value 1}}=-2$ & \exampleslicesarc{-2}{-0.5} & \exampleslicesarc{-2}
wheel data pos=0.5,
wheel data style=White
]{%
- Yellow/{Some text A},
- Orange/{Some text B},
- Red/{Some text C},
- Green/{Some text D},
- Blue/{Some text E}%
+ Yellow/Some text A,
+ Orange/Some text B,
+ Red/Some text C,
+ Green/Some text D,
+ Blue/Some text E%
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc inner end=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices inner arc| and |slices start arc| are set such that the inner part and the end of each of the slices of the wheelchart form one arc and such that the start has the opposite curvature as the end.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[font=\scriptsize]
+\foreach\a/\x in {0/0,45/4.5}{
+\wheelchart[
+ at={(\x,0)},
+ data=,
+ gap,
+ radius={1}{2.2},
+ slices arc inner end,
+ slices outer angle shift=\a,
+ value=1,
+ wheel data=\WCvarC,
+ wheel data angle pos=0.6
+]{\exampleforthismanual}
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc inner end start=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices inner arc| and |slices start arc| are set such that the inner part and the end of each of the slices of the wheelchart form one arc and such that the start has the same curvature as the end.
+\begin{codeexample}[]
+\begin{tikzpicture}
+\foreach\a/\x in {-60/0,0/4.5,60/10}{
+\wheelchart[
+ at={(\x,0)},
+ radius={0.66}{2},
+ slices arc inner end start,
+ slices inner angle shift=\a,
+ slices style={fill=none,draw=Turquoise,ultra thick},
+ total count=20
+]{}
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc inner start=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices inner arc| and |slices start arc| are set such that the inner part and the start of each of the slices of the wheelchart form one arc and such that the end has the opposite curvature as the start.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ middle={%
+ slices arc\\%
+ inner start,\\%
+ slices inner\\%
+ angle shift=90%
+ },
+ middle style={font=\ttfamily},
+ slices arc inner start,
+ slices inner angle shift=90
+]{%
+ 1/Goldenrod/,
+ 1/Mahogany/,
+ 1/JungleGreen/,
+ 1/RoyalBlue/%
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc inner start end=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices inner arc| and |slices start arc| are set such that the inner part and the start of each of the slices of the wheelchart form one arc and such that the end has the same curvature as the start.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ gap polar=5,
+ middle={%
+ slices arc\\%
+ inner start end%
+ },
+ middle style={font=\ttfamily},
+ slices arc inner start end,
+ value=1,
+ wheel data=\WCvarC,
+ wheel data pos=0.4
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc match=\marg{arg 1}\marg{num 1}\marg{num 2}\marg{num 3}\marg{arg 2}\marg{arg 3}\marg{arg 4}}
+This key modifies the shape of the slices according to the $7$ arguments.
+
+Here, \meta{arg 1} must be |end|, |inner|, |outer| or |start| and \meta{arg 2}, \meta{arg 3} and \meta{arg 4} must be |inner end|, |inner start|, |outer end| or |outer start|. For example, the key |slices arc inner end| sets |slices arc match={inner}{1}{-1}{1}{inner end}{inner start}{outer end}|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\foreach\a/\b/\x in
+ {end/1/0,inner/-1/4.8}{
+\wheelchart[
+ at={(\x,0)},
+ radius={0.66}{2},
+ slices arc match=
+ {\a}{\b}{1}{1}{inner end}
+ {inner start}{outer end},
+ slices inner angle shift=60,
+ slices style={
+ fill=none,
+ draw=Turquoise
+ },
+ total count=20
+]{}
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc outer end=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices outer arc| and |slices start arc| are set such that the outer part and the end of each of the slices of the wheelchart form one arc and such that the start has the opposite curvature as the end.
+\end{key}
+\begin{key}{/wheelchart/slices arc outer end start=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices outer arc| and |slices start arc| are set such that the outer part and the end of each of the slices of the wheelchart form one arc and such that the start has the same curvature as the end.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ gap polar=5,
+ middle={%
+ slices arc\\%
+ outer end start%
+ },
+ middle style={font=\ttfamily},
+ slices arc outer end start,
+ value=1,
+ wheel data=\WCvarC
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices arc outer start=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices outer arc| and |slices start arc| are set such that the outer part and the start of each of the slices of the wheelchart form one arc and such that the end has the opposite curvature as the start.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ gap=0.1,
+ slices arc inner start,
+ slices arc outer start,
+ slices style={
+ \WCvarB!50,
+ draw=\WCvarB,
+ ultra thick
+ },
+ value=1,
+ wheel data=\WCcount,
+ wheel data pos=0.8
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\foreach\a/\x in {0/0,45/5,90/10}{
+\wheelchart[
+ at={(\x,0)},
+ data=,
+ gap,
+ radius={0.66}{2},
+ slices arc outer start,
+ slices outer angle shift=\a,
+ value=1
+]{\exampleforthismanual}
}
\end{tikzpicture}
\end{codeexample}
\end{key}
+\begin{key}{/wheelchart/slices arc outer start end=\opt{\meta{boolean}} (default true, initially false)}
+If true then the keys |slices end arc|, |slices outer arc| and |slices start arc| are set such that the outer part and the start of each of the slices of the wheelchart form one arc and such that the end has the same curvature as the start.
+\end{key}
\begin{key}{/wheelchart/slices arrow=\marg{value 1}\marg{value 2}}
-This key is similar to the key |slices arc|.
+This key is similar to the key |slices arc| but draws an arrow.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
@@ -1096,48 +1907,484 @@ This key is similar to the key |slices arc|.
\end{codeexample}
\end{key}
\begin{key}{/wheelchart/slices end arc=\marg{value 1}\marg{value 2}}
-This key is similar to the key |slices arc| but only sets the end of the slice.
+This key determines the end of the slice.
+
+The effect of \meta{value 1} and \meta{value 2} is shown in the figure and the table below.
+
+If $\text{\meta{value 1}}>0$ then the arc points outwards the slice. If $\text{\meta{value 1}}<0$ then the arc points inwards the slice. Here, outwards and inwards are relative to the orientation of the four-sided polygon formed by the points whose coordinates are determined by the inner and outer radius of the first slice and the start angle and the angle at the inverse of the key |samples| between the start angle and the end angle of the first slice. If the start angle and the end angle of the first slice are equal then the end angle of the last slice is used instead. If this test is inconclusive then the orientation is set according to the key |counterclockwise|.
+
+If $\text{\meta{value 1}}=0$ then a line segment is drawn.
+
+If \meta{value 1} and \meta{value 2} are negative then an arc is drawn which behaves the same as an arc with $\text{\meta{value 2}}=0$ and such that its radius matches the radius of the arc corresponding to setting \meta{value 1} to its opposite. This is illustrated in the table below.
+\begin{center}
+\begin{tikzpicture}[scale=3]
+\wheelchart[
+ slices end arc={2}{0.5},
+ slices style={
+ fill=none,
+ draw=Cyan,
+ ultra thick
+ },
+ xbar={1}{1}
+]{1//}
+\draw[<->] (1,0.5)--(1.5,0.5) node[below,midway] {$a$};
+\draw[<->] (1,0.5)--(1,0.75) node[left,midway] {$b$};
+\draw[<->] (1,0.75)--(1,1) node[left,midway] {$c$};
+\draw[<->] (0.75,0.5)--(0.75,1) node[left,midway] {$d$};
+\node[right] at (2,0.5) {$\lvert\text{\meta{value 1}}\rvert=\frac{a}{b},\ \lvert\text{\meta{value 2}}\rvert=\frac{c}{d}$};
+\end{tikzpicture}
+
+\newcommand{\exampleslicesarc}[2]{%
+\begin{tikzpicture}[baseline={(0,0.5)}]
+\ifdim #1 pt<0pt
+\ifdim #2 pt<0pt
+\edef\r{\fpeval{0.25*((#2)-1)*(1/(#1)+(#1))}}
+\wheelchart[
+ at={({1.5+sqrt((\r)^2-0.25)-(#1)*0.5*(1-(#2))-\r},0)},
+ slices start arc={-(#1)}{#2},
+ slices style={
+ fill=none,
+ draw=Goldenrod,
+ ultra thick
+ },
+ xbar={0.5}{1}
+]{1//}
+\fi
+\fi
+\wheelchart[
+ slices end arc={#1}{#2},
+ slices style={
+ fill=none,
+ draw
+ },
+ xbar={1.5}{1}
+]{1//}
+\useasboundingbox ($(current bounding box.south west)-(2pt,2pt)$) rectangle ($(current bounding box.north east)+(2pt,2pt)$);
+\end{tikzpicture}%
+}
+\newcommand{\exampleslicesarcrow}[1]{$\text{\meta{value 1}}=#1$ & \exampleslicesarc{#1}{-0.5} & \exampleslicesarc{#1}{0} & \exampleslicesarc{#1}{0.5}\\}
+\begin{tabular}{l|lll}
+ & $\text{\meta{value 2}}=-0.5$ & $\text{\meta{value 2}}=0$ & $\text{\meta{value 2}}=0.5$\\\hline
+\exampleslicesarcrow{2}
+\exampleslicesarcrow{1}
+\exampleslicesarcrow{0}
+\exampleslicesarcrow{-1}
+\exampleslicesarcrow{-2}
+\end{tabular}
+\end{center}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ for loop start={
+ \definecolor{WCcolor}{wave}{
+ \fpeval{380+(\WCcount-1)*
+ 340/(\WCtotalcount-1)}}
+ },
+ gap polar=180/\WCtotalcount,
+ radius={1.5}{3},
+ slices end arc={-0.6}{0},
+ slices start arc={1.2}{0},
+ slices style=WCcolor,
+ total count=20
+]{}
+\end{tikzpicture}
+\end{codeexample}
\end{key}
\begin{key}{/wheelchart/slices end arrow=\marg{value 1}\marg{value 2}}
-This key is similar to the key |slices arrow| but only sets the end of the slice.
+This key is similar to the key |slices end arc| but draws an arrow.
+\end{key}
+\begin{key}{/wheelchart/slices end to=\marg{value 1}\marg{value 2}}
+This key sets the |to| path operation for the end of the slice. The angle at the inner side is determined by \meta{value 1} and the angle at the outer side is determined by \meta{value 2}.
+\end{key}
+\begin{key}{/wheelchart/slices inner angle reduce=\marg{angle}}
+This key sets |slices inner end angle shift| to $-\text{\meta{angle}}$ and |slices inner start angle shift| to \meta{angle}.
+\end{key}
+\begin{key}{/wheelchart/slices inner angle shift=\marg{angle}}
+This key sets |slices inner end angle shift| and |slices inner start angle shift| to \meta{angle}.
\begin{codeexample}[width=10cm]
\begin{tikzpicture}
\wheelchart[
- data={},
- explode=1,
- middle={\Large Recycle},
- slices end arrow={1}{-0.5},
- slices style=Green,
- total count=3,
+ data=,
+ middle={%
+ slices inner\\%
+ angle shift=90%
+ },
+ middle style={font=\ttfamily},
+ slices inner angle shift=90
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ gap,
+ radius={1}{3},
+ slices arc={0.5}{0},
+ slices inner angle shift=45,
+ value=1,
+ wheel data=\WCvarC,
+ wheel data angle pos=0.8
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[]
+\begin{tikzpicture}
+\foreach\a/\x in {-60/0,0/5.6,60/10}{
+\wheelchart[
+ at={(\x,0)},
+ radius={0.66}{2},
+ slices arc inner start,
+ slices inner angle shift=\a,
+ slices style={fill=\WClistcolors},
+ total count=40,
+ WClistcolors={RedOrange,none}
+]{}
+}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[font=\small]
+\pgfkeys{
+ /wheelchart,
+ data=,
+ inner data=\WCcount,
+ inner data pos=0.1,
+ inner data sep=0,
+ radius={1}{2.4},
+ slices inner angle shift=
+ 90-180/\WCtotalcount,
+ slices inner arc={0}{0},
+ value=1,
+ wheel data=\WCvarC
+}
+\wheelchart{\exampleforthismanual}
+\wheelchart[
+ at={(4.8,0)},
+ slices outer arc={0}{0},
+ wheel data pos=0.58
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices inner arc=\marg{value 1}\marg{value 2}}
+This key is similar to the key |slices end arc| but sets the inner part of the slice.
+\end{key}
+\begin{key}{/wheelchart/slices inner arc tangent=\opt{\meta{boolean}} (default true, initially false)}
+If true then the key |slices inner arc| is set such that the arc is tangent to the end and start of the slice if possible. Note that this is not possible for all settings for keys such as |plot| and |slices inner angle shift|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ counterclockwise,
+ data=,
+ gap=0.1,
+ middle=slices inner\\arc tangent,
+ middle style={font=\ttfamily},
+ slices inner arc tangent,
+ slices style={
+ draw=\WCvarB,
+ fill=\WCvarB!50,
+ ultra thick
+ },
value=1
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices inner arrow=\marg{value 1}\marg{value 2}}
+This key is similar to the key |slices end arrow| but sets the inner part of the slice.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\def\n{10}
+\wheelchart[
+ radius={0}{1.5},
+ slices outer arrow={cot(180/\n)}{0},
+ slices style{list}={
+ BurntOrange,RedOrange
+ },
+ total count=\n
+]{}
+\wheelchart[
+ radius={3*cos(180/\n)}
+ {3*cos(180/\n)},
+ slices inner arrow={cot(360/\n)}{0},
+ slices outer arrow={cot(360/\n)}{0},
+ slices style{list}={
+ Dandelion,Goldenrod
+ },
+ start half,
+ total count=\n
]{}
\end{tikzpicture}
\end{codeexample}
\end{key}
+\begin{key}{/wheelchart/slices inner end angle shift=\marg{angle} (initially 0)}
+The end angle of the inner part of the slice will be modified such that the angle between the end and the inner part of the slice is shifted with \meta{angle} (taking into account the key |counterclockwise|). The behavior of this key depends on whether a plot is used.
+\end{key}
+\begin{key}{/wheelchart/slices inner start angle shift=\marg{angle} (initially 0)}
+This key is similar to the key |slices inner end angle shift| but modifies the start angle of the inner part of the slice.
+\end{key}
+\begin{key}{/wheelchart/slices inner to=\marg{value 1}\marg{value 2}}
+This key sets the |to| path operation for the inner part of the slice. The angle at the start is determined by \meta{value 1} and the angle at the end is determined by \meta{value 2}.
+\end{key}
+\begin{key}{/wheelchart/slices outer angle reduce=\marg{angle}}
+This key sets |slices outer end angle shift| to $-\text{\meta{angle}}$ and |slices outer start angle shift| to \meta{angle}.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ inner data=\WCcount,
+ inner data style={
+ circle,
+ fill=white
+ },
+ slices inner arrow={1}{0},
+ slices outer angle reduce=
+ 180/\WCtotalcount,
+ slices outer arrow={0}{0},
+ value=1,
+ wheel data=\WCvarC,
+ wheel data style={
+ rotate=\WCmidangle-90
+ }
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices outer angle shift=\marg{angle}}
+This key sets |slices outer end angle shift| and |slices outer start angle shift| to \meta{angle}.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[looseness=2]
+\wheelchart[
+ data=,
+ inner data={\Large\WCcount},
+ inner data pos=1.1,
+ radius={1}{3},
+ slices arc inner end,
+ slices outer angle shift=80,
+ slices outer to={80}{80},
+ slices style={
+ bottom color=\WCvarB,
+ top color=\WCvarB!80!black,
+ shading angle=\WCmidangle-90
+ },
+ value=1,
+ wheel data=\WCvarC,
+ wheel data angle pos=0.4,
+ wheel data pos=0.8
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices outer arc=\marg{value 1}\marg{value 2}}
+This key is similar to the key |slices end arc| but sets the outer part of the slice.
+\end{key}
+\begin{key}{/wheelchart/slices outer arc tangent=\opt{\meta{boolean}} (default true, initially false)}
+If true then the key |slices outer arc| is set such that the arc is tangent to the end and start of the slice if possible. Note that this is not possible for all settings for keys such as |plot| and |slices inner angle shift|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ gap=0.1,
+ middle=slices outer\\arc tangent,
+ middle style={font=\ttfamily},
+ slices outer arc tangent,
+ slices style={
+ draw=\WCvarB,
+ fill=\WCvarB!50,
+ ultra thick
+ },
+ value=1
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices outer arrow=\marg{value 1}\marg{value 2}}
+This key is similar to the key |slices end arrow| but sets the outer part of the slice.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[font=\scriptsize]
+\foreach\a/\x in
+ {1/0,{tan(180/\WCtotalcount)}/5}{
+\wheelchart[
+ at={(\x,0)},
+ data=,
+ gap,
+ radius={0.66}{2},
+ slices outer arrow={\a}{0},
+ start half,
+ value=1,
+ wheel data=\WCvarC
+]{\exampleforthismanual}
+}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\pgfkeys{
+ /wheelchart,
+ data=,
+ radius={1}{1.5},
+ value=1
+}
+\wheelchart[
+ slices inner arrow={0}{0}
+]{\exampleforthismanual}
+\wheelchart[
+ at={(3.25,0)},
+ slices outer arrow={0}{0}
+]{\exampleforthismanual}
+\wheelchart[
+ at={(6.5,0)},
+ slices inner arrow={0}{0},
+ slices outer arrow={0}{0}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\foreach\r/\s/\a in
+ {3/0/0.5,2/15/1,1/30/0.7}{
+\wheelchart[
+ radius={0.5}{\r},
+ slices outer arrow={\a}{0},
+ slices style={
+ fill=\WClistcolors!20,
+ draw=\WClistcolors,
+ ultra thick,
+ double
+ },
+ start half=\s,
+ total count=12,
+ WClistcolors={CarnationPink,Orchid}
+]{}
+}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices outer end angle shift=\marg{angle} (initially 0)}
+The end angle of the outer part of the slice will be modified such that the angle between the end and the inner (not the outer) part of the slice is shifted with \meta{angle} (taking into account the key |counterclockwise|). The behavior of this key depends on whether a plot is used.
+\end{key}
+\begin{key}{/wheelchart/slices outer start angle shift=\marg{angle} (initially 0)}
+This key is similar to the key |slices outer end angle shift| but modifies the start angle of the outer part of the slice.
+\end{key}
+\begin{key}{/wheelchart/slices outer to=\marg{value 1}\marg{value 2}}
+This key sets the |to| path operation for the outer part of the slice. The angle at the start is determined by \meta{value 1} and the angle at the end is determined by \meta{value 2}.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[looseness=3]
+\wheelchart[
+ data=,
+ radius={0}{2.5},
+ slices arc={0.4}{0},
+ slices outer to={70}{70},
+ start half,
+ value=1,
+ wheel data=\WCvarC,
+ wheel data pos=1
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/slices pos=\marg{value} (initially 0.5)}
+This key determines the position of the slices if the key |slices| is used similar as the corresponding key for the key |data|.
+\end{key}
+\begin{stylekey}{/wheelchart/slices scope=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys which will be applied to the scope in which the slices of the wheelchart, the wheel lines determined by the key |wheel lines| and the different kinds of data are placed.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data=,
+ radius={3.9}{4.5},
+ slices inner arc={0}{0},
+ slices outer angle reduce=5*90/7,
+ slices outer arc={0}{0},
+ slices scope={
+ shift={
+ ($(90+\WCmidangle:0.559572)
+ +(\WCmidangle:-1.16196)$)
+ }
+ },
+ value=1,
+ wheel data=\WCvarC,
+ wheel data pos=0,
+ wheel data style={
+ rotate=\WCmidangle-90
+ }
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
+\begin{tikzpicture}
+\wheelchart[
+ data=\WCvarC\\%
+ \qty{\fpeval{\WCvarA/2}}%
+ {\percent},
+ radius={0.5}{0.5+0.1*\WCvarA},
+ slices inner arc tangent,
+ slices outer angle reduce=
+ 180/\WCtotalcount,
+ slices outer arc tangent,
+ slices scope={shift={(\WCmidangle:
+ {-cos(180/\WCtotalcount)/2})}},
+ value=1
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{stylekey}
+\begin{key}{/wheelchart/slices sep=\marg{value} (initially 0)}
+This key determines the position of the slices if the key |slices| is used similar as the corresponding key for the key |data|.
+\end{key}
\begin{key}{/wheelchart/slices start arc=\marg{value 1}\marg{value 2}}
-This key is similar to the key |slices arc| but only sets the start of the slice.
+This key is similar to the key |slices end arc| but sets the start of the slice.
\end{key}
\begin{key}{/wheelchart/slices start arrow=\marg{value 1}\marg{value 2}}
-This key is similar to the key |slices arrow| but only sets the start of the slice.
+This key is similar to the key |slices end arrow| but sets the start of the slice.
+\end{key}
+\begin{key}{/wheelchart/slices start to=\marg{value 1}\marg{value 2}}
+This key sets the |to| path operation for the start of the slice. The angle at the inner side is determined by \meta{value 1} and the angle at the outer side is determined by \meta{value 2}.
\end{key}
\begin{stylekey}{/wheelchart/slices style=\marg{options} (initially \textbackslash WCvarB)}
This key defines the style of the slices of the wheelchart.
\end{stylekey}
+\begin{key}{/wheelchart/slices to=\marg{value 1}\marg{value 2}}
+This key sets |slices end to| and |slices start to| but uses the opposite respective values for |slices start to|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}[looseness=2]
+\wheelchart[
+ radius={1}{3},
+ slices inner angle shift=90,
+ slices inner arc={0}{0},
+ slices outer to={70}{70},
+ slices style{list}={Maroon,Salmon},
+ slices to={30}{30},
+ total count=6
+]{}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{stylekey}{/wheelchart/slice\marg{range}=\marg{options} (initially \normalfont empty)}
+This key accepts a list of keys from the wheelchart key family. The \meta{range} is mandatory and must be non-empty. It is processed with |\foreach| with the option |parse=true|. Hereafter the elements are processed with |\fp_eval:n|. The \meta{options} will only be applied to a slice if the number of the slice is in the \meta{range}. The \meta{range} only makes sense for a key which is processed for each slice. For example, the \meta{range} does not make sense for the key |middle|.
+\end{stylekey}
\begin{key}{/wheelchart/start angle=\marg{angle} (initially 90)}
This key defines the \meta{angle} in degrees at which the first slice of the wheelchart starts.
\end{key}
\begin{key}{/wheelchart/start half=\marg{angle} (default 90)}
-If this key is set then the middle of the first slice of the wheelchart is positioned at \meta{angle} in degrees.
+This key sets the start angle such that the middle of the first slice of the wheelchart is positioned at \meta{angle} in degrees.
\end{key}
-\begin{key}{/wheelchart/title=\marg{text}}
-This key contains the \meta{text} which will be placed above the wheelchart. The \meta{text} is placed in a node. The $x$ coordinate of this node is the $x$ coordinate of the center of the wheelchart, which is defined by the key |at|. In general, this is \emph{not} the same as the $x$ coordinate of the center of the |local bounding box| around the wheelchart. The $y$ coordinate of this node is |0.5| above the north of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=south,align=center| are given. Thereafter, the style of the key |title style| is added.
+\begin{key}{/wheelchart/title=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed above the wheelchart. The \meta{text} is placed in a node. The $x$ coordinate of this node is the $x$ coordinate of the center of the wheelchart, which is defined by the key |at|. In general, this is \emph{not} the same as the $x$ coordinate of the center of the |local bounding box| around the wheelchart. The $y$ coordinate of this node is at a value determined by the key |title sep| above the north of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=south,align=center| are given. Thereafter, the style of the key |title style| is added.
\end{key}
-\begin{key}{/wheelchart/title left=\marg{text}}
-This key contains the \meta{text} which will be placed above left of the wheelchart. The \meta{text} is placed in a node. This node is placed |0.5| above the north west of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=south west,align=left| are given. Thereafter, the style of the key |title left style| is added.
+\begin{key}{/wheelchart/title left=\marg{text} (initially \normalfont empty)}
+This key contains the \meta{text} which will be placed above left of the wheelchart. The \meta{text} is placed in a node. This node is placed at a value determined by the key |title left sep| above the north west of the |local bounding box| around the wheelchart. The style of this node is given as follows. First, the options |anchor=south west,align=left| are given. Thereafter, the style of the key |title left style| is added.
+\end{key}
+\begin{key}{/wheelchart/title left sep=\marg{value} (initially 0.5)}
+The node where the contents of the key |title left| is placed is at \meta{value} above the north west of the |local bounding box| around the wheelchart.
\end{key}
\begin{stylekey}{/wheelchart/title left style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |title left| is placed.
\end{stylekey}
+\begin{key}{/wheelchart/title sep=\marg{value} (initially 0.5)}
+The $y$ coordinate of the node where the contents of the key |title| is placed is at \meta{value} above the north of the |local bounding box| around the wheelchart.
+\end{key}
\begin{stylekey}{/wheelchart/title style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |title| is placed.
\end{stylekey}
@@ -1145,67 +2392,61 @@ This key accepts a list of keys which will be applied to the node where the cont
This key defines the total \meta{angle} in degrees of the wheelchart.
\end{key}
\begin{key}{/wheelchart/total count=\marg{number}}
-If this key is set then the number of slices of the wheelchart is determined by \meta{number}.
-\begin{codeexample}[width=10cm,preamble={\usepackage{listofitems}}]
-\readlist*\WCcolors{
- Rhodamine,RedOrange,OrangeRed
-}
-\setsepchar{ }
-\readlist\WCdata{An example with the
- package \texttt{listofitems} where
- some keys are given using a list}
+If this key is set then the number of slices of the wheelchart is determined by \meta{number}. Moreover, |\WCvarA| is defined as |1| and |\WCvarB| and |\WCvarC| are defined to be empty.
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
+\def\n{57}
\wheelchart[
- data={\WCdata[\WCcount]},
- slices style={
- /utils/exec={
- \pgfmathsetmacro
- {\WCcolornumber}
- {int(Mod({\WCcount-1},
- \WCcolorslen)+1)}
- },
- \WCcolors[\WCcolornumber]
- },
- total count={\WCdatalen},
- value=1
+ gap=0.015,
+ middle={\Huge\qty{\n}{\percent}},
+ slices style=Gray,
+ slices style{1,...,\n}=Cyan,
+ total count=100
]{}
\end{tikzpicture}
\end{codeexample}
-\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
+\end{key}
+\begin{key}{/wheelchart/triangle proportional area=\marg{width}\marg{height}}
+This key configures the plot such that a triangular shape is obtained. The value is proportional to the area and \emph{not} to the height. Moreover, it sets |samples=2| and |wheel data pos=0.5|. The point $(0,0)$ is at the top. This can be shifted with the key |at|.
+\begin{codeexample}[width=10cm]
\begin{tikzpicture}
-\def\n{57}
\wheelchart[
- data={},
- gap=0.015,
- middle={%
- {\Huge\qty{\n}{\percent}}\\%
- An ode to the\\%
- ``Grothendieck prime''%
- },
- slices style={
- /utils/exec={
- \ifnum\WCcount>\n
- \def\WCcolor{Gray}
- \else
- \def\WCcolor{Cyan}
- \fi
- },
- \WCcolor
- },
- total count=100,
+ triangle proportional area={5}{4},
value=1
-]{}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/triangle proportional height=\marg{width}\marg{height}}
+This key configures the plot such that a triangular shape is obtained. The value is proportional to the height and \emph{not} to the area. Moreover, it sets |samples=2| and |wheel data pos=0.5|. The point $(0,0)$ is at the top. This can be shifted with the key |at|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ triangle proportional height={5}{4},
+ value=1
+]{\exampleforthismanual}
\end{tikzpicture}
\end{codeexample}
\end{key}
\begin{key}{/wheelchart/value=\marg{value} (initially \textbackslash WCvarA)}
This key defines the \meta{value} which corresponds to the size of each slice of the wheelchart.
\end{key}
-\begin{key}{/wheelchart/wheel data=\marg{text}}
+\begin{key}{/wheelchart/WClist\meta{name}=\marg{list}}
+This key locally defines a macro |\WClist|\meta{name} which gives the element in the \meta{list} with as index |\WCcount| modulo the length of the \meta{list}. The \meta{list} is expanded once and processed using a |clist|. In particular, blank arguments are ignored. An empty argument in the \meta{list} can be obtained with |{}|. Items containing a |,| can be obtained by surrounding it with |{| and |}| such as |WClistA={{a,b},{c,d}}|.
+
+If |\def\mylist{a,b,c}| and |WClistA=\mylist| then |\WClistA| gives |a,b,c| for each slice. On the other hand, if |WClistA/.expanded=\mylist| then |\WClistA| alternates between |a|, |b| and |c|.
+\end{key}
+\begin{key}{/wheelchart/wheel data=\marg{text} (initially \normalfont empty)}
This key contains the \meta{text} which will be placed on top of each slice of the wheelchart. The \meta{text} is placed in a node. The style of this node is given as follows. First, the option |align=left| is given. Thereafter, the style of the key |wheel data style| is added.
\end{key}
+\begin{key}{/wheelchart/wheel data angle pos=\marg{value} (initially 0.5)}
+\end{key}
+\begin{key}{/wheelchart/wheel data angle shift=\marg{angle} (initially 0)}
+\end{key}
\begin{key}{/wheelchart/wheel data pos=\marg{value} (initially 0.66)}
-The radius of the polar coordinate at which the contents of the key |wheel data| is placed is given by the convex combination $\text{|wheel data pos|}\cdot\text{|outer radius|}+(1-\text{|wheel data pos|})\cdot\text{|inner radius|}$.
+\end{key}
+\begin{key}{/wheelchart/wheel data sep=\marg{value} (initially 0)}
+These keys determine the position of the contents of the key |wheel data| similar as the corresponding keys for the key |data|.
\end{key}
\begin{stylekey}{/wheelchart/wheel data style=\marg{options} (initially \normalfont empty)}
This key accepts a list of keys which will be applied to the node where the contents of the key |wheel data| is placed.
@@ -1214,7 +2455,7 @@ This key accepts a list of keys which will be applied to the node where the cont
If this key is set then lines with the style determined by this key will be drawn inside the slices of the wheelchart. The number of these lines depends on the value of the key |value|.
Below is the example from \cite[Subsection 7.6]{TtTaPGFp} recreated with the package |wheelchart|.
-\begin{codeexample}[width=10cm]
+\begin{codeexample}[width=10cm,preamble={\usepackage{siunitx}}]
\begin{tikzpicture}
\colorlet{good}{green!75!black}
\colorlet{bad}{red}
@@ -1223,22 +2464,268 @@ Below is the example from \cite[Subsection 7.6]{TtTaPGFp} recreated with the pac
\wheelchart[
anchor xsep=15,
contour=gray,
- data={``\WCvarC'': \WCvarA{} (\WCperc)},
- middle={Ratings given by\\\pgfmathprintnumber{\WCtotalnum}~participants},
+ data=``\WCvarC'': \WCvarA{} (\WCperc),
+ middle=Ratings given by\\\WCtotalnum{} participants,
radius={1.8}{2.2},
start half=270,
wheel lines={black!15,thick}
]{%
10/neutral/ok,
9/good!60!white/good,
- 3/good/{very good},
+ 3/good/very good,
20/none/none,
- 0/bad/{very bad},
+ 0/bad/very bad,
8/bad!60!white/bad%
}
\end{tikzpicture}
\end{codeexample}
\end{stylekey}
+\begin{key}{/wheelchart/xbar=\marg{width}\marg{height}}
+This key sets |domain=0:|\marg{width}, |plot={{#1},{#2}}|, |radius={0}|\marg{height}, |samples=2| and also |wheel data pos=0.5|. The point $(0,0)$ is below left of the bar. This can be shifted with the key |at|. Note that since this key sets in particular the outer parts of the slices, keys such as |slices outer arc| must be placed \emph{after} the key |xbar| to be applied.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ data pos{list}={1,0},
+ data style={anchor=mid},
+ gap polar=0.05,
+ slices arrow={1}{0},
+ xbar={8}{1.5}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\begin{key}{/wheelchart/ybar=\marg{width}\marg{height}}
+This key sets |domain=0:|\marg{height}, |plot={{#2},{#1}}|, |radius={0}|\marg{width}, |samples=2| and also |wheel data pos=0.5|. The point $(0,0)$ is below left of the bar. This can be shifted with the key |at|.
+\begin{codeexample}[width=10cm]
+\begin{tikzpicture}
+\wheelchart[
+ inner data=\WCperc,
+ inner data style={anchor=east},
+ ybar={1}{4}
+]{\exampleforthismanual}
+\end{tikzpicture}
+\end{codeexample}
+\end{key}
+\section{Additional examples}
+The following example is an answer to the question on \url{https://tex.stackexchange.com/questions/433848/is-there-a-way-to-make-sunburst-charts-multi-level-pie-charts-in-latex}.
+\catcode`|=12%
+\begin{codeexample}[preamble={\usepackage{etoolbox}
+\usepackage{listofitems}
+\usetikzlibrary{decorations.text}}]
+\begin{tikzpicture}
+\sffamily
+\readlist\WCcolors{orange!50,orange!75,orange}
+\pgfkeys{
+ /wheelchart,
+ arc data=\WCvarB,
+ arc data dir={\WCmidangle<180?-1:1},
+ arc data pos=0.5,
+ arc data style={text color=white},
+ counterclockwise,
+ data=,
+ gap,
+ gap radius,
+ slices style={
+ /utils/exec={
+ \ifdefempty{\WCvarB}{
+ \def\WCcolor{none}
+ \def\WCoverlay{true}
+ }{
+ \edef\WCcolor{\WCcolors[\fpeval{\WCmidangle<90?1:(\WCmidangle<210?2:(\WCmidangle<270?3:1))}]}
+ \def\WCoverlay{false}
+ }
+ },
+ fill=\WCcolor,
+ overlay=\WCoverlay
+ }
+}
+\wheelchart[
+ middle=Root\\Node,
+ middle style=darkgray,
+ radius={1}{2}
+]{2/Node 1,1/Node 2,3/Node 3}
+\wheelchart[
+ radius={2}{3}
+]{4/Sub1,4/Sub2,4/Sub3,3/Sub1,3/Sub2,6/Sub1,6/Sub2,3/Sub3,3/Sub4}
+\wheelchart[
+ radius={3}{4}
+]{4/Sub1-Sub1,20/,3/Sub2-Sub1,3/Sub2-Sub2,6/}
+\end{tikzpicture}
+\end{codeexample}
+\catcode`|=13%
+The following example is an answer to the question on \url{https://tex.stackexchange.com/questions/447920/pie-chart-with-color-palette-info-inside-and-legend}.
+\newgeometry{left=2pt,right=2pt,top=2.5cm,bottom=2.5cm}%
+\makeatletter%
+\f@nch@setoffs%
+\makeatother%
+\catcode`|=12%
+\begin{codeexample}[preamble={\usepackage{siunitx}
+\usetikzlibrary{decorations.text}}]
+\begin{tikzpicture}
+\ExplSyntaxOn
+\seq_set_from_clist:Nn \l_tmpa_seq { 190~ 30~ 46 , 240~ 65~ 54 , 241~ 90~ 43 , 247~148~ 30 , 43~ 56~144 , 28~117~188 , 40~170~225 ,
+ 119~179~225 , 181~212~239 , 0~104~ 56 , 0~148~ 69 , 57~181~ 74 , 141~199~ 63 , 215~244~ 34 ,
+ 249~237~ 50 , 248~241~148 , 242~245~205 , 123~ 82~ 49 , 104~ 73~158 , 102~ 45~145 , 148~149~151 }
+\seq_map_indexed_inline:Nn \l_tmpa_seq { \definecolor { slice#1 } { RGB } {#2} }
+\ExplSyntaxOff
+\definecolor{background}{RGB}{255 253 234}\definecolor{disc}{RGB}{ 15 119 188}
+\definecolor{text1}{RGB}{209 211 212}\definecolor{text2}{RGB}{ 67 66 63}
+\sisetup{group-separator={,},group-minimum-digits=4,text-series-to-math=true}
+\fill[background] (-6.8,-8) rectangle (13.8,8);
+\pgfkeys{/wheelchart,data=,radius={1.7}{5}}
+\wheelchart[
+ arc data{18,21}=|\bfseries|\WCvarE{} \WCpercentage{\,}{\unit{\percent}},
+ arc data pos=1.2,
+ arc data style={text color=slice\WCcount},
+ inner data{1,...,20}=\qty{\WCvarC}{\percent}\\[-4pt]yield,
+ inner data pos=0.5,
+ inner data style=\WCvarB,
+ legend entry={
+ \fill[slice\WCcount,shift={({int((\WCcount-1)/17)*4.5-3},0)}] ({45-Mod({\WCcount-1},17)*90/16}:10) circle[radius=0.4]
+ node[\WCvarB,font=\large] {\WCperc}
+ node[black,shift={(0.6,0)},anchor=west,font=\footnotesize,align=left,execute at begin node={\baselineskip=7pt}] {\WCvarD};
+ },
+ lines{18,21}=0.75,
+ lines sep=0.1,
+ lines style={slice\WCcount,dashed,ultra thick},
+ middle=Income\\[-4pt]\& growth\\{\Huge\textcolor{slice21}{\pounds 100k}}\\portfolio,
+ middle fill=white,
+ middle style={font=\bfseries\Large},
+ slices style=slice\WCcount,
+ wheel data={\Large \pounds\WCvarA k},
+ wheel data{21}=\pounds\\[-4pt]\WCvarA\\[-4pt]k,
+ wheel data pos=0.8,
+ wheel data style=\WCvarB
+]{%
+ 5/text1/4.26/Miton Multi-Cap\\Income/,
+ 6/text1/6.86/Schroder Income\\Maximiser/,
+ 6/text1/3.82/Trojan\\Income/,
+ 7/text1/3.32/CF Woodford\\Equity Income/,
+ 7/text1/2.91/Artemis Global\\Income/,
+ 4/text1/2.87/First State Global\\Listed Infrastructure/,
+ 4/slice5/2.63/Lazard Global\\Listed Infrastructure/,
+ 4/slice5/3.50/Legg Mason RARE\\Global Income/,
+ 6/slice5/2.55/Newton Global\\Income/,
+ 5/text1/4.6/Henderson\\Strategic Bond/,
+ 4/text1/5.01/Invesco Perpetual\\Monthly Income Plus/,
+ 5/text1/4.4/Jupiter Strategic\\Bond/,
+ 4/slice11/0/L\&G All Stocks Index\\Linked Gilt Index/,
+ 5/slice11/2.3/L\&G Short Dated Sterling\\Corporate Bond Index/,
+ 4/slice11/5.95/Royal London Short Duration\\Global High Yield Bond/,
+ 4/slice10/3.55/TwentyFour\\Corporate Bond/,
+ 4/slice10/5.03/TwentyFour\\Dynamic Bond/,
+ 5/text1/4.8/F\&C Property Growth\\\& Income/PROPERTY,
+ 5/text1/4.44/Aviva Multi Strategy\\Target Income/,
+ 5/text1/3.45/Invesco\\Perpetual\\Global Targeted\\Income/,
+ 1/text2/0.01/Cash/CASH%
+}
+\pgfkeys{/wheelchart,arc={draw=\WCvarB,dashed,ultra thick},arc around text,arc data{1,2,3,5}=|\bfseries|\WCvarC{} \WCvarA{\,}
+{\unit{\percent}},arc data pos=1.1,arc data style={text color=\WCvarB},arc pos=1.1,slices style={fill=none},value{5}=12}
+\wheelchart{%
+ 24/slice1/UK EQUITIES,
+ 25/slice5/GLOBAL EQUITIES,
+ 35/slice10/FIXED INTEREST,
+ 3/none/,
+ 10/slice20/ALTERNATIVE,
+ 1/none/%
+}
+\fill[disc] (12,-5.5) circle[radius=1.7]
+node[white,font=\Large\bfseries,align=center] {Portfolio\\[-4pt]income\\\pounds\num{3785}\\[10pt]{\large or \qty{3.79}{\percent}}};
+\node[rotate=270,anchor=north west] at (13.8,8) {\emph{Source: Whitechurch Securities}};
+\end{tikzpicture}
+\end{codeexample}
+\catcode`|=13%
+\restoregeometry%
+The following example is an answer to the question on \url{https://tex.stackexchange.com/questions/477310/cyclic-flowchart-in-tikz}.
+\catcode`|=12%
+\begin{codeexample}[width=10cm,preamble={\usetikzlibrary{decorations.text}}]
+\begin{tikzpicture}
+\sffamily
+\wheelchart[
+ data=,
+ middle=Optimized\\vibrating\\%
+ systems,
+ middle fill=RoyalBlue,
+ middle style=white,
+ radius={1.2}{4},
+ slices={(0,0) circle[radius=0.8];},
+ slices style=\WCvarA,
+ start half,
+ value=1,
+ wheel data=\WCvarB,
+ wheel data pos=0.5,
+ wheel data style={
+ white,
+ align=center
+ }
+]{%
+ Green/Passive\\control,
+ Maroon/Feed-\\forward,
+ Orange/Active\\control%
+}
+\wheelchart[
+ gap polar=25,
+ radius={2.5}{2.7},
+ slices end arrow={1}{-1},
+ slices start arrow={1}{-1},
+ slices style=Gray,
+ total count=3
+]{}
+\foreach\n in {-30,90,210}{
+ \draw[->,MidnightBlue,ultra thick]
+ (\n:1.7)--(\n:1.3);
+}
+\fill[
+ top color=Gray!50,
+ bottom color=Gray,
+ draw,
+ even odd rule
+] (0,0) circle[radius=3.5]
+ circle[radius=4.2];
+\wheelchart[
+ arc{2}={
+ <-,
+ ultra thick
+ },
+ arc around text,
+ arc data=~\WCvarA~,
+ arc data pos=0.5,
+ arc pos=0.5,
+ data=,
+ gap polar=10,
+ radius={3.5}{4.2},
+ slices style={fill=none},
+ start half=180,
+ value=1
+]{%
+ {Mass M, Damping D, Stiffness K},
+ Dynamic model,
+ Frequency response functions H,
+ %
+}
+\end{tikzpicture}
+\end{codeexample}
+\catcode`|=13%
+\section{Version history}
+\begin{itemize}
+\item[] \textbf{Version 1.0 (2022/09/11)} First version.
+\item[] \textbf{Version 2.0 (2023/12/03)}
+\begin{itemize}
+\item The package now mainly uses \LaTeX3 syntax.
+\item Improved the definition of the path of the slices.
+\item Many internal computations are now performed with |\fp_eval:n| instead of |pgfmath| for higher accuracy and to allow larger values. This applies in particular to the computation of |\WCpercentage|, |\WCpercentagerounded| and |\WCtotalnum|. Hence |\WCpercentagerounded| can be parsed by |siunitx| since its definition does not involve |\pgfmathprintnumberto| anymore and |\WCtotalnum| does not end with |.0| if it is an integer.
+\item The number of data which can be given to each slice of the wheelchart and accessed by |\WCvarA| and so on is not limited to $26$ anymore.
+\item \begin{flushleft}Added the macros |\WCcountdiscrete|, |\WCetocthelinkedname|, |\WCetocthelinkednumber|, |\WCetocthelinkedpage|, |\WCetocthename|, |\WCetocthenumber|, |\WCetocthenumberofpages|, |\WCetocthepage|, |\WClegend|, |\WClist|\meta{name} and |\|\meta{prefix}\meta{name}.\end{flushleft}
+\item \begin{flushleft}Added the keys |after slices|, |arc|, |arc around text|, |arc data|, |arc data align|, |arc data angle pos|, |arc data angle shift|, |arc data dir|, |arc data pos|, |arc data sep|, |arc data style|, |arc first half|, |arc pos|, |arc second half|, |arc sep|, |before slices|, |caption left sep|, |caption sep|, |data angle pos|, |data pos|, |discrete|, |discrete factor|, |discrete partitioning|, |discrete pic|, |discrete sort|, |discrete space at borders|, |domain|, |etoc code|, |etoc count total pages|, |etoc level|, |etoc name|, |etoc use name|, |expand list items|, |for loop end|, |for loop start|, |gap max angle|, |gap radius|, |header|, |header prefix|, |inner data angle pos|, |inner data angle shift|, |inner data pos|, |inner plot|, |inner plot style|, |legend columns|, |legend only|, |legend row|, |lines angle pos|, |lines angle shift|, |lines ext dir|, |lines ext fixed left|, |lines ext fixed right|, |lines pos|, |outer plot|, |outer plot style|, |parse|, |plot|, |plot style|, |samples|, |separator columns|, |separator rows|, |slices angle pos|, |slices angle shift|, |slices arc inner end|, |slices arc inner end start|, |slices arc inner start|, |slices arc inner start end|, |slices arc match|, |slices arc outer end|, |slices arc outer end start|, |slices arc outer start|, |slices arc outer start end|, |slices end to|, |slices inner angle reduce|, |slices inner angle shift|, |slices inner arc|, |slices inner arc tangent|, |slices inner arrow|, |slices inner end angle shift|, |slices inner start angle shift|, |slices inner to|, |slices outer angle reduce|, |slices outer angle shift|, |slices outer arc|, |slices outer arc tangent|, |slices outer arrow|, |slices outer end angle shift|, |slices outer start angle shift|, |slices outer to|, |slices pos|, |slices scope|, |slices sep|, |slices start to|, |slices to|, |slice|\marg{range}, |title left sep|, |title sep|, |triangle proportional area|, |triangle proportional height|, |WClist|\meta{name}, |wheel data angle pos|, |wheel data angle shift|, |wheel data sep|, |xbar| and |ybar|.\end{flushleft}
+\item Added the possibility to give a \meta{range} to the keys such that the options given to the key will only be applied to a slice if the number of the slice is in the \meta{range}.
+\item Added the possibility to give a \meta{list} to the keys.
+\item The \meta{wheelchart data} are not processed with |\foreach| anymore but instead with one of |\seq_set_split:Nee|, |\seq_set_split:Nen| or |\seq_set_split:Neo| depending on the keys |expand list| and |expand list items|. Thus syntax which is specific to how |\foreach| processes a list does not work anymore, such as the dots notation and the repeating of the last entry if some entry in the list has fewer entries than required.
+\item If the key |start angle| is set after the key |start half| then v1.0 preserved the setting of the key |start half|. In v2.0, the setting is determined by the key which is set last.
+\item In v1.0, the value of the key |data angle shift| was also applied to |inner data|, |lines| and |wheel data|. In v2.0, this is not the case anymore. Instead there are now separate keys |inner data angle shift|, |lines angle shift|, |wheel data angle shift| and also |arc data angle shift|.
+\item In v1.0, the key |data sep| was not applied if the key |lines ext| was used. In v2.0, this is not the case anymore.
+\item In v1.0, a negative value for the key |lines| was not applied. In v2.0, this is not the case anymore.
+\end{itemize}
+\end{itemize}
\begin{thebibliography}{9}
\bibitem{JhcIparowcltopotPGFm}
Jake,
@@ -1254,9 +2741,9 @@ Manual for Preliminary Version,
\bibitem{RSVpaaMfp}
Dominique Rodriguez, Michael Sharpe, Herbert Vo{\ss},
\emph{{\upshape\texttt{pstricks-add} \textsf{additionals Macros for} \texttt{pstricks}}},
-Manual for version 3.92,
+Manual for version 3.94,
\url{https://ctan.org/pkg/pstricks-add},
-2021.
+2023.
\bibitem{Tumfdb}
Nicola L.C.~Talbot,
\emph{User Manual for datatool bundle version 2.32},
@@ -1265,15 +2752,23 @@ Nicola L.C.~Talbot,
\bibitem{TtTaPGFp}
Till Tantau,
\emph{The \tikzname{} and {\upshape\pgfname} Packages},
-Manual for version 3.1.9a,
+Manual for version 3.1.10,
\url{https://ctan.org/pkg/pgf},
-2021.
+2023.
\bibitem{XdPCbupp}
Yuan Xu,
\emph{Drawing Pie Chart by using {\upshape\texttt{pgf-pie}}},
-Manual for version 0.6,
+Manual for version 0.7,
\url{https://ctan.org/pkg/pgf-pie},
-2021.
+2022.
\end{thebibliography}
\printindex
+\newgeometry{left=2.25cm,right=2.25cm,top=2.25cm,bottom=2.25cm}
+\pagestyle{plain}
+\appendix
+\addtocontents{toc}{\protect\setcounter{tocdepth}{-2}}
+\begin{landscape}
+\section{The source code}\label{Thesourcecode}
+\dochighinput[language=latex/latex3]{wheelchart.sty}
+\end{landscape}
\end{document} \ No newline at end of file
diff --git a/macros/generic/ltxcmds/README.md b/macros/generic/ltxcmds/README.md
index 2aef65aa3a..e9a4b0dc3d 100644
--- a/macros/generic/ltxcmds/README.md
+++ b/macros/generic/ltxcmds/README.md
@@ -1,6 +1,6 @@
# ltxcmds package for latex
-Version: 2020-05-10 v1.25
+Version: 2023-12-04 v1.26
The package ltxcmds exports some utility macros
from the LaTeX kernel into a separate namespace and
@@ -8,7 +8,7 @@ also provides them for other formats such as plain-TeX.
## Copyright (C)
* 2007, 2009-2011 Heiko Oberdiek
-* 2016-2020 Oberdiek Package Support Group
+* 2016-2023 Oberdiek Package Support Group
## License
LATEX Project Public License, version 1.3c or later.
diff --git a/macros/generic/ltxcmds/ltxcmds.dtx b/macros/generic/ltxcmds/ltxcmds.dtx
index 9940671d4d..7970f6a011 100644
--- a/macros/generic/ltxcmds/ltxcmds.dtx
+++ b/macros/generic/ltxcmds/ltxcmds.dtx
@@ -1,12 +1,12 @@
% \iffalse meta-comment
%
% File: ltxcmds.dtx
-% Version: 2020-05-10 v1.25
+% Version: 2023-12-04 v1.26
% Info: LaTeX kernel commands for general use
%
% Copyright (C)
% 2009-2011 Heiko Oberdiek
-% 2016-2020 Oberdiek Package Support Group
+% 2016-2023 Oberdiek Package Support Group
% https://github.com/ho-tex/ltxcmds/issues
%
% This work may be distributed and/or modified under the
@@ -86,7 +86,7 @@
\input docstrip.tex
\Msg{************************************************************************}
\Msg{* Installation}
-\Msg{* Package: ltxcmds 2020-05-10 v1.25 LaTeX kernel commands for general use (HO)}
+\Msg{* Package: ltxcmds 2023-12-04 v1.26 LaTeX kernel commands for general use (HO)}
\Msg{************************************************************************}
\keepsilent
@@ -98,11 +98,11 @@
This is a generated file.
Project: ltxcmds
-Version: 2020-05-10 v1.25
+Version: 2023-12-04 v1.26
Copyright (C)
2009-2011 Heiko Oberdiek
- 2016-2020 Oberdiek Package Support Group
+ 2016-2023 Oberdiek Package Support Group
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -166,7 +166,7 @@ and the derived files
%<*driver>
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{ltxcmds.drv}%
- [2020-05-10 v1.25 LaTeX kernel commands for general use (HO)]%
+ [2023-12-04 v1.26 LaTeX kernel commands for general use (HO)]%
\documentclass{ltxdoc}
\usepackage{holtxdoc}[2011/11/22]
\usepackage{zref-savepos}
@@ -183,7 +183,7 @@ and the derived files
% \GetFileInfo{ltxcmds.drv}
%
% \title{The \xpackage{ltxcmds} package}
-% \date{2020-05-10 v1.25}
+% \date{2023-12-04 v1.26}
% \author{Heiko Oberdiek\thanks
% {Please report any issues at \url{https://github.com/ho-tex/ltxcmds/issues}}}
%
@@ -334,7 +334,7 @@ and the derived files
% \end{declcs}
%
% Macros with uppercase letters are expandable in two expansion steps.
-% Changes in version 2020-05-10 v1.25:
+% Changes in version 2023-12-04 v1.26:
% \begin{itemize}
% \item
% Macros \cs{ltx@carsecond}, \cs{ltx@carthird}, \cs{ltx@carfourth},
@@ -701,7 +701,7 @@ and the derived files
\fi
\expandafter\x\csname ver@ltxcmds.sty\endcsname
\ProvidesPackage{ltxcmds}%
- [2020-05-10 v1.25 LaTeX kernel commands for general use (HO)]%
+ [2023-12-04 v1.26 LaTeX kernel commands for general use (HO)]%
% \end{macrocode}
%
% \begin{macrocode}
@@ -1497,9 +1497,9 @@ and the derived files
\def\ltx@ifl@t@r#1#2{%
\ifnum\expandafter\ltx@parse@version@#1//00\@nil<%
\expandafter\ltx@parse@version@#2//00\@nil
- \expandafter\@secondoftwo
+ \expandafter\ltx@secondoftwo
\else
- \expandafter\@firstoftwo
+ \expandafter\ltx@firstoftwo
\fi}
\def\ltx@parse@version@#1{\ltx@parse@version0#1}
\def\ltx@parse@version#1/#2/#3#4#5\@nil{%
@@ -2348,6 +2348,9 @@ $ \next
% LaTeX kernel. \cs{pdfmatch} is no longer used with pdftex, and the tests for dates before
% 1994 have been removed
% \end{Version}
+% \begin{Version}{2023-12-04 v1.26}
+% \item corrected \cs{ltx@ifl@t@r} for plain.
+% \end{Version}
% \end{History}
%
% \PrintIndex
diff --git a/macros/generic/ltxcmds/ltxcmds.pdf b/macros/generic/ltxcmds/ltxcmds.pdf
index 1dfb9104f3..ab59f45da8 100644
--- a/macros/generic/ltxcmds/ltxcmds.pdf
+++ b/macros/generic/ltxcmds/ltxcmds.pdf
Binary files differ
diff --git a/macros/latex/contrib/fbox/CHANGELOG b/macros/latex/contrib/fbox/CHANGELOG
index d8eb3919fb..6a2c75bf4c 100644
--- a/macros/latex/contrib/fbox/CHANGELOG
+++ b/macros/latex/contrib/fbox/CHANGELOG
@@ -1,3 +1,4 @@
+0.07 2023-12-04 - added optional argument linewidth for \fparbox
0.06 2022-02-20 - added individual color option
0.05 2020-06-22 - added optional arguments boxrule and boxsep
0.04 2020-01-03 - added \fparbox[]{}
diff --git a/macros/latex/contrib/fbox/doc/fbox.pdf b/macros/latex/contrib/fbox/doc/fbox.pdf
index e4176b5bad..6c0d9eaf9a 100644
--- a/macros/latex/contrib/fbox/doc/fbox.pdf
+++ b/macros/latex/contrib/fbox/doc/fbox.pdf
Binary files differ
diff --git a/macros/latex/contrib/fbox/doc/fbox.tex b/macros/latex/contrib/fbox/doc/fbox.tex
index fad6aa5004..27bf1aa7ad 100644
--- a/macros/latex/contrib/fbox/doc/fbox.tex
+++ b/macros/latex/contrib/fbox/doc/fbox.tex
@@ -1,5 +1,4 @@
-%% $Id: fbox.tex 449 2022-02-20 20:50:12Z herbert $
-%
+%% $Id: fbox.tex 828 2023-12-04 19:56:29Z herbert $%
\listfiles\setcounter{errorcontextlines}{100}
\documentclass[paper=a4,fontsize=11pt,DIV=13,parskip=half-,
captions=tableabove,twoside=on]{scrartcl}
@@ -62,7 +61,7 @@ Equipped with the talking points above, you’re ready to help anyone search and
\def\setVersion#1{\setVVersion#1!!}
\def\setVVersion#1=#2!!{\def\fboxVersion{#2}}
-\setVersion{version = 0.06}%
+\setVersion{version = 0.07}%
\title{Package \texttt{fbox} \\--\\ \normalsize \fboxVersion\ (\today)}
\author{Herbert Voß\thanks{\url{hvoss@tug.org}\newline Thanks to Rolf Niepraschk}}
@@ -99,6 +98,7 @@ The optional argument can be
\item[tcolor] Color for the top line (black)
\item[rcolor] Color for the right line (black)
\item[bcolor] Color for the bottom line (black)
+\item[linewidth] linewidth for \Lcs{fparbox} (\Ldim{linewidth})
\item[<letters>] Any combination of the letters
l, r, b, and t, or altenatively L, R, B, and T for l)eft, r)right, b)ottom, and t)op
of the frame parts. A missing or an empty argument is the same as the default
@@ -237,9 +237,18 @@ of the frame parts. A missing or an empty argument is the same as the default
\end{LTXexample}
\begin{LTXexample}
+\fparbox*[bT,boxrule=5pt,boxsep=6pt,
+ linewidth=0.75\linewidth]{\demoText}
+\end{LTXexample}
+
+\begin{LTXexample}
\fparbox*[bT,boxrule=3pt,boxsep=10pt]{\demoText}
\end{LTXexample}
+\begin{LTXexample}
+\fparbox*[bT,boxrule=3pt,boxsep=10pt,
+ linewidth=7cm]{\demoText}
+\end{LTXexample}
\begin{LTXexample}
\fparbox[Br,boxrule=5pt,boxsep=10pt]{\demoText}
diff --git a/macros/latex/contrib/fbox/latex/fbox.sty b/macros/latex/contrib/fbox/latex/fbox.sty
index b12207a78d..0fa7d36ad2 100644
--- a/macros/latex/contrib/fbox/latex/fbox.sty
+++ b/macros/latex/contrib/fbox/latex/fbox.sty
@@ -1,6 +1,6 @@
%% This is file `fbox.sty'
%%
-%% Copyright (C) 2019, 2022
+%% Copyright (C) 2019, ..., 2023
%% Herbert Voss <hvoss@tug.org>
%%
%% It may be distributed and/or modified under the
@@ -11,23 +11,27 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%
-% $Id: fbox.sty 449 2022-02-20 20:50:12Z herbert $
+% $Id: fbox.sty 828 2023-12-04 19:56:29Z herbert $
%
% -------------------------------------
-\ProvidesPackage{fbox}[2022/02/20 v. 0.06 allow parts of the frame (hv)]
+\ProvidesPackage{fbox}[2023/12/04 v. 0.07 allow parts of the frame (hv)]
%
\RequirePackage{xkeyval}
\RequirePackage{xcolor}
\newlength\fbox@@rule
\newlength\fbox@@sep
+\newlength\fbox@@linewidth
\define@key{fbox}{boxrule}[0.4pt]{\setlength\fbox@@rule{#1}}
\define@key{fbox}{boxsep}[3pt]{\setlength\fbox@@sep{#1}}
\define@key{fbox}{bcolor}[black]{\def\fbox@bcolor{#1}}
\define@key{fbox}{tcolor}[black]{\def\fbox@tcolor{#1}}
\define@key{fbox}{lcolor}[black]{\def\fbox@lcolor{#1}}
\define@key{fbox}{rcolor}[black]{\def\fbox@rcolor{#1}}
-\setkeys*{fbox}{boxrule=\fboxrule,boxsep=\fboxsep,lcolor,rcolor,bcolor,tcolor}
+\define@key{fbox}{linewidth}[\linewidth]{\setlength\fbox@@linewidth{#1}}
+\setkeys*{fbox}{boxrule=\fboxrule,boxsep=\fboxsep,
+ lcolor,rcolor,bcolor,tcolor,
+ linewidth=\linewidth}
% latex.ltx
%\fboxsep = 3pt
@@ -122,10 +126,12 @@
\long\def\fparbox{\@ifnextchar*{\@fbox@startrue\FParBox@}{\@fbox@starfalse\FParBox@*}}
\def\FParBox@*{\@ifnextchar[\FParBox@i\FParBox@ii}
\long\def\FParBox@i[#1]#2{%
- \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fbox@@sep-2\fbox@@rule}{#2}}%
+ \setkeys*{fbox}{linewidth=\linewidth,#1}%
+ \savebox\fpar@b@x{\parbox{\dimexpr\fbox@@linewidth-2\fbox@@sep-2\fbox@@rule}{#2}}%
\FBox@i[#1]{\usebox\fpar@b@x}}
\long\def\FParBox@ii#1{%
- \savebox\fpar@b@x{\parbox{\dimexpr\linewidth-2\fbox@@sep-2\fbox@@rule}{#1}}%
+ \setkeys*{fbox}{linewidth=\linewidth}%
+ \savebox\fpar@b@x{\parbox{\dimexpr\fbox@@linewidth-2\fbox@@sep-2\fbox@@rule}{#1}}%
\orig@fbox{\usebox\fpar@b@x}}
diff --git a/macros/latex/contrib/heria/README.md b/macros/latex/contrib/heria/README.md
new file mode 100644
index 0000000000..b3d5cf32b1
--- /dev/null
+++ b/macros/latex/contrib/heria/README.md
@@ -0,0 +1,38 @@
+# heria: A LaTeX class for Horizon Europe RIA and IA grant proposals
+
+## Overview
+
+The `heria` class facilitates the preparation of Research and
+Innovation Action (RIA) and Innovation Action (IA) funding proposals
+for the European Commission's Horizon Europe program. The class is a
+conversion of the official Part B template into LaTeX; it preserves
+the formatting and most of the instructions of the original version,
+and has the additional feature that tables (listing the participants,
+work packages, deliverables, etc.) are programmatically generated
+according to data supplied by the user.
+
+## Building and installing
+
+To build the class, run the file `heria.ins` through `latex` or
+`pdflatex` and then copy the resulting `.cls` and `.tex` files into a
+directory searched by LaTeX.
+
+To generate the documentation, run the file `heria.dtx` through
+`pdflatex`.
+
+To generate the skeleton proposal, build the class and then run the
+file `heria-proposal.tex` through `pdflatex`.
+
+## Source repository and bug tracker
+
+For now, the source code is hosted on GitHub at
+[https://github.com/logological/heria](https://github.com/logological/heria).
+There you will also find an issue tracker for reporting bugs and
+feature requests.
+
+## Licence
+
+The `heria` class is distributed under the conditions of the [LaTeX
+Project Public License](https://www.latex-project.org/lppl.txt),
+either version 1.3 of this license or (at your option) any later
+version.
diff --git a/macros/latex/contrib/heria/heria-proposal.pdf b/macros/latex/contrib/heria/heria-proposal.pdf
new file mode 100644
index 0000000000..f8d64312a9
--- /dev/null
+++ b/macros/latex/contrib/heria/heria-proposal.pdf
Binary files differ
diff --git a/macros/latex/contrib/heria/heria.dtx b/macros/latex/contrib/heria/heria.dtx
new file mode 100644
index 0000000000..5c6b5e9691
--- /dev/null
+++ b/macros/latex/contrib/heria/heria.dtx
@@ -0,0 +1,2783 @@
+% \iffalse meta-comment
+%
+% Copyright 2023 Tristan Miller
+% -----------------------------
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% https://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008 or later.
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{heria.dtx}
+%</driver>
+%<*class>
+%% Copyright 2023 Tristan Miller
+%% Copyright 2016 John Kormylo
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008 or later.
+%%
+%</class>
+%<class>\NeedsTeXFormat{LaTeX2e}
+%<class>\ProvidesClass{heria}
+%<*class>
+[2023-12-04 v3.2.1.0 Class for Horizon Europe (R)IA proposals]
+%</class>
+%
+%<*driver>
+\documentclass{ltxdoc}
+\DisableCrossrefs
+\CodelineIndex
+\RecordChanges
+\addtolength\marginparwidth{5ex}
+\addtolength\oddsidemargin{6ex}
+\addtolength\evensidemargin{6ex}
+\begin{document}
+\DocInput{heria.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{1506}
+%
+% \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 \~}
+%
+%
+% \GetFileInfo{heria.dtx}
+%
+% \DoNotIndex{\newcommand,\newenvironment}
+%
+%
+% \title{\textsf{heria}: A \LaTeX\ class for\\ Horizon Europe RIA and
+% IA grant proposals\thanks{This document corresponds to
+% \textsf{heria}~\fileversion, dated \filedate. See §\ref{sec:version}
+% for an explanation of the versioning scheme.}}
+%
+% \author{Tristan Miller\\
+% Austrian Research Institute for Artificial Intelligence\\
+% \texttt{tristan.miller@ofai.at}}
+%
+% \maketitle
+% \tableofcontents
+%
+% \section{Introduction}\label{sec:introduction}
+%
+% This document describes the usage of \textsf{heria}, a \LaTeX\ class
+% that facilitates the preparation of Research and Innovation Action
+% (RIA) and Innovation Action (IA) funding proposals for the European
+% Commission's~(EC) Horizon Europe program. The Commission prescribes
+% a detailed, structured format for the technical description
+% (``Part~B'') of these proposals, but provides templates only in Rich
+% Text Format (RTF), a format that does not lend itself well to
+% collaborative authorship and \mbox{(cross-)}reference management.
+% The \textsf{heria} class is a conversion of the official Part~B
+% template into \LaTeX; it preserves the formatting and most of the
+% instructions of the original version, and has the additional feature
+% that tables (listing the participants, work packages, deliverables,
+% etc.)\ are programmatically generated according to data supplied by
+% the user. The advantage of this becomes clear when one considers
+% that much of the data is reused across multiple tables.
+%
+% At the time of writing (2023-12-04), open calls to the RIA and IA
+% calls require proposals to be submitted according to either
+% Version~3.2 (2022-11-15) or Version~3.3 (2023-09-27) of the Part~B
+% template. The \textsf{heria} package was developed with reference
+% to the Version~3.2 template; however, according to the changelog for
+% the Version~3.3 template, the only difference from the previous
+% version is the addition of some instructions concerning the use of
+% generative AI tools for the preparation of the proposal.
+%
+% \section{Usage}
+%
+% The EC's official template is structured in such a way that form and
+% content cannot be entirely separated. The best way of starting a new
+% proposal is therefore to make a copy of \texttt{heria-proposal.tex},
+% the skeleton proposal distributed with this package, and then adapt
+% it to your project. The following subsections describe the various
+% macros and environments provided by \textsf{heria}, roughly in the
+% same order presented in the skeleton proposal.
+%
+% \subsection{Preamble}
+%
+% Your proposal document should begin with the following line if you
+% want the template instructions to be included in the output:
+% \begin{quote}\verb|\documentclass[showinstructions]{heria}|\end{quote}
+% Otherwise you can omit the \verb|showinstructions| option:
+% \begin{quote}\verb|\documentclass{heria}|\end{quote}
+%
+% The \verb|heria| class is based on the default \LaTeX\
+% \verb|article| class, and so all of the macros and environments from
+% the latter are available for you to use. The class automatically
+% sets the font, margins, etc.\ mandated by the official instructions,
+% and redefines some of the \verb|article| macros as described later
+% in this document.
+%
+% \medskip
+%
+% \noindent Following \cs{documentclass} you should provide the
+% proposal metadata using the following macros:
+%
+% \DescribeMacro{\title} This macro takes the title of the proposal as
+% its sole argument. This title will be printed by the \cs{maketitle}
+% macro (see below) and used for the PDF metadata.
+%
+% \DescribeMacro{\callname} This macro takes as its sole argument the
+% official natural-language description of the call to which the
+% proposal is being submitted. It will be printed in the page header.
+%
+% \DescribeMacro{\callidentifier} This macro takes as its sole
+% argument the identifier of the call to which the proposal is being
+% submitted, which will be printed in the page header. Call
+% identifiers normally have the format
+% \texttt{HORIZON-XX0-0000-XXXXX-00-XXXXX}.
+%
+% \DescribeMacro{\calltopic} This macro takes as its sole argument the
+% identifier of the specific topic within the call to which the
+% proposal is being submitted. Such identifiers normally have the
+% format \texttt{HORIZON-XX0-0000-XXXXX-00-00}. The official template
+% does not require proposals to mention the call topic, so you are
+% free to omit the \cs{calltopic} macro. If you do use it, it will be
+% printed by \cs{maketitle} below the proposal title.
+%
+% \subsection{Title}
+%
+% \DescribeMacro{\maketitle} This is generally the first macro that
+% should be called in the main body of the document. As with the
+% standard \verb|article| class, it typesets the title.
+%
+% \subsection{Section headings, tags, and instructions}
+%
+% \DescribeMacro{\heinstructions} When the \verb|showinstructions|
+% options is passed to the document class, the \cs{heinstructions}
+% macro prints instructions from the official EC template. These
+% instructions are contained in files distributed with the
+% \textsf{heria} class; the macro's sole argument is used to construct
+% the name of one of these files. To suppress printing of individual
+% instructions, you can simply remove or comment out the corresponding
+% \cs{heinstructions} macro.
+%
+% \DescribeMacro{\opentag}\DescribeMacro{\closetag} The official
+% template includes a number of ``tags'' that are used for the EC's
+% ``internal processing of information, mostly for statistical
+% gathering.'' The \cs{opentag} and \cs{closetag} macros are used to
+% emit the tags at the appropriate places in the proposal, and so
+% should be left in their original positions in the skeleton template.
+% The EC asks that proposal authors ``not move, delete, re-order, or
+% alter tags in any way''.
+%
+% \DescribeMacro{\section}\DescribeMacro{\subsection}\DescribeMacro{\subsubsection}
+% These three macros take a mandatory argument specifying the title of
+% the corresponding section, subsection, or subsubsection,
+% respectively. These document subdivisions are fixed by the official
+% template and so generally should not be renamed or reordered, though
+% it is probably safe to add additional ones where it does not disrupt
+% the numbering of the existing ones. Many sections and subsections
+% \emph{must} be preceded or followed by certain tags, which are
+% specified in the first and second optional arguments, respectively.
+% The third optional argument contains the recommended page limit,
+% when specified by the official template. The page limit will be
+% printed only when the \verb|showinstructions| option is passed to
+% the document class.
+%
+% \subsection{Participants}
+%
+% \DescribeMacro{\participant} Participants should be listed in the
+% same order as in Part~A of the proposal, which is completed using an
+% online form. Use one invocation of \cs{participant} for each
+% participant, with the following three mandatory arguments, in order:
+% the participant's full name, the participant's short name, and the
+% participant's two-letter country code. The first participant will
+% be marked in the participant table as the project coordinator. Note
+% that while the short name is typeset in the proposal, it is also
+% used internally by the \verb|heria| class as part of a \LaTeX\
+% counter name, and so should generally consist only of ASCII letters.
+%
+% \DescribeMacro{\makeparticipantstable} This macro emits the table of
+% participants using the data from the \cs{participant} macro.
+% Participants are automatically numbered according to the order of
+% the \cs{participant} macros.
+%
+% \subsection{Summary tableau}
+%
+% \DescribeEnv{summarycanvas} \DescribeEnv{summarybox} Proposals must
+% include a summary tableau of six boxes that briefly describe the
+% project's specific needs; expected results; dissemination,
+% exploitation, and communication measures; target groups; outcomes;
+% and impacts. The \verb|summarycanvas| and \verb|summaryenv|
+% environments are provided for this purpose. Each \verb|summarybox|
+% environment typesets a shaded box headed by its mandatory argument.
+% Three such boxes can be grouped side by side into a single
+% \verb|summarycanvas| environment. The skeleton proposal
+% demonstrates how all six boxes can be placed in a floating figure on
+% a single landscape page, though other arrangements seem to be
+% permissible.
+%
+% \subsection{Work packages and deliverables}
+%
+% \DescribeMacro{\makeworkpackagestable} This macro emits the table of
+% work packages, using the data from the \cs{workpackage} macros. Work
+% packages are automatically numbered according to the order of the
+% \cs{workpackage} macros.
+%
+% \DescribeMacro{\workpackage} This macro declares a work package, and
+% takes five mandatory arguments: a unique identifier (used only
+% internally by \verb|heria| for cross-referencing purposes), the work
+% package title, the short name of the lead participant (as specified
+% in the corresponding \cs{participant} macro), the numeric starting
+% month (measured from the start of the project), and the numeric
+% ending month. Since the unique identifier is used as part of a
+% \LaTeX\ counter name, you should generally use only ASCII letters.
+% Work packages are automatically numbered. You should use one
+% \cs{workpackage} macro for each work package in your project.
+%
+% \DescribeEnv{objectives} This environment typesets a box containing
+% an enumerated list of objectives for the most recently declared work
+% package. Use the \cs{item} macro to begin each objective.
+%
+% \DescribeEnv{descriptionofwork} This environment typesets a box
+% where you can describe the work program of the most recently
+% declared work package. You can enter this information in free-form
+% and\slash or use the \cs{task} macro to enumerate individual tasks.
+%
+% \DescribeMacro{\task} This macro typesets basic information about a
+% work package task. The format used by this macro is not strictly
+% mandated by the official template, but you may nonetheless find it
+% useful. The macro takes three mandatory arguments: the task name,
+% the short name of the lead participant (as specified in the
+% corresponding \cs{participant} macro), a list of other participants
+% (as free-form text, but advisedly using short names of participants
+% where appropriate), and the starting and ending months for the task
+% (as free-form text). You should use one \cs{task} macro for each
+% task in your work package. You can, if you wish, follow each
+% \cs{task} macro with a free-form description of the task.
+%
+% \DescribeMacro{\deliverable} This macro declares a deliverable for
+% the most recently declared work package. There are six mandatory
+% arguments: the deliverable name, a short description of the
+% deliverable, the short name of the lead participant (as specified in
+% the corresponding \cs{participant} macro), the deliverable type, the
+% dissemination level, and the numeric delivery month (in months from
+% the beginning of the project). The type and dissemination level
+% arguments must be selected from the identifiers given in the
+% template instructions.
+%
+% \DescribeMacro{\makedeliverablestable} This macro emits the table of
+% deliverables, using the data from the \cs{deliverable}
+% macros. Deliverables are automatically numbered according to the
+% order of the \cs{deliverable} macros.
+%
+% \subsection{Milestones}
+%
+% \DescribeMacro{\milestone} This macro declares a project milestone.
+% It takes four mandatory arguments: the milestone name, a free-form
+% list of related work packages, the due date (in number of months
+% from the start of the project), and a free-form means of
+% verification. You should use one \cs{milestone} macro for each
+% milestone in your project.
+%
+% \DescribeMacro{\makemilestonestable} This macro emits the table of
+% milestones, using the data from the \cs{milestone}
+% macros. Milestones are automatically numbered according to the order
+% of the \cs{milestone} macros.
+%
+% \subsection{Critical risks}
+%
+% \DescribeMacro{\criticalrisk} This macro declares a critical risk
+% for the project. It takes five mandatory arguments: a free-form
+% description of the risk, the likelihood of the risk, the severity of
+% the risk, and a free-form description of proposed mitigation
+% measures. The likelihood and severity arguments must be selected
+% from the identifiers given in the template instructions. You should
+% use one \cs{criticalrisk} macro for each critical risk in your
+% project.
+%
+% \DescribeMacro{\makecriticalriskstable} This macro emits the table
+% of critical risks, using the data from the \cs{criticalrisk}
+% macros. Critical risks are output in the order of the
+% \cs{criticalrisk} macros.
+%
+% \subsection{Summary of staff effort}
+%
+% \DescribeMacro{\staffeffort} This macro declares the number of
+% person-months a given project participant will spend on a given work
+% package. It takes three mandatory arguments: the short name of the
+% participant (as specified in the corresponding \cs{participant}
+% macro), the short name of the work package (as specified in the
+% corresponding \cs{workpackage} macro), and the number of months.
+% You must provide one and only one \cs{staffeffort} macro for every
+% possible combination of participant and work package in your project.
+%
+% \DescribeMacro{\makestaffefforttable} This macro emits the summary
+% of staff effort table, using the data from the \cs{staffeffort}
+% macros. The table rows and columns are automatically ordered
+% according to the order of the \cs{participant} and \cs{workpackage}
+% macros, respectively, and the total person-months per participant
+% and total person-months per work package are automatically
+% calculated.
+%
+% \subsection{Costs}
+%
+% \DescribeMacro{\subcontractingcost} This macro declares a
+% subcontracting cost. It takes three mandatory arguments: the short
+% name of a participant (as specified in the corresponding
+% \cs{participant} macro), the amount of the subcontracting cost in
+% euros, and a free-form description of the tasks and justification
+% for the subcontracting cost. You should use one
+% \cs{subcontractingcost} macro for each subcontracting cost in your
+% project.
+%
+% \DescribeMacro{\makesubcontractingcoststable} This macro emits the
+% tables of subcontracting costs, using the data from the
+% \cs{subcontractingcost} macros. Subcontracting costs are
+% automatically grouped by participant and then output according to
+% the order of the \cs{participant} and \cs{subcontractingcost}
+% macros.
+%
+% \DescribeMacro{\purchasecost} This macro declares the purchase costs
+% for a participant. It takes eight mandatory arguments:
+% \begin{quote}\cs{purchasecost}\marg{participant}\verb|%|\\
+% \hspace*{5ex}\marg{goodscost}\marg{justification}\verb|%|\\
+% \hspace*{5ex}\marg{travelcost}\marg{justification}\verb|%|\\
+% \hspace*{5ex}\marg{equipmentcost}\marg{justification}\verb|%|\\
+% \hspace*{5ex}\marg{remainingcosts}\end{quote}
+% Here \meta{participant} is the short name of a participant (as
+% specified in the corresponding \cs{participant} macro);
+% \meta{goodscost}, \meta{travelcost}, \meta{equipmentcost}, and
+% \meta{remainingcost} are the amount of the ``other goods, works and
+% services'', ``travel and subsistence'', ``equipment'', and
+% ``remaining purchase costs'', respectively, in euros; and the
+% \meta{justification} arguments are free-form justifications for the
+% immediately preceding cost. (According to the official template,
+% the remaining purchase costs do not require a justification.) You
+% should use one \cs{purchasecost} macro for each participant with
+% purchase costs in your project.
+%
+% \DescribeMacro{\makepurchasecoststable} This macro emits the tables
+% of purchase costs, using the data from the \cs{purchasecost} macros.
+% Purchase costs are output according to the order of the
+% \cs{participant} macros, and then in reverse order of the largest
+% costs, with the ``remaining purchase costs'' output last.
+%
+% \DescribeMacro{\othercost} This macro declares an ``other'' cost
+% (i.e.,\ in the ``other costs'' category). It takes three mandatory
+% arguments: the short name of a participant (as specified in the
+% corresponding \cs{participant} macro), the amount of the ``other''
+% cost in euros, and a free-form justification for the cost. You
+% should use one \cs{othercost} macro for each ``other'' cost in your
+% project.
+%
+% \DescribeMacro{\makeothercoststable} This macro emits the tables of
+% ``other'' costs, using the data from the \cs{othercost} macros.
+% ``Other'' costs are automatically grouped by participant and then
+% output according to the order of the \cs{participant} and
+% \cs{othercost} macros.
+%
+% \DescribeMacro{\inkindcontribution} This macro declares an in-kind
+% contribution. It takes five mandatory arguments: the short name of a
+% participant (as specified in the corresponding \cs{participant}
+% macro), the third party name, the category of the contribution
+% (selected from \texttt{Seconded personnel}, \texttt{Travel and
+% subsistence}, \texttt{Equipment}, \texttt{Other goods, works and
+% services}, and \texttt{Internally invoiced goods and services}), the
+% amount of the cost in euros, and a free-form justification for the
+% in-kind contribution. You should use one \cs{inkindcontribution}
+% macro for each in-kind contribution in your project.
+%
+% \DescribeMacro{\makeinkindcontributionstable} This macro emits the
+% tables of in-kind contributions, using the data from the
+% \cs{inkindcontribution} macros. In-kind contributions are
+% automatically grouped by participant and then output according to
+% the order of the \cs{participant} and \cs{inkindcontribution}
+% macros.
+%
+% \section{Hints and tips}
+%
+% \paragraph{Part A.} Some proposal data---in particular, the list of
+% participants and the costs---must be entered not just in Part~B of
+% the proposal, but also in the online Part~A form. It is your
+% responsibility to ensure that this data is consistent across the two
+% parts of the proposal.
+%
+% \paragraph{File structure.} Rather than putting all the work package
+% data into your main proposal document, you may find it convenient to
+% put the \cs{workpackage} macro, the \verb|objectives| environment,
+% the \verb|descriptionofwork| environment, and the \cs{deliverable}
+% macros corresponding to a single work package into a dedicated file,
+% which you can then include in your main proposal document with the
+% \cs{input} macro. This will make it easier for you to shuffle the
+% order of work packages as you write your proposal. (You may wish to
+% split off other sections of the proposal into their own files,
+% though the official template gives considerably less freedom to
+% reorder them.)
+%
+% \paragraph{Vertical spacing.} The \textsf{heria} class applies the
+% same vertical spacing as the \textsf{article} class; this is
+% particularly generous around section headings. If you find yourself
+% running up against the page limit, you may wish to add some
+% \cs{vspace} commands, with a negative length as the argument, to
+% tighten up the spaces before section headings, and perhaps also the
+% tables.
+%
+% \section{Limitations and caveats}
+%
+% \paragraph{No backward compatibility.} This version of the
+% \textsf{heria} class implements a specific version of the official
+% Horizon Europe template as described in §\ref{sec:introduction}. It
+% is intended that \textsf{heria}, over the course of its development,
+% will track changes made to the official template. Since these
+% changes may be incompatible with previous versions, you are advised
+% to retain a copy of the version of \textsf{heria} you used to
+% produce a proposal; this way you will still be able to build the
+% proposal even if you later install a new version of \textsf{heria}.
+% See §\ref{sec:version} for further information on \textsf{heria}'s
+% versioning scheme and when to expect breaking changes.
+%
+% \paragraph{Table 3.1h.} The instructions in the official template
+% are ambiguous about the construction of the tables for purchase
+% costs. In particular, it's not clear whether each individual cost
+% exceeding 15\% of the personnel costs must be listed in a separate
+% row, or whether all costs in each category (``travel and
+% subsistence'', ``equipment'', etc.)\ should be combined into a
+% single row. The \textsf{heria} class takes the latter
+% interpretation; this may or may not be the same interpretation
+% adopted by the funding agency and its reviewers.
+%
+% \paragraph{Error handling.} The class currently does very little
+% error checking on its input. Usually invalid input (e.g., mistyping
+% the short name of a participant or work package in a macro argument,
+% or neglecting to provide a macro necessary to generate a table)
+% \emph{will} result in an error that prevents the document from
+% compiling, though the diagnostic message emitted by \LaTeX\ may be
+% somewhat cryptic.
+%
+% \paragraph{Coverage of instructions.} The class reproduces most,
+% but not all, of the instructions from the official template. In
+% particular, it omits all the instructions occurring before the title
+% of the proposal, including three pages of introductory material and
+% definitions. You should not rely solely on the instructions emitted
+% by the class, which are provided only as a convenience; be sure to
+% also read the instructions in the official template (and in the text
+% of the call to which you are applying).
+%
+% \section{Package development}
+%
+% \subsection{Source repository and bug tracker}
+%
+% For now, the package's source code is hosted on GitHub at
+% \url{https://github.com/logological/heria}. There you will also
+% find an issue tracker for reporting bugs and feature requests.
+%
+% \subsection{Versioning scheme}\label{sec:version}
+%
+% Each release of the \textsf{heria} class carries a version number in
+% the format \textit{omaj.\allowbreak omin.\allowbreak maj.\allowbreak
+% min}. Here \textit{omaj.omin} is the version number of the official
+% Horizon Europe RIA template that the class implements, and
+% \textit{maj} and \textit{min} represent, respectively, major and
+% minor revisions to the class (including any ancillary files, such as
+% the skeleton proposal and documentation). A major revision is one
+% that includes breaking changes or significant new features; minor
+% revisions are for all other changes. You should generally assume
+% that any change to \textit{omaj.omin} introduces breaking changes to
+% the class interface and\slash or significant changes to the official
+% proposal preparation instructions.
+%
+% \subsection{Version history}
+%
+% \begin{description}
+% \item[v3.2.1.0 (2023-12-04)] Initial release.
+% \end{description}
+%
+% \section{Disclaimer}
+%
+% The \textsf{heria} package is distributed in the hope that it will
+% be useful, but WITHOUT ANY WARRANTY; without even the implied
+% warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+% PURPOSE. (See the \LaTeX\ Project Public License for further
+% details.) In particular, users should understand that the
+% \textsf{heria} proposal template is wholly unofficial, and its
+% author(s) accept no responsibility for any omissions, errors, or
+% discrepancies with respect to the requirements set forth in the
+% official Horizon Europe templates and associated documentation. If
+% you produce a proposal with this template, then you alone are
+% responsible for ensuring that it matches all the official
+% requirements before submitting it to the funding body.
+%
+% \appendix
+%
+% \section{Implementation}
+%
+% \StopEventually{}
+%
+% \subsection*{Basic setup}
+%
+% Import the \verb|article| class and set up some basic features
+% (margins, hyperlinks, etc.)
+%
+%\iffalse
+%<*class>
+%\fi
+% \begin{macrocode}
+\LoadClass[11pt,a4paper]{article}
+\RequirePackage[T1]{fontenc} % T1 font encoding
+\RequirePackage[left=15mm,
+ top=15mm,
+ bottom=15mm,
+ right=15mm,
+ includehead,
+ includefoot,
+ headheight=10pt,
+ headsep=5mm,
+ footskip=18pt,
+ ]{geometry}
+\RequirePackage[pdftex]{graphicx} % For graphics
+
+\RequirePackage[pdftex,pdfusetitle]{hyperref} % Hyperlinks
+\hypersetup{%
+ colorlinks=true,
+ breaklinks=true,
+ urlcolor=black,
+ linkcolor=black,
+ citecolor=black,
+ pdfsubject={},
+ pdfkeywords={},
+}
+
+\RequirePackage{xfp} % Floating point numbers
+
+% \end{macrocode}
+%
+% A helper function to display variables
+%
+% \begin{macrocode}
+\newcommand{\disptoken}[1]{%
+ \csname#1\endcsname
+}
+% \end{macrocode}
+%
+% \subsection*{Tables and framed boxes}
+%
+% \begin{macrocode}
+\RequirePackage{colortbl} % for shaded table rows
+\RequirePackage{xltabular} % for breakable tables with var-width columns
+\RequirePackage[table]{xcolor} % for colours and shaded table cells
+\RequirePackage[breakable,raster]{tcolorbox} % for framed boxes
+% \end{macrocode}
+%
+% \subsection*{Colours}
+%
+% \begin{macrocode}
+\definecolor{taggrey}{HTML}{B5B5B5}
+\definecolor{footergrey}{HTML}{D8D8D8}
+\definecolor{tablegrey}{HTML}{F2F2F2}
+\definecolor{summaryblue}{HTML}{00B0F0}
+% \end{macrocode}
+%
+% \subsection*{Basic proposal variables}
+%
+% \begin{macrocode}
+\newcommand{\callname}[1]{\gdef\@callname{#1}}%
+\newcommand{\callidentifier}[1]{\gdef\@callidentifier{#1}}%
+\newcommand{\calltopic}[1]{\gdef\@calltopic{#1}}%
+% \end{macrocode}
+%
+% \subsection*{Participants}
+%
+% \begin{macrocode}
+\newcounter{@pcount} % Participant counter
+\newcommand{\participant}[3]{%
+ \stepcounter{@pcount}%
+ \newcounter{@p#2num}%
+ \setcounter{@p#2num}{\value{@pcount}}%
+ \expandafter\xdef\csname @pFullName\arabic{@p#2num}\endcsname{#1}%
+ \expandafter\xdef\csname @pShortName\arabic{@p#2num}\endcsname{#2}%
+ \expandafter\xdef\csname @pCountry\arabic{@p#2num}\endcsname{#3}%
+ \newcounter{@pSubcontractingCosts\arabic{@p#2num}}%
+ \newcounter{@pPurchaseCosts\arabic{@p#2num}}%
+ \newcounter{@pOtherCosts\arabic{@p#2num}}%
+ \newcounter{@pInkindContributions\arabic{@p#2num}}%
+}
+% \end{macrocode}
+%
+% Get participant number from short name
+%
+% \begin{macrocode}
+\newcommand{\getPnum}[1]{%
+ \@ifundefined{c@@p#1num}{}{\arabic{@p#1num}}%
+}
+% \end{macrocode}
+%
+% Participants table row
+%
+% \begin{macrocode}
+\newcommand{\ptablerow}[1]{%
+ \stepcounter{#1}
+ \the\value{#1}
+ \ifthenelse{\value{#1}=1}{ (Coordinator) &}{&}%
+ \disptoken{@pFullName\arabic{#1}} (\disptoken{@pShortName\arabic{#1}}) &
+ \disptoken{@pCountry\arabic{#1}} \\
+ \hline%
+}
+% \end{macrocode}
+%
+% Participants table
+%
+% \begin{macrocode}
+\newcommand{\makeparticipantstable}{%
+ \newcounter{@ptable}
+ \begin{center}
+ \begin{xltabular}{0.9\textwidth}{|l|X|l|}
+ \hline
+ \textbf{Participant No.} &
+ \textbf{Participant organisation name} &
+ \textbf{Country} \\
+ \hline
+ \whiledo%
+ {\value{@ptable}<\numexpr\value{@pcount}-1}%
+ {\ptablerow{@ptable}}%
+ \ptablerow{@ptable}
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% \subsection*{Work packages}
+%
+% \begin{macrocode}
+\RequirePackage{atveryend}
+\newcounter{@wpcount} % Work package counter
+\newcommand{\workpackage}[5]{%
+ \stepcounter{@wpcount}%
+ \newcounter{@wp\arabic{@wpcount}deliverable}%
+ \newcounter{@wp\arabic{@wpcount}task}%
+ \newcounter{@wp#1num}%
+ \setcounter{@wp#1num}{\value{@wpcount}}%
+ \expandafter\xdef\csname %
+ @wpPersonMonths\arabic{@wp#1num}\endcsname{0}%
+ \expandafter\xdef\csname @wpShortName\arabic{@wp#1num}\endcsname{#1}%
+ \expandafter\xdef\csname @wpTitle\arabic{@wp#1num}\endcsname{#2}%
+ \expandafter\xdef\csname %
+ @wpLeadParticipantShortName\arabic{@wp#1num}\endcsname{#3}%
+ \expandafter\xdef\csname @wpStartMonth\arabic{@wp#1num}\endcsname{#4}%
+ \expandafter\xdef\csname @wpEndMonth\arabic{@wp#1num}\endcsname{#5}%
+ \@bsphack
+ \protected@write\@auxout{}%
+ {\string\makeworkpackagestable@data{\arabic{@wp#1num}
+ & #2 & \getPnum{#3} & #3 & %
+ \@ifundefined{@wpTotalPersonMonths\arabic{@wp#1num}}%
+ {\textbf{??}}%
+ {\disptoken{@wpTotalPersonMonths\arabic{@wp#1num}}}%
+ & #4 & #5}}%
+ \@esphack
+ \ifthenelse{\arabic{@wp#1num}=1}{}{\bigskip}
+ \noindent\begin{tabularx}%
+ {1.0\linewidth}{|>{\columncolor{tablegrey}}l|X|}
+ \hline
+ \bfseries Work package number & \arabic{@wp#1num} \\
+ \hline
+ \bfseries Work package title & #2 \\
+ \hline
+ \end{tabularx}
+}
+\newcommand{\makeworkpackagestable@data}[1]{%
+ \g@addto@macro\makeworkpackagestable@body{#1 \\ \hline}%
+}
+\def\makeworkpackagestable@body{}% initialize
+\AtBeginDocument{\global\let\makeworkpackagestable@body@startup%
+ \makeworkpackagestable@body}
+\AtEndDocument{%
+ \global\let\makeworkpackagestable@body@end\@empty
+ \def\makeworkpackagestable@data#1%
+ {\g@addto@macro\makeworkpackagestable@body@end{#1 \\ \hline}}%
+}
+\AtVeryEndDocument{%
+ \ifx\makeworkpackagestable@body@startup%
+ \makeworkpackagestable@body@end\else
+ \@latex@warning{Rerun for \string\makeworkpackagestable}%
+ \fi
+}
+% \end{macrocode}
+%
+% Work packages table
+%
+% \begin{macrocode}
+\RequirePackage{makecell}
+\newcommand{\makeworkpackagestable}{%
+ \begin{center}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{1.0\textwidth}{|c|X|c|c|c|c|c|}
+ \hline
+ \rowcolor{tablegrey}%
+ \thead{Work\\ package\\ No.} &
+ \thead{Work package title} &
+ \thead{Lead\\ participant\\ No.} &
+ \thead{Lead\\ participant\\ short name} &
+ \thead{Person-\\months} &
+ \thead{Start\\ month} &
+ \thead{End\\ month} \\
+ \hline
+ \makeworkpackagestable@body
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% Get work package number from short name
+%
+% \begin{macrocode}
+\newcommand{\getWPnum}[1]{%
+ \@ifundefined{c@@wp#1num}{}{\arabic{@wp#1num}}%
+}
+% \end{macrocode}
+%
+% Work package objectives
+%
+% \begin{macrocode}
+\newenvironment{objectives}{%
+ \begin{tcolorbox}[colback=white,
+ parbox=false,
+ boxrule=0.75pt,
+ boxsep=0mm,
+ breakable
+ ]%
+ \textsf{\textbf{Objectives}~~~}%
+ \begin{enumerate*}[nolistsep,noitemsep,itemjoin={~---~},%
+ label=\textbf{O\arabic{@wpcount}.\arabic*}]%
+ }{%
+ \end{enumerate*}%
+ \end{tcolorbox}%
+ }
+% \end{macrocode}
+%
+% Work package description
+%
+% \begin{macrocode}
+\newenvironment{descriptionofwork}{%
+ \begin{tcolorbox}[colback=white,
+ parbox=false,
+ boxrule=0.75pt,
+ boxsep=0mm,
+ breakable
+ ]%
+ \textsf{\textbf{Description of work}~~~}
+ }{%
+ \end{tcolorbox}%
+ }
+% \end{macrocode}
+%
+% Tasks
+%
+% \begin{macrocode}
+\NewDocumentCommand{\task}{mmmm}{%
+ \stepcounter{@wp\arabic{@wpcount}task}
+ \par\medskip\noindent\textbf{Task %
+ \arabic{@wpcount}.\arabic{@wp\arabic{@wpcount}task}: #1}
+ \textit{(Lead: #2; Participants: #3; Month: #4)}\hspace{1em}%
+}
+% \end{macrocode}
+%
+% \subsection*{Deliverables}
+%
+% \begin{macrocode}
+\newcounter{@dcount} % Deliverable counter
+\newcommand{\deliverable}[6]{%
+ \stepcounter{@wp\arabic{@wpcount}deliverable}%
+ \stepcounter{@dcount}%
+ \expandafter\xdef\csname @dNumber\arabic{@dcount}\endcsname%
+ {\arabic{@wpcount}.\arabic{@wp\arabic{@wpcount}deliverable}}%
+ \expandafter\xdef\csname %
+ @dWorkPackage\arabic{@dcount}\endcsname{\arabic{@wpcount}}%
+ \expandafter\xdef\csname @dName\arabic{@dcount}\endcsname{#1}%
+ \expandafter\gdef\csname @dDescription\arabic{@dcount}\endcsname{#2}%
+ \expandafter\xdef\csname @dLead\arabic{@dcount}\endcsname{#3}%
+ \expandafter\xdef\csname @dType\arabic{@dcount}\endcsname{#4}%
+ \expandafter\xdef\csname %
+ @dDisseminationLevel\arabic{@dcount}\endcsname{#5}%
+ \expandafter\xdef\csname @dDeliveryDate\arabic{@dcount}\endcsname{#6}%
+}
+% \end{macrocode}
+%
+% Deliverables table row
+%
+% \begin{macrocode}
+\newcommand{\dtablerow}[1]{%
+ \stepcounter{#1}
+ \disptoken{@dNumber\arabic{#1}} &
+ \disptoken{@dName\arabic{#1}} &
+ \disptoken{@dDescription\arabic{#1}} &
+ \disptoken{@dWorkPackage\arabic{#1}} &
+ \disptoken{@dLead\arabic{#1}} &
+ \disptoken{@dType\arabic{#1}} &
+ \disptoken{@dDisseminationLevel\arabic{#1}} &
+ \disptoken{@dDeliveryDate\arabic{#1}} \\
+ \hline%
+}
+% \end{macrocode}
+%
+% Deliverables table
+%
+% \begin{macrocode}
+\newcommand{\makedeliverablestable}{%
+ \newcounter{@dtable}
+ \begin{center}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{1.0\textwidth}%
+ {|c|>{\raggedright\hsize=.667\hsize\linewidth=\hsize}X%
+ |>{\hsize=1.333\hsize\linewidth=\hsize}X|c|c|c|c|p{15mm}|}
+ \hline
+ \rowcolor{tablegrey}%
+ \thead{\#} &
+ \thead{Name} &
+ \thead{Short description} &
+ \thead{WP\\ \#} &
+ \thead{Lead\\ participant} &
+ \thead{Type} &
+ \thead{Dissem.\\ level} &
+ \thead{Delivery\\ month} \\
+ \hline
+ \whiledo%
+ {\value{@dtable}<\numexpr\value{@dcount}-1}%
+ {\dtablerow{@dtable}}%
+ \dtablerow{@dtable}
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% \subsection*{Milestones}
+%
+% \begin{macrocode}
+\newcounter{@mcount} % Milestone counter
+\newcommand{\milestone}[4]{%
+ \stepcounter{@mcount}%
+ \expandafter\gdef\csname @mName\arabic{@mcount}\endcsname{#1}%
+ \expandafter\xdef\csname @mWorkPackages\arabic{@mcount}\endcsname{#2}%
+ \expandafter\xdef\csname @mDueDate\arabic{@mcount}\endcsname{#3}%
+ \expandafter\xdef\csname %
+ @mMeansOfVerification\arabic{@mcount}\endcsname{#4}%
+}
+% \end{macrocode}
+%
+% Milestones table row
+%
+% \begin{macrocode}
+\newcommand{\mtablerow}[1]{%
+ \stepcounter{#1}
+ \arabic{#1} &
+ \disptoken{@mName\arabic{#1}} &
+ \disptoken{@mWorkPackages\arabic{#1}} &
+ \disptoken{@mDueDate\arabic{#1}} &
+ \disptoken{@mMeansOfVerification\arabic{#1}} \\
+ \hline%
+}
+% \end{macrocode}
+%
+% Milestones table
+%
+% \begin{macrocode}
+\newcommand{\makemilestonestable}{%
+ \newcounter{@mtable}
+ \begin{center}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{1.0\textwidth}{|c|X|p{26mm}|c|p{26mm}|}
+ \hline
+ \rowcolor{tablegrey}%
+ \thead{\#} &
+ \thead{Milestone\\ name} &
+ \thead{Related\\ WP(s)} &
+ \thead{Month\\ due} &
+ \thead{Means of\\ verification} \\
+ \hline
+ \whiledo%
+ {\value{@mtable}<\numexpr\value{@mcount}-1}%
+ {\mtablerow{@mtable}}%
+ \mtablerow{@mtable}
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% \subsection*{Critical risks}
+%
+% \begin{macrocode}
+\newtcbox{\risktag}[1][black]{%
+ fontupper=\scriptsize\sffamily\bfseries,%
+ on line,%
+ arc=3pt,%
+ colupper=white,%
+ colback=#1!50!black,%
+ colframe=#1!50!black,%
+ before upper={\rule[-3pt]{0pt}{10pt}},%
+ boxrule=1pt,%
+ boxsep=0pt,%
+ left=2pt,%
+ right=2pt,%
+ top=1pt,%
+ bottom=.5pt%
+}
+\newcounter{@crcount} % Critical risk counter
+\newcommand{\criticalrisk}[5]{%
+ \stepcounter{@crcount}%
+ \expandafter\gdef\csname %
+ @crDescription\arabic{@crcount}\endcsname{#1}%
+ \expandafter\xdef\csname @crLikelihood\arabic{@crcount}\endcsname{#2}%
+ \expandafter\xdef\csname @crSeverity\arabic{@crcount}\endcsname{#3}%
+ \expandafter\xdef\csname %
+ @crWorkPackages\arabic{@crcount}\endcsname{#4}%
+ \expandafter\gdef\csname @crMitigation\arabic{@crcount}\endcsname{#5}%
+}
+% \end{macrocode}
+%
+% Critical risk table row
+%
+% \begin{macrocode}
+\newcommand{\crtablerow}[1]{%
+ \stepcounter{#1}%
+ \disptoken{@crDescription\arabic{#1}}\newline
+ \risktag[blue]{Likelihood: \disptoken{@crLikelihood\arabic{#1}}}
+ \risktag[red]{Severity: \disptoken{@crSeverity\arabic{#1}}} &
+ \disptoken{@crWorkPackages\arabic{#1}} &
+ \disptoken{@crMitigation\arabic{#1}} \\
+ \hline%
+}
+% \end{macrocode}
+%
+% Critical risks table
+%
+% \begin{macrocode}
+\newcommand{\makecriticalriskstable}{%
+ \newcounter{@crtable}
+ \begin{center}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{1.0\textwidth}{|p{60mm}|c|X|}
+ \hline
+ \rowcolor{tablegrey}%
+ \thead{Description of risk (indicate level of\\ %
+ (i) likelihood, and (ii) severity:\\ %
+ Low\slash Medium\slash High)} &
+ \thead{WP(s)\\ involved} &
+ \thead{Proposed risk-mitigation measures} \\
+ \hline
+ \whiledo%
+ {\value{@crtable}<\numexpr\value{@crcount}-1}%
+ {\crtablerow{@crtable}}%
+ \crtablerow{@crtable}
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% \subsection*{Staff effort}
+%
+% \begin{macrocode}
+\newcommand{\staffeffort}[3]{%
+ \expandafter\xdef\csname @se#1.#2\endcsname{#3}%
+}
+% \end{macrocode}
+%
+% Summary of staff effort table row
+%
+% \begin{macrocode}
+\newcommand{\setablerow}[1]{%
+ \def\serowtotal{0}%
+ \setcounter{@secolumn}{0}%
+ \bfseries\the\value{#1} \disptoken{@pShortName\arabic{#1}}%
+ \edef\serowtemp{}%
+ \whiledo{\value{@secolumn}<\value{@wpcount}}{%
+ \stepcounter{@secolumn}%
+ \edef\sewpname{\disptoken{@wpShortName\the\value{@secolumn}}}%
+ \edef\sewpcell%
+ {\disptoken{@se\disptoken{@pShortName\the\value{#1}}.\sewpname}}%
+ \edef\serowtotal%
+ {\fpeval{\serowtotal + \sewpcell}}% Total PMs per participant
+ \xdef\setotalpm{\fpeval{\setotalpm + \sewpcell}}% Total PMs
+ \expandafter\xdef\csname %
+ @wpPersonMonths\arabic{@secolumn}\endcsname{\fpeval{%
+ \sewpcell+\csname %
+ @wpPersonMonths\arabic{@secolumn}\endcsname}}% Total PMs per WP
+ \IfEq% If...
+ {\disptoken{@pShortName\the\value{#1}}}% ...the current PI
+ {\disptoken{@wpLeadParticipantShortName%
+ \the\value{@secolumn}}}% ...is the WP lead
+ {\protected@edef\seformat{\bfseries}}% ...then apply boldface
+ {\edef\seformat{}}% ...otherwise don't.
+ \protected@edef\serowtemp%
+ {\serowtemp&\seformat \sewpcell}% Print PI's PMs for this WP
+ }%
+ \protected@edef\serowtemp{\serowtemp&\fpeval{round(\serowtotal,0)}}%
+ \serowtemp%
+ \stepcounter{#1}%
+}
+% \end{macrocode}
+%
+% Summary of staff effort table
+%
+% \begin{macrocode}
+\newcommand{\makestaffefforttable}{%
+ \newcounter{@setable}
+ \stepcounter{@setable}
+ \newcounter{@secolumn}
+ \xdef\setotalpm{0}
+ \edef\serowtemp{}
+ \begin{center}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{1.0\textwidth}%
+ {|>{\columncolor{tablegrey}}l|*{\value{@wpcount}}{r|}%
+ >{\columncolor{tablegrey}}r|}
+ \hline
+ % Table header
+ \rowcolor{tablegrey}%
+ \whiledo{\value{@secolumn}<\value{@wpcount}}{%
+ \stepcounter{@secolumn}%
+ \protected@edef\serowtemp%
+ {\serowtemp&\protect\thead{WP\the\value{@secolumn}}}%
+ }
+ \serowtemp & \thead{Total PMs\\ per Participant} \\
+ \hline
+ % Participant rows
+ \whiledo%
+ {\value{@setable}<\numexpr\value{@pcount}}%
+ {\setablerow{@setable}\\ \hline}%
+ \setablerow{@setable} \\ \hline%
+ % Total
+ \rowcolor{tablegrey}%
+ \setcounter{@secolumn}{0}
+ \bfseries Total PMs
+ \whiledo{\value{@secolumn}<\value{@wpcount}}{%
+ \stepcounter{@secolumn}%
+ \edef\serowtemp{\serowtemp&\fpeval{round(\csname %
+ @wpPersonMonths\arabic{@secolumn}\endcsname,0)}}%
+ \@bsphack
+ \protected@write\@auxout{}%
+ {\string\expandafter\string\expandafter\string\expandafter%
+ \string\gdef\string\disptoken{@wpTotalPersonMonths%
+ \arabic{@secolumn}}{\fpeval{round(\disptoken{@wpPersonMonths%
+ \arabic{@secolumn}},0)}}}%
+ \@esphack
+ }
+ \serowtemp & \fpeval{round(\setotalpm,0)} \\
+ \hline
+ \end{xltabular}
+ \end{center}
+}
+% \end{macrocode}
+%
+% \subsection*{Subcontracting costs}
+%
+% \begin{macrocode}
+\newcommand{\subcontractingcost}[3]{%
+ \stepcounter{@pSubcontractingCosts\getPnum{#1}}
+ \expandafter\xdef\csname %
+ @scCost\getPnum{#1}.\arabic{@pSubcontractingCosts\getPnum{#1}}%
+ \endcsname{#2}%
+ \expandafter\xdef\csname %
+ @scJustification\getPnum{#1}.\arabic{@pSubcontractingCosts\getPnum%
+ {#1}}\endcsname{#3}%
+}
+% \end{macrocode}
+%
+% Subcontracting costs table
+%
+% \begin{macrocode}
+\newcommand{\makesubcontractingcoststable}{%
+ \newcounter{@scparticipant}
+ \begin{center}
+ % For each participant
+ \whiledo{\value{@scparticipant}<\value{@pcount}}{%
+ \stepcounter{@scparticipant}%
+ \ifthenelse%
+ {\value{@pSubcontractingCosts\arabic%
+ {@scparticipant}}>0}% If they have subcontracting costs
+ {\sctablesection%
+ {@scparticipant}}% Print their subcontracting costs table
+ {}% Otherwise, do nothing
+ }%
+ \end{center}
+}
+% \end{macrocode}
+%
+% Subcontracting costs table section
+%
+% \begin{macrocode}
+\newcommand{\sctablesection}[1]{%
+ \newcounter{@sccost\arabic{#1}}
+ \edef\scrowtemp{}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{\textwidth}{|>{\columncolor{tablegrey}}l|r|X|}
+ \hline
+ \rowcolor{tablegrey}
+ \multicolumn{3}{|l|}{\bfseries\the\value{#1} %
+ \disptoken{@pShortName\arabic{#1}}} \\
+ \hline
+ \rowcolor{tablegrey}
+ & \thead{Cost (€)}
+ & \thead{Description of tasks and justification} \\
+ \hline
+ % For each subcontracting cost
+ \whiledo%
+ {\value{@sccost\arabic{#1}}<\numexpr\value%
+ {@pSubcontractingCosts\arabic{#1}}-1}{%
+ \stepcounter{@sccost\arabic{#1}}%
+ \sctablerow{#1}{@sccost\arabic{#1}}%
+ }%
+ \stepcounter{@sccost\arabic{#1}}%
+ \sctablerow{#1}{@sccost\arabic{#1}}%
+ \end{xltabular}
+}
+% \end{macrocode}
+%
+% Subcontracting costs table row
+%
+% \begin{macrocode}
+\newcommand{\sctablerow}[2]{%
+ \thead{Subcontracting} &
+ \disptoken{@scCost\arabic{#1}.\arabic{#2}} &
+ \disptoken{@scJustification\arabic{#1}.\arabic{#2}}
+ \\ \hline
+}
+% \end{macrocode}
+%
+% \subsection*{Other costs}
+%
+% \begin{macrocode}
+\newcommand{\othercost}[3]{%
+ \stepcounter{@pOtherCosts\getPnum{#1}}
+ \expandafter\xdef\csname %
+ @ocCost\getPnum{#1}.\arabic{@pOtherCosts\getPnum{#1}}\endcsname{#2}%
+ \expandafter\xdef\csname %
+ @ocJustification\getPnum{#1}.\arabic%
+ {@pOtherCosts\getPnum{#1}}\endcsname{#3}%
+}
+% \end{macrocode}
+%
+% Other costs table
+%
+% \begin{macrocode}
+\newcommand{\makeothercoststable}{%
+ \newcounter{@ocparticipant}
+ \begin{center}
+ % For each participant
+ \whiledo{\value{@ocparticipant}<\value{@pcount}}{%
+ \stepcounter{@ocparticipant}%
+ \ifthenelse%
+ {\value{@pOtherCosts\arabic%
+ {@ocparticipant}}>0}% If they have other costs
+ {\octablesection{@ocparticipant}}% Print their other costs table
+ {}% Otherwise, do nothing
+ }%
+ \end{center}
+}
+% \end{macrocode}
+%
+% Other costs table section
+%
+% \begin{macrocode}
+\newcommand{\octablesection}[1]{%
+ \newcounter{@occost\arabic{#1}}
+ \edef\ocrowtemp{}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{\textwidth}{|>{\columncolor{tablegrey}}l|r|X|}
+ \hline
+ \rowcolor{tablegrey}
+ \multicolumn{3}{|l|}{\bfseries\the\value{#1} %
+ \disptoken{@pShortName\arabic{#1}}} \\
+ \hline
+ \rowcolor{tablegrey}
+ & \thead{Cost (€)} & \thead{Justification} \\
+ \hline
+ % For each other cost
+ \whiledo%
+ {\value{@occost\arabic{#1}}<\numexpr\value%
+ {@pOtherCosts\arabic{#1}}-1}{%
+ \stepcounter{@occost\arabic{#1}}%
+ \octablerow{#1}{@occost\arabic{#1}}%
+ }%
+ \stepcounter{@occost\arabic{#1}}%
+ \octablerow{#1}{@occost\arabic{#1}}%
+ \end{xltabular}
+}
+% \end{macrocode}
+%
+% Other costs table row
+%
+% \begin{macrocode}
+\newcommand{\octablerow}[2]{%
+ \thead{Internally invoiced\\ goods and services} &
+ \disptoken{@ocCost\arabic{#1}.\arabic{#2}} &
+ \disptoken{@ocJustification\arabic{#1}.\arabic{#2}}
+ \\ \hline
+}
+% \end{macrocode}
+%
+% \subsection*{Purchase costs}
+%
+% \begin{macrocode}
+\newcommand{\purchasecost}[8]{%
+ \stepcounter{@pPurchaseCosts\getPnum{#1}}
+ \expandafter\xdef\csname @pcTravelCost\getPnum{#1}\endcsname{#2}%
+ \expandafter\xdef\csname %
+ @pcTravelJustification\getPnum{#1}\endcsname{#3}%
+ \expandafter\xdef\csname @pcEquipmentCost\getPnum{#1}\endcsname{#4}%
+ \expandafter\xdef\csname %
+ @pcEquipmentJustification\getPnum{#1}\endcsname{#5}%
+ \expandafter\xdef\csname @pcOtherCost\getPnum{#1}\endcsname{#6}%
+ \expandafter\xdef\csname %
+ @pcOtherJustification\getPnum{#1}\endcsname{#7}%
+ \expandafter\xdef\csname @pcRemainingCost\getPnum{#1}\endcsname{#8}%
+ \expandafter\xdef\csname %
+ @pcTotalCost\getPnum{#1}\endcsname%
+ {\the\numexpr #2+#4+#6+#8 \relax}% TO DO
+ % \expandafter\xdef\csname @pcTotalCost\getPnum{#1}\endcsname{100}%
+}
+% \end{macrocode}
+%
+% Purchase costs table
+%
+% \begin{macrocode}
+\newcommand{\makepurchasecoststable}{%
+ \newcounter{@pcparticipant}
+ \begin{center}
+ % For each participant
+ \whiledo{\value{@pcparticipant}<\value{@pcount}}{%
+ \stepcounter{@pcparticipant}%
+ \ifthenelse%
+ {\value{@pPurchaseCosts\arabic%
+ {@pcparticipant}}>0}% If they have purchase costs
+ {\pctablesection%
+ {@pcparticipant}}% Print their purchase costs table
+ {}% Otherwise, do nothing
+ }%
+ \end{center}
+}
+% \end{macrocode}
+%
+% Purchase costs table section
+%
+% \begin{macrocode}
+\newcommand\swap[2]{
+ \let\pcTemp#1
+ \let#1#2
+ \let#2\pcTemp
+}
+\newcommand{\pctablesection}[1]{%
+ \newcounter{@pccost\arabic{#1}}
+ % Define table rows
+ \def\pcRowA{%
+ \thead{Travel and subsistence} &
+ \disptoken{@pcTravelCost\arabic{#1}} &
+ \disptoken{@pcTravelJustification\arabic{#1}}
+ }%
+ \edef\pcCostA{\disptoken{@pcTravelCost\arabic{#1}}}%
+ \def\pcRowB{%
+ \thead{Equipment} &
+ \disptoken{@pcEquipmentCost\arabic{#1}} &
+ \disptoken{@pcEquipmentJustification\arabic{#1}}
+ }%
+ \edef\pcCostB{\disptoken{@pcEquipmentCost\arabic{#1}}}%
+ \def\pcRowC{%
+ \thead{Other goods, works\\ and services} &
+ \disptoken{@pcOtherCost\arabic{#1}} &
+ \disptoken{@pcOtherJustification\arabic{#1}}
+ }%
+ \edef\pcCostC{\disptoken{@pcOtherCost\arabic{#1}}}%
+ % Sort table rows
+ \ifthenelse{\pcCostA<\pcCostC}{%
+ \swap{\pcRowA}{\pcRowC}
+ \swap{\pcCostA}{\pcCostC}
+ }{}
+ \ifthenelse{\pcCostA<\pcCostB}{%
+ \swap{\pcRowA}{\pcRowB}
+ \swap{\pcCostA}{\pcCostB}
+ }{}
+ \ifthenelse{\pcCostB<\pcCostC}{%
+ \swap{\pcRowC}{\pcRowB}
+ \swap{\pcCostC}{\pcCostB}
+ }{}
+
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{\textwidth}{|>{\columncolor{tablegrey}}p{43mm}|r|X|}
+ \hline
+ \rowcolor{tablegrey}
+ \multicolumn{3}{|l|}{\bfseries\the\value{#1} %
+ \disptoken{@pShortName\arabic{#1}}} \\
+ \hline
+ \rowcolor{tablegrey}
+ & \thead{Cost (€)} & \thead{Justification} \\
+ \hline
+ % Output purchase costs in sorted order
+ \pcRowA \\ \hline
+ \pcRowB \\ \hline
+ \pcRowC \\ \hline
+ % Output remaining and total costs
+ \thead{Remaining purchase\\ costs (<15\% of pers.\\ costs)}
+ & \disptoken{@pcRemainingCost\arabic{#1}} \\
+ \cline{1-2}
+ \thead{Total} & \disptoken{@pcTotalCost\arabic{#1}} \\
+ \cline{1-2}
+ \end{xltabular}
+}
+% \end{macrocode}
+%
+% \subsection*{In-kind contributions}
+%
+% \begin{macrocode}
+\newcommand{\inkindcontribution}[5]{%
+ \stepcounter{@pInkindContributions\getPnum{#1}}
+ \expandafter\xdef\csname %
+ @ikcThirdPartyName\getPnum{#1}.\arabic%
+ {@pInkindContributions\getPnum{#1}}\endcsname{#2}%
+ \expandafter\xdef\csname %
+ @ikcCategory\getPnum{#1}.\arabic%
+ {@pInkindContributions\getPnum{#1}}\endcsname{#3}%
+ \expandafter\xdef\csname %
+ @ikcCost\getPnum{#1}.\arabic%
+ {@pInkindContributions\getPnum{#1}}\endcsname{#4}%
+ \expandafter\xdef\csname %
+ @ikcJustification\getPnum{#1}.\arabic%
+ {@pInkindContributions\getPnum{#1}}\endcsname{#5}%
+}
+% \end{macrocode}
+%
+% In-kind contributions table
+%
+% \begin{macrocode}
+\newcommand{\makeinkindcontributionstable}{%
+ \newcounter{@ikcparticipant}
+ \begin{center}
+ % For each participant
+ \whiledo{\value{@ikcparticipant}<\value{@pcount}}{%
+ \stepcounter{@ikcparticipant}%
+ \ifthenelse%
+ {\value{@pInkindContributions\arabic%
+ {@ikcparticipant}}>0}% If they have in-kind contributions
+ {\ikctablesection%
+ {@ikcparticipant}}% Print their in-kind contributions table
+ {}% Otherwise, do nothing
+ }%
+ \end{center}
+}
+% \end{macrocode}
+%
+% In-kind contributions table section
+%
+% \begin{macrocode}
+\newcommand{\ikctablesection}[1]{%
+ \newcounter{@ikccost\arabic{#1}}
+ \edef\ikcrowtemp{}
+ \renewcommand\theadfont{\normalsize\bfseries}
+ \begin{xltabular}{\textwidth}%
+ {|>{\raggedright}p{40mm}|>{\raggedright}p{35mm}|r|X|}
+ \hline
+ \rowcolor{tablegrey}
+ \multicolumn{4}{|l|}{\bfseries\the\value{#1} %
+ \disptoken{@pShortName\arabic{#1}}} \\
+ \hline
+ \rowcolor{tablegrey}
+ \thead{Third party name} & \thead{Category} &
+ \thead{Cost (€)} & \thead{Justification} \\
+ \hline
+ % For each in-kind contribution
+ \whiledo%
+ {\value{@ikccost\arabic{#1}}<\numexpr\value%
+ {@pInkindContributions\arabic{#1}}-1}{%
+ \stepcounter{@ikccost\arabic{#1}}%
+ \ikctablerow{#1}{@ikccost\arabic{#1}}%
+ }%
+ \stepcounter{@ikccost\arabic{#1}}%
+ \ikctablerow{#1}{@ikccost\arabic{#1}}%
+ \end{xltabular}
+}
+% \end{macrocode}
+%
+% In-kind contributions table row
+%
+% \begin{macrocode}
+\newcommand{\ikctablerow}[2]{%
+ \disptoken{@ikcThirdPartyName\arabic{#1}.\arabic{#2}} &
+ \disptoken{@ikcCategory\arabic{#1}.\arabic{#2}} &
+ \disptoken{@ikcCost\arabic{#1}.\arabic{#2}} &
+ \disptoken{@ikcJustification\arabic{#1}.\arabic{#2}}
+ \\ \hline
+}
+% \end{macrocode}
+%
+% \subsection*{Summary canvas}
+%
+% \begin{macrocode}
+\RequirePackage{pdflscape} % PDF landscape for Summary canvas
+\newenvironment{summarycanvas}{%
+ \begin{tcbraster}[%
+ raster columns=3,
+ ]%
+}{%
+ \end{tcbraster}%
+}
+\newenvironment{summarybox}[1]{%
+ \begin{tcolorbox}[%
+ colframe=summaryblue,
+ colbacktitle=summaryblue,
+ %height fill,
+ fonttitle=\bfseries\sffamily,
+ halign title=center,
+ title={#1}
+ ]
+}{%
+ \end{tcolorbox}%
+}
+% \end{macrocode}
+%
+% Code for sideways figures, adapted from
+% \url{https://tex.stackexchange.com/a/307142/22603}.
+% Copyright 2016 John Kormylo and licensed under the Creative Commons
+% Attribution-ShareAlike 4.0 license (CC~BY-SA~4.0), per personal
+% communication with Tristan Miller on 2023-12-02.
+%
+% \begin{macrocode}
+\RequirePackage{everypage}
+\RequirePackage{environ}
+\newcounter{abspage}% \thepage not reliab
+\newcommand{\newSFPage}[1]% #1 = \theabspage
+ {\global\expandafter\let\csname SFPage@#1\endcsname\null}
+\NewEnviron{SidewaysFigure}{\begin{figure}[p]
+\protected@write\@auxout%
+ {\let\theabspage=\relax}% delays expansion until shipout
+ {\string\newSFPage{\theabspage}}%
+\ifdim\textwidth=\textheight
+ \rotatebox{90}{\parbox[c][\textwidth][c]{\linewidth}{\BODY}}%
+\else
+ \rotatebox{90}{\parbox[c][\textwidth][c]{\textheight}{\BODY}}%
+\fi
+\end{figure}}
+\AddEverypageHook{% check if sideways figure on this page
+ \ifdim\textwidth=\textheight
+ \stepcounter{abspage}% already in landscape
+ \else
+ \@ifundefined{SFPage@\theabspage}{}{\global\pdfpageattr{/Rotate 0}}%
+ \stepcounter{abspage}%
+ \@ifundefined{SFPage@\theabspage}{}%
+ {\global\pdfpageattr{/Rotate 90}}%
+ \fi}
+% \end{macrocode}
+%
+% \subsection*{Font setup}
+%
+% \begin{macrocode}
+\RequirePackage{newtxtext} % Use Times for main text
+\RequirePackage{newtxmath} % Use Times for math
+\renewcommand*\ttdefault{lmvtt} % Latin Modern Typewriter Proportional
+% \end{macrocode}
+%
+% \subsection*{Page header and footer}
+%
+% \begin{macrocode}
+\RequirePackage{lastpage}
+\RequirePackage{fancyhdr}
+\newcommand{\Paragraph}[1]{\vspace*{-.45em}\paragraph{#1.}}
+\pagestyle{fancy}
+\renewcommand{\headrulewidth}{0pt} % Remove line at top
+\lhead{\sffamily\scriptsize Call: \@callidentifier\ --- \@callname}
+\rhead{}
+\chead{}
+\cfoot{\raisebox{\dimexpr(-\height+\ht\strutbox-\dp\strutbox)/2}{%
+ \begin{tcolorbox}[nobeforeafter,
+ fontupper=\scriptsize\sffamily,
+ colback=footergrey,
+ boxrule=0.75pt,
+ halign=center,
+ boxsep=0mm,
+ ]%
+ \strut Part B -- Page \thepage\ of \pageref*{LastPage}%
+ \end{tcolorbox}%
+ }%
+}
+% \end{macrocode}
+%
+% \subsection*{Titles and section headings}
+%
+% Document title
+%
+% \begin{macrocode}
+\def\@maketitle{%
+ \newpage%
+ \noindent%
+ \large%
+ \framebox[\textwidth]%
+ {\null\hfill\textsf{\textbf{\textsc{\@title}}}\hfill\null}%
+ \par
+ \vskip 1.5em\thispagestyle{fancy}%
+ \ifdefined\@calltopic
+ \vspace{-5mm}
+ \begin{center}
+ Topic: \@calltopic
+ \end{center}
+ \fi
+}
+% \end{macrocode}
+%
+% Format page limits used by the Horizon Europe template
+%
+% \begin{macrocode}
+\NewDocumentCommand{\showpagelimit}{m}
+{%
+ \ifheria@showinstructions%
+ {\normalfont\sffamily\itshape [e.g.\ #1]}%
+ \fi%
+}
+% \end{macrocode}
+%
+% Format ``tags'' used by the Horizon Europe template
+%
+% \begin{macrocode}
+\ExplSyntaxOn
+\NewDocumentCommand{\hetag}{mm}
+ {%
+ \textcolor{taggrey}{\normalfont\sffamily\footnotesize%
+ \clist_map_inline:nn { #2 } { \# #1 ##1 #1 \# ~}%
+ }%
+ }
+\ExplSyntaxOff
+\NewDocumentCommand{\opentag}{m}{\hetag{@}{#1}}
+\NewDocumentCommand{\closetag}{m}{\noindent\hetag{§}{#1}}
+% \end{macrocode}
+%
+% Format section titles, with optional opening and closing tags
+%
+% \begin{macrocode}
+\RequirePackage[explicit]{titlesec}
+\titleformat{\section}
+ {\normalfont\normalsize\bfseries\sffamily}%
+ {\thesection}{1em}{#1 \sectiontag\sectionpagelimit}
+\titleformat{\subsection}
+ {\normalfont\normalsize\bfseries\sffamily}%
+ {\thesubsection}{1em}{#1 \sectiontag\sectionpagelimit}
+\titleformat{\subsubsection}
+ {\normalfont\normalsize\bfseries\sffamily}%
+ {\thesubsubsection}{1em}{#1 \sectiontag\sectionpagelimit}
+\NewDocumentCommand{\extendedsection}{sO{#3}mooo}{%
+ \IfValueTF{#4}%
+ {\renewcommand{\sectiontag}{\opentag{#4}}}%
+ {\renewcommand{\sectiontag}{}}%
+ \IfValueTF{#6}%
+ {\renewcommand{\sectionpagelimit}{\showpagelimit{#6}}}%
+ {\renewcommand{\sectionpagelimit}{}}%
+ \IfValueT{#5}{%
+ \closetag{#5}%
+ }%
+ \IfBooleanTF{#1}{%
+ \latexsection*{#3}%
+ }{%
+ \latexsection[#2]{#3}%
+ }%
+}
+\NewDocumentCommand{\extendedsubsection}{sO{#3}mooo}{%
+ \IfValueTF{#4}%
+ {\renewcommand{\sectiontag}{\opentag{#4}}}%
+ {\renewcommand{\sectiontag}{}}%
+ \IfValueTF{#6}%
+ {\renewcommand{\sectionpagelimit}{\showpagelimit{#6}}}%
+ {\renewcommand{\sectionpagelimit}{}}%
+ \IfValueT{#5}{%
+ \closetag{#5}%
+ }%
+ \IfBooleanTF{#1}{%
+ \latexsubsection*{#3}%
+ }{%
+ \latexsubsection[#2]{#3}%
+ }%
+}
+\NewDocumentCommand{\extendedsubsubsection}{sO{#3}mooo}{%
+ \IfValueTF{#4}%
+ {\renewcommand{\sectiontag}{\opentag{#4}}}%
+ {\renewcommand{\sectiontag}{}}%
+ \IfValueTF{#6}%
+ {\renewcommand{\sectionpagelimit}{\showpagelimit{#6}}}%
+ {\renewcommand{\sectionpagelimit}{}}%
+ \IfValueT{#5}{%
+ \closetag{#5}%
+ }%
+ \IfBooleanTF{#1}{%
+ \latexsubsubsection*{#3}%
+ }{%
+ \latexsubsubsection[#2]{#3}%
+ }%
+}
+\newcommand{\sectiontag}{}
+\newcommand{\sectionpagelimit}{}
+\AtBeginDocument{%
+ \NewCommandCopy{\latexsection}{\section}%
+ \RenewCommandCopy{\section}{\extendedsection}%
+ \NewCommandCopy{\latexsubsection}{\subsection}%
+ \RenewCommandCopy{\subsection}{\extendedsubsection}%
+ \NewCommandCopy{\latexsubsubsection}{\subsubsection}%
+ \RenewCommandCopy{\subsubsection}{\extendedsubsubsection}%
+}
+% \end{macrocode}
+%
+% \subsection*{Official Horizon Europe template instructions}
+%
+% \begin{macrocode}
+\RequirePackage[inline]{enumitem} % For custom bullets
+\RequirePackage[normalem]{ulem} % For underlined text
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{
+ family=heria,
+ prefix=heria@
+}
+\DeclareBoolOption{showinstructions}
+\ProcessKeyvalOptions*
+
+\RequirePackage{twemojis}
+\RequirePackage{xspace}
+\newcommand{\twarn}{\twemoji{warning}\xspace}
+\RequirePackage{verbatim}
+\newenvironment{instructions}{%
+ \begin{tcolorbox}[fontupper=\sffamily,
+ fonttitle=\sffamily\bfseries,
+ colback=blue!5!white,
+ colframe=blue!75!black,
+ parbox=false,
+ breakable
+ ]%
+ }{%
+ \end{tcolorbox}%
+ }
+
+\newcommand{\heinstructions}[1]{%
+ \ifheria@showinstructions%
+ \begin{instructions}%
+ \input{hi-#1}%
+ \end{instructions}%
+ \fi%
+}
+% \end{macrocode}
+%\iffalse
+%</class>
+%<*hi-annexes>
+\textbf{ANNEXES TO PROPOSAL PART B}
+
+Some calls may ask to upload annexes to proposal part B. The annexes
+must be uploaded as separate documents in the submission system. The
+most common annexes to be uploaded in Horizon Europe are (standard
+templates are published in the Funding \& Tenders portal):
+
+\begin{itemize}
+\item
+ \textbf{CLINICAL TRIALS:} Annex with information on clinical trials
+\item
+ \textbf{FINANCIAL SUPPORT TO THIRD PARTIES:} Annex with information on
+ financial support to third parties.~
+\item
+ \textbf{CALLS FLAGGED AS SECURITY SENSITIVE:} Annex with information
+ on security aspects.~
+\item
+ \textbf{ETHICS:} ethics self-assessment should be included in proposal
+ part A. However, in calls where several serious ethics issues are
+ expected, the character limited in this section of proposal part A may
+ not be sufficient for participants to give all necessary information.
+ In those cases, participants may include additional information in an
+ annex to proposal part B.~~
+\end{itemize}
+%</hi-annexes>
+%<*hi-capacity>
+\twarn \emph{The individual participants of the consortium are
+ described in a separate section under Part A. There is no need to
+ repeat that information here.}
+
+\begin{itemize}
+\item
+ Describe the consortium. How does it match the project's objectives,
+ and bring together the necessary disciplinary and inter-disciplinary
+ knowledge? Show how this includes expertise in social sciences and
+ humanities, open science practices, and gender aspects of R\&I, as
+ appropriate. Include in the description affiliated entities and
+ associated partners, if any.
+\item
+ Show how the partners will have access to critical infrastructure
+ needed to carry out the project activities.
+\item
+ Describe how the members complement one another (and cover the value
+ chain, where appropriate)
+\item
+ In what way does each of them contribute to the project? Show that
+ each has a valid role, and adequate resources in the project to fulfil
+ that role.
+\item
+ If applicable, describe the industrial/commercial involvement in the
+ project to ensure exploitation of the results and explain why this is
+ consistent with and will help to achieve the specific measures which
+ are proposed for exploitation of the results of the project (see
+ section 2.2).
+\item
+ \textbf{Other countries and international organisations}: If one or
+ more of the participants requesting EU funding is based in a country
+ or is an international organisation that is not automatically eligible
+ for such funding (entities from Member States of the EU, from
+ Associated Countries and from one of the countries in the exhaustive
+ list included in the Work Programme General Annexes B are
+ automatically eligible for EU funding), explain why the participation
+ of the entity in question is essential to successfully carry out the
+ project.
+\end{itemize}
+%</hi-capacity>
+%<*hi-criticalrisks>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+\textbf{Definition critical risk:}
+
+A critical risk is a plausible event or issue that could have a high
+adverse impact on the ability of the project to achieve its objectives.
+
+\textbf{Level of likelihood to occur: Low/medium/high}
+
+The likelihood is the estimated probability that the risk will
+materialise even after taking account of the mitigating measures put in
+place.
+
+\textbf{Level of severity: Low/medium/high}
+
+The relative seriousness of the risk and the significance of its effect.
+\end{tcolorbox}
+%</hi-criticalrisks>
+%<*hi-deliverables-key>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+\textbf{KEY}
+
+Deliverable numbers in order of delivery dates. Please use the numbering
+convention \textless WP number\textgreater.\textless number of
+deliverable within that WP\textgreater.
+
+For example, deliverable 4.2 would be the second deliverable from work
+package 4.
+
+\textbf{Type:}
+
+Use one of the following codes:
+
+\begin{quote}
+R: Document, report (excluding the periodic and final reports)
+
+DEM: Demonstrator, pilot, prototype, plan designs
+
+DEC: Websites, patents filing, press \& media actions, videos, etc.
+
+DATA: Data sets, microdata, etc.
+
+DMP: Data management plan
+
+ETHICS: Deliverables related to ethics issues.
+
+SECURITY: Deliverables related to security issues
+
+OTHER: Software, technical diagram, algorithms, models, etc.
+\end{quote}
+
+\textbf{Dissemination level:}
+
+Use one of the following codes:
+
+\begin{quote}
+PU -- Public, fully open, e.g. web (Deliverables flagged as public will
+be automatically published in CORDIS project's page)
+
+SEN -- Sensitive, limited under the conditions of the Grant Agreement
+
+Classified R-UE/EU-R -- EU RESTRICTED under the Commission Decision
+No2015/444
+
+Classified C-UE/EU-C -- EU CONFIDENTIAL under the Commission Decision
+No2015/444
+
+Classified S-UE/EU-S -- EU SECRET under the Commission Decision
+No2015/444
+\end{quote}
+
+\textbf{Delivery date}
+
+Measured in months from the project start date (month 1)
+\end{tcolorbox}
+%</hi-deliverables-key>
+%<*hi-deliverables>
+Only include deliverables that you consider essential for effective
+project monitoring.\footnote{You must include a data
+ management plan (DMP) and a `plan for dissemination and exploitation
+ including communication activities as distinct deliverables within the
+ first 6 months of the project. The DMP will evolve during the lifetime
+ of the project in order to present the status of the
+ project\textquotesingle s reflections on data management. A template
+ for such a plan is available in the
+ \href{https://ec.europa.eu/info/funding-tenders/opportunities/docs/2021-2027/common/guidance/om_en.pdf}{Online
+ Manual} on the Funding \& Tenders Portal.}
+%</hi-deliverables>
+%<*hi-excellence>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+ \textbf{Excellence – aspects to be taken into account.}
+ \begin{itemize}
+ \item Clarity and pertinence of the project’s objectives, and the
+ extent to which the proposed work is ambitious, and goes beyond
+ the state of the art.
+ \item Soundness of the proposed methodology, including the
+ underlying concepts, models, assumptions, interdisciplinary
+ approaches, appropriate consideration of the gender dimension in
+ research and innovation content, and the quality of open science
+ practices, including sharing and management of research outputs
+ and engagement of citizens, civil society and end users where
+ appropriate.
+ \end{itemize}
+ \end{tcolorbox}
+ \noindent \twarn The following aspects will be taken into account
+ only to the extent that the proposed work is within the scope of the
+ work programme topic.
+%</hi-excellence>
+%<*hi-impact>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+\emph{\textbf{Impact -- aspects to be taken into account.}}
+
+\begin{itemize}
+\item
+ Credibility of the pathways to achieve the expected outcomes and
+ impacts specified in the work programme, and the likely scale and
+ significance of the contributions due to the project.
+\item
+ Suitability and quality of the measures to maximise expected outcomes
+ and impacts, as set out in the dissemination and exploitation plan,
+ including communication activities.
+\end{itemize}
+ \end{tcolorbox}
+
+ \emph{The results of your project should make a contribution to the
+expected outcomes set out for the work programme topic over the medium
+term, and to the wider expected impacts set out in the `destination'
+over the longer term.}
+
+\emph{In this section you should show how your project could contribute
+to the outcomes and impacts described in the work programme, the likely
+scale and significance of this contribution, and the measures to
+maximise these impacts.}
+%</hi-impact>
+%<*hi-inkind>
+Please complete the table below for each participant that will make use
+of in-kind contributions (non-financial resources made available free of
+charge by third parties). In kind contributions provided by third
+parties free of charge are declared by the participants as eligible
+direct costs in the corresponding cost category (e.g. personnel costs or
+purchase costs for equipment).
+%</hi-inkind>
+%<*hi-measures>
+\begin{itemize}
+\item
+ Describe the planned measures to maximise the impact of your project
+ by providing a first version of your `\uline{plan for the
+ dissemination and exploitation including communication activities'}.
+ Describe the dissemination, exploitation and communication measures
+ that are planned, and the target group(s) addressed (e.g. scientific
+ community, end users, financial actors, public at large).
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Please remember that this plan is an admissibility condition,
+ unless the work programme topic explicitly states otherwise. In case
+ your proposal is selected for funding, a more detailed `plan for
+ dissemination and exploitation including communication activities'
+ will need to be provided as a mandatory project deliverable within 6
+ months after signature date. This plan shall be periodically updated
+ in alignment with the project's progress.}
+\item
+ \emph{\uline{Communication}}\footnote{For further guidance on
+ communicating EU research and innovation for project participants,
+ please refer to the
+ \href{https://ec.europa.eu/info/funding-tenders/opportunities/docs/2021-2027/common/guidance/om_en.pdf}{Online
+ Manual} on the Funding \& Tenders Portal} \emph{measures should
+ promote the project throughout the full lifespan of the project. The
+ aim is to inform and reach out to society and show the activities
+ performed, and the use and the benefits the project will have for
+ citizens. Activities must be strategically planned, with clear
+ objectives, start at the outset and continue through the lifetime of
+ the project. The description of the communication activities needs to
+ state the main messages as well as the tools and channels that will be
+ used to reach out to each of the chosen target groups.}
+\item
+ \emph{All measures should be proportionate to the scale of the
+ project, and should contain concrete actions to be implemented both
+ during and after the end of the project, e.g. standardisation
+ activities. Your plan should give due consideration to the possible
+ follow-up of your project, once it is finished. In the justification,
+ explain why each measure chosen is best suited to reach the target
+ group addressed. Where relevant, and for innovation actions, in
+ particular, describe the measures for a plausible path to
+ commercialise the innovations.}
+\item
+ \emph{If exploitation is expected primarily in non-associated third
+ countries, justify by explaining how that exploitation is still in the
+ Union's interest.}
+\item
+ \emph{Describe possible feedback to policy measures generated by the
+ project that will contribute to designing, monitoring, reviewing and
+ rectifying (if necessary) existing policy and programmatic measures or
+ shaping and supporting the implementation of new policy initiatives
+ and decisions.}
+\end{itemize}
+
+\item
+ Outline your strategy for the management of intellectual property,
+ foreseen protection measures, such as patents, design rights,
+ copyright, trade secrets, etc., and how these would be used to support
+ exploitation.
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{If your project is selected, you will need an appropriate
+ consortium agreement to manage (amongst other things) the ownership
+ and access to key knowledge (IPR, research data etc.). Where relevant,
+ these will allow you, collectively and individually, to pursue market
+ opportunities arising from the project.}
+\item
+ \emph{If your project is selected, you must indicate the owner(s) of
+ the results (results ownership list) in the final periodic report.}
+\end{itemize}
+\end{itemize}
+
+
+%</hi-measures>
+%<*hi-methodology>
+\begin{itemize}
+\item
+ Describe and explain the overall methodology, including the concepts,
+ models and assumptions that underpin your work. Explain how this will
+ enable you to deliver your project's objectives. Refer to any
+ important challenges you may have identified in the chosen methodology
+ and how you intend to overcome them. \emph{{[}e.g. 10 pages{]}}
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{This section should be presented as a narrative. The detailed
+ tasks and work packages are described below under `Implementation'.}
+\item
+ \emph{Where relevant, include how the project methodology complies
+ with the `do no significant harm' principle as per Article 17 of
+ \href{https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=celex:32020R0852}{Regulation
+ (EU) No 2020/852} on the establishment of a framework to facilitate
+ sustainable investment (i.e. the so-called \textquotesingle EU
+ Taxonomy Regulation\textquotesingle). This means that the methodology
+ is designed in a way it is not significantly harming any of the six
+ environmental objectives of the EU Taxonomy Regulation.}
+\item
+ \emph{If you plan to use, develop and/or deploy artificial
+ intellingence (AI) based systems and/or techniques you must
+ demonstrate their technical robustness. AI-based systems or techniques
+ should be, or be developed to become:~}
+
+ \begin{itemize}
+ \item
+ \emph{technically robust, accurate and reproducible, and able to
+ deal with and inform about possible failures, inaccuracies and
+ errors, proportionate to the assessed risk they pose~}
+ \item
+ \emph{socially robust, in that they duly consider the context and
+ environment in which they operate~}
+ \item
+ \emph{reliable and function as intended, minimizing unintentional
+ and unexpected harm, preventing unacceptable harm and safeguarding
+ the physical and mental integrity of humans~}
+ \item
+ \emph{able to provide a suitable explanation of their
+ decision-making processes, whenever they can have a significant
+ impact on people's lives.}
+ \end{itemize}
+\end{itemize}
+
+\item
+ Describe any national or international research and innovation
+ activities whose results will feed into the project, and how that link
+ will be established; \emph{{[}e.g. 1 page{]}}
+\item
+ Explain how expertise and methods from different disciplines will be
+ brought together and integrated in pursuit of your objectives. If you
+ consider that an inter-disciplinary approach is unnecessary in the
+ context of the proposed work, please provide a justification.
+ \emph{{[}e.g. 1/2 page{]}}
+\item
+ For topics where the work programme indicates the need for the
+ integration of social sciences and humanities, show the role of these
+ disciplines in the project or provide a justification if you consider
+ that these disciplines are not relevant to your proposed project.
+ \emph{{[}e.g. 1/2 page{]}}
+\item
+ Describe how the gender dimension (i.e. sex and/or gender analysis) is
+ taken into account in the project's research and innovation content
+ \emph{{[}e.g. 1 page{]}. If} you do not consider such a gender
+ dimension to be relevant in your project, please provide a
+ justification.
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Note: This section is mandatory except for topics which have
+ been identified in the work programme as not requiring the integration
+ of the gender dimension into R\&I content.}
+\item
+ \emph{Remember that that this question relates to the \uline{content}
+ of the planned research and innovation activities, and not to gender
+ balance in the teams in charge of carrying out the project.}
+\item
+ \emph{Sex and gender analysis refers to biological characteristics and
+ social/cultural factors respectively. For guidance on methods of sex /
+ gender analysis and the issues to be taken into account, please refer
+ to}
+ \url{https://ec.europa.eu/info/news/gendered-innovations-2-2020-nov-24_en}
+\end{itemize}
+
+\item
+ Describe how appropriate open science practices are implemented as an
+ integral part of the proposed methodology. Show how the choice of
+ practices and their implementation are adapted to the nature of your
+ work, in a way that will increase the chances of the project
+ delivering on its objectives \emph{{[}e.g. 1 page{]}}. If you believe
+ that none of these practices are appropriate for your project, please
+ provide a justification here.
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Open science is an approach based on open cooperative work and
+ systematic sharing of knowledge and tools as early and widely as
+ possible in the process. Open science practices include early and open
+ sharing of research (for example through preregistration, registered
+ reports, pre-prints, or crowd-sourcing); research output management;
+ measures to ensure reproducibility of research outputs; providing open
+ access to research outputs (such as publications, data, software,
+ models, algorithms, and workflows); participation in open peer-review;
+ and involving all relevant knowledge actors including citizens, civil
+ society and end users in the co-creation of R\&I agendas and contents
+ (such as citizen science).}
+\item
+ \emph{Please note that this question does not refer to outreach
+ actions that may be planned as part of communication, dissemination
+ and exploitation activities. These aspects should instead be described
+ below under `Impact'.}
+\end{itemize}
+
+\item
+ Research \textbf{data management and management of other research
+ outputs:} Applicants generating/collecting data and/or other research
+ outputs (except for publications) during the project must provide
+ maximum 1 page on how the data/ research outputs will be managed in
+ line with the FAIR principles (Findable, Accessible, Interoperable,
+ Reusable), addressing the following (the description should be
+ specific to your project): \emph{{[}1 page{]}}
+
+\begin{quote}
+\textbf{Types of data/research outputs} (e.g. experimental,
+observational, images, text, numerical) and their estimated size; if
+applicable, combination with, and provenance of, existing data.
+
+\textbf{Findability of data/research outputs:} Types of~persistent and
+unique~identifiers (e.g. digital object identifiers)~and~trusted
+repositories~that will be used.
+
+\textbf{Accessibility of data/research outputs:}~IPR considerations and
+timeline for open access (if open access not provided, explain why);
+provisions for access to restricted data for verification purposes.
+
+\textbf{Interoperability of data/research outputs:} Standards, formats
+and vocabularies for data and metadata.
+
+\textbf{Reusability of data/research outputs}:~ Licenses for data
+sharing and re-use (e.g. Creative Commons, Open Data
+Commons);~availability of tools/software/models for data generation and
+validation/interpretation /re-use.
+
+\textbf{Curation and storage/preservation costs}; person/team
+responsible for data management and quality assurance.
+\end{quote}
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Proposals selected for funding under Horizon Europe will need to
+ develop a~detailed data management plan (DMP) for making their
+ data/research outputs findable, accessible, interoperable and reusable
+ (FAIR) as a deliverable by month 6 and revised towards the end of a
+ project's lifetime.}
+\item
+ \emph{For guidance on open science practices and research data
+ management, please refer to the relevant section of the
+ \href{https://ec.europa.eu/info/funding-tenders/opportunities/docs/2021-2027/horizon/guidance/programme-guide_horizon_en.pdf}{HE
+ Programme Guide} on the Funding \& Tenders Portal.}
+\end{itemize}
+\end{itemize}
+%</hi-methodology>
+%<*hi-milestones>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+\textbf{KEY}
+
+\textbf{Due date}
+
+Measured in months from the project start date (month 1)
+
+\textbf{Means of verification}
+
+Show how you will confirm that the milestone has been attained. Refer to
+indicators if appropriate. For example: a laboratory prototype that is
+`up and running'; software released and validated by a user group; field
+survey complete and data quality validated.
+\end{tcolorbox}
+%</hi-milestones>
+%<*hi-objectives>
+\begin{itemize}
+\item
+ Briefly describe the objectives of your proposed work. Why are they
+ pertinent to the work programme topic? Are they measurable and
+ verifiable? Are they realistically achievable?
+\item
+ Describe how your project goes beyond the state-of-the-art, and the
+ extent the proposed work is ambitious. Indicate any exceptional
+ ground-breaking R\&I, novel concepts and approaches, new products,
+ services or business and organisational models. Where relevant,
+ illustrate the advance by referring to products and services already
+ available on the market. Refer to any patent or publication search
+ carried out.
+\item
+ Describe where the proposed work is positioned in terms of R\&I
+ maturity (i.e. where it is situated in the spectrum from `idea to
+ application', or from `lab to market'). Where applicable, provide an
+ indication of the Technology Readiness Level, if possible
+ distinguishing the start and by the end of the project.
+
+ \begin{itemize}[label=\twarn]
+ \item \emph{Please bear in mind that advances beyond the state of
+ the art must be interpreted in the light of the positioning of
+ the project. Expectations will not be the same for RIAs at
+ lower TRL, compared with Innovation Actions at high TRLs. }
+ \end{itemize}
+\end{itemize}
+%</hi-objectives>
+%<*hi-othercosts>
+Please complete the table below for each participant that would like to
+declare costs under other costs categories (e.g. internally invoiced
+goods and services), irrespective of the percentage of personnel costs.
+%</hi-othercosts>
+%<*hi-participant-numbering>
+Please use the same participant numbering and name as that used in the
+administrative proposal forms.
+%</hi-participant-numbering>
+%<*hi-participants>
+\twarn The consortium members are listed in part A of the proposal
+(application forms). A summary list should also be provided in the
+table below.
+%</hi-participants>
+%<*hi-pathways>
+\begin{itemize}
+\item
+ \begin{quote}
+ Provide a \textbf{narrative} explaining how the project's results
+ are expected to make a difference in terms of impact, beyond the
+ immediate scope and duration of the project. The narrative should
+ include the components below, tailored to your project.
+ \end{quote}
+
+\begin{enumerate}
+\def\labelenumi{(\alph{enumi})}
+\item
+ Describe the unique contribution your project results would make
+ towards (1) the \textbf{outcomes} specified in this topic, and (2) the
+ \textbf{wider impacts}, in the longer term, specified in the
+ respective destinations in the work programme.
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Be specific, referring to the effects of your project, and not
+ R\&I in general in this field.}
+\item
+ \emph{State the target groups that would benefit. Even if target
+ groups are mentioned in general terms in the work programme, you
+ should be specific here, breaking target groups into particular
+ interest groups or segments of society relevant to this project.}
+\item
+ \emph{The outcomes and impacts of your project may:}
+
+ \begin{itemize}
+ \item
+ \emph{Scientific, e.g. contributing to specific scientific advances,
+ across and within disciplines, creating new knowledge, reinforcing
+ scientific equipment and instruments, computing systems (i.e.
+ research infrastructures);}
+ \item
+ \emph{Economic/technological, e.g. bringing new products, services,
+ business processes to the market, increasing efficiency, decreasing
+ costs, increasing profits, contributing to standards' setting, etc.}
+ \item
+ \emph{Societal , e.g. decreasing CO\textsubscript{2} emissions,
+ decreasing avoidable mortality, improving policies and decision
+ making, raising consumer awareness.}
+ \end{itemize}
+
+\emph{Only include such outcomes and impacts where your project would
+make a significant and direct contribution. Avoid describing very
+tenuous links to wider impacts. However, include any potential
+negative environmental outcome or impact of the project including when
+expected results are brought at scale (such as at commercial level).
+Where relevant, explain how the potential harm can be managed.}
+\end{itemize}
+
+\item
+ Give an indication of the scale and significance of the project's
+ contribution to the expected outcomes and impacts, should the project
+ be successful. Provide quantified estimates where possible and
+ meaningful.
+
+\begin{itemize}[label=\twarn]
+\item
+ `\emph{\uline{Scale'} refers to how widespread the outcomes and
+ impacts are likely to be. For example, in terms of the size of the
+ target group, or the proportion of that group, that should benefit
+ over time; \uline{`Significance'} refers to the importance, or value,
+ of those benefits. For example, number of additional healthy life
+ years; efficiency savings in energy supply.}
+
+\item
+ \emph{Explain your baselines, benchmarks and assumptions used for
+ those estimates. Wherever possible, quantify your estimation of the
+ effects that you expect from your project. Explain assumptions that
+ you make, referring for example to any relevant studies or statistics.
+ Where appropriate, try to use only one methodology for calculating
+ your estimates: not different methodologies for each partner, region
+ or country (the extrapolation should preferably be prepared by one
+ partner).}
+
+\item
+ \emph{Your estimate must relate to this project only - the effect of
+ other initiatives should not be taken into account.}
+\end{itemize}
+
+\item
+ Describe any requirements and potential barriers - arising from
+ factors beyond the scope and duration of the project - that may
+ determine whether the desired outcomes and impacts are achieved. These
+ may include, for example, other R\&I work within and beyond Horizon
+ Europe; regulatory environment; targeted markets; user behaviour.
+ Indicate if these factors might evolve over time. Describe any
+ mitigating measures you propose, within or beyond your project, that
+ could be needed should your assumptions prove to be wrong, or to
+ address identified barriers.
+
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Note that this does not include the critical risks inherent to
+ the management of the project itself , which should be described below
+ under `Implementation'.}
+\end{itemize}
+\end{enumerate}
+\end{itemize}
+%</hi-pathways>
+%<*hi-purchasecosts>
+Please complete the table below for each participant if the purchase
+costs (i.e. the sum of the costs for 'travel and subsistence',
+`equipment', and `other goods, works and services') exceeds 15\% of the
+personnel costs for that participant (according to the budget table in
+proposal part A). The record must list cost items in order of costs and
+starting with the largest cost item, up to the level that the remaining
+costs are below 15\% of personnel costs.
+%</hi-purchasecosts>
+%<*hi-quality>
+\begin{tcolorbox}[standard jigsaw,opacityback=0]
+ \emph{\textbf{Quality and efficiency of the implementation -- aspects to
+be taken into account}}
+
+\begin{itemize}
+\item
+ \emph{Quality and effectiveness of the work plan, assessment of risks,
+ and appropriateness of the effort assigned to work packages, and the
+ resources overall}
+\item
+ \emph{Capacity and role of each participant, and extent to which the
+ consortium as a whole brings together the necessary expertise.}
+\end{itemize}
+ \end{tcolorbox}
+%</hi-quality>
+%<*hi-staffeffort>
+\emph{Please indicate the number of person/months over the whole
+duration of the planned work, for each work package, for each
+participant. Identify the work-package leader for each WP by showing the
+relevant person-month figure in bold.}
+%</hi-staffeffort>
+%<*hi-subcontractingcosts>
+For each participant describe and justify the tasks to be subcontracted
+(please note that core tasks of the project should not be
+sub-contracted).
+%</hi-subcontractingcosts>
+%<*hi-summary>
+ Provide a summary of this section by presenting in the canvas below the
+key elements of your project impact pathway and of the measures to
+maximise its impact.
+%</hi-summary>
+%<*hi-tables>
+\twarn \emph{Use plain text for the tables in section 3.1. If the proposal is
+invited to start Grant Agreement preparation, these tables will have to
+be encoded in the grant management IT tool, where no graphics or special
+formats are supported.}
+%</hi-tables>
+%<*hi-workplan>
+Please provide the following:
+
+\begin{itemize}
+\item
+
+ brief presentation of the overall structure of the work plan;
+\item
+
+ timing of the different work packages and their components (Gantt
+ chart or similar);
+\item
+
+ graphical presentation of the components showing how they inter-relate
+ (Pert chart or similar).
+\item
+
+ detailed work description, i.e.:
+
+ \begin{itemize}
+ \item
+
+ a list of work packages (table 3.1a);
+ \item
+
+ a description of each work package (table 3.1b);
+ \item
+
+ a list of deliverables (table 3.1c);
+\begin{itemize}[label=\twarn]
+\item
+ \emph{Give full details. Base your account on the logical structure of
+ the project and the stages in which it is to be carried out.}
+ \emph{The number of work packages should be proportionate to the scale
+ and complexity of the project.}
+\item
+ \emph{You should give enough detail in each work package to justify
+ the proposed resources to be allocated and also quantified information
+ so that progress can be monitored, including by the Commission}
+\item
+ \emph{Resources assigned to work packages should be in line with their
+ objectives and deliverables. You are advised to include a distinct
+ work package on `project management', and to give due visibility in
+ the work plan to `data management' `dissemination and exploitation'
+ and `communication activities', either with distinct tasks or distinct
+ work packages.}
+\item
+ \emph{You will be required to update the `plan for the dissemination
+ and exploitation of results including communication activities', and a
+ `data management plan', (this does not apply to topics where a plan
+ was not required.) This should include a record of activities related
+ to dissemination and exploitation that have been undertaken and those
+ still planned.}
+\item
+ \emph{Please make sure the information in this section matches the
+ costs as stated in the budget table in section 3 of the application
+ forms, and the number of person months, shown in the detailed work
+ package descriptions.}
+\end{itemize}
+\end{itemize}
+
+\item
+ a list of milestones (table 3.1d);
+
+\item
+ a list of critical risks, relating to project implementation, that the
+ stated project\textquotesingle s objectives may not be achieved.
+ Detail any risk mitigation measures. You will be able to update the
+ list of critical risks and mitigation measures as the project
+ progresses (table 3.1e);
+
+\item
+ a table showing number of person months required (table 3.1f);
+
+\item
+ a table showing description and justification of subcontracting costs
+ for each participant (table 3.1g);
+
+\item
+ a table showing justifications for `purchase costs' (table 3.1h) for
+ participants where those costs exceed 15\% of the personnel costs
+ (according to the budget table in proposal part A);
+
+\item
+ if applicable, a table showing justifications for `other costs
+ categories' (table 3.1i);
+
+\item
+ if applicable, a table showing in-kind contributions from third
+ parties (table 3.1j)
+\end{itemize}
+%</hi-workplan>
+%<*hi-wp-description>
+(where appropriate, broken down into tasks), lead partner and role of
+participants. Deliverables linked to each WP are listed in table 3.1c
+(no need to repeat the information here).
+%</hi-wp-description>
+%<*hi-wp-objectives>
+\twarn \emph{Participants involved in each WP and their efforts are
+ shown in table 3.1f. Lead participant and starting and end date of
+ each WP are shown in table 3.1a.)}
+%</hi-wp-objectives>
+%<*heria-proposal>
+%% Copyright 2023 Tristan Miller
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008 or later.
+%%
+\documentclass[showinstructions]{heria}
+
+\title{Skeleton Horizon Europe Proposal}
+\callname{insert call name}
+\callidentifier{HORIZON-XX0-0000-XXXXX-00-XXXXX}
+\calltopic{HORIZON-XX0-0000-XXXXX-00-00}
+
+\begin{document}
+\maketitle
+
+\heinstructions{participants}
+
+\noindent\opentag{APP-FORM-HERIAIA}%
+\section*{List of participants}[][][1 page]\label{sec:listofparticipants}
+
+\participant
+ {University of Upper Freedonia} % Participant organisation name
+ {UUF} % Participant short name
+ {AT} % Country
+
+\participant
+ {Molvania State University} % Participant organisation name
+ {MSU} % Participant short name
+ {DE} % Country
+
+\participant
+ {Institute for Underwater Basket Weaving} % Participant organisation name
+ {IUBW} % Participant short name
+ {UK} % Country
+
+\makeparticipantstable
+
+\heinstructions{participant-numbering}
+
+\section{Excellence}[REL-EVA-RE]\label{sec:excellence}
+
+\heinstructions{excellence}
+
+\subsection{Objectives and ambition}[PRJ-OBJ-PO][][4 pages]\label{sec:objectives}
+
+\heinstructions{objectives}
+
+\subsection{Methodology}[CON-MET-CM,COM-PLE-CP][PRJ-OBJ-PO][14 pages]\label{sec:methodology}
+
+\heinstructions{methodology}
+
+\subsubsection{Overall methodology}[][][10 pages]\label{sec:overallmethodology}
+
+\subsubsection{Connections to other research activities}[][][1 page]\label{sec:connections}
+
+\subsubsection{Interdisciplinarity}[][][1/2 page]\label{sec:interdisciplinarity}
+
+\subsubsection{Gender dimension}[][][1/2 page]\label{sec:gender}
+
+\subsubsection{Open science}[][][1 page]\label{sec:openscience}
+
+\subsubsection{Research data management}[][][1 page]\label{sec:rdm}
+
+\section{Impact}[IMP-ACT-IA][CON-MET-CM,COM-PLE-CP,REL-EVA-RE]\label{sec:impact}
+
+\heinstructions{impact}
+
+\subsection{Project's pathways towards impact}[][][4 pages]\label{sec:pathways}
+
+\heinstructions{pathways}
+
+\subsection{Measures to maximise impact: Dissemination, exploitation and communication}[COM-DIS-VIS-CDV][][5 pages, including section 2.3]\label{sec:measures}
+
+\heinstructions{measures}
+
+\subsection{Summary}\label{sec:summary}
+
+\heinstructions{summary}
+
+\closetag{COM-DIS-VIS-CDV}
+
+\begin{SidewaysFigure}
+\begin{summarycanvas}%
+ \begin{summarybox}{SPECIFIC NEEDS}
+ \end{summarybox}%
+ \begin{summarybox}{EXPECTED RESULTS}
+ \end{summarybox}%
+ \begin{summarybox}{D \& E \& C MEASURES}
+ \end{summarybox}%
+\end{summarycanvas}%
+\begin{summarycanvas}%
+ \begin{summarybox}{TARGET GROUPS}
+ \end{summarybox}%
+ \begin{summarybox}{OUTCOMES}
+ \end{summarybox}%
+ \begin{summarybox}{IMPACTS}
+ \end{summarybox}%
+\end{summarycanvas}%
+\caption{Impact summary tableau}\label{fig:impact}
+\end{SidewaysFigure}
+
+\section{Quality and efficiency of the implementation}[QUA-LIT-QL,WRK-PLA-WP][IMP-ACT-IA]\label{sec:quality}
+
+\heinstructions{quality}
+
+\subsection{Work plan and resources}[][][14 pages (19 pages for topics using lump sum funding)~-- including tables]\label{sec:workplan}
+
+\heinstructions{workplan}
+
+\subsubsection*{Table 3.1a: List of work packages}
+
+\heinstructions{tables}
+
+\makeworkpackagestable
+
+\subsubsection*{Table 3.1b: Work package description}
+
+\workpackage
+ {ra} % unique ID (used only for cross-referencing deliverables, etc. in LaTeX)
+ {Requirements analysis} % work package title
+ {UUF}% Lead participant (using short name)
+ {1}% Start month
+ {6}% End month
+
+\heinstructions{wp-objectives}
+\begin{objectives}
+\item First objective
+\item Second objective
+\item \dots
+\end{objectives}
+
+\begin{descriptionofwork}
+\heinstructions{wp-description}
+\task
+ {Literature survey} % task name
+ {UUF} % short name of lead participant
+ {MSU} % other participants (or "all participants", etc.)
+ {1--6} % month(s)
+ In this task, we will read a lot of books, and\dots
+\end{descriptionofwork}
+
+\deliverable
+ {dmp} % deliverable name
+ {Data management plan} % short description
+ {MSU} % short name of lead participant
+ {DMP}% type; see Table 3.1c instructions for valid values
+ {PU}% dissemination level; see Table 3.1c instructions for valid values
+ {6}% delivery date (in months from beginning of project)
+
+\workpackage%
+ {integration}% Unique ID (used only for cross-referencing deliverables, etc. in LaTeX)
+ {System integration}% Title
+ {UUF}% Lead partner (using short name ID)
+ {1}% Start month
+ {20}% End month
+
+\heinstructions{wp-objectives}
+\begin{objectives}
+\item First objective
+\item Second objective
+\item \dots
+\end{objectives}
+
+\begin{descriptionofwork}
+\heinstructions{wp-description}
+\task
+ {Develop prototype} % task name
+ {UUF} % short name of lead participant
+ {MSU} % other participants (or "all participants", etc.)
+ {1--10} % month(s)
+ In this task, we will do lots of coding, and\dots
+\end{descriptionofwork}
+
+\deliverable
+ {demo} % deliverable name
+ {Working demo system} % short description
+ {IUBW} % short name of lead participant
+ {DEM}% type; see Table 3.1c instructions for valid values
+ {SEN}% dissemination level; see Table 3.1c instructions for valid values
+ {10}% delivery date (in months from beginning of project)
+
+\workpackage%
+ {dissemination}% Unique ID (used only for cross-referencing deliverables, etc. in LaTeX)
+ {Dissemination and exploitation}% Title
+ {UUF}% Lead partner (using short name ID)
+ {7}% Start month
+ {20}% End month
+
+\heinstructions{wp-objectives}
+\begin{objectives}
+\item First objective
+\item Second objective
+\item \dots
+\end{objectives}
+
+\begin{descriptionofwork}
+\heinstructions{wp-description}
+\task
+ {Organise public workshop} % task name
+ {MSU} % short name of lead participant
+ {all participants} % other participants (or "all participants", etc.)
+ {7--10} % month(s)
+ In this task, we will unite the greatest minds\dots
+\end{descriptionofwork}
+
+\deliverable
+ {proceedings} % deliverable name
+ {Workshop proceedings} % short description
+ {MSU} % short name of lead participant
+ {R}% type; see Table 3.1c instructions for valid values
+ {PU}% dissemination level; see Table 3.1c instructions for valid values
+ {11}% delivery date (in months from beginning of project)
+
+\subsubsection*{Table 3.1c: List of deliverables}
+
+\heinstructions{deliverables}
+
+\makedeliverablestable
+
+\heinstructions{deliverables-key}
+
+\subsubsection*{Table 3.1d: List of milestones}
+
+\milestone
+ {Define use cases} % milestone name
+ {WP1} % related work package(s)
+ {12} % month due
+ {expert review} % means of verification
+
+\milestone
+ {Minimum viable product (MVP)} % milestone name
+ {WP2} % related work package(s)
+ {20} % month due
+ {expert review} % means of verification
+
+\heinstructions{milestones}
+\makemilestonestable
+
+\subsubsection*{Table 3.1e: Critical risks for implementation}[RSK-MGT-RM]
+
+\criticalrisk
+ {Datasets are not available} % description of risk
+ {Low} % Likelihood
+ {High} % Severity
+ {WP1, WP2} % Work package(s) involved
+ {We'll find new ones} % Proposed risk-mitigation measures
+
+\heinstructions{criticalrisks}
+\makecriticalriskstable
+
+\subsubsection*{Table 3.1f: Summary of staff effort}[][RSK-MGT-RM]
+
+\staffeffort
+ {UUF} % short name of participant
+ {ra} % name of work package
+ {23} % number of person-months
+\staffeffort{UUF}{integration}{6}
+\staffeffort{UUF}{dissemination}{11}
+\staffeffort{MSU}{ra}{18}
+\staffeffort{MSU}{integration}{17}
+\staffeffort{MSU}{dissemination}{1}
+\staffeffort{IUBW}{ra}{21}
+\staffeffort{IUBW}{integration}{14}
+\staffeffort{IUBW}{dissemination}{5}
+
+\heinstructions{staffeffort}
+\makestaffefforttable
+
+\subsubsection*{Table 3.1g: `Subcontracting costs' items}
+
+\heinstructions{subcontractingcosts}
+
+\subcontractingcost
+ {UUF} % short name of participant
+ {25000} % cost in euros
+ {Design project website} % description of tasks and justification
+
+\makesubcontractingcoststable
+
+\subsubsection*{Table 3.1h: `Purchase costs' items (travel and subsistence, equipment and other goods, works and services)}
+
+\heinstructions{purchasecosts}
+
+\purchasecost
+ {IUBW} % short name of participant
+ {6125} % travel cost in euros
+ {Attendance at two conferences} % justification
+ {2120} % equipment cost in euros
+ {Computing cluster} % justification
+ {4775} % other costs in euros
+ {Crowdsourcing study} % justification
+ {1000} % remaining costs
+
+\makepurchasecoststable
+
+\subsubsection*{Table 3.1i: `Other costs categories' items (e.g., internally invoiced goods and services)}
+
+\heinstructions{othercosts}
+
+\othercost
+ {UUF} % short name of participant
+ {500} % cost in euros
+ {Cookies for bribing reviewers} % justification
+\othercost
+ {MSU} % short name of participant
+ {15000} % cost in euros
+ {Legal fees for defending bribery charges} % justification
+
+\makeothercoststable
+
+\subsubsection*{Table 3.1j: `In-kind contributions' provided by third parties}
+
+\inkindcontribution
+ {UUF} % short name of participant
+ {Freedonian Ministry of Education} % third party name
+ {Travel and subsistence} % category (see template instructions for list)
+ {300} % cost in euros
+ {Use of minister's private jet} % justification
+
+\heinstructions{inkind}
+\makeinkindcontributionstable
+
+\subsection{Capacity of participants and consortium as a whole}[CON-SOR-CS,PRJ-MGT-PM][][3 pages]\label{sec:capacity}
+
+\heinstructions{capacity}
+
+\closetag{CON-SOR-CS,PRJ-MGT-PM}
+
+\closetag{QUA-LIT-QL,WRK-PLA-WP}
+
+\heinstructions{annexes}
+\end{document}
+%</heria-proposal>
+% \fi
+% \Finale
diff --git a/macros/latex/contrib/heria/heria.ins b/macros/latex/contrib/heria/heria.ins
new file mode 100644
index 0000000000..89b8b7f72c
--- /dev/null
+++ b/macros/latex/contrib/heria/heria.ins
@@ -0,0 +1,92 @@
+%%
+%% Copyright 2023 Tristan Miller
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% https://www.latex-project.org/lppl.txt
+%% and version 1.3c or later is part of all distributions of LaTeX
+%% version 2008 or later.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/heria}
+
+\preamble
+
+This is a generated file.
+
+\endpreamble
+
+\generate{\file{heria.cls}{\from{heria.dtx}{class}}}
+\generate{\file{heria-proposal.tex}{\from{heria.dtx}{heria-proposal}}}
+
+\generate{\file{hi-annexes.tex}{\from{heria.dtx}{hi-annexes}}}
+\generate{\file{hi-capacity.tex}{\from{heria.dtx}{hi-capacity}}}
+\generate{\file{hi-criticalrisks.tex}{\from{heria.dtx}{hi-criticalrisks}}}
+\generate{\file{hi-deliverables-key.tex}{\from{heria.dtx}{hi-deliverables-key}}}
+\generate{\file{hi-deliverables.tex}{\from{heria.dtx}{hi-deliverables}}}
+\generate{\file{hi-excellence.tex}{\from{heria.dtx}{hi-excellence}}}
+\generate{\file{hi-impact.tex}{\from{heria.dtx}{hi-impact}}}
+\generate{\file{hi-inkind.tex}{\from{heria.dtx}{hi-inkind}}}
+\generate{\file{hi-measures.tex}{\from{heria.dtx}{hi-measures}}}
+\generate{\file{hi-methodology.tex}{\from{heria.dtx}{hi-methodology}}}
+\generate{\file{hi-milestones.tex}{\from{heria.dtx}{hi-milestones}}}
+\generate{\file{hi-objectives.tex}{\from{heria.dtx}{hi-objectives}}}
+\generate{\file{hi-othercosts.tex}{\from{heria.dtx}{hi-othercosts}}}
+\generate{\file{hi-participant-numbering.tex}{\from{heria.dtx}{hi-participant-numbering}}}
+\generate{\file{hi-participants.tex}{\from{heria.dtx}{hi-participants}}}
+\generate{\file{hi-pathways.tex}{\from{heria.dtx}{hi-pathways}}}
+\generate{\file{hi-purchasecosts.tex}{\from{heria.dtx}{hi-purchasecosts}}}
+\generate{\file{hi-quality.tex}{\from{heria.dtx}{hi-quality}}}
+\generate{\file{hi-staffeffort.tex}{\from{heria.dtx}{hi-staffeffort}}}
+\generate{\file{hi-subcontractingcosts.tex}{\from{heria.dtx}{hi-subcontractingcosts}}}
+\generate{\file{hi-summary.tex}{\from{heria.dtx}{hi-summary}}}
+\generate{\file{hi-tables.tex}{\from{heria.dtx}{hi-tables}}}
+\generate{\file{hi-workplan.tex}{\from{heria.dtx}{hi-workplan}}}
+\generate{\file{hi-wp-description.tex}{\from{heria.dtx}{hi-wp-description}}}
+\generate{\file{hi-wp-objectives.tex}{\from{heria.dtx}{hi-wp-objectives}}}
+
+\Msg{*********************************************************}
+\Msg{*}
+\Msg{* To finish the installation you have to move the}
+\Msg{* following files into a directory searched by TeX:}
+\Msg{*}
+\Msg{* \space\space heria.cls}
+\Msg{* \space\space heria-proposal.tex}
+\Msg{* \space\space hi-annexes.tex}
+\Msg{* \space\space hi-capacity.tex}
+\Msg{* \space\space hi-criticalrisks.tex}
+\Msg{* \space\space hi-deliverables-key.tex}
+\Msg{* \space\space hi-deliverables.tex}
+\Msg{* \space\space hi-excellence.tex}
+\Msg{* \space\space hi-impact.tex}
+\Msg{* \space\space hi-inkind.tex}
+\Msg{* \space\space hi-measures.tex}
+\Msg{* \space\space hi-methodology.tex}
+\Msg{* \space\space hi-milestones.tex}
+\Msg{* \space\space hi-objectives.tex}
+\Msg{* \space\space hi-othercosts.tex}
+\Msg{* \space\space hi-participant-numbering.tex}
+\Msg{* \space\space hi-participants.tex}
+\Msg{* \space\space hi-pathways.tex}
+\Msg{* \space\space hi-purchasecosts.tex}
+\Msg{* \space\space hi-quality.tex}
+\Msg{* \space\space hi-staffeffort.tex}
+\Msg{* \space\space hi-subcontractingcosts.tex}
+\Msg{* \space\space hi-summary.tex}
+\Msg{* \space\space hi-tables.tex}
+\Msg{* \space\space hi-workplan.tex}
+\Msg{* \space\space hi-wp-description.tex}
+\Msg{* \space\space hi-wp-objectives.tex}
+\Msg{*}
+\Msg{* To produce the documentation run the file heria.dtx}
+\Msg{* through pdflatex.}
+\Msg{*}
+\Msg{* Happy TeXing!}
+\Msg{*********************************************************}
+
+\endbatchfile \ No newline at end of file
diff --git a/macros/latex/contrib/heria/heria.pdf b/macros/latex/contrib/heria/heria.pdf
new file mode 100644
index 0000000000..af4f0cd627
--- /dev/null
+++ b/macros/latex/contrib/heria/heria.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.dtx b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
index 63334d973f..3683787bcf 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.dtx
@@ -17,8 +17,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.26}
-\def\myfiledate{2023/11/22}
+\def\myfileversion{6.26a}
+\def\myfiledate{2023/12/04}
%
%
%<*batchfile>
@@ -205,8 +205,8 @@ version 2005/12/01 or later.
\bool_new:N \g_@@_messages_for_Overleaf_bool
\bool_gset:Nn \g_@@_messages_for_Overleaf_bool
{
- \str_if_eq_p:Vn \c_sys_jobname_str { _region_ } % for Emacs
- || \str_if_eq_p:Vn \c_sys_jobname_str { output } % for Overleaf
+ \str_if_eq_p:on \c_sys_jobname_str { _region_ } % for Emacs
+ || \str_if_eq_p:on \c_sys_jobname_str { output } % for Overleaf
}
% \end{macrocode}
%
@@ -370,6 +370,27 @@ version 2005/12/01 or later.
% \bigskip
% \section{Technical definitions}
%
+%
+% The following constants are defined only for efficiency in the tests.
+% \begin{macrocode}
+\tl_const:Nn \c_@@_b_tl { b }
+\tl_const:Nn \c_@@_c_tl { c }
+\tl_const:Nn \c_@@_l_tl { l }
+\tl_const:Nn \c_@@_r_tl { r }
+\tl_const:Nn \c_@@_all_tl { all }
+\tl_const:Nn \c_@@_dot_tl { . }
+\tl_const:Nn \c_@@_default_tl { default }
+\tl_const:Nn \c_@@_star_tl { * }
+\str_const:Nn \c_@@_r_str { r }
+\str_const:Nn \c_@@_c_str { c }
+\str_const:Nn \c_@@_l_str { l }
+\str_const:Nn \c_@@_R_str { R }
+\str_const:Nn \c_@@_C_str { C }
+\str_const:Nn \c_@@_L_str { L }
+\str_const:Nn \c_@@_j_str { j }
+\str_const:Nn \c_@@_si_str { si }
+% \end{macrocode}
+%
% The following token list will be used for definitions of user commands (with
% |\NewDocumentCommand|) with an embellishment using an \emph{underscore} (there
% may be problems because of the catcode of the underscore).
@@ -474,12 +495,12 @@ version 2005/12/01 or later.
\mathinner
{
\tex_mkern:D 1 mu
- \box_move_up:nn { 1 pt } { \hbox:n { . } }
+ \box_move_up:nn { 1 pt } { \hbox { . } }
\tex_mkern:D 2 mu
- \box_move_up:nn { 4 pt } { \hbox:n { . } }
+ \box_move_up:nn { 4 pt } { \hbox { . } }
\tex_mkern:D 2 mu
\box_move_up:nn { 7 pt }
- { \vbox:n { \kern 7 pt \hbox:n { . } } }
+ { \vbox:n { \kern 7 pt \hbox { . } } }
\tex_mkern:D 1 mu
}
}
@@ -536,7 +557,7 @@ version 2005/12/01 or later.
\cs_set:Npn \CT@arc #1 #2
{
\dim_compare:nNnT \baselineskip = \c_zero_dim \noalign
- { \cs_gset:Npn \CT@arc@ { \color #1 { #2 } } }
+ { \cs_gset_nopar:Npn \CT@arc@ { \color #1 { #2 } } }
}
% \end{macrocode}
% Idem for |\CT@drs@|.
@@ -570,7 +591,8 @@ version 2005/12/01 or later.
\cs_set:Npn \@@_standard_cline:w #1-#2 \q_stop
{
\int_if_zero:nT \l_@@_first_col_int { \omit & }
- \int_compare:nNnT { #1 } > 1 { \multispan { \int_eval:n { #1 - 1 } } & }
+ \int_compare:nNnT { #1 } > \c_one_int
+ { \multispan { \int_eval:n { #1 - 1 } } & }
\multispan { \int_eval:n { #2 - #1 + 1 } }
{
\CT@arc@
@@ -647,10 +669,10 @@ version 2005/12/01 or later.
%
%
% \bigskip
-% The following command is a small shortcut.
+% The following command will be nullified in the environment |{NiceTabular}|,
+% |{NiceTabular*}| and |{NiceTabularX}|.
% \begin{macrocode}
-\cs_new:Npn \@@_math_toggle_token:
- { \bool_if:NF \l_@@_tabular_bool \c_math_toggle_token }
+\cs_set_eq:NN \@@_math_toggle: \c_math_toggle_token
% \end{macrocode}
%
% \bigskip
@@ -664,7 +686,7 @@ version 2005/12/01 or later.
{ \cs_set:Npn \CT@arc@ { \color { #1 } } }
}
}
-\cs_generate_variant:Nn \@@_set_CT@arc@:n { V }
+\cs_generate_variant:Nn \@@_set_CT@arc@:n { o }
% \end{macrocode}
%
% \bigskip
@@ -675,7 +697,7 @@ version 2005/12/01 or later.
{ \cs_set:Npn \CT@drsc@ { \color #1 } }
{ \cs_set:Npn \CT@drsc@ { \color { #1 } } }
}
-\cs_generate_variant:Nn \@@_set_CT@drsc@:n { V }
+\cs_generate_variant:Nn \@@_set_CT@drsc@:n { o }
% \end{macrocode}
%
% \bigskip
@@ -688,14 +710,14 @@ version 2005/12/01 or later.
{ #1 #2 }
{ #1 { #2 } }
}
-\cs_generate_variant:Nn \@@_exp_color_arg:Nn { N V }
+\cs_generate_variant:Nn \@@_exp_color_arg:Nn { N o }
% \end{macrocode}
%
% The following command must be protected because of its use of the command |\color|.
% \begin{macrocode}
\cs_new_protected:Npn \@@_color:n #1
{ \tl_if_blank:nF { #1 } { \@@_exp_color_arg:Nn \color { #1 } } }
-\cs_generate_variant:Nn \@@_color:n { V }
+\cs_generate_variant:Nn \@@_color:n { o }
% \end{macrocode}
%
% \bigskip
@@ -776,10 +798,10 @@ version 2005/12/01 or later.
\hook_gput_code:nnn { begindocument } { . }
{
\bool_if:NTF \c_@@_revtex_bool
- { \cs_new_protected:Npn \@@_redefine_mkpream: { } }
+ { \cs_set_eq:NN \@@_redefine_mkpream: \prg_do_nothing: }
{
\IfPackageLoadedTF { arydshln }
- { \cs_new_protected:Npn \@@_redefine_mkpream: { } }
+ { \cs_set_eq:NN \@@_redefine_mkpream: \prg_do_nothing: }
{
\cs_new_protected:Npn \@@_redefine_mkpream:
{ \cs_set_eq:NN \@mkpream \@@_mkpream: }
@@ -954,9 +976,10 @@ version 2005/12/01 or later.
% |r|, |l|, |c| and |j|. For example, a column |p[l]{3cm}| will provide the
% value |l| for all the cells of the column.
% \begin{macrocode}
-\str_new:N \l_@@_hpos_cell_str
-\str_set:Nn \l_@@_hpos_cell_str { c }
+\tl_new:N \l_@@_hpos_cell_tl
+\tl_set_eq:NN \l_@@_hpos_cell_tl \c_@@_c_tl
% \end{macrocode}
+%
%
% \bigskip
% When there is a mono-column block (created by the command |\Block|), we want
@@ -974,13 +997,6 @@ version 2005/12/01 or later.
\dim_new:N \g_@@_blocks_ht_dim
\dim_new:N \g_@@_blocks_dp_dim
% \end{macrocode}
-%
-% \bigskip
-% The following dimension will be used by the command |\Block| for the blocks
-% with a key of vertical position equal to |T| or |B|.
-% \begin{macrocode}
-\dim_new:N \l_@@_block_ysep_dim
-% \end{macrocode}
%
% \bigskip
% The following dimension correspond to the key |width| (which may be fixed in
@@ -1110,7 +1126,7 @@ version 2005/12/01 or later.
% |matrix / columns-type| of |\NiceMatrixOptions|.
% \begin{macrocode}
\tl_new:N \l_@@_columns_type_tl
-\tl_set:Nn \l_@@_columns_type_tl { c }
+\str_set:Nn \l_@@_columns_type_tl { c }
% \end{macrocode}
%
% \bigskip
@@ -1201,15 +1217,6 @@ version 2005/12/01 or later.
\tl_new:N \l_@@_pgf_node_code_tl
% \end{macrocode}
%
-% \bigskip
-% The following token list has a function similar to
-% |\g_nicematrix_code_after_tl| but it is used internally by \pkg{nicematrix}.
-% In fact, we have to distinguish between |\g_nicematrix_code_after_tl| and
-% |\g_@@_pre_code_after_tl| because we must take care of the order in which
-% instructions stored in that parameters are executed.
-% \begin{macrocode}
-
-% \end{macrocode}
%
% \bigskip
% The so-called |\CodeBefore| is splitted in two parts because we want to control
@@ -1462,7 +1469,16 @@ version 2005/12/01 or later.
\int_new:N \l_@@_col_min_int
\int_new:N \l_@@_col_max_int
% \end{macrocode}
-%
+% \medskip
+% The following counters will be used when drawing the rules.
+% \begin{macrocode}
+\int_new:N \l_@@_start_int
+\int_set_eq:NN \l_@@_start_int \c_one_int
+\int_new:N \l_@@_end_int
+\int_new:N \l_@@_local_start_int
+\int_new:N \l_@@_local_end_int
+% \end{macrocode}
+%
% \medskip
% The following sequence will be used when the command |\SubMatrix| is used in
% the |\CodeBefore| (and not in the |\CodeAfter|). It will contain the position of
@@ -1552,8 +1568,8 @@ version 2005/12/01 or later.
% \medskip
% For the vertical position, the possible values are |c|, |t| and |b|.
% \begin{macrocode}
-\str_new:N \l_@@_vpos_of_block_str
-\str_set:Nn \l_@@_vpos_of_block_str { c }
+\str_new:N \l_@@_vpos_block_str
+\str_set:Nn \l_@@_vpos_block_str { c }
% \end{macrocode}
%
%
@@ -1640,7 +1656,7 @@ version 2005/12/01 or later.
% the value will be~$0$.
% \begin{macrocode}
\int_new:N \l_@@_first_col_int
-\int_set:Nn \l_@@_first_col_int 1
+\int_set_eq:NN \l_@@_first_col_int \c_one_int
% \end{macrocode}
%
% \medskip
@@ -1720,8 +1736,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_protected:Npn \@@_cut_on_hyphen:w #1-#2\q_stop
{
- \tl_set:Nn \l_tmpa_tl { #1 }
- \tl_set:Nn \l_tmpb_tl { #2 }
+ \cs_set_nopar:Npn \l_tmpa_tl { #1 }
+ \cs_set_nopar:Npn \l_tmpb_tl { #2 }
}
% \end{macrocode}
%
@@ -1733,7 +1749,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_expand_clist:N #1
{
- \clist_if_in:NnF #1 { all }
+ \clist_if_in:NVF #1 \c_@@_all_tl
{
\clist_clear:N \l_tmpa_clist
\clist_map_inline:Nn #1
@@ -1741,8 +1757,8 @@ version 2005/12/01 or later.
\tl_if_in:nnTF { ##1 } { - }
{ \@@_cut_on_hyphen:w ##1 \q_stop }
{
- \tl_set:Nn \l_tmpa_tl { ##1 }
- \tl_set:Nn \l_tmpb_tl { ##1 }
+ \cs_set_nopar:Npn \l_tmpa_tl { ##1 }
+ \cs_set_nopar:Npn \l_tmpb_tl { ##1 }
}
\int_step_inline:nnn { \l_tmpa_tl } { \l_tmpb_tl }
{ \clist_put_right:Nn \l_tmpa_clist { ####1 } }
@@ -1929,14 +1945,15 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand \tabularnote { o m }
{
- \bool_if:nT { \cs_if_exist_p:N \@captype || \l_@@_in_env_bool }
+ \bool_lazy_or:nnT { \cs_if_exist_p:N \@captype } \l_@@_in_env_bool
{
- \bool_if:nTF { ! \l_@@_tabular_bool && \l_@@_in_env_bool }
+ \bool_lazy_and:nnTF { ! \l_@@_tabular_bool } \l_@@_in_env_bool
{ \@@_error:n { tabularnote~forbidden } }
{
\bool_if:NTF \l_@@_in_caption_bool
- { \@@_tabularnote_caption:nn { #1 } { #2 } }
- { \@@_tabularnote:nn { #1 } { #2 } }
+ \@@_tabularnote_caption:nn
+ \@@_tabularnote:nn
+ { #1 } { #2 }
}
}
}
@@ -2017,7 +2034,7 @@ version 2005/12/01 or later.
% labels of these tabular notes (in the array). We compose those labels in a box
% |\l_tmpa_box| because we will do a special construction in order to have this
% box in an overlapping position if we are at the end of a cell when
-% |\l_@@_hpos_cell_str| is equal to |c| or |r|.
+% |\l_@@_hpos_cell_tl| is equal to |c| or |r|.
% \begin{macrocode}
\hbox_set:Nn \l_tmpa_box
{
@@ -2034,15 +2051,15 @@ version 2005/12/01 or later.
% \end{macrocode}
% We want the (last) tabular note referenceable (with the standard command |\label|).
% \begin{macrocode}
- \int_gsub:Nn \c@tabularnote { 1 }
+ \int_gdecr:N \c@tabularnote
\int_set_eq:NN \l_tmpa_int \c@tabularnote
\refstepcounter { tabularnote }
\int_compare:nNnT \l_tmpa_int = \c@tabularnote
{ \int_gincr:N \c@tabularnote }
\seq_clear:N \l_@@_notes_labels_seq
\bool_lazy_or:nnTF
- { \str_if_eq_p:Vn \l_@@_hpos_cell_str { c } }
- { \str_if_eq_p:Vn \l_@@_hpos_cell_str { r } }
+ { \tl_if_eq_p:NN \l_@@_hpos_cell_tl \c_@@_c_tl }
+ { \tl_if_eq_p:NN \l_@@_hpos_cell_tl \c_@@_r_tl }
{
\hbox_overlap_right:n { \box_use:N \l_tmpa_box }
% \end{macrocode}
@@ -2071,8 +2088,7 @@ version 2005/12/01 or later.
{
\bool_if:NTF \g_@@_caption_finished_bool
{
- \int_compare:nNnT
- \c@tabularnote = \g_@@_notes_caption_int
+ \int_compare:nNnT \c@tabularnote = \g_@@_notes_caption_int
{ \int_gzero:N \c@tabularnote }
% \end{macrocode}
% Now, we try to detect duplicate notes in the caption.
@@ -2354,10 +2370,10 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% The following flag corresponds to the key |respect-arraystretch| (that key has
-% an effect on the blocks).
+% When the key |respect-arraystretch| is used, the following command will be nullified.
% \begin{macrocode}
-\bool_new:N \l_@@_respect_arraystretch_bool
+\cs_new_protected:Npn \@@_reset_arraystretch:
+ { \cs_set_nopar:Npn \arraystretch { 1 } }
% \end{macrocode}
%
%
@@ -2596,13 +2612,13 @@ version 2005/12/01 or later.
hvlines .code:n =
{
\bool_set_true:N \l_@@_hvlines_bool
- \clist_set:Nn \l_@@_vlines_clist { all }
- \clist_set:Nn \l_@@_hlines_clist { all }
+ \tl_set_eq:NN \l_@@_vlines_clist \c_@@_all_tl
+ \tl_set_eq:NN \l_@@_hlines_clist \c_@@_all_tl
} ,
hvlines-except-borders .code:n =
{
- \clist_set:Nn \l_@@_vlines_clist { all }
- \clist_set:Nn \l_@@_hlines_clist { all }
+ \tl_set_eq:NN \l_@@_vlines_clist \c_@@_all_tl
+ \tl_set_eq:NN \l_@@_hlines_clist \c_@@_all_tl
\bool_set_true:N \l_@@_hvlines_bool
\bool_set_true:N \l_@@_except_borders_bool
} ,
@@ -2632,8 +2648,9 @@ version 2005/12/01 or later.
extra-margin .meta:n =
{ extra-left-margin = #1 , extra-right-margin = #1 } ,
extra-margin .value_required:n = true ,
- respect-arraystretch .bool_set:N = \l_@@_respect_arraystretch_bool ,
- respect-arraystretch .default:n = true ,
+ respect-arraystretch .code:n =
+ \cs_set_eq:NN \@@_reset_arraystretch: \prg_do_nothing: ,
+ respect-arraystretch .value_forbidden:n = true ,
pgf-node-code .tl_set:N = \l_@@_pgf_node_code_tl ,
pgf-node-code .value_required:n = true
}
@@ -3051,50 +3068,75 @@ version 2005/12/01 or later.
% the |\everycr| because some packages, like \pkg{arydshln}, create special rows
% in the |\halign| that we don't want to take into account.
% \begin{macrocode}
- \int_compare:nNnT \c@jCol = 1
- { \int_compare:nNnT \l_@@_first_col_int = 1 \@@_begin_of_row: }
+ \int_compare:nNnT \c@jCol = \c_one_int
+ { \int_compare:nNnT \l_@@_first_col_int = \c_one_int \@@_begin_of_row: }
% \end{macrocode}
% The content of the cell is composed in the box |\l_@@_cell_box|. The
-% |\hbox_set_end:| corresponding to this |\hbox_set:Nw| will be in the
-% |\@@_cell_end:| (and the potential |\c_math_toggle_token| also).
+% |\hbox_set_end:| corresponding to this |\hbox_set:Nw| is in the
+% |\@@_cell_end:|.
% \begin{macrocode}
\hbox_set:Nw \l_@@_cell_box
- \bool_if:NF \l_@@_tabular_bool
- {
- \c_math_toggle_token
- \bool_if:NT \l_@@_small_bool \scriptstyle
- }
+% \end{macrocode}
+% The following command is nullified in the tabulars.
+% \begin{macrocode}
+ \@@_tuning_not_tabular_begin:
% \end{macrocode}
%
% \begin{macrocode}
+ \@@_tuning_first_row:
+ \@@_tuning_last_row:
\g_@@_row_style_tl
+ }
% \end{macrocode}
-%
-% We will call \emph{corners} of the matrix the cases which are at the
-% intersection of the exterior rows and exterior columns (of course, the four
-% corners doesn't always exist simultaneously).
%
-% The codes |\l_@@_code_for_first_row_tl| and \emph{al} don't apply in the
-% corners of the matrix.
+% The following command will be nullified unless there is a first row.
% \begin{macrocode}
- \int_if_zero:nTF \c@iRow
+\cs_new_protected:Npn \@@_tuning_first_row:
+ {
+ \int_if_zero:nT \c@iRow
{
- \int_compare:nNnT \c@jCol > 0
+ \int_compare:nNnT \c@jCol > \c_zero_int
{
\l_@@_code_for_first_row_tl
\xglobal \colorlet { nicematrix-first-row } { . }
}
}
+ }
+% \end{macrocode}
+%
+% The following command will be nullified unless there is a last row and we
+% know its value (\emph{ie}: |\l_@@_lat_row_int > 0|).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_tuning_last_row:
+ {
+ \int_compare:nNnT \c@iRow = \l_@@_last_row_int
{
- \int_compare:nNnT \c@iRow = \l_@@_last_row_int
- {
- \l_@@_code_for_last_row_tl
- \xglobal \colorlet { nicematrix-last-row } { . }
- }
+ \l_@@_code_for_last_row_tl
+ \xglobal \colorlet { nicematrix-last-row } { . }
}
}
% \end{macrocode}
+%
+% A different value will be provided to the following command when the key
+% |small| is in force.
+% \begin{macrocode}
+\cs_set_eq:NN \@@_tuning_key_small: \prg_do_nothing:
+% \end{macrocode}
%
+% The following commands are nullified in the tabulars.
+% \begin{macrocode}
+\cs_set_nopar:Npn \@@_tuning_not_tabular_begin:
+ {
+ \c_math_toggle_token
+% \end{macrocode}
+% A special value is provided by the following controls sequence when the key
+% |small| is in force.
+% \begin{macrocode}
+ \@@_tuning_key_small:
+ }
+\cs_set_eq:NN \@@_tuning_not_tabular_end: \c_math_toggle_token
+% \end{macrocode}
+%
% \interitem
% The following macro |\@@_begin_of_row| is usually used in the cell
% number~$1$ of the row. However, when the key |first-col| is used,
@@ -3140,7 +3182,7 @@ version 2005/12/01 or later.
{ \dim_max:nn \g_@@_ht_row_zero_dim { \box_ht:N \l_@@_cell_box } }
}
{
- \int_compare:nNnT \c@iRow = 1
+ \int_compare:nNnT \c@iRow = \c_one_int
{
\dim_gset:Nn \g_@@_ht_row_one_dim
{ \dim_max:nn \g_@@_ht_row_one_dim { \box_ht:N \l_@@_cell_box } }
@@ -3204,8 +3246,11 @@ version 2005/12/01 or later.
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_cell_end:
- {
- \@@_math_toggle_token:
+ {
+% \end{macrocode}
+% The following command is nullified in the tabulars.
+% \begin{macrocode}
+ \@@_tuning_not_tabular_end:
\hbox_set_end:
\@@_cell_end_i:
}
@@ -3273,11 +3318,14 @@ version 2005/12/01 or later.
\bool_if:NTF \g_@@_empty_cell_bool
{ \box_use_drop:N \l_@@_cell_box }
{
- \bool_lazy_or:nnTF
+ \bool_if:NTF
\g_@@_not_empty_cell_bool
- { \dim_compare_p:nNn { \box_wd:N \l_@@_cell_box } > \c_zero_dim }
\@@_node_for_cell:
- { \box_use_drop:N \l_@@_cell_box }
+ {
+ \dim_compare:nNnTF { \box_wd:N \l_@@_cell_box } > \c_zero_dim
+ \@@_node_for_cell:
+ { \box_use_drop:N \l_@@_cell_box }
+ }
}
\int_gset:Nn \g_@@_col_total_int { \int_max:nn \g_@@_col_total_int \c@jCol }
\bool_gset_false:N \g_@@_empty_cell_bool
@@ -3302,7 +3350,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_cell_end_for_w_s:
{
- \@@_math_toggle_token:
+ \@@_math_toggle:
\hbox_set_end:
\bool_if:NF \g_@@_rotate_bool
{
@@ -3569,7 +3617,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\tl_if_empty:NF \l_@@_hlines_clist
{
- \tl_if_eq:NnF \l_@@_hlines_clist { all }
+ \tl_if_eq:NNF \l_@@_hlines_clist \c_@@_all_tl
{
\exp_args:NNe
\clist_if_in:NnT
@@ -3704,6 +3752,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_nopar:Npn \arraystretch { 0.47 }
\dim_set:Nn \arraycolsep { 1.45 pt }
+% \end{macrocode}
+% By default, |\@@_small_scripstyle:| is null.
+% \begin{macrocode}
+ \cs_set_eq:NN \@@_tuning_key_small: \scriptstyle
}
% \end{macrocode}
%
@@ -3799,6 +3851,10 @@ version 2005/12/01 or later.
\cs_set_eq:NN \rowcolor \@@_rowcolor_tabular
\cs_set_eq:NN \rowcolors \@@_rowcolors_tabular
\cs_set_eq:NN \rowlistcolors \@@_rowlistcolors_tabular
+ \int_compare:nNnT \l_@@_first_row_int > \c_zero_int
+ { \cs_set_eq:NN \@@_tuning_first_row: \prg_do_nothing: }
+ \int_compare:nNnT \l_@@_last_row_int < \c_zero_int
+ { \cs_set_eq:NN \@@_tuning_last_row: \prg_do_nothing: }
\bool_if:NT \l_@@_renew_dots_bool \@@_renew_dots:
% \end{macrocode}
% We redefine |\multicolumn| and, since we want |\multicolumn| to be available
@@ -4494,7 +4550,7 @@ version 2005/12/01 or later.
%
% \bigskip
% \begin{macrocode}
- \@@_set_CT@arc@:V \l_@@_rules_color_tl
+ \@@_set_CT@arc@:o \l_@@_rules_color_tl
% \end{macrocode}
%
% \bigskip
@@ -4540,7 +4596,7 @@ version 2005/12/01 or later.
% |X|-column of weight~$n$, the width will be |\l_@@_X_columns_dim| multiplied
% by~$n$.
% \begin{macrocode}
- \int_compare:nNnT \g_@@_total_X_weight_int > 0
+ \int_compare:nNnT \g_@@_total_X_weight_int > \c_zero_int
{
\tl_build_gput_right:Nx \g_@@_aux_tl
{
@@ -4593,7 +4649,7 @@ version 2005/12/01 or later.
% has the number~$0$.}
% \begin{macrocode}
\int_gset_eq:NN \c@jCol \g_@@_col_total_int
- \bool_if:nTF \g_@@_last_col_found_bool
+ \bool_if:NTF \g_@@_last_col_found_bool
{ \int_gdecr:N \c@jCol }
{
\int_compare:nNnT \l_@@_last_col_int > { -1 }
@@ -4617,10 +4673,7 @@ version 2005/12/01 or later.
% p.~\pageref{overlap-left}).
% \begin{macrocode}
\int_if_zero:nT \l_@@_first_col_int
- {
- % \skip_horizontal:N \col@sep % 05-08-23
- \skip_horizontal:N \g_@@_width_first_col_dim
- }
+ { \skip_horizontal:N \g_@@_width_first_col_dim }
% \end{macrocode}
%
% The construction of the real box is different whether we have delimiters to
@@ -4628,12 +4681,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:nTF { ! \g_@@_delims_bool }
{
- \str_case:VnF \l_@@_baseline_tl
- {
- b \@@_use_arraybox_with_notes_b:
- c \@@_use_arraybox_with_notes_c:
+ \tl_if_eq:NNTF \l_@@_baseline_tl \c_@@_c_tl
+ \@@_use_arraybox_with_notes_c:
+ {
+ \tl_if_eq:NNTF \l_@@_baseline_tl \c_@@_b_tl
+ \@@_use_arraybox_with_notes_b:
+ \@@_use_arraybox_with_notes:
}
- \@@_use_arraybox_with_notes:
}
% \end{macrocode}
%
@@ -4669,7 +4723,7 @@ version 2005/12/01 or later.
\hbox_set:Nn \l_tmpa_box
{
\c_math_toggle_token
- \@@_color:V \l_@@_delimiters_color_tl
+ \@@_color:o \l_@@_delimiters_color_tl
\exp_after:wN \left \g_@@_left_delim_tl
\vcenter
{
@@ -4692,14 +4746,9 @@ version 2005/12/01 or later.
% We take into account the ``last row'' (we have previously computed its total
% height in |\l_tmpb_dim|).
% \begin{macrocode}
- \skip_vertical:n { -\l_tmpb_dim + \arrayrulewidth }
+ \skip_vertical:N -\l_tmpb_dim
+ \skip_vertical:N \arrayrulewidth
}
-% \end{macrocode}
-% Curiously, we have to put again the following specification of color.
-% Otherwise, with XeLaTeX (and not with the other engines), the closing
-% delimiter is not colored.
-% \begin{macrocode}
- \@@_color:V \l_@@_delimiters_color_tl
\exp_after:wN \right \g_@@_right_delim_tl
\c_math_toggle_token
}
@@ -4713,7 +4762,8 @@ version 2005/12/01 or later.
\bool_if:NTF \l_@@_delimiters_max_width_bool
{
\@@_put_box_in_flow_bis:nn
- \g_@@_left_delim_tl \g_@@_right_delim_tl
+ \g_@@_left_delim_tl
+ \g_@@_right_delim_tl
}
\@@_put_box_in_flow:
}
@@ -4724,10 +4774,7 @@ version 2005/12/01 or later.
% |\g_@@_width_last_col_dim|: see p.~\pageref{overlap-right}).
% \begin{macrocode}
\bool_if:NT \g_@@_last_col_found_bool
- {
- \skip_horizontal:N \g_@@_width_last_col_dim
- % \skip_horizontal:N \col@sep % 2023-08-05
- }
+ { \skip_horizontal:N \g_@@_width_last_col_dim }
\bool_if:NT \l_@@_preamble_bool
{
\int_compare:nNnT \c@jCol < \g_@@_static_num_of_col_int
@@ -4752,7 +4799,7 @@ version 2005/12/01 or later.
\iow_now:Nx \@mainaux
{
\tl_gset:cn { c_@@_ \int_use:N \g_@@_env_int _ tl }
- { \exp_not:V \g_@@_aux_tl }
+ { \exp_not:o \g_@@_aux_tl }
}
\iow_now:Nn \@mainaux { \ExplSyntaxOff }
% \end{macrocode}
@@ -4809,7 +4856,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_zero:N \l_tmpa_int
\tl_gclear:N \g_@@_array_preamble_tl
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ \tl_if_eq:NNTF \l_@@_vlines_clist \c_@@_all_tl
{
\tl_gset:Nn \g_@@_array_preamble_tl
{ ! { \skip_horizontal:N \arrayrulewidth } }
@@ -4869,9 +4916,11 @@ version 2005/12/01 or later.
% If there were delimiters at the beginning or at the end of the preamble, the
% environment |{NiceArray}| is transformed into an environment |{xNiceMatrix}|.
% \begin{macrocode}
- \bool_lazy_or:nnT
- { ! \str_if_eq_p:Vn \g_@@_left_delim_tl { . } }
- { ! \str_if_eq_p:Vn \g_@@_right_delim_tl { . } }
+ \tl_if_eq:NNTF \g_@@_left_delim_tl \c_@@_dot_tl
+ {
+ \tl_if_eq:NNF \g_@@_right_delim_tl \c_@@_dot_tl
+ { \bool_gset_true:N \g_@@_delims_bool }
+ }
{ \bool_gset_true:N \g_@@_delims_bool }
% \end{macrocode}
%
@@ -4885,28 +4934,34 @@ version 2005/12/01 or later.
% We complete the preamble with the potential ``exterior columns'' (on both sides).
% \begin{macrocode}
\int_if_zero:nTF \l_@@_first_col_int
- { \tl_gput_left:NV \g_@@_array_preamble_tl \c_@@_preamble_first_col_tl }
+ { \tl_gput_left:No \g_@@_array_preamble_tl \c_@@_preamble_first_col_tl }
{
- \bool_lazy_all:nT
+ \bool_if:NF \g_@@_delims_bool
{
- { \bool_not_p:n \g_@@_delims_bool }
- { \bool_not_p:n \l_@@_tabular_bool }
- { \tl_if_empty_p:N \l_@@_vlines_clist }
- { \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
+ \bool_if:NF \l_@@_tabular_bool
+ {
+ \tl_if_empty:NT \l_@@_vlines_clist
+ {
+ \bool_if:NF \l_@@_exterior_arraycolsep_bool
+ { \tl_gput_left:Nn \g_@@_array_preamble_tl { @ { } } }
+ }
+ }
}
- { \tl_gput_left:Nn \g_@@_array_preamble_tl { @ { } } }
}
\int_compare:nNnTF \l_@@_last_col_int > { -1 }
- { \tl_gput_right:NV \g_@@_array_preamble_tl \c_@@_preamble_last_col_tl }
+ { \tl_gput_right:No \g_@@_array_preamble_tl \c_@@_preamble_last_col_tl }
{
- \bool_lazy_all:nT
+ \bool_if:NF \g_@@_delims_bool
{
- { \bool_not_p:n \g_@@_delims_bool }
- { \bool_not_p:n \l_@@_tabular_bool }
- { \tl_if_empty_p:N \l_@@_vlines_clist }
- { \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
+ \bool_if:NF \l_@@_tabular_bool
+ {
+ \tl_if_empty:NT \l_@@_vlines_clist
+ {
+ \bool_if:NF \l_@@_exterior_arraycolsep_bool
+ { \tl_gput_right:Nn \g_@@_array_preamble_tl { @ { } } }
+ }
+ }
}
- { \tl_gput_right:Nn \g_@@_array_preamble_tl { @ { } } }
}
% \end{macrocode}
% We add a last column to raise a good error message when the user puts more
@@ -4926,7 +4981,7 @@ version 2005/12/01 or later.
% The preamble provided by the final user will be read by a finite
% automata. The following function |\@@_rec_preamble:n| will read that preamble
% (usually letter by letter) in a recursive way (hence the name of that function).
-% in the preamble and
+% in the preamble.
% \begin{macrocode}
\cs_new_protected:Npn \@@_rec_preamble:n #1
{
@@ -4935,7 +4990,7 @@ version 2005/12/01 or later.
% calling directly a function in the main hashtable of TeX (thanks to the
% mechanism |\csname...\endcsname|. Be careful: all these functions take in as
% first argument the letter (or token) itself.\footnote{We do that because it's
-% a easy way to insert the letter at some places in the code that we will add to
+% an easy way to insert the letter at some places in the code that we will add to
% |\g_@@_array_preamble_tl|.}
% \begin{macrocode}
\cs_if_exist:cTF { @@ _ \token_to_str:N #1 }
@@ -4965,23 +5020,47 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new:Npn \@@_c #1
{
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gclear:N \g_@@_pre_cell_tl
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ { > \@@_cell_begin:w c < \@@_cell_end: }
+% \end{macrocode}
+%
+% We increment the counter of columns and then we test for the presence of a |<|.
+% \begin{macrocode}
+ \int_gincr:N \c@jCol
+ \@@_rec_preamble_after_col:n
+ }
+% \end{macrocode}
+% \begin{macrocode}
+\cs_new:Npn \@@_l #1
+ {
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_array_preamble_tl
{
- > { \@@_cell_begin:w \str_set:Nn \l_@@_hpos_cell_str { #1 } }
- #1
+ > { \@@_cell_begin:w \tl_set_eq:NN \l_@@_hpos_cell_tl \c_@@_l_tl }
+ l
< \@@_cell_end:
}
+ \int_gincr:N \c@jCol
+ \@@_rec_preamble_after_col:n
+ }
% \end{macrocode}
-%
-% We increment the counter of columns and then we test for the presence of a |<|.
% \begin{macrocode}
+\cs_new:Npn \@@_r #1
+ {
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gclear:N \g_@@_pre_cell_tl
+ \tl_gput_right:Nn \g_@@_array_preamble_tl
+ {
+ > { \@@_cell_begin:w \tl_set_eq:NN \l_@@_hpos_cell_tl \c_@@_r_tl }
+ r
+ < \@@_cell_end:
+ }
\int_gincr:N \c@jCol
\@@_rec_preamble_after_col:n
}
-\cs_set_eq:NN \@@_l \@@_c
-\cs_set_eq:NN \@@_r \@@_c
% \end{macrocode}
%
% \medskip
@@ -5081,37 +5160,37 @@ version 2005/12/01 or later.
% \begin{macrocode}
\keys_define:nn { WithArrows / p-column }
{
- r .code:n = \str_set:Nn \l_@@_hpos_col_str { r } ,
+ r .code:n = \str_set_eq:NN \l_@@_hpos_col_str \c_@@_r_str ,
r .value_forbidden:n = true ,
- c .code:n = \str_set:Nn \l_@@_hpos_col_str { c } ,
+ c .code:n = \str_set_eq:NN \l_@@_hpos_col_str \c_@@_c_str ,
c .value_forbidden:n = true ,
- l .code:n = \str_set:Nn \l_@@_hpos_col_str { l } ,
+ l .code:n = \str_set_eq:NN \l_@@_hpos_col_str \c_@@_l_str ,
l .value_forbidden:n = true ,
R .code:n =
\IfPackageLoadedTF { ragged2e }
- { \str_set:Nn \l_@@_hpos_col_str { R } }
+ { \str_set_eq:NN \l_@@_hpos_col_str \c_@@_R_str }
{
\@@_error_or_warning:n { ragged2e~not~loaded }
- \str_set:Nn \l_@@_hpos_col_str { r }
+ \str_set_eq:NN \l_@@_hpos_col_str \c_@@_r_str
} ,
R .value_forbidden:n = true ,
L .code:n =
\IfPackageLoadedTF { ragged2e }
- { \str_set:Nn \l_@@_hpos_col_str { L } }
+ { \str_set_eq:NN \l_@@_hpos_col_str \c_@@_L_stsr }
{
\@@_error_or_warning:n { ragged2e~not~loaded }
- \str_set:Nn \l_@@_hpos_col_str { l }
+ \str_set_eq:NN \l_@@_hpos_col_str \c_@@_l_str
} ,
L .value_forbidden:n = true ,
C .code:n =
\IfPackageLoadedTF { ragged2e }
- { \str_set:Nn \l_@@_hpos_col_str { C } }
+ { \str_set_eq:NN \l_@@_hpos_col_str \c_@@_C_str }
{
\@@_error_or_warning:n { ragged2e~not~loaded }
- \str_set:Nn \l_@@_hpos_col_str { c }
+ \str_set_eq:NN \l_@@_hpos_col_str \c_@@_c_str
} ,
C .value_forbidden:n = true ,
- S .code:n = \str_set:Nn \l_@@_hpos_col_str { si } ,
+ S .code:n = \str_set_eq:NN \l_@@_hpos_col_str \c_@@_si_str ,
S .value_forbidden:n = true ,
p .code:n = \str_set:Nn \l_@@_vpos_col_str { p } ,
p .value_forbidden:n = true ,
@@ -5167,9 +5246,9 @@ version 2005/12/01 or later.
% the initial value), |l|, |c|, |r|, |L|, |C| and |R| (when the user has used
% the corresponding key in the optional argument of the specifier).
% \begin{macrocode}
- \str_set:Nn \l_@@_hpos_col_str { j }
- \tl_set:Nn \l_tmpa_tl { #1 }
- \@@_keys_p_column:V \l_tmpa_tl
+ \str_set_eq:NN \l_@@_hpos_col_str \c_@@_j_str
+ % \tl_set:Nn \l_tmpa_tl { #1 }
+ \@@_keys_p_column:n { #1 }
\@@_make_preamble_ii_iv:nnn { #2 } { minipage } { }
}
% \end{macrocode}
@@ -5177,7 +5256,6 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_keys_p_column:n #1
{ \keys_set_known:nnN { WithArrows / p-column } { #1 } \l_tmpa_tl }
-\cs_generate_variant:Nn \@@_keys_p_column:n { V }
% \end{macrocode}
%
% \medskip
@@ -5190,22 +5268,22 @@ version 2005/12/01 or later.
\use:e
{
\@@_make_preamble_ii_v:nnnnnnnn
- { \str_if_eq:VnTF \l_@@_vpos_col_str { p } { t } { b } }
+ { \str_if_eq:onTF \l_@@_vpos_col_str { p } { t } { b } }
{ \dim_eval:n { #1 } }
{
% \end{macrocode}
% The parameter |\l_@@_hpos_col_str| (as |\l_@@_vpos_col_str|) exists only
% during the construction of the preamble. During the composition of the array
-% itself, you will have, in each cell, the parameter |\l_@@_hpos_cell_str| which
+% itself, you will have, in each cell, the parameter |\l_@@_hpos_cell_tl| which
% will provide the horizontal alignment of the column to which belongs the cell.
% \begin{macrocode}
- \str_if_eq:VnTF \l_@@_hpos_col_str j
- { \str_set:Nn \exp_not:N \l_@@_hpos_cell_str { } }
+ \str_if_eq:NNTF \l_@@_hpos_col_str \c_@@_j_str
+ { \tl_clear:N \exp_not:N \l_@@_hpos_cell_tl }
{
- \str_set:Nn \exp_not:N \l_@@_hpos_cell_str
+ \cs_set_nopar:Npn \exp_not:N \l_@@_hpos_cell_tl
{ \str_lowercase:V \l_@@_hpos_col_str }
}
- \str_case:Vn \l_@@_hpos_col_str
+ \str_case:on \l_@@_hpos_col_str
{
c { \exp_not:N \centering }
l { \exp_not:N \raggedright }
@@ -5216,12 +5294,12 @@ version 2005/12/01 or later.
}
#3
}
- { \str_if_eq:VnT \l_@@_vpos_col_str { m } \@@_center_cell_box: }
- { \str_if_eq:VnT \l_@@_hpos_col_str { si } \siunitx_cell_begin:w }
- { \str_if_eq:VnT \l_@@_hpos_col_str { si } \siunitx_cell_end: }
+ { \str_if_eq:onT \l_@@_vpos_col_str { m } \@@_center_cell_box: }
+ { \str_if_eq:onT \l_@@_hpos_col_str { si } \siunitx_cell_begin:w }
+ { \str_if_eq:onT \l_@@_hpos_col_str { si } \siunitx_cell_end: }
{ #2 }
{
- \str_case:VnF \l_@@_hpos_col_str
+ \str_case:onF \l_@@_hpos_col_str
{
{ j } { c }
{ si } { c }
@@ -5251,7 +5329,7 @@ version 2005/12/01 or later.
%
% |#3| is the coding for the horizontal position of the content of the cell
% (|\centering|, |\raggedright|, |\raggedleft| or nothing). It's also possible
-% to put in that |#3| some code to fix the value of |\l_@@_hpos_cell_str| which
+% to put in that |#3| some code to fix the value of |\l_@@_hpos_cell_tl| which
% will be available in each cell of the column.
%
% |#4| is an extra-code which contains |\@@_center_cell_box:| (when the column
@@ -5268,10 +5346,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_make_preamble_ii_v:nnnnnnnn #1 #2 #3 #4 #5 #6 #7 #8
{
- \str_if_eq:VnTF \l_@@_hpos_col_str { si }
+ \tl_if_eq:NNTF \l_@@_hpos_col_str \c_@@_si_str
{ \tl_gput_right:Nn \g_@@_array_preamble_tl { > { \@@_test_if_empty_for_S: } } }
{ \tl_gput_right:Nn \g_@@_array_preamble_tl { > { \@@_test_if_empty: } } }
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_array_preamble_tl
{
@@ -5430,9 +5508,8 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_make_preamble_V_ii:nn #1 #2
{
\str_set:Nn \l_@@_vpos_col_str { p }
- \str_set:Nn \l_@@_hpos_col_str { j }
- \tl_set:Nn \l_tmpa_tl { #1 }
- \@@_keys_p_column:V \l_tmpa_tl
+ \str_set_eq:NN \l_@@_hpos_col_str \c_@@_j_str
+ \@@_keys_p_column:n { #1 }
\IfPackageLoadedTF { varwidth }
{ \@@_make_preamble_ii_iv:nnn { #2 } { varwidth } { } }
{
@@ -5476,14 +5553,14 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_make_preamble_w_i:nnnn #1 #2
{
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_array_preamble_tl
{
> {
\dim_set:Nn \l_@@_col_width_dim { #2 }
\@@_cell_begin:w
- \str_set:Nn \l_@@_hpos_cell_str { c }
+ \tl_set_eq:NN \l_@@_hpos_cell_tl \c_@@_c_tl
}
c
< {
@@ -5504,7 +5581,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_make_preamble_w_ii:nnnn #1 #2 #3 #4
{
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_array_preamble_tl
{
@@ -5517,7 +5594,7 @@ version 2005/12/01 or later.
\dim_set:Nn \l_@@_col_width_dim { #4 }
\hbox_set:Nw \l_@@_cell_box
\@@_cell_begin:w
- \str_set:Nn \l_@@_hpos_cell_str { #3 }
+ \cs_set_nopar:Npn \l_@@_hpos_cell_tl { #3 }
}
c
< {
@@ -5566,7 +5643,7 @@ version 2005/12/01 or later.
{
\IfPackageLoadedTF { siunitx }
{
- \tl_gput_right:NV \g_@@_array_preamble_tl \g_@@_pre_cell_tl
+ \tl_gput_right:No \g_@@_array_preamble_tl \g_@@_pre_cell_tl
\tl_gclear:N \g_@@_pre_cell_tl
\tl_gput_right:Nn \g_@@_array_preamble_tl
{
@@ -5601,14 +5678,14 @@ version 2005/12/01 or later.
% \begin{macrocode}
\int_if_zero:nTF \c@jCol
{
- \str_if_eq:VnTF \g_@@_left_delim_tl { . }
+ \tl_if_eq:NNTF \g_@@_left_delim_tl \c_@@_dot_tl
{
% \end{macrocode}
% In that case, in fact, the first letter of the preamble must be considered as
% the left delimiter of the array.
% \begin{macrocode}
\tl_gset:Nn \g_@@_left_delim_tl { #1 }
- \tl_gset:Nn \g_@@_right_delim_tl { . }
+ \tl_gset_eq:NN \g_@@_right_delim_tl \c_@@_dot_tl
\@@_rec_preamble:n #2
}
{
@@ -5657,7 +5734,7 @@ version 2005/12/01 or later.
{
\tl_if_eq:nnTF { \stop } { #2 }
{
- \str_if_eq:VnTF \g_@@_right_delim_tl { . }
+ \tl_if_eq:NNTF \g_@@_right_delim_tl \c_@@_dot_tl
{ \tl_gset:Nn \g_@@_right_delim_tl { #1 } }
{
\tl_gput_right:Nn \g_@@_array_preamble_tl { ! { \enskip } }
@@ -5684,7 +5761,7 @@ version 2005/12/01 or later.
{
\tl_if_eq:nnTF { \stop } { #3 }
{
- \str_if_eq:VnTF \g_@@_right_delim_tl { . }
+ \tl_if_eq:NNTF \g_@@_right_delim_tl \c_@@_dot_tl
{
\tl_gput_right:Nn \g_@@_array_preamble_tl { ! { \enskip } }
\tl_gput_right:Nx \g_@@_pre_code_after_tl
@@ -5728,7 +5805,7 @@ version 2005/12/01 or later.
\str_if_eq:nnTF { #1 } { @ }
\@@_rec_preamble_after_col_ii:n
{
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ \tl_if_eq:NNTF \l_@@_vlines_clist \c_@@_all_tl
{
\tl_gput_right:Nn \g_@@_array_preamble_tl
{ ! { \skip_horizontal:N \arrayrulewidth } }
@@ -5761,7 +5838,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_rec_preamble_after_col_ii:n #1
{
- \tl_if_eq:NnTF \l_@@_vlines_clist { all }
+ \tl_if_eq:NNTF \l_@@_vlines_clist \c_@@_all_tl
{
\tl_gput_right:Nn \g_@@_array_preamble_tl
{ @ { #1 \skip_horizontal:N \arrayrulewidth } }
@@ -5785,7 +5862,7 @@ version 2005/12/01 or later.
{
\tl_clear:N \l_tmpa_tl
\int_step_inline:nn { #2 } { \tl_put_right:Nn \l_tmpa_tl { #3 } }
- \exp_last_unbraced:NV \@@_rec_preamble:n \l_tmpa_tl
+ \exp_last_unbraced:No \@@_rec_preamble:n \l_tmpa_tl
}
% \end{macrocode}
%
@@ -5843,7 +5920,7 @@ version 2005/12/01 or later.
% (when the user has used the corresponding key in the optional argument of the
% specifier |X|).
% \begin{macrocode}
- \tl_set:Nn \l_@@_vpos_col_str { p }
+ \str_set:Nn \l_@@_vpos_col_str { p }
% \end{macrocode}
%
% The integer |\l_@@_weight_int| will be the weight of the |X| column (the
@@ -5853,11 +5930,13 @@ version 2005/12/01 or later.
% of those columns as in \pkg{tabu} (now obsolete) or \pkg{tabularray}.
% \begin{macrocode}
\int_zero_new:N \l_@@_weight_int
- \int_set:Nn \l_@@_weight_int { 1 }
- \tl_set:Nn \l_tmpa_tl { #1 }
- \@@_keys_p_column:V \l_tmpa_tl
- \keys_set:nV { WithArrows / X-column } \l_tmpa_tl
- \int_compare:nNnT \l_@@_weight_int < 0
+ \int_set_eq:NN \l_@@_weight_int \c_one_int
+ \@@_keys_p_column:n { #1 }
+% \end{macrocode}
+% The unknown keys are put in |\l_tmpa_tl|
+% \begin{macrocode}
+ \keys_set:no { WithArrows / X-column } \l_tmpa_tl
+ \int_compare:nNnT \l_@@_weight_int < \c_zero_int
{
\@@_error_or_warning:n { negative~weight }
\int_set:Nn \l_@@_weight_int { - \l_@@_weight_int }
@@ -5988,7 +6067,7 @@ version 2005/12/01 or later.
% The following lines are an adaptation of the definition of |\multicolumn| in
% \pkg{array}.
% \begin{macrocode}
- \exp_args:NV \@mkpream \g_@@_preamble_tl
+ \exp_args:No \@mkpream \g_@@_preamble_tl
\@addtopreamble \@empty
\endgroup
% \end{macrocode}
@@ -5997,7 +6076,7 @@ version 2005/12/01 or later.
% Now, we do a treatment specific to \pkg{nicematrix} which has no equivalent
% in the original definition of |\multicolumn|.
% \begin{macrocode}
- \int_compare:nNnT { #1 } > 1
+ \int_compare:nNnT { #1 } > \c_one_int
{
\seq_gput_left:Nx \g_@@_multicolumn_cells_seq
{ \int_use:N \c@iRow - \int_eval:n { \c@jCol + 1 } }
@@ -6067,7 +6146,7 @@ version 2005/12/01 or later.
\cs_if_exist:cTF { NC @ find @ #1 }
{
\tl_set_eq:Nc \l_tmpa_tl { NC @ rewrite @ #1 }
- \exp_last_unbraced:NV \@@_make_m_preamble:n \l_tmpa_tl
+ \exp_last_unbraced:No \@@_make_m_preamble:n \l_tmpa_tl
}
{
\tl_if_eq:nnT { #1 } { S }
@@ -6085,7 +6164,7 @@ version 2005/12/01 or later.
{
\tl_gput_right:Nn \g_@@_preamble_tl
{
- > { \@@_cell_begin:w \str_set:Nn \l_@@_hpos_cell_str { #1 } }
+ > { \@@_cell_begin:w \cs_set_nopar:Npn \l_@@_hpos_cell_tl { #1 } }
#1
< \@@_cell_end:
}
@@ -6157,7 +6236,7 @@ version 2005/12/01 or later.
\dim_set:Nn \l_@@_col_width_dim { #4 }
\hbox_set:Nw \l_@@_cell_box
\@@_cell_begin:w
- \str_set:Nn \l_@@_hpos_cell_str { #3 }
+ \cs_set_nopar:Npn \l_@@_hpos_cell_tl { #3 }
}
c
< {
@@ -6210,12 +6289,14 @@ version 2005/12/01 or later.
{
\box_set_ht:Nn \l_tmpa_box { \box_ht:N \l_tmpa_box + \l_tmpa_dim }
\box_set_dp:Nn \l_tmpa_box { \box_dp:N \l_tmpa_box + \l_tmpb_dim }
- \tl_if_eq:NnTF \l_@@_baseline_tl { c }
+ \tl_if_eq:NNTF \l_@@_baseline_tl \c_@@_c_tl
{ \box_use_drop:N \l_tmpa_box }
\@@_put_box_in_flow_i:
}
% \end{macrocode}
%
+% \bigskip
+%
% \medskip
% The command |\@@_put_box_in_flow_i:| is used when the value of
% |\l_@@_baseline_tl| is different of |c| (which is the initial value and the
@@ -6233,30 +6314,31 @@ version 2005/12/01 or later.
% Now, |\g_tmpa_dim| contains the $y$-value of the center of the array (the
% delimiters are centered in relation with this value).
% \begin{macrocode}
- \str_if_in:NnTF \l_@@_baseline_tl { line- }
+ \tl_if_in:NnTF \l_@@_baseline_tl { line- }
{
\int_set:Nn \l_tmpa_int
{
\str_range:Nnn
\l_@@_baseline_tl
6
- { \tl_count:V \l_@@_baseline_tl }
+ { \tl_count:o \l_@@_baseline_tl }
}
\@@_qpoint:n { row - \int_use:N \l_tmpa_int }
}
{
- \str_case:VnF \l_@@_baseline_tl
- {
- { t } { \int_set:Nn \l_tmpa_int 1 }
- { b } { \int_set_eq:NN \l_tmpa_int \c@iRow }
+ \tl_if_eq:NnTF \l_@@_baseline_tl { t }
+ { \int_set_eq:NN \l_tmpa_int \c_one_int }
+ {
+ \tl_if_eq:NnTF \l_@@_baseline_tl { b }
+ { \int_set_eq:NN \l_tmpa_int \c@iRow }
+ { \int_set:Nn \l_tmpa_int \l_@@_baseline_tl }
}
- { \int_set:Nn \l_tmpa_int \l_@@_baseline_tl }
\bool_lazy_or:nnT
{ \int_compare_p:nNn \l_tmpa_int < \l_@@_first_row_int }
{ \int_compare_p:nNn \l_tmpa_int > \g_@@_row_total_int }
{
\@@_error:n { bad~value~for~baseline }
- \int_set:Nn \l_tmpa_int 1
+ \int_set_eq:NN \l_tmpa_int \c_one_int
}
\@@_qpoint:n { row - \int_use:N \l_tmpa_int - base }
% \end{macrocode}
@@ -6289,7 +6371,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_if:NT \l_@@_NiceMatrix_without_vlines_bool
{
- \int_compare:nNnT \c@jCol > 1 % added 2023-08-13
+ \int_compare:nNnT \c@jCol > \c_one_int
{
\box_set_wd:Nn \l_@@_the_array_box
{ \box_wd:N \l_@@_the_array_box - \arraycolsep }
@@ -6315,7 +6397,7 @@ version 2005/12/01 or later.
% tabular notes for which the command |\tabularnote| has been used without its
% optional argument (between square brackets).
% \begin{macrocode}
- \int_compare:nNnT \g_@@_notes_caption_int > 0
+ \int_compare:nNnT \g_@@_notes_caption_int > \c_zero_int
{
\tl_build_gput_right:Nx \g_@@_aux_tl
{
@@ -6353,7 +6435,7 @@ version 2005/12/01 or later.
{
{ ! \seq_if_empty_p:N \g_@@_notes_seq }
{ ! \seq_if_empty_p:N \g_@@_notes_in_caption_seq }
- { ! \tl_if_empty_p:V \g_@@_tabularnote_tl }
+ { ! \tl_if_empty_p:o \g_@@_tabularnote_tl }
}
\@@_insert_tabularnotes:
\cs_set_eq:NN \tabularnote \@@_tabularnote_error:n
@@ -6408,7 +6490,7 @@ version 2005/12/01 or later.
% caption is composed only once. In that case, we fix the value of
% |\g_@@_caption_finished_bool| now.
% \begin{macrocode}
- \bool_if:NF \g_@@_caption_finished_bool % added 2023/06/30
+ \bool_if:NF \g_@@_caption_finished_bool
{
\bool_gset_true:N \g_@@_caption_finished_bool
\int_gset_eq:NN \g_@@_notes_caption_int \c@tabularnote
@@ -6449,7 +6531,7 @@ version 2005/12/01 or later.
% the |\unskip| are designed to give the ability to put a |\bottomrule| at the
% end of the notes with a good vertical space.
% \begin{macrocode}
- \int_compare:nNnT \c@tabularnote > 0
+ \int_compare:nNnT \c@tabularnote > \c_zero_int
{
\bool_if:NTF \l_@@_notes_para_bool
{
@@ -6545,7 +6627,7 @@ version 2005/12/01 or later.
% We convert a value of |t| to a value of |1|.
% \begin{macrocode}
\tl_if_eq:NnT \l_@@_baseline_tl { t }
- { \tl_set:Nn \l_@@_baseline_tl { 1 } }
+ { \cs_set_nopar:Npn \l_@@_baseline_tl { 1 } }
% \end{macrocode}
% Now, we convert the value of |\l_@@_baseline_tl| (which should represent an
% integer) to an integer stored in |\l_tmpa_int|.
@@ -6560,7 +6642,7 @@ version 2005/12/01 or later.
\str_range:Nnn
\l_@@_baseline_tl
6
- { \tl_count:V \l_@@_baseline_tl }
+ { \tl_count:o \l_@@_baseline_tl }
}
\@@_qpoint:n { row - \int_use:N \l_tmpa_int }
}
@@ -6668,7 +6750,7 @@ version 2005/12/01 or later.
% Here is the call to |\array| (we have a dedicated macro |\@@_array:| because
% of compatibility with the classes \cls{revtex4-1} and \cls{revtex4-2}).
% \begin{macrocode}
- \exp_args:NV \@@_array: \g_@@_array_preamble_tl
+ \exp_args:No \@@_array: \g_@@_array_preamble_tl
}
}
}
@@ -6745,7 +6827,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\seq_pop_right:NN \l_@@_rows_seq \l_tmpa_tl
\tl_if_empty:NF \l_tmpa_tl
- { \seq_put_right:NV \l_@@_rows_seq \l_tmpa_tl }
+ { \seq_put_right:No \l_@@_rows_seq \l_tmpa_tl }
% \end{macrocode}
% If the environment uses the option |last-row| without value (i.e. without
% saying the number of the rows), we have now the opportunity to compute that
@@ -6769,7 +6851,7 @@ version 2005/12/01 or later.
% First, we treat the first row.
% \begin{macrocode}
\seq_pop_left:NN \l_@@_rows_seq \l_tmpa_tl
- \@@_line_with_light_syntax:V \l_tmpa_tl
+ \@@_line_with_light_syntax:o \l_tmpa_tl
% \end{macrocode}
% Now, the other rows (with the same treatment, excepted that we have to insert
% |\\| between the rows).
@@ -6802,7 +6884,7 @@ version 2005/12/01 or later.
% |\@@_array:| because of compatibility with the classes \cls{revtex4-1} and
% \cls{revtex4-2}).
% \begin{macrocode}
- \exp_args:NV \@@_array: \g_@@_array_preamble_tl \l_@@_new_body_tl
+ \exp_args:No \@@_array: \g_@@_array_preamble_tl \l_@@_new_body_tl
}
% \end{macrocode}
%
@@ -6818,11 +6900,11 @@ version 2005/12/01 or later.
{ \seq_count:N \l_@@_cells_seq }
}
\seq_pop_left:NN \l_@@_cells_seq \l_tmpa_tl
- \exp_args:NNV \tl_build_put_right:Nn \l_@@_new_body_tl \l_tmpa_tl
+ \exp_args:NNo \tl_build_put_right:Nn \l_@@_new_body_tl \l_tmpa_tl
\seq_map_inline:Nn \l_@@_cells_seq
{ \tl_build_put_right:Nn \l_@@_new_body_tl { & ##1 } }
}
-\cs_generate_variant:Nn \@@_line_with_light_syntax:n { V }
+\cs_generate_variant:Nn \@@_line_with_light_syntax:n { o }
% \end{macrocode}
%
%
@@ -6833,7 +6915,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_analyze_end:Nn #1 #2
{
- \str_if_eq:VnT \g_@@_name_env_str { #2 }
+ \str_if_eq:onT \g_@@_name_env_str { #2 }
{ \@@_fatal:n { empty~environment } }
% \end{macrocode}
% We reput in the stream the |\end{...}| we have extracted and the user will
@@ -6962,10 +7044,10 @@ version 2005/12/01 or later.
% We begin a loop over the columns. The integer |\g_tmpa_int| will be the
% number of the current column. This integer is used for the Tikz nodes.
% \begin{macrocode}
- \int_gset:Nn \g_tmpa_int 1
+ \int_gset_eq:NN \g_tmpa_int \c_one_int
\bool_if:NTF \g_@@_last_col_found_bool
- { \prg_replicate:nn { \int_max:nn { \g_@@_col_total_int - 3 } 0 } }
- { \prg_replicate:nn { \int_max:nn { \g_@@_col_total_int - 2 } 0 } }
+ { \prg_replicate:nn { \int_max:nn { \g_@@_col_total_int - 3 } \c_zero_int } }
+ { \prg_replicate:nn { \int_max:nn { \g_@@_col_total_int - 2 } \c_zero_int } }
{
&
\omit
@@ -7010,17 +7092,17 @@ version 2005/12/01 or later.
% The two following lines have been added on 2021-12-15 to solve a bug
% mentionned by Joao Luis Soares by mail.
% \begin{macrocode}
- \int_compare:nNnT \g_@@_col_total_int = 1
+ \int_compare:nNnT \g_@@_col_total_int = \c_one_int
{ \skip_gset:Nn \g_tmpa_skip { 0 pt~plus 1 fill } }
\skip_horizontal:N \g_tmpa_skip
\int_gincr:N \g_tmpa_int
- \bool_lazy_all:nT
+ \bool_lazy_any:nT
{
- { \bool_not_p:n \g_@@_delims_bool }
- { \bool_not_p:n \l_@@_tabular_bool }
- { \clist_if_empty_p:N \l_@@_vlines_clist }
- { \bool_not_p:n \l_@@_exterior_arraycolsep_bool }
- { ! \l_@@_bar_at_end_of_pream_bool }
+ \g_@@_delims_bool
+ \l_@@_tabular_bool
+ { ! \clist_if_empty_p:N \l_@@_vlines_clist }
+ \l_@@_exterior_arraycolsep_bool
+ \l_@@_bar_at_end_of_pream_bool
}
{ \skip_horizontal:N -\col@sep }
\bool_if:NT \l_@@_code_before_bool
@@ -7120,22 +7202,21 @@ version 2005/12/01 or later.
% have to compute some dimensions of this box.
% \begin{macrocode}
\hbox_set:Nw \l_@@_cell_box
- \@@_math_toggle_token:
- \bool_if:NT \l_@@_small_bool \scriptstyle
+ \@@_math_toggle:
+ \@@_tuning_key_small:
% \end{macrocode}
% We insert |\l_@@_code_for_first_col_tl|... but we don't insert it in the
% potential ``first row'' and in the potential ``last row''.
% \begin{macrocode}
- \bool_lazy_and:nnT
- { \int_compare_p:nNn \c@iRow > 0 }
+ \int_compare:nNnT \c@iRow > \c_zero_int
{
- \bool_lazy_or_p:nn
- { \int_compare_p:nNn \l_@@_last_row_int < 0 }
+ \bool_lazy_or:nnT
+ { \int_compare_p:nNn \l_@@_last_row_int < \c_zero_int }
{ \int_compare_p:nNn \c@iRow < \l_@@_last_row_int }
- }
- {
- \l_@@_code_for_first_col_tl
- \xglobal \colorlet { nicematrix-first-col } { . }
+ {
+ \l_@@_code_for_first_col_tl
+ \xglobal \colorlet { nicematrix-first-col } { . }
+ }
}
}
% \end{macrocode}
@@ -7145,7 +7226,7 @@ version 2005/12/01 or later.
l
<
{
- \@@_math_toggle_token:
+ \@@_math_toggle:
\hbox_set_end:
\bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
\@@_adjust_size_box:
@@ -7202,16 +7283,16 @@ version 2005/12/01 or later.
% have to compute some dimensions of this box.
% \begin{macrocode}
\hbox_set:Nw \l_@@_cell_box
- \@@_math_toggle_token:
- \bool_if:NT \l_@@_small_bool \scriptstyle
+ \@@_math_toggle:
+ \@@_tuning_key_small:
% \end{macrocode}
% We insert |\l_@@_code_for_last_col_tl|... but we don't insert it in the
% potential ``first row'' and in the potential ``last row''.
% \begin{macrocode}
- \int_compare:nNnT \c@iRow > 0
+ \int_compare:nNnT \c@iRow > \c_zero_int
{
\bool_lazy_or:nnT
- { \int_compare_p:nNn \l_@@_last_row_int < 0 }
+ { \int_compare_p:nNn \l_@@_last_row_int < \c_zero_int }
{ \int_compare_p:nNn \c@iRow < \l_@@_last_row_int }
{
\l_@@_code_for_last_col_tl
@@ -7222,7 +7303,7 @@ version 2005/12/01 or later.
l
<
{
- \@@_math_toggle_token:
+ \@@_math_toggle:
\hbox_set_end:
\bool_if:NT \g_@@_rotate_bool \@@_rotate_cell_box:
\@@_adjust_size_box:
@@ -7330,7 +7411,7 @@ version 2005/12/01 or later.
{ #2 }
}
\tl_set:Nn \l_tmpb_tl { \use:c { #1 NiceArray } }
- \exp_args:NV \l_tmpb_tl \l_tmpa_tl
+ \exp_args:No \l_tmpb_tl \l_tmpa_tl
}
% \end{macrocode}
%
@@ -7426,13 +7507,22 @@ version 2005/12/01 or later.
}
}
{ }
- \bool_set_true:N \l_@@_tabular_bool
+ \@@_settings_for_tabular:
\NiceArray { #2 }
}
{ \endNiceArray }
% \end{macrocode}
%
-%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_settings_for_tabular:
+ {
+ \bool_set_true:N \l_@@_tabular_bool
+ \cs_set_eq:NN \@@_math_toggle: \prg_do_nothing:
+ \cs_set_eq:NN \@@_tuning_not_tabular_begin: \prg_do_nothing:
+ \cs_set_eq:NN \@@_tuning_not_tabular_end: \prg_do_nothing:
+ }
+% \end{macrocode}
+%
% \bigskip
% \begin{macrocode}
\NewDocumentEnvironment { NiceTabularX } { m O { } m ! O { } }
@@ -7441,7 +7531,7 @@ version 2005/12/01 or later.
\dim_zero_new:N \l_@@_width_dim
\dim_set:Nn \l_@@_width_dim { #1 }
\keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 }
- \bool_set_true:N \l_@@_tabular_bool
+ \@@_settings_for_tabular:
\NiceArray { #3 }
}
{
@@ -7458,7 +7548,7 @@ version 2005/12/01 or later.
\str_gset:Nn \g_@@_name_env_str { NiceTabular* }
\dim_set:Nn \l_@@_tabular_width_dim { #1 }
\keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 }
- \bool_set_true:N \l_@@_tabular_bool
+ \@@_settings_for_tabular:
\NiceArray { #3 }
}
{ \endNiceArray }
@@ -7755,7 +7845,7 @@ version 2005/12/01 or later.
% potential ``argument'' with the command |\@@_CodeAfter_keys:|.
% \begin{macrocode}
\bool_set_true:N \l_@@_in_code_after_bool
- \exp_last_unbraced:NV \@@_CodeAfter_keys: \g_nicematrix_code_after_tl
+ \exp_last_unbraced:No \@@_CodeAfter_keys: \g_nicematrix_code_after_tl
\scan_stop:
\tl_gclear:N \g_nicematrix_code_after_tl
\group_end:
@@ -7774,7 +7864,7 @@ version 2005/12/01 or later.
\tl_build_gput_right:Nx \g_@@_aux_tl
{
\tl_gset:Nn \exp_not:N \g_@@_pre_code_before_tl
- { \exp_not:V \g_@@_pre_code_before_tl }
+ { \exp_not:o \g_@@_pre_code_before_tl }
}
\tl_gclear:N \g_@@_pre_code_before_tl
}
@@ -7783,7 +7873,7 @@ version 2005/12/01 or later.
\tl_build_gput_right:Nx \g_@@_aux_tl
{
\tl_gset:Nn \exp_not:N \g_@@_code_before_tl
- { \exp_not:V \g_nicematrix_code_before_tl }
+ { \exp_not:o \g_nicematrix_code_before_tl }
}
\tl_gclear:N \g_nicematrix_code_before_tl
}
@@ -8042,7 +8132,7 @@ version 2005/12/01 or later.
\bool_set_false:N \l_@@_final_open_bool
\int_compare:nNnTF \l_@@_final_i_int > \l_@@_row_max_int
{
- \int_compare:nNnTF { #3 } = 1
+ \int_compare:nNnTF { #3 } = \c_one_int
{ \bool_set_true:N \l_@@_final_open_bool }
{
\int_compare:nNnT \l_@@_final_j_int > \l_@@_col_max_int
@@ -8058,7 +8148,7 @@ version 2005/12/01 or later.
{
\int_compare:nNnT \l_@@_final_j_int > \l_@@_col_max_int
{
- \int_compare:nNnT { #4 } = 1
+ \int_compare:nNnT { #4 } = \c_one_int
{ \bool_set_true:N \l_@@_final_open_bool }
}
}
@@ -8137,7 +8227,7 @@ version 2005/12/01 or later.
\bool_set_false:N \l_@@_initial_open_bool
\int_compare:nNnTF \l_@@_initial_i_int < \l_@@_row_min_int
{
- \int_compare:nNnTF { #3 } = 1
+ \int_compare:nNnTF { #3 } = \c_one_int
{ \bool_set_true:N \l_@@_initial_open_bool }
{
\int_compare:nNnT \l_@@_initial_j_int = { \l_@@_col_min_int - 1 }
@@ -8147,7 +8237,7 @@ version 2005/12/01 or later.
{
\int_compare:nNnTF \l_@@_initial_j_int < \l_@@_col_min_int
{
- \int_compare:nNnT { #4 } = 1
+ \int_compare:nNnT { #4 } = \c_one_int
{ \bool_set_true:N \l_@@_initial_open_bool }
}
{
@@ -8265,18 +8355,25 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_set_protected:Npn \@@_adjust_to_submatrix:nnnnnn #1 #2 #3 #4 #5 #6
{
- \bool_if:nT
+ \int_compare:nNnF { #3 } > { #1 }
{
- \int_compare_p:n { #3 <= #1 }
- && \int_compare_p:n { #1 <= #5 }
- && \int_compare_p:n { #4 <= #2 }
- && \int_compare_p:n { #2 <= #6 }
- }
- {
- \int_set:Nn \l_@@_row_min_int { \int_max:nn \l_@@_row_min_int { #3 } }
- \int_set:Nn \l_@@_col_min_int { \int_max:nn \l_@@_col_min_int { #4 } }
- \int_set:Nn \l_@@_row_max_int { \int_min:nn \l_@@_row_max_int { #5 } }
- \int_set:Nn \l_@@_col_max_int { \int_min:nn \l_@@_col_max_int { #6 } }
+ \int_compare:nNnF { #1 } > { #5 }
+ {
+ \int_compare:nNnF { #4 } > { #2 }
+ {
+ \int_compare:nNnF { #2 } > { #6 }
+ {
+ \int_set:Nn \l_@@_row_min_int
+ { \int_max:nn \l_@@_row_min_int { #3 } }
+ \int_set:Nn \l_@@_col_min_int
+ { \int_max:nn \l_@@_col_min_int { #4 } }
+ \int_set:Nn \l_@@_row_max_int
+ { \int_min:nn \l_@@_row_max_int { #5 } }
+ \int_set:Nn \l_@@_col_max_int
+ { \int_min:nn \l_@@_col_max_int { #6 } }
+ }
+ }
+ }
}
}
% \end{macrocode}
@@ -8407,7 +8504,7 @@ version 2005/12/01 or later.
{ \color { nicematrix-last-row } }
}
\keys_set:nn { NiceMatrix / xdots } { #3 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Ldots:
\group_end:
}
@@ -8502,7 +8599,7 @@ version 2005/12/01 or later.
{ \color { nicematrix-last-row } }
}
\keys_set:nn { NiceMatrix / xdots } { #3 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Cdots:
\group_end:
}
@@ -8566,7 +8663,6 @@ version 2005/12/01 or later.
{ \dim_max:nn \l_@@_y_initial_dim \pgf@y }
}
}
- % modified 2023-08-10
\dim_compare:nNnT \l_@@_y_initial_dim = { - \c_max_dim }
{
\@@_qpoint:n { row - \int_use:N \l_@@_initial_i_int - base }
@@ -8599,7 +8695,6 @@ version 2005/12/01 or later.
{ \dim_min:nn \l_@@_y_final_dim \pgf@y }
}
}
- % modified 2023-08-10
\dim_compare:nNnT \l_@@_y_final_dim = \c_max_dim
{
\@@_qpoint:n { row - \int_use:N \l_@@_final_i_int - base }
@@ -8632,7 +8727,7 @@ version 2005/12/01 or later.
{ \color { nicematrix-last-col } }
}
\keys_set:nn { NiceMatrix / xdots } { #3 }
- \tl_if_empty:VF \l_@@_xdots_color_tl
+ \tl_if_empty:oF \l_@@_xdots_color_tl
{ \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Vdots:
\group_end:
@@ -8677,10 +8772,7 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
\dim_sub:Nn \l_@@_x_initial_dim \l_@@_left_margin_dim
\dim_sub:Nn \l_@@_x_initial_dim \l_@@_extra_left_margin_dim
- % \bool_if:NT \g_@@_delims_bool
- % {
- \dim_sub:Nn \l_@@_x_initial_dim \c_@@_shift_exterior_Vdots_dim
- % }
+ \dim_sub:Nn \l_@@_x_initial_dim \c_@@_shift_exterior_Vdots_dim
}
{
\bool_lazy_and:nnTF
@@ -8694,12 +8786,7 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
\dim_add:Nn \l_@@_x_initial_dim \l_@@_right_margin_dim
\dim_add:Nn \l_@@_x_initial_dim \l_@@_extra_right_margin_dim
- % \bool_if:NT \g_@@_delims_bool
- % {
- \dim_add:Nn
- \l_@@_x_initial_dim
- \c_@@_shift_exterior_Vdots_dim
- % }
+ \dim_add:Nn \l_@@_x_initial_dim \c_@@_shift_exterior_Vdots_dim
}
% \end{macrocode}
% We have a dotted line open on both sides which is \emph{not} in an exterior column.
@@ -8721,14 +8808,15 @@ version 2005/12/01 or later.
% \begin{macrocode}
{
\bool_set_false:N \l_tmpa_bool
- \bool_lazy_and:nnT
- { ! \l_@@_initial_open_bool }
- { ! \l_@@_final_open_bool }
- {
- \@@_set_initial_coords_from_anchor:n { south~west }
- \@@_set_final_coords_from_anchor:n { north~west }
- \bool_set:Nn \l_tmpa_bool
- { \dim_compare_p:nNn \l_@@_x_initial_dim = \l_@@_x_final_dim }
+ \bool_if:NF \l_@@_initial_open_bool
+ {
+ \bool_if:NF \l_@@_final_open_bool
+ {
+ \@@_set_initial_coords_from_anchor:n { south~west }
+ \@@_set_final_coords_from_anchor:n { north~west }
+ \bool_set:Nn \l_tmpa_bool
+ { \dim_compare_p:nNn \l_@@_x_initial_dim = \l_@@_x_final_dim }
+ }
}
% \end{macrocode}
% Now, we try to determine whether the column is of type |c| or may be
@@ -8788,7 +8876,7 @@ version 2005/12/01 or later.
\group_begin:
\@@_open_shorten:
\keys_set:nn { NiceMatrix / xdots } { #3 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Ddots:
\group_end:
}
@@ -8833,7 +8921,7 @@ version 2005/12/01 or later.
% We test if the diagonal line is the first one (the counter |\g_@@_ddots_int|
% is created for this usage).
% \begin{macrocode}
- \int_compare:nNnTF \g_@@_ddots_int = 1
+ \int_compare:nNnTF \g_@@_ddots_int = \c_one_int
% \end{macrocode}
% If the diagonal line is the first one, we have no adjustment of the line to do
% but we store the $\Delta_x$ and the $\Delta_y$ of the line because these
@@ -8883,7 +8971,7 @@ version 2005/12/01 or later.
\group_begin:
\@@_open_shorten:
\keys_set:nn { NiceMatrix / xdots } { #3 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Iddots:
\group_end:
}
@@ -8919,7 +9007,7 @@ version 2005/12/01 or later.
\bool_if:NT \l_@@_parallelize_diags_bool
{
\int_gincr:N \g_@@_iddots_int
- \int_compare:nNnTF \g_@@_iddots_int = 1
+ \int_compare:nNnTF \g_@@_iddots_int = \c_one_int
{
\dim_gset:Nn \g_@@_delta_x_two_dim
{ \l_@@_x_final_dim - \l_@@_x_initial_dim }
@@ -8970,7 +9058,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \medskip
-% We have to do a special construction with |\exp_args:NV| to be able to put in
+% We have to do a special construction with |\exp_args:No| to be able to put in
% the list of options in the correct place in the Tikz instruction.
% \begin{macrocode}
\cs_new_protected:Npn \@@_draw_unstandard_dotted_line:
@@ -8988,7 +9076,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_draw_unstandard_dotted_line:n #1
{
- \@@_draw_unstandard_dotted_line:nVVV
+ \@@_draw_unstandard_dotted_line:nooo
{ #1 }
\l_@@_xdots_up_tl
\l_@@_xdots_down_tl
@@ -9048,53 +9136,31 @@ version 2005/12/01 or later.
)
}
}
- \bool_lazy_and:nnT % security
- { \dim_compare_p:nNn { \dim_abs:n \l_@@_l_dim } < \c_@@_max_l_dim }
- { \dim_compare_p:nNn { \dim_abs:n \l_@@_l_dim } > { 1 pt } }
+% \end{macrocode}
+% It seems that, during the first compilations, the value of |\l_@@_l_dim| may
+% be erroneous (equal to zero or very large). We must detect these cases
+% because they would cause errors during the drawing of the dotted line. Maybe
+% we should also write something in the |aux| file to say that one more
+% compilation should be done.
+% \begin{macrocode}
+ \dim_compare:nNnT \l_@@_l_dim < \c_@@_max_l_dim
{
- \dim_set:Nn \l_tmpa_dim
- {
- \l_@@_x_initial_dim
- + ( \l_@@_x_final_dim - \l_@@_x_initial_dim )
- * \dim_ratio:nn \l_@@_xdots_shorten_start_dim \l_@@_l_dim
- }
- \dim_set:Nn \l_tmpb_dim
- {
- \l_@@_y_initial_dim
- + ( \l_@@_y_final_dim - \l_@@_y_initial_dim )
- * \dim_ratio:nn \l_@@_xdots_shorten_start_dim \l_@@_l_dim
- }
- \dim_set:Nn \l_@@_tmpc_dim
- {
- \l_@@_x_final_dim
- - ( \l_@@_x_final_dim - \l_@@_x_initial_dim )
- * \dim_ratio:nn \l_@@_xdots_shorten_end_dim \l_@@_l_dim
- }
- \dim_set:Nn \l_@@_tmpd_dim
- {
- \l_@@_y_final_dim
- - ( \l_@@_y_final_dim - \l_@@_y_initial_dim )
- * \dim_ratio:nn \l_@@_xdots_shorten_end_dim \l_@@_l_dim
- }
- \dim_set_eq:NN \l_@@_x_initial_dim \l_tmpa_dim
- \dim_set_eq:NN \l_@@_y_initial_dim \l_tmpb_dim
- \dim_set_eq:NN \l_@@_x_final_dim \l_@@_tmpc_dim
- \dim_set_eq:NN \l_@@_y_final_dim \l_@@_tmpd_dim
+ \dim_compare:nNnT \l_@@_l_dim > { 1 pt }
+ \@@_draw_unstandard_dotted_line_i:
}
% \end{macrocode}
-%
%
% If the key |xdots/horizontal-labels| has been used.
% \begin{macrocode}
\bool_if:NT \l_@@_xdots_h_labels_bool
- {
- \tikzset
- {
- @@_node_above / .style = { auto = left } ,
- @@_node_below / .style = { auto = right } ,
- @@_node_middle / .style = { inner~sep = \c_@@_innersep_middle_dim }
- }
- }
+ {
+ \tikzset
+ {
+ @@_node_above / .style = { auto = left } ,
+ @@_node_below / .style = { auto = right } ,
+ @@_node_middle / .style = { inner~sep = \c_@@_innersep_middle_dim }
+ }
+ }
\tl_if_empty:nF { #4 }
{ \tikzset { @@_node_middle / .append~style = { fill = white } } }
\draw
@@ -9111,7 +9177,44 @@ version 2005/12/01 or later.
( \l_@@_x_final_dim , \l_@@_y_final_dim ) ;
\end { scope }
}
-\cs_generate_variant:Nn \@@_draw_unstandard_dotted_line:nnnn { n V V V }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_draw_unstandard_dotted_line_i:
+ {
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \l_@@_x_initial_dim
+ + ( \l_@@_x_final_dim - \l_@@_x_initial_dim )
+ * \dim_ratio:nn \l_@@_xdots_shorten_start_dim \l_@@_l_dim
+ }
+ \dim_set:Nn \l_tmpb_dim
+ {
+ \l_@@_y_initial_dim
+ + ( \l_@@_y_final_dim - \l_@@_y_initial_dim )
+ * \dim_ratio:nn \l_@@_xdots_shorten_start_dim \l_@@_l_dim
+ }
+ \dim_set:Nn \l_@@_tmpc_dim
+ {
+ \l_@@_x_final_dim
+ - ( \l_@@_x_final_dim - \l_@@_x_initial_dim )
+ * \dim_ratio:nn \l_@@_xdots_shorten_end_dim \l_@@_l_dim
+ }
+ \dim_set:Nn \l_@@_tmpd_dim
+ {
+ \l_@@_y_final_dim
+ - ( \l_@@_y_final_dim - \l_@@_y_initial_dim )
+ * \dim_ratio:nn \l_@@_xdots_shorten_end_dim \l_@@_l_dim
+ }
+ \dim_set_eq:NN \l_@@_x_initial_dim \l_tmpa_dim
+ \dim_set_eq:NN \l_@@_y_initial_dim \l_tmpb_dim
+ \dim_set_eq:NN \l_@@_x_final_dim \l_@@_tmpc_dim
+ \dim_set_eq:NN \l_@@_y_final_dim \l_@@_tmpd_dim
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_generate_variant:Nn \@@_draw_unstandard_dotted_line:nnnn { n o o o }
% \end{macrocode}
%
% \bigskip
@@ -9145,10 +9248,11 @@ version 2005/12/01 or later.
% we should also write something in the |aux| file to say that one more
% compilation should be done.
% \begin{macrocode}
- \bool_lazy_or:nnF
- { \dim_compare_p:nNn { \dim_abs:n \l_@@_l_dim } > \c_@@_max_l_dim }
- { \dim_compare_p:nNn \l_@@_l_dim = \c_zero_dim }
- \@@_draw_standard_dotted_line_i:
+ \dim_compare:nNnT \l_@@_l_dim < \c_@@_max_l_dim
+ {
+ \dim_compare:nNnT \l_@@_l_dim > { 1 pt }
+ \@@_draw_standard_dotted_line_i:
+ }
\group_end:
% \end{macrocode}
% \begin{macrocode}
@@ -9226,7 +9330,7 @@ version 2005/12/01 or later.
{ 2 \l_@@_l_dim }
}
\pgf@relevantforpicturesizefalse
- \int_step_inline:nnn 0 \l_tmpa_int
+ \int_step_inline:nnn \c_zero_int \l_tmpa_int
{
\pgfpathcircle
{ \pgfpoint \l_@@_x_initial_dim \l_@@_y_initial_dim }
@@ -9339,11 +9443,11 @@ version 2005/12/01 or later.
% \begin{macrocode}
\hook_gput_code:nnn { begindocument } { . }
{
- \tl_set:Nn \l_@@_argspec_tl { m E { _ ^ : } { { } { } { } } }
- \tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
+ \cs_set_nopar:Npn \l_@@_argspec_tl { m E { _ ^ : } { { } { } { } } }
+ \tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
\cs_new_protected:Npn \@@_Ldots
{ \@@_collect_options:n { \@@_Ldots_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Ldots_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Ldots_i \l_@@_argspec_tl
{
\int_if_zero:nTF \c@jCol
{ \@@_error:nn { in~first~col } \Ldots }
@@ -9365,7 +9469,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Cdots
{ \@@_collect_options:n { \@@_Cdots_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Cdots_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Cdots_i \l_@@_argspec_tl
{
\int_if_zero:nTF \c@jCol
{ \@@_error:nn { in~first~col } \Cdots }
@@ -9387,7 +9491,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Vdots
{ \@@_collect_options:n { \@@_Vdots_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Vdots_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Vdots_i \l_@@_argspec_tl
{
\int_if_zero:nTF \c@iRow
{ \@@_error:nn { in~first~row } \Vdots }
@@ -9410,7 +9514,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Ddots
{ \@@_collect_options:n { \@@_Ddots_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Ddots_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Ddots_i \l_@@_argspec_tl
{
\int_case:nnF \c@iRow
{
@@ -9440,7 +9544,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Iddots
{ \@@_collect_options:n { \@@_Iddots_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Iddots_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Iddots_i \l_@@_argspec_tl
{
\int_case:nnF \c@iRow
{
@@ -9536,7 +9640,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\hook_gput_code:nnn { begindocument } { . }
{
- \tl_set:Nn \l_@@_argspec_tl { m m O { } E { _ ^ : } { { } { } { } } }
+ \cs_set_nopar:Npn \l_@@_argspec_tl { m m O { } E { _ ^ : } { { } { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
% \end{macrocode}
% We don't put |!| before the last optionnal argument for homogeneity with
@@ -9544,7 +9648,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_Hdotsfor_i
{ \@@_collect_options:n { \@@_Hdotsfor_ii } }
- \exp_args:NNV \NewDocumentCommand \@@_Hdotsfor_ii \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Hdotsfor_ii \l_@@_argspec_tl
{
\tl_gput_right:Nx \g_@@_HVdotsfor_lines_tl
{
@@ -9563,7 +9667,7 @@ version 2005/12/01 or later.
{
&
\multicolumn { 1 } { c } { }
- \cs_set_eq:NN \CodeAfter \@@_CodeAfter_i: % added 2023-08-26
+ \cs_set_eq:NN \CodeAfter \@@_CodeAfter_i:
}
}
}
@@ -9583,9 +9687,9 @@ version 2005/12/01 or later.
% \end{macrocode}
% For the column, it's a bit more complicated.
% \begin{macrocode}
- \int_compare:nNnTF { #2 } = 1
+ \int_compare:nNnTF { #2 } = \c_one_int
{
- \int_set:Nn \l_@@_initial_j_int 1
+ \int_set_eq:NN \l_@@_initial_j_int \c_one_int
\bool_set_true:N \l_@@_initial_open_bool
}
{
@@ -9632,7 +9736,7 @@ version 2005/12/01 or later.
}
\keys_set:nn { NiceMatrix / xdots } { #4 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Ldots:
\group_end:
% \end{macrocode}
@@ -9652,11 +9756,11 @@ version 2005/12/01 or later.
% \begin{macrocode}
\hook_gput_code:nnn { begindocument } { . }
{
- \tl_set:Nn \l_@@_argspec_tl { m m O { } E { _ ^ : } { { } { } { } } }
+ \cs_set_nopar:Npn \l_@@_argspec_tl { m m O { } E { _ ^ : } { { } { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
\cs_new_protected:Npn \@@_Vdotsfor:
{ \@@_collect_options:n { \@@_Vdotsfor_i } }
- \exp_args:NNV \NewDocumentCommand \@@_Vdotsfor_i \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_Vdotsfor_i \l_@@_argspec_tl
{
\bool_gset_true:N \g_@@_empty_cell_bool
\tl_gput_right:Nx \g_@@_HVdotsfor_lines_tl
@@ -9690,9 +9794,9 @@ version 2005/12/01 or later.
% \end{macrocode}
% For the row, it's a bit more complicated.
% \begin{macrocode}
- \int_compare:nNnTF { #1 } = 1
+ \int_compare:nNnTF { #1 } = \c_one_int
{
- \int_set:Nn \l_@@_initial_i_int 1
+ \int_set_eq:NN \l_@@_initial_i_int \c_one_int
\bool_set_true:N \l_@@_initial_open_bool
}
{
@@ -9738,7 +9842,7 @@ version 2005/12/01 or later.
{ \color { nicematrix-last-col } }
}
\keys_set:nn { NiceMatrix / xdots } { #4 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\@@_actually_draw_Vdots:
\group_end:
% \end{macrocode}
@@ -9819,13 +9923,14 @@ version 2005/12/01 or later.
% \begin{macrocode}
\hook_gput_code:nnn { begindocument } { . }
{
- \tl_set:Nn \l_@@_argspec_tl { O { } m m ! O { } E { _ ^ : } { { } { } { } } }
+ \cs_set_nopar:Npn \l_@@_argspec_tl
+ { O { } m m ! O { } E { _ ^ : } { { } { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
- \exp_args:NNV \NewDocumentCommand \@@_line \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_line \l_@@_argspec_tl
{
\group_begin:
\keys_set:nn { NiceMatrix / xdots } { #1 , #4 , down = #5 , up = #6 }
- \tl_if_empty:VF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
+ \tl_if_empty:oF \l_@@_xdots_color_tl { \color { \l_@@_xdots_color_tl } }
\use:e
{
\@@_line_i:nn
@@ -9842,15 +9947,10 @@ version 2005/12/01 or later.
{
\bool_set_false:N \l_@@_initial_open_bool
\bool_set_false:N \l_@@_final_open_bool
- \bool_if:nTF
- {
- \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #1 }
- ||
- \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #2 }
- }
- {
- \@@_error:nnn { unknown~cell~for~line~in~CodeAfter } { #1 } { #2 }
- }
+ \bool_lazy_or:nnTF
+ { \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #1 } }
+ { \cs_if_free_p:c { pgf @ sh @ ns @ \@@_env: - #2 } }
+ { \@@_error:nnn { unknown~cell~for~line~in~CodeAfter } { #1 } { #2 } }
% \end{macrocode}
% The test of |measuring@| is a security (cf. question 686649 on TeX StackExchange).
% \begin{macrocode}
@@ -9922,7 +10022,7 @@ version 2005/12/01 or later.
% |#1| is the first row \emph{after} the scope of the instructions in |#2|
% \begin{macrocode}
\cs_new:Npn \@@_if_row_less_than:nn #1 #2
- { \int_compare:nNnT { \int_use:N \c@iRow } < { #1 } { #2 } }
+ { \int_compare:nNnT \c@iRow < { #1 } { #2 } }
% \end{macrocode}
%
% \bigskip
@@ -9997,20 +10097,20 @@ version 2005/12/01 or later.
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
% \end{macrocode}
-% The command |\@@_exp_color_arg:NV| is \emph{fully expandable}.
+% The command |\@@_exp_color_arg:No| is \emph{fully expandable}.
% \begin{macrocode}
- \@@_exp_color_arg:NV \@@_rectanglecolor \l_tmpa_tl
+ \@@_exp_color_arg:No \@@_rectanglecolor \l_tmpa_tl
{ \int_use:N \c@iRow - \int_use:N \c@jCol }
{ \int_use:N \c@iRow - * }
}
% \end{macrocode}
% Then, the other rows (if there is several rows).
% \begin{macrocode}
- \int_compare:nNnT \l_@@_key_nb_rows_int > 1
+ \int_compare:nNnT \l_@@_key_nb_rows_int > \c_one_int
{
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
- \@@_exp_color_arg:NV \@@_rowcolor \l_tmpa_tl
+ \@@_exp_color_arg:No \@@_rowcolor \l_tmpa_tl
{
\int_eval:n { \c@iRow + 1 }
- \int_eval:n { \c@iRow + \l_@@_key_nb_rows_int - 1 }
@@ -10241,7 +10341,7 @@ version 2005/12/01 or later.
\@@_clip_with_rounded_corners:
\seq_map_indexed_inline:Nn \g_@@_colors_seq
{
- \int_compare:nNnTF { ##1 } = 1
+ \int_compare:nNnTF { ##1 } = \c_one_int
{
\cs_set_eq:NN \@@_cartesian_path:n \@@_cartesian_path_nocolor:n
\use:c { g_@@_color _ 1 _tl }
@@ -10285,7 +10385,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% |\l_tmpa_tl| (if not empty) is now the opacity and |\l_tmpb_tl| (if not empty) is now the colorimetric space.
% \begin{macrocode}
- \tl_if_empty:NF \l_tmpa_tl { \exp_args:NV \pgfsetfillopacity \l_tmpa_tl }
+ \tl_if_empty:NF \l_tmpa_tl { \exp_args:No \pgfsetfillopacity \l_tmpa_tl }
\tl_if_empty:NTF \l_tmpb_tl
{ \@declaredcolor }
{ \use:e { \exp_not:N \@undeclaredcolor [ \l_tmpb_tl ] } }
@@ -10306,8 +10406,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_cartesian_color:nn #1 #2
{
- \tl_set:Nn \l_@@_rows_tl { #1 }
- \tl_set:Nn \l_@@_cols_tl { #2 }
+ \cs_set_nopar:Npn \l_@@_rows_tl { #1 }
+ \cs_set_nopar:Npn \l_@@_cols_tl { #2 }
\@@_cartesian_path:
}
% \end{macrocode}
@@ -10349,7 +10449,7 @@ version 2005/12/01 or later.
{
\@@_add_to_colors_seq:en
{ \tl_if_blank:nF { #1 } { [ #1 ] } { #2 } }
- { \@@_rectanglecolor:nnn { #3 } { #4 } { 0 pt } }
+ { \@@_rectanglecolor:nnn { #3 } { #4 } { \c_zero_dim } }
}
}
% \end{macrocode}
@@ -10379,7 +10479,7 @@ version 2005/12/01 or later.
\tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
\tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #2 \q_stop
- \tl_set:Nx \l_@@_rows_tl { \l_@@_tmpc_tl - \l_tmpa_tl }
+ \tl_set:Nx \l_@@_rows_tl { \l_@@_tmpc_tl - \l_tmpa_tl }
\tl_set:Nx \l_@@_cols_tl { \l_@@_tmpd_tl - \l_tmpb_tl }
% \end{macrocode}
% The command |\@@_cartesian_path:n| takes in two implicit arguments:
@@ -10404,9 +10504,9 @@ version 2005/12/01 or later.
% \begin{macrocode}
\NewDocumentCommand \@@_chessboardcolors { O { } m m }
{
- \int_step_inline:nn { \int_use:N \c@iRow }
+ \int_step_inline:nn \c@iRow
{
- \int_step_inline:nn { \int_use:N \c@jCol }
+ \int_step_inline:nn \c@jCol
{
\int_if_even:nTF { ####1 + ##1 }
{ \@@_cellcolor [ #1 ] { #2 } }
@@ -10468,14 +10568,14 @@ version 2005/12/01 or later.
\seq_clear_new:N \l_@@_colors_seq
\seq_set_split:Nnn \l_@@_colors_seq { , } { #3 }
\tl_clear_new:N \l_@@_cols_tl
- \tl_set:Nn \l_@@_cols_tl { - }
+ \cs_set_nopar:Npn \l_@@_cols_tl { - }
\keys_set:nn { NiceMatrix / rowcolors } { #4 }
% \end{macrocode}
% The counter |\l_@@_color_int| will be the rank of the current color in the list of
% colors (modulo the length of the list).
% \begin{macrocode}
\int_zero_new:N \l_@@_color_int
- \int_set:Nn \l_@@_color_int 1
+ \int_set_eq:NN \l_@@_color_int \c_one_int
\bool_if:NT \l_@@_respect_blocks_bool
{
% \end{macrocode}
@@ -10494,10 +10594,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\clist_map_inline:nn { #2 }
{
- \tl_set:Nn \l_tmpa_tl { ##1 }
+ \cs_set_nopar:Npn \l_tmpa_tl { ##1 }
\tl_if_in:NnTF \l_tmpa_tl { - }
{ \@@_cut_on_hyphen:w ##1 \q_stop }
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } }
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@iRow } }
% \end{macrocode}
% Now, |l_tmpa_tl| and |l_tmpb_tl| are the first row and the last row of the
% interval of rows that we have to treat. The counter |\l_tmpa_int| will be the
@@ -10527,7 +10627,7 @@ version 2005/12/01 or later.
% Now, the last row of the block is computed in |\l_tmpb_int|.
% \begin{macrocode}
}
- \tl_set:Nx \l_@@_rows_tl
+ \tl_set:No \l_@@_rows_tl
{ \int_use:N \l_tmpa_int - \int_use:N \l_tmpb_int }
% \end{macrocode}
% |\l_@@_tmpc_tl| will be the color that we will use.
@@ -10595,11 +10695,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_not_in_exterior:nnnnn p
{
- \bool_lazy_or:nnTF
- { \int_if_zero_p:n { #4 } }
- { \int_compare_p:nNn { #2 } = { \int_eval:n { \c@jCol + 1 } } }
+ \int_if_zero:nTF { #4 }
\prg_return_false:
- \prg_return_true:
+ {
+ \int_compare:nNnTF { #2 } > \c@jCol
+ \prg_return_false:
+ \prg_return_true:
+ }
}
% \end{macrocode}
%
@@ -10609,14 +10711,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_intersect_our_row:nnnnn p
{
- \bool_if:nTF
- {
- \int_compare_p:n { #1 <= \l_tmpa_int }
- &&
- \int_compare_p:n { \l_tmpa_int <= #3 }
- }
- \prg_return_true:
+ \int_compare:nNnTF { #1 } > \l_tmpa_int
\prg_return_false:
+ {
+ \int_compare:nNnTF \l_tmpa_int > { #3 }
+ \prg_return_false:
+ \prg_return_true:
+ }
}
% \end{macrocode}
%
@@ -10628,50 +10729,62 @@ version 2005/12/01 or later.
% below a command |\@@_cartesian_path:| which corresponds to a value $0$~pt for
% the radius of the corners.
%
-% This command is in particular used in |\@@_rectanglecolor:nnn| (used in
+% This command is, in particular, used in |\@@_rectanglecolor:nnn| (used in
% |\@@_rectanglecolor|, itself used in |\@@_cellcolor|).
% \begin{macrocode}
\cs_new_protected:Npn \@@_cartesian_path_normal:n #1
{
- \bool_lazy_any:nT
+ \dim_compare:nNnTF { #1 } = \c_zero_dim
{
- { ! \seq_if_empty_p:N \l_@@_corners_cells_seq }
- { \dim_compare_p:nNn { #1 } = \c_zero_dim }
- { ! \@@_nocolor_used_bool }
+ \bool_if:NTF
+ \@@_nocolor_used_bool
+ \@@_cartesian_path_normal_ii:
+ {
+ \seq_if_empty:NTF \l_@@_corners_cells_seq
+ { \@@_cartesian_path_normal_i:n { #1 } }
+ \@@_cartesian_path_normal_ii:
+ }
}
- {
- \@@_expand_clist:NN \l_@@_cols_tl \c@jCol
- \@@_expand_clist:NN \l_@@_rows_tl \c@iRow
- }
+ { \@@_cartesian_path_normal_i:n { #1 } }
+ }
+% \end{macrocode}
+%
+%
+% \bigskip
+% First, the situation where is a rectangular zone of cells will be colored as a
+% whole (in the instructions of the resulting \textsc{pdf}). The argument is the
+% radius of the corners.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_cartesian_path_normal_i:n #1
+ {
+ \pgfsetcornersarced { \pgfpoint { #1 } { #1 } }
% \end{macrocode}
% We begin the loop over the columns.
% \begin{macrocode}
\clist_map_inline:Nn \l_@@_cols_tl
{
- \tl_set:Nn \l_tmpa_tl { ##1 }
+ \cs_set_nopar:Npn \l_tmpa_tl { ##1 }
\tl_if_in:NnTF \l_tmpa_tl { - }
{ \@@_cut_on_hyphen:w ##1 \q_stop }
{ \@@_cut_on_hyphen:w ##1 - ##1 \q_stop }
- \bool_lazy_or:nnT
- { \tl_if_blank_p:V \l_tmpa_tl }
- { \str_if_eq_p:Vn \l_tmpa_tl { * } }
- { \tl_set:Nn \l_tmpa_tl { 1 } }
- \bool_lazy_or:nnT
- { \tl_if_blank_p:V \l_tmpb_tl }
- { \str_if_eq_p:Vn \l_tmpb_tl { * } }
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
+ \tl_if_empty:NTF \l_tmpa_tl
+ { \cs_set_nopar:Npn \l_tmpa_tl { 1 } }
+ {
+ \tl_if_eq:NNT \l_tmpa_tl \c_@@_star_tl
+ { \cs_set_nopar:Npn \l_tmpa_tl { 1 } }
+ }
+ \tl_if_empty:NTF \l_tmpb_tl
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@jCol } }
+ {
+ \tl_if_eq:NNT \l_tmpb_tl \c_@@_star_tl
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@jCol } }
+ }
\int_compare:nNnT \l_tmpb_tl > \g_@@_col_total_int
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \g_@@_col_total_int } }
+ { \tl_set:No \l_tmpb_tl { \int_use:N \g_@@_col_total_int } }
% \end{macrocode}
% |\l_@@_tmpc_tl| will contain the number of column.
% \begin{macrocode}
\tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
-% \end{macrocode}
-% If we decide to provide the commands |\cellcolor|, |\rectanglecolor|,
-% |\rowcolor|, |\columncolor|, |\rowcolors| and |\chessboardcolors| in the
-% |code-before| of a |\SubMatrix|, we will have to modify the following line, by
-% adding a kind of offset. We will have also some other lines to modify.
-% \begin{macrocode}
\@@_qpoint:n { col - \l_tmpa_tl }
\int_compare:nNnTF \l_@@_first_col_int = \l_tmpa_tl
{ \dim_set:Nn \l_@@_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } }
@@ -10683,28 +10796,76 @@ version 2005/12/01 or later.
% \begin{macrocode}
\clist_map_inline:Nn \l_@@_rows_tl
{
- \tl_set:Nn \l_tmpa_tl { ####1 }
+ \cs_set_nopar:Npn \l_tmpa_tl { ####1 }
\tl_if_in:NnTF \l_tmpa_tl { - }
{ \@@_cut_on_hyphen:w ####1 \q_stop }
{ \@@_cut_on_hyphen:w ####1 - ####1 \q_stop }
- \tl_if_empty:NT \l_tmpa_tl { \tl_set:Nn \l_tmpa_tl { 1 } }
- \tl_if_empty:NT \l_tmpb_tl
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@iRow } }
+ \tl_if_empty:NTF \l_tmpa_tl
+ { \cs_set_nopar:Npn \l_tmpa_tl { 1 } }
+ {
+ \tl_if_eq:NNT \l_tmpa_tl \c_@@_star_tl
+ { \cs_set_nopar:Npn \l_tmpa_tl { 1 } }
+ }
+ \tl_if_empty:NTF \l_tmpb_tl
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@iRow } }
+ {
+ \tl_if_eq:NNT \l_tmpb_tl \c_@@_star_tl
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@iRow } }
+ }
\int_compare:nNnT \l_tmpb_tl > \g_@@_row_total_int
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \g_@@_row_total_int } }
+ { \tl_set:No \l_tmpb_tl { \int_use:N \g_@@_row_total_int } }
% \end{macrocode}
% Now, the numbers of both rows are in |\l_tmpa_tl| and |\l_tmpb_tl|.
% \begin{macrocode}
- \seq_if_in:NxF \l_@@_corners_cells_seq
- { \l_tmpa_tl - \l_@@_tmpc_tl }
+ \cs_if_exist:cF
+ { @@ _ \l_tmpa_tl _ \l_@@_tmpc_tl _ nocolor }
{
\@@_qpoint:n { row - \int_eval:n { \l_tmpb_tl + 1 } }
\dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth }
\@@_qpoint:n { row - \l_tmpa_tl }
\dim_set:Nn \l_@@_tmpd_dim { \pgf@y + 0.5 \arrayrulewidth }
- \pgfsetcornersarced { \pgfpoint { #1 } { #1 } }
+ \pgfpathrectanglecorners
+ { \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim }
+ { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
+ }
+ }
+ }
+ }
+% \end{macrocode}
+%
+%
+% Now, the case where the cells will be colored cell by cell (it's mandatory for
+% example if the key |corners| is used).
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_cartesian_path_normal_ii:
+ {
+ \@@_expand_clist:NN \l_@@_cols_tl \c@jCol
+ \@@_expand_clist:NN \l_@@_rows_tl \c@iRow
+% \end{macrocode}
+% We begin the loop over the columns.
+% \begin{macrocode}
+ \clist_map_inline:Nn \l_@@_cols_tl
+ {
+ \@@_qpoint:n { col - ##1 }
+ \int_compare:nNnTF \l_@@_first_col_int = { ##1 }
+ { \dim_set:Nn \l_@@_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } }
+ { \dim_set:Nn \l_@@_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } }
+ \@@_qpoint:n { col - \int_eval:n { ##1 + 1 } }
+ \dim_set:Nn \l_tmpa_dim { \pgf@x + 0.5 \arrayrulewidth }
+% \end{macrocode}
+% We begin the loop over the rows.
+% \begin{macrocode}
+ \clist_map_inline:Nn \l_@@_rows_tl
+ {
+ \seq_if_in:NnF \l_@@_corners_cells_seq
+ { ####1 - ##1 }
+ {
+ \@@_qpoint:n { row - \int_eval:n { ####1 + 1 } }
+ \dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth }
+ \@@_qpoint:n { row - ####1 }
+ \dim_set:Nn \l_@@_tmpd_dim { \pgf@y + 0.5 \arrayrulewidth }
\cs_if_exist:cF
- { @@ _ \l_tmpa_tl _ \l_@@_tmpc_tl _ nocolor }
+ { @@ _ ####1 _ ##1 _ nocolor }
{
\pgfpathrectanglecorners
{ \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim }
@@ -10716,12 +10877,14 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+%
+%
% \bigskip
% The following command corresponds to a radius of the corners equal to $0$~pt.
% This command is used by the commands |\@@_rowcolors|, |\@@_columncolor| and
% |\@@_rowcolor:n| (used in |\@@_rowcolor|).
% \begin{macrocode}
-\cs_new_protected:Npn \@@_cartesian_path: { \@@_cartesian_path:n { 0 pt } }
+\cs_new_protected:Npn \@@_cartesian_path: { \@@_cartesian_path:n \c_zero_dim }
% \end{macrocode}
%
%
@@ -10761,20 +10924,20 @@ version 2005/12/01 or later.
\clist_clear:N #1
\clist_map_inline:Nn \l_tmpa_clist
{
- \tl_set:Nn \l_tmpa_tl { ##1 }
+ \cs_set_nopar:Npn \l_tmpa_tl { ##1 }
\tl_if_in:NnTF \l_tmpa_tl { - }
{ \@@_cut_on_hyphen:w ##1 \q_stop }
{ \@@_cut_on_hyphen:w ##1 - ##1 \q_stop }
\bool_lazy_or:nnT
- { \tl_if_blank_p:V \l_tmpa_tl }
- { \str_if_eq_p:Vn \l_tmpa_tl { * } }
- { \tl_set:Nn \l_tmpa_tl { 1 } }
+ { \tl_if_blank_p:o \l_tmpa_tl }
+ { \str_if_eq_p:on \l_tmpa_tl { * } }
+ { \cs_set_nopar:Npn \l_tmpa_tl { 1 } }
\bool_lazy_or:nnT
- { \tl_if_blank_p:V \l_tmpb_tl }
- { \str_if_eq_p:Vn \l_tmpb_tl { * } }
- { \tl_set:Nx \l_tmpb_tl { \int_use:N #2 } }
+ { \tl_if_blank_p:o \l_tmpb_tl }
+ { \str_if_eq_p:on \l_tmpb_tl { * } }
+ { \tl_set:No \l_tmpb_tl { \int_use:N #2 } }
\int_compare:nNnT \l_tmpb_tl > #2
- { \tl_set:Nx \l_tmpb_tl { \int_use:N #2 } }
+ { \tl_set:No \l_tmpb_tl { \int_use:N #2 } }
\int_step_inline:nnn \l_tmpa_tl \l_tmpb_tl
{ \clist_put_right:Nn #1 { ####1 } }
}
@@ -11071,7 +11234,6 @@ version 2005/12/01 or later.
position .int_set:N = \l_@@_position_int ,
position .value_required:n = true ,
start .int_set:N = \l_@@_start_int ,
- start .initial:n = 1 ,
end .code:n =
\bool_lazy_or:nnTF
{ \tl_if_empty_p:n { #1 } }
@@ -11140,7 +11302,6 @@ version 2005/12/01 or later.
% The group is for the options.
% \begin{macrocode}
\group_begin:
- \int_zero_new:N \l_@@_end_int
\int_set_eq:NN \l_@@_end_int \c@iRow
\keys_set_known:nnN { NiceMatrix / Rules } { #1 } \l_@@_other_keys_tl
% \end{macrocode}
@@ -11157,14 +11318,12 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_vline_i:
{
- \int_zero_new:N \l_@@_local_start_int
- \int_zero_new:N \l_@@_local_end_int
% \end{macrocode}
% |\l_tmpa_tl| is the number of row and |\l_tmpb_tl| the number of column. When
% we have found a row corresponding to a rule to draw, we note its number in
% |\l_@@_tmpc_tl|.
% \begin{macrocode}
- \tl_set:Nx \l_tmpb_tl { \int_eval:n \l_@@_position_int }
+ \tl_set:No \l_tmpb_tl { \int_use:N \l_@@_position_int }
\int_step_variable:nnNn \l_@@_start_int \l_@@_end_int
\l_tmpa_tl
{
@@ -11193,7 +11352,7 @@ version 2005/12/01 or later.
{ \int_set:Nn \l_@@_local_start_int \l_tmpa_tl }
}
{
- \int_compare:nNnT \l_@@_local_start_int > 0
+ \int_compare:nNnT \l_@@_local_start_int > \c_zero_int
{
\int_set:Nn \l_@@_local_end_int { \l_tmpa_tl - 1 }
\@@_vline_ii:
@@ -11201,7 +11360,7 @@ version 2005/12/01 or later.
}
}
}
- \int_compare:nNnT \l_@@_local_start_int > 0
+ \int_compare:nNnT \l_@@_local_start_int > \c_zero_int
{
\int_set_eq:NN \l_@@_local_end_int \l_@@_end_int
\@@_vline_ii:
@@ -11225,7 +11384,7 @@ version 2005/12/01 or later.
\l_@@_corners_cells_seq
{ \l_tmpa_tl - \l_tmpb_tl }
{
- \int_compare:nNnTF \l_tmpb_tl = 1
+ \int_compare:nNnTF \l_tmpb_tl = \c_one_int
{ \bool_set_false:N \g_tmpa_bool }
{
\seq_if_in:NxT
@@ -11278,9 +11437,9 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\bool_lazy_all:nT
{
- { \int_compare_p:nNn \l_@@_multiplicity_int > 1 }
+ { \int_compare_p:nNn \l_@@_multiplicity_int > \c_one_int }
{ \cs_if_exist_p:N \CT@drsc@ }
- { ! \tl_if_blank_p:V \CT@drsc@ }
+ { ! \tl_if_blank_p:o \CT@drsc@ }
}
{
\group_begin:
@@ -11362,7 +11521,7 @@ version 2005/12/01 or later.
\dim_set:Nn \l_tmpb_dim { \pgf@x - 0.5 \l_@@_rule_width_dim }
\@@_qpoint:n { row - \int_eval:n { \l_@@_local_end_int + 1 } }
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
- \exp_args:NV \tikzset \l_@@_tikz_rule_tl
+ \exp_args:No \tikzset \l_@@_tikz_rule_tl
\use:e { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpb_dim , \l_tmpa_dim ) --
( \l_tmpb_dim , \l_@@_tmpc_dim ) ;
@@ -11379,17 +11538,14 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_draw_vlines:
{
\int_step_inline:nnn
+ { \bool_lazy_or:nnTF \g_@@_delims_bool \l_@@_except_borders_bool 2 1 }
{
- \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
- 1 2
- }
- {
- \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
- { \int_eval:n { \c@jCol + 1 } }
+ \bool_lazy_or:nnTF \g_@@_delims_bool \l_@@_except_borders_bool
\c@jCol
+ { \int_eval:n { \c@jCol + 1 } }
}
{
- \tl_if_eq:NnF \l_@@_vlines_clist { all }
+ \tl_if_eq:NNF \l_@@_vlines_clist \c_@@_all_tl
{ \clist_if_in:NnT \l_@@_vlines_clist { ##1 } }
{ \@@_vline:n { position = ##1 , total-width = \arrayrulewidth } }
}
@@ -11429,7 +11585,7 @@ version 2005/12/01 or later.
% we have found a column corresponding to a rule to draw, we note its number in
% |\l_@@_tmpc_tl|.
% \begin{macrocode}
- \tl_set:Nx \l_tmpa_tl { \int_use:N \l_@@_position_int }
+ \tl_set:No \l_tmpa_tl { \int_use:N \l_@@_position_int }
\int_step_variable:nnNn \l_@@_start_int \l_@@_end_int
\l_tmpb_tl
{
@@ -11458,7 +11614,7 @@ version 2005/12/01 or later.
{ \int_set:Nn \l_@@_local_start_int \l_tmpb_tl }
}
{
- \int_compare:nNnT \l_@@_local_start_int > 0
+ \int_compare:nNnT \l_@@_local_start_int > \c_zero_int
{
\int_set:Nn \l_@@_local_end_int { \l_tmpb_tl - 1 }
\@@_hline_ii:
@@ -11466,7 +11622,7 @@ version 2005/12/01 or later.
}
}
}
- \int_compare:nNnT \l_@@_local_start_int > 0
+ \int_compare:nNnT \l_@@_local_start_int > \c_zero_int
{
\int_set_eq:NN \l_@@_local_end_int \l_@@_end_int
\@@_hline_ii:
@@ -11490,7 +11646,7 @@ version 2005/12/01 or later.
\l_@@_corners_cells_seq
{ \l_tmpa_tl - \l_tmpb_tl }
{
- \int_compare:nNnTF \l_tmpa_tl = 1
+ \int_compare:nNnTF \l_tmpa_tl = \c_one_int
{ \bool_set_false:N \g_tmpa_bool }
{
\seq_if_in:NxT
@@ -11542,9 +11698,9 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\bool_lazy_all:nT
{
- { \int_compare_p:nNn \l_@@_multiplicity_int > 1 }
+ { \int_compare_p:nNn \l_@@_multiplicity_int > \c_one_int }
{ \cs_if_exist_p:N \CT@drsc@ }
- { ! \tl_if_blank_p:V \CT@drsc@ }
+ { ! \tl_if_blank_p:o \CT@drsc@ }
}
{
\group_begin:
@@ -11634,7 +11790,7 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_y_final_dim \l_@@_y_initial_dim
\@@_qpoint:n { col - \int_use:N \l_@@_local_start_int }
\dim_set_eq:NN \l_@@_x_initial_dim \pgf@x
- \int_compare:nNnT \l_@@_local_start_int = 1
+ \int_compare:nNnT \l_@@_local_start_int = \c_one_int
{
\dim_sub:Nn \l_@@_x_initial_dim \l_@@_left_margin_dim
\bool_if:NF \g_@@_delims_bool
@@ -11688,7 +11844,7 @@ version 2005/12/01 or later.
\dim_set:Nn \l_tmpb_dim { \pgf@y - 0.5 \l_@@_rule_width_dim }
\@@_qpoint:n { col - \int_eval:n { \l_@@_local_end_int + 1 } }
\dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
- \exp_args:NV \tikzset \l_@@_tikz_rule_tl
+ \exp_args:No \tikzset \l_@@_tikz_rule_tl
\use:e { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpa_dim , \l_tmpb_dim ) --
( \l_@@_tmpc_dim , \l_tmpb_dim ) ;
@@ -11705,17 +11861,14 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_draw_hlines:
{
\int_step_inline:nnn
+ { \bool_lazy_or:nnTF \g_@@_delims_bool \l_@@_except_borders_bool 2 1 }
{
- \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
- 1 2
- }
- {
- \bool_if:nTF { ! \g_@@_delims_bool && ! \l_@@_except_borders_bool }
- { \int_eval:n { \c@iRow + 1 } }
+ \bool_lazy_or:nnTF \g_@@_delims_bool \l_@@_except_borders_bool
\c@iRow
+ { \int_eval:n { \c@iRow + 1 } }
}
{
- \tl_if_eq:NnF \l_@@_hlines_clist { all }
+ \tl_if_eq:NNF \l_@@_hlines_clist \c_@@_all_tl
{ \clist_if_in:NnT \l_@@_hlines_clist { ##1 } }
{ \@@_hline:n { position = ##1 , total-width = \arrayrulewidth } }
}
@@ -11759,7 +11912,7 @@ version 2005/12/01 or later.
\cs_set:Npn \@@_Hline_iv:nn #1 #2
{
\@@_compute_rule_width:n { multiplicity = #1 , #2 }
- \skip_vertical:n { \l_@@_rule_width_dim }
+ \skip_vertical:N \l_@@_rule_width_dim
\tl_gput_right:Nx \g_@@_pre_code_after_tl
{
\@@_hline:n
@@ -11808,7 +11961,7 @@ version 2005/12/01 or later.
{ \str_if_empty_p:N \l_@@_ccommand_str }
}
{ \@@_error:n { No~letter~and~no~command } }
- { \exp_args:NV \@@_custom_line_i:n \l_@@_other_keys_tl }
+ { \exp_args:No \@@_custom_line_i:n \l_@@_other_keys_tl }
}
% \end{macrocode}
%
@@ -11847,12 +12000,11 @@ version 2005/12/01 or later.
\bool_if:NT \l_@@_color_bool
{ \@@_error:n { color~in~custom-line~with~tikz } }
}
- \bool_if:nT
+ \bool_if:NT \l_@@_dotted_rule_bool
{
- \int_compare_p:nNn \l_@@_multiplicity_int > 1
- && \l_@@_dotted_rule_bool
+ \int_compare:nNnT \l_@@_multiplicity_int > \c_one_int
+ { \@@_error:n { key~multiplicity~with~dotted } }
}
- { \@@_error:n { key~multiplicity~with~dotted } }
\str_if_empty:NF \l_@@_letter_str
{
\int_compare:nTF { \str_count:N \l_@@_letter_str != 1 }
@@ -11953,7 +12105,7 @@ version 2005/12/01 or later.
% |\noalign| (which is in |\Hline|).
% \begin{macrocode}
\cs_set:cpn { nicematrix - \l_@@_command_str } { \Hline [ #1 ] }
- \seq_put_left:NV \l_@@_custom_line_commands_seq \l_@@_command_str
+ \seq_put_left:No \l_@@_custom_line_commands_seq \l_@@_command_str
}
% \end{macrocode}
%
@@ -11983,7 +12135,7 @@ version 2005/12/01 or later.
{ \@@_c_custom_line_i:nn { #1 , ##1 } { ####1 } }
}
}
- \seq_put_left:NV \l_@@_custom_line_commands_seq \l_@@_ccommand_str
+ \seq_put_left:No \l_@@_custom_line_commands_seq \l_@@_ccommand_str
}
% \end{macrocode}
% The first argument is the list of key-value pairs characteristic of the line.
@@ -12072,14 +12224,17 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_hline_in_block:nnnnn #1 #2 #3 #4 #5
{
- \bool_lazy_all:nT
+ \int_compare:nNnT \l_tmpa_tl > { #1 }
{
- { \int_compare_p:nNn \l_tmpa_tl > { #1 } }
- { \int_compare_p:nNn \l_tmpa_tl < { #3 + 1 } }
- { \int_compare_p:nNn \l_tmpb_tl > { #2 - 1 } }
- { \int_compare_p:nNn \l_tmpb_tl < { #4 + 1 } }
+ \int_compare:nNnT \l_tmpa_tl < { #3 + 1 }
+ {
+ \int_compare:nNnT \l_tmpb_tl > { #2 - 1 }
+ {
+ \int_compare:nNnT \l_tmpb_tl < { #4 + 1 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ }
+ }
}
- { \bool_gset_false:N \g_tmpa_bool }
}
% \end{macrocode}
%
@@ -12087,46 +12242,53 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_vline_in_block:nnnnn #1 #2 #3 #4 #5
{
- \bool_lazy_all:nT
- {
- { \int_compare_p:nNn \l_tmpa_tl > { #1 - 1 } }
- { \int_compare_p:nNn \l_tmpa_tl < { #3 + 1 } }
- { \int_compare_p:nNn \l_tmpb_tl > { #2 } }
- { \int_compare_p:nNn \l_tmpb_tl < { #4 + 1 } }
+ \int_compare:nNnT \l_tmpa_tl > { #1 - 1 }
+ {
+ \int_compare:nNnT \l_tmpa_tl < { #3 + 1 }
+ {
+ \int_compare:nNnT \l_tmpb_tl > { #2 }
+ {
+ \int_compare:nNnT \l_tmpb_tl < { #4 + 1 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ }
+ }
}
- { \bool_gset_false:N \g_tmpa_bool }
}
% \end{macrocode}
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_hline_in_stroken_block:nnnn #1 #2 #3 #4
{
- \bool_lazy_all:nT
- {
- {
- ( \int_compare_p:nNn \l_tmpa_tl = { #1 } )
- || ( \int_compare_p:nNn \l_tmpa_tl = { #3 + 1 } )
- }
- { \int_compare_p:nNn \l_tmpb_tl > { #2 - 1 } }
- { \int_compare_p:nNn \l_tmpb_tl < { #4 + 1 } }
+ \int_compare:nNnT \l_tmpb_tl > { #2 - 1 }
+ {
+ \int_compare:nNnT \l_tmpb_tl < { #4 + 1 }
+ {
+ \int_compare:nNnTF \l_tmpa_tl = { #1 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ {
+ \int_compare:nNnT \l_tmpa_tl = { #3 + 1 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ }
+ }
}
- { \bool_gset_false:N \g_tmpa_bool }
}
% \end{macrocode}
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_test_vline_in_stroken_block:nnnn #1 #2 #3 #4
{
- \bool_lazy_all:nT
+ \int_compare:nNnT \l_tmpa_tl > { #1 - 1 }
{
- { \int_compare_p:nNn \l_tmpa_tl > { #1 - 1 } }
- { \int_compare_p:nNn \l_tmpa_tl < { #3 + 1 } }
- {
- ( \int_compare_p:nNn \l_tmpb_tl = { #2 } )
- || ( \int_compare_p:nNn \l_tmpb_tl = { #4 + 1 } )
- }
+ \int_compare:nNnT \l_tmpa_tl < { #3 + 1 }
+ {
+ \int_compare:nNnTF \l_tmpb_tl = { #2 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ {
+ \int_compare:nNnT \l_tmpb_tl = { #4 + 1 }
+ { \bool_gset_false:N \g_tmpa_bool }
+ }
+ }
}
- { \bool_gset_false:N \g_tmpa_bool }
}
% \end{macrocode}
%
@@ -12301,15 +12463,15 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
-\cs_new_protected:Npn \@@_test_if_cell_in_block:nnnnnnn #1 #2 #3 #4 #5 #6 #7
+\cs_set_protected:Npn \@@_test_if_cell_in_block:nnnnnnn #1 #2 #3 #4 #5 #6 #7
{
- \int_compare:nNnT { #3 } < { \int_eval:n { #1 + 1 } }
+ \int_compare:nNnF { #3 } > { #1 }
{
- \int_compare:nNnT { #1 } < { \int_eval:n { #5 + 1 } }
+ \int_compare:nNnF { #1 } > { #5 }
{
- \int_compare:nNnT { #4 } < { \int_eval:n { #2 + 1 } }
+ \int_compare:nNnF { #4 } > { #2 }
{
- \int_compare:nNnT { #2 } < { \int_eval:n { #6 + 1 } }
+ \int_compare:nNnF { #2 } > { #6 }
{ \bool_set_true:N \l_tmpb_bool }
}
}
@@ -12565,7 +12727,7 @@ version 2005/12/01 or later.
% Now, we can create the ``medium nodes''. We use a command |\@@_create_nodes:|
% because this command will also be used for the creation of the ``large nodes''.
% \begin{macrocode}
- \tl_set:Nn \l_@@_suffix_tl { -medium }
+ \cs_set_nopar:Npn \l_@@_suffix_tl { -medium }
\@@_create_nodes:
\endpgfpicture
}
@@ -12588,7 +12750,7 @@ version 2005/12/01 or later.
\pgf@relevantforpicturesizefalse
\@@_computations_for_medium_nodes:
\@@_computations_for_large_nodes:
- \tl_set:Nn \l_@@_suffix_tl { - large }
+ \cs_set_nopar:Npn \l_@@_suffix_tl { - large }
\@@_create_nodes:
\endpgfpicture
}
@@ -12605,10 +12767,10 @@ version 2005/12/01 or later.
% Now, we can create the ``medium nodes''. We use a command |\@@_create_nodes:|
% because this command will also be used for the creation of the ``large nodes''.
% \begin{macrocode}
- \tl_set:Nn \l_@@_suffix_tl { - medium }
+ \cs_set_nopar:Npn \l_@@_suffix_tl { - medium }
\@@_create_nodes:
\@@_computations_for_large_nodes:
- \tl_set:Nn \l_@@_suffix_tl { - large }
+ \cs_set_nopar:Npn \l_@@_suffix_tl { - large }
\@@_create_nodes:
\endpgfpicture
}
@@ -12622,8 +12784,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_computations_for_large_nodes:
{
- \int_set:Nn \l_@@_first_row_int 1
- \int_set:Nn \l_@@_first_col_int 1
+ \int_set_eq:NN \l_@@_first_row_int \c_one_int
+ \int_set_eq:NN \l_@@_first_col_int \c_one_int
% \end{macrocode}
% We have to change the values of all the dimensions
% \texttt{l_@@_row_\textsl{i}_min_dim}, \texttt{l_@@_row_\textsl{i}_max_dim},
@@ -12777,13 +12939,13 @@ version 2005/12/01 or later.
R .value_forbidden:n = true ,
C .code:n = \str_set:Nn \l_@@_hpos_block_str c ,
C .value_forbidden:n = true ,
- t .code:n = \str_set:Nn \l_@@_vpos_of_block_str t ,
+ t .code:n = \str_set:Nn \l_@@_vpos_block_str t ,
t .value_forbidden:n = true ,
- T .code:n = \str_set:Nn \l_@@_vpos_of_block_str T ,
+ T .code:n = \str_set:Nn \l_@@_vpos_block_str T ,
T .value_forbidden:n = true ,
- b .code:n = \str_set:Nn \l_@@_vpos_of_block_str b ,
+ b .code:n = \str_set:Nn \l_@@_vpos_block_str b ,
b .value_forbidden:n = true ,
- B .code:n = \str_set:Nn \l_@@_vpos_of_block_str B ,
+ B .code:n = \str_set:Nn \l_@@_vpos_block_str B ,
B .value_forbidden:n = true ,
color .code:n =
\@@_color:n { #1 }
@@ -12792,8 +12954,9 @@ version 2005/12/01 or later.
{ \char_set_catcode_other:N ! }
{ #1 } ,
color .value_required:n = true ,
- respect-arraystretch .bool_set:N = \l_@@_respect_arraystretch_bool ,
- respect-arraystretch .default:n = true
+ respect-arraystretch .code:n =
+ \cs_set_eq:NN \@@_reset_arraystretch: \prg_do_nothing: ,
+ respect-arraystretch .value_forbidden:n = true ,
}
% \end{macrocode}
%
@@ -12819,7 +12982,7 @@ version 2005/12/01 or later.
\peek_remove_spaces:n
{
\tl_if_blank:nTF { #2 }
- { \@@_Block_i 1-1 \q_stop }
+ { \@@_Block_ii:nnnnn \c_one_int \c_one_int }
{
\int_compare:nNnTF { \char_value_catcode:n { 45 } } = { 13 }
\@@_Block_i_czech \@@_Block_i
@@ -12882,13 +13045,13 @@ version 2005/12/01 or later.
% \medskip
% If the block is mono-column.
% \begin{macrocode}
- \int_compare:nNnTF \l_tmpb_int = 1
+ \int_compare:nNnTF \l_tmpb_int = \c_one_int
{
- \str_if_empty:NTF \l_@@_hpos_cell_str
- { \str_set:Nn \l_@@_hpos_block_str c }
- { \str_set_eq:NN \l_@@_hpos_block_str \l_@@_hpos_cell_str }
+ \tl_if_empty:NTF \l_@@_hpos_cell_tl
+ { \str_set_eq:NN \l_@@_hpos_block_str \c_@@_c_str }
+ { \str_set:NV \l_@@_hpos_block_str \l_@@_hpos_cell_tl }
}
- { \str_set:Nn \l_@@_hpos_block_str c }
+ { \str_set_eq:NN \l_@@_hpos_block_str \c_@@_c_str }
% \end{macrocode}
% The value of |\l_@@_hpos_block_str| may be modified by the keys of the
% command |\Block| that we will analyze now.
@@ -12921,9 +13084,9 @@ version 2005/12/01 or later.
\bool_if:nTF
{
(
- \int_compare_p:nNn { \l_tmpa_int } = 1
+ \int_compare_p:nNn \l_tmpa_int = \c_one_int
||
- \int_compare_p:nNn { \l_tmpb_int } = 1
+ \int_compare_p:nNn \l_tmpb_int = \c_one_int
)
&& ! \tl_if_empty_p:n { #5 }
% \end{macrocode}
@@ -12994,15 +13157,15 @@ version 2005/12/01 or later.
% |\documentclass| with |\RequirePackage{expl3}|).
% \begin{macrocode}
\tl_if_empty:NTF \l_@@_color_tl
- { \int_compare:nNnT { #2 } = 1 \set@color }
- { \@@_color:V \l_@@_color_tl }
+ { \int_compare:nNnT { #2 } = \c_one_int \set@color }
+ { \@@_color:o \l_@@_color_tl }
% \end{macrocode}
% If the block is mono-row, we use |\g_@@_row_style_tl| even if it has yet been
% used in the beginning of the cell where the command |\Block| has been issued
% because we want to be able to take into account a potential instruction of
% color of the font in |\g_@@_row_style_tl|.
% \begin{macrocode}
- \int_compare:nNnT { #1 } = 1
+ \int_compare:nNnT { #1 } = \c_one_int
{
\int_if_zero:nTF \c@iRow
\l_@@_code_for_first_row_tl
@@ -13012,8 +13175,10 @@ version 2005/12/01 or later.
}
\g_@@_row_style_tl
}
- \bool_if:NF \l_@@_respect_arraystretch_bool
- { \cs_set:Npn \arraystretch { 1 } }
+% \end{macrocode}
+% The following command will be no-op when |respect-arraystretch| is in force.
+% \begin{macrocode}
+ \@@_reset_arraystretch:
\dim_zero:N \extrarowheight
% \end{macrocode}
% |#4| is the optional argument of the command |\Block|, provided with the
@@ -13039,12 +13204,12 @@ version 2005/12/01 or later.
{
\bool_lazy_all:nTF
{
- { \int_compare_p:nNn { #2 } = 1 }
+ { \int_compare_p:nNn { #2 } = \c_one_int }
% \end{macrocode}
% Remind that, when the column has not a fixed width, the dimension
% |\l_@@_col_width_dim| has the conventional value of $-1$~cm.
% \begin{macrocode}
- { \dim_compare_p:n { \l_@@_col_width_dim >= \c_zero_dim } }
+ { ! \dim_compare_p:nNn \l_@@_col_width_dim < \c_zero_dim }
{ ! \g_@@_rotate_bool }
}
% \end{macrocode}
@@ -13055,9 +13220,9 @@ version 2005/12/01 or later.
\use:e
{
\exp_not:N \begin { minipage }%
- [ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
+ [ \str_lowercase:V \l_@@_vpos_block_str ]
{ \l_@@_col_width_dim }
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{ c \centering r \raggedleft l \raggedright }
}
#5
@@ -13070,7 +13235,7 @@ version 2005/12/01 or later.
\use:e
{
\exp_not:N \begin { tabular }%
- [ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
+ [ \str_lowercase:V \l_@@_vpos_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
}
#5
@@ -13086,7 +13251,7 @@ version 2005/12/01 or later.
\use:e
{
\exp_not:N \begin { array }%
- [ \str_lowercase:V { \l_@@_vpos_of_block_str } ]
+ [ \str_lowercase:V \l_@@_vpos_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
}
#5
@@ -13108,7 +13273,7 @@ version 2005/12/01 or later.
% If we are in a mono-column block, we take into account the width of that block
% for the width of the column.
% \begin{macrocode}
- \int_compare:nNnT { #2 } = 1
+ \int_compare:nNnT { #2 } = \c_one_int
{
\dim_gset:Nn \g_@@_blocks_wd_dim
{
@@ -13129,9 +13294,9 @@ version 2005/12/01 or later.
% |b| or |B|.}, we take into account the height and the depth of that block for the
% height and the depth of the row.
% \begin{macrocode}
- \str_if_eq:VnT \l_@@_vpos_of_block_str { c }
+ \str_if_eq:VnT \l_@@_vpos_block_str { c }
{
- \int_compare:nNnT { #1 } = 1
+ \int_compare:nNnT { #1 } = \c_one_int
{
\dim_gset:Nn \g_@@_blocks_ht_dim
{
@@ -13197,7 +13362,7 @@ version 2005/12/01 or later.
\bool_if:NTF \g_@@_rotate_c_bool
{ c }
{
- \str_case:VnF \l_@@_vpos_of_block_str
+ \str_case:onF \l_@@_vpos_block_str
{ b l B l t r T r }
{ \int_compare:nNnTF \c@iRow = \l_@@_last_row_int r l }
}
@@ -13264,8 +13429,10 @@ version 2005/12/01 or later.
\bool_if:NTF \l_@@_tabular_bool
{
\group_begin:
- \bool_if:NF \l_@@_respect_arraystretch_bool
- { \cs_set:Npn \exp_not:N \arraystretch { 1 } }
+% \end{macrocode}
+% The following command will be no-op when |respect-arraystretch| is in force.
+% \begin{macrocode}
+ \@@_reset_arraystretch:
\exp_not:n
{
\dim_zero:N \extrarowheight
@@ -13278,10 +13445,9 @@ version 2005/12/01 or later.
% the tabular is the same as the external alignment of the tabular (that is to
% say the position of the block in its zone of merged cells).
% \begin{macrocode}
- % \@@_adjust_hpos_rotate:
\use:e
{
- \exp_not:N \begin { tabular } [ \l_@@_vpos_of_block_str ]
+ \exp_not:N \begin { tabular } [ \l_@@_vpos_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
}
#5
@@ -13294,17 +13460,18 @@ version 2005/12/01 or later.
% \begin{macrocode}
{
\group_begin:
- \bool_if:NF \l_@@_respect_arraystretch_bool
- { \cs_set:Npn \exp_not:N \arraystretch { 1 } }
+% \end{macrocode}
+% The following will be no-op when |respect-arraystretch| is in force.
+% \begin{macrocode}
+ \@@_reset_arraystretch:
\exp_not:n
{
\dim_zero:N \extrarowheight
#4
- % \@@_adjust_hpos_rotate:
- \c_math_toggle_token % :n c
+ \c_math_toggle_token
\use:e
{
- \exp_not:N \begin { array } [ \l_@@_vpos_of_block_str ]
+ \exp_not:N \begin { array } [ \l_@@_vpos_block_str ]
{ @ { } \l_@@_hpos_block_str @ { } }
}
#5
@@ -13376,16 +13543,18 @@ version 2005/12/01 or later.
\bool_set_true:N \l_@@_hpos_of_block_cap_bool ,
C .code:n = \str_set:Nn \l_@@_hpos_block_str c
\bool_set_true:N \l_@@_hpos_of_block_cap_bool ,
- t .code:n = \str_set:Nn \l_@@_vpos_of_block_str t ,
- T .code:n = \str_set:Nn \l_@@_vpos_of_block_str T ,
- b .code:n = \str_set:Nn \l_@@_vpos_of_block_str b ,
- B .code:n = \str_set:Nn \l_@@_vpos_of_block_str B ,
- v-center .code:n = \str_set:Nn \l_@@_vpos_of_block_str { c } ,
+ t .code:n = \str_set:Nn \l_@@_vpos_block_str t ,
+ T .code:n = \str_set:Nn \l_@@_vpos_block_str T ,
+ b .code:n = \str_set:Nn \l_@@_vpos_block_str b ,
+ B .code:n = \str_set:Nn \l_@@_vpos_block_str B ,
+ v-center .code:n = \str_set:Nn \l_@@_vpos_block_str { c } ,
v-center .value_forbidden:n = true ,
name .tl_set:N = \l_@@_block_name_str ,
name .value_required:n = true ,
name .initial:n = ,
- respect-arraystretch .bool_set:N = \l_@@_respect_arraystretch_bool ,
+ respect-arraystretch .code:n =
+ \cs_set_eq:NN \@@_reset_arraystretch: \prg_do_nothing: ,
+ respect-arraystretch .value_forbidden:n = true ,
transparent .bool_set:N = \l_@@_transparent_bool ,
transparent .default:n = true ,
transparent .initial:n = false ,
@@ -13435,10 +13604,7 @@ version 2005/12/01 or later.
{
\bool_lazy_and:nnTF
\l_@@_preamble_bool
- {
- \int_compare_p:n
- { \l_@@_last_col_int <= \g_@@_static_num_of_col_int }
- }
+ { \int_compare_p:nNnF \l_@@_last_col_int > \g_@@_static_num_of_col_int }
{
\msg_error:nnnn { nicematrix } { Block~too~large~2 } { #1 } { #2 }
\@@_msg_redirect_name:nn { Block~too~large~2 } { none }
@@ -13471,7 +13637,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\int_compare:nNnT { #1 } = { #3 }
- { \str_set:Nn \l_@@_vpos_of_block_str { t } }
+ { \str_set:Nn \l_@@_vpos_block_str { t } }
\keys_set:nn { NiceMatrix / Block / SecondPass } { #5 }
% \end{macrocode}
%
@@ -13496,28 +13662,28 @@ version 2005/12/01 or later.
{ \int_use:N \l_@@_last_row_int - \int_use:N \l_@@_last_col_int }
}
}
- \bool_if:nF
+ \bool_if:NF \l_@@_transparent_bool
{
- \l_@@_transparent_bool
- || ( \l_@@_vlines_block_bool && \l_@@_hlines_block_bool )
- }
- {
+ \bool_lazy_and:nnF \l_@@_vlines_block_bool \l_@@_hlines_block_bool
+ {
% \end{macrocode}
% The sequence of the positions of the blocks (excepted the blocks with the key
% |hvlines|) will be used when drawing the rules (in fact, there is also the
% |\multicolumn| and the |\diagbox| in that sequence).
% \begin{macrocode}
- \seq_gput_left:Nx \g_@@_pos_of_blocks_seq
- { { #1 } { #2 } { #3 } { #4 } { \l_@@_block_name_str } }
+ \seq_gput_left:Nx \g_@@_pos_of_blocks_seq
+ { { #1 } { #2 } { #3 } { #4 } { \l_@@_block_name_str } }
+ }
}
% \end{macrocode}
%
% \bigskip
% \begin{macrocode}
- \bool_lazy_and:nnT
- { ! (\tl_if_empty_p:N \l_@@_draw_tl) }
- { \l_@@_hlines_block_bool || \l_@@_vlines_block_bool }
- { \@@_error:n { hlines~with~color } }
+ \tl_if_empty:NF \l_@@_draw_tl
+ {
+ \bool_lazy_or:nnT \l_@@_hlines_block_bool \l_@@_vlines_block_bool
+ { \@@_error:n { hlines~with~color } }
+ }
% \end{macrocode}
% \bigskip
% \begin{macrocode}
@@ -13558,7 +13724,7 @@ version 2005/12/01 or later.
\tl_set:Nx \l_@@_fill_tl
{
[ opacity = \l_@@_opacity_tl ,
- \tl_tail:V \l_@@_fill_tl
+ \tl_tail:o \l_@@_fill_tl
}
}
{
@@ -13569,7 +13735,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nx \g_@@_pre_code_before_tl
{
\exp_not:N \roundedrectanglecolor
- \exp_args:NV \tl_if_head_eq_meaning:nNTF \l_@@_fill_tl [
+ \exp_args:No \tl_if_head_eq_meaning:nNTF \l_@@_fill_tl [
{ \l_@@_fill_tl }
{ { \l_@@_fill_tl } }
{ #1 - #2 }
@@ -13796,9 +13962,9 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_lazy_any:nTF
{
- { \str_if_eq_p:Vn \l_@@_vpos_of_block_str { c } }
- { \str_if_eq_p:Vn \l_@@_vpos_of_block_str { T } }
- { \str_if_eq_p:Vn \l_@@_vpos_of_block_str { B } }
+ { \str_if_eq_p:on \l_@@_vpos_block_str { c } }
+ { \str_if_eq_p:on \l_@@_vpos_block_str { T } }
+ { \str_if_eq_p:on \l_@@_vpos_block_str { B } }
}
% \end{macrocode}
% \medskip
@@ -13807,24 +13973,24 @@ version 2005/12/01 or later.
% \end{macrocode}
% If we are in the first column, we must put the block as if it was with the key~|r|.
% \begin{macrocode}
- \int_if_zero:nT { #2 } { \str_set:Nn \l_@@_hpos_block_str r }
+ \int_if_zero:nT { #2 } { \str_set_eq:NN \l_@@_hpos_block_str \c_@@_r_str }
% \end{macrocode}
% If we are in the last column, we must put the block as if it was with the key~|l|.
% \begin{macrocode}
\bool_if:nT \g_@@_last_col_found_bool
{
\int_compare:nNnT { #2 } = \g_@@_col_total_int
- { \str_set:Nn \l_@@_hpos_block_str l }
+ { \str_set_eq:NN \l_@@_hpos_block_str \c_@@_l_str }
}
% \end{macrocode}
% |\l_tmpa_tl| will contain the anchor of the \textsc{pgf} node which will be used.
% \begin{macrocode}
\tl_set:Nx \l_tmpa_tl
{
- \str_case:Vn \l_@@_vpos_of_block_str
+ \str_case:on \l_@@_vpos_block_str
{
c {
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{
c { center }
l { west }
@@ -13833,7 +13999,7 @@ version 2005/12/01 or later.
}
T {
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{
c { north }
l { north~west }
@@ -13842,7 +14008,7 @@ version 2005/12/01 or later.
}
B {
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{
c { south}
l { south~west }
@@ -13866,7 +14032,7 @@ version 2005/12/01 or later.
\pgfset
{
inner~xsep = \c_zero_dim ,
- inner~ysep = \l_@@_block_ysep_dim
+ inner~ysep = \c_zero_dim
}
\pgfnode
{ rectangle }
@@ -13874,7 +14040,7 @@ version 2005/12/01 or later.
{ \box_use_drop:N \l_@@_cell_box } { } { }
}
% \end{macrocode}
-% End of the case when |\l_@@_vpos_of_block_str| is equal to |c|, |T| or |B|.
+% End of the case when |\l_@@_vpos_block_str| is equal to |c|, |T| or |B|.
% Now, the other cases.
% \begin{macrocode}
{
@@ -13885,7 +14051,7 @@ version 2005/12/01 or later.
{
\@@_qpoint:n
{
- row - \str_if_eq:VnTF \l_@@_vpos_of_block_str { b } { #3 } { #1 }
+ row - \str_if_eq:onTF \l_@@_vpos_block_str { b } { #3 } { #1 }
- base
}
}
@@ -13899,7 +14065,7 @@ version 2005/12/01 or later.
\bool_if:NF \l_@@_hpos_of_block_cap_bool { - short }
}
{
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{
c { center }
l { west }
@@ -13914,7 +14080,7 @@ version 2005/12/01 or later.
\pgfnode
{ rectangle }
{
- \str_case:Vn \l_@@_hpos_block_str
+ \str_case:on \l_@@_hpos_block_str
{
c { base }
l { base~west }
@@ -13953,9 +14119,9 @@ version 2005/12/01 or later.
% If the user has used the key |color| of the command |\Block| without value,
% the color fixed by |\arrayrulecolor| is used.
% \begin{macrocode}
- \str_if_eq:VnTF \l_@@_draw_tl { default }
+ \tl_if_eq:NNTF \l_@@_draw_tl \c_@@_default_tl
{ \CT@arc@ }
- { \@@_color:V \l_@@_draw_tl }
+ { \@@_color:o \l_@@_draw_tl }
}
\pgfsetcornersarced
{
@@ -13964,30 +14130,31 @@ version 2005/12/01 or later.
{ \l_@@_rounded_corners_dim }
}
\@@_cut_on_hyphen:w #2 \q_stop
- \bool_lazy_and:nnT
- { \int_compare_p:n { \l_tmpa_tl <= \c@iRow } }
- { \int_compare_p:n { \l_tmpb_tl <= \c@jCol } }
- {
- \@@_qpoint:n { row - \l_tmpa_tl }
- \dim_set_eq:NN \l_tmpb_dim \pgf@y
- \@@_qpoint:n { col - \l_tmpb_tl }
- \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
- \@@_cut_on_hyphen:w #3 \q_stop
- \int_compare:nNnT \l_tmpa_tl > \c@iRow
- { \tl_set:Nx \l_tmpa_tl { \int_use:N \c@iRow } }
- \int_compare:nNnT \l_tmpb_tl > \c@jCol
- { \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
- \@@_qpoint:n { row - \int_eval:n { \l_tmpa_tl + 1 } }
- \dim_set_eq:NN \l_tmpa_dim \pgf@y
- \@@_qpoint:n { col - \int_eval:n { \l_tmpb_tl + 1 } }
- \dim_set_eq:NN \l_@@_tmpd_dim \pgf@x
- \pgfsetlinewidth { 1.1 \l_@@_line_width_dim }
- \pgfpathrectanglecorners
- { \pgfpoint \l_@@_tmpc_dim \l_tmpb_dim }
- { \pgfpoint \l_@@_tmpd_dim \l_tmpa_dim }
- \dim_compare:nNnTF \l_@@_rounded_corners_dim = \c_zero_dim
- { \pgfusepathqstroke }
- { \pgfusepath { stroke } }
+ \int_compare:nNnF \l_tmpa_tl > \c@iRow
+ {
+ \int_compare:nNnF \l_tmpb_tl > \c@jCol
+ {
+ \@@_qpoint:n { row - \l_tmpa_tl }
+ \dim_set_eq:NN \l_tmpb_dim \pgf@y
+ \@@_qpoint:n { col - \l_tmpb_tl }
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
+ \@@_cut_on_hyphen:w #3 \q_stop
+ \int_compare:nNnT \l_tmpa_tl > \c@iRow
+ { \tl_set:No \l_tmpa_tl { \int_use:N \c@iRow } }
+ \int_compare:nNnT \l_tmpb_tl > \c@jCol
+ { \tl_set:No \l_tmpb_tl { \int_use:N \c@jCol } }
+ \@@_qpoint:n { row - \int_eval:n { \l_tmpa_tl + 1 } }
+ \dim_set_eq:NN \l_tmpa_dim \pgf@y
+ \@@_qpoint:n { col - \int_eval:n { \l_tmpb_tl + 1 } }
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@x
+ \pgfsetlinewidth { 1.1 \l_@@_line_width_dim }
+ \pgfpathrectanglecorners
+ { \pgfpoint \l_@@_tmpc_dim \l_tmpb_dim }
+ { \pgfpoint \l_@@_tmpd_dim \l_tmpa_dim }
+ \dim_compare:nNnTF \l_@@_rounded_corners_dim = \c_zero_dim
+ { \pgfusepathqstroke }
+ { \pgfusepath { stroke } }
+ }
}
\endpgfpicture
\group_end:
@@ -14311,17 +14478,11 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\keys_set_known:nnN { NiceMatrix / Auto } { #6 } \l_tmpa_tl
-% \end{macrocode}
-% We nullify the command |\@@_transform_preamble_i:| because we will provide a
-% preamble which is yet transformed (by using |\l_@@_columns_type_tl| which is
-% yet nicematrix-ready).
-% \begin{macrocode}
- % \bool_set_false:N \l_@@_preamble_bool
\use:e
{
\exp_not:N \begin { NiceArrayWithDelims } { #1 } { #2 }
- { * { #4 } { \exp_not:V \l_@@_columns_type_tl } }
- [ \exp_not:V \l_tmpa_tl ]
+ { * { #4 } { \exp_not:o \l_@@_columns_type_tl } }
+ [ \exp_not:o \l_tmpa_tl ]
}
\int_if_zero:nT \l_@@_first_row_int
{
@@ -14406,7 +14567,7 @@ version 2005/12/01 or later.
% array, and it will extend, since it is no longer in |\l_@@_cell_box|.
% \begin{macrocode}
\cs_new_protected:Npn \@@_dotfill_i:
- { \dim_compare:nNnT { \box_wd:N \l_@@_cell_box } = \c_zero_dim \@@_old_dotfill }
+ { \dim_compare:nNnT { \box_wd:N \l_@@_cell_box } = \c_zero_dim \@@_old_dotfill }
% \end{macrocode}
%
% \bigskip
@@ -14497,7 +14658,7 @@ version 2005/12/01 or later.
\pgfnode { rectangle } { south~west }
{
\begin { minipage } { 20 cm }
- \@@_math_toggle_token: #5 \@@_math_toggle_token:
+ \@@_math_toggle: #5 \@@_math_toggle:
\end { minipage }
}
{ }
@@ -14508,7 +14669,7 @@ version 2005/12/01 or later.
{
\begin { minipage } { 20 cm }
\raggedleft
- \@@_math_toggle_token: #6 \@@_math_toggle_token:
+ \@@_math_toggle: #6 \@@_math_toggle:
\end { minipage }
}
{ }
@@ -14662,7 +14823,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\nullfont
\c_math_toggle_token
- \@@_color:V \l_@@_delimiters_color_tl
+ \@@_color:o \l_@@_delimiters_color_tl
\bool_if:nTF { #3 } { \left #1 } { \left . }
\vcenter
{
@@ -14820,9 +14981,9 @@ version 2005/12/01 or later.
% \begin{macrocode}
\hook_gput_code:nnn { begindocument } { . }
{
- \tl_set:Nn \l_@@_argspec_tl { m m m m O { } E { _ ^ } { { } { } } }
+ \cs_set_nopar:Npn \l_@@_argspec_tl { m m m m O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
- \exp_args:NNV \NewDocumentCommand \@@_SubMatrix \l_@@_argspec_tl
+ \exp_args:NNo \NewDocumentCommand \@@_SubMatrix \l_@@_argspec_tl
{
\peek_remove_spaces:n
{
@@ -14846,10 +15007,10 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_compute_i_j:nnnn #1 #2 #3 #4
{
- \tl_set:Nn \l_@@_first_i_tl { #1 }
- \tl_set:Nn \l_@@_first_j_tl { #2 }
- \tl_set:Nn \l_@@_last_i_tl { #3 }
- \tl_set:Nn \l_@@_last_j_tl { #4 }
+ \cs_set_nopar:Npn \l_@@_first_i_tl { #1 }
+ \cs_set_nopar:Npn \l_@@_first_j_tl { #2 }
+ \cs_set_nopar:Npn \l_@@_last_i_tl { #3 }
+ \cs_set_nopar:Npn \l_@@_last_j_tl { #4 }
\tl_if_eq:NnT \l_@@_first_i_tl { last }
{ \tl_set:NV \l_@@_first_i_tl \c@iRow }
\tl_if_eq:NnT \l_@@_first_j_tl { last }
@@ -14869,9 +15030,8 @@ version 2005/12/01 or later.
% The four following token lists correspond to the position of the |\SubMatrix|.
% \begin{macrocode}
\@@_compute_i_j:nn { #2 } { #3 }
- % added 6.19b
\int_compare:nNnT \l_@@_first_i_tl = \l_@@_last_i_tl
- { \cs_set:Npn \arraystretch { 1 } }
+ { \cs_set_nopar:Npn \arraystretch { 1 } }
\bool_lazy_or:nnTF
{ \int_compare_p:nNn \l_@@_last_i_tl > \g_@@_row_total_int }
{ \int_compare_p:nNn \l_@@_last_j_tl > \g_@@_col_total_int }
@@ -14969,7 +15129,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\group_begin:
\pgfsetlinewidth { 1.1 \arrayrulewidth }
- \@@_set_CT@arc@:V \l_@@_rules_color_tl
+ \@@_set_CT@arc@:o \l_@@_rules_color_tl
\CT@arc@
% \end{macrocode}
% Now, we draw the potential vertical rules specified in the preamble of the
@@ -15000,12 +15160,12 @@ version 2005/12/01 or later.
% The last argument of |\int_step_inline:nn| or |\clist_map_inline:Nn| is given
% by curryfication.
% \begin{macrocode}
- \tl_if_eq:NnTF \l_@@_submatrix_vlines_clist { all }
+ \tl_if_eq:NNTF \l_@@_submatrix_vlines_clist \c_@@_all_tl
{ \int_step_inline:nn { \l_@@_last_j_tl - \l_@@_first_j_tl } }
{ \clist_map_inline:Nn \l_@@_submatrix_vlines_clist }
{
\bool_lazy_and:nnTF
- { \int_compare_p:nNn { ##1 } > 0 }
+ { \int_compare_p:nNn { ##1 } > \c_zero_int }
{
\int_compare_p:nNn
{ ##1 } < { \l_@@_last_j_tl - \l_@@_first_j_tl + 1 } }
@@ -15025,12 +15185,12 @@ version 2005/12/01 or later.
% The last argument of |\int_step_inline:nn| or |\clist_map_inline:Nn| is given
% by curryfication.
% \begin{macrocode}
- \tl_if_eq:NnTF \l_@@_submatrix_hlines_clist { all }
+ \tl_if_eq:NNTF \l_@@_submatrix_hlines_clist \c_@@_all_tl
{ \int_step_inline:nn { \l_@@_last_i_tl - \l_@@_first_i_tl } }
{ \clist_map_inline:Nn \l_@@_submatrix_hlines_clist }
{
\bool_lazy_and:nnTF
- { \int_compare_p:nNn { ##1 } > 0 }
+ { \int_compare_p:nNn { ##1 } > \c_zero_int }
{
\int_compare_p:nNn
{ ##1 } < { \l_@@_last_i_tl - \l_@@_first_i_tl + 1 } }
@@ -15243,7 +15403,7 @@ version 2005/12/01 or later.
{
\nullfont
\c_math_toggle_token
- \@@_color:V \l_@@_delimiters_color_tl
+ \@@_color:o \l_@@_delimiters_color_tl
\left #1
\vcenter
{
@@ -15274,7 +15434,7 @@ version 2005/12/01 or later.
{
\nullfont
\c_math_toggle_token
- \@@_color:V \l_@@_delimiters_color_tl
+ \@@_color:o \l_@@_delimiters_color_tl
\left .
\vcenter
{
@@ -15433,14 +15593,14 @@ version 2005/12/01 or later.
{ rectangle }
{ south }
{
- \vbox_top:n
+ \vtop
{
\group_begin:
\everycr { }
\halign
{
\hfil ## \hfil \crcr
- \@@_math_toggle_token: #1 \@@_math_toggle_token: \cr
+ \@@_math_toggle: #1 \@@_math_toggle: \cr
\noalign { \skip_vertical:n { 3 pt } \nointerlineskip }
\c_math_toggle_token
\overbrace
@@ -15479,7 +15639,7 @@ version 2005/12/01 or later.
{
\group_begin:
\everycr { }
- \vbox:n
+ \vbox
{
\halign
{
@@ -15494,7 +15654,7 @@ version 2005/12/01 or later.
\c_math_toggle_token
\cr
\noalign { \skip_vertical:n { 3 pt } \nointerlineskip }
- \@@_math_toggle_token: #1 \@@_math_toggle_token: \cr
+ \@@_math_toggle: #1 \@@_math_toggle: \cr
}
}
\group_end:
@@ -15958,13 +16118,13 @@ version 2005/12/01 or later.
% \bigskip
% If the user uses too much columns, the command |\@@_error_too_much_cols:| is
% triggered. This command raises an error but also tries to give the best
-% information to the user in the error message. The command |\seq_if_in:NVTF| is
+% information to the user in the error message. The command |\seq_if_in:NoTF| is
% not expandable and that's why we can't put it in the error message itself. We
% have to do the test before the |\@@_fatal:n|.
% \begin{macrocode}
\cs_new_protected:Npn \@@_error_too_much_cols:
{
- \seq_if_in:NVTF \g_@@_types_of_matrix_seq \g_@@_name_env_str
+ \seq_if_in:NoTF \g_@@_types_of_matrix_seq \g_@@_name_env_str
{
\int_compare:nNnTF \l_@@_last_col_int = { -2 }
{ \@@_fatal:n { too~much~cols~for~matrix } }
@@ -15986,7 +16146,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new:Npn \@@_message_hdotsfor:
{
- \tl_if_empty:VF \g_@@_HVdotsfor_lines_tl
+ \tl_if_empty:oF \g_@@_HVdotsfor_lines_tl
{ ~Maybe~your~use~of~\token_to_str:N \Hdotsfor\ is~incorrect.}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/nicematrix/nicematrix-code.pdf b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
index 5bf3af42b3..d35a38c358 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-code.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 7ed598c337..a2a0d2e235 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index 1524409d3f..d11b8c8d1c 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -361,7 +361,7 @@ rangée (avec |{tabular}| ou |{array}| de \pkg{array}, il faut utiliser
\item un item
\smallskip
\item \renewcommand{\arraystretch}{1.2}
-$\begin{NiceArray}[t]{lcccccc}
+$\begin{NiceArray}~emphase#[t]@{lcccccc}
\hline
n & 0 & 1 & 2 & 3 & 4 & 5 \\
u_n & 1 & 2 & 4 & 8 & 16 & 32
@@ -1400,10 +1400,10 @@ comme non vide par \pkg{nicematrix} avec la commande |\NotEmpty|.
\medskip
\begin{minipage}{9cm}
-Dans l'exemple ci-contre (où B est au centre d'un |\Block| de taille $2\times 2$),
+Dans l'exemple ci-contre (où B est au centre d'un |\Block| de taille $2\times2$),
on a colorié en bleu clair les quatre coins (vides) du tableau.
\end{minipage}\hspace{2cm}%
-\begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt]
+\begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt,hvlines,rules={color=white,width=0.1pt}]
\CodeBefore
\rectanglecolor{blue!10}{1-1}{4-2}
\rectanglecolor{blue!10}{1-1}{1-4}
@@ -1422,7 +1422,6 @@ A & A & A & A & A & A \\
& & & A \\
\end{NiceTabular}
-
\medskip
Quand la clé |corners|\footnote{La clé \texttt{corners} dont on parle là
n'a pas de rapport direct avec la clé \texttt{rounded-corners},
@@ -1494,7 +1493,7 @@ dans les coins (cf.~p.~\pageref{color-in-code-before}). La commande
p.~\pageref{TikzEveryCell}) tient également compte des coins.
-\subsection{La commande \textbackslash diagbox}
+\subsubsection{La commande \textbackslash diagbox}
\indexcommand{diagbox}
@@ -1525,7 +1524,7 @@ Cette commande |\diagbox| peut aussi être utilisée dans un |\Block|.
-\subsection{Commandes pour filets personnalisés}
+\subsubsection{Commandes pour filets personnalisés}
\label{custom-line}
\index{command (clé de «custom-line»)}
\index{ccommand (clé de «custom-line»)}
@@ -6037,7 +6036,7 @@ la dernière case (deuxième rangée et deuxième colonne) est vide.
\medskip
\item Pour les colonnes de type |p|, |m|, |b|, |V|\footnote{Les colonnes de type
- |V| sont fournies par l'extension \pkg{varwidth}: cf.~p.~\pageref{varwidth}}
+ |V| sont fournies par l'extension \pkg{varwidth}, qui doit être chargée : cf.~p.~\pageref{varwidth}}
ou |X|\footnote{Pour les colonnes |X|, voir p.~\pageref{colonne-X}}, la case est vide si (et seulement
si) son contenu dans le codage TeX est vide (il n'y a que des espaces entre les
deux esperluettes |&|).
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 242451d506..144a5986d0 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix.tex b/macros/latex/contrib/nicematrix/nicematrix.tex
index ec7ed5c96d..71ab7c036d 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix.tex
@@ -1,5 +1,5 @@
% -*- coding: utf-8 ; -*- This file should be compiled with XeLaTeX only
-\documentclass[dvipsnames]{article}% dvipsnames is for xcolor (loaded by Tikz, loaded by nicematrix)
+\documentclass[dvipsnames]{article}% dvipsnames is for xcolor (loaded by TikZ, loaded by nicematrix)
\usepackage{xltxtra}
\usepackage{geometry}
@@ -168,7 +168,7 @@ a sufficient number of compilations.}
\medskip
Most features of \pkg{nicematrix} may be used without explicit use of
-\textsc{pgf} or Tikz (which, in fact, is not loaded by default).
+\textsc{pgf} or TikZ (which, in fact, is not loaded by default).
\medskip
\indexcommand{NiceMatrixOptions}
@@ -552,7 +552,7 @@ only when one of the keys |draw|, |hvlines|, |vlines| and |hlines| is used);
the key \Definition{rounded-corners} requires rounded corners (for the
frame drawn by |draw| and the shape drawn by |fill|) with a radius equal to
the value of that key (the default value is 4~pt\footnote{This value is the
-initial value of the \emph{rounded corners} of Tikz.}).
+initial value of the \emph{rounded corners} of TikZ.}).
\end{itemize}
\medskip
@@ -570,15 +570,15 @@ borders of the blocks; the value of that key is a (comma-separated) list of
elements covered by |left|, |right|, |top| and |bottom|; it's possible, in
fact, in the list which is the value of the key |borders|, to add an entry of
the form |tikz={|\textsl{list}|}| where \textsl{list} is a list of couples
-\textsl{key=value} of Tikz specifying the graphical characteristics of the
+\textsl{key=value} of TikZ specifying the graphical characteristics of the
lines that will be drawn (for an example, see p.~\pageref{dashed}).
\item \index{tikzz@tikz!key of \texttt{\textbackslash Block}}
-When the key \Definition{tikz} is used, the Tikz path corresponding of
-the rectangle which delimits the block is executed with Tikz\footnote{Tikz
+When the key \Definition{tikz} is used, the TikZ path corresponding of
+the rectangle which delimits the block is executed with TikZ\footnote{TikZ
should be loaded (by default, \pkg{nicematrix} only loads \textsc{pgf}) and,
if it's not, an error will be raised.} by using as options the value of that
-key |tikz| (which must be a list of keys allowed for a Tikz path).
+key |tikz| (which must be a list of keys allowed for a TikZ path).
\colorbox{yellow!50}{\textbf{New 6.24}}\enskip In fact, in the list of the keys
provided by the user as value of |tikz|, it's possible to put a key |offset|.
@@ -597,8 +597,8 @@ There is also some technical keys:
\begin{itemize}
\item \index{name!key of \texttt{\textbackslash Block}}
-the key \Definition{name} provides a name to the rectangular Tikz node
-corresponding to the block; it's possible to use that name with Tikz in the
+the key \Definition{name} provides a name to the rectangular TikZ node
+corresponding to the block; it's possible to use that name with TikZ in the
|\CodeAfter| of the environment (cf.~p.~\pageref{code-after});
\item \index{respect-arraystretch (key of \texttt{\textbackslash Block})}
the key \Definition{respect-arraystretch} prevents the setting of
@@ -1358,7 +1358,9 @@ to consider that cell as not empty with the key |\NotEmpty|.
In the example on the right (where B is in the center of a block of size
$2\times2$), we have colored in blue the four (empty) corners of the array.
\end{minipage}\hspace{2cm}%
-\begin{NiceTabular}{*{6}{c}}[cell-space-top-limit=3pt]
+\begin{NiceTabular}
+ [cell-space-top-limit=3pt,hvlines,rules={color=white,width=0.1pt}]
+ {*{6}{c}}
\CodeBefore
\rectanglecolor{blue!10}{1-1}{4-2}
\rectanglecolor{blue!10}{1-1}{1-4}
@@ -1446,7 +1448,7 @@ the cells which are in the corners (cf.~p.~\pageref{color-in-code-before}). The
command |\TikzEveryCell| available in the |\CodeBefore| and the |\CodeAfter|
(cf. p.~\pageref{TikzEveryCell}) takes also into account the empty corners.
-\subsection{The command \textbackslash diagbox}
+\subsubsection{The command \textbackslash diagbox}
\indexcommand{diagbox}
@@ -1477,7 +1479,7 @@ It's possible to use the command |\diagbox| in a |\Block|.
-\subsection{Commands for customized rules}
+\subsubsection{Commands for customized rules}
\label{custom-line}
\index{command (key of ``custom-line'')}
@@ -1580,12 +1582,12 @@ Product C & 5 & 4 & 1 \\
\index{tikzz@tikz!key of ``custom-line''}
\index{total-width (key of ``custom-line'')}
-It's possible to use the key |tikz| (if Tikz is loaded). In that case, the
-rule is drawn directly with Tikz by using as parameters the value of the key
+It's possible to use the key |tikz| (if TikZ is loaded). In that case, the
+rule is drawn directly with TikZ by using as parameters the value of the key
|tikz| which must be a list of \textsl{key=value} pairs which may be applied
-to a Tikz path.
+to a TikZ path.
-By default, no space is reserved for the rule that will be drawn with Tikz. It
+By default, no space is reserved for the rule that will be drawn with TikZ. It
is possible to specify a reservation (horizontal for a vertical rule and
vertical for an horizontal one) with the key |total-width|. That value of that
key, is, in some ways, the width of the rule that will be drawn
@@ -1595,7 +1597,7 @@ rule specified in |tikz|).
\bigskip
-Here is an example with the key |dotted| of Tikz.
+Here is an example with the key |dotted| of TikZ.
\begin{BVerbatim}[boxwidth=9cm,baseline=c]
\NiceMatrixOptions
@@ -1638,7 +1640,7 @@ seven & eight & nine
\indexcommand{hdottedline}
\indexcommand{cdottedline}
-As one can see, the dots of a dotted line of Tikz have the shape of a square,
+As one can see, the dots of a dotted line of TikZ have the shape of a square,
and not a circle. That's why the extension \pkg{nicematrix} provides in the
key |custom-line| a key |dotted| which will draw rounded dots. The initial
value of the key |total-width| is, in this case, equal to the diameter of the dots
@@ -1799,7 +1801,7 @@ documentation.\footnote{The available keys are |create-cell-nodes|,
New commands are available in that |\CodeBefore|: |\cellcolor|,
|\rectanglecolor|, |\rowcolor|, |\columncolor|, |\rowcolors|,
|\rowlistcolors|, |\chessboardcolors| and |\arraycolor|.\footnote{Remark that,
-in the |\CodeBefore|, PGF/Tikz nodes of the form ``\verb+(i-|j)+'' are
+in the |\CodeBefore|, PGF/TikZ nodes of the form ``\verb+(i-|j)+'' are
also available to indicate the position to the potential rules:
cf.~p.~\pageref{nodes-i}.}
\label{code-before}
@@ -2571,7 +2573,7 @@ is not suppressed (of course, it's possible to suppress this space by setting
\bigskip
It's possible to give the special value |auto| to the option |columns-width|:
all the columns of the array will have a width equal to the widest cell of the
-array.\footnote{The result is achieved with only one compilation (but PGF/Tikz
+array.\footnote{The result is achieved with only one compilation (but PGF/TikZ
will have written informations in the |aux| file and a message requiring a
second compilation will appear).}\par\nobreak
@@ -2791,7 +2793,7 @@ some very very very long text
\bigskip
Concerning \pkg{nicematrix}, one of the
interests of this type of columns is that, for a cell of a column of type~|V|,
-the PGF/Tikz node created by \pkg{nicematrix} for the content of that cell has
+the PGF/TikZ node created by \pkg{nicematrix} for the content of that cell has
a width adjusted to the content of the cell : cf. p.~\pageref{node-V}.
@@ -3452,7 +3454,7 @@ the current font).
\textbf{The option \Definition{xdots/line-style}}\par\nobreak
\smallskip
-It should be pointed that, by default, the lines drawn by Tikz with the
+It should be pointed that, by default, the lines drawn by TikZ with the
parameter |dotted| are composed of square dots (and not rounded
ones).\footnote{The first reason of this behaviour is that the \textsc{pdf}
format includes a description for dashed lines. The lines specified with this
@@ -3461,7 +3463,7 @@ easy, starting from these dashed lines,
to create a line composed by square dots whereas a line of rounded dots needs
a specification of each dot in the \textsc{pdf} file. Nevertheless, you can
have a look at the following page to see how to have dotted rules with rounded
-dots in Tikz:\newline \small
+dots in TikZ:\newline \small
\url{https://tex.stackexchange.com/questions/52848/tikz-line-with-large-dots}}
\begin{BVerbatim}[baseline=c,boxwidth=9cm]
@@ -3473,12 +3475,12 @@ dots in Tikz:\newline \small
In order to provide lines with rounded dots in the style of those provided by
|\ldots| (at least with the \emph{Computer Modern} fonts), the package
\pkg{nicematrix} embeds its own system to draw a dotted line (and this system
-uses \textsc{pgf} and not Tikz). This style is called |standard| and that's
+uses \textsc{pgf} and not TikZ). This style is called |standard| and that's
the initial value of the parameter |xdots/line-style|.
-However (when Tikz is loaded) it's possible to use for |xdots/line-style| any style
-provided by Tikz, that is to say any sequence of options provided by Tikz for
-the Tizk pathes (with the exception of ``|color|'', ``|shorten >|'' and
+However (when TikZ is loaded) it's possible to use for |xdots/line-style| any style
+provided by TikZ, that is to say any sequence of options provided by TikZ for
+the TikZ pathes (with the exception of ``|color|'', ``|shorten >|'' and
``|shorten <|'').
\medskip
@@ -3642,7 +3644,7 @@ its sub-keys.}
\medskip
-The experienced users may, for instance, use the PGF/Tikz nodes created by
+The experienced users may, for instance, use the PGF/TikZ nodes created by
\pkg{nicematrix} in the |\CodeAfter|. These nodes are described further
beginning on p.~\pageref{PGF-nodes}.
@@ -3935,7 +3937,7 @@ c & d & \frac12c+\frac14d \\
\bigskip
There is also a key |name| which gives a name to the submatrix created by
-|\SubMatrix|. That name is used to create PGF/Tikz nodes: cf
+|\SubMatrix|. That name is used to create PGF/TikZ nodes: cf
p.~\pageref{node-sub-matrix}.
@@ -4134,7 +4136,7 @@ $\begin{pNiceMatrix}
\colorbox{yellow!50}{\textbf{New 6.24}}\enskip The command |\TikzEveryCell|
execute with TikZ the rectangular path corresponding to each cell of the tabular
with parameters of TikZ the argument of |\TikzEveryCell|. That argument must be
-a list of \textsl{key=value} pairs which may be applied to a Tikz path. In fact,
+a list of \textsl{key=value} pairs which may be applied to a TikZ path. In fact,
the command applies to each of the tabular, except those in the exterior rows
and columns (cf.~p.~\pageref{exterior}) and those in the empty corners (when the
key |corners| is used: cf.~p.~\pageref{corners}). It applies in fact to each
@@ -5089,19 +5091,19 @@ rows or one of the exterior columns. If it is used outside an environment of
For an example of utilisation, see \url{tex.stackexchange.com/questions/488566}
-\section{Use of Tikz with nicematrix}
+\section{Use of TikZ with nicematrix}
\label{name}\label{PGF-nodes}
\index{tikza@TikZ (utilisation with \pkg{nicematrix})}
-\index{node@\textbf{Nodes of PGF/Tikz}|(}
+\index{node@\textbf{Nodes of PGF/TikZ|}(}
\subsection{The nodes corresponding to the contents of the cells}
-The package \pkg{nicematrix} creates a PGF/Tikz node\footnote{We recall that Tikz
+The package \pkg{nicematrix} creates a PGF/TikZ node\footnote{We recall that TikZ
is a layer over PGF. The extension \pkg{nicematrix} loads PGF but does not
-load Tikz. We speak of PGF/Tikz nodes to emphase the fact that the PGF nodes
-created by \pkg{nicematrix} may be used with PGF but also with Tikz. The final
-user will probably prefer to use Tikz rather than PGF.} for each (non-empty) cell
+load TikZ. We speak of PGF/TikZ nodes to emphase the fact that the PGF nodes
+created by \pkg{nicematrix} may be used with PGF but also with TikZ. The final
+user will probably prefer to use TikZ rather than PGF.} for each (non-empty) cell
of the considered array. These nodes are used to draw the dotted lines between
the cells of the matrix (inter alia).
@@ -5139,9 +5141,9 @@ gives a name to the current environment. When the environment has a name, the
nodes are accessible with the name ``\textsl{name}-$i$-$j$'' where \textsl{name}
is the name given to the array and $i$ and $j$ the numbers of row and column.
It's possible to use these nodes with \textsc{pgf} but the final user will
-probably prefer to use Tikz (which is a convenient layer upon \textsc{pgf}).
-However, one should remind that \pkg{nicematrix} doesn't load Tikz by default.
-In the following examples, we assume that Tikz has been loaded.
+probably prefer to use TikZ (which is a convenient layer upon \textsc{pgf}).
+However, one should remind that \pkg{nicematrix} doesn't load TikZ by default.
+In the following examples, we assume that TikZ has been loaded.
\bigskip
\begin{BVerbatim}[baseline=c,boxwidth=11cm]
@@ -5257,7 +5259,7 @@ etc.
When the extension \pkg{varwidth} is loaded, the columns of the type |V|
defined by \pkg{varwidth} are supported by \pkg{nicematrix}. It may be
-interessant to notice that, for a cell of a column of type |V|, the PGF/Tikz
+interessant to notice that, for a cell of a column of type |V|, the PGF/TikZ
node created by \pkg{nicematrix} for the content of that cell has a width
adjusted to the content of the cell. This is in contrast to the case of the
columns of type |p|, |m| or |b| for which the nodes have always a width equal
@@ -5562,7 +5564,7 @@ Here is an example which uses these nodes in the |\CodeAfter|.
\subsection{The nodes which indicate the position of the rules}
\label{nodes-i}
-The package \pkg{nicematrix} creates a PGF/Tikz node merely called $i$ (with
+The package \pkg{nicematrix} creates a PGF/TikZ node merely called $i$ (with
the classical prefix) at the intersection of the horizontal rule of number~$i$
and the vertical rule of number~$i$ (more specifically the potential position
of those rules because maybe there are not actually drawn). The last node has
@@ -5589,8 +5591,8 @@ muguet & dahlia
\end{center}
\bigskip
-If we use Tikz (we remind that \pkg{nicematrix} does not load Tikz by default,
-by only \textsc{pgf}, which is a sub-layer of Tikz), we can access, in the
+If we use TikZ (we remind that \pkg{nicematrix} does not load TikZ by default,
+by only \textsc{pgf}, which is a sub-layer of TikZ), we can access, in the
|\CodeAfter| but also in the |\CodeBefore|, to the intersection of the
(potential) horizontal rule~$i$ and the (potential) vertical rule~$j$ with the
syntax |(|$i$\verb+-|+$j$|)|.
@@ -5631,7 +5633,7 @@ syntax |(|$i$\verb+-|+$j$|)|.
\bigskip
The nodes of the form $i$|.5| may be used, for example to cross a row of a
-matrix (if Tikz is loaded).
+matrix (if TikZ is loaded).
\smallskip
\begin{BVerbatim}[boxwidth=11cm,baseline=c]
@@ -5665,7 +5667,7 @@ p.~\pageref{sub-matrix}.
\smallskip
If a command |\SubMatrix| has been used with the key |name| with an expression
-such as |name=|\textsl{\ttfamily MyName} three PGF/Tikz nodes are created
+such as |name=|\textsl{\ttfamily MyName} three PGF/TikZ nodes are created
with the names \textsl{\ttfamily MyName}|-left|, \textsl{\ttfamily MyName} and
\textsl{\ttfamily MyName}|-right|.
@@ -5694,7 +5696,7 @@ been created with |\SubMatrix\{{2-2}{3-3}\}|).
\end{tikzpicture}
\end{pNiceMatrix}\]
-\index{node@\textbf{Nodes of PGF/Tikz}|)}
+\index{node@\textbf{Nodes of PGF/TikZ}|)}
\section{API for the developers}
@@ -5726,7 +5728,7 @@ used during the next run).
\emph{Example} : We want to write a command |\crossbox| to draw a cross in the
current cell. This command will take in an optional argument between square
brackets for a list of pairs \textsl{key}-\textsl{value} which will be given to
-Tikz before the drawing.
+TikZ before the drawing.
It's possible to program such command |\crossbox| as follows, explicitely
using the public variable |\g_nicematrix_code_before_tl|.
@@ -5913,10 +5915,10 @@ the last cell (second row and second column) is empty.
\medskip
\item For the columns of type |p|, |m|, |b|, |V|\footnote{The columns of type
-|V| are provided by \pkg{varwidth}: cf.~p.~\pageref{varwidth}.} and
-|X|\footnote{See p.~\pageref{X-columns}}, the cell is empty if (and only if)
-its content in the TeX code is empty (there is only spaces between the
-ampersands |&|).
+ |V| are provided by \pkg{varwidth}, which must be loaded:
+ cf.~p.~\pageref{varwidth}.} and |X|\footnote{See p.~\pageref{X-columns}}, the
+cell is empty if (and only if) its content in the TeX code is empty (there is
+only spaces between the ampersands |&|).
\medskip
\item For the columns of type |c|, |l|, |r| and |w{...}{...}|, the cell is
@@ -5924,7 +5926,7 @@ empty if (and only if) its TeX output has a width equal to zero.
\medskip
\item \indexcommand{NotEmpty}
-A cell containing the command |\NotEmpty| is not empty (and a PGF/Tikz
+A cell containing the command |\NotEmpty| is not empty (and a PGF/TikZ
node is created in that cell).
\medskip
@@ -5970,7 +5972,7 @@ environments of \pkg{nicematrix} are not affected).
\index{Incompatibilities}
The package \pkg{nicematrix} is not compatible with the class \cls{ieeeaccess}
-(because that class is not compatible with PGF/Tikz).\footnote{See
+(because that class is not compatible with PGF/TikZ).\footnote{See
\url{https://tex.stackexchange.com/questions/528975/error-loading-tikz-in-ieeeaccess-class}}
\bigskip
@@ -6017,17 +6019,17 @@ the colums |S| of \pkg{siunitx}).
\section{Examples}
-\subsection[{Utilisation of the key 'tikz' of the command \textbackslash
-Block}]{Utilisation of the key ``tikz'' of the command \textbackslash Block}
+\subsection[{Utilisation of the key 'TikZ' of the command \textbackslash
+Block}]{Utilisation of the key ``TikZ'' of the command \textbackslash Block}
\label{tikz-key-examples}
\index{tikzz@tikz!key of \texttt{\textbackslash Block}|textit}
-The key |tikz| of the command |\Block| is available only when Tikz is
+The key |TikZ| of the command |\Block| is available only when TikZ is
loaded.\footnote{By default, \pkg{nicematrix} only loads \textsc{pgf}, which is
-a sub-layer of Tikz.}
+a sub-layer of TikZ.}
-For the following example, we also need the Tikz library |patterns|.
+For the following example, we also need the TikZ library |patterns|.
\begin{Verbatim}
\usetikzlibrary{patterns}
@@ -6414,7 +6416,7 @@ not longer dotted (TikZ should be loaded).
\interitem
In fact, it's even possible to draw solid lines with the commands |\Cdots|,
-|\Vdots|, etc.\footnote{In this document, the Tikz library \pkg{arrows.meta}
+|\Vdots|, etc.\footnote{In this document, the TikZ library \pkg{arrows.meta}
has been loaded, which impacts the shape of the arrow tips.}
\begin{Verbatim}
@@ -6483,7 +6485,7 @@ $\begin{pNiceArray}{ccc|cc}[first-row,last-col,margin]
\index{tikzz@tikz!key of ``borders'' de \texttt{\textbackslash Block}|textit}
In the following example, we use the command |\Block| to draw dashed rules.
-For that example, Tikz should be loaded (by |\usepackage{tikz}|).
+For that example, TikZ should be loaded (by |\usepackage{tikz}|).
\begin{Verbatim}
@@ -6895,8 +6897,8 @@ However, it's not possible to do a fine tuning. That's why we describe now a
method to highlight a row of the matrix.
\medskip
-That example and the following ones require Tikz (by default, \pkg{nicematrix}
-only loads \textsc{pgf}, which is a sub-layer of Tikz) and the Tikz library
+That example and the following ones require TikZ (by default, \pkg{nicematrix}
+only loads \textsc{pgf}, which is a sub-layer of TikZ) and the TikZ library
|fit|. The following lines in the preamble of your document do the job:
\begin{verbatim}
\usepackage{tikz}
@@ -6904,8 +6906,8 @@ only loads \textsc{pgf}, which is a sub-layer of Tikz) and the Tikz library
\end{verbatim}
\medskip
-We create a rectangular Tikz node which encompasses the nodes of the second
-row by using the tools of the Tikz library \pkg{fit}. Those nodes are not
+We create a rectangular TikZ node which encompasses the nodes of the second
+row by using the tools of the TikZ library \pkg{fit}. Those nodes are not
available by default in the |\CodeBefore| (for efficiency). We have to require
their creation with the key |create-cell-nodes| of the keyword |\CodeBefore|.
@@ -7259,7 +7261,7 @@ New key |rounded-corners| for a whole tabular.
\subsection*{Changes between version 6.16 and 6.17}
-New PGF/Tikz style |nicematrix/cell-node|.
+New PGF/TikZ style |nicematrix/cell-node|.
New key |pgf-node-code|
@@ -7461,7 +7463,7 @@ New key |rounded-corners| for the command |\Block|.
\subsection*{Changes between versions 5.10 and 5.11}
It's now possible, in the |code-before| and in the |\CodeAfter|, to use the
-syntax \verb+|(i-|j)+ for the Tikz node at the intersection of the (potential)
+syntax \verb+|(i-|j)+ for the TikZ node at the intersection of the (potential)
horizontal rule number~$i$ and the (potential) vertical rule number~$j$.
\subsection*{Changes between versions 5.9 and 5.10}
@@ -7473,7 +7475,7 @@ It's possible to provide options (between brackets) to the keyword |\CodeAfter|.
\subsection*{Changes between versions 5.8 and 5.9}
Correction of a bug: in the previous versions, it was not possible to use the
-key |line-style| for the continuous dotted lines when the Tikz library |babel|
+key |line-style| for the continuous dotted lines when the TikZ library |babel|
was loaded.
New key |cell-space-limits|.
@@ -7615,8 +7617,8 @@ In the environments without preamble (|{NiceMatrix}|, |{pNiceMatrix}|, etc.),
it's possible to use the options |l| (=|L|) or |r| (=|R|) to specify the type
of the columns.
-The code of \pkg{nicematrix} no longer uses Tikz but only \textsc{pgf}. By
-default, Tikz is \emph{not} loaded by \pkg{nicematrix}.
+The code of \pkg{nicematrix} no longer uses TikZ but only \textsc{pgf}. By
+default, TikZ is \emph{not} loaded by \pkg{nicematrix}.
\subsection*{Changes between versions 3.11 and 3.12}
@@ -7626,7 +7628,7 @@ Options |vlines|, |hlines| and |hvlines|.
Option |baseline| pour |{NiceArray}| (not for the other environments).
-The name of the Tikz nodes created by the command |\Block| has changed: when
+The name of the TikZ nodes created by the command |\Block| has changed: when
the command has been issued in the cell $i$|-|$j$, the name is
$i$|-|$j$|-block| and, if the creation of the ``medium nodes'' is required, a
node $i$|-|$j$|-block-medium| is created.
@@ -7695,7 +7697,7 @@ not executed.
Following a discussion on TeX StackExchange\footnote{cf.
|tex.stackexchange.com/questions/510841/nicematrix-and-tikz-external-optimize|},
-optimization of Tikz externalization is disabled in the environments of
+optimization of TikZ externalization is disabled in the environments of
\pkg{nicematrix} when the class \cls{standalone} or the package
\pkg{standalone} is used.
@@ -7792,10 +7794,10 @@ available in the command |\NiceMatrixOptions|.
Following a discussion on
TeX StackExchange\footnote{cf.
|tex.stackexchange.com/questions/450841/tikz-externalize-and-nicematrix-package|},
-Tikz externalization is now deactivated in the environments of the
+TikZ externalization is now deactivated in the environments of the
package \pkg{nicematrix}.\footnote{Before this version, there was an error
-when using \pkg{nicematrix} with Tikz externalization. In any case, it's not
-possible to externalize the Tikz elements constructed by \pkg{nicematrix}
+when using \pkg{nicematrix} with TikZ externalization. In any case, it's not
+possible to externalize the TikZ elements constructed by \pkg{nicematrix}
because they use the options |overlay| and |remember picture|.}
\subsection*{Changes between version 2.0 and 2.1}
@@ -7841,7 +7843,7 @@ New environment |{NiceArray}| with column types |L|, |C| and |R|.
\subsection*{Changes between versions 1.0 and 1.1}
-The dotted lines are no longer drawn with Tikz nodes but with Tikz circles
+The dotted lines are no longer drawn with TikZ nodes but with TikZ circles
(for efficiency).
Modification of the code which is now twice faster.
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index d2374fba2c..d9bd881255 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,8 @@
+2023-12-03 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (xcolor.4ht): added the "color" option.
+ https://tex.stackexchange.com/a/470290/2891
+
2023-11-21 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathml.tex (mathml.4ht): use <mtext> instead of <mrow> in
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index e163fca2d9..ae5be04ce3 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1412 2023-11-20 10:08:03Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1414 2023-12-03 21:09:44Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2023 TeX Users Group
@@ -28514,6 +28514,19 @@ second parameter.
>>>
+This code comes from this \Link[https://tex.stackexchange.com/a/470290/2891]{}{}answer\EndLink.
+See the comments for possible shortcommings.
+
+\<config xcolor\><<<
+\:CheckOption{color}\if:Option
+\pend:defI\@declaredcolor{%
+ \ifdefined\end:def:color\end:def:color\else\aftergroup\b:textcolor\fi
+ \a:textcolor\def\end:def:color{\b:textcolor}%
+}
+\fi
+>>>
+
+
We need to use dvips driver with XeLaTeX
\<add to usepackage\><<<
@@ -29774,7 +29787,7 @@ original environment, and generated tags will be mismatched.
This code postpones execution of code from the "after" key after
closing of the Enumitem environment, so it can be correctly closed.
-See \Link[https://tex.stackexchange.com/q/642439/2891] this example
+See \Link[https://tex.stackexchange.com/q/642439/2891]{}{} this example
what can go wrong\EndLink.
\<enumitem config\><<<
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index b82add1c39..6a078c2ec4 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -117,7 +117,6 @@ $mirrors = {
},
'Greece' => {
'http://ftp.ntua.gr/mirror/ctan/' => 1,
- 'https://fosszone.csd.auth.gr/CTAN/' => 1,
'https://ftp.cc.uoc.gr/mirrors/CTAN/' => 1,
},
'Hungary' => {
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 2a055aa630..b28f1a33fe 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/69019
+depend revision/69028
name 00texlive.image
category TLCore
-revision 69006
+revision 69026
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
@@ -2388,7 +2388,6 @@ runfiles size=13117
tlpkg/tlpsrc/issuulinks.tlpsrc
tlpkg/tlpsrc/istgame.tlpsrc
tlpkg/tlpsrc/itnumpar.tlpsrc
- tlpkg/tlpsrc/iwhdp.tlpsrc
tlpkg/tlpsrc/iwona.tlpsrc
tlpkg/tlpsrc/iwonamath.tlpsrc
tlpkg/tlpsrc/jablantile.tlpsrc
@@ -4818,7 +4817,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 69016
+revision 69021
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
@@ -22662,16 +22661,16 @@ catalogue-topics font font-sans font-maths
name argumentation
category Package
-revision 68778
+revision 69023
shortdesc Create abstract argumentation frameworks via TikZ
relocated 1
longdesc This package provides commands for creating abstract
longdesc argumentation frameworks via TikZ.
-containersize 1812
-containerchecksum 7195de4ec2b02bc9aad6ce2e5d766d741f0a13c3569c7de0e9f090a7ece090383d0f3d9a2895f88dc05b7c96436c506149708e2c374dccc37bb7fd2fb68d2249
-doccontainersize 181660
-doccontainerchecksum 6925de93676f173ab298b5dcf6310061b907e93cabb19dc30c35c02a8b26a612cf430ef19585ca5eeca5f8dd65a162a7d524309a2500db35e1a86821e1c0f5ad
-docfiles size=50
+containersize 2028
+containerchecksum d18f62c0c6c5cef4f85b854342671ebbc9224475d41488058543e682e41230f61cea4ecb68db767742c30d92ae2af1270ef47624608a3fb93aa6f8031b12648e
+doccontainersize 270220
+doccontainerchecksum bd6e12905e35d15064a357a248f4f5dbf5d91e37d0e742be0cd360e7d6079122090f29341acf11584ab563355481aad7edbbdfe1fa6b2455aee2b67e263dbb6a
+docfiles size=75
RELOC/doc/latex/argumentation/README.md details="Readme"
RELOC/doc/latex/argumentation/argumentation-doc.pdf details="Package documentation"
RELOC/doc/latex/argumentation/argumentation-doc.tex
@@ -22681,7 +22680,7 @@ catalogue-contact-repository https://github.com/aig-hagen/tikz_argumentation
catalogue-ctan /graphics/pgf/contrib/argumentation
catalogue-license lppl1.3c
catalogue-topics graphics diagram pgf-tikz
-catalogue-version 1.0
+catalogue-version 1.1
name arimo
category Package
@@ -71602,7 +71601,7 @@ containerchecksum c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326
name collection-latexextra
category Collection
-revision 68958
+revision 69026
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -72331,7 +72330,6 @@ depend isorot
depend isosafety
depend isotope
depend issuulinks
-depend iwhdp
depend iwonamath
depend jlabels
depend jmsdelim
@@ -73126,8 +73124,8 @@ depend zref-clever
depend zref-vario
depend zwgetfdate
depend zwpagelayout
-containersize 7060
-containerchecksum 7b5bc2b0d97de16383d95ff5e5ca3b61ba51c365b63423559aa28a05b508ecd8f8da98faaceae735e0a5543183e3c460e977809a55385093ad17b77b3a729f2c
+containersize 7048
+containerchecksum 9aac1959330dcdcb2368ce9eb78ff4b70c4826d347f99d04bc53540df17740b97dbcc0edec27ff8a5eb2e6035f9e13166675d51921ff70d8d2daaa3e81f6e951
name collection-latexrecommended
category Collection
@@ -158233,34 +158231,6 @@ catalogue-license lppl
catalogue-topics italian numbers
catalogue-version 1.0
-name iwhdp
-category Package
-revision 37552
-shortdesc Halle Institute for Economic Research (IWH) Discussion Papers
-relocated 1
-longdesc The document class is for creating Discussion Papers of the
-longdesc Halle Institute for Economic Research (IWH) in Halle, Germany.
-longdesc The class offers options for both English and German texts.
-containersize 10284
-containerchecksum 7153fd75ec63a6abbb4d2bbda8a5eb150f4b202b72baec8361a810d28aac5690f76e4099ff3a616a44077337ace469d6a111d4e42ad8d68428144b7fdee58575
-doccontainersize 396092
-doccontainerchecksum f75a9d0ea4b69de5a82659e18a0ea04544c93b056c52efac534e16490a5ac78b329d700f2ed7b3e8564a72331489106bb7e735c44b3e24ff943c6ec0b89eaef2
-docfiles size=124
- RELOC/doc/latex/iwhdp/Back_2015.pdf
- RELOC/doc/latex/iwhdp/Deckblatt_2015.pdf
- RELOC/doc/latex/iwhdp/README details="Readme"
- RELOC/doc/latex/iwhdp/iwhdp_Manual.bib
- RELOC/doc/latex/iwhdp/iwhdp_Manual.pdf details="Package documentation (German)" language="de"
- RELOC/doc/latex/iwhdp/iwhdp_Manual.tex
- RELOC/doc/latex/iwhdp/iwhdp_paper.bib
- RELOC/doc/latex/iwhdp/iwhdp_paper.tex
-runfiles size=9
- RELOC/tex/latex/iwhdp/iwhdp.cls
-catalogue-ctan /macros/latex/contrib/iwhdp
-catalogue-license lppl1.3
-catalogue-topics misc-paper class
-catalogue-version 0.50
-
name iwona
category Package
revision 19611
@@ -268419,7 +268389,7 @@ catalogue-version 1.0.1
name pwebmac
category Package
-revision 68486
+revision 69027
shortdesc Consolidated WEB macros for DVI and PDF output
relocated 1
longdesc The original WEB system by Donald Knuth has the macros
@@ -268441,11 +268411,11 @@ longdesc in the WEB sources. WEB programmers who want to use pwebmac.tex
longdesc instead of the default webmac.tex in their programs have to
longdesc change the first line in the TeX file created by weave. From
longdesc there, all depends on the "TeX engine" you use.
-containersize 8880
-containerchecksum ddb960b9219b898f8e6891e01db1154635206f20c9957c2c152cc9b1ca37edc9d8cfbba7d6b871bc66d7286ff8b661b2859c3a6a429cff572fcd886feb00af7a
-doccontainersize 11564
-doccontainerchecksum 01974abe275ac37ac0c02146a81ec0ac1411a366041954776ed7927b4efa7fb6f14d868249f6ce462c6b323a05e54645ad2483cb7a8584021e041d536a673421
-docfiles size=12
+containersize 8972
+containerchecksum aed495ad3c056a34f63416e570db395125719e9a9cb05c5043bd4f0d58713c28ee548c931a5c18d316d0a2a39c81671788f87b422f01148cf9ecdb52ab2a87d2
+doccontainersize 15656
+doccontainerchecksum 0312806d06b3db91d2e0bf3df2c1f3dc8620c1f6b59e4e968232631edac217e99bccede5d9cf133f52409d8a664f69dfa072ab5d205f67fabafa0ee74db90d20
+docfiles size=15
RELOC/doc/plain/pwebmac/README.md details="Readme"
RELOC/doc/plain/pwebmac/Xerrorlog.tex
RELOC/doc/plain/pwebmac/index.md
@@ -268459,7 +268429,7 @@ catalogue-contact-support https://lists.tug.org/tex-k
catalogue-ctan /web/pwebmac
catalogue-license pd
catalogue-topics litprog
-catalogue-version 4.10
+catalogue-version 4.11
name pxbase
category Package
@@ -284835,7 +284805,7 @@ catalogue-version 2.0
name scrabble
category Package
-revision 65507
+revision 69024
shortdesc Commands for Scrabble boards
relocated 1
longdesc This package provides some commands (in English and in French)
@@ -284843,24 +284813,24 @@ longdesc to work with a Scrabble Board : \ScrabbleBoard and
longdesc \begin{EnvScrabble} and \ScrabblePutWord for the English
longdesc version, \PlateauScrabble and \begin{EnvScrabble} and
longdesc \ScrabblePlaceMot for the French version.
-containersize 3072
-containerchecksum df992081a34554d1e26ec6eb227f2ac5beddb7fd88a4a8377aebdfebd9fd200d053c4e43db96450f20a7c23cac11d235f1acde3e4dc40a3c30b83ad2914eae5b
-doccontainersize 883952
-doccontainerchecksum c61edf946eef82a7cde0af391eaca776784870be6a235e9752821f565b187a2a286ce1c7d7a7d5bc902550597e2a0906f25581bd8295b7dc5a546cf7bd8ee73b
-docfiles size=253
+containersize 3600
+containerchecksum f4401768ca1b9f1ca4a84a61e07379b9ed98f679e0fb4c3231b3daba495dfabb2d2e980b76088cf28bf03e2776e1e39133709b9d4b9b374292e1a4eed56b3b19
+doccontainersize 987276
+doccontainerchecksum ca5b37469ba336683ed77872cdbdfcee2379eb32c840cadf79d54b1e18eac69ec1918e8279f1207710125fbbd871b149bf556ecd36b11836a7a0defd941ba8d0
+docfiles size=284
RELOC/doc/latex/scrabble/README.md details="Readme"
RELOC/doc/latex/scrabble/Scrabble-doc-en.pdf details="Package documentation (English)"
RELOC/doc/latex/scrabble/Scrabble-doc-en.tex
RELOC/doc/latex/scrabble/Scrabble-doc-fr.pdf details="Package documentation (French)" language="fr"
RELOC/doc/latex/scrabble/Scrabble-doc-fr.tex
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/scrabble/Scrabble.sty
catalogue-contact-repository https://github.com/cpierquet/Scrabble
catalogue-contact-support https://github.com/cpierquet/Scrabble/issues
catalogue-ctan /graphics/pgf/contrib/scrabble
catalogue-license lppl1.3c
catalogue-topics games pgf-tikz
-catalogue-version 0.1.3
+catalogue-version 0.1.4
name scrambledenvs
category Package
@@ -305723,7 +305693,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 68930
+revision 69028
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -305744,10 +305714,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 1106536
-containerchecksum 40c52ef9d115c33aaf01aa22ac9959aa63d34571be56caf1e54ed27058db71aa78260b760810186a97740f37db087a8ee2354011887aba7f28a32f5270e13566
+containersize 1106600
+containerchecksum 746fe24c584a237375f55f8f533dd5d5dc7460a02bd58b8cd36ebf1c9626a748f6f6612120d94bb4fe3675357792616de806e90ee82e7265358abf8f8a30ec49
doccontainersize 136384
-doccontainerchecksum 877e1c90aaf327752c1a44d63c6232e038bcc1ed19df86bdd4c5f3a808ea3aa3107adbcc29cee6e0eb76ac56c57ee3bccea1381791f3bd95725acd341befc6a2
+doccontainerchecksum 4d124bd2b9e5cd6d66f160283f844252347871d7ab76a420626cd662ea4ccb327ebfcfb88f78798c2e0ad285e07180b6d695498e230b40455d5c8b0d05c280e5
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -305819,9 +305789,9 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1459440
-srccontainerchecksum 4cc1cda3a64e55de0fd3feabd563e8fe91daa2554647386dd4bdb455898ffc1d5a39298846ca16466dd77b8763ef511050f687eb60028252c080046ebfe7c1f8
-srcfiles size=4402
+srccontainersize 1461884
+srccontainerchecksum 57a2c449ba147a53e42e1e887d2bfdcbb57ae503e4864265cb9521001ee592185b26680f96f327d63d8eac6e23e040d4ce8439d31b2cfeb67d6f2466fb5b98ee
+srcfiles size=4403
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
texmf-dist/source/generic/tex4ht/README
@@ -317497,7 +317467,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 69016
+revision 69021
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.
@@ -317505,10 +317475,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 114260
-containerchecksum d6de52de8b349b07936d316aa50e433ed1df0590a07d27990b50e146abd716a187fada0d27665510a0e241e267c28ea16de65f821b4fcd2dfc15d6f094021597
-doccontainersize 430588
-doccontainerchecksum 2219cfaf7d2dd04a6afa6ea6bcc38fb8486e7547be28788bb94fa162391bee75391040624c2245f6d3eee1d04036ab6b90c7659996d7ce068c29cd4ae8031b85
+containersize 114248
+containerchecksum e053a30fb8d67452139663c9cce80d3dad62b038430192cb4260901750d880d57634e72eea9aa8df51699d380a1becf15bac4eb8df8da6d253dba7782c61f61d
+doccontainersize 430612
+doccontainerchecksum 72c9d853e98c30696dcfc19cd75a58449e560cc4ce1253f25b85719a5385b141eadcf3845b2e53587b9c2bd4f42f658a613bc7952107294559de2e8a3a093775
docfiles size=560
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -326479,7 +326449,7 @@ catalogue-version 1.45c
name tkz-elements
category Package
-revision 68806
+revision 69022
shortdesc A Lua library for drawing Euclidean geometry with TikZ or tkz-euclide
relocated 1
longdesc This package provides a library written in Lua, allowing to
@@ -326490,25 +326460,33 @@ longdesc main possibility of programmation proposed is oriented "object
longdesc programming" with object classes like point, line, triangle,
longdesc circle and ellipse. For the moment, once the calculations are
longdesc done, it is tkz-euclide or TikZ which allows the drawings.
-containersize 12796
-containerchecksum e57dcc40edd9805dd55b4d672914adbee48a1fe8ab4d250d9ac082e87c3b4ba967c612100604e9de056a3e20aa520a58a5071a5d98025ef59780db455a5cf9bb
-doccontainersize 516408
-doccontainerchecksum 25583d686fb9b698838c385e86d1ee581a9047f6552dedf70f0a38f1a709cf1b8fe10727b1b7fe3814d26e2f8247f66222fe3e1649a78b6c3614669928f7bc79
-docfiles size=193
+containersize 15244
+containerchecksum 8d6a9eb128bd671fab151322ce9580837a1d4a0a36ae1777d27a58ef25414b4fbee09153674858e0a78691add853abd919e79936e1f6ce5926368c2a0f5cb247
+doccontainersize 627984
+doccontainerchecksum 88cac26702a8db536d379cd66b5ad0a9f372cbe19099172d990e4ca41141a858ec682d53060a83752a9517748d6590ec1c879ea259ce547f030975fa75376ef9
+docfiles size=241
RELOC/doc/latex/tkz-elements/README.md details="Readme"
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-circle.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-ellipse.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-line.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-misc.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-parallelogram.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-point.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-quadrilateral.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-rectangle.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-regular.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-square.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes-triangle.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-classes.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-convention.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-examples.tex
- RELOC/doc/latex/tkz-elements/TKZdoc-elements-howtouse.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-indepthstudy.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-intersection.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-main.tex
RELOC/doc/latex/tkz-elements/TKZdoc-elements-presentation.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-structure.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-transferts.tex
+ RELOC/doc/latex/tkz-elements/TKZdoc-elements-why.tex
RELOC/doc/latex/tkz-elements/examples/tkz-elements-demo_1.pdf
RELOC/doc/latex/tkz-elements/examples/tkz-elements-demo_1.tex
RELOC/doc/latex/tkz-elements/examples/tkz-elements-demo_2.pdf
@@ -326518,28 +326496,34 @@ docfiles size=193
RELOC/doc/latex/tkz-elements/examples/tkz-elements-demo_4.pdf
RELOC/doc/latex/tkz-elements/examples/tkz-elements-demo_4.tex
RELOC/doc/latex/tkz-elements/tkz-elements.pdf details="Package documentation"
-runfiles size=24
+runfiles size=31
RELOC/tex/latex/tkz-elements/tkz-elements.sty
- RELOC/tex/latex/tkz-elements/tkz_elements_circles.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_circle.lua
RELOC/tex/latex/tkz-elements/tkz_elements_class.lua
- RELOC/tex/latex/tkz-elements/tkz_elements_ellipses.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_ellipse.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_circles.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_intersections.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_lines.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_maths.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_points.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_functions_regular.lua
RELOC/tex/latex/tkz-elements/tkz_elements_functions_triangles.lua
- RELOC/tex/latex/tkz-elements/tkz_elements_lines.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_line.lua
RELOC/tex/latex/tkz-elements/tkz_elements_main.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_misc.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_parallelogram.lua
RELOC/tex/latex/tkz-elements/tkz_elements_point.lua
- RELOC/tex/latex/tkz-elements/tkz_elements_points.lua
- RELOC/tex/latex/tkz-elements/tkz_elements_triangles.lua
- RELOC/tex/latex/tkz-elements/tkz_elements_vectors.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_quadrilateral.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_rectangle.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_regular.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_square.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_triangle.lua
+ RELOC/tex/latex/tkz-elements/tkz_elements_vector.lua
catalogue-contact-home https://altermundus.fr
catalogue-ctan /macros/latex/contrib/tkz/tkz-elements
catalogue-license lppl1.3
catalogue-topics maths calculation luatex
-catalogue-version 1.20b
+catalogue-version 1.40c
name tkz-euclide
category Package
@@ -338078,7 +338062,7 @@ catalogue-version 1.1.0
name ufrgscca
category Package
-revision 69009
+revision 69025
shortdesc A bundle for undergraduate students final work/report (tcc) at UFRGS/EE
relocated 1
longdesc This bundle is aimed at producing undergraduate students' final
@@ -338087,10 +338071,10 @@ longdesc University of Rio Grande do Sul), closely following ABNT rules
longdesc (Brazilian Association for Technical Norms). It is composed of
longdesc a main class, ufrgscca, and a set of auxiliary packages, some
longdesc of which can be used independently.
-containersize 23452
-containerchecksum 7e98c6a97d2864bcac75e45307e359f39873c33fd40a5e74000588b9bdd7d057184b445b038ec6c4f03eed14aa7ee3c8172d8079e232ef603bebb3c403619577
-doccontainersize 536056
-doccontainerchecksum 95ec3f792ecc903da737e811b12265b6b128ecc2637ff4091b54f9c016d7d50d4adc897c25787528e1becac6b8a2465f8caf6416d7472c0cf5c76ad5df913c96
+containersize 24092
+containerchecksum 87729540fa65f304c4cf97269590e3ffd5d9f4d89e96f4f1e7ca8095c71c86d66d551a74c699a95f436ae0877edd88147ef629e3c93d0b440416f9aa42a61804
+doccontainersize 536700
+doccontainerchecksum 1d18507d6f3d61d8566751614b01b0c0b51246b25ac7219f377a5d5660cb97624c7451ad498751d2f39f60f31853d1bc4ed47c89c6335ed93ee4f848c481760c
docfiles size=185
RELOC/doc/latex/ufrgscca/README.md details="Readme"
RELOC/doc/latex/ufrgscca/ufrgscca-cover-ptBR.tex
@@ -338099,7 +338083,7 @@ docfiles size=185
RELOC/doc/latex/ufrgscca/ufrgscca-terms-ptBR.tex
RELOC/doc/latex/ufrgscca/ufrgscca.pdf details="Package documentation"
RELOC/doc/latex/ufrgscca/ufrgscca.tex
-runfiles size=41
+runfiles size=42
RELOC/tex/latex/ufrgscca/ufrgscca-abnt.sty
RELOC/tex/latex/ufrgscca/ufrgscca-base-en.def
RELOC/tex/latex/ufrgscca/ufrgscca-base-ptBR.def
@@ -338116,7 +338100,7 @@ catalogue-contact-repository https://github.com/alceu-frigeri/ufrgscca
catalogue-ctan /macros/latex/contrib/ufrgscca
catalogue-license lppl1.3c gpl
catalogue-topics dissertation portuguese-br std-conform expl3
-catalogue-version 2.1
+catalogue-version 2.2
name uhc
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 84ebcc4c4a..c399139b0c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-677d6e79cc40196afc7ec37fceb51fc9 texlive.tlpdb
+93ec9c81ca5cc2e688721f1a02ded249 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index f2d691450d..606cb294ad 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-89b14203cf4a2e3a4454ec587ae6eab1d953eacf60124fba151987b6a3b6cddbe3b6b42f39c45034b1fa6e163bfe381ae9472ec7651bd24d4901e33d6f6f332a texlive.tlpdb
+69e525e9758341d0f71247bded5acdf74e0a9ed297adaec54d9b61fab0aba5a08c55fdffb1b051dfefe40db2751a145111bcfbc64c9f758bb952cd3e573c192f texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 1c61ec17cf..5ce4dcde22 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+QqiBBqTOGHfhlDjHAFAmVr0XkACgkQTOGHfhlD
-jHA9jwf+Pr+rlSPEfWwNrOQT78p8gYDkCK6lNxoM2JMB9SciDFi8/r0+AgdgQXUF
-bFiL/6r4bL/01cStlbcoaA1EBGCG6za2YfEC0y2aZ5I1tt/XitnbVtoesZQECXdk
-b/WaiyGfeM8eaVJ3onTHegYS3tI3+MNdGJfueTlJEnVVP/QOJmkphKc9NOjMGHSE
-FTiLHesBGhcatt7nbMCTv4/3ovb3rZe0EBaVp4C364kRJueloxaQvm4REvGLMOdu
-Eir3wpyJCTfmFQNikS/EhYhOPRsoIGnNFozRmcvvnShmRW+8nZ05qzCPAu3cFrKp
-1mhu6i/qQq9Fw4nDxxyf2Sgcv1ED6A==
-=WzDB
+iQEzBAEBCgAdFiEE2PL4YFeoV+QqiBBqTOGHfhlDjHAFAmVtISYACgkQTOGHfhlD
+jHBc4Qf/RAdQnImAuffvea3s78uXogenVIzh9JbXb7HnpUtmh61h/mEnO/O3UcuH
+kjWs6wnOjngOjS1yXZiAie8MLV+LXEIc4a8AOO7Hf0IjSN5/O+PlrSRJJkAl+l6g
+2FOY77OXfJKxzfKnS3trzEhWmo7Oni7s7zRWIFEiOptXv8GhiGjIf5zfYOAHjsCC
+aPiowkDu/Pfc8Natrauz/cAheDGqX+/FeeQedGGTV7V7W93WXAjvaBr4eF+vSKBJ
+1ssWYwbddDj+nt43tVFU3JIML9kCFUkO3QabZ/ONZwsMnm5qrWsO73CqvrKZqRiO
+iAJo5UXsgWJCx/BJajkZgOmWKQ00Cg==
+=hL1k
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index b2fd8969ba..01d50931b3 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index a4fe6d7f1b..b854d538c4 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2023-12-04-02-02
+2023-12-05-02-02