summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-10-27 03:01:07 +0000
committerNorbert Preining <norbert@preining.info>2022-10-27 03:01:07 +0000
commit876d640726265ada7e067f22dda368dd49ed9ad1 (patch)
tree8a7e5c35cb74a7fcf340169e19efcf89ffe06f68
parentfac21618bdcd44d7ca47228c8b856488b12ee6a2 (diff)
CTAN sync 202210270300
-rw-r--r--FILES.byname543
-rw-r--r--FILES.byname.gzbin2470461 -> 2471831 bytes
-rw-r--r--FILES.last07days1049
-rw-r--r--biblio/ctan-bibdata/ctan.bib100
-rw-r--r--biblio/ctan-bibdata/ctan.pdfbin3620590 -> 3620007 bytes
-rw-r--r--graphics/pgf/contrib/braids/braids.pdfbin314455 -> 301271 bytes
-rw-r--r--graphics/pgf/contrib/braids/braids.tex55
-rw-r--r--graphics/pgf/contrib/braids/braids_code.dtx693
-rw-r--r--graphics/pgf/contrib/braids/braids_code.pdfbin410835 -> 456447 bytes
-rw-r--r--graphics/pgf/contrib/spath3/knots.pdfbin341621 -> 367400 bytes
-rw-r--r--graphics/pgf/contrib/spath3/knots.tex113
-rw-r--r--graphics/pgf/contrib/spath3/spath3.pdfbin388662 -> 441114 bytes
-rw-r--r--graphics/pgf/contrib/spath3/spath3.tex223
-rw-r--r--graphics/pgf/contrib/spath3/spath3_code.dtx5203
-rw-r--r--graphics/pgf/contrib/spath3/spath3_code.pdfbin571802 -> 833596 bytes
-rw-r--r--graphics/pgf/contrib/tikzmark/README1
-rw-r--r--graphics/pgf/contrib/tikzmark/tikzmark.dtx1592
-rw-r--r--graphics/pgf/contrib/tikzmark/tikzmark.pdfbin423477 -> 517587 bytes
-rw-r--r--macros/latex/contrib/docshots/DEPENDS.txt5
-rw-r--r--macros/latex/contrib/docshots/README.md2
-rw-r--r--macros/latex/contrib/docshots/docshots.dtx137
-rw-r--r--macros/latex/contrib/docshots/docshots.pdfbin335433 -> 338306 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin588865 -> 588506 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex53
-rw-r--r--macros/latex/contrib/filehook/DEPENDS.txt6
-rw-r--r--macros/latex/contrib/filehook/README7
-rw-r--r--macros/latex/contrib/filehook/README.txt12
-rw-r--r--macros/latex/contrib/filehook/filehook.dtx10
-rw-r--r--macros/latex/contrib/filehook/filehook.pdfbin304009 -> 316022 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/README.md9
-rw-r--r--macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdfbin0 -> 5663850 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex713
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10C.pngbin0 -> 16929 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10K.pngbin0 -> 15717 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10P.pngbin0 -> 10524 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10T.pngbin0 -> 11012 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2C.pngbin0 -> 7450 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2K.pngbin0 -> 6972 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2P.pngbin0 -> 4473 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2T.pngbin0 -> 4722 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3C.pngbin0 -> 9224 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3K.pngbin0 -> 8548 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3P.pngbin0 -> 5545 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3T.pngbin0 -> 5747 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4C.pngbin0 -> 8699 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4K.pngbin0 -> 8033 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4P.pngbin0 -> 5641 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4T.pngbin0 -> 5846 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5C.pngbin0 -> 10512 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5K.pngbin0 -> 9703 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5P.pngbin0 -> 6560 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5T.pngbin0 -> 6848 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6C.pngbin0 -> 12632 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6K.pngbin0 -> 11949 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6P.pngbin0 -> 7830 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6T.pngbin0 -> 8152 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7C.pngbin0 -> 12522 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7K.pngbin0 -> 11715 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7P.pngbin0 -> 7792 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7T.pngbin0 -> 8108 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8C.pngbin0 -> 15268 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8K.pngbin0 -> 14105 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8P.pngbin0 -> 9295 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8T.pngbin0 -> 9769 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9C.pngbin0 -> 15968 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9K.pngbin0 -> 14817 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9P.pngbin0 -> 9830 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9T.pngbin0 -> 10282 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AC.pngbin0 -> 6887 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AK.pngbin0 -> 6586 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AP.pngbin0 -> 4160 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AT.pngbin0 -> 12024 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DC.pngbin0 -> 90274 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DK.pngbin0 -> 83544 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DP.pngbin0 -> 85185 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DT.pngbin0 -> 80241 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosArgent.pngbin0 -> 28919 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBase.pngbin0 -> 1594 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleu.pngbin0 -> 62669 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuFonce.pngbin0 -> 59833 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuVert.pngbin0 -> 62969 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosCyan.pngbin0 -> 53015 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosFuchsia.pngbin0 -> 53007 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosGris.pngbin0 -> 33037 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosJaune.pngbin0 -> 53007 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosMarron.pngbin0 -> 63461 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNavy.pngbin0 -> 63519 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNoir.pngbin0 -> 45992 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosOlive.pngbin0 -> 63108 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosRouge.pngbin0 -> 59833 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVert.pngbin0 -> 64250 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVertCitron.pngbin0 -> 55974 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosViolet.pngbin0 -> 64088 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JN.pngbin0 -> 38205 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JR.pngbin0 -> 38208 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RC.pngbin0 -> 81364 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RK.pngbin0 -> 84821 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RP.pngbin0 -> 86164 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RT.pngbin0 -> 86879 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VC.pngbin0 -> 79792 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VK.pngbin0 -> 77964 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VP.pngbin0 -> 93105 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VT.pngbin0 -> 82311 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.pngbin0 -> 44247 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.pngbin0 -> 42766 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.pngbin0 -> 42360 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.pngbin0 -> 47466 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.pngbin0 -> 56973 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.pngbin0 -> 37927 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.pngbin0 -> 44818 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.pngbin0 -> 44384 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.pngbin0 -> 36795 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.pngbin0 -> 45828 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.pngbin0 -> 53425 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.pngbin0 -> 49300 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.pngbin0 -> 49989 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.pngbin0 -> 43440 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.pngbin0 -> 43799 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.pngbin0 -> 43792 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.pngbin0 -> 48089 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.pngbin0 -> 50287 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.pngbin0 -> 27549 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.pngbin0 -> 27207 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.pngbin0 -> 29073 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.pngbin0 -> 30579 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.pngbin0 -> 50104 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.pngbin0 -> 30378 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.pngbin0 -> 30138 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.pngbin0 -> 31671 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.pngbin0 -> 34899 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.pngbin0 -> 45425 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.pngbin0 -> 28707 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.pngbin0 -> 28936 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.pngbin0 -> 31048 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.pngbin0 -> 33487 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.pngbin0 -> 43095 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.pngbin0 -> 30426 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.pngbin0 -> 30600 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.pngbin0 -> 34235 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.pngbin0 -> 37424 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.pngbin0 -> 48338 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.pngbin0 -> 31872 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.pngbin0 -> 33157 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.pngbin0 -> 37950 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.pngbin0 -> 42512 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.pngbin0 -> 49002 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.pngbin0 -> 30118 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.pngbin0 -> 29190 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.pngbin0 -> 36529 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.pngbin0 -> 40463 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.pngbin0 -> 49112 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.pngbin0 -> 37356 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.pngbin0 -> 34636 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.pngbin0 -> 41209 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.pngbin0 -> 47785 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.pngbin0 -> 48783 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.pngbin0 -> 37970 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.pngbin0 -> 37475 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.pngbin0 -> 43485 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.pngbin0 -> 47633 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.pngbin0 -> 22035 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.pngbin0 -> 21913 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.pngbin0 -> 23870 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.pngbin0 -> 25708 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.pngbin0 -> 38389 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.pngbin0 -> 37673 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.pngbin0 -> 41010 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.pngbin0 -> 40689 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.pngbin0 -> 38949 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.pngbin0 -> 38448 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.pngbin0 -> 38922 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.pngbin0 -> 32924 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.pngbin0 -> 80226 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.pngbin0 -> 46165 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.pngbin0 -> 42817 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.pngbin0 -> 43865 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.pngbin0 -> 38016 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.pngbin0 -> 44231 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.pngbin0 -> 46382 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.pngbin0 -> 49967 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.pngbin0 -> 49125 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.pngbin0 -> 42304 bytes
-rw-r--r--macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty368
-rw-r--r--macros/latex/contrib/newverbs/DEPENDS.txt4
-rw-r--r--macros/latex/contrib/newverbs/README.txt (renamed from macros/latex/contrib/newverbs/README)9
-rw-r--r--macros/latex/contrib/newverbs/newverbs.dtx10
-rw-r--r--macros/latex/contrib/newverbs/newverbs.ins2
-rw-r--r--macros/latex/contrib/newverbs/newverbs.pdfbin221688 -> 231411 bytes
-rw-r--r--macros/unicodetex/latex/polyglossia/README.md4
-rw-r--r--macros/unicodetex/latex/polyglossia/polyglossia.dtx1278
-rw-r--r--macros/unicodetex/latex/polyglossia/polyglossia.pdfbin352848 -> 354667 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog6
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex41
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini8
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini8
-rw-r--r--timestamp2
197 files changed, 8851 insertions, 3421 deletions
diff --git a/FILES.byname b/FILES.byname
index e24f2158e5..6136794712 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -2035,12 +2035,12 @@
2022/09/23 | 1673 | biblio/citation-style-language/README.md
2022/09/23 | 11958 | biblio/citation-style-language/vancouver.csl
2022/09/23 | 591448 | biblio/citation-style-language.zip
-2022/10/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/10/26 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/08 | 127 | biblio/ctan-bibdata/biblatex-ctan/ctan.cbx
-2022/10/25 | 2741891 | biblio/ctan-bibdata/ctan.bib
-2022/10/25 | 3620597 | biblio/ctan-bibdata/ctan.pdf
+2022/10/26 | 2741921 | biblio/ctan-bibdata/ctan.bib
+2022/10/26 | 3620590 | biblio/ctan-bibdata/ctan.pdf
2022/10/08 | 1415 | biblio/ctan-bibdata/README
-2022/10/25 | 4012485 | biblio/ctan-bibdata.zip
+2022/10/26 | 4012423 | biblio/ctan-bibdata.zip
2022/02/06 | 3110 | biblio/pbibtex/pbibtex-base/cpp.awk
2022/02/06 | 1009 | biblio/pbibtex/pbibtex-base/generate.sh
2022/02/06 | 22422 | biblio/pbibtex/pbibtex-base/jabbrv.bst
@@ -2196,7 +2196,7 @@
1989/12/11 | 6196 | biblio/tib/tib.man
1989/03/29 | 23265 | biblio/tib/vitaMake
2005/12/15 | 366385 | biblio/tib.zip
-2022/10/14 | 18006 | CTAN.sites
+2022/10/26 | 17914 | 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
@@ -5414,7 +5414,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/10/25 | 152860 | FILES.last07days
+2022/10/26 | 122540 | 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
@@ -158656,12 +158656,12 @@
2022/07/31 | 1062592 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
2022/07/31 | 3623 | graphics/pgf/contrib/bodeplot/README.md
2022/08/01 | 775056 | graphics/pgf/contrib/bodeplot.zip
-2019/05/07 | 70256 | graphics/pgf/contrib/braids/braids_code.dtx
-2019/05/07 | 410835 | graphics/pgf/contrib/braids/braids_code.pdf
-2019/04/04 | 314455 | graphics/pgf/contrib/braids/braids.pdf
-2019/04/04 | 21475 | graphics/pgf/contrib/braids/braids.tex
-2019/05/07 | 518 | graphics/pgf/contrib/braids/README.txt
-2019/05/08 | 740965 | graphics/pgf/contrib/braids.zip
+2022/10/26 | 83144 | graphics/pgf/contrib/braids/braids_code.dtx
+2022/10/26 | 456447 | graphics/pgf/contrib/braids/braids_code.pdf
+2022/10/26 | 301271 | graphics/pgf/contrib/braids/braids.pdf
+2022/06/05 | 23036 | graphics/pgf/contrib/braids/braids.tex
+2022/10/26 | 518 | graphics/pgf/contrib/braids/README.txt
+2022/10/26 | 764762 | graphics/pgf/contrib/braids.zip
2021/04/19 | 279288 | graphics/pgf/contrib/byo-twemojis/byo-twemojis.dtx
2021/04/19 | 589 | graphics/pgf/contrib/byo-twemojis/byo-twemojis.ins
2021/04/19 | 337748 | graphics/pgf/contrib/byo-twemojis/byo-twemojis.pdf
@@ -159733,14 +159733,14 @@
2016/12/23 | 276207 | graphics/pgf/contrib/smartdiagram.zip
2021/02/21 | 259536 | graphics/pgf/contrib/spath3/calligraphy.pdf
2021/02/05 | 16482 | graphics/pgf/contrib/spath3/calligraphy.tex
-2021/02/21 | 341621 | graphics/pgf/contrib/spath3/knots.pdf
-2021/02/05 | 27006 | graphics/pgf/contrib/spath3/knots.tex
-2021/02/21 | 523 | graphics/pgf/contrib/spath3/README
-2021/02/21 | 265415 | graphics/pgf/contrib/spath3/spath3_code.dtx
-2021/02/21 | 571802 | graphics/pgf/contrib/spath3/spath3_code.pdf
-2021/02/21 | 388662 | graphics/pgf/contrib/spath3/spath3.pdf
-2021/02/21 | 33598 | graphics/pgf/contrib/spath3/spath3.tex
-2021/02/21 | 1600674 | graphics/pgf/contrib/spath3.zip
+2021/10/25 | 367400 | graphics/pgf/contrib/spath3/knots.pdf
+2021/08/28 | 31271 | graphics/pgf/contrib/spath3/knots.tex
+2022/10/26 | 523 | graphics/pgf/contrib/spath3/README
+2022/10/08 | 314157 | graphics/pgf/contrib/spath3/spath3_code.dtx
+2022/08/25 | 833596 | graphics/pgf/contrib/spath3/spath3_code.pdf
+2022/10/26 | 441114 | graphics/pgf/contrib/spath3/spath3.pdf
+2022/10/26 | 42054 | graphics/pgf/contrib/spath3/spath3.tex
+2022/10/26 | 1902479 | graphics/pgf/contrib/spath3.zip
2022/02/19 | 116564 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.pdf
2022/02/19 | 4304 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_2.tex
2022/02/19 | 52581 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf
@@ -160091,10 +160091,10 @@
2022/06/17 | 3011 | graphics/pgf/contrib/tikzlings/tikzlings.sty
2022/06/17 | 12195 | graphics/pgf/contrib/tikzlings/tikzlings-wolves.sty
2022/06/17 | 768178 | graphics/pgf/contrib/tikzlings.zip
-2021/02/21 | 469 | graphics/pgf/contrib/tikzmark/README
-2021/02/16 | 72059 | graphics/pgf/contrib/tikzmark/tikzmark.dtx
-2021/02/21 | 423477 | graphics/pgf/contrib/tikzmark/tikzmark.pdf
-2021/02/21 | 436319 | graphics/pgf/contrib/tikzmark.zip
+2022/08/25 | 470 | graphics/pgf/contrib/tikzmark/README
+2022/08/25 | 115328 | graphics/pgf/contrib/tikzmark/tikzmark.dtx
+2022/08/25 | 517587 | graphics/pgf/contrib/tikzmark/tikzmark.pdf
+2022/10/26 | 537655 | graphics/pgf/contrib/tikzmark.zip
2017/08/18 | 19039 | graphics/pgf/contrib/tikzmarmots/LICENSE.txt
2018/10/04 | 465 | graphics/pgf/contrib/tikzmarmots/README.md
2018/11/08 | 636 | graphics/pgf/contrib/tikzmarmots/tikzlibrarymarmots.code.tex
@@ -190036,7 +190036,7 @@
2013/07/02 | 153964 | install/macros/plain/contrib/plstmary.tds.zip
2008/05/18 | 22279 | install/macros/plain/plnfss.tds.zip
2022/01/15 | 1403657 | install/macros/unicodetex/latex/fontspec.tds.zip
-2022/07/18 | 1137643 | install/macros/unicodetex/latex/polyglossia.tds.zip
+2022/10/26 | 1152943 | install/macros/unicodetex/latex/polyglossia.tds.zip
2016/02/13 | 111305 | install/macros/unicodetex/latex/realscripts.tds.zip
2021/02/09 | 4924350 | install/macros/unicodetex/latex/texnegar.tds.zip
2020/01/31 | 1873940 | install/macros/unicodetex/latex/unicode-math.tds.zip
@@ -214557,13 +214557,13 @@
2012/03/22 | 988 | macros/latex/contrib/docmute/docmute.sty
2012/03/22 | 350 | macros/latex/contrib/docmute/README
2012/03/22 | 150730 | macros/latex/contrib/docmute.zip
-2022/10/25 | 85 | macros/latex/contrib/docshots/DEPENDS.txt
-2022/10/25 | 19136 | macros/latex/contrib/docshots/docshots.dtx
-2022/10/25 | 2634 | macros/latex/contrib/docshots/docshots.ins
-2022/10/25 | 335433 | macros/latex/contrib/docshots/docshots.pdf
-2022/10/25 | 1083 | macros/latex/contrib/docshots/LICENSE.txt
-2022/10/25 | 1298 | macros/latex/contrib/docshots/README.md
-2022/10/25 | 338236 | macros/latex/contrib/docshots.zip
+2022/10/26 | 129 | macros/latex/contrib/docshots/DEPENDS.txt
+2022/10/26 | 20438 | macros/latex/contrib/docshots/docshots.dtx
+2022/10/26 | 2634 | macros/latex/contrib/docshots/docshots.ins
+2022/10/26 | 338306 | macros/latex/contrib/docshots/docshots.pdf
+2022/10/26 | 1083 | macros/latex/contrib/docshots/LICENSE.txt
+2022/10/26 | 1459 | macros/latex/contrib/docshots/README.md
+2022/10/26 | 341266 | macros/latex/contrib/docshots.zip
2014/06/27 | 39453 | macros/latex/contrib/doctools/doctools.dtx
2014/06/27 | 1134 | macros/latex/contrib/doctools/doctools.ins
2014/06/27 | 605871 | macros/latex/contrib/doctools/doctools.pdf
@@ -214880,12 +214880,12 @@
2008/02/10 | 19110 | macros/latex/contrib/ean13isbn/License.txt
2021/01/24 | 422 | macros/latex/contrib/ean13isbn/README
2021/01/24 | 322624 | macros/latex/contrib/ean13isbn.zip
-2022/10/15 | 75613 | macros/latex/contrib/easybook/easybook.dtx
+2022/10/26 | 75616 | macros/latex/contrib/easybook/easybook.dtx
2022/04/21 | 2081 | macros/latex/contrib/easybook/easybook.ins
-2022/10/15 | 588865 | macros/latex/contrib/easybook/easybook.pdf
-2022/10/15 | 83933 | macros/latex/contrib/easybook/easybook.tex
+2022/10/26 | 588506 | macros/latex/contrib/easybook/easybook.pdf
+2022/10/26 | 83763 | macros/latex/contrib/easybook/easybook.tex
2022/10/15 | 801 | macros/latex/contrib/easybook/README.md
-2022/10/15 | 630422 | macros/latex/contrib/easybook.zip
+2022/10/26 | 630030 | macros/latex/contrib/easybook.zip
2009/06/17 | 82589 | macros/latex/contrib/easy/doc/docbib.pdf
2009/06/17 | 78378 | macros/latex/contrib/easy/doc/docbmat.pdf
2009/06/17 | 99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -216943,11 +216943,12 @@
2013/03/26 | 19267 | macros/latex/contrib/filedate/filedate.sty
2012/11/06 | 1899 | macros/latex/contrib/filedate/README
2013/03/27 | 575744 | macros/latex/contrib/filedate.zip
-2020/09/29 | 83112 | macros/latex/contrib/filehook/filehook.dtx
-2020/09/29 | 808 | macros/latex/contrib/filehook/filehook.ins
-2020/09/29 | 304009 | macros/latex/contrib/filehook/filehook.pdf
-2020/09/29 | 284 | macros/latex/contrib/filehook/README
-2020/09/29 | 312378 | macros/latex/contrib/filehook.zip
+2022/10/26 | 294 | macros/latex/contrib/filehook/DEPENDS.txt
+2022/10/26 | 83218 | macros/latex/contrib/filehook/filehook.dtx
+2022/10/26 | 808 | macros/latex/contrib/filehook/filehook.ins
+2022/10/26 | 316022 | macros/latex/contrib/filehook/filehook.pdf
+2022/10/26 | 555 | macros/latex/contrib/filehook/README.txt
+2022/10/26 | 322581 | macros/latex/contrib/filehook.zip
2012/11/30 | 599 | macros/latex/contrib/fileinfo/doc/fileinfo.RLS
2012/11/30 | 559310 | macros/latex/contrib/fileinfo/doc/myfilist.pdf
2012/11/30 | 489557 | macros/latex/contrib/fileinfo/doc/readprov.pdf
@@ -221414,6 +221415,161 @@
2010/04/07 | 239721 | macros/latex/contrib/jeopardy/jeopardy.pdf
2010/04/07 | 996 | macros/latex/contrib/jeopardy/README
2010/04/08 | 1447445 | macros/latex/contrib/jeopardy.zip
+2022/10/26 | 5663850 | macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
+2022/10/26 | 26328 | macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
+2022/10/26 | 518 | macros/latex/contrib/jeuxcartes/README.md
+2020/07/30 | 16929 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10C.png
+2020/07/30 | 15717 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10K.png
+2020/07/30 | 10524 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10P.png
+2020/07/30 | 11012 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10T.png
+2020/07/30 | 7450 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2C.png
+2020/07/30 | 6972 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2K.png
+2020/07/30 | 4473 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2P.png
+2020/07/30 | 4722 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2T.png
+2020/07/30 | 9224 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3C.png
+2020/07/30 | 8548 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3K.png
+2020/07/30 | 5545 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3P.png
+2020/07/30 | 5747 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3T.png
+2020/07/30 | 8699 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4C.png
+2020/07/30 | 8033 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4K.png
+2020/07/30 | 5641 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4P.png
+2020/07/30 | 5846 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4T.png
+2020/07/30 | 10512 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5C.png
+2020/07/30 | 9703 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5K.png
+2020/07/30 | 6560 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5P.png
+2020/07/30 | 6848 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5T.png
+2020/07/30 | 12632 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6C.png
+2020/07/30 | 11949 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6K.png
+2020/07/30 | 7830 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6P.png
+2020/07/30 | 8152 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6T.png
+2020/07/30 | 12522 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7C.png
+2020/07/30 | 11715 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7K.png
+2020/07/30 | 7792 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7P.png
+2020/07/30 | 8108 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7T.png
+2020/07/30 | 15268 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8C.png
+2020/07/30 | 14105 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8K.png
+2020/07/30 | 9295 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8P.png
+2020/07/30 | 9769 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8T.png
+2020/07/30 | 15968 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9C.png
+2020/07/30 | 14817 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9K.png
+2020/07/30 | 9830 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9P.png
+2020/07/30 | 10282 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9T.png
+2020/07/30 | 6887 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AC.png
+2020/07/30 | 6586 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AK.png
+2020/07/30 | 4160 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AP.png
+2020/07/30 | 12024 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AT.png
+2020/07/30 | 90274 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DC.png
+2020/07/30 | 83544 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DK.png
+2020/07/30 | 28919 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosArgent.png
+2020/07/30 | 1594 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBase.png
+2020/07/30 | 59833 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuFonce.png
+2020/07/30 | 62669 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleu.png
+2020/07/30 | 62969 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuVert.png
+2020/07/30 | 53015 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosCyan.png
+2020/07/30 | 53007 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosFuchsia.png
+2020/07/30 | 33037 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosGris.png
+2020/07/30 | 53007 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosJaune.png
+2020/07/30 | 63461 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosMarron.png
+2020/07/30 | 63519 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNavy.png
+2020/07/30 | 45992 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNoir.png
+2020/07/30 | 63108 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosOlive.png
+2020/07/30 | 59833 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosRouge.png
+2020/07/30 | 55974 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVertCitron.png
+2020/07/30 | 64250 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVert.png
+2020/07/30 | 64088 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosViolet.png
+2020/07/30 | 85185 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DP.png
+2020/07/30 | 80241 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DT.png
+2020/07/30 | 38205 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JN.png
+2020/07/30 | 38208 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JR.png
+2020/07/30 | 81364 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RC.png
+2020/07/30 | 84821 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RK.png
+2020/07/30 | 86164 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RP.png
+2020/07/30 | 86879 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RT.png
+2020/07/30 | 79792 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VC.png
+2020/07/30 | 77964 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VK.png
+2020/07/30 | 93105 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VP.png
+2020/07/30 | 82311 | macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VT.png
+2022/10/25 | 44247 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.png
+2022/10/24 | 42766 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.png
+2022/10/24 | 42360 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.png
+2022/10/24 | 47466 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.png
+2022/10/24 | 56973 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.png
+2022/10/25 | 37927 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.png
+2022/10/25 | 44818 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.png
+2022/10/25 | 44384 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.png
+2022/10/25 | 36795 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.png
+2022/10/25 | 45828 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.png
+2022/10/25 | 53425 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.png
+2022/10/25 | 49300 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.png
+2022/10/25 | 49989 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.png
+2022/10/25 | 43440 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.png
+2022/10/25 | 43799 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.png
+2022/10/25 | 43792 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.png
+2022/10/25 | 48089 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.png
+2022/10/25 | 50287 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.png
+2022/10/24 | 27549 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.png
+2022/10/24 | 27207 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.png
+2022/10/24 | 29073 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.png
+2022/10/24 | 30579 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.png
+2022/10/25 | 50104 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.png
+2022/10/24 | 30378 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.png
+2022/10/24 | 30138 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.png
+2022/10/24 | 31671 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.png
+2022/10/24 | 34899 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.png
+2022/10/25 | 45425 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.png
+2022/10/24 | 28707 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.png
+2022/10/24 | 28936 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.png
+2022/10/24 | 31048 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.png
+2022/10/24 | 33487 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.png
+2022/10/25 | 43095 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.png
+2022/10/24 | 30426 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.png
+2022/10/24 | 30600 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.png
+2022/10/24 | 34235 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.png
+2022/10/24 | 37424 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.png
+2022/10/25 | 48338 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.png
+2022/10/24 | 31872 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.png
+2022/10/24 | 33157 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.png
+2022/10/24 | 37950 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.png
+2022/10/24 | 42512 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.png
+2022/10/25 | 49002 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.png
+2022/10/24 | 30118 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.png
+2022/10/24 | 29190 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.png
+2022/10/24 | 36529 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.png
+2022/10/24 | 40463 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.png
+2022/10/25 | 49112 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.png
+2022/10/24 | 37356 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.png
+2022/10/24 | 34636 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.png
+2022/10/24 | 41209 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.png
+2022/10/24 | 47785 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.png
+2022/10/25 | 48783 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.png
+2022/10/24 | 37970 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.png
+2022/10/24 | 37475 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.png
+2022/10/24 | 43485 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.png
+2022/10/24 | 47633 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.png
+2022/10/24 | 22035 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.png
+2022/10/24 | 21913 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.png
+2022/10/24 | 23870 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.png
+2022/10/24 | 25708 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.png
+2022/10/25 | 38389 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.png
+2022/10/25 | 37673 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.png
+2022/10/25 | 41010 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.png
+2022/10/25 | 40689 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.png
+2022/10/25 | 38949 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.png
+2022/10/25 | 38448 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.png
+2022/10/24 | 80226 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.png
+2022/10/25 | 38922 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.png
+2022/10/25 | 32924 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.png
+2022/10/25 | 46165 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.png
+2022/10/25 | 42817 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.png
+2022/10/25 | 43865 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.png
+2022/10/25 | 38016 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.png
+2022/10/25 | 44231 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.png
+2022/10/25 | 46382 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.png
+2022/10/25 | 49967 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.png
+2022/10/25 | 49125 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.png
+2022/10/25 | 42304 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.png
+2022/10/26 | 14555 | macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
+2022/10/26 | 11049260 | macros/latex/contrib/jeuxcartes.zip
2004/12/10 | 70397 | macros/latex/contrib/jhep/JHEP.cls
2007/04/24 | 1891 | macros/latex/contrib/jj_game/designs/design_bahamas.def
2007/04/19 | 1573 | macros/latex/contrib/jj_game/designs/design_florida.def
@@ -225350,11 +225506,12 @@
2011/09/17 | 82006 | macros/latex/contrib/newvbtm/newvbtm-man.pdf
2011/09/17 | 1058 | macros/latex/contrib/newvbtm/README
2011/09/17 | 82826 | macros/latex/contrib/newvbtm.zip
-2021/01/06 | 28997 | macros/latex/contrib/newverbs/newverbs.dtx
-2021/01/06 | 281 | macros/latex/contrib/newverbs/newverbs.ins
-2021/01/06 | 221688 | macros/latex/contrib/newverbs/newverbs.pdf
-2021/01/06 | 988 | macros/latex/contrib/newverbs/README
-2021/03/10 | 227897 | macros/latex/contrib/newverbs.zip
+2022/10/26 | 61 | macros/latex/contrib/newverbs/DEPENDS.txt
+2022/10/26 | 29106 | macros/latex/contrib/newverbs/newverbs.dtx
+2022/10/26 | 278 | macros/latex/contrib/newverbs/newverbs.ins
+2022/10/26 | 231411 | macros/latex/contrib/newverbs/newverbs.pdf
+2022/10/26 | 1259 | macros/latex/contrib/newverbs/README.txt
+2022/10/26 | 235708 | macros/latex/contrib/newverbs.zip
2018/07/05 | 93 | macros/latex/contrib/nexus-otf/Changes
2018/07/05 | 161314 | macros/latex/contrib/nexus-otf/doc/nexus-otf-doc.pdf
2018/07/05 | 6205 | macros/latex/contrib/nexus-otf/doc/nexus-otf-doc.tex
@@ -247682,10 +247839,10 @@
2022/05/29 | 2346554 | macros/unicodetex/latex/nwafuthesis/nwafuthesis.pdf
2022/04/04 | 1542 | macros/unicodetex/latex/nwafuthesis/README.md
2022/05/29 | 3442045 | macros/unicodetex/latex/nwafuthesis.zip
-2022/07/18 | 971089 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
-2022/07/18 | 352848 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
-2022/07/18 | 1942 | macros/unicodetex/latex/polyglossia/README.md
-2022/07/18 | 564296 | macros/unicodetex/latex/polyglossia.zip
+2022/10/26 | 992557 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
+2022/10/26 | 354667 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
+2022/10/26 | 1942 | macros/unicodetex/latex/polyglossia/README.md
+2022/10/26 | 567887 | macros/unicodetex/latex/polyglossia.zip
2021/02/02 | 89634 | macros/unicodetex/latex/quran-bn/doc/quran-bn-doc.pdf
2021/02/02 | 6514 | macros/unicodetex/latex/quran-bn/doc/quran-bn-doc.tex
2021/02/02 | 47781 | macros/unicodetex/latex/quran-bn/doc/quran-bn-test.pdf
@@ -278446,7 +278603,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
-2022/10/23 | 204647 | support/TeX4ht/source/ChangeLog
+2022/10/25 | 205203 | 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
@@ -278458,7 +278615,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
-2022/10/20 | 1133871 | support/TeX4ht/source/tex4ht-4ht.tex
+2022/10/25 | 1134186 | 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
2022/06/05 | 21307 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -278484,7 +278641,7 @@
2021/05/03 | 14218 | support/TeX4ht/source/tex4ht-htcmd.tex
2021/05/03 | 70683 | support/TeX4ht/source/tex4ht-html0.tex
2021/05/03 | 164748 | support/TeX4ht/source/tex4ht-html32.tex
-2022/10/23 | 618841 | support/TeX4ht/source/tex4ht-html4.tex
+2022/10/25 | 618901 | support/TeX4ht/source/tex4ht-html4.tex
2022/08/11 | 11077 | support/TeX4ht/source/tex4ht-html5.tex
2021/06/17 | 648233 | support/TeX4ht/source/tex4ht-html-speech.tex
2021/05/03 | 59483 | support/TeX4ht/source/tex4ht-html-speech-xtpipes.tex
@@ -278502,7 +278659,7 @@
2021/05/03 | 90707 | support/TeX4ht/source/tex4ht-jsml-xtpipes.tex
2022/10/23 | 6801 | support/TeX4ht/source/tex4ht-mathjax.tex
2021/05/03 | 102444 | support/TeX4ht/source/tex4ht-mathltx.tex
-2022/10/05 | 145166 | support/TeX4ht/source/tex4ht-mathml.tex
+2022/10/25 | 145364 | support/TeX4ht/source/tex4ht-mathml.tex
2021/05/03 | 8860 | support/TeX4ht/source/tex4ht-mathplayer.tex
2021/06/20 | 49012 | support/TeX4ht/source/tex4ht-mkht.tex
2021/05/03 | 26652 | support/TeX4ht/source/tex4ht-moz.tex
@@ -278514,7 +278671,7 @@
2021/05/03 | 7226 | support/TeX4ht/source/tex4ht-svg.tex
2021/05/03 | 106563 | support/TeX4ht/source/tex4ht-t4ht.tex
2021/05/03 | 44160 | support/TeX4ht/source/tex4ht-tei.tex
-2021/06/19 | 30441 | support/TeX4ht/source/tex4ht-unicode.tex
+2022/10/25 | 30495 | support/TeX4ht/source/tex4ht-unicode.tex
2021/05/03 | 14570 | support/TeX4ht/source/tex4ht-word.tex
2021/05/03 | 15265 | support/TeX4ht/source/tex4ht-xhtml-xtpipes.tex
2021/05/03 | 16354 | support/TeX4ht/source/tex4ht-xhtmml-xtpipes.tex
@@ -282383,9 +282540,9 @@
2019/12/07 | 327132 | systems/texlive/tlnet/archive/accsupp.doc.r53052.tar.xz
2019/12/07 | 3304 | systems/texlive/tlnet/archive/accsupp.r53052.tar.xz
2019/12/07 | 8184 | systems/texlive/tlnet/archive/accsupp.source.r53052.tar.xz
-2022/09/29 | 881812 | systems/texlive/tlnet/archive/achemso.doc.r64538.tar.xz
-2022/09/29 | 19312 | systems/texlive/tlnet/archive/achemso.r64538.tar.xz
-2022/09/29 | 31548 | systems/texlive/tlnet/archive/achemso.source.r64538.tar.xz
+2022/10/26 | 880940 | systems/texlive/tlnet/archive/achemso.doc.r64807.tar.xz
+2022/10/26 | 19280 | systems/texlive/tlnet/archive/achemso.r64807.tar.xz
+2022/10/26 | 31508 | systems/texlive/tlnet/archive/achemso.source.r64807.tar.xz
2022/10/20 | 4833180 | systems/texlive/tlnet/archive/acmart.doc.r64753.tar.xz
2022/10/20 | 42916 | systems/texlive/tlnet/archive/acmart.r64753.tar.xz
2022/10/20 | 61220 | systems/texlive/tlnet/archive/acmart.source.r64753.tar.xz
@@ -283351,7 +283508,7 @@
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
2022/09/04 | 476940 | systems/texlive/tlnet/archive/beaulivre.doc.r64280.tar.xz
2022/09/04 | 4628 | systems/texlive/tlnet/archive/beaulivre.r64280.tar.xz
-2022/09/24 | 892256 | systems/texlive/tlnet/archive/beebe.r64481.tar.xz
+2022/10/26 | 891724 | systems/texlive/tlnet/archive/beebe.r64814.tar.xz
2022/05/08 | 785552 | systems/texlive/tlnet/archive/begingreek.doc.r63255.tar.xz
2022/05/08 | 1808 | systems/texlive/tlnet/archive/begingreek.r63255.tar.xz
2022/05/08 | 7856 | systems/texlive/tlnet/archive/begingreek.source.r63255.tar.xz
@@ -285569,9 +285726,9 @@
2019/02/28 | 3156 | systems/texlive/tlnet/archive/docmute.source.r25741.tar.xz
2019/02/28 | 1508 | systems/texlive/tlnet/archive/doc-pictex.doc.r24927.tar.xz
2019/02/28 | 468 | systems/texlive/tlnet/archive/doc-pictex.r24927.tar.xz
-2022/10/19 | 331104 | systems/texlive/tlnet/archive/docshots.doc.r64739.tar.xz
-2022/10/19 | 2488 | systems/texlive/tlnet/archive/docshots.r64739.tar.xz
-2022/10/19 | 6296 | systems/texlive/tlnet/archive/docshots.source.r64739.tar.xz
+2022/10/26 | 331464 | systems/texlive/tlnet/archive/docshots.doc.r64808.tar.xz
+2022/10/26 | 2472 | systems/texlive/tlnet/archive/docshots.r64808.tar.xz
+2022/10/26 | 6480 | systems/texlive/tlnet/archive/docshots.source.r64808.tar.xz
2021/12/31 | 260928 | systems/texlive/tlnet/archive/docsurvey.doc.r61447.tar.xz
2021/12/31 | 548 | systems/texlive/tlnet/archive/docsurvey.r61447.tar.xz
2019/02/28 | 603152 | systems/texlive/tlnet/archive/doctools.doc.r34474.tar.xz
@@ -286243,9 +286400,9 @@
2022/02/08 | 341332 | systems/texlive/tlnet/archive/envlab.doc.r61937.tar.xz
2022/02/08 | 5492 | systems/texlive/tlnet/archive/envlab.r61937.tar.xz
2022/02/08 | 14628 | systems/texlive/tlnet/archive/envlab.source.r61937.tar.xz
-2022/10/21 | 491676 | systems/texlive/tlnet/archive/eolang.doc.r64763.tar.xz
-2022/10/21 | 3104 | systems/texlive/tlnet/archive/eolang.r64763.tar.xz
-2022/10/21 | 5548 | systems/texlive/tlnet/archive/eolang.source.r64763.tar.xz
+2022/10/26 | 560616 | systems/texlive/tlnet/archive/eolang.doc.r64809.tar.xz
+2022/10/26 | 3232 | systems/texlive/tlnet/archive/eolang.r64809.tar.xz
+2022/10/26 | 6140 | systems/texlive/tlnet/archive/eolang.source.r64809.tar.xz
2019/02/28 | 266312 | systems/texlive/tlnet/archive/epigrafica.doc.r17210.tar.xz
2019/02/28 | 343668 | systems/texlive/tlnet/archive/epigrafica.r17210.tar.xz
2019/02/28 | 852 | systems/texlive/tlnet/archive/epigram.r20513.tar.xz
@@ -288008,9 +288165,9 @@
2022/04/06 | 17644 | systems/texlive/tlnet/archive/ieejtran.r62957.tar.xz
2019/02/28 | 3464 | systems/texlive/tlnet/archive/ietfbibs.doc.r41332.tar.xz
2019/02/28 | 456 | systems/texlive/tlnet/archive/ietfbibs.r41332.tar.xz
-2022/10/24 | 325224 | systems/texlive/tlnet/archive/iexec.doc.r64797.tar.xz
-2022/10/24 | 2380 | systems/texlive/tlnet/archive/iexec.r64797.tar.xz
-2022/10/24 | 5472 | systems/texlive/tlnet/archive/iexec.source.r64797.tar.xz
+2022/10/26 | 325748 | systems/texlive/tlnet/archive/iexec.doc.r64810.tar.xz
+2022/10/26 | 2412 | systems/texlive/tlnet/archive/iexec.r64810.tar.xz
+2022/10/26 | 5548 | systems/texlive/tlnet/archive/iexec.source.r64810.tar.xz
2021/07/24 | 175068 | systems/texlive/tlnet/archive/ifallfalse.doc.r60027.tar.xz
2021/07/24 | 1248 | systems/texlive/tlnet/archive/ifallfalse.r60027.tar.xz
2021/07/24 | 3084 | systems/texlive/tlnet/archive/ifallfalse.source.r60027.tar.xz
@@ -289536,8 +289693,8 @@
2020/08/15 | 7092 | systems/texlive/tlnet/archive/luaprogtable.r56113.tar.xz
2022/09/13 | 1524 | systems/texlive/tlnet/archive/luapstricks.doc.r64345.tar.xz
2022/09/13 | 26996 | systems/texlive/tlnet/archive/luapstricks.r64345.tar.xz
-2022/08/31 | 110844 | systems/texlive/tlnet/archive/luaquotes.doc.r64243.tar.xz
-2022/08/31 | 2596 | systems/texlive/tlnet/archive/luaquotes.r64243.tar.xz
+2022/10/26 | 113916 | systems/texlive/tlnet/archive/luaquotes.doc.r64812.tar.xz
+2022/10/26 | 2628 | systems/texlive/tlnet/archive/luaquotes.r64812.tar.xz
2019/02/28 | 50272 | systems/texlive/tlnet/archive/luarandom.doc.r49419.tar.xz
2019/02/28 | 1392 | systems/texlive/tlnet/archive/luarandom.r49419.tar.xz
2019/02/28 | 224504 | systems/texlive/tlnet/archive/luasseq.doc.r37877.tar.xz
@@ -291424,8 +291581,8 @@
2019/02/28 | 352 | systems/texlive/tlnet/archive/pedigree-perl.x86_64-linuxmusl.r46840.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/pedigree-perl.x86_64-linux.r25962.tar.xz
2019/02/28 | 348 | systems/texlive/tlnet/archive/pedigree-perl.x86_64-solaris.r25962.tar.xz
-2022/10/23 | 55904 | systems/texlive/tlnet/archive/penlight.doc.r64781.tar.xz
-2022/10/23 | 108264 | systems/texlive/tlnet/archive/penlight.r64781.tar.xz
+2022/10/26 | 56004 | systems/texlive/tlnet/archive/penlight.doc.r64811.tar.xz
+2022/10/26 | 108260 | systems/texlive/tlnet/archive/penlight.r64811.tar.xz
2021/01/24 | 966168 | systems/texlive/tlnet/archive/penrose.doc.r57508.tar.xz
2021/01/24 | 7448 | systems/texlive/tlnet/archive/penrose.r57508.tar.xz
2021/01/24 | 13256 | systems/texlive/tlnet/archive/penrose.source.r57508.tar.xz
@@ -293774,14 +293931,14 @@
2022/02/27 | 108804 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r62206.tar.xz
2022/02/27 | 87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r62220.tar.xz
2022/04/21 | 69948 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r63092.tar.xz
-2022/10/24 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r64796.tar.xz
+2022/10/26 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r64813.tar.xz
2022/03/01 | 58328 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r62282.tar.xz
2022/02/27 | 93760 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r62206.tar.xz
2022/02/27 | 91280 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r62210.tar.xz
2022/02/27 | 76200 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r62220.tar.xz
2022/02/27 | 83964 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r62206.tar.xz
-2022/10/24 | 944956 | systems/texlive/tlnet/archive/tex4ht.r64796.tar.xz
-2022/10/24 | 1273692 | systems/texlive/tlnet/archive/tex4ht.source.r64796.tar.xz
+2022/10/26 | 944928 | systems/texlive/tlnet/archive/tex4ht.r64813.tar.xz
+2022/10/26 | 1270488 | systems/texlive/tlnet/archive/tex4ht.source.r64813.tar.xz
2022/02/28 | 184748 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r62258.tar.xz
2022/02/27 | 57768 | systems/texlive/tlnet/archive/tex4ht.win32.r62199.tar.xz
2022/03/01 | 58016 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r62279.tar.xz
@@ -294035,7 +294192,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
-2022/10/25 | 422904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64799.tar.xz
+2022/10/26 | 422904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64806.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
@@ -294059,7 +294216,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
-2022/10/25 | 113648 | systems/texlive/tlnet/archive/texlive-scripts.r64799.tar.xz
+2022/10/26 | 113684 | systems/texlive/tlnet/archive/texlive-scripts.r64806.tar.xz
2022/09/13 | 580 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r64356.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2022/09/13 | 596 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r64356.tar.xz
@@ -295906,16 +296063,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/07/17 | 124404 | systems/texlive/tlnet/install-tl
-2022/10/25 | 5834227 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/10/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/10/26 | 5834456 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/10/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/10/25 | 20436202 | systems/texlive/tlnet/install-tl-windows.exe
-2022/10/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/10/25 | 25518474 | systems/texlive/tlnet/install-tl.zip
-2022/10/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/10/26 | 20436948 | systems/texlive/tlnet/install-tl-windows.exe
+2022/10/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/10/26 | 25518511 | systems/texlive/tlnet/install-tl.zip
+2022/10/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -295925,7 +296082,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/10/09 | 49938 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/10/24 | 6969 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/10/25 | 7204 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/10/13 | 225403 | 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
@@ -295968,12 +296125,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/10/25 | 17787724 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/10/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/10/26 | 17787240 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/10/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/10/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/10/25 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/10/25 | 2422424 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/10/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/10/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/10/26 | 2423180 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/09/14 | 58922 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/10/04 | 42404 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -301373,7 +301530,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/10/25 | 668296 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/10/26 | 668296 | systems/win32/miktex/tm/packages/files.csv.lzma
2001/05/14 | 5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
2015/10/20 | 44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
2011/10/21 | 89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -303105,9 +303262,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/07/26 | 39695 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/10/15 | 43540 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/10/25 | 299947 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/10/25 | 1508898 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/10/25 | 1385823 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/10/26 | 299943 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/10/26 | 1507796 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/10/26 | 1385837 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/07/26 | 13519 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/10/15 | 14426 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
2016/07/15 | 35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -303356,102 +303513,102 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/10/25 | 667232 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/10/25 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/10/25 | 1161751 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/10/25 | 31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/10/25 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/10/25 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/10/25 | 95467 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/10/25 | 77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/10/25 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/10/25 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/10/25 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/10/25 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/10/25 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/10/25 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/10/25 | 103247 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/10/25 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/10/25 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/10/25 | 52036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/10/25 | 325981 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/10/25 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/10/25 | 135465 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/10/25 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/10/25 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/10/25 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/10/25 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/10/25 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/10/25 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/10/25 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/10/25 | 81447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/10/25 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/10/25 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/10/25 | 112878 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/10/25 | 73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/10/25 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/10/25 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/10/25 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/10/25 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/10/25 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/10/25 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/10/25 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/10/25 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/10/25 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/10/25 | 599103 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/10/25 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/10/25 | 103597 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/10/25 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/10/25 | 74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/10/25 | 32073 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/10/25 | 8824 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/10/25 | 209137 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/10/25 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/10/25 | 104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/10/25 | 140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/10/25 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/10/25 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/10/25 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/10/25 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/10/25 | 43618 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/10/25 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/10/25 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/10/25 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/10/25 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/10/25 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/10/25 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/10/25 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/10/25 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/10/25 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/10/25 | 23951 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/10/25 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/10/25 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/10/25 | 58631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/10/25 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/10/25 | 1503054 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/10/25 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/10/25 | 63803 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/10/25 | 27464 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/10/25 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/10/25 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/10/25 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/10/25 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/10/25 | 107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/10/25 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/10/25 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/10/25 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/10/25 | 33859 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/10/25 | 73687 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/10/25 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/10/25 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/10/25 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/10/25 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/10/25 | 299939 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/10/25 | 1505392 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/10/25 | 1383989 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/10/25 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/10/26 | 667232 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/10/26 | 57318 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/10/26 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/10/26 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/10/26 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/10/26 | 65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/10/26 | 95467 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/10/26 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/10/26 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/10/26 | 394144 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/10/26 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/10/26 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/10/26 | 270467 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/10/26 | 196211 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/10/26 | 103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/10/26 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/10/26 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/10/26 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/10/26 | 325981 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/10/26 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/10/26 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/10/26 | 1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/10/26 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/10/26 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/10/26 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/10/26 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/10/26 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/10/26 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/10/26 | 81450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/10/26 | 295946 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/10/26 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/10/26 | 112880 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/10/26 | 73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/10/26 | 115580 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/10/26 | 43890 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/10/26 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/10/26 | 247206 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/10/26 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/10/26 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/10/26 | 18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/10/26 | 30571 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/10/26 | 682213 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/10/26 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/10/26 | 527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/10/26 | 103597 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/10/26 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/10/26 | 74100 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/10/26 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/10/26 | 8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/10/26 | 209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/10/26 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/10/26 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/10/26 | 140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/10/26 | 325484 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/10/26 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/10/26 | 55318 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/10/26 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/26 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/10/26 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/10/26 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/10/26 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/10/26 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/10/26 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/10/26 | 203418 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/10/26 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/10/26 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/10/26 | 1323745 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/10/26 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/10/26 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/10/26 | 72977 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/10/26 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/10/26 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/10/26 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/10/26 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/10/26 | 63803 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/10/26 | 27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/10/26 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/10/26 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/10/26 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/10/26 | 68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/10/26 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/10/26 | 2821672 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/10/26 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/10/26 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/10/26 | 33863 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/10/26 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/10/26 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/10/26 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/10/26 | 630436 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/10/26 | 43526 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/10/26 | 299957 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/10/26 | 1506348 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/10/26 | 1384936 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/10/26 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/10/25 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/10/26 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
2018/07/06 | 145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
2017/03/30 | 191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
2012/12/20 | 612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -303968,7 +304125,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/10/25 | 990 | systems/win32/miktex/tm/packages/pr.ini
+2022/10/26 | 990 | systems/win32/miktex/tm/packages/pr.ini
2010/09/27 | 248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
2008/06/17 | 77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
2017/07/12 | 988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -305956,7 +306113,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
-2022/10/26 | 186 | timestamp
+2022/10/27 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 05d6251f60..a23ecf415a 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index b3fa691695..e02270637a 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,174 +1,274 @@
-2022/10/25 | 990 | systems/win32/miktex/tm/packages/pr.ini
-2022/10/25 | 95467 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/10/25 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/10/25 | 8824 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/10/26 | 992557 | macros/unicodetex/latex/polyglossia/polyglossia.dtx
+2022/10/26 | 990 | systems/win32/miktex/tm/packages/pr.ini
+2022/10/26 | 95467 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/10/26 | 944928 | systems/texlive/tlnet/archive/tex4ht.r64813.tar.xz
+2022/10/26 | 891724 | systems/texlive/tlnet/archive/beebe.r64814.tar.xz
+2022/10/26 | 88483 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/10/26 | 8825 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/10/26 | 880940 | systems/texlive/tlnet/archive/achemso.doc.r64807.tar.xz
+2022/10/26 | 83763 | macros/latex/contrib/easybook/easybook.tex
+2022/10/26 | 83218 | macros/latex/contrib/filehook/filehook.dtx
+2022/10/26 | 83144 | graphics/pgf/contrib/braids/braids_code.dtx
+2022/10/26 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/10/26 | 81450 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/10/26 | 808 | macros/latex/contrib/filehook/filehook.ins
+2022/10/26 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/10/26 | 77211 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/10/26 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/10/26 | 764762 | graphics/pgf/contrib/braids.zip
+2022/10/26 | 75616 | macros/latex/contrib/easybook/easybook.dtx
+2022/10/26 | 74100 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/10/26 | 73685 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/10/26 | 73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/10/26 | 72977 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/10/26 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/10/26 | 682213 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/10/26 | 68147 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/10/26 | 668296 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/10/26 | 667232 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/10/26 | 65130 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/10/26 | 6480 | systems/texlive/tlnet/archive/docshots.source.r64808.tar.xz
+2022/10/26 | 63803 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/10/26 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/10/26 | 630436 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/10/26 | 630030 | macros/latex/contrib/easybook.zip
+2022/10/26 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/10/26 | 61 | macros/latex/contrib/newverbs/DEPENDS.txt
+2022/10/26 | 6140 | systems/texlive/tlnet/archive/eolang.source.r64809.tar.xz
+2022/10/26 | 599104 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/10/26 | 588506 | macros/latex/contrib/easybook/easybook.pdf
+2022/10/26 | 58633 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/10/26 | 5834456 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/10/26 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/10/26 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/10/26 | 57318 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/10/26 | 567887 | macros/unicodetex/latex/polyglossia.zip
+2022/10/26 | 5663850 | macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
+2022/10/26 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/10/26 | 560616 | systems/texlive/tlnet/archive/eolang.doc.r64809.tar.xz
+2022/10/26 | 56004 | systems/texlive/tlnet/archive/penlight.doc.r64811.tar.xz
+2022/10/26 | 555 | macros/latex/contrib/filehook/README.txt
+2022/10/26 | 5548 | systems/texlive/tlnet/archive/iexec.source.r64810.tar.xz
+2022/10/26 | 55318 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/10/26 | 537655 | graphics/pgf/contrib/tikzmark.zip
+2022/10/26 | 527570 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/10/26 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/10/26 | 523 | graphics/pgf/contrib/spath3/README
+2022/10/26 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/10/26 | 52037 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/10/26 | 518 | macros/latex/contrib/jeuxcartes/README.md
+2022/10/26 | 518 | graphics/pgf/contrib/braids/README.txt
+2022/10/26 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/10/26 | 48852 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/10/26 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/10/26 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/10/26 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/10/26 | 456447 | graphics/pgf/contrib/braids/braids_code.pdf
+2022/10/26 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/10/26 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/10/26 | 441114 | graphics/pgf/contrib/spath3/spath3.pdf
+2022/10/26 | 43890 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/10/26 | 43617 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/10/26 | 43526 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/10/26 | 422904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64806.tar.xz
+2022/10/26 | 42054 | graphics/pgf/contrib/spath3/spath3.tex
+2022/10/26 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/10/26 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/10/26 | 4012423 | biblio/ctan-bibdata.zip
+2022/10/26 | 394144 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/10/26 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/10/26 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/10/26 | 3620590 | biblio/ctan-bibdata/ctan.pdf
+2022/10/26 | 354667 | macros/unicodetex/latex/polyglossia/polyglossia.pdf
+2022/10/26 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/10/26 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/10/26 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/26 | 341266 | macros/latex/contrib/docshots.zip
+2022/10/26 | 33863 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/10/26 | 338306 | macros/latex/contrib/docshots/docshots.pdf
+2022/10/26 | 331464 | systems/texlive/tlnet/archive/docshots.doc.r64808.tar.xz
+2022/10/26 | 325981 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/10/26 | 325748 | systems/texlive/tlnet/archive/iexec.doc.r64810.tar.xz
+2022/10/26 | 325484 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/10/26 | 3232 | systems/texlive/tlnet/archive/eolang.r64809.tar.xz
+2022/10/26 | 322581 | macros/latex/contrib/filehook.zip
+2022/10/26 | 32074 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/10/26 | 316022 | macros/latex/contrib/filehook/filehook.pdf
+2022/10/26 | 31586 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/10/26 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/10/26 | 31508 | systems/texlive/tlnet/archive/achemso.source.r64807.tar.xz
+2022/10/26 | 30571 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/10/26 | 301271 | graphics/pgf/contrib/braids/braids.pdf
+2022/10/26 | 299957 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/10/26 | 299943 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/10/26 | 295946 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/10/26 | 294 | macros/latex/contrib/filehook/DEPENDS.txt
+2022/10/26 | 29106 | macros/latex/contrib/newverbs/newverbs.dtx
+2022/10/26 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/10/26 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/10/26 | 2821672 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/10/26 | 278 | macros/latex/contrib/newverbs/newverbs.ins
+2022/10/26 | 27463 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/10/26 | 2741921 | biblio/ctan-bibdata/ctan.bib
+2022/10/26 | 270467 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/10/26 | 2634 | macros/latex/contrib/docshots/docshots.ins
+2022/10/26 | 26328 | macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
+2022/10/26 | 2628 | systems/texlive/tlnet/archive/luaquotes.r64812.tar.xz
+2022/10/26 | 25518511 | systems/texlive/tlnet/install-tl.zip
+2022/10/26 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/10/26 | 2472 | systems/texlive/tlnet/archive/docshots.r64808.tar.xz
+2022/10/26 | 247206 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/10/26 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/10/26 | 2423180 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/10/26 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/10/26 | 2412 | systems/texlive/tlnet/archive/iexec.r64810.tar.xz
+2022/10/26 | 23950 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/10/26 | 235708 | macros/latex/contrib/newverbs.zip
+2022/10/26 | 231411 | macros/latex/contrib/newverbs/newverbs.pdf
+2022/10/26 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/10/26 | 209139 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/10/26 | 20438 | macros/latex/contrib/docshots/docshots.dtx
+2022/10/26 | 20436948 | systems/texlive/tlnet/install-tl-windows.exe
+2022/10/26 | 203418 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/10/26 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/10/26 | 196211 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/10/26 | 1942 | macros/unicodetex/latex/polyglossia/README.md
+2022/10/26 | 19280 | systems/texlive/tlnet/archive/achemso.r64807.tar.xz
+2022/10/26 | 1902479 | graphics/pgf/contrib/spath3.zip
+2022/10/26 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/10/26 | 18381 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/10/26 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/10/26 | 17914 | CTAN.sites
+2022/10/26 | 17787240 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/10/26 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/10/26 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/10/26 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
+2022/10/26 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/10/26 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/10/26 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/10/26 | 1507796 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/10/26 | 1506348 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/10/26 | 1503055 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/10/26 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/10/26 | 1459 | macros/latex/contrib/docshots/README.md
+2022/10/26 | 1458151 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/10/26 | 14555 | macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
+2022/10/26 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/10/26 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/10/26 | 140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/10/26 | 1385837 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/10/26 | 1384936 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/10/26 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r64813.tar.xz
+2022/10/26 | 135464 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/10/26 | 1323745 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/10/26 | 129 | macros/latex/contrib/docshots/DEPENDS.txt
+2022/10/26 | 1270488 | systems/texlive/tlnet/archive/tex4ht.source.r64813.tar.xz
+2022/10/26 | 1259 | macros/latex/contrib/newverbs/README.txt
+2022/10/26 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/10/26 | 1161749 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/10/26 | 115580 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/10/26 | 1152943 | install/macros/unicodetex/latex/polyglossia.tds.zip
+2022/10/26 | 113916 | systems/texlive/tlnet/archive/luaquotes.doc.r64812.tar.xz
+2022/10/26 | 113684 | systems/texlive/tlnet/archive/texlive-scripts.r64806.tar.xz
+2022/10/26 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/10/26 | 112880 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/10/26 | 11049260 | macros/latex/contrib/jeuxcartes.zip
+2022/10/26 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/10/26 | 1083 | macros/latex/contrib/docshots/LICENSE.txt
+2022/10/26 | 108260 | systems/texlive/tlnet/archive/penlight.r64811.tar.xz
+2022/10/26 | 107437 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/10/26 | 104922 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/10/26 | 103597 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/10/26 | 103246 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2022/10/25 | 87 | macros/latex/contrib/eolang/DEPENDS.txt
-2022/10/25 | 85 | macros/latex/contrib/docshots/DEPENDS.txt
-2022/10/25 | 824995 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/10/25 | 81447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/10/25 | 7916 | systems/texlive/tlnet/archive/se2thesis.r64803.tar.xz
-2022/10/25 | 79064 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/10/25 | 77210 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/10/25 | 769653 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/10/25 | 74099 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/10/25 | 73687 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/10/25 | 73263 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/10/25 | 72978 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/10/25 | 70940 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/10/25 | 682214 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/10/25 | 68146 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/10/25 | 668296 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/10/25 | 667232 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/10/25 | 65129 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/10/25 | 7204 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/10/25 | 641 | macros/latex/contrib/eolang/main.bib
2022/10/25 | 638 | macros/luatex/latex/luaquotes/README
-2022/10/25 | 63803 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/10/25 | 63241 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
2022/10/25 | 632099 | macros/latex/contrib/eolang.zip
-2022/10/25 | 630433 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/10/25 | 62359 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/10/25 | 599103 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/10/25 | 618901 | support/TeX4ht/source/tex4ht-html4.tex
2022/10/25 | 591918 | macros/latex/contrib/eolang/eolang.pdf
-2022/10/25 | 58631 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/10/25 | 5834227 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/10/25 | 57505 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/10/25 | 57501 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/10/25 | 57317 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/10/25 | 565082 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/10/25 | 55319 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/10/25 | 527569 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/10/25 | 52627 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/10/25 | 52369 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/10/25 | 52036 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/10/25 | 53425 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.png
2022/10/25 | 51 | macros/latex/contrib/iexec/DEPENDS.txt
2022/10/25 | 512485 | macros/latex/contrib/frenchmath.zip
+2022/10/25 | 50287 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.png
2022/10/25 | 502874 | macros/latex/contrib/frenchmath/frenchmath.pdf
-2022/10/25 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/10/25 | 48851 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/10/25 | 50104 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.png
+2022/10/25 | 49989 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.png
+2022/10/25 | 49967 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.png
+2022/10/25 | 49300 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.png
+2022/10/25 | 49125 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.png
+2022/10/25 | 49112 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.png
+2022/10/25 | 49002 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.png
2022/10/25 | 487888 | systems/texlive/tlnet/archive/lt3luabridge.doc.r64801.tar.xz
-2022/10/25 | 481895 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/10/25 | 48038 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/10/25 | 48783 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.png
+2022/10/25 | 48338 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.png
+2022/10/25 | 48089 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.png
2022/10/25 | 47687 | macros/latex/contrib/eolang/cactus.pdf
-2022/10/25 | 45795 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/10/25 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/10/25 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/10/25 | 46382 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.png
+2022/10/25 | 46165 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.png
+2022/10/25 | 45828 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.png
+2022/10/25 | 45425 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.png
2022/10/25 | 44968 | macros/latex/contrib/mismath/mismath.dtx
-2022/10/25 | 43889 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/10/25 | 43618 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/10/25 | 43527 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/10/25 | 44818 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.png
+2022/10/25 | 44384 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.png
+2022/10/25 | 44247 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.png
+2022/10/25 | 44231 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.png
+2022/10/25 | 43865 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.png
+2022/10/25 | 43799 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.png
+2022/10/25 | 43792 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.png
+2022/10/25 | 43440 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.png
+2022/10/25 | 43095 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.png
+2022/10/25 | 42817 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.png
2022/10/25 | 423724 | systems/texlive/tlnet/archive/biblatex-publist.doc.r64802.tar.xz
-2022/10/25 | 422904 | systems/texlive/tlnet/archive/texlive-scripts.doc.r64799.tar.xz
+2022/10/25 | 42304 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.png
2022/10/25 | 4192 | systems/texlive/tlnet/archive/lt3luabridge.source.r64801.tar.xz
-2022/10/25 | 41191 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/10/25 | 41180 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/10/25 | 4012485 | biblio/ctan-bibdata.zip
+2022/10/25 | 41010 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.png
+2022/10/25 | 40689 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.png
2022/10/25 | 39788 | systems/texlive/tlnet/archive/bithesis.source.r64804.tar.xz
-2022/10/25 | 394142 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/10/25 | 37507 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/10/25 | 37050 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/10/25 | 3620597 | biblio/ctan-bibdata/ctan.pdf
-2022/10/25 | 35265 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/10/25 | 352464 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/10/25 | 35231 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/10/25 | 38949 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.png
+2022/10/25 | 38922 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.png
+2022/10/25 | 38448 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.png
+2022/10/25 | 38389 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.png
+2022/10/25 | 38016 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.png
+2022/10/25 | 37927 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.png
+2022/10/25 | 37673 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.png
+2022/10/25 | 36795 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.png
2022/10/25 | 35098 | macros/luatex/latex/luaquotes/luaquotes-documentation.tex
-2022/10/25 | 33859 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/10/25 | 338236 | macros/latex/contrib/docshots.zip
-2022/10/25 | 335433 | macros/latex/contrib/docshots/docshots.pdf
2022/10/25 | 331469 | macros/latex/contrib/iexec.zip
+2022/10/25 | 32924 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.png
2022/10/25 | 328403 | macros/latex/contrib/iexec/iexec.pdf
2022/10/25 | 32608 | macros/latex/contrib/frenchmath/frenchmath.dtx
-2022/10/25 | 325981 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/10/25 | 325483 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/10/25 | 32073 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/10/25 | 31587 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/10/25 | 31562 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/10/25 | 30570 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/10/25 | 30495 | support/TeX4ht/source/tex4ht-unicode.tex
2022/10/25 | 3004 | systems/texlive/tlnet/archive/lt3luabridge.r64801.tar.xz
-2022/10/25 | 299947 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/10/25 | 299939 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/10/25 | 295944 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/10/25 | 286684 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/10/25 | 28510 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/10/25 | 2821671 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/10/25 | 27464 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/10/25 | 2741891 | biblio/ctan-bibdata/ctan.bib
-2022/10/25 | 270466 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/10/25 | 2634 | macros/latex/contrib/docshots/docshots.ins
2022/10/25 | 2628 | macros/latex/contrib/eolang/eolang.ins
2022/10/25 | 2625 | macros/latex/contrib/iexec/iexec.ins
-2022/10/25 | 25518474 | systems/texlive/tlnet/install-tl.zip
-2022/10/25 | 25119 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/10/25 | 247929 | macros/latex/contrib/mismath/mismath.pdf
-2022/10/25 | 247207 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/10/25 | 245152 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/10/25 | 2422424 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2022/10/25 | 24212 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/10/25 | 23951 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/10/25 | 234025 | macros/latex/contrib/mismath.zip
2022/10/25 | 21796 | systems/texlive/tlnet/archive/bithesis.r64804.tar.xz
-2022/10/25 | 213848 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2022/10/25 | 21320 | systems/texlive/tlnet/archive/se2thesis.source.r64803.tar.xz
-2022/10/25 | 209137 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/10/25 | 20436202 | systems/texlive/tlnet/install-tl-windows.exe
-2022/10/25 | 203420 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/10/25 | 2023134 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/10/25 | 196213 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/10/25 | 19136 | macros/latex/contrib/docshots/docshots.dtx
+2022/10/25 | 205203 | support/TeX4ht/source/ChangeLog
2022/10/25 | 185393 | macros/luatex/generic/penlight.zip
-2022/10/25 | 18511 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/10/25 | 18382 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/10/25 | 181724 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/10/25 | 17787724 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/10/25 | 173177 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/10/25 | 169679 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/10/25 | 1678 | biblio/ctan-bibdata/biblatex-ctan/ctan.bbx
2022/10/25 | 15706 | macros/latex/contrib/eolang/eolang.dtx
-2022/10/25 | 155430 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/10/25 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/10/25 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/10/25 | 1508898 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/10/25 | 1505392 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/10/25 | 1503054 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/10/25 | 14958 | macros/latex/contrib/iexec/iexec.dtx
-2022/10/25 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/10/25 | 1458152 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/10/25 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/10/25 | 14433 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/10/25 | 145364 | support/TeX4ht/source/tex4ht-mathml.tex
2022/10/25 | 1429356 | systems/texlive/tlnet/archive/se2thesis.doc.r64803.tar.xz
-2022/10/25 | 140013 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/10/25 | 1385823 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/10/25 | 1383989 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2022/10/25 | 1369 | macros/latex/contrib/iexec/README.md
-2022/10/25 | 135465 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/10/25 | 1323744 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/10/25 | 1298 | macros/latex/contrib/docshots/README.md
2022/10/25 | 12172 | systems/texlive/tlnet/archive/biblatex-publist.r64802.tar.xz
2022/10/25 | 1211 | macros/latex/contrib/eolang/README.md
-2022/10/25 | 1172 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/10/25 | 1161751 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2022/10/25 | 116172 | macros/luatex/latex/luaquotes.zip
-2022/10/25 | 115579 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/10/25 | 113648 | systems/texlive/tlnet/archive/texlive-scripts.r64799.tar.xz
-2022/10/25 | 112979 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/10/25 | 112878 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/10/25 | 1134186 | support/TeX4ht/source/tex4ht-4ht.tex
2022/10/25 | 110314 | macros/luatex/latex/luaquotes/luaquotes-documentation.pdf
-2022/10/25 | 109650 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2022/10/25 | 10886 | macros/luatex/latex/luaquotes/luaquotes.sty
2022/10/25 | 1083 | macros/latex/contrib/iexec/LICENSE.txt
2022/10/25 | 1083 | macros/latex/contrib/eolang/LICENSE.txt
-2022/10/25 | 1083 | macros/latex/contrib/docshots/LICENSE.txt
-2022/10/25 | 107436 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/10/25 | 104921 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/10/25 | 1043 | macros/latex/contrib/frenchmath/README.md
-2022/10/25 | 103597 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/10/25 | 103247 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
2022/10/25 | 1017204 | systems/texlive/tlnet/archive/bithesis.doc.r64804.tar.xz
2022/10/24 | 998 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.dbx
2022/10/24 | 9920 | systems/texlive/tlnet/archive/chktex.r64797.tar.xz
2022/10/24 | 9639 | info/biblio/tugboat.def
-2022/10/24 | 944956 | systems/texlive/tlnet/archive/tex4ht.r64796.tar.xz
2022/10/24 | 917348 | macros/latex/contrib/achemso.zip
2022/10/24 | 896 | macros/generic/lt3luabridge/README.md
2022/10/24 | 8892 | systems/texlive/tlnet/archive/unigrazpub.source.r64797.tar.xz
@@ -178,47 +278,84 @@
2022/10/24 | 871804 | systems/texlive/tlnet/archive/babel.doc.r64797.tar.xz
2022/10/24 | 863 | macros/latex/contrib/se2thesis/README.md
2022/10/24 | 85675 | macros/latex/contrib/se2thesis/se2thesis.dtx
+2022/10/24 | 80226 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.png
2022/10/24 | 7872 | systems/texlive/tlnet/archive/piton.r64797.tar.xz
2022/10/24 | 7596068 | systems/texlive/tlnet/archive/pstricks.doc.r64797.tar.xz
2022/10/24 | 716104 | systems/texlive/tlnet/archive/babel.source.r64797.tar.xz
2022/10/24 | 7083 | macros/latex/contrib/achemso/achemso.ins
-2022/10/24 | 6969 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/10/24 | 65640 | systems/texlive/tlnet/archive/siunitx.r64797.tar.xz
2022/10/24 | 64580 | systems/texlive/tlnet/archive/njuthesis.source.r64797.tar.xz
2022/10/24 | 63183 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.bbx
2022/10/24 | 60358 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.tex
2022/10/24 | 5952 | systems/texlive/tlnet/archive/unigrazpub.r64797.tar.xz
2022/10/24 | 59499 | macros/luatex/generic/penlight/penlight.pdf
-2022/10/24 | 5472 | systems/texlive/tlnet/archive/iexec.source.r64797.tar.xz
+2022/10/24 | 56973 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.png
2022/10/24 | 529764 | systems/texlive/tlnet/archive/tikz-ext.doc.r64797.tar.xz
2022/10/24 | 525672 | macros/latex/contrib/achemso/achemso.pdf
2022/10/24 | 5245 | macros/latex/contrib/achemso/achemso-demo.bib
2022/10/24 | 494475 | macros/generic/lt3luabridge/lt3luabridge.pdf
2022/10/24 | 492236 | macros/generic/lt3luabridge.zip
+2022/10/24 | 47785 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.png
+2022/10/24 | 47633 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.png
+2022/10/24 | 47466 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.png
2022/10/24 | 464 | macros/latex/contrib/achemso/LICENSE.md
2022/10/24 | 440628 | systems/texlive/tlnet/archive/jobname-suffix.doc.r64797.tar.xz
2022/10/24 | 439729 | macros/latex/contrib/biblatex-contrib/biblatex-publist.zip
+2022/10/24 | 43485 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.png
+2022/10/24 | 42766 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.png
2022/10/24 | 425796 | systems/texlive/tlnet/archive/chktex.doc.r64797.tar.xz
2022/10/24 | 425636 | macros/luatex/generic/penlight/penlight.lua
+2022/10/24 | 42512 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.png
+2022/10/24 | 42360 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.png
+2022/10/24 | 41209 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.png
2022/10/24 | 407139 | macros/latex/contrib/biblatex-contrib/biblatex-publist/biblatex-publist.pdf
+2022/10/24 | 40463 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.png
2022/10/24 | 397012 | systems/texlive/tlnet/archive/piton.doc.r64797.tar.xz
2022/10/24 | 3842964 | info/biblio/tugboat.bib
2022/10/24 | 382966 | macros/latex/contrib/achemso/achemso-demo.pdf
+2022/10/24 | 37970 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.png
+2022/10/24 | 37950 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.png
+2022/10/24 | 37475 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.png
+2022/10/24 | 37424 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.png
+2022/10/24 | 37356 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.png
2022/10/24 | 3720 | macros/unicodetex/latex/bithesis/bithesis.ins
2022/10/24 | 365712 | macros/latex/contrib/se2thesis/se2thesis.pdf
+2022/10/24 | 36529 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.png
2022/10/24 | 3582 | info/biblio/tugboat.ltx
+2022/10/24 | 34899 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.png
2022/10/24 | 3478 | macros/latex/contrib/biblatex-contrib/biblatex-publist/publist.cbx
+2022/10/24 | 34636 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.png
+2022/10/24 | 34235 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.png
+2022/10/24 | 33487 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.png
2022/10/24 | 3340 | macros/luatex/generic/penlight/penlight.sty
-2022/10/24 | 325224 | systems/texlive/tlnet/archive/iexec.doc.r64797.tar.xz
+2022/10/24 | 33157 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.png
+2022/10/24 | 31872 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.png
+2022/10/24 | 31671 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.png
+2022/10/24 | 31048 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.png
+2022/10/24 | 30600 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.png
+2022/10/24 | 30579 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.png
2022/10/24 | 30484 | systems/texlive/tlnet/archive/srdp-mathematik.r64797.tar.xz
+2022/10/24 | 30426 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.png
+2022/10/24 | 30378 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.png
+2022/10/24 | 30138 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.png
+2022/10/24 | 30118 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.png
+2022/10/24 | 29190 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.png
+2022/10/24 | 29073 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.png
+2022/10/24 | 28936 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.png
+2022/10/24 | 28707 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.png
+2022/10/24 | 27549 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.png
+2022/10/24 | 27207 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.png
2022/10/24 | 2643 | macros/unicodetex/latex/bithesis/contributing-zh.md
+2022/10/24 | 25708 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.png
2022/10/24 | 25612 | macros/luatex/generic/penlight/penlightextras.lua
2022/10/24 | 253 | macros/generic/lt3luabridge/lt3luabridge.ins
2022/10/24 | 2466 | macros/latex/contrib/se2thesis/se2thesis.ins
-2022/10/24 | 2380 | systems/texlive/tlnet/archive/iexec.r64797.tar.xz
+2022/10/24 | 23870 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.png
2022/10/24 | 23540 | systems/texlive/tlnet/archive/tikz-ext.r64797.tar.xz
2022/10/24 | 2352976 | systems/texlive/tlnet/archive/wargame.doc.r64797.tar.xz
2022/10/24 | 2332 | macros/unicodetex/latex/bithesis/contributing.md
+2022/10/24 | 22035 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.png
+2022/10/24 | 21913 | macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.png
2022/10/24 | 217 | macros/generic/lt3luabridge/example.latex
2022/10/24 | 1993 | macros/unicodetex/latex/bithesis/README.md
2022/10/24 | 194220 | systems/texlive/tlnet/archive/wargame.r64797.tar.xz
@@ -241,11 +378,9 @@
2022/10/24 | 1446588 | macros/latex/contrib/se2thesis.zip
2022/10/24 | 14380 | macros/generic/lt3luabridge/lt3luabridge.dtx
2022/10/24 | 1389 | macros/generic/lt3luabridge/docstrip.cfg
-2022/10/24 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r64796.tar.xz
2022/10/24 | 134736 | systems/texlive/tlnet/archive/unigrazpub.doc.r64797.tar.xz
2022/10/24 | 1333 | macros/latex/contrib/achemso/README.md
2022/10/24 | 1296 | macros/luatex/generic/penlight/README.md
-2022/10/24 | 1273692 | systems/texlive/tlnet/archive/tex4ht.source.r64796.tar.xz
2022/10/24 | 1242984 | systems/texlive/tlnet/archive/siunitx.doc.r64797.tar.xz
2022/10/24 | 1189824 | systems/texlive/tlnet/archive/njuthesis.doc.r64797.tar.xz
2022/10/24 | 116788 | systems/texlive/tlnet/archive/siunitx.source.r64797.tar.xz
@@ -280,11 +415,9 @@
2022/10/23 | 6801 | support/TeX4ht/source/tex4ht-mathjax.tex
2022/10/23 | 6792 | systems/texlive/tlnet/archive/collection-latexextra.r64783.tar.xz
2022/10/23 | 666267 | macros/latex/contrib/siunitx/siunitx.pdf
-2022/10/23 | 618841 | support/TeX4ht/source/tex4ht-html4.tex
2022/10/23 | 617655 | macros/latex/contrib/siunitx/siunitx-code.pdf
2022/10/23 | 614033 | graphics/pgf/contrib/tikz-ext.zip
2022/10/23 | 574442 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual.pdf
-2022/10/23 | 55904 | systems/texlive/tlnet/archive/penlight.doc.r64781.tar.xz
2022/10/23 | 5481 | macros/latex/contrib/siunitx/siunitx-locale.dtx
2022/10/23 | 50961 | macros/latex/contrib/siunitx/siunitx-table.dtx
2022/10/23 | 48433 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
@@ -316,7 +449,6 @@
2022/10/23 | 21890 | macros/latex/required/babel/base/bbcompat.dtx
2022/10/23 | 217579 | macros/luatex/latex/piton/piton-french.pdf
2022/10/23 | 21683 | macros/latex/contrib/siunitx/siunitx.dtx
-2022/10/23 | 204647 | support/TeX4ht/source/ChangeLog
2022/10/23 | 1922922 | macros/latex/required/babel/base.zip
2022/10/23 | 1920 | systems/texlive/tlnet/archive/pangram.r64783.tar.xz
2022/10/23 | 19105 | macros/unicodetex/latex/njuthesis/LICENSE
@@ -338,7 +470,6 @@
2022/10/23 | 125369 | graphics/pstricks/base/generic/pstricks.tex
2022/10/23 | 1200264 | macros/unicodetex/latex/njuthesis/njuthesis.pdf
2022/10/23 | 11063 | graphics/pgf/contrib/tikz-ext/doc/tikz-ext-manual-en-library-misc.tex
-2022/10/23 | 108264 | systems/texlive/tlnet/archive/penlight.r64781.tar.xz
2022/10/23 | 10812 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2022/10/23 | 1077 | macros/unicodetex/latex/njuthesis/README.md
2022/10/23 | 103909 | macros/latex/contrib/siunitx/siunitx-unit.dtx
@@ -386,13 +517,11 @@
2022/10/21 | 58548 | macros/unicodetex/latex/tipauni/tipauni.dtx
2022/10/21 | 576 | fonts/simpleicons/tfm/SimpleIcons--simpleiconsOneZero.tfm
2022/10/21 | 5611 | macros/latex/contrib/beamer-contrib/themes/beamertheme-simpleplus/beamertheme-simpleplus-sample.tex
-2022/10/21 | 5548 | systems/texlive/tlnet/archive/eolang.source.r64763.tar.xz
2022/10/21 | 553 | macros/latex/contrib/univie-ling/doc/templates/template-handout-deutsch.tex
2022/10/21 | 531 | macros/latex/contrib/univie-ling/doc/templates/template-handout-english.tex
2022/10/21 | 5231 | macros/latex/contrib/univie-ling/doc/templates/template-expose-deutsch.tex
2022/10/21 | 500648 | systems/win32/miktex/tm/packages/pgf-periodictable.tar.lzma
2022/10/21 | 4916973 | fonts/simpleicons.zip
-2022/10/21 | 491676 | systems/texlive/tlnet/archive/eolang.doc.r64763.tar.xz
2022/10/21 | 4737 | macros/latex/contrib/univie-ling/doc/templates/template-expose-english.tex
2022/10/21 | 4727 | macros/latex/contrib/univie-ling/doc/templates/template-thesis-deutsch.tex
2022/10/21 | 458 | macros/unicodetex/latex/tipauni/README.txt
@@ -423,7 +552,6 @@
2022/10/21 | 32708 | macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
2022/10/21 | 321268 | macros/unicodetex/latex/tipauni/tipauni.pdf
2022/10/21 | 3192 | macros/latex/contrib/pangram/pangram.ins
-2022/10/21 | 3104 | systems/texlive/tlnet/archive/eolang.r64763.tar.xz
2022/10/21 | 3071 | macros/xetex/latex/ucharclasses/README
2022/10/21 | 29439 | macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
2022/10/21 | 28732 | macros/xetex/latex/ucharclasses/ucharclasses.tex
@@ -528,648 +656,9 @@
2022/10/20 | 163732 | systems/texlive/tlnet/archive/pxjahyper.doc.r64752.tar.xz
2022/10/20 | 16124 | systems/texlive/tlnet/archive/crossrefware.r64754.tar.xz
2022/10/20 | 1611 | macros/latex/contrib/qrbill/qrbill.ins
-2022/10/20 | 155716 | macros/jptex/latex/pxjahyper/pxjahyper.pdf
2022/10/20 | 12183 | macros/latex/contrib/biblatex-contrib/biblatex-jura2/mylit.bib
2022/10/20 | 1153 | macros/latex/contrib/qrbill/qrbill_swiss-cross.pdf
2022/10/20 | 114815 | install/macros/latex/contrib/qrbill.tds.zip
-2022/10/20 | 1133871 | support/TeX4ht/source/tex4ht-4ht.tex
2022/10/20 | 1107 | macros/latex/contrib/qrbill/qrbill-vocab.csv
2022/10/20 | 1098205 | macros/latex/contrib/proflycee.zip
2022/10/20 | 10577 | macros/latex/contrib/biblatex-contrib/biblatex-jura2/jura2.bbx
-2022/10/19 | 995 | macros/latex/contrib/glossaries-extra/README
-2022/10/19 | 994 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example159.tex
-2022/10/19 | 9843 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example007.png
-2022/10/19 | 983 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example006.tex
-2022/10/19 | 9724 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example097.png
-2022/10/19 | 949 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example158.tex
-2022/10/19 | 94465 | macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.pdf
-2022/10/19 | 9325 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example133.png
-2022/10/19 | 9310 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example132.png
-2022/10/19 | 930 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example117.tex
-2022/10/19 | 9261 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example087.png
-2022/10/19 | 9148 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example154.png
-2022/10/19 | 9118 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example129.png
-2022/10/19 | 908 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example118.tex
-2022/10/19 | 907 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example124.tex
-2022/10/19 | 8982 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example130.png
-2022/10/19 | 896 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example004.tex
-2022/10/19 | 895 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example122.tex
-2022/10/19 | 89488 | systems/texlive/tlnet/archive/glossaries.r64741.tar.xz
-2022/10/19 | 8907 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example075.png
-2022/10/19 | 8753 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example083.png
-2022/10/19 | 87339 | macros/latex/contrib/glossaries-extra/samples/sample-initialisms.pdf
-2022/10/19 | 8721 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example079.png
-2022/10/19 | 8694 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example095.png
-2022/10/19 | 8671 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example146.png
-2022/10/19 | 8642 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example096.png
-2022/10/19 | 8607 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example089.png
-2022/10/19 | 8548 | fonts/erewhon-math/fourier-otf.sty
-2022/10/19 | 853 | macros/latex/contrib/glossaries-extra/samples/sample-alias.tex
-2022/10/19 | 8537 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example086.png
-2022/10/19 | 8533 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example077.png
-2022/10/19 | 843 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example001.tex
-2022/10/19 | 8408 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example006.png
-2022/10/19 | 83719 | macros/latex/contrib/glossaries-extra/samples/sample-accsupp.pdf
-2022/10/19 | 836 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example120.tex
-2022/10/19 | 8282 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example081.png
-2022/10/19 | 8250 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example085.png
-2022/10/19 | 81525 | macros/latex/contrib/glossaries-extra/samples/sample-fmt.pdf
-2022/10/19 | 81361 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example119.pdf
-2022/10/19 | 8118 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example074.png
-2022/10/19 | 810 | macros/latex/contrib/glossaries-extra/samples/sample-external.tex
-2022/10/19 | 800 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example103.tex
-2022/10/19 | 7977 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example082.png
-2022/10/19 | 7936 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example078.png
-2022/10/19 | 7922 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example118.png
-2022/10/19 | 7886 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example122.png
-2022/10/19 | 7860 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example088.png
-2022/10/19 | 784 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.tex
-2022/10/19 | 783 | macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.tex
-2022/10/19 | 7830 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example005.png
-2022/10/19 | 782 | macros/latex/contrib/glossaries-extra/samples/sample-abbrv.tex
-2022/10/19 | 7821 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example106.png
-2022/10/19 | 781 | macros/latex/contrib/glossaries-extra/samples/sample-crossref2.tex
-2022/10/19 | 779396 | systems/texlive/tlnet/archive/mfirstuc.doc.r64743.tar.xz
-2022/10/19 | 777 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example157.tex
-2022/10/19 | 77642 | macros/latex/contrib/glossaries-extra/samples/sample-nested.pdf
-2022/10/19 | 775 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115.tex
-2022/10/19 | 7731 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example076.png
-2022/10/19 | 769 | macros/latex/contrib/glossaries-extra/samples/sample-pages.tex
-2022/10/19 | 7651 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example111.png
-2022/10/19 | 759 | macros/latex/contrib/glossaries-extra/samples/sample-acronym.tex
-2022/10/19 | 75683 | macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.pdf
-2022/10/19 | 755 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example091.tex
-2022/10/19 | 75552 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example097.pdf
-2022/10/19 | 751 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example142.tex
-2022/10/19 | 75150 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example039.pdf
-2022/10/19 | 75123 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example055.pdf
-2022/10/19 | 75064 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example045.pdf
-2022/10/19 | 7484 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example080.png
-2022/10/19 | 74842 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example087.pdf
-2022/10/19 | 7477 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example159.png
-2022/10/19 | 7464 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example084.png
-2022/10/19 | 744 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example123.tex
-2022/10/19 | 74462 | macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.pdf
-2022/10/19 | 7409 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example119.png
-2022/10/19 | 738 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example092.tex
-2022/10/19 | 73857 | macros/latex/contrib/glossaries-extra/samples/sample-postlink.pdf
-2022/10/19 | 73471 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example089.pdf
-2022/10/19 | 73249 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example033.pdf
-2022/10/19 | 73221 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example049.pdf
-2022/10/19 | 73199 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example012.pdf
-2022/10/19 | 7310 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example112.png
-2022/10/19 | 726 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example133.tex
-2022/10/19 | 725 | macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.tex
-2022/10/19 | 724 | macros/latex/contrib/glossaries-extra/samples/sample-footnote.tex
-2022/10/19 | 71793 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example079.pdf
-2022/10/19 | 7164 | macros/jptex/latex/pxjahyper/README-ja.md
-2022/10/19 | 715 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example098.tex
-2022/10/19 | 70427 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example081.pdf
-2022/10/19 | 702 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example003.tex
-2022/10/19 | 695 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example093.tex
-2022/10/19 | 69396 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example029.pdf
-2022/10/19 | 6935 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example156-page3.png
-2022/10/19 | 6935 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example155-page3.png
-2022/10/19 | 690 | macros/latex/contrib/glossaries-extra/samples/sample-docdef.tex
-2022/10/19 | 686 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example069.tex
-2022/10/19 | 686 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example063.tex
-2022/10/19 | 6867 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example109.png
-2022/10/19 | 683 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example132.tex
-2022/10/19 | 68245 | macros/latex/contrib/glossaries-extra/samples/sample-footnote.pdf
-2022/10/19 | 680 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example064.tex
-2022/10/19 | 678 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example068.tex
-2022/10/19 | 678 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example062.tex
-2022/10/19 | 677 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example090.tex
-2022/10/19 | 67533 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example037.pdf
-2022/10/19 | 67478 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example018.pdf
-2022/10/19 | 67471 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example053.pdf
-2022/10/19 | 671 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example095.tex
-2022/10/19 | 67117 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example007.pdf
-2022/10/19 | 670 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example150.tex
-2022/10/19 | 669 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example121.tex
-2022/10/19 | 663 | macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.tex
-2022/10/19 | 66300 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example035.pdf
-2022/10/19 | 66289 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example051.pdf
-2022/10/19 | 66258 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example015.pdf
-2022/10/19 | 6601 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example139.png
-2022/10/19 | 6551 | fonts/erewhon-math/README.md
-2022/10/19 | 6522 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example110.png
-2022/10/19 | 65135 | macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.pdf
-2022/10/19 | 646 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example136.tex
-2022/10/19 | 6433 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example093.png
-2022/10/19 | 6433 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example092.png
-2022/10/19 | 641 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example067.tex
-2022/10/19 | 641 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example061.tex
-2022/10/19 | 63908 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example083.pdf
-2022/10/19 | 635 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example065.tex
-2022/10/19 | 634 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example002.tex
-2022/10/19 | 6344 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example127.png
-2022/10/19 | 6344 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example126.png
-2022/10/19 | 633 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example105.tex
-2022/10/19 | 633 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example066.tex
-2022/10/19 | 633 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example060.tex
-2022/10/19 | 6330208 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual.html
-2022/10/19 | 63254 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example086.pdf
-2022/10/19 | 6300 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example124.png
-2022/10/19 | 6296 | systems/texlive/tlnet/archive/docshots.source.r64739.tar.xz
-2022/10/19 | 627 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example094.tex
-2022/10/19 | 62799 | macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.pdf
-2022/10/19 | 62538 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example085.pdf
-2022/10/19 | 624 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example085.tex
-2022/10/19 | 621 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example045.tex
-2022/10/19 | 61873 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example088.pdf
-2022/10/19 | 617 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.tex
-2022/10/19 | 616 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example083.tex
-2022/10/19 | 6166 | macros/latex/contrib/glossaries-extra/glossaries-extra.ins
-2022/10/19 | 615 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example059.tex
-2022/10/19 | 615 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example043.tex
-2022/10/19 | 613 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example146.tex
-2022/10/19 | 6134 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example108.png
-2022/10/19 | 609 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example025.tex
-2022/10/19 | 609 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example015.tex
-2022/10/19 | 607 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example057.tex
-2022/10/19 | 607 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example041.tex
-2022/10/19 | 605 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example051.tex
-2022/10/19 | 605 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example035.tex
-2022/10/19 | 604 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example073.tex
-2022/10/19 | 6049 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example138.png
-2022/10/19 | 603 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example089.tex
-2022/10/19 | 603 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example081.tex
-2022/10/19 | 60215 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example078.pdf
-2022/10/19 | 600 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example100.tex
-2022/10/19 | 598 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example071.tex
-2022/10/19 | 597 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example077.tex
-2022/10/19 | 595 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example087.tex
-2022/10/19 | 595 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example079.tex
-2022/10/19 | 594 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example029.tex
-2022/10/19 | 5925 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example121.png
-2022/10/19 | 59249 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example038.pdf
-2022/10/19 | 59230 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example054.pdf
-2022/10/19 | 59225 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example028.pdf
-2022/10/19 | 591 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example141.tex
-2022/10/19 | 591 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example007.tex
-2022/10/19 | 590 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example055.tex
-2022/10/19 | 590 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example039.tex
-2022/10/19 | 589 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example075.tex
-2022/10/19 | 5891 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example137.png
-2022/10/19 | 588 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example027.tex
-2022/10/19 | 588 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example023.tex
-2022/10/19 | 588 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example018.tex
-2022/10/19 | 588 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example012.tex
-2022/10/19 | 58844 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example080.pdf
-2022/10/19 | 58668 | macros/latex/contrib/glossaries-extra/samples/sample-entrycount.pdf
-2022/10/19 | 58585 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example096.pdf
-2022/10/19 | 584 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example053.tex
-2022/10/19 | 584 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example049.tex
-2022/10/19 | 584 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example037.tex
-2022/10/19 | 584 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example033.tex
-2022/10/19 | 5835 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example107.png
-2022/10/19 | 58340 | macros/latex/contrib/glossaries-extra/samples/sample-multientry.pdf
-2022/10/19 | 582 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example020.tex
-2022/10/19 | 581 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example009.tex
-2022/10/19 | 5819 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example045.png
-2022/10/19 | 58142 | macros/latex/contrib/glossaries-extra/samples/sample-alttree.pdf
-2022/10/19 | 579 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example084.tex
-2022/10/19 | 578 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example104.tex
-2022/10/19 | 578 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example047.tex
-2022/10/19 | 578 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example031.tex
-2022/10/19 | 5780 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example057.png
-2022/10/19 | 577 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example044.tex
-2022/10/19 | 5756 | systems/texlive/tlnet/archive/mfirstuc.r64743.tar.xz
-2022/10/19 | 571 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example082.tex
-2022/10/19 | 571 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example058.tex
-2022/10/19 | 571 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example042.tex
-2022/10/19 | 57158 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example073.pdf
-2022/10/19 | 57133 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example023.pdf
-2022/10/19 | 5676 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example059.png
-2022/10/19 | 56755 | macros/jptex/latex/pxjahyper/pxjahyper.sty
-2022/10/19 | 5673 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example043.png
-2022/10/19 | 5663934 | usergrps/gutenberg/lettre/lettre46.pdf
-2022/10/19 | 5656 | systems/texlive/tlnet/archive/gensymb.source.r64740.tar.xz
-2022/10/19 | 56567 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example027.pdf
-2022/10/19 | 564 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example024.tex
-2022/10/19 | 564 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example016.tex
-2022/10/19 | 564 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example014.tex
-2022/10/19 | 5642 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example041.png
-2022/10/19 | 563 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example056.tex
-2022/10/19 | 563 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example040.tex
-2022/10/19 | 5633 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example125.png
-2022/10/19 | 56151 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example075.pdf
-2022/10/19 | 56111 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example148.pdf
-2022/10/19 | 560 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example050.tex
-2022/10/19 | 560 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example034.tex
-2022/10/19 | 56086 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example149.pdf
-2022/10/19 | 5604 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example002.png
-2022/10/19 | 56045 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example044.pdf
-2022/10/19 | 559 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example072.tex
-2022/10/19 | 55956 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example147.pdf
-2022/10/19 | 55905 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example032.pdf
-2022/10/19 | 558 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example088.tex
-2022/10/19 | 558 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example080.tex
-2022/10/19 | 55883 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example048.pdf
-2022/10/19 | 55874 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example013.pdf
-2022/10/19 | 55866 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example072.pdf
-2022/10/19 | 55865 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example011.pdf
-2022/10/19 | 55844 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example022.pdf
-2022/10/19 | 5571 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example128.png
-2022/10/19 | 5563 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example003.png
-2022/10/19 | 5560 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example063.png
-2022/10/19 | 553 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example070.tex
-2022/10/19 | 552 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example099.tex
-2022/10/19 | 552 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example076.tex
-2022/10/19 | 550 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example086.tex
-2022/10/19 | 550 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example078.tex
-2022/10/19 | 55073 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example156.pdf
-2022/10/19 | 549 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example028.tex
-2022/10/19 | 54773 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example077.pdf
-2022/10/19 | 545 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example054.tex
-2022/10/19 | 545 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example038.tex
-2022/10/19 | 544 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example074.tex
-2022/10/19 | 54470 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example153.pdf
-2022/10/19 | 54402 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example152.pdf
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example026.tex
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example022.tex
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example019.tex
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example017.tex
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example013.tex
-2022/10/19 | 543 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example011.tex
-2022/10/19 | 5430 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example039.png
-2022/10/19 | 5421 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example037.png
-2022/10/19 | 5402 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example156-page2.png
-2022/10/19 | 539 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example052.tex
-2022/10/19 | 539 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example048.tex
-2022/10/19 | 539 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example036.tex
-2022/10/19 | 539 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example032.tex
-2022/10/19 | 5395 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example055.png
-2022/10/19 | 53938 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example151.pdf
-2022/10/19 | 5392 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example069.png
-2022/10/19 | 53902 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example155.pdf
-2022/10/19 | 537 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example021.tex
-2022/10/19 | 537 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example010.tex
-2022/10/19 | 5378 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example158.png
-2022/10/19 | 536 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example008.tex
-2022/10/19 | 53695 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example154.pdf
-2022/10/19 | 53675 | macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.pdf
-2022/10/19 | 53524 | macros/latex/contrib/glossaries-extra/samples/sample-record.pdf
-2022/10/19 | 533 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example046.tex
-2022/10/19 | 533 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example030.tex
-2022/10/19 | 5326 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example044.png
-2022/10/19 | 5323 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example062.png
-2022/10/19 | 53238 | macros/latex/contrib/glossaries-extra/samples/sample-trans.pdf
-2022/10/19 | 5279 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example068.png
-2022/10/19 | 5279 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example056.png
-2022/10/19 | 5273 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example035.png
-2022/10/19 | 5269 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example053.png
-2022/10/19 | 5268 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example031.png
-2022/10/19 | 5235 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example047.png
-2022/10/19 | 52340 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example082.pdf
-2022/10/19 | 5232 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example156-page1.png
-2022/10/19 | 5220 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example061.png
-2022/10/19 | 5217 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example094.png
-2022/10/19 | 5207 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example051.png
-2022/10/19 | 5195 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example042.png
-2022/10/19 | 5185 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example033.png
-2022/10/19 | 51818 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example098.pdf
-2022/10/19 | 5177 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example049.png
-2022/10/19 | 5173 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example040.png
-2022/10/19 | 51597 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example025.pdf
-2022/10/19 | 51416 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example059.pdf
-2022/10/19 | 51412 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example057.pdf
-2022/10/19 | 5139 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example058.png
-2022/10/19 | 5134 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example018.png
-2022/10/19 | 51165 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example041.pdf
-2022/10/19 | 51150 | macros/latex/contrib/glossaries-extra/samples/sample-restricteddocdefs.pdf
-2022/10/19 | 51134 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example043.pdf
-2022/10/19 | 5106 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example098.png
-2022/10/19 | 5102 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example038.png
-2022/10/19 | 50964 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example084.pdf
-2022/10/19 | 5090 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example036.png
-2022/10/19 | 50842 | macros/latex/contrib/glossaries-extra/samples/sample-noidx-restricteddocdefs.pdf
-2022/10/19 | 5079 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example009.png
-2022/10/19 | 5071 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example054.png
-2022/10/19 | 504 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example005.tex
-2022/10/19 | 5027 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example067.png
-2022/10/19 | 50276 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example113.pdf
-2022/10/19 | 501 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example116.tex
-2022/10/19 | 50170 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example036.pdf
-2022/10/19 | 50147 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example019.pdf
-2022/10/19 | 50134 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example017.pdf
-2022/10/19 | 50119 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example052.pdf
-2022/10/19 | 500832 | systems/texlive/tlnet/archive/pgf-periodictable.r64748.tar.xz
-2022/10/19 | 5004 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example060.png
-2022/10/19 | 49978 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example095.pdf
-2022/10/19 | 49894 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example026.pdf
-2022/10/19 | 49673 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-main-hyp.pdf
-2022/10/19 | 4963 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example066.png
-2022/10/19 | 4963 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example015.png
-2022/10/19 | 4962 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example029.png
-2022/10/19 | 495 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example113.tex
-2022/10/19 | 4952 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example030.png
-2022/10/19 | 4951 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example034.png
-2022/10/19 | 4947 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example012.png
-2022/10/19 | 4945 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example052.png
-2022/10/19 | 49385 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example068.pdf
-2022/10/19 | 49384 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example062.pdf
-2022/10/19 | 49378 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example031.pdf
-2022/10/19 | 49372 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example069.pdf
-2022/10/19 | 49371 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example063.pdf
-2022/10/19 | 49366 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example009.pdf
-2022/10/19 | 49359 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example047.pdf
-2022/10/19 | 4925 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example046.png
-2022/10/19 | 4920 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example028.png
-2022/10/19 | 4915 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example117.png
-2022/10/19 | 489 | macros/latex/contrib/glossaries-extra/samples/sample-mixed-abbrv-styles.tex
-2022/10/19 | 48949 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example034.pdf
-2022/10/19 | 48942 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example050.pdf
-2022/10/19 | 48931 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example016.pdf
-2022/10/19 | 4892 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example050.png
-2022/10/19 | 48913 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example014.pdf
-2022/10/19 | 4879 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example019.png
-2022/10/19 | 4878 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example071.png
-2022/10/19 | 4868 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example064.png
-2022/10/19 | 48677 | macros/latex/contrib/glossaries-extra/CHANGES
-2022/10/19 | 485 | macros/latex/contrib/glossaries-extra/samples/sample-alttree.tex
-2022/10/19 | 48584 | macros/latex/contrib/glossaries-extra/samples/sample-docdef.pdf
-2022/10/19 | 4851 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example073.png
-2022/10/19 | 4851 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example027.png
-2022/10/19 | 4850 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example048.png
-2022/10/19 | 4848 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example032.png
-2022/10/19 | 4843 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example120.png
-2022/10/19 | 48427 | macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.pdf
-2022/10/19 | 48400 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example074.pdf
-2022/10/19 | 48281 | macros/latex/contrib/glossaries-extra/samples/sample.pdf
-2022/10/19 | 4827 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example026.png
-2022/10/19 | 4815 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example070.png
-2022/10/19 | 4813 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example017.png
-2022/10/19 | 4804 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example065.png
-2022/10/19 | 4787 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example113.png
-2022/10/19 | 4787 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example025.png
-2022/10/19 | 4787 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example010.png
-2022/10/19 | 4771 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example020.png
-2022/10/19 | 47651 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example071.pdf
-2022/10/19 | 4764 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example023.png
-2022/10/19 | 47645 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example064.pdf
-2022/10/19 | 47640 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example020.pdf
-2022/10/19 | 4763 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example008.png
-2022/10/19 | 473 | macros/latex/contrib/glossaries-extra/samples/sample-undef.tex
-2022/10/19 | 473 | macros/latex/contrib/glossaries-extra/samples/sample-crossref.tex
-2022/10/19 | 4734 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example072.png
-2022/10/19 | 47270 | macros/latex/contrib/glossaries-extra/samples/sample-abbrv.pdf
-2022/10/19 | 4708 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example021.png
-2022/10/19 | 47025 | macros/latex/contrib/glossaries-extra/samples/sample-onelink.pdf
-2022/10/19 | 47021 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example076.pdf
-2022/10/19 | 4700 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example155-page2.png
-2022/10/19 | 4696 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example024.png
-2022/10/19 | 46963 | macros/latex/contrib/glossaries-extra/samples/sample-alias.pdf
-2022/10/19 | 4690 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example136.png
-2022/10/19 | 466 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example114.tex
-2022/10/19 | 466 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example102.tex
-2022/10/19 | 4660 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example013.png
-2022/10/19 | 4647 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example016.png
-2022/10/19 | 4645 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example014.png
-2022/10/19 | 4644 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example022.png
-2022/10/19 | 46373 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly.pdf
-2022/10/19 | 4622 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example011.png
-2022/10/19 | 46049 | macros/latex/contrib/glossaries-extra/samples/sample-indexhook.pdf
-2022/10/19 | 4596 | systems/texlive/tlnet/archive/ifoddpage.source.r64742.tar.xz
-2022/10/19 | 4573012 | systems/texlive/tlnet/archive/pgf-periodictable.doc.r64748.tar.xz
-2022/10/19 | 456 | macros/latex/contrib/glossaries-extra/samples/sample-prefix.tex
-2022/10/19 | 4519 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115-page3.png
-2022/10/19 | 44961 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example133.pdf
-2022/10/19 | 44941 | macros/latex/contrib/glossaries-extra/samples/sample-crossref2.pdf
-2022/10/19 | 44895 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example132.pdf
-2022/10/19 | 44639 | macros/latex/contrib/glossaries-extra/samples/sample-crossref.pdf
-2022/10/19 | 4447 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example143.png
-2022/10/19 | 4332 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115-page4.png
-2022/10/19 | 43297 | macros/latex/contrib/glossaries-extra/samples/sample-prefix.pdf
-2022/10/19 | 4315 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115-page2.png
-2022/10/19 | 4306 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115-page1.png
-2022/10/19 | 4295 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example155-page1.png
-2022/10/19 | 4260 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example123-page2.png
-2022/10/19 | 42513 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example145.pdf
-2022/10/19 | 42504 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example144.pdf
-2022/10/19 | 42206 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example143.pdf
-2022/10/19 | 418 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example101.tex
-2022/10/19 | 416 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example135.tex
-2022/10/19 | 41300 | macros/latex/contrib/glossaries-extra/samples/sample-pages.pdf
-2022/10/19 | 40775 | macros/latex/contrib/glossaries-extra/samples/sample-linkcount.pdf
-2022/10/19 | 405 | macros/latex/contrib/glossaries-extra/samples/sample.tex
-2022/10/19 | 39659 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example024.pdf
-2022/10/19 | 39563 | macros/latex/contrib/glossaries-extra/samples/sample-postdot.pdf
-2022/10/19 | 39250 | macros/latex/contrib/glossaries-extra/samples/sample-acronym.pdf
-2022/10/19 | 391 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example134.tex
-2022/10/19 | 39192 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example118.pdf
-2022/10/19 | 384168 | fonts/erewhon-math/Erewhon-Math.otf
-2022/10/19 | 38067 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example140.pdf
-2022/10/19 | 37817 | macros/latex/contrib/glossaries-extra/samples/sample-altmodifier.pdf
-2022/10/19 | 3761 | macros/latex/contrib/glossaries-extra/samples/sample-accsupp.tex
-2022/10/19 | 37492 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-hyp.pdf
-2022/10/19 | 36985 | macros/latex/contrib/glossaries-extra/samples/sample-undef.pdf
-2022/10/19 | 36971 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example056.pdf
-2022/10/19 | 36971 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example040.pdf
-2022/10/19 | 36969 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example058.pdf
-2022/10/19 | 36944 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example042.pdf
-2022/10/19 | 3684 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example157.png
-2022/10/19 | 36810 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example030.pdf
-2022/10/19 | 36809 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example066.pdf
-2022/10/19 | 36808 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example060.pdf
-2022/10/19 | 36798 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example010.pdf
-2022/10/19 | 36797 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example070.pdf
-2022/10/19 | 36797 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example061.pdf
-2022/10/19 | 36792 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example067.pdf
-2022/10/19 | 36791 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example065.pdf
-2022/10/19 | 36786 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example046.pdf
-2022/10/19 | 36785 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example021.pdf
-2022/10/19 | 36784 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example008.pdf
-2022/10/19 | 36692 | macros/latex/contrib/glossaries-extra/samples/sample-external.pdf
-2022/10/19 | 36181 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example159.pdf
-2022/10/19 | 36050 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example115.pdf
-2022/10/19 | 360448 | systems/texlive/tlnet/archive/mismath.doc.r64744.tar.xz
-2022/10/19 | 35828 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example131.pdf
-2022/10/19 | 35491 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example130.pdf
-2022/10/19 | 3527 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example123-page1.png
-2022/10/19 | 35074 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example106.pdf
-2022/10/19 | 35051 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example127.pdf
-2022/10/19 | 35051 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example126.pdf
-2022/10/19 | 35045 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example129.pdf
-2022/10/19 | 34676 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example111.pdf
-2022/10/19 | 34579 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example112.pdf
-2022/10/19 | 3415 | macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.tex
-2022/10/19 | 34109 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.pdf
-2022/10/19 | 33996 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example109.pdf
-2022/10/19 | 33982 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example110.pdf
-2022/10/19 | 3373 | macros/latex/contrib/glossaries-extra/samples/sample-autoindex.tex
-2022/10/19 | 33689 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example108.pdf
-2022/10/19 | 33649 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example146.pdf
-2022/10/19 | 33337 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example005.pdf
-2022/10/19 | 33222 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example128.pdf
-2022/10/19 | 33199 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example125.pdf
-2022/10/19 | 331104 | systems/texlive/tlnet/archive/docshots.doc.r64739.tar.xz
-2022/10/19 | 3307 | macros/jptex/latex/pxjahyper/pxjahyper-enc.sty
-2022/10/19 | 32642 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example094.pdf
-2022/10/19 | 32547 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example093.pdf
-2022/10/19 | 32546 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example092.pdf
-2022/10/19 | 32323 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example158.pdf
-2022/10/19 | 31736 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example004.pdf
-2022/10/19 | 30861 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example099.pdf
-2022/10/19 | 307 | macros/latex/contrib/glossaries-extra/samples/sample-suppl-main.tex
-2022/10/19 | 30445 | fonts/erewhon-math/Erewhon-Math.ltx
-2022/10/19 | 30417 | macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.tex
-2022/10/19 | 3024 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example001.png
-2022/10/19 | 3020 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example090.png
-2022/10/19 | 2970 | macros/latex/contrib/glossaries-extra/samples/sample-multientry.tex
-2022/10/19 | 2937 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example104.png
-2022/10/19 | 2932 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example105.png
-2022/10/19 | 28569 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example006.pdf
-2022/10/19 | 2848 | macros/jptex/latex/pxjahyper/pxjahyper-uni.def
-2022/10/19 | 28202 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example150.pdf
-2022/10/19 | 2816 | systems/texlive/tlnet/archive/mismath.r64744.tar.xz
-2022/10/19 | 28155673 | install/macros/latex/contrib/glossaries-extra.tds.zip
-2022/10/19 | 281430 | support/crossrefware.zip
-2022/10/19 | 27895830 | macros/latex/contrib/glossaries-extra.zip
-2022/10/19 | 26812 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example122.pdf
-2022/10/19 | 26398 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example003.pdf
-2022/10/19 | 26398 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example002.pdf
-2022/10/19 | 26274 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example121.pdf
-2022/10/19 | 25960 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example124.pdf
-2022/10/19 | 250 | macros/latex/contrib/glossaries-extra/samples/sample-suppl.tex
-2022/10/19 | 25036 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example120.pdf
-2022/10/19 | 25034 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example107.pdf
-2022/10/19 | 2488 | systems/texlive/tlnet/archive/docshots.r64739.tar.xz
-2022/10/19 | 24621 | macros/jptex/latex/pxjahyper/pxjahyper-ajm.def
-2022/10/19 | 2451 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example142.png
-2022/10/19 | 24434 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example001.pdf
-2022/10/19 | 23838 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example137.pdf
-2022/10/19 | 23761 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example123.pdf
-2022/10/19 | 23651 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example139.pdf
-2022/10/19 | 23628 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example138.pdf
-2022/10/19 | 2350860 | fonts/erewhon-math.zip
-2022/10/19 | 2348 | macros/jptex/latex/pxjahyper/README.md
-2022/10/19 | 23457 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example157.pdf
-2022/10/19 | 2307 | macros/latex/contrib/glossaries-extra/samples/sample-unitentrycount.tex
-2022/10/19 | 2301 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example091.png
-2022/10/19 | 2263931 | macros/latex/contrib/glossaries-extra/glossaries-extra.dtx
-2022/10/19 | 22391 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example142.pdf
-2022/10/19 | 221592 | systems/texlive/tlnet/archive/gensymb.doc.r64740.tar.xz
-2022/10/19 | 22136 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example105.pdf
-2022/10/19 | 22136 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example104.pdf
-2022/10/19 | 2202 | macros/latex/contrib/glossaries-extra/samples/sample-alttree-marginpar.tex
-2022/10/19 | 219603 | fonts/erewhon-math/Erewhon-Math.pdf
-2022/10/19 | 214759 | macros/latex/contrib/glossaries-extra/samples/sample-name-font.pdf
-2022/10/19 | 21279 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example103.pdf
-2022/10/19 | 2118 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example149.tex
-2022/10/19 | 2086 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example116.png
-2022/10/19 | 2080 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example154.tex
-2022/10/19 | 2052 | systems/texlive/tlnet/archive/gensymb.r64740.tar.xz
-2022/10/19 | 20393 | macros/jptex/latex/pxjahyper/pxjahyper.tex
-2022/10/19 | 2036 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example156.tex
-2022/10/19 | 2024 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example148.tex
-2022/10/19 | 2014 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example147.tex
-2022/10/19 | 2006 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example153.tex
-2022/10/19 | 1996 | systems/texlive/tlnet/archive/collection-fontsextra.r64738.tar.xz
-2022/10/19 | 1965 | macros/latex/contrib/glossaries-extra/samples/sample-header.tex
-2022/10/19 | 19653 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.pdf
-2022/10/19 | 1916 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example114.png
-2022/10/19 | 1912 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example139.tex
-2022/10/19 | 1902 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example103.png
-2022/10/19 | 188565 | macros/jptex/latex/pxjahyper.zip
-2022/10/19 | 1878 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example152.tex
-2022/10/19 | 1863 | macros/latex/contrib/glossaries-extra/samples/sample-initialisms.tex
-2022/10/19 | 1846978 | fonts/erewhon-math/unimath-erewhon.pdf
-2022/10/19 | 1805034 | macros/latex/contrib/glossaries-extra/glossaries-extra-code.pdf
-2022/10/19 | 17940 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example117.pdf
-2022/10/19 | 1775 | macros/latex/contrib/glossaries-extra/samples/sample-postlink.tex
-2022/10/19 | 1774 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example138.tex
-2022/10/19 | 1759 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example155.tex
-2022/10/19 | 1755 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example099.png
-2022/10/19 | 1738422 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual.tex
-2022/10/19 | 1736 | macros/latex/contrib/glossaries-extra/samples/sample-record-nameref.tex
-2022/10/19 | 1717 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example151.tex
-2022/10/19 | 171465 | macros/latex/contrib/glossaries-extra/samples/sample-autoindex.pdf
-2022/10/19 | 16947 | fonts/erewhon-math/unimath-erewhon.ltx
-2022/10/19 | 169036 | macros/latex/contrib/glossaries-extra/samples/sample-mixture.pdf
-2022/10/19 | 1678 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example128.tex
-2022/10/19 | 1645 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.tex
-2022/10/19 | 16446 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example116.pdf
-2022/10/19 | 15986 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example150.png
-2022/10/19 | 1594 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example131.tex
-2022/10/19 | 1581 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example135.png
-2022/10/19 | 1558 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example127.tex
-2022/10/19 | 1547 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example100.png
-2022/10/19 | 1544 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example134.png
-2022/10/19 | 1518890 | macros/latex/contrib/glossaries-extra/samples/sample-abbr-styles.pdf
-2022/10/19 | 14950 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example114.pdf
-2022/10/19 | 149156 | macros/latex/contrib/glossaries-extra/samples/sample-autoindex-hyp.pdf
-2022/10/19 | 1479 | macros/latex/contrib/glossaries-extra/samples/sample-postdot.tex
-2022/10/19 | 14788 | systems/texlive/tlnet/archive/mismath.source.r64744.tar.xz
-2022/10/19 | 1455 | macros/latex/contrib/glossaries-extra/samples/sample-record.tex
-2022/10/19 | 145412 | systems/texlive/tlnet/archive/glossaries.source.r64741.tar.xz
-2022/10/19 | 144248 | systems/texlive/tlnet/archive/ifoddpage.doc.r64742.tar.xz
-2022/10/19 | 14259 | macros/latex/contrib/glossaries-extra/samples/sample-suppl.pdf
-2022/10/19 | 1424 | systems/texlive/tlnet/archive/ifoddpage.r64742.tar.xz
-2022/10/19 | 1418 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly-xetex.tex
-2022/10/19 | 1408 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example130.tex
-2022/10/19 | 1406 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example108.tex
-2022/10/19 | 14050 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example090.pdf
-2022/10/19 | 1400 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example145.tex
-2022/10/19 | 1394 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example097.tex
-2022/10/19 | 1375 | macros/latex/contrib/glossaries-extra/samples/sample-alttree-sym.tex
-2022/10/19 | 1371 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example126.tex
-2022/10/19 | 1367 | macros/latex/contrib/glossaries-extra/samples/sample-trans.tex
-2022/10/19 | 13553 | graphics/pgf/contrib/tikz-ext/tex/generic/tikz-ext/tikzlibraryext.paths.arcto.code.tex
-2022/10/19 | 134679 | macros/latex/contrib/glossaries-extra/samples/sample-header.pdf
-2022/10/19 | 13459 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example153.png
-2022/10/19 | 1342 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example119.tex
-2022/10/19 | 13362 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example152.png
-2022/10/19 | 13308 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example091.pdf
-2022/10/19 | 1310 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example107.tex
-2022/10/19 | 1306 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly.tex
-2022/10/19 | 13030615 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual.pdf
-2022/10/19 | 1302 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example109.tex
-2022/10/19 | 12980592 | macros/latex/contrib/acmart.zip
-2022/10/19 | 1296 | macros/latex/contrib/glossaries-extra/samples/sample-nested.tex
-2022/10/19 | 1296 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example129.tex
-2022/10/19 | 1289 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example106.tex
-2022/10/19 | 1280 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example125.tex
-2022/10/19 | 1277 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example141.png
-2022/10/19 | 12709 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example136.pdf
-2022/10/19 | 1269 | macros/latex/contrib/glossaries-extra/samples/sample-acronym-desc.tex
-2022/10/19 | 12424 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example102.pdf
-2022/10/19 | 1238 | macros/latex/contrib/glossaries-extra/samples/sample-fmt.tex
-2022/10/19 | 12159 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example151.png
-2022/10/19 | 12132 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example101.pdf
-2022/10/19 | 1212 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example112.tex
-2022/10/19 | 12115 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example140.png
-2022/10/19 | 11 | macros/latex/contrib/glossaries-extra/DEPENDS.txt
-2022/10/19 | 11982 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example149.png
-2022/10/19 | 1193 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example111.tex
-2022/10/19 | 11935 | macros/latex/contrib/glossaries-extra/samples/sample-mixture.tex
-2022/10/19 | 1191 | macros/latex/contrib/glossaries-extra/samples/sample-entrycount.tex
-2022/10/19 | 11882 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example135.pdf
-2022/10/19 | 1167 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example102.png
-2022/10/19 | 11609 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example148.png
-2022/10/19 | 11591 | macros/latex/contrib/glossaries-extra/samples/sample-name-font.tex
-2022/10/19 | 11529 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example004.png
-2022/10/19 | 11528 | systems/texlive/tlnet/archive/mfirstuc.source.r64743.tar.xz
-2022/10/19 | 11481 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example100.pdf
-2022/10/19 | 11385 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example134.pdf
-2022/10/19 | 1131 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example143.tex
-2022/10/19 | 11251 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example141.pdf
-2022/10/19 | 1124 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example144.tex
-2022/10/19 | 1121 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example096.tex
-2022/10/19 | 112116 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2022/10/19 | 111703 | macros/latex/contrib/glossaries-extra/samples/sample-onthefly-utf8.pdf
-2022/10/19 | 1115 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example110.tex
-2022/10/19 | 1110 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example140.tex
-2022/10/19 | 11067 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example147.png
-2022/10/19 | 109848 | fonts/erewhon-math/Erewhon-Math-Bold.otf
-2022/10/19 | 1089 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example101.png
-2022/10/19 | 10793 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example144.png
-2022/10/19 | 10787944 | systems/texlive/tlnet/archive/glossaries.doc.r64741.tar.xz
-2022/10/19 | 10761 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example145.png
-2022/10/19 | 1073 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example137.tex
-2022/10/19 | 1065 | macros/latex/contrib/glossaries-extra/samples/sample-onelink.tex
-2022/10/19 | 10600 | macros/latex/contrib/glossaries-extra/glossaries-extra-manual-examples/glossaries-extra-manual-example131.png
-2022/10/19 | 1048 | macros/latex/contrib/glossaries-extra/samples/sample-linkcount.tex
-2022/10/19 | 1024 | macros/latex/contrib/glossaries-extra/samples/sample-indexhook.tex
-2022/10/19 | 1002 | macros/latex/contrib/glossaries-extra/samples/sample-mixedsort.tex
diff --git a/biblio/ctan-bibdata/ctan.bib b/biblio/ctan-bibdata/ctan.bib
index 95d05c84c0..82fc6637c9 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 26-10-2022, 02:00:52
+%% created at 27-10-2022, 02:00:13
%%
%% This file is provided under the terms of the LPPL v1.3 or
@@ -894,7 +894,7 @@
title = {The \texttt{adjustbox} package},
subtitle = {Graphics package-alike macros for “general” boxes},
author = {Martin Scharrer},
- date = {2022-10-17},
+ date = {2022-10-26},
version = {1.3a},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/adjustbox},
@@ -9514,8 +9514,8 @@
title = {The \texttt{braids} package},
subtitle = {Draw braid diagrams with PGF/TikZ},
author = {Andrew Stacey},
- date = {2019-05-10},
- version = {2.0},
+ date = {2022-10-26},
+ version = {2.2},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/braids},
url = {https://ctan.org/pkg/braids},
@@ -13692,7 +13692,7 @@
title = {The \texttt{collcell} package},
subtitle = {Collect contents of a tabular cell as argument to a macro},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.5},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/collcell},
@@ -13719,7 +13719,7 @@
title = {The \texttt{collectbox} package},
subtitle = {Collect and process macro arguments as boxes},
author = {Martin Scharrer},
- date = {2022-10-17},
+ date = {2022-10-26},
version = {0.4c},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/collectbox},
@@ -18590,8 +18590,8 @@
title = {The \texttt{docshots} package},
subtitle = {TeX samples next to their PDF Snapshots},
author = {Yegor Bugayenko},
- date = {2022-10-25},
- version = {0.0.5},
+ date = {2022-10-26},
+ version = {0.2.0},
license = {mit},
mirror = {https://mirror.ctan.org/macros/latex/contrib/docshots},
url = {https://ctan.org/pkg/docshots},
@@ -20122,8 +20122,8 @@
title = {The \texttt{easybook} package},
subtitle = {Easily typesetting Chinese theses or books},
author = {Qu Yi},
- date = {2022-10-15},
- version = {1.71},
+ date = {2022-10-26},
+ version = {1.71A},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/easybook},
url = {https://ctan.org/pkg/easybook},
@@ -20153,7 +20153,7 @@
title = {The \texttt{easyfig} package},
subtitle = {Simplifying the use of common figures},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {1.2a},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/easyfig},
@@ -24860,9 +24860,9 @@
title = {The \texttt{filehook} package},
subtitle = {Hooks for input files},
author = {Martin Scharrer},
- date = {2020-09-29},
- version = {0.8a},
- license = {lppl1.3},
+ date = {2022-10-26},
+ version = {0.8b},
+ license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/filehook},
url = {https://ctan.org/pkg/filehook},
annotation = {The package provides several file hooks (,
@@ -24896,7 +24896,7 @@
title = {The \texttt{filemod} package},
subtitle = {Provide file modification times, and compare them},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {1.2},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/filemod},
@@ -28283,7 +28283,7 @@
title = {The \texttt{gincltex} package},
subtitle = {Include \TeX{} files as graphics (.tex support for \textbackslash{}includegraphics)},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.3},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/gincltex},
@@ -28962,7 +28962,7 @@
title = {The \texttt{gobble} package},
subtitle = {More gobble macros for PlainTeX and \LaTeX{}},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.2},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/generic/gobble},
@@ -32515,7 +32515,7 @@
title = {The \texttt{ifetex} package},
subtitle = {Provides \textbackslash{}ifetex switch},
author = {{The \LaTeX{} Project Team} and Martin Scharrer},
- date = {2020-10-01},
+ date = {2022-10-26},
version = {1.3},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/generic/iftex},
@@ -32600,7 +32600,7 @@
title = {The \texttt{ifoddpage} package},
subtitle = {Determine if the current page is odd or even},
author = {Martin Scharrer},
- date = {2022-10-18},
+ date = {2022-10-26},
version = {1.2},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/ifoddpage},
@@ -34327,6 +34327,20 @@
url = {https://ctan.org/pkg/jeopardy},
}
+@manual{ctan-jeuxcartes,
+ title = {The \texttt{JeuxCartes} package},
+ subtitle = {Macros to insert playing cards},
+ author = {Cédric Pierquet},
+ date = {2022-10-26},
+ version = {0.1.2},
+ license = {lppl1.3c,lgpl2.1,pd},
+ mirror = {https://mirror.ctan.org/macros/latex/contrib/jeuxcartes},
+ url = {https://ctan.org/pkg/jeuxcartes},
+ annotation = {This package provides macros to insert playing cards,
+ single, or hand, or random-hand, Poker or French Tarot,
+ from files.},
+}
+
@manual{ctan-jflap2tikz,
title = {The \texttt{jflap2tikz} package},
subtitle = {Convert JFlap file into a \LaTeX{} file depicting the automaton using TikZ},
@@ -40010,7 +40024,7 @@
title = {The \texttt{lstaddons} package},
subtitle = {Add-on packages for listings: autogobble and line background},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.1},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/lstaddons},
@@ -41304,7 +41318,7 @@
title = {The \texttt{macros2e} package},
subtitle = {A list of internal \LaTeX{}2e macros},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.4a},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/info/macros2e},
@@ -45837,9 +45851,9 @@
@manual{ctan-multienv,
title = {The \texttt{multienv} package},
- subtitle = {Multiple environments using a "key=value" syntax},
+ subtitle = {Multiple environments using a “key=value” syntax},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {1.0},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/multienv},
@@ -46141,7 +46155,7 @@
title = {The \texttt{mwe} package},
subtitle = {Packages and image files for MWEs},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.5},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/mwe},
@@ -47248,9 +47262,9 @@
title = {The \texttt{newverbs} package},
subtitle = {Define new versions of \textbackslash{}verb, including short verb versions},
author = {Martin Scharrer},
- date = {2021-03-10},
- version = {1.6},
- license = {lppl1.3},
+ date = {2022-10-26},
+ version = {1.6a},
+ license = {lppl1.3c},
mirror = {https://mirror.ctan.org/macros/latex/contrib/newverbs},
url = {https://ctan.org/pkg/newverbs},
}
@@ -52898,8 +52912,8 @@
title = {The \texttt{polyglossia} package},
subtitle = {An alternative to babel for \XeLaTeX{} and LuaLaTeX},
author = {François Charette and Arthur Rosendahl},
- date = {2022-07-18},
- version = {1.57},
+ date = {2022-10-26},
+ version = {1.58},
license = {mit,lppl1.3,cc0},
mirror = {https://mirror.ctan.org/macros/unicodetex/latex/polyglossia},
url = {https://ctan.org/pkg/polyglossia},
@@ -56942,7 +56956,7 @@
title = {The \texttt{rcs-multi} package},
subtitle = {Typeset RCS version control in multiple-file documents},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.1a},
license = {lppl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/rcs-multi},
@@ -57023,7 +57037,7 @@
title = {The \texttt{realboxes} package},
subtitle = {Variants of common box-commands that read their content as real box and not as macro argument},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.2},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/realboxes},
@@ -62501,8 +62515,8 @@
title = {The \texttt{spath3} package},
subtitle = {Manipulate “soft paths” in PGF},
author = {Andrew Stacey},
- date = {2021-02-21},
- version = {2.4},
+ date = {2022-10-26},
+ version = {2.7},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/spath3},
url = {https://ctan.org/pkg/spath3},
@@ -63345,7 +63359,7 @@
title = {The \texttt{storebox} package},
subtitle = {Storing information for reuse},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {1.3a},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/storebox},
@@ -63500,7 +63514,7 @@
title = {The \texttt{sty2dtx} package},
subtitle = {Create a .dtx file from a .sty file},
author = {Martin Scharrer},
- date = {2022-10-19},
+ date = {2022-10-26},
version = {2.4},
license = {gpl3},
mirror = {https://mirror.ctan.org/support/sty2dtx},
@@ -63916,7 +63930,7 @@
title = {The \texttt{svn-multi} package},
subtitle = {Subversion keywords in multi-file \LaTeX{} documents},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {2.4d},
license = {lppl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/svn-multi},
@@ -63927,7 +63941,7 @@
title = {The \texttt{svn-prov} package},
subtitle = {Subversion variants of \textbackslash{}Provides... macros},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {3.1862},
license = {lppl},
mirror = {https://mirror.ctan.org/macros/latex/contrib/svn-prov},
@@ -66140,7 +66154,7 @@
title = {The \texttt{texdef} package},
subtitle = {Display the definitions of \TeX{} commands},
author = {Martin Scharrer},
- date = {2020-09-28},
+ date = {2022-10-26},
version = {1.9},
license = {gpl3},
mirror = {https://mirror.ctan.org/support/texdef},
@@ -68274,7 +68288,7 @@
title = {The \texttt{tikz-timing} package},
subtitle = {Easy generation of timing diagrams as TikZ pictures},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.7f},
license = {lppl},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikz-timing},
@@ -68391,8 +68405,8 @@
title = {The \texttt{tikzmark} package},
subtitle = {Use TikZ's method of remembering a position on a page},
author = {Andrew Stacey},
- date = {2021-02-21},
- version = {1.10},
+ date = {2022-10-26},
+ version = {1.15},
license = {lppl1.3c},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikzmark},
url = {https://ctan.org/pkg/tikzmark},
@@ -68435,7 +68449,7 @@
title = {The \texttt{tikzpagenodes} package},
subtitle = {A single TikZ node for the whole page},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {1.1},
license = {lppl},
mirror = {https://mirror.ctan.org/graphics/pgf/contrib/tikzpagenodes},
@@ -76302,7 +76316,7 @@
title = {The \texttt{ydoc} package},
subtitle = {Macros for documentation of \LaTeX{} classes and packages},
author = {Martin Scharrer},
- date = {2020-08-27},
+ date = {2022-10-26},
version = {0.6alpha},
license = {lppl1.3},
mirror = {https://mirror.ctan.org/macros/latex/contrib/ydoc},
diff --git a/biblio/ctan-bibdata/ctan.pdf b/biblio/ctan-bibdata/ctan.pdf
index 9dd2a459c8..e32c1f89e8 100644
--- a/biblio/ctan-bibdata/ctan.pdf
+++ b/biblio/ctan-bibdata/ctan.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/braids/braids.pdf b/graphics/pgf/contrib/braids/braids.pdf
index 5241cd38ee..32712530b6 100644
--- a/graphics/pgf/contrib/braids/braids.pdf
+++ b/graphics/pgf/contrib/braids/braids.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/braids/braids.tex b/graphics/pgf/contrib/braids/braids.tex
index 7dab9f0873..fa99fd937b 100644
--- a/graphics/pgf/contrib/braids/braids.tex
+++ b/graphics/pgf/contrib/braids/braids.tex
@@ -10,7 +10,15 @@
\usepackage{listings}
\lstloadlanguages{[LaTeX]TeX}
-\lstset{breakatwhitespace=true,breaklines=true,language=TeX}
+ \lstset{
+ gobble=2,
+ breakatwhitespace=true,
+ breaklines=true,
+ language=[LaTeX]TeX,
+ basicstyle=\small\ttfamily,
+ keepspaces=true,
+ columns=fullflexible
+}
\usepackage{fancyvrb}
@@ -21,7 +29,6 @@
\begin{center}
\setlength{\parindent}{0pt}
\fbox{\begin{minipage}{.9\linewidth}
- \lstset{breakatwhitespace=true,breaklines=true,language=TeX,basicstyle=\small}
\lstinputlisting[]{example.out}
\end{minipage}}
@@ -105,15 +112,27 @@ The usual syntax for this is as follows:
\DescribeMacro{braid-word}
The \Verb+braid-word+ is an expression in the braid group, such as \Verb+s_1 s_2^{-1} s_{3,5}+.
The generator labels are not significant.
-If the subscript is a single number, as in \Verb+s_2+, the crossing goes from that number over the next.
-If the subscript is two numbers, as in \Verb+s_{2,4}+, the crossing goes from the first over the second, with both the crossing strands passing over all of the intervening strands.
+
+The subscript determines how the strands cross, as follows:
+\begin{enumerate}
+\item If the subscript is a single number, as in \Verb+s_2+, the crossing goes from that number over the next.
+\item If the subscript is two or more numbers separated by a comma, as in \Verb+s_{2,4}+ or \Verb+s_{1,3,5}+, imagine holding the numbered strands and moving each to the position of the next with the last strand moving under the others to where the first stands.
+Any intermediate non-specified strand is behind all those involved in the crossing.
+\item If the subscript is hyphenated, as in \Verb+s_{1-5}+, this is equivalent to \Verb+s_{1,2,3,4,5}+.
+This can be used as part of a list, as in \Verb+s_{1-3,5}+.
+\end{enumerate}
+
+All of these crossings take place in the same amount of vertical space.
+Be advised that crossings involving a lot of strands can get quite squashed.
+
The exponent can be \Verb+1+, \Verb+{-1}+, or missing (in which case it defaults to \Verb+1+, note also that the exponent is read as a \TeX-token so \Verb+{1}+ is also legal).
-If the exponent is \(-1\) then the over and under strands swap.
+If the exponent is \(-1\) then the braid element represented by the crossing is inverted.
\begin{itemize}
\item \Verb+s_1+ is strand \(1\) over strand \(2\).
\item \Verb+s_1^{-1}+ is strand \(2\) over strand \(1\).
\item \Verb+s_{1,3}+ is strand \(1\) over strand \(3\), and both are over strand \(2\).
+\item \Verb+s_{1-3}+ is strand \(3\) under strand \(2\) and then under strand \(1\).
\end{itemize}
Certain other symbols are allowed in the \Verb+braid-word+ which control the rendering of the braid.
@@ -217,9 +236,13 @@ With a \Verb+name prefix+, the coordinate names look like the following:
The crossing number can also be either \Verb+s+ or \Verb+e+ for the start and end of the strand.
Note that \Verb+-1-0+ and \Verb+-1-s+ are slightly different in that \Verb+s+ includes the border height.
+In addition, if the braid is named then a rectangular node is defined that fits around the whole braid.
+This node is not actually rendered but its anchors can be used afterwards as if it had been.
+
\DescribeMacro{anchor}
The key \Verb+anchor+ (in the \Verb+braid+ name space) can be used to shift the braid so that a different part of it is at the specified location.
-It uses the same syntax as the coordinates, except without the \Verb+<name prefix>-+.
+If the argument contains a hyphen then it is assumed to refer to a point on a strand with the same interpretation as the coordinates (except without the \Verb+<name prefix>-+, of course).
+If the argument does not contain a hyphen then it is taken to be an anchor of a surrounding rectangular node (the node might not itself exist -- if the braid isn't named -- but that doesn't affect the positioning).
In the following example, the braid is shifted so that where the third strand starts the second level is at the position \Verb+(1,1)+
\begin{example}
@@ -282,6 +305,26 @@ Here are more detailed examples.
\end{example}
+\begin{example}
+\begin{center}
+\begin{tikzpicture}
+\pic[
+ braid/.cd,
+ number of strands=3,
+ ultra thick,
+ strand 1/.style={red},
+ strand 2/.style={green},
+ strand 3/.style={blue},
+ gap=0.1,
+% control factor=0,
+% nudge factor=0,
+ name prefix=braid,
+] {braid={a_{1-3} a_{1,3}}};
+\end{tikzpicture}
+\end{center}
+
+\end{example}
+
\newpage
\section{Original Package Usage (Depreciated)}
diff --git a/graphics/pgf/contrib/braids/braids_code.dtx b/graphics/pgf/contrib/braids/braids_code.dtx
index 51a4ee2c60..f1f59c29b0 100644
--- a/graphics/pgf/contrib/braids/braids_code.dtx
+++ b/graphics/pgf/contrib/braids/braids_code.dtx
@@ -35,7 +35,7 @@ See http://www.latex-project.org/lppl.txt
\endpreamble
\postamble
-Copyright (C) 2011-2019 by Andrew Stacey <loopspace@mathforge.org>
+Copyright (C) 2011-2022 by Andrew Stacey <loopspace@mathforge.org>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
@@ -103,7 +103,7 @@ and the derived files README.txt,
%</driver>
% \fi
%
-% \CheckSum{1949}
+% \CheckSum{2352}
%
% \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
@@ -125,6 +125,8 @@ and the derived files README.txt,
% \changes{1.0}{2011/05/03}{Converted to DTX file}
% \changes{1.1}{2011/05/03}{Extended syntax}
% \changes{2.0}{2019/03/20}{Converted TikZ library}
+% \changes{2.1}{2019/08/14}{Extended crossing capability}
+% \changes{2.2}{2022/10/26}{Advanced positioning}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
@@ -1181,7 +1183,7 @@ and the derived files README.txt,
% Life is so much easier with \LaTeX3.
% \begin{macrocode}
\ProvidesFile{tikzlibrarybraids.code.tex}[%
- 2019/03/20 v2.0 Tikz/PGF library for drawing braid diagrams%
+ 2022/10/26 v2.2 Tikz/PGF library for drawing braid diagrams%
]
\RequirePackage{expl3}
\ExplSyntaxOn
@@ -1207,11 +1209,19 @@ and the derived files README.txt,
\fp_new:N \l_@@_anchor_x_fp
\fp_new:N \l_@@_anchor_y_fp
\int_new:N \l_@@_tmpa_int
+\int_new:N \l_@@_tmpb_int
\int_new:N \l_@@_length_int
\int_new:N \l_@@_strands_int
\int_new:N \l_@@_crossing_int
+\int_new:N \l_@@_crossing_start_int
+\int_new:N \l_@@_crossing_end_int
+\int_new:N \l_@@_crossing_width_int
+\int_new:N \l_@@_crossing_long_int
+\int_new:N \l_@@_crossing_start_factor_int
+\int_new:N \l_@@_crossing_end_factor_int
\int_new:N \l_@@_anchor_level_int
\int_new:N \l_@@_floor_int
+\seq_new:N \l_@@_tmpa_seq
\seq_new:N \l_@@_word_seq
\seq_new:N \l_@@_crossing_seq
\seq_new:N \l_@@_anchor_seq
@@ -1235,22 +1245,19 @@ and the derived files README.txt,
\prop_new:N \l_@@_crossing_permutation_prop
\prop_new:N \l_@@_inverse_prop
\prop_new:N \l_@@_anchor_prop
+\cs_generate_variant:Nn \seq_set_split:Nnn {NVn}
% \end{macrocode}
% Our interface is through a TikZ pic.
% \begin{macrocode}
\tikzset{
braid/.pic={
- code={
- \@@_parse_word:n {#1}
- \@@_count:
- \@@_render:
- }
+ \@@_parse_word:n {#1}
+ \@@_count:
+ \@@_render:
},
floor/.pic={
- code={
- \path[pic~ actions, draw=none] (0,0) rectangle (1,1);
- \path[pic~ actions, fill=none] (0,0) -- (1,0) (0,1) -- (1,1);
- }
+ \path[pic~ actions, draw=none] (0,0) rectangle (1,1);
+ \path[pic~ actions, fill=none] (0,0) -- (1,0) (0,1) -- (1,1);
},
/tikz/braid/.search~ also={/tikz},
braid/.cd,
@@ -1431,15 +1438,35 @@ and the derived files README.txt,
% \begin{macrocode}
\cs_new_nopar:Npn \@@_parse_index:n #1
{
- \seq_set_from_clist:Nn \l_@@_crossing_seq {#1}
+ \seq_clear:N \l_@@_crossing_seq
+ \clist_map_inline:nn {#1}
+ {
+ \tl_if_in:nnTF {##1} {-}
+ {
+ \seq_set_split:Nnn \l_@@_tmpa_seq {-} {##1}
+ \int_compare:nTF {\seq_item:Nn \l_@@_tmpa_seq {1} < \seq_item:Nn \l_@@_tmpa_seq {2} }
+ {
+ \int_set:Nn \l_@@_tmpa_int {1}
+ }
+ {
+ \int_set:Nn \l_@@_tmpa_int {-1}
+ }
+ \int_step_inline:nnnn {\seq_item:Nn \l_@@_tmpa_seq {1}} {\l_@@_tmpa_int} {\seq_item:Nn \l_@@_tmpa_seq {2}}
+ {
+ \seq_put_right:Nn \l_@@_crossing_seq {####1}
+ }
+ }
+ {
+ \seq_put_right:Nn \l_@@_crossing_seq {##1}
+ }
+ }
\int_compare:nT {\seq_count:N \l_@@_crossing_seq == 1}
{
\seq_put_right:Nx \l_@@_crossing_seq {\int_eval:n {#1 + 1} }
}
- \bool_if:NT \l_@@_swap_crossing_bool
+ \bool_if:NF \l_@@_swap_crossing_bool
{
- \seq_pop_left:NN \l_@@_crossing_seq \l_@@_tmpa_tl
- \seq_put_right:NV \l_@@_crossing_seq \l_@@_tmpa_tl
+ \seq_reverse:N \l_@@_crossing_seq
}
}
% \end{macrocode}
@@ -1507,15 +1534,11 @@ and the derived files README.txt,
% \begin{macrocode}
\seq_if_empty:NF \l_@@_crossing_seq
{
- \int_set:Nn \l_@@_strands_int
+ \seq_map_inline:Nn \l_@@_crossing_seq
{
- \int_max:nn
+ \int_set:Nn \l_@@_strands_int
{
- \int_max:nn {\l_@@_strands_int}
- { \seq_item:Nn \l_@@_crossing_seq {1}}
- }
- {
- \seq_item:Nn \l_@@_crossing_seq {2}
+ \int_max:nn {\l_@@_strands_int} {####1}
}
}
}
@@ -1534,38 +1557,51 @@ and the derived files README.txt,
% Now we step through the braid word again and record the permutations so that we can calculate the overall permutation defined by the braid.
%
% We will also figure out our shift from the anchor, so first we need to get some information about the anchor.
+%
+% If the anchor specification has a hyphen then it is of the form strand-level, otherwise it is an anchor as if the whole braid were contained in a rectangular node.
% \begin{macrocode}
\tl_set:Nx \l_@@_tmpa_tl {\@@_value:n {anchor}}
- \seq_set_split:NnV \l_@@_anchor_seq {-} \l_@@_tmpa_tl
-
- \tl_set:Nx \l_@@_tmpa_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
- \tl_if_eq:VnTF \l_@@_tmpa_tl {rev}
- {
- \tl_set:Nx \l_@@_anchor_strand_tl {\seq_item:Nn \l_@@_anchor_seq {2}}
- \tl_set:Nx \l_@@_anchor_level_tl {\seq_item:Nn \l_@@_anchor_seq {3}}
- }
+ \tl_if_in:NnTF \l_@@_tmpa_tl {-}
{
- \tl_set:Nx \l_@@_anchor_strand_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
- \tl_set:Nx \l_@@_anchor_level_tl {\seq_item:Nn \l_@@_anchor_seq {2}}
- }
+ \seq_set_split:NnV \l_@@_anchor_seq {-} \l_@@_tmpa_tl
+
+ \tl_set:Nx \l_@@_tmpa_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
+ \tl_if_eq:VnTF \l_@@_tmpa_tl {rev}
+ {
+ \tl_set:Nx \l_@@_anchor_strand_tl {\seq_item:Nn \l_@@_anchor_seq {2}}
+ \tl_set:Nx \l_@@_anchor_level_tl {\seq_item:Nn \l_@@_anchor_seq {3}}
+ }
+ {
+ \tl_set:Nx \l_@@_anchor_strand_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
+ \tl_set:Nx \l_@@_anchor_level_tl {\seq_item:Nn \l_@@_anchor_seq {2}}
+ }
% \end{macrocode}
% The important information is as to the level at which the requested anchor resides.
% If it is at the end or start of a strand, we set the level to \(-1\) so that it never matches a level number.
% \begin{macrocode}
- \tl_if_eq:VnTF \l_@@_anchor_level_tl {s}
- {
- \int_set:Nn \l_@@_anchor_level_int {-1}
- }
- {
- \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+ \tl_if_eq:VnTF \l_@@_anchor_level_tl {s}
{
\int_set:Nn \l_@@_anchor_level_int {-1}
}
{
- \int_set:Nn \l_@@_anchor_level_int
- {\tl_use:N \l_@@_anchor_level_tl}
+ \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+ {
+ \int_set:Nn \l_@@_anchor_level_int {-1}
+ }
+ {
+ \int_set:Nn \l_@@_anchor_level_int
+ {\tl_use:N \l_@@_anchor_level_tl}
+ }
}
}
+ {
+% \end{macrocode}
+% There wasn't a hyphen in the anchor specification, so assume it's an anchor on a node surrounding the entire braid.
+% For now, set the anchor strand and level to \(-1\).
+% \begin{macrocode}
+ \int_set:Nn \l_@@_anchor_level_int {-1}
+ \tl_set:Nn \l_@@_anchor_strand_tl {-1}
+ }
\int_zero:N \l_@@_crossing_int
\int_incr:N \l_@@_crossing_int
@@ -1580,23 +1616,29 @@ and the derived files README.txt,
##1
\seq_if_empty:NF \l_@@_crossing_seq
{
- \prop_get:NxN \l_@@_permutation_prop
- {
- \seq_item:Nn \l_@@_crossing_seq {1}
- } \l_@@_tmpa_tl
- \prop_get:NxN \l_@@_permutation_prop
+ \int_step_inline:nnn {2} {\seq_count:N \l_@@_crossing_seq}
{
- \seq_item:Nn \l_@@_crossing_seq {2}
- } \l_@@_tmpb_tl
+ \int_set:Nn \l_@@_tmpa_int {####1}
+ \int_set:Nn \l_@@_tmpb_int {####1 - 1}
- \prop_put:NxV \l_@@_permutation_prop
- {
- \seq_item:Nn \l_@@_crossing_seq {2}
- } \l_@@_tmpa_tl
- \prop_put:NxV \l_@@_permutation_prop
- {
- \seq_item:Nn \l_@@_crossing_seq {1}
- } \l_@@_tmpb_tl
+ \prop_get:NxN \l_@@_permutation_prop
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ } \l_@@_tmpa_tl
+ \prop_get:NxN \l_@@_permutation_prop
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}
+ } \l_@@_tmpb_tl
+
+ \prop_put:NxV \l_@@_permutation_prop
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}
+ } \l_@@_tmpa_tl
+ \prop_put:NxV \l_@@_permutation_prop
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ } \l_@@_tmpb_tl
+ }
}
% \end{macrocode}
% See if the current level is what was requested by the anchor.
@@ -1629,24 +1671,30 @@ and the derived files README.txt,
}
% \end{macrocode}
% Now that we have the inverse, we can figure out our anchor.
-% First, see if we requested a strand by its position at the end of the braid.
+% If the strand was recorded as \(-1\), then we want to figure out the position from the braid as a whole so we don't bother with processing.
% \begin{macrocode}
- \tl_set:Nx \l_@@_tmpa_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
- \tl_if_eq:VnT \l_@@_tmpa_tl {rev}
+ \tl_if_eq:VnF \l_@@_anchor_strand_tl {-1}
{
- \prop_get:NVN \l_@@_permutation_prop
- \l_@@_anchor_strand_tl \l_@@_anchor_strand_tl
- }
- \tl_if_eq:VnF \l_@@_anchor_level_tl {s}
- {
- \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+% \end{macrocode}
+% Now, see if we requested a strand by its position at the end of the braid.
+% \begin{macrocode}
+ \tl_set:Nx \l_@@_tmpa_tl {\seq_item:Nn \l_@@_anchor_seq {1}}
+ \tl_if_eq:VnT \l_@@_tmpa_tl {rev}
{
- \prop_get:NVN \l_@@_inverse_prop
+ \prop_get:NVN \l_@@_permutation_prop
\l_@@_anchor_strand_tl \l_@@_anchor_strand_tl
}
+ \tl_if_eq:VnF \l_@@_anchor_level_tl {s}
{
- \prop_get:NVN \l_@@_anchor_prop
- \l_@@_anchor_strand_tl \l_@@_anchor_strand_tl
+ \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+ {
+ \prop_get:NVN \l_@@_inverse_prop
+ \l_@@_anchor_strand_tl \l_@@_anchor_strand_tl
+ }
+ {
+ \prop_get:NVN \l_@@_anchor_prop
+ \l_@@_anchor_strand_tl \l_@@_anchor_strand_tl
+ }
}
}
% \end{macrocode}
@@ -1684,28 +1732,91 @@ and the derived files README.txt,
\cs_new_nopar:Npn \@@_render:
{
% \end{macrocode}
-%
+% Start by figuring out our anchor.
% \begin{macrocode}
- \fp_set:Nn \l_@@_anchor_x_fp { - 1 * (\tl_use:N \l_@@_anchor_strand_tl - 1) * \@@_dim_value:n {width} }
-
- \tl_if_eq:VnTF \l_@@_anchor_level_tl {s}
+ \tl_if_eq:VnTF \l_@@_anchor_strand_tl {-1}
{
- \fp_set:Nn \l_@@_anchor_y_fp {0}
+% \end{macrocode}
+% The strand is \(-1\) then we're working with the braid as if a node.
+% We'll redefine this node later anyway.
+% \begin{macrocode}
+ \tl_set:cn {pgf@sh@ns@temporary braid node}{rectangle}
+ \tl_set:cx {pgf@sh@np@temporary braid node}{%
+ \exp_not:N\def
+ \exp_not:N\southwest
+ {
+ \exp_not:N\pgfqpoint
+ {0pt}
+ {0pt}
+ }
+ \exp_not:N\def
+ \exp_not:N\northeast
+ {
+ \exp_not:N\pgfqpoint
+ {
+ \fp_to_dim:n
+ {
+ (\l_@@_strands_int - 1)
+ *
+ abs(\@@_dim_value:n {width})
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ \l_@@_length_int * abs(\@@_dim_value:n {height})
+ + 2 * \@@_dim_value:n {border~ height}
+ }
+ }
+ }
+ }%
+ \pgfgettransform\l_@@_tmpa_tl
+ \tl_set:cV {pgf@sh@nt@temporary braid node} \l_@@_tmpa_tl
+ \tl_set:cV {pgf@sh@pi@temporary braid node} \pgfpictureid
+ \pgfpointanchor{temporary braid node} {\@@_value:n {anchor}}
+% \end{macrocode}
+% Adjustments due to the possibility of negative widths/heights
+% \begin{macrocode}
+ \fp_set:Nn \l_@@_anchor_x_fp {
+ - \dim_use:c {pgf@x}
+ - (1 - sign(\@@_dim_value:n {width})) / 2
+ * (\l_@@_strands_int - 1)
+ * \@@_dim_value:n {width}
+ }
+ \fp_set:Nn \l_@@_anchor_y_fp {
+ - \dim_use:c {pgf@y}
+ - (1 - sign(\@@_dim_value:n {height})) / 2
+ * (
+ \l_@@_length_int * abs(\@@_dim_value:n {height})
+ + 2 * \@@_dim_value:n {border~ height}
+ ) * sign(\@@_dim_value:n {height})
+ }
}
{
- \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+% \end{macrocode}
+% The strand is not \(-1\) so we're setting the anchor via strand and level numbers.
+% \begin{macrocode}
+ \fp_set:Nn \l_@@_anchor_x_fp { - 1 * (\tl_use:N \l_@@_anchor_strand_tl - 1) * \@@_dim_value:n {width} }
+
+ \tl_if_eq:VnTF \l_@@_anchor_level_tl {s}
{
- \fp_set:Nn \l_@@_anchor_y_fp {
- -1 * \l_@@_length_int * \@@_dim_value:n {height}
- - sign(\@@_dim_value:n {height})
- * 2 * \@@_dim_value:n {border~ height}
- }
+ \fp_set:Nn \l_@@_anchor_y_fp {0}
}
{
- \fp_set:Nn \l_@@_anchor_y_fp {
- -1 * \l_@@_anchor_level_tl * \@@_dim_value:n {height}
- - sign(\@@_dim_value:n {height})
- * \@@_dim_value:n {border~ height}
+ \tl_if_eq:VnTF \l_@@_anchor_level_tl {e}
+ {
+ \fp_set:Nn \l_@@_anchor_y_fp {
+ -1 * \l_@@_length_int * \@@_dim_value:n {height}
+ - sign(\@@_dim_value:n {height})
+ * 2 * \@@_dim_value:n {border~ height}
+ }
+ }
+ {
+ \fp_set:Nn \l_@@_anchor_y_fp {
+ -1 * \l_@@_anchor_level_tl * \@@_dim_value:n {height}
+ - sign(\@@_dim_value:n {height})
+ * \@@_dim_value:n {border~ height}
+ }
}
}
}
@@ -1860,190 +1971,321 @@ and the derived files README.txt,
% \begin{macrocode}
\seq_if_empty:NF \l_@@_crossing_seq
{
+ \int_set:Nn \l_@@_crossing_long_int
+ {
+ % \seq_item:Nn \l_@@_crossing_seq {\seq_count:N \l_@@_crossing_seq}
+ \seq_item:Nn \l_@@_crossing_seq {1}
+ }
+ \int_set:Nn \l_@@_crossing_start_int
+ {
+ \int_min:nn
+ {
+ \seq_item:Nn \l_@@_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\seq_count:N \l_@@_crossing_seq}
+ }
+ }
+ \int_set:Nn \l_@@_crossing_end_int
+ {
+ \int_max:nn
+ {
+ \seq_item:Nn \l_@@_crossing_seq {1}
+ }
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\seq_count:N \l_@@_crossing_seq}
+ }
+
+ }
+ \int_set:Nn \l_@@_crossing_width_int
+ {
+ \l_@@_crossing_end_int
+ -
+ \l_@@_crossing_start_int
+ }
+% \end{macrocode}
+% Step through the crossing
+% \begin{macrocode}
+ \int_step_inline:nnn {2} {\seq_count:N \l_@@_crossing_seq}
+ {
+ \int_set:Nn \l_@@_tmpa_int {####1}
+ \int_set:Nn \l_@@_tmpb_int {####1 - 1}
% \end{macrocode}
% Keep track of the current permutation.
% \begin{macrocode}
\prop_get:NxN \l_@@_crossing_permutation_prop
- {\seq_item:Nn \l_@@_crossing_seq {1}} \l_@@_tmpa_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}} \l_@@_tmpa_tl
\prop_get:NxN \l_@@_crossing_permutation_prop
- {\seq_item:Nn \l_@@_crossing_seq {2}} \l_@@_tmpb_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}} \l_@@_tmpb_tl
\prop_put:NxV \l_@@_crossing_permutation_prop
- {\seq_item:Nn \l_@@_crossing_seq {2}} \l_@@_tmpa_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}} \l_@@_tmpa_tl
\prop_put:NxV \l_@@_crossing_permutation_prop
- {\seq_item:Nn \l_@@_crossing_seq {1}} \l_@@_tmpb_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}} \l_@@_tmpb_tl
% \end{macrocode}
% Now get the strands corresponding to the ones involved in the crossing.
% \begin{macrocode}
\prop_get:NxN \l_@@_strands_prop
- {\seq_item:Nn \l_@@_crossing_seq {1}} \l_@@_tmpa_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}} \l_@@_tmpa_tl
\prop_get:NxN \l_@@_strands_prop
- {\seq_item:Nn \l_@@_crossing_seq {2}} \l_@@_tmpb_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}} \l_@@_tmpb_tl
% \end{macrocode}
% The over-strand is easy as that's a single curve.
% \begin{macrocode}
+% \int_set:Nn \l_@@_crossing_start_factor_int {1}
+% \int_set:Nn \l_@@_crossing_end_factor_int {1}
+% \int_compare:nT {
+% \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+% =
+% \l_@@_crossing_long_int
+% }
+% {
+ \int_set:Nn \l_@@_crossing_start_factor_int {0}
+ \int_set:Nn \l_@@_crossing_end_factor_int {0}
+
+ \int_compare:nT {
+ ####1 = \seq_count:N \l_@@_crossing_seq
+ }
+ {
+ \int_set:Nn \l_@@_crossing_end_factor_int {1}
+ }
+ \int_compare:nT {
+ ####1 = 2
+ }
+ {
+ \int_set:Nn \l_@@_crossing_start_factor_int {1}
+ }
+% }
+
\tl_put_right:Nx \l_@@_tmpa_tl
{
\exp_not:N \@@_lineto:nn
{\fp_eval:n
{
- (\seq_item:Nn \l_@@_crossing_seq {1} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int} - 1)
* \@@_dim_value:n {width}
}
}
- {\fp_eval:n { \l_@@_height_fp + \l_@@_nudge_fp } }
+ {\fp_eval:n { \l_@@_height_fp + \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ + \@@_dim_value:n {height} * (####1 - 2)/(\seq_count:N \l_@@_crossing_seq - 1)
+ } }
\exp_not:N \@@_curveto:nnnnnn
{0}
- {\fp_eval:n { \l_@@_control_fp}}
+ {\fp_eval:n { \l_@@_control_fp
+% * \l_@@_crossing_start_factor_int
+ * 1/(\seq_count:N \l_@@_crossing_seq - 1)}}
{0}
- {\fp_eval:n {- \l_@@_control_fp}}
+ {\fp_eval:n {- \l_@@_control_fp
+% * \l_@@_crossing_end_factor_int
+ * 1/(\seq_count:N \l_@@_crossing_seq - 1)}}
{\fp_eval:n
{
- (\seq_item:Nn \l_@@_crossing_seq {2} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int} - 1)
* \@@_dim_value:n {width}
}
}
{\fp_eval:n
{
\l_@@_height_fp
- + \@@_dim_value:n {height}
- - \l_@@_nudge_fp
+ + \@@_dim_value:n {height} * (####1 - 1)/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
}
}
% \end{macrocode}
% The under-strand is a bit more complicated as we need to break it in the middle.
% \begin{macrocode}
+% \int_set:Nn \l_@@_crossing_start_factor_int {1}
+% \int_set:Nn \l_@@_crossing_end_factor_int {1}
+% \int_compare:nT {
+% \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}
+% =
+% \l_@@_crossing_long_int
+% }
+% {
+ \int_set:Nn \l_@@_crossing_start_factor_int {0}
+ \int_set:Nn \l_@@_crossing_end_factor_int {0}
+
+ \int_compare:nT {
+ ####1 = \seq_count:N \l_@@_crossing_seq
+ }
+ {
+ \int_set:Nn \l_@@_crossing_end_factor_int {1}
+ }
+ \int_compare:nT {
+ ####1 = 2
+ }
+ {
+ \int_set:Nn \l_@@_crossing_start_factor_int {1}
+ }
+% }
+
\tl_put_right:Nx \l_@@_tmpb_tl
{
\exp_not:N \@@_lineto:nn
{\fp_eval:n
{
- (\seq_item:Nn \l_@@_crossing_seq {2} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int} - 1)
* \@@_dim_value:n {width}
}
}
- {\fp_eval:n { \l_@@_height_fp + \l_@@_nudge_fp } }
+ {\fp_eval:n { \l_@@_height_fp + \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ + \@@_dim_value:n {height} * (####1 - 2)/(\seq_count:N \l_@@_crossing_seq - 1)
+
+ } }
\exp_not:N \@@_curveto:nnnnnn
{0}
{
\fp_eval:n {
- \l_@@_control_fp * (.5 - \@@_value:n {gap} )
+ \l_@@_control_fp * (.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) ) * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_start_factor_int
}
}
{
\fp_eval:n {
- - (.5 - \@@_value:n {gap} ) / 3 *
+ - (.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) ) / 3 *
\@@_bezier_tangent:nnnnn
- {.5 - \@@_value:n {gap} }
+ {.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
{0}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
}
}
{
\fp_eval:n {
- -(.5 - \@@_value:n {gap} ) / 3 *
+ -(.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) ) / 3 *
\@@_bezier_tangent:nnnnn
- {.5 - \@@_value:n {gap} }
+ {.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
- {\l_@@_control_fp}
{
- \@@_dim_value:n {height}
- - 2* \l_@@_nudge_fp
- - \l_@@_control_fp
+ \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_start_factor_int
+ }
+ {
+ \@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
+ - \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_end_factor_int
+ }
+ {
+ \@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
- {\@@_dim_value:n {height} - 2* \l_@@_nudge_fp}
}
}
{
\fp_eval:n {
- (\seq_item:Nn \l_@@_crossing_seq {2} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int} - 1)
* \@@_dim_value:n {width} +
\@@_bezier_point:nnnnn
- {.5 - \@@_value:n {gap} }
+ {.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
{0}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
}
}
{
\fp_eval:n {
- \l_@@_height_fp + \l_@@_nudge_fp +
+ \l_@@_height_fp
+ + \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ + \@@_dim_value:n {height} * (####1 - 2)/(\seq_count:N \l_@@_crossing_seq - 1)
+ +
\@@_bezier_point:nnnnn
- {.5 - \@@_value:n {gap} }
+ {.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
- {\l_@@_control_fp}
{
- \@@_dim_value:n {height}
- - 2* \l_@@_nudge_fp
- - \l_@@_control_fp
+ \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_start_factor_int
+ }
+ {
+ \@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
+ - \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_end_factor_int
+ }
+ {\@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
- {\@@_dim_value:n {height} - 2* \l_@@_nudge_fp}
}
}
\exp_not:N \@@_moveto:nn
{
\fp_eval:n {
- (\seq_item:Nn \l_@@_crossing_seq {2} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int} - 1)
* \@@_dim_value:n {width} +
\@@_bezier_point:nnnnn
- {.5 + \@@_value:n {gap} }
+ {.5 + \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
{0}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
}
}
{
\fp_eval:n {
- \l_@@_height_fp + \l_@@_nudge_fp +
+ \l_@@_height_fp
+ + \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ + \@@_dim_value:n {height} * (####1 - 2)/(\seq_count:N \l_@@_crossing_seq - 1)
+ +
\@@_bezier_point:nnnnn
- {.5 + \@@_value:n {gap} }
+ {.5 + \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
- {\l_@@_control_fp}
{
- \@@_dim_value:n {height} - 2* \l_@@_nudge_fp
- - \l_@@_control_fp
+ \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_start_factor_int
+ }
+ {
+ \@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
+ - \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_end_factor_int
+ }
+ {\@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
- {\@@_dim_value:n {height} - 2* \l_@@_nudge_fp}
}
}
@@ -2051,55 +2293,65 @@ and the derived files README.txt,
{
\fp_eval:n {
- (.5 - \@@_value:n {gap} ) / 3 *
+ (.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) ) / 3 *
\@@_bezier_tangent:nnnnn
- {.5 + \@@_value:n {gap} }
+ {.5 + \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
{0}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
{
- (\seq_item:Nn \l_@@_crossing_seq {1}
- - \seq_item:Nn \l_@@_crossing_seq {2})
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ - \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int})
* \@@_dim_value:n {width}
}
}
}
{
\fp_eval:n {
- (.5 - \@@_value:n {gap} ) / 3 *
+ (.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) ) / 3 *
\@@_bezier_tangent:nnnnn
- {.5 + \@@_value:n {gap} }
+ {.5 + \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) }
{0}
- {\l_@@_control_fp}
{
- \@@_dim_value:n {height} - 2* \l_@@_nudge_fp
- - \l_@@_control_fp
+ \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_start_factor_int
+ }
+ {
+ \@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
+ - \l_@@_control_fp * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+% * \l_@@_crossing_end_factor_int
+ }
+ {\@@_dim_value:n {height} * 1/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_start_factor_int
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
- {\@@_dim_value:n {height} - 2* \l_@@_nudge_fp}
}
}
{0}
- { \fp_eval:n {
- -\l_@@_control_fp * (.5 - \@@_value:n {gap} )
- }
+ {\fp_eval:n {
+ - \l_@@_control_fp * (.5 - \@@_value:n {gap} * (\seq_count:N \l_@@_crossing_seq - 1) )
+% * \l_@@_crossing_end_factor_int
+ * 1/(\seq_count:N \l_@@_crossing_seq - 1)}
}
-
{\fp_eval:n
{
- (\seq_item:Nn \l_@@_crossing_seq {1} - 1)
+ (\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int} - 1)
* \@@_dim_value:n {width}
}
}
{\fp_eval:n
{
- \l_@@_height_fp + \@@_dim_value:n {height}
- - \l_@@_nudge_fp
+ \l_@@_height_fp
+ + \@@_dim_value:n {height} * (####1 - 1)/(\seq_count:N \l_@@_crossing_seq - 1)
+ - \l_@@_nudge_fp * \l_@@_crossing_end_factor_int
}
}
@@ -2108,9 +2360,9 @@ and the derived files README.txt,
% Now put those new strands back in the prop.
% \begin{macrocode}
\prop_put:NxV \l_@@_strands_prop
- {\seq_item:Nn \l_@@_crossing_seq {2}} \l_@@_tmpa_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}} \l_@@_tmpa_tl
\prop_put:NxV \l_@@_strands_prop
- {\seq_item:Nn \l_@@_crossing_seq {1}} \l_@@_tmpb_tl
+ {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}} \l_@@_tmpb_tl
% \end{macrocode}
% If the strands are more than one apart, the intermediate strands need to be broken as well.
% \begin{macrocode}
@@ -2118,18 +2370,18 @@ and the derived files README.txt,
{
\int_max:nn
{
- \seq_item:Nn \l_@@_crossing_seq {1}
+ \seq_item:Nn \l_@@_crossing_seq {####1 - 1}
}
{
- \seq_item:Nn \l_@@_crossing_seq {2}
+ \seq_item:Nn \l_@@_crossing_seq {####1}
}
-
\int_min:nn
{
- \seq_item:Nn \l_@@_crossing_seq {1}
+ \seq_item:Nn \l_@@_crossing_seq {####1 - 1}
}
{
- \seq_item:Nn \l_@@_crossing_seq {2}
+ \seq_item:Nn \l_@@_crossing_seq {####1}
}
> 1
}
@@ -2138,49 +2390,78 @@ and the derived files README.txt,
{
\int_min:nn
{
- \seq_item:Nn \l_@@_crossing_seq {1}
+ \seq_item:Nn \l_@@_crossing_seq {####1 - 1}
}
{
- \seq_item:Nn \l_@@_crossing_seq {2}
+ \seq_item:Nn \l_@@_crossing_seq {####1}
}
+ 1}
{1}
{
\int_max:nn
{
- \seq_item:Nn \l_@@_crossing_seq {1}
+ \seq_item:Nn \l_@@_crossing_seq {####1 - 1}
}
{
- \seq_item:Nn \l_@@_crossing_seq {2}
+ \seq_item:Nn \l_@@_crossing_seq {####1}
}
- 1
}
{
- \prop_get:NnN \l_@@_strands_prop {####1} \l_@@_tmpa_tl
+ \prop_get:NnN \l_@@_strands_prop {########1} \l_@@_tmpa_tl
\tl_put_right:Nx \l_@@_tmpa_tl
{
\exp_not:N \@@_lineto:nn
- {\fp_eval:n {(####1 - 1) * \@@_dim_value:n {width} }}
+ {\fp_eval:n {(########1 - 1) * \@@_dim_value:n {width} }}
{\fp_eval:n
{
\l_@@_height_fp + \l_@@_nudge_fp
- + .5 * \l_@@_control_fp
+ + .5 * \l_@@_control_fp / (\seq_count:N \l_@@_crossing_seq - 1)
+ + \@@_dim_value:n {height} * (####1 - 2)/(\seq_count:N \l_@@_crossing_seq - 1)
}
}
\exp_not:N \@@_moveto:nn
- {\fp_eval:n {(####1 - 1) * \@@_dim_value:n {width} }}
+ {\fp_eval:n {(########1 - 1) * \@@_dim_value:n {width} }}
{\fp_eval:n
{
- \l_@@_height_fp + \@@_dim_value:n {height}
- - \l_@@_nudge_fp - .5 * \l_@@_control_fp
+ \l_@@_height_fp
+ - \l_@@_nudge_fp - .5 * \l_@@_control_fp / (\seq_count:N \l_@@_crossing_seq - 1)
+ + \@@_dim_value:n {height} * (####1 - 1)/(\seq_count:N \l_@@_crossing_seq - 1)
}
}
}
- \prop_put:NnV \l_@@_strands_prop {####1} \l_@@_tmpa_tl
+ \prop_put:NnV \l_@@_strands_prop {########1} \l_@@_tmpa_tl
}
}
+% \end{macrocode}
+% Reset the current long
+% \begin{macrocode}
+ \int_compare:nTF
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}
+ =
+ \l_@@_crossing_long_int
+ }
+ {
+ \int_set:Nn \l_@@_crossing_long_int {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}}
+ }
+ {
+ \int_compare:nT
+ {
+ \seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpb_int}
+ =
+ \l_@@_crossing_long_int
+ }
+ {
+ \int_set:Nn \l_@@_crossing_long_int {\seq_item:Nn \l_@@_crossing_seq {\l_@@_tmpa_int}}
+ }
+
+ }
+% \end{macrocode}
+% \begin{macrocode}
+ }
}
% \end{macrocode}
% If we're to step the level, increase the height and add a load of coordinates.
@@ -2239,6 +2520,68 @@ and the derived files README.txt,
\prop_get:NnN \l_@@_strands_prop {##1} \l_@@_tmpa_tl
\tl_use:N \l_@@_tmpa_tl
}
+% \end{macrocode}
+% Finally, put a node around the whole braid if it's been named
+% \begin{macrocode}
+ \tl_if_empty:cF {tikz@fig@name}
+ {
+ \tl_gset:cn {pgf@sh@ns@ \tl_use:c{tikz@fig@name} }{rectangle}
+ \tl_gset:cx {pgf@sh@np@ \tl_use:c{tikz@fig@name} }{%
+ \exp_not:N\def
+ \exp_not:N\southwest
+ {
+ \exp_not:N\pgfqpoint
+ {
+ \fp_to_dim:n
+ {
+ min(0,
+ (\l_@@_strands_int - 1)
+ *
+ (\@@_dim_value:n {width})
+ )
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ min(0,
+ \l_@@_length_int * (\@@_dim_value:n {height})
+ + 2 * sign(\@@_dim_value:n {height}) *
+ \@@_dim_value:n {border~ height}
+ )
+ }
+ }
+ }
+ \exp_not:N\def
+ \exp_not:N\northeast
+ {
+ \exp_not:N\pgfqpoint
+ {
+ \fp_to_dim:n
+ {
+ max(0,
+ (\l_@@_strands_int - 1)
+ *
+ (\@@_dim_value:n {width})
+ )
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ max(0,
+ \l_@@_length_int * (\@@_dim_value:n {height})
+ + 2 * sign(\@@_dim_value:n {height}) *
+ \@@_dim_value:n {border~ height}
+ )
+ }
+ }
+ }
+ }%
+ \pgfgettransform\l_@@_tmpa_tl
+ \tl_gset:cV {pgf@sh@nt@ \tl_use:c{tikz@fig@name} } \l_@@_tmpa_tl
+ \tl_gset:cV {pgf@sh@pi@ \tl_use:c{tikz@fig@name} } \pgfpictureid
+ }
\end{scope}
}
% \end{macrocode}
@@ -2257,6 +2600,8 @@ and the derived files README.txt,
}
\cs_new_nopar:Npn \@@_curveto:nnnnnn #1#2#3#4#5#6
{
+% -- +(5 pt, 0) -- +(0 pt, 0pt)
+% -- +(#1 pt, #2 pt) -- (#5 pt + #3 pt, #6 pt + #4 pt) -- (#5 pt, #6 pt)
.. controls +(#1 pt, #2 pt) and +(#3 pt, #4 pt)
.. (#5 pt, #6 pt)
}
diff --git a/graphics/pgf/contrib/braids/braids_code.pdf b/graphics/pgf/contrib/braids/braids_code.pdf
index d60b9b6f39..e001392bde 100644
--- a/graphics/pgf/contrib/braids/braids_code.pdf
+++ b/graphics/pgf/contrib/braids/braids_code.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/knots.pdf b/graphics/pgf/contrib/spath3/knots.pdf
index 39067dee2e..9f4d6b0fa7 100644
--- a/graphics/pgf/contrib/spath3/knots.pdf
+++ b/graphics/pgf/contrib/spath3/knots.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/knots.tex b/graphics/pgf/contrib/spath3/knots.tex
index 7e0d885843..9236af6aa5 100644
--- a/graphics/pgf/contrib/spath3/knots.tex
+++ b/graphics/pgf/contrib/spath3/knots.tex
@@ -611,6 +611,119 @@ This can be combined with the facilities of this package but also has some featu
For braids themselves, there is the \Verb+braids+ package which allows input specification in the form of a word in the braid group.
+\section{Troubleshooting}
+
+The diagrams drawn by this package can involve quite complicated calculations and they don't always turn out as expected.
+There are plenty of \href{https://tex.stackexchange.com/search?q=knots}{questions on TeX-SX} about this package, but sifting through them can be tricky.
+Through answering some of them, I've developed a few strategies for figuring out what's going on.
+This section details some of what can go wrong and some of those strategies for finding out what's going on.
+
+\subsection{Small Diagrams}
+
+A common situation when the diagrams don't always work out is when the diagram is relatively small.
+The defaults in this library are set for a diagram of a few centimetres across.
+Some of the key properties are stored as dimensions which means that they don't naturally scale but have to be reset.
+In particular, the \Verb!end tolerance! and \Verb!clip radius! are dimensions with defaults \Verb!14pt! and \Verb!10pt! respectively.
+
+The \Verb!end tolerance! is used to weed out false intersections that occur when a strand is split into pieces.
+Therefore, if the \Verb!consider self intersections! key is not set then \Verb!end tolerance! is largely unneeded (though it is still used) so can safely be set to something very small.
+
+The effect of this can be seen in the following (where to make the issue evident, I've made \Verb!end tolerance! larger rather than make the diagram small).
+
+\begin{example}
+\begin{tikzpicture}
+\begin{knot}[
+ end tolerance=1.5cm
+ ]
+\strand[red] (0,0) to[out=0,in=180] ++(1,1);
+\strand[blue] (0,1) to[out=0,in=180] ++(1,-1);
+\end{knot}
+\begin{knot}
+\strand[red] (1.5,0) to[out=0,in=180] ++(1,1);
+\strand[blue] (1.5,1) to[out=0,in=180] ++(1,-1);
+\end{knot}
+\end{tikzpicture}
+\end{example}
+
+The \Verb!clip radius! determines how much of the diagram is redrawn near a crossing.
+If the crossings are very close together, the redraws can interfere with each other.
+
+\begin{example}
+\begin{tikzpicture}
+\begin{knot}[
+ clip radius=.6cm,
+ flip crossing=2
+ ]
+\strand[red] (0,0) to[out=0,in=180] ++(1,.6) to[out=0,in=180] ++(1,-.6);
+\strand[blue] (0,1) to[out=0,in=180] ++(1,-.6) to[out=0,in=180] ++(1,.6);
+\end{knot}
+\begin{knot}[flip crossing=2]
+\strand[red] (2.5,0) to[out=0,in=180] ++(1,.6) to[out=0,in=180] ++(1,-.6);
+\strand[blue] (2.5,1) to[out=0,in=180] ++(1,-.6) to[out=0,in=180] ++(1,.6);
+\end{knot}
+\end{tikzpicture}
+\end{example}
+
+\subsection{Strategies}
+
+\begin{itemize}
+\item \Verb+draft mode=crossings+
+
+This is useful to check that all the intersections are actually being found.
+Any that aren't might be due to \Verb!end tolerance! being too large.
+Or if \Verb!consider self intersections! is set to \Verb!no splits! then some self intersections might not be found.
+
+\item \Verb+background clip+ and \Verb+clip+ styles.
+
+When a crossing is redrawn, the over strand is clipped to a circle centred on the crossing.
+First a background path is drawn to ``wipe out'' the under strand and then the over strand is drawn.
+The clip circle for the background path is slightly smaller than the over path to avoid an issue whereby faint artefacts are visible (called \href{https://tex.stackexchange.com/q/188447/86}{crop circles} in one question on TeX-SX).
+Rather than use a \Verb!\clip! directly, I use \Verb!\path[background clip]! and \Verb!\path[clip]! which means that these styles can be modified to show the region that is being used.
+A useful style is:
+
+\begin{lstlisting}
+ background clip/.append style={
+ preaction={
+ fill=gray,
+ fill opacity=.5,
+ }
+ }
+\end{lstlisting}
+
+\begin{example}
+\begin{tikzpicture}
+\begin{knot}[
+ clip radius=.6cm,
+ flip crossing=2,
+ background clip/.append style={
+ preaction={
+ fill=gray,
+ fill opacity=.5,
+ }
+ }
+]
+\strand[red] (0,0) to[out=0,in=180] ++(1,.6) to[out=0,in=180] ++(1,-.6);
+\strand[blue] (0,1) to[out=0,in=180] ++(1,-.6) to[out=0,in=180] ++(1,.6);
+\end{knot}
+\begin{knot}[
+ flip crossing=2,
+ background clip/.append style={
+ preaction={
+ fill=gray,
+ fill opacity=.5,
+ }
+ }
+]
+\strand[red] (2.5,0) to[out=0,in=180] ++(1,.6) to[out=0,in=180] ++(1,-.6);
+\strand[blue] (2.5,1) to[out=0,in=180] ++(1,-.6) to[out=0,in=180] ++(1,.6);
+\end{knot}
+\end{tikzpicture}
+\end{example}
+
+
+\end{itemize}
+
+
\end{document}
% Local Variables:
% tex-output-type: "pdf18"
diff --git a/graphics/pgf/contrib/spath3/spath3.pdf b/graphics/pgf/contrib/spath3/spath3.pdf
index ebbefefa1a..9282e0adfe 100644
--- a/graphics/pgf/contrib/spath3/spath3.pdf
+++ b/graphics/pgf/contrib/spath3/spath3.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/spath3/spath3.tex b/graphics/pgf/contrib/spath3/spath3.tex
index 7621db4a28..c8e9d65af7 100644
--- a/graphics/pgf/contrib/spath3/spath3.tex
+++ b/graphics/pgf/contrib/spath3/spath3.tex
@@ -1,5 +1,5 @@
-%\RequirePackage{shellesc}
-%\immediate\write18{tex spath3_code.dtx}
+\RequirePackage{shellesc}
+\immediate\write18{tex spath3_code.dtx}
\documentclass{l3doc}
\usepackage{tikz}
\usetikzlibrary{
@@ -89,12 +89,62 @@ The best way is to open an issue at the code repository on github, at \href{http
\end{lstlisting}
The \texttt{spath3} TikZ library defines a set of keys that can be issued to muck about with soft paths.
-These are all defined in the \texttt{spath} family, so all the following keys should be prefixed by \texttt{spath/}, or the key \texttt{spath/.cd} needs to be used beforehand (but note that as yet I haven't implemented sending unknown keys back to the main \Verb+tikz+ directory).
+These are all defined in the |spath| family, so all the following keys should be prefixed by |spath/|, or the key |spath/.cd| needs to be used beforehand (but note that as yet I haven't implemented sending unknown keys back to the main |tikz| directory).
-The keys try to gracefully fail if the path doesn't exist or is empty.
+The keys try to gracefully fail if the path doesn't exist or is empty\footnote{A path that was defined inside a group will be empty if referred to outside that group rather than not existing.}.
The intention is that the document should still compile with a warning in the log file (and on the console output).
If this doesn't happen, please report it.
+\subsection{Path Names}
+
+Soft paths are stored in macros but are referred to via a name.
+The macro is constructed from the name, but there is scope for a prefix and suffix.
+By default, these are set up so to be compatible with the |intersections| library -- this package and that save their paths in the same underlying macro.
+Some packages that are built on top of this one (such as the |knot| and |penrose| packages) install their own prefixes and suffixes to avoid clashes.
+
+\begin{function}{
+ set prefix,
+ set suffix,
+ prefix,
+ suffix
+}
+\begin{syntax}
+|set prefix=|\marg{prefix}
+|set suffix=|\marg{suffix}
+|prefix=|\oarg{name}
+|suffix=|\oarg{name}
+|set name=|\oarg{name}
+\end{syntax}
+The first two keys set the prefix and suffix directly.
+The other keys allow for defining a label for a prefix and suffix for quick switching between different ones.
+The default (with key |default| or no key specified) is to match the |intersections| library.
+The |knots| library uses this to set a different prefix.
+\end{function}
+
+Using names rather than macros directly also makes it possible to link a soft path with a set of TikZ styles (this is particularly useful when splitting the path into components).
+
+\begin{variable}{current}
+\begin{syntax}
+|\path (0,0) -- (3,0) to[out=90, in=90] (1,0) [spath/adjust and close=current];|
+\end{syntax}
+
+There is a special path name, |current|, which refers to the current path being built.
+To be clear, the test for this name takes place before any prefix or suffix is applied so it depends only on what the user uses.
+
+When this name is encountered, the current path is copied into a macro and that path is used in the command.
+If the command is such that it is possible that the path is modified in some fashion then after the command is finished the old current path is replaced by the new one.
+There are several commands that take multiple paths and |current| can be used in place of any of the paths, but usually there is only one that is modified and so that is the only one that would be used to replace the old current path.
+
+It only makes sense to use it in a path-building context, and it refers to the path at the moment of invocation, so it doesn't do a lot in the main options on that path but it can be used in options later on in the process.
+
+Sometimes it isn't possible to put commands partway through a path (for example, if the path command is buried in another macro) so there is a key which can be used to delay things to the end of the construction:
+
+\begin{verbatim}
+at end path construction={code}
+\end{verbatim}
+%
+This invokes the |code| right after the path has finished being built.
+\end{variable}
\subsection{Saving and Using Soft Paths}
@@ -104,16 +154,14 @@ If this doesn't happen, please report it.
|save global=|\meta{name}
\end{syntax}
-Saves the current path with name \texttt{<name>}.
+Saves the current path with name \meta{name}.
This delays until the path is fully constructed so can be issued in the options to the main command.
Soft paths constructed this way are local to the group in which the path command is issued.
The |global| version saves the path globally which is useful when the original path is inside a scope or even another tikzpicture.
-The soft path is actually stored in a macro constructed from the name.
-There are a couple of reasons for using a \emph{name} rather than a macro directly.
-One is so that it is compatible with the \texttt{intersections} library -- by default both this package and that save their paths in the same underlying macro.
-The other is to provide a way to link a soft path with a set of TikZ styles (this is particularly useful when splitting the path into components).
+If wanting to save the border of a node then because there are extra levels of grouping, the global version of this key has to be used.
+
\end{function}
\begin{function}{clone, clone globally}
@@ -124,6 +172,22 @@ The other is to provide a way to link a soft path with a set of TikZ styles (thi
Clones one soft path into another.
In the second, the clone is global (the original need not be).
+
+By using |current| as the source name, the current soft path in its current state is copied.
+This can be used to get round the restriction whereby |save path| waits until the path is fully constructed before being saved.
+\end{function}
+
+\begin{function}{show, show current path}
+\begin{syntax}
+|show=|\meta{name}
+|show current path|
+\end{syntax}
+
+These keys display a path on the terminal and in the log file.
+They do a bit of sensible line formatting so that the paths are relatively easy to scan through.
+
+The key |show current path| delays the logging until the path is fully constructed.
+To get a view of what the path is at an intermediate stage of construction, use |show=current|.
\end{function}
\begin{function}{use}
@@ -145,20 +209,22 @@ The options is a comma separated list and can include:
\item |weld|, |no weld| determines whether to weld the inserted path to the current path.
Welding means that the |move to| at the start of the inserted path is removed.
Note that this doesn't \emph{move} the inserted path so this will usually modify the first segment of the inserted path, possibly in unexpected ways.
+The expected use is that when the |weld| key is used then the inserted path starts where the current path ends either because it already does or because the |move| key has also been invoked.
+But there's nothing \emph{stopping} anyone using this key in other circumstances.
\item |move|, |no move| determines whether the inserted path is translated so that it starts where the current path ends.
\item |transform=|\marg{transformations} applies the specified transformations to the inserted path.
-See the |transform| key in Section~\ref{sec:transform}
+See the |transform| key in Section~\ref{sec:transform}.
+\item |use current transformation| applies the current transformation to the inserted path.
+Note that because the keys are processed and then acted upon, this key is always applied \emph{before} the |transform| key.
\item Any other key is taken as the name of the path (so it doesn't have to be specified first) with the last one winning.
\end{itemize}
One thing should be noted about transformations.
By the time a soft path is built, all available transformations have been applied.
-This means that when re-inserting a soft path back into a high level command (such as |\draw|), the effect of existing transformations might produce some confusing effects.
-When restoring a path then the library tries to set up various internals of TikZ correctly, but there may be some things I've overlooked or not accounted for particularly with regard to existing transformations; if you spot anything working oddly then please report it to me.
-
-In particular, restoring a path should sets things right for positioning nodes along the path.
-Using the \Verb+pos=D+ key on a node positions that node at a particular point on the path.
+This means that when re-inserting a soft path back into a high level command (such as |\draw|), existing transformations should have no effect (other than those specified via the |transform| key).
+Where this gets a little tricky is with things like node placement -- using the \Verb+pos=D+ key on a node positions that node at a particular point on the path.
Exactly how the parameter is interpreted is the same as for the \Verb+spath+ coordinate system described in Section~\ref{sec:coordinates}.
+When restoring a path then the library tries to set up various internals of TikZ correctly, but there may be some things I've overlooked or not accounted for particularly with regard to existing transformations; if you spot anything working oddly then please report it to me.
\end{function}
\begin{function}{
@@ -183,6 +249,19 @@ The equivalences are:
\end{itemize}
\end{function}
+\begin{function}{join with}
+\begin{syntax}
+|join with=|\marg{path}\marg{path, options}
+\end{syntax}
+
+This joins the second path to the first, with applying the specified options.
+The options are the same as for the |use| key.
+The first path is modified, the second is not (the second path is copied before any modifications are applied).
+
+It is almost the case that |join with={current}{...}| is synonymous with |use={...}|.
+The difference is that |use={...}| applies an extra check to ensure that the resulting path is not empty.
+\end{function}
+
\begin{function}{to}
\begin{syntax}
|to=|\marg{name}
@@ -198,7 +277,7 @@ The path is transformed by rotation, translation, and uniform scaling so that it
\label{sec:transform}
The following keys all apply some sort of transformation to the soft path.
-They do not render the path, but simply adjust it.
+They do not render the path, but simply adjust it (but they can be used to modify the current path by invoking with the path name |current|).
The global versions apply their transformation globally, otherwise it is local to the current group (or scope).
\begin{function}{reverse, reverse global}
@@ -245,9 +324,6 @@ As with the \Verb+to+ path construction and the \Verb+splice+ method, this won't
\subsection{Intersection Routines}
To use these features you need to use the \texttt{intersections} library.
-Note that there is currently an issue with the intersections routine when trying to intersect two parallel (or near parallel) lines.
-One workaround is to replace one of the lines by a B\'ezier curve along the same path.
-The best such replacement is to put the control points at one third and two thirds between the start and end.
\begin{function}{
split at self intersections,
@@ -346,18 +422,27 @@ It applies the following styles (in this order):
\begin{function}{
insert gaps after components,
- insert gaps globally after components
+ insert gaps globally after components,
+ insert gaps after segments,
+ insert gaps globally after segments
}
\begin{syntax}
|insert gaps after components=|\marg{path}\marg{gap}\marg{components}
|insert gaps after components=|\marg{path}\marg{gap}
|insert gaps globally after components=|\marg{path}\marg{gap}\marg{components}
|insert gaps globally after components=|\marg{path}\marg{gap}
+|insert gaps after segments=|\marg{path}\marg{gap}\marg{segments}
+|insert gaps after segments=|\marg{path}\marg{gap}
+|insert gaps globally after segments=|\marg{path}\marg{gap}\marg{segments}
+|insert gaps globally after segments=|\marg{path}\marg{gap}
\end{syntax}
This inserts a gap between components of a path by shortening the end of the specified component and start of the next one.
The list of components is passed through a |\foreach| loop so that syntax like |2,4,...,16| can be used.
If the list of components is not given the gaps are inserted between all components.
+
+The \texttt{segments} versions work on the segments of the path rather than its components.
+A \emph{segment} is a minimal drawing piece, meaning a line or B\'ezier curve.
\end{function}
\begin{function}{
@@ -374,16 +459,20 @@ The list of components is processed by |\foreach|.
If the component is the first one then it is joined to the last component.
\end{function}
-\begin{function}{join components with, join components globally with, join components upright with, join components globally upright with}
+\begin{function}{join components with, join components globally with, join components upright with, join components globally upright with, join components with curve, join components globally with curve}
\begin{syntax}
|join components with=|\marg{path}\marg{splice path}
|join components with=|\marg{path}\marg{splice path}\marg{list}
|join components upright with=|\marg{path}\marg{splice path}
|join components upright with=|\marg{path}\marg{splice path}\marg{list}
+|join components with curve=|\marg{path}
+|join components with curve=|\marg{path}\marg{list}
|join components globally with=|\marg{path}\marg{splice path}
|join components globally with=|\marg{path}\marg{splice path}\marg{list}
|join components globally upright with=|\marg{path}\marg{splice path}
|join components globally upright with=|\marg{path}\marg{splice path}\marg{list}
+|join components globally with curve=|\marg{path}
+|join components globally with curve=|\marg{path}\marg{list}
\end{syntax}
This inserts the |splice path| in the gaps between components of |path| specified by a comma separated list.
@@ -396,6 +485,9 @@ This does \emph{not} close the resulting path, even if the last component is spe
Note that because there is an optional third argument to this key, the second argument must always be enclosed in braces unless it is a single token.
The |upright| versions do a little test to see if the gap is oriented upside-down and if so then they insert the reflection of the splice path.
+
+The |with curve| versions insert a single B\'ezier curve into the gap.
+The curve is chosen to match the tangents of the segments either side of the gap and uses John Hobby's construction of a B\'ezier curve from its tangent directions.
\end{function}
@@ -436,18 +528,36 @@ This removes the listed components of the path.
As with other list routines, the list is parsed via |foreach| first.
\end{function}
+\begin{function}{open, open globally}
+\begin{syntax}
+|open=|\marg{path}
+|open globally=|\marg{path}
+\end{syntax}
-\begin{function}{close, close globally, close with, close globally with}
+These open the path by removing all of the closing elements.
+If the closing elements add substantially to the path then they are replaced by a line segment.
+\end{function}
+
+
+\begin{function}{close, close globally, close with, close globally with, close with curve, close globally with curve, adjust and close, adjust and close globally}
\begin{syntax}
|close=|\marg{path}
|close globally=|\marg{path}
|close with=|\marg{path}\marg{splice path}
|close globally with=|\marg{path}\marg{splice path}
+|close with curve=|\marg{path}
+|close globally with curve=|\marg{path}
+|adjust and close=|\marg{path}
+|adjust and close globally=|\marg{path}
\end{syntax}
These all close the last component of the given path.
The first two will insert a line segment if the initial and final points of the component are not sufficiently close.
-The latter two allow you to specify another path to insert.
+The two |with| variants allow you to specify another path to insert between the end and start of the path.
+The two |with curve| variants insert a B\'ezier curve in the gap; the choice of curve depends on the tangents of the path segments being joined and uses John Hobby's B\'ezier curve construction (as used in the \texttt{hobby} TikZ library).
+The two |adjust| variants shift the end point of the path so that it is at the same place as the start of that component.
+If the last segment is a B\'ezier curve then the second control point is also shifted.
+(The intention with the |adjust| keys is where the start and end of the component are very close together so the adjustment creates a smaller visual effect than adding in a line -- see Example~\ref{ex:close}.)
\end{function}
\begin{function}{splice, splice global}
@@ -461,7 +571,7 @@ The middle path is transformed to fit (don't try this with a path whose starting
\end{function}
-\subsection{Shortening Paths}
+\subsection{Shortening and Splitting Paths}
\begin{function}{
shorten at end,
@@ -488,6 +598,42 @@ It uses the derivative at the end to work out how much to shorten by.
If wanting to shorten by a large amount it is better to shorten by a small amount a number of times.
\end{function}
+\begin{function}{
+ split at,
+ split globally at,
+ split at into,
+ split globally at into,
+ split at keep start,
+ split globally at keep start,
+ split at keep end,
+ split globally at keep end,
+ split at keep middle,
+ split globally at keep middle,
+}
+\begin{syntax}
+|split at=|\marg{path}\marg{parameter}
+|split globally at=|\marg{path}\marg{parameter}
+|split at into=|\marg{start path}\marg{end path}\marg{path}\marg{parameter}
+|split globally at into=|\marg{start path}\marg{end path}\marg{path}\marg{parameter}
+|split at keep start=|\marg{path}\marg{parameter}
+|split globally at keep start=|\marg{path}\marg{parameter}
+|split at keep end=|\marg{path}\marg{parameter}
+|split globally at keep end=|\marg{path}\marg{parameter}
+|split at keep middle=|\marg{path}\marg{parameter}\marg{parameter}
+|split globally at keep middle=|\marg{path}\marg{parameter}\marg{parameter}
+\end{syntax}
+
+These keys split a path at a point specified by a parameter.
+The interpretation of the parameter is described in Section~\ref{sec:coordinates}.
+
+The first two keys replace the path with the split path, so this introduces a break at the point specified by the parameter.
+The second two save the split path into a new path.
+
+The ones with \texttt{keep} in the name split a path and keep the designated piece (so throw away the rest).
+The ones that keep the middle need two parameters to specify the break points.
+
+\end{function}
+
\subsection{Exporting Paths}
There are two keys to export a path.
@@ -516,8 +662,8 @@ Saves the path to the file \texttt{path.svg} as an SVG document.
draft mode
}
\begin{syntax}
-|knot=|\meta{path}\meta{gap}\meta{components}
-|global knot=|\meta{path}\meta{gap}\meta{components}
+|knot=|\marg{path}\marg{gap}\marg{components}
+|global knot=|\marg{path}\marg{gap}\marg{components}
\end{syntax}
This style combines various of the above to make it simpler to draw knots and links.
@@ -679,6 +825,24 @@ The intention with the second key is that it is similar to what happens with the
\end{tikzpicture}
\end{example}
+\item Closing and adjusting paths.
+\label{ex:close}
+
+\begin{example}
+\begin{tikzpicture}
+\draw[line width=.2cm] (0,0) -- +(1,0) -- +(1,1) -- +(0,1) -- +(.01,.01);
+
+\draw[line width=.2cm] (2,0) -- +(1,0) -- +(1,1) -- +(0,1) -- +(.01,.01)
+-- cycle;
+
+\draw[line width=.2cm] (4,0) -- +(1,0) -- +(1,1) -- +(0,1) -- +(.01,.01)
+[spath/close=current];
+
+\draw[line width=.2cm] (6,0) -- +(1,0) -- +(1,1) -- +(0,1) -- +(.01,.01)
+[spath/adjust and close=current];
+\end{tikzpicture}
+\end{example}
+
\item Shortening.
\begin{example}
@@ -929,8 +1093,8 @@ sin ++(1.57,1);
}
% If used in the preamble, this needs surrounding in \AtBeginDocument
-%\AtBeginDocument{
-\tikz[overlay] \path[spath/save=arc] (0,0) arc[radius=1cm, start angle=180, delta angle=-180];
+%\AtBeginDocument{%
+\tikz[overlay] { \path[spath/save global=arc] (0,0) arc[radius=1cm, start angle=180, delta angle=-180]; }%
%}
\begin{tikzpicture}
\path[spath/save=over] (0,0) -| ++(1,1) -| ++(-1,1) -| ++(1,1) -| ++(-1,1);
@@ -941,5 +1105,8 @@ sin ++(1.57,1);
\end{tikzpicture}
\end{example}
+The command defining the arc does introduce a box which can introduce additional spacing.
+The syntax above, with the \% at the end of the lines, shouldn't add space but if for some reason it does then more sophisticated solutions to this are detailed at \href{https://tex.stackexchange.com/q/605800/86}{How to save or define a TikZ path for spath3 without introducing artifacts?}.
+
\end{enumerate}
\end{document}
diff --git a/graphics/pgf/contrib/spath3/spath3_code.dtx b/graphics/pgf/contrib/spath3/spath3_code.dtx
index afd132938c..031c0e7bd3 100644
--- a/graphics/pgf/contrib/spath3/spath3_code.dtx
+++ b/graphics/pgf/contrib/spath3/spath3_code.dtx
@@ -143,7 +143,7 @@ and the derived files spath3.ins,
%</driver>
% \fi
%
-% \CheckSum{8929}
+% \CheckSum{10189}
%
% \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
@@ -169,6 +169,8 @@ and the derived files spath3.ins,
% \changes{2.0}{2021/01/19}{Refactored the code to remove the OO approach and make it functional, introduced the spath3 TikZ library to provide a user interface.}
% \changes{2.2}{2021/02/05}{Bugfixes and improvements, mainly with regard to the intersection and splitting routines.}
% \changes{2.4}{2021/02/21}{Rejigged how the routines for using paths were implemented, added some more routines for joining paths.}
+% \changes{2.6}{2021/11/23}{Modified core routines to cope with a "true rectangle" path; added routines for splitting at a parametrised point.}
+% \changes{2.7}{2022/08/24}{Bug fixes}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
@@ -257,7 +259,7 @@ and the derived files spath3.ins,
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
\RequirePackage{pgf}
-\ProvidesExplPackage {spath3} {2021/02/21} {2.4} {Functions for
+\ProvidesExplPackage {spath3} {2022/08/24} {2.7} {Functions for
manipulating PGF soft paths}
\RequirePackage{xparse}
% \end{macrocode}
@@ -332,6 +334,9 @@ manipulating PGF soft paths}
\fp_new:N \l_@@_tmpa_fp
\fp_new:N \l_@@_tmpb_fp
\fp_new:N \l_@@_tmpc_fp
+\fp_new:N \l_@@_tmpd_fp
+\fp_new:N \l_@@_tmpe_fp
+\fp_new:N \l_@@_tmpf_fp
\int_new:N \l_@@_tmpa_int
\int_new:N \l_@@_tmpb_int
@@ -353,6 +358,23 @@ manipulating PGF soft paths}
\bool_new:N \l_@@_closed_bool
% \end{macrocode}
%
+% True rectangles are rare, but need special handling.
+% They are specified by two tokens, the first specifies the lower left corner which can be handled pretty much as other tokens but the second specifies the width and height meaning that it transforms differently.
+% So when encountering on, the coordinates of the lower left corner are useful to remember.
+%
+% \begin{macrocode}
+\dim_new:N \l_@@_rectx_dim
+\dim_new:N \l_@@_recty_dim
+
+\bool_new:N \l_@@_rect_bool
+% \end{macrocode}
+%
+% When restoring a path we need to know whether to update the stored moveto.
+%
+% \begin{macrocode}
+\bool_new:N \l_spath_movetorelevant_bool
+% \end{macrocode}
+%
% The intersection routine can't happen inside a group so we need two token lists to hold the paths that we'll intersect.
%
% \begin{macrocode}
@@ -369,6 +391,8 @@ manipulating PGF soft paths}
\tl_const:Nn \c_spath_curvetoa_tl {\pgfsyssoftpath@curvetosupportatoken}
\tl_const:Nn \c_spath_curvetob_tl {\pgfsyssoftpath@curvetosupportbtoken}
\tl_const:Nn \c_spath_closepath_tl {\pgfsyssoftpath@closepathtoken}
+\tl_const:Nn \c_spath_rectcorner_tl {\pgfsyssoftpath@rectcornertoken}
+\tl_const:Nn \c_spath_rectsize_tl {\pgfsyssoftpath@rectsizetoken}
% \end{macrocode}
%
% We will want to be able to use anonymous spaths internally, so we create a global counter that we can use to refer to them.
@@ -377,6 +401,27 @@ manipulating PGF soft paths}
\int_gzero:N \g_@@_anon_int
% \end{macrocode}
%
+% \begin{macro}[internal]{
+% \spath_anonymous:N,
+% \spath_ganonymous:N
+% }
+% Set the token list to the next anonymous name.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \spath_anonymous:N #1
+{
+ \tl_set:Nx #1 {anonymous_\int_use:N \g_@@_anon_int}
+ \int_gincr:N \g_@@_anon_int
+}
+\cs_new_protected_nopar:Npn \spath_ganonymous:N #1
+{
+ \tl_gset:Nx #1 {anonymous_\int_use:N \g_@@_anon_int}
+ \int_gincr:N \g_@@_anon_int
+}
+\cs_generate_variant:Nn \spath_anonymous:N {c}
+\cs_generate_variant:Nn \spath_ganonymous:N {c}
+% \end{macrocode}
+% \end{macro}
+%
% And some error messages
% \begin{macrocode}
\msg_new:nnn { spath3 } { unknown path construction }
@@ -482,6 +527,27 @@ manipulating PGF soft paths}
}
+ \c_spath_rectcorner_tl
+ {
+ \tl_set_eq:NN \l_@@_tmpb_tl \c_spath_rectcorner_tl
+
+ \tl_put_right:Nx \l_@@_tmpb_tl {{\tl_head:N \l_@@_tmpa_tl}}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_put_right:Nx \l_@@_tmpb_tl {{\tl_head:N \l_@@_tmpa_tl}}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_put_right:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_put_right:Nx \l_@@_tmpb_tl {{\tl_head:N \l_@@_tmpa_tl}}
+ \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_put_right:Nx \l_@@_tmpb_tl {{\tl_head:N \l_@@_tmpa_tl}}
+ \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ }
+
\c_spath_closepath_tl
{
\tl_set_eq:NN \l_@@_tmpb_tl \c_spath_moveto_tl
@@ -559,9 +625,11 @@ manipulating PGF soft paths}
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
\seq_clear:N \l_@@_tmpa_seq
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
\tl_put_right:NV \l_@@_tmpa_tl \c_spath_moveto_tl
- \tl_set_eq:NN \l_@@_tmpb_tl \c_spath_moveto_tl
+
\bool_do_until:nn {
\tl_if_empty_p:N \l_@@_tmpa_tl
}
@@ -572,6 +640,11 @@ manipulating PGF soft paths}
\seq_put_right:NV \l_@@_tmpa_seq \l_@@_tmpb_tl
\tl_clear:N \l_@@_tmpb_tl
}
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \seq_put_right:NV \l_@@_tmpa_seq \l_@@_tmpb_tl
+ \tl_clear:N \l_@@_tmpb_tl
+ }
\tl_if_single:NTF \l_@@_tmpc_tl
{
\tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpc_tl
@@ -637,7 +710,7 @@ manipulating PGF soft paths}
% \spath_reallength:Nn,
% \spath_greallength:Nn
% }
-% The real length of a path is the number of triples that actually draw something (that is, the number of lines, curves, and closepaths).
+% The real length of a path is the number of triples that actually draw something (that is, the number of lines, curves, rectangles, and closepaths).
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_reallength:n #1
{
@@ -650,6 +723,7 @@ manipulating PGF soft paths}
\c_spath_lineto_tl {}
\c_spath_curveto_tl {}
\c_spath_closepath_tl {}
+ \c_spath_rectsize_tl {}
}
{
\int_incr:N \l_@@_tmpa_int
@@ -695,6 +769,10 @@ manipulating PGF soft paths}
{
\int_incr:N \l_@@_tmpa_int
}
+ \c_spath_rectcorner_tl
+ {
+ \int_incr:N \l_@@_tmpa_int
+ }
}
}
\int_gzero:N \g_@@_output_int
@@ -765,10 +843,35 @@ manipulating PGF soft paths}
\tl_set:Nn \l_@@_tmpa_tl {#1}
\tl_reverse:N \l_@@_tmpa_tl
\tl_clear:N \l_@@_tmpb_tl
- \tl_set:Nx \l_@@_tmpb_tl
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_item:Nn \l_@@_tmpa_tl {3}}
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectsize_tl
+ {
+ \tl_set:Nx \l_@@_tmpb_tl
+ {
+ {
+ \dim_eval:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ +
+ \tl_item:Nn \l_@@_tmpa_tl {5}
+ }
+ }
+ {
+ \dim_eval:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ +
+ \tl_item:Nn \l_@@_tmpa_tl {4}
+ }
+ }
+ }
+ }
{
- { \tl_item:Nn \l_@@_tmpa_tl {2} }
- { \tl_item:Nn \l_@@_tmpa_tl {1} }
+ \tl_set:Nx \l_@@_tmpb_tl
+ {
+ { \tl_item:Nn \l_@@_tmpa_tl {2} }
+ { \tl_item:Nn \l_@@_tmpa_tl {1} }
+ }
}
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
\group_end:
@@ -817,6 +920,16 @@ manipulating PGF soft paths}
{ \tl_item:Nn \l_@@_tmpa_tl {3} }
}
}
+
+ \c_spath_rectcorner_tl
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ { \tl_item:Nn \l_@@_tmpa_tl {2} }
+ { \tl_item:Nn \l_@@_tmpa_tl {3} }
+ }
+ }
+
}
\prg_replicate:nn {3}
{
@@ -844,119 +957,404 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
-% \spath_reverse:Nn,
-% \spath_greverse:Nn
+% \spath_initialtangent:Nn,
+% \spath_ginitialtangent:Nn
% }
-% This computes the reverse of the path.
+% The starting tangent of the path.
% \begin{macrocode}
-\cs_new_protected_nopar:Npn \@@_reverse:n #1
+\cs_new_protected_nopar:Npn \@@_initialtangent:n #1
+{
+ \group_begin:
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_item:nn {#1} {4}}
+ \tl_if_eq:NNTF \l_@@_tmpb_tl \c_spath_curvetoa_tl
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {3}
+ }
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {1}
+ }
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_set:Nx \l_@@_tmpa_tl
+ {
+ {
+ \fp_to_dim:n {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:nn {#1} {5}
+ -
+ \tl_item:nn {#1} {2}
+ )
+ }
+ }
+ {
+ \fp_to_dim:n {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:nn {#1} {6}
+ -
+ \tl_item:nn {#1} {3}
+ )
+ }
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_initialtangent:Nn #1#2
+{
+ \@@_initialtangent:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_initialtangent:Nn {NV, cn, cV, Nv}
+\cs_new_protected_nopar:Npn \spath_ginitialtangent:Nn #1#2
+{
+ \@@_initialtangent:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_ginitialtangent:Nn {NV, cn, cV, Nv}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \spath_finaltangent:Nn,
+% \spath_gfinaltangent:Nn,
+% }
+% The final tangent of the path.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_finaltangent:n #1
{
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
-
+ \tl_reverse:N \l_@@_tmpa_tl
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_item:nn {#1} {6}}
+ \tl_if_eq:NNTF \l_@@_tmpb_tl \c_spath_curveto_tl
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {3}
+ }
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {1}
+ }
\tl_clear:N \l_@@_tmpb_tl
- \tl_clear:N \l_@@_tmpd_tl
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
-
- \tl_put_left:Nx \l_@@_tmpd_tl
+ \tl_set:Nx \l_@@_tmpb_tl
{
- {\dim_use:N \l_@@_tmpa_dim}
- {\dim_use:N \l_@@_tmpb_dim}
+ {
+ \fp_to_dim:n {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ -
+ \tl_item:Nn \l_@@_tmpa_tl {5}
+ )
+ }
+ }
+ {
+ \fp_to_dim:n {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ -
+ \tl_item:Nn \l_@@_tmpa_tl {4}
+ )
+ }
+ }
}
-
- \bool_set_false:N \l_@@_closed_bool
-
- \bool_until_do:nn {
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_finaltangent:Nn #1#2
+{
+ \@@_finaltangent:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_finaltangent:Nn {NV, cn, cV, Nv}
+\cs_new_protected_nopar:Npn \spath_gfinaltangent:Nn #1#2
+{
+ \@@_finaltangent:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gfinaltangent:Nn {NV, cn, cV, Nv}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}[internal]{
+% \spath_finalmovetangent:Nn,
+% \spath_gfinalmovetangent:Nn
+% }
+% Get the last move on the path.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_finalmovetangent:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpc_tl { {0pt} {0pt} }
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \bool_do_until:nn
+ {
\tl_if_empty_p:N \l_@@_tmpa_tl
}
{
- \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
-
- \tl_case:NnTF \l_@@_tmpc_tl
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl}
+ \tl_case:Nn \l_@@_tmpb_tl
{
- \c_spath_moveto_tl {
-
- \bool_if:NT \l_@@_closed_bool
+ \c_spath_moveto_tl
+ {
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:Nn \l_@@_tmpa_tl {4} }
+ \tl_if_eq:NNTF \l_@@_tmpd_tl \c_spath_curveto_tl
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {3}
+ }
+ {
+ \fp_set:Nn \l_@@_tmpa_fp {1}
+ }
+ \tl_set:Nx \l_@@_tmpc_tl
{
- \tl_put_right:NV \l_@@_tmpd_tl \c_spath_closepath_tl
- \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpd_tl}
- \tl_put_right:Nx \l_@@_tmpd_tl
{
- { \tl_head:N \l_@@_tmpd_tl }
- { \tl_head:N \l_@@_tmpe_tl }
+ \fp_to_dim:n
+ {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:Nn \l_@@_tmpa_tl {5}
+ -
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ )
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ \l_@@_tmpa_fp
+ *
+ (
+ \tl_item:Nn \l_@@_tmpa_tl {6}
+ -
+ \tl_item:Nn \l_@@_tmpa_tl {3}
+ )
+ }
}
}
- \bool_set_false:N \l_@@_closed_bool
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_moveto_tl
- \tl_put_left:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
- \tl_clear:N \l_@@_tmpd_tl
- }
- \c_spath_lineto_tl {
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_lineto_tl
- }
- \c_spath_curveto_tl {
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curvetoa_tl
- }
- \c_spath_curvetoa_tl {
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curveto_tl
- }
- \c_spath_curvetob_tl {
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curvetob_tl
}
}
+ \prg_replicate:nn {3}
{
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpc_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_finalmovetangent:Nn #1#2
+{
+ \@@_finalmovetangent:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_finalmovetangent:Nn {NV, cn, cV}
+\cs_new_protected_nopar:Npn \spath_gfinalmovetangent:Nn #1#2
+{
+ \@@_finalmovetangent:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gfinalmovetangent:Nn {NV, cn, cV}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \spath_reverse:Nn,
+% \spath_greverse:Nn
+% }
+% This computes the reverse of the path.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_reverse:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
- \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_clear:N \l_@@_tmpb_tl
+ \tl_clear:N \l_@@_tmpd_tl
+
+ \bool_set_false:N \l_@@_rect_bool
+
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
+ \bool_while_do:nn {
+ \tl_if_eq_p:NN \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ }
+ {
+ \tl_put_left:Nx \l_@@_tmpd_tl
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ {\tl_item:Nn \l_@@_tmpa_tl {2}}
+ {\tl_item:Nn \l_@@_tmpa_tl {3}}
+ \tl_item:Nn \l_@@_tmpa_tl {4}
+ {\tl_item:Nn \l_@@_tmpa_tl {5}}
+ {\tl_item:Nn \l_@@_tmpa_tl {6}}
+ }
+ \prg_replicate:nn {6}
+ {
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
+ \bool_set_true:N \l_@@_rect_bool
+ }
- \tl_put_left:Nx \l_@@_tmpd_tl
- {
- {\dim_use:N \l_@@_tmpa_dim}
- {\dim_use:N \l_@@_tmpb_dim}
- }
+ \tl_if_empty:NF \l_@@_tmpa_tl
+ {
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_put_left:Nx \l_@@_tmpd_tl
+ {
+ {\dim_use:N \l_@@_tmpa_dim}
+ {\dim_use:N \l_@@_tmpb_dim}
+ }
+
+ \bool_set_false:N \l_@@_closed_bool
+ \bool_until_do:nn {
+ \tl_if_empty_p:N \l_@@_tmpa_tl
}
{
- \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_closepath_tl
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
+ \bool_set_false:N \l_@@_rect_bool
+
+ \tl_case:NnTF \l_@@_tmpc_tl
{
- \bool_set_true:N \l_@@_closed_bool
+ \c_spath_moveto_tl {
+
+ \bool_if:NT \l_@@_closed_bool
+ {
+ \tl_put_right:NV \l_@@_tmpd_tl \c_spath_closepath_tl
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpd_tl}
+ \tl_put_right:Nx \l_@@_tmpd_tl
+ {
+ { \tl_head:N \l_@@_tmpd_tl }
+ { \tl_head:N \l_@@_tmpe_tl }
+ }
+ }
+ \bool_set_false:N \l_@@_closed_bool
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_moveto_tl
+ \tl_put_left:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \tl_clear:N \l_@@_tmpd_tl
+ }
+ \c_spath_rectcorner_tl {
+
+ \bool_if:NT \l_@@_closed_bool
+ {
+ \tl_put_right:NV \l_@@_tmpd_tl \c_spath_closepath_tl
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpd_tl}
+ \tl_put_right:Nx \l_@@_tmpd_tl
+ {
+ { \tl_head:N \l_@@_tmpd_tl }
+ { \tl_head:N \l_@@_tmpe_tl }
+ }
+ }
+ \bool_set_false:N \l_@@_closed_bool
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_moveto_tl
+ \tl_put_left:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \tl_clear:N \l_@@_tmpd_tl
+
+ \bool_while_do:nn {
+ \tl_if_eq_p:NN \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ }
+ {
+ \tl_put_left:Nx \l_@@_tmpb_tl
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ {\tl_item:Nn \l_@@_tmpa_tl {2}}
+ {\tl_item:Nn \l_@@_tmpa_tl {3}}
+ \tl_item:Nn \l_@@_tmpa_tl {4}
+ {\tl_item:Nn \l_@@_tmpa_tl {5}}
+ {\tl_item:Nn \l_@@_tmpa_tl {6}}
+ }
+ \prg_replicate:nn {6}
+ {
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
+ }
+ \bool_set_true:N \l_@@_rect_bool
+
+ }
+ \c_spath_lineto_tl {
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_lineto_tl
+ }
+ \c_spath_curveto_tl {
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curvetoa_tl
+ }
+ \c_spath_curvetoa_tl {
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curveto_tl
+ }
+ \c_spath_curvetob_tl {
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_curvetob_tl
+ }
}
{
- \msg_warning:nnx
- { spath3 }
- { unknown path construction }
- {\l_@@_tmpc_tl }
+ \tl_if_empty:NF \l_@@_tmpa_tl
+ {
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_put_left:Nx \l_@@_tmpd_tl
+ {
+ {\dim_use:N \l_@@_tmpa_dim}
+ {\dim_use:N \l_@@_tmpb_dim}
+ }
+ }
}
+ {
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_closepath_tl
+ {
+ \bool_set_true:N \l_@@_closed_bool
+ }
+ {
+ \msg_warning:nnx
+ { spath3 }
+ { unknown path construction }
+ { \l_@@_tmpc_tl }
+ }
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ }
+ }
+ \bool_if:NT \l_@@_closed_bool
+ {
+ \tl_put_right:NV \l_@@_tmpd_tl \c_spath_closepath_tl
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpd_tl}
+ \tl_put_right:Nx \l_@@_tmpd_tl
+ {
+ { \tl_head:N \l_@@_tmpd_tl }
+ { \tl_head:N \l_@@_tmpe_tl }
+ }
}
- }
- \bool_if:NT \l_@@_closed_bool
- {
- \tl_put_right:NV \l_@@_tmpd_tl \c_spath_closepath_tl
- \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpd_tl}
- \tl_put_right:Nx \l_@@_tmpd_tl
+ \bool_set_false:N \l_@@_closed_bool
+ \bool_if:NF \l_@@_rect_bool
{
- { \tl_head:N \l_@@_tmpd_tl }
- { \tl_head:N \l_@@_tmpe_tl }
+ \tl_put_left:NV \l_@@_tmpd_tl \c_spath_moveto_tl
}
}
-
- \bool_set_false:N \l_@@_closed_bool
- \tl_put_left:NV \l_@@_tmpd_tl \c_spath_moveto_tl
+
\tl_put_left:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
-
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
\group_end:
}
@@ -997,14 +1395,21 @@ manipulating PGF soft paths}
{
\group_begin:
\tl_clear:N \l_@@_tmpa_tl
- \int_compare:nT
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_head:n {#1}}
+ \tl_if_eq:NNTF \l_@@_tmpb_tl \c_spath_rectcorner_tl
{
- \tl_count:n {#1} > 3
+ \tl_set_eq:NN \l_@@_tmpa_tl \c_spath_rectcorner_tl
}
{
- \tl_set:Nx \l_@@_tmpa_tl
+ \int_compare:nT
{
- \tl_item:Nn {#1} {4}
+ \tl_count:n {#1} > 3
+ }
+ {
+ \tl_set:Nx \l_@@_tmpa_tl
+ {
+ \tl_item:Nn {#1} {4}
+ }
}
}
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
@@ -1052,6 +1457,10 @@ manipulating PGF soft paths}
{
\tl_set_eq:NN \l_@@_tmpb_tl \c_spath_curveto_tl
}
+ \tl_if_eq:NNT \l_@@_tmpb_tl \c_spath_rectsize_tl
+ {
+ \tl_set_eq:NN \l_@@_tmpb_tl \c_spath_rectcorner_tl
+ }
}
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
\group_end:
@@ -1083,22 +1492,60 @@ manipulating PGF soft paths}
{
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
+
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
\dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
\dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set_eq:NN \l_@@_rectx_dim \l_@@_tmpa_dim
+ \dim_set_eq:NN \l_@@_recty_dim \l_@@_tmpb_dim
+ }
\bool_until_do:nn {
\tl_if_empty_p:N \l_@@_tmpa_tl
}
{
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpa_dim
- {\dim_min:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpa_dim}}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpb_dim
- {\dim_min:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpb_dim}}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectsize_tl
+ {
+ \dim_set:Nn \l_@@_tmpa_dim
+ {\dim_min:nn
+ {\tl_head:N \l_@@_tmpa_tl + \l_@@_rectx_dim} {\l_@@_tmpa_dim}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \dim_set:Nn \l_@@_tmpb_dim
+ {\dim_min:nn
+ {\tl_head:N \l_@@_tmpa_tl + \l_@@_recty_dim} {\l_@@_tmpb_dim}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ {
+ \dim_set:Nn \l_@@_tmpa_dim
+ {\dim_min:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpa_dim}}
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set:Nn \l_@@_rectx_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \dim_set:Nn \l_@@_tmpb_dim
+ {\dim_min:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpb_dim}}
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set:Nn \l_@@_recty_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+
}
\tl_clear:N \l_@@_tmpb_tl
\tl_put_right:Nx \l_@@_tmpb_tl
@@ -1136,25 +1583,63 @@ manipulating PGF soft paths}
{
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
+
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
\dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
\dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set_eq:NN \l_@@_rectx_dim \l_@@_tmpa_dim
+ \dim_set_eq:NN \l_@@_recty_dim \l_@@_tmpb_dim
+ }
\bool_until_do:nn {
\tl_if_empty_p:N \l_@@_tmpa_tl
}
{
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpa_dim
- {\dim_max:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpa_dim}}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpb_dim
- {\dim_max:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpb_dim}}
- \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectsize_tl
+ {
+ \dim_set:Nn \l_@@_tmpa_dim
+ {\dim_max:nn
+ {\tl_head:N \l_@@_tmpa_tl + \l_@@_rectx_dim} {\l_@@_tmpa_dim}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \dim_set:Nn \l_@@_tmpb_dim
+ {\dim_max:nn
+ {\tl_head:N \l_@@_tmpa_tl + \l_@@_recty_dim} {\l_@@_tmpb_dim}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+ {
+ \dim_set:Nn \l_@@_tmpa_dim
+ {\dim_max:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpa_dim}}
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set:Nn \l_@@_rectx_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+
+ \dim_set:Nn \l_@@_tmpb_dim
+ {\dim_max:nn {\tl_head:N \l_@@_tmpa_tl} {\l_@@_tmpb_dim}}
+ \tl_if_eq:NNT \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+ \dim_set:Nn \l_@@_recty_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ }
+
}
\tl_clear:N \l_@@_tmpb_tl
- \tl_put_right:Nx \l_@@_tmpb_tl
+ \tl_set:Nx \l_@@_tmpb_tl
{
{\dim_use:N \l_@@_tmpa_dim}
{\dim_use:N \l_@@_tmpb_dim}
@@ -1194,7 +1679,7 @@ manipulating PGF soft paths}
\tl_clear:N \l_@@_tmpa_tl
\tl_put_right:Nn \l_@@_tmpa_tl {
\ExplSyntaxOn
- \tl_clear:N #1
+ \tl_clear_new:N #1
\tl_set:Nn #1 {#2}
\ExplSyntaxOff
}
@@ -1212,6 +1697,7 @@ manipulating PGF soft paths}
\spath_save_to_aux:NV #1#1
}
}
+\cs_generate_variant:Nn \spath_save_to_aux:N {c}
% \end{macrocode}
% \end{macro}
%
@@ -1241,13 +1727,27 @@ manipulating PGF soft paths}
\tl_if_empty_p:N \l_@@_tmpa_tl
}
{
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
+
\tl_put_right:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
-
- \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl + #2}
+
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectsize_tl
+ {
+ \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ {
+ \dim_set:Nn \l_@@_tmpa_dim {\tl_head:N \l_@@_tmpa_tl + #2}
+ }
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
- \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl + #3}
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectsize_tl
+ {
+ \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl}
+ }
+ {
+ \dim_set:Nn \l_@@_tmpb_dim {\tl_head:N \l_@@_tmpa_tl + #3}
+ }
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
\tl_put_right:Nx \l_@@_tmpb_tl
@@ -1470,17 +1970,29 @@ manipulating PGF soft paths}
\tl_if_empty_p:N \l_@@_tmpa_tl
}
{
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_head:N \l_@@_tmpa_tl}
+
\tl_put_right:Nx \l_@@_tmpb_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpd_tl {\tl_head:N \l_@@_tmpa_tl}
\tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
-
- \fp_set:Nn \l_@@_tmpa_fp
- {\l_@@_tmpc_tl * #2 + \l_@@_tmpd_tl * #4 + #6}
- \fp_set:Nn \l_@@_tmpb_fp
- {\l_@@_tmpc_tl * #3 + \l_@@_tmpd_tl * #5 + #7}
+
+ \tl_if_eq:NNTF \l_@@_tmpe_tl \c_spath_rectsize_tl
+ {
+ \fp_set:Nn \l_@@_tmpa_fp
+ {\l_@@_tmpc_tl * #2 + \l_@@_tmpd_tl * #4}
+ \fp_set:Nn \l_@@_tmpb_fp
+ {\l_@@_tmpc_tl * #3 + \l_@@_tmpd_tl * #5}
+ }
+ {
+ \fp_set:Nn \l_@@_tmpa_fp
+ {\l_@@_tmpc_tl * #2 + \l_@@_tmpd_tl * #4 + #6}
+ \fp_set:Nn \l_@@_tmpb_fp
+ {\l_@@_tmpc_tl * #3 + \l_@@_tmpd_tl * #5 + #7}
+ }
+
\tl_put_right:Nx \l_@@_tmpb_tl
{
{\fp_to_dim:N \l_@@_tmpa_fp}
@@ -1738,8 +2250,8 @@ manipulating PGF soft paths}
\cs_new_protected_nopar:Npn \@@_splice_between:nnn #1#2#3
{
\group_begin:
- \spath_finalpoint:NV \l_@@_tmpd_tl {#1}
- \spath_initialpoint:NV \l_@@_tmpe_tl {#3}
+ \spath_finalpoint:Nn \l_@@_tmpd_tl {#1}
+ \spath_initialpoint:Nn \l_@@_tmpe_tl {#3}
\spath_span:NnVV \l_@@_tmpb_tl {#2} \l_@@_tmpd_tl \l_@@_tmpe_tl
\spath_append_no_move:NnV \l_@@_tmpa_tl {#1} \l_@@_tmpb_tl
\spath_append_no_move:Nn \l_@@_tmpa_tl {#3}
@@ -1774,6 +2286,340 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
+% \spath_hobby_curve:Nnnnn
+% }
+% Construct the curve from Hobby's algorithm given the start, end, and tangent directions.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_hobby_curve:nnnn #1#2#3#4
+{
+ \group_begin:
+% \end{macrocode}
+% First tangent vector projected onto vector between endpoints
+%
+% Something a bit weird here as the components are opposite to how I thought they should be ...
+% \begin{macrocode}
+ \fp_set:Nn \l_@@_tmpa_fp
+ {
+ (
+ (\tl_item:nn {#2} {1})
+ *
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})
+ +
+ (\tl_item:nn {#2} {2})
+ *
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})
+ )
+ /
+ sqrt
+ (
+ (
+ (\tl_item:nn {#2} {1})^2
+ +
+ (\tl_item:nn {#2} {2})^2
+ )
+ *
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ )
+ }
+ \fp_set:Nn \l_@@_tmpb_fp
+ {
+ (
+ -
+ (\tl_item:nn {#2} {1})
+ *
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})
+ +
+ (\tl_item:nn {#2} {2})
+ *
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})
+ )
+ /
+ sqrt
+ (
+ (
+ (\tl_item:nn {#2} {1})^2
+ +
+ (\tl_item:nn {#2} {2})^2
+ )
+ *
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ )
+ }
+% \end{macrocode}
+% Second tangent vector projected onto vector between endpoints
+% \begin{macrocode}
+ \fp_set:Nn \l_@@_tmpc_fp
+ {
+ (
+ (\tl_item:nn {#3} {1})
+ *
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})
+ +
+ (\tl_item:nn {#3} {2})
+ *
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})
+ )
+ /
+ sqrt
+ (
+ (
+ (\tl_item:nn {#3} {1})^2
+ +
+ (\tl_item:nn {#3} {2})^2
+ )
+ *
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ )
+ }
+ \fp_set:Nn \l_@@_tmpd_fp
+ {
+ (
+ (\tl_item:nn {#3} {1})
+ *
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})
+ -
+ (\tl_item:nn {#3} {2})
+ *
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})
+ )
+ /
+ sqrt
+ (
+ (
+ (\tl_item:nn {#3} {1})^2
+ +
+ (\tl_item:nn {#3} {2})^2
+ )
+ *
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ )
+ }
+
+ \fp_set:Nn \l_@@_tmpe_fp
+ {
+ (
+ 2 + sqrt(2) *
+ (\l_@@_tmpb_fp - 1/16 * \l_@@_tmpd_fp)
+ *
+ (\l_@@_tmpd_fp - 1/16 * \l_@@_tmpb_fp)
+ *
+ (\l_@@_tmpa_fp - \l_@@_tmpc_fp)
+ )
+ /
+ (
+ 1
+ +
+ (1 - (3 - sqrt(5))/2)
+ *
+ \l_@@_tmpa_fp
+ +
+ (3 - sqrt(5))/2
+ *
+ \l_@@_tmpc_fp
+ )
+ *
+ sqrt
+ (
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ /
+ (
+ (\tl_item:nn {#2} {1})^2
+ +
+ (\tl_item:nn {#2} {2})^2
+ )
+ )
+ /3
+ }
+ \fp_set:Nn \l_@@_tmpf_fp
+ {
+ (
+ 2 - sqrt(2) *
+ (\l_@@_tmpb_fp - 1/16 * \l_@@_tmpd_fp)
+ *
+ (\l_@@_tmpd_fp - 1/16 * \l_@@_tmpb_fp)
+ *
+ (\l_@@_tmpa_fp - \l_@@_tmpc_fp)
+ )
+ /
+ (
+ 1
+ +
+ (1 - (3 - sqrt(5))/2)
+ *
+ \l_@@_tmpc_fp
+ +
+ (3 - sqrt(5))/2
+ *
+ \l_@@_tmpa_fp
+ )
+ *
+ sqrt
+ (
+ (
+ (\tl_item:nn {#4} {1} - \tl_item:nn {#1} {1})^2
+ +
+ (\tl_item:nn {#4} {2} - \tl_item:nn {#1} {2})^2
+ )
+ /
+ (
+ (\tl_item:nn {#3} {1})^2
+ +
+ (\tl_item:nn {#3} {2})^2
+ )
+ )
+ /3
+ }
+
+ \tl_set:Nx \l_@@_tmpa_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ \tl_item:nn {#1} {1}
+ +
+ \l_@@_tmpe_fp
+ *
+ (\tl_item:nn {#2} {1})
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ \tl_item:nn {#1} {2}
+ +
+ \l_@@_tmpe_fp
+ *
+ (\tl_item:nn {#2} {2})
+ }
+ }
+ }
+ \tl_set:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n
+ {
+ \tl_item:nn {#4} {1}
+ -
+ \l_@@_tmpf_fp
+ *
+ (\tl_item:nn {#3} {1})
+ }
+ }
+ {
+ \fp_to_dim:n
+ {
+ \tl_item:nn {#4} {2}
+ -
+ \l_@@_tmpf_fp
+ *
+ (\tl_item:nn {#3} {2})
+ }
+ }
+ }
+
+ \tl_clear:N \l_@@_tmpc_tl
+ \tl_set:NV \l_@@_tmpc_tl \c_spath_moveto_tl
+ \tl_put_right:Nn \l_@@_tmpc_tl {#1}
+ \tl_put_right:NV \l_@@_tmpc_tl \c_spath_curvetoa_tl
+ \tl_put_right:NV \l_@@_tmpc_tl \l_@@_tmpa_tl
+ \tl_put_right:NV \l_@@_tmpc_tl \c_spath_curvetob_tl
+ \tl_put_right:NV \l_@@_tmpc_tl \l_@@_tmpb_tl
+ \tl_put_right:NV \l_@@_tmpc_tl \c_spath_curveto_tl
+ \tl_put_right:Nn \l_@@_tmpc_tl {#4}
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpc_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_hobby_curve:Nnnnn #1#2#3#4#5
+{
+ \@@_hobby_curve:nnnn {#2}{#3}{#4}{#5}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_hobby_curve:Nnnnn {NVVVV}
+\cs_new_protected_nopar:Npn \spath_ghobby_curve:Nnnnn #1#2#3#4#5
+{
+ \@@_hobby_curve:nnnn {#2}{#3}{#4}{#5}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_ghobby_curve:Nnnnn {NVVVV}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}[internal]{
+% \spath_curve_between:Nnn,
+% \spath_curve_between:Nn,
+% \spath_gcurve_between:Nnn,
+% \spath_gcurve_between:Nn
+% }
+% This takes two paths and returns a single path formed by joining the two paths by a curve.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_curve_between:nn #1#2
+{
+ \group_begin:
+ \spath_finalpoint:Nn \l_@@_tmpa_tl {#1}
+ \spath_finaltangent:Nn \l_@@_tmpb_tl {#1}
+ \spath_initialpoint:Nn \l_@@_tmpc_tl {#2}
+ \spath_initialtangent:Nn \l_@@_tmpd_tl {#2}
+
+ \spath_hobby_curve:NVVVV \l_@@_tmpe_tl
+ \l_@@_tmpa_tl \l_@@_tmpb_tl \l_@@_tmpd_tl \l_@@_tmpc_tl
+
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \spath_append_no_move:NV \l_@@_tmpa_tl \l_@@_tmpe_tl
+ \spath_append_no_move:Nn \l_@@_tmpa_tl {#2}
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_curve_between:Nnn #1#2#3
+{
+ \@@_curve_between:nn {#2}{#3}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_curve_between:Nnn {NVn, NVV}
+\cs_new_protected_nopar:Npn \spath_curve_between:Nn #1#2
+{
+ \spath_curve_between:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_curve_between:Nn {NV, cn, cv}
+\cs_new_protected_nopar:Npn \spath_gcurve_between:Nnn #1#2#3
+{
+ \@@_curve_between:nn {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gcurve_between:Nnn {NVn, NVV}
+\cs_new_protected_nopar:Npn \spath_gcurve_between:Nn #1#2
+{
+ \spath_gcurve_between:NVnn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_gcurve_between:Nn {NV, cn, cv}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
% \spath_close_with:Nn,
% \spath_gclose_with:Nn
% }
@@ -1839,6 +2685,77 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
+% \spath_close_with_curve:N,
+% \spath_gclose_with_curve:N
+% }
+% Closes the path with a curve.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_close_with_curve:n #1
+{
+ \group_begin:
+ \spath_finalpoint:Nn \l_@@_tmpa_tl {#1}
+ \spath_finaltangent:Nn \l_@@_tmpb_tl {#1}
+ \spath_finalmovepoint:Nn \l_@@_tmpc_tl {#1}
+ \spath_finalmovetangent:Nn \l_@@_tmpd_tl {#1}
+ \dim_compare:nTF
+ {
+ \dim_abs:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ -
+ \tl_item:Nn \l_@@_tmpc_tl {1}
+ }
+ +
+ \dim_abs:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ -
+ \tl_item:Nn \l_@@_tmpc_tl {2}
+ }
+ < 0.01pt
+ }
+ {
+ \@@_close:n {#1}
+ }
+ {
+
+ \spath_hobby_curve:NVVVV \l_@@_tmpe_tl
+ \l_@@_tmpa_tl \l_@@_tmpb_tl \l_@@_tmpd_tl \l_@@_tmpc_tl
+
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \spath_append_no_move:NV \l_@@_tmpa_tl \l_@@_tmpe_tl
+ \@@_close:V \l_@@_tmpa_tl
+ }
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_close_with_curve:Nn #1#2
+{
+ \@@_close_with_curve:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_close_with_curve:Nn {cn, cV, cv, NV}
+\cs_new_protected_nopar:Npn \spath_close_with_curve:N #1
+{
+ \spath_close_with_curve:NV #1#1
+}
+\cs_generate_variant:Nn \spath_close_with_curve:N {c}
+\cs_new_protected_nopar:Npn \spath_gclose_with_curve:Nn #1#2
+{
+ \@@_close_with_curve:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gclose_with_curve:Nn {cn, cV, cv, NV}
+\cs_new_protected_nopar:Npn \spath_gclose_with_curve:N #1
+{
+ \spath_gclose_with_curve:NV #1#1
+}
+\cs_generate_variant:Nn \spath_gclose_with_curve:N {c}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
% \spath_weld:Nnn,
% \spath_weld:Nn,
% \spath_gweld:Nnn,
@@ -1893,16 +2810,27 @@ manipulating PGF soft paths}
% \spath_gappend_no_move:Nn,
% }
% Append the path from the second \Verb+spath+ to the first, removing
-% the adjoining move.
+% the adjoining move if neither path has a rectangle either side of the join or if the first path isn't closed.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_append_no_move:nn #1#2
{
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
\tl_set:Nn \l_@@_tmpb_tl {#2}
- \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
- \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
- \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpb_tl}
+ \spath_finalaction:Nn \l_@@_tmpd_tl {#1}
+ \bool_if:nT {
+ ! \tl_if_eq_p:NN \l_@@_tmpd_tl \c_spath_closepath_tl
+ &&
+ ! \tl_if_eq_p:NN \l_@@_tmpd_tl \c_spath_rectcorner_tl
+ &&
+ \tl_if_eq_p:NN \l_@@_tmpc_tl \c_spath_moveto_tl
+ }
+ {
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
+ \tl_set:Nx \l_@@_tmpb_tl {\tl_tail:N \l_@@_tmpb_tl}
+ }
\tl_put_right:NV \l_@@_tmpa_tl \l_@@_tmpb_tl
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
@@ -2079,6 +3007,56 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
+% \spath_bake_shorten:Nn,
+% \spath_bake_shorten:N,
+% \spath_gbake_shorten:Nn,
+% \spath_gbake_shorten:N
+% }
+%
+% The shortening routine is applied quite late in the process of building a soft path so this ensures that it is done.
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_bake_shorten:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \pgfsyssoftpath@getcurrentpath\l_@@_tmpb_tl
+ \pgfsyssoftpath@setcurrentpath\l_@@_tmpa_tl
+ \pgf@prepare@end@of@path
+ \pgf@prepare@start@of@path
+ \pgfsyssoftpath@getcurrentpath\l_@@_tmpa_tl
+ \pgfsyssoftpath@setcurrentpath\l_@@_tmpb_tl
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_bake_shorten:Nn #1#2
+{
+ \@@_bake_shorten:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_bake_shorten:Nn {NV}
+\cs_new_protected_nopar:Npn \spath_bake_shorten:N #1
+{
+ \spath_bake_shorten:NV #1#1
+}
+\cs_generate_variant:Nn \spath_bake_shorten:N {c}
+\cs_new_protected_nopar:Npn \spath_gbake_shorten:Nn #1#2
+{
+ \@@_bake_shorten:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gbake_shorten:Nn {NV}
+\cs_new_protected_nopar:Npn \spath_gbake_shorten:N #1
+{
+ \spath_gbake_shorten:NV #1#1
+}
+\cs_generate_variant:Nn \spath_gbake_shorten:N {c}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
% \spath_close:Nn,
% \spath_close:N,
% \spath_gclose:Nn,
@@ -2124,6 +3102,91 @@ manipulating PGF soft paths}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{
+% \spath_adjust_close:Nn,
+% \spath_adjust_close:N,
+% \spath_adjust_gclose:Nn,
+% \spath_adjust_gclose:N
+% }
+% This closes a path and adjusts the end point to be where the final move point (so where the close points to) is.
+% The intention is that this should be used if the two points are visually the same point but mathematically different.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_adjust_close:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \spath_finalmovepoint:NV \l_@@_tmpb_tl \l_@@_tmpa_tl
+ \spath_finalpoint:NV \l_@@_tmpc_tl \l_@@_tmpa_tl
+ \tl_reverse:N \l_@@_tmpa_tl
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpd_tl {\tl_head:N \l_@@_tmpa_tl}
+ \tl_if_eq:NNT \l_@@_tmpd_tl \c_spath_curveto_tl
+ {
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_clear:N \l_@@_tmpe_tl
+ \tl_set:Nx \l_@@_tmpe_tl {
+ {
+ \dim_eval:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ -
+ \tl_item:Nn \l_@@_tmpc_tl {2}
+ +
+ \tl_item:Nn \l_@@_tmpb_tl {2}
+ }
+ }
+ {
+ \dim_eval:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ -
+ \tl_item:Nn \l_@@_tmpc_tl {1}
+ +
+ \tl_item:Nn \l_@@_tmpb_tl {1}
+ }
+ }
+ }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl}
+ \tl_put_left:NV \l_@@_tmpa_tl \l_@@_tmpe_tl
+ \tl_put_left:NV \l_@@_tmpa_tl \l_@@_tmpd_tl
+ }
+ \tl_reverse:N \l_@@_tmpa_tl
+ \tl_put_right:NV \l_@@_tmpa_tl \l_@@_tmpb_tl
+ \tl_put_right:NV \l_@@_tmpa_tl \c_spath_closepath_tl
+ \tl_put_right:NV \l_@@_tmpa_tl \l_@@_tmpb_tl
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_generate_variant:Nn \@@_adjust_close:n {V}
+\cs_new_protected_nopar:Npn \spath_adjust_close:Nn #1#2
+{
+ \@@_adjust_close:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_adjust_close:Nn {NV}
+\cs_new_protected_nopar:Npn \spath_adjust_close:N #1
+{
+ \spath_adjust_close:NV #1#1
+}
+\cs_generate_variant:Nn \spath_adjust_close:N {c}
+\cs_new_protected_nopar:Npn \spath_adjust_gclose:Nn #1#2
+{
+ \@@_adjust_close:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_adjust_gclose:Nn {NV}
+\cs_new_protected_nopar:Npn \spath_adjust_gclose:N #1
+{
+ \spath_adjust_gclose:NV #1#1
+}
+\cs_generate_variant:Nn \spath_adjust_gclose:N {c}
+% \end{macrocode}
+% \end{macro}
+%
%
% \begin{macro}[internal]{
% \spath_open:Nn,
@@ -2132,11 +3195,12 @@ manipulating PGF soft paths}
% \spath_gopen:N
% }
% Removes all close paths from the path, replacing them by \Verb+lineto+ if they move any distance.
+% Rectangles are replaced by lines with the start/end at the lower left corner.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_open:n #1
{
\group_begin:
- \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \spath_replace_rectangles:Nn \l_@@_tmpa_tl {#1}
\tl_clear:N \l_@@_tmpb_tl
\bool_until_do:nn {
\tl_if_empty_p:N \l_@@_tmpa_tl
@@ -2210,6 +3274,7 @@ manipulating PGF soft paths}
\tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
\group_end:
}
+\cs_generate_variant:Nn \@@_open:n {V}
\cs_new_protected_nopar:Npn \spath_open:Nn #1#2
{
\@@_open:n {#2}
@@ -2232,6 +3297,8 @@ manipulating PGF soft paths}
{
\spath_gopen:NV #1#1
}
+\cs_generate_variant:Nn \spath_open:N {c}
+\cs_generate_variant:Nn \spath_gopen:N {c}
% \end{macrocode}
% \end{macro}
%
@@ -2358,6 +3425,126 @@ manipulating PGF soft paths}
% \end{macro}
%
% \begin{macro}[internal]{
+% \spath_replace_rectangles:Nn,
+% \spath_replace_rectangles:Nn,
+% \spath_replace_rectangles:Nn,
+% \spath_replace_rectangles:Nn,
+% }
+% Replace any rectangle components by lines.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_replace_rectangles:n #1
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \tl_clear:N \l_@@_tmpb_tl
+
+ \bool_do_until:nn
+ {
+ \tl_if_empty_p:N \l_@@_tmpa_tl
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_head:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpd_tl {\tl_head:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_head:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+
+ \tl_if_eq:NNTF \l_@@_tmpc_tl \c_spath_rectcorner_tl
+ {
+
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+ \dim_set:Nn \l_@@_tmpa_dim
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {1}
+ }
+ \dim_set:Nn \l_@@_tmpb_dim
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {2}
+ }
+
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+ \tl_set:Nx \l_@@_tmpa_tl {\tl_tail:N \l_@@_tmpa_tl }
+
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_moveto_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_lineto_tl
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n { \l_@@_tmpd_tl + \l_@@_tmpa_dim }
+ }
+ }
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_lineto_tl
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n { \l_@@_tmpd_tl + \l_@@_tmpa_dim }
+ }
+ }
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n { \l_@@_tmpe_tl + \l_@@_tmpb_dim }
+ }
+ }
+
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_lineto_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \tl_put_right:Nx \l_@@_tmpb_tl
+ {
+ {
+ \fp_to_dim:n { \l_@@_tmpe_tl + \l_@@_tmpb_dim }
+ }
+ }
+
+ \tl_put_right:NV \l_@@_tmpb_tl \c_spath_closepath_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+
+ }
+ {
+ \tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpc_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpd_tl
+ \@@_tl_put_right_braced:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpb_tl
+ \group_end:
+}
+\cs_generate_variant:Nn \@@_replace_rectangles:n {V}
+\cs_new_protected_nopar:Npn \spath_replace_rectangles:Nn #1#2
+{
+ \@@_replace_rectangles:n {#2}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_replace_rectangles:Nn {NV, cV, cv, Nv}
+\cs_new_protected_nopar:Npn \spath_replace_rectangles:N #1
+{
+ \spath_replace_rectangles:NV #1#1
+}
+\cs_generate_variant:Nn \spath_replace_rectangles:N {c}
+\cs_new_protected_nopar:Npn \spath_greplace_rectangles:Nn #1#2
+{
+ \@@_replace_rectangles:n {#2}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_greplace_rectangles:Nn {NV, cV, cv, Nv}
+\cs_new_protected_nopar:Npn \spath_greplace_rectangles:N #1
+{
+ \spath_greplace_rectangles:NV #1#1
+}
+\cs_generate_variant:Nn \spath_greplace_rectangles:N {c}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
% \spath_remove_empty_components:Nn,
% \spath_remove_empty_components:N,
% \spath_gremove_empty_components:Nn,
@@ -2688,9 +3875,11 @@ manipulating PGF soft paths}
}
{
\fp_set:Nn \l_@@_tmpa_fp {.5 * \l_@@_tmpa_fp / \l_@@_tmpb_fp}
- \fp_compare:nTF
+ \bool_if:nTF
{
- 0 < \l_@@_tmpa_fp && \l_@@_tmpa_fp < 1
+ \fp_compare_p:n {0 < \l_@@_tmpa_fp}
+ &&
+ \fp_compare_p:n {\l_@@_tmpa_fp < 1}
}
{
\@@_split_curve:nV {#1} \l_@@_tmpa_fp
@@ -2908,16 +4097,74 @@ manipulating PGF soft paths}
% \end{macrocode}
% \end{macro}
%
+%
+% \begin{macro}[internal]{
+% \spath_split_rectangle:Nnn,
+% \spath_gsplit_rectangle:Nnn
+% }
+% Cuts a rectangle at a point.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_split_rectangle:nn #1#2
+{
+ \group_begin:
+ \spath_open:Nn \l_@@_tmpa_tl {#1}
+ \fp_set:Nn \l_@@_tmpa_fp {4*(#2)}
+ \spath_split_at:NNVV
+ \l_@@_tmpa_tl \l_@@_tmpb_tl \l_@@_tmpa_tl \l_@@_tmpa_fp
+ \@@_append_no_move:VV \l_@@_tmpb_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \spath_split_rectangle:Nnn #1#2#3
+{
+ \@@_split_rectangle:nn {#2}{#3}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_rectangle:Nnn {NnV, NVn, NVV}
+\cs_new_protected_nopar:Npn \spath_gsplit_rectangle:Nnn #1#2#3
+{
+ \@@_split_rectangle:nn {#2}{#3}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_rectangle:Nnn {NnV, NVn, NVV}
+% \end{macrocode}
+% \end{macro}
+%
+%
% \begin{macro}[internal]{
% \spath_split_at:NNnn,
% \spath_split_at:Nnn,
% \spath_split_at:Nn,
% \spath_gsplit_at:NNnn
% \spath_gsplit_at:Nnn,
-% \spath_gsplit_at:Nn
+% \spath_gsplit_at:Nn,
+% \spath_split_at_keep_start:Nnn,
+% \spath_split_at_keep_start:Nn,
+% \spath_gsplit_at_keep_start:Nnn,
+% \spath_gsplit_at_keep_start:Nn,
+% \spath_split_at_keep_end:Nnn,
+% \spath_split_at_keep_end:Nn,
+% \spath_gsplit_at_keep_end:Nnn,
+% \spath_gsplit_at_keep_end:Nn,
+% \spath_split_at_normalised:NNnn,
+% \spath_split_at_normalised:Nnn,
+% \spath_split_at_normalised:Nn,
+% \spath_gsplit_at_normalised:NNnn
+% \spath_gsplit_at_normalised:Nnn,
+% \spath_gsplit_at_normalised:Nn,
+% \spath_split_at_normalised_keep_start:Nnn,
+% \spath_split_at_normalised_keep_start:Nn,
+% \spath_gsplit_at_normalised_keep_start:Nnn,
+% \spath_gsplit_at_normalised_keep_start:Nn,
+% \spath_split_at_normalised_keep_end:Nnn,
+% \spath_split_at_normalised_keep_end:Nn,
+% \spath_gsplit_at_normalised_keep_end:Nnn,
+% \spath_gsplit_at_normalised_keep_end:Nn,
% }
% Split a path according to the parameter generated by the intersection routine.
% The versions with two \texttt{N} arguments stores the two parts in two macros, the version with a single \texttt{N} joins them back into a single path (as separate components).
+% The \texttt{keep} versions throw away the other part of the curve.
% \begin{macrocode}
\cs_new_protected_nopar:Npn \@@_split_at:nn #1#2
{
@@ -2948,11 +4195,28 @@ manipulating PGF soft paths}
\bool_set_true:N \l_@@_tmpa_bool
\tl_set:Nn \l_@@_tmpe_tl {#1}
- \tl_clear:N \l_@@_tmpc_tl
\dim_zero:N \l_@@_tmpa_dim
\dim_zero:N \l_@@_tmpb_dim
+ % Remember if the component is closed
+ \spath_finalaction:NV \l_@@_tmpa_tl \l_@@_tmpe_tl
+
+ \bool_set:Nn \l_@@_closed_bool
+ {
+ \tl_if_eq_p:NN \l_@@_tmpa_tl \c_spath_closepath_tl
+ ||
+ \tl_if_eq_p:NN \l_@@_tmpa_tl \c_spath_rectcorner_tl
+ }
+
+ % Open it
+ \spath_open:N \l_@@_tmpe_tl
+
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_clear:N \l_@@_tmpb_tl
+ \tl_clear:N \l_@@_tmpc_tl
+ \tl_clear:N \l_@@_tmpd_tl
+
\bool_until_do:nn {
\tl_if_empty_p:N \l_@@_tmpe_tl
||
@@ -2971,6 +4235,10 @@ manipulating PGF soft paths}
{
\int_incr:N \l_@@_tmpb_int
}
+ \c_spath_rectcorner_tl
+ {
+ \int_incr:N \l_@@_tmpb_int
+ }
}
\int_compare:nT { \l_@@_tmpb_int < \l_@@_tmpa_int }
{
@@ -3075,14 +4343,65 @@ manipulating PGF soft paths}
\tl_put_right:NV \l_@@_tmpc_tl \l_@@_tmpa_tl
\tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
}
+
+ \c_spath_rectcorner_tl
+ {
+ \tl_clear:N \l_@@_tmpd_tl
+ \tl_put_right:NV \l_@@_tmpd_tl \l_@@_tmpf_tl
+
+ \tl_put_right:Nx \l_@@_tmpd_tl {{\tl_head:N \l_@@_tmpe_tl}}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpe_tl}
+ \tl_put_right:Nx \l_@@_tmpd_tl {{\tl_head:N \l_@@_tmpe_tl}}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpe_tl}
+
+ \tl_put_right:Nx \l_@@_tmpd_tl {\tl_head:N \l_@@_tmpe_tl}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpe_tl}
+
+ \tl_put_right:Nx \l_@@_tmpd_tl {{\tl_head:N \l_@@_tmpe_tl}}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpe_tl}
+ \tl_put_right:Nx \l_@@_tmpd_tl {{\tl_head:N \l_@@_tmpe_tl}}
+ \tl_set:Nx \l_@@_tmpe_tl {\tl_tail:N \l_@@_tmpe_tl}
+
+ \spath_split_rectangle:NVV
+ \l_@@_tmpa_tl
+ \l_@@_tmpd_tl
+ \l_@@_tmpa_fp
+
+ \tl_put_right:NV \l_@@_tmpc_tl \l_@@_tmpa_tl
+ \tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpe_tl
+ }
+
}
}
+ \bool_if:NT \l_@@_closed_bool
+ {
+ \prg_replicate:nn {3}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl {\tl_tail:N \l_@@_tmpc_tl}
+ }
+ \tl_put_right:NV \l_@@_tmpb_tl \l_@@_tmpc_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_@@_tmpb_tl
+ \tl_clear:N \l_@@_tmpb_tl
+ }
+
\tl_gclear:N \g_@@_output_tl
\@@_tl_gput_right_braced:NV \g_@@_output_tl \l_@@_tmpc_tl
\@@_tl_gput_right_braced:NV \g_@@_output_tl \l_@@_tmpb_tl
\group_end:
}
+\cs_generate_variant:Nn \@@_split_at:nn {nV, VV}
+\cs_new_protected_nopar:Npn \@@_split_at_normalised:nn #1#2
+{
+ \group_begin:
+ \spath_reallength:Nn \l_@@_tmpa_int {#1}
+
+ \tl_set:Nx \l_@@_tmpa_tl
+ {\fp_to_decimal:n {(#2) * (\l_@@_tmpa_int)}}
+ \@@_split_at:nV {#1} \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_generate_variant:Nn \@@_split_at_normalised:nn {nV}
\cs_new_protected_nopar:Npn \spath_split_at:NNnn #1#2#3#4
{
\@@_split_at:nn {#3}{#4}
@@ -3099,6 +4418,114 @@ manipulating PGF soft paths}
\tl_gclear:N \g_@@_output_tl
}
\cs_generate_variant:Nn \spath_gsplit_at:NNnn {NNVn, NNVV, NNnV}
+\cs_new_protected_nopar:Npn \spath_split_at_keep_start:Nnn #1#2#3
+{
+ \@@_split_at:nn {#2}{#3}
+ \tl_set:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_keep_start:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_split_at_keep_start:Nn #1#2
+{
+ \spath_split_at_keep_start:NVn #1#1{#2}
+}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_keep_start:Nnn #1#2#3
+{
+ \@@_split_at:nn {#2}{#3}
+ \tl_gset:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_keep_start:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_keep_start:Nn #1#2
+{
+ \spath_gsplit_at_keep_start:NVn #1#1{#2}
+}
+\cs_new_protected_nopar:Npn \spath_split_at_keep_end:Nnn #1#2#3
+{
+ \@@_split_at:nn {#2}{#3}
+ \tl_set:Nx #1 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_keep_end:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_split_at_keep_end:Nn #1#2
+{
+ \spath_split_at_keep_end:NVn #1#1{#2}
+}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_keep_end:Nnn #1#2#3
+{
+ \@@_split_at:nn {#2}{#3}
+ \tl_gset:Nx #1 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_keep_end:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_keep_end:Nn #1#2
+{
+ \spath_gsplit_at_keep_end:NVn #1#1{#2}
+}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised:NNnn #1#2#3#4
+{
+ \@@_split_at_normalised:nn {#3}{#4}
+ \tl_set:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_set:Nx #2 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_normalised:NNnn {NNVn, NNVV, NNnV, ccvn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised:NNnn #1#2#3#4
+{
+ \@@_split_at_normalised:nn {#3}{#4}
+ \tl_gset:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_gset:Nx #2 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised:NNnn {NNVn, NNVV, NNnV, ccvn}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised_keep_start:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_set:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_normalised_keep_start:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised_keep_start:Nn #1#2
+{
+ \spath_split_at_normalised_keep_start:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_split_at_normalised_keep_start:Nn {cn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised_keep_start:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_gset:Nx #1 {\tl_item:Nn \g_@@_output_tl {1}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised_keep_start:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised_keep_start:Nn #1#2
+{
+ \spath_gsplit_at_normalised_keep_start:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised_keep_start:Nn {cn}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised_keep_end:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_set:Nx #1 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_normalised_keep_end:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised_keep_end:Nn #1#2
+{
+ \spath_split_at_normalised_keep_end:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_split_at_normalised_keep_end:Nn {cn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised_keep_end:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_gset:Nx #1 {\tl_item:Nn \g_@@_output_tl {2}}
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised_keep_end:Nnn {NVn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised_keep_end:Nn #1#2
+{
+ \spath_gsplit_at_normalised_keep_end:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised_keep_end:Nn {cn}
% \end{macrocode}
%
%
@@ -3133,6 +4560,38 @@ manipulating PGF soft paths}
{
\spath_gsplit_at:NVn #1#1{#2}
}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_set:Nx #1
+ {
+ \tl_item:Nn \g_@@_output_tl {1}
+ \tl_item:Nn \g_@@_output_tl {2}
+ }
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_split_at_normalised:Nnn {NVn, NVV}
+\cs_new_protected_nopar:Npn \spath_split_at_normalised:Nn #1#2
+{
+ \spath_split_at_normalised:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_split_at_normalised:Nn {cn}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised:Nnn #1#2#3
+{
+ \@@_split_at_normalised:nn {#2}{#3}
+ \tl_gset:Nx #1
+ {
+ \tl_item:Nn \g_@@_output_tl {1}
+ \tl_item:Nn \g_@@_output_tl {2}
+ }
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised:Nnn {NVn, NVV}
+\cs_new_protected_nopar:Npn \spath_gsplit_at_normalised:Nn #1#2
+{
+ \spath_gsplit_at_normalised:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \spath_gsplit_at_normalised:Nn {cn}
% \end{macrocode}
% \end{macro}
%
@@ -3473,6 +4932,40 @@ manipulating PGF soft paths}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{
+% \spath_shorten_at_both_ends:Nnn,
+% \spath_shorten_at_both_ends:Nn,
+% \spath_gshorten_at_both_ends:Nnn,
+% \spath_gshorten_at_both_ends:Nn
+% }
+%
+% This macro shortens a path from the start by a dimension.
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \spath_shorten_at_both_ends:Nnn #1#2#3
+{
+ \spath_shorten_at_start:Nnn #1{#2}{#3}
+ \spath_shorten_at_end:Nnn #1{#2}{#3}
+}
+\cs_new_protected_nopar:Npn \spath_shorten_at_both_ends:Nn #1#2
+{
+ \spath_shorten_at_start:Nn #1{#2}
+ \spath_shorten_at_end:Nn #1{#2}
+}
+\cs_generate_variant:Nn \spath_shorten_at_both_ends:Nn {cn, cV, NV}
+\cs_new_protected_nopar:Npn \spath_gshorten_at_both_ends:Nnn #1#2#3
+{
+ \spath_gshorten_at_start:Nnn #1{#2}{#3}
+ \spath_gshorten_at_end:Nnn #1{#2}{#3}
+}
+\cs_new_protected_nopar:Npn \spath_gshorten_at_both_ends:Nn #1#2
+{
+ \spath_gshorten_at_start:Nn #1{#2}
+ \spath_gshorten_at_end:Nn #1{#2}
+}
+\cs_generate_variant:Nn \spath_gshorten_at_both_ends:Nn {cn, cV, NV}
+% \end{macrocode}
+% \end{macro}
%
% \subsection{Points on a Path}
%
@@ -3561,6 +5054,95 @@ manipulating PGF soft paths}
}
}
+ \c_spath_rectsize_tl
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .25
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {2} )
+ +
+ 4 * \l_@@_tmpa_fp * ( \tl_item:Nn \l_@@_tmpa_tl {5} )
+ }
+ }
+ {\fp_to_dim:n {\tl_item:Nn \l_@@_tmpa_tl {3} } }
+ }
+ }
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .5
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {2} )
+ +
+ ( \tl_item:Nn \l_@@_tmpa_tl {5} )
+ }
+ }
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {3} )
+ +
+ (4 * (\l_@@_tmpa_fp) - 1) * ( \tl_item:Nn \l_@@_tmpa_tl {6} )
+ }
+ }
+ }
+ }
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .75
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {2} )
+ +
+ (3 - 4 * (\l_@@_tmpa_fp)) *( \tl_item:Nn \l_@@_tmpa_tl {5} )
+ }
+ }
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {3} )
+ +
+ ( \tl_item:Nn \l_@@_tmpa_tl {6} )
+ }
+ }
+ }
+
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {2} )
+ }
+ }
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {3} )
+ +
+ (4 - 4 *(\l_@@_tmpa_fp)) * ( \tl_item:Nn \l_@@_tmpa_tl {6} )
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
\c_spath_closepath_tl
{
\tl_set:Nx \l_@@_tmpc_tl
@@ -3717,6 +5299,71 @@ manipulating PGF soft paths}
}
}
+ \c_spath_rectsize_tl
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .25
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ \tl_item:Nn \l_@@_tmpa_tl {5}
+ }
+ }
+ {0pt}
+ }
+ }
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .5
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {0pt}
+ {\fp_to_dim:n
+ {
+ ( \tl_item:Nn \l_@@_tmpa_tl {6} )
+ }
+ }
+ }
+ }
+ {
+ \fp_compare:nTF
+ {
+ \l_@@_tmpa_fp <= .75
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {\fp_to_dim:n
+ {
+ -( \tl_item:Nn \l_@@_tmpa_tl {5} )
+ }
+ }
+ {0pt}
+ }
+
+ }
+ {
+ \tl_set:Nx \l_@@_tmpc_tl
+ {
+ {0pt}
+ {\fp_to_dim:n
+ {
+ - ( \tl_item:Nn \l_@@_tmpa_tl {6} )
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
\c_spath_closepath_tl
{
\tl_set:Nx \l_@@_tmpc_tl
@@ -3898,19 +5545,21 @@ manipulating PGF soft paths}
\tl_set:Nn \l_@@_tmpb_tl {#1}
\tl_set:Nn \l_@@_tmpc_tl {#2}
- \spath_reallength:Nn \l_@@_tmpa_int {#1}
-
% Remember if the component is closed
\spath_finalaction:NV \l_@@_tmpa_tl \l_@@_tmpb_tl
-
+
\bool_set:Nn \l_@@_closed_bool
{
\tl_if_eq_p:NN \l_@@_tmpa_tl \c_spath_closepath_tl
+ ||
+ \tl_if_eq_p:NN \l_@@_tmpa_tl \c_spath_rectcorner_tl
}
-
+
% Open it
\spath_open:N \l_@@_tmpb_tl
+ \spath_reallength:NV \l_@@_tmpa_int \l_@@_tmpb_tl
+
% Sort intersections along the component
\pgfintersectionsortbyfirstpath
\spath_intersect:NN \l_@@_tmpb_tl \l_@@_tmpc_tl
@@ -3933,6 +5582,7 @@ manipulating PGF soft paths}
{
\bool_set_false:N \l_@@_closed_bool
}
+
\seq_get_right:NN \l_@@_tmpb_seq \l_@@_tmpa_tl
\fp_compare:nT
{
@@ -3941,7 +5591,6 @@ manipulating PGF soft paths}
{
\bool_set_false:N \l_@@_closed_bool
}
-
\tl_set:Nn \l_@@_tmpg_tl {-1}
@@ -3989,6 +5638,7 @@ manipulating PGF soft paths}
\tl_set_eq:NN \l_@@_tmpb_tl \l_@@_tmpe_tl
}
+
\bool_if:NT \l_@@_closed_bool
{
\spath_join_component:Nn \l_@@_tmpb_tl {1}
@@ -4847,6 +6497,7 @@ manipulating PGF soft paths}
{
\pgfsyssoftpath@getcurrentpath #1
}
+\cs_generate_variant:Nn \spath_get_current_path:N {c}
% \end{macrocode}
%
% \begin{macrocode}
@@ -4855,6 +6506,7 @@ manipulating PGF soft paths}
\pgfsyssoftpath@getcurrentpath #1
\tl_gset_eq:NN #1 #1
}
+\cs_generate_variant:Nn \spath_gget_current_path:N {c}
% \end{macrocode}
% \end{macro}
%
@@ -4912,10 +6564,13 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \spath_tikz_path:nn #1#2
{
- \path[#1] \pgfextra{
- \spath_set_current_path:n {#2}
- \tl_put_right:Nn \tikz@preactions {\def\tikz@actions@path{#2}}
- };
+ \tl_if_empty:nF {#2}
+ {
+ \path[#1] \pgfextra{
+ \spath_set_current_path:n {#2}
+ \tl_put_left:Nn \tikz@preactions {\def\tikz@actions@path{#2}}
+ };
+ }
}
\cs_generate_variant:Nn \spath_tikz_path:nn {Vn, VV, nv, Vv, nV}
% \end{macrocode}
@@ -4929,8 +6584,8 @@ manipulating PGF soft paths}
\spath_finalpoint:Nn \l_@@_tmpa_tl {#1}
\tl_set:Nx \l_@@_tmpa_tl
{
- \exp_not:c {pgf@x}=\tl_item:Nn \l_@@_tmpa_tl {1}
- \exp_not:c {pgf@y}=\tl_item:Nn \l_@@_tmpa_tl {2}
+ \exp_not:c {pgf@x}=\tl_item:Nn \l_@@_tmpa_tl {1} \relax
+ \exp_not:c {pgf@y}=\tl_item:Nn \l_@@_tmpa_tl {2} \relax
}
\use:c {pgf@process}{%
\tl_use:N \l_@@_tmpa_tl
@@ -4939,32 +6594,41 @@ manipulating PGF soft paths}
}
\tl_set:Nx \l_@@_tmpa_tl
{
- \exp_not:c {tikz@lastx}=\exp_not:c {pgf@x}
- \exp_not:c {tikz@lasty}=\exp_not:c {pgf@y}
- \exp_not:c {tikz@lastxsaved}=\exp_not:c {pgf@x}
- \exp_not:c {tikz@lastysaved}=\exp_not:c {pgf@y}
+ \exp_not:c {tikz@lastx}=\exp_not:c {pgf@x} \relax
+ \exp_not:c {tikz@lasty}=\exp_not:c {pgf@y} \relax
+ \exp_not:c {tikz@lastxsaved}=\exp_not:c {pgf@x} \relax
+ \exp_not:c {tikz@lastysaved}=\exp_not:c {pgf@y} \relax
}
\tl_use:N \l_@@_tmpa_tl
\spath_finalmovepoint:Nn \l_@@_tmpa_tl {#1}
- \ifpgfsyssoftpathmovetorelevant%
- \tl_gset_eq:cN {pgfsyssoftpath@lastmoveto} \l_@@_tmpa_tl
- \fi
+ \bool_if:NT \l_spath_movetorelevant_bool
+ {
+ \ifpgfsyssoftpathmovetorelevant%
+ \tl_gset_eq:cN {pgfsyssoftpath@lastmoveto} \l_@@_tmpa_tl
+ \fi
+ }
\tl_set:Nx \l_@@_tmpa_tl
{
- \exp_not:c {pgf@x}=\tl_item:Nn \l_@@_tmpa_tl {1}
- \exp_not:c {pgf@y}=\tl_item:Nn \l_@@_tmpa_tl {2}
+ \exp_not:c {pgf@x}=\tl_item:Nn \l_@@_tmpa_tl {1} \relax
+ \exp_not:c {pgf@y}=\tl_item:Nn \l_@@_tmpa_tl {2} \relax
}
\use:c {pgf@process}{%
\tl_use:N \l_@@_tmpa_tl
\pgftransforminvert
\use:c {pgf@pos@transform@glob}
}
- \tl_set:Nx \l_@@_tmpa_tl
+ \bool_if:NT \l_spath_movetorelevant_bool
{
- \exp_not:c {tikz@lastmovetox}=\exp_not:c {pgf@x}
- \exp_not:c {tikz@lastmovetoy}=\exp_not:c {pgf@y}
+ \dim_if_exist:cT {tikz@lastmovetox}
+ {
+ \tl_set:Nx \l_@@_tmpa_tl
+ {
+ \exp_not:c {tikz@lastmovetox}=\exp_not:c {pgf@x} \relax
+ \exp_not:c {tikz@lastmovetoy}=\exp_not:c {pgf@y} \relax
+ }
+ \tl_use:N \l_@@_tmpa_tl
+ }
}
- \tl_use:N \l_@@_tmpa_tl
\tl_clear_new:c {tikz@timer}
\tl_set:cn {tikz@timer}
{
@@ -5028,6 +6692,11 @@ manipulating PGF soft paths}
%<*tikzspath3>
% \fi
%
+% \begin{macrocode}
+%<@@=tikzspath>
+% \end{macrocode}
+%
+%
% This provides an interface to the soft path manipulation routines via a series of TikZ keys.
% They all live in the \texttt{spath} family.
%
@@ -5037,24 +6706,44 @@ manipulating PGF soft paths}
\RequirePackage{expl3}
\ExplSyntaxOn
+\tl_new:N \l_@@_tmpa_tl
+\tl_new:N \l_@@_tmpb_tl
+\tl_new:N \l_@@_tmpc_tl
+\tl_new:N \l_@@_tmpd_tl
+\tl_new:N \l_@@_tmpe_tl
+\tl_new:N \l_@@_tmpf_tl
+
+\int_new:N \l_@@_tmpa_int
+\seq_new:N \l_@@_tmpa_seq
+\seq_new:N \l_@@_tmpb_seq
+\seq_new:N \l_@@_tmpc_seq
+\seq_new:N \l_@@_tmpd_seq
+
\tl_new:N \l_@@_current_tl
\tl_new:N \l_@@_reverse_tl
\tl_new:N \l_@@_prefix_tl
\tl_new:N \l_@@_suffix_tl
\tl_new:N \g_@@_smuggle_tl
+\tl_new:N \g_@@_output_tl
+\tl_new:N \l_@@_check_tl
+\clist_new:N \g_@@_output_clist
\seq_new:N \g_@@_tmpa_seq
\seq_new:N \g_@@_tmpb_seq
+\seq_new:N \g_@@_output_seq
\bool_new:N \l_@@_draft_bool
% \end{macrocode}
%
% We surround all the keys with checks to ensure that the soft path under consideration does actually exist, but if it doesn't we should warn the user.
%
% \begin{macrocode}
-\msg_new:nnn { spath3 } { missing soft path } { Soft~ path~ #1~ doesn't~ exist }
-\msg_new:nnnn { spath3 } { empty soft path } { Soft~ path~ #1~ is~ empty}
+\msg_new:nnn { spath3 } { missing soft path }
+{ Soft~ path~ #1~ doesn't~ exist~ \msg_line_context:}
+\msg_new:nnnn { spath3 } { empty soft path }
+{ Soft~ path~ #1~ is~ empty~ \msg_line_context:}
{If~ it~ was~ defined~ inside~ a~ group,~ try~ using~ "save~ global". }
\msg_new:nnn { spath3 } { load intersections }
-{ You~ need~ to~ load~ the~ "intersections"~ library~ to~ work~ with~ intersections }
+{ You~ need~ to~ load~ the~ "intersections"~ library~
+ to~ work~ with~ intersections }
% \end{macrocode}
%
% When saving a soft path, by default we use a naming convention that is compatible with the intersections library so that paths saved here and paths saved by the \texttt{name path} facility of the intersections library are mutually exchangeable.
@@ -5065,9 +6754,14 @@ manipulating PGF soft paths}
% \end{macrocode}
%
% When a soft path is grabbed from TikZ we're usually deep in a group so I've adapted the code from the intersections library to dig the definition out of the group without making everything global.
-%
+%
+% Interestingly, the intersections library doesn't clear its naming code once it is used meaning that it keeps resetting the definition of a path back to its original one every time a path command is called.
+%
+% Also, when the hook is restored outside a scope then no check is made to ensure that the inner one was actually invoked.
+% This can cause issues when the syntax \Verb!\tikz .. ;! is used since the end of the path coincides with the end of the picture.
% \begin{macrocode}
\tl_new:N \g_@@_tikzfinish_tl
+\tl_new:N \l_@@_tikzfinish_outside_tl
\cs_new_protected_nopar:Npn \spath_at_end_of_path:
{
\tl_use:N \g_@@_tikzfinish_tl
@@ -5075,8 +6769,43 @@ manipulating PGF soft paths}
}
\tl_put_right:Nn \tikz@finish {\spath_at_end_of_path:}
+\tikzset{
+ every~ scope/.append~ style={
+ execute~ at~ begin~ scope={
+ \tl_set_eq:NN \l_@@_tikzfinish_outside_tl \g_@@_tikzfinish_tl
+ },
+ execute~ at~ end~ scope={
+ \tl_use:N \g_@@_tikzfinish_tl
+ \tl_gclear:N \g_@@_tikzfinish_tl
+ \tl_gset_eq:NN \g_@@_tikzfinish_tl \l_@@_tikzfinish_outside_tl
+ },
+ },
+}
+% \end{macrocode}
+%
+% This is for delaying something until the path is fully constructed (but no later), sometimes useful to be able to specify this in the path options rather than directly at the end of the path.
+%
+% \begin{macrocode}
+\tl_new:N \l_@@_tikzpath_finish_tl
+
+\cs_new_protected_nopar:Npn \@@_at_end_of_path_construction:
+{
+ \tl_use:N \l_@@_tikzpath_finish_tl
+ \tl_clear:N \l_@@_tikzpath_finish_tl
+}
+
+\tl_put_left:Nn \tikz@finish {\@@_at_end_of_path_construction:}
+% \end{macrocode}
+%
+% Code for saving a path
+%
+% \begin{macrocode}
\cs_new_protected_nopar:Npn \spath_save_path:Nn #1#2
{
+ \tl_if_empty:NF \g_@@_tikzfinish_tl
+ {
+ \tl_use:N \g_@@_tikzfinish_tl
+ }
\tl_gput_right:Nn \g_@@_tikzfinish_tl
{
\tl_clear_new:N #1
@@ -5127,6 +6856,228 @@ manipulating PGF soft paths}
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}[internal]{
+% \@@_check_path:nnn
+% \@@_check_two_paths:nnnn
+% \@@_check_three_paths:nnnnn
+% }
+% Given a path name as the second argument, check if it exists and is not empty, and if so reinsert it after the first argument.
+% The third argument is code to be executed in case of a missing or empty path.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_check_path:nnn #1#2#3
+{
+ \tl_set:Nn \l_@@_check_tl {#3}
+ \tl_if_exist:cTF {\@@_path_name:n {#2}}
+ {
+ \tl_if_empty:cTF {\@@_path_name:n {#2}}
+ {
+ \msg_warning:nnn { spath3 } { empty soft path } { #2 }
+ }
+ {
+ \tl_set:Nn \l_@@_check_tl {
+ #1 {\@@_path_name:n {#2}}
+ }
+ }
+ }
+ {
+ \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ }
+ \tl_use:N \l_@@_check_tl
+}
+\cs_new_protected_nopar:Npn \@@_check_two_paths:nnnn #1#2#3#4
+{
+ \@@_check_path:nnn {
+ \@@_check_path:nnn {#1}{#2}{#4}
+ }{#3}{#4}
+}
+\cs_new_protected_nopar:Npn \@@_check_three_paths:nnnnn #1#2#3#4#5
+{
+ \@@_check_path:nnn {
+ \@@_check_path:nnn {
+ \@@_check_path:nnn {#1}{#2}{#5}
+ }{#3}{#5}
+ }{#4}{#5}
+}
+\cs_generate_variant:Nn \@@_check_path:nnn {nVn}
+\cs_generate_variant:Nn \@@_check_two_paths:nnnn {nnVn}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \@@_maybe_current_path:nn
+% \@@_maybe_current_path_reuse:nnn
+% \@@_maybe_current_two_paths_reuse_both:nnnn
+% \@@_maybe_current_two_paths_reuse_first:nnnn
+% \@@_maybe_current_two_paths_reuse_second:nnnn
+% }
+% If the named path is ``current'' then get the current path and use that.
+% The second version puts the resulting path back as the current path.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_maybe_current_path:nn #1#2
+{
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#2}}
+ }
+ #1 {#2}
+}
+\cs_new_protected_nopar:Npn \@@_maybe_current_path_reuse:nnn #1#2#3
+{
+ \bool_set_true:N \l_spath_movetorelevant_bool
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#2}}
+ }
+ #1 {#2} #3
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \tl_if_empty:cF {\@@_path_name:n {#2}}
+ {
+ \spath_set_current_path:c {\@@_path_name:n {#2}}
+ \spath_set_tikz_data:v {\@@_path_name:n {#2}}
+ }
+ }
+}
+\cs_new_protected_nopar:Npn \@@_maybe_current_two_paths_reuse_both:nnnn #1#2#3#4
+{
+ \bool_set_true:N \l_spath_movetorelevant_bool
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#2}}
+ }
+ \tl_if_eq:nnT {#3} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#3}}
+ }
+ #1 {#2} {#3} #4
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \tl_if_empty:cF {\@@_path_name:n {#2}}
+ {
+ \spath_set_current_path:c {\@@_path_name:n {#2}}
+ \spath_set_tikz_data:v {\@@_path_name:n {#2}}
+ }
+ }
+ \tl_if_eq:nnT {#3} {current}
+ {
+ \tl_if_empty:cF {\@@_path_name:n {#3}}
+ {
+ \spath_set_current_path:c {\@@_path_name:n {#3}}
+ \spath_set_tikz_data:v {\@@_path_name:n {#3}}
+ }
+ }
+}
+\cs_new_protected_nopar:Npn \@@_maybe_current_two_paths_reuse_first:nnnn #1#2#3#4
+{
+ \bool_set_true:N \l_spath_movetorelevant_bool
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#2}}
+ }
+ \tl_if_eq:nnT {#3} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#3}}
+ }
+ #1 {#2} {#3} #4
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \tl_if_empty:cF {\@@_path_name:n {#2}}
+ {
+ \spath_set_current_path:c {\@@_path_name:n {#2}}
+ \spath_set_tikz_data:v {\@@_path_name:n {#2}}
+ }
+ }
+}
+\cs_new_protected_nopar:Npn \@@_maybe_current_two_paths_reuse_second:nnnn #1#2#3#4
+{
+ \bool_set_true:N \l_spath_movetorelevant_bool
+ \tl_if_eq:nnT {#2} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#2}}
+ }
+ \tl_if_eq:nnT {#3} {current}
+ {
+ \spath_get_current_path:c {\@@_path_name:n {#3}}
+ }
+ #1 {#2} {#3} #4
+ \tl_if_eq:nnT {#3} {current}
+ {
+ \tl_if_empty:cF {\@@_path_name:n {#3}}
+ {
+ \spath_set_current_path:c {\@@_path_name:n {#3}}
+ \spath_set_tikz_data:v {\@@_path_name:n {#3}}
+ }
+ }
+}
+\cs_generate_variant:Nn \@@_maybe_current_path:nn {nV}
+\cs_generate_variant:Nn \@@_maybe_current_path_reuse:nnn {nVn}
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \begin{macro}{
+% \@@_seq_from_foreach:NNn
+% }
+%
+% Convert a PGF foreach list, as the third argument, to a sequence.
+% The second argument is the maximum number on the list.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_seq_from_foreach:Nnn #1#2#3
+{
+ \group_begin:
+ \seq_gclear:N \g_@@_output_seq
+
+ \tl_if_empty:nTF {#3}
+ {
+ \int_step_inline:nnnn {1}{1} {#2}
+ {
+ \seq_gput_right:Nn \g_@@_output_seq {##1}
+ }
+ }
+ {
+ \foreach \l_@@_tmpa_tl in {#3}
+ {
+ \int_compare:nTF { \l_@@_tmpa_tl > 0 }
+ {
+ \seq_gput_right:NV \g_@@_output_seq \l_@@_tmpa_tl
+ }
+ {
+ \seq_gput_right:Nx \g_@@_output_seq
+ {\int_eval:n {#2 - \l_@@_tmpa_tl}}
+ }
+ }
+ \seq_gsort:Nn \g_@@_output_seq
+ {
+ \int_compare:nNnTF {##1} < {##2}
+ { \sort_return_same: }
+ { \sort_return_swapped: }
+ }
+ }
+ \group_end:
+ \seq_set_eq:NN #1 \g_@@_output_seq
+ \seq_gclear:N \g_@@_output_seq
+}
+\cs_generate_variant:Nn \@@_seq_from_foreach:Nnn {NVV, NVn}
+%
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \@@_path_name:n
+% }
+% Wrap the argument in the prefix and suffix to generate the proper name.
+% \begin{macrocode}
+\cs_new:Npn \@@_path_name:n #1
+{
+ \tl_use:N \l_@@_prefix_tl
+ #1
+ \tl_use:N \l_@@_suffix_tl
+}
+\cs_generate_variant:Nn \@@_path_name:n {V}
+% \end{macrocode}
+% \end{macro}
+%
% When joining two paths we provide a set of options for how to process the second path.
%
% \begin{macrocode}
@@ -5134,6 +7085,7 @@ manipulating PGF soft paths}
\bool_new:N \l_@@_weld_bool
\bool_new:N \l_@@_move_bool
\bool_new:N \l_@@_global_bool
+\bool_new:N \l_@@_current_transformation_bool
\tl_new:N \l_@@_joinpath_tl
\tl_new:N \l_@@_transformation_tl
@@ -5176,6 +7128,10 @@ manipulating PGF soft paths}
\@@_set_bool:Nn \l_@@_global_bool {#1}
},
global/.default = true,
+ use~ current~ transformation/.code={
+ \@@_set_bool:Nn \l_@@_current_transformation_bool {#1}
+ },
+ use~ current~ transformation/.default = true,
transform/.store~in=\l_@@_transformation_tl,
.unknown/.code = {
\tl_set_eq:NN \l_@@_joinpath_tl \pgfkeyscurrentname
@@ -5191,6 +7147,766 @@ manipulating PGF soft paths}
\cs_set_eq:NN \getComponentOf \clist_item:Nn
% \end{macrocode}
%
+% \subsection{Helper Functions}
+%
+% \begin{macro}[internal]{
+% \@@_use_path:n
+% }
+% Use a path, possibly manipulating it first.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_use_path:n #1
+{
+ \tl_set:Nn \l_@@_joinpath_tl {#1}
+ \spath_get_current_path:N \l_@@_current_tl
+
+ \bool_if:NT \l_@@_reverse_bool
+ {
+ \spath_reverse:N \l_@@_joinpath_tl
+ }
+
+ \bool_if:NT \l_@@_current_transformation_bool
+ {
+ \pgfgettransform \l_@@_tmpa_tl
+ \spath_transform:NV
+ \l_@@_joinpath_tl
+ \l_@@_tmpa_tl
+ }
+
+ \tl_if_empty:NF \l_@@_transformation_tl
+ {
+ \group_begin:
+ \pgftransformreset
+ \@@_tikzset:V \l_@@_transformation_tl
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset:Nn \g_@@_smuggle_tl
+ {
+ \spath_transform:Nnnnnnn
+ \l_@@_joinpath_tl
+ }
+ \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+ \tl_use:N \g_@@_smuggle_tl
+ }
+
+ \bool_if:NT \l_@@_move_bool
+ {
+ \tl_if_empty:NTF \l_@@_current_tl
+ {
+ \tl_set:Nn \l_@@_tmpc_tl { {0pt} {0pt} }
+ }
+ {
+ \spath_finalpoint:NV
+ \l_@@_tmpc_tl
+ \l_@@_current_tl
+ }
+ \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
+ }
+
+ \tl_if_empty:NTF \l_@@_current_tl
+ {
+ \tl_if_empty:NTF \l_@@_joinpath_tl
+ {
+ \tl_set_eq:NN \l_@@_current_tl \c_spath_moveto_tl
+ \tl_put_right:Nn \l_@@_current_tl {{0pt}{0pt}}
+ }
+ {
+ \tl_set_eq:NN \l_@@_current_tl \l_@@_joinpath_tl
+ }
+ }
+ {
+
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_set:Nn \l_@@_tmpa_tl {spath_}
+
+ \tl_put_right:Nn \l_@@_tmpa_tl {append}
+
+ \bool_if:NT \l_@@_weld_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
+ \spath_numberofcomponents:NV \l_@@_tmpa_int \l_@@_joinpath_tl
+ \int_compare:nT {\l_@@_tmpa_int == 1}
+ {
+ \bool_set_false:N \l_spath_movetorelevant_bool
+ }
+ }
+ \tl_put_right:Nn \l_@@_tmpa_tl {:NV}
+
+ \use:c {\tl_use:N \l_@@_tmpa_tl }
+ \l_@@_current_tl
+ \l_@@_joinpath_tl
+ }
+
+ \spath_set_current_path:N \l_@@_current_tl
+ \spath_set_tikz_data:V \l_@@_joinpath_tl
+}
+\cs_generate_variant:Nn \@@_use_path:n {V, v}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}[internal]{
+% \@@_join_with:nn
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_join_with:Nn #1#2
+{
+ \tl_set:Nn \l_@@_joinpath_tl {#2}
+
+ \bool_if:NT \l_@@_reverse_bool
+ {
+ \spath_reverse:N \l_@@_joinpath_tl
+ }
+
+ \tl_if_empty:NF \l_@@_transformation_tl
+ {
+ \group_begin:
+ \pgftransformreset
+ \@@_tikzset:V \l_@@_transformation_tl
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset:Nn \g_@@_smuggle_tl
+ {
+ \spath_transform:Nnnnnnn
+ \l_@@_joinpath_tl
+ }
+ \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+ \tl_use:N \g_@@_smuggle_tl
+ }
+
+ \bool_if:NT \l_@@_move_bool
+ {
+ \spath_finalpoint:NV
+ \l_@@_tmpc_tl
+ #1
+ \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
+ }
+
+ \tl_clear:N \l_@@_tmpa_tl
+ \tl_set:Nn \l_@@_tmpa_tl {spath_}
+
+ \bool_if:NT \l_@@_global_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {g}
+ }
+
+ \tl_put_right:Nn \l_@@_tmpa_tl {append}
+
+ \bool_if:NT \l_@@_weld_bool
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
+ }
+ \tl_put_right:Nn \l_@@_tmpa_tl {:NV}
+
+ \cs_if_exist:cF {\tl_use:N \l_@@_tmpa_tl}
+ {
+ \tl_show:N \l_@@_tmpa_tl
+ }
+
+ \use:c {\tl_use:N \l_@@_tmpa_tl } #1
+ \l_@@_joinpath_tl
+}
+\cs_generate_variant:Nn \@@_join_with:Nn {cv, cn}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \@@_join_components_with:Nnn
+% \@@_join_components_upright_with:Nnn
+% }
+% Join the specified components of the first path by splicing in the second.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_join_components_with_aux:nnn #1#2#3
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpc_tl {#1}
+ \tl_if_empty:nT {#3}
+ {
+ \spath_spot_weld_components:N \l_@@_tmpc_tl
+ }
+
+ \spath_numberofcomponents:NV \l_@@_tmpa_int \l_@@_tmpc_tl
+ \@@_seq_from_foreach:NVn \l_@@_tmpb_seq \l_@@_tmpa_int {#3}
+
+ \spath_components_to_seq:NV \l_@@_tmpa_seq \l_@@_tmpc_tl
+
+ \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_pop_left:NN \l_@@_tmpb_seq \l_@@_tmpb_tl
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_pop_left:NNF \l_@@_tmpb_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_splice_between:Nnn \l_@@_tmpa_tl {#2} {##2}
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_join_components_with:Nnnn #1#2#3#4
+{
+ \@@_join_components_with_aux:nnn {#2}{#3}{#4}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_join_components_with:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_join_components_with:Nnn #1#2#3
+{
+ \@@_join_components_with:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_join_components_with:Nnn {cvV}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_with:Nnnn #1#2#3#4
+{
+ \@@_join_components_with_aux:nnn {#2}{#3}{#4}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_gjoin_components_with:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_with:Nnn #1#2#3
+{
+ \@@_gjoin_components_with:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_gjoin_components_with:Nnn {cvV}
+\cs_new_protected_nopar:Npn \@@_join_components_upright_with_aux:nnn #1#2#3
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpc_tl {#1}
+ \tl_if_empty:nT {#3}
+ {
+ \spath_spot_weld_components:N \l_@@_tmpc_tl
+ }
+
+ \spath_numberofcomponents:NV \l_@@_tmpa_int \l_@@_tmpc_tl
+ \@@_seq_from_foreach:NVn \l_@@_tmpb_seq \l_@@_tmpa_int {#3}
+
+ \spath_components_to_seq:NV \l_@@_tmpa_seq \l_@@_tmpc_tl
+
+ \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_pop_left:NN \l_@@_tmpb_seq \l_@@_tmpb_tl
+
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \spath_transform:NVnnnnnn \l_@@_tmpd_tl \l_@@_tmpc_tl {1}{0}{0}{-1}{0pt}{0pt}
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_pop_left:NNF \l_@@_tmpb_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+
+ \spath_finalpoint:NV \l_@@_tmpe_tl \l_@@_tmpa_tl
+ \spath_initialpoint:Nn \l_@@_tmpf_tl {##2}
+
+ \dim_compare:nTF
+ {
+ \tl_item:Nn \l_@@_tmpe_tl {1}
+ >
+ \tl_item:Nn \l_@@_tmpf_tl {1}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpd_tl
+ {##2}
+ }
+ {
+ \spath_splice_between:NVn
+ \l_@@_tmpa_tl
+ \l_@@_tmpc_tl
+ {##2}
+ }
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_join_components_upright_with:Nnnn #1#2#3#4
+{
+ \@@_join_components_upright_with_aux:nnn {#2}{#3}{#4}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_join_components_upright_with:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_join_components_upright_with:Nnn #1#2#3
+{
+ \@@_join_components_upright_with:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_join_components_upright_with:Nnn {cvV}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_upright_with:Nnnn #1#2#3#4
+{
+ \@@_join_components_upright_with_aux:nnn {#2}{#3}{#4}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_gjoin_components_upright_with:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_upright_with:Nnn #1#2#3
+{
+ \@@_gjoin_components_upright_with:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_gjoin_components_upright_with:Nnn {cvV}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{
+% \@@_get_components:Nn
+% }
+% Get the components of the named path to the token list.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_get_components_aux:n #1
+{
+ \clist_gclear_new:N \g_@@_output_clist
+ \spath_components_to_seq:Nn \l_@@_tmpa_seq {#1}
+
+ \seq_map_inline:Nn \l_@@_tmpa_seq
+ {
+ \spath_anonymous:N \l_@@_tmpa_tl
+ \tl_new:c {\@@_path_name:V \l_@@_tmpa_tl}
+ \tl_set:cn {\@@_path_name:V \l_@@_tmpa_tl} {##1}
+ \clist_gput_right:NV \g_@@_output_clist \l_@@_tmpa_tl
+ }
+}
+\cs_new_protected_nopar:Npn \@@_get_components:Nn #1#2
+{
+ \clist_clear_new:N #1
+ \@@_get_components_aux:n {#2}
+ \clist_set_eq:NN #1 \g_@@_output_clist
+ \clist_gclear:N \g_@@_output_clist
+}
+\cs_generate_variant:Nn \@@_get_components:Nn {NV, Nv}
+\cs_new_protected_nopar:Npn \@@_gget_components:Nn #1#2
+{
+ \clist_gclear_new:N #1
+ \@@_get_components_aux:n {#2}
+ \clist_gset_eq:NN #1 \g_@@_output_clist
+ \clist_gclear:N \g_@@_output_clist
+}
+\cs_generate_variant:Nn \@@_gget_components:Nn {NV, Nv}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{
+% \@@_render_components:n
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_render_components:nn #1#2
+{
+ \group_begin:
+ \spath_components_to_seq:Nn \l_@@_tmpa_seq {#2}
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \spath_tikz_path:nn
+ {
+ every~ spath~ component/.try,
+ spath ~component~ ##1/.try,
+ spath ~component/.try={##1},
+ every~ #1~ component/.try,
+ #1 ~component~ ##1/.try,
+ #1 ~component/.try={##1},
+ }
+ {
+ ##2
+ }
+ }
+ \group_end:
+}
+\cs_generate_variant:Nn \@@_render_components:nn {nv}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \@@_insert_gaps_after_components:nn
+% }
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_components_aux:nnn #1#2#3
+{
+ \group_begin:
+ \spath_numberofcomponents:Nn \l_@@_tmpa_int {#1}
+ \@@_seq_from_foreach:NVn \l_@@_tmpa_seq \l_@@_tmpa_int {#3}
+
+ \tl_if_empty:nT {#3}
+ {
+ \seq_pop_right:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ }
+
+ \seq_clear:N \l_@@_tmpb_seq
+ \seq_map_inline:Nn \l_@@_tmpa_seq {
+ \seq_put_right:Nx
+ \l_@@_tmpb_seq
+ {\int_eval:n
+ {
+ \int_mod:nn { ##1 }{ \l_@@_tmpa_int } + 1
+ }
+ }
+ }
+
+ \spath_components_to_seq:Nn \l_@@_tmpc_seq {#1}
+
+ \seq_clear:N \l_@@_tmpd_seq
+ \seq_map_indexed_inline:Nn \l_@@_tmpc_seq
+ {
+ \tl_set:Nn \l_@@_tmpa_tl {##2}
+ \seq_if_in:NnT \l_@@_tmpa_seq {##1}
+ {
+ \spath_shorten_at_end:Nn \l_@@_tmpa_tl {(#2)/2}
+ }
+ \seq_if_in:NnT \l_@@_tmpb_seq {##1}
+ {
+ \spath_shorten_at_start:Nn \l_@@_tmpa_tl {(#2)/2}
+ }
+ \seq_put_right:NV \l_@@_tmpd_seq \l_@@_tmpa_tl
+ }
+ \tl_gset:Nx \g_@@_output_tl {\seq_use:Nn \l_@@_tmpd_seq {} }
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_components:Nnnn #1#2#3#4
+{
+ \@@_insert_gaps_after_components_aux:nnn {#2}{#3}{#4}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_insert_gaps_after_components:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_components:Nnn #1#2#3
+{
+ \@@_insert_gaps_after_components:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_insert_gaps_after_components:Nnn {cnn, cVV}
+\cs_new_protected_nopar:Npn \@@_ginsert_gaps_after_components:Nnnn #1#2#3#4
+{
+ \@@_insert_gaps_after_components_aux:nnn {#2}{#3}{#4}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_ginsert_gaps_after_components:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_ginsert_gaps_after_components:Nnn #1#2#3
+{
+ \@@_ginsert_gaps_after_components:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_ginsert_gaps_after_components:Nnn {cnn, cVV}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \@@_insert_gaps_after_segments:Nn
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_segments_aux:nnn #1#2#3
+{
+ \group_begin:
+ \spath_reallength:Nn \l_@@_tmpa_int {#1}
+ \@@_seq_from_foreach:NVn \l_@@_tmpa_seq \l_@@_tmpa_int {#3}
+
+ \tl_if_empty:nT {#3}
+ {
+ \seq_pop_right:NN \l_@@_tmpb_seq \l_@@_tmpa_tl
+ }
+
+ \seq_clear:N \l_@@_tmpb_seq
+ \seq_map_inline:Nn \l_@@_tmpa_seq {
+ \seq_put_right:Nx
+ \l_@@_tmpb_seq
+ {\int_eval:n
+ {
+ \int_mod:nn { ##1 }{ \l_@@_tmpa_int } + 1
+ }
+ }
+ }
+
+ \spath_segments_to_seq:Nn \l_@@_tmpc_seq {#1}
+
+ \seq_clear:N \l_@@_tmpd_seq
+ \seq_map_indexed_inline:Nn \l_@@_tmpc_seq
+ {
+ \tl_set:Nn \l_@@_tmpa_tl {##2}
+ \seq_if_in:NnT \l_@@_tmpa_seq {##1}
+ {
+ \spath_shorten_at_end:Nn \l_@@_tmpa_tl {(#2)/2}
+ }
+ \seq_if_in:NnT \l_@@_tmpb_seq {##1}
+ {
+ \spath_shorten_at_start:Nn \l_@@_tmpa_tl {(#2)/2}
+ }
+ \seq_put_right:NV \l_@@_tmpd_seq \l_@@_tmpa_tl
+ }
+ \tl_gset:Nx \g_@@_output_tl {\seq_use:Nn \l_@@_tmpd_seq {} }
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_segments:Nnnn #1#2#3#4
+{
+ \@@_insert_gaps_after_segments_aux:nnn {#2}{#3}{#4}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_insert_gaps_after_segments:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_insert_gaps_after_segments:Nnn #1#2#3
+{
+ \@@_insert_gaps_after_segments:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_insert_gaps_after_segments:Nnn {cnn, cVV}
+\cs_new_protected_nopar:Npn \@@_ginsert_gaps_after_segments:Nnnn #1#2#3#4
+{
+ \@@_insert_gaps_after_segments_aux:nnn {#2}{#3}{#4}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_ginsert_gaps_after_segments:Nnnn {NVnn}
+\cs_new_protected_nopar:Npn \@@_ginsert_gaps_after_segments:Nnn #1#2#3
+{
+ \@@_ginsert_gaps_after_segments:NVnn #1#1{#2}{#3}
+}
+\cs_generate_variant:Nn \@@_ginsert_gaps_after_segments:Nnn {cnn, cVV}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \@@_join_components:Nn
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_join_components_aux:nn #1#2
+{
+ \group_begin:
+
+ \tl_set:Nn \l_@@_tmpa_tl {#1}
+ \spath_numberofcomponents:NV \l_@@_tmpa_int \l_@@_tmpa_tl
+ \@@_seq_from_foreach:NVn \l_@@_tmpa_seq \l_@@_tmpa_int {#2}
+
+ \seq_reverse:N \l_@@_tmpa_seq
+
+ \seq_map_inline:Nn \l_@@_tmpa_seq
+ {
+ \spath_join_component:Nn \l_@@_tmpa_tl {##1}
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_join_components:Nnn #1#2#3
+{
+ \@@_join_components_aux:nn {#2}{#3}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_join_components:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_join_components:Nn #1#2
+{
+ \@@_join_components:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_join_components:Nn {cn}
+\cs_new_protected_nopar:Npn \@@_gjoin_components:Nnn #1#2#3
+{
+ \@@_join_components_aux:nn {#2}{#3}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_gjoin_components:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_gjoin_components:Nn #1#2
+{
+ \@@_gjoin_components:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_gjoin_components:Nn {cn}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{
+% \@@_join_components_with_bezier:Nn
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_join_components_with_bezier_aux:nn #1#2
+{
+ \group_begin:
+ \tl_set:Nn \l_@@_tmpc_tl {#1}
+ \tl_if_empty:nT {#2}
+ {
+ \spath_spot_weld_components:N \l_@@_tmpc_tl
+ }
+
+ \spath_numberofcomponents:NV \l_@@_tmpa_int \l_@@_tmpc_tl
+ \@@_seq_from_foreach:NVn \l_@@_tmpb_seq \l_@@_tmpa_int {#2}
+
+ \spath_components_to_seq:NV \l_@@_tmpa_seq \l_@@_tmpc_tl
+
+ \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
+ \seq_pop_left:NN \l_@@_tmpb_seq \l_@@_tmpb_tl
+
+ \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ {
+ \int_compare:nTF
+ {
+ ##1 == \l_@@_tmpb_tl
+ }
+ {
+ \seq_pop_left:NNF \l_@@_tmpb_seq \l_@@_tmpb_tl
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {-1}
+ }
+ \spath_curve_between:Nn \l_@@_tmpa_tl {##2}
+ }
+ {
+ \tl_put_right:Nn \l_@@_tmpa_tl {##2}
+ }
+ }
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_join_components_with_bezier:Nnn #1#2#3
+{
+ \@@_join_components_with_bezier_aux:nn {#2}{#3}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_join_components_with_bezier:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_join_components_with_bezier:Nn #1#2
+{
+ \@@_join_components_with_bezier:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_join_components_with_bezier:Nn {cV}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_with_bezier:Nnn #1#2#3
+{
+ \@@_join_components_with_bezier_aux:nn {#2}{#3}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_gjoin_components_with_bezier:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_gjoin_components_with_bezier:Nn #1#2
+{
+ \@@_gjoin_components_with_bezier:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_gjoin_components_with_bezier:Nn {cV}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}[internal]{
+% \@@_remove_components:nn
+% }
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_remove_components_aux:nn #1#2
+{
+ \group_begin:
+
+ \spath_numberofcomponents:Nn \l_@@_tmpa_int {#1}
+ \@@_seq_from_foreach:NVn \l_@@_tmpa_seq \l_@@_tmpa_int {#2}
+
+ \spath_components_to_seq:Nn \l_@@_tmpb_seq {#1}
+
+ \seq_pop_left:NNF \l_@@_tmpa_seq \l_@@_tmpa_tl
+ {
+ \tl_clear:N \l_@@_tmpa_tl
+ }
+
+ \seq_clear:N \l_@@_tmpc_seq
+ \seq_map_indexed_inline:Nn \l_@@_tmpb_seq
+ {
+ \tl_set:Nn \l_@@_tmpb_tl {##1}
+ \tl_if_eq:NNTF \l_@@_tmpb_tl \l_@@_tmpa_tl
+ {
+ \seq_pop_left:NNF \l_@@_tmpa_seq \l_@@_tmpa_tl
+ {
+ \tl_clear:N \l_@@_tmpa_tl
+ }
+ }
+ {
+ \seq_put_right:Nn \l_@@_tmpc_seq {##2}
+ }
+ }
+
+ \tl_gset:Nx \g_@@_output_tl {\seq_use:Nn \l_@@_tmpc_seq {} }
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_remove_components:Nnn #1#2#3
+{
+ \@@_remove_components_aux:nn {#2}{#3}
+ \tl_set_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_remove_components:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_remove_components:Nn #1#2
+{
+ \@@_remove_components:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_remove_components:Nn {cn}
+\cs_new_protected_nopar:Npn \@@_gremove_components:Nnn #1#2#3
+{
+ \@@_remove_components_aux:nn {#2}{#3}
+ \tl_gset_eq:NN #1 \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_gremove_components:Nnn {NVn}
+\cs_new_protected_nopar:Npn \@@_gremove_components:Nn #1#2
+{
+ \@@_gremove_components:NVn #1#1{#2}
+}
+\cs_generate_variant:Nn \@@_gremove_components:Nn {cn}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}[internal]{
+% \@@_transform_to:nn,
+% \@@_transform_upright_to:nn
+% }
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_transform_to_aux:nn #1#2
+{
+ \group_begin:
+ \spath_reallength:Nn \l_@@_tmpa_int {#2}
+
+ \tl_set:Nx \l_@@_tmpb_tl
+ {\fp_to_decimal:n {(#1) * (\l_@@_tmpa_int)}}
+ \spath_transformation_at:NnV \l_@@_tmpc_tl {#2} \l_@@_tmpb_tl
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpc_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \@@_transform_to:nn #1#2
+{
+ \@@_transform_to_aux:nn {#1}{#2}
+ \exp_last_unbraced:NV \pgfsettransformentries \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_transform_to:nn {nv}
+\cs_new_protected_nopar:Npn \@@_transform_upright_to:nn #1#2
+{
+ \@@_transform_to_aux:nn {#1}{#2}
+ \fp_compare:nT { \tl_item:Nn \g_@@_output_tl {4} < 0}
+ {
+ \tl_gset:Nx \g_@@_output_tl
+ {
+ { \fp_eval:n { - (\tl_item:Nn \g_@@_output_tl {1})} }
+ { \fp_eval:n { - (\tl_item:Nn \g_@@_output_tl {2})} }
+ { \fp_eval:n { - (\tl_item:Nn \g_@@_output_tl {3})} }
+ { \fp_eval:n { - (\tl_item:Nn \g_@@_output_tl {4})} }
+ { \tl_item:Nn \g_@@_output_tl {5} }
+ { \tl_item:Nn \g_@@_output_tl {6} }
+ }
+ }
+ \exp_last_unbraced:NV \pgfsettransformentries \g_@@_output_tl
+ \tl_gclear:N \g_@@_output_tl
+}
+\cs_generate_variant:Nn \@@_transform_upright_to:nn {nv}
+% \end{macrocode}
+% \end{macro}
+%
+%
+%
+% \subsection{Keys}
% Now we define all of our keys.
%
% \begin{macrocode}
@@ -5224,6 +7940,14 @@ manipulating PGF soft paths}
},
% \end{macrocode}
%
+% Hook in to the end of the path construction
+%
+% \begin{macrocode}
+ at~ end~ path~ construction/.code={
+ \tl_put_right:Nn \l_@@_tikzpath_finish_tl {#1}
+ },
+% \end{macrocode}
+%
% Keys for saving and cloning a soft path.
%
% \begin{macrocode}
@@ -5231,8 +7955,8 @@ manipulating PGF soft paths}
\tikz@addmode{
\spath_get_current_path:N \l_@@_tmpa_tl
\spath_bake_round:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
- \spath_save_path:cV
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \spath_bake_shorten:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
+ \spath_save_path:cV {\@@_path_name:n {#1}}
\l_@@_tmpa_tl
}
},
@@ -5240,38 +7964,30 @@ manipulating PGF soft paths}
\tikz@addmode{
\spath_get_current_path:N \l_@@_tmpa_tl
\spath_bake_round:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
- \spath_gsave_path:cV
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \spath_bake_shorten:NV \l_@@_tmpa_tl \l_@@_tmpa_tl
+ \spath_gsave_path:cV {\@@_path_name:n {#1}}
\l_@@_tmpa_tl
}
},
clone/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_clear_new:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \tl_set_eq:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path:nn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \@@_check_path:nnn {
+ \tl_clear_new:c {\@@_path_name:n {#1}}
+ \tl_set_eq:cc {\@@_path_name:n {#1}}
+ }
}
+ {#2}{}
},
clone~ global/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_gclear_new:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \tl_gset_eq:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path:nn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \@@_check_path:nnn {
+ \tl_gclear_new:c {\@@_path_name:n {#1}}
+ \tl_gset_eq:cc {\@@_path_name:n {#1}}
+ }
}
+ {#2}{}
},
% \end{macrocode}
%
@@ -5279,15 +7995,14 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
save~ to~ aux/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path:nn
{
- \spath_save_to_aux:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \@@_check_path:nnn {
+ \spath_save_to_aux:c
+ }
}
+ {#1}
+ {}
},
% \end{macrocode}
%
@@ -5295,15 +8010,14 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
export~ to~ svg/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_export_to_svg:nv {#1}
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path:nn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \@@_check_path:nnn {
+ \spath_export_to_svg:nv {#1}
+ }
}
+ {#1}
+ {}
},
% \end{macrocode}
%
@@ -5317,6 +8031,8 @@ manipulating PGF soft paths}
\bool_set_false:N \l_@@_reverse_bool
\bool_set_false:N \l_@@_weld_bool
\bool_set_false:N \l_@@_move_bool
+ \bool_set_false:N \l_@@_current_transformation_bool
+ \bool_set_true:N \l_spath_movetorelevant_bool
\tl_clear:N \l_@@_joinpath_tl
\tl_clear:N \l_@@_transformation_tl
\tikzset{
@@ -5324,103 +8040,11 @@ manipulating PGF soft paths}
#1
}
- \tl_if_exist:cTF
+ \@@_check_path:nVn
{
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_joinpath_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {
- \tl_if_empty:cT
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_joinpath_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {
- \msg_warning:nnn { spath3 } { empty soft path } { #1 }
- }
- \tl_set_eq:Nc \l_@@_joinpath_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_joinpath_tl
- \tl_use:N \l_@@_suffix_tl
- }
- \spath_get_current_path:N \l_@@_current_tl
-
- \bool_if:NT \l_@@_reverse_bool
- {
- \spath_reverse:N \l_@@_joinpath_tl
- }
-
- \tl_if_empty:NF \l_@@_transformation_tl
- {
- \group_begin:
- \pgftransformreset
- \@@_tikzset:V \l_@@_transformation_tl
- \pgfgettransform \l_@@_tmpa_tl
- \tl_gset:Nn \g_@@_smuggle_tl
- {
- \spath_transform:Nnnnnnn
- \l_@@_joinpath_tl
- }
- \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
- \group_end:
- \tl_use:N \g_@@_smuggle_tl
- }
-
- \bool_if:NT \l_@@_move_bool
- {
- \tl_if_empty:NTF \l_@@_current_tl
- {
- \tl_set:Nn \l_@@_tmpc_tl { {0pt} {0pt} }
- }
- {
- \spath_finalpoint:NV
- \l_@@_tmpc_tl
- \l_@@_current_tl
- }
- \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
- }
-
- \tl_if_empty:NTF \l_@@_current_tl
- {
- \tl_if_empty:NTF \l_@@_joinpath_tl
- {
- \tl_set_eq:NN \l_@@_current_tl \c_spath_moveto_tl
- \tl_put_right:Nn \l_@@_current_tl {{0pt}{0pt}}
- }
- {
- \tl_set_eq:NN \l_@@_current_tl \l_@@_joinpath_tl
- }
- }
- {
-
- \tl_clear:N \l_@@_tmpa_tl
- \tl_set:Nn \l_@@_tmpa_tl {spath_}
-
- \tl_put_right:Nn \l_@@_tmpa_tl {append}
-
- \bool_if:NT \l_@@_weld_bool
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
- }
- \tl_put_right:Nn \l_@@_tmpa_tl {:NV}
-
- \use:c {\tl_use:N \l_@@_tmpa_tl }
- \l_@@_current_tl
- \l_@@_joinpath_tl
- }
+ \@@_use_path:v
+ } \l_@@_joinpath_tl {}
- \spath_set_current_path:N \l_@@_current_tl
- \spath_set_tikz_data:V \l_@@_joinpath_tl
- }
- {
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- {\tl_use:N \l_@@_joinpath_tl }
- }
},
% \end{macrocode}
%
@@ -5453,23 +8077,10 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
show/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_if_empty:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \msg_warning:nnn { spath3 } { empty soft path } { #1 }
- }
- {
- \iow_term:n {---~ soft~ path~ #1~ ---}
- \spath_show:v
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn {
+ \iow_term:n {---~ soft~ path~ #1~ ---}
+ \spath_show:v
+ } {#1} {}
},
% \end{macrocode}
%
@@ -5479,98 +8090,25 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
join~ with/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \bool_set_false:N \l_@@_reverse_bool
- \bool_set_false:N \l_@@_weld_bool
- \bool_set_false:N \l_@@_move_bool
- \bool_set_false:N \l_@@_global_bool
- \tl_clear:N \l_@@_joinpath_tl
- \tl_clear:N \l_@@_transformation_tl
- \tikzset{
- spath/join/.cd,
- #2
- }
-
- \tl_if_exist:cTF
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_joinpath_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {
- \tl_set_eq:Nc \l_@@_joinpath_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_joinpath_tl
- \tl_use:N \l_@@_suffix_tl
- }
-
- \bool_if:NT \l_@@_reverse_bool
- {
- \spath_reverse:N \l_@@_joinpath_tl
- }
-
- \tl_if_empty:NF \l_@@_transformation_tl
- {
- \group_begin:
- \pgftransformreset
- \@@_tikzset:V \l_@@_transformation_tl
- \pgfgettransform \l_@@_tmpa_tl
- \tl_gset:Nn \g_@@_smuggle_tl
- {
- \spath_transform:Nnnnnnn
- \l_@@_joinpath_tl
- }
- \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
- \group_end:
- \tl_use:N \g_@@_smuggle_tl
- }
-
- \bool_if:NT \l_@@_move_bool
- {
- \spath_finalpoint:Nv
- \l_@@_tmpc_tl
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \spath_translate_to:NV \l_@@_joinpath_tl \l_@@_tmpc_tl
- }
-
- \tl_clear:N \l_@@_tmpa_tl
- \tl_set:Nn \l_@@_tmpa_tl {spath_}
-
- \bool_if:NT \l_@@_global_bool
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {g}
- }
-
- \tl_put_right:Nn \l_@@_tmpa_tl {append}
-
- \bool_if:NT \l_@@_weld_bool
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {_no_move}
- }
- \tl_put_right:Nn \l_@@_tmpa_tl {:cV}
+ \bool_set_false:N \l_@@_reverse_bool
+ \bool_set_false:N \l_@@_weld_bool
+ \bool_set_false:N \l_@@_move_bool
+ \bool_set_false:N \l_@@_global_bool
+ \bool_set_false:N \l_@@_current_transformation_bool
+ \tl_clear:N \l_@@_joinpath_tl
+ \tl_clear:N \l_@@_transformation_tl
+ \tikzset{
+ spath/join/.cd,
+ #2
+ }
- \cs_if_exist:cF {\tl_use:N \l_@@_tmpa_tl}
- {
- \tl_show:N \l_@@_tmpa_tl
- }
-
- \use:c {\tl_use:N \l_@@_tmpa_tl }
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_joinpath_tl
- }
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_two_paths:nnVn
{
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- {\tl_use:N \l_@@_joinpath_tl }
+ \@@_join_with:cv
}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { \l_@@_joinpath_tl {} }
},
% \end{macrocode}
%
@@ -5578,26 +8116,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
spot~ weld/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_spot_weld_components:c
+ }
+ } {#1} { {} }
},
spot~ weld~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_spot_gweld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_spot_gweld_components:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
@@ -5605,26 +8139,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
reverse/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_reverse:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_reverse:c
+ }
+ } {#1} { {} }
},
reverse~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_reverse:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_greverse:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
@@ -5632,32 +8162,26 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
span/.code ~n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \@@_process_tikz_point:Nn \l_@@_tmpa_tl {#2}
- \@@_process_tikz_point:Nn \l_@@_tmpb_tl {#3}
- \spath_span:cVV
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl \l_@@_tmpb_tl
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \@@_process_tikz_point:Nn \l_@@_tmpa_tl {#2}
+ \@@_process_tikz_point:Nn \l_@@_tmpb_tl {#3}
+ \spath_span:cVV
+ }
+ } {#1} { {} \l_@@_tmpa_tl \l_@@_tmpb_tl }
},
span~ global/.code ~n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \@@_process_tikz_point:Nn \l_@@_tmpa_tl {#2}
- \@@_process_tikz_point:Nn \l_@@_tmpb_tl {#3}
- \spath_gspan:cVV
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl \l_@@_tmpb_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \@@_process_tikz_point:Nn \l_@@_tmpa_tl {#2}
+ \@@_process_tikz_point:Nn \l_@@_tmpb_tl {#3}
+ \spath_span:cVV
+ }
+ } {#1} { {} \l_@@_tmpa_tl \l_@@_tmpb_tl }
},
% \end{macrocode}
%
@@ -5668,69 +8192,34 @@ manipulating PGF soft paths}
to~path={
[
spath/span={#1}{(\tikztostart)}{(\tikztotarget)},
- spath/append~no~move={#1},
+ spath/use={#1,weld},
]
\tikztonodes
}
},
% \end{macrocode}
%
+%
% Splice three paths together, transforming the middle one so that it exactly fits between the first and third.
%
% \begin{macrocode}
splice/.code ~n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #3 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_splice_between:cvv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #3 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #3 }
- }
- }
+ \@@_check_three_paths:nnnnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \spath_splice_between:cvv
}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {#2} {#3} {} }
},
splice~ global/.code ~n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #3 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_gsplice_between:cvv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #3 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #3 }
- }
- }
+ \@@_check_three_paths:nnnnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \spath_gsplice_between:cvv
}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {#2} {#3} {} }
},
% \end{macrocode}
%
@@ -5742,447 +8231,177 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
join~ components~ with/.code~2~args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_head_is_group:nTF {#2}
{
- \tl_if_head_is_group:nTF {#2}
- {
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
- }
- {
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
- }
- \tl_if_exist:cTF
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {
- \tl_if_empty:NT \l_@@_tmpd_tl
- {
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
-
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \seq_gclear:N \g_@@_tmpa_seq
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- }
- }
- {
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- }
-
- \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
-
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \int_compare:nTF
- {
- ##1 == \l_@@_tmpb_tl
- }
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
- {
- \tl_set:Nn \l_@@_tmpb_tl {-1}
- }
- \spath_splice_between:Nvn \l_@@_tmpa_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {##2}
- }
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {##2}
- }
- }
- \tl_set_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl
- }
- {
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- { \tl_use:N \l_@@_tmpc_tl }
- }
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
}
- },
- join~ components~ globally~ with/.code~2~args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_head_is_group:nTF {#2}
- {
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
- }
- {
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
- }
- \tl_if_exist:cTF
+ \@@_check_two_paths:nnVn
{
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
+ \@@_join_components_with:cvV
}
- {
- \tl_if_empty:NT \l_@@_tmpd_tl
- {
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
-
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \seq_gclear:N \g_@@_tmpa_seq
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- }
- }
- {
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- }
-
- \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
+ } {#1} { \l_@@_tmpc_tl {} \l_@@_tmpd_tl }
+ },
+ join~ components~ globally~ with/.code~2~args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \int_compare:nTF
- {
- ##1 == \l_@@_tmpb_tl
- }
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
- {
- \tl_set:Nn \l_@@_tmpb_tl {-1}
- }
- \spath_splice_between:Nvn \l_@@_tmpa_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {##2}
- }
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {##2}
- }
- }
- \tl_gset_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl
- }
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_two_paths:nnVn
{
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- { \tl_use:N \l_@@_tmpc_tl }
+ \@@_gjoin_components_with:cvV
}
+ } {#1} { \l_@@_tmpc_tl {} \l_@@_tmpd_tl }
+ },
+ join~ components~ upright~ with/.code~2~args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
}
- },
- join~ components~ upright~ with/.code~2~args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_head_is_group:nTF {#2}
- {
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
- }
- {
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
- }
- \tl_if_exist:cTF
+ \@@_check_two_paths:nnVn
{
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
+ \@@_join_components_upright_with:cvV
}
- {
- \tl_if_empty:NT \l_@@_tmpd_tl
- {
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
-
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \seq_gclear:N \g_@@_tmpa_seq
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- }
- }
- {
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- }
-
- \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
-
- \tl_set_eq:Nc \l_@@_tmpc_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
- }
- \spath_transform:NVnnnnnn \l_@@_tmpd_tl \l_@@_tmpc_tl {1}{0}{0}{-1}{0pt}{0pt}
-
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \int_compare:nTF
- {
- ##1 == \l_@@_tmpb_tl
- }
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
- {
- \tl_set:Nn \l_@@_tmpb_tl {-1}
- }
- \spath_finalpoint:NV \l_@@_tmpe_tl \l_@@_tmpa_tl
- \spath_initialpoint:Nn \l_@@_tmpf_tl {##2}
+ } {#1} { \l_@@_tmpc_tl {} \l_@@_tmpd_tl }
+ },
+ join~ components~ globally~ upright~ with/.code~2~args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
- \dim_compare:nTF
- {
- \tl_item:Nn \l_@@_tmpe_tl {1}
- >
- \tl_item:Nn \l_@@_tmpf_tl {1}
- }
- {
- \spath_splice_between:NVn
- \l_@@_tmpa_tl
- \l_@@_tmpd_tl
- {##2}
- }
- {
- \spath_splice_between:NVn
- \l_@@_tmpa_tl
- \l_@@_tmpc_tl
- {##2}
- }
- }
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {##2}
- }
- }
- \tl_set_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl
- }
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_two_paths:nnVn
{
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- { \tl_use:N \l_@@_tmpc_tl }
+ \@@_gjoin_components_upright_with:cvV
}
+ } {#1} { \l_@@_tmpc_tl {} \l_@@_tmpd_tl }
+ },
+ join~ components~ with~ bezier/.code={
+ \tl_if_head_is_group:nTF {#1}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#1} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#1} {2} }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \tl_set:Nn \l_@@_tmpc_tl {#1}
+ \tl_clear:N \l_@@_tmpd_tl
}
- },
- join~ components~ globally~ upright~ with/.code~2~args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \@@_maybe_current_path_reuse:nVn
{
- \tl_if_head_is_group:nTF {#2}
+ \@@_check_path:nnn
{
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ \@@_join_components_with_bezier:cV
}
+ } \l_@@_tmpc_tl { {} \l_@@_tmpd_tl }
+ },
+ join~ components~ globally~ with~ bezier/.code~2~args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
+ \@@_gjoin_components_with_bezier:cn
}
- \tl_if_exist:cTF
+ } {#1} { {} {#2} }
+ },
+% \end{macrocode}
+%
+% Close a path.
+%
+% \begin{macrocode}
+ close/.code={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
+ \spath_close:c
}
+ } {#1} { {} }
+ },
+ close~ globally/.code={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \tl_if_empty:NT \l_@@_tmpd_tl
- {
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
-
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \seq_gclear:N \g_@@_tmpa_seq
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} {\seq_count:N \l_@@_tmpa_seq}
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- }
- }
- {
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- }
-
- \seq_pop_left:NN \l_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gpop_left:NN \g_@@_tmpa_seq \l_@@_tmpb_tl
-
- \tl_set_eq:Nc \l_@@_tmpc_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpc_tl
- \tl_use:N \l_@@_suffix_tl
- }
- \spath_transform:NVnnnnnn \l_@@_tmpd_tl \l_@@_tmpc_tl {1}{0}{0}{-1}{0pt}{0pt}
-
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \int_compare:nTF
- {
- ##1 == \l_@@_tmpb_tl
- }
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpb_tl
- {
- \tl_set:Nn \l_@@_tmpb_tl {-1}
- }
- \spath_finalpoint:NV \l_@@_tmpe_tl \l_@@_tmpa_tl
- \spath_initialpoint:Nn \l_@@_tmpf_tl {##2}
-
- \dim_compare:nTF
- {
- \tl_item:Nn \l_@@_tmpe_tl {1}
- >
- \tl_item:Nn \l_@@_tmpf_tl {1}
- }
- {
- \spath_splice_between:NVn
- \l_@@_tmpa_tl
- \l_@@_tmpd_tl
- {##2}
- }
- {
- \spath_splice_between:NVn
- \l_@@_tmpa_tl
- \l_@@_tmpc_tl
- {##2}
- }
- }
- {
- \tl_put_right:Nn \l_@@_tmpa_tl {##2}
- }
- }
- \tl_gset_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \l_@@_tmpa_tl
+ \spath_gclose:c
}
+ } {#1} { {} }
+ },
+% \end{macrocode}
+%
+% Open a path.
+%
+% \begin{macrocode}
+ open/.code={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- { \tl_use:N \l_@@_tmpc_tl }
+ \spath_open:c
}
- }
+ } {#1} { {} }
+ },
+ open~ globally/.code={
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gopen:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
-% Close a path.
+% Close a path, ensuring that the end point is exactly where it will close up to.
%
% \begin{macrocode}
- close/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_close:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ adjust~ and~ close/.code={
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_adjust_close:c
+ }
+ } {#1} { {} }
},
- close~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_gclose:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ adjust~ and~ close~ globally/.code={
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_adjust_gclose:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
@@ -6190,117 +8409,191 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
close~ with/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
\spath_close_with:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {#2} {} }
},
close~ globally~ with/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
\spath_gclose_with:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
}
+ } {#1} { {#2} {} }
+ },
+% \end{macrocode}
+%
+% Close a path with a curve.
+%
+% \begin{macrocode}
+ close~ with~ curve/.code={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
+ \spath_close_with_curve:c
}
- }
+ } {#1} { {} }
+ },
+ close~ globally~ with~ curve/.code={
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gclose_with_curve:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
-% These keys shorten the path.
+% These keys shorten the path by a dimension.
%
% \begin{macrocode}
shorten~ at~ end/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_shorten_at_end:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_shorten_at_end:cn
+ }
+ } {#1} { {} {#2} }
},
shorten~ at~ start/.code~ 2~ args ={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_shorten_at_start:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_shorten_at_start:cn
+ }
+ } {#1} { {} {#2} }
},
shorten~ at~ both~ ends/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_shorten_at_end:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- \spath_shorten_at_start:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_shorten_at_both_ends:cn
+ }
+ } {#1} { {} {#2} }
},
shorten~ globally~ at~ end/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_gshorten_at_end:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gshorten_at_end:cn
+ }
+ } {#1} { {} {#2} }
},
shorten~ globally~ at~ start/.code~ 2~ args ={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_gshorten_at_start:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gshorten_at_start:cn
+ }
+ } {#1} { {} {#2} }
},
shorten~ globally~ at~ both~ ends/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_shorten_at_end:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- \spath_shorten_at_start:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl} {#2}
- }
+ \@@_check_path:nnn
+ {
+ \spath_gshorten_at_both_ends:cn
+ }
+ } {#1} { {} {#2} }
+ },
+% \end{macrocode}
+%
+% These keys split a path at a parameter, the \texttt{keep} versions only keep one part of the resultant path.
+%
+% \begin{macrocode}
+ split~ at/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_split_at_normalised:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ globally~ at/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_gsplit_at_normalised:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ at~ into/.code~ n~ args={4}{
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_split_at_normalised:ccvn {\@@_path_name:n {#1}}
+ {\@@_path_name:n {#2}}
+ }
+ } {#3} { {} {#4} }
+ },
+ split~ globally~ at~ into/.code~ n~ args={4}{
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_gsplit_at_normalised:ccvn {\@@_path_name:n {#1}}
+ {\@@_path_name:n {#2}}
+ }
+ } {#3} { {} {#4} }
+ },
+ split~ at~ keep~ start/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_split_at_normalised_keep_start:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ globally~ at~ keep~ start/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_gsplit_at_normalised_keep_start:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ at~ keep~ end/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_split_at_normalised_keep_end:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ globally~ at~ keep~ end/.code~ 2~ args={
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \spath_gsplit_at_normalised_keep_end:cn
+ }
+ } {#1} { {} {#2} }
+ },
+ split~ at~ keep~ middle/.style~ n~ args={3}{
+ /tikz/spath/split~ at~ keep~ start={#1}{#3},
+ /tikz/spath/split~ at~ keep~ end={#1}{(#2)/(#3)},
+ },
+ split~ globally~ at~ keep~ middle/.style~ n~ args={3}{
+ /tikz/spath/split~ globally~ at~ keep~ start={#1}{#3},
+ /tikz/spath/split~ globally~ at~ keep~ end={#1}{(#2)/(#3)},
},
% \end{macrocode}
%
@@ -6308,26 +8601,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
translate/.code~ n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_translate:cnn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}{#2}{#3}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_translate:cnn
+ }
+ } {#1} { {} {#2}{#3} }
},
translate~ globally/.code~ n~ args={3}{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_gtranslate:cnn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}{#2}{#3}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gtranslate:cnn
+ }
+ } {#1} { {} {#2}{#3} }
},
% \end{macrocode}
%
@@ -6335,26 +8624,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
normalise/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_normalise:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_normalise:c
+ }
+ } {#1} { {} }
},
normalise~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_gnormalise:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gnormalise:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
@@ -6362,75 +8647,55 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
transform/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \group_begin:
+ \pgftransformreset
+ \tikzset{#2}
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset_eq:NN \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+
+ \@@_maybe_current_path_reuse:nnn
{
- \group_begin:
- \pgftransformreset
- \tikzset{#2}
- \pgfgettransform \l_@@_tmpa_tl
- \tl_gset:Nn \g_@@_smuggle_tl
+ \@@_check_path:nnn
{
- \spath_transform:cnnnnnn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \spath_transform:cV
}
- \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
- \group_end:
- \tl_use:N \g_@@_smuggle_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} \g_@@_smuggle_tl }
},
transform~globally/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \group_begin:
+ \pgftransformreset
+ \tikzset{#2}
+ \pgfgettransform \l_@@_tmpa_tl
+ \tl_gset_eq:NN \g_@@_smuggle_tl \l_@@_tmpa_tl
+ \group_end:
+
+ \@@_maybe_current_path_reuse:nnn
{
- \group_begin:
- \pgftransformreset
- \tikzset{#2}
- \pgfgettransform \l_@@_tmpa_tl
- \tl_gset:Nn \g_@@_smuggle_tl
+ \@@_check_path:nnn
{
- \spath_gtransform:cnnnnnn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \spath_gtransform:cV
}
- \tl_gput_right:NV \g_@@_smuggle_tl \l_@@_tmpa_tl
- \group_end:
- \tl_use:N \g_@@_smuggle_tl
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} \g_@@_smuggle_tl }
},
% \end{macrocode}
%
% Splits first path where it intersects with the second.
%
% \begin{macrocode}
- split~ at~ intersections~ with/.code~ n~ args={2}{
+ split~ at~ intersections~ with/.code~ 2~ args={
\tl_if_exist:cTF
{
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_two_paths_reuse_first:nnnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
- \spath_split_path_at_intersections:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \spath_split_path_at_intersections:cv
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} {#2} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6442,23 +8707,13 @@ manipulating PGF soft paths}
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_two_paths_reuse_first:nnnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
\spath_gsplit_path_at_intersections:cv
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} {#2} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6475,23 +8730,13 @@ manipulating PGF soft paths}
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_two_paths_reuse_both:nnnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
\spath_split_at_intersections:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} {#2} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6503,23 +8748,13 @@ manipulating PGF soft paths}
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_two_paths_reuse_both:nnnn
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
+ \@@_check_two_paths:nnnn
{
\spath_gsplit_at_intersections:cc
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\tl_use:N \l_@@_prefix_tl #2 \tl_use:N \l_@@_suffix_tl}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #2 }
- }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} {#2} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6536,15 +8771,13 @@ manipulating PGF soft paths}
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_split_at_self_intersections:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_split_at_self_intersections:c
+ }
+ } {#1} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6556,15 +8789,13 @@ manipulating PGF soft paths}
tikz@library@intersections@loaded
}
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_gsplit_at_self_intersections:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gsplit_at_self_intersections:c
+ }
+ } {#1} { {} }
}
{
\msg_warning:nn { spath3 } { load intersections }
@@ -6576,64 +8807,24 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
get~ components~ of/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path:nn
{
- \clist_clear_new:N #2
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \seq_map_inline:Nn \l_@@_tmpa_seq
- {
- \tl_new:c
- {
- \tl_use:N \l_@@_prefix_tl
- anonymous_\int_use:N \g_@@_anon_int
- \tl_use:N \l_@@_suffix_tl
- }
- \tl_set:cn
- {
- \tl_use:N \l_@@_prefix_tl
- anonymous_\int_use:N \g_@@_anon_int
- \tl_use:N \l_@@_suffix_tl
- } {##1}
- \clist_put_right:Nx #2 {anonymous_\int_use:N \g_@@_anon_int}
- \int_gincr:N \g_@@_anon_int
+ \@@_check_path:nnn {
+ \@@_get_components:Nv #2
}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ {#1}
+ {}
},
get~ components~ of~ globally/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path:nn
{
- \clist_gclear_new:N #2
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \seq_map_inline:Nn \l_@@_tmpa_seq
- {
- \tl_new:c
- {
- \tl_use:N \l_@@_prefix_tl
- anonymous_\int_use:N \g_@@_anon_int
- \tl_use:N \l_@@_suffix_tl
- }
- \tl_gset:cn
- {
- \tl_use:N \l_@@_prefix_tl
- anonymous_\int_use:N \g_@@_anon_int
- \tl_use:N \l_@@_suffix_tl
- } {##1}
- \clist_gput_right:Nx #2 {anonymous_\int_use:N \g_@@_anon_int}
- \int_gincr:N \g_@@_anon_int
+ \@@_check_path:nnn {
+ \@@_gget_components:Nv #2
}
}
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ {#1}
+ {}
},
% \end{macrocode}
%
@@ -6641,33 +8832,14 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
render~ components/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path:nn
{
- \group_begin:
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \spath_tikz_path:nn
- {
- every~ spath~ component/.try,
- spath ~component~ ##1/.try,
- spath ~component/.try={##1},
- every~ #1~ component/.try,
- #1 ~component~ ##1/.try,
- #1 ~component/.try={##1},
- }
- {
- ##2
- }
+ \@@_check_path:nnn {
+ \@@_render_components:nv {#1}
}
- \group_end:
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
}
+ {#1}
+ {}
},
% \end{macrocode}
%
@@ -6676,148 +8848,86 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
insert~ gaps~ after~ components/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \tl_if_head_is_group:nTF {#2}
{
- \group_begin:
- \tl_if_head_is_group:nTF {#2}
- {
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
- }
- {
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
- }
- \seq_gclear:N \g_@@_tmpa_seq
- \seq_gclear:N \g_@@_tmpb_seq
- \spath_numberofcomponents:Nv \l_@@_tmpa_int
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} { \l_@@_tmpa_int - 1 }
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
- {\int_eval:n {##1 + 1}}
- }
- }
- {
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
- {\int_eval:n
- {
- \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
- }
- }
- }
- }
-
- \seq_clear:N \l_@@_tmpb_seq
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
- {
- \tl_set:Nn \l_@@_tmpa_tl {##2}
- \seq_if_in:NnT \g_@@_tmpa_seq {##1}
- {
- \spath_shorten_at_end:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
- }
- \seq_if_in:NnT \g_@@_tmpb_seq {##1}
- {
- \spath_shorten_at_start:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
- }
- \seq_put_right:NV \l_@@_tmpb_seq \l_@@_tmpa_tl
- }
- \tl_gset:Nx \g_@@_output_tl {\seq_use:Nn \l_@@_tmpb_seq {} }
- \group_end:
- \tl_set_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \g_@@_output_tl
- \tl_gclear:N \g_@@_output_tl
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
}
- },
- insert~ gaps~ globally~ after~ components/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+
+ \@@_maybe_current_path_reuse:nnn
{
- \group_begin:
- \tl_if_head_is_group:nTF {#2}
- {
- \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
- \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
- }
+ \@@_check_path:nnn
{
- \tl_set:Nn \l_@@_tmpc_tl {#2}
- \tl_clear:N \l_@@_tmpd_tl
+ \@@_insert_gaps_after_components:cVV
}
- \seq_gclear:N \g_@@_tmpa_seq
- \seq_gclear:N \g_@@_tmpb_seq
- \spath_numberofcomponents:Nv \l_@@_tmpa_int
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ } {#1} { {} \l_@@_tmpc_tl \l_@@_tmpd_tl }
+ },
+ insert~ gaps~ globally~ after~ components/.code~ 2~ args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
-
- \tl_if_empty:NTF \l_@@_tmpd_tl
- {
- \int_step_inline:nnnn {1}{1} { \l_@@_tmpa_int - 1 }
- {
- \seq_gput_right:Nn \g_@@_tmpa_seq {##1}
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
- {\int_eval:n {##1 + 1}}
- }
- }
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \foreach \l_@@_tmpa_tl in \l_@@_tmpd_tl
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- \seq_gput_right:Nx
- \g_@@_tmpb_seq
- {\int_eval:n
- {
- \int_mod:nn { \l_@@_tmpa_tl }{ \l_@@_tmpa_int } + 1
- }
- }
- }
+ \@@_ginsert_gaps_after_components:cVV
}
+ } {#1} { {} \l_@@_tmpc_tl \l_@@_tmpd_tl }
+ },
+% \end{macrocode}
+%
+% This puts gaps between segments of a soft path.
+% The list of segments is passed through a \Verb+\foreach+ loop so can use the shortcut syntax from those loops.
+%
+% \begin{macrocode}
+ insert~ gaps~ after~ segments/.code~ 2~ args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
+ }
+ {
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
+ }
- \seq_clear:N \l_@@_tmpb_seq
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
{
- \tl_set:Nn \l_@@_tmpa_tl {##2}
- \seq_if_in:NnT \g_@@_tmpa_seq {##1}
- {
- \spath_shorten_at_end:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
- }
- \seq_if_in:NnT \g_@@_tmpb_seq {##1}
- {
- \spath_shorten_at_start:Nn \l_@@_tmpa_tl {\l_@@_tmpc_tl/2}
- }
- \seq_put_right:NV \l_@@_tmpb_seq \l_@@_tmpa_tl
+ \@@_insert_gaps_after_segments:cVV
}
- \tl_gset:Nx \g_@@_output_tl {\seq_use:Nn \l_@@_tmpb_seq {} }
- \group_end:
- \tl_gset_eq:cN
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \g_@@_output_tl
- \tl_gclear:N \g_@@_output_tl
+ } {#1} { {} \l_@@_tmpc_tl \l_@@_tmpd_tl }
+ },
+ insert~ gaps~ globally~ after~ segments/.code~ 2~ args={
+ \tl_if_head_is_group:nTF {#2}
+ {
+ \tl_set:Nx \l_@@_tmpc_tl { \tl_item:nn {#2} {1} }
+ \tl_set:Nx \l_@@_tmpd_tl { \tl_item:nn {#2} {2} }
}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
+ \tl_set:Nn \l_@@_tmpc_tl {#2}
+ \tl_clear:N \l_@@_tmpd_tl
}
+
+ \@@_maybe_current_path_reuse:nnn
+ {
+ \@@_check_path:nnn
+ {
+ \@@_ginsert_gaps_after_segments:cVV
+ }
+ } {#1} { {} \l_@@_tmpc_tl \l_@@_tmpd_tl }
},
% \end{macrocode}
%
@@ -6825,54 +8935,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
join~ components/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \seq_gclear:N \g_@@_tmpa_seq
- \foreach \l_@@_tmpa_tl in {#2}
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} > {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- \seq_map_inline:Nn \g_@@_tmpa_seq
+ \@@_check_path:nnn
{
- \spath_join_component:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}{##1}
+ \@@_join_components:cn
}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} {#2} }
},
join~ components~ globally/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \seq_gclear:N \g_@@_tmpa_seq
- \foreach \l_@@_tmpa_tl in {#2}
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} > {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- \seq_map_inline:Nn \g_@@_tmpa_seq
+ \@@_check_path:nnn
{
- \spath_gjoin_component:cn
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}{##1}
+ \@@_gjoin_components:cn
}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} {#2} }
},
% \end{macrocode}
%
@@ -6880,26 +8958,22 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
remove~ empty~ components/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_remove_empty_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_remove_empty_components:c
+ }
+ } {#1} { {} }
},
remove~ empty~ components~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_gremove_empty_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_gremove_empty_components:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
@@ -6907,120 +8981,46 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
replace~ lines/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_replace_lines:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_replace_lines:c
+ }
+ } {#1} { {} }
},
replace~ lines~ globally/.code={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_greplace_lines:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_greplace_lines:c
+ }
+ } {#1} { {} }
},
% \end{macrocode}
%
%
-% Join the specified components together, joining each to its previous one.
+% Remove the specified components.
%
% \begin{macrocode}
remove~ components/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \seq_gclear:N \g_@@_tmpa_seq
- \foreach \l_@@_tmpa_tl in {#2}
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpa_tl
- {
- \tl_clear:N \l_@@_tmpa_tl
- }
- \seq_clear:N \l_@@_tmpb_seq
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ \@@_check_path:nnn
{
- \tl_set:Nn \l_@@_tmpb_tl {##1}
- \tl_if_eq:NNTF \l_@@_tmpb_tl \l_@@_tmpa_tl
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpa_tl
- {
- \tl_clear:N \l_@@_tmpa_tl
- }
- }
- {
- \seq_put_right:Nn \l_@@_tmpb_seq {##2}
- }
+ \@@_remove_components:cn
}
- \tl_set:cx {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\seq_use:Nn \l_@@_tmpb_seq {} }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} {#2} }
},
remove~ components~ globally/.code~ 2~ args={
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \seq_gclear:N \g_@@_tmpa_seq
- \foreach \l_@@_tmpa_tl in {#2}
- {
- \seq_gput_right:NV \g_@@_tmpa_seq \l_@@_tmpa_tl
- }
- \seq_gsort:Nn \g_@@_tmpa_seq
- {
- \int_compare:nNnTF {##1} < {##2}
- { \sort_return_same: }
- { \sort_return_swapped: }
- }
- \spath_components_to_seq:Nv
- \l_@@_tmpa_seq
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpa_tl
- {
- \tl_clear:N \l_@@_tmpa_tl
- }
- \seq_clear:N \l_@@_tmpb_seq
- \seq_map_indexed_inline:Nn \l_@@_tmpa_seq
+ \@@_check_path:nnn
{
- \tl_set:Nn \l_@@_tmpb_tl {##1}
- \tl_if_eq:NNTF \l_@@_tmpb_tl \l_@@_tmpa_tl
- {
- \seq_gpop_left:NNF \g_@@_tmpa_seq \l_@@_tmpa_tl
- {
- \tl_clear:N \l_@@_tmpa_tl
- }
- }
- {
- \seq_put_right:Nn \l_@@_tmpb_seq {##2}
- }
+ \@@_gremove_components:cn
}
- \tl_gset:cx {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {\seq_use:Nn \l_@@_tmpb_seq {} }
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ } {#1} { {} {#2} }
},
% \end{macrocode}
%
@@ -7037,29 +9037,25 @@ manipulating PGF soft paths}
maybe~ spot~ weld/.code={
\bool_if:NF \l_@@_draft_bool
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
+ \@@_maybe_current_path_reuse:nnn
{
- \spath_spot_weld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
- {
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_spot_weld_components:c
+ }
+ } {#1} { {} }
}
},
maybe~ spot~ weld~ globally/.code={
\bool_if:NF \l_@@_draft_bool
{
- \tl_if_exist:cTF
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- {
- \spath_spot_gweld_components:c
- {\tl_use:N \l_@@_prefix_tl #1 \tl_use:N \l_@@_suffix_tl}
- }
+ \@@_maybe_current_path_reuse:nnn
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- }
+ \@@_check_path:nnn
+ {
+ \spath_spot_gweld_components:c
+ }
+ } {#1} { {} }
}
},
% \end{macrocode}
@@ -7068,40 +9064,16 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
transform~ to/.code~ 2~ args={
- \group_begin:
- \tl_if_exist:cTF
+ \@@_maybe_current_path:nn
{
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
- }
- {
- \spath_reallength:Nv
- \l_@@_tmpa_int
- {
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
+ \@@_check_path:nnn {
+ \@@_transform_to:nv {#2}
}
-
- \tl_set:Nx \l_@@_tmpb_tl
- {\fp_to_decimal:n {(#2) * (\l_@@_tmpa_int)}}
- \spath_transformation_at:NvV \l_@@_tmpc_tl
- {
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
- }
- \l_@@_tmpb_tl
- \tl_gset_eq:NN \g_@@_smuggle_tl \l_@@_tmpc_tl
}
+ {#1}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- \tl_gset_eq:NN \g_@@_smuggle_tl { {1}{0}{0}{1}{0pt}{0pt} }
+ \pgfsettransformentries {1}{0}{0}{1}{0pt}{0pt}
}
- \group_end:
- \exp_last_unbraced:NV \pgfsettransformentries \g_@@_smuggle_tl
- \tl_gclear:N \g_@@_smuggle_tl
},
% \end{macrocode}
%
@@ -7109,52 +9081,16 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
upright~ transform~ to/.code~ 2~ args={
- \group_begin:
- \tl_if_exist:cTF
- {
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
- }
+ \@@_maybe_current_path:nn
{
- \spath_reallength:Nv
- \l_@@_tmpa_int
- {
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
- }
-
- \tl_set:Nx \l_@@_tmpb_tl
- {\fp_to_decimal:n {(#2) * (\l_@@_tmpa_int)}}
- \spath_transformation_at:NvV \l_@@_tmpc_tl
- {
- \tl_use:N \l_@@_prefix_tl
- #1
- \tl_use:N \l_@@_suffix_tl
+ \@@_check_path:nnn {
+ \@@_transform_upright_to:nv {#2}
}
- \l_@@_tmpb_tl
- \tl_gset_eq:NN \g_@@_smuggle_tl \l_@@_tmpc_tl
}
+ {#1}
{
- \msg_warning:nnn { spath3 } { missing soft path } { #1 }
- \tl_gset_eq:NN \g_@@_smuggle_tl { {1}{0}{0}{1}{0pt}{0pt} }
- }
- \fp_compare:nT { \tl_item:Nn \g_@@_smuggle_tl {4} < 0}
- {
- \tl_gset:Nx \g_@@_smuggle_tl
- {
- { \fp_eval:n { - (\tl_item:Nn \g_@@_smuggle_tl {1})} }
- { \fp_eval:n { - (\tl_item:Nn \g_@@_smuggle_tl {2})} }
- { \fp_eval:n { - (\tl_item:Nn \g_@@_smuggle_tl {3})} }
- { \fp_eval:n { - (\tl_item:Nn \g_@@_smuggle_tl {4})} }
- { \tl_item:Nn \g_@@_smuggle_tl {5} }
- { \tl_item:Nn \g_@@_smuggle_tl {6} }
- }
+ \pgfsettransformentries {1}{0}{0}{1}{0pt}{0pt}
}
- \group_end:
- \exp_last_unbraced:NV \pgfsettransformentries \g_@@_smuggle_tl
- \tl_gclear:N \g_@@_smuggle_tl
},
% \end{macrocode}
%
@@ -7162,25 +9098,70 @@ manipulating PGF soft paths}
%
% \begin{macrocode}
knot/.style~ n~ args={3}{
- spath/split~ at~ self~ intersections=#1,
- spath/remove~ empty~ components=#1,
- spath/insert~ gaps~ after~ components={#1}{#2}{#3},
- spath/maybe~ spot~ weld=#1,
- spath/render~ components=#1
+ /tikz/spath/split~ at~ self~ intersections=#1,
+ /tikz/spath/remove~ empty~ components=#1,
+ /tikz/spath/insert~ gaps~ after~ components={#1}{#2}{#3},
+ /tikz/spath/maybe~ spot~ weld=#1,
+ /tikz/spath/render~ components=#1
},
global~ knot/.style~ n~ args={3}{
- spath/split~ globally~ at~ self~ intersections=#1,
- spath/remove~ empty~ components~ globally=#1,
- spath/insert~ gaps~ globally ~after~ components={#1}{#2}{#3},
- spath/maybe~ spot~ weld~ globally=#1,
- spath/render~ components=#1
+ /tikz/spath/split~ globally~ at~ self~ intersections=#1,
+ /tikz/spath/remove~ empty~ components~ globally=#1,
+ /tikz/spath/insert~ gaps~ globally ~after~ components={#1}{#2}{#3},
+ /tikz/spath/maybe~ spot~ weld~ globally=#1,
+ /tikz/spath/render~ components=#1
},
+% \end{macrocode}
+%
+% For single argument commands which take a path as their argument, set the default to be \Verb+current+ so that they use the current path.
+%
+% \begin{macrocode}
+ show/.default=current,
+ spot~ weld/.default=current,
+ spot~ weld~ globally/.default=current,
+ reverse/.default=current,
+ reverse~ globally/.default=current,
+ close/.default=current,
+ close~ globally/.default=current,
+ open/.default=current,
+ open~ globally/.default=current,
+ adjust~ and~ close/.default=current,
+ adjust~ and~ close~ globally/.default=current,
+ close~ with~ curve/.default=current,
+ close~ globally~ with~ curve/.default=current,
+ remove~ empty~ components/.default=current,
+ remove~ empty~ components~ globally/.default=current,
+ replace~ lines/.default=current,
+ replace~ lines~ globally/.default=current,
+ maybe~ spot~ weld/.default=current,
+ maybe~ spot~ weld~ globally/.default=current,
}
% \end{macrocode}
%
% This defines a coordinate system that finds a position on a soft path.
%
% \begin{macrocode}
+\cs_new_protected_nopar:Npn \@@_get_point_at:nn #1#2
+{
+ \group_begin:
+ \spath_reallength:Nn \l_@@_tmpa_int {#2}
+ \tl_set:Nx \l_@@_tmpb_tl
+ {\fp_to_decimal:n {(#1) * (\l_@@_tmpa_int)}}
+ \spath_point_at:NnV \l_@@_tmpc_tl {#2} \l_@@_tmpb_tl
+
+ \tl_clear:N \l_@@_tmpd_tl
+ \tl_put_right:Nn \l_@@_tmpd_tl {\pgf@x=}
+ \tl_put_right:Nx \l_@@_tmpd_tl {\tl_item:Nn \l_@@_tmpc_tl {1}}
+ \tl_put_right:Nn \l_@@_tmpd_tl {\relax}
+ \tl_put_right:Nn \l_@@_tmpd_tl {\pgf@y=}
+ \tl_put_right:Nx \l_@@_tmpd_tl {\tl_item:Nn \l_@@_tmpc_tl {2}}
+ \tl_put_right:Nn \l_@@_tmpd_tl {\relax}
+
+ \tl_gset_eq:NN \g_@@_output_tl \l_@@_tmpd_tl
+ \group_end:
+ }
+\cs_generate_variant:Nn \@@_get_point_at:nn {VV, Vn, Vv}
+
\tikzdeclarecoordinatesystem{spath}{%
\group_begin:
\tl_set:Nn \l_@@_tmpa_tl {#1}
@@ -7190,55 +9171,25 @@ manipulating PGF soft paths}
\seq_pop_right:NN \l_@@_tmpa_seq \l_@@_tmpb_tl
\tl_set:Nx \l_@@_tmpa_tl { \seq_use:Nn \l_@@_tmpa_seq {~} }
- \tl_if_exist:cTF
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpa_tl
- \tl_use:N \l_@@_suffix_tl
- }
- {
-
- \tl_set_eq:Nc
- \l_@@_tmpa_tl
- {
- \tl_use:N \l_@@_prefix_tl
- \tl_use:N \l_@@_tmpa_tl
- \tl_use:N \l_@@_suffix_tl
- }
-
- \tl_if_empty:NTF \l_@@_tmpa_tl
- {
- \tl_gset_eq:NN \g_@@_smuggle_tl \pgfpointorigin
- }
- {
- \spath_reallength:NV \l_@@_tmpa_int \l_@@_tmpa_tl
- \tl_set:Nx \l_@@_tmpb_tl
- {\fp_to_decimal:n {(\l_@@_tmpb_tl) * (\l_@@_tmpa_int)}}
- \spath_point_at:NVV \l_@@_tmpc_tl \l_@@_tmpa_tl \l_@@_tmpb_tl
- \tl_clear:N \l_@@_tmpd_tl
- \tl_put_right:Nn \l_@@_tmpd_tl {\pgf@x=}
- \tl_put_right:Nx \l_@@_tmpd_tl {\tl_item:Nn \l_@@_tmpc_tl {1}}
- \tl_put_right:Nn \l_@@_tmpd_tl {\relax}
- \tl_put_right:Nn \l_@@_tmpd_tl {\pgf@y=}
- \tl_put_right:Nx \l_@@_tmpd_tl {\tl_item:Nn \l_@@_tmpc_tl {2}}
- \tl_put_right:Nn \l_@@_tmpd_tl {\relax}
- \tl_gset_eq:NN \g_@@_smuggle_tl \l_@@_tmpd_tl
+ \@@_maybe_current_path:nV
+ {
+ \@@_check_path:nnn {
+ \@@_get_point_at:Vv \l_@@_tmpb_tl
}
}
+ \l_@@_tmpa_tl
{
- \msg_warning:nnx
- { spath3 }
- { missing soft path }
- { \tl_use:N \l_@@_tmpa_tl }
- \tl_gset_eq:NN \g_@@_smuggle_tl \pgfpointorigin
+ \tl_gset_eq:NN \g_@@_output_tl \pgfpointorigin
}
+
\group_end:
\use:c {pgf@process}{%
- \tl_use:N \g_@@_smuggle_tl
+ \tl_use:N \g_@@_output_tl
\pgftransforminvert
\use:c {pgf@pos@transform@glob}
}
+ \tl_gclear:N \g_@@_output_tl
}
\ExplSyntaxOff
@@ -8281,6 +10232,7 @@ manipulating PGF soft paths}
\bool_new:N \l_@@_append_next_bool
\bool_new:N \l_@@_skip_bool
\bool_new:N \l_@@_save_bool
+\bool_new:N \l_@@_debugging_bool
\seq_new:N \g_@@_nodes_seq
@@ -8417,6 +10369,14 @@ manipulating PGF soft paths}
\bool_set_true:N \l_@@_draft_bool
\bool_set_true:N \l_@@_super_draft_bool
},
+ debug/.is~ choice,
+ debug/true/.code={
+ \bool_set_true:N \l_@@_debugging_bool
+ },
+ debug/false/.code={
+ \bool_set_false:N \l_@@_debugging_bool
+ },
+ debug/.default=true,
draft/.is~ family,
draft,
crossing~ label/.style={
@@ -8440,10 +10400,26 @@ manipulating PGF soft paths}
}
% \end{macrocode}
%
+% \begin{macro}[internal]{\knot_debug:n}
+% Debugging
+% \begin{macrocode}
+\cs_new_nopar:Npn \knot_debug:n #1
+{
+ \bool_if:NT \l_@@_debugging_bool
+ {
+ \iow_term:n {===Knot~ debug: #1===}
+ }
+}
+
+\cs_generate_variant:Nn \knot_debug:n {x}
+% \end{macrocode}
+% \end{macro}
+%
% Wrapper around \Verb+\tikzset+ for applying keys from a token list, checking for if the given token list exists.
% \begin{macrocode}
\cs_new_nopar:Npn \knot_apply_style:N #1
{
+ \knot_debug:n {knot~ apply~ style}
\tl_if_exist:NT #1 {
\exp_args:NV \tikzset #1
}
@@ -8492,6 +10468,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_initialise:n #1
{
+ \knot_debug:n {knot~ initialise}
\tikzset{knot~ diagram/.cd,every~ knot~ diagram/.try,#1}
\int_zero:N \l_@@_strands_int
\tl_clear:N \l_@@_redraws_tl
@@ -8505,6 +10482,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_render:
{
+ \knot_debug:n {knot~ render}
% \end{macrocode}
% Start a scope and reset the transformation (since all transformations have already been taken into account when defining the strands).
% \begin{macrocode}
@@ -8591,6 +10569,8 @@ manipulating PGF soft paths}
% Close the scope
% \begin{macrocode}
\endpgfscope
+ \knot_debug:x {knot~rendered,
+ ~found~\int_use:N \g_@@_intersections_int \c_space_tl~intersections}
}
% \end{macrocode}
% \end{macro}
@@ -8600,6 +10580,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_draw_strand:n #1
{
+ \knot_debug:n {knot~ draw~ strand~ #1}
\pgfscope
\group_begin:
\spath_bake_round:c {knot strand #1}
@@ -8609,7 +10590,7 @@ manipulating PGF soft paths}
{
,
knot~ diagram/only~ when~ rendering/.try,
- only~ when~ rendering/.try
+ only~ when~ rendering/.try,
}
\spath_tikz_path:Vv \l_@@_tmpa_tl {knot strand #1}
\group_end:
@@ -8625,6 +10606,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_draw_labels:n #1
{
+ \knot_debug:n {knot~ draw~ labels}
\bool_if:NT \l_@@_draft_bool
{
\spath_finalpoint:Nv \l_@@_tmpb_tl {knot strand #1}
@@ -8665,6 +10647,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_split_self_intersects:N #1
{
+ \knot_debug:n {knot~ split~ self~ intersects}
\tl_set:Nx \l_@@_tmpc_tl {\tl_item:nn {#1} {4}}
\tl_case:NnF \l_@@_tmpc_tl
{
@@ -8702,9 +10685,11 @@ manipulating PGF soft paths}
}
{
\fp_set:Nn \l_@@_tmpa_fp {.5 * \l_@@_tmpa_fp / \l_@@_tmpb_fp}
- \fp_compare:nTF
+ \bool_if:nTF
{
- 0 < \l_@@_tmpa_fp && \l_@@_tmpa_fp < 1
+ \fp_compare_p:n {0 < \l_@@_tmpa_fp}
+ &&
+ \fp_compare_p:n {\l_@@_tmpa_fp < 1}
}
{
\spath_split_curve:NNnV
@@ -8758,6 +10743,8 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_intersections:nn #1#2
{
+ \knot_debug:x {knot~ intersections~ between~
+ \l_@@_prefix_tl \c_space_tl #1~ and~ #2}
\group_begin:
\tl_set_eq:NN \l_@@_tmpa_tl \l_@@_prefix_tl
\tl_put_right:Nn \l_@@_tmpa_tl {#1}
@@ -8789,6 +10776,7 @@ manipulating PGF soft paths}
}
+ \knot_debug:x {found~\pgfintersectionsolutions\c_space_tl~ intersections}
\int_compare:nT {\pgfintersectionsolutions > 0}
{
\int_step_function:nnnN
@@ -8808,6 +10796,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_save_intersections:nn #1#2
{
+ \knot_debug:n {knot~ save~ intersections}
\bool_if:NT \l_@@_save_bool
{
\tl_clear:N \l_@@_aux_tl
@@ -8861,12 +10850,15 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_do_intersection:n #1
{
+ \knot_debug:n {knot~ do~ intersection~ #1}
% \end{macrocode}
% Get the intersection coordinates.
% \begin{macrocode}
\pgfpointintersectionsolution{#1}
\dim_set:Nn \l_@@_tmpa_dim {\pgf@x}
\dim_set:Nn \l_@@_tmpb_dim {\pgf@y}
+ \knot_debug:x {intersection~at~
+ (\dim_use:N \l_@@_tmpa_dim,\dim_use:N \l_@@_tmpb_dim)}
% \end{macrocode}
% If we're dealing with filaments, we can get false positives from the end points.
% \begin{macrocode}
@@ -8925,8 +10917,9 @@ manipulating PGF soft paths}
% \begin{macrocode}
\bool_if:NF \l_@@_skip_bool
{
-
+
\int_gincr:N \g_@@_intersections_int
+ \knot_debug:x {Processing~intersection~\int_use:N \g_@@_intersections_int}
% \end{macrocode}
% This is the intersection test.
% If the intersection finder finds too many, it might be useful to ignore some.
@@ -9007,6 +11000,8 @@ manipulating PGF soft paths}
!\tl_if_empty_p:c {knot previous \tl_use:N \l_@@_tmpg_tl}
}
{
+ \knot_debug:x {Prepending~
+ \tl_use:c {knot previous \tl_use:N \l_@@_tmpg_tl}}
\spath_prepend_no_move:cv
{knot \tl_use:N \l_@@_prefix_tl -1}
{knot \tl_use:c {knot previous \tl_use:N \l_@@_tmpg_tl}}
@@ -9017,9 +11012,13 @@ manipulating PGF soft paths}
{
\l_@@_splits_bool
&&
- \tl_if_exist_p:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ \tl_if_exist_p:c {knot previous
+ \tl_use:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ }
&&
- !\tl_if_empty_p:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ !\tl_if_empty_p:c {knot previous
+ \tl_use:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ }
}
{
\knot_test_endpoint:NvnT
@@ -9027,6 +11026,11 @@ manipulating PGF soft paths}
{knot previous \tl_use:N \l_@@_tmpg_tl}
{initial point}
{
+ \knot_debug:x {Prepending~
+ \tl_use:c {knot previous
+ \tl_use:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ }
+ }
\spath_prepend_no_move:cv
{knot \tl_use:N \l_@@_prefix_tl -1}
{knot \tl_use:c
@@ -9034,10 +11038,12 @@ manipulating PGF soft paths}
{knot previous \tl_use:N \l_@@_tmpg_tl}
}
}
- \tl_set_eq:Nc \l_@@_tmpa_tl {knot \tl_use:N \l_@@_prefix_tl -1}
+ \tl_set_eq:Nc \l_@@_tmpa_tl
+ {knot \tl_use:N \l_@@_prefix_tl -1}
}
}
}
+
% \end{macrocode}
% Now the same for appending.
% \begin{macrocode}
@@ -9047,9 +11053,11 @@ manipulating PGF soft paths}
&&
\tl_if_exist_p:c {knot next \tl_use:N \l_@@_tmpg_tl}
&&
- !\tl_if_empty_p:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ !\tl_if_empty_p:c {knot next \tl_use:N \l_@@_tmpg_tl}
}
{
+ \knot_debug:x {Appending~
+ \tl_use:c {knot next \tl_use:N \l_@@_tmpg_tl}}
\spath_append_no_move:cv
{knot \tl_use:N \l_@@_prefix_tl -1}
{knot \tl_use:c {knot next \tl_use:N \l_@@_tmpg_tl}}
@@ -9057,17 +11065,25 @@ manipulating PGF soft paths}
{
\l_@@_splits_bool
&&
- \tl_if_exist_p:c {knot previous \tl_use:N
- \l_@@_tmpg_tl}
+ \tl_if_exist_p:c {knot next \tl_use:c { knot next \tl_use:N
+ \l_@@_tmpg_tl}}
&&
- !\tl_if_empty_p:c {knot previous \tl_use:N \l_@@_tmpg_tl}
+ !\tl_if_empty_p:c {knot next
+ \tl_use:c { knot next \tl_use:N \l_@@_tmpg_tl}
+ }
}
{
+ \knot_debug:x {Testing~ whether~ to~ append~
+ {knot next \tl_use:c { knot next \tl_use:N \l_@@_tmpg_tl}}
+ }
\knot_test_endpoint:NvnT
\l_@@_redraw_tolerance_dim
- {knot previous \tl_use:N \l_@@_tmpg_tl}
+ {knot next \tl_use:N \l_@@_tmpg_tl}
{final point}
{
+ \knot_debug:x {Appending~
+ {knot next \tl_use:c { knot next \tl_use:N \l_@@_tmpg_tl}}
+ }
\spath_append_no_move:cv
{knot \tl_use:N \l_@@_prefix_tl -1}
{knot \tl_use:c
@@ -9170,6 +11186,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_draw_crossing:nnn #1#2#3
{
+ \knot_debug:n {knot~ draw~ crossing}
\group_begin:
\pgfscope
\path[knot~ diagram/background~ clip] (#2, #3)
@@ -9224,6 +11241,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_split_strands:
{
+ \knot_debug:n {knot~ split~ strands}
\int_gzero:N \g_@@_filaments_int
\int_step_function:nnnN {1} {1} {\l_@@_strands_int} \knot_split_strand:n
\int_step_function:nnnN {1} {1} {\g_@@_filaments_int} \knot_compute_nexts:n
@@ -9237,6 +11255,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_compute_nexts:n #1
{
+ \knot_debug:n {knot~ compute~ nexts}
\tl_clear_new:c {knot next \tl_use:c {knot previous filament #1}}
\tl_set:cn {knot next \tl_use:c {knot previous filament #1}} {filament #1}
}
@@ -9248,6 +11267,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_split_strand:n #1
{
+ \knot_debug:n {knot~ split~ strand}
\int_set_eq:NN \l_@@_component_start_int \g_@@_filaments_int
\int_incr:N \l_@@_component_start_int
\tl_set_eq:Nc \l_@@_tmpa_tl {l_@@_options_strand #1}
@@ -9262,6 +11282,7 @@ manipulating PGF soft paths}
% \begin{macrocode}
\cs_new_protected_nopar:Npn \knot_save_filament:N #1
{
+ \knot_debug:n {knot~ save~ filament}
\tl_set:Nx \l_@@_tmpb_tl {\tl_item:nn {#1} {4}}
\tl_case:NnF \l_@@_tmpb_tl
{
diff --git a/graphics/pgf/contrib/spath3/spath3_code.pdf b/graphics/pgf/contrib/spath3/spath3_code.pdf
index e61a569ddf..f773a0b534 100644
--- a/graphics/pgf/contrib/spath3/spath3_code.pdf
+++ b/graphics/pgf/contrib/spath3/spath3_code.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikzmark/README b/graphics/pgf/contrib/tikzmark/README
index ef4d2e566d..c8d36e0132 100644
--- a/graphics/pgf/contrib/tikzmark/README
+++ b/graphics/pgf/contrib/tikzmark/README
@@ -8,3 +8,4 @@ See http://www.latex-project.org/lppl.txt
The tikzmark package defines a command to "remember" a position
on a page for later (or earlier) use, primarily (but not
exclusively) with TikZ.
+
diff --git a/graphics/pgf/contrib/tikzmark/tikzmark.dtx b/graphics/pgf/contrib/tikzmark/tikzmark.dtx
index 88aec1a4ed..6169f8176f 100644
--- a/graphics/pgf/contrib/tikzmark/tikzmark.dtx
+++ b/graphics/pgf/contrib/tikzmark/tikzmark.dtx
@@ -53,6 +53,8 @@ and the derived files tikzmark.ins,
tikzmark.pdf,
tikzlibrarytikzmark.code.tex, and
tikzmarklibrarylistings.code.tex
+ tikzmarklibraryhighlighting.code.tex
+ tikzmarklibraryams.code.tex
\endpostamble
\usedir{tex/latex/tikzmark}
@@ -62,9 +64,12 @@ and the derived files tikzmark.ins,
\generate{
\file{tikzmarklibrarylistings.code.tex}{\from{\jobname.dtx}{listings}}
}
-%\generate{
-% \file{tikzmarklibraryhighlight.code.tex}{\from{\jobname.dtx}{highlight}}
-%}
+\generate{
+ \file{tikzmarklibraryhighlighting.code.tex}{\from{\jobname.dtx}{highlighting}}
+}
+\generate{
+ \file{tikzmarklibraryams.code.tex}{\from{\jobname.dtx}{ams}}
+}
%</install>
%<install>\endbatchfile
%<*internal>
@@ -91,8 +96,8 @@ and the derived files tikzmark.ins,
%\usepackage{morefloats}
\usepackage{listings}
\usepackage{tikz}
-\usetikzlibrary{fit,arrows,tikzmark,shadows,decorations.pathreplacing,calc}
-\usetikzmarklibrary{listings}
+\usetikzlibrary{fit,arrows.meta,tikzmark,shadows,decorations.pathreplacing,calc}
+\usetikzmarklibrary{ams,listings,highlighting}
%\usepackage[numbered]{hypdoc}
\definecolor{lstbgcolor}{rgb}{0.9,0.9,0.9}
@@ -206,7 +211,7 @@ and the derived files tikzmark.ins,
%</driver>
% \fi
%
-% \CheckSum{1178}
+% \CheckSum{1891}
%
% \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
@@ -235,8 +240,16 @@ and the derived files tikzmark.ins,
% \changes{1.7}{2019/05/07}{Added conditions to test if a tikzmark is on a particular page}
% \changes{1.8}{2019/10/04}{Fixed some bugs with subnode and tikzmarknode inside maths}
% \changes{1.10}{2021/02/16}{Tikzmarknode is now prefix and suffix aware, and added a test to see if a picture id has been saved to the aux file for times when pictures are thrown away, eg in AMS's text command}
+% \changes{1.11}{2021/08/16}{Tikzmark inside a tikzpicture was not applying any surrounding transformation before saving the coordinates. Code for adjusting a pic's location based on an internal coordinate.}
+% \changes{1.12}{2021/08/24}{Experimental library for creating pseudo-nodes around AMSMath equation alignment boxes.}
+% \changes{1.14}{2022/01/28}{Reimplementing the highlighting code using LaTeX3 hooks.}
+% \changes{1.15}{2022/08/24}{Improvements to highlighting code}
%
% \DoNotIndex{\newcommand,\newenvironment}
+% \pdfstringdefDisableCommands{%
+% \def\\{}%
+% \def\url#1{<#1>}%
+% }
%
% \GetFileInfo{tikzlibrarytikzmark.code.tex}
% \providecommand*{\url}{\texttt}
@@ -382,6 +395,8 @@ and the derived files tikzmark.ins,
%
% This package defines the following commands and usable stuff.
%
+% \subsection{Core Commands}
+%
% \begin{enumerate}
% \item \Verb+\tikzmark+\oarg{drawing command}\marg{name}
%
@@ -459,7 +474,7 @@ and the derived files tikzmark.ins,
% In such a situation, when defining nodes then the last one ``wins'' in that each node remembers the id of the last processed picture.
% However, only the one that is actually used has its location remembered on the page (since the others don't have a position).
% This can lead to the situation whereby a node becomes disassociated from its picture and so using it for later reference fails.
-% This key tries to get around that situation by checking the \Verb+aux+ file to see if the current picture was actually typeset last time (by checking for the presence of the remembered location) and if it find that it wasn't, it quietly appends the string \Verb+discard-+ to each node name.
+% This key tries to get around that situation by checking the \Verb+aux+ file to see if the current picture was actually typeset last time (by checking for the presence of the remembered location) and if it finds that it wasn't, it quietly appends the string \Verb+discard-+ to each node name.
% The idea being that the version of the picture that is actually typeset will not have this happen and so its nodes ``survive''.
%
% \item \Verb+/tikz/maybe define node=#1+
@@ -504,7 +519,35 @@ and the derived files tikzmark.ins,
%
% This was inspired by the question \href{http://tex.stackexchange.com/q/302517/86}{using tikzmark subnode with overlays beamer} on TeX-SX.
%
-% \item \Verb+\subnode[options]{name}{content}+
+% \end{enumerate}
+%
+% \subsection{Pic and Scope Positioning}
+%
+% \Verb+scope anchor+, \Verb+pic anchor+, and \Verb+surround pic+.
+%
+% These keys can be used to enable advanced positioning of \Verb+scope+s and \Verb+pic+s.
+% The standard positioning of a \Verb+pic+ places its internal origin at the location specified on the \Verb!\pic! command.
+% This is more limited than what is available to a \Verb+node+ whereby any of the defined anchors can be placed at the given position.
+% The key \Verb+pic anchor+ allows a little more flexibility to \Verb+pic+ positioning by allowing a \Verb+pic anchor+ to be defined and used as the point to place at the given position.
+%
+% When invoking the \Verb!pic! the key \Verb!pic anchor={coordinate}! can be used to specify a point inside the \Verb!pic! to use as the anchor.
+% This point is evaluated inside the \Verb!pic! so if using a node then the node name should be specified as if inside the \Verb!pic!.
+%
+% The node positioning syntax, things like \Verb!below! and \Verb!below=5pt of!, sets the anchor of the following node.
+% Using \Verb!pic anchor! without a coordinate uses this anchor on the bounding box of the pic when positioning the pic.
+%
+% Internally, this works by adjusting the location of the \Verb!pic!'s surrounding scope.
+% So the code can equally be used on \Verb!scope!s.
+% For a \Verb!scope!, use the \Verb!scope anchor! version on the scope directly.
+% The keys \Verb!name! and \Verb!anchor! can be used on the scope as if on a \Verb!node! with the same effect on the positioning.
+%
+% The key \Verb!surround pic! saves the bounding box of the pic as if it were the boundary of a rectangular node, using the name of the pic as the name of the node.
+%
+% This was inspired by the questions \href{https://tex.stackexchange.com/q/185279/86}{Anchoring TiKZ pics} and \href{https://tex.stackexchange.com/q/567245/86}{Reposition Tikz Scope After Size Known}.
+%
+% \subsection{Subnodes}
+%
+% \Verb+\subnode[options]{name}{content}+
%
% This produces a pseudo-node named \Verb+name+ around the \Verb+content+.
% The design purpose of this is to create a ``subnode'' inside a TikZ node.
@@ -525,9 +568,12 @@ and the derived files tikzmark.ins,
% The simplest way to turn a pseudo-node into a more normal node is to use the \Verb+fit+ library.
% Using the above example, \Verb+\node[fit=(a),draw,inner sep=0pt] {};+ would draw a rectangle around the word \Verb+sub+ of exactly the same size as would appear had a normal node been created.
%
-% Using a sneaky trick with \Verb+\mathchoice+, \Verb+subnode+ works inside a math environment. The spacing either side might not be quite right as although it detects the math style it doesn't got beyond that.
+% Using a sneaky trick with \Verb+\mathchoice+, \Verb+subnode+ works inside a math environment.
+% The spacing either side might not be quite right as although it detects the math style it doesn't got beyond that.
%
-% \item \emph{Node saving}
+% Note that because of the way that this works, the outer \Verb!tikzpicture! must have the \Verb!remember picture! option set.
+%
+% \subsection{Node saving}
%
% The node saving system takes the information stored about a node and saves it for later use.
% That later use can be in the same document, in which case it should be saved just to the memory of the current TeX process, or it can be used earlier in the same document or another document altogether (in particular, if the nodes are defined in a \Verb+tikzpicture+ that has been externalised, this can be used to import the node information into the main file) in which cases the node data is saved to a file.
@@ -539,9 +585,18 @@ and the derived files tikzmark.ins,
% The keys for working with saving and restoring nodes are as follows.
%
% \begin{itemize}
-% \item \Verb+save node+
+% \item \Verb+save node+, \Verb+save node=<name>+
+%
+% This is the key that indicates a node to be saved.
+% The version with no argument is to be used directly in the keys for a node and it saves that node.
+% With an argument then it saves a node that has been declared somewhere in the current tikz picture (it may not always be convenient to issue the \Verb+save node+ key directly on the node itself).
+% Since the list is saved up to the end of the picture, this can be invoked before the node is defined.
%
-% This is the key to put on a node that is to be saved.
+% \item \Verb+\SaveNode[group name]{name}+
+%
+% This command is for outside a tikzpicture and saves the named node directly.
+% The optional argument is a group name for saving to a group.
+% If this is not specified then the node is saved to a file.
%
% \item \Verb+set node group=<name>+
%
@@ -579,21 +634,17 @@ and the derived files tikzmark.ins,
% If there is a transformation in place on the containing node, this key applies that transformation to all the nodes in the inner picture.
%
% \end{itemize}
-% \end{enumerate}
%
-% \section{Examples and Extras}
+% \section{Examples}
%
% The \Verb+\tikzmark+ command has been used in numerous answers on \href{http://tex.stackexchange.com}{TeX-SX}.
-% The plan is to gather some of these into extra libraries which can be loaded via \Verb+\usetikzmarklibrary+.
-%
-% At present, this is the code listings library (which works with the \Verb+listings+ package).
-% One that is in development (as it has featured much on the TeX-SX website) is highlighting, however this is not so straightforward to implement so is still under development.
%
% \subsection{Basic Examples}
%
% A simple example of the \Verb+\tikzmark+ macro is the following.
%
% \begin{example}
+% \tikzset{tikzmark prefix=ex1-}
% \[
% \tikzmark{a} e^{i \pi/2} = i
% \]
@@ -602,6 +653,7 @@ and the derived files tikzmark.ins,
% \end{example}
%
% \begin{example}
+% \tikzset{tikzmark prefix=ex2-}
% \begin{itemize}
% \item A first item,\tikzmark{b}
% \item A second item,\tikzmark{c}
@@ -613,6 +665,7 @@ and the derived files tikzmark.ins,
% \end{example}
%
% \begin{example}
+% \tikzset{tikzmark prefix=ex3-}
% \begin{tikzpicture}[remember picture]
% \node (a) at (0,0) {This has a \subnode{sub}{subnode} in it};
% \draw[->] (0,-1) to[bend right] (sub);
@@ -622,7 +675,7 @@ and the derived files tikzmark.ins,
% An example using \Verb+\tikzmark+ inside a \Verb+tikzpicture+
%
% \begin{example}
-% \tikzset{tikzmark prefix=ex3-}
+% \tikzset{tikzmark prefix=ex4-}
% \begin{tikzpicture}[remember picture,overlay]
% \draw[->,line width=1mm,cyan] (pic cs:a) to[bend left] (pic cs:b);
% \end{tikzpicture}
@@ -638,6 +691,7 @@ and the derived files tikzmark.ins,
% The \Verb+\tikmarknode+ puts a node around some text, which can be referred to later, and adds a \Verb+\tikzmark+ at its origin.
%
% \begin{example}
+% \tikzset{tikzmark prefix=ex5-}
% Putting a node around \tikzmarknode{txt}{some text} means we can connect text together, including in maths:
% \[
% \tikzmarknode{a}{\sum_{k=1}^n} k^{\tikzmarknode{b}{2}}
@@ -719,6 +773,13 @@ and the derived files tikzmark.ins,
% \fbox{\IfFileExists{tikzrefextnodes.pdf}{\includegraphics{tikzrefextnodes}}{}}
% \end{center}
%
+% \section{Additional Libraries}
+%
+% Some of the more ambitious uses of \Verb!\tikzmark! involve a fair bit of extra code and so are worth gathering in to extra libraries of their own.
+% These can be loaded via \Verb+\usetikzmarklibrary+.
+%
+% At present, there are three libraries: one for code listings which works with the \Verb+listings+ package, one for AMSMath equations, and one for highlighting.
+%
% \subsection{Code Listings}
%
% If the \Verb+listings+ package has been loaded then issuing
@@ -749,6 +810,7 @@ and the derived files tikzmark.ins,
% The following example shows this, where the red dots are the \Verb+start+, the blue are \Verb+end+, and the green are \Verb+first+.
%
% \begin{example}
+% \tikzset{tikzmark prefix=ex6-}
% \begin{tikzpicture}[remember picture]
% \foreach \k in {0,...,7} {
% \iftikzmark{line-code-\k-start}{\fill[red,overlay] (pic cs:line-code-\k-start) circle[radius=4pt];}{\message{No start for \k}}
@@ -788,7 +850,215 @@ and the derived files tikzmark.ins,
% \end{lstlisting}
% \end{example}
%
+% \subsection{AMS Equation Environments}
+%
+% \textbf{This is an experimental library.}
+%
+% If the \Verb+amsmath+ package has been loaded then issuing
+%
+% \Verb+\usetikzmarklibrary{ams}+
+%
+% \noindent loads some code that places pseudo-nodes around the boxes that are used in AMSMath's various equation alignment environments, such as \Verb!align! and \Verb!gather!.
+% These environments work by constructing boxes with each of the pieces of the equations that are then put together into the grid.
+% This library hooks in to the unboxing code, before the box is typeset then it measures it and stores that information in various macros as if it were a TikZ node.
+% The aim is that this doesn't disturb the placement, but as far as TikZ is concerned then there is a node there that can be referred to later.
+%
+% As it is experimental, even if this library is loaded then it isn't automatically switched on.
+% To do that, use either the \Verb!tikzmarkmath! environment or the \Verb!\tikzmarkmath! command.
+% Each has an optional argument which is a prefix for the node names (the default is \Verb!equation!).
+% The node names are then of the form \Verb!<prefix>-<number>!.
+% The numbering is held in a counter called \Verb!tikzmarkequation! and is reset when the command is invoked or the environment is started.
+% As usual, redefining \Verb!\thetikzmarkequation! changes the styling of the \Verb!<number>!.
+%
+% To disable the marking, either end the environment or use \Verb!\endtikzmarkmath!.
+% The ending command explicitly removes the hook rather than rely on \TeX\ groupings.
+% It also prints out the number of nodes created to the log file and terminal.
+% This can be useful with figuring out which nodes to use, since the box that this library hooks into is used many times.
+% For example, equation numbers are included with this.
%
+% The box is also used when assembling a \Verb!\sqrt[3]{4}! command, and as that uses \Verb!\mathchoice! then there are more boxes created than used.
+% So the count of number of nodes created can be more than are actually there.
+%
+% \begin{example}
+% \begin{tikzmarkmath}[pythagoras]
+%
+% \begin{gather}
+% a^2 = b^2 + c^2
+% \end{gather}
+%
+% \begin{gather}
+% a = \sqrt[2]{b^2 + c^2}
+% \end{gather}
+% \end{tikzmarkmath}
+%
+% \begin{tikzpicture}[remember picture, overlay]
+% \foreach \k in {1,2,3,7,8} {
+% \draw[red] (pic cs:pythagoras-\k) -- ++(135:1) node[draw,red,circle,font=\tiny,above left] {\k};
+% \node[draw,blue,fit=(pythagoras-\k),inner sep=0pt] {};
+% }
+% \end{tikzpicture}
+% % \end{example}
+%
+%
+% \subsection{Highlighting}
+%
+% I've returned to the highlighting library.
+% The \LaTeX3 hook mechanism makes a couple of things possible that were tricky before.
+%
+% The idea of the highlighting mechanism is to use two \Verb!\tikzmark!s to mark a start and end of a region to be highlighted.
+% The region is considered to be formed by lines of text, with the first mark at the baseline of the start and the second at the baseline of the end.
+%
+% The highlighting itself is done by inserting code in the shipout routine before the page itself is laid out.
+% So the highlighting is on a separate layer to the text itself, which can be either behind or in front of the text layer.
+% The hook mechanisem also makes it relatively simple to support page breaks between the start and end of highlighting.
+%
+% Since the highlighting is separate to the flow of the text, it doesn't make sense to use an environment to mark the start and end of the highlighting so instead there are two commands: \Verb!\StartHighlighting[options]! and \Verb!\StopHighlighting!, or a single command \Verb!\Highlight[options]{text}! that just highlights the \Verb!text!.
+% At the moment, nesting highlighting is not supported.
+%
+% The optional argument to \Verb!\StartHighlighting! (or \Verb!\Highlight!) consists of key-value pairs that control the behaviour of the highlighted region.
+% There are particular keys in the \Verb!/tikz/highlighter! family which control the size of the highlighted region.
+%
+% The keys are as follows:
+%
+% \begin{itemize}
+% \item \texttt{direction}
+% \item \texttt{layer}
+% \item \texttt{initial height}
+% \item \texttt{initial depth}
+% \item \texttt{initial offset}
+% \item \texttt{final height}
+% \item \texttt{final depth}
+% \item \texttt{final offset}
+% \item \texttt{left margin}
+% \item \texttt{right margin}
+% \item \texttt{height}
+% \item \texttt{depth}
+% \item \texttt{offset}
+% \item \texttt{margin}
+% \end{itemize}
+%
+% The highlighting code draws a region which can be styled with standard TikZ keys, more of which in a moment.
+% Although it is a single region, the \emph{intention} is to simulate using an actual highlighter.
+% The first key, \Verb!direction!, is used to draw the region as if the highlighter were used in a particular direction.
+% The options are \Verb!horizontal!, \Verb!vertical!, or \Verb!box!.
+% The default is \Verb!horizontal!.
+%
+% The second key, \Verb!layer!, determines whether the highlighter is rendered on the \Verb!background! or \Verb!foreground! layer.
+% Using the \Verb!background! layer puts the highlighting underneath the text, which will make the text easier to read.
+% The \Verb!foreground! option puts the highlighting over the text, which can be used to fade the text.
+% The default is \Verb!background!.
+%
+% The shape of the region depends on a few things, such as whether the highlighting starts and ends on the same line.
+%
+% \begin{tikzpicture}[>=Latex]
+% \fill (0,0) circle[radius=2pt];
+% \fill (4,0) circle[radius=2pt];
+% \draw (-1,-1) rectangle (5,1);
+% \draw[dashed] (0,0) -- (4,0);
+% \draw[<->] (0,0) -- +(-1,0);
+% \draw[<->] (0,0) -- +(0,1);
+% \draw[<->] (4,0) -- +(0,-1);
+% \draw[<->] (4,0) -- +(1,0);
+% \draw[<-] (-.5,0) to[out=90,in=-90] +(-1,1.5) node[above] {initial offset};
+% \draw[<-] (4.5,0) to[out=90,in=-90] +(1,1.5) node[above] {final offset};
+% \draw[<-] (0,.5) to[out=0,in=180] +(1,1.5) node[right] {initial height};
+% \draw[<-] (4,-.5) to[out=0,in=180] +(1,-1.5) node[right] {final depth};
+% \node[anchor=base] at (2,0) {Single line};
+% \end{tikzpicture}
+%
+% \begin{tikzpicture}[>=Latex]
+% \fill (0,0) circle[radius=2pt];
+% \draw (-1,-1) rectangle (4,1);
+% \draw[dashed] (0,0) -- (4,0);
+% \draw[<->] (0,0) -- +(-1,0);
+% \draw[<->] (0,0) -- +(0,1);
+% \draw[<->] (0,0) -- +(0,-1);
+% \draw[<-] (-.5,0) to[out=90,in=-90] +(-1,1.5) node[above] {initial offset};
+% \draw[<-] (0,.5) to[out=0,in=180] +(1,1.5) node[right] {initial height};
+% \draw[<-] (0,-.5) to[out=0,in=180] +(1,-1.5) node[right] {initial depth};
+% \node[anchor=base] at (2,0) {Split line};
+% \begin{scope}[yshift=-3cm,xshift=-5cm]
+% \fill (4,0) circle[radius=2pt];
+% \draw (0,-1) rectangle (5,1);
+% \draw[dashed] (0,0) -- (4,0);
+% \draw[<->] (4,0) -- +(1,0);
+% \draw[<->] (4,0) -- +(0,1);
+% \draw[<->] (4,0) -- +(0,-1);
+% \draw[<-] (4.5,0) to[out=90,in=180] +(2.5,0) node[right] {final offset};
+% \draw[<-] (4,.5) to[out=180,in=0] +(-1,1.5) node[left] {final height};
+% \draw[<-] (4,-.5) to[out=0,in=180] +(1.5,-1) node[right] {final depth};
+% \node[anchor=base] at (2,0) {Split line};
+% \end{scope}
+% \end{tikzpicture}
+%
+% \begin{tikzpicture}[>=Latex]
+% \fill (0,0) circle[radius=2pt];
+% \fill (4,0) circle[radius=2pt];
+% \fill (-4,-1) circle[radius=2pt];
+% \fill (4,-1) circle[radius=2pt];
+% \fill (-4,-2) circle[radius=2pt];
+% \fill (0,-2) circle[radius=2pt];
+% \draw (-1,0) -- (-1,1) -- (5,1) -- (5,-2) -- (1,-2) -- (1,-3) -- (-5,-3) -- (-5,0) -- cycle;
+% \draw[dashed] (0,0) -- (4,0);
+% \draw[dashed] (-4,-1) -- (4,-1);
+% \draw[dashed] (-4,-2) -- (0,-2);
+% \draw[<->] (0,0) -- +(-1,0);
+% \draw[<->] (0,0) -- +(0,1);
+% \draw[<->] (4,0) -- +(1,0);
+% \draw[<->] (0,-2) -- +(1,0);
+% \draw[<->] (0,-2) -- +(0,-1);
+% \draw[<->] (-4,-2) -- +(-1,0);
+% \draw[<-] (-.5,0) to[out=90,in=0] +(-1,.5) node[left] {initial offset};
+% \draw[<-] (0,.5) to[out=0,in=180] +(1,0) node[right] {initial height};
+% \draw[<-] (4.5,0) to[out=90,in=-90] +(1,1.5) node[above] {right margin};
+% \draw[<-] (.5,-2) to[out=-90,in=180] +(1,-.5) node[right] {final offset};
+% \draw[<-] (0,-2.5) to[out=180,in=0] +(-1,0) node[left] {final depth};
+% \draw[<-] (-4.5,-2) to[out=90,in=-90] +(-1,1.5) node[above] {left margin};
+% \node[anchor=base] at (0,-1) {Multiple lines};
+% \end{tikzpicture}
+%
+% The \texttt{vertical} regions and the \texttt{box} are defined similarly.
+% With the vertical regions then the meaning of the \Verb!height!, \Verb!depth!, and \Verb!offset! are rotated \(90^\circ\), and the vertial regions don't stretch to the page boundaries.
+% The \texttt{box} region is always a rectangle.
+%
+% Once the region is defined, it can be styled using options directly on the \Verb!StartHighlighting! or \Verb!\Highlight! command and by using the following styles:
+%
+% \begin{itemize}
+% \item \texttt{every highlight picture}
+% \item \texttt{every <direction> highlight picture}
+% \item \texttt{every <layer> highlight picture}
+% \item \texttt{every highlight path}
+% \item \texttt{every <direction> highlight path}
+% \item \texttt{every <layer> highlight path}
+% \item \texttt{highlight path}
+% \item \texttt{<direction> highlight path}
+% \item \texttt{<layer> highlight path}
+% \end{itemize}
+%
+% The \Verb!picture! keys are for the surrounding \Verb!tikzpicture!, while the \Verb!path! keys are for the path itself.
+%
+% Lastly, a word about scoping the options.
+% Since the code that actually renders the highlighting is processed when the page is shipped out, it may well be that the settings in force when the highlighting was defined have changed.
+% The keys that adjust the size of the region (in the \Verb!highlighter! family) are saved at the moment of invocation but keys such as the colour or whether to fill or draw the path are not.
+% Therefore, it is wise to use styles that persist to set the rendering styles.
+%
+% \begin{example}
+% The sun was shining on the sea, shining with all its might.
+% \StartHighlighting[fill=cyan!50]
+% And this was very odd because it was the middle of the night.
+% \StopHighlighting
+% The moon was up there sulkily because she thought the sun had no
+% business to be there after the day was done.
+% \StartHighlighting[fill=magenta!50]
+% ``It's very rude of him,'' she said, ``to come and spoil the fun.''
+% \StopHighlighting
+
+% \noindent The sun was shining on the sea, shining with all its might.
+% And this was very odd because it was the middle of the night.
+% \StartHighlighting[fill=yellow!50]
+% The moon was up there sulkily because she thought the sun had no business to be there after the day was done\StopHighlighting.
+% ``It's very rude of him,'' she said, ``to come and spoil the fun.''
+% \end{example}
%
% \section{Acknowledgements}
%
@@ -810,8 +1080,8 @@ and the derived files tikzmark.ins,
% The \Verb+save nodes+ code uses \LaTeX3.
% \begin{macrocode}
\ProvidesFile{tikzlibrarytikzmark.code.tex}[%
- 2021/02/16
- v1.10
+ 2022/08/24
+ v1.15
TikZ library for marking positions in a document]
\RequirePackage{expl3, l3keys2e, xparse}
% \end{macrocode}
@@ -959,6 +1229,79 @@ and the derived files tikzmark.ins,
% \begin{macrocode}
tikzmark prefix/.initial=,%
tikzmark suffix/.initial=,%
+ tikzmark clear ixes/.style={
+ tikzmark prefix={},
+ tikzmark suffix={}
+ },
+% \end{macrocode}
+% Tikzmarks can be used to adjust the position of a scope or pic so that an internally defined coordinate is used to locate the scope or pic.
+%
+% The key used to adjust the location is \Verb!scope anchor={coordinate}! for \Verb!scope!s and \Verb!pic anchor={coordinate}! for \Verb!pic!s, where \Verb!coordinate! is evaluated internally to the \Verb!scope! or \Verb!pic!, so can use node names.
+% \begin{macrocode}
+ scope anchor location/.initial={(0,0)},
+ scope anchor location/.default=@auto,
+ pic anchor/.style={
+ scope anchor location={#1},
+ next pic/.append style={
+ adjust scope position,
+ }
+ },
+ scope anchor/.style={
+ scope anchor location={#1},
+ adjust scope position,
+ },
+% \end{macrocode}
+% The code that does the adjustment is added to the \Verb!pic! on its enclosing scope using the \Verb!every pic! key.
+% \begin{macrocode}
+ adjust scope position/.code={%
+ \pgfutil@ifundefined{tikz@fig@name}%
+ {\let\tikz@fig@name=\pgfutil@empty}{}%
+ \tikz@resetexpandcount%
+ \tikz@fig@mustbenamed
+ \pgfkeysgetvalue{/tikz/scope anchor location}\tkzmk@anchor
+ \ifx\tkzmk@anchor\tikz@auto@text
+ \tikzset{local bounding box/.expanded=\tikz@fig@name}%
+ \def\tkzmk@anchor{(\tikz@fig@name.\tikz@anchor)}%
+ \fi
+ \tikz@scan@one@point
+ \pgfutil@firstofone(pic cs:\tikz@fig@name-origin)\relax
+ \pgf@xa=\pgf@x
+ \pgf@ya=\pgf@y
+ \tikz@scan@one@point
+ \pgfutil@firstofone(pic cs:\tikz@fig@name-anchor)\relax
+ \advance\pgf@xa by -\pgf@x
+ \advance\pgf@ya by -\pgf@y
+ \tikzset{
+ shift={(\the\pgf@xa,\the\pgf@ya)},
+ execute at end scope={%
+ \tikzmark{\tikz@fig@name-origin}{(0,0)}%
+ \tikzmark{\tikz@fig@name-anchor}{\tkzmk@anchor}%
+ }
+ }
+ },
+% \end{macrocode}
+%
+% To install this code on a pic, we hook in to the pic's enclosing scope using the \Verb+every pic+ key.
+% To avoid this bubbling down to pics within pics, we clear it once it has been executed.
+% So any code that triggers this adjustment adds \Verb!adjust pic position! to the !next pic! style.
+% \begin{macrocode}
+ every pic/.append style={
+ next pic/.try,
+ next pic/.style={}
+ },
+% \end{macrocode}
+%
+% This code remembers the bounding box of a pic, saving it as if it were a node.
+% \begin{macrocode}
+ save pic bounding box/.code={
+ \tikz@fig@mustbenamed
+ \tikzset{local bounding box/.expanded=\tikz@fig@name}
+ },
+ surround pic/.style={
+ next pic/.append style={
+ save pic bounding box
+ }
+ },
}
% \end{macrocode}
%
@@ -987,11 +1330,25 @@ and the derived files tikzmark.ins,
% \end{macro}
%
% \begin{macro}{\tikzmarkalias}
-% Alias a tikzmark to another name (used in tikzmarknode)
-% \begin{macrocode}
+% Alias a tikzmark to another name (used in tikzmarknode).
+% The alias is saved to the aux-file so that it is available prior to the definition.
+% The private one doesn't use the prefix-suffix for greater internal flexibility.
+% The public one does.
+% \begin{macrocode}
+\def\@tikzmarkalias#1#2{%
+ \@ifundefined{save@pt@#2}{}{%
+ \pgf@node@gnamelet{save@pt@#1}{save@pt@#2}%
+ \pgf@node@gnamelet{save@pt@#1@offset}{save@pt@#2@offset}%
+ \protected@write\pgfutil@auxout{}{%
+ \string\savepointas%
+ {#1}{\csname save@pt@#2\endcsname}%
+ \expandafter\expandafter\expandafter
+ \@gobble\csname save@pt@#2@offset\endcsname
+ }%
+ }%
+}
\def\tikzmarkalias#1#2{%
- \pgf@node@gnamelet{save@pt@#1}{save@pt@#2}%
- \pgf@node@gnamelet{save@pt@#1@offset}{save@pt@#2@offset}%
+ \@tikzmarkalias{\tikzmark@pp@name{#1}}{\tikzmark@pp@name{#2}}%
}
% \end{macrocode}
% \end{macro}
@@ -1017,7 +1374,8 @@ and the derived files tikzmark.ins,
\tmk@labeldef#1,(0pt,0pt)\@nil
\fi
\@ifundefined{save@pt@\tmk@label}{%
- \tikz@scan@one@point\pgfutil@firstofone\tmk@def
+ \expandafter\tikz@scan@one@point
+ \expandafter\pgfutil@firstofone\tmk@def\relax
}{%
\pgfsys@getposition{\csname save@pt@\tmk@label\endcsname}%
\save@orig@pic%
@@ -1076,7 +1434,9 @@ and the derived files tikzmark.ins,
% \begin{macrocode}
\def\tikzmark@inside#1#2{%
\tikzset{remember picture}%
+ \tikz@resetexpandcount%
\tikz@scan@one@point\pgfutil@firstofone#2\relax
+ \pgf@pos@transform{\pgf@x}{\pgf@y}%
\protected@write\pgfutil@auxout{}{%
\string\savepointas%
{\tikzmark@pp@name{#1}}{\pgfpictureid}{\the\pgf@x}{\the\pgf@y}}%
@@ -1103,18 +1463,22 @@ and the derived files tikzmark.ins,
% \begin{macro}{\pgfmark}
% \begin{macrocode}
\newcommand\pgfmark[1]{%
- \bgroup
- \global\advance\pgf@picture@serial@count by1\relax%
- \edef\pgfpictureid{pgfid\the\pgf@picture@serial@count}%
- \pgfsys@markposition{\pgfpictureid}%
- \edef\pgf@temp{%
- \noexpand\write\noexpand\pgfutil@auxout{%
- \string\savepicturepage{\pgfpictureid}{\noexpand\arabic{page}}}}%
- \pgf@temp
- \protected@write\pgfutil@auxout{}{%
- \string\savepointas{\tikzmark@pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
- \egroup
- }
+ \bgroup
+ \global\advance\pgf@picture@serial@count by1\relax%
+ \edef\pgfpictureid{pgfid\the\pgf@picture@serial@count}%
+ \pgfsys@markposition{\pgfpictureid}%
+ \edef\pgf@temp{%
+ \noexpand\write\noexpand\pgfutil@auxout{%
+ \string\savepicturepage
+ {\pgfpictureid}{\noexpand\arabic{page}}%
+ }%
+ }%
+ \pgf@temp
+ \protected@write\pgfutil@auxout{}{%
+ \string\savepointas
+ {\tikzmark@pp@name{#1}}{\pgfpictureid}{0pt}{0pt}}%
+ \egroup
+}
% \end{macrocode}
% \end{macro}
%
@@ -1183,7 +1547,9 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
\tikzmark@false
}{%
- \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \@ifundefined{save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ }{%
\tikzmark@false
}{%
\ifnum\csname save@pg@%
@@ -1206,7 +1572,9 @@ and the derived files tikzmark.ins,
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
\tikzmark@false
}{%
- \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \@ifundefined{save@pg@%
+ \csname save@pt@\tikzmark@pp@name{#1}\endcsname%
+ }{%
\tikzmark@false
}{%
\ifnum\csname save@pg@%
@@ -1225,13 +1593,15 @@ and the derived files tikzmark.ins,
%
% \begin{macro}{\subnode}
% Note: much of this code was inevitably adapted from the node defining code in the TikZ/PGF sources.
+%
+% The \Verb!\pgfmark! applies the current tikzmark prefix/suffix.
+% The current node prefix/suffix is applied by using the \Verb!name=! key.
% \begin{macrocode}
\def\subnode@#1#2#3{%
\begingroup
\pgfmark{#2}%
\setbox\pgfnodeparttextbox=\hbox\bgroup #3\egroup
- \def\tikz@fig@name{#2}%
- \tikzset{every subnode/.try,#1}%
+ \tikzset{every subnode/.try,#1,name=#2}%
\pgfpointorigin
\tikz@scan@one@point\pgfutil@firstofone(pic cs:#2)\relax
\advance\pgf@x by .5\wd\pgfnodeparttextbox
@@ -1251,24 +1621,30 @@ and the derived files tikzmark.ins,
\pgf@x=-\pgf@x%
\pgf@y=-\pgf@y%
}%
- \expandafter\pgfsavepgf@process\csname pgf@sh@sa@\tikz@fig@name\endcsname{%
+ \expandafter\pgfsavepgf@process
+ \csname pgf@sh@sa@\tikz@fig@name\endcsname{%
\pgf@sh@reanchor{rectangle}{center}% FIXME : this is double work!
}%
% Save the saved points and the transformation matrix
\edef\pgf@node@name{\tikz@fig@name}%
\ifx\pgf@node@name\pgfutil@empty%
\else%
- \expandafter\xdef\csname pgf@sh@ns@\pgf@node@name\endcsname{rectangle}%
+ \expandafter\xdef
+ \csname pgf@sh@ns@\pgf@node@name\endcsname{rectangle}%
\edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
+ \noexpand\gdef\expandafter
+ \noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
\expandafter\pgf@sh@@temp\expandafter{%
\pgf@sh@savedpoints}%
\edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
+ \noexpand\gdef\expandafter
+ \noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
\expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
\pgfgettransform\pgf@temp
- \expandafter\xdef\csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
- \expandafter\xdef\csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
+ \expandafter\xdef
+ \csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
+ \expandafter\xdef
+ \csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
\fi%
}%
\egroup
@@ -1291,31 +1667,34 @@ and the derived files tikzmark.ins,
\def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
\edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
-\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
-\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \pgfutil@ifundefined{pgf@sh@ns@#2}{%
- \pgfnodealias{#2}{#2-t}%
- \tikzmarkalias{#2}{#2-t}%
+ \pgfutil@ifundefined{pgf@sh@ns@\tikz@pp@name{#2}}{%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
}{}%
\else
- \pgfnodealias{#2}{#2-d}%
- \tikzmarkalias{#2}{#2-d}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-d}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-d}}%
\fi
\else
- \pgfnodealias{#2}{#2-t}%
- \tikzmarkalias{#2}{#2-t}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
\fi
\else
- \pgfnodealias{#2}{#2-s}%
- \tikzmarkalias{#2}{#2-s}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-s}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-s}}%
\fi
\else
- \pgfnodealias{#2}{#2-ss}%
- \tikzmarkalias{#2}{#2-ss}%
+ \pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-ss}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-ss}}%
\fi
\else
\subnode@{#1}{#2}{#3}%
@@ -1366,31 +1745,34 @@ and the derived files tikzmark.ins,
\def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
\edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
-\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
-\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
+ \edef\tzmk@pic%
+ {\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\pgfutil@ifundefined{pgf@sh@ns@\tikz@pp@name{#2}}{%
\pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
- \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
}{}%
\else
\pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-d}}%
- \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-d}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-d}}%
\fi
\else
\pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-t}}%
- \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-t}}%
\fi
\else
\pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-s}}%
- \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-s}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-s}}%
\fi
\else
\pgfnodealias{\tikz@pp@name{#2}}{\tikz@pp@name{#2-ss}}%
- \tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-ss}}%
+ \@tikzmarkalias{\tikzmark@pp@name{#2}}{\tikzmark@pp@name{#2-ss}}%
\fi
\else
\tikzmarknode@{#1}{#2}{#3}%
@@ -1399,6 +1781,80 @@ and the derived files tikzmark.ins,
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\tikzmark@box}
+% This macro takes a name and a box.
+% It pretends that there is a tight-fitting rectangular PGF node around that box with the given name, and saves the required information so that that node can be used later on in a tikzpicture drawing.
+%
+% It does not actually build a node, and it doesn't create a TikZ drawing.
+% Rather, it measures the box and uses that information to define the various macros that store the information about the node.
+%
+% Apart from assigning a load of macros, it does also place a \Verb+\pgfmark+ just before the box.
+% This is needed to be able to locate the node on the page.
+%
+% The command is defined with an \Verb!@! because it is more likely to be used in other packages than by a user.
+% \begin{macrocode}
+\def\tikzmark@box#1#2{%
+ \begingroup
+ \pgfmark{#1}%
+ \let\pgfnodeparttextbox=#2%
+ \edef\pgfpictureid{pgfid\the\pgf@picture@serial@count}%
+ \def\tikz@fig@name{#1}%
+ \pgfpointorigin
+ \advance\pgf@x by .5\wd\pgfnodeparttextbox
+ \advance\pgf@y by .5\ht\pgfnodeparttextbox
+ \advance\pgf@y by -.5\dp\pgfnodeparttextbox
+ \pgftransformshift{}%
+ \setbox\@tempboxa=\hbox\bgroup
+ {%
+ \tikzset{
+ inner sep=0pt,
+ minimum size=0pt,
+ outer sep=0pt,
+ anchor=base
+ }%
+ \let\pgf@sh@savedmacros=\pgfutil@empty% MW
+ \let\pgf@sh@savedpoints=\pgfutil@empty
+ \def\pgf@sm@shape@name{rectangle}% CJ % TT added prefix!
+ \pgf@sh@s@rectangle
+ \pgf@sh@savedpoints
+ \pgf@sh@savedmacros% MW
+ \pgftransformshift{%
+ \pgf@sh@reanchor{rectangle}{center}%
+ \pgf@x=-\pgf@x
+ \pgf@y=-\pgf@y
+ }%
+ \expandafter\pgfsavepgf@process
+ \csname pgf@sh@sa@\tikz@fig@name\endcsname{%
+ \pgf@sh@reanchor{rectangle}{center}% FIXME : this is double work!
+ }%
+ % Save the saved points and the transformation matrix
+ \edef\pgf@node@name{\tikz@fig@name}%
+ \ifx\pgf@node@name\pgfutil@empty
+ \else
+ \expandafter\xdef
+ \csname pgf@sh@ns@\pgf@node@name\endcsname{rectangle}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter
+ \noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
+ \expandafter\pgf@sh@@temp\expandafter{%
+ \pgf@sh@savedpoints}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter
+ \noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
+ \expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
+ \pgfgettransform\pgf@temp
+ \expandafter\xdef
+ \csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
+ \expandafter\xdef
+ \csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
+ \fi
+ }%
+ \egroup
+ \endgroup
+ \box#2%
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{\usetikzmarklibrary}
% \begin{macrocode}
@@ -1407,28 +1863,33 @@ and the derived files tikzmark.ins,
}%}
\def\use@tikzmarklibrary[#1]{\use@@tikzmarklibrary{#1}}
\def\use@@tikzmarklibrary#1{%
- \edef\pgf@list{#1}%
- \pgfutil@for\pgf@temp:=\pgf@list\do{%
- \expandafter\pgfkeys@spdef\expandafter\pgf@temp\expandafter{\pgf@temp}%
+ \edef\pgf@list{#1}%
+ \pgfutil@for\pgf@temp:=\pgf@list\do{%
+ \expandafter\pgfkeys@spdef
+ \expandafter\pgf@temp\expandafter{\pgf@temp}%
\ifx\pgf@temp\pgfutil@empty
\else
- \expandafter\ifx\csname tikzmark@library@\pgf@temp @loaded\endcsname\relax%
+ \expandafter\ifx
+ \csname tikzmark@library@\pgf@temp @loaded\endcsname\relax%
\expandafter\global\expandafter\let%
- \csname tikzmark@library@\pgf@temp @loaded\endcsname=\pgfutil@empty%
- \expandafter\edef\csname tikzmark@library@#1@atcode\endcsname{\the\catcode`\@}
- \expandafter\edef\csname tikzmark@library@#1@barcode\endcsname{\the\catcode`\|}
+ \csname tikzmark@library@\pgf@temp @loaded\endcsname
+ =\pgfutil@empty%
+ \expandafter\edef
+ \csname tikzmark@library@#1@atcode\endcsname{\the\catcode`\@}
+ \expandafter\edef
+ \csname tikzmark@library@#1@barcode\endcsname{\the\catcode`\|}
\catcode`\@=11
\catcode`\|=12
\pgfutil@InputIfFileExists{tikzmarklibrary\pgf@temp.code.tex}{}{
- \PackageError{tikzmark}{I did not find the tikzmark extras library '\pgf@temp'.}{}
- }%
+ \PackageError{tikzmark}{
+ I did not find the tikzmark extras library '\pgf@temp'.}{}
+ }%
\catcode`\@=\csname tikzmark@library@#1@atcode\endcsname
\catcode`\|=\csname tikzmark@library@#1@barcode\endcsname
\fi%
\fi
}%
}
-
% \end{macrocode}
% \end{macro}
%
@@ -1436,8 +1897,17 @@ and the derived files tikzmark.ins,
%
% \begin{macrocode}
\ExplSyntaxOn
+\cs_new_protected:Nn \tikzmark_tl_put_right_braced:Nn
+ {
+ \tl_put_right:Nn #1 { { #2 } }
+ }
+\cs_generate_variant:Nn \tikzmark_tl_put_right_braced:Nn { NV, cV, cv, Nx, cx }
% \end{macrocode}
%
+% This is how we handle return values from functions
+% \begin{macrocode}
+\tl_new:N \g__sn_output_tl
+% \end{macrocode}
% We save our information in a ``property list'', which is L3's
% version of an associative array or dictionary. They keys will give
% the ability to store several groups of nodes and restore them at
@@ -1462,9 +1932,10 @@ and the derived files tikzmark.ins,
\tl_new:N \l__sn_group_tl
% \end{macrocode}
%
-% We store up the nodes in a list and save them at the end of a given tikzpicture.
+% We store up the nodes in a list and save them at the end of a given tikzpicture.
+% Has to be global as we're often in a group.
% \begin{macrocode}
-\clist_new:N \l__sn_nodes_clist
+\clist_new:N \g__sn_nodes_clist
% \end{macrocode}
%
% This boolean is for whether we save to a file or not.
@@ -1475,9 +1946,19 @@ and the derived files tikzmark.ins,
% This boolean is for whether we are in the preamble or not.
% \begin{macrocode}
\bool_new:N \g__sn_preamble_bool
-\bool_set_true:N \g__sn_preamble_bool
+\bool_gset_true:N \g__sn_preamble_bool
+% \end{macrocode}
+%
+% Key interface for setting some of the options
+% \begin{macrocode}
+\keys_define:nn {tikzmark / save nodes}
+{
+ file .bool_set:N = \l__sn_file_bool,
+ group .tl_set:N = \l__sn_group_tl,
+}
% \end{macrocode}
%
+%
% \begin{macrocode}
\msg_new:nnn {tikzmark} {no file} {File~ "#1"~ doesn't~ exist.}
\msg_new:nnn {tikzmark} {loading nodes} {Loading~ nodes~ from~ "#1".}
@@ -1547,43 +2028,40 @@ and the derived files tikzmark.ins,
%
% \begingroup
% \catcode`_=12
-% \begin{macro}{\save_nodes:Nn}
+% \begin{macro}{\process_node:Nn}
% This is the command that actually does the work. It constructs a
% token list which contains the code that will restore the node data
% when invoked. The two arguments are the token list to store this in
-% and a comma separated list of the node names to be saved.
+% and the node name to be saved.
% \begin{macrocode}
-\cs_new_nopar:Npn \save_nodes:Nn #1#2
+\cs_new_nopar:Npn \__sn_process_node:n #1
{
+ \group_begin:
% \end{macrocode}
-% Clear our token lists
+% Clear our token list
% \begin{macrocode}
\tl_clear:N \l__sn_tmpa_tl
% \end{macrocode}
% Set the centre of the picture
% \begin{macrocode}
- \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(current~ bounding~ box.center)}
+ \tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim
+ {(current~ bounding~ box.center)}
\dim_set:Nn \l__sn_x_dim {-\l__sn_x_dim}
\dim_set:Nn \l__sn_y_dim {-\l__sn_y_dim}
\tl_set:Nx \l__sn_centre_tl {
{1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
}
% \end{macrocode}
-% Iterate over the list of node names
-% \begin{macrocode}
- \clist_map_inline:nn {#2}
- {
-% \end{macrocode}
% Test to see if the node has been defined
% \begin{macrocode}
- \tl_if_exist:cT {pgf@sh@ns@##1}
- {
-% \end{macrocode}
+ \tl_if_exist:cT {pgf@sh@ns@#1}
+ {
+% \end{macrocode}
% The node information is stored in a series of macros of the form
% \Verb+\pgf@sh@XX@nodename+ where XX is one of the following.
% \begin{macrocode}
- \clist_map_inline:nn {ns,np,ma,pi}
- {
+ \clist_map_inline:nn {ns,np,ma,pi}
+ {
% \end{macrocode}
% Our token list will look like:
%
@@ -1594,36 +2072,36 @@ and the derived files tikzmark.ins,
%
% This part puts the \Verb+\tl_set:cn {pgf@sh@XX@nodename}+ in place
% \begin{macrocode}
- \tl_put_right:Nn \l__sn_tmpa_tl
- {
- \tl_gset:cn {pgf@sh@####1@ \tikz_set_node_name:n{##1} }
- }
-% \end{macrocode}
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf@sh@##1@ \tikz_set_node_name:n{#1} }
+ }
+% \end{macrocode}
% Now we put the current contents in place. We're doing this in
% an expansive context to get at the contents. The \Verb+\exp_not:v+
% part takes the current value of \Verb+\pgf@sh@XX@nodename+ and puts
% it in place, preventing further expansion.
% \begin{macrocode}
- \tl_if_exist:cTF {pgf@sh@####1@##1}
- {
- \tl_put_right:Nx \l__sn_tmpa_tl {
- {\exp_not:v {pgf@sh@####1@ \tikz_set_node_name:n {##1}}}
- }
- }
- {
- \tl_put_right:Nx \l__sn_tmpa_tl {{}}
+ \tl_if_exist:cTF {pgf@sh@##1@#1}
+ {
+ \tl_put_right:Nx \l__sn_tmpa_tl {
+ {\exp_not:v {pgf@sh@##1@ \tikz_set_node_name:n {#1}}}
}
}
- \tl_put_right:Nn \l__sn_tmpa_tl
{
- \tl_gset:cn {pgf@sh@nt@ \tikz_set_node_name:n{##1} }
+ \tl_put_right:Nx \l__sn_tmpa_tl {{}}
}
- \compose_transformations:NVv \l__sn_tmpb_tl \l__sn_centre_tl {pgf@sh@nt@##1}
- \tl_put_right:Nx \l__sn_tmpa_tl {{\exp_not:V \l__sn_tmpb_tl}}
- \tl_put_right:Nn \l__sn_tmpa_tl {
- \transform_node:Nn \l__sn_transformation_tl {
- \tikz_set_node_name:n{##1}
- }
+ }
+ \tl_put_right:Nn \l__sn_tmpa_tl
+ {
+ \tl_gset:cn {pgf@sh@nt@ \tikz_set_node_name:n{#1} }
+ }
+ \compose_transformations:NVv
+ \l__sn_tmpb_tl \l__sn_centre_tl {pgf@sh@nt@#1}
+ \tl_put_right:Nx \l__sn_tmpa_tl {{\exp_not:V \l__sn_tmpb_tl}}
+ \tl_put_right:Nn \l__sn_tmpa_tl {
+ \transform_node:Nn \l__sn_transformation_tl {
+ \tikz_set_node_name:n{#1}
}
}
}
@@ -1631,7 +2109,20 @@ and the derived files tikzmark.ins,
% Once we've assembled our token list, we store it in the given
% token list
% \begin{macrocode}
- \tl_set_eq:NN #1 \l__sn_tmpa_tl
+ \tl_gset_eq:NN \g__sn_output_tl \l__sn_tmpa_tl
+ \group_end:
+}
+\cs_new_protected_nopar:Npn \process_node:Nn #1#2
+{
+ \__sn_process_node:n {#2}
+ \tl_set_eq:NN #1 \g__sn_output_tl
+ \tl_gclear:N \g__sn_output_tl
+}
+\cs_new_protected_nopar:Npn \process_gnode:Nn #1#2
+{
+ \__sn_process_node:n {#2}
+ \tl_gset_eq:NN #1 \g__sn_output_tl
+ \tl_gclear:N \g__sn_output_tl
}
% \end{macrocode}
% \end{macro}
@@ -1641,7 +2132,12 @@ and the derived files tikzmark.ins,
% \begin{macrocode}
\cs_new_nopar:Npn \save_nodes_to_list:nn #1#2
{
- \save_nodes:Nn \l__sn_tmpa_tl {#2}
+ \tl_clear:N \l__sn_tmpa_tl
+ \clist_map_inline:nn {#2}
+ {
+ \process_node:Nn \l__sn_tmpb_tl {##1}
+ \tl_put_right:NV \l__sn_tmpa_tl \l__sn_tmpb_tl
+ }
\prop_gput:NnV \g__sn_prop {#1} \l__sn_tmpa_tl
}
% \end{macrocode}
@@ -1650,24 +2146,27 @@ and the derived files tikzmark.ins,
% \begin{macro}{\save_nodes_to_file:n}
% Save the nodes to a file
% \begin{macrocode}
+\cs_generate_variant:Nn \iow_now:Nn {NV}
\cs_new_nopar:Npn \save_nodes_to_file:n #1
{
- \save_nodes:Nn \l__sn_tmpa_tl {#1}
+ \sn_open_stream:
+ \clist_map_inline:nn {#1}
+ {
+ \process_node:Nn \l__sn_tmpa_tl {##1}
% \end{macrocode}
% Save the token list to the nodes file so that on reading it back in, we restore the node definitions
% \begin{macrocode}
- \sn_open_stream:
- \iow_now:Nx \g__sn_stream
- {
- \iow_newline:
- \exp_not:V \l__sn_tmpa_tl
- \iow_newline:
+ \iow_now:Nx \g__sn_stream
+ {
+ \iow_newline:
+ \exp_not:V \l__sn_tmpa_tl
+ }
}
}
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
-\cs_generate_variant:Nn \save_nodes_to_list:nn {VV}
+\cs_generate_variant:Nn \save_nodes_to_list:nn {VV, Vn}
\cs_generate_variant:Nn \save_nodes_to_file:n {V}
% \end{macrocode}
%
@@ -1702,6 +2201,7 @@ and the derived files tikzmark.ins,
\msg_warning:nnn {tikzmark} {no file} {#1}
}
}
+\cs_generate_variant:Nn \restore_nodes_from_file:n {x}
\AtBeginDocument{\bool_gset_false:N \g__sn_preamble_bool}
% \end{macrocode}
% \end{macro}
@@ -1781,7 +2281,8 @@ and the derived files tikzmark.ins,
% \end{macro}
%
% \begin{macrocode}
-\cs_generate_variant:Nn \compose_transformations:Nnn {cVv,NVv,NVn,NvV,NnV}
+\cs_generate_variant:Nn \compose_transformations:Nnn
+{cVv,NVv,NVn,NvV,NnV}
% \end{macrocode}
%
% \begin{macro}{\transform_node:Nn}
@@ -1800,8 +2301,12 @@ and the derived files tikzmark.ins,
\tl_set_eq:Nc \l__sn_transformation_tl {pgf@sh@nt@#1}
\tikz_scan_point:NNn \l__sn_x_dim \l__sn_y_dim {(#1.center)}
- \dim_set:Nn \l__sn_x_dim {\l__sn_x_dim - \tl_item:cn {pgf@sh@nt@#1}{5}}
- \dim_set:Nn \l__sn_y_dim {\l__sn_y_dim - \tl_item:cn {pgf@sh@nt@#1}{6}}
+ \dim_set:Nn \l__sn_x_dim {
+ \l__sn_x_dim - \tl_item:cn {pgf@sh@nt@#1}{5}
+ }
+ \dim_set:Nn \l__sn_y_dim {
+ \l__sn_y_dim - \tl_item:cn {pgf@sh@nt@#1}{6}
+ }
\compose_transformations:NnV \l__sn_transformation_tl {
{1}{0}{0}{1}{\dim_use:N \l__sn_x_dim}{\dim_use:N \l__sn_y_dim}
@@ -1849,16 +2354,23 @@ and the derived files tikzmark.ins,
}
},
% \end{macrocode}
-% Append current node to the list of nodes to be saved
+% Append current node or named node to the list of nodes to be saved
% \begin{macrocode}
save~ node/.code={
- \tikz_fig_must_be_named:
- \pgfkeysalso{append~ after~ command={
- \pgfextra{
- \clist_gput_right:Nv \l__sn_nodes_clist {tikz@last@fig@name}
+ \tl_if_eq:nnTF {#1} {\pgfkeysnovalue}
+ {
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{
+ append~ after~ command={
+ \pgfextra{
+ \clist_gput_right:Nv \g__sn_nodes_clist {tikz@last@fig@name}
+ }
}
}
}
+ {
+ \clist_gput_right:Nn \g__sn_nodes_clist {#1}
+ }
},
% \end{macrocode}
% Restore nodes from file
@@ -1866,14 +2378,14 @@ and the derived files tikzmark.ins,
restore~ nodes~ from~ file/.code={
\bool_if:NTF \g__sn_preamble_bool
{
- \restore_nodes_from_file:n {#1}
+ \restore_nodes_from_file:x {#1}
}
{
\tikz_fig_must_be_named:
\pgfkeysalso{append~ after~ command={
\pgfextra{
\scope
- \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
+ \split_argument:NNn \tikzset \restore_nodes_from_file:x {#1}
\endscope
}
}
@@ -1929,22 +2441,51 @@ and the derived files tikzmark.ins,
% \begin{macrocode}
\cs_new_nopar:Npn \maybe_save_nodes:
{
- \clist_if_empty:NF \l__sn_nodes_clist
+ \clist_if_empty:NF \g__sn_nodes_clist
{
\bool_if:NTF \l__sn_file_bool
{
- \save_nodes_to_file:V \l__sn_nodes_clist
+ \save_nodes_to_file:V \g__sn_nodes_clist
}
{
\tl_if_empty:NF \l__sn_group_tl
{
- \save_nodes_to_list:VV \l__sn_group_tl \l__sn_nodes_clist
+ \save_nodes_to_list:VV \l__sn_group_tl \g__sn_nodes_clist
}
}
- \clist_gclear:N \l__sn_nodes_clist
+ \clist_gclear:N \g__sn_nodes_clist
}
}
-% \end{macrocode}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\SaveNode}
+% Command for saving a node outside a TikZ picture.
+% \begin{macrocode}
+\DeclareDocumentCommand \SaveNode { o m }
+{
+ \group_begin:
+ \IfNoValueF {#1}
+ {
+ \keys_set:nn {tikzmark / save nodes}
+ {
+ file=false,
+ group=#1
+ }
+ }
+ \bool_if:NTF \l__sn_file_bool
+ {
+ \save_nodes_to_file:n {#2}
+ }
+ {
+ \tl_if_empty:NF \l__sn_group_tl
+ {
+ \save_nodes_to_list:Vn \l__sn_group_tl {#2}
+ }
+ }
+ \group_end:
+}
+% \end{macrocode}
% \end{macro}
% \endgroup
% \begin{macrocode}
@@ -2039,14 +2580,775 @@ and the derived files tikzmark.ins,
%
% \begin{macrocode}
}{%
- \PackageError{tikzmark listings}{The listings package has not been loaded.}{}
+ \PackageError{tikzmark listings}%
+ {The listings package has not been loaded.}{}
}
% \end{macrocode}
% \iffalse
%</listings>
% \fi
%
+% \subsection{AMS Math}
+%
+% This tikzmark library defines a routine that puts a pseudo-node (using \Verb+\tikzmark@box+) around all the pieces used in constructing the various math environments that the AMS Math package provides, such as \Verb+gather+ and \Verb+align+.
+% All of these (and their labels) work by putting various pieces into a box and then typesetting that box in the cells of an \Verb+halign+.
+% By using \Verb+\tikzmark@box+, this can be infiltrated to put nodes around each of those boxes as it is placed.
+%
+% \iffalse
+%<*ams>
+% \fi
+% \begin{macrocode}
+\@ifpackageloaded{amsmath}{%
+% \end{macrocode}
+%
+% \begin{macro}{tikzmarkmath}
+%
+% Defines an environment in which any AMS mathematical aligned environments get nodes around each piece of their contents.
+%
+% Start by saving the original \Verb+\boxz@+ command.
+% \begin{macrocode}
+ \let\tikzmark@ams@boxz@=\boxz@
+% \end{macrocode}
+%
+% We'll need a counter to keep track of the nodes.
+% \begin{macrocode}
+ \newcounter{tikzmarkequation}
+% \end{macrocode}
+%
+% The nodes will be labelled \Verb!<name>-<number>!.
+% By default the name is \Verb!equation! but this can be customised.
+% \begin{macrocode}
+ \def\tikzmark@ams@name{equation}
+% \end{macrocode}
+%
+% This is the substitute command.
+% I don't know if the \Verb=\ifmeasuring@= actually does anything, but it's here just in case at the moment.
+% \begin{macrocode}
+ \def\tikzmark@boxz@{%
+ \ifmeasuring@
+ \tikzmark@ams@boxz@
+ \else
+ \stepcounter{tikzmarkequation}%
+ \tikzmark@box{\tikzmark@ams@name-\thetikzmarkequation}{\z@}%
+ \fi
+ }
+% \end{macrocode}
+%
+% This is the environment that sets the node name and swaps out the box code.
+% At the end of the environment we swap back the code so that the commands can be used as standalone \Verb+\tikzmarkmath+ and \Verb+\endtikzmarkmath+ in occasions when it isn't appropriate to use an environment (for example, if it crosses sections, or if it is wanted to turn on this feature for an entire document).
+% At the end of the environment, the number of nodes is written out to the terminal and log file to make it easier to keep track.
+% \begin{macrocode}
+ \newenvironment{tikzmarkmath}[1][equation]{%
+ \def\tikzmark@ams@name{#1}%
+ \setcounter{tikzmarkequation}{0}%
+ \let\boxz@=\tikzmark@boxz@
+ }{%
+ \let\boxz@=\tikzmark@ams@boxz@
+ \message{%
+ Tikzmark math environment
+ \tikzmark@ams@name\space had
+ \the\value{tikzmarkequation} nodes in it
+ }%
+ }
+% \end{macrocode}
+% \end{macro}
+% \begin{macrocode}
+}{%
+ \PackageError{tikzmark AMS}%
+ {The amsmath package has not been loaded.}%
+ {}
+}
+% \end{macrocode}
+% \iffalse
+%</ams>
+% \fi
+%
+% \iffalse
+%<*highlighting>
+% \fi
+%
+% \subsection{Highlighting}
+%
+% An early use of \Verb!\tikzmark! was to add highlighting to text by drawing over or under the text between two tikzmarks, for example the question \href{http://tex.stackexchange.com/q/46434/86}{How to "highlight" text/formulas with tikz?}.
+%
+% I was never totally happy with the overall mechanism, so didn't include it in the main tikzmark package.
+% Recently, I had occasion to revisit it and by using the new \LaTeX3 hook facility I got something that I was sufficiently happy with to add to the main package.
+%
+% The key idea is to hook into the \texttt{shipout/background} routine to insert the highlighting behind the text.
+% This allows us to draw the highlighting before the page is laid out and so is under the text.
+%
+% \LaTeX3 makes life just that little bit easier.
+% \begin{macrocode}
+\ExplSyntaxOn
+% \end{macrocode}
+%
+% Since the code that draws the highlighting will probably be very separate from the code that defines it, when storing the highlighting code then we want to expand the tikzmark full name.
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \tikzmark_fix_name:Nn #1#2
+{
+ \tl_set:Nx #1 {\tikzmark@pp@name{#2}}
+}
+% \end{macrocode}
+%
+% \begin{macro}{\StartHighlighting,\EndHighlighting,\Highlight}
+% These are the user interfaces for highlighting a section.
+% The first command inserts the drawing code into the relevant hook and places a tikzmark at the current location.
+% The second command indicates when the highlighting should stop.
+% The third is a short cut for highlighting its argument.
+%
+% These are commands rather than an environment to allow it to span, for example, different parts of an aligned equation.
+% \begin{macrocode}
+\tl_new:N \g__tikzmark_highlighter_tl
+\tl_set:Nn \g__tikzmark_highlighter_tl {tikzmark~ highlighter~}
+\int_new:N \g__tikzmark_highlighter_int
+\tl_new:N \l__tikzmark_start_tl
+\tl_new:N \l__tikzmark_end_tl
+\tl_new:N \l__tikzmark_highlighter_name_tl
+\tl_new:N \l__tikzmark_tmpa_tl
+\tl_new:N \l__tikzmark_tmpb_tl
+\tl_new:N \l__tikzmark_tmpc_tl
+
+\cs_new_protected_nopar:Npn \tikzmark_bake_highlighter:N #1
+{
+ \tl_clear:N #1
+ \clist_map_inline:nn {direction,layer}
+ {
+ \tl_put_right:Nx #1 {
+ /tikz/highlighter/##1=\pgfkeysvalueof{/tikz/highlighter/##1},
+ }
+ }
+ \clist_map_inline:nn {
+ initial~ height,
+ initial~ depth,
+ initial~ offset,
+ final~ height,
+ final~ depth,
+ final~ offset,
+ left~ margin,
+ right~ margin,
+ top~ margin,
+ bottom~ margin,
+ }
+ {
+ \tl_put_right:Nx #1 {
+ /tikz/highlighter/##1=\dim_eval:n {\pgfkeysvalueof{/tikz/highlighter/##1}},
+ }
+ }
+}
+
+\cs_new_protected_nopar:Npn \tikzmark_start_highlighting:n #1
+{
+ \int_gincr:N \g__tikzmark_highlighter_int
+ \tl_set:Nx \l__tikzmark_highlighter_name_tl
+ {
+ \tl_use:N \g__tikzmark_highlighter_tl
+ \int_use:N \g__tikzmark_highlighter_int
+ }
+ \tl_set:Nn \l__tikzmark_tmpb_tl
+ {
+ every~ highlighter/.try,
+ }
+ \tikzmark_bake_highlighter:N \l__tikzmark_tmpc_tl
+ \tl_put_right:NV \l__tikzmark_tmpb_tl \l__tikzmark_tmpc_tl
+ \tl_put_right:Nn \l__tikzmark_tmpb_tl {#1}
+ \tikzmark_process_highlighting:VV
+ \l__tikzmark_tmpb_tl
+ \l__tikzmark_highlighter_name_tl
+ \tikzmark{highlight-start-\tl_use:N \l__tikzmark_highlighter_name_tl}
+}
+\cs_new_protected_nopar:Npn \tikzmark_end_highlighting:
+{
+ \tl_set:Nx \l__tikzmark_highlighter_name_tl
+ {
+ \tl_use:N \g__tikzmark_highlighter_tl
+ \int_use:N \g__tikzmark_highlighter_int
+ }
+ \tikzmark{highlight-end-\tl_use:N \l__tikzmark_highlighter_name_tl}
+}
+
+\NewDocumentCommand \StartHighlighting {O{}}
+{%
+ \tikzmark_start_highlighting:n {#1}
+}
+\NewDocumentCommand \StopHighlighting {}
+{%
+ \tikzmark_end_highlighting:
+}
+\NewDocumentCommand \Highlight {O{} m}
+{%
+ \tikzmark_start_highlighting:n {#1}
+ #2
+ \tikzmark_end_highlighting:
+}
+% \end{macrocode}
+% \end{macro}
%
+% The following code inserts the drawing command into the shipout hook.
+% \begin{macrocode}
+% \end{macrocode}
+% We need an ordinary colon, rather than a \LaTeX3 one
+% \begin{macrocode}
+\tl_const:Nx \c__tikzmark_colon_tl
+{
+ \char_generate:nn {`:} {12}
+}
+
+\cs_generate_variant:Nn \hook_gput_next_code:nn {nV}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \tikzmark_highlight_or_shunt:nnnn #1#2#3#4
+{
+% \end{macrocode}
+% First, test to check if the tikzmarks are actually defined yet,
+% if not then bail out.
+% \begin{macrocode}
+ \bool_lazy_all:nT
+ {
+ {\tl_if_exist_p:c {save@pt@\tikzmark@pp@name{#2}}}
+ {\tl_if_exist_p:c {save@pg@\tl_use:c{save@pt@\tikzmark@pp@name{#2}}}}
+ {\tl_if_exist_p:c {save@pt@\tikzmark@pp@name{#3}}}
+ {\tl_if_exist_p:c {save@pg@\tl_use:c{save@pt@\tikzmark@pp@name{#3}}}}
+ }
+ {
+% \end{macrocode}
+% Okay, so all the tikzmarks are defined. Now see if we're on the
+% right page. Is our start tikzmark in the future?
+% \begin{macrocode}
+ \int_compare:nTF
+ {
+ \tl_use:c {save@pg@\tl_use:c{save@pt@\tikzmark@pp@name{#2}}}
+ >
+ \the\value{page}
+ }
+ {
+% \end{macrocode}
+% It is, so we just punt our highlighting down the line
+% \begin{macrocode}
+ \hook_gput_next_code:nn {#1} {
+ \tikzmark_highlight_or_shunt:nnnn {#1}{#2}{#3}{#4}
+ }
+ }
+ {
+% \end{macrocode}
+% It isn't, so we have some highlighting to do.
+% We need to build our highlighting code.
+% \begin{macrocode}
+ \tl_set:Nn \l__tikzmark_tmpa_tl {#4}
+% \end{macrocode}
+% Is our starting tikzmark on \emph{this} page?
+% \begin{macrocode}
+ \int_compare:nTF
+ {
+ \tl_use:c {save@pg@\tl_use:c{save@pt@\tikzmark@pp@name{#2}}}
+ =
+ \the\value{page}
+ }
+ {
+% \end{macrocode}
+% It is, so we use the starting tikzmark as our first coordinate.
+% \begin{macrocode}
+ \tl_put_right:Nx \l__tikzmark_tmpa_tl
+ {
+ {
+ pic~ cs
+ \tl_use:N \c__tikzmark_colon_tl
+ #2
+ }
+ }
+ }
+ {
+% \end{macrocode}
+% It isn't, so we use the north west corner of the page
+% \begin{macrocode}
+ \tl_put_right:Nn \l__tikzmark_tmpa_tl
+ {
+ {
+ page.north~ west
+ }
+ }
+ }
+% \end{macrocode}
+% Is our ending tikzmark on \emph{this} page?
+% \begin{macrocode}
+ \int_compare:nTF
+ {
+ \tl_use:c {save@pg@\tl_use:c{save@pt@\tikzmark@pp@name{#3}}}
+ =
+ \the\value{page}
+ }
+ {
+% \end{macrocode}
+% It is, so we use the ending tikzmark as our second coordinate.
+% \begin{macrocode}
+ \tl_put_right:Nx \l__tikzmark_tmpa_tl
+ {
+ {
+ pic~ cs
+ \tl_use:N \c__tikzmark_colon_tl
+ #3
+ }
+ }
+ }
+ {
+% \end{macrocode}
+% It isn't, so we use the south east corner of the page, and
+% we have to shunt the code to the next page.
+% \begin{macrocode}
+ \tl_put_right:Nn \l__tikzmark_tmpa_tl
+ {
+ {
+ page.south~ east
+ }
+ }
+ \hook_gput_next_code:nn {#1} {
+ \tikzmark_highlight_or_shunt:nnnn {#1}{#2}{#3}{#4}
+ }
+ }
+% \end{macrocode}
+% We've built our highlighting code, now's time to execute it.
+% \begin{macrocode}
+ \tl_use:N \l__tikzmark_tmpa_tl
+ }
+ }
+}
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new_protected_nopar:Npn \tikzmark_process_highlighting:nn #1#2
+{
+ \pgfkeys{/tikz/highlighter/configuration/.activate~ family}
+ \pgfkeysfiltered{/tikz/.cd,highlighter/direction,highlighter/layer,#1}
+
+ \tikzmark_fix_name:Nn \l__tikzmark_start_tl {highlight-start-#2}
+ \tikzmark_fix_name:Nn \l__tikzmark_end_tl {highlight-end-#2}
+ \tl_set:Nx \l__tikzmark_tmpa_tl {\pgfkeysvalueof{/tikz/highlighter/direction}}
+ \tl_clear:N \l__tikzmark_tmpb_tl
+ \tl_clear:N \l__tikzmark_tmpc_tl
+ \tl_if_eq:NnTF \l__tikzmark_tmpa_tl {vertical}
+ {
+ \tl_put_right:Nn \l__tikzmark_tmpb_tl
+ {
+ \vl@draw
+ }
+ }
+ {
+ \tl_if_eq:NnTF \l__tikzmark_tmpa_tl {box}
+ {
+ \tl_put_right:Nn \l__tikzmark_tmpb_tl
+ {
+ \box@draw
+ }
+ }
+ {
+ \tl_put_right:Nn \l__tikzmark_tmpb_tl
+ {
+ \hl@draw
+ }
+ }
+ }
+
+ \tl_put_right:Nn \l__tikzmark_tmpb_tl
+ {
+ {tikzmark~ clear~ ixes,#1}
+ }
+
+ \tl_set:Nx \l__tikzmark_tmpa_tl {\pgfkeysvalueof{/tikz/highlighter/layer}}
+ \tl_set:Nn \l__tikzmark_tmpc_tl
+ {
+ \tikzmark_highlight_or_shunt:nnnn
+ }
+ \tl_if_eq:NnTF \l__tikzmark_tmpa_tl {foreground}
+ {
+ \tl_put_right:Nn \l__tikzmark_tmpc_tl {{shipout/foreground}}
+ }
+ {
+ \tl_put_right:Nn \l__tikzmark_tmpc_tl {{shipout/background}}
+ }
+
+ \tikzmark_tl_put_right_braced:NV \l__tikzmark_tmpc_tl \l__tikzmark_start_tl
+ \tikzmark_tl_put_right_braced:NV \l__tikzmark_tmpc_tl \l__tikzmark_end_tl
+ \tikzmark_tl_put_right_braced:NV \l__tikzmark_tmpc_tl \l__tikzmark_tmpb_tl
+
+ \tl_if_eq:NnTF \l__tikzmark_tmpa_tl {foreground}
+ {
+ \hook_gput_next_code:nV {shipout/foreground} \l__tikzmark_tmpc_tl
+ }
+ {
+ \hook_gput_next_code:nV {shipout/background} \l__tikzmark_tmpc_tl
+ }
+}
+\cs_generate_variant:Nn \tikzmark_process_highlighting:nn {nV,VV}
+\ExplSyntaxOff
+% \end{macrocode}
+%
+% The command that draws the horizontal highligher or fader.
+% This fills a shape determined by two coordinates assumed to be (in effect) on the baseline of the start and end of the region to be highlighted.
+% \begin{macrocode}
+\def\hl@draw#1#2#3{%
+ \pgfkeys{/tikz/highlighter/configuration/.activate family}
+ \pgfkeysfiltered{/tikz/.cd,highlighter/direction,highlighter/layer,#1}
+ \begin{tikzpicture}[
+ remember picture,
+ overlay,
+ highlight picture action,
+ #1,
+ ]%
+%
+ \page@node
+%
+ \tikz@scan@one@point\pgfutil@firstofone(#2)\relax
+ \pgf@ya=\pgf@y
+ \tikz@scan@one@point\pgfutil@firstofone(#3)\relax
+ \pgf@yb=\pgf@y
+%
+ \ifdim\pgf@ya=\pgf@yb
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial offset},
+ \pgfkeysvalueof{/tikz/highlighter/initial height})
+ coordinate (start);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final offset},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final depth})
+ coordinate (end);
+%
+ \path[
+ highlight action,
+ #1
+ ] (start) rectangle (end);
+%
+ \else
+%
+ \path (page.east)
+ ++(\pgfkeysvalueof{/tikz/highlighter/right margin},0pt)
+ coordinate (east);
+%
+ \path (page.west)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/left margin},0pt)
+ coordinate (west);
+%
+ \pgfmathsetlength\pgf@x{%
+ \pgfkeysvalueof{/tikz/highlighter/initial height}%
+ }%
+%
+ \advance\pgf@yb by \pgf@x\relax
+%
+ \pgfmathsetlength\pgf@x{%
+ -1*\pgfkeysvalueof{/tikz/highlighter/final depth}%
+ }%
+%
+ \advance\pgf@ya by \pgf@x\relax
+%
+ \ifdim\pgf@yb>\pgf@ya
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial offset},
+ \pgfkeysvalueof{/tikz/highlighter/initial height})
+ coordinate (start);
+%
+ \path (#2)
+ ++(0pt,-1*\pgfkeysvalueof{/tikz/highlighter/final depth})
+ coordinate (end);
+%
+ \path[
+ highlight action,
+ #1
+ ] (start) rectangle (end -| east);
+%
+ \path (#3)
+ ++(0pt,\pgfkeysvalueof{/tikz/highlighter/initial height})
+ coordinate (start);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final offset},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final depth})
+ coordinate (end);
+%
+ \path[
+ highlight action,
+ #1
+ ] (start -| west) rectangle (end);
+%
+ \else
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial offset},
+ \pgfkeysvalueof{/tikz/highlighter/initial height})
+ coordinate (tl);
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial offset},
+ -1*\pgfkeysvalueof{/tikz/highlighter/initial depth})
+ coordinate (start);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final offset},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final depth})
+ coordinate (end);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final offset},
+ \pgfkeysvalueof{/tikz/highlighter/final height})
+ coordinate (mr);
+%
+ \path[
+ highlight action,
+ #1
+ ] (start) -- (tl) -- (tl -| east) -- (mr -| east) -- (mr) --
+ (end) -- (end -| west) -- (start -| west) -- cycle;
+%
+ \fi
+ \fi
+ \end{tikzpicture}%
+}
+% \end{macrocode}
+%
+% This one draws a box.
+% \begin{macrocode}
+\def\box@draw#1#2#3{%
+ \pgfkeys{/tikz/highlighter/configuration/.activate family}
+ \pgfkeysfiltered{/tikz/.cd,highlighter/direction,highlighter/layer,#1}
+ \begin{tikzpicture}[
+ remember picture,
+ overlay,
+ highlight picture action,
+ #1,
+ ]%
+%
+ \tikz@scan@one@point\pgfutil@firstofone(#2)\relax
+ \pgf@xa=\pgf@x
+ \tikz@scan@one@point\pgfutil@firstofone(#3)\relax
+ \pgf@xb=\pgf@x
+%
+ \def\tkmk@high@bscale{1}%
+ \ifdim\pgf@xa>\pgf@xb
+ \def\tkmk@high@bscale{-1}%
+ \fi
+%
+ \path (#2)
+ ++({\tkmk@high@bscale*(-1)*\pgfkeysvalueof{/tikz/highlighter/initial offset}},
+ \pgfkeysvalueof{/tikz/highlighter/initial height})
+ coordinate (start);
+%
+ \path (#3)
+ ++(\tkmk@high@bscale*\pgfkeysvalueof{/tikz/highlighter/final offset},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final depth})
+ coordinate (end);
+%
+ \path[
+ highlight action,
+ #1
+ ] (start) rectangle (end);
+ \end{tikzpicture}%
+}
+% \end{macrocode}
+%
+% In this one the region is defined vertically.
+% \begin{macrocode}
+\def\vl@draw#1#2#3{%
+ \pgfkeys{/tikz/highlighter/configuration/.activate family}
+ \pgfkeysfiltered{/tikz/.cd,highlighter/direction,highlighter/layer,#1}
+ \begin{tikzpicture}[
+ remember picture,
+ overlay,
+ highlight picture action,
+ #1,
+ ]%
+%
+ \tikz@scan@one@point\pgfutil@firstofone(#2)\relax
+ \pgf@ya=\pgf@y
+ \pgf@xa=\pgf@x
+ \tikz@scan@one@point\pgfutil@firstofone(#3)\relax
+ \pgf@yb=\pgf@y
+ \pgf@xb=\pgf@x
+%
+ \pgfmathsetlength\pgf@y{%
+ \pgfkeysvalueof{/tikz/highlighter/initial offset}%
+ }%
+ \advance\pgf@yb by \pgf@y
+ \pgfmathsetlength\pgf@y{%
+ -1*\pgfkeysvalueof{/tikz/highlighter/final offset}%
+ }%
+ \advance\pgf@ya by \pgf@y
+%
+ \ifdim\pgf@yb>\pgf@ya
+%
+ \ifdim\pgf@xa>\pgf@xb
+%
+ \path (#2)
+ ++(\pgfkeysvalueof{/tikz/highlighter/initial height},
+ \pgfkeysvalueof{/tikz/highlighter/initial offset})
+ coordinate (start);
+%
+ \path (#3)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/final depth},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final offset})
+ coordinate (end);
+%
+ \else
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial depth},
+ \pgfkeysvalueof{/tikz/highlighter/initial offset})
+ coordinate (start);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final height},
+ -1*\pgfkeysvalueof{/tikz/highlighter/final offset})
+ coordinate (end);
+%
+ \fi
+%
+ \path[
+ highlight action,
+ #1
+ ] (start) rectangle (end);
+%
+ \else
+%
+ \path (#2)
+ ++(\pgfkeysvalueof{/tikz/highlighter/initial height},0)
+ coordinate (tr);
+%
+ \path (#2)
+ ++(0,\pgfkeysvalueof{/tikz/highlighter/initial offset})
+ coordinate (start);
+%
+ \path (#2)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/initial depth},0)
+ coordinate (tl);
+%
+ \path (#3)
+ ++(\pgfkeysvalueof{/tikz/highlighter/final height},0)
+ coordinate (br);
+%
+ \path (#3)
+ ++(0,-1*\pgfkeysvalueof{/tikz/highlighter/final offset})
+ coordinate (end);
+%
+ \path (#3)
+ ++(-1*\pgfkeysvalueof{/tikz/highlighter/final depth},0)
+ coordinate (bl);
+%
+ \tikz@scan@one@point\pgfutil@firstofone(#2)\relax
+ \pgf@xa=\pgf@x
+ \tikz@scan@one@point\pgfutil@firstofone(#3)\relax
+ \pgf@xb=\pgf@x
+%
+ \ifdim\pgf@xa<\pgf@xb
+%
+ \path[
+ highlight action,
+ #1
+ ] (tl) |- (start) -| (tr) -| (br) |- (end) -| (bl) -| cycle;
+%
+ \else
+%
+ \path[
+ highlight action,
+ #1
+ ] (tl) |- (start) -| (tr) |- (br) |- (end) -| (bl) |- cycle;
+%
+ \fi
+%
+ \fi
+ \end{tikzpicture}
+}
+% \end{macrocode}
+%
+% These set various options.
+% \begin{macrocode}
+\tikzset{%
+ /tikz/highlighter/.is family,
+ /tikz/highlighter/.unknown/.code={%
+ \let\tk@searchname=\pgfkeyscurrentname%
+ \pgfkeysalso{%
+ /tikz/\tk@searchname=#1
+ }
+ },
+ every highlight path/.style={
+ fill=yellow!50,
+ rounded corners,
+ },
+ every foreground highlight path/.style={
+ fill opacity=.5,
+ },
+ highlight picture action/.style={
+ every highlight picture/.try,
+ every \pgfkeysvalueof{/tikz/highlighter/direction} highlight picture/.try,
+ every \pgfkeysvalueof{/tikz/highlighter/layer} highlight picture/.try,
+ },
+ highlight action/.style={
+ every highlight path/.try,
+ every \pgfkeysvalueof{/tikz/highlighter/direction} highlight path/.try,
+ every \pgfkeysvalueof{/tikz/highlighter/layer} highlight path/.try,
+ highlight path/.try,
+ \pgfkeysvalueof{/tikz/highlighter/direction} highlight path/.try,
+ \pgfkeysvalueof{/tikz/highlighter/layer} highlight path/.try,
+ },
+ /tikz/highlighter/.cd,
+ direction/.initial=horizontal,
+ layer/.initial=background,
+ direction/.default=horizontal,
+ layer/.default=background,
+ initial height/.initial=\baselineskip,
+ initial depth/.initial=.5ex,
+ initial offset/.initial=.5\baselineskip,
+ final height/.initial=\baselineskip,
+ final depth/.initial=.5ex,
+ final offset/.initial=.5\baselineskip,
+ left margin/.initial=.5\baselineskip,
+ right margin/.initial=.5\baselineskip,
+ top margin/.initial=.5\baselineskip,
+ bottom margin/.initial=-.5\baselineskip,
+ height/.style={
+ initial height=#1,
+ final height=#1
+ },
+ depth/.style={
+ initial depth=#1,
+ final depth=#1
+ },
+ offset/.style={
+ initial offset=#1,
+ final offset=#1
+ },
+ margin/.style={
+ left margin=#1,
+ right margin=#1,
+ top margin=#1,
+ bottom margin=#1,
+ },
+ /tikz/highlighter/configuration/.is family,
+ /tikz/highlighter/direction/.belongs to family=/tikz/highlighter/configuration,
+ /tikz/highlighter/layer/.belongs to family=/tikz/highlighter/configuration,
+}
+% \end{macrocode}
+%
+%
+% \begin{macrocode}
+\def\page@node{
+ \path (current page.north west)
+ ++(\hoffset + 1in + \oddsidemargin + \leftskip,
+ -\voffset - 1in - \topmargin - \headheight - \headsep)
+ node[
+ minimum width=\textwidth - \leftskip - \rightskip,
+ minimum height=\textheight,
+ anchor=north west,
+ line width=0mm,
+ inner sep=0pt,
+ outer sep=0pt,
+ ] (page) {};
+}
+% \end{macrocode}
+%
+%
+%
+% \iffalse
+%</highlighting>
+% \fi
%
% \Finale
\endinput
diff --git a/graphics/pgf/contrib/tikzmark/tikzmark.pdf b/graphics/pgf/contrib/tikzmark/tikzmark.pdf
index 62c1de9cca..385b47553d 100644
--- a/graphics/pgf/contrib/tikzmark/tikzmark.pdf
+++ b/graphics/pgf/contrib/tikzmark/tikzmark.pdf
Binary files differ
diff --git a/macros/latex/contrib/docshots/DEPENDS.txt b/macros/latex/contrib/docshots/DEPENDS.txt
index 93a73e061e..42b2d30ead 100644
--- a/macros/latex/contrib/docshots/DEPENDS.txt
+++ b/macros/latex/contrib/docshots/DEPENDS.txt
@@ -4,4 +4,7 @@ hard pdfcrop
hard pgf
hard pgfopts
hard listings
-hard minted \ No newline at end of file
+hard minted
+hard pdftexcmds
+hard ifluatex
+hard ifxetex
diff --git a/macros/latex/contrib/docshots/README.md b/macros/latex/contrib/docshots/README.md
index ff64e5ba6e..17a6693a35 100644
--- a/macros/latex/contrib/docshots/README.md
+++ b/macros/latex/contrib/docshots/README.md
@@ -28,6 +28,8 @@ For more informaiton, read \TeX{} Book by Donald Knuth.
\end{document}
```
+Otherwise, you can download [`docshots.sty`](https://raw.githubusercontent.com/objectionary/eolang.sty/gh-pages/docshots/docshots.sty) and add to your project.
+
If you want to contribute yourself, make a fork, then create a branch,
then run `l3build ctan` in the root directory.
It should compile everything without errors. If not, submit an issue and wait.
diff --git a/macros/latex/contrib/docshots/docshots.dtx b/macros/latex/contrib/docshots/docshots.dtx
index 2e6d03614c..0a559d7edf 100644
--- a/macros/latex/contrib/docshots/docshots.dtx
+++ b/macros/latex/contrib/docshots/docshots.dtx
@@ -50,7 +50,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{docshots}
%<*package>
-[2022-10-25 0.0.5 TeX Samples Next to Their PDF Snapshots in DTX]
+[2022-10-26 0.2.0 TeX Samples Next to Their PDF Snapshots in DTX]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -128,13 +128,9 @@
% \begin{docshot}
% \documentclass{article}
% \usepackage{tikz}
-% \usetikzlibrary{backgrounds}
% \pagestyle{empty}
% \begin{document}
-% \begin{tikzpicture}[
-% show background rectangle,
-% background rectangle/.style=
-% {draw=none,fill=gray!20}]
+% \begin{tikzpicture}
% \node [circle,draw] (v0) {$v_0$};
% \node [circle,draw=orange,thick,
% below right of=v0] (v1) {$v_1$};
@@ -155,17 +151,18 @@
% When you render a text instead of a single picture, it's recommended to use
% \href{https://ctan.org/pkg/geometry}{geometry} package to change the size
-% of the page and then |empty| page style to remove page numbering:
+% of the page:
% \begin{docshot}
% \documentclass{article}
-% \usepackage[paperwidth=2in]{geometry}
-% \pagestyle{empty}
+% \usepackage[paperwidth=2in,
+% paperheight=2.2in]{geometry}
% \begin{document}
% ``There is no sadder thing than
% a young pessimist, except an old
% pessimist'' --- \emph{Mark Twain}
% \end{document}
% \end{docshot}
+% You can also use |\pagestyle{empty}| as was done in previous docshots.
% \section{Package Options}
@@ -230,6 +227,18 @@ Hello, world!
%</verb>
%\fi
+% \DescribeMacro{nocrop}
+% You may disable cropping with the help of |nocrop| option:
+%\iffalse
+%<*verb>
+%\fi
+\begin{verbatim}
+\usepackage[nocrop]{docshot}
+\end{verbatim}
+%\iffalse
+%</verb>
+%\fi
+
% \DescribeMacro{hspace}
% The horizontal distance between the image and its verbatim \TeX{} source
% may be configured via |hspace| package option:
@@ -271,7 +280,7 @@ Hello, world!
%\fi
% \DescribeMacro{tmpdir}
-% The default location of temp files is |\docshots@tmpdir|. You can change this using |tmpdir| option:
+% The default location of temp files is |_docshots|. You can change this using |tmpdir| option:
%\iffalse
%<*verb>
%\fi
@@ -448,17 +457,21 @@ Hello, world!
% Then, we process package options:
% \changes{0.0.4}{2022/10/18}{Package options "lstinputlisting" and "inputminted" introduced to enable printing of verbatim text either via listings or minted packages.}
% \changes{0.0.5}{2022/10/24}{Package option "log" added, which enables detailed logging via exec. By default, there is no logging at all.}
+% \changes{0.2.0}{2022/10/26}{New package option "nocrop" added to allow disabling of "pdfcrop" execution.}
% \begin{macrocode}
\RequirePackage{pgfopts}
+\RequirePackage{ifluatex}
+\RequirePackage{ifxetex}
\def\docshots@log{}
\pgfkeys{
/docshots/.cd,
dtx/.store in=\docshots@dtx,
log/.code=\def\docshots@log{log},
+ nocrop/.code=\def\docshots@nocrop{},
lstinputlisting/.store in=\docshots@lstinputlisting,
inputminted/.store in=\docshots@inputminted,
tmpdir/.store in=\docshots@tmpdir,
- tmpdir/.default=_docshots,
+ tmpdir/.default=_docshots\ifxetex-xe\else\ifluatex-lua\fi\fi,
small/.store in=\docshots@small,
tiny/.store in=\docshots@tiny,
runs/.store in=\docshots@runs,
@@ -484,28 +497,39 @@ Hello, world!
% Then, we print the version of |pdflatex| to \TeX{} log:
% \begin{macrocode}
-\iexec[\docshots@log,quiet]{\docshots@pdflatex\space --version}%
+\iexec[\docshots@log,quiet]{"\docshots@pdflatex" --version}%
% \end{macrocode}
% Then, we print the version of \href{https://ctan.org/pkg/pdfcrop}{pdfcrop} to \TeX{} log:
% \begin{macrocode}
-\iexec[\docshots@log,quiet]{\docshots@pdfcrop\space --version}%
+\ifdefined\docshots@nocrop\else%
+ \iexec[\docshots@log,quiet]{"\docshots@pdfcrop" --version}%
+\fi%
% \end{macrocode}
% Then, we print the version of |ghostscript| to \TeX{} log:
% \begin{macrocode}
-\iexec[\docshots@log,quiet]{\docshots@gs\space --version}%
+\iexec[\docshots@log,quiet]{"\docshots@gs" --version}%
% \end{macrocode}
% Then, we make a directory where all temporary files will be kept:
% \begin{macrocode}
-\iexec[null]{mkdir -p \docshots@tmpdir/\jobname}%
+\iexec[null]{mkdir -p "\docshots@tmpdir/\jobname"}%
+% \end{macrocode}
+
+% \begin{macro}{\docshots@mdfive}
+% \changes{0.1.1}{2022/10/26}{New supplementary command added to calculate MD5 sum of a file.}
+% Then, we define a command for MD5 hash calculating of a file:
+% \begin{macrocode}
+\RequirePackage{pdftexcmds}
+\makeatletter\newcommand\docshots@mdfive[1]{\pdf@filemdfivesum{#1}}\makeatother
% \end{macrocode}
+% \end{macro}
% \begin{macro}{docshot}
% Then, we define |docshot| environment:
% \begin{macrocode}
-\newenvironment{docshot}
+\makeatletter\newenvironment{docshot}
{\VerbatimEnvironment\begin{VerbatimOut}
{\docshots@tmpdir/\jobname/verbatim.tex}}
{\end{VerbatimOut}%
@@ -519,52 +543,64 @@ Hello, world!
% \end{macrocode}
% We calculate MD5 hashsum of the file content:
% \begin{macrocode}
- \def\hash{\pdfmdfivesum file
- {\docshots@tmpdir/\jobname/verbatim.tex}}%
+ \def\hash{\docshots@mdfive{\docshots@tmpdir/\jobname/verbatim.tex}}%
% \end{macrocode}
% If the PDF with the required name already exists, we ignore this step.
% Otherwise, we copy |verbatim.tex| into new file and run |pdflatex|:
+% \changes{0.1.0}{2022/10/26}{The output is saved to a hash-named file, for better uniqueness of temporary files.}
% \begin{macrocode}
\IfFileExists{\docshots@tmpdir/\jobname/\hash.pdf}
- {\message{docshots: won't render, the PDF already exists
- (\docshots@tmpdir/\jobname/\hash.pdf)^^J}}
- {\iexec[\docshots@log,quiet]{cp \docshots@tmpdir/\jobname/verbatim.tex
- \docshots@tmpdir/\jobname/\hash.tex}%
- \foreach \n in {1,...,\docshots@runs}{
- \iexec[\docshots@log,quiet]{cd \docshots@tmpdir/\jobname;
- \docshots@pdflatex\space
+ {\message{docshots: Won't render,
+ the PDF '\docshots@tmpdir/\jobname/\hash.pdf' already exists^^J}}
+ {\iexec[\docshots@log,quiet]{cp "\docshots@tmpdir/\jobname/verbatim.tex"
+ "\docshots@tmpdir/\jobname/\hash.tex"}%
+ \foreach \n in {1,...,\docshots@runs}{%
+ \iexec[\docshots@log,
+ stdout=\docshots@tmpdir/\jobname/\hash.stdout,
+ exit=\docshots@tmpdir/\jobname/\hash.ret,
+ quiet,trace]{cd "\docshots@tmpdir/\jobname" &&
+ "\docshots@pdflatex"
-interaction=errorstopmode
-halt-on-error
-shell-escape
- \hash.tex}
- \message{docshots: pdflatex run no.\n^^J}
+ \hash.tex}%
+ \ifnum\n=1\else%
+ \message{docshots: pdflatex run no.\n^^J}%
+ \fi%
\IfFileExists{\docshots@tmpdir/\jobname/after.sh}
{\iexec[\docshots@log,quiet]{chmod a+x
- \docshots@tmpdir/\jobname/after.sh}
- \iexec[\docshots@log,quiet]{cd \docshots@tmpdir/\jobname;
+ "\docshots@tmpdir/\jobname/after.sh"}
+ \iexec[\docshots@log,quiet]{cd "\docshots@tmpdir/\jobname" &&
./after.sh \n\space \hash\space \hash.tex}}
{}}}%
% \end{macrocode}
% Here we delete |after.sh| which may exist here after the last
% compilation of |pdflatex|:
% \begin{macrocode}
- \iexec[\docshots@log,quiet]{rm -f \docshots@tmpdir/\jobname/after.sh}
+ \iexec[\docshots@log,quiet]{rm -f "\docshots@tmpdir/\jobname/after.sh"}
% \end{macrocode}
% If a cropped version of the PDF with the required name already exists, we ignore this step.
% Otherwise, we ask |pdfcrop| to crop the PDF:
% \begin{macrocode}
\IfFileExists{\docshots@tmpdir/\jobname/\hash.crop.pdf}
- {\message{docshots: won't pdfcrop, the PDF already exists
- (\docshots@tmpdir/\jobname/\hash.crop.pdf)^^J}}
- {\iexec[\docshots@log,quiet]{\docshots@pdfcrop\space
- --margins \docshots@margin\space
- \docshots@tmpdir/\jobname/\hash.pdf
- \docshots@tmpdir/\jobname/\hash.crop.pdf}}%
+ {\message{docshots: Won't pdfcrop,
+ the PDF '\docshots@tmpdir/\jobname/\hash.crop.pdf'
+ already exists^^J}}
+ {\ifdefined\docshots@nocrop
+ \iexec[\docshots@log,quiet]{cp
+ "\docshots@tmpdir/\jobname/\hash.pdf"
+ "\docshots@tmpdir/\jobname/\hash.crop.pdf"}%
+ \else%
+ \iexec[\docshots@log,quiet]{"\docshots@pdfcrop"
+ --margins 0
+ "\docshots@tmpdir/\jobname/\hash.pdf"
+ "\docshots@tmpdir/\jobname/\hash.crop.pdf"}%
+ \fi}%
% \end{macrocode}
% We configure |fancyvrb|:
% \begin{macrocode}
\fvset{numbers=left,numbersep=3pt}%
- \fvset{frame=leftline,framerule=.4pt,rulecolor=\color{gray}}%
+ \fvset{frame=leftline,framerule=.2pt,rulecolor=\color{gray}}%
\fvset{samepage=true}%
\fvset{baselinestretch=1}%
\ifdefined\docshots@small%
@@ -574,12 +610,13 @@ Hello, world!
\fvset{fontsize=\scriptsize}%
\fi%
% \end{macrocode}
-% We render the two column content:
+% Finally, we render the two-column content:
% \begin{macrocode}
\begingroup%
\par%
\tikz[baseline=(a.north)]
- \node (a) [draw=gray,inner sep=0]
+ \node (a) [draw=gray,inner sep=\docshots@margin,
+ line width=.2pt]
{\includegraphics[width=\docshots@left]
{\docshots@tmpdir/\jobname/\hash.crop.pdf}};%
\hspace{\docshots@hspace}%
@@ -597,30 +634,30 @@ Hello, world!
\end{minipage}%
\par%
\endgroup%
-}
+}\makeatother
% \end{macrocode}
% \end{macro}
% \begin{macro}{\docshotPrerequisite}
% Then, we define |\docshotPrerequisite| command:
% \begin{macrocode}
-\newcommand\docshotPrerequisite[1]{
- \iexec[\docshots@log,quiet]{cp #1 \docshots@tmpdir/\jobname}%
- \message{docshots: file #1 copied to
- \docshots@tmpdir/\jobname/#1^^J}%
-}
+\makeatletter\newcommand\docshotPrerequisite[1]{
+ \iexec[\docshots@log,quiet]{cp #1 "\docshots@tmpdir/\jobname"}%
+ \message{docshots: File '#1' copied to
+ '\docshots@tmpdir/\jobname/#1'^^J}%
+}\makeatother
% \end{macrocode}
% \end{macro}
% \begin{macro}{\docshotAfter}
% Finally, we define |\docshotAfter| command:
% \begin{macrocode}
-\newcommand\docshotAfter[1]{
+\makeatletter\newcommand\docshotAfter[1]{
\iexec[\docshots@log,quiet]{/bin/echo -n '\detokenize{#1}'
- > \docshots@tmpdir/\jobname/after.sh}%
- \message{docshots: file
- \docshots@tmpdir/\jobname/after.sh created^^J}%
-}
+ > "\docshots@tmpdir/\jobname/after.sh"}%
+ \message{docshots: File
+ '\docshots@tmpdir/\jobname/after.sh' created^^J}%
+}\makeatother
% \end{macrocode}
% \end{macro}
diff --git a/macros/latex/contrib/docshots/docshots.pdf b/macros/latex/contrib/docshots/docshots.pdf
index 888639741d..9d94d44dee 100644
--- a/macros/latex/contrib/docshots/docshots.pdf
+++ b/macros/latex/contrib/docshots/docshots.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index fa2ddd5abe..9721fc9842 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2022/10/15}{1.71}
+\ProvidesExplClass{easybook}{2022/10/26}{1.71A}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -303,7 +303,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2022/10/15}{1.71}
+\ProvidesExplPackage{easybase}{2022/10/26}{1.71A}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2333,7 +2333,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/10/15}{1.71}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/10/26}{1.71A}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 127c268d2a..59f3eea5f2 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index e40bd1ed4c..c6b3f101cb 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -1,19 +1,18 @@
-\PassOptionsToPackage{dvipsnames}{xcolor}
\documentclass[load-preamble+]{cnltx-doc}
\usepackage[fontset = fandol]{ctex}
\usepackage
{
- enumitem,newtxmath,indentfirst,tabularray,
+ enumitem,newtxmath,indentfirst,tabularray,ninecolors,
fancyvrb,geometry,hologo,pifont,changelog
}
\definecolorscheme{blue}
{
- cs => Plum,
- option => PineGreen,
- cnltx => RoyalBlue,
- link => OrangeRed,
- module => YellowOrange,
+ cs => violet,
+ option => olive6,
+ cnltx => blue,
+ link => purple5,
+ module => orange,
meta => black,
versionnote => black
}
@@ -22,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v1.71,
- date = 2022/10/15,
+ version = v1.71A,
+ date = 2022/10/26,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -39,20 +38,20 @@
}
\KOMAoptions{numbers = noenddot}
\setfootnoterule[0.5pt]{0.4\columnwidth}
-\addtokomafont{headsepline}{\color{RoyalBlue}}
-\addtokomafont{footnoterule}{\color{RoyalBlue}}
+\addtokomafont{headsepline}{\color{blue}}
+\addtokomafont{footnoterule}{\color{blue}}
\addtokomafont{section}{\normalfont\sffamily}
\addtokomafont{subsection}{\normalfont\sffamily}
\addtokomafont{subsubsection}{\normalfont\sffamily}
\DeclareTOCStyleEntry[entryformat = \sffamily]{default}{section}
\DeclareFieldFormat[book]{title}{\textsf{#1}}
\geometry{margin = 1in,marginparwidth = 0.6in}
-\SetEnumitemValue{label}{smallbullet}{\small\color{RoyalBlue}\textbullet}
+\SetEnumitemValue{label}{smallbullet}{\small\color{blue}\textbullet}
\setlist{nosep,topsep = \smallskipamount,labelsep = 0.5em}
\setlist[1]{labelindent = \parindent}
\setlist[itemize,1]{label = smallbullet,leftmargin = *}
\setcounter{tocdepth}{2}
-\SetTblrInner{hline{1,Z} = {0.8pt,RoyalBlue}}
+\SetTblrInner{hline{1,Z} = {0.8pt,blue}}
\ExplSyntaxOn\makeatletter
% * Do not add entries to the index
@@ -139,10 +138,10 @@
baselinestretch = 1.2,
gobble = 2,
fontsize = \small,
- rulecolor = \color{RoyalBlue},
+ rulecolor = \color{blue},
framerule = 0.5pt,
frame = single,
- framesep = 10pt
+ framesep = 6pt
}
\DefineVerbatimEnvironment{frameverb}{Verbatim}
{
@@ -228,15 +227,15 @@
{
colspec = @{}*{5}{c}@{},
cells = {cmd = \pkg*},
- cell{1}{3,4} = brown8,
- cell{2}{5} = brown8,
- cell{3}{2,4} = brown8,
- cell{5}{1} = brown8,
- cell{1}{2} = cyan8,
- cell{3}{1,4} = cyan8,
- cell{5}{2} = cyan8
+ cell{1}{3,4} = yellow8,
+ cell{2}{5} = yellow8,
+ cell{3}{2,4} = yellow8,
+ cell{5}{1} = yellow8,
+ cell{1}{2} = green8,
+ cell{3}{1,4} = green8,
+ cell{5}{2} = green8
}{
- amsthm & bicaption & ctex & caption & chemformula \\
+ amsthm & bicaption & ctexbook & caption & chemformula \\
enumitem & etoolbox & fancyhdr & geometry & hyperref \\
imakeidx & listings & marginnote & mathtools & multicol \\
pifont & pdfpages & siunitx & spbmark & thmtools \\
@@ -287,7 +286,7 @@
\insertblr
{
colspec = @{}*{4}{c}@{},
- hline{2} = {0.5pt,RoyalBlue},
+ hline{2} = {0.5pt,blue},
row{1} = {font = \sffamily},
column{1} = {cmd = \code}
}{
@@ -324,7 +323,7 @@
\insertblr
{
colspec = @{}*{5}{c}@{},
- hline{3} = {0.5pt,RoyalBlue},
+ hline{3} = {0.5pt,blue},
row{1,3} = {font = \sffamily,belowsep = 0pt},
row{2,4} = {cmd = \module*}
}{
@@ -1170,9 +1169,7 @@
\begin{commands}\noitemsep
\command{newcounter}[\marg{计数器}\oarg{父计数器}]\default{}
\command{counteruse}[\sarg\oarg{编号}\darg{分隔符}\marg{计数器}\oarg{父计数器}]
- 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令,计数器值输出命令 \cs{counteruse} 将会以 \cs*{the}\meta{父计数器}\meta{分隔符}\cs*{the}\meta{计数器} 形式输出这种计数器的值。命令 \cs{counteruse} 仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次命令 \meta{计数器} 的值增加1,带有星号参数的命令使 \meta{计数器} 的值保持不变。计数器的 \meta{编号} 为 \code{arabic} 或 \code{alph} 等计数形式。
-
- 在一定的场合下可能用到 \cs{counteruse} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器。使用 \cs{labelformat} 设置计数器的标签引用时需添加 \code{eb-} 前缀:
+ 命令 \cs{newcounter} 是 \LaTeX 自带的创建计数器命令。命令 \cs{counteruse} 可以在当前位置输出这种计数器的值,它仅具有\textbf{输出功能},并不会改变计数器原有的绑定关系。默认每使用一次输出命令 \meta{计数器} 的值增加1,带有星号参数的命令使 \meta{计数器} 的值保持不变。计数器的 \meta{编号} 为 \code{arabic} 或 \code{alph} 等计数形式。在一定的场合下可能用到 \cs{counteruse} 命令,比如通过新建快捷命令在一些位置使用定理环境的计数器。使用 \cs{labelformat} 设置计数器的标签引用时需添加 \code{eb-} 前缀:
\begin{ctexexam}
\labelformat{eb-theorem}{定理#1}
\newcommand{\theoremhead}[1]{定理\counteruse{theorem}[chapter]\hspace{1em}#1}
diff --git a/macros/latex/contrib/filehook/DEPENDS.txt b/macros/latex/contrib/filehook/DEPENDS.txt
new file mode 100644
index 0000000000..fa0a16dcfb
--- /dev/null
+++ b/macros/latex/contrib/filehook/DEPENDS.txt
@@ -0,0 +1,6 @@
+soft pgf # Only needed for optional pgf-filehook
+soft fink # compatibility patches if loaded
+soft listings # compatibility patches if loaded
+soft memoir # compatibility patches if loaded
+soft scrlfile # compatibility patches if loaded
+soft ydoc # for compilation of package manual only \ No newline at end of file
diff --git a/macros/latex/contrib/filehook/README b/macros/latex/contrib/filehook/README
deleted file mode 100644
index aeac2f848e..0000000000
--- a/macros/latex/contrib/filehook/README
+++ /dev/null
@@ -1,7 +0,0 @@
-LaTeX package 'filehook'
-~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2020 by Martin Scharrer <martin@scharrer-online.de>
-Code repository: ssh://hth@helixteamhub.cloud/scharrer/projects/filehook/
-
-Provides several file hooks for files read by \input, \include and \InputIfFileExists.
-
diff --git a/macros/latex/contrib/filehook/README.txt b/macros/latex/contrib/filehook/README.txt
new file mode 100644
index 0000000000..4cafdf9469
--- /dev/null
+++ b/macros/latex/contrib/filehook/README.txt
@@ -0,0 +1,12 @@
+LaTeX package 'filehook'
+~~~~~~~~~~~~~~~~~~~~~~~~
+Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
+License: LPPL v1.3c or later <https://www.latex-project.org/lppl/lppl-1-3c/>
+CTAN: https://www.ctan.org/pkg/filehook
+Texdoc: https://texdoc.org/pkg/filehook
+Homepage: https://github.com/MartinScharrer/filehook
+Repository: https://github.com/MartinScharrer/filehook.git
+Issue tracker: https://github.com/MartinScharrer/filehook/issues
+
+Provides several file hooks for files read by \input, \include and \InputIfFileExists.
+
diff --git a/macros/latex/contrib/filehook/filehook.dtx b/macros/latex/contrib/filehook/filehook.dtx
index eee04bd9af..2008f1a489 100644
--- a/macros/latex/contrib/filehook/filehook.dtx
+++ b/macros/latex/contrib/filehook/filehook.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
-%% Copyright (C) 2011-2020 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (c) 2011-2022 by Martin Scharrer <martin.scharrer@web.de>
%% ----------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,10 +26,10 @@
%<*driver>
\ProvidesFile{filehook.dtx}[%
%<=*DATE>
- 2020/09/29
+ 2022/10/25
%<=/DATE>
%<=*VERSION>
- v0.8a
+ v0.8b
%<=/VERSION>
Hooks for input files]
\documentclass{ydoc}
@@ -102,13 +102,15 @@
% \changes{v0.7}{2020/02/03}{Further fixes for InputIfFileExists for LaTeX format 2019/10/01.}
% \changes{v0.8}{2020/09/27}{Support for LaTeX format 2020/10/01.}
% \changes{v0.8a}{2020/09/29}{Further fixes for LaTeX format 2020/10/01.}
+% \changes{v0.8b}{2022/10/25}{Updated package URLs. Added DEPENDS.txt file.}
%
% \GetFileInfo{filehook.dtx}
%
% \DoNotIndex{\newcommand,\newenvironment}
%
% \author{Martin Scharrer}
-% \email{martin@scharrer-online.de}
+% \email{martin.scharrer@web.de}
+% \github{MartinScharrer/filehook}
% \maketitle
%
% \begin{abstract}
diff --git a/macros/latex/contrib/filehook/filehook.pdf b/macros/latex/contrib/filehook/filehook.pdf
index bd94ed1a66..d1d4236431 100644
--- a/macros/latex/contrib/filehook/filehook.pdf
+++ b/macros/latex/contrib/filehook/filehook.pdf
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/README.md b/macros/latex/contrib/jeuxcartes/README.md
new file mode 100644
index 0000000000..bcfb5270a1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/README.md
@@ -0,0 +1,9 @@
+JeuxCartes is a package with playing cards.
+--------------------------------------------------
+JeuxCartes est un package avec des cartes à jouer.
+--------------------------------------------------
+Author : Cédric Pierquet
+email : cpierquet@outlook.fr
+Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+Poker cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards
+Tarot cards Image's Licence : Public Domain https://freesvg.org/ \ No newline at end of file
diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
new file mode 100644
index 0000000000..7cf0434497
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
new file mode 100644
index 0000000000..159fe3412f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/doc/JeuxCartes-doc.tex
@@ -0,0 +1,713 @@
+% !TeX TXS-program:compile = txs:///arara
+% arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode}
+% arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
+
+\documentclass{article}
+\usepackage[french]{babel}
+\usepackage{iftex,ifpdf,ifxetex,ifluatex}
+\ifpdftex
+ \usepackage[utf8]{inputenc}
+ \usepackage[T1]{fontenc}
+ \usepackage[upright]{fourier}
+ \usepackage[scaled=0.875]{helvet}
+ \renewcommand\ttdefault{lmtt}
+ \usepackage[scaled=0.875]{cabin}
+ \usepackage{amsmath,amssymb}
+\fi
+\ifluatex
+ \RequirePackage[math-style=french,bold-style=ISO]{fourier-otf}
+\fi
+\ifxetex
+ \RequirePackage[math-style=french,bold-style=ISO]{fourier-otf}
+\fi
+\usepackage{fontawesome5}
+\usepackage{enumitem}
+\usepackage{JeuxCartes}
+\usepackage{tabularray}
+\usepackage{fancyvrb}
+\usepackage{fancyhdr}
+\fancyhf{}
+\renewcommand{\headrulewidth}{0pt}
+\lfoot{\sffamily \small [JeuxCartes]}
+\cfoot{\sffamily \small - \thepage{} -}
+\rfoot{\hyperlink{matoc}{\small\faArrowAltCircleUp[regular]}}
+
+\usepackage{hvlogos}
+\usepackage{menukeys}
+\let\tab\relax
+\usepackage{tabto}
+\usepackage{codehigh}
+\usepackage{scontents}
+\usepackage{hyperref}
+\urlstyle{same}
+\hypersetup{pdfborder=0 0 0}
+\usepackage[margin=1.5cm]{geometry}
+\usepackage{newverbs}
+\newverbcommand{\pverb}{\color{purple}}{}
+\newverbcommand{\rverb}{\color{red}}{}
+\newverbcommand{\vverb}{\color{ForestGreen}}{}
+\newverbcommand{\averb}{\color{CadetBlue}}{}
+\newverbcommand{\overb}{\color{orange}}{}
+\newverbcommand{\bverb}{\color{blue}}{}
+\setlength{\parindent}{0pt}
+\definecolor{LightGray}{gray}{0.9}
+
+\def\TPversion{0.1.2}
+\def\TPdate{26 Octobre 2022}
+
+\usepackage[most]{tcolorbox}
+\usepackage[outputdir=build]{minted}
+\tcbuselibrary{minted}
+
+\tcbset{vignettes/.style={%
+ nobeforeafter,box align=base,boxsep=0pt,enhanced,sharp corners=all,rounded corners=southeast,%
+ boxrule=0.75pt,left=7pt,right=1pt,top=0pt,bottom=0.25pt,%
+ }
+}
+\tcbset{vignettelatex/.style={%
+ fontupper={\vphantom{pf}\footnotesize\ttfamily},
+ vignettes,%
+ colframe=CadetBlue,coltitle=white,colback=CadetBlue!5,%
+ overlay={\begin{tcbclipinterior}%
+ \fill[fill=lightgray!50]($(interior.south west)$) rectangle node[rotate=90]{\tiny \sffamily{\textcolor{CadetBlue}{\scalebox{0.6}[0.75]{\textbf{\LaTeX}}}}} ($(interior.north west)+(5pt,0pt)$);%
+ \end{tcbclipinterior}}
+ }
+}
+
+\newtcblisting{codetex}[1][]{%
+ colback=white,colframe=red!75!black,title={\small \faCode} Code \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codeattention}[1][]{%
+ colback=Yellow!50,colframe=Yellow!50!Black,title={\small \faBomb} Attention,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codesortie}[1][]{%
+ colback=white,colframe=red!75!black,title={\small \faArrowAltCircleRight[regular]} Sortie \LaTeX,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codeidee}[1][]{%
+ colback=white,colframe=PeachPuff!75!black,title={\small \faLightbulb[regular]} Idée(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codeinfo}[1][]{%
+ colback=white,colframe=SteelBlue,title={\small \faPuzzlePiece} Information(s),fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+\newtcolorbox{codecles}[1][]{%
+ colback=white,colframe=ForestGreen!75,title={\small \faPaperclip} Clés et options,fonttitle=\sffamily\bfseries,left=3pt,right=3pt,top=2pt,bottom=2pt,#1}
+
+%petite vignette tex
+\newcommand\ctex[1]{\tcbox[vignettelatex]{#1}}
+
+\title{%
+\begin{minipage}{0.85\linewidth}
+ \begin{tcolorbox}[colframe=yellow,colback=yellow!15]
+ \begin{center}
+ \begin{tabular}{c}
+ \lstinline!JeuxCartes!\\
+ \\
+ Des cartes de poker ou de tarot, \\
+ simples ou en \textit{mains}, \\
+ avec possibilité de tirage aléatoire.
+ \end{tabular}
+ \end{center}
+ \end{tcolorbox}
+\end{minipage}
+}
+\author{
+ \begin{tabular}{c}
+ Cédric Pierquet\\
+ {\ttfamily c pierquet -- at -- outlook . fr}
+ \end{tabular}
+}
+\date{Version \TPversion{} -- \TPdate}
+
+\newcommand\Cle[1]{{\bfseries\sffamily\textlangle #1\textrangle}}
+
+\begin{document}
+
+\pagestyle{fancy}
+
+\maketitle
+
+\thispagestyle{empty}
+
+{\Large {\bfseries Résumé} : Quelques commandes pour afficher des cartes à jouer, de type Poker ou Tarot}
+
+\medskip
+
+\noindent Une commande pour créer une carte individuelle (insertion autonome ou via \TikZ).
+
+Une commande pour créer une main de cartes, avec possibilité d'affichage en éventail.
+
+Une commande pour créer une main aléatoire de cartes, avec possibilité d'affichage en éventail.
+
+Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main ou aléatoire).
+
+\vspace{0.5cm}
+
+\begin{center}
+ \CartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AP § 10C § AC § 8T § 2K § VC}\hspace{0.5cm}\CartesJeu[TypeJeu=Tarot,EspH=0.85,EspV=0.2]{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+\end{center}
+
+\hfill{}\textit{Merci aux membres du groupe \faFacebook{} du \og Coin \LaTeX{} \fg{} pour leur aide et leurs idées !}
+
+\vfill
+
+\hrule
+
+\medskip
+
+\begin{tblr}{width=\linewidth,colspec={X[c]X[c]X[c]X[c]X[c]X[c]},cells={font=\sffamily}}
+ {\huge \LaTeX} & & & & &\\
+ & {\huge \pdfLaTeX} & & & & \\
+ & & {\huge \LuaLaTeX} & & & \\
+ & & & {\huge \TikZ} & & \\
+ & & & & {\huge \TeXLive} & \\
+ & & & & & {\huge \MiKTeX} \\
+\end{tblr}
+
+\medskip
+
+\hrule
+
+\vfill
+
+~
+
+\newpage
+
+\phantomsection
+\hypertarget{matoc}{}
+
+\tableofcontents
+
+\vfill~
+
+\part{Historique}
+{\small \bverb|v0.1.2|~:~~~~Modification du nom (et de la source) des images de Tarot (CC0)
+
+{\small \bverb|v0.1.1|~:~~~~Ajout de commandes pour des mini-cartes
+
+{\small \bverb|v0.1 |~:~~~~Version initiale
+
+\vfill~
+
+\newpage
+
+\part*{Introduction}
+
+\section{Le package JeuxCartes}
+
+\subsection{\og Philosophie \fg{} du package}
+
+\begin{codeidee}
+L'idée de ce package est de proposer, comme le fait \ctex{pst-poker}, des commandes pour intégrer des cartes de poker dans un document \LaTeX.
+
+Les cartes sont des images :
+%
+\begin{itemize}
+ \item les cartes type \textsf{Poker} sont sous licence LGPL, \copyright{}2005, de David Bellot, via \url{https://github.com/htdebeer/SVG-cards} ;
+ \item les cartes type \textsf{Tarot} sous licence CC0, du site \url{https://freesvg.org}.
+\end{itemize}
+\end{codeidee}
+
+\begin{codeinfo}
+Le {package} \ctex{JeuxCartes} charge les {packages} :
+
+\begin{itemize}
+ \item \ctex{tikz}, \ctex{pifont}, \ctex{xfp}, \ctex{pgffor}, \ctex{xinttools} ;
+ \item \ctex{listofitems}, \ctex{xstring}, \ctex{xparse} et \ctex{simplekv} ;
+ \item \ctex{randomlist}, \ctex{xcolor} avec les options \ctex{[table,svgnames]}.
+\end{itemize}
+\end{codeinfo}
+
+\begin{codeinfo}
+Des packages ou solutions existent déjà pour des cartes en \LaTeX, le lecteur choirira donc la solution qui lui semblera être la meilleure pour son utilisation !
+
+On peut citer par exemple :
+
+\begin{itemize}
+ \item le packages \ctex{pst-poker} en language \texttt{pstricks} ;
+ \item les fichiers \texttt{postscript} disponibles sur \url{https://melusine.eu.org/syracuse/postscript/cartes01/}
+\end{itemize}
+\end{codeinfo}
+
+\begin{codeattention}
+Les images utiles sont proposés en format \texttt{png}, donc une solution de compilation adaptée au format \textsf{png} est nécessaire.
+\end{codeattention}
+
+\subsection{Chargement du package}
+
+\begin{codetex}[listing only]
+%exemple de chargement pour une compilation en (pdf)latex
+\documentclass{article}
+\usepackage[french]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{JeuxCartes}
+...
+\end{codetex}
+
+\begin{codetex}[listing only]
+%exemple de chargement pour une compilation en (xe/lua)latex
+\documentclass{article}
+\usepackage[french]{babel}
+\usepackage{mathtools}
+\usepackage{fontspec}
+\usepackage{JeuxCartes}
+...
+\end{codetex}
+
+\section{Compléments}
+
+\subsection{Le système de \og clés/options \fg}
+
+\begin{codeidee}
+L'idée est de conserver -- autant que faire se peut -- l'idée de \Cle{Clés} qui sont modifiables et relativement explicites. À noter que :
+%
+\begin{itemize}[leftmargin=*]
+ \item les \Cle{Clés} peuvent être mises dans n'importe quel ordre, et être omises lorsque la valeur par défaut est conservée ;
+ \item les \textsf{arguments} doivent, eux, être positionnés dans le \textit{bon ordre}.
+\end{itemize}
+\end{codeidee}
+
+\begin{codeinfo}
+Les \textsf{commandes} présentés seront explicités via leur \textsf{syntaxe} avec les \textsf{options} ou \textsf{arguments}.
+
+Autant que faire se peut, des exemples/illustrations/remarques seront proposés à chaque fois.
+
+\smallskip
+
+Les \textsf{codes} seront présentés dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faCode} Code \LaTeX}, si possible avec la \textsf{sortie} dans la même boîte, et sinon la \textsf{sortie} sera visible dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faArrowAltCircleRight[regular]} Sortie \LaTeX}. Les \textsf{clés} ou \textsf{options} seront présentées dans des \textsf{boîtes} \textcolor{ForestGreen}{{\small \faPaperclip} Clés}.
+\end{codeinfo}
+
+\part{Les commandes}
+
+\section{La commande simple \og CarteJeu \fg}
+
+\subsection{Introduction}
+
+\begin{codeinfo}
+La commande \ctex{AffCarteJeu} affiche une carte, avec un système de clés/options
+\end{codeinfo}
+
+\begin{codetex}[]
+\AffCarteJeu{VP}\AffCarteJeu{10K}\AffCarteJeu{AC}\AffCarteJeu{DosBleu}\AffCarteJeu{DT}\\ \\
+\AffCarteJeu[TypeJeu=Tarot]{VP}\AffCarteJeu[TypeJeu=Tarot]{Dos}
+\AffCarteJeu[TypeJeu=Tarot]{Exc}\AffCarteJeu[TypeJeu=Tarot]{1AT}
+\AffCarteJeu[TypeJeu=Tarot]{10K}\AffCarteJeu[TypeJeu=Tarot]{18AT}
+\end{codetex}
+
+\subsection{Noms de cartes}
+
+\begin{codeinfo}
+Les cartes étant des \textbf{images}, leur nom
+est fixé suivant le modèle suivant (typiquement \texttt{<hauteur>.<couleur>} ) avec quelques spécificités :
+
+\begin{itemize}
+ \item cartes classiques pour Belote/Bataille/Poker :
+ \begin{itemize}
+ \item \texttt{2C}, \texttt{3C}, \ldots, \texttt{DC}, \texttt{RC}, \texttt{AC}\dotfill\Cle{Cœur}
+ \item \texttt{2P}, \texttt{3P}, \ldots, \texttt{DP}, \texttt{RP}, \texttt{AP}\dotfill\Cle{Pique}
+ \item \texttt{2K}, \texttt{3K}, \ldots, \texttt{DK}, \texttt{RK}, \texttt{AK}\dotfill\Cle{Carreau}
+ \item \texttt{2T}, \texttt{3T}, \ldots, \texttt{DT}, \texttt{RT}, \texttt{AT}\dotfill\Cle{Trèfle}
+ \item \texttt{JN}, \texttt{JR}\dotfill\Cle{Joker}
+ \item \texttt{DosRouge}, \texttt{DosBleu}, \ldots\dotfill\Cle{Dos}
+ \end{itemize}
+ \item cartes de Tarot :
+ \begin{itemize}
+ \item \texttt{2C}, \texttt{3C}, \ldots, \texttt{CC}, \ldots, \texttt{AC}\dotfill\Cle{Cœur}
+ \item \texttt{2P}, \texttt{3P}, \ldots, \texttt{CP}, \ldots, \texttt{AP}\dotfill\Cle{Pique}
+ \item \texttt{2K}, \texttt{3K}, \ldots, \texttt{CK}, \ldots, \texttt{AK}\dotfill\Cle{Carreau}
+ \item \texttt{2T}, \texttt{3T}, \ldots, \texttt{CT}, \ldots, \texttt{AT}\dotfill\Cle{Trèfle}
+ \item \texttt{Exc}, \texttt{1AT}, \texttt{2AT}, \ldots, \texttt{20T}, \texttt{21AT}\dotfill\Cle{Atouts}
+ \item \texttt{Dos}\dotfill\Cle{Dos}
+ \end{itemize}
+\end{itemize}
+\end{codeinfo}
+
+\subsection{Clés et options}
+
+\begin{codetex}[listing only]
+\AffCarteJeu[options]{<carte>}
+\end{codetex}
+
+\begin{codecles}
+Concernant les \Cle{options} :
+
+\begin{itemize}
+ \item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, de la carte ; \hfill{}défaut \Cle{4.25}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{Rotation} pour une éventuelle rotation de la carte ; \hfill{}défaut \Cle{0}
+ \item la clé \Cle{AlignementV} pour l'alignement vertical (lié à \ctex{raisebox} ou à \TikZ) ; \hfill{}défaut \Cle{0.5}
+ \item le booléen \Cle{Tikz} pour préciser que la carte est \textit{autonome}, dans un environnement \ctex{tikzpicture} ; \hfill{}défaut \Cle{false}
+ \item la clé \Cle{DecalageX} pour le décalage horizontal par rapport à l'origine (si \Cle{Tikz=false}) ; \hfill{}défaut \Cle{0}
+ \item la clé \Cle{DecalageY} pour le décalage vertical par rapport à l'origine (si \Cle{Tikz=false}) ; \hfill{}défaut \Cle{0}
+ \item le booléen \Cle{TikzAutonome} pour basculer d'un environnement \TikZ{} à une commande \TikZ. \hfill{}défaut \Cle{true}
+\end{itemize}
+\end{codecles}
+
+\begin{codeinfo}
+Concernant la clé \Cle{AlignementV}, elle peut être :
+
+\begin{itemize}
+ \item donnée sous forme décimale entre 0 et 1 pour l'utilisation standard ;
+ \item choisie parmi 0, 0.5 et 1 pour l'utilisation via le mode \Cle{Tikz}.
+\end{itemize}
+\end{codeinfo}
+
+\begin{codeinfo}
+Concernant la clé \Cle{TikzAutonome} est plutôt une clé utilisée \textit{interne}, elle peut être utilisée pour intégrer une carte dans un environnement \TikZ{} déjà créé, pour une utilisation complètement personnalisé des cartes !
+
+\smallskip
+
+Il est à noter que la commande (en \textit{interne}) est liée à un \textit{sous}-environnement \ctex{scope}.
+\end{codeinfo}
+
+
+\begin{codetex}[]
+En mode normal, \AffCarteJeu{VP} ou \AffCarteJeu[AlignementV=0]{DosRouge} ou
+\AffCarteJeu[AlignementV=1]{10K} ou \AffCarteJeu[TypeJeu=Tarot,AlignementV=0.33,Rotation=25]{10AT}.
+
+\smallskip
+
+En mode \TikZ, \AffCarteJeu[Hauteur=2.75,Tikz]{VP}
+ou \AffCarteJeu[Hauteur=2.75,AlignementV=0,Tikz]{DosVert}
+ou \AffCarteJeu[Hauteur=2.75,AlignementV=1,Tikz]{10K}
+ou \AffCarteJeu[Hauteur=2.75,TypeJeu=Tarot,AlignementV=0.33,Rotation=-25]{10AT}.
+
+\smallskip
+
+On obtient la main \AffCarteJeu[Hauteur=2]{VP}\AffCarteJeu[Hauteur=2]{10K}
+\AffCarteJeu[Hauteur=2]{AK}\AffCarteJeu[Hauteur=2]{JN}\AffCarteJeu[Hauteur=2]{7P}.
+\end{codetex}
+
+\section{Main de cartes}
+
+\subsection{Introduction}
+
+\begin{codeidee}
+La commande précédente, relativement simple, ne fait \textit{que} placer une image dans un le document, il sera peut-être plus intéressant d'utiliser les commandes qui suivent, afin de créer des \textit{mains} de cartes, aléatoires ou non !
+\end{codeidee}
+
+\begin{codeattention}
+Les commandes pour créer des \textit{mains} sont obligatoirement liées à des environnement \ctex{tikzpicture} autonomes !
+\end{codeattention}
+
+\begin{codetex}[listing only]
+\CartesJeu[options]{<liste de cartes>}
+\end{codetex}
+
+\subsection{Clés et options}
+
+\begin{codecles}
+L'argument \textit{mandataire} correspond à la liste des cartes à afficher, sous la forme
+
+\begin{itemize}
+ \item \texttt{<carte1> § <carte2> § ... § <carten>}.
+\end{itemize}
+
+Les \Cle{options} sont les suivantes :
+
+\begin{itemize}
+ \item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
+ \item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
+ \item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
+ \item la clé \Cle{Rotation} pour l'angle entre les cartes en mode \Cle{Eventail} ; \hfill{}défaut \Cle{10}
+ \item la clé \Cle{AlignementV} pour l'alignement vertical lié à \TikZ{}\hfill{}défaut \Cle{0.5}
+\end{itemize}
+\end{codecles}
+
+\begin{codetex}[]
+\CartesJeu{7K § 8P § DT § AC}
+~ou \CartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AC}
+~ou \CartesJeu[Eventail,EspH=0.5]{7K § 8P § DT § AC}
+\end{codetex}
+
+\begin{codeinfo}
+Pour une main \textit{horizontale}, seule la clé \Cle{EspH} est importante, et une valeur proche de 1 donne des résultats intéressants.
+
+\smallskip
+
+Pour une main \textit{éventail}, les deux espacements peuvent être modifiés, afin d'avoir un rendu satisfaisant pour l'utilisateur.
+
+\smallskip
+
+Les exemples proposés dans cette documentation permettent de se rendre compte de valeurs possibles pour un rendu satisfaisant.
+\end{codeinfo}
+
+\begin{codetex}[]
+\CartesJeu[TypeJeu=Tarot]%
+ {Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+
+\smallskip
+
+\CartesJeu[TypeJeu=Tarot,EspH=1,EspV=-0.15,Hauteur=2.25]%
+ {Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+
+\smallskip
+
+Ça c'est une belle poignée ! \CartesJeu[Eventail,Hauteur=3,TypeJeu=Tarot,EspH=0,EspV=0.1]%
+ {Exc § 1AT § 2AT § 3AT § 4AT § 5AT § 6AT § %
+ 10AT § 11AT § 15AT § 16AT § 19AT § 20AT § 21AT}
+
+\smallskip
+
+Et un chien qui en a : \CartesJeu[Eventail,Hauteur=2,TypeJeu=Tarot,EspH=0.5,EspV=0.15,Rotation=20]%
+ {DK § 10AT § 16AT § VP § 1AT}
+\end{codetex}
+
+\pagebreak
+
+\section{Mains aléatoires}
+
+\subsection{Introduction}
+
+\begin{codeidee}
+L'idée est ici de proposer une commande, similaire à la précédente, mais qui permet de \textbf{tirer au hasard} un certain nombre de cartes pour créer une main.
+\end{codeidee}
+
+\begin{codetex}[listing only]
+\CartesJeuAleatoire[<options>]{<nombre de cartes>}
+\end{codetex}
+
+\begin{codetex}[]
+Voilà de quoi d'obtenir une main aléatoire de Poker :
+
+\CartesJeuAleatoire{5}
+\end{codetex}
+
+\subsection{Clés et options}
+
+\begin{codecles}
+Les \Cle{options} sont les suivantes :
+
+\begin{itemize}
+ \item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille}) ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
+ \item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
+ \item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
+ \item la clé \Cle{Rotation} pour l'angle entre les cartes en mode \Cle{Eventail} ; \hfill{}défaut \Cle{10}
+ \item la clé \Cle{AlignementV} pour l'alignement vertical lié à \TikZ{}\hfill{}défaut \Cle{0.5}
+\end{itemize}
+\end{codecles}
+
+\begin{codeinfo}
+En ce qui concerne les \textit{jeux} disponibles (non modifiables) :
+
+\begin{itemize}
+ \item \Cle{Poker} : 52 cartes (sans Joker) ;
+ \item \Cle{Belote} : 32 cartes (sans Joker) ;
+ \item \Cle{Bataille} : 54 cartes (avec Jokers) ;
+ \item \Cle{Tarot} : 78 cartes.
+\end{itemize}
+\end{codeinfo}
+
+\pagebreak
+
+\begin{codetex}[]
+\textbf{\large Belote :} \\
+
+\CartesJeuAleatoire[Hauteur=2,TypeJeu=Belote]{8} ou \CartesJeuAleatoire[Hauteur=2,TypeJeu=Belote]{8}.\\
+
+\textbf{\large Poker :} \\
+
+\CartesJeuAleatoire[Hauteur=3,Eventail,EspH=0,EspV=0.1]{5} ou \CartesJeuAleatoire[Hauteur=3,Eventail,EspH=0,EspV=0.1]{5}.\\
+
+\textbf{\large Bataille :} \\
+
+\CartesJeuAleatoire[Hauteur=2.25,TypeJeu=Bataille]{27}\\
+
+\textbf{\large Tarot :} \\
+
+\CartesJeuAleatoire[Hauteur=3.25,TypeJeu=Tarot]{10} ou~
+\CartesJeuAleatoire[Hauteur=3.25,Eventail,TypeJeu=Tarot,EspH=0,EspV=0.1]{10}
+\end{codetex}
+
+\pagebreak
+
+\section{\textit{Mini}-Cartes}
+
+\subsection{Introduction}
+
+\begin{codeidee}
+L'idée est ici de proposer des commandes pour afficher des \textit{mini-}cartes, utilisables en mode ligne, sans utiliser les images précédentes.
+
+\smallskip
+
+Ces \textit{mini-}cartes sont des figures \TikZ, alignées verticalement sur leur \textit{baseline}.
+\end{codeidee}
+
+\begin{codetex}[listing only]
+\MiniCarteJeu[<options>]{<carte>}
+\end{codetex}
+
+\begin{codetex}[]
+Si on met du texte sur la ligne du dessus, on peut voir le résultat.\\
+Voilà des exemples de mini-cartes, \MiniCarteJeu{7.K}\MiniCarteJeu{1.AT}\MiniCarteJeu{V.K}\MiniCarteJeu{10.C}, intégrables dans un paragraphe.\\
+Si on met du texte sur la ligne du dessous, on peut voir le résultat.
+\end{codetex}
+
+\subsection{Noms des \textit{mini-}cartes}
+
+\begin{codeinfo}
+Pour des raisons internes au code, les cartes doivent être saisies suivant la nomenclature (noter l'utilisation du \ctex{.} pour séparer la hauteur de la couleur !) :
+
+\begin{itemize}
+ \item \texttt{2.C}, \texttt{3.C}, \ldots, \texttt{C.C}, \texttt{D.C}, \texttt{R.C}, \texttt{A.C}\dotfill\Cle{Cœur}
+ \item \texttt{2.P}, \texttt{3.P}, \ldots, \texttt{C.P}, \texttt{D.P}, \texttt{R.P}, \texttt{A.P}\dotfill\Cle{Pique}
+ \item \texttt{2.K}, \texttt{3.K}, \ldots, \texttt{C.K}, \texttt{D.K}, \texttt{R.K}, \texttt{A.K}\dotfill\Cle{Carreau}
+ \item \texttt{2.T}, \texttt{3.T}, \ldots, \texttt{K.T}, \texttt{D.T}, \texttt{R.T}, \texttt{A.T}\dotfill\Cle{Trèfle}
+ \item \texttt{J.N}, \texttt{J.R}\dotfill\Cle{Joker}
+ \item \texttt{Exc}, \texttt{1.AT}, \texttt{2.AT}, \ldots, \texttt{20.T}, \texttt{21.AT}\dotfill\Cle{Atouts}
+\end{itemize}
+\end{codeinfo}
+
+\begin{codeinfo}
+Les \textit{mini-}cartes d'atout pour le Tarot sont présentées avec un fond coloré, et avec un symbole en étoile.
+\end{codeinfo}
+
+\subsection{Clés et options}
+
+\begin{codecles}
+Quelques \Cle{options} pour les \textit{mini-}cartes :
+
+\begin{itemize}
+ \item la clé \Cle{Largeur} pour gérer la largeur des miniatures ; \hfill{}défaut \Cle{0.55cm}
+ \item la clé \Cle{FondAtout} pour gérer la couleur de fond pour les atouts. \hfill{}défaut \Cle{PeachPuff}
+\end{itemize}
+\end{codecles}
+
+\begin{codetex}[]
+\foreach \EECARTE in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}{\MiniCarteJeu[Largeur=0.75cm]{\EECARTE.K}}\\
+\MiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{Exc}%
+\foreach \EECARTE in {1,2,...,21}{\MiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{\EECARTE.AT}}
+\end{codetex}
+
+\subsection{\textit{Mini}-Mains et \textit{mini}-mains aléatoires}
+
+\begin{codeidee}
+Comme pour les cartes \textit{classiques}, il existe deux commandes pour des \textit{mains} de \textit{mini-}cartes, mais uniquement en présentation horizontale/côte-à-côte.
+\end{codeidee}
+
+\begin{codetex}[listing only]
+\MiniCartesJeu[<options>]{<liste de cartes>}
+
+\MiniCartesJeuAleatoire[<options>]{<liste de cartes>}
+\end{codetex}
+
+\begin{codecles}
+Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus :
+
+\begin{itemize}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille}). \hfill{}défaut \Cle{Poker}
+\end{itemize}
+\end{codecles}
+
+\begin{codetex}[]
+\textbf{\large Saisie de mains : }\\
+\MiniCartesJeu{7.K § A.P § D.T § V.K § 10.C § C.T} et~
+\MiniCartesJeu{Exc § 1.AT § C.C § 8.T § 2.K § 5.AT § 2.AT § D.P § 7.T § 10.C § 19.AT § V.P}\\
+
+\textbf{\large Poker : }\\
+\MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5}.\\
+
+\textbf{\large Belote :}\\
+\MiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MiniCartesJeuAleatoire[TypeJeu=Belote]{8}.\\
+
+\textbf{\large Bataille : }\\
+\MiniCartesJeuAleatoire[TypeJeu=Bataille]{12} ou \MiniCartesJeuAleatoire[TypeJeu=Bataille]{12}.\\
+
+\textbf{\large Tarot : }\\
+\MiniCartesJeuAleatoire[TypeJeu=Tarot]{10} ou \MiniCartesJeuAleatoire[TypeJeu=Tarot]{10}.
+\end{codetex}
+
+\pagebreak
+
+\part{Compléments}
+
+\section{Cartes disponibles}
+
+\subsection{Poker/Bataille/Belote}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.75]{#1P}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.75]{#1C}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.75]{#1K}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,D,R,A}\do{\AffCarteJeu[Hauteur=1.75]{#1T}}
+
+\AffCarteJeu[Hauteur=1.75]{JN}\AffCarteJeu[Hauteur=1.75]{JR}%
+\xintFor #1 in {Bleu,BleuVert,Fuchsia,Gris,Jaune,Marron,Navy,Noir,Olive,Vert,Violet}\do{\AffCarteJeu[Hauteur=1.75]{Dos#1}}
+
+\subsection{Cartes Tarot}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1P}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1C}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1K}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1T}}
+
+\AffCarteJeu[TypeJeu=Tarot,Hauteur=2]{Exc}%
+\xintFor #1 in {1,2,3,4,5,6,7,8,9,10}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1AT}}%
+\AffCarteJeu[TypeJeu=Tarot,Hauteur=2]{Dos}
+
+\xintFor #1 in {11,12,13,14,15,16,17,18,19,20,21}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1AT}}%
+\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{Dos}
+
+\pagebreak
+
+\subsection{MiniCartes}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.P}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.C}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.K}}
+
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.T}}
+
+\MiniCarteJeu{J.N}\MiniCarteJeu{J.R}
+
+\medskip
+
+\MiniCarteJeu{Exc}%
+\xintFor #1 in {1,2,3,4,5,6,7,8,9,10}\do{\MiniCarteJeu{#1.AT}}
+
+\xintFor #1 in {11,12,13,14,15,16,17,18,19,20,21}\do{\MiniCarteJeu{#1.AT}}%
+
+\section{Carte simple dans un environnement \TikZ}
+
+\begin{codeidee}
+La commande simple, avec l'option \Cle{TikzAutonome=false} permet à l'utilisateur de gérer les cartes dans un environnement \ctex{tikzpicture} \textit{indépendant}.
+
+\smallskip
+
+L'\textit{origine} des cartes est fixée, au coin bas-gauche, et la \Cle{Rotation} éventuelle est appliquée après la translation gérée par les \Cle{DecalageXY}.
+\end{codeidee}
+
+\begin{codetex}[]
+\begin{tikzpicture}
+ \draw[thin,lightgray] (-5,-5) grid (5,3) ; %grille rajoutée pour la lisibilité du code
+ \foreach \ptsupport in {(0,0),(3,-4),(-3,-1),(-2,-3.5),(2,2.75)}%
+ {\filldraw[Gray] \ptsupport circle[radius=2pt] ;} %poits rajouté pour la lisibilité du code
+ \foreach \x in {-5,-4,...,5} \draw[lightgray] (\x,-5) node[below,font=\small] {\x} ;
+ \foreach \y in {-5,-4,...,3} \draw[lightgray] (-5,\y) node[left,font=\small] {\y} ;
+ \AffCarteJeu[Hauteur=2,Tikz=true,TikzAutonome=false]%
+ {10C}
+ \AffCarteJeu[Hauteur=2.5,Tikz=true,TikzAutonome=false,DecalageX=3,DecalageY=-4]%
+ {JN}
+ \AffCarteJeu[Hauteur=3,Tikz=true,TikzAutonome=false,DecalageX=-3,DecalageY=-1,Rotation=20]%
+ {JR}
+ \AffCarteJeu[Hauteur=1.75,Tikz=true,TikzAutonome=false,DecalageX=-2,DecalageY=-3.5,Rotation=-50]%
+ {DosBleu}
+ \AffCarteJeu%
+ [TypeJeu=Tarot,Hauteur=2.75,Tikz=true,TikzAutonome=false,DecalageX=2,DecalageY=2.75,Rotation=-90]%
+ {18AT}
+\end{tikzpicture}
+\end{codetex}
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10C.png
new file mode 100644
index 0000000000..892c6dddad
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10K.png
new file mode 100644
index 0000000000..5958537954
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10P.png
new file mode 100644
index 0000000000..3e3634ff1f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10T.png
new file mode 100644
index 0000000000..56373396fb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-10T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2C.png
new file mode 100644
index 0000000000..85da80ad46
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2K.png
new file mode 100644
index 0000000000..a4291738b9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2P.png
new file mode 100644
index 0000000000..2a86f7f882
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2T.png
new file mode 100644
index 0000000000..d91e3128d6
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-2T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3C.png
new file mode 100644
index 0000000000..9ad0e7d867
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3K.png
new file mode 100644
index 0000000000..6b76266176
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3P.png
new file mode 100644
index 0000000000..441b94841a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3T.png
new file mode 100644
index 0000000000..91db23cf10
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-3T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4C.png
new file mode 100644
index 0000000000..065bed3c20
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4K.png
new file mode 100644
index 0000000000..191f2b7a3b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4P.png
new file mode 100644
index 0000000000..d9017dcd16
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4T.png
new file mode 100644
index 0000000000..b228c4ff40
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-4T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5C.png
new file mode 100644
index 0000000000..94512e9a1e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5K.png
new file mode 100644
index 0000000000..6d5c75df63
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5P.png
new file mode 100644
index 0000000000..21ca8a6e0d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5T.png
new file mode 100644
index 0000000000..a9bb90420e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-5T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6C.png
new file mode 100644
index 0000000000..661a06089a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6K.png
new file mode 100644
index 0000000000..64d103c7e0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6P.png
new file mode 100644
index 0000000000..92b08a9a25
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6T.png
new file mode 100644
index 0000000000..df3bb06883
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-6T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7C.png
new file mode 100644
index 0000000000..c1f7f545de
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7K.png
new file mode 100644
index 0000000000..06d7b9ae55
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7P.png
new file mode 100644
index 0000000000..64d39928ac
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7T.png
new file mode 100644
index 0000000000..e5cc018d6b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-7T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8C.png
new file mode 100644
index 0000000000..629d5871b4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8K.png
new file mode 100644
index 0000000000..d359845c8b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8P.png
new file mode 100644
index 0000000000..0a558ef8ff
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8T.png
new file mode 100644
index 0000000000..b3c188d083
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-8T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9C.png
new file mode 100644
index 0000000000..57133d0da0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9K.png
new file mode 100644
index 0000000000..d3302849e0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9P.png
new file mode 100644
index 0000000000..14ed071191
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9T.png
new file mode 100644
index 0000000000..f968b75c91
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-9T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AC.png
new file mode 100644
index 0000000000..e170e28829
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AK.png
new file mode 100644
index 0000000000..113658515b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AP.png
new file mode 100644
index 0000000000..f2776afc73
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AT.png
new file mode 100644
index 0000000000..e67aea360e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DC.png
new file mode 100644
index 0000000000..b2cda1bb91
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DK.png
new file mode 100644
index 0000000000..0349478e2f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DP.png
new file mode 100644
index 0000000000..dad39014e6
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DT.png
new file mode 100644
index 0000000000..acb7edccec
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosArgent.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosArgent.png
new file mode 100644
index 0000000000..704650c9aa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosArgent.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBase.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBase.png
new file mode 100644
index 0000000000..d83171a057
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBase.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleu.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleu.png
new file mode 100644
index 0000000000..ac9df234ff
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleu.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuFonce.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuFonce.png
new file mode 100644
index 0000000000..444b0e12f1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuFonce.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuVert.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuVert.png
new file mode 100644
index 0000000000..3ef30f9281
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosBleuVert.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosCyan.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosCyan.png
new file mode 100644
index 0000000000..657f6db7b2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosCyan.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosFuchsia.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosFuchsia.png
new file mode 100644
index 0000000000..a3bb52b234
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosFuchsia.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosGris.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosGris.png
new file mode 100644
index 0000000000..2de572d885
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosGris.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosJaune.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosJaune.png
new file mode 100644
index 0000000000..ff91edf68d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosJaune.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosMarron.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosMarron.png
new file mode 100644
index 0000000000..d642a7ffc3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosMarron.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNavy.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNavy.png
new file mode 100644
index 0000000000..02b28c1c79
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNavy.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNoir.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNoir.png
new file mode 100644
index 0000000000..92372eee35
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosNoir.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosOlive.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosOlive.png
new file mode 100644
index 0000000000..448f2cf417
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosOlive.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosRouge.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosRouge.png
new file mode 100644
index 0000000000..b61e4340db
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosRouge.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVert.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVert.png
new file mode 100644
index 0000000000..94c21d3e7a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVert.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVertCitron.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVertCitron.png
new file mode 100644
index 0000000000..99d9fc0556
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosVertCitron.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosViolet.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosViolet.png
new file mode 100644
index 0000000000..5045c055e7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-DosViolet.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JN.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JN.png
new file mode 100644
index 0000000000..1e287ce6e9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JN.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JR.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JR.png
new file mode 100644
index 0000000000..ef264d8db2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-JR.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RC.png
new file mode 100644
index 0000000000..436762e578
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RK.png
new file mode 100644
index 0000000000..7eaffc9b0e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RP.png
new file mode 100644
index 0000000000..f6b6d41cc9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RT.png
new file mode 100644
index 0000000000..20692723c2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-RT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VC.png
new file mode 100644
index 0000000000..3656753196
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VK.png
new file mode 100644
index 0000000000..8130833bc3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VP.png
new file mode 100644
index 0000000000..f7002e27b9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VT.png
new file mode 100644
index 0000000000..cda911b2fc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Poker-VT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.png
new file mode 100644
index 0000000000..99f8286180
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.png
new file mode 100644
index 0000000000..2b04117df5
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.png
new file mode 100644
index 0000000000..12971fcaab
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.png
new file mode 100644
index 0000000000..2c853b1758
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.png
new file mode 100644
index 0000000000..a8a6bca4df
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-10T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.png
new file mode 100644
index 0000000000..9e8a68bb0d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-11AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.png
new file mode 100644
index 0000000000..067a4f86ea
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-12AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.png
new file mode 100644
index 0000000000..6e5e238084
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-13AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.png
new file mode 100644
index 0000000000..2a2129b944
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-14AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.png
new file mode 100644
index 0000000000..dfe28537f8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-15AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.png
new file mode 100644
index 0000000000..5e6677b910
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-16AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.png
new file mode 100644
index 0000000000..7520988052
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-17AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.png
new file mode 100644
index 0000000000..39bb7f054a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-18AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.png
new file mode 100644
index 0000000000..74b6d63a3a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-19AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.png
new file mode 100644
index 0000000000..c597d451d8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-1AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.png
new file mode 100644
index 0000000000..c8f0e7c6e3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-20AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.png
new file mode 100644
index 0000000000..3f18693fdf
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-21AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.png
new file mode 100644
index 0000000000..565a8bba92
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.png
new file mode 100644
index 0000000000..e0b4d2b05c
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.png
new file mode 100644
index 0000000000..a86d518c93
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.png
new file mode 100644
index 0000000000..4f91a036a9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.png
new file mode 100644
index 0000000000..a80c47b6dc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-2T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.png
new file mode 100644
index 0000000000..cd0729efc7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.png
new file mode 100644
index 0000000000..a06a5d69a3
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.png
new file mode 100644
index 0000000000..2138f6a8d8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.png
new file mode 100644
index 0000000000..2869a70e19
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.png
new file mode 100644
index 0000000000..f5b7fce1f7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-3T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.png
new file mode 100644
index 0000000000..2c8b7392ef
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.png
new file mode 100644
index 0000000000..19917255c8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.png
new file mode 100644
index 0000000000..21b0a5f57e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.png
new file mode 100644
index 0000000000..b8ba63f36e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.png
new file mode 100644
index 0000000000..5868cbdb0d
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-4T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.png
new file mode 100644
index 0000000000..aedb0c4399
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.png
new file mode 100644
index 0000000000..ef87bf92a2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.png
new file mode 100644
index 0000000000..9891e868a5
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.png
new file mode 100644
index 0000000000..35bf65c381
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.png
new file mode 100644
index 0000000000..c700fe0215
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-5T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.png
new file mode 100644
index 0000000000..63b302112b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.png
new file mode 100644
index 0000000000..77c57f6362
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.png
new file mode 100644
index 0000000000..30f171483a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.png
new file mode 100644
index 0000000000..f58346b8aa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.png
new file mode 100644
index 0000000000..41fd9df936
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-6T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.png
new file mode 100644
index 0000000000..48492d74fc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.png
new file mode 100644
index 0000000000..db5748f145
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.png
new file mode 100644
index 0000000000..c308120066
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.png
new file mode 100644
index 0000000000..d2dc30f935
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.png
new file mode 100644
index 0000000000..ce49ddd1a1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-7T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.png
new file mode 100644
index 0000000000..e8d50bf89f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.png
new file mode 100644
index 0000000000..9db298531a
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.png
new file mode 100644
index 0000000000..ad2d973a57
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.png
new file mode 100644
index 0000000000..4a4a763faa
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.png
new file mode 100644
index 0000000000..68c7761162
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-8T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.png
new file mode 100644
index 0000000000..e07ae08c57
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.png
new file mode 100644
index 0000000000..ad8d90b1cb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9C.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.png
new file mode 100644
index 0000000000..300186f835
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9K.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.png
new file mode 100644
index 0000000000..510803578f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9P.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.png
new file mode 100644
index 0000000000..2c5f6b7d5b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-9T.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.png
new file mode 100644
index 0000000000..7ef4682fb0
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.png
new file mode 100644
index 0000000000..8658a7417f
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.png
new file mode 100644
index 0000000000..d9f37790b1
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.png
new file mode 100644
index 0000000000..a5bb6ff59e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-AT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.png
new file mode 100644
index 0000000000..e4a74c9fa7
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.png
new file mode 100644
index 0000000000..a16a9f4c3e
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.png
new file mode 100644
index 0000000000..539819df05
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.png
new file mode 100644
index 0000000000..fc45c569af
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-CT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.png
new file mode 100644
index 0000000000..3ea415980b
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.png
new file mode 100644
index 0000000000..5f520f9867
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.png
new file mode 100644
index 0000000000..f5349b86e2
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.png
new file mode 100644
index 0000000000..220287bb72
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-DT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.png
new file mode 100644
index 0000000000..4cc36a5cf9
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Dos.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.png
new file mode 100644
index 0000000000..560e1f1473
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-Exc.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.png
new file mode 100644
index 0000000000..df94f090e4
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.png
new file mode 100644
index 0000000000..cdc8117c37
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.png
new file mode 100644
index 0000000000..642d4756bc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.png
new file mode 100644
index 0000000000..307f0efabc
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-RT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.png
new file mode 100644
index 0000000000..ceacfaecfb
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VC.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.png
new file mode 100644
index 0000000000..bc5598bb00
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VK.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.png
new file mode 100644
index 0000000000..b2d53510f8
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VP.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.png b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.png
new file mode 100644
index 0000000000..73a743ad26
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/CaJ-Tarot-VT.png
Binary files differ
diff --git a/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
new file mode 100644
index 0000000000..5dfd0b5a03
--- /dev/null
+++ b/macros/latex/contrib/jeuxcartes/tex/JeuxCartes.sty
@@ -0,0 +1,368 @@
+% Author : C. Pierquet
+% licence : Released under the LaTeX Project Public License v1.3c
+% or later, see http://www.latex-project.org/lppl.txtf
+% Poker cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards
+% Tarot cards Image's Licence : Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{JeuxCartes}[2022/10/26 v0.1.2 Jeux de cartes]
+% 0.1.2 Modification du nom (et de la source) des images de Tarot (CC0)
+% 0.1.1 Ajout de commandes pour des mini-cartes
+% 0.1 Version initiale
+
+%------Packages utiles
+\RequirePackage{graphicx}
+\RequirePackage[table,svgnames]{xcolor}
+\RequirePackage{tikz}
+\RequirePackage{pgf,pgffor}
+\RequirePackage{xfp}
+\RequirePackage{listofitems}
+\RequirePackage{xstring}
+\RequirePackage{xparse}
+\RequirePackage{simplekv}
+\RequirePackage{xinttools}
+\RequirePackage{randomlist}
+\RequirePackage{pifont}
+%librairies tikz
+\usetikzlibrary{calc,scopes}
+%images venant de https://github.com/htdebeer/SVG-cards
+%images venant de https://freesvg.org/deck-of-french-tarot-playing-cards
+
+%------Commande en ligne (includegraphics) via raisebox/rotatebox ou tikz
+\defKV[AffCarteJeu]{%
+ Hauteur=\def\AffCarteJeuHauteur{#1},%
+ DecalageX=\def\AffCarteJeuDecalageX{#1},%
+ DecalageY=\def\AffCarteJeuDecalageY{#1},%
+ Rotation=\def\AffCarteJeuRotation{#1},%
+ AlignementV=\def\AffCarteJeuAlignementV{#1},%
+ TypeJeu=\def\AffCarteJeuType{#1}
+}
+\setKVdefault[AffCarteJeu]{%
+ Hauteur=4.25,%
+ Tikz=false,%pour placer la commande dans un environnement tikz ou en raisebox,
+ TikzAutonome=true,%pour déjà mettre l'image dans du tikz
+ DecalageX=0,%
+ DecalageY=0,%
+ Rotation=0,%
+ AlignementV=0.5,%
+ TypeJeu=Poker
+}
+
+\NewDocumentCommand\AffCarteJeu{ O{} m }{%1=options,2=cartenommée
+ \useKVdefault[AffCarteJeu]%
+ \setKV[AffCarteJeu]{#1}%
+ %cas poker
+ \IfStrEq{\AffCarteJeuType}{Poker}%poker
+ {\def\CartePrefixe{CaJ-Poker-}}{}%
+ \IfStrEq{\AffCarteJeuType}{Tarot}%tarot
+ {\def\CartePrefixe{CaJ-Tarot-}}{}%
+ %transformation valign en tikz
+ \def\OptionTikzCBB{current bounding box.center}%
+ \IfStrEq{\AffCarteJeuAlignementV}{0}%
+ {\def\OptionTikzCBB{current bounding box.south}}{}%
+ \IfStrEq{\AffCarteJeuAlignementV}{1}%
+ {\def\OptionTikzCBB{current bounding box.north}}{}%
+ %affichage
+ \ifboolKV[AffCarteJeu]{Tikz}%
+ {%
+ \ifboolKV[AffCarteJeu]{TikzAutonome}%
+ {%
+ {\tikz[baseline=(\OptionTikzCBB)] \draw (\AffCarteJeuDecalageX,\AffCarteJeuDecalageY) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate=\AffCarteJeuRotation] {\includegraphics[height=\AffCarteJeuHauteur cm]{\CartePrefixe#2}} ;}%
+ }%
+ {%
+ \begin{scope}[shift={(\AffCarteJeuDecalageX,\AffCarteJeuDecalageY)}]%
+ \draw (0,0) node[above right=0pt,inner sep=0pt,outer sep=0pt,rotate=\AffCarteJeuRotation] {\includegraphics[height=\AffCarteJeuHauteur cm]{\CartePrefixe#2}} ;%
+ \end{scope}%
+ }%
+ }%
+ {%
+ \rotatebox[origin=c]{\AffCarteJeuRotation}{\raisebox{-\AffCarteJeuAlignementV\height}{\includegraphics[height=\AffCarteJeuHauteur cm]{\CartePrefixe#2}}}%
+ }%
+}
+
+%------commande main cartes
+\defKV[AffMainCartes]{%
+ Hauteur=\def\MainHauteur{#1},%
+ EspH=\def\MainDecalH{#1},%
+ EspV=\def\MainDecalV{#1},%
+ Rotation=\def\MainRotation{#1},%
+ TypeJeu=\def\MainJeuType{#1},%
+ AlignementV=\def\MainAlignementV{#1}
+}
+\setKVdefault[AffMainCartes]{%
+ Hauteur=4.25,%
+ EspH=1,%
+ EspV=0,%
+ Rotation=10,%
+ Eventail=false,%
+ TypeJeu=Poker,%
+ AlignementV=0.5
+}
+
+\NewDocumentCommand\CartesJeu{ O{} m }{%1=options,2=listecartes
+ \useKVdefault[AffMainCartes]%
+ \setKV[AffMainCartes]{#1}%
+ %calculs et traitement des variables
+ \ignoreemptyitems%
+ \setsepchar{§}%
+ \readlist*\ListeCartesMain{#2}%
+ \def\NbCartesMain{\ListeCartesMainlen}%nbcartes
+ \IfStrEq{\MainJeuType}{Poker}%poker
+ {\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-Poker-}}{}%
+ \IfStrEq{\MainJeuType}{Tarot}%tarot
+ {\def\HauteurGenerique{5.5}\def\CarteMainPrefixe{CaJ-Tarot-}}{}%
+ \def\EchelleCarteDecalage{\fpeval{\MainHauteur/\HauteurGenerique}}%
+ %transformation valign en tikz
+ \def\OptionTikzCBB{current bounding box.center}%
+ \IfStrEq{\MainAlignementV}{0}%
+ {\def\OptionTikzCBB{current bounding box.south}}{}%
+ \IfStrEq{\MainAlignementV}{1}%
+ {\def\OptionTikzCBB{current bounding box.north}}{}%
+ %environnement tikzpicture
+ \begin{tikzpicture}[baseline=(\OptionTikzCBB)]%
+ \foreach \i in {1,2,...,\ListeCartesMainlen}{%
+ \itemtomacro\ListeCartesMain[\i]\CarteMain%
+ \ifboolKV[AffMainCartes]{Eventail}%
+ {%
+ \def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
+ \def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
+ \def\DecAngleMain{\fpeval{0.5*\NbCartesMain*\MainRotation}}%
+ \AffCarteJeu[TypeJeu=\MainJeuType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainRotation}]{\CarteMain}%
+ }%
+ {%
+ \def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
+ \def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
+ \AffCarteJeu[TypeJeu=\MainJeuType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMain}%
+ }%
+ }%finpour
+ \end{tikzpicture}%
+}
+
+%------commande main aléatoire
+\defKV[AffMainAleaCartes]{%
+ Hauteur=\def\MainHauteur{#1},%
+ EspH=\def\MainDecalH{#1},%
+ EspV=\def\MainDecalV{#1},%
+ Rotation=\def\MainRotation{#1},%
+ TypeJeu=\def\MainJeuType{#1},%
+ AlignementV=\def\MainAlignementV{#1}
+}
+\setKVdefault[AffMainAleaCartes]{%
+ Hauteur=4.25,%
+ EspH=1,%
+ EspV=0,%
+ Rotation=10,%
+ Eventail=false,%
+ TypeJeu=Poker,%
+ AlignementV=0.5
+}
+
+\xdef\CartesJeuPoker{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK}%
+\xdef\CartesJeuBelote{7P,8P,9P,10P,VP,DP,RP,AP,7T,8T,9T,10T,VT,DT,RT,AT,7C,8C,9C,10C,VC,DC,RC,AC,7K,8K,9K,10K,VK,DK,RK,AK}%
+\xdef\CartesJeuBataille{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK,JN,JR}%
+\xdef\CartesJeuTarot{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,CP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,CT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,CC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,CK,DK,RK,AK,1AT,2AT,3AT,4AT,5AT,6AT,7AT,8AT,9AT,10AT,11AT,12AT,13AT,14AT,15AT,16AT,17AT,18AT,19AT,20AT,21AT,Exc}%
+\NewList{CartesJeuMelange}
+
+\NewDocumentCommand\CartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
+ \useKVdefault[AffMainAleaCartes]%
+ \setKV[AffMainAleaCartes]{#1}%
+ %calculs et traitement des variables
+ \IfStrEq{\MainJeuType}{Poker}%poker
+ {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
+ \IfStrEq{\MainJeuType}{Bataille}%bataille
+ {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
+ \IfStrEq{\MainJeuType}{Belote}%poker
+ {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
+ \IfStrEq{\MainJeuType}{Tarot}%tarot
+ {\def\HauteurGenerique{6.375}\def\CarteMainType{Tarot}\xdef\CarteDebutRand{\fpeval{randint(0,78-#2)}}}{}%
+ %échelle relative des cartes
+ \def\EchelleCarteDecalage{\fpeval{\MainHauteur/\HauteurGenerique}}%
+ %transformation valign en tikz
+ \def\OptionTikzCBB{current bounding box.center}%
+ \IfStrEq{\MainAlignementV}{0}%
+ {\def\OptionTikzCBB{current bounding box.south}}{}%
+ \IfStrEq{\MainAlignementV}{1}%
+ {\def\OptionTikzCBB{current bounding box.north}}{}%
+ %melange du jeu
+ \ClearList{CartesJeuMelange}%
+ \IfStrEq{\MainJeuType}{Poker}%si c'est le poker
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuPoker}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MainJeuType}{Bataille}%si c'est la bataille
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuBataille}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MainJeuType}{Belote}%si c'est le poker
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MainJeuType}{Tarot}%si c'est le tarot
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuTarot}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
+ %environnement tikzpicture
+ \begin{tikzpicture}[baseline=(\OptionTikzCBB)]%
+ \foreach \i in {1,2,...,#2}{%
+ \GetItem{CartesJeuMelange}{\inteval{\CarteDebutRand+\i-1}}{CarteMainChoisie}%
+ %\itemtomacro\ListeCartesMain[\i]\CarteMain%
+ \ifboolKV[AffMainAleaCartes]{Eventail}%
+ {%
+ \def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
+ \def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
+ \def\DecAngleMain{\fpeval{0.5*#2*\MainRotation}}%
+ \AffCarteJeu[TypeJeu=\CarteMainType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageY=\MainOffset,DecalageX=\SecondOffset,Rotation={\DecAngleMain-(\i-1)*\MainRotation}]{\CarteMainChoisie}%
+ }%
+ {%
+ \def\MainOffset{\fpeval{\EchelleCarteDecalage*\MainDecalH*(\i-1)}}%
+ \def\SecondOffset{\fpeval{\EchelleCarteDecalage*\MainDecalV*(\i-1)}}%
+ \AffCarteJeu[TypeJeu=\CarteMainType,Tikz,TikzAutonome=false,Hauteur=\MainHauteur,DecalageX=\MainOffset,DecalageY=\SecondOffset]{\CarteMainChoisie}%
+ }%
+ }%finpour
+ \end{tikzpicture}%
+}
+
+%------commande mini-cartes
+\defKV[AffMiniCartes]{%
+ Largeur=\def\MiniCarteLargeur{#1},
+ FondAtout=\def\MiniCarteFondAtout{#1}
+}
+\setKVdefault[AffMiniCartes]{%
+ Largeur=0.55cm,%
+ FondAtout=PeachPuff
+}
+
+\NewDocumentCommand\MiniCarteJeu{ O{} m }{%1=options,2=nbcartes
+ \useKVdefault[AffMiniCartes]%
+ \setKV[AffMiniCartes]{#1}%
+ %découpage de l'argument
+ \StrCut{#2}{.}\csVal\csCplt%
+ %couleur de fond
+ \def\csFond{White}%
+ \def\csCoul{black}%
+ %le cas du 10.11...21
+ \IfStrEq{\csVal}{10}{\def\csVal{\scalebox{0.5}[1]{10}}}{}%
+ \IfStrEq{\csVal}{11}{\def\csVal{\scalebox{0.5}[1]{11}}}{}%
+ \IfStrEq{\csVal}{12}{\def\csVal{\scalebox{0.5}[1]{12}}}{}%
+ \IfStrEq{\csVal}{13}{\def\csVal{\scalebox{0.5}[1]{13}}}{}%
+ \IfStrEq{\csVal}{14}{\def\csVal{\scalebox{0.5}[1]{14}}}{}%
+ \IfStrEq{\csVal}{15}{\def\csVal{\scalebox{0.5}[1]{15}}}{}%
+ \IfStrEq{\csVal}{16}{\def\csVal{\scalebox{0.5}[1]{16}}}{}%
+ \IfStrEq{\csVal}{17}{\def\csVal{\scalebox{0.5}[1]{17}}}{}%
+ \IfStrEq{\csVal}{18}{\def\csVal{\scalebox{0.5}[1]{18}}}{}%
+ \IfStrEq{\csVal}{19}{\def\csVal{\scalebox{0.5}[1]{19}}}{}%
+ \IfStrEq{\csVal}{20}{\def\csVal{\scalebox{0.5}[1]{20}}}{}%
+ \IfStrEq{\csVal}{21}{\def\csVal{\scalebox{0.5}[1]{21}}}{}%
+ %le cas du Excuse
+ \IfStrEq{#2}{Exc}%
+ {\def\csSymb{\ding{168}}\def\csCoul{blue}%
+ \def\csVal{\scalebox{0.33}[1]{EXC}}}{}%
+ %le cas du Joker
+ \IfStrEq{\csVal}{J}%
+ {\def\csSymb{\ding{166}}\def\csVal{\scalebox{0.5}[1]{JO}}}{}%
+ %si c'est un coeur
+ \IfStrEq{\csCplt}{C}%
+ {\def\csSymb{\ding{170}}\def\csCoul{red}}{}%
+ %si c'est un carreau
+ \IfStrEq{\csCplt}{K}%
+ {\def\csSymb{\ding{169}}\def\csCoul{red}}{}%
+ %si c'est un coeur
+ \IfStrEq{\csCplt}{P}%
+ {\def\csSymb{\ding{171}}}{}%
+ %si c'est un trèfle
+ \IfStrEq{\csCplt}{T}%
+ {\def\csSymb{\ding{168}}}{}%
+ %si c'est un atout 68
+ \IfStrEq{\csCplt}{AT}%
+ {\def\csFond{\MiniCarteFondAtout}\def\csSymb{\ding{88}}}{}%
+ %si c'est un rouge
+ \IfStrEq{\csCplt}{R}%
+ {\def\csCoul{red}}{}%
+ %minicarte
+ \tikz[baseline=(char.base)]\node[anchor=north west,line width=0.7pt,draw=Gray,rectangle,rounded corners,inner sep=1.6pt,fill=\csFond,text=\csCoul,font=\ttfamily,minimum width=\MiniCarteLargeur](char){\csVal\scalebox{0.75}[0.75]{\csSymb}};%
+}
+
+%------commande mini-main-cartes
+\defKV[AffMiniMainCartes]{%
+ Largeur=\def\MiniMainLargeur{#1},%
+ FondAtout=\def\MiniMainFondAtout{#1}
+}
+\setKVdefault[AffMiniMainCartes]{%
+ Largeur=0.55cm,%
+ FondAtout=PeachPuff
+}
+
+\NewDocumentCommand\MiniCartesJeu{ O{} m }{%1=options,2=liste
+ \useKVdefault[AffMiniMainCartes]%
+ \setKV[AffMiniMainCartes]{#1}%
+ \ignoreemptyitems%
+ \setsepchar{§}%
+ \readlist*\MiniCartesMain{#2}%
+ \foreachitem\MiniCarteAffich\in\MiniCartesMain{%
+ \MiniCarteJeu[FondAtout=\MiniMainFondAtout,Largeur=\MiniMainLargeur]{\MiniCarteAffich}%
+ }%
+}
+
+%------commande mini-main aléatoire
+\defKV[MiniMainAleaCartes]{%
+ Largeur=\def\MiniMainAleaLargeur{#1},%
+ TypeJeu=\def\MiniMainAleaType{#1},%
+ FondAtout=\def\MiniMainAleaFondAtout{#1}
+}
+\setKVdefault[MiniMainAleaCartes]{%
+ Largeur=0.55cm,%
+ TypeJeu=Poker,%
+ FondAtout=PeachPuff
+}
+
+\xdef\MiniCartesJeuPoker{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K}%
+\xdef\MiniCartesJeuBelote{7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K}%
+\xdef\MiniCartesJeuBataille{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K,J.N,J.R}%
+\xdef\MiniCartesJeuTarot{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,C.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,C.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,C.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,C.K,D.K,R.K,A.K,1.AT,2.AT,3.AT,4.AT,5.AT,6.AT,7.AT,8.AT,9.AT,10.AT,11.AT,12.AT,13.AT,14.AT,15.AT,16.AT,17.AT,18.AT,19.AT,20.AT,21.AT,Exc}%
+\NewList{MiniCartesJeuMelange}
+
+\NewDocumentCommand\MiniCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
+ \useKVdefault[MiniMainAleaCartes]%
+ \setKV[MiniMainAleaCartes]{#1}%
+ %melange du jeu
+ \ClearList{MiniCartesJeuMelange}%
+ \IfStrEq{\MiniMainAleaType}{Poker}%si c'est le poker
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuPoker}}%
+ \do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MiniMainAleaType}{Bataille}%si c'est la bataille
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuBataille}}%
+ \do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MiniMainAleaType}{Belote}%si c'est le poker
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuBelote}}%
+ \do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MiniMainAleaType}{Tarot}%si c'est le tarot
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuTarot}}%
+ \do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
+ }%
+ {}%
+ %création de la main
+ \foreach \i in {1,2,...,#2}{%
+ \GetItem{MiniCartesJeuMelange}{\inteval{\i-1}}{MiniCarteMainChoisie}%
+ \MiniCarteJeu[FondAtout=\MiniMainAleaFondAtout,Largeur=\MiniMainAleaLargeur]{\MiniCarteMainChoisie}%
+ }%finpour
+}
+
+\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/newverbs/DEPENDS.txt b/macros/latex/contrib/newverbs/DEPENDS.txt
new file mode 100644
index 0000000000..3eb96fe1c9
--- /dev/null
+++ b/macros/latex/contrib/newverbs/DEPENDS.txt
@@ -0,0 +1,4 @@
+hard shortvrb
+
+# patches tabularx if installed
+# doconly ydoc \ No newline at end of file
diff --git a/macros/latex/contrib/newverbs/README b/macros/latex/contrib/newverbs/README.txt
index 8d6c410c79..5920104e7a 100644
--- a/macros/latex/contrib/newverbs/README
+++ b/macros/latex/contrib/newverbs/README.txt
@@ -1,7 +1,12 @@
The 'newverbs' LaTeX package
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Copyright (c) 2010-2021 by Martin Scharrer <martin@scharrer-online.de>
-Code repository: https://sourceforge.net/projects/newfloat/
+Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
+License: LPPL v1.3c or later <https://www.latex-project.org/lppl/lppl-1-3c/>
+CTAN: https://www.ctan.org/pkg/newverbs
+Texdoc: https://texdoc.org/pkg/newverbs
+Homepage: https://github.com/MartinScharrer/newverbs
+Repository: https://github.com/MartinScharrer/newverbs.git
+Issue tracker: https://github.com/MartinScharrer/newverbs/issues
This package allows the definition of \verb variants which add TeX code before
and after the verbatim text (e.g. quotes or \fbox{}). When used together with
diff --git a/macros/latex/contrib/newverbs/newverbs.dtx b/macros/latex/contrib/newverbs/newverbs.dtx
index 8c22b0229d..b2d0ceef9f 100644
--- a/macros/latex/contrib/newverbs/newverbs.dtx
+++ b/macros/latex/contrib/newverbs/newverbs.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%<=*COPYRIGHT>
-%% Copyright (C) 2012-2021 by Martin Scharrer <martin@scharrer-online.de>
+%% Copyright (c) 2012-2022 by Martin Scharrer <martin.scharrer@web.de>
%% --------------------------------------------------------------------
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -23,10 +23,10 @@
%<*driver>
\ProvidesFile{newverbs.dtx}[%
%<=*DATE>
- 2021/01/06
+ 2022/10/25
%<=/DATE>
%<=*VERSION>
- v1.6
+ v1.6a
%<=/VERSION>
newverbs DTX file]
\documentclass{ydoc}
@@ -71,12 +71,14 @@
% \changes{v1.4}{2019/09/09}{Added several suggested changes.}
% \changes{v1.5}{2020/09/02}{Added support for mathmode.}
% \changes{v1.6}{2021/01/06}{Changed \cs{Verbdef} to define robust commands.}
+% \changes{v1.6a}{2022/10/25}{Updated repository URL. Added DEPENDS.txt file.}
%
% \DoNotIndex{\newcommand,\newenvironment,\providecommand}
%
% \GetFileInfo{newverbs.dtx}
% \author{Martin Scharrer}
-% \email{martin@scharrer-online.de}
+% \email{martin.scharrer@web.de}
+% \github{MartinScharrer/newverbs}
% \maketitle
%
% \begin{abstract}
diff --git a/macros/latex/contrib/newverbs/newverbs.ins b/macros/latex/contrib/newverbs/newverbs.ins
index a40a13d6ac..adfb447182 100644
--- a/macros/latex/contrib/newverbs/newverbs.ins
+++ b/macros/latex/contrib/newverbs/newverbs.ins
@@ -1,4 +1,4 @@
-% Copyright (c) 2010-2012 by Martin Scharrer <martin@scharrer-online.de>
+% Copyright (c) 2010-2022 by Martin Scharrer <martin.scharrer@web.de>
% See file 'newverbs.dtx' for copyright and licence information.
diff --git a/macros/latex/contrib/newverbs/newverbs.pdf b/macros/latex/contrib/newverbs/newverbs.pdf
index 2e8c79c684..0f3df1e1ea 100644
--- a/macros/latex/contrib/newverbs/newverbs.pdf
+++ b/macros/latex/contrib/newverbs/newverbs.pdf
Binary files differ
diff --git a/macros/unicodetex/latex/polyglossia/README.md b/macros/unicodetex/latex/polyglossia/README.md
index 4108d0d484..a1535f3c20 100644
--- a/macros/unicodetex/latex/polyglossia/README.md
+++ b/macros/unicodetex/latex/polyglossia/README.md
@@ -1,4 +1,4 @@
-# THE POLYGLOSSIA PACKAGE v1.57
+# THE POLYGLOSSIA PACKAGE v1.58
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
@@ -37,5 +37,5 @@ Except where otherwise noted, Polyglossia is placed under the terms of the MIT l
If you run into a bug, or suspect you do, or you have a request or comment, please
use the GitHub issue tracker: http://github.com/reutenauer/polyglossia/issues
-This is more efficient than contacting the maintainer by email as it allows me
+This is more efficient than contacting the maintainer by email as it allows us
to track the issues and follow progress.
diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.dtx b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
index af83430c71..c73188a860 100644
--- a/macros/unicodetex/latex/polyglossia/polyglossia.dtx
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.dtx
@@ -8,7 +8,7 @@
\iffalse
%</internal>
%<*README>
-# THE POLYGLOSSIA PACKAGE v1.57
+# THE POLYGLOSSIA PACKAGE v1.58
## Multilingual typesetting with XeLaTeX and LuaLaTeX
This package provides an alternative to Babel for users of XeLaTeX and LuaLaTeX.
@@ -47,7 +47,7 @@ Except where otherwise noted, Polyglossia is placed under the terms of the MIT l
If you run into a bug, or suspect you do, or you have a request or comment, please
use the GitHub issue tracker: http://github.com/reutenauer/polyglossia/issues
-This is more efficient than contacting the maintainer by email as it allows me
+This is more efficient than contacting the maintainer by email as it allows us
to track the issues and follow progress.
%</README>
%<*internal>
@@ -1640,14 +1640,14 @@ to track the issues and follow progress.
% \subsection{hebrew}\label{hebrew}
% \paragraph*{Options:}
% \begin{itemize}
-% \item \xpgboolkeyfalse[1.57]{fullyear} causes years from the current millenium to be printed with the thousands digit
-% (he-tav-shin-samekh-gimel). Without this option, thousands are not printed for the current millenium.
% \item \xpgchoicekey{numerals}{\xpgvalue{hebrew} or \xpgpresetvalue{arabic}}
% \item \xpgchoicekey{calendar}{\xpgvalue{hebrew} or \xpgpresetvalue{gregorian}}
% \item \xpgboolkeyfalse{marcheshvan}
% If \xpgvalue{true}, the second month of the civil year will be output as
% \texthebrew{מרחשון} (Marcheshvan) rather than \texthebrew{חשון} (Heshvan),
% which is the default.
+% \item \xpgboolkeyfalse[1.57]{fullyear} causes years from the current millennium to be printed with the thousands digit
+% (he-tav-shin-samekh-gimel). Without this option, thousands are not printed for the current millennium.
% \item \xpgchoicekey[1.57]{transliteration}{\xpgvalue{academy} or \xpgpresetvalue{alt}} With value \xpgvalue{academy}, transliteration
% follows the recommendations of the Hebrew Language Academy. The default (\xpgvalue{alt}) uses the received settings of
% \pkg{babel} (\pkg{hebcal}) and \pkg{polyglossia} (\pkg{hebrewcal}).
@@ -1685,6 +1685,13 @@ to track the issues and follow progress.
% \item ¦hheaders¦: Redefine part and chapter headings as well as running headers
% \item ¦none¦: Do not redefine anything
% \end{itemize}
+% \item \xpgboolkeytrue[1.58]{forceheadingpunctuation}
+% Section numbers always have a trailing punctuation in Hungarian (as in \emph{1.1.} as opposed to \emph{1.1}).
+% For compatibility reasons, the default option is \xpgvalue{false}, thus \textsf{polyglossia}
+% does not touch heading punctuation, so this will be whatever the class or a package determines.
+% Set this option to \xpgvalue{true},
+% and \textsf{polyglossia} appends a period after the section counters,
+% and adjusts the header punctuation (as in \emph{1. fejezet.} as opposed to \emph{1. fejezet}).
% \end{itemize}
% \paragraph*{Commands:}
% \begin{itemize}
@@ -2812,7 +2819,22 @@ to track the issues and follow progress.
% \section{Revision history}
%
% \bgroup\footnotesize
-% \subsection*{1.57 (18-07-2022)}
+% \subsection*{1.58 (2022/10/26)}
+%
+% \subsubsection*{Bug fixes}
+% \begin{itemize}
+% \item The option \xpgoption{forceheadingpunctuation} is introduced
+% for correct running headers in Hungarian documents (\TXI{557}).
+% \item Fix language setting in list of figure and table if captions float to different
+% language areas (\TXI{542}).
+% \item Make Croatian digraphs robust (\TXI{552}).
+% \item Fix definition of some Finnish shorthands (\TXI{554}).
+% \item Re-fix Hungarian patching of parts with hyperref (\TXI{555}).
+% \item Correct running headers in Hungarian documents (\TXI{557}).
+% \item Fix option expansion issue (\TXI{559}).
+% \end{itemize}
+%
+% \subsection*{1.57 (2022/07/18)}
%
% \subsubsection*{Bug fixes}
% \begin{itemize}
@@ -2829,7 +2851,7 @@ to track the issues and follow progress.
% \item New option \xpgoption{fullyear} to Hebrew.
% \end{itemize}
%
-% \subsection*{1.56 (20-04-2022)}
+% \subsection*{1.56 (2022/04/20)}
%
% \subsubsection*{Bug fixes}
% \begin{itemize}
@@ -2837,14 +2859,14 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.55a (10-04-2022)}
+% \subsection*{1.55a (2022/04/10)}
%
% \subsubsection*{Bug fixes}
% \begin{itemize}
% \item Fix \cmd\foreignlanguage\ command (\TXI{538}).
% \end{itemize}
%
-% \subsection*{1.55 (09-04-2022)}
+% \subsection*{1.55 (2022/04/09)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -2857,7 +2879,7 @@ to track the issues and follow progress.
% \item Add missing \texttt{gloss-latex.lde} file to release (\TXI{537}).
% \end{itemize}
%
-% \subsection*{1.54 (27-03-2022)}
+% \subsection*{1.54 (2022/03/27)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -2899,7 +2921,7 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.53 (12-04-2021)}
+% \subsection*{1.53 (2021/04/12)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -2919,7 +2941,7 @@ to track the issues and follow progress.
% \item Fix part modifications in Hungarian with \pkg{hyperref} (\TXI{493}).
% \end{itemize}
%
-% \subsection*{1.52 (16-03-2021)}
+% \subsection*{1.52 (2021/03/16)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -2936,7 +2958,7 @@ to track the issues and follow progress.
% \item Fix markup of French ¦\see¦ and ¦\alsoname¦ (\TXI{468}).
% \end{itemize}
%
-% \subsection*{1.51 (08-12-2020)}
+% \subsection*{1.51 (2020/12/08)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -2957,14 +2979,14 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.50a (15-10-2020)}
+% \subsection*{1.50a (2020/10/15)}
%
% \subsubsection*{Bug fixes}
% \begin{itemize}
% \item Assure ¦\autodot¦ is defined with ¦\KOMAScript¦ in Russian.
% \end{itemize}
%
-% \subsection*{1.50 (09-10-2020)}
+% \subsection*{1.50 (2020/10/09)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -3030,7 +3052,7 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.49 (08-04-2020)}
+% \subsection*{1.49 (2020/04/08)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -3050,7 +3072,7 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.48 (25-03-2020)}
+% \subsection*{1.48 (2020/03/25)}
%
% \begin{itemize}
% \item No new features
@@ -3076,7 +3098,7 @@ to track the issues and follow progress.
% \item Use private macros in keyval choice keys (\TXI{390}).
% \end{itemize}
%
-% \subsection*{1.47 (29-01-2020)}
+% \subsection*{1.47 (2020/01/29)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -3148,7 +3170,7 @@ to track the issues and follow progress.
% 2020-01-12 at least.
% \end{itemize}
%
-% \subsection*{1.46 (15-11-2019)}
+% \subsection*{1.46 (2019/11/15)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -3202,7 +3224,7 @@ to track the issues and follow progress.
% space now instead of a ¦\thinspace¦ (cf. \TXI{345}).
% \end{itemize}
%
-% \subsection*{1.45 (27-10-2019)}
+% \subsection*{1.45 (2019/10/27)}
%
% \subsubsection*{New features}
% \begin{itemize}
@@ -3321,18 +3343,18 @@ to track the issues and follow progress.
% \item Mention Japanese support in the docs.
% \end{itemize}
%
-% \subsection*{1.44 (04-04-2019)}
+% \subsection*{1.44 (2019/04/04)}
% \begin{itemize}
% \item Correction to Russian language file, by \TA{Maksim Zholudev} (commit d2f383e).
% \item Added Macedonian language file, by \TA{Stefan Zlatinov} (commit cd379e1).
% \end{itemize}
%
-% \subsection*{1.43 (05-03-2019)}
+% \subsection*{1.43 (2019/03/05)}
% \begin{itemize}
% \item Correction to Hindi language file, by \TA{Zdenĕk Wagner}.
% \end{itemize}
%
-% \subsection*{1.42.5 (13-04-2017)}
+% \subsection*{1.42.5 (2017/04/13)}
% \begin{itemize}
% \item Many changes to the French language file, by \TA{Maïeul Rouquette}.
% \end{itemize}
@@ -3360,7 +3382,7 @@ to track the issues and follow progress.
% \item Fixed issue \TXI{107} for Marathi (labels and month names)
% \end{itemize}
%
-% \subsection*{1.42.0 (06-08-2015)}
+% \subsection*{1.42.0 (2015/08/06)}
% \begin{itemize}
% \item Add Bengali digits package, and option to reset all numbering functions.
% \item Add ¦long¦ option for Welsh date.
@@ -3370,22 +3392,22 @@ to track the issues and follow progress.
% \item Fixed error with British variant of English and LuaTeX (issue \TXI{86}).
% \end{itemize}
%
-% \subsection*{1.41.0 (16-07-2015)}
+% \subsection*{1.41.0 (2015/07/16)}
% \begin{itemize}
% \item Added support for Khmer, by \TA{Say Ol} (private email)
% \end{itemize}
%
-% \subsection*{1.40.1 (14-07-2015)}
+% \subsection*{1.40.1 (2015/07/14)}
% \begin{itemize}
% \item Bugfix for Korean, by \TA{Dohyun Kim} (pull request \TXI{103})
% \end{itemize}
%
-% \subsection*{1.40.0 (07-07-2015)}
+% \subsection*{1.40.0 (2015/07/07)}
% \begin{itemize}
% \item ¦gloss-korean.ldf¦ contributed by \TA{Dohyun Kim} (pull request \TXI{102})
% \end{itemize}
%
-% \subsection*{1.33.7 (04-07-2015)}
+% \subsection*{1.33.7 (2015/07/04)}
% \begin{itemize}
% \item Release to CTAN, no code change
% \item Fixed extraneous space in code for Swiss German (pull request \TXI{101})
@@ -3402,14 +3424,14 @@ to track the issues and follow progress.
% \item Enhanced Latin support by \TA{Claudio Beccari}
% \end{itemize}
%
-% \subsection*{1.33.6 (15-05-2015)}
+% \subsection*{1.33.6 (2015/05/15)}
% \begin{itemize}
% \item Introduce a ¦classical¦ and ¦medieval¦ variant of Latin
% \item Add ¦\asbuk¦ and ¦\Asbuk¦ for Ukrainian (after their Russian counterpart)
% \item Fix a number of bugs
% \end{itemize}
%
-% \subsection*{1.33.5 (21-05-2014)}
+% \subsection*{1.33.5 (2014/05/21)}
% \begin{itemize}
% \item Option to disable hyphenation entirely, by \TA{Élie Roux}
% \item Fix spurious spaces in gloss-russian.ldf, by \TA{Oleg Domanov}
@@ -3418,17 +3440,17 @@ to track the issues and follow progress.
% \item Correction to the Lithuanian translations, by \TA{Ignas Anikevičius}
% \end{itemize}
%
-% \subsection*{1.33.4 (27-06-2013)}
+% \subsection*{1.33.4 (2013/06/27)}
% \begin{itemize}
% \item Emergency release for a bug introduced in ¦babelsh.def¦
% \end{itemize}
%
-% \subsection*{1.33.3 (28-05-2013)}
+% \subsection*{1.33.3 (2013/05/28)}
% \begin{itemize}
% \item Changed formatting of some error messages (emergency fixes for TeX Live 2013)
% \end{itemize}
%
-% \subsection*{1.33.2 (26-05-2013)}
+% \subsection*{1.33.2 (2013/05/26)}
% \begin{itemize}
% \item Added ¦\disablehyphenation¦ and ¦\enablehyphenation¦, contributed by
% \TA{Élie Roux}.
@@ -3438,25 +3460,25 @@ to track the issues and follow progress.
% \item Removed spurious space introduced by ¦\captionswedish¦.
% \end{itemize}
%
-% \subsection*{1.33.1 (23-05-2013)}
+% \subsection*{1.33.1 (2013/05/23)}
% \begin{itemize}
% \item Editorial changes to the documentation
% \item Hunted and documented bugs
% \end{itemize}
%
-% \subsection*{1.33.0 (20-05-2013)}
+% \subsection*{1.33.0 (2013/05/20)}
% \begin{itemize}
% \item Added support for N’Ko.
% \item Bugfixes for LuaTeX
% \item More work in progress on Bidi in LuaTeX.
% \end{itemize}
%
-% \subsection*{1.32.0 (15-05-2013)}
+% \subsection*{1.32.0 (2013/05/15)}
% \begin{itemize}
% \item Transitional version to support right-to-left languages with LuaTeX.
% \end{itemize}
%
-% \subsection*{1.31 (10-05-2013) / 1.3 (11-05-2013)}
+% \subsection*{1.31 (2013/05/10) / 1.3 (2013/05/11)}
% \begin{itemize}
% \item Several bugfixes.
% \item Sync with \pkg{babel} 3.9.
@@ -3466,23 +3488,23 @@ to track the issues and follow progress.
% \item Added support for Tibetan, contributed by \TA{Élie Roux} (end of lines are experimental).
% \end{itemize}
%
-% \subsection*{1.30 (06-08-2012)}
+% \subsection*{1.30 (2012/08/06)}
% \begin{itemize}
% \item Added support for LuaTeX. Many languages don’t work yet. Please be patient.
% \end{itemize}
%
-% \subsection*{1.2.0e (28-04-2012)}
+% \subsection*{1.2.0e (2012/04/28)}
% \begin{itemize}
% \item Fixed a number of outstanding and not very interesting bugs.
% \item Added gloss files for Romansh and Friulan, contributed by \TA{Claudio Beccari}.
% \end{itemize}
%
-% \subsection*{1.2.0d (12-01-2012)}
+% \subsection*{1.2.0d (2012/01/12)}
% \begin{itemize}
% \item Removed ¦\makeatletter¦ and ¦\makeother¦ from gloss files entirely.
% \end{itemize}
%
-% \subsection*{1.2.0c (12-10-2011) [First update by Arthur Reutenauer]}
+% \subsection*{1.2.0c (2011/10/12) [First update by Arthur Reutenauer]}
% \begin{itemize}
% \item Update to ¦gloss-italian.ldf¦ by \TA{Claudio Beccari}, incorporating changes
% by \TA{Enrico Gregorio}.
@@ -3513,13 +3535,13 @@ to track the issues and follow progress.
% \end{itemize}
% \end{itemize}
%
-% \subsection*{1.2.0b (03-10-2011) [Update by Philipp Stephani]}
+% \subsection*{1.2.0b (2011/10/03) [Update by Philipp Stephani]}
% \begin{itemize}
% \item Load \pkg{xkeyval} package explicitly since newer versions
% of \pkg{fontspec} don't load it any more.
% \end{itemize}
%
-% \subsection*{1.2.0a (27-07-2010) [Last update by François Charette]}
+% \subsection*{1.2.0a (2010/07/27) [Last update by François Charette]}
% \begin{itemize}
% \item Initialize ¦\fontfamily¦ acc to value of ¦\familydefault¦
% (Fixes a bug when using \pkg{polyglossia} with beamer)
@@ -3531,7 +3553,7 @@ to track the issues and follow progress.
% \end{itemize}
%
%
-% \subsection*{1.2.0 (15-07-2010)}
+% \subsection*{1.2.0 (2010/07/15)}
% \begin{itemize}
% \item Adapted for \pkg{fontspec} 2.0 (will not work with earlier versions!)
% \item New implementation of a ¦\PolyglossiaSetup¦ interface
@@ -3563,7 +3585,7 @@ to track the issues and follow progress.
% feature was deprecated since v1.1.0).
% \end{itemize}
%
-% \subsection*{1.1.1 (23-03-2010)}
+% \subsection*{1.1.1 (2010/03/23)}
% \begin{itemize}
% \item Bugfix for French: explicit spaces before/after double punctuation
% signs (Par exemple : les grands « espaces » du Canada !) are
@@ -3594,18 +3616,18 @@ to track the issues and follow progress.
% \item Change ¦hyphenmins¦ for Sanskrit
% \end{itemize}
%
-% \subsection*{1.1.0b (22-11-2009)}
+% \subsection*{1.1.0b (2009/11/22)}
% \begin{itemize}
% \item Modify ¦\hyphenmins¦ for Sanskrit (\TA{Yves Codet})
% \item Bugfixes for Serbian and Bulgarian (\TA{Enrico Gregorio})
% \end{itemize}
%
-% \subsection*{1.1.0a (22-11-2009)}
+% \subsection*{1.1.0a (2009/11/22)}
% \begin{itemize}
% \item Bugfix for interchar tokens
% \end{itemize}
%
-% \subsection*{1.1.0 (20-11-2009)}
+% \subsection*{1.1.0 (2009/11/20)}
% \begin{itemize}
% \item Use ¦\newXeTeXintercharclass¦ (thanks to \TA{Enrico Gregorio})
% \item Fixed implementation of shorthands for German (\pkg{babel} code in file ¦babelsh.def¦)
@@ -3639,7 +3661,7 @@ to track the issues and follow progress.
% \item Other minor bugfixes
% \end{itemize}
%
-% \subsection*{1.0.2 (27-01-2009)}
+% \subsection*{1.0.2 (2009/01/27)}
% \begin{itemize}
% \item Captions corrected in Hebrew, Russian and Spanish
% \item Removed all ¦\text<lang>¦ wrappers within caption definitions
@@ -3648,7 +3670,7 @@ to track the issues and follow progress.
% \item New option \xpgoption{Script} for Sanskrit
% \end{itemize}
%
-% \subsection*{1.0.1 (31-07-2008)}
+% \subsection*{1.0.1 (2008/07/31)}
% \begin{itemize}
% \item Improved documentation (added sections on font setup and numeration mappings)
% \item Improvements and bug fixes for English and German
@@ -3657,7 +3679,7 @@ to track the issues and follow progress.
% \item Added ¦gloss-amharic.ldf¦ (ported from ¦ethiop.ldf¦ in the package \pkg{ethiop})
% \end{itemize}
%
-% \subsection*{1.0 (13-07-2008)}
+% \subsection*{1.0 (2008/07/13)}
% \begin{itemize}
% \item Initial release on CTAN.
% \end{itemize}
@@ -3694,10 +3716,10 @@ to track the issues and follow progress.
% In alphabetical order: \TA{Ignas Anikevicius}, \TA{Sina Ahmadi}, \TA{Wouter Bolsterlee}, \TA{Christian Buhtz},
% \TA{Zgarbul Andrey}, \TA{Oleg Domanov}, user \TA{fakhriaunur}, \TA{Philipp Gesang}, \TA{Kevin Godby}, \TA{Enrico Gregorio},
% \TA{Khaled Hosny}, \TA{Najib Idrissi}, user \TA{julroy67}, \TA{Dohyun Kim}, \TA{Phil Kime}, \TA{Mike Kroutikov},
-% \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{José Mancera}, \TA{Miquel Ortega}, \TA{Yevgen Pogribnyi}, \TA{Will Robertson},
-% \TA{Maïeul Rouquette}, \TA{Elie Roux}, \TA{Hugo Roy}, \TA{Guy Rutenberg}, \TA{Marcin Serwin}, \TA{Philipp Stephani},
-% \TA{Niranjan Tambe}, \TA{Osman Tursun}, \TA{Keno Wehr}, \TA{Dominik Wujastyk}, \TA{Sertaç Ö. Yıldız}, \TA{Maksim Zholudev},
-% \TA{Yan Zhou}, and \TA{Stefan Zlatinov}.
+% \TA{Ivan Kokan}, \TA{Caleb Maclennan}, \TA{Gyula Magyarkuti}, \TA{José Mancera}, \TA{Miquel Ortega}, \TA{Yevgen Pogribnyi},
+% \TA{Will Robertson}, \TA{Maïeul Rouquette}, \TA{Elie Roux}, \TA{Hugo Roy}, \TA{Guy Rutenberg}, \TA{Marcin Serwin},
+% \TA{Philipp Stephani}, \TA{Niranjan Tambe}, \TA{Osman Tursun}, \TA{Keno Wehr}, \TA{Dominik Wujastyk}, \TA{Sertaç Ö. Yıldız},
+% \TA{Maksim Zholudev}, \TA{Yan Zhou}, and \TA{Stefan Zlatinov}.
% Their respective contributions can be identified from the contributor statistics on
% \href{https://github.com/reutenauer/polyglossia/graphs/contributors}{GitHub}.
%
@@ -3723,7 +3745,7 @@ to track the issues and follow progress.
% \subsection{polyglossia.sty}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{polyglossia}[2022/07/18 v1.57
+\ProvidesPackage{polyglossia}[2022/10/26 v1.58
Modern multilingual typesetting with XeLaTeX and LuaLaTeX]
\RequirePackage{etoolbox}
\RequirePackage{makecmds}
@@ -5565,7 +5587,14 @@ to track the issues and follow progress.
\__xpg_foreignlanguage:eeen {#1} {#2} {\xpg_alias_base_lang:n{#2}} {#3}
}
-% internal wrapper for foreing language
+% Direct access to polyglossia@setforeignlanguage
+% used in captions
+\newcommand{\setforeignlanguage}[2][]
+{
+ \polyglossia@setforeignlanguage[#1]{#2}%
+}
+
+% internal wrapper for foreign language
% #1 option
% #2 alias
% #3 base lang
@@ -5907,17 +5936,20 @@ to track the issues and follow progress.
\ifx#1\\\\%
\protected@write\@auxout{}{\protect\selectlanguage*{#2}}%
\addtocontents{toc}{\protect\selectlanguage*{#2}}%
- \addtocontents{lof}{\protect\selectlanguage*{#2}}%
- \addtocontents{lot}{\protect\selectlanguage*{#2}}%
\else
\protected@write\@auxout{}{\protect\selectlanguage*[#1]{#2}}%
\addtocontents{toc}{\protect\selectlanguage*[#1]{#2}}%
- \addtocontents{lof}{\protect\selectlanguage*[#1]{#2}}%
- \addtocontents{lot}{\protect\selectlanguage*[#1]{#2}}%
\fi
\fi
}
+% Since captions might float to other language regions,
+% we need to change the language here (#542)
+\AddToHook{cmd/caption/before}{%
+ \addtocontents{lof}{\protect\setforeignlanguage{\languagename}}%
+ \addtocontents{lot}{\protect\setforeignlanguage{\languagename}}%
+}
+
% The bidi package swaps the output stream within RTL tables
% (to get the column order right). This also swaps group
% delimiters inserted to the aux files via otherlanguage (see #354).
@@ -6172,7 +6204,7 @@ to track the issues and follow progress.
\newcommand*\use@localhyphenmins[2][]{%
\bgroup
\polyglossia@error@iflangnotloaded:n{#2}
- \setkeys{#2}{#1}%
+ \exp_args:Nne \setkeys{#2}{#1}%
% Store BCP-47 id of language
\tl_if_blank:nTF {#1}{%
\ifcsundef{#2@gbcp47id}{%
@@ -7018,6 +7050,11 @@ Shawwāl\or Dhū ’l-Qaʿda\or Dhū ’l-Ḥijja\fi}
%
% \subsection{polyglossia-french.lua}
% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
local function set_left_space(lang, char, kern, rubber)
@@ -7082,6 +7119,7 @@ polyglossia.deactivate_french_punct = deactivate_french_punct
% \begin{macrocode}
--
-- polyglossia-korean.lua
+-- part of polyglossia v1.58 -- 2022/10/26
--
local glyph_id = node.id"glyph"
@@ -7697,6 +7735,11 @@ prepend_to_callback ("hpack_filter",
%
% \subsection{polyglossia-latin.lua}
% \begin{macrocode}
+--
+-- polyglossia-latin.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
-- For ecclesiastic Latin (and sometimes for Italian) a very small space is
@@ -7747,6 +7790,11 @@ polyglossia.deactivate_latin_punct = deactivate_latin_punct
%
% \subsection{polyglossia-punct.lua}
% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
@@ -8110,6 +8158,11 @@ polyglossia.clear_spaced_characters = clear_spaced_characters
%
% \subsection{polyglossia-sanskrit.lua}
% \begin{macrocode}
+--
+-- polyglossia-sanskrit.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
-- How do we now, in Lua, what a \thinspace is? In the LaTeX source (latex.ltx)
@@ -8155,6 +8208,11 @@ polyglossia.deactivate_sanskrit_punct = deactivate_sanskrit_punct
%
% \subsection{polyglossia-tibt.lua}
% \begin{macrocode}
+--
+-- polyglossia-tibt.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
@@ -8253,6 +8311,10 @@ polyglossia.desactivate_tibt_eol = desactivate
%
% \subsection{polyglossia.lua}
% \begin{macrocode}
+--
+-- polyglossia.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
local module_name = "polyglossia"
local polyglossia_module = {
@@ -9610,7 +9672,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latex.lde}
% \begin{macrocode}
-\ProvidesLanguageDefinitionExtension{gloss-latex}{2021/07/10}{v1.53}{polyglossia: module for default language}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesLanguageDefinitionExtension{gloss-latex}{2022/10/26}{v1.58}{polyglossia: module for default language}
\PolyglossiaSetup{latex}{
hyphennames={english},
@@ -9654,7 +9718,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-acadien.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for canadian (acadian) french]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-acadien.ldf}[polyglossia: module for Canadian (Acadian) French]
% We provide this as a babel alias
@@ -9669,7 +9735,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-aeb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-aeb.ldf}[polyglossia: module for aeb (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -9684,7 +9752,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-af.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (afrikaans)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-af.ldf}[polyglossia: module for af (Afrikaans)]
% We provide this as a bcp47-compliant alias
@@ -9699,7 +9769,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-afb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-afb.ldf}[polyglossia: module for afb (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -9714,7 +9786,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-afrikaans.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for afrikaans]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-afrikaans.ldf}[polyglossia: module for Afrikaans]
\PolyglossiaSetup{afrikaans}{
bcp47=af,
@@ -9815,7 +9889,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-albanian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-albanian.ldf}[polyglossia: module for albanian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-albanian.ldf}[polyglossia: module for Albanian]
\PolyglossiaSetup{albanian}{
bcp47=sq,
@@ -9868,7 +9944,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-am.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (amharic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-am.ldf}[polyglossia: module for am (Amharic)]
% We provide this as a bcp47-compliant alias
@@ -9883,7 +9961,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-american.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-american.ldf}[polyglossia: module for american english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-american.ldf}[polyglossia: module for American English]
% We provide this as a babel alias
@@ -9898,7 +9978,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-amharic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-amharic.ldf}[polyglossia: module for amharic]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-amharic.ldf}[polyglossia: module for Amharic]
\PolyglossiaSetup{amharic}{
bcp47=am,
script=Ethiopic,
@@ -10114,7 +10196,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-apd.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-apd.ldf}[polyglossia: module for apd (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10129,7 +10213,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-IQ.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-IQ.ldf}[polyglossia: module for ar-IQ (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10144,7 +10230,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-JO.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-JO.ldf}[polyglossia: module for ar-JO (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10159,7 +10247,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-LB.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-LB.ldf}[polyglossia: module for ar-LB (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10174,7 +10264,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-MR.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-MR.ldf}[polyglossia: module for ar-MR (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10189,7 +10281,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-PS.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-PS.ldf}[polyglossia: module for ar-PS (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10204,7 +10298,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-SY.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-SY.ldf}[polyglossia: module for ar-SY (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10219,7 +10315,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar-YE.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar-YE.ldf}[polyglossia: module for ar-YE (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10234,7 +10332,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ar.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ar.ldf}[polyglossia: module for ar (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10249,7 +10349,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arabic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for arabic]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-arabic.ldf}[polyglossia: module for Arabic]
\RequireBidi
\RequirePackage{arabicnumbers}
\RequirePackage{hijrical}
@@ -10517,7 +10619,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-armenian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for armenian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-armenian.ldf}[polyglossia: module for Armenian]
\PolyglossiaSetup{armenian}{
bcp47=hy,
@@ -10702,7 +10806,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arq.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-arq.ldf}[polyglossia: module for arq (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10717,7 +10823,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ary.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ary.ldf}[polyglossia: module for ary (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10732,7 +10840,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-arz.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-arz.ldf}[polyglossia: module for arz (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10747,7 +10857,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ast.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (asturian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ast.ldf}[polyglossia: module for ast (Asturian)]
% We provide this as a bcp47-compliant alias
@@ -10762,10 +10874,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-asturian.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% Translated by Xuacu <xuacusk8 at gmail dot com>
% Contributed by Kevin Godby <godbyk at gmail dot com>
%
-\ProvidesFile{gloss-asturian.ldf}[polyglossia: module for asturian]
+\ProvidesFile{gloss-asturian.ldf}[polyglossia: module for Asturian]
\PolyglossiaSetup{asturian}{
bcp47=ast,
hyphennames={asturian,catalan},
@@ -10818,7 +10932,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-australian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-australian.ldf}[polyglossia: module for australian english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-australian.ldf}[polyglossia: module for Australian English]
% We provide this as a babel alias
@@ -10833,7 +10949,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-austrian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for austrian german (old spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-austrian.ldf}[polyglossia: module for Austrian German (old spelling)]
% We provide this as a babel alias
@@ -10848,7 +10966,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ayl.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (arabic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ayl.ldf}[polyglossia: module for ayl (Arabic)]
% We provide this as a bcp47-compliant alias
@@ -10863,7 +10983,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasa.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for bahasa indonesia]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bahasa.ldf}[polyglossia: module for Bahasa Indonesia]
% We provide this as a babel alias
@@ -10878,7 +11000,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasai.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for bahasa indonesia]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bahasai.ldf}[polyglossia: module for Bahasa Indonesia]
% We only provide this gloss for babel compatibility. Since bahasai is
% a malay variety, we use 'malay' with variant 'indonesian' now.
@@ -10894,7 +11018,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bahasam.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for bahasa melayu]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bahasam.ldf}[polyglossia: module for Bahasa Melayu]
% We only provide this gloss for babel compatibility. Since bahasam is
% a malay variety, we use 'malay' with variant 'malaysian' now.
@@ -10910,7 +11036,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-basque.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-basque.ldf}[polyglossia: module for basque]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-basque.ldf}[polyglossia: module for Basque]
\PolyglossiaSetup{basque}{
bcp47=eu,
hyphennames={basque},
@@ -10963,7 +11091,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-be-tarask.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (belarusian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-be-tarask.ldf}[polyglossia: module for be-tarask (Belarusian)]
% We provide this as a bcp47-compliant alias
@@ -10978,7 +11108,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-be.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (belarusian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-be.ldf}[polyglossia: module for be (Belarusian)]
% We provide this as a bcp47-compliant alias
@@ -10993,7 +11125,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-belarusian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for belarusian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-belarusian.ldf}[polyglossia: module for Belarusian]
\RequirePackage{xpg-cyrillicnumbers}
@@ -11315,10 +11449,12 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bengali.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% Translations provided by সাজেদুর রহিম জোয়ারদার <toshazed@gmail.com>
% TODO implement Bengali calendar
-\ProvidesFile{gloss-bengali.ldf}[polyglossia: module for bengali]
+\ProvidesFile{gloss-bengali.ldf}[polyglossia: module for Bengali]
\RequirePackage{devanagaridigits}
\RequirePackage{bengalidigits}
@@ -11452,7 +11588,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bg.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (bulgarian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bg.ldf}[polyglossia: module for bg (Bulgarian)]
% We provide this as a bcp47-compliant alias
@@ -11467,7 +11605,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (bengali)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bn.ldf}[polyglossia: module for bn (Bengali)]
% We provide this as a bcp47-compliant alias
@@ -11482,7 +11622,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bo.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (tibetan)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bo.ldf}[polyglossia: module for bo (Tibetan)]
% We provide this as a bcp47-compliant alias
@@ -11497,7 +11639,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bosnian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for bosnian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bosnian.ldf}[polyglossia: module for Bosnian]
\PolyglossiaSetup{bosnian}{
bcp47=bs,
@@ -11555,7 +11699,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-br.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (breton)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-br.ldf}[polyglossia: module for br (Breton)]
% We provide this as a bcp47-compliant alias
@@ -11570,7 +11716,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-brazil.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for brazilian portuguese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-brazil.ldf}[polyglossia: module for Brazilian Portuguese]
% We only provide this gloss for backwards compatibility. The name
% 'brazil' was selected in accordance with babel.
@@ -11587,7 +11735,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-breton.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-breton.ldf}[polyglossia: module for breton]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-breton.ldf}[polyglossia: module for Breton]
\PolyglossiaSetup{breton}{
bcp47=br,
hyphennames={breton},
@@ -11690,7 +11840,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-british.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-british.ldf}[polyglossia: module for british english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-british.ldf}[polyglossia: module for British English]
% We provide this as a babel alias
@@ -11705,7 +11857,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bs.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (bosnian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bs.ldf}[polyglossia: module for bs (Bosnian)]
% We provide this as a bcp47-compliant alias
@@ -11720,7 +11874,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-bulgarian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for bulgarian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-bulgarian.ldf}[polyglossia: module for Bulgarian]
\PolyglossiaSetup{bulgarian}{
bcp47=bg,
script=Cyrillic,
@@ -11817,7 +11973,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ca.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (catalan)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ca.ldf}[polyglossia: module for ca (Catalan)]
% We provide this as a bcp47-compliant alias
@@ -11832,7 +11990,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-canadian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for canadian english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-canadian.ldf}[polyglossia: module for Canadian English]
% We provide this as a babel alias
@@ -11847,7 +12007,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-canadien.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for canadian french]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-canadien.ldf}[polyglossia: module for Canadian French]
% We provide this as a babel alias
@@ -11862,7 +12024,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-catalan.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for catalan]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-catalan.ldf}[polyglossia: module for Catalan]
\PolyglossiaSetup{catalan}{
bcp47=ca,
hyphennames={catalan},
@@ -12027,7 +12191,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb-Arab.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ckb-Arab.ldf}[polyglossia: module for ckb-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -12042,7 +12208,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb-Latn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ckb-Latn.ldf}[polyglossia: module for ckb-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -12057,7 +12225,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ckb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ckb.ldf}[polyglossia: module for ckb (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -12072,7 +12242,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-cop.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (coptic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-cop.ldf}[polyglossia: module for cop (Coptic)]
% We provide this as a bcp47-compliant alias
@@ -12087,7 +12259,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-coptic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-coptic.ldf}[polyglossia: module for coptic]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-coptic.ldf}[polyglossia: module for Coptic]
\PolyglossiaSetup{coptic}{
bcp47=cop,
script=Coptic,
@@ -12138,7 +12312,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-croatian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for croatian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-croatian.ldf}[polyglossia: module for Croatian]
\PolyglossiaSetup{croatian}{
bcp47=hr,
langtag=HRV,
@@ -12276,7 +12452,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}
% Provide croatian digraphs if available in current font
-\def\xpg@hr@digraph#1#2{%
+\protected\def\xpg@hr@digraph#1#2{%
\bgroup%
% 1. DŽ, Dž and dž
\ifx#1D%
@@ -12409,7 +12585,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-cy.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (welsh)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-cy.ldf}[polyglossia: module for cy (Welsh)]
% We provide this as a bcp47-compliant alias
@@ -12424,7 +12602,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-cz.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (czech)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-cz.ldf}[polyglossia: module for cz (Czech)]
% We provide this as a bcp47-compliant alias
@@ -12439,7 +12619,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-czech.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-czech.ldf}[polyglossia: module for czech]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-czech.ldf}[polyglossia: module for Czech]
\PolyglossiaSetup{czech}{
bcp47=cz,
@@ -12693,7 +12875,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-da.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (danish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-da.ldf}[polyglossia: module for da (Danish)]
% We provide this as a bcp47-compliant alias
@@ -12708,7 +12892,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-danish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-danish.ldf}[polyglossia: module for danish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-danish.ldf}[polyglossia: module for Danish]
\PolyglossiaSetup{danish}{
bcp47=da,
hyphennames={danish},
@@ -12761,7 +12947,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT-1901.ldf}[polyglossia: module for de-AT-1901 (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -12776,7 +12964,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT-1996.ldf}[polyglossia: module for de-AT-1996 (Austrian German)]
% We provide this as a bcp47-compliant alias
@@ -12791,7 +12981,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-AT.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT.ldf}[polyglossia: module for de-AT (Austrian German)]
% We provide this as a bcp47-compliant alias
@@ -12806,7 +12998,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH-1901.ldf}[polyglossia: module for de-CH-1901 (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -12821,7 +13015,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH-1996.ldf}[polyglossia: module for de-CH-1996 (Swiss German)]
% We provide this as a bcp47-compliant alias
@@ -12836,7 +13032,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-CH.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH.ldf}[polyglossia: module for de-CH (Swiss German)]
% We provide this as a bcp47-compliant alias
@@ -12851,7 +13049,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE-1901.ldf}[polyglossia: module for de-DE-1901 (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -12866,7 +13066,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE-1996.ldf}[polyglossia: module for de-DE-1996 (Germany's German)]
% We provide this as a bcp47-compliant alias
@@ -12881,7 +13083,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-DE.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE.ldf}[polyglossia: module for de-DE (Germany's German)]
% We provide this as a bcp47-compliant alias
@@ -12896,7 +13100,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT-1901-Latf.ldf}[polyglossia: module for de-AT-1901-Latf (Austrian German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -12911,7 +13117,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT-1996-Latf.ldf}[polyglossia: module for de-AT-1996-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
@@ -12926,7 +13134,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-AT.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-AT-Latf.ldf}[polyglossia: module for de-AT-Latf (Austrian German)]
% We provide this as a bcp47-compliant alias
@@ -12941,7 +13151,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH-1901-Latf.ldf}[polyglossia: module for de-CH-1901-Latf (Swiss German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -12956,7 +13168,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH-1996-Latf.ldf}[polyglossia: module for de-CH-1996-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
@@ -12971,7 +13185,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-CH.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-CH-Latf.ldf}[polyglossia: module for de-CH-Latf (Swiss German)]
% We provide this as a bcp47-compliant alias
@@ -12986,7 +13202,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE-1901.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE-1901-Latf.ldf}[polyglossia: module for de-DE-1901-Latf (Germany's German, old spelling)]
% We provide this as a bcp47-compliant alias
@@ -13001,7 +13219,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE-1996.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE-1996-Latf.ldf}[polyglossia: module for de-DE-1996-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
@@ -13016,7 +13236,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf-DE.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-DE-Latf.ldf}[polyglossia: module for de-DE-Latf (Germany's German)]
% We provide this as a bcp47-compliant alias
@@ -13031,7 +13253,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de-Latf.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de-Latf.ldf}[polyglossia: module for de-Latf (German)]
% We provide this as a bcp47-compliant alias
@@ -13046,7 +13270,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-de.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (german)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-de.ldf}[polyglossia: module for de (German)]
% We provide this as a bcp47-compliant alias
@@ -13061,7 +13287,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-divehi.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-divehi.ldf}[polyglossia: module for divehi]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-divehi.ldf}[polyglossia: module for Divehi]
\RequireBidi
\PolyglossiaSetup{divehi}{
@@ -13124,7 +13352,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dsb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (sorbian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-dsb.ldf}[polyglossia: module for dsb (Sorbian)]
% We provide this as a bcp47-compliant alias
@@ -13139,7 +13369,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dutch.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for dutch]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-dutch.ldf}[polyglossia: module for Dutch]
\PolyglossiaSetup{dutch}{
bcp47=nl,
hyphennames={dutch},
@@ -13240,7 +13472,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-dv.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (divehi)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-dv.ldf}[polyglossia: module for dv (Divehi)]
% We provide this as a bcp47-compliant alias
@@ -13255,7 +13489,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-el-monoton.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (greek)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-el-monoton.ldf}[polyglossia: module for el-monoton (Greek)]
% We provide this as a bcp47-compliant alias
@@ -13270,7 +13506,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-el-polyton.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (greek)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-el-polyton.ldf}[polyglossia: module for el-polyton (Greek)]
% We provide this as a bcp47-compliant alias
@@ -13285,7 +13523,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-el.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (greek)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-el.ldf}[polyglossia: module for el (Greek)]
% We provide this as a bcp47-compliant alias
@@ -13300,7 +13540,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-AU.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en-AU.ldf}[polyglossia: module for en-AU (Australian English)]
% We provide this as a bcp47-compliant alias
@@ -13315,7 +13557,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-CA.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en-CA.ldf}[polyglossia: module for en-CA (Canadan English)]
% We provide this as a bcp47-compliant alias
@@ -13330,7 +13574,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-GB.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en-GB.ldf}[polyglossia: module for en-GB (British English)]
% We provide this as a bcp47-compliant alias
@@ -13345,7 +13591,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-NZ.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en-NZ.ldf}[polyglossia: module for en-NZ (Newzealand English)]
% We provide this as a bcp47-compliant alias
@@ -13360,7 +13608,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en-US.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en-US.ldf}[polyglossia: module for en-US (American English)]
% We provide this as a bcp47-compliant alias
@@ -13375,7 +13625,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-en.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (english)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-en.ldf}[polyglossia: module for en (English)]
% We provide this as a bcp47-compliant alias
@@ -13390,7 +13642,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-english.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-english.ldf}[polyglossia: module for english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-english.ldf}[polyglossia: module for English]
\PolyglossiaSetup{english}{
bcp47=en-US,
@@ -13596,7 +13850,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-eo.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (esperanto)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-eo.ldf}[polyglossia: module for eo (Esperanto)]
% We provide this as a bcp47-compliant alias
@@ -13611,7 +13867,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es-ES.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (spanish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-es-ES.ldf}[polyglossia: module for es-ES (Spain's Spanish)]
% We provide this as a bcp47-compliant alias
@@ -13626,7 +13884,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es-MX.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (spanish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-es-MX.ldf}[polyglossia: module for es-MX (Mexican Spanish)]
% We provide this as a bcp47-compliant alias
@@ -13641,7 +13901,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-es.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (spanish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-es.ldf}[polyglossia: module for es (Spanish)]
% We provide this as a bcp47-compliant alias
@@ -13656,7 +13918,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-esperanto.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for esperanto]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-esperanto.ldf}[polyglossia: module for Esperanto]
\PolyglossiaSetup{esperanto}{
bcp47=eo,
hyphennames={esperanto},
@@ -13732,7 +13996,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-estonian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for estonian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-estonian.ldf}[polyglossia: module for Estonian]
\PolyglossiaSetup{estonian}{
bcp47=et,
hyphennames={estonian},
@@ -13784,7 +14050,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-et.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (estonian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-et.ldf}[polyglossia: module for et (Estonian)]
% We provide this as a bcp47-compliant alias
@@ -13799,7 +14067,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-eu.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (basque)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-eu.ldf}[polyglossia: module for eu (Basque)]
% We provide this as a bcp47-compliant alias
@@ -13814,7 +14084,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fa.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (persian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fa.ldf}[polyglossia: module for fa (Persian)]
% We provide this as a bcp47-compliant alias
@@ -13829,7 +14101,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-farsi.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for farsi]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-farsi.ldf}[polyglossia: module for Farsi]
% We only provide this gloss for babel compatibility.
% The proper English language name is Persian.
@@ -13845,7 +14119,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fi.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (finnish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fi.ldf}[polyglossia: module for fi (Finnish)]
% We provide this as a bcp47-compliant alias
@@ -13860,7 +14136,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-finnish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for finnish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-finnish.ldf}[polyglossia: module for Finnish]
\PolyglossiaSetup{finnish}{
bcp47=fi,
hyphennames={finnish},
@@ -13896,10 +14174,10 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\bbl@activate{"}%
\def\language@group{finnish}%
\declare@shorthand{finnish}{"-}{\nobreak-\bbl@allowhyphens}
- \declare@shorthand{finnish}{"|}{\textormath{\penalty@M\discretionary{-}{}{\kern.03em}}{}}%
+ \declare@shorthand{finnish}{"|}{\textormath{\penalty\@M\discretionary{-}{}{\kern.03em}}{}}%
\declare@shorthand{finnish}{""}{\hskip\z@skip}%
\declare@shorthand{finnish}{"~}{\textormath{\leavevmode\hbox{-}}{-}}%
- \declare@shorthand{finnish}{"=}{\penalty@M-\hskip\z@skip}%
+ \declare@shorthand{finnish}{"=}{\penalty\@M-\hskip\z@skip}%
\declare@shorthand{finnish}{"/}{\textormath
{\bbl@allowhyphens\discretionary{/}{}{/}\bbl@allowhyphens}{}}%
}
@@ -13975,7 +14253,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-CA.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (french)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fr-CA.ldf}[polyglossia: module for fr-CA (Canadian French)]
% We provide this as a bcp47-compliant alias
@@ -13990,7 +14270,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-CH.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (french)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fr-CH.ldf}[polyglossia: module for fr-CH (Swiss French)]
% We provide this as a bcp47-compliant alias
@@ -14005,7 +14287,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr-FR.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (french)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fr-FR.ldf}[polyglossia: module for fr-FR (France's French)]
% We provide this as a bcp47-compliant alias
@@ -14020,7 +14304,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fr.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (french)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fr.ldf}[polyglossia: module for fr (French)]
% We provide this as a bcp47-compliant alias
@@ -14035,7 +14321,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-french.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-french.ldf}[polyglossia: module for french]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-french.ldf}[polyglossia: module for French]
\PolyglossiaSetup{french}{%
bcp47=fr-FR,
@@ -14555,7 +14843,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-friulan.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for friulan]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-friulan.ldf}[polyglossia: module for Friulian]
% We only provide this gloss for babel compatibility.
@@ -14570,7 +14860,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-friulian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for friulian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-friulian.ldf}[polyglossia: module for Friulian]
\PolyglossiaSetup{friulian}{%
bcp47=fur,
@@ -14652,7 +14944,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-fur.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (friulian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-fur.ldf}[polyglossia: module for fur (Friulian)]
% We provide this as a bcp47-compliant alias
@@ -14667,7 +14961,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ga.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (gaelic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ga.ldf}[polyglossia: module for ga (Gaelic)]
% We provide this as a bcp47-compliant alias
@@ -14682,7 +14978,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gaelic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for gaelic]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-gaelic.ldf}[polyglossia: module for Gaelic]
\PolyglossiaSetup{gaelic}{
bcp47=ga,
@@ -14808,7 +15106,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-galician.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-galician.ldf}[polyglossia: module for galician]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-galician.ldf}[polyglossia: module for Galician]
\PolyglossiaSetup{galician}{
bcp47=gl,
hyphennames={galician},
@@ -14860,7 +15160,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gd.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (gaelic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-gd.ldf}[polyglossia: module for gd (Gaelic)]
% We provide this as a bcp47-compliant alias
@@ -14875,7 +15177,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-georgian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for georgian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-georgian.ldf}[polyglossia: module for Georgian]
\PolyglossiaSetup{georgian}{
bcp47=ka,
@@ -15115,7 +15419,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-german.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-german.ldf}[polyglossia: module for german]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-german.ldf}[polyglossia: module for German]
\PolyglossiaSetup{german}{
bcp47=de-DE,
@@ -15447,7 +15753,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-germanb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for german (old spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-germanb.ldf}[polyglossia: module for German (old spelling)]
% We provide this as a babel alias
@@ -15462,7 +15770,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-gl.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (galician)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-gl.ldf}[polyglossia: module for gl (Galician)]
% We provide this as a bcp47-compliant alias
@@ -15477,7 +15787,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-grc.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (greek)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-grc.ldf}[polyglossia: module for grc (Greek)]
% We provide this as a bcp47-compliant alias
@@ -15492,7 +15804,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-greek.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-greek.ldf}[polyglossia: module for greek]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-greek.ldf}[polyglossia: module for Greek]
\PolyglossiaSetup{greek}{
bcp47=el-monoton,
@@ -15910,7 +16224,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-he.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (hebrew)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-he.ldf}[polyglossia: module for he (Hebrew)]
% We provide this as a bcp47-compliant alias
@@ -15925,7 +16241,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hebrew.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for hebrew]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hebrew.ldf}[polyglossia: module for Hebrew]
\RequireBidi
\RequirePackage{hebrewcal}
@@ -15952,25 +16270,28 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\define@key{hebrew}{fullyear}[true]{\setkeys{hebrewcal}{fullyear=#1}}
\newif\if@calendar@hebrew
-\def\tmp@hebrew{hebrew}
-\define@key{hebrew}{calendar}[gregorian]{%
- \message{Setting \string\if@calendar@hebrew}
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@hebrew%
- \@calendar@hebrewtrue%
- \else%
- \@calendar@hebrewfalse%
- \fi}
+\define@choicekey*+{hebrew}{calendar}[\xpg@val\xpg@nr]{hebrew,gregorian}[gregorian]{%
+ \ifcase\xpg@nr\relax
+ % hebrew:
+ \@calendar@hebrewtrue%
+ \or
+ % gregorian:
+ \@calendar@hebrewfalse%
+ \fi
+ \xpg@info{Option: Hebrew, calendar=\xpg@val}%
+}{\xpg@warning{Unknown Hebrew calendar `#1'}}
\newif\if@hebrew@numerals
-\def\tmp@hebrew{hebrew}
-\define@key{hebrew}{numerals}[arabic]{%
- \def\@tmpa{#1}%
- \ifx\@tmpa\tmp@hebrew%
- \@hebrew@numeralstrue%
- \else%
- \@hebrew@numeralsfalse%
- \fi}
+\define@choicekey*+{hebrew}{numerals}[\xpg@val\xpg@nr]{hebrew,arabic}[arabic]{%
+ \ifcase\xpg@nr\relax
+ % hebrew:
+ \@hebrew@numeralstrue%
+ \or
+ % arabic:
+ \@hebrew@numeralsfalse%
+ \fi
+ \xpg@info{Option: Hebrew, numerals=\xpg@val}%
+}{\xpg@warning{Unknown Hebrew numerals value `#1'}}
\setkeys{hebrew}{numerals}
@@ -16009,7 +16330,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\hebrewnumber\day%
\space ב\hebrewgregmonth{\month}\space%
\hebrewnumber\year%
- \fi}%
+ \fi%
+ }%
}
\def\hebrewgregmonth#1{\ifcase#1%
@@ -16100,7 +16422,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hi.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (hindi)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hi.ldf}[polyglossia: module for hi (Hindi)]
% We provide this as a bcp47-compliant alias
@@ -16115,12 +16439,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hindi.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% UTF-8 strings kindly provided by Zdenĕk Wagner, 10-03-2008
% with corrections and additional contributions by Anshuman Pandey
% TODO: add option for velthuis transliteration with link to
% Velthuis Devanagari project.
-\ProvidesFile{gloss-hindi.ldf}[polyglossia: module for hindi]
+\ProvidesFile{gloss-hindi.ldf}[polyglossia: module for Hindi]
\RequirePackage{devanagaridigits}
\PolyglossiaSetup{hindi}{
bcp47=hi,
@@ -16238,7 +16564,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hr.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (croatian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hr.ldf}[polyglossia: module for hr (Croatian)]
% We provide this as a bcp47-compliant alias
@@ -16253,7 +16581,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hsb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (sorbian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hsb.ldf}[polyglossia: module for hsb (Higher Sorbian)]
% We provide this as a bcp47-compliant alias
@@ -16268,7 +16598,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hu.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (hungarian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hu.ldf}[polyglossia: module for hu (Hungarian)]
% We provide this as a bcp47-compliant alias
@@ -16283,7 +16615,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hungarian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for hungarian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hungarian.ldf}[polyglossia: module for Hungarian]
\PolyglossiaSetup{hungarian}{
bcp47=hu,
@@ -16340,8 +16674,14 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\xpg@info{Option: Hungarian, swapstrings=\xpg@val}%
}{\xpg@warning{Unknown Hungarian swapstrings value `#1'}}
+% Force punctuation: 1) after section type counters; 2) after @chapapp in the running head
+\define@boolkey{hungarian}[hungarian@]{forceheadingpunctuation}[true]{}
+
% Register default options
-\xpg@initialize@gloss@options{hungarian}{swapstrings=all}
+% forceheadinpunctuatin is recommended, but the default value is false for compatibility reasons
+\xpg@initialize@gloss@options{hungarian}{swapstrings=all,
+ forceheadingpunctuation=false}
+
\def\hungarian@language{%
\polyglossia@setup@language@patterns{hungarian}%
@@ -16418,9 +16758,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\if@hungarian@swapheadings
% With titlesec
\ifcsdef{titleformat}{%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}%
+ \ifcsdef{NR@part}{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\thepart.\nobreakspace\partname}%
{}%
@@ -16462,9 +16802,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{}%
{\xpg@warning{Failed to patch chapter for Hungarian}}%
}{}%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}{\printpartname \partnamenum \printpartnum}%
+ \ifcsdef{NR@part}{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}{\printpartname \partnamenum \printpartnum}%
{\printpartnum.\partnamenum\printpartname}%
{}%
{\xpg@warning{Failed to patch part for Hungarian}}%
@@ -16487,13 +16827,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{}%
{\xpg@warning{Failed to patch chapter for Hungarian}}%
}{}%
- \ifcsdef{H@old@part}{% Hyperref
- \let\xpg@save@part@format\H@old@part%
- \patchcmd{\H@old@part}%
+ \ifcsdef{NR@part}{% Hyperref (nameref)
+ \let\xpg@save@part@format\NR@part%
+ \patchcmd{\NR@part}%
{\partname\nobreakspace\thepart}%
{\thepart.\nobreakspace\partname}%
{}%
- {\xpg@warning{Failed to patch part for Hungarian}}%
+ {\xpg@warning{Failed to patch part for Hungarian}}%
}{% not hyperref
\ifcsdef{@part}{%
\let\xpg@save@part@format\@part%
@@ -16515,7 +16855,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% With KOMA
\let\xpg@save@chaptermark@format\chaptermarkformat%
\renewcommand*\chaptermarkformat{%
- \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\enskip}{}}
+ \thechapter\autodot\ \IfChapterUsesPrefixLine{\chapapp\@hungarian@forced@dot\enskip}{}}
}{% (not \ifdefined\chapterformat)
\ifcsdef{@memptsize}{%
% With memoir
@@ -16524,7 +16864,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\markboth{\memUChead{%
\ifnum \c@secnumdepth >\m@ne
\ifbool{@mainmatter}{%
- \thechapter.\ \@chapapp\ %
+ \thechapter.\ \@chapapp\@hungarian@forced@dot\ %
}{}%
\fi
##1}}{}}%
@@ -16536,7 +16876,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
{\let\xpg@save@chaptermark@format\chaptermark%
\patchcmd{\chaptermark}%
{\@chapapp\ \thechapter.}%
- {\thechapter.\ \@chapapp}%
+ {\thechapter.\ \@chapapp\@hungarian@forced@dot}%
{}%
{\xpg@warning{Failed to patch chaptermark for Hungarian}}}%
{}%
@@ -16556,8 +16896,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
\ifcsdef{titleformat}{%
% With titlesec
\ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
+ \ifcsdef{NR@part}{%
+ \let\NR@part\xpg@save@part@format%
}{%
\let\@part\xpg@save@part@format%
}%
@@ -16579,8 +16919,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}{%
% With memoir and standard classes
\ifcsdef{xpg@save@part@format}{%
- \ifcsdef{H@old@part}{%
- \let\H@old@part\xpg@save@part@format%
+ \ifcsdef{NR@part}{%
+ \let\NR@part\xpg@save@part@format%
}{%
\let\@part\xpg@save@part@format%
}%
@@ -16606,16 +16946,62 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
}{}% (end \ifdefined\chaptermark)
}% (end \ifdefined\chapterformat)
}
-
+% Hungarian needs 1) trailing dots in chapter headings; 2) trailing dot in section, subsection, etc, counters
+\def\@hungarian@forced@dot{}
+\def\xpg@save@autodot{}
+\ifdef{\KOMAScript}{%
+ \providecommand*\autodot{}%
+ \let\xpg@save@autodot\autodot%
+}{}
+% The following is based on some ideas from gloss-russian.ldf
+\def\hungarian@sectsformat{%
+ \ifhungarian@forceheadingpunctuation%
+ \ifdef{\KOMAScript}{%
+ \renewcommand*\autodot{.}%
+ }{%
+ \def\@seccntformat##1{\csname pre##1\endcsname%
+ \csname the##1\endcsname%
+ \csname post##1\endcsname}%
+ \def\@aftersepkern{\hspace{0.5em}}%
+ \def\postchapter{.\@aftersepkern}%
+ \def\postsection{.\@aftersepkern}%
+ \def\postsubsection{.\@aftersepkern}%
+ \def\postsubsubsection{.\@aftersepkern}%
+ \def\postparagraph{.\@aftersepkern}%
+ \def\postsubparagraph{.\@aftersepkern}%
+ \def\prechapter{}%
+ \def\presection{}%
+ \def\presubsection{}%
+ \def\presubsubsection{}%
+ \def\preparagraph{}%
+ \def\presubparagraph{}%
+ }%
+ \def\@hungarian@forced@dot{.}
+ \fi%
+}
+%
+\def\nohungarian@sectsformat{%
+ \ifhungarian@forceheadingpunctuation%
+ \ifdef{\KOMAScript}{%
+ \let\autodot\xpg@save@autodot%
+ }{%
+ \def\@seccntformat##1{\csname the##1\endcsname\quad}% = LaTeX kernel
+ }%
+ \fi%
+ \def\@hungarian@forced@dot{}
+}
+%
\def\blockextras@hungarian{%
\hungarian@capsformat%
+ \hungarian@sectsformat%
}
-
+%
\def\noextras@hungarian{%
\nohungarian@capsformat%
+ \nohungarian@sectsformat%
\let\ontoday\@undefined%
}
-
+%
% \end{macrocode}
% \iffalse
%</gloss-hungarian.ldf>
@@ -16625,7 +17011,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-hy.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (armenian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-hy.ldf}[polyglossia: module for hy (Armenian)]
% We provide this as a bcp47-compliant alias
@@ -16640,7 +17028,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ia.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (interlingua)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ia.ldf}[polyglossia: module for ia (Interlingua)]
% We provide this as a bcp47-compliant alias
@@ -16655,7 +17045,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-icelandic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-icelandic.ldf}[polyglossia: module for icelandic]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-icelandic.ldf}[polyglossia: module for Icelandic]
\PolyglossiaSetup{icelandic}{
bcp47=is,
hyphennames={icelandic},
@@ -16709,7 +17101,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-id.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (malay)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-id.ldf}[polyglossia: module for id (Malay)]
% We provide this as a bcp47-compliant alias
@@ -16724,7 +17118,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-interlingua.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-interlingua.ldf}[polyglossia: module for interlingua]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-interlingua.ldf}[polyglossia: module for Interlingua]
\PolyglossiaSetup{interlingua}{
bcp47=ia,
hyphennames={interlingua},
@@ -16778,7 +17174,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-irish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-irish.ldf}[polyglossia: module for irish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-irish.ldf}[polyglossia: module for Irish]
% We only provide this gloss for babel compatibility. Since irish is
% a gaelic variety, we use 'gaelic' with variant 'irish' now.
@@ -16794,7 +17192,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-is.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (icelandic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-is.ldf}[polyglossia: module for is (Icelandic)]
% We provide this as a bcp47-compliant alias
@@ -16809,7 +17209,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-it.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (italian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-it.ldf}[polyglossia: module for it (Italian)]
% We provide this as a bcp47-compliant alias
@@ -16825,7 +17227,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-italian.ldf}
% \begin{macrocode}
% !TEX encoding = UTF-8 Unicode
-\ProvidesFile{gloss-italian.ldf}[polyglossia: module for italian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-italian.ldf}[polyglossia: module for Italian]
\PolyglossiaSetup{italian}{
bcp47=it,
hyphennames={italian},
@@ -16972,7 +17376,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ja.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (japanese)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ja.ldf}[polyglossia: module for ja (Japanese)]
% We provide this as a bcp47-compliant alias
@@ -16987,7 +17393,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-japanese.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for japanese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-japanese.ldf}[polyglossia: module for Japanese]
\PolyglossiaSetup{japanese}{
bcp47=ja,
@@ -17220,7 +17628,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ka.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (georgian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ka.ldf}[polyglossia: module for ka (Georgian)]
% We provide this as a bcp47-compliant alias
@@ -17236,6 +17646,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-kannada.ldf}
% \begin{macrocode}
%% gloss-kannada.ldf
+%% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%%
%% Copyright 2011 Aravinda VK <hallimanearavind AT gmail.com>,
%% Shankar Prasad <prasad.mvs AT gmail.com>,
%% Team Sanchaya <dev AT lists.sanchaya.net>
@@ -17253,7 +17665,7 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% The Current Maintainer of this work is Aravinda VK <hallimanearavind AT gmail.com>.
%
% This work consists of the file gloss-kannada.ldf
-\ProvidesFile{gloss-kannada.ldf}[polyglossia: module for kannada]
+\ProvidesFile{gloss-kannada.ldf}[polyglossia: module for Kannada]
\PolyglossiaSetup{kannada}{
bcp47=kn,
@@ -17354,6 +17766,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-khmer.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
\ProvidesFile{gloss-khmer.ldf}[polyglossia: module for Khmer]
\PolyglossiaSetup{khmer}{
bcp47=km,
@@ -17521,7 +17935,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-km.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (khmer)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-km.ldf}[polyglossia: module for km (Khmer)]
% We provide this as a bcp47-compliant alias
@@ -17536,7 +17952,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr-Arab.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-kmr-Arab.ldf}[polyglossia: module for kmr-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -17551,7 +17969,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr-Latn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-kmr-Latn.ldf}[polyglossia: module for kmr-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -17566,7 +17986,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kmr.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-kmr.ldf}[polyglossia: module for kmr (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -17581,7 +18003,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (kannada)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-kn.ldf}[polyglossia: module for kn (Kannada)]
% We provide this as a bcp47-compliant alias
@@ -17596,7 +18020,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ko.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (korean)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ko.ldf}[polyglossia: module for ko (Korean)]
% We provide this as a bcp47-compliant alias
@@ -17611,6 +18037,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-korean.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
\ProvidesFile{gloss-korean.ldf}[polyglossia: module for Korean]
\PolyglossiaSetup{korean}{
@@ -18087,7 +18515,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku-Arab.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ku-Arab.ldf}[polyglossia: module for ku-Arab (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -18102,7 +18532,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku-Latn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ku-Latn.ldf}[polyglossia: module for ku-Latn (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -18117,7 +18549,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ku.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (kurdish)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ku.ldf}[polyglossia: module for ku (Kurdish)]
% We provide this as a bcp47-compliant alias
@@ -18132,6 +18566,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kurdish.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% Created on September 1, 2019
% Last updated on May 17, 2020
% Sina Ahmadi (ahmadi.sina@outlook.com)
@@ -18536,7 +18972,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-kurmanji.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for kurmanji kurdish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-kurmanji.ldf}[polyglossia: module for Kurmanji Kurdish]
% We provide this gloss for babel compatibility.
@@ -18551,7 +18989,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-classic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (latin)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-la-xclassic.ldf}[polyglossia: module for la-xclassic (Latin)]
% We provide this as a bcp47-compliant alias
@@ -18566,7 +19006,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-ecclesia.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (latin)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-la-xecclesiastic.ldf}[polyglossia: module for la-xecclesiastic (Latin)]
% We provide this as a bcp47-compliant alias
@@ -18581,7 +19023,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la-x-medieval.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (latin)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-la-xmedieval.ldf}[polyglossia: module for la-xmedieval (Latin)]
% We provide this as a bcp47-compliant alias
@@ -18596,7 +19040,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-la.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (latin)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-la.ldf}[polyglossia: module for la (Latin)]
% We provide this as a bcp47-compliant alias
@@ -18611,6 +19057,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lao.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
\ProvidesFile{gloss-lao.ldf}[polyglossia: module for Lao]
\PolyglossiaSetup{lao}{
@@ -18718,7 +19166,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latin.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin v.2.5 2022-06-21]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-latin.ldf}[polyglossia: module for Latin]
\ExplSyntaxOn
@@ -19824,7 +20274,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latinclassic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic latin]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-latinclassic.ldf}[polyglossia: module for classic Latin]
% We provide this as a babel alias
@@ -19839,7 +20291,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latinecclesiastic.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic latin]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-latinecclesiastic.ldf}[polyglossia: module for ecclesiastic Latin]
% We provide this as a babel alias
@@ -19854,7 +20308,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latinmedieval.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval latin]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-latinmedieval.ldf}[polyglossia: module for medieval Latin]
% We provide this as a babel alias
@@ -19869,7 +20325,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-latvian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for latvian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-latvian.ldf}[polyglossia: module for Latvian]
\PolyglossiaSetup{latvian}{
bcp47=lv,
hyphennames={latvian},
@@ -19922,9 +20380,11 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lithuanian.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% Translated by Paulius Sladkevičius <komsas@gmail.com>
-\ProvidesFile{gloss-lithuanian.ldf}[polyglossia: module for lithuanian]
+\ProvidesFile{gloss-lithuanian.ldf}[polyglossia: module for Lithuanian]
\PolyglossiaSetup{lithuanian}{
bcp47=lt,
hyphennames={lithuanian},
@@ -19999,7 +20459,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lo.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (lao)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-lo.ldf}[polyglossia: module for lo (Lao)]
% We provide this as a bcp47-compliant alias
@@ -20014,7 +20476,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lowersorbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for lower sorbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-lowersorbian.ldf}[polyglossia: module for Lower Sorbian]
% We provide this as a babel alias
@@ -20029,7 +20493,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lsorbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for lower sorbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-lsorbian.ldf}[polyglossia: module for Lower Sorbian]
% We only provide this gloss for babel compatibility. Since lsorbian is
% a sorbian variety, we use 'sorbian' with variant 'lower' now.
@@ -20045,7 +20511,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lt.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (lithuanian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-lt.ldf}[polyglossia: module for lt (Lithuanian)]
% We provide this as a bcp47-compliant alias
@@ -20060,7 +20528,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-lv.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (latvian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-lv.ldf}[polyglossia: module for lv (Latvian)]
% We provide this as a bcp47-compliant alias
@@ -20075,7 +20545,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-macedonian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-macedonian.ldf}[polyglossia: module for macedonian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-macedonian.ldf}[polyglossia: module for Macedonian]
\PolyglossiaSetup{macedonian}{
bcp47=mk,
script=Cyrillic,
@@ -20170,7 +20642,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-magyar.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for magyar]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-magyar.ldf}[polyglossia: module for Hungarian (Magyar)]
% We only provide this gloss for babel compatibility.
@@ -20185,7 +20659,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-malay.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-malay.ldf}[polyglossia: module for malay]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-malay.ldf}[polyglossia: module for Malay]
\RequirePackage{hijrical}
@@ -20380,7 +20856,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-malayalam.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-malayalam.ldf}[polyglossia: module for malayalam]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-malayalam.ldf}[polyglossia: module for Malayalam]
% Translations provided by Kevin & Siji, 01-11-2009
@@ -20446,11 +20924,13 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-marathi.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
% Translations provided by Abhijit Navale <abhi_navale@live.in>
% Ordinals (1-100) added by Niranjan Tambe <niranjanvikastambe@gmail.com> on 14th December, 2019
% TODO implement Hindu calendar (not used in day-to-day practice)
-\ProvidesFile{gloss-marathi.ldf}[polyglossia: module for marathi]
+\ProvidesFile{gloss-marathi.ldf}[polyglossia: module for Marathi]
\RequirePackage{devanagaridigits}
@@ -20590,7 +21070,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mk.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (macedonian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-mk.ldf}[polyglossia: module for mk (Macedonian)]
% We provide this as a bcp47-compliant alias
@@ -20605,7 +21087,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ml.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (malayalam)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ml.ldf}[polyglossia: module for ml (Malayalam)]
% We provide this as a bcp47-compliant alias
@@ -20620,7 +21104,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mn.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (mongolian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-mn.ldf}[polyglossia: module for mn (Mongolian)]
% We provide this as a bcp47-compliant alias
@@ -20635,7 +21121,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mongolian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for mongolian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-mongolian.ldf}[polyglossia: module for Mongolian]
\RequirePackage{xpg-cyrillicnumbers}
@@ -20870,7 +21358,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-mr.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (marathi)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-mr.ldf}[polyglossia: module for mr (Marathi)]
% We provide this as a bcp47-compliant alias
@@ -20885,7 +21375,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-naustrian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for austrian german (current spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-naustrian.ldf}[polyglossia: module for Austrian German (current spelling)]
% We provide this as a babel alias
@@ -20900,7 +21392,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nb.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (norwegian)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-nb.ldf}[polyglossia: module for nb (Norwegian)]
% We provide this as a bcp47-compliant alias
@@ -20915,7 +21409,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-newzealand.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for newzealand english]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-newzealand.ldf}[polyglossia: module for Newzealand English]
% We provide this as a babel alias
@@ -20930,7 +21426,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ngerman.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for german (current spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ngerman.ldf}[polyglossia: module for German (current spelling)]
% We provide this as a babel alias
@@ -20945,7 +21443,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nko.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-nko.ldf}[Polyglossia: module for N’Ko v0.1 2013/05/19]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-nko.ldf}[Polyglossia: module for N’Ko]
\PolyglossiaSetup{nko}{%
bcp47=nko,
script=N'ko,
@@ -21039,7 +21539,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-norsk.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for norwegian (bokmal)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-norsk.ldf}[polyglossia: module for Norwegian (Bokmal)]
% We only provide this gloss for babel compatibility. Since norsk is
% actually norwegian bokmal, we use 'norwegian' with variant 'bokmal' now.
@@ -21055,7 +21557,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-norwegian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for norwegian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-norwegian.ldf}[polyglossia: module for Norwegian]
\PolyglossiaSetup{norwegian}{
bcp47=nn,
hyphennames={nynorsk},
@@ -21178,7 +21682,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nswissgerman.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for swiss german (current spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-nswissgerman.ldf}[polyglossia: module for Swiss German (current spelling)]
% We provide this as a babel alias
@@ -21193,7 +21699,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-nynorsk.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for norwegian (Nynorsk)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-nynorsk.ldf}[polyglossia: module for Norwegian (Nynorsk)]
% We only provide this gloss for babel compatibility. Since nynorsk is
% a norwegian variety, we use 'norwegian' with variant 'nynorsk' now.
@@ -21209,6 +21717,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-occitan.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
%%
%% This is file `gloss-occitan.ldf',
%% generated with the docstrip utility.
@@ -21226,8 +21736,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%% Created by Cédric Valmary: cvalmary at yahoo dot fr
%% of Tot en òc <http://www.totenoc.eu/>
%%
-\ProvidesFile{gloss-occitan.ldf}[2016/02/04 v0.3 polyglossia:
- module for Occitan]
+\ProvidesFile{gloss-occitan.ldf}[polyglossia: module for Occitan]
+
\PolyglossiaSetup{occitan}{
bcp47=oc,
hyphennames={occitan},
@@ -21384,7 +21894,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-persian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-persian.ldf}[polyglossia: module for persian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-persian.ldf}[polyglossia: module for Persian]
\RequireBidi
\RequirePackage{arabicnumbers}
@@ -21532,7 +22044,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
% \subsection{gloss-piedmontese.ldf}
% \begin{macrocode}
% !TEX encoding = UTF-8 Unicode
-\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for piedmontese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-piedmontese.ldf}[2013/02/12 v1.0 polyglossia: module for Piedmontese]
\makeatletter
\PolyglossiaSetup{piedmontese}{
bcp47=pms,
@@ -21658,7 +22172,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-polish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-polish.ldf}[polyglossia: module for polish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-polish.ldf}[polyglossia: module for Polish]
\PolyglossiaSetup{polish}{
bcp47=pl,
@@ -21912,7 +22428,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-polutonikogreek.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic greek]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-polutonikogreek.ldf}[polyglossia: module for polytonic Greek]
% We provide this as a babel alias
@@ -21927,7 +22445,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-portuges.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for portuguese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-portuges.ldf}[polyglossia: module for Portuguese]
% We only provide this gloss for backwards compatibility. The name
% 'portuges' was selected in accordance with babel (which probably
@@ -21945,7 +22465,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-portuguese.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for portuguese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-portuguese.ldf}[polyglossia: module for Portuguese]
\PolyglossiaSetup{portuguese}{
bcp47=pt-PT,
@@ -22170,7 +22692,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-romanian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-romanian.ldf}[polyglossia: module for romanian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-romanian.ldf}[polyglossia: module for Romanian]
\PolyglossiaSetup{romanian}{
bcp47=ro,
@@ -22225,7 +22749,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-romansh.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-romansh.ldf}[polyglossia: module for romansh]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-romansh.ldf}[polyglossia: module for Romansh]
\makeatletter
\PolyglossiaSetup{romansh}{%
bcp47=rm,
@@ -22279,7 +22805,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-russian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-russian.ldf}[polyglossia: module for russian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-russian.ldf}[polyglossia: module for Russian]
\RequirePackage{xpg-cyrillicnumbers}
@@ -22669,7 +23197,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sami.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-sami.ldf}[polyglossia: module for sami]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-sami.ldf}[polyglossia: module for Sami]
\PolyglossiaSetup{sami}{
bcp47=se,
@@ -22769,7 +23299,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-samin.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-samin.ldf}[polyglossia: module for samin]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-samin.ldf}[polyglossia: module for Northern Sami]
% We only provide this gloss for babel compatibility. Since samin is
% a sami variety, we use 'sami' with variant 'northern' now.
@@ -22785,7 +23317,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sanskrit.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for sanskrit]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-sanskrit.ldf}[polyglossia: module for Sanskrit]
\RequirePackage{devanagaridigits}
@@ -22937,7 +23471,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-scottish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for scottish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-scottish.ldf}[polyglossia: module for Scottish Gaelic]
% We only provide this gloss for babel compatibility. Since scottish is
% a gaelic variety, we use 'gaelic' with variant 'scottish' now.
@@ -22953,7 +23489,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-serbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for serbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-serbian.ldf}[polyglossia: module for Serbian]
%TODO split into gloss-serbiancyr.ldf and gloss-serbianlat.ldf
%% load these automatically from polyglossia.sty according to the script option ??
%% same thing for all languages that have a "script" key !
@@ -23259,7 +23797,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-serbianc.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for serbian (cyrillic)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-serbianc.ldf}[polyglossia: module for Serbian (cyrillic)]
% We provide this as a babel alias
@@ -23274,7 +23814,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovak.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for slovak]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-slovak.ldf}[polyglossia: module for Slovak]
\PolyglossiaSetup{slovak}{
bcp47=sk,
@@ -23536,7 +24078,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovene.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for slovenian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-slovene.ldf}[polyglossia: module for Slovenian]
% We provide this as a babel alias
@@ -23551,7 +24095,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-slovenian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for slovenian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-slovenian.ldf}[polyglossia: module for Slovenian]
\PolyglossiaSetup{slovenian}{
bcp47=sl,
@@ -23639,7 +24185,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-sorbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for sorbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-sorbian.ldf}[polyglossia: module for Sorbian]
\PolyglossiaSetup{sorbian}{
bcp47=hsb,
@@ -23826,7 +24374,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-spanish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for spanish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-spanish.ldf}[polyglossia: module for Spanish]
\PolyglossiaSetup{spanish}{
bcp47=es-ES,
@@ -24061,7 +24611,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-spanishmx.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for mexican spanish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-spanishmx.ldf}[polyglossia: module for Mexican Spanish]
% We provide this as a babel alias
@@ -24076,7 +24628,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-swedish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-swedish.ldf}[polyglossia: module for swedish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-swedish.ldf}[polyglossia: module for Swedish]
\PolyglossiaSetup{swedish}{
bcp47=sv,
@@ -24137,7 +24691,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-swissgerman.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for swiss german (old spelling)]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-swissgerman.ldf}[polyglossia: module for Swiss German (old spelling)]
% We provide this as a babel alias
@@ -24152,7 +24708,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-syriac.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for syriac]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-syriac.ldf}[polyglossia: module for Syriac]
\RequireBidi
\RequirePackage{arabicnumbers}
@@ -24336,7 +24894,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-tamil.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-tamil.ldf}[polyglossia: module for tamil]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-tamil.ldf}[polyglossia: module for Tamil]
% Translations provided by Kevin & Siji, 01-11-2009
@@ -24402,7 +24962,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-telugu.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-telugu.ldf}[polyglossia: module for telugu]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-telugu.ldf}[polyglossia: module for Telugu]
% Translations provided by Anmol Sharma <unmole.in@gmail.com>
@@ -24471,7 +25033,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-thai.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-thai.ldf}[polyglossia: module for thai]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-thai.ldf}[polyglossia: module for Thai]
%% This is partly based on thai-latex for Babel:
%%%% Copyright (C) 1999 - 2006
%%%% by Surapant Meknavin,
@@ -24620,7 +25184,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-tibetan.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for tibetan]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-tibetan.ldf}[polyglossia: module for Tibetan]
%% Copyright 2013 Elie Roux
%% Under the CC0 license <http://creativecommons.org/publicdomain/zero/1.0/>
%%
@@ -24839,7 +25405,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-turkish.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-turkish.ldf}[polyglossia: module for turkish]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-turkish.ldf}[polyglossia: module for Turkish]
\RequirePackage{hijrical}
\PolyglossiaSetup{turkish}{
bcp47=tr,
@@ -24953,7 +25521,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-turkmen.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-turkmen.ldf}[polyglossia: module for turkmen]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-turkmen.ldf}[polyglossia: module for Turkmen]
%% Translations provided by Nazar Annagurban <nazartm at gmail dot com>
\PolyglossiaSetup{turkmen}{
bcp47=tk,
@@ -25007,6 +25577,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ug.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
\ProvidesFile{gloss-ug.ldf}[polyglossia: module for ug (Uyghur)]
% BCP 47 tag for Uyghur
@@ -25021,7 +25593,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-ukrainian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for ukrainian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-ukrainian.ldf}[polyglossia: module for Ukrainian]
% Strings taken from Babel
% and revised by Roman Kyrylych
@@ -25312,7 +25886,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-uppersorbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for upper sorbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-uppersorbian.ldf}[polyglossia: module for Upper Sorbian]
% We provide this as a babel alias
@@ -25327,6 +25903,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-urdu.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
%%% Adapted from a file contributed by Kamal Abdali
\ProvidesFile{gloss-urdu.ldf}[polyglossia: module for Urdu]
@@ -25481,7 +26059,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-usorbian.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for upper sorbian]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-usorbian.ldf}[polyglossia: module for Upper Sorbian]
% We only provide this gloss for babel compatibility. Since usorbian is
% a sorbian variety, we use 'sorbian' with variant 'upper' now.
@@ -25497,6 +26077,8 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-uyghur.ldf}
% \begin{macrocode}
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
\ProvidesFile{gloss-uyghur.ldf}[polyglossia: module for Uyghur]
%% Translations provided by Osman Tursun (Github Account: neouyghur)
@@ -25934,7 +26516,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-vietnamese.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for vietnamese]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-vietnamese.ldf}[polyglossia: module for Vietnamese]
%% Strings contributed by Daniel Owens < dhowens . pmbx . net >
\PolyglossiaSetup{vietnamese}{
@@ -25989,7 +26573,9 @@ polyglossia.newloader_loaded_languages = newloader_loaded_languages
%
% \subsection{gloss-welsh.ldf}
% \begin{macrocode}
-\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for welsh]
+% Language definition file (part of polyglossia v1.58 -- 2022/10/26)
+%
+\ProvidesFile{gloss-welsh.ldf}[polyglossia: module for Welsh]
\PolyglossiaSetup{welsh}{
bcp47=cy,
@@ -26210,6 +26796,11 @@ U+0039 <> U+0E59 ;
%
% \subsection{polyglossia-french.lua}
% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
local function set_left_space(lang, char, kern, rubber)
@@ -26274,6 +26865,7 @@ polyglossia.deactivate_french_punct = deactivate_french_punct
% \begin{macrocode}
--
-- polyglossia-korean.lua
+-- part of polyglossia v1.58 -- 2022/10/26
--
local glyph_id = node.id"glyph"
@@ -26889,6 +27481,11 @@ prepend_to_callback ("hpack_filter",
%
% \subsection{polyglossia-latin.lua}
% \begin{macrocode}
+--
+-- polyglossia-latin.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
-- For ecclesiastic Latin (and sometimes for Italian) a very small space is
@@ -26939,6 +27536,11 @@ polyglossia.deactivate_latin_punct = deactivate_latin_punct
%
% \subsection{polyglossia-punct.lua}
% \begin{macrocode}
+--
+-- polyglossia-punct.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
@@ -27302,6 +27904,11 @@ polyglossia.clear_spaced_characters = clear_spaced_characters
%
% \subsection{polyglossia-sanskrit.lua}
% \begin{macrocode}
+--
+-- polyglossia-sanskrit.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia-punct')
-- How do we now, in Lua, what a \thinspace is? In the LaTeX source (latex.ltx)
@@ -27347,6 +27954,11 @@ polyglossia.deactivate_sanskrit_punct = deactivate_sanskrit_punct
%
% \subsection{polyglossia-tibt.lua}
% \begin{macrocode}
+--
+-- polyglossia-tibt.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
+
require('polyglossia') -- just in case...
local add_to_callback = luatexbase.add_to_callback
@@ -27445,6 +28057,10 @@ polyglossia.desactivate_tibt_eol = desactivate
%
% \subsection{polyglossia.lua}
% \begin{macrocode}
+--
+-- polyglossia.lua
+-- part of polyglossia v1.58 -- 2022/10/26
+--
local module_name = "polyglossia"
local polyglossia_module = {
diff --git a/macros/unicodetex/latex/polyglossia/polyglossia.pdf b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
index c9d8dbbc9b..7aa9a9dd17 100644
--- a/macros/unicodetex/latex/polyglossia/polyglossia.pdf
+++ b/macros/unicodetex/latex/polyglossia/polyglossia.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index c9fb24a9d0..dddf63f672 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,9 @@
+2022-10-26 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (subfiles.4ht): fixed handling of environments
+ inside TeX files included using \subfile.
+ https://github.com/michal-h21/make4ht/issues/84
+
2022-10-25 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (fontmath.4ht, plain.4ht),
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index e70774e203..d7c9840d4a 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1223 2022-10-25 20:53:26Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1224 2022-10-26 14:03:21Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -4977,31 +4977,34 @@ as it leads to a fatal error.
\endinput
>>> \AddFile{9}{subfiles}
-We use the original version of \Verb|\subfiles@renewEndDocument|, the only
-change is that we added the \Verb|\choose:begin| redefinition. It is necessary
-to prevent processing of the document after \Verb|\end{document}| in the
-included subfile.
+The Subfiles package redefines handling of LaTeX environments.
+Because the included TeX files contain \Verb|\end{document}|,
+it causes immediate stop of the main file processing.
+
+We must test for environment names in the included document,
+and set \Verb|\choose:begin| to grab the second argument,
+which will prevent the stop of the processing.
+
\<subfiles enddocument\><<<
+\def\subfiles:end{%
+ \def\:temp{document}
+ \ifx\@currenvir\:temp
+ \let\choose:begin\@secondoftwo%
+ \subfiles@restoreEndFrom\:gobble
+ \fi%
+}
+
\def\:tempa#1{%
\ifcsname subfiles@end\endcsname
- \else
- \subfiles@saveEndTo\subfiles@end
- \fi
- \let\choose:begin\@secondoftwo
- \expandafter\def\csname end \endcsname##1{%
- \romannumeral
- \subfiles@StrIfEqTF{##1}{document}{%
- \z@
- \subfiles@restoreEndFrom\subfiles@end
- #1%
- }{%
- \expandafter\expandafter\expandafter\z@\subfiles@end{##1}%
- }%
- }%
+\else
+ \subfiles@saveEndTo\subfiles@end
+\fi
+\pend:defI\end\subfiles:end
}
\HLet\subfiles@renewEndDocument\:tempa
+
>>>
\Section{url.sty}
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 48e0fb84e4..070032a2ad 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1666729006
+date=1666815408
lastupd=miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-x64-2.9 miktex-cjkutils-bin-x64-2.9 miktex-console-bin-x64-2.9 miktex-curl-bin-x64-2.9 miktex-cweb-bin-x64-2.9 miktex-devnag-bin-x64-2.9 miktex-doc miktex-dvicopy-bin-x64-2.9 miktex-dvipdfmx-bin-x64-2.9 miktex-dvipng-bin-x64-2.9 miktex-dvips-bin-x64-2.9
-lstdigest=7c7c13f9bf4cb85242aceeef82434a6a
+lstdigest=6e8011b081a21655bed0aa9be6d0f381
numpkg=6103
relstate=next
-version=8333
+version=8334
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: lznKdRDPxa+sGXRDYPYyyfcRZH8/WZaJ7UMwRwzQplO2RwCOk3T6ooQEOcM9S++2eaf9Kmm0S59QZUd6cNlutx4A36B4s97MvkFn25pX5TItPrA4GMUsINaDRSOaOYOVMi2vNmTXmREyTX5f0/PtLkboLBPjLU3F8ri5p9+vctt/EIh2ioH/ERcTFZxOyDRf0wS19xKi33diBc6+awG8Nazx2wqzLWFWGnytgLmtx/2q2GZ7NVLe6xr24PovxJaIyHMGuRlc97X0o1M0SIkmPybNzeCImQviQgqMVkvkOJ5G4+b/IOmlR0xEu1eFYwRTAIQvnKC3EIhQ1073QdafSw==
+;;;; signature/miktex: C5ibXXu9+BsVJfm3bgyPzUU1fBLrPqYwBC3cy0iUxEO/+2kwk5kPkNwKPooct1d/wOgV24WKsUKM9vrDoIpm891KsqCe6usJLyO0NKNdN3vYNrbNu0A6kH/6En1IlI0kKz1r568xZvBvy4fALy9p0ZhbaQMyu8uXjf3ByDXuQZ8FqUpPPsu4MBHO8pGPJ1GiJVHlZ/0BBgag0ArjJP0dhcJfZjmjOkliiuEERSA7Gcd0zqXqQaP/Jn1SGpIXMSDWul+dcQk3kF0NLLkqPCs84hT88KJwZ8h0XHpc/sw4xLDUORLVEkSKL1sWkcfjmR9/d1YxEylv+vGJGJxezm/apQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index ddae375d77..b7cb98d188 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1666728706
+date=1666815104
lastupd=pgf-periodictable pgf-periodictable__doc pgf-periodictable__source urw-base35 urw-base35__doc urw-base35__source miktex-runtime-bin-x64-2.9 standalone was was__doc was__source xcharter-math xcharter-math__doc xcharter-math__source abntexto abntexto__doc abntexto__source algpseudocodex algpseudocodex__doc algpseudocodex__source
-lstdigest=f81fc67882bccf17f6e08f3b598a67de
+lstdigest=5c91f3cc248a59008b032298d2e20515
numpkg=6103
relstate=stable
-version=8333
+version=8334
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: hRcHFrj75oh2+R8f6ws6VdoqxxEX3NvV4jKeQdMTTR0QgoJsTh+S4rROuLsWGRAJnqOfuLy912PPUweC0bmyeCrEZt0yTdlmgo7kQCBVMRA9bP4Rc0JctmiDrOzJk8/xEwhHTxs7ZwFqEx/PCn9ZpJOuIEMHES9kk5wAG8dVEXUdJx+AaC0p66wkFS8hNZ9Py4q0hbQWeZiBa9t1GdcZXCW1yELxt9s7/LkE2Wh0Lx+Rck4x9o5ugR5InrihTLm+Ked/g7wWZevFefVJxwoD+YDSuSt5zIpcR5CR2rQGqucFaWJyNpHsbXUEgMfwEO8JyR4gWsN9c3uIPZHJ21TM2w==
+;;;; signature/miktex: FjI32tqNrRg4dnKfNruskvW5pRxPm6lbY4HBkuKJECffI6VDHoe9Pm5oYZZW65ZhPw22D914o4jmLOgD6K+7vtn+k6S2Sbvdcw5CG5SCqkbGu04w0Jy4g3kmPRMJgqsU26Bbd8SSt3U2Zh58XbnYMu0/+Rc+Dmvm5JZe5YVBA8JkqVhYUUZ+/0JQqWYm87xp2UNpPpQbO4eHikKxcNZDzLIzGEKSIGVG0jm+EdzZCGX1nh6N+TWkxdoiBsO0OGf2TDhUCgcHimNOj2spbWGO2YlV0SrOYep6iUN/FRcytMpWolq6CPy+hT3g3b4PxvcmL9XWfIGk1mha18iYzHOpTQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 61d66d7712..176a593c94 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-10-26-02-02
+2022-10-27-02-02