summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FILES.byname569
-rw-r--r--FILES.byname.gzbin2423195 -> 2423196 bytes
-rw-r--r--FILES.last07days584
-rw-r--r--fonts/cochineal/README13
-rw-r--r--fonts/cochineal/afm/Cochineal-Bold.afm6
-rw-r--r--fonts/cochineal/afm/Cochineal-BoldItalic.afm6
-rw-r--r--fonts/cochineal/afm/Cochineal-Italic.afm6
-rw-r--r--fonts/cochineal/afm/Cochineal-Roman.afm6
-rw-r--r--fonts/cochineal/opentype/Cochineal-Bold.otfbin233604 -> 233988 bytes
-rw-r--r--fonts/cochineal/opentype/Cochineal-BoldItalic.otfbin224696 -> 225012 bytes
-rw-r--r--fonts/cochineal/opentype/Cochineal-Italic.otfbin233640 -> 233860 bytes
-rw-r--r--fonts/cochineal/opentype/Cochineal-Roman.otfbin232904 -> 233232 bytes
-rw-r--r--fonts/cochineal/tex/ly1mincochineal.fd112
-rw-r--r--fonts/cochineal/tex/ot1mincochineal.fd112
-rw-r--r--fonts/cochineal/tex/t1mincochineal.fd112
-rw-r--r--fonts/cochineal/type1/Cochineal-Bold.pfbbin280903 -> 363515 bytes
-rw-r--r--fonts/cochineal/type1/Cochineal-BoldItalic.pfbbin291939 -> 342640 bytes
-rw-r--r--fonts/cochineal/type1/Cochineal-Italic.pfbbin278181 -> 365481 bytes
-rw-r--r--fonts/cochineal/type1/Cochineal-Roman.pfbbin275884 -> 386263 bytes
-rw-r--r--graphics/pgf/contrib/tikz-karnaugh/README.txt4
-rw-r--r--graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdfbin402809 -> 402432 bytes
-rw-r--r--graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex12
-rw-r--r--graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex15
-rw-r--r--macros/latex/contrib/babel-contrib/serbian/README.md12
-rw-r--r--macros/latex/contrib/babel-contrib/serbian/serbian.dtx26
-rw-r--r--macros/latex/contrib/babel-contrib/serbian/serbian.ins8
-rw-r--r--macros/latex/contrib/babel-contrib/serbian/serbian.pdfbin255910 -> 273184 bytes
-rw-r--r--macros/latex/contrib/babel-contrib/serbianc/README.md6
-rw-r--r--macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx43
-rw-r--r--macros/latex/contrib/babel-contrib/serbianc/serbianc.ins8
-rw-r--r--macros/latex/contrib/babel-contrib/serbianc/serbianc.pdfbin296954 -> 314360 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin578310 -> 578152 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex8
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.pdfbin499106 -> 502752 bytes
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix-french.tex103
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.dtx534
-rw-r--r--macros/latex/contrib/nicematrix/nicematrix.pdfbin1482850 -> 1489647 bytes
-rw-r--r--macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdfbin7591580 -> 7630568 bytes
-rw-r--r--macros/latex/contrib/profcollege/latex/ProfCollege.sty721
-rw-r--r--macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp200
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdfbin362084 -> 426042 bytes
-rw-r--r--macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex452
-rw-r--r--macros/latex/contrib/proflycee/tex/ProfLycee.sty292
-rw-r--r--macros/latex/contrib/wrapfig2/README.txt5
-rw-r--r--macros/latex/contrib/wrapfig2/commodilla.jpgbin137378 -> 0 bytes
-rw-r--r--macros/latex/contrib/wrapfig2/stele-todi-small.jpgbin0 -> 64157 bytes
-rw-r--r--macros/latex/contrib/wrapfig2/wrapfig2.dtx917
-rw-r--r--macros/latex/contrib/wrapfig2/wrapfig2.pdfbin758679 -> 697282 bytes
-rw-r--r--systems/mac/mactex/ExtrasFolder.pdfbin38199 -> 38202 bytes
-rw-r--r--systems/mac/mactex/Licenses.txt4
-rwxr-xr-xsystems/texlive/tlnet/install-tl24
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl7
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb20
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2349932 -> 2349072 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/cs.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/da.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/de.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/es.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/fr.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/it.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/ja.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/messages.pot8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/nl.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/pl.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/pt_BR.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/sk.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/sl.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/sr.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/uk.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/vi.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/zh_CN.po8
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/zh_TW.po8
-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
79 files changed, 3414 insertions, 1719 deletions
diff --git a/FILES.byname b/FILES.byname
index baae1f2184..9ccba921da 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5210,7 +5210,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/02/15 | 133095 | FILES.last07days
+2022/02/16 | 125872 | 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
@@ -24125,10 +24125,10 @@
1991/10/04 | 715 | fonts/cm/xcmr/xcmr12.mf
2019/10/16 | 7361 | fonts/cochineal/afm/cochBMI.afm
2019/10/14 | 5750 | fonts/cochineal/afm/cochBRM.afm
-2022/01/11 | 3470082 | fonts/cochineal/afm/Cochineal-Bold.afm
-2021/12/14 | 1971222 | fonts/cochineal/afm/Cochineal-BoldItalic.afm
-2021/12/14 | 2274088 | fonts/cochineal/afm/Cochineal-Italic.afm
-2022/01/29 | 3446537 | fonts/cochineal/afm/Cochineal-Roman.afm
+2022/02/16 | 3470203 | fonts/cochineal/afm/Cochineal-Bold.afm
+2022/02/16 | 1971343 | fonts/cochineal/afm/Cochineal-BoldItalic.afm
+2022/02/16 | 2274209 | fonts/cochineal/afm/Cochineal-Italic.afm
+2022/02/16 | 3446658 | fonts/cochineal/afm/Cochineal-Roman.afm
2019/10/15 | 7387 | fonts/cochineal/afm/cochMI.afm
2019/10/14 | 3471 | fonts/cochineal/afm/cochMRM.afm
2021/11/13 | 3446537 | fonts/cochineal/afm/Cochneal-Roman.afm
@@ -24315,11 +24315,11 @@
2022/01/29 | 3722 | fonts/cochineal/enc/coch_zbphsw.enc
2022/01/29 | 3384 | fonts/cochineal/enc/coch_zg5irv.enc
2022/01/29 | 31818 | fonts/cochineal/map/Cochineal.map
-2021/12/14 | 224696 | fonts/cochineal/opentype/Cochineal-BoldItalic.otf
-2022/01/11 | 233604 | fonts/cochineal/opentype/Cochineal-Bold.otf
-2021/12/14 | 233640 | fonts/cochineal/opentype/Cochineal-Italic.otf
-2022/01/29 | 232904 | fonts/cochineal/opentype/Cochineal-Roman.otf
-2022/01/31 | 8902 | fonts/cochineal/README
+2022/02/16 | 225012 | fonts/cochineal/opentype/Cochineal-BoldItalic.otf
+2022/02/16 | 233988 | fonts/cochineal/opentype/Cochineal-Bold.otf
+2022/02/16 | 233860 | fonts/cochineal/opentype/Cochineal-Italic.otf
+2022/02/16 | 233232 | fonts/cochineal/opentype/Cochineal-Roman.otf
+2022/02/16 | 9741 | fonts/cochineal/README
2016/01/31 | 196 | fonts/cochineal/tex/cochineal.fontspec
2022/01/31 | 16679 | fonts/cochineal/tex/cochineal.sty
2016/02/17 | 1195 | fonts/cochineal/tex/LGRCochineal-LF.fd
@@ -24333,6 +24333,7 @@
2016/01/22 | 1215 | fonts/cochineal/tex/LY1Cochineal-Sup.fd
2019/06/22 | 2956 | fonts/cochineal/tex/LY1Cochineal-TLF.fd
2019/06/22 | 3284 | fonts/cochineal/tex/LY1Cochineal-TOsF.fd
+2022/02/05 | 2816 | fonts/cochineal/tex/ly1mincochineal.fd
2016/01/19 | 803 | fonts/cochineal/tex/omlzcochmi.fd
2016/01/22 | 1236 | fonts/cochineal/tex/OT1Cochineal-Dnom.fd
2016/01/22 | 1215 | fonts/cochineal/tex/OT1Cochineal-Inf.fd
@@ -24341,6 +24342,7 @@
2016/01/22 | 1215 | fonts/cochineal/tex/OT1Cochineal-Sup.fd
2019/06/22 | 2956 | fonts/cochineal/tex/OT1Cochineal-TLF.fd
2019/06/22 | 3279 | fonts/cochineal/tex/OT1Cochineal-TOsF.fd
+2022/02/05 | 2816 | fonts/cochineal/tex/ot1mincochineal.fd
2016/02/17 | 1191 | fonts/cochineal/tex/OT2Cochineal-LF.fd
2016/02/17 | 1212 | fonts/cochineal/tex/OT2Cochineal-OsF.fd
2016/02/17 | 1212 | fonts/cochineal/tex/OT2Cochineal-TLF.fd
@@ -24352,6 +24354,7 @@
2016/01/22 | 1199 | fonts/cochineal/tex/T1Cochineal-Sup.fd
2019/06/22 | 2916 | fonts/cochineal/tex/T1Cochineal-TLF.fd
2019/06/22 | 3244 | fonts/cochineal/tex/T1Cochineal-TOsF.fd
+2022/02/05 | 2776 | fonts/cochineal/tex/t1mincochineal.fd
2016/01/27 | 1306 | fonts/cochineal/tex/T2ACochineal-TLF.fd
2018/10/15 | 1182 | fonts/cochineal/tex/TS1Cochineal-LF.fd
2018/10/15 | 1199 | fonts/cochineal/tex/TS1Cochineal-OsF.fd
@@ -24739,10 +24742,10 @@
2022/01/29 | 3260 | fonts/cochineal/tfm/zcochmi.tfm
2019/10/16 | 37065 | fonts/cochineal/type1/cochBMI.pfb
2019/10/14 | 30219 | fonts/cochineal/type1/cochBRM.pfb
-2022/01/29 | 291939 | fonts/cochineal/type1/Cochineal-BoldItalic.pfb
-2022/01/29 | 280903 | fonts/cochineal/type1/Cochineal-Bold.pfb
-2022/01/29 | 278181 | fonts/cochineal/type1/Cochineal-Italic.pfb
-2022/01/29 | 275884 | fonts/cochineal/type1/Cochineal-Roman.pfb
+2022/02/16 | 342640 | fonts/cochineal/type1/Cochineal-BoldItalic.pfb
+2022/02/16 | 363515 | fonts/cochineal/type1/Cochineal-Bold.pfb
+2022/02/16 | 365481 | fonts/cochineal/type1/Cochineal-Italic.pfb
+2022/02/16 | 386263 | fonts/cochineal/type1/Cochineal-Roman.pfb
2019/10/15 | 35962 | fonts/cochineal/type1/cochMI.pfb
2019/10/14 | 16222 | fonts/cochineal/type1/cochMRM.pfb
2022/01/29 | 1660 | fonts/cochineal/vf/Cochineal-Bold-dnom-ly1.vf
@@ -24878,7 +24881,7 @@
2022/01/29 | 2584 | fonts/cochineal/vf/zcochbmi.vf
2022/01/29 | 2180 | fonts/cochineal/vf/zcochmia.vf
2022/01/29 | 2496 | fonts/cochineal/vf/zcochmi.vf
-2022/02/01 | 6604582 | fonts/cochineal.zip
+2022/02/16 | 6924491 | fonts/cochineal.zip
2020/04/13 | 63456 | fonts/coelacanth/doc/coelacanth-samples.pdf
2019/10/10 | 712 | fonts/coelacanth/doc/coelacanth-samples.tex
2019/10/10 | 4433 | fonts/coelacanth/doc/LICENSE.md
@@ -155337,11 +155340,11 @@
2019/11/22 | 12191 | graphics/pgf/contrib/tikz-kalender/tikz-kalender.cls
2019/06/06 | 801 | graphics/pgf/contrib/tikz-kalender/tikz-kalender-translation.clo
2019/11/22 | 124462 | graphics/pgf/contrib/tikz-kalender.zip
-2022/02/08 | 402809 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
-2022/02/08 | 83989 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
-2022/02/08 | 2241 | graphics/pgf/contrib/tikz-karnaugh/README.txt
-2022/02/08 | 38631 | graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
-2022/02/08 | 370341 | graphics/pgf/contrib/tikz-karnaugh.zip
+2022/02/15 | 402432 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
+2022/02/16 | 84024 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
+2022/02/16 | 2247 | graphics/pgf/contrib/tikz-karnaugh/README.txt
+2022/02/16 | 38710 | graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
+2022/02/16 | 370094 | graphics/pgf/contrib/tikz-karnaugh.zip
2018/02/06 | 360083 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.pdf
2018/02/06 | 45483 | graphics/pgf/contrib/tikz-ladder/doc/tikz-ladder-doc.tex
2018/02/06 | 1628 | graphics/pgf/contrib/tikz-ladder/README.txt
@@ -202958,16 +202961,16 @@
2013/05/20 | 4943 | macros/latex/contrib/babel-contrib/scottish/scottish.ins
2013/05/20 | 113507 | macros/latex/contrib/babel-contrib/scottish/scottish.pdf
2014/02/23 | 117242 | macros/latex/contrib/babel-contrib/scottish.zip
-2021/04/10 | 1847 | macros/latex/contrib/babel-contrib/serbianc/README.md
-2021/04/10 | 29291 | macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
-2021/04/10 | 4158 | macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
-2021/04/10 | 296954 | macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
-2021/04/10 | 292924 | macros/latex/contrib/babel-contrib/serbianc.zip
-2021/04/10 | 995 | macros/latex/contrib/babel-contrib/serbian/README.md
-2021/04/10 | 20310 | macros/latex/contrib/babel-contrib/serbian/serbian.dtx
-2021/04/10 | 4355 | macros/latex/contrib/babel-contrib/serbian/serbian.ins
-2021/04/10 | 255910 | macros/latex/contrib/babel-contrib/serbian/serbian.pdf
-2021/04/10 | 252662 | macros/latex/contrib/babel-contrib/serbian.zip
+2022/02/16 | 1897 | macros/latex/contrib/babel-contrib/serbianc/README.md
+2022/02/16 | 30700 | macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
+2022/02/16 | 4158 | macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
+2022/02/16 | 314360 | macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
+2022/02/16 | 305332 | macros/latex/contrib/babel-contrib/serbianc.zip
+2022/02/16 | 1042 | macros/latex/contrib/babel-contrib/serbian/README.md
+2022/02/16 | 20951 | macros/latex/contrib/babel-contrib/serbian/serbian.dtx
+2022/02/16 | 4355 | macros/latex/contrib/babel-contrib/serbian/serbian.ins
+2022/02/16 | 273184 | macros/latex/contrib/babel-contrib/serbian/serbian.pdf
+2022/02/16 | 265569 | macros/latex/contrib/babel-contrib/serbian.zip
2013/05/20 | 48552 | macros/latex/contrib/babel-contrib/slovak/slovak.dtx
2013/05/20 | 4937 | macros/latex/contrib/babel-contrib/slovak/slovak.ins
2013/05/20 | 195853 | macros/latex/contrib/babel-contrib/slovak/slovak.pdf
@@ -209457,12 +209460,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/02/15 | 73740 | macros/latex/contrib/easybook/easybook.dtx
+2022/02/16 | 73740 | macros/latex/contrib/easybook/easybook.dtx
2022/01/02 | 2085 | macros/latex/contrib/easybook/easybook.ins
-2022/02/15 | 578310 | macros/latex/contrib/easybook/easybook.pdf
-2022/02/15 | 80856 | macros/latex/contrib/easybook/easybook.tex
+2022/02/16 | 578152 | macros/latex/contrib/easybook/easybook.pdf
+2022/02/16 | 80856 | macros/latex/contrib/easybook/easybook.tex
2022/02/11 | 787 | macros/latex/contrib/easybook/README.md
-2022/02/15 | 618906 | macros/latex/contrib/easybook.zip
+2022/02/16 | 618699 | 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
@@ -219125,13 +219128,13 @@
1996/03/22 | 18862 | macros/latex/contrib/niceframe/umrandb.mf
2015/01/17 | 1370 | macros/latex/contrib/niceframe/umrand.mf
2015/01/17 | 287910 | macros/latex/contrib/niceframe.zip
-2022/01/23 | 697206 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2022/01/23 | 499106 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2022/01/23 | 189315 | macros/latex/contrib/nicematrix/nicematrix-french.tex
+2022/02/16 | 702844 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2022/02/16 | 502752 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2022/02/15 | 191858 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/01/22 | 1423 | macros/latex/contrib/nicematrix/nicematrix.ins
-2022/01/23 | 1482850 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2022/02/16 | 1489647 | macros/latex/contrib/nicematrix/nicematrix.pdf
2021/11/10 | 1023 | macros/latex/contrib/nicematrix/README.md
-2022/01/23 | 2104132 | macros/latex/contrib/nicematrix.zip
+2022/02/16 | 2116342 | macros/latex/contrib/nicematrix.zip
2015/11/21 | 217 | macros/latex/contrib/nicetext/ANNOUNCE.txt
2012/03/18 | 254582 | macros/latex/contrib/nicetext/demo/arseneau.pdf
2011/09/14 | 10 | macros/latex/contrib/nicetext/demo/iso.txt
@@ -221556,15 +221559,15 @@
2002/02/04 | 5634 | macros/latex/contrib/procIAGssymp/procIAGssymp.sty
2002/02/04 | 7126 | macros/latex/contrib/procIAGssymp/TestPaper.tex
2019/07/29 | 5300 | macros/latex/contrib/procIAGssymp.zip
-2021/12/27 | 7591580 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
-2021/12/27 | 2116628 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2022/02/16 | 7630568 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2022/02/16 | 2123490 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
2021/08/22 | 23478 | macros/latex/contrib/profcollege/latex/PfCEquationComposition2.tex
2021/08/22 | 19350 | macros/latex/contrib/profcollege/latex/PfCEquationLaurent1.tex
2021/08/22 | 20438 | macros/latex/contrib/profcollege/latex/PfCEquationPose1.tex
2021/08/22 | 27165 | macros/latex/contrib/profcollege/latex/PfCEquationSoustraction2.tex
2021/08/22 | 15309 | macros/latex/contrib/profcollege/latex/PfCEquationSymbole1.tex
2021/08/22 | 22791 | macros/latex/contrib/profcollege/latex/PfCEquationTerme1.tex
-2021/12/27 | 728288 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2022/02/16 | 744247 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
2021/11/06 | 8247 | macros/latex/contrib/profcollege/metapost/datastest/afganistan.dat
2021/11/06 | 10915 | macros/latex/contrib/profcollege/metapost/datastest/afriquesud1.dat
2021/11/06 | 218 | macros/latex/contrib/profcollege/metapost/datastest/afriquesud2.dat
@@ -221766,7 +221769,7 @@
2021/11/06 | 10433 | macros/latex/contrib/profcollege/metapost/datastest/zambie.dat
2021/11/06 | 5644 | macros/latex/contrib/profcollege/metapost/datastest/zimbabwe.dat
2021/08/22 | 5056 | macros/latex/contrib/profcollege/metapost/PfCAfficheur.mp
-2021/08/22 | 13296 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
+2022/02/16 | 13296 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
2021/08/22 | 431 | macros/latex/contrib/profcollege/metapost/PfCConstantes.mp
2021/11/06 | 32442 | macros/latex/contrib/profcollege/metapost/PfCGeometrie.mp
2021/08/22 | 5386 | macros/latex/contrib/profcollege/metapost/PfCLabyNombre.mp
@@ -221777,12 +221780,12 @@
2021/08/22 | 104787 | macros/latex/contrib/profcollege/metapost/PfCScratchpdf.mp
2021/08/22 | 6652 | macros/latex/contrib/profcollege/metapost/PfCSvgnames.mp
2021/01/18 | 435 | macros/latex/contrib/profcollege/README
-2021/12/28 | 11792173 | macros/latex/contrib/profcollege.zip
-2022/02/13 | 362084 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
-2022/02/13 | 39336 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
-2022/02/14 | 435 | macros/latex/contrib/proflycee/README.md
-2022/02/14 | 12030 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
-2022/02/14 | 368647 | macros/latex/contrib/proflycee.zip
+2022/02/16 | 11837962 | macros/latex/contrib/profcollege.zip
+2022/02/15 | 426042 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+2022/02/16 | 41962 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2022/02/16 | 435 | macros/latex/contrib/proflycee/README.md
+2022/02/15 | 21481 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
+2022/02/16 | 434116 | macros/latex/contrib/proflycee.zip
1996/02/05 | 1760 | macros/latex/contrib/progkeys/demo/demo.tex
1996/02/05 | 459 | macros/latex/contrib/progkeys/demo/prog1.tex
1996/02/05 | 347 | macros/latex/contrib/progkeys/demo/prog2.tex
@@ -233473,11 +233476,11 @@
2018/08/17 | 14778 | macros/latex/contrib/worksheet/worksheet.sty
2018/08/17 | 16462 | macros/latex/contrib/worksheet/worksheet.tex
2018/08/17 | 99332 | macros/latex/contrib/worksheet.zip
-2020/06/06 | 137378 | macros/latex/contrib/wrapfig2/commodilla.jpg
-2022/01/25 | 1335 | macros/latex/contrib/wrapfig2/README.txt
-2022/01/25 | 80388 | macros/latex/contrib/wrapfig2/wrapfig2.dtx
-2022/01/25 | 758679 | macros/latex/contrib/wrapfig2/wrapfig2.pdf
-2022/01/26 | 905509 | macros/latex/contrib/wrapfig2.zip
+2022/02/16 | 1465 | macros/latex/contrib/wrapfig2/README.txt
+2020/05/23 | 64157 | macros/latex/contrib/wrapfig2/stele-todi-small.jpg
+2022/02/16 | 92954 | macros/latex/contrib/wrapfig2/wrapfig2.dtx
+2022/02/16 | 697282 | macros/latex/contrib/wrapfig2/wrapfig2.pdf
+2022/02/16 | 774206 | macros/latex/contrib/wrapfig2.zip
2003/02/24 | 5342 | macros/latex/contrib/wrapfig/multiple-span.txt
2011/04/09 | 330855 | macros/latex/contrib/wrapfig/wrapfig-doc.pdf
2011/04/09 | 15201 | macros/latex/contrib/wrapfig/wrapfig-doc.tex
@@ -277404,9 +277407,9 @@
1994/02/22 | 94984 | systems/mac/macmakeindex2.12.sea.hqx
1993/07/19 | 61321 | systems/mac/macmakeindex.sit.hqx
2021/04/01 | 47 | systems/mac/mactex/BasicTeX.pkg.md5
-2022/02/12 | 38199 | systems/mac/mactex/ExtrasFolder.pdf
+2022/02/15 | 38202 | systems/mac/mactex/ExtrasFolder.pdf
2021/04/01 | 50 | systems/mac/mactex/Ghostscript.pkg.md5
-2022/02/12 | 1711 | systems/mac/mactex/Licenses.txt
+2022/02/15 | 1711 | systems/mac/mactex/Licenses.txt
2021/03/29 | 4701496188 | systems/mac/mactex/mactex-20210328.pkg
2021/03/29 | 54 | systems/mac/mactex/mactex-20210328.pkg.md5
2021/03/25 | 97330890 | systems/mac/mactex/mactex-basictex-20210325.pkg
@@ -277416,8 +277419,8 @@
2021/04/01 | 45 | systems/mac/mactex/MacTeX.pkg.md5
2021/02/26 | 77461 | systems/mac/mactex/mactex-texdist-20210226.pkg
2021/02/26 | 58 | systems/mac/mactex/mactex-texdist-20210226.pkg.md5
-2022/02/12 | 486130359 | systems/mac/mactex/MacTeXtras-20220212.zip
-2022/02/12 | 58 | systems/mac/mactex/MacTeXtras-20220212.zip.md5
+2022/02/15 | 486292756 | systems/mac/mactex/MacTeXtras-20220215.zip
+2022/02/15 | 58 | systems/mac/mactex/MacTeXtras-20220215.zip.md5
2021/04/01 | 179 | systems/mac/mactex/README
1995/08/15 | 308344 | systems/mac/MakeIndex-Fat-1.0-sit.hqx
1994/04/20 | 2925109 | systems/mac/metafont/bluesky/MAC_MF_0.66.sit.hqx
@@ -290162,7 +290165,7 @@
2021/03/23 | 276 | systems/texlive/tlnet/archive/texlive-it.r58653.tar.xz
2021/03/22 | 1845596 | systems/texlive/tlnet/archive/texlive-ja.doc.r58581.tar.xz
2021/03/22 | 276 | systems/texlive/tlnet/archive/texlive-ja.r58581.tar.xz
-2021/10/15 | 146056 | systems/texlive/tlnet/archive/texlive-msg-translations.r60760.tar.xz
+2022/02/16 | 146040 | systems/texlive/tlnet/archive/texlive-msg-translations.r62030.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.aarch64-linux.r46208.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-freebsd.r24062.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/texliveonfly.amd64-netbsd.r30191.tar.xz
@@ -290189,7 +290192,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/02/15 | 403372 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62016.tar.xz
+2022/02/16 | 403440 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62031.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
@@ -290213,7 +290216,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/02/15 | 108616 | systems/texlive/tlnet/archive/texlive-scripts.r62016.tar.xz
+2022/02/16 | 108696 | systems/texlive/tlnet/archive/texlive-scripts.r62031.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -292009,17 +292012,17 @@
2020/01/24 | 8760 | systems/texlive/tlnet/archive/zxjatype.r53500.tar.xz
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/02/14 | 106549 | systems/texlive/tlnet/install-tl
-2022/02/15 | 6808814 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/02/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/02/15 | 106655 | systems/texlive/tlnet/install-tl
+2022/02/16 | 6809097 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/02/16 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/02/15 | 20873817 | systems/texlive/tlnet/install-tl-windows.exe
-2022/02/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/02/15 | 25628089 | systems/texlive/tlnet/install-tl.zip
-2022/02/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/02/16 | 20875132 | systems/texlive/tlnet/install-tl-windows.exe
+2022/02/16 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/02/16 | 25628216 | systems/texlive/tlnet/install-tl.zip
+2022/02/16 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -292029,7 +292032,7 @@
2021/07/03 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/01/12 | 49482 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/02/14 | 7033 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/02/15 | 7205 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/02/05 | 213092 | 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
@@ -292071,12 +292074,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/02/15 | 17111146 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/02/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/02/16 | 17111146 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/02/16 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/12/21 | 86654 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/02/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/02/15 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/02/15 | 2349932 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/02/16 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/02/16 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/02/16 | 2349072 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/12/21 | 42112 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -294774,27 +294777,27 @@
2021/03/02 | 3531 | systems/texlive/tlnet/tlpkg/tltcl/lib/tkConfig.sh
2018/11/30 | 1310 | systems/texlive/tlnet/tlpkg/tltcl/tlmgr.gif
2021/10/13 | 25696 | systems/texlive/tlnet/tlpkg/tltcl/tltcl.tcl
-2021/10/14 | 81661 | systems/texlive/tlnet/tlpkg/translations/cs.po
-2021/10/14 | 57238 | systems/texlive/tlnet/tlpkg/translations/da.po
-2021/10/14 | 89150 | systems/texlive/tlnet/tlpkg/translations/de.po
-2021/10/14 | 79116 | systems/texlive/tlnet/tlpkg/translations/es.po
-2021/10/14 | 93591 | systems/texlive/tlnet/tlpkg/translations/fr.po
-2021/10/14 | 87449 | systems/texlive/tlnet/tlpkg/translations/it.po
-2021/10/14 | 62088 | systems/texlive/tlnet/tlpkg/translations/ja.po
-2021/10/14 | 46805 | systems/texlive/tlnet/tlpkg/translations/messages.pot
-2021/10/14 | 57512 | systems/texlive/tlnet/tlpkg/translations/nl.po
-2021/10/14 | 66647 | systems/texlive/tlnet/tlpkg/translations/pl.po
-2021/10/14 | 81801 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po
+2022/02/15 | 81661 | systems/texlive/tlnet/tlpkg/translations/cs.po
+2022/02/15 | 57238 | systems/texlive/tlnet/tlpkg/translations/da.po
+2022/02/15 | 89150 | systems/texlive/tlnet/tlpkg/translations/de.po
+2022/02/15 | 79116 | systems/texlive/tlnet/tlpkg/translations/es.po
+2022/02/15 | 93591 | systems/texlive/tlnet/tlpkg/translations/fr.po
+2022/02/15 | 87449 | systems/texlive/tlnet/tlpkg/translations/it.po
+2022/02/15 | 62088 | systems/texlive/tlnet/tlpkg/translations/ja.po
+2022/02/15 | 46805 | systems/texlive/tlnet/tlpkg/translations/messages.pot
+2022/02/15 | 57512 | systems/texlive/tlnet/tlpkg/translations/nl.po
+2022/02/15 | 66647 | systems/texlive/tlnet/tlpkg/translations/pl.po
+2022/02/15 | 81801 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po
2019/03/25 | 430 | systems/texlive/tlnet/tlpkg/translations/README
2021/03/10 | 105281 | systems/texlive/tlnet/tlpkg/translations/ru.po
-2021/10/14 | 88496 | systems/texlive/tlnet/tlpkg/translations/sk.po
-2021/10/14 | 69304 | systems/texlive/tlnet/tlpkg/translations/sl.po
-2021/10/14 | 103025 | systems/texlive/tlnet/tlpkg/translations/sr.po
+2022/02/15 | 88496 | systems/texlive/tlnet/tlpkg/translations/sk.po
+2022/02/15 | 69304 | systems/texlive/tlnet/tlpkg/translations/sl.po
+2022/02/15 | 103025 | systems/texlive/tlnet/tlpkg/translations/sr.po
2019/03/28 | 847 | systems/texlive/tlnet/tlpkg/translations/translators
-2021/10/14 | 80130 | systems/texlive/tlnet/tlpkg/translations/uk.po
-2021/10/14 | 90134 | systems/texlive/tlnet/tlpkg/translations/vi.po
-2021/10/14 | 63102 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
-2021/10/14 | 53033 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
+2022/02/15 | 80130 | systems/texlive/tlnet/tlpkg/translations/uk.po
+2022/02/15 | 90134 | systems/texlive/tlnet/tlpkg/translations/vi.po
+2022/02/15 | 63102 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
+2022/02/15 | 53033 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
2022/02/10 | 4079844 | systems/texlive/tlnet/update-tlmgr-r61961.exe
2022/02/10 | 154 | systems/texlive/tlnet/update-tlmgr-r61961.exe.sha512
2022/02/10 | 455 | systems/texlive/tlnet/update-tlmgr-r61961.exe.sha512.asc
@@ -297203,7 +297206,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/02/15 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/02/16 | 634962 | 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
@@ -298729,9 +298732,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/01/29 | 39717 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/01/29 | 43173 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/02/15 | 265642 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/02/15 | 1418292 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/02/15 | 1310041 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/02/16 | 265637 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/02/16 | 1416930 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/02/16 | 1309473 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/01/29 | 13505 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/01/29 | 14408 | 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
@@ -298955,189 +298958,189 @@
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/02/15 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/02/15 | 51549 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/02/15 | 57354 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/02/15 | 960375 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/02/15 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/02/15 | 28770 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/02/15 | 31540 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/02/15 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/02/15 | 35239 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/02/15 | 56851 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/02/15 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/02/15 | 86495 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/02/15 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/02/15 | 68736 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/02/15 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/02/15 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/02/15 | 31336 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/02/15 | 332532 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/02/15 | 393912 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/02/15 | 32965 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/02/15 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/02/15 | 51412 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/02/15 | 57208 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/02/15 | 256593 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/02/15 | 281919 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/02/15 | 179947 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/02/15 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/02/15 | 55000 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/02/15 | 62444 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/02/15 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/02/15 | 24077 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/02/15 | 478898 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/02/15 | 46112 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/02/15 | 52005 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/02/15 | 285552 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/02/15 | 326181 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/02/15 | 41389 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/02/15 | 45737 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/02/15 | 120231 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/02/15 | 134990 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/02/15 | 1300071 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/02/15 | 1452955 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/02/15 | 99697 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/02/15 | 113012 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/02/15 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/02/15 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/02/15 | 25130 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/02/15 | 28583 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/02/15 | 57013 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/02/15 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/02/15 | 135906 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/02/15 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/02/15 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/02/15 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/02/15 | 72006 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/02/15 | 81508 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/02/15 | 259151 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/02/15 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/02/15 | 22156 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/02/15 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/02/15 | 97052 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/02/15 | 112669 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/02/15 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/02/15 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/02/15 | 96824 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/02/15 | 115636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/02/15 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/02/15 | 43813 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/02/15 | 484674 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/02/15 | 565707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/02/15 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/02/15 | 168798 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/02/15 | 95477 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/02/15 | 109550 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/02/15 | 16509 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/02/15 | 18376 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/02/15 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/02/15 | 30559 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/02/15 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/02/15 | 682180 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/02/15 | 532417 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/02/15 | 598775 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/02/15 | 477701 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/02/15 | 528108 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/02/15 | 94011 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/02/15 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/02/15 | 1732208 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/02/15 | 2006598 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/02/15 | 68021 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/02/15 | 74119 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/02/15 | 27787 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/02/15 | 32081 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/02/15 | 7760 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/02/15 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/02/15 | 199419 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/02/15 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/02/15 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/02/15 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/02/15 | 99227 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/02/15 | 104697 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/02/15 | 126866 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/02/15 | 139187 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/02/15 | 254847 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/02/15 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/02/15 | 199792 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/02/15 | 181555 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/02/15 | 68532 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/02/15 | 76200 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/02/15 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/02/15 | 35179 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/02/15 | 38568 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/02/15 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/02/15 | 43430 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/02/15 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/02/15 | 45929 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/02/15 | 52325 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/02/15 | 199170 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/02/15 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/02/15 | 36061 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/02/15 | 41240 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/02/15 | 753735 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/02/15 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/02/15 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/02/15 | 203066 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/02/15 | 209864 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/02/15 | 244997 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/02/15 | 78984 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/02/15 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/02/15 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/02/15 | 1322847 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/02/15 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/02/15 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/02/15 | 31572 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/02/15 | 37379 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/02/15 | 64695 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/02/15 | 72890 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/02/15 | 50824 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/02/15 | 58645 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/02/15 | 691861 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/02/15 | 752443 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/02/15 | 1355175 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/02/15 | 1499491 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/02/15 | 42765 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/02/15 | 52515 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/02/15 | 57563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/02/15 | 63750 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/02/15 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/02/15 | 27462 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/02/15 | 16570 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/02/15 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/02/15 | 64507 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/02/15 | 70971 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/02/15 | 157566 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/02/15 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/02/15 | 58728 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/02/15 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/02/15 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/02/15 | 109307 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/02/15 | 2674152 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/02/15 | 2799004 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/02/15 | 55201 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/02/15 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/02/15 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/02/15 | 41215 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/02/15 | 28704 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/02/15 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/02/15 | 67891 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/02/15 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/02/15 | 317512 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/02/15 | 355068 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/02/15 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/02/15 | 57423 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/02/15 | 591258 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/02/15 | 629387 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/02/15 | 39325 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/02/15 | 43567 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/02/15 | 265605 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/02/15 | 1416849 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/02/15 | 1309239 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/02/15 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/02/15 | 14409 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/02/16 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/02/16 | 51548 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/02/16 | 57354 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/02/16 | 960376 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/02/16 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/02/16 | 28768 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/02/16 | 31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/02/16 | 30181 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/02/16 | 35238 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/02/16 | 56849 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/02/16 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/02/16 | 86494 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/02/16 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/02/16 | 68737 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/02/16 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/02/16 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/02/16 | 31336 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/02/16 | 332531 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/02/16 | 393909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/02/16 | 32963 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/02/16 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/02/16 | 51410 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/02/16 | 57210 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/02/16 | 256593 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/02/16 | 281918 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/02/16 | 179944 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/02/16 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/02/16 | 54996 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/02/16 | 62444 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/02/16 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/02/16 | 24077 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/02/16 | 478897 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/02/16 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/02/16 | 52006 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/02/16 | 285552 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/02/16 | 326180 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/02/16 | 41388 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/02/16 | 45737 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/02/16 | 120229 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/02/16 | 134989 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/02/16 | 1300071 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/02/16 | 1452955 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/02/16 | 99696 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/02/16 | 113011 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/02/16 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/02/16 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/02/16 | 25129 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/02/16 | 28583 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/02/16 | 57011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/02/16 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/02/16 | 135904 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/02/16 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/02/16 | 73651 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/02/16 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/02/16 | 72004 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/02/16 | 81507 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/02/16 | 259150 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/02/16 | 296123 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/02/16 | 22158 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/02/16 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/02/16 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/02/16 | 112668 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/02/16 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/02/16 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/02/16 | 96824 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/02/16 | 115635 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/02/16 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/02/16 | 43812 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/02/16 | 484671 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/02/16 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/02/16 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/02/16 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/02/16 | 95475 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/02/16 | 109551 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/02/16 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/02/16 | 18376 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/02/16 | 28337 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/02/16 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/02/16 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/02/16 | 682181 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/02/16 | 532414 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/02/16 | 598774 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/02/16 | 477696 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/02/16 | 528110 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/02/16 | 94011 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/02/16 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/02/16 | 1732206 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/02/16 | 2006601 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/02/16 | 68020 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/02/16 | 74118 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/02/16 | 27786 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/02/16 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/02/16 | 7759 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/02/16 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/02/16 | 199420 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/02/16 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/02/16 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/02/16 | 286571 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/02/16 | 99226 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/02/16 | 104696 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/02/16 | 126866 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/02/16 | 139188 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/02/16 | 254844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/02/16 | 286068 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/02/16 | 199792 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/02/16 | 181556 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/02/16 | 68530 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/02/16 | 76199 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/02/16 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/02/16 | 35180 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/02/16 | 38567 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/02/16 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/02/16 | 43428 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/02/16 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/02/16 | 45928 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/02/16 | 52324 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/02/16 | 199170 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/02/16 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/02/16 | 36059 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/02/16 | 41239 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/02/16 | 753733 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/02/16 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/02/16 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/02/16 | 203065 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/02/16 | 209862 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/02/16 | 244999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/02/16 | 78982 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/02/16 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/02/16 | 1181082 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/02/16 | 1322847 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/02/16 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/02/16 | 23937 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/02/16 | 31575 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/02/16 | 37379 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/02/16 | 64694 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/02/16 | 72890 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/02/16 | 50821 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/02/16 | 58645 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/02/16 | 691860 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/02/16 | 752446 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/02/16 | 1355174 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/02/16 | 1499492 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/02/16 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/02/16 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/02/16 | 57560 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/02/16 | 63750 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/02/16 | 25480 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/02/16 | 27461 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/02/16 | 16569 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/02/16 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/02/16 | 64503 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/02/16 | 70973 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/02/16 | 157566 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/02/16 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/02/16 | 58727 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/02/16 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/02/16 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/02/16 | 109310 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/02/16 | 2674148 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/02/16 | 2799003 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/02/16 | 55201 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/02/16 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/02/16 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/02/16 | 41215 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/02/16 | 28703 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/02/16 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/02/16 | 67890 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/02/16 | 71842 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/02/16 | 317511 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/02/16 | 355066 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/02/16 | 55753 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/02/16 | 57424 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/02/16 | 591257 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/02/16 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/02/16 | 39322 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/02/16 | 43568 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/02/16 | 265617 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/02/16 | 1416892 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/02/16 | 1310057 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/02/16 | 13512 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/02/16 | 14408 | 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/02/15 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/02/16 | 1153 | 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
@@ -299589,7 +299592,7 @@
2020/10/20 | 342254 | 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/02/15 | 964 | systems/win32/miktex/tm/packages/pr.ini
+2022/02/16 | 964 | 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
@@ -301355,7 +301358,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/02/16 | 186 | timestamp
+2022/02/17 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index e36b787e58..323a68c5bf 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index e2b0fde2a0..7c9a497d5b 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,111 +1,314 @@
+2022/02/16 | 99696 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/02/16 | 99226 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/02/16 | 9741 | fonts/cochineal/README
+2022/02/16 | 97053 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/02/16 | 96824 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/02/16 | 964 | systems/win32/miktex/tm/packages/pr.ini
+2022/02/16 | 960376 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/02/16 | 95475 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/02/16 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/02/16 | 94011 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/02/16 | 92954 | macros/latex/contrib/wrapfig2/wrapfig2.dtx
+2022/02/16 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/02/16 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/02/16 | 86494 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/02/16 | 84024 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
+2022/02/16 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/02/16 | 81507 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/02/16 | 80856 | macros/latex/contrib/easybook/easybook.tex
+2022/02/16 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/02/16 | 78982 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/02/16 | 7759 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/02/16 | 774206 | macros/latex/contrib/wrapfig2.zip
+2022/02/16 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/02/16 | 7630568 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+2022/02/16 | 76199 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/02/16 | 753733 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/02/16 | 752446 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/02/16 | 744247 | macros/latex/contrib/profcollege/latex/ProfCollege.sty
+2022/02/16 | 74118 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/02/16 | 73740 | macros/latex/contrib/easybook/easybook.dtx
+2022/02/16 | 73651 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/02/16 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/02/16 | 72890 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/02/16 | 72004 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/02/16 | 71842 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/02/16 | 70973 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/02/16 | 702844 | macros/latex/contrib/nicematrix/nicematrix.dtx
+2022/02/16 | 697282 | macros/latex/contrib/wrapfig2/wrapfig2.pdf
+2022/02/16 | 6924491 | fonts/cochineal.zip
+2022/02/16 | 691860 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/02/16 | 68737 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/02/16 | 68530 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/02/16 | 682181 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/02/16 | 6809097 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/02/16 | 68020 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/02/16 | 67890 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/02/16 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/02/16 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/02/16 | 64694 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/02/16 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/02/16 | 64503 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/02/16 | 63750 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/02/16 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/02/16 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/02/16 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/02/16 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/02/16 | 629385 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/02/16 | 62444 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/02/16 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/02/16 | 618699 | macros/latex/contrib/easybook.zip
+2022/02/16 | 598774 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/02/16 | 591257 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/02/16 | 58727 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/02/16 | 58645 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/02/16 | 578152 | macros/latex/contrib/easybook/easybook.pdf
+2022/02/16 | 57560 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/02/16 | 57424 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/02/16 | 57354 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/02/16 | 57210 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/02/16 | 57011 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/02/16 | 56849 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/02/16 | 565708 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/02/16 | 55753 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/02/16 | 55201 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/02/16 | 54996 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/02/16 | 532414 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/02/16 | 528110 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/02/16 | 52514 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/02/16 | 52324 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/02/16 | 52006 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/02/16 | 51548 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/02/16 | 51410 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/02/16 | 50821 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/02/16 | 502752 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
+2022/02/16 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/02/16 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/02/16 | 484671 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/02/16 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/02/16 | 478897 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/02/16 | 477696 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/02/16 | 46110 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/02/16 | 45928 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/02/16 | 45737 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/02/16 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/02/16 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/02/16 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/02/16 | 43812 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/02/16 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/02/16 | 435 | macros/latex/contrib/proflycee/README.md
+2022/02/16 | 43568 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/02/16 | 4355 | macros/latex/contrib/babel-contrib/serbian/serbian.ins
+2022/02/16 | 43428 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/02/16 | 434116 | macros/latex/contrib/proflycee.zip
+2022/02/16 | 42764 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/02/16 | 41962 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+2022/02/16 | 4158 | macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
+2022/02/16 | 41388 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/02/16 | 41239 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/02/16 | 41215 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/02/16 | 403440 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62031.tar.xz
+2022/02/16 | 393909 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/02/16 | 39322 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/02/16 | 38710 | graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
+2022/02/16 | 386263 | fonts/cochineal/type1/Cochineal-Roman.pfb
+2022/02/16 | 38567 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/02/16 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/02/16 | 37379 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/02/16 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/02/16 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/02/16 | 370094 | graphics/pgf/contrib/tikz-karnaugh.zip
+2022/02/16 | 365481 | fonts/cochineal/type1/Cochineal-Italic.pfb
+2022/02/16 | 363515 | fonts/cochineal/type1/Cochineal-Bold.pfb
+2022/02/16 | 36059 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/02/16 | 355066 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/02/16 | 35238 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/02/16 | 35180 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/02/16 | 3470203 | fonts/cochineal/afm/Cochineal-Bold.afm
+2022/02/16 | 3446658 | fonts/cochineal/afm/Cochineal-Roman.afm
+2022/02/16 | 342640 | fonts/cochineal/type1/Cochineal-BoldItalic.pfb
+2022/02/16 | 34053 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/02/16 | 332531 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/02/16 | 32963 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/02/16 | 326180 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/02/16 | 32080 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/02/16 | 317511 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/02/16 | 31575 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/02/16 | 31539 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/02/16 | 314360 | macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
+2022/02/16 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/02/16 | 31336 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/02/16 | 30700 | macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
+2022/02/16 | 30560 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/02/16 | 305332 | macros/latex/contrib/babel-contrib/serbianc.zip
+2022/02/16 | 30181 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/02/16 | 296123 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/02/16 | 28768 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/02/16 | 28703 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/02/16 | 286571 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/02/16 | 286068 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/02/16 | 28583 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/02/16 | 285552 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/02/16 | 28337 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/02/16 | 281918 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/02/16 | 2799003 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/02/16 | 27786 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/02/16 | 27461 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/02/16 | 273184 | macros/latex/contrib/babel-contrib/serbian/serbian.pdf
+2022/02/16 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/02/16 | 2674148 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/02/16 | 265637 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/02/16 | 265617 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/02/16 | 265569 | macros/latex/contrib/babel-contrib/serbian.zip
+2022/02/16 | 259150 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/02/16 | 256593 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/02/16 | 25628216 | systems/texlive/tlnet/install-tl.zip
+2022/02/16 | 254844 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/02/16 | 25480 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/02/16 | 25129 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/02/16 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/02/16 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/02/16 | 244999 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/02/16 | 24077 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/02/16 | 23937 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/02/16 | 2349072 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/02/16 | 233988 | fonts/cochineal/opentype/Cochineal-Bold.otf
+2022/02/16 | 233860 | fonts/cochineal/opentype/Cochineal-Italic.otf
+2022/02/16 | 233232 | fonts/cochineal/opentype/Cochineal-Roman.otf
+2022/02/16 | 2274209 | fonts/cochineal/afm/Cochineal-Italic.afm
+2022/02/16 | 225012 | fonts/cochineal/opentype/Cochineal-BoldItalic.otf
+2022/02/16 | 2247 | graphics/pgf/contrib/tikz-karnaugh/README.txt
+2022/02/16 | 22158 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/02/16 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/02/16 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/02/16 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/02/16 | 2123490 | macros/latex/contrib/profcollege/doc/ProfCollege-doc.zip
+2022/02/16 | 2116342 | macros/latex/contrib/nicematrix.zip
+2022/02/16 | 209862 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/02/16 | 20951 | macros/latex/contrib/babel-contrib/serbian/serbian.dtx
+2022/02/16 | 20875132 | systems/texlive/tlnet/install-tl-windows.exe
+2022/02/16 | 203065 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/02/16 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/02/16 | 2006601 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/02/16 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/02/16 | 199792 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/02/16 | 199420 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/02/16 | 199170 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/02/16 | 1971343 | fonts/cochineal/afm/Cochineal-BoldItalic.afm
+2022/02/16 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/02/16 | 1897 | macros/latex/contrib/babel-contrib/serbianc/README.md
+2022/02/16 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/02/16 | 18376 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/02/16 | 181556 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/02/16 | 179944 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/02/16 | 1732206 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/02/16 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/02/16 | 17111146 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/02/16 | 168797 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/02/16 | 16569 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/02/16 | 16508 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/02/16 | 157566 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/02/16 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/02/16 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/02/16 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/02/16 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/02/16 | 1499492 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/02/16 | 1489647 | macros/latex/contrib/nicematrix/nicematrix.pdf
+2022/02/16 | 1465 | macros/latex/contrib/wrapfig2/README.txt
+2022/02/16 | 146040 | systems/texlive/tlnet/archive/texlive-msg-translations.r62030.tar.xz
+2022/02/16 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/02/16 | 1452955 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/02/16 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/02/16 | 14408 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/02/16 | 1416930 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/02/16 | 1416892 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/02/16 | 139188 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/02/16 | 135904 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/02/16 | 1355174 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/02/16 | 13512 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/02/16 | 134989 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/02/16 | 13296 | macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
+2022/02/16 | 1322847 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/02/16 | 1310057 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/02/16 | 1309473 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/02/16 | 1300071 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/02/16 | 126866 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/02/16 | 120229 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/02/16 | 11837962 | macros/latex/contrib/profcollege.zip
+2022/02/16 | 1181082 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/02/16 | 115635 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/02/16 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/02/16 | 113011 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/02/16 | 112668 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/02/16 | 109551 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/02/16 | 109310 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/02/16 | 108696 | systems/texlive/tlnet/archive/texlive-scripts.r62031.tar.xz
+2022/02/16 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/02/16 | 104696 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/02/16 | 1042 | macros/latex/contrib/babel-contrib/serbian/README.md
+2022/02/16 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/02/16 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/02/15 | 996 | macros/latex/contrib/siunitx/README.md
-2022/02/15 | 99697 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/02/15 | 99227 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
2022/02/15 | 98548 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2022/02/15 | 9759 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2022/02/15 | 97052 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/02/15 | 96824 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/02/15 | 964 | systems/win32/miktex/tm/packages/pr.ini
-2022/02/15 | 960375 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/02/15 | 95477 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/02/15 | 95214 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/02/15 | 94011 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/02/15 | 93591 | systems/texlive/tlnet/tlpkg/translations/fr.po
+2022/02/15 | 90134 | systems/texlive/tlnet/tlpkg/translations/vi.po
2022/02/15 | 895 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/measure_line_with_hectometer.tikz
-2022/02/15 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/02/15 | 89150 | systems/texlive/tlnet/tlpkg/translations/de.po
+2022/02/15 | 88496 | systems/texlive/tlnet/tlpkg/translations/sk.po
2022/02/15 | 8798 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2022/02/15 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/02/15 | 87449 | systems/texlive/tlnet/tlpkg/translations/it.po
2022/02/15 | 872 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bend_train.tikz
-2022/02/15 | 86495 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2022/02/15 | 847 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/pylons_middle.tikz
2022/02/15 | 8370 | macros/luatex/generic/lua-widow-control/lwc-documentation.mkxl
-2022/02/15 | 824420 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/02/15 | 81508 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/02/15 | 81801 | systems/texlive/tlnet/tlpkg/translations/pt_BR.po
+2022/02/15 | 81661 | systems/texlive/tlnet/tlpkg/translations/cs.po
2022/02/15 | 81425 | macros/latex/contrib/spbmark.zip
2022/02/15 | 8119 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.symbology.code.tex
-2022/02/15 | 80856 | macros/latex/contrib/easybook/easybook.tex
-2022/02/15 | 79060 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/02/15 | 78984 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/02/15 | 80130 | systems/texlive/tlnet/tlpkg/translations/uk.po
+2022/02/15 | 79116 | systems/texlive/tlnet/tlpkg/translations/es.po
2022/02/15 | 78020 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_chamstadt.pdf
-2022/02/15 | 7760 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/02/15 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/02/15 | 76200 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2022/02/15 | 76051 | macros/latex/contrib/spbmark/spbmark.pdf
2022/02/15 | 7592 | systems/texlive/tlnet/archive/footmisc.r62025.tar.xz
2022/02/15 | 754570 | graphics/pgf/contrib/tikz-trackschematic.zip
-2022/02/15 | 753735 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/02/15 | 752443 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
2022/02/15 | 74131 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic.tex
-2022/02/15 | 74119 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/02/15 | 73740 | macros/latex/contrib/easybook/easybook.dtx
-2022/02/15 | 73652 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/02/15 | 73204 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/02/15 | 72890 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2022/02/15 | 72610 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_berg.pdf
-2022/02/15 | 72006 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/02/15 | 7205 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/02/15 | 718 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/hectometer.tikz
-2022/02/15 | 71844 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2022/02/15 | 715336 | systems/texlive/tlnet/archive/kanbun.doc.r62026.tar.xz
-2022/02/15 | 70971 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/02/15 | 691861 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/02/15 | 68736 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/02/15 | 68532 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/02/15 | 682180 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/02/15 | 69304 | systems/texlive/tlnet/tlpkg/translations/sl.po
2022/02/15 | 68129 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-symbology-table.pdf
-2022/02/15 | 6808814 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/02/15 | 68021 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/02/15 | 67891 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/02/15 | 67221 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/02/15 | 66647 | systems/texlive/tlnet/tlpkg/translations/pl.po
2022/02/15 | 655 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_double.tikz
2022/02/15 | 655 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_double_full_closure.tikz
-2022/02/15 | 65079 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2022/02/15 | 65016 | macros/latex/contrib/siunitx/CHANGELOG.md
-2022/02/15 | 64695 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/02/15 | 64539 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/02/15 | 64507 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2022/02/15 | 640391 | macros/latex/contrib/siunitx/siunitx.pdf
2022/02/15 | 638 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth.tikz
-2022/02/15 | 63750 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/02/15 | 634973 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/02/15 | 634962 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/02/15 | 63366 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/02/15 | 630636 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/02/15 | 629387 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/02/15 | 63102 | systems/texlive/tlnet/tlpkg/translations/zh_CN.po
2022/02/15 | 6284 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_chamstadt.tex
-2022/02/15 | 62444 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/02/15 | 62354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/02/15 | 62088 | systems/texlive/tlnet/tlpkg/translations/ja.po
2022/02/15 | 619 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_middle.tikz
-2022/02/15 | 618906 | macros/latex/contrib/easybook.zip
2022/02/15 | 617 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bridge_track_beneath.tikz
2022/02/15 | 611 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_distance.tikz
2022/02/15 | 608 | systems/texlive/tlnet/archive/collection-langfrench.r62027.tar.xz
2022/02/15 | 608847 | macros/latex/contrib/siunitx/siunitx-code.pdf
2022/02/15 | 6080 | systems/texlive/tlnet/archive/kanbun.r62026.tar.xz
2022/02/15 | 599340 | systems/texlive/tlnet/archive/easybook.doc.r62024.tar.xz
-2022/02/15 | 598775 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2022/02/15 | 592 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape_special.tikz
-2022/02/15 | 591258 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/02/15 | 58728 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/02/15 | 58645 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/02/15 | 58 | systems/mac/mactex/MacTeXtras-20220215.zip.md5
2022/02/15 | 580 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_marking_with_turnout.tikz
-2022/02/15 | 578310 | macros/latex/contrib/easybook/easybook.pdf
-2022/02/15 | 57563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/02/15 | 57423 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/02/15 | 57354 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/02/15 | 57208 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/02/15 | 57013 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/02/15 | 57512 | systems/texlive/tlnet/tlpkg/translations/nl.po
+2022/02/15 | 57238 | systems/texlive/tlnet/tlpkg/translations/da.po
2022/02/15 | 569 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_bidirectional.tikz
2022/02/15 | 569 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/pylons_right.tikz
-2022/02/15 | 56851 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
2022/02/15 | 566 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/pylons_left.tikz
2022/02/15 | 566 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/pylons_both.tikz
2022/02/15 | 565 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/combined_signal_forward.tikz
-2022/02/15 | 565707 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
2022/02/15 | 56164 | systems/texlive/tlnet/archive/cweb.doc.r62023.tar.xz
2022/02/15 | 559 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_backward.tikz
2022/02/15 | 557 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_forward.tikz
-2022/02/15 | 55755 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/02/15 | 55201 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/02/15 | 55000 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
2022/02/15 | 543 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_speed_signal_backward.tikz
2022/02/15 | 542 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_speed_signal_forward.tikz
2022/02/15 | 541 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter.tikz
@@ -113,20 +316,16 @@
2022/02/15 | 536 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/double-slip_turnout_left.tikz
2022/02/15 | 534 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route_signal_backward.tikz
2022/02/15 | 533 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_manually.tikz
-2022/02/15 | 532417 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2022/02/15 | 531 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward_manually.tikz
2022/02/15 | 531 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_manually.tikz
+2022/02/15 | 53033 | systems/texlive/tlnet/tlpkg/translations/zh_TW.po
2022/02/15 | 529 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_manually.tikz
2022/02/15 | 528 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/diamond_crossing_right.tikz
-2022/02/15 | 528108 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
2022/02/15 | 527 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/diamond_crossing_left.tikz
2022/02/15 | 5261 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/station_berg.tex
2022/02/15 | 5259 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2022/02/15 | 52515 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/02/15 | 52325 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
2022/02/15 | 520 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_right_backward.tikz
2022/02/15 | 520 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_moving_points.tikz
-2022/02/15 | 52005 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
2022/02/15 | 519 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward_right_position.tikz
2022/02/15 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_right_forward.tikz
2022/02/15 | 518 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_with_fouling_left_backward.tikz
@@ -140,15 +339,12 @@
2022/02/15 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_moving_points.tikz
2022/02/15 | 516 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward_left_position.tikz
2022/02/15 | 515 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_right_position.tikz
-2022/02/15 | 51549 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
2022/02/15 | 514 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_forward_left_position.tikz
2022/02/15 | 514 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/speed_signal_backward.tikz
-2022/02/15 | 51412 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2022/02/15 | 513 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/speed_signal_forward.tikz
2022/02/15 | 510 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/route.tikz
2022/02/15 | 510884 | systems/texlive/tlnet/archive/footmisc.doc.r62025.tar.xz
2022/02/15 | 50881 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2022/02/15 | 50824 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2022/02/15 | 506 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_backward.tikz
2022/02/15 | 504 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_right_forward.tikz
2022/02/15 | 504 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/turnout_left_backward.tikz
@@ -157,11 +353,9 @@
2022/02/15 | 497 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/main_line.tikz
2022/02/15 | 495 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right_with_signal.tikz
2022/02/15 | 492 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_marking.tikz
-2022/02/15 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2022/02/15 | 48820 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/02/15 | 486292756 | systems/mac/mactex/MacTeXtras-20220215.zip
2022/02/15 | 485 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape_bidirectional.tikz
2022/02/15 | 485 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bridge.tikz
-2022/02/15 | 484674 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
2022/02/15 | 483 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_right_backward.tikz
2022/02/15 | 482 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_right_forward.tikz
2022/02/15 | 482 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/derailer_left_backward.tikz
@@ -175,10 +369,7 @@
2022/02/15 | 480 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/distant_pantograph_down_forward.tikz
2022/02/15 | 480 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/block_signal_with_shunt_signal_forward.tikz
2022/02/15 | 479 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_berth_shape.tikz
-2022/02/15 | 47985 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2022/02/15 | 478 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_drive_human.tikz
-2022/02/15 | 478898 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/02/15 | 477701 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2022/02/15 | 476 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_backward_locked.tikz
2022/02/15 | 476 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/pantograph_down_backward.tikz
2022/02/15 | 475 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_signal_forward_locked.tikz
@@ -229,6 +420,7 @@
2022/02/15 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/parked_vehicles.tikz
2022/02/15 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/direction_control_forward.tikz
2022/02/15 | 468 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz
+2022/02/15 | 46805 | systems/texlive/tlnet/tlpkg/translations/messages.pot
2022/02/15 | 467 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_ghost_direction_forward.tikz
2022/02/15 | 467 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/shunt_limit_forward.tikz
2022/02/15 | 467 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/power_on_backward.tikz
@@ -239,203 +431,84 @@
2022/02/15 | 463 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right_forward.tikz
2022/02/15 | 462 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_direction_backward.tikz
2022/02/15 | 461 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/train_direction_forward.tikz
-2022/02/15 | 46112 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2022/02/15 | 460 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_right.tikz
2022/02/15 | 4597855 | macros/latex/contrib/asmeconf.zip
-2022/02/15 | 45929 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
2022/02/15 | 458 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/view_point_backward.tikz
2022/02/15 | 458 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/platform_left.tikz
2022/02/15 | 458 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/level_crossing_without_barrier.tikz
2022/02/15 | 457 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/view_point_forward.tikz
-2022/02/15 | 45737 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2022/02/15 | 456 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/transmitter_right.tikz
-2022/02/15 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/02/15 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/02/15 | 448 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/measure_line.tikz
2022/02/15 | 447 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/hump.tikz
2022/02/15 | 444 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/friction_bufferstop_backward.tikz
2022/02/15 | 443 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/friction_bufferstop_forward.tikz
-2022/02/15 | 43946 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/02/15 | 43813 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/02/15 | 43652 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/02/15 | 43567 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/02/15 | 43430 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
2022/02/15 | 433 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-symbology-table.tex
2022/02/15 | 432 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bufferstop_backward.tikz
2022/02/15 | 431 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/bufferstop_forward.tikz
-2022/02/15 | 42765 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/02/15 | 426042 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
2022/02/15 | 424 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/track_closure.tikz
2022/02/15 | 421 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/minimal_working_example.tex
2022/02/15 | 4204 | systems/texlive/tlnet/archive/proflycee.r62027.tar.xz
-2022/02/15 | 41389 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/02/15 | 41240 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/02/15 | 41215 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
2022/02/15 | 407 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/secondary_track.tikz
-2022/02/15 | 403372 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62016.tar.xz
2022/02/15 | 402 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/main_track.tikz
+2022/02/15 | 402432 | graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
2022/02/15 | 4022 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-documentation.sty
-2022/02/15 | 393912 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/02/15 | 39325 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
2022/02/15 | 3912 | macros/luatex/generic/lua-widow-control/lwc-sample.tex
-2022/02/15 | 38568 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/02/15 | 38477 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2022/02/15 | 38279 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex
+2022/02/15 | 38202 | systems/mac/mactex/ExtrasFolder.pdf
2022/02/15 | 3776 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/minimal_working_example.png
2022/02/15 | 375 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets/interlocking.tikz
-2022/02/15 | 37379 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/02/15 | 37133 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/02/15 | 37113 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2022/02/15 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
2022/02/15 | 36564 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets.tex
2022/02/15 | 365576 | systems/texlive/tlnet/archive/proflycee.doc.r62027.tar.xz
-2022/02/15 | 36061 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/02/15 | 355068 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/02/15 | 35239 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/02/15 | 35179 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/02/15 | 34543 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2022/02/15 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/02/15 | 33799 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2022/02/15 | 332532 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/02/15 | 32965 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/02/15 | 326181 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2022/02/15 | 323185 | macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
2022/02/15 | 3220 | graphics/pgf/contrib/tikz-trackschematic/README.md
-2022/02/15 | 32081 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2022/02/15 | 320672 | install/macros/luatex/generic/lua-widow-control.tds.zip
2022/02/15 | 317708 | macros/luatex/generic/lua-widow-control.zip
-2022/02/15 | 317512 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
2022/02/15 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
2022/02/15 | 31735 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2022/02/15 | 31572 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/02/15 | 31540 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/02/15 | 31413 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/02/15 | 31336 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/02/15 | 30559 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/02/15 | 30182 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/02/15 | 296124 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2022/02/15 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2022/02/15 | 28770 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/02/15 | 28704 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/02/15 | 286572 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/02/15 | 286070 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/02/15 | 28583 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/02/15 | 285552 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/02/15 | 28338 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/02/15 | 281919 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/02/15 | 2799004 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/02/15 | 27787 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/02/15 | 27462 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2022/02/15 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2022/02/15 | 27254 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/02/15 | 2674152 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/02/15 | 265642 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/02/15 | 265605 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
2022/02/15 | 26531 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex
2022/02/15 | 26311 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex
2022/02/15 | 25985 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2022/02/15 | 259151 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/02/15 | 256593 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/02/15 | 25628089 | systems/texlive/tlnet/install-tl.zip
-2022/02/15 | 254847 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/02/15 | 25481 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/02/15 | 25130 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/02/15 | 251252 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/02/15 | 25080 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/02/15 | 2492 | macros/latex/contrib/siunitx/siunitx-code.tex
-2022/02/15 | 244997 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
2022/02/15 | 2431 | macros/luatex/generic/lua-widow-control/README.md
2022/02/15 | 24148 | systems/texlive/tlnet/archive/cweb.r62023.tar.xz
-2022/02/15 | 24077 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/02/15 | 23936 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/02/15 | 2386 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.code.tex
2022/02/15 | 23721 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex
2022/02/15 | 236395 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic.pdf
-2022/02/15 | 2349932 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/02/15 | 2234 | macros/luatex/generic/lua-widow-control/lua-widow-control.sty
2022/02/15 | 22285 | macros/luatex/generic/lua-widow-control/lwc-documentation.tex
-2022/02/15 | 22156 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2022/02/15 | 21768 | systems/texlive/tlnet/archive/footmisc.source.r62025.tar.xz
-2022/02/15 | 216597 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/02/15 | 213133 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/02/15 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/02/15 | 21481 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
2022/02/15 | 2123 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic.sty
-2022/02/15 | 209864 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/02/15 | 20873817 | systems/texlive/tlnet/install-tl-windows.exe
-2022/02/15 | 203066 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/02/15 | 20191 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/02/15 | 2006598 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/02/15 | 200155 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/02/15 | 199792 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/02/15 | 199419 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/02/15 | 199170 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2022/02/15 | 19900 | macros/latex/contrib/siunitx/siunitx.dtx
2022/02/15 | 1989 | macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
-2022/02/15 | 196137 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/02/15 | 18494 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/02/15 | 18376 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/02/15 | 191858 | macros/latex/contrib/nicematrix/nicematrix-french.tex
2022/02/15 | 182781 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-snippets.pdf
2022/02/15 | 18177 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex
-2022/02/15 | 181555 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/02/15 | 179947 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/02/15 | 1732208 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2022/02/15 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2022/02/15 | 172637 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2022/02/15 | 1722 | macros/luatex/generic/lua-widow-control/lua-widow-control.tex
-2022/02/15 | 17111146 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/02/15 | 168798 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/02/15 | 1711 | systems/mac/mactex/Licenses.txt
2022/02/15 | 16709 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2022/02/15 | 16570 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/02/15 | 16509 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2022/02/15 | 16452 | systems/texlive/tlnet/archive/easybook.r62024.tar.xz
2022/02/15 | 16356 | systems/texlive/tlnet/archive/easybook.source.r62024.tar.xz
-2022/02/15 | 157566 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/02/15 | 155441 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/02/15 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
2022/02/15 | 15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
-2022/02/15 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/02/15 | 152020 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/02/15 | 1499491 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/02/15 | 149431 | macros/latex/contrib/siunitx/siunitx.tex
2022/02/15 | 1492 | macros/luatex/generic/lua-widow-control/lwc-documentation.bib
2022/02/15 | 1465577 | install/macros/latex/contrib/siunitx.tds.zip
-2022/02/15 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/02/15 | 1452955 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/02/15 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/02/15 | 14409 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2022/02/15 | 1425051 | macros/latex/contrib/siunitx.zip
2022/02/15 | 14214 | macros/luatex/generic/lua-widow-control/lua-widow-control.lua
-2022/02/15 | 1418292 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/02/15 | 1416849 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/02/15 | 139187 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2022/02/15 | 13860 | macros/latex/contrib/spbmark/spbmark.sty
-2022/02/15 | 135906 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/02/15 | 1355175 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/02/15 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/02/15 | 134990 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/02/15 | 1322847 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/02/15 | 1310041 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/02/15 | 1309239 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/02/15 | 1300071 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/02/15 | 126866 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/02/15 | 123850 | macros/latex/contrib/siunitx/siunitx-number.dtx
2022/02/15 | 12369 | macros/latex/contrib/spbmark/spbmark.tex
-2022/02/15 | 120231 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2022/02/15 | 11819 | graphics/pgf/contrib/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex
-2022/02/15 | 1181083 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
2022/02/15 | 1161 | graphics/pgf/contrib/tikz-trackschematic/tikz-trackschematic-examples/minimal_working_example.pdf
-2022/02/15 | 115636 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/02/15 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/02/15 | 113012 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/02/15 | 112669 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/02/15 | 109550 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/02/15 | 109307 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/02/15 | 1086644 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/02/15 | 108616 | systems/texlive/tlnet/archive/texlive-scripts.r62016.tar.xz
-2022/02/15 | 104697 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/02/15 | 103413 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/02/15 | 101560 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/02/15 | 106655 | systems/texlive/tlnet/install-tl
+2022/02/15 | 103025 | systems/texlive/tlnet/tlpkg/translations/sr.po
2022/02/15 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
2022/02/14 | 9540 | macros/latex/contrib/asmeconf/README.md
2022/02/14 | 930450 | macros/latex/contrib/kanbun.zip
@@ -444,7 +517,6 @@
2022/02/14 | 859 | macros/latex/contrib/footmisc/changes.txt
2022/02/14 | 840816 | systems/texlive/tlnet/archive/babel.doc.r62007.tar.xz
2022/02/14 | 81088 | macros/latex/contrib/footmisc/footmisc.dtx
-2022/02/14 | 7033 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/02/14 | 698840 | systems/texlive/tlnet/archive/babel.source.r62007.tar.xz
2022/02/14 | 6956 | systems/texlive/tlnet/archive/pyluatex.r62008.tar.xz
2022/02/14 | 626213 | macros/latex/contrib/footmisc.zip
@@ -455,11 +527,9 @@
2022/02/14 | 48184 | systems/texlive/tlnet/archive/ninecolors.doc.r62006.tar.xz
2022/02/14 | 468 | macros/latex/contrib/footmisc/README.md
2022/02/14 | 457900 | systems/texlive/tlnet/archive/expkv-cs.doc.r62003.tar.xz
-2022/02/14 | 435 | macros/latex/contrib/proflycee/README.md
2022/02/14 | 42430 | macros/latex/contrib/asmeconf/asmeconf-template.tex
2022/02/14 | 37844 | macros/latex/contrib/asmeconf/asmeconf.bst
2022/02/14 | 3743560 | systems/texlive/tlnet/archive/bidi.doc.r62010.tar.xz
-2022/02/14 | 368647 | macros/latex/contrib/proflycee.zip
2022/02/14 | 363566 | macros/latex/contrib/footmisc/footmisc-code.pdf
2022/02/14 | 34608 | systems/texlive/tlnet/archive/xindex.r62002.tar.xz
2022/02/14 | 31720 | systems/texlive/tlnet/archive/chemmacros.r62004.tar.xz
@@ -477,9 +547,7 @@
2022/02/14 | 135560 | systems/texlive/tlnet/archive/bmstu.r62012.tar.xz
2022/02/14 | 134224 | systems/texlive/tlnet/archive/bidi.source.r62010.tar.xz
2022/02/14 | 1289628 | systems/texlive/tlnet/archive/bmstu.doc.r62012.tar.xz
-2022/02/14 | 12030 | macros/latex/contrib/proflycee/tex/ProfLycee.sty
2022/02/14 | 116400 | systems/texlive/tlnet/archive/bidi.r62010.tar.xz
-2022/02/14 | 106549 | systems/texlive/tlnet/install-tl
2022/02/14 | 1050568 | systems/texlive/tlnet/archive/zref-check.doc.r62011.tar.xz
2022/02/14 | 1045120 | systems/texlive/tlnet/archive/chemmacros.doc.r62004.tar.xz
2022/02/14 | 101 | macros/latex/contrib/footmisc/footmisc-code.tex
@@ -535,9 +603,7 @@
2022/02/13 | 403429 | macros/latex/contrib/kanbun/kanbun-en.pdf
2022/02/13 | 3991 | macros/xetex/latex/bidi-atbegshi/bidi-atbegshi.sty
2022/02/13 | 3948780 | macros/xetex/latex/bidi.zip
-2022/02/13 | 39336 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
2022/02/13 | 39021 | indexing/xindex/doc/tests/buch.pdf
-2022/02/13 | 362084 | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
2022/02/13 | 3596 | macros/xetex/latex/bidi/bidi-doc-preamble.ltx
2022/02/13 | 3526 | macros/latex/required/babel/base/bbidxglo.dtx
2022/02/13 | 34606 | indexing/xindex/doc/tests/demo.pdf
@@ -622,7 +688,6 @@
2022/02/12 | 6099 | indexing/xindex/lualatex/xindex-norsk.lua
2022/02/12 | 60853 | macros/latex/contrib/xsim/examples/xsim.texsx-549540.pdf
2022/02/12 | 60453 | macros/latex/contrib/xsim/examples/xsim.texsx-466584.pdf
-2022/02/12 | 58 | systems/mac/mactex/MacTeXtras-20220212.zip.md5
2022/02/12 | 5868 | macros/latex/contrib/xsim/examples/xsim.various.tex
2022/02/12 | 57642 | indexing/xindex/doc/xindex-doc.tex
2022/02/12 | 57220 | macros/latex/contrib/xsim/examples/xsim.listofexercises.pdf
@@ -634,7 +699,6 @@
2022/02/12 | 51800 | macros/latex/contrib/xsim/examples/xsim.texsx-580636.pdf
2022/02/12 | 50575 | macros/latex/contrib/xsim/examples/xsim.texsx-395273.pdf
2022/02/12 | 49333 | macros/latex/contrib/xsim/examples/xsim.texsx-576998.pdf
-2022/02/12 | 486130359 | systems/mac/mactex/MacTeXtras-20220212.zip
2022/02/12 | 484271 | macros/latex/contrib/snotez.zip
2022/02/12 | 4835 | indexing/xindex/lualatex/xindex-dtk.lua
2022/02/12 | 48095 | macros/latex/contrib/xsim/examples/xsim.texsx-299534.pdf
@@ -659,7 +723,6 @@
2022/02/12 | 3855 | macros/latex/contrib/xsim/examples/xsim.texsx-549540.tex
2022/02/12 | 38372 | macros/latex/contrib/xsim/examples/xsim.boxed-headings.pdf
2022/02/12 | 38256 | macros/latex/contrib/xsim/examples/xsim.blanks.pdf
-2022/02/12 | 38199 | systems/mac/mactex/ExtrasFolder.pdf
2022/02/12 | 37717 | macros/latex/contrib/xsim/examples/xsim.floating.pdf
2022/02/12 | 36974 | macros/latex/contrib/xsim/examples/xsim.texsx-305110.pdf
2022/02/12 | 3670 | macros/latex/contrib/xsim/README
@@ -708,7 +771,6 @@
2022/02/12 | 1759 | macros/latex/contrib/knowledge/knowledge.ins
2022/02/12 | 1749 | macros/latex/contrib/xsim/examples/xsim.texwelt-6698.tex
2022/02/12 | 174327 | macros/latex/contrib/knowledge/knowledge-code.dtx
-2022/02/12 | 1711 | systems/mac/mactex/Licenses.txt
2022/02/12 | 1586903 | macros/latex/contrib/zref-clever.zip
2022/02/12 | 1566 | macros/latex/contrib/xsim/examples/xsim.texwelt-23968.tex
2022/02/12 | 1537 | macros/latex/contrib/xsim/examples/xsim.texsx-498299.tex
@@ -1450,89 +1512,3 @@
2022/02/10 | 10479 | macros/latex/contrib/upmethodology/src/upmethodology-document.cls
2022/02/10 | 10311 | macros/latex/contrib/crefthe/crefthe-doc.tex
2022/02/10 | 10068459 | systems/texlive/tlnet/update-tlmgr-r61961.sh
-2022/02/09 | 83001 | systems/win32/miktex/tm/packages/luafindfont__doc.tar.lzma
-2022/02/09 | 8082 | macros/latex/contrib/jmlr/CHANGES
-2022/02/09 | 77938 | systems/win32/miktex/tm/packages/tkz-euclide__source.tar.lzma
-2022/02/09 | 74974 | systems/win32/miktex/tm/packages/spbmark__doc.tar.lzma
-2022/02/09 | 749696 | systems/texlive/tlnet/archive/tkz-fct.doc.r61949.tar.xz
-2022/02/09 | 722683 | systems/win32/miktex/tm/packages/tkz-fct__doc.tar.lzma
-2022/02/09 | 697475 | systems/win32/miktex/tm/packages/zref-vario__doc.tar.lzma
-2022/02/09 | 6884 | systems/win32/miktex/tm/packages/tikz-karnaugh.tar.lzma
-2022/02/09 | 6696 | systems/texlive/tlnet/archive/tikz-karnaugh.r61945.tar.xz
-2022/02/09 | 6504 | macros/latex/contrib/censor/censor.sty
-2022/02/09 | 633284 | macros/latex/contrib/jmlr/jmlr.pdf
-2022/02/09 | 5906 | systems/win32/miktex/tm/packages/luafindfont__source.tar.lzma
-2022/02/09 | 5788 | systems/win32/miktex/tm/packages/zref-check.tar.lzma
-2022/02/09 | 56978 | support/texlogsieve/texlogsieve.pdf
-2022/02/09 | 537 | macros/latex/contrib/jmlr/pmlr-sample.bib
-2022/02/09 | 5225 | systems/win32/miktex/tm/packages/luafindfont.tar.lzma
-2022/02/09 | 4927 | systems/win32/miktex/tm/packages/tkz-fct.tar.lzma
-2022/02/09 | 4800008 | systems/texlive/tlnet/archive/fiziko.doc.r61944.tar.xz
-2022/02/09 | 4740 | systems/texlive/tlnet/archive/tkz-fct.r61949.tar.xz
-2022/02/09 | 460820 | info/biblio/texbook2.bib
-2022/02/09 | 43483 | systems/win32/miktex/tm/packages/tuda-ci.tar.lzma
-2022/02/09 | 4210 | systems/win32/miktex/tm/packages/zref-vario.tar.lzma
-2022/02/09 | 4075 | systems/win32/miktex/tm/packages/spbmark__source.tar.lzma
-2022/02/09 | 3916 | info/biblio/texbook3.ltx
-2022/02/09 | 38644 | systems/texlive/tlnet/archive/tkz-euclide.r61948.tar.xz
-2022/02/09 | 38280 | systems/win32/miktex/tm/packages/tkz-euclide.tar.lzma
-2022/02/09 | 381520 | systems/texlive/tlnet/archive/tkz-base.doc.r61947.tar.xz
-2022/02/09 | 358864 | systems/texlive/tlnet/archive/tikz-karnaugh.doc.r61945.tar.xz
-2022/02/09 | 3559931 | macros/latex/contrib/beamer.zip
-2022/02/09 | 35149 | support/texlogsieve/LICENCE.txt
-2022/02/09 | 346340 | macros/latex/contrib/jmlr/pmlr-sample.pdf
-2022/02/09 | 339215 | systems/win32/miktex/tm/packages/tikz-karnaugh__doc.tar.lzma
-2022/02/09 | 3372 | systems/win32/miktex/tm/packages/spbmark.tar.lzma
-2022/02/09 | 33373 | macros/latex/contrib/handoutwithnotes/handoutWithNotes.dtx
-2022/02/09 | 324066 | macros/latex/contrib/handoutwithnotes.zip
-2022/02/09 | 322975 | macros/latex/contrib/handoutwithnotes/handoutWithNotes.pdf
-2022/02/09 | 2883 | info/biblio/texbook2.ltx
-2022/02/09 | 2852 | info/biblio/typeset.ltx
-2022/02/09 | 28126 | systems/win32/miktex/tm/packages/tkz-fct__source.tar.lzma
-2022/02/09 | 26092 | macros/latex/contrib/jmlr/pmlr-sample.tex
-2022/02/09 | 25791 | macros/latex/contrib/censor/censor.tex
-2022/02/09 | 2519 | support/texlogsieve/README.md
-2022/02/09 | 24932 | systems/texlive/tlnet/archive/byrne.r61943.tar.xz
-2022/02/09 | 241196 | macros/latex/contrib/formal-grammar.zip
-2022/02/09 | 2399 | macros/latex/contrib/handoutwithnotes/README.md
-2022/02/09 | 235309 | macros/latex/contrib/formal-grammar/formal-grammar.pdf
-2022/02/09 | 230707 | systems/win32/miktex/tm/packages/erewhon-math.tar.lzma
-2022/02/09 | 230200 | systems/texlive/tlnet/archive/erewhon-math.r61942.tar.xz
-2022/02/09 | 2301 | macros/latex/contrib/handoutwithnotes/handoutWithNotes.ins
-2022/02/09 | 22700 | systems/texlive/tlnet/archive/fiziko.r61944.tar.xz
-2022/02/09 | 221880 | macros/latex/contrib/censor/censor.pdf
-2022/02/09 | 22021 | systems/win32/miktex/tm/packages/zref-check__source.tar.lzma
-2022/02/09 | 218551 | macros/latex/contrib/jmlr/jmlr.dtx
-2022/02/09 | 21282 | systems/win32/miktex/tm/packages/tikz-karnaugh__source.tar.lzma
-2022/02/09 | 20893 | support/texlogsieve/texlogsieve.tex
-2022/02/09 | 20845 | systems/win32/miktex/tm/packages/hamnosys.tar.lzma
-2022/02/09 | 20636 | systems/texlive/tlnet/archive/hamnosys.r61941.tar.xz
-2022/02/09 | 1965252 | systems/texlive/tlnet/archive/erewhon-math.doc.r61942.tar.xz
-2022/02/09 | 1961142 | systems/win32/miktex/tm/packages/erewhon-math__doc.tar.lzma
-2022/02/09 | 18906 | macros/latex/contrib/formal-grammar/formal-grammar.dtx
-2022/02/09 | 1853 | macros/latex/contrib/jmlr/README
-2022/02/09 | 181633 | systems/win32/miktex/tm/packages/hamnosys__doc.tar.lzma
-2022/02/09 | 181248 | systems/texlive/tlnet/archive/hamnosys.doc.r61941.tar.xz
-2022/02/09 | 17804 | CTAN.sites
-2022/02/09 | 172841 | support/texlogsieve/texlogsieve
-2022/02/09 | 164212 | systems/texlive/tlnet/archive/byrne.doc.r61943.tar.xz
-2022/02/09 | 16236 | systems/win32/miktex/tm/packages/hamnosys__source.tar.lzma
-2022/02/09 | 15888 | systems/texlive/tlnet/archive/hamnosys.source.r61941.tar.xz
-2022/02/09 | 15324 | systems/texlive/tlnet/archive/tkz-base.r61947.tar.xz
-2022/02/09 | 1504 | systems/texlive/tlnet/archive/collection-pictures.r61943.tar.xz
-2022/02/09 | 1446 | macros/latex/contrib/formal-grammar/formal-grammar.ins
-2022/02/09 | 13141 | systems/win32/miktex/tm/packages/erewhon-math__source.tar.lzma
-2022/02/09 | 124467 | support/texlogsieve.zip
-2022/02/09 | 123 | macros/latex/contrib/jmlr/example-teximage.tex
-2022/02/09 | 1187080 | info/biblio/typeset.bib
-2022/02/09 | 11458 | support/texlogsieve/texlogsieve.1
-2022/02/09 | 1143101 | systems/win32/miktex/tm/packages/tuda-ci__doc.tar.lzma
-2022/02/09 | 1132 | macros/latex/contrib/jmlr/jmlr.ins
-2022/02/09 | 1097820 | systems/texlive/tlnet/archive/tkz-euclide.doc.r61948.tar.xz
-2022/02/09 | 1093 | macros/latex/contrib/formal-grammar/README.md
-2022/02/09 | 10915 | systems/win32/miktex/tm/packages/zref-vario__source.tar.lzma
-2022/02/09 | 1057301 | systems/win32/miktex/tm/packages/zref-check__doc.tar.lzma
-2022/02/09 | 1035078 | install/macros/latex/contrib/jmlr.tds.zip
-2022/02/09 | 1021522 | systems/win32/miktex/tm/packages/tkz-euclide__doc.tar.lzma
-2022/02/09 | 1011245 | macros/latex/contrib/jmlr.zip
-2022/02/09 | 1001976 | info/biblio/texbook3.bib
diff --git a/fonts/cochineal/README b/fonts/cochineal/README
index 74ba83b2d0..960217299d 100644
--- a/fonts/cochineal/README
+++ b/fonts/cochineal/README
@@ -19,10 +19,17 @@ Files provided "as is", with no warranties.
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts, LGR for Greek scripts and T2A and OT2 for Cyrillic scripts.
-Current version: 1.076 (2022-01-31)
+Current version: 1.077 (2022-02-15)
+
+Changes in version 1.077
+1. Added the mincochneal fd files, needed for loading from newtx.
+2. Added a decorative Q glyph to each style along with a small cap version. Available only using unicode latex, +ss03. Can be globally set by option altQ.
+3. Added a decorative J glyph to italic and bold italic. Available only using unicode latex, +ss02. Can be globally set by option altJ.
+4. Thanks once more to Bernhard Hermes for his excellent bug-finding skills, a number of omissions and errors in the Cochineal lookup tables were corrected. I've added brackets to the superiors at his suggestion, seeing that the Wikipedia superscript marker style is like [1].
+5. Reworked cochineal.sty so that its code works with both unicode and non-unicode latex, and so that it may be specified as an option to newtx using any current latex engine.
Changes in version 1.076
-Added definitions of \nustyle and \destyle to erewhon.sty.
+Added definitions of \nustyle and \destyle to cochineal.sty.
Changes in version 1.075
Corrected three poor glyphs in Bold Cyrillic: uni403, uni413, uni41F. (Thanks Stoyan Stoyanov.)
@@ -31,7 +38,7 @@ Changes in version 1.074
Corrected case in Cochineal-Italic.afm
Changes in version 1.073
-Added Cochineal-Italic.afm, missing in 1.072, and corrected names of CochIneal-Roman.{afm,pfb}.
+Added Cochineal-Italic.afm, missing in 1.072, and corrected names of Cochineal-Roman.{afm,pfb}.
Changes in version 1.072
Corrected the pnum Lookup in Cochineal-Bold, which was causing bold-osf 4 to render as 5. (Thanks Woooseok Kim for catching this error.)
diff --git a/fonts/cochineal/afm/Cochineal-Bold.afm b/fonts/cochineal/afm/Cochineal-Bold.afm
index 4b813e2dc1..8bfe3a7622 100644
--- a/fonts/cochineal/afm/Cochineal-Bold.afm
+++ b/fonts/cochineal/afm/Cochineal-Bold.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20201107
-Comment Creation Date: Mon Jan 10 16:15:16 2022
+Comment Creation Date: Tue Feb 15 17:49:36 2022
FontName Cochineal-Bold
FullName Cochineal Bold
FamilyName Cochineal
@@ -20,7 +20,7 @@ CapHeight 672
XHeight 435
Ascender 705
Descender -209
-StartCharMetrics 1605
+StartCharMetrics 1607
C 0 ; WX 212 ; N space ; B 0 0 0 0 ;
C 1 ; WX 269 ; N exclam ; B 59 -11 209 642 ;
C 2 ; WX 330 ; N quotedbl ; B 36 431 289 700 ;
@@ -1626,6 +1626,8 @@ C -1 ; WX 606 ; N q.ss03.swsh.sc ; B 39 -178 862 459 ;
C -1 ; WX 533 ; N q.ss03 ; B 32 -218 542 446 ;
C -1 ; WX 533 ; N q.ss03.swsh ; B 32 -218 542 446 ;
C -1 ; WX 0 ; N uni200D ; B 0 0 0 0 ;
+C -1 ; WX 250 ; N bracketleft.superior ; B 50 166 212 752 ;
+C -1 ; WX 236 ; N bracketright.superior ; B 25 166 187 752 ;
EndCharMetrics
StartKernData
StartKernPairs 143865
diff --git a/fonts/cochineal/afm/Cochineal-BoldItalic.afm b/fonts/cochineal/afm/Cochineal-BoldItalic.afm
index eb0ff91cdf..80a9a3538d 100644
--- a/fonts/cochineal/afm/Cochineal-BoldItalic.afm
+++ b/fonts/cochineal/afm/Cochineal-BoldItalic.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20201107
-Comment Creation Date: Mon Dec 13 16:36:59 2021
+Comment Creation Date: Tue Feb 15 17:53:11 2022
FontName Cochineal-BoldItalic
FullName Cochineal Bold Italic
FamilyName Cochineal
@@ -20,7 +20,7 @@ CapHeight 666
XHeight 459
Ascender 679
Descender -215
-StartCharMetrics 1578
+StartCharMetrics 1580
C 0 ; WX 221 ; N space ; B 0 0 0 0 ;
C 1 ; WX 257 ; N exclam ; B 22 -11 254 646 ;
C 2 ; WX 334 ; N quotedbl ; B 105 437 366 702 ;
@@ -1599,6 +1599,8 @@ C -1 ; WX 606 ; N q.ss03.swsh.sc ; B 51 -178 818 459 ;
C -1 ; WX 455 ; N q.ss03 ; B 11 -221 422 452 ;
C -1 ; WX 455 ; N q.ss03.swsh ; B 11 -221 422 452 ;
C -1 ; WX 0 ; N uni200D ; B 0 0 0 0 ;
+C -1 ; WX 250 ; N bracketleft.superior ; B 66 166 339 752 ;
+C -1 ; WX 236 ; N bracketright.superior ; B 67 166 341 752 ;
EndCharMetrics
StartKernData
StartKernPairs 82888
diff --git a/fonts/cochineal/afm/Cochineal-Italic.afm b/fonts/cochineal/afm/Cochineal-Italic.afm
index 9f8fd0c4e4..59a085eff8 100644
--- a/fonts/cochineal/afm/Cochineal-Italic.afm
+++ b/fonts/cochineal/afm/Cochineal-Italic.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20201107
-Comment Creation Date: Tue Dec 14 14:45:50 2021
+Comment Creation Date: Tue Feb 15 17:48:54 2022
FontName Cochineal-Italic
FullName Cochineal Italic
FamilyName Cochineal
@@ -20,7 +20,7 @@ CapHeight 669
XHeight 454
Ascender 703
Descender -191
-StartCharMetrics 1598
+StartCharMetrics 1600
C 0 ; WX 228 ; N space ; B 0 0 0 0 ;
C 1 ; WX 235 ; N exclam ; B 20 -14 226 639 ;
C 2 ; WX 333 ; N quotedbl ; B 107 439 360 706 ;
@@ -1619,6 +1619,8 @@ C -1 ; WX 564 ; N q.ss03.swsh.sc ; B 50 -198 766 446 ;
C -1 ; WX 430 ; N q.ss03 ; B 19 -237 387 440 ;
C -1 ; WX 430 ; N q.ss03.swsh ; B 19 -237 387 440 ;
C -1 ; WX 0 ; N uni200D ; B 0 0 0 0 ;
+C -1 ; WX 199 ; N bracketleft.superior ; B 62 141 299 745 ;
+C -1 ; WX 199 ; N bracketright.superior ; B 69 141 305 745 ;
EndCharMetrics
StartKernData
StartKernPairs 93299
diff --git a/fonts/cochineal/afm/Cochineal-Roman.afm b/fonts/cochineal/afm/Cochineal-Roman.afm
index f7dadfcc7b..2da5e1fd8f 100644
--- a/fonts/cochineal/afm/Cochineal-Roman.afm
+++ b/fonts/cochineal/afm/Cochineal-Roman.afm
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
Comment Generated by FontForge 20201107
-Comment Creation Date: Fri Jan 28 16:10:17 2022
+Comment Creation Date: Tue Feb 15 17:45:56 2022
FontName Cochineal-Roman
FullName Cochineal Roman
FamilyName Cochineal
@@ -20,7 +20,7 @@ CapHeight 643
XHeight 425
Ascender 643
Descender -202
-StartCharMetrics 1629
+StartCharMetrics 1631
C 0 ; WX 211 ; N space ; B 0 0 0 0 ;
C 1 ; WX 235 ; N exclam ; B 63 -11 171 627 ;
C 2 ; WX 273 ; N quotedbl ; B 38 462 231 683 ;
@@ -1650,6 +1650,8 @@ C -1 ; WX 729 ; N Q.ss03.swsh ; B 48 -225 1065 651 ;
C -1 ; WX 564 ; N q.ss03.sc ; B 35 -183 546 447 ;
C -1 ; WX 564 ; N q.ss03.swsh.sc ; B 35 -198 812 446 ;
C -1 ; WX 491 ; N q.ss03.swsh ; B 38 -222 490 438 ;
+C -1 ; WX 199 ; N bracketleft.superior ; B 51 141 174 745 ;
+C -1 ; WX 199 ; N bracketright.superior ; B 51 141 174 745 ;
EndCharMetrics
StartKernData
StartKernPairs 141672
diff --git a/fonts/cochineal/opentype/Cochineal-Bold.otf b/fonts/cochineal/opentype/Cochineal-Bold.otf
index 249038789d..6d00108f4f 100644
--- a/fonts/cochineal/opentype/Cochineal-Bold.otf
+++ b/fonts/cochineal/opentype/Cochineal-Bold.otf
Binary files differ
diff --git a/fonts/cochineal/opentype/Cochineal-BoldItalic.otf b/fonts/cochineal/opentype/Cochineal-BoldItalic.otf
index d0005d32bf..b8fd6abd08 100644
--- a/fonts/cochineal/opentype/Cochineal-BoldItalic.otf
+++ b/fonts/cochineal/opentype/Cochineal-BoldItalic.otf
Binary files differ
diff --git a/fonts/cochineal/opentype/Cochineal-Italic.otf b/fonts/cochineal/opentype/Cochineal-Italic.otf
index 6284fb8f4f..21af248e6e 100644
--- a/fonts/cochineal/opentype/Cochineal-Italic.otf
+++ b/fonts/cochineal/opentype/Cochineal-Italic.otf
Binary files differ
diff --git a/fonts/cochineal/opentype/Cochineal-Roman.otf b/fonts/cochineal/opentype/Cochineal-Roman.otf
index 57d1421297..7885f772f7 100644
--- a/fonts/cochineal/opentype/Cochineal-Roman.otf
+++ b/fonts/cochineal/opentype/Cochineal-Roman.otf
Binary files differ
diff --git a/fonts/cochineal/tex/ly1mincochineal.fd b/fonts/cochineal/tex/ly1mincochineal.fd
new file mode 100644
index 0000000000..1520bf9934
--- /dev/null
+++ b/fonts/cochineal/tex/ly1mincochineal.fd
@@ -0,0 +1,112 @@
+%% Generated by msharpe on 2022/02/04
+%%
+\ProvidesFile{ly1mincochineal.fd}
+ [2022/02/04 (msharpe) Font definitions for LY1/mincochineal.]
+
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \global\let\Cochineal@@swashQ\@empty
+\fi
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+\DeclareFontFamily{LY1}{mincochineal}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{nw}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{sc}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{it}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf\Cochineal@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{n}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf\Cochineal@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{scit}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{sw}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{sl}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{b}{scsl}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{sw}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-swash-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{n}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf\Cochineal@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{scit}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{it}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf\Cochineal@@swashQ-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{sc}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{nw}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-swash-ly1
+}{}
+% changed 2019-06-21 to enable theorem font
+\DeclareFontShape{LY1}{mincochineal}{m}{sl}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-th-ly1
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{m}{scsl}{
+ <-> ssub * mincochineal/m/scit
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{nw}{
+ <-> ssub * mincochineal/b/nw
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{sl}{
+ <-> ssub * mincochineal/b/sl
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{n}{
+ <-> ssub * mincochineal/b/n
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{sw}{
+ <-> ssub * mincochineal/b/sw
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{scsl}{
+ <-> ssub * mincochineal/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{sc}{
+ <-> ssub * mincochineal/b/sc
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{it}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{LY1}{mincochineal}{bx}{scit}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\endinput
diff --git a/fonts/cochineal/tex/ot1mincochineal.fd b/fonts/cochineal/tex/ot1mincochineal.fd
new file mode 100644
index 0000000000..4969ca24b7
--- /dev/null
+++ b/fonts/cochineal/tex/ot1mincochineal.fd
@@ -0,0 +1,112 @@
+%% Generated by msharpe on 2022/02/04
+%%
+\ProvidesFile{ot1mincochineal.fd}
+ [2022/02/04 (msharpe) Font definitions for OT1/mincochineal.]
+
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \global\let\Cochineal@@swashQ\@empty
+\fi
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+\DeclareFontFamily{OT1}{mincochineal}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{sw}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{nw}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{it}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf\Cochineal@@swashQ-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{sc}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{n}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf\Cochineal@@swashQ-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{scit}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-sc-ot1
+}{}
+% changed 2019-06-21 to enable theorem font
+\DeclareFontShape{OT1}{mincochineal}{m}{sl}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-th-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{m}{scsl}{
+ <-> ssub * mincochineal/m/scit
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{scit}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{n}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf\Cochineal@@swashQ-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{sc}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{it}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf\Cochineal@@swashQ-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{nw}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{sw}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-swash-ot1
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{sl}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{b}{scsl}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{scit}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{sc}{
+ <-> ssub * mincochineal/b/sc
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{it}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{n}{
+ <-> ssub * mincochineal/b/n
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{sl}{
+ <-> ssub * mincochineal/b/sl
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{nw}{
+ <-> ssub * mincochineal/b/nw
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{scsl}{
+ <-> ssub * mincochineal/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{mincochineal}{bx}{sw}{
+ <-> ssub * mincochineal/b/sw
+}{}
+
+\endinput
diff --git a/fonts/cochineal/tex/t1mincochineal.fd b/fonts/cochineal/tex/t1mincochineal.fd
new file mode 100644
index 0000000000..307c3eefb0
--- /dev/null
+++ b/fonts/cochineal/tex/t1mincochineal.fd
@@ -0,0 +1,112 @@
+%% Generated by msharpe on 2022/02/04
+%%
+\ProvidesFile{t1mincochineal.fd}
+ [2022/02/04 (msharpe) Font definitions for T1/mincochineal.]
+
+\expandafter\ifx\csname Cochineal@@swashQ\endcsname\relax%
+ \global\let\Cochineal@@swashQ\@empty
+\fi
+
+\expandafter\ifx\csname ntxmath@scaled\endcsname\relax
+ \let\ntxmath@scaled\@empty
+\fi
+
+\DeclareFontFamily{T1}{mincochineal}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{it}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf\Cochineal@@swashQ-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{sc}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{nw}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{scit}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{n}{
+ <-> \ntxmath@scaled Cochineal-Bold-tlf\Cochineal@@swashQ-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{sw}{
+ <-> \ntxmath@scaled Cochineal-BoldItalic-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{sl}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{b}{scsl}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{n}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf\Cochineal@@swashQ-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{scit}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{nw}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-swash-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{sc}{
+ <-> \ntxmath@scaled Cochineal-Roman-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{it}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf\Cochineal@@swashQ-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{sw}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-swash-t1
+}{}
+% changed 2019-06-21 to enable theorem font
+\DeclareFontShape{T1}{mincochineal}{m}{sl}{
+ <-> \ntxmath@scaled Cochineal-Italic-tlf-th-t1
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{m}{scsl}{
+ <-> ssub * mincochineal/m/scit
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{n}{
+ <-> ssub * mincochineal/b/n
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{nw}{
+ <-> ssub * mincochineal/b/nw
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{sl}{
+ <-> ssub * mincochineal/b/sl
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{scsl}{
+ <-> ssub * mincochineal/b/scsl
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{sw}{
+ <-> ssub * mincochineal/b/sw
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{scit}{
+ <-> ssub * mincochineal/b/scit
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{it}{
+ <-> ssub * mincochineal/b/it
+}{}
+
+\DeclareFontShape{T1}{mincochineal}{bx}{sc}{
+ <-> ssub * mincochineal/b/sc
+}{}
+
+\endinput
diff --git a/fonts/cochineal/type1/Cochineal-Bold.pfb b/fonts/cochineal/type1/Cochineal-Bold.pfb
index d1d08cc1a0..7fad59aa98 100644
--- a/fonts/cochineal/type1/Cochineal-Bold.pfb
+++ b/fonts/cochineal/type1/Cochineal-Bold.pfb
Binary files differ
diff --git a/fonts/cochineal/type1/Cochineal-BoldItalic.pfb b/fonts/cochineal/type1/Cochineal-BoldItalic.pfb
index b458aa6814..0e45a73c61 100644
--- a/fonts/cochineal/type1/Cochineal-BoldItalic.pfb
+++ b/fonts/cochineal/type1/Cochineal-BoldItalic.pfb
Binary files differ
diff --git a/fonts/cochineal/type1/Cochineal-Italic.pfb b/fonts/cochineal/type1/Cochineal-Italic.pfb
index 53c6f818e0..752b191f95 100644
--- a/fonts/cochineal/type1/Cochineal-Italic.pfb
+++ b/fonts/cochineal/type1/Cochineal-Italic.pfb
Binary files differ
diff --git a/fonts/cochineal/type1/Cochineal-Roman.pfb b/fonts/cochineal/type1/Cochineal-Roman.pfb
index bdbd681b18..b750cb33fb 100644
--- a/fonts/cochineal/type1/Cochineal-Roman.pfb
+++ b/fonts/cochineal/type1/Cochineal-Roman.pfb
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-karnaugh/README.txt b/graphics/pgf/contrib/tikz-karnaugh/README.txt
index b9e11e222d..82f12ef650 100644
--- a/graphics/pgf/contrib/tikz-karnaugh/README.txt
+++ b/graphics/pgf/contrib/tikz-karnaugh/README.txt
@@ -1,11 +1,11 @@
-Copyright (C) 2017 by Luis Paulo Laus, <laus@utfpr.edu.br>
+Copyright (C) 2017-2022 by Luis Paulo Laus, <laus@utfpr.edu.br>
------------------------------------------------------------
The tikz-karnaugh package may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1 of this license or (at your option) any later version. The latest version of this license is in:
http://www.latex-project.org/lppl.txt and version 1 or
later is part of all distributions of LaTeX version 1999/12/01 or later.
- Version 1.4 of 8 February 2022
+ Version 1.5 of 15 February 2022
------------------------------------------------------------
diff --git a/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf b/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
index f383fd345a..8d8314438a 100644
--- a/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
+++ b/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex b/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
index bcf7b18b2c..62ba21d24d 100644
--- a/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
+++ b/graphics/pgf/contrib/tikz-karnaugh/doc/tikz-karnaugh-doc.tex
@@ -1,8 +1,8 @@
%% This is file `tikz-karnaugh-doc.tex'
-%% Version: 1.4
-%% Version date: 2022-02-08
+%% Version: 1.5
+%% Version date: 2022-02-15
%%
-%% Copyright (C) 2017 by Luis Paulo Laus, laus@utfpr.edu.br
+%% Copyright (C) 2017-2022 by Luis Paulo Laus, laus@utfpr.edu.br
%%
%% This package can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License distributed from CTAN
@@ -60,7 +60,7 @@
\usepackage[a4paper,left=2.25cm,right=2.25cm,top=2.5cm,bottom=2.5cm,nohead]{geometry}
\usepackage{amsmath,amssymb}
\usepackage{xxcolor}
-%% \usepackage{pifont}
+%\usepackage{pifont}
%%\usepackage{tgpagella} % no ligatures (test and orthography check)
\usepackage{enumitem}
\usepackage[T1]{fontenc}
@@ -133,13 +133,13 @@
%
% This file really starts here, all the above is for pgfmanual
% compatibility
-\input ../tex/tikzlibrarykarnaugh.code
+\input ../tex/tikzlibrarykarnaugh.code % or \usetikzlibrary{karnaugh}
\sloppy
\begin{document}
\title{Typesetting Karnaugh Maps with \LaTeX\ and \tikzname}
\author{Luis Paulo Laus\\e-mail: \texttt{laus@utfpr.edu.br}}
-\date{Version: 1.4, Version date: 2022-02-08}
+\date{Version: 1.5, Version date: 2022-02-15}
\maketitle
diff --git a/graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex b/graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
index f9a9434435..d0fe7c5f64 100644
--- a/graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
+++ b/graphics/pgf/contrib/tikz-karnaugh/tex/tikzlibrarykarnaugh.code.tex
@@ -1,8 +1,8 @@
%% This is file `tikzlibrarykarnaugh.code.tex' formerly known as `tikz-karnaugh.tex',
-%% Version: 1.4
-%% Version date: 2022-02-08
+%% Version: 1.5
+%% Version date: 2022-02-15
%%
-%% Copyright (C) 2018 by Luis Paulo Laus, laus@utfpr.edu.br
+%% Copyright (C) 2017-2022 by Luis Paulo Laus, laus@utfpr.edu.br
%%
%% This package can be redistributed and/or modified under the terms
%% of the LaTeX Project Public License distributed from CTAN
@@ -22,7 +22,7 @@
%%
\typeout{}
\typeout{Macros for typesetting Karnaugh maps}
-\typeout{Version 1.4 of 8 February 2022}
+\typeout{Version 1.5 of 15 February 2022}
\typeout{by Luis Paulo Laus, laus@utfpr.edu.br}
\typeout{}
%%
@@ -39,10 +39,11 @@
%% 1.3: 14 October 2021: New American style KM (for maps with ones
%% and zeros labels surrounding the map). In addition, a new macro for
%% decimal to Gray Code conversion (\pgfmathdectoGray) is provided.
-%% 1.4: February 2022: new style and length for American style;
+%% 1.4: 8 February 2022: new style and length for American style;
%% change some key names (standard); new 'karnaugh cell size' key;
%% bug fixes; positioning of labels simplified; two new macros for type
%% setting maps as they should appear and not using the truth table order.
+%% 1.5: 15 February 2022: bug fixes on Gray code generation
%%
%% Setting up some TikZ parameters for Karnaugh Maps
%%
@@ -251,7 +252,7 @@
\else%
\edef\kmresult@@{\kmresult@@\ifnum#1=\kmbarmove\relax0\else1\fi}% xor
\kmbarmove=#1\relax%
- \advance\kmbarlength by -1%
+ \advance\kmbarlength by -1\relax%
\ifnum\kmbarlength=\kmxvarno\kmbarmove=0\fi%
\fi%
\next}%
@@ -274,7 +275,7 @@
\else%
\edef\kmresult@@{\kmresult@@\ifnum#1=\kmbarmove\relax0\else1\fi}% xor
\kmbarmove=#1\relax%
- \advance\kmbarlength by -1%
+ \advance\kmbarlength by -1\relax%
\ifnum\kmbarlength=\kmxvarno%
\kmbarmove=0\relax%
\let\next\kmdectoKG@@tabvert%
diff --git a/macros/latex/contrib/babel-contrib/serbian/README.md b/macros/latex/contrib/babel-contrib/serbian/README.md
index 7006c05ad0..788773c140 100644
--- a/macros/latex/contrib/babel-contrib/serbian/README.md
+++ b/macros/latex/contrib/babel-contrib/serbian/README.md
@@ -1,6 +1,6 @@
----------------------------------------------------------------
-# Serbian Latin language module for Babel, v2.1
+# Serbian Latin language module for Babel, v2.2
Released under the LaTeX Project Public License v1.3 or later.
See http://www.latex-project.org/lppl.txt
@@ -19,14 +19,18 @@ lualatex.exe).
Typesetting in ijekavian dialect:
- \usepackage[english,serbianc]{babel}
- \languageattribute{serbianc}{ijekav}
+ \usepackage[english,serbian]{babel}
+ \languageattribute{serbian}{ijekav}
or
- \usepackage[english,serbianc.ijekav]{babel}
+ \usepackage[english,serbian.ijekav]{babel}
Also, the attributes 'datei' and 'quotes' are defined.
+## CHANGES v2.2
+
+New date formats are available.
+
## CHANGES v2.1
New enumeration alphabets are available.
diff --git a/macros/latex/contrib/babel-contrib/serbian/serbian.dtx b/macros/latex/contrib/babel-contrib/serbian/serbian.dtx
index 106ac9b7aa..70f9a2c38d 100644
--- a/macros/latex/contrib/babel-contrib/serbian/serbian.dtx
+++ b/macros/latex/contrib/babel-contrib/serbian/serbian.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright 2019--2021 Uroš Stefanović and any individual authors
+% Copyright 2019--2022 Uroš Stefanović and any individual authors
% listed elsewhere in this file. All rights reserved.
% Earlier Maintainers: Dejan Muhamedagić, Slobodan Janković, Javier Bezos López, Johannes L. Braams
%
@@ -32,7 +32,7 @@
%<code>\ProvidesLanguage{serbian}
%\fi
%\ProvidesFile{serbian.dtx}
- [2021/04/10 2.1 Serbian Latin support for the Babel system]
+ [2022/02/16 2.2 Serbian Latin support for the Babel system]
%\iffalse
%% File `serbian.dtx'
%
@@ -98,7 +98,9 @@
% If you prefer to use `juni' and `juli' instead of default `jun' and `jul',
% use the \Lopt{datei} attribute. Also, the |\today*| macro prints the date without dot after the year
% (used when after the date is the punctuation mark, such as comma).
-% Alternatively, the commands |\todayRoman| and |\todayRoman*| prints the current date using Roman numerals for months.
+% Alternatively, the commands |\todayRoman| and |\todayRoman*| prints the current date using Roman numerals for months;
+% |\todayGen| and |\todayGen*| prints the current month name in the genitive case,
+% and |\todayArabic| and |\todayArabic*| prints the current month as a number.
%
% The alphabetical enumerations in texts use the Latin alphabet and alphabetic order,
% but the letters q, w, x and y are omitted by the rules of the Serbian language (22 letters are used).
@@ -271,6 +273,7 @@
% \end{macrocode}
%
% The macro |\dateserbian| redefines the commands |\today|, |\today*|, |\todayRoman| and |\todayRoman*| to produce Serbian dates.
+% Also, the commands |\todayGen|, |\todayGen*|, |\todayArabic| and |\todayArabic*| are provided.
%
% \begin{macrocode}
\def\dateserbian{%
@@ -287,8 +290,23 @@
oktobar\or
novembar\or
decembar\fi}%
+ \def\month@serbian@gen{\ifcase\month\or
+ januara\or
+ februara\or
+ marta\or
+ aprila\or
+ maja\or
+ juna\or
+ jula\or
+ avgusta\or
+ septembra\or
+ oktobra\or
+ novembra\or
+ decembra\fi}%
\def\today{\number\day.~\month@serbian\ \number\year\@ifstar{}{.}}%
- \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
+ \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}%
+ \def\todayGen{\number\day.~\month@serbian@gen\ \number\year\@ifstar{}{.}}%
+ \def\todayArabic{\number\day.~\number\month.~\number\year\@ifstar{}{.}}}
\let\dateserbian@datei=\dateserbian
\addto\dateserbian@datei{
\def\month@serbian@datei{\ifnum\month=6 juni%
diff --git a/macros/latex/contrib/babel-contrib/serbian/serbian.ins b/macros/latex/contrib/babel-contrib/serbian/serbian.ins
index aa495cf06a..8ab31c3415 100644
--- a/macros/latex/contrib/babel-contrib/serbian/serbian.ins
+++ b/macros/latex/contrib/babel-contrib/serbian/serbian.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2019--2021 Uroš Stefanović and any individual authors
+%% Copyright 2019--2022 Uroš Stefanović and any individual authors
%% listed elsewhere in this file. All rights reserved.
%% Earlier Maintainers: Dejan Muhamedagić, Slobodan Janković, Javier Bezos López, Johannes L. Braams
%%
@@ -29,7 +29,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2021/04/10}
+\def\filedate{2022/02/16}
\def\batchfile{serbian.ins}
\input docstrip.tex
@@ -51,7 +51,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 2019--2021 Uroš Stefanović and any individual authors
+Copyright 2019--2022 Uroš Stefanović and any individual authors
listed elsewhere in this file. All rights reserved.
This file is intended to be used with the Babel system.
@@ -77,7 +77,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 2019--2021 Uroš Stefanović and any individual authors
+Copyright 2019--2022 Uroš Stefanović and any individual authors
listed elsewhere in this file. All rights reserved.
This file is intended to be used with the Babel system.
diff --git a/macros/latex/contrib/babel-contrib/serbian/serbian.pdf b/macros/latex/contrib/babel-contrib/serbian/serbian.pdf
index 29d8d75b5e..2f02e91498 100644
--- a/macros/latex/contrib/babel-contrib/serbian/serbian.pdf
+++ b/macros/latex/contrib/babel-contrib/serbian/serbian.pdf
Binary files differ
diff --git a/macros/latex/contrib/babel-contrib/serbianc/README.md b/macros/latex/contrib/babel-contrib/serbianc/README.md
index 5a9c48d83c..5d43446d6a 100644
--- a/macros/latex/contrib/babel-contrib/serbianc/README.md
+++ b/macros/latex/contrib/babel-contrib/serbianc/README.md
@@ -1,6 +1,6 @@
----------------------------------------------------------------
-# Serbian Cyrillic language module for Babel, v3.1
+# Serbian Cyrillic language module for Babel, v3.2
Released under the LaTeX Project Public License v1.3 or later.
See http://www.latex-project.org/lppl.txt
@@ -48,6 +48,10 @@ or
Also, the attributes 'datei' and 'quotes' are defined.
+## CHANGES v3.2
+
+New date formats are available.
+
## CHANGES v3.1
New enumeration alphabets are available.
diff --git a/macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx b/macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
index cca22b76c0..c3716aff52 100644
--- a/macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
+++ b/macros/latex/contrib/babel-contrib/serbianc/serbianc.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-%Copyright 2019--2021 Uroš Stefanović,
+%Copyright 2019--2022 Uroš Stefanović,
%2002--2019 Filip Brčić
%All rights reserved.
%
@@ -32,7 +32,7 @@
%<code>\ProvidesLanguage{serbianc}
%\fi
%\ProvidesFile{serbianc.dtx}
- [2021/04/10 3.1 Serbian Cyrillic support for the Babel system]
+ [2022/02/16 3.2 Serbian Cyrillic support for the Babel system]
%\iffalse
%% File `serbianc.dtx'
%
@@ -96,7 +96,9 @@
% If you prefer to use `јуни' and `јули' instead of default `јун' and `јул',
% use the \Lopt{datei} attribute. Also, the |\today*| macro prints the date without dot after the year
% (used when after the date is the punctuation mark, such as comma).
-% Alternatively, the commands |\todayRoman| and |\todayRoman*| print the current date using Roman numerals for months.
+% Alternatively, the commands |\todayRoman| and |\todayRoman*| prints the current date using Roman numerals for months;
+% |\todayGen| and |\todayGen*| prints the current month name in the genitive case,
+% and |\todayArabic| and |\todayArabic*| prints the current month as a number.
%
% The alphabetical enumerations in texts use the Cyrillic alphabet and alphabetic order (all 30 letters of the Serbian language are used).
% Also, the Serbian language allows enumeration with the Latin alphabet.
@@ -426,6 +428,7 @@
% \end{macrocode}
%
% The macro |\dateserbianc| redefines the commands |\today|, |\today*|, |\todayRoman| and |\todayRoman*| to produce Serbian dates.
+% Also, the commands |\todayGen|, |\todayGen*|, |\todayArabic| and |\todayArabic*| are provided.
%
% \begin{macrocode}
\if@srbc@uni@ode
@@ -443,8 +446,23 @@
октобар\or
новембар\or
децембар\fi}%
+ \def\month@serbianc@gen{\ifcase\month\or
+ јануара\or
+ фебруара\or
+ марта\or
+ априла\or
+ маја\or
+ јуна\or
+ јула\or
+ августа\or
+ септембра\or
+ октобра\or
+ новембра\or
+ децембра\fi}%
\def\today{\number\day.~\month@serbianc\ \number\year\@ifstar{}{.}}%
- \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
+ \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}%
+ \def\todayGen{\number\day.~\month@serbianc@gen\ \number\year\@ifstar{}{.}}%
+ \def\todayArabic{\number\day.~\number\month.~\number\year\@ifstar{}{.}}}
\let\dateserbianc@datei=\dateserbianc
\addto\dateserbianc@datei{%
\def\month@serbianc@datei{\ifnum\month=6 јуни%
@@ -465,8 +483,23 @@
\cyro\cyrk\cyrt\cyro\cyrb\cyra\cyrr\or
\cyrn\cyro\cyrv\cyre\cyrm\cyrb\cyra\cyrr\or
\cyrd\cyre\cyrc\cyre\cyrm\cyrb\cyra\cyrr\fi}%
+ \def\month@serbianc@gen{\ifcase\month\or
+ \cyrje\cyra\cyrn\cyru\cyra\cyrr\cyra\or
+ \cyrf\cyre\cyrb\cyrr\cyru\cyra\cyrr\cyra\or
+ \cyrm\cyra\cyrr\cyrt\cyra\or
+ \cyra\cyrp\cyrr\cyri\cyrl\cyra\or
+ \cyrm\cyra\cyrje\cyra\or
+ \cyrje\cyru\cyrn\cyra\or
+ \cyrje\cyru\cyrl\cyra\or
+ \cyra\cyrv\cyrg\cyru\cyrs\cyrt\cyra\or
+ \cyrs\cyre\cyrp\cyrt\cyre\cyrm\cyrb\cyrr\cyra\or
+ \cyro\cyrk\cyrt\cyro\cyrb\cyrr\cyra\or
+ \cyrn\cyro\cyrv\cyre\cyrm\cyrb\cyrr\cyra\or
+ \cyrd\cyre\cyrc\cyre\cyrm\cyrb\cyrr\cyra\fi}%
\def\today{\number\day.~\month@serbianc\ \number\year\@ifstar{}{.}}%
- \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}}
+ \def\todayRoman{\number\day.~\@Roman\month~\number\year\@ifstar{}{.}}%
+ \def\todayGen{\number\day.~\month@serbianc@gen\ \number\year\@ifstar{}{.}}%
+ \def\todayArabic{\number\day.~\number\month.~\number\year\@ifstar{}{.}}}
\let\dateserbianc@datei=\dateserbianc
\addto\dateserbianc@datei{%
\def\month@serbianc@datei{\ifnum\month=6\cyrje\cyru\cyrn\cyri%
diff --git a/macros/latex/contrib/babel-contrib/serbianc/serbianc.ins b/macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
index 4260d94966..e925a6f8db 100644
--- a/macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
+++ b/macros/latex/contrib/babel-contrib/serbianc/serbianc.ins
@@ -3,7 +3,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 2019--2021 Uroš Stefanović,
+%% Copyright 2019--2022 Uroš Stefanović,
%% 2002--2019 Filip Brčić
%% All rights reserved.
%%
@@ -29,7 +29,7 @@
%%
%% --------------- start of docstrip commands ------------------
%%
-\def\filedate{2021/04/10}
+\def\filedate{2022/02/16}
\def\batchfile{serbianc.ins}
\input docstrip.tex
@@ -51,7 +51,7 @@
\declarepreamble\mainpreamble
This is a generated file.
-Copyright 2019--2021 Uroš Stefanović,
+Copyright 2019--2022 Uroš Stefanović,
2002--2019 Filip Brčić
All rights reserved.
@@ -78,7 +78,7 @@ extension .ins) which are part of the distribution.
\declarepreamble\fdpreamble
This is a generated file.
-Copyright 2019--2021 Uroš Stefanović,
+Copyright 2019--2022 Uroš Stefanović,
2002--2019 Filip Brčić
All rights reserved.
diff --git a/macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf b/macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
index b886b7b261..34eaa6d233 100644
--- a/macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
+++ b/macros/latex/contrib/babel-contrib/serbianc/serbianc.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 050718cbb5..0903ac961b 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/02/15}{1.628}
+\ProvidesExplClass{easybook}{2022/02/16}{1.629}
{Typeset 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/02/15}{1.628}
+\ProvidesExplPackage{easybase}{2022/02/16}{1.629}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -2271,7 +2271,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/15}{1.628}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2022/02/16}{1.629}
{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 d5fc5dc183..5080515171 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 39c87a9732..3b5358c2e0 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -21,8 +21,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.628,
- date = 2022/02/15,
+ version = v1.629,
+ date = 2022/02/16,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = q1jx@foxmail.com,
@@ -450,7 +450,7 @@
\ebstyle{hyphen-figure = {-}}
\end{ctexexam}
- 文档类有三种选项:布尔型 \boolkey*{key},选项的值为真 \code{true} 或假 \code{false},如果不指定默认为真。键值型 \key*-{key}{value} 需要为选项指定值,后面 \code{=} 号不能省略。选择型 \choicekey*{key}{one,\default{two},three} 根据提供的可选值进行设定。
+ 文档类有三种选项:布尔型 \boolkey*{key},选项的值为真 \code{true} 或假 \code{false},如果不指定默认为真。键值型 \key*{key}{value} 需要为选项指定值,后面 \code{=} 号不能省略。选择型 \choicekey*{key}{one,\default{two},three} 根据提供的可选值进行设定。
\end{commands}
\subsection{风格}
@@ -532,7 +532,7 @@
\keychoice{linktype}{edge,colors,none}\Module{refset}\Default{edge}
超链接类型。\code{edge} 使超链接形式为边框,\code{colors} 使超链接字体为彩色,\code{none} 关闭超链接边框与颜色,此时 \option{linkcolor} 选项无效。
\keychoice{linkcolor}{fresh,cutepink,navyblue,crimson}\Default{navyblue}
- 超链接颜色样式。预置了四种超链接颜色风格。为使相关颜色能够正确显示,\option{linkcolor} 选项应当在 \option{linktype} 前使用。
+ 超链接颜色样式。预置了四种超链接颜色风格。为使相关颜色能够正确显示,选项 \option{linkcolor} 应当在 \option{linktype} 前使用。
\begin{commands}
\command{DeclareLinkColor}[\splitmarg{风格名称,ctex@link,ctex@url,ctex@cite}]
声明新的超链接颜色样式命令。它的参数以英文逗号分隔,第一部分为颜色风格名称,后面三部分为 \code{HTML} 颜色代码,构成超链接颜色列表。
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.pdf b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
index 0e75045e9a..060eb81773 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.pdf
Binary files differ
diff --git a/macros/latex/contrib/nicematrix/nicematrix-french.tex b/macros/latex/contrib/nicematrix/nicematrix-french.tex
index fc2cc12e34..d97d20c70e 100644
--- a/macros/latex/contrib/nicematrix/nicematrix-french.tex
+++ b/macros/latex/contrib/nicematrix/nicematrix-french.tex
@@ -10,7 +10,7 @@
\usepackage{nicematrix}
\usepackage{tikz}
-\usetikzlibrary{fit,patterns,arrows.meta}
+\usetikzlibrary{fit,patterns,arrows.meta,decorations.pathmorphing}
\usepackage{enumitem}
\usepackage{siunitx}
@@ -1246,7 +1246,8 @@ tracées par |\hdottedline| et «|:|» ont ce même effet.
commandes et des lettres pour des filets personnalisés avec la clé
|custom-line|, utilisable dans |\NiceMatrixOptions| ou bien dans un
environnement. Cette clé prend en argument une liste de paires de la forme
-\textsl{clé=valeur}. Les clés disponibles sont les suivantes :
+\textsl{clé=valeur}. Il y a d'abord deux clés pour spécifier les outils qui
+permettront d'utiliser ce nouveau type de filet.
\begin{itemize}
\item la clé |command| indique le nom (sans la contre-oblique) d'une commande
@@ -1256,8 +1257,20 @@ tracer des filets horizontaux (de manière similaire à |\hline|) ;
\item la clé |letter| prend en argument une lettre\footnote{Les lettres
suivantes ne sont pas autorisées : \verb+lcrpmbVX:|()[]!@<>+} qui pourra être utilisée par
l'utilisateur dans le préambule d'un environnement à préambule (comme
-|{NiceTabular}|) pour spécifier un filet vertical ;
+|{NiceTabular}|) pour spécifier un filet vertical.
+\end{itemize}
+
+\bigskip
+Pour la description du filet elle-même, il y a trois possibilités.
+
+\begin{itemize}
+\item \emph{Première possibilité}\par\nobreak
+
+Il est possible de spécifier des filets multiples, colorés avec une couleur
+entre les filets (comme on peut le faire avec \pkg{colortbl} par exemple).
+
+\begin{itemize}
\item la clé |multiplicity| indique le nombre de traits successifs qui seront
tracés : par exemple, une valeur de~$2$ va créer des filets doubles comme créés
en standard par |\hline\hline| ou bien \verb+||+ dans le préambule d'un
@@ -1266,13 +1279,35 @@ environnement ;
\item la clé |color| fixe la couleur des filets ;
\item la clé |sep-color| fixe la couleur entre deux filets consécutifs (n'a
-d'intérêt que dans le cas où la clé |multiplicity| est utilisée) ;
+d'intérêt que dans le cas où la clé |multiplicity| est utilisée).
+\end{itemize}
-\item la clé |dotted| impose un style de pointillés qui utilise le système
-de pointillés de la commande |\hdottedline| (et de la lettre \verb|:|) décrit à
-la partie précédente (cf. p.~\pageref{dotted}).
+\bigskip
+\item \emph{Deuxième possibilité}\par\nobreak
+
+On peut utiliser la clé |dotted| qui impose un style de pointillés qui utilise
+le système de pointillés de la commande |\hdottedline| (et de la lettre
+\verb|:|) décrit à la partie précédente (cf. p.~\pageref{dotted}). La clé
+|color| est en fait aussi utilisable dans ce cas-là.
+
+\bigskip
+\item \colorbox{yellow!50}{\textbf{Nouveau 6.6}}\enskip \emph{Troisième
+ possibilité}
+
+On peut utiliser la clé |tikz| (si Tikz est chargé, \pkg{nicematrix} ne
+chargeant par défaut que \textsc{pgf}). Dans ce cas-là, le filet est tracé
+directement avec Tikz en utilisant comme paramètres la valeur de la clé |tikz|
+qui doit être une liste de couples \textsl{clé=valeur} applicables à un chemin
+Tikz.
+
+Par défaut aucune réservation de place n'est faite par défaut pour le filet qui
+sera tracé avec Tikz. On peut demander une réservation (horizontale pour un
+filet vertical et verticale pour un filet horizontal) avec la clé |width| qui
+est donc en quelque sorte la largeur du filet qui sera tracé (cette largeur
+n'est pas déduite des caractéristiques fournies par la clé |tikz|).
\end{itemize}
+
\medskip
Ce système permet en particulier de définir des commandes pour tracer des filets
avec une couleur spécifique (et ces filets respecteront les blocs comme les
@@ -1307,6 +1342,52 @@ Produit C & 5 & 4 & 1 \\
\end{center}
+\bigskip
+Voici un exemple avec la clé |tikz|.
+
+\begin{Verbatim}
+\documentclass{article}
+\usepackage{nicematrix,tikz}
+\usetikzlibrary{decorations.pathmorphing}
+
+\NiceMatrixOptions
+ {
+ custom-line =
+ {
+ letter = I ,
+ ~emphase#tikz = { decorate, decoration = { coil, aspect = 0 } }}@ ,
+ ~emphase#width = 2 mm@
+ }
+ }
+
+\begin{document}
+\begin{NiceTabular}{cIcIc}
+un & deux & trois \\
+quatre & cinq & six \\
+sept & huit & neuf
+\end{NiceTabular}
+\end{document}
+\end{Verbatim}
+
+\begin{center}
+\NiceMatrixOptions
+ {
+ custom-line =
+ {
+ letter = I ,
+ tikz = { decorate, decoration = { coil, aspect = 0 } } ,
+ width = 2 mm
+ }
+ }
+\begin{NiceTabular}{cIcIc}
+un & deux & trois \\
+quatre & cinq & six \\
+sept & huit & neuf
+\end{NiceTabular}
+\end{center}
+
+
+
\section{Les couleurs des rangées et des colonnes}
\subsection{Utilisation de colortbl}
@@ -1812,7 +1893,9 @@ concerné.\footnote{Pour le moment, cette clé n'est \emph{pas} disponible dans
On a alors accès aux trois commandes suivantes :
\begin{itemize}
-\item |\cellcolor| qui colorie la case courante ;
+\item |\cellcolor| qui colorie la case courante\footnote{Néanmoins, cette
+ commande |\cellcolor| supprimera les espaces qui la suivent, ce que ne fait
+ pas la commande |\cellcolor| de \pkg{colortbl}.} ;
\item |\rowcolor| à utiliser dans une case et qui colorie le reste de la rangée
;
\item |\columncolor| à utiliser dans le préambule du tableau de la même manière
@@ -2130,6 +2213,10 @@ un très très très très long texte
\end{center}
+Remarquons que l'extension \pkg{varwidth} a quelques problèmes (au moins dans sa
+version 0.92). Par exemple, avec LuaLaTeX, elle en fonctionne pas si le contenu
+commence par une instruction |\color|.
+
\subsection{Les colonnes X}
diff --git a/macros/latex/contrib/nicematrix/nicematrix.dtx b/macros/latex/contrib/nicematrix/nicematrix.dtx
index 80d98ae17e..cf717533a1 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.dtx
+++ b/macros/latex/contrib/nicematrix/nicematrix.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{6.5}
-\def\myfiledate{2022/01/23}
+\def\myfileversion{6.6}
+\def\myfiledate{2022/02/16}
%
%
%<*batchfile>
@@ -53,7 +53,7 @@ version 2005/12/01 or later.
\geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
\usepackage{tikz}
-\usetikzlibrary{fit,patterns,arrows.meta}
+\usetikzlibrary{fit,patterns,arrows.meta,decorations.pathmorphing}
\usepackage{nicematrix}
\usepackage{siunitx}
\usepackage{varwidth}
@@ -1257,8 +1257,9 @@ version 2005/12/01 or later.
% \colorbox{yellow!50}{\textbf{New 6.5}}\enskip It's possible to define commands
% and letters for customized rules with the key |custom-line| available in
% |\NiceMatrixOptions| and in the options of individual environments. That key
-% takes in as argument a list of \textsl{key=value} pairs. The available keys
-% are the following:
+% takes in as argument a list of \textsl{key=value} pairs. First, there is two
+% keys to define the tools which will be used to use that new type of rule.
+%
% \begin{itemize}
% \item the key |command| is the name (without the backslahs) of a command that
% will be created by \pkg{nicematrix} and that will be available for the final
@@ -1267,8 +1268,19 @@ version 2005/12/01 or later.
% \item the key |letter| takes in as argument a letter\footnote{The following
% letters are forbidden: \verb+lcrpmbVX:|()[]!@<>+} that the user will use in
% the preamble of an environment with preamble (such as |{NiceTabular}| in order
-% to specify a vertical rule;
+% to specify a vertical rule.
+% \end{itemize}
+%
+% \bigskip
+% For the description of the rule itself, there is three possibilities.
%
+% \begin{itemize}
+% \item \emph{First possibility}\par\nobreak
+%
+% It's possible to specify composite rules, with a color and a color for the
+% inter-rule space (as possible with \pkg{colortbl} for instance).
+%
+% \begin{itemize}
% \item the key |multiplicity| is the number to consecutive rules that will be
% drawn: for instance, a value of $2$ will create double rules such those
% created by |\hline\hline| or \verb+||+ in the preamble of an environment;
@@ -1276,13 +1288,33 @@ version 2005/12/01 or later.
% \item the key |color| sets the color of the rule ;
%
% \item the key |sep-color| sets the color between two successive rules (should be
-% used only in conjonction with |multiplicity|);
+% used only in conjonction with |multiplicity|).
+% \end{itemize}
+%
+% \bigskip
+% \item \emph{Second possibility}\par\nobreak
+%
+% The key |dotted| forces a style with dotted rules such as those created by
+% |\hdottedline| or the letter ``|:|'' in the preamble (cf.
+% p.~\pageref{dotted}). The key |color| may be used also in that case.
%
-% \item the key |dotted| forces a style with dotted rules such as those created by
-% |\hdottedline| or the letter ``|:|'' in the preamble (cf. p.~\pageref{dotted}).
+% \bigskip
+% \item \colorbox{yellow!50}{\textbf{New 6.6}}\enskip \emph{Third
+% possibility}\par\nobreak
+%
+% It's possible to use the key |tikz| (if Tikz is loaded). In that case, the
+% rule is drawn directly with Tikz by using as parameters the value of the key
+% |tikz| which must be a list of \textsl{key=value} pairs which may be applied
+% to a Tikz path.
+%
+% By default, no space is reserved for the rule that will be drawn with Tikz. It
+% possible to specify a reservation (horizontal for a vertical rule and vertical
+% for an horizontal one) with the key |width|. That value of that key, is, in
+% some ways, the width of the rule that will be drawn (\pkg{nicematrix} does not
+% compute that width from the characteristics of the rule specified in |tikz|).
% \end{itemize}
%
-% \medskip
+% \bigskip
% That system may be used, in particular, for the definition of commands and
% letters to draw rules with a specific color (and those rules will respect the
% blocks as do all rules of \pkg{nicematrix}).
@@ -1316,7 +1348,50 @@ version 2005/12/01 or later.
% \end{NiceTabular}
% \end{center}
%
-%
+% \bigskip
+% Here is an example of the key |tikz|.
+%
+% \begin{Verbatim}
+% \documentclass{article}
+% \usepackage{nicematrix,tikz}
+% \usetikzlibrary{decorations.pathmorphing}
+%
+% \NiceMatrixOptions
+% {
+% custom-line =
+% {
+% letter = I ,
+% ~emphase#tikz = { decorate, decoration = { coil, aspect = 0 } }}@ ,
+% ~emphase#width = 2 mm@
+% }
+% }
+%
+% \begin{document}
+% \begin{NiceTabular}{cIcIc}
+% one & two & three \\
+% four & five & six \\
+% seven & eight & nine
+% \end{NiceTabular}
+% \end{document}
+% \end{Verbatim}
+%
+% \begin{center}
+% \NiceMatrixOptions
+% {
+% custom-line =
+% {
+% letter = I ,
+% tikz = { decorate, decoration = { coil, aspect = 0 } } ,
+% width = 2 mm
+% }
+% }
+% \begin{NiceTabular}{cIcIc}
+% one & two & three \\
+% four & five & six \\
+% seven & eight & nine
+% \end{NiceTabular}
+% \end{center}
+%
%
%\section{The color of the rows and columns}
%
@@ -1801,7 +1876,9 @@ version 2005/12/01 or later.
% There are three commands available (they are inspired by \pkg{colortbl} but
% are \emph{independent} of \pkg{colortbl}):
% \begin{itemize}
-% \item |\cellcolor| which colorizes a cell;
+% \item |\cellcolor| which colorizes a cell;\footnote{However, this command
+% |\cellcolor| will delete the following spaces, which does not the command
+% |\cellcolor| of \pkg{colortbl}.}
% \item |\rowcolor| which must be used in a cell and which colorizes the end of
% the row;
% \item |\columncolor| which must be used in the preamble of the environment
@@ -2112,6 +2189,10 @@ version 2005/12/01 or later.
% \end{NiceTabular}
% \end{center}
%
+% \bigskip
+% One should remark that the extension \pkg{varwidth} (at least in its version
+% 0.92) has some problems: for instance, with LuaLaTeX, it does not work when
+% the content begins with |\color|.
%
%
% \subsection{The columns X}
@@ -5649,7 +5730,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\bool_new:N \c_@@_in_preamble_bool
\bool_set_true:N \c_@@_in_preamble_bool
-\AtBeginDocument { \bool_set_false:N \c_@@_in_preamble_bool }
+\hook_gput_code:nnn { begindocument } { . }
+ { \bool_set_false:N \c_@@_in_preamble_bool }
% \end{macrocode}
%
% \begin{macrocode}
@@ -5659,7 +5741,7 @@ version 2005/12/01 or later.
\bool_new:N \c_@@_tabularx_loaded_bool
\bool_new:N \c_@@_tikz_loaded_bool
\bool_new:N \c_@@_varwidth_loaded_bool
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\@ifpackageloaded { varwidth }
{ \bool_set_true:N \c_@@_varwidth_loaded_bool }
@@ -5789,7 +5871,7 @@ version 2005/12/01 or later.
% be modified. In order to avoid an error message in this case, we will redefine
% |\pgfutil@check@rerun| in the |aux| file.
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\@ifpackageloaded { booktabs }
{ \iow_now:Nn \@mainaux \nicematrix@redefine@check@rerun }
@@ -5816,7 +5898,7 @@ version 2005/12/01 or later.
% redefinition of |\everycr|.
% \begin{macrocode}
\bool_new:N \c_@@_colortbl_loaded_bool
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\@ifpackageloaded { colortbl }
{ \bool_set_true:N \c_@@_colortbl_loaded_bool }
@@ -5989,7 +6071,7 @@ version 2005/12/01 or later.
% loaded, we redefine the |S| columns of \pkg{siunitx}.
% \begin{macrocode}
\bool_new:N \c_@@_siunitx_loaded_bool
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\@ifpackageloaded { siunitx }
{ \bool_set_true:N \c_@@_siunitx_loaded_bool }
@@ -6003,7 +6085,7 @@ version 2005/12/01 or later.
% The command |\@@_renew_NC@rewrite@S:| will be used in each environment of
% \pkg{nicematrix} in order to ``rewrite'' the |S| column in each environment.
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\bool_if:nTF { ! \c_@@_siunitx_loaded_bool }
{ \cs_set_eq:NN \@@_renew_NC@rewrite@S: \prg_do_nothing: }
@@ -6399,11 +6481,10 @@ version 2005/12/01 or later.
%
% \bigskip
% The L3 programming layer provides scratch dimensions |\l_tmpa_dim| and
-% |\l_tmpb_dim|. We creates two more in the same spirit (if they don't exist
-% yet: that's why we use |\dim_zero_new:N|).
+% |\l_tmpb_dim|. We creates two more in the same spirit.
% \begin{macrocode}
-\dim_zero_new:N \l_tmpc_dim
-\dim_zero_new:N \l_tmpd_dim
+\dim_zero_new:N \l_@@_tmpc_dim
+\dim_zero_new:N \l_@@_tmpd_dim
% \end{macrocode}
%
% \bigskip
@@ -6831,7 +6912,7 @@ version 2005/12/01 or later.
% beginning of the document (we want to allow the user to load \pkg{enumitem}
% after \pkg{nicematrix}).
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\bool_if:nTF { ! \c_@@_enumitem_loaded_bool }
{
@@ -7051,10 +7132,11 @@ version 2005/12/01 or later.
% initial value is 0.45~em but it will be changed if the option |small| is used.
% \begin{macrocode}
\dim_new:N \l_@@_inter_dots_dim
-\AtBeginDocument { \dim_set:Nn \l_@@_inter_dots_dim { 0.45 em } }
+\hook_gput_code:nnn { begindocument } { . }
+ { \dim_set:Nn \l_@@_inter_dots_dim { 0.45 em } }
% \end{macrocode}
-% The |\AtBeginDocument| is only a security in case \cls{revtex4-1} is used
-% (even though it is obsolete).
+% We use a hook only by security in case \cls{revtex4-1}
+% is used (even though it is obsolete).
%
% \bigskip
% The following dimension is the minimal distance between a node (in fact an
@@ -7063,10 +7145,11 @@ version 2005/12/01 or later.
% distance may vary a little).
% \begin{macrocode}
\dim_new:N \l_@@_xdots_shorten_dim
-\AtBeginDocument { \dim_set:Nn \l_@@_xdots_shorten_dim { 0.3 em } }
+\hook_gput_code:nnn { begindocument } { . }
+ { \dim_set:Nn \l_@@_xdots_shorten_dim { 0.3 em } }
% \end{macrocode}
-% The |\AtBeginDocument| is only a security in case \cls{revtex4-1} is used
-% (even though it is obsolete).
+% We use a hook only by security in case \cls{revtex4-1} is used (even though it
+% is obsolete).
%
% \bigskip
% The following dimension is the radius of the dots for the dotted lines (when
@@ -7074,10 +7157,11 @@ version 2005/12/01 or later.
% value is 0.53~pt but it will be changed if the option |small| is used.
% \begin{macrocode}
\dim_new:N \l_@@_radius_dim
-\AtBeginDocument { \dim_set:Nn \l_@@_radius_dim { 0.53 pt } }
+\hook_gput_code:nnn { begindocument } { . }
+ { \dim_set:Nn \l_@@_radius_dim { 0.53 pt } }
% \end{macrocode}
-% The |\AtBeginDocument| is only a security in case \cls{revtex4-1} is used
-% (even if it is obsolete).
+% We use a hook only by security in case \cls{revtex4-1} is used (even though it
+% is obsolete).
%
%
% \bigskip
@@ -7134,10 +7218,11 @@ version 2005/12/01 or later.
% \bigskip
% \begin{macrocode}
\dim_new:N \l_@@_notes_above_space_dim
-\AtBeginDocument { \dim_set:Nn \l_@@_notes_above_space_dim { 1 mm } }
+\hook_gput_code:nnn { begindocument } { . }
+ { \dim_set:Nn \l_@@_notes_above_space_dim { 1 mm } }
% \end{macrocode}
-% The |\AtBeginDocument| is only a security in case \cls{revtex4-1} is used
-% (even if it is obsolete).
+% We use a hook only by security in case \cls{revtex4-1} is used (even though it
+% is obsolete).
%
% \bigskip
% The flag |\l_@@_nullify_dots_bool| corresponds to the option |nullify-dots|.
@@ -7487,7 +7572,7 @@ version 2005/12/01 or later.
{
\bool_if:NTF \c_@@_in_preamble_bool
{
- \AtBeginDocument
+ \hook_gput_code:nnn { begindocument } { . }
{
\bool_if:NT \c_@@_enumitem_loaded_bool
{ \setlist* [ tabularnotes ] { #1 } }
@@ -7503,7 +7588,7 @@ version 2005/12/01 or later.
{
\bool_if:NTF \c_@@_in_preamble_bool
{
- \AtBeginDocument
+ \hook_gput_code:nnn { begindocument } { . }
{
\bool_if:NT \c_@@_enumitem_loaded_bool
{ \setlist* [ tabularnotes* ] { #1 } }
@@ -7603,17 +7688,6 @@ version 2005/12/01 or later.
renew-matrix .code:n = \@@_renew_matrix: ,
renew-matrix .value_forbidden:n = true ,
% \end{macrocode}
-% The key |transparent| is now considered as obsolete (because its name is ambiguous).
-% \begin{macrocode}
- transparent .code:n =
- {
- \@@_renew_matrix:
- \bool_set_true:N \l_@@_renew_dots_bool
- \@@_error:n { Key~transparent }
- } ,
- transparent .value_forbidden:n = true,
-% \end{macrocode}
-%
%
% \bigskip
% The option |exterior-arraycolsep| will have effect only in |{NiceArray}| for
@@ -8489,13 +8563,9 @@ version 2005/12/01 or later.
% We redefine |\multicolumn| and, since we want |\multicolumn| to be available
% in the potential environments |{tabular}| nested in the environments of
% \pkg{nicematrix}, we patch |{tabular}| to go back to the original definition.
-% The command |\AtBeginEnvironment| is the command of \pkg{l3hooks} and, if this
-% command is not available (versions of LaTeX prior to 2020-10-01),
-% \pkg{etoolbox} is loaded and the command |\AtBeginDocument| of \pkg{etoolbox}
-% is used.
% \begin{macrocode}
\cs_set_eq:NN \multicolumn \@@_multicolumn:nnn
- \AtBeginEnvironment { tabular }
+ \hook_gput_code:nnn { env / tabular / begin } { . }
{ \cs_set_eq:NN \multicolumn \@@_old_multicolumn }
% \end{macrocode}
%
@@ -8972,15 +9042,15 @@ version 2005/12/01 or later.
\@@_qpoint:n { #1 }
\dim_set_eq:NN \l_tmpb_dim \pgf@y
\@@_qpoint:n { col - \@@_succ:n { #4 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\@@_qpoint:n { \@@_succ:n { #3 } }
- \dim_set_eq:NN \l_tmpd_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@y
\@@_pgf_rect_node:nnnnn
{ \@@_env: - #5 }
{ \dim_use:N \l_tmpa_dim }
{ \dim_use:N \l_tmpb_dim }
- { \dim_use:N \l_tmpc_dim }
- { \dim_use:N \l_tmpd_dim }
+ { \dim_use:N \l_@@_tmpc_dim }
+ { \dim_use:N \l_@@_tmpd_dim }
}
}
% \end{macrocode}
@@ -12018,7 +12088,7 @@ version 2005/12/01 or later.
% |\@@_draw_dotted_lines:| whether Tikz is loaded or not (in that case, only
% \textsc{pgf} is loaded).
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\cs_new_protected:Npx \@@_draw_dotted_lines:
{
@@ -12087,16 +12157,16 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \int_min:nn { ##1 } { \c@iRow + 1 } }
\dim_set_eq:NN \l_tmpb_dim \pgf@y
\@@_qpoint:n { col - \int_min:nn { ##1 + 1 } { \c@jCol + 1 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\@@_qpoint:n { row - \int_min:nn { ##1 + 1 } { \c@iRow + 1 } }
- \dim_set_eq:NN \l_tmpd_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@y
\pgftransformshift { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
% \end{macrocode}
% Now, |\l_tmpa_dim| and |\l_tmpb_dim| become the width and the height of the
% node (of shape |@à_diag_node|) that we will construct.
% \begin{macrocode}
- \dim_set:Nn \l_tmpa_dim { ( \l_tmpc_dim - \l_tmpa_dim ) / 2 }
- \dim_set:Nn \l_tmpb_dim { ( \l_tmpd_dim - \l_tmpb_dim ) / 2 }
+ \dim_set:Nn \l_tmpa_dim { ( \l_@@_tmpc_dim - \l_tmpa_dim ) / 2 }
+ \dim_set:Nn \l_tmpb_dim { ( \l_@@_tmpd_dim - \l_tmpb_dim ) / 2 }
\pgfnode { @@_diag_node } { center } { } { \@@_env: - ##1 } { }
\str_if_empty:NF \l_@@_name_str
{ \pgfnodealias { \l_@@_name_str - ##1 } { \@@_env: - ##1 } }
@@ -13290,17 +13360,17 @@ version 2005/12/01 or later.
% \pkg{nicematrix} rely upon |{NiceArray}|).
%
%
-% \medskip
+% \medskip
% The syntax of these commands uses the character |_| as embellishment and
% thats' why we have to insert a character |_| in the \emph{arg spec} of these
% commands. However, we don't know the future catcode of |_| in the main
% document (maybe the user will use \pkg{underscore}, and, in that case, the
% catcode is $13$ because \pkg{underscore} activates |_|). That's why these
-% commands will be defined in a |\AtBeginDocument| and the \emph{arg spec} will
-% be rescanned.
+% commands will be defined in a |\hook_gput_code:nnn { begindocument } { . }|
+% and the \emph{arg spec} will be rescanned.
%
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\tl_set:Nn \l_@@_argspec_tl { O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
@@ -13418,7 +13488,7 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% End of the |\AtBeginDocument|.
+% End of the |\AddToHook|.
%
%
% \bigskip
@@ -13487,7 +13557,7 @@ version 2005/12/01 or later.
% |\NewDocumentCommand| is protected and that's why we have put the
% |\multicolumn| before (in the definition of |\@@_Hdotsfor:|).
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\tl_set:Nn \l_@@_argspec_tl { O { } m O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
@@ -13513,7 +13583,7 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% Enf of |\AtBeginDocument|.
+% Enf of |\AddToHook|.
%
% \medskip
% \begin{macrocode}
@@ -13594,7 +13664,7 @@ version 2005/12/01 or later.
%
% \bigskip
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\tl_set:Nn \l_@@_argspec_tl { O { } m O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
@@ -13614,7 +13684,7 @@ version 2005/12/01 or later.
}
}
% \end{macrocode}
-% Enf of |\AtBeginDocument|.
+% Enf of |\AddToHook|.
%
% \begin{macrocode}
\cs_new_protected:Npn \@@_Vdotsfor:nnnn #1 #2 #3 #4
@@ -13725,7 +13795,7 @@ version 2005/12/01 or later.
% construction uses the fact the |\@@_line_i:nn| is protected and that
% |\@@_double_int_eval:n| is fully expandable).
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\tl_set:Nn \l_@@_argspec_tl { O { } m m ! O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
@@ -13764,7 +13834,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\cs_new_protected:Npx \@@_draw_line_ii:nn #1 #2
{
@@ -13831,7 +13901,7 @@ version 2005/12/01 or later.
nb-rows .int_set:N = \l_@@_key_nb_rows_int ,
nb-rows .value_required:n = true ,
nb-rows .initial:n = 1 ,
- rowcolor .tl_set:N = \l_tmpc_tl ,
+ rowcolor .tl_set:N = \l_@@_tmpc_tl ,
rowcolor .value_required:n = true ,
rowcolor .initial:n = ,
unknown .code:n = \@@_error:n { Unknown~key~for~RowStyle }
@@ -13846,7 +13916,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% If the key |rowcolor| has been used.
% \begin{macrocode}
- \tl_if_empty:NF \l_tmpc_tl
+ \tl_if_empty:NF \l_@@_tmpc_tl
{
% \end{macrocode}
% First, the end of the current row (we remind that |\RowStyle| applies to the
@@ -13855,7 +13925,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nx \g_nicematrix_code_before_tl
{
\@@_rectanglecolor
- { \l_tmpc_tl }
+ { \l_@@_tmpc_tl }
{ \int_use:N \c@iRow - \int_use:N \c@jCol }
{ \int_use:N \c@iRow - * }
}
@@ -13867,7 +13937,7 @@ version 2005/12/01 or later.
\tl_gput_right:Nx \g_nicematrix_code_before_tl
{
\@@_rowcolor
- { \l_tmpc_tl }
+ { \l_@@_tmpc_tl }
{
\int_eval:n { \c@iRow + 1 }
- \int_eval:n { \c@iRow + \l_@@_key_nb_rows_int - 1 }
@@ -14092,13 +14162,13 @@ version 2005/12/01 or later.
\cs_new_protected:Npn \@@_rectanglecolor:nnn #1 #2 #3
{
\@@_cut_on_hyphen:w #1 \q_stop
- \tl_clear_new:N \l_tmpc_tl
- \tl_clear_new:N \l_tmpd_tl
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
- \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl
+ \tl_clear_new:N \l_@@_tmpc_tl
+ \tl_clear_new:N \l_@@_tmpd_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #2 \q_stop
- \tl_set:Nx \l_@@_rows_tl { \l_tmpc_tl - \l_tmpa_tl }
- \tl_set:Nx \l_@@_cols_tl { \l_tmpd_tl - \l_tmpb_tl }
+ \tl_set:Nx \l_@@_rows_tl { \l_@@_tmpc_tl - \l_tmpa_tl }
+ \tl_set:Nx \l_@@_cols_tl { \l_@@_tmpd_tl - \l_tmpb_tl }
% \end{macrocode}
% The command |\@@_cartesian_path:n| takes in two implicit arguments:
% |\l_@@_cols_tl| and |\l_@@_rows_tl|.
@@ -14221,9 +14291,9 @@ version 2005/12/01 or later.
\bool_if:NTF \l_@@_rowcolors_restart_bool
{ \int_set:Nn \l_@@_color_int 1 }
{ \int_set:Nn \l_@@_color_int \l_tmpa_tl }
- \int_zero_new:N \l_tmpc_int
- \int_set:Nn \l_tmpc_int \l_tmpb_tl
- \int_do_until:nNnn \l_tmpa_int > \l_tmpc_int
+ \int_zero_new:N \l_@@_tmpc_int
+ \int_set:Nn \l_@@_tmpc_int \l_tmpb_tl
+ \int_do_until:nNnn \l_tmpa_int > \l_@@_tmpc_int
{
% \end{macrocode}
% We will compute in |\l_tmpb_int| the last row of the ``block''.
@@ -14245,7 +14315,7 @@ version 2005/12/01 or later.
\tl_set:Nx \l_@@_rows_tl
{ \int_use:N \l_tmpa_int - \int_use:N \l_tmpb_int }
% \end{macrocode}
-% |\l_tmpc_tl| will be the color that we will use.
+% |\l_@@_tmpc_tl| will be the color that we will use.
% \begin{macrocode}
\tl_clear_new:N \l_@@_color_tl
\tl_set:Nx \l_@@_color_tl
@@ -14373,9 +14443,9 @@ version 2005/12/01 or later.
\int_compare:nNnT \l_tmpb_tl > \c@jCol
{ \tl_set:Nx \l_tmpb_tl { \int_use:N \c@jCol } }
% \end{macrocode}
-% |\l_tmpc_tl| will contain the number of column.
+% |\l_@@_tmpc_tl| will contain the number of column.
% \begin{macrocode}
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
% \end{macrocode}
% If we decide to provide the commands |\cellcolor|, |\rectanglecolor|,
% |\rowcolor|, |\columncolor|, |\rowcolors| and |\chessboardcolors| in the
@@ -14384,8 +14454,8 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_qpoint:n { col - \l_tmpa_tl }
\int_compare:nNnTF \l_@@_first_col_int = \l_tmpa_tl
- { \dim_set:Nn \l_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } }
- { \dim_set:Nn \l_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } }
+ { \dim_set:Nn \l_@@_tmpc_dim { \pgf@x - 0.5 \arrayrulewidth } }
+ { \dim_set:Nn \l_@@_tmpc_dim { \pgf@x + 0.5 \arrayrulewidth } }
\@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl }
\dim_set:Nn \l_tmpa_dim { \pgf@x + 0.5 \arrayrulewidth }
% \end{macrocode}
@@ -14406,15 +14476,15 @@ version 2005/12/01 or later.
% Now, the numbers of both rows are in |\l_tmpa_tl| and |\l_tmpb_tl|.
% \begin{macrocode}
\seq_if_in:NxF \l_@@_corners_cells_seq
- { \l_tmpa_tl - \l_tmpc_tl }
+ { \l_tmpa_tl - \l_@@_tmpc_tl }
{
\@@_qpoint:n { row - \@@_succ:n \l_tmpb_tl }
\dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \arrayrulewidth }
\@@_qpoint:n { row - \l_tmpa_tl }
- \dim_set:Nn \l_tmpd_dim { \pgf@y + 0.5 \arrayrulewidth }
+ \dim_set:Nn \l_@@_tmpd_dim { \pgf@y + 0.5 \arrayrulewidth }
\pgfsetcornersarced { \pgfpoint { #1 } { #1 } }
\pgfpathrectanglecorners
- { \pgfpoint \l_tmpc_dim \l_tmpd_dim }
+ { \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim }
{ \pgfpoint \l_tmpa_dim \l_tmpb_dim }
}
}
@@ -14647,7 +14717,9 @@ version 2005/12/01 or later.
% \begin{macrocode}
tikz .tl_set:N = \l_@@_tikz_rule_tl ,
tikz .value_required:n = true ,
- tikz .initial:n =
+ tikz .initial:n = ,
+ width .dim_set:N = \l_@@_rule_width_dim ,
+ width .value_required:n = true
}
% \end{macrocode}
%
@@ -14685,7 +14757,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% |\l_tmpa_tl| is the number of row and |\l_tmpb_tl| the number of column. When
% we have found a row corresponding to a rule to draw, we note its number in
-% |\l_tmpc_tl|.
+% |\l_@@_tmpc_tl|.
% \begin{macrocode}
\tl_set:Nx \l_tmpb_tl { \int_eval:n \l_@@_position_int }
\int_step_variable:nnNn \l_@@_start_int \l_@@_end_int
@@ -14791,7 +14863,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { col - \int_use:N \l_@@_position_int }
\dim_set_eq:NN \l_tmpb_dim \pgf@x
\@@_qpoint:n { row - \int_eval:n { \l_@@_local_end_int + 1 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\bool_lazy_all:nT
{
{ \int_compare_p:nNn \l_@@_multiplicity_int > 1 }
@@ -14802,26 +14874,26 @@ version 2005/12/01 or later.
\group_begin:
\CT@drsc@
\dim_add:Nn \l_tmpa_dim { 0.5 \arrayrulewidth }
- \dim_sub:Nn \l_tmpc_dim { 0.5 \arrayrulewidth }
- \dim_set:Nn \l_tmpd_dim
+ \dim_sub:Nn \l_@@_tmpc_dim { 0.5 \arrayrulewidth }
+ \dim_set:Nn \l_@@_tmpd_dim
{
\l_tmpb_dim - ( \doublerulesep + \arrayrulewidth )
* ( \l_@@_multiplicity_int - 1 )
}
\pgfpathrectanglecorners
{ \pgfpoint \l_tmpb_dim \l_tmpa_dim }
- { \pgfpoint \l_tmpd_dim \l_tmpc_dim }
+ { \pgfpoint \l_@@_tmpd_dim \l_@@_tmpc_dim }
\pgfusepath { fill }
\group_end:
}
\pgfpathmoveto { \pgfpoint \l_tmpb_dim \l_tmpa_dim }
- \pgfpathlineto { \pgfpoint \l_tmpb_dim \l_tmpc_dim }
+ \pgfpathlineto { \pgfpoint \l_tmpb_dim \l_@@_tmpc_dim }
\prg_replicate:nn { \l_@@_multiplicity_int - 1 }
{
\dim_sub:Nn \l_tmpb_dim \arrayrulewidth
\dim_sub:Nn \l_tmpb_dim \doublerulesep
\pgfpathmoveto { \pgfpoint \l_tmpb_dim \l_tmpa_dim }
- \pgfpathlineto { \pgfpoint \l_tmpb_dim \l_tmpc_dim }
+ \pgfpathlineto { \pgfpoint \l_tmpb_dim \l_@@_tmpc_dim }
}
\CT@arc@
\pgfsetlinewidth { 1.1 \arrayrulewidth }
@@ -14866,13 +14938,13 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \int_use:N \l_@@_local_start_int }
\dim_set_eq:NN \l_tmpa_dim \pgf@y
\@@_qpoint:n { col - \int_use:N \l_@@_position_int }
- \dim_set_eq:NN \l_tmpb_dim \pgf@x
+ \dim_set:Nn \l_tmpb_dim { \pgf@x - 0.5 \l_@@_rule_width_dim }
\@@_qpoint:n { row - \int_eval:n { \l_@@_local_end_int + 1 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\exp_args:NV \tikzset \l_@@_tikz_rule_tl
\use:x { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpb_dim , \l_tmpa_dim ) --
- ( \l_tmpb_dim , \l_tmpc_dim ) ;
+ ( \l_tmpb_dim , \l_@@_tmpc_dim ) ;
\end { tikzpicture }
}
% \end{macrocode}
@@ -14934,7 +15006,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% |\l_tmpa_tl| is the number of row and |\l_tmpb_tl| the number of column. When
% we have found a column corresponding to a rule to draw, we note its number in
-% |\l_tmpc_tl|.
+% |\l_@@_tmpc_tl|.
% \begin{macrocode}
\tl_set:Nx \l_tmpa_tl { \int_use:N \l_@@_position_int }
\int_step_variable:nnNn \l_@@_start_int \l_@@_end_int
@@ -15039,7 +15111,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \int_use:N \l_@@_position_int }
\dim_set_eq:NN \l_tmpb_dim \pgf@y
\@@_qpoint:n { col - \int_eval:n { \l_@@_local_end_int + 1 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\bool_lazy_all:nT
{
{ \int_compare_p:nNn \l_@@_multiplicity_int > 1 }
@@ -15049,25 +15121,25 @@ version 2005/12/01 or later.
{
\group_begin:
\CT@drsc@
- \dim_set:Nn \l_tmpd_dim
+ \dim_set:Nn \l_@@_tmpd_dim
{
\l_tmpb_dim - ( \doublerulesep + \arrayrulewidth )
* ( \l_@@_multiplicity_int - 1 )
}
\pgfpathrectanglecorners
{ \pgfpoint \l_tmpa_dim \l_tmpb_dim }
- { \pgfpoint \l_tmpc_dim \l_tmpd_dim }
+ { \pgfpoint \l_@@_tmpc_dim \l_@@_tmpd_dim }
\pgfusepathqfill
\group_end:
}
\pgfpathmoveto { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
- \pgfpathlineto { \pgfpoint \l_tmpc_dim \l_tmpb_dim }
+ \pgfpathlineto { \pgfpoint \l_@@_tmpc_dim \l_tmpb_dim }
\prg_replicate:nn { \l_@@_multiplicity_int - 1 }
{
\dim_sub:Nn \l_tmpb_dim \arrayrulewidth
\dim_sub:Nn \l_tmpb_dim \doublerulesep
\pgfpathmoveto { \pgfpoint \l_tmpa_dim \l_tmpb_dim }
- \pgfpathlineto { \pgfpoint \l_tmpc_dim \l_tmpb_dim }
+ \pgfpathlineto { \pgfpoint \l_@@_tmpc_dim \l_tmpb_dim }
}
\CT@arc@
\pgfsetlinewidth { 1.1 \arrayrulewidth }
@@ -15175,13 +15247,13 @@ version 2005/12/01 or later.
\@@_qpoint:n { col - \int_use:N \l_@@_local_start_int }
\dim_set_eq:NN \l_tmpa_dim \pgf@x
\@@_qpoint:n { row - \int_use:N \l_@@_position_int }
- \dim_set_eq:NN \l_tmpb_dim \pgf@y
+ \dim_set:Nn \l_tmpb_dim { \pgf@y - 0.5 \l_@@_rule_width_dim }
\@@_qpoint:n { col - \int_eval:n { \l_@@_local_end_int + 1 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@x
\exp_args:NV \tikzset \l_@@_tikz_rule_tl
\use:x { \exp_not:N \draw [ \l_@@_tikz_rule_tl ] }
( \l_tmpa_dim , \l_tmpb_dim ) --
- ( \l_tmpc_dim , \l_tmpb_dim ) ;
+ ( \l_@@_tmpc_dim , \l_tmpb_dim ) ;
\end { tikzpicture }
}
% \end{macrocode}
@@ -15279,15 +15351,46 @@ version 2005/12/01 or later.
%
% \medskip
% The following command will create the customized rule (it is executed when the
-% final user uses the key |custom-line| in |\NiceMatrixOption|).
+% final user uses the key |custom-line| in |\NiceMatrixOptions|).
% \begin{macrocode}
\cs_new_protected:Npn \@@_custom_line:n #1
{
+ \str_clear_new:N \l_@@_command_str
+ \str_clear_new:N \l_@@_letter_str
+ \dim_zero_new:N \l_@@_rule_width_dim
+% \end{macrocode}
+% The token list |\l_tmpa_tl| is for the key |color|.
+% \begin{macrocode}
+ \tl_clear:N \l_tmpa_tl
+% \end{macrocode}
+% The flag |\l_tmpa_bool| will indicate whether the key |tikz| is present.
+% \begin{macrocode}
+ \bool_set_false:N \l_tmpa_bool
+% \end{macrocode}
+% The flag |\l_tmpb_bool| will indicate whether the key |width| is present.
+% \begin{macrocode}
+ \bool_set_false:N \l_tmpb_bool
\keys_set_known:nn { NiceMatrix / Custom-Line } { #1 }
+ \bool_if:NT \l_tmpa_bool
+ {
+% \end{macrocode}
+% We can't use |\c_@@_tikz_loaded_bool| to test whether \pkg{tikz} is loaded
+% because |\NiceMatrixOptions| may be used in the preamble of the document.
+% \begin{macrocode}
+ \cs_if_exist:NF \tikzpicture
+ { \@@_error:n { tikz~in~custom-line~without~tikz } }
+ \tl_if_empty:NF \l_tmpa_tl
+ { \@@_error:n { color~in~custom-line~with~tikz } }
+ }
+ \bool_if:NT \l_tmpb_bool
+ {
+ \bool_if:NF \l_tmpa_bool
+ { \@@_error:n { key~width~without~key~tikz } }
+ }
% \end{macrocode}
% If the final user only wants to draw horizontal rules, he does not need to
% specify a letter (for the vertical rules in the preamble of the array). On the
-% other hand, if he only wants to draw vertical rules, the does not need to
+% other hand, if he only wants to draw vertical rules, he does not need to
% define a command (which is the tool to draw horizontal rules in the array). Of
% course, a definition of custom lines with no letter and no command would be point-less.
%
@@ -15315,7 +15418,24 @@ version 2005/12/01 or later.
{ \@@_error:n { Several~letters } }
}
\str_if_empty:NF \l_@@_command_str
- { \exp_args:NnV \@@_define_h_custom_line:nn { #1 } \l_tmpc_int }
+ {
+% \end{macrocode}
+% The flag |\l_tmpa_bool| means that the key 'tikz' have been used. When the key
+% 'tikz' has not been used, the width of the rule is computed with the
+% multiplicity of the rule.
+% \begin{macrocode}
+ \bool_if:NF \l_tmpa_bool
+ {
+ \dim_set:Nn \l_@@_rule_width_dim
+ {
+ \arrayrulewidth * \l_@@_tmpc_int
+ + \doublerulesep * ( \l_@@_tmpc_int - 1 )
+ }
+ }
+ \exp_args:NnV \@@_define_h_custom_line:nn
+ { #1 }
+ \l_@@_rule_width_dim
+ }
}
}
% \end{macrocode}
@@ -15329,47 +15449,52 @@ version 2005/12/01 or later.
% However, the whole definition of the customized lines (as provided by the
% final user as argument of |custom-line|) will also be used further with
% other sets of keys (for instance |{NiceMatrix/Rules}|). That's why the
-% following set of keys has only entries for three keys.
+% following set of keys has only entries for a few keys.
% \begin{macrocode}
\keys_define:nn { NiceMatrix / Custom-Line }
{
letter .str_set:N = \l_@@_letter_str ,
letter .value_required:n = true ,
- letter .initial:n = ,
command .str_set:N = \l_@@_command_str ,
command .value_required:n = true ,
- command .initial:n = ,
+ multiplicity .int_set:N = \l_@@_tmpc_int ,
+ multiplicity .initial:n = 1 ,
+ multiplicity .value_required:n = true ,
+ color .tl_set:N = \l_tmpa_tl ,
+ color. value_required:n = true ,
% \end{macrocode}
-% We need to know the multiplicity of the rule right now in order to compute the
-% total width of the rule (and reserve space both in vertical and horizontal rules).
+% When the key |tikz| is used, the rule will be drawn with Tikz by using the set
+% of keys specified in the value of that key |tikz|.
% \begin{macrocode}
- multiplicity .int_set:N = \l_tmpc_int ,
- multiplicity .initial:n = 1 ,
- multiplicity .value_required:n = true ,
+ tikz .code:n = \bool_set_true:N \l_tmpa_bool ,
+% \end{macrocode}
+% The key |width| must be used only when the key |tikz| is used. When used, the
+% key |width| specifies the width of the rule: it will be used to reserve space
+% (in the preamble of the array or in the command for the horizontal rules).
+% \begin{macrocode}
+ width .code:n = \dim_set:Nn \l_@@_rule_width_dim { #1 }
+ \bool_set_true:N \l_tmpb_bool ,
+ width .value_required:n = true ,
}
% \end{macrocode}
%
% \bigskip
% The following command will create the command that the final user will use in
% its array to draw a horizontal rule (hence the `|h|` in the name). |#1| is the
-% whole set of keys to pass to |\@@_line:n| and |#2| is the multiplicity of
-% the line (number of consecutive rules).
+% whole set of keys to pass to |\@@_line:n| and |#2| is the widht of the whole
+% rule.
% \begin{macrocode}
\cs_new_protected:Npn \@@_define_h_custom_line:nn #1 #2
{
% \end{macrocode}
-% We use |\cs_set:cpn| and not |\cs_new:cpn| because we want a local définition.
+% We use |\cs_set:cpn| and not |\cs_new:cpn| because we want a local definition.
% Moreover, the command must \emph{not} be protected since it begins with |\noalign|.
% \begin{macrocode}
\cs_set:cpn \l_@@_command_str
{
\noalign
{
- \skip_vertical:n
- {
- \dim_eval:n
- { \arrayrulewidth * #2 + \doublerulesep * ( #2 - 1) }
- }
+ \skip_vertical:n { #2 }
\tl_gput_right:Nx \g_@@_internal_code_after_tl
{ \@@_hline:n { #1 , position = \int_eval:n { \c@iRow + 1 } } }
}
@@ -15377,24 +15502,26 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
+% The flag |\l_tmpa_bool| means that the key 'tikz' have been used. When the key
+% 'tikz' has not been used, the width of the rule is computed with the
+% multiplicity of the rule.
% \begin{macrocode}
\cs_new_protected:Npn \@@_custom_line_i:n #1
{
+ \bool_if:NF \l_tmpa_bool
+ {
+ \dim_set:Nn \l_@@_rule_width_dim
+ {
+ \arrayrulewidth * \l_@@_tmpc_int
+ + \doublerulesep * ( \l_@@_tmpc_int - 1)
+ }
+ }
\tl_gput_right:Nx \g_@@_preamble_tl
{
\exp_not:N !
- {
- \skip_horizontal:n
- {
- \dim_eval:n
- {
- \arrayrulewidth * \l_tmpc_int
- + \doublerulesep * ( \l_tmpc_int - 1)
- }
- }
- }
+ { \skip_horizontal:n { \dim_use:N \l_@@_rule_width_dim } }
}
- \tl_gput_right:Nx \g_@@_internal_code_after_tl
+ \tl_gput_right:Nx \g_@@_internal_code_after_tl
{ \@@_vline:n { #1 , position = \@@_succ:n \c@jCol } }
}
% \end{macrocode}
@@ -16833,9 +16960,9 @@ version 2005/12/01 or later.
\@@_qpoint:n { col - #2 }
\dim_set_eq:NN \l_tmpb_dim \pgf@x
\@@_qpoint:n { row - \@@_succ:n { \l_@@_last_row_int } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } }
- \dim_set_eq:NN \l_tmpd_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@x
% \end{macrocode}
%
% We construct the node for the block with the name |(#1-#2-block)|.
@@ -16845,7 +16972,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\@@_pgf_rect_node:nnnnn
{ \@@_env: - #1 - #2 - block }
- \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim
+ \l_tmpb_dim \l_tmpa_dim \l_@@_tmpd_dim \l_@@_tmpc_dim
\str_if_empty:NF \l_@@_block_name_str
{
\pgfnodealias
@@ -16902,7 +17029,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { col - #2 }
\dim_set_eq:NN \l_tmpb_dim \pgf@x
}
- \dim_set:Nn \l_tmpd_dim { - \c_max_dim }
+ \dim_set:Nn \l_@@_tmpd_dim { - \c_max_dim }
\int_step_inline:nnn \l_@@_first_row_int \g_@@_row_total_int
{
\cs_if_exist:cT
@@ -16913,18 +17040,18 @@ version 2005/12/01 or later.
\pgfpointanchor
{ \@@_env: - ##1 - \int_use:N \l_@@_last_col_int }
{ east }
- \dim_set:Nn \l_tmpd_dim { \dim_max:nn \l_tmpd_dim \pgf@x }
+ \dim_set:Nn \l_@@_tmpd_dim { \dim_max:nn \l_@@_tmpd_dim \pgf@x }
}
}
}
- \dim_compare:nNnT \l_tmpd_dim = { - \c_max_dim }
+ \dim_compare:nNnT \l_@@_tmpd_dim = { - \c_max_dim }
{
\@@_qpoint:n { col - \@@_succ:n { \l_@@_last_col_int } }
- \dim_set_eq:NN \l_tmpd_dim \pgf@x
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@x
}
\@@_pgf_rect_node:nnnnn
{ \@@_env: - #1 - #2 - block - short }
- \l_tmpb_dim \l_tmpa_dim \l_tmpd_dim \l_tmpc_dim
+ \l_tmpb_dim \l_tmpa_dim \l_@@_tmpd_dim \l_@@_tmpc_dim
}
% \end{macrocode}
%
@@ -17106,7 +17233,7 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \l_tmpa_tl }
\dim_set:Nn \l_tmpb_dim { \pgf@y }
\@@_qpoint:n { col - \l_tmpb_tl }
- \dim_set:Nn \l_tmpc_dim { \pgf@x }
+ \dim_set:Nn \l_@@_tmpc_dim { \pgf@x }
\@@_cut_on_hyphen:w #3 \q_stop
\int_compare:nNnT \l_tmpa_tl > \c@iRow
{ \tl_set:Nx \l_tmpa_tl { \int_use:N \c@iRow } }
@@ -17115,10 +17242,10 @@ version 2005/12/01 or later.
\@@_qpoint:n { row - \@@_succ:n \l_tmpa_tl }
\dim_set:Nn \l_tmpa_dim { \pgf@y }
\@@_qpoint:n { col - \@@_succ:n \l_tmpb_tl }
- \dim_set:Nn \l_tmpd_dim { \pgf@x }
+ \dim_set:Nn \l_@@_tmpd_dim { \pgf@x }
\pgfpathrectanglecorners
- { \pgfpoint \l_tmpc_dim \l_tmpb_dim }
- { \pgfpoint \l_tmpd_dim \l_tmpa_dim }
+ { \pgfpoint \l_@@_tmpc_dim \l_tmpb_dim }
+ { \pgfpoint \l_@@_tmpd_dim \l_tmpa_dim }
\pgfsetlinewidth { 1.1 \l_@@_line_width_dim }
% \end{macrocode}
% We can't use |\pgfusepathqstroke| because of the key |rounded-corners|.
@@ -17155,19 +17282,19 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_line_width_dim \arrayrulewidth
\keys_set_known:nn { NiceMatrix / BlockBorders } { #1 }
\@@_cut_on_hyphen:w #2 \q_stop
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
- \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #3 \q_stop
\tl_set:Nx \l_tmpa_tl { \int_eval:n { \l_tmpa_tl + 1 } }
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
- \int_step_inline:nnn \l_tmpd_tl \l_tmpb_tl
+ \int_step_inline:nnn \l_@@_tmpd_tl \l_tmpb_tl
{
\use:x
{
\@@_vline:n
{
position = ##1 ,
- start = \l_tmpc_tl ,
+ start = \l_@@_tmpc_tl ,
end = \@@_pred:n \l_tmpa_tl
}
}
@@ -17178,19 +17305,19 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_@@_line_width_dim \arrayrulewidth
\keys_set_known:nn { NiceMatrix / BlockBorders } { #1 }
\@@_cut_on_hyphen:w #2 \q_stop
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
- \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #3 \q_stop
\tl_set:Nx \l_tmpa_tl { \int_eval:n { \l_tmpa_tl + 1 } }
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
- \int_step_inline:nnn \l_tmpc_tl \l_tmpa_tl
+ \int_step_inline:nnn \l_@@_tmpc_tl \l_tmpa_tl
{
\use:x
{
\@@_hline:n
{
position = ##1 ,
- start = \l_tmpd_tl ,
+ start = \l_@@_tmpd_tl ,
end = \int_eval:n { \l_tmpb_tl - 1 }
}
}
@@ -17217,8 +17344,8 @@ version 2005/12/01 or later.
{ \@@_error:nn { bad~border } { ##1 } }
}
\@@_cut_on_hyphen:w #2 \q_stop
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
- \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #3 \q_stop
\tl_set:Nx \l_tmpa_tl { \int_eval:n { \l_tmpa_tl + 1 } }
\tl_set:Nx \l_tmpb_tl { \int_eval:n { \l_tmpb_tl + 1 } }
@@ -17230,11 +17357,11 @@ version 2005/12/01 or later.
\clist_if_in:NnT \l_@@_borders_clist { right }
{ \@@_stroke_vertical:n \l_tmpb_tl }
\clist_if_in:NnT \l_@@_borders_clist { left }
- { \@@_stroke_vertical:n \l_tmpd_tl }
+ { \@@_stroke_vertical:n \l_@@_tmpd_tl }
\clist_if_in:NnT \l_@@_borders_clist { bottom }
{ \@@_stroke_horizontal:n \l_tmpa_tl }
\clist_if_in:NnT \l_@@_borders_clist { top }
- { \@@_stroke_horizontal:n \l_tmpc_tl }
+ { \@@_stroke_horizontal:n \l_@@_tmpc_tl }
\endpgfpicture
}
}
@@ -17246,13 +17373,13 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_stroke_vertical:n #1
{
- \@@_qpoint:n \l_tmpc_tl
+ \@@_qpoint:n \l_@@_tmpc_tl
\dim_set:Nn \l_tmpb_dim { \pgf@y + 0.5 \l_@@_line_width_dim }
\@@_qpoint:n \l_tmpa_tl
- \dim_set:Nn \l_tmpc_dim { \pgf@y + 0.5 \l_@@_line_width_dim }
+ \dim_set:Nn \l_@@_tmpc_dim { \pgf@y + 0.5 \l_@@_line_width_dim }
\@@_qpoint:n { #1 }
\pgfpathmoveto { \pgfpoint \pgf@x \l_tmpb_dim }
- \pgfpathlineto { \pgfpoint \pgf@x \l_tmpc_dim }
+ \pgfpathlineto { \pgfpoint \pgf@x \l_@@_tmpc_dim }
\pgfusepathqstroke
}
% \end{macrocode}
@@ -17263,7 +17390,7 @@ version 2005/12/01 or later.
% \begin{macrocode}
\cs_new_protected:Npn \@@_stroke_horizontal:n #1
{
- \@@_qpoint:n \l_tmpd_tl
+ \@@_qpoint:n \l_@@_tmpd_tl
\clist_if_in:NnTF \l_@@_borders_clist { left }
{ \dim_set:Nn \l_tmpa_dim { \pgf@x - 0.5 \l_@@_line_width_dim } }
{ \dim_set:Nn \l_tmpa_dim { \pgf@x + 0.5 \l_@@_line_width_dim } }
@@ -17521,10 +17648,10 @@ version 2005/12/01 or later.
\dim_set_eq:NN \l_tmpb_dim \pgf@x
\pgfpathmoveto { \pgfpoint \l_tmpb_dim \l_tmpa_dim }
\@@_qpoint:n { row - \@@_succ:n { #3 } }
- \dim_set_eq:NN \l_tmpc_dim \pgf@y
+ \dim_set_eq:NN \l_@@_tmpc_dim \pgf@y
\@@_qpoint:n { col - \@@_succ:n { #4 } }
- \dim_set_eq:NN \l_tmpd_dim \pgf@x
- \pgfpathlineto { \pgfpoint \l_tmpd_dim \l_tmpc_dim }
+ \dim_set_eq:NN \l_@@_tmpd_dim \pgf@x
+ \pgfpathlineto { \pgfpoint \l_@@_tmpd_dim \l_@@_tmpc_dim }
{
% \end{macrocode}
% The command |\CT@arc@| is a command of \pkg{colortbl} which sets the color of
@@ -17537,7 +17664,7 @@ version 2005/12/01 or later.
}
\pgfset { inner~sep = 1 pt }
\pgfscope
- \pgftransformshift { \pgfpoint \l_tmpb_dim \l_tmpc_dim }
+ \pgftransformshift { \pgfpoint \l_tmpb_dim \l_@@_tmpc_dim }
\pgfnode { rectangle } { south~west }
{
\begin { minipage } { 20 cm }
@@ -17547,7 +17674,7 @@ version 2005/12/01 or later.
{ }
{ }
\endpgfscope
- \pgftransformshift { \pgfpoint \l_tmpd_dim \l_tmpa_dim }
+ \pgftransformshift { \pgfpoint \l_@@_tmpd_dim \l_tmpa_dim }
\pgfnode { rectangle } { north~east }
{
\begin { minipage } { 20 cm }
@@ -17826,13 +17953,13 @@ version 2005/12/01 or later.
\peek_remove_spaces:n
{
\@@_cut_on_hyphen:w #3 \q_stop
- \tl_clear_new:N \l_tmpc_tl
- \tl_clear_new:N \l_tmpd_tl
- \tl_set_eq:NN \l_tmpc_tl \l_tmpa_tl
- \tl_set_eq:NN \l_tmpd_tl \l_tmpb_tl
+ \tl_clear_new:N \l_@@_tmpc_tl
+ \tl_clear_new:N \l_@@_tmpd_tl
+ \tl_set_eq:NN \l_@@_tmpc_tl \l_tmpa_tl
+ \tl_set_eq:NN \l_@@_tmpd_tl \l_tmpb_tl
\@@_cut_on_hyphen:w #2 \q_stop
\seq_gput_right:Nx \g_@@_submatrix_seq
- { { \l_tmpa_tl } { \l_tmpb_tl } { \l_tmpc_tl } { \l_tmpd_tl } }
+ { { \l_tmpa_tl } { \l_tmpb_tl } { \l_@@_tmpc_tl } { \l_@@_tmpd_tl } }
\tl_gput_right:Nn \g_@@_internal_code_after_tl
{ \SubMatrix { #1 } { #2 } { #3 } { #4 } [ #5 ] }
}
@@ -17854,7 +17981,7 @@ version 2005/12/01 or later.
% For explanations about the construction with rescanning of the preamble, see
% the documentation for the user command |\Cdots|.
% \begin{macrocode}
-\AtBeginDocument
+\hook_gput_code:nnn { begindocument } { . }
{
\tl_set:Nn \l_@@_argspec_tl { m m m m O { } E { _ ^ } { { } { } } }
\tl_set_rescan:Nno \l_@@_argspec_tl { } \l_@@_argspec_tl
@@ -18564,16 +18691,6 @@ version 2005/12/01 or later.
}
% \end{macrocode}
%
-% \medskip
-% Maybe we will completely delete the key 'transparent' in a future version.
-% \begin{macrocode}
-\@@_msg_new:nn { Key~transparent }
- {
- The~key~'transparent'~is~now~obsolete~(because~it's~name~
- is~not~clear).~You~must~use~the~conjonction~of~'renew-dots'~
- and~'renew-matrix'.~This~error~is~fatal.
- }
-% \end{macrocode}
%
% \begin{macrocode}
\keys_define:nn { NiceMatrix / Package }
@@ -18949,6 +19066,14 @@ version 2005/12/01 or later.
If~you~go~on,~it~will~be~ignored.
}
% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { key~width~without~key~tikz }
+ {
+ In~'custom-line',~you~have~used~'width'~without~'tikz'.~That's~not~correct.~
+ If~you~go~on,~that~key~'width'~will~be~discarded.
+ }
+% \end{macrocode}
%
% \begin{macrocode}
\@@_msg_new:nn { Several~letters }
@@ -19142,6 +19267,25 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
+\@@_msg_new:nn { tikz~in~custom-line~without~tikz }
+ {
+ You~have~used~the~key~'tikz'~in~the~definition~of~a~
+ customized~line~(with~'custom-line')~but~Tikz~is~not~loaded.~
+ You~can~go~on~but~you~will~have~another~error~if~you~actually~
+ use~that~custom~line.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\@@_msg_new:nn { color~in~custom-line~with~tikz }
+ {
+ In~a~'custom-line',~you~have~used~both~'tikz'~and~'color',~
+ which~is~forbidden~(you~should~use~'color'~inside~the~key~'tikz').~
+ If~you~go~on,~the~key~'color'~will~be~discarded.
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
\@@_msg_new:nn { Wrong~last~row }
{
You~have~used~'last-row=\int_use:N \l_@@_last_row_int'~but~your~
@@ -20107,6 +20251,10 @@ version 2005/12/01 or later.
%
% Key |respect-arraystretch|.
%
+%
+% \subsection*{Changes between version 6.5 and 6.6}
+%
+% Keys |tikz| and |width| in |custom-line|.
% \PrintIndex
%
% \tableofcontents
diff --git a/macros/latex/contrib/nicematrix/nicematrix.pdf b/macros/latex/contrib/nicematrix/nicematrix.pdf
index 703b8f8c3b..d96ed3fa4a 100644
--- a/macros/latex/contrib/nicematrix/nicematrix.pdf
+++ b/macros/latex/contrib/nicematrix/nicematrix.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
index 1acedf0c61..699123316d 100644
--- a/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
+++ b/macros/latex/contrib/profcollege/doc/ProfCollege-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profcollege/latex/ProfCollege.sty b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
index ba5e7d5675..411551409e 100644
--- a/macros/latex/contrib/profcollege/latex/ProfCollege.sty
+++ b/macros/latex/contrib/profcollege/latex/ProfCollege.sty
@@ -3,7 +3,7 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfCollege}[2022/01/01 v0.99-j Aide pour l'utilisation de LaTeX au collège]
+\ProvidesPackage{ProfCollege}[2022/02/16 v0.99-k Aide pour l'utilisation de LaTeX au collège]
\RequirePackage{verbatim}
@@ -178,7 +178,7 @@
\Dotfill%
\else%
\hbox to#1{\Dotfill}%
- \fi
+ \fi%
}%
\newcommand\Lignespointilles[1]{%
@@ -517,6 +517,456 @@
}
%%%
+% Modele en barre
+%%%
+\setKVdefault[ClesModeleBarre]{Hauteur=0.5cm,Largeur=1cm,Separation=0,Homogene=false}%Separation pour conserver le lien avec les équations.
+\defKV[ClesModeleBarre]{Longueur=\setKV[ClesModeleBarre]{Homogene}}
+
+\newtoks\toklistemodelbarresup%
+\toklistemodelbarresup{}%
+\def\UpdateListeModelBarreSup#1\nil{\addtotok\toklistemodelbarresup{#1,}}%
+\newtoks\toklistemodelbarreinf%
+\toklistemodelbarreinf{}%
+\def\UpdateListeModelBarreInf#1\nil{\addtotok\toklistemodelbarreinf{#1,}}%
+
+\newcommand\ModeleBarre[3][]{%
+ % #1 options
+ % #2 éléments de la barre supérieure C1 2 $x$ 1 3/C2 1 1x/
+ % #3 éléments de la barre inférieure (même lecture)
+ \useKVdefault[ClesModeleBarre]%
+ \setKV[ClesModeleBarre]{#1}%
+ \setsepchar{\\/ }%
+ \readlist\ListeModelBarreSup{#2}%
+ \readlist\ListeModelBarreInf{#3}%
+ \toklistemodelbarresup{}%
+ \foreachitem\compteur\in\ListeModelBarreSup{%
+ \foreachitem\valeur\in\ListeModelBarreSup[\compteurcnt]{%
+ \expandafter\UpdateListeModelBarreSup\valeur\nil%
+ }%
+ }%
+ \toklistemodelbarreinf{}%
+ \foreachitem\compteur\in\ListeModelBarreInf{%
+ \foreachitem\valeur\in\ListeModelBarreInf[\compteurcnt]{%
+ \expandafter\UpdateListeModelBarreInf\valeur\nil%
+ }%
+ }%
+ \ifboolKV[ClesModeleBarre]{Homogene}{%
+ \PfCMPDessineModelBarre{\the\toklistemodelbarresup}{\the\toklistemodelbarreinf}%
+ }{%
+ \PfCMPDessineModelBarreNonHomogene{\the\toklistemodelbarresup}{\the\toklistemodelbarreinf}%
+ }%
+}%
+
+\newcommand\PfCMPDessineModelBarre[2]{%
+ \begin{mplibcode}
+ Longueur:=\useKV[ClesModeleBarre]{Longueur};
+ Hauteur:=\useKV[ClesModeleBarre]{Hauteur};
+
+ vardef Briquesup(expr col)(text t)=
+ save $;
+ picture $;
+ $=image(
+ u:=Longueur/MBnbcasessuptotal;
+ remplis polygone((0,0),(u,0),(u,Hauteur),(0,Hauteur)) withcolor col;
+ draw polygone((0,0),(u,0),(u,Hauteur),(0,Hauteur));
+ label(TEX(t),iso((0,0),(u,Hauteur)));
+ u:=1cm;
+ );
+ $
+ enddef;
+
+ vardef Briqueinf(expr col)(text t)=
+ save $;
+ picture $;
+ $=image(
+ u:=Longueur/MBnbcasesinftotal;
+ remplis polygone((0,0),(u,0),(u,Hauteur),(0,Hauteur)) withcolor col;
+ draw polygone((0,0),(u,0),(u,Hauteur),(0,Hauteur));
+ label(TEX(t),iso((0,0),(u,Hauteur)));
+ u:=1cm;
+ );
+ $
+ enddef;
+
+ numeric MBnbcolsup;%compte combien de couleurs
+ MBnbcolsup=0;
+ color MBColSup[];%Sauvegarde les couleurs de la barre sup
+ numeric MBnbinfosup[];%compte combien d'infos par couleurs.
+ numeric MBnbcasessup[][];
+ numeric MBnbcasessuptotal;
+ MBnbcasessuptotal=0;
+ string MBTextcasessup[][];
+ vardef toto(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolsup:=MBnbcolsup+1;% on incrémente le nombre de couleurs
+ MBColSup[MBnbcolsup]:=p_;% on définit la couleur de la série de cases
+ MBnbinfosup[MBnbcolsup]:=0;
+ else:
+ if numeric p_:
+ MBnbinfosup[MBnbcolsup]:=MBnbinfosup[MBnbcolsup]+1;
+ MBnbcasessuptotal:=MBnbcasessuptotal+p_;
+ MBnbcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ else:
+ MBTextcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ toto(#1);
+
+ numeric MBnbcolinf;%compte combien de couleurs
+ MBnbcolinf=0;
+ color MBColInf[];%Sauvegarde les couleurs de la barre inf
+ numeric MBnbinfoinf[];%compte combien d'infos par couleurs.
+ numeric MBnbcasesinf[][];
+ numeric MBnbcasesinftotal;
+ MBnbcasesinftotal=0;
+ string MBTextcasesinf[][];
+ vardef tata(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolinf:=MBnbcolinf+1;% on incrémente le nombre de couleurs
+ MBColInf[MBnbcolinf]:=p_;% on définit la couleur de la série de cases
+ MBnbinfoinf[MBnbcolinf]:=0;
+ else:
+ if numeric p_:
+ MBnbinfoinf[MBnbcolinf]:=MBnbinfoinf[MBnbcolinf]+1;
+ MBnbcasesinftotal:=MBnbcasesinftotal+p_;
+ MBnbcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ else:
+ MBTextcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ tata(#2);
+
+ pair VecteurDeplasup;
+ VecteurDeplasup=(Longueur/MBnbcasessuptotal,0);
+
+ numeric MBnbdepla;
+ MBnbdepla=0;
+ for k=1 upto MBnbcolsup:
+ for l=1 upto MBnbinfosup[k]:
+ for j=1 upto MBnbcasessup[k][l]:
+ trace Briquesup(MBColSup[k])(MBTextcasessup[k][l]) shifted(MBnbdepla*VecteurDeplasup);
+ MBnbdepla:=MBnbdepla+1;
+ endfor;
+ endfor;
+ endfor;
+
+ pair VecteurDeplainf;
+ VecteurDeplainf=(Longueur/MBnbcasesinftotal,0);
+
+ numeric MBnbdepla;
+ MBnbdepla=0;
+ for k=1 upto MBnbcolinf:
+ for l=1 upto MBnbinfoinf[k]:
+ for j=1 upto MBnbcasesinf[k][l]:
+ trace Briqueinf(MBColInf[k])(MBTextcasesinf[k][l]) shifted(MBnbdepla*VecteurDeplainf+(0,-Hauteur));
+ MBnbdepla:=MBnbdepla+1;
+ endfor;
+ endfor;
+ endfor;
+ \end{mplibcode}
+}
+
+\newcommand\PfCMPDessineModelBarreNonHomogene[2]{%
+ \ifluatex%
+ \mplibforcehmode%
+ \begin{mplibcode}
+ Longueur:=\useKV[ClesModeleBarre]{Largeur};
+ Hauteur:=\useKV[ClesModeleBarre]{Hauteur};
+ Separation:=\useKV[ClesModeleBarre]{Separation};
+
+ vardef Brique(expr col,nbfois)(text t)=
+ save $;
+ picture $;
+ $=image(
+ u:=Longueur;
+ if t="?":
+ draw polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur)) dashed evenly;
+ else:
+ remplis polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur)) withcolor col;
+ draw polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur));
+ fi;
+ if nbfois>0:
+ label(TEX(t),iso((0,0),(u*abs(nbfois),Hauteur)));
+ else:
+ label.bot(TEX(t),iso((0,0),(u*abs(nbfois),-Hauteur)));
+ drawdblarrow (0,-0.5*Hauteur)--(u*abs(nbfois),-0.5*Hauteur);
+ fi;
+ u:=1cm;
+ );
+ $
+ enddef;
+
+ numeric MBnbcolsup;%compte combien de couleurs
+ MBnbcolsup=0;
+ color MBColSup[];%Sauvegarde les couleurs de la barre sup
+ numeric MBnbinfosup[];%compte combien d'infos par couleurs.
+ numeric MBnbcasessup[][];
+ numeric MBnbcasessuptotal;
+ MBnbcasessuptotal=0;
+ string MBTextcasessup[][];
+ vardef toto(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolsup:=MBnbcolsup+1;% on incrémente le nombre de couleurs
+ MBColSup[MBnbcolsup]:=p_;% on définit la couleur de la série de cases
+ MBnbinfosup[MBnbcolsup]:=0;
+ else:
+ if numeric p_:
+ MBnbinfosup[MBnbcolsup]:=MBnbinfosup[MBnbcolsup]+1;
+ MBnbcasessuptotal:=MBnbcasessuptotal+p_;
+ MBnbcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ else:
+ MBTextcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ toto(#1);
+
+ numeric MBnbcolinf;%compte combien de couleurs
+ MBnbcolinf=0;
+ color MBColInf[];%Sauvegarde les couleurs de la barre inf
+ numeric MBnbinfoinf[];%compte combien d'infos par couleurs.
+ numeric MBnbcasesinf[][];
+ numeric MBnbcasesinftotal;
+ MBnbcasesinftotal=0;
+ string MBTextcasesinf[][];
+ vardef tata(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolinf:=MBnbcolinf+1;% on incrémente le nombre de couleurs
+ MBColInf[MBnbcolinf]:=p_;% on définit la couleur de la série de cases
+ MBnbinfoinf[MBnbcolinf]:=0;
+ else:
+ if numeric p_:
+ MBnbinfoinf[MBnbcolinf]:=MBnbinfoinf[MBnbcolinf]+1;
+ MBnbcasesinftotal:=MBnbcasesinftotal+p_;
+ MBnbcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ else:
+ MBTextcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ tata(#2);
+
+ pair VecteurDepla;
+ VecteurDepla=(Longueur,0);
+
+ numeric MBnbdepla;
+ MBnbdepla=0;
+ for k=1 upto MBnbcolsup:
+ for l=1 upto MBnbinfosup[k]:
+ trace Brique(MBColSup[k],MBnbcasessup[k][l])(MBTextcasessup[k][l]) shifted(MBnbdepla*VecteurDepla);
+ MBnbdepla:=MBnbdepla+MBnbcasessup[k][l];
+ endfor;
+ endfor;
+
+ MBnbdepla:=0;
+ for k=1 upto MBnbcolinf:
+ for l=1 upto MBnbinfoinf[k]:
+ trace Brique(MBColInf[k],MBnbcasesinf[k][l])(MBTextcasesinf[k][l]) shifted(MBnbdepla*VecteurDepla+u*(0,-0.5));
+ if MBnbcasesinf[k][l]<0:
+ for j=1 upto (abs(MBnbcasesinf[k][l])-1):
+ trace ((0,0)--(0,Hauteur)) shifted((MBnbdepla+j)*VecteurDepla+u*(0,-0.5)) withcolor black;
+ endfor;
+ fi;
+ MBnbdepla:=MBnbdepla+abs(MBnbcasesinf[k][l]);
+ endfor;
+ endfor;
+
+ if Separation>0:
+ draw u*(Separation,-0.75)--u*(Separation,0.75) withpen pencircle scaled 1.5 dashed evenly withcolor red;
+ fi;
+
+ \end{mplibcode}
+ \else
+ \begin{mpost}[mpsettings={Longueur:=\useKV[ClesModeleBarre]{Largeur};Hauteur:=\useKV[ClesModeleBarre]{Hauteur};Separation:=\useKV[ClesModeleBarre]{Separation};}]
+ vardef Brique(expr col,nbfois)(text t)=
+ save $;
+ picture $;
+ $=image(
+ u:=Longueur;
+ if t="?":
+ draw polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur)) dashed evenly;
+ else:
+ remplis polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur)) withcolor col;
+ draw polygone((0,0),(u*abs(nbfois),0),(u*abs(nbfois),Hauteur),(0,Hauteur));
+ fi;
+ if nbfois>0:
+ label(LATEX(t),iso((0,0),(u*abs(nbfois),Hauteur)));
+ else:
+ label.bot(LATEX(t),iso((0,0),(u*abs(nbfois),-Hauteur)));
+ drawdblarrow (0,-0.5*Hauteur)--(u*abs(nbfois),-0.5*Hauteur);
+ fi;
+ u:=1cm;
+ );
+ $
+ enddef;
+
+ numeric MBnbcolsup;%compte combien de couleurs
+ MBnbcolsup=0;
+ color MBColSup[];%Sauvegarde les couleurs de la barre sup
+ numeric MBnbinfosup[];%compte combien d'infos par couleurs.
+ numeric MBnbcasessup[][];
+ numeric MBnbcasessuptotal;
+ MBnbcasessuptotal=0;
+ string MBTextcasessup[][];
+ vardef toto(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolsup:=MBnbcolsup+1;% on incrémente le nombre de couleurs
+ MBColSup[MBnbcolsup]:=p_;% on définit la couleur de la série de cases
+ MBnbinfosup[MBnbcolsup]:=0;
+ else:
+ if numeric p_:
+ MBnbinfosup[MBnbcolsup]:=MBnbinfosup[MBnbcolsup]+1;
+ MBnbcasessuptotal:=MBnbcasessuptotal+p_;
+ MBnbcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ else:
+ MBTextcasessup[MBnbcolsup][MBnbinfosup[MBnbcolsup]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ toto(#1);
+
+ numeric MBnbcolinf;%compte combien de couleurs
+ MBnbcolinf=0;
+ color MBColInf[];%Sauvegarde les couleurs de la barre inf
+ numeric MBnbinfoinf[];%compte combien d'infos par couleurs.
+ numeric MBnbcasesinf[][];
+ numeric MBnbcasesinftotal;
+ MBnbcasesinftotal=0;
+ string MBTextcasesinf[][];
+ vardef tata(text t)=
+ for p_=t:
+ if color p_:
+ MBnbcolinf:=MBnbcolinf+1;% on incrémente le nombre de couleurs
+ MBColInf[MBnbcolinf]:=p_;% on définit la couleur de la série de cases
+ MBnbinfoinf[MBnbcolinf]:=0;
+ else:
+ if numeric p_:
+ MBnbinfoinf[MBnbcolinf]:=MBnbinfoinf[MBnbcolinf]+1;
+ MBnbcasesinftotal:=MBnbcasesinftotal+p_;
+ MBnbcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ else:
+ MBTextcasesinf[MBnbcolinf][MBnbinfoinf[MBnbcolinf]]:=p_;
+ fi;
+ fi;
+ endfor;
+ enddef;
+
+ tata(#2);
+
+ pair VecteurDepla;
+ VecteurDepla=(Longueur,0);
+
+ numeric MBnbdepla;
+ MBnbdepla=0;
+ for k=1 upto MBnbcolsup:
+ for l=1 upto MBnbinfosup[k]:
+ trace Brique(MBColSup[k],MBnbcasessup[k][l])(MBTextcasessup[k][l]) shifted(MBnbdepla*VecteurDepla);
+ MBnbdepla:=MBnbdepla+MBnbcasessup[k][l];
+ endfor;
+ endfor;
+
+ MBnbdepla:=0;
+ for k=1 upto MBnbcolinf:
+ for l=1 upto MBnbinfoinf[k]:
+ trace Brique(MBColInf[k],MBnbcasesinf[k][l])(MBTextcasesinf[k][l]) shifted(MBnbdepla*VecteurDepla+u*(0,-0.5));
+ if MBnbcasesinf[k][l]<0:
+ for j=1 upto (abs(MBnbcasesinf[k][l])-1):
+ trace ((0,0)--(0,Hauteur)) shifted((MBnbdepla+j)*VecteurDepla+u*(0,-0.5)) withcolor black;
+ endfor;
+ fi;
+ MBnbdepla:=MBnbdepla+abs(MBnbcasesinf[k][l]);
+ endfor;
+ endfor;
+
+ if Separation>0:
+ draw u*(Separation,-0.75)--u*(Separation,0.75) withpen pencircle scaled 1.5 dashed evenly withcolor red;
+ fi;
+
+ \end{mpost}
+ \fi
+}
+
+%%%
+% Fiche m\'emorisation active
+%%%
+\setKVdefault[ClesFicheMemo]{TexteReponses=Réponses,TexteQuestions=Questions,Solution=false,Largeur=\linewidth}
+
+\newcommand\FicheMemo[3][]{%
+ \xdef\CountcolUn{0}%
+ \xdef\CountcolDeux{0}%
+ \useKVdefault[ClesFicheMemo]%
+ \setKV[ClesFicheMemo]{#1}%
+ \setsepchar[*]{§*/}%
+ \readlist*\ListeQuestionColonneUn{#2}%
+ \readlist*\ListeQuestionColonneDeux{#3}%
+ \renewcommand{\arraystretch}{1.35}%
+ \begin{NiceTabular}[width=\useKV[ClesFicheMemo]{Largeur}]{X[1]X[1]X[1]X[1]}[hvlines]
+ \CodeBefore%
+ \rowcolor{gray!15}{1}%
+ \tikz\draw[dashed,gray!50](2-|1.5) to (last-|1.5);%
+ \tikz\draw[dashed,gray!50](2-|4.5) to (last-|4.5);%
+ \Body%
+ \Block{1-1}{\bfseries\useKV[ClesFicheMemo]{TexteReponses}}&&&\Block{1-1}{\bfseries\useKV[ClesFicheMemo]{TexteReponses}}\\
+ \xintFor* ##4 in {\xintSeq {1}{\ListeQuestionColonneUnlen}}\do{%
+ \xintifboolexpr{\listlen\ListeQuestionColonneUn[##4]==2}{%
+ \uppercase{&}}{%
+ \Block[l]{\fpeval{\ListeQuestionColonneUn[##4,1]}-1}{\ifboolKV[ClesFicheMemo]{Solution}{\ListeQuestionColonneUn[##4,3]}{}}\uppercase{&}\xdef\CountcolUn{\fpeval{\CountcolUn+1}}\Block[l]{\fpeval{\ListeQuestionColonneUn[##4,1]}-1}{\ListeQuestionColonneUn[##4,2]}%
+ }%
+ &%
+ \xintifboolexpr{\listlen\ListeQuestionColonneDeux[##4]==2}{%
+ \uppercase{&}%
+ }{%
+ \xdef\CountcolDeux{\fpeval{\CountcolDeux+1}}\Block[l]{\fpeval{\ListeQuestionColonneDeux[##4,1]}-1}{\ListeQuestionColonneDeux[##4,2]}\uppercase{&}\Block[l]{\fpeval{\ListeQuestionColonneDeux[##4,1]}-1}{\ifboolKV[ClesFicheMemo]{Solution}{\ListeQuestionColonneDeux[##4,3]}{}}%
+ }%
+ \\%
+ }%
+ \CodeAfter%
+ \tikz\node[xshift=0.5em] at (2-|1) {\scriptsize\faCut};%
+ \xdef\PfCCountCutUn{2}%
+ \xintFor* ##4 in {\xintSeq {1}{\ListeQuestionColonneUnlen}}\do{%
+ \xintifboolexpr{\listlen\ListeQuestionColonneUn[##4]==2}{%
+ }{%
+ \xdef\PfCCountCutUn{\fpeval{\PfCCountCutUn+\ListeQuestionColonneUn[##4,1]}}%
+ \tikz\node[xshift=0.5em] at (\fpeval{\PfCCountCutUn}-|1) {\scriptsize\faCut};%
+ }%
+ }%
+ \tikz\node[xshift=-0.5em] at (2-|last) {\scriptsize\rotatebox{180}{\faCut}};%
+ \xdef\PfCCountCutDeux{2}%
+ \xintFor* ##4 in {\xintSeq {1}{\ListeQuestionColonneDeuxlen}}\do{%
+ \xintifboolexpr{\listlen\ListeQuestionColonneDeux[##4]==2}{%
+ }{%
+ \xdef\PfCCountCutDeux{\fpeval{\PfCCountCutDeux+\ListeQuestionColonneDeux[##4,1]}}%
+ \tikz\node[xshift=-0.5em] at (\fpeval{\PfCCountCutDeux}-|last) {\scriptsize\rotatebox{180}{\faCut}};%
+ }%
+ }%
+ \tikz\node[xshift=0.5em] at (1-|1) {\color{gray}\scriptsize\faCut};%
+ \tikz\node[xshift=0.5em] at (last-|1) {\color{gray}\scriptsize\faCut};%
+ \tikz\node[xshift=-0.5em] at (1-|last) {\color{gray}\scriptsize\rotatebox{180}{\faCut}};%
+ \tikz\node[xshift=-0.5em] at (last-|last) {\color{gray}\scriptsize\rotatebox{180}{\faCut}};%
+ \tikz\node at (1.5-|2.5) {\bfseries\useKV[ClesFicheMemo]{TexteQuestions} 1 à \num{\CountcolUn}};%
+ \tikz\node at (1.5-|3.5) {\bfseries\useKV[ClesFicheMemo]{TexteQuestions} \num{\fpeval{\CountcolUn+1}} à \num{\fpeval{\CountcolUn+\CountcolDeux}}};%
+ \end{NiceTabular}%
+ \renewcommand{\arraystretch}{1}%
+}%
+
+%%%
% Op\'erations pos\'es à trou
%%%
%% D'après https://tex.stackexchange.com/questions/277246/drawing-a-circle-around-the-numbers-in-xlop-package
@@ -2465,7 +2915,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
%%%
% Qui suis-je
%%%
-\setKVdefault[Quisuisje]{Solution=false,Largeur=5mm,Colonnes=5,CodePerso=false}%
+\setKVdefault[Quisuisje]{Solution=false,Largeur=5mm,Colonnes=5,CodePerso=false,TexteA=Lettre,TexteB=R\'esultat du calcul}%
\newcommand\QuisuisjeEnonce{%
Chaque lettre du mot à découvrir porte un numéro qui correspond à un
@@ -2481,11 +2931,11 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
\readlist*\ListeQuisuisje{#2}%
\begin{NiceTabular}{|l|*{\ListeQuisuisjelen}{m{\useKV[Quisuisje]{Largeur}}|}}%
\hline
- Lettre\xintFor* ##1 in {\xintSeq {1}{\ListeQuisuisjelen}}\do{%
+ \useKV[Quisuisje]{TexteA}\xintFor* ##1 in {\xintSeq {1}{\ListeQuisuisjelen}}\do{%
&\centering\arraybackslash\ListeQuisuisje[##1,1]
}\\
\hline
- R\'esultat du calcul\xintFor* ##1 in {\xintSeq {1}{\ListeQuisuisjelen}}\do{%
+ \useKV[Quisuisje]{TexteB}\xintFor* ##1 in {\xintSeq {1}{\ListeQuisuisjelen}}\do{%
&\centering\arraybackslash\ListeQuisuisje[##1,2]
}\\
\hline
@@ -2919,16 +3369,16 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
\readlist*\ListeAutoQ{#2}%
% \setsepchar{§}
% \readlist*\ListeAutoR{#3}%
- \setsepchar[*]{§*/}
+ \setsepchar[*]{§*/}%
\readlist*\ListeAutoEn{#3}%
\clearpage
\begin{tikzpicture}[remember picture,overlay]%
\ifboolKV[Autonomie]{AfficheMarge}{%
- \node[xshift=5mm,yshift=-5mm,circle] (PfCA) at (current page.north west) {};
- \node[xshift=-5mm,yshift=5mm] (PfCB) at (current page.south east) {};
- \draw[blue,dashed] (PfCA) rectangle (PfCB);
+ \node[xshift=5mm,yshift=-5mm,circle] (PfCA) at (current page.north west) {};%
+ \node[xshift=-5mm,yshift=5mm] (PfCB) at (current page.south east) {};%
+ \draw[blue,dashed] (PfCA) rectangle (PfCB);%
}{}%
- \foreach \i in {1,...,3}{
+ \foreach \i in {1,...,3}{%
\coordinate[xshift=\i*0.25*\paperwidth] (A\i) at (current page.north west);%
\coordinate[xshift=\i*0.25*\paperwidth] (B\i) at (current page.south west);%
}
@@ -2939,53 +3389,53 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
\coordinate[yshift=-\i*0.25*\paperheight] (E\i) at (A3);%
}%
\ifboolKV[Autonomie]{Deux}{%
- \draw (C2) to (D2);
- \draw (E2) to (F2);
+ \draw (C2) to (D2);%
+ \draw (E2) to (F2);%
}{%
\foreach\i in{1,...,4}{%
- \draw (C\i) to (D\i);
- \draw (E\i) to (F\i);
+ \draw (C\i) to (D\i);%
+ \draw (E\i) to (F\i);%
}%
}%
- \coordinate (Q1) at ($(F1)!0.5!(A3)$);
- \coordinate (Q2) at ($(F2)!0.5!(E1)$);
- \coordinate (Q3) at ($(F3)!0.5!(E2)$);
- \coordinate (Q4) at ($(F4)!0.5!(E3)$);
- \coordinate (Q5) at ($(C1)!0.5!(A1)$);
- \coordinate (Q6) at ($(C2)!0.5!(D1)$);
- \coordinate (Q7) at ($(C3)!0.5!(D2)$);
- \coordinate (Q8) at ($(C4)!0.5!(D3)$);
+ \coordinate (Q1) at ($(F1)!0.5!(A3)$);%
+ \coordinate (Q2) at ($(F2)!0.5!(E1)$);%
+ \coordinate (Q3) at ($(F3)!0.5!(E2)$);%
+ \coordinate (Q4) at ($(F4)!0.5!(E3)$);%
+ \coordinate (Q5) at ($(C1)!0.5!(A1)$);%
+ \coordinate (Q6) at ($(C2)!0.5!(D1)$);%
+ \coordinate (Q7) at ($(C3)!0.5!(D2)$);%
+ \coordinate (Q8) at ($(C4)!0.5!(D3)$);%
\draw[dashed] (A1) to (B1);%
\draw[dashed] (A3) to (B3);%
\ifboolKV[Autonomie]{ARemplir}{%
\ifboolKV[Autonomie]{Deux}{%
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test1) at ($(Q1)!0.5!(Q2)$) {\ListeAutoQ[1,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test2) at ($(Q3)!0.5!(Q4)$) {\ListeAutoQ[2,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test3) at ($(Q5)!0.5!(Q6)$) {\ListeAutoQ[3,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test4) at ($(Q7)!0.5!(Q8)$) {\ListeAutoQ[4,1]};
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test1) at ($(Q1)!0.5!(Q2)$) {\ListeAutoQ[1,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test2) at ($(Q3)!0.5!(Q4)$) {\ListeAutoQ[2,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test3) at ($(Q5)!0.5!(Q6)$) {\ListeAutoQ[3,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test4) at ($(Q7)!0.5!(Q8)$) {\ListeAutoQ[4,1]};%
}{%
\foreach \i in {1,...,4}{%
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test\i) at (Q\i) {\ListeAutoQ[\i,1]};
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test\i) at (Q\i) {\ListeAutoQ[\i,1]};%
}%
\foreach \i in {5,...,8}{%
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test\i) at (Q\i) {\ListeAutoQ[\i,1]};
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] (Test\i) at (Q\i) {\ListeAutoQ[\i,1]};%
}%
}%
}{%
\foreach \i in {1,...,4}{%
- \node[xshift=-5mm,align=justify,anchor=center,text width=0.8*0.25\textwidth] (Test\i) at (Q\i) {\ding{\fpeval{171+\i}}~\ListeAutoQ[\i,1]};
+ \node[xshift=-5mm,align=justify,anchor=center,text width=0.8*0.25\textwidth] (Test\i) at (Q\i) {\ding{\fpeval{171+\i}}~\ListeAutoQ[\i,1]};%
}%
\foreach \i in {5,...,8}{%
- \node[align=justify,anchor=center,text width=0.8*0.25\textwidth] (Test\i) at (Q\i) {\ding{\fpeval{171+\i}}~\ListeAutoQ[\i,1]};
+ \node[align=justify,anchor=center,text width=0.8*0.25\textwidth] (Test\i) at (Q\i) {\ding{\fpeval{171+\i}}~\ListeAutoQ[\i,1]};%
}%
}%
- \end{tikzpicture}
- \clearpage
+ \end{tikzpicture}%
+ \clearpage%
\begin{tikzpicture}[remember picture,overlay]%
\ifboolKV[Autonomie]{AfficheMarge}{%
- \node[xshift=5mm,yshift=-5mm,circle] (PfCA) at (current page.north west) {};
- \node[xshift=-5mm,yshift=5mm] (PfCB) at (current page.south east) {};
- \draw[blue,dashed] (PfCA) rectangle (PfCB);
+ \node[xshift=5mm,yshift=-5mm,circle] (PfCA) at (current page.north west) {};%
+ \node[xshift=-5mm,yshift=5mm] (PfCB) at (current page.south east) {};%
+ \draw[blue,dashed] (PfCA) rectangle (PfCB);%
}{}%
\foreach \i in {1,...,3}{%
\coordinate[xshift=\i*0.25*\paperwidth] (A\i) at (current page.north west);%
@@ -2999,83 +3449,83 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
\coordinate[yshift=-\i*0.25*\paperheight] (E\i) at (A3);%
}%
\ifboolKV[Autonomie]{Deux}{%
- \draw (C2) to (F2);
+ \draw (C2) to (F2);%
}{%
\foreach \i in{1,...,4}{%
- \draw (C\i) to (F\i);
+ \draw (C\i) to (F\i);%
}%
}%
- \coordinate (T1) at ($(current page.north west)!0.5!(A1)$);
- \coordinate (T2) at ($(C1)!0.5!(D1)$);
- \coordinate (T3) at ($(C2)!0.5!(D2)$);
- \coordinate (T4) at ($(C3)!0.5!(D3)$);
- \coordinate (T5) at ($(current page.north east)!0.5!(A3)$);
- \coordinate (T6) at ($(E1)!0.5!(F1)$);
- \coordinate (T7) at ($(E2)!0.5!(F2)$);
- \coordinate (T8) at ($(E3)!0.5!(F3)$);
- \coordinate (U1) at ($(C1)!0.5!(D1)$);
- \coordinate (U2) at ($(C2)!0.5!(D2)$);
- \coordinate (U3) at ($(C3)!0.5!(D3)$);
- \coordinate (U4) at ($(current page.south west)!0.5!(B1)$);
- \coordinate (U5) at ($(E1)!0.5!(F1)$);
- \coordinate (U6) at ($(E2)!0.5!(F2)$);
- \coordinate (U7) at ($(E3)!0.5!(F3)$);
- \coordinate (U8) at ($(B3)!0.5!(current page.south east)$);
- \coordinate (R1) at ($(D1)!0.5!(A2)$);
- \coordinate (R2) at ($(D2)!0.5!(G1)$);
- \coordinate (R3) at ($(D3)!0.5!(G2)$);
- \coordinate (R4) at ($(D4)!0.5!(G3)$);
- \coordinate (R5) at ($(E1)!0.5!(A2)$);
- \coordinate (R6) at ($(E2)!0.5!(G1)$);
- \coordinate (R7) at ($(E3)!0.5!(G2)$);
- \coordinate (R8) at ($(E4)!0.5!(G3)$);
- \coordinate (S1) at ($(A1)!0.5!(D1)$);
- \coordinate (S2) at ($(D1)!0.5!(D2)$);
- \coordinate (S3) at ($(D2)!0.5!(D3)$);
- \coordinate (S4) at ($(D3)!0.5!(B1)$);
- \coordinate (S5) at ($(R1)!0.5!(R5)$);
- \coordinate (S6) at ($(R2)!0.5!(R6)$);
- \coordinate (S7) at ($(R3)!0.5!(R7)$);
- \coordinate (S8) at ($(R4)!0.5!(R8)$);
- \coordinate (V1) at ($(T1)!0.5!(U1)$);
- \coordinate (V2) at ($(T2)!0.5!(U2)$);
- \coordinate (V3) at ($(T3)!0.5!(U3)$);
- \coordinate (V4) at ($(T4)!0.5!(U4)$);
- \coordinate (V5) at ($(T5)!0.5!(U5)$);
- \coordinate (V6) at ($(T6)!0.5!(U6)$);
- \coordinate (V7) at ($(T7)!0.5!(U7)$);
- \coordinate (V8) at ($(T8)!0.5!(U8)$);
+ \coordinate (T1) at ($(current page.north west)!0.5!(A1)$);%
+ \coordinate (T2) at ($(C1)!0.5!(D1)$);%
+ \coordinate (T3) at ($(C2)!0.5!(D2)$);%
+ \coordinate (T4) at ($(C3)!0.5!(D3)$);%
+ \coordinate (T5) at ($(current page.north east)!0.5!(A3)$);%
+ \coordinate (T6) at ($(E1)!0.5!(F1)$);%
+ \coordinate (T7) at ($(E2)!0.5!(F2)$);%
+ \coordinate (T8) at ($(E3)!0.5!(F3)$);%
+ \coordinate (U1) at ($(C1)!0.5!(D1)$);%
+ \coordinate (U2) at ($(C2)!0.5!(D2)$);%
+ \coordinate (U3) at ($(C3)!0.5!(D3)$);%
+ \coordinate (U4) at ($(current page.south west)!0.5!(B1)$);%
+ \coordinate (U5) at ($(E1)!0.5!(F1)$);%
+ \coordinate (U6) at ($(E2)!0.5!(F2)$);%
+ \coordinate (U7) at ($(E3)!0.5!(F3)$);%
+ \coordinate (U8) at ($(B3)!0.5!(current page.south east)$);%
+ \coordinate (R1) at ($(D1)!0.5!(A2)$);%
+ \coordinate (R2) at ($(D2)!0.5!(G1)$);%
+ \coordinate (R3) at ($(D3)!0.5!(G2)$);%
+ \coordinate (R4) at ($(D4)!0.5!(G3)$);%
+ \coordinate (R5) at ($(E1)!0.5!(A2)$);%
+ \coordinate (R6) at ($(E2)!0.5!(G1)$);%
+ \coordinate (R7) at ($(E3)!0.5!(G2)$);%
+ \coordinate (R8) at ($(E4)!0.5!(G3)$);%
+ \coordinate (S1) at ($(A1)!0.5!(D1)$);%
+ \coordinate (S2) at ($(D1)!0.5!(D2)$);%
+ \coordinate (S3) at ($(D2)!0.5!(D3)$);%
+ \coordinate (S4) at ($(D3)!0.5!(B1)$);%
+ \coordinate (S5) at ($(R1)!0.5!(R5)$);%
+ \coordinate (S6) at ($(R2)!0.5!(R6)$);%
+ \coordinate (S7) at ($(R3)!0.5!(R7)$);%
+ \coordinate (S8) at ($(R4)!0.5!(R8)$);%
+ \coordinate (V1) at ($(T1)!0.5!(U1)$);%
+ \coordinate (V2) at ($(T2)!0.5!(U2)$);%
+ \coordinate (V3) at ($(T3)!0.5!(U3)$);%
+ \coordinate (V4) at ($(T4)!0.5!(U4)$);%
+ \coordinate (V5) at ($(T5)!0.5!(U5)$);%
+ \coordinate (V6) at ($(T6)!0.5!(U6)$);%
+ \coordinate (V7) at ($(T7)!0.5!(U7)$);%
+ \coordinate (V8) at ($(T8)!0.5!(U8)$);%
\draw[dashed] (A1) to (B1);%
- \draw[dashed] (A2) to (B2);
+ \draw[dashed] (A2) to (B2);%
\draw[dashed] (A3) to (B3);%
\ifboolKV[Autonomie]{ARemplir}{%
\ifboolKV[Autonomie]{Deux}{%
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V1)!0.5!(V2)$) {\ListeAutoEn[1,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V3)!0.5!(V4)$) {\ListeAutoEn[2,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V5)!0.5!(V6)$) {\ListeAutoEn[3,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V7)!0.5!(V8)$) {\ListeAutoEn[4,1]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R1)!0.5!(R2)$) {\ListeAutoQ[1,2]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R3)!0.5!(R4)$) {\ListeAutoQ[2,2]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R5)!0.5!(R6)$) {\ListeAutoQ[3,2]};
- \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R7)!0.5!(R8)$) {\ListeAutoQ[4,2]};
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V1)!0.5!(V2)$) {\ListeAutoEn[1,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V3)!0.5!(V4)$) {\ListeAutoEn[2,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V5)!0.5!(V6)$) {\ListeAutoEn[3,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(V7)!0.5!(V8)$) {\ListeAutoEn[4,1]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R1)!0.5!(R2)$) {\ListeAutoQ[1,2]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R3)!0.5!(R4)$) {\ListeAutoQ[2,2]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R5)!0.5!(R6)$) {\ListeAutoQ[3,2]};%
+ \node[align=justify,anchor=center,text width=0.9*0.25\textwidth] at ($(R7)!0.5!(R8)$) {\ListeAutoQ[4,2]};%
}{%
\foreach \i in {1,...,8}{%
- \node[text width=0.9*0.25\paperwidth] at (V\i) {\ListeAutoQ[\i,2]};
- \node[text width=0.9*0.25\paperwidth] at (R\i) {\ListeAutoEn[\i,1]};
+ \node[text width=0.9*0.25\paperwidth] at (V\i) {\ListeAutoQ[\i,2]};%
+ \node[text width=0.9*0.25\paperwidth] at (R\i) {\ListeAutoEn[\i,1]};%
}%
}%
}{%
\foreach \i in {1,...,8}{%
- \node[rotate=90,anchor=north] (Cor\i) at (S\i) {\useKV[Autonomie]{TexteCorrection}};
+ \node[rotate=90,anchor=north] (Cor\i) at (S\i) {\useKV[Autonomie]{TexteCorrection}};%
\node[anchor=west,xshift=2em,text width=0.8*0.25\paperwidth] (Test\i)
- at (S\i) {\ListeAutoQ[\i,2]};
+ at (S\i) {\ListeAutoQ[\i,2]};%
\node[anchor=north,yshift=-1em,text width=0.85*0.25\paperwidth] (TestEn\i)
- at (T\i) {\textbf{\useKV[Autonomie]{TitreAtoi} :} \ListeAutoEn[\i,1]};
+ at (T\i) {\textbf{\useKV[Autonomie]{TitreAtoi} :} \ListeAutoEn[\i,1]};%
\ifboolKV[Autonomie]{Enigme}{%
\node[anchor=south,yshift=1em,text width=0.85*0.25\paperwidth] (TestREn\i)
at (U\i) {%
- \ListeAutoEn[\i,2] : \pointilles\\
- Lettre \ding{\fpeval{171+\i}} : \pointilles
+ \ListeAutoEn[\i,2] : \pointilles\\%
+ Lettre \ding{\fpeval{171+\i}} : \pointilles%
};%
}{%
\node[anchor=south,yshift=1em,text width=0.85*0.25\paperwidth] (TestREn\i)
@@ -3084,9 +3534,9 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
};%
}%
}%
- }
- \end{tikzpicture}
-}
+ }%
+ \end{tikzpicture}%
+}%
%%%
% Calculatrice
@@ -3200,7 +3650,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
\def\MPCalculatrice#1#2#3{
% #1 Calcul %2 r\'eponse
\ifluatex
- \mplibforcehmode%
+ \mplibforcehmode%
\begin{mplibcode}%
input PfCCalculatrice;
LCD(#1)(#2)(#3);
@@ -6374,7 +6824,7 @@ couleur indiquée, le nombre de cases donné par le résultat du calcul.
}%
}%
-\newcommand{\Resultat}[1][]{%
+\newcommand\Resultat[1][]{%
\setKV[ClesDistributivite]{#1}%On lit les arguments optionnels
\ensuremath{%
\Affichage{\SommeA}{\SommeB}{\SommeC}
@@ -9263,7 +9713,7 @@ vardef Positions(expr Step)=
% #6 hyp
% #7 angle de rotation
\ifluatex
- \mplibcodeinherit{enable}
+ \mplibcodeinherit{enable}
\mplibforcehmode
\begin{mplibcode}
u:=\useKV[ClesTrigo]{Echelle};
@@ -10795,7 +11245,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
\fi%
\fi%
\ifnum\k=\meda%
- La \the\meda\ieme{} valeur est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
+ La \the\meda\ieme{} donn\'ee est \num{\ListeComplete[##1,1]}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}\\Donc la m\'ediane de la s\'erie est \xdef\Mediane{\fpeval{(\Mediane+\ListeComplete[##1,1])/2}}\num{\Mediane}\ifboolKV[ClesStat]{Concret}{~\useKV[ClesStat]{Unite}.}{.}%
\fi%
}%
}%
@@ -13020,8 +13470,8 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
}
\newcommand\Fonction[2][]{%
- \useKVdefault[ClesFonction]
- \setKV[ClesFonction]{#1}
+ \useKVdefault[ClesFonction]%
+ \setKV[ClesFonction]{#1}%
\ifboolKV[ClesFonction]{Trace}{%
\useKVdefault[TraceG]%
\setKV[TraceG]{#1}%
@@ -13029,7 +13479,6 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
}{%
\ifboolKV[ClesFonction]{Points}{%
\toklistePtsFn{}%
- % \setsepchar[*]{,*/}%\ignoreemptyitems%
\setsepchar[*]{§*/}%\ignoreemptyitems%
\readlist*\ListePoints{#2}%
\ifboolKV[ClesFonction]{Tangentes}{%
@@ -13052,25 +13501,26 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
}%
}%
}{%
- \ignoreemptyitems%
- \readlist*\ListeFonction{#2}
+ \setsepchar{,}\ignoreemptyitems%
+ \readlist*\ListeFonction{#2}%
\StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{\i}[\temp]%
\StrSubstitute{\useKV[ClesFonction]{Calcul}}{**}{^}[\tempa]%
\StrSubstitute{\tempa}{*}{}[\tempab]%
\ifboolKV[ClesFonction]{Ecriture}{%
- \ensuremath{\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})=\tempab}
+ \ensuremath{\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})=\tempab}%
}{}%
\ifboolKV[ClesFonction]{Definition}{%
- \ensuremath{\useKV[ClesFonction]{Nom}:\useKV[ClesFonction]{Variable}\mapsto\tempab}
+ \ensuremath{\useKV[ClesFonction]{Nom}:\useKV[ClesFonction]{Variable}\mapsto\tempab}%
}{}%
\ifboolKV[ClesFonction]{Tableau}{%
\buildtabfonction%
}{}%
+ \reademptyitems%
}%
}%
}%
-\def\buildtabfonction{%\\
+\def\buildtabfonction{%
\[%
\begin{array}{|>{\columncolor{gray!15}}c|*{\number\numexpr\ListeFonctionlen}{>{\centering\arraybackslash}p{\useKV[ClesFonction]{Largeur}}|}}%
\hline
@@ -13078,9 +13528,9 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
\hline
\useKV[ClesFonction]{Nom}(\useKV[ClesFonction]{Variable})\xintFor* ##1 in {\xintSeq {1}{\ListeFonctionlen}}\do{& \StrSubstitute{\useKV[ClesFonction]{Calcul}}{\useKV[ClesFonction]{Variable}}{(\ListeFonction[##1])}[\tempab]\num{\fpeval{\tempab}}}
\\\hline
- \end{array}
- \]
-}
+ \end{array}%
+ \]%
+}%
%%%
% Diff\'erentes représentations graphiques
@@ -14513,7 +14963,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
%%%
% Proba
%%%
-\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1}
+\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1,Incline}
\def\Updatetoksproba#1/#2\nil{\addtotok\toklistepointproba{"#1","\footnotesize #2",}}
\def\Updatetoksprobaechelle#1/#2/#3\nil{\addtotok\toklistepointproba{#1,#2,"#3",}}
@@ -14666,6 +15116,8 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
% #3:Liste des \'ev\`enements/proba
\ifluatex
\begin{mplibcode}
+ boolean Incline;
+ Incline=\useKV[ClesProba]{Incline};
pair A[],B[];%les noeuds de l'arbre
Figure(-10u,-10u,10u,10u);
A0=u*(1,1);
@@ -14697,11 +15149,19 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
else:
if (l mod 2)=1:
if p_<>"":
+ if Incline:
draw appelation(A[(l-1) div 2],A[l],4mm,TEX(p_));
+ else:
+ label.ulft(TEX(p_),iso(A[(l-1) div 2],A[l]));
+ fi;
fi;
else:
if p_<>"":
+ if Incline:
draw appelation(A[(l-1) div 2],A[l],-4mm,TEX(p_));
+ else:
+ label.llft(TEX(p_),iso(A[(l-1) div 2],A[l]));
+ fi;
fi;
fi;
l:=l+1;
@@ -14712,7 +15172,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
toto(#3);
\end{mplibcode}
\else
- \begin{mpost}[mpsettings={input PfCGeometrie;}]
+ \begin{mpost}[mpsettings={input PfCGeometrie; boolean Incline; Incline=\useKV[ClesProba]{Incline};}]
pair A[],B[];%les noeuds de l'arbre
Figure(-10u,-10u,10u,10u);
A0=u*(1,1);
@@ -14737,13 +15197,27 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
vardef toto(text t)=
for p_=t:
if (n mod 2)=1:
+ if p_<>"":
label(LATEX(p_),A[k]);
+ fi;
k:=k+1;
else:
if (l mod 2)=1:
+ if p_<>"":
+ if Incline:
draw appelation(A[(l-1) div 2],A[l],4mm,LATEX(p_));
else:
+ label.ulft(LATEX(p_),iso(A[(l-1) div 2],A[l]));
+ fi;
+ fi;
+ else:
+ if p_<>"":
+ if Incline:
draw appelation(A[(l-1) div 2],A[l],-4mm,LATEX(p_));
+ else:
+ label.llft(LATEX(p_),iso(A[(l-1) div 2],A[l]));
+ fi;
+ fi;
fi;
l:=l+1;
fi;
@@ -16065,8 +16539,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
n:=n+1;
if p_<>"":
drawarrow (unitp*(valeur[n],-1))--(unitp*(valeur[n],-0.3));
- label.bot(btex \hbox to2em{\dotfill} etex,(unitp*(valeur[n],-1)));
- pointe(unitp*(valeur[n]-ValeurOrigine,0));
+ label.bot(btex \pointilles[2em] etex,(unitp*(valeur[n],-1)));
fi;
endfor;
elseif AffichageCoord=2:
@@ -16075,7 +16548,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
n:=n+1;
if p_<>"":
if ((ValeurUnitex*valeur[n]) mod pasx)<>0:
- label.bot(TEX("\footnotesize$\frac{\num{\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"}}}{\num{"&decimal(pasx)&"}}$"),unitp*(valeur[n],0));
+ label.bot(TEX("\footnotesize$\frac{\num{\fpeval{"&decimal(ValeurOrigine*pasx)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(valeur[n])&"}}}{\num{"&decimal(pasx)&"}}$"),unitp*(valeur[n],0));
else:
label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
fi;
@@ -16087,7 +16560,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
for p_=t:
n:=n+1;
if p_<>"":
- label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
+ label.bot(TEX("\footnotesize\num{\fpeval{"&decimal(ValeurOrigine)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
pointe(unitp*(valeur[n],0));
fi;
endfor;
@@ -16163,8 +16636,8 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
n:=n+1;
if p_<>"":
drawarrow (unitp*(valeur[n],-1))--(unitp*(valeur[n],-0.3));
- label.bot(btex \noexpand\hbox to2em{\noexpand\dotfill} etex,(unitp*(valeur[n],-1)));
- pointe(unitp*(valeur[n]-ValeurOrigine,0));
+ label.bot(btex \noexpand\hbox to2em{\noexpand\pointilles[2em]} etex,(unitp*(valeur[n],-1)));
+ %pointe(unitp*(valeur[n]-ValeurOrigine,0));
fi;
endfor;
elseif AffichageCoord=2:
@@ -16173,7 +16646,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
n:=n+1;
if p_<>"":
if ((ValeurUnitex*valeur[n]) mod pasx)<>0:
- label.bot(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{\noexpand\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"}}}{\noexpand\num{"&decimal(pasx)&"}}$"),unitp*(valeur[n],0));
+ label.bot(LATEX("\noexpand\footnotesize$\noexpand\frac{\noexpand\num{\noexpand\fpeval{"&decimal(ValeurOrigine*pasx)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(valeur[n])&"}}}{\noexpand\num{"&decimal(pasx)&"}}$"),unitp*(valeur[n],0));
else:
label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
fi;
@@ -16185,7 +16658,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
for p_=t:
n:=n+1;
if p_<>"":
- label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(ValeurUnitex)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
+ label.bot(LATEX("\noexpand\footnotesize\noexpand\num{\noexpand\fpeval{"&decimal(ValeurOrigine)&"+"&decimal(ValeurUnitex-ValeurOrigine)&"*"&decimal(valeur[n])&"/"&decimal(pasx)&"}}"),unitp*(valeur[n],0));
pointe(unitp*(valeur[n],0));
fi;
endfor;
@@ -16461,13 +16934,13 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
\foreachitem\compteur\in\ListePointDroite{\expandafter\Updatetoksdemidroite\compteur\nil}%
\foreachitem\compteur\in\ListePointDroite{\xdef\Listedesvaleursaplacersurlademidroite{\Listedesvaleursaplacersurlademidroite,\ListePointDroite[\compteurcnt,1]}}%
%\Listedesvaleursaplacersurlademidroite%
- \[\MPNewDEMIGraduee{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}\]%
+ \MPNewDEMIGraduee{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}%
}{%
\foreachitem\compteur\in\ListePointDroite{\expandafter\Updatetoksdemidroite\compteur\nil}%
\xdef\Listedesvaleursaplacersurlademidroite{}%
\foreachitem\compteur\in\ListePointDroite{\xdef\Listedesvaleursaplacersurlademidroite{\Listedesvaleursaplacersurlademidroite,\ListePointDroite[\compteurcnt,1]}}%
%\Listedesvaleursaplacersurlademidroite%
- \[\MPNewDROITEGraduee{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}\]%
+ \MPNewDROITEGraduee{\Listedesvaleursaplacersurlademidroite}{\the\toklistenompointdemidroite}%
}%
}%
@@ -17935,7 +18408,7 @@ Unite={},Largeur=1cm,Precision=2,Donnee=Valeurs,Effectif=Effectif,Grille=false,O
\end{center}%
\end{minipage}};%
\node[yshift=-0.5em-0.5\hauteurtitre] (B) at (A){};%
- \ifboolKV[Cards]{Titre}{\node[fill=white] at (B) {\useKV[Cards]{NomTitre}};}{},%
+ \ifboolKV[Cards]{Titre}{\node[fill=white] at (B) {\useKV[Cards]{NomTitre}};}{}%
}%
}%
diff --git a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
index 92d4d3057d..4e208cf560 100644
--- a/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
+++ b/macros/latex/contrib/profcollege/metapost/PfCCalculatrice.mp
@@ -39,135 +39,135 @@ Math=true;
decahoriz:=0;
vardef Test(expr cptk,cptnt)=
- pair decalage;
+ pair Decalage;
if nblignes mod 2=0:
- decalage:=u*((20-length(cptnt)+cptk)*6,-8*(nblignes-1));
+ Decalage:=u*((20-length(cptnt)+cptk)*6,-8*(nblignes-1));
else:
- decalage:=u*(decahoriz,-8*(nblignes-1));
+ Decalage:=u*(decahoriz,-8*(nblignes-1));
decahoriz:=decahoriz+6;
fi;
- if substring(cptk,cptk+1) of cptnt="A":draw Affichage("01110100011000110001111111000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="B":draw Affichage("11110100011000111110100011000111110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="C":draw Affichage("01110100011000010000100001000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="D":draw Affichage("11100100101000110001100011001011100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="E":draw Affichage("11111100001000011111100001000011111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="F":draw Affichage("11111100001000011111100001000010000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="G":draw Affichage("01110100011000010111100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="H":draw Affichage("10001100011000111111100011000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="I":draw Affichage("01110001000010000100001000010001110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="J":draw Affichage("00111000100001000010000101001001100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="K":draw Affichage("10001100101010011000101001001010001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="L":draw Affichage("10000100001000010000100001000011111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="M":draw Affichage("10001110111010110101100011000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="N":draw Affichage("10001100011100110101100111000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="O":draw Affichage("01110100011000110001100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="P":draw Affichage("11110100011000111110100001000010000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="Q":draw Affichage("01110100011000110001101011001001101") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="R":draw Affichage("11110100011000111110101001001010001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="S":draw Affichage("01111100001000001110000010000111110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="T":draw Affichage("11111001000010000100001000010000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="U":draw Affichage("10001100011000110001100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="V":draw Affichage("10001100011000110001100010101000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="W":draw Affichage("10101101011010110101101011010101010") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="X":draw Affichage("10001100010101000100010101000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="Y":draw Affichage("10001100011000101010001000010000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="Z":draw Affichage("11111000010001000100010001000011111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="a":draw Affichage("00000000000111100001011111000101111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="b":draw Affichage("10000100001011011001100011000111110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="c":draw Affichage("00000000000111010000100001000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="d":draw Affichage("00001000010110110011100011000101111") shifted(decalage);
+ if substring(cptk,cptk+1) of cptnt="A":draw Affichage("01110100011000110001111111000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="B":draw Affichage("11110100011000111110100011000111110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="C":draw Affichage("01110100011000010000100001000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="D":draw Affichage("11100100101000110001100011001011100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="E":draw Affichage("11111100001000011111100001000011111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="F":draw Affichage("11111100001000011111100001000010000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="G":draw Affichage("01110100011000010111100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="H":draw Affichage("10001100011000111111100011000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="I":draw Affichage("01110001000010000100001000010001110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="J":draw Affichage("00111000100001000010000101001001100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="K":draw Affichage("10001100101010011000101001001010001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="L":draw Affichage("10000100001000010000100001000011111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="M":draw Affichage("10001110111010110101100011000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="N":draw Affichage("10001100011100110101100111000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="O":draw Affichage("01110100011000110001100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="P":draw Affichage("11110100011000111110100001000010000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="Q":draw Affichage("01110100011000110001101011001001101") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="R":draw Affichage("11110100011000111110101001001010001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="S":draw Affichage("01111100001000001110000010000111110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="T":draw Affichage("11111001000010000100001000010000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="U":draw Affichage("10001100011000110001100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="V":draw Affichage("10001100011000110001100010101000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="W":draw Affichage("10101101011010110101101011010101010") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="X":draw Affichage("10001100010101000100010101000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="Y":draw Affichage("10001100011000101010001000010000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="Z":draw Affichage("11111000010001000100010001000011111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="a":draw Affichage("00000000000111100001011111000101111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="b":draw Affichage("10000100001011011001100011000111110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="c":draw Affichage("00000000000111010000100001000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="d":draw Affichage("00001000010110110011100011000101111") shifted(Decalage);
elseif substring(cptk,cptk+1) of cptnt="e":if Math:
- draw Affichage("00000000000000000001101000100010100") shifted(decalage);
- decalage:=u*(decahoriz-1,-8*(nblignes-1));
- draw Affichage("00000000001001010101101011010110010") shifted(decalage);
+ draw Affichage("00000000000000000001101000100010100") shifted(Decalage);
+ Decalage:=u*(decahoriz-1,-8*(nblignes-1));
+ draw Affichage("00000000001001010101101011010110010") shifted(Decalage);
decahoriz:=decahoriz+6;
else:
- draw Affichage("00000000000111010001111111000001110") shifted(decalage);
+ draw Affichage("00000000000111010001111111000001110") shifted(Decalage);
fi;
- elseif substring(cptk,cptk+1) of cptnt="@":draw Affichage("00010001000111010001111111000001110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="f":draw Affichage("00110010010100011100010000100001000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="g":draw Affichage("00000011111000110001011110000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="h":draw Affichage("10000100001011011001100011000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="i":draw Affichage("00100000000110000100001000010001110") shifted(decalage);
+ elseif substring(cptk,cptk+1) of cptnt="@":draw Affichage("00010001000111010001111111000001110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="f":draw Affichage("00110010010100011100010000100001000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="g":draw Affichage("00000011111000110001011110000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="h":draw Affichage("10000100001011011001100011000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="i":draw Affichage("00100000000110000100001000010001110") shifted(Decalage);
elseif substring(cptk,cptk+1) of cptnt="j":if Math=true:
- draw Affichage("00011000011110100001000000000000000") shifted(decalage);
+ draw Affichage("00011000011110100001000000000000000") shifted(Decalage);
else:
- draw Affichage("00010000000011000010000101001001100") shifted(decalage);
+ draw Affichage("00010000000011000010000101001001100") shifted(Decalage);
fi;
elseif substring(cptk,cptk+1) of cptnt="k":if Math=true:
- draw Affichage("11100001000100011100000000000000000") shifted(decalage);
+ draw Affichage("11100001000100011100000000000000000") shifted(Decalage);
else:
- draw Affichage("10000100001001010100110001010010010") shifted(decalage);
+ draw Affichage("10000100001001010100110001010010010") shifted(Decalage);
fi;
elseif substring(cptk,cptk+1) of cptnt="l":if Math=true:
- draw Affichage("11100010000010011100000000000000000") shifted(decalage);
+ draw Affichage("11100010000010011100000000000000000") shifted(Decalage);
else:
- draw Affichage("01100001000010000100001000010001110") shifted(decalage);
+ draw Affichage("01100001000010000100001000010001110") shifted(Decalage);
fi;
- elseif substring(cptk,cptk+1) of cptnt="m":draw Affichage("00000000001101010101101011000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="n":draw Affichage("00000000001011011001100011000110001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="o":draw Affichage("00000000000111010001100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="p":draw Affichage("00000000001111010001111101000010000") shifted(decalage);
+ elseif substring(cptk,cptk+1) of cptnt="m":draw Affichage("00000000001101010101101011000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="n":draw Affichage("00000000001011011001100011000110001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="o":draw Affichage("00000000000111010001100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="p":draw Affichage("00000000001111010001111101000010000") shifted(Decalage);
elseif substring(cptk,cptk+1) of cptnt="q":if Math=true:
- draw Affichage("00000000001111101010010100101010001") shifted(decalage);
+ draw Affichage("00000000001111101010010100101010001") shifted(Decalage);
else:
- draw Affichage("00000000000110110011011110000100001") shifted(decalage);
+ draw Affichage("00000000000110110011011110000100001") shifted(Decalage);
fi;
- elseif substring(cptk,cptk+1) of cptnt="r":draw Affichage("00000000001011011001100001000010000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="s":draw Affichage("00000000000111010000011100000111110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="t":draw Affichage("01000010001110001000010000100100110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="u":draw Affichage("00000000001000110001100011001101101") shifted(decalage);
+ elseif substring(cptk,cptk+1) of cptnt="r":draw Affichage("00000000001011011001100001000010000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="s":draw Affichage("00000000000111010000011100000111110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="t":draw Affichage("01000010001110001000010000100100110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="u":draw Affichage("00000000001000110001100011001101101") shifted(Decalage);
elseif substring(cptk,cptk+1) of cptnt="v":if Math=true:
- draw Affichage("00111001000010000100101000110000100") shifted(decalage);
+ draw Affichage("00111001000010000100101000110000100") shifted(Decalage);
else:
- draw Affichage("00000000001000110001100010111000100") shifted(decalage);
+ draw Affichage("00000000001000110001100010111000100") shifted(Decalage);
fi;
- elseif substring(cptk,cptk+1) of cptnt="w":draw Affichage("00000000001010110101101011010101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="x":draw Affichage("00000000001000101010001000101010001") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="y":draw Affichage("00000000001000110001011110000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="z":draw Affichage("00000000001111100010001000100011111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="0":draw Affichage("01110100011001110101110011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="1":draw Affichage("00100011000010000100001000010001110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="2":draw Affichage("01110100010000100010001000100011111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="3":draw Affichage("11111000100010000010000011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="4":draw Affichage("00010001100101010010111110001000010") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="5":draw Affichage("11111100001111000001000011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="6":draw Affichage("00110010001000011110100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="7":draw Affichage("11111000010001000100010000100001000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="8":draw Affichage("01110100011000101110100011000101110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="9":draw Affichage("01110100011000101111000010001001100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="!":draw Affichage("00100001000010000100000000000000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="'":draw Affichage("01100001000100000000000000000000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="(":draw Affichage("00010001000100001000010000010000010") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt=")":draw Affichage("01000001000001000010000100010001000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="*":draw Affichage("00000001001010101110101010010000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="+":draw Affichage("00000001000010011111001000010000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt=",":draw Affichage("00000000000000000000011000010001000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="-":draw Affichage("00000000000000011111000000000000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt=".":draw Affichage("00000000000000000000000000110001100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="/":draw Affichage("00000000010001000100010001000000000") shifted(decalage);
+ elseif substring(cptk,cptk+1) of cptnt="w":draw Affichage("00000000001010110101101011010101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="x":draw Affichage("00000000001000101010001000101010001") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="y":draw Affichage("00000000001000110001011110000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="z":draw Affichage("00000000001111100010001000100011111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="0":draw Affichage("01110100011001110101110011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="1":draw Affichage("00100011000010000100001000010001110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="2":draw Affichage("01110100010000100010001000100011111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="3":draw Affichage("11111000100010000010000011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="4":draw Affichage("00010001100101010010111110001000010") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="5":draw Affichage("11111100001111000001000011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="6":draw Affichage("00110010001000011110100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="7":draw Affichage("11111000010001000100010000100001000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="8":draw Affichage("01110100011000101110100011000101110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="9":draw Affichage("01110100011000101111000010001001100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="!":draw Affichage("00100001000010000100000000000000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="'":draw Affichage("01100001000100000000000000000000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="(":draw Affichage("00010001000100001000010000010000010") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt=")":draw Affichage("01000001000001000010000100010001000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="*":draw Affichage("00000001001010101110101010010000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="+":draw Affichage("00000001000010011111001000010000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt=",":draw Affichage("00000000000000000000011000010001000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="-":draw Affichage("00000000000000011111000000000000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt=".":draw Affichage("00000000000000000000000000110001100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="/":draw Affichage("00000000010001000100010001000000000") shifted(Decalage);
elseif substring(cptk,cptk+1) of cptnt=":":if Math=true:
- draw Affichage("00000000000000000000000000000000000") shifted(decalage);
+ draw Affichage("00000000000000000000000000000000000") shifted(Decalage);
else:
- draw Affichage("00000011000110000000011000110000000") shifted(decalage);
+ draw Affichage("00000011000110000000011000110000000") shifted(Decalage);
fi;
elseif substring(cptk,cptk+1) of cptnt=";":if Math=true:
- draw Affichage("00000001000000011111000000010000000") shifted(decalage);
+ draw Affichage("00000001000000011111000000010000000") shifted(Decalage);
else:
- draw Affichage("00000011000110000000011000010001000") shifted(decalage);
+ draw Affichage("00000011000110000000011000010001000") shifted(Decalage);
fi;
- elseif substring(cptk,cptk+1) of cptnt="<":draw Affichage("00010001000100010000010000010000010") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="=":draw Affichage("00000000001111100000111110000000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt=">":draw Affichage("10000010000010000010001000100010000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="?":draw Affichage("01110100010000100010001000000000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="[":draw Affichage("01110010000100001000010000100001110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="]":draw Affichage("01110000100001000010000100001001110") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="`":draw Affichage("01000001000001000000000000000000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="|":draw Affichage("00100001000010000100001000010000100") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt=" ":draw Affichage("00000100010101000100010101000100000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="&":draw Affichage("00000100001100011100110001000000000") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="$":draw Affichage("00000000000000100001000010000111111") shifted(decalage);
- elseif substring(cptk,cptk+1) of cptnt="^":draw Affichage("00100010101000100000000000000000000") shifted(decalage);
+ elseif substring(cptk,cptk+1) of cptnt="<":draw Affichage("00010001000100010000010000010000010") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="=":draw Affichage("00000000001111100000111110000000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt=">":draw Affichage("10000010000010000010001000100010000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="?":draw Affichage("01110100010000100010001000000000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="[":draw Affichage("01110010000100001000010000100001110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="]":draw Affichage("01110000100001000010000100001001110") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="`":draw Affichage("01000001000001000000000000000000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="|":draw Affichage("00100001000010000100001000010000100") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt=" ":draw Affichage("00000100010101000100010101000100000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="&":draw Affichage("00000100001100011100110001000000000") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="$":draw Affichage("00000000000000100001000010000111111") shifted(Decalage);
+ elseif substring(cptk,cptk+1) of cptnt="^":draw Affichage("00100010101000100000000000000000000") shifted(Decalage);
fi;
enddef;
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
index 28ebf75edb..e5c9cd1156 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
index c328b4035f..b513bc9a73 100644
--- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
+++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex
@@ -1,6 +1,5 @@
-% !TeX TXS-program:compile = txs:///pythonpdfse
-
\documentclass{article}
+\usepackage[french]{babel}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage[upright]{fourier}
@@ -8,9 +7,7 @@
\renewcommand\ttdefault{lmtt}
\usepackage[scaled=0.875]{cabin}
\usepackage{ProfLycee}
-\usepackage[most]{tcolorbox}
\usetikzlibrary{hobby}
-\usepackage[french]{babel}
\usepackage{siunitx}
\usepackage{graphics}
\usepackage{hvlogos}
@@ -21,40 +18,6 @@
\usepackage{hyperref}
\hypersetup{pdfborder=0 0 0}
-\usepackage{listings}
-
-\lstset{%
- classoffset = 0,%
- language = [LaTeX]TeX,%
- basicstyle = \ttfamily,%
- breaklines = true,%
- commentstyle =\color{gray},%
- columns=fullflexible,%
- keepspaces,
- frame=tb,%
- %texcsstyle=*\color{blue},%pour colorer la contre-oblique
- alsoletter={\\},%
- keywordstyle=\color{blue},%
- emph=[1]{tkz,ProfLycee,ProfCollege},%
- emphstyle=[1]{\color{blue}},%
- emph=[3]{beamer},%
- emphstyle=[3]{\color{red}},%
- classoffset=1,%
- keywords={Ecran},%
- keywordstyle=\color{green},%
- classoffset=0,%
- literate=*{[}{{\textcolor{orange}{[}}}{1}
- {]}{{\textcolor{orange}{]}}}{1}
- {\{}{\textcolor{amber}{\{}}{1}
- {\}}{\textcolor{amber}{\}}}{1}
- {\&}{\textcolor{red}{\&}}{1}
- {\\[}{{\textcolor{purple}{\textbackslash[}}}{2}
- {\\]}{{\textcolor{purple}{\textbackslash]}}}{2}
- {$}{{\textcolor{purple}{\$}}}{1}%$
- {_}{{\textcolor{purple}{\_}}}{1}%
- {^}{{\textcolor{purple}{\^{}}}}{1}%,
-}
-
\usepackage{minted}
\sisetup{locale=FR}
\usepackage{geometry}
@@ -172,7 +135,7 @@
{\ttfamily c pierquet -- at -- outlook . fr}
\end{tabular}
}
-\date{Version 1.0.2 -- 13 Février 2022}
+\date{Version 1.0.5 -- 16 Février 2022}
\newcommand\Cle[1]{{\bfseries\sffamily\textlangle #1\textrangle}}
@@ -189,7 +152,7 @@
\noindent Quelques commandes (dans des environnements \TikZ) pour faciliter l'utilisation
de \LaTeX{} pour les enseignants de mathématiques en lycée.\\
-\bigskip
+\newpage
\tableofcontents
@@ -205,7 +168,20 @@ On peut le voir comme un (maigre) complément à \ctex{ProfCollege}, et je préc
\medskip
-L'idée est donc de conserver l'idée de \Cle{Clés} qui sont :
+Il se charge, dans le préambule, par \ctex{\textbackslash usepackage\{ProfLycee\}}.
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\documentclass{article}
+\usepackage[french]{babel}
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{ProfLycee}
+...
+\end{minted}
+
+\medskip
+
+L'idée est de conserver l'idée de \Cle{Clés} qui sont :
%
\begin{itemize}
\item modifiables ;
@@ -633,7 +609,7 @@ Ainsi, le code :
\paramCF[titre=true,couleurcmd=olive,couleurres=orange]
\ligneCF{COMMANDE 1}{RÉSULTAT 1}
\ligneCF{\texttt{(x+1)\chap2}}{$\mathtt{x^2+2x+1}$}
- \ligneCF[HC=1,HR=1]{\textsf{Dérivée[(x+5)*exp(-0.1*x)]}}{$\mathsf{\rightarrow (0.5-0.1*x)*exp(-0.1*x)}$}
+ \ligneCF[hc=1,hr=1.25]{\textsf{Dérivée[(x+5)*exp(-0.1*x)]}}{$\mathsf{\rightarrow (0.5-0.1*x)*exp(-0.1*x)}$}
\end{tikzpicture}
\end{minted}
@@ -705,7 +681,13 @@ Le \textsf{package} \ctex{pythontex} permet d'insérer et d'exécuter du code Py
\item charger du code python, et éventuellement l'utiliser dans la console.
\end{itemize}
-\subsection{Présentation de code Python}
+\medskip
+
+\textbf{Attention : }il faut dans ce cas une compilation en plusieurs parties, comme par exemple \textsf{pdflatex puis pythontex puis pdflatex} !
+
+Voir par exemple \url{http://lesmathsduyeti.fr/fr/informatique/latex/pythontex/} !
+
+\subsection{Présentation de code Python via pythontex}
L'environnement \ctex{\textbackslash envcodepythontex} (chargé par \ctex{ProfLycee}, avec l'option \textit{autogobble}) permet de présenter du code python, dans une \ctex{colorbox} avec un style particulier.
@@ -763,6 +745,70 @@ produira :
\newpage
+\subsection{Présentation de code Python via minted}
+
+Pour celles et ceux qui ne sont pas à l'aise avec le \textsf{package} \ctex{pythontex} et notamment sa spécificité pour compiler, il existe le \textsf{package} \ctex{minted} qui permet de présenter du code, et notamment python (il nécessite quand même une compilation avec l'option \ctex{--shell-escape} ou \ctex{-write18}).
+
+\medskip
+
+L'environnement \ctex{\textbackslash envcodepythonminted} permet de présenter du code python, dans une \ctex{colorbox} avec un style (\textit{minted}) particulier.
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{envcodepythonminted}(*)[largeur][options]
+...
+\end{envcodepythonminted}
+\end{minted}
+
+Plusieurs \Cle{arguments} (optionnels) sont disponibles :
+
+\begin{itemize}
+ \item la version \textit{étoilée} qui permet de pas afficher les numéros de lignes ;
+ \item le premier argument optionnel concerne la \Cle{largeur} de la \ctex{tcbox} ;\hfill{}défaut \Cle{12cm}
+ \item le second argument optionnel concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
+\end{itemize}
+
+\medskip
+
+Ainsi le code :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{envcodepythonminted}[12cm][center]
+ #environnement Python(minted) centré avec numéros, de largeur 12cm
+ def f(x) :
+ return x**2
+\end{envcodepythonminted}
+\end{minted}
+
+produira :
+
+\begin{envcodepythonminted}[12cm][center]
+ #environnement Python(minted) centré avec numéros
+ def f(x) :
+ return x**2
+\end{envcodepythonminted}
+
+\medskip
+
+Et le code :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{envcodepythonminted}*[0.8\linewidth][]
+ #environnement Python(minted) sans numéro, de largeur 0.8\linewidth
+ def f(x) :
+ return x**2
+\end{envcodepythonminted}
+\end{minted}
+
+produira :
+
+\begin{envcodepythonminted}*[0.8\linewidth][]
+ #environnement Python(minted) sans numéro, de largeur 0.8\linewidth
+ def f(x) :
+ return x**2
+\end{envcodepythonminted}
+
+\newpage
+
\subsection{Console d'exécution Python}
\ctex{pythontex} permet également de \textit{simuler} (en exécutant également !) du code python dans une \textit{console}.
@@ -833,157 +879,183 @@ Cela peut donner -- en tout cas -- des idées de personnalisation en ayant une b
\newpage
+\section{Pseudo-Code}
+
+\subsection{Introduction}
+
+Le \textsf{package} \ctex{listings} permet d'insérer et de présenter du code, et avec \ctex{tclorobx} on peut obtenir une présentation similaire à celle du code Python. Pour le moment la \textit{philosophie} de la commande est un peu différente de celle du code python, avec son système de \Cle{Clés}, car l'environnement \ctex{tcblisting} est un peu différente\ldots
+
+\subsection{Présentation de Pseudo-Code}
+
+L'environnement \ctex{\textbackslash envpseudocode} (chargé par \ctex{ProfLycee} permet de présenter du (pseudo-code) dans une \ctex{tcolorbox}.
+
+\smallskip
+
+De plus, le package \ctex{listings} avec \ctex{tcolorbox} ne permet pas de gérer le paramètre \textit{autogobble}, donc il faudra être vigilant quant à la position du code (pas de tabulation en fait\ldots)
+
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
+\begin{envpseudocode}(*)[largeur][options]
+%attention à l'indentation, gobble ne fonctionne pas...
+...
+\end{envpseudocode}
+\end{minted}
+
+Plusieurs \Cle{arguments} (optionnels) sont disponibles :
+
+\begin{itemize}
+ \item la version \textit{étoilée} qui permet de pas afficher les numéros de lignes ;
+ \item le premier argument optionnel concerne la \Cle{largeur} de la \ctex{tcbox} ;\hfill{}défaut \Cle{12cm}
+ \item le second argument optionnel concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
+\end{itemize}
+
+\medskip
+
+Ainsi le code :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{envpseudocode}
+%non centré, de largeur par défaut (12cm) avec lignes
+List = [...] # à déclarer au préalable
+n = longueur(List)
+Pour i allant de 0 à n-1 Faire
+ Afficher(List[i])
+FinPour
+\end{envpseudocode}
+\end{minted}
+
+produira :
+
+\begin{envpseudocode}
+List = [...] # à déclarer au préalable
+n = longueur(List)
+Pour i allant de 0 à n-1 Faire
+ Afficher(List[i])
+FinPour
+\end{envpseudocode}
+
+\medskip
+
+Et le code :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{envpseudocode}*[15cm][center]
+%centré, de largeur 15cm sans ligne
+List = [...] # à déclarer au préalable
+n = longueur(List)
+Pour i allant de 0 à n-1 Faire
+ Afficher(List[i])
+FinPour
+\end{envpseudocode}
+\end{minted}
+
+produira :
+
+\begin{envpseudocode}*[15cm][center]
+List = [...] # à déclarer au préalable
+n = longueur(List)
+Pour i allant de 0 à n-1 Faire
+ Afficher(List[i])
+FinPour
+\end{envpseudocode}
+
+\newpage
+
+\section{Terminal Windows/UNiX/OSX}
+
+\subsection{Introduction}
+
+L'idée des \textsf{commandes} suivantes est de permettre de simuler des fenêtres de \textsf{Terminal}, que ce soit pour Windows, Ubuntu ou OSX.
+
+\smallskip
+
+Le \textsf{contenu} est géré par le package \ctex{listings}, sans langage particulier, et donc sans coloration syntaxique particulière.
+
+\smallskip
+
+Comme pour le pseudo-code, pas d'\textsf{autogobble}, donc commandes à aligner à gauche !
+
+\subsection{Commandes}
+
+Les (trois) environnements disponibles sont :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{PLtermwin}[largeur]{titre=...}[options]
+...
+
+\begin{PLtermunix}[largeur]{titre=...}[options]
+...
+
+\begin{PLtermosx}[largeur]{titre=...}[options]
+...
+\end{minted}
+
+Peu d'options pour ces commandes :
+
+\begin{itemize}
+ \item le premier, optionnel, est la \Cle{largeur} de la \ctex{tcbox} ;\hfill{}défaut \Cle{\textbackslash linewidth}
+ \item le deuxième, mandataire, permet de spécifier le titre par la clé \Cle{titre}.\hfill{}défaut \Cle{Terminal Windows/UNiX/OSX}
+ \item le troisième, optionnel, concerne les \Cle{options} de la \ctex{tcbox} en \textit{langage tcolorbox}.\hfill{}défaut \Cle{vide}
+\end{itemize}
+
+\medskip
+
+Ainsi le code :
+
+\begin{minted}[frame=lines,framesep=2mm,bgcolor=lightgray!5,fontsize=\footnotesize,tabsize=4]{tex}
+\begin{PLtermwin}[15cm]{} %largeur 15cm avec titre par défaut
+Microsoft Windows [version 10.0.22000.493]
+(c) Microsoft Corporation. Tous droits réservés.
+
+C:\Users\test>ping -c 2ctan.org
+Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
+\end{PLtermwin}
+
+\begin{PLtermunix}[12cm]{titre=Terminal Ubuntu}[center] %12cm, avec titre modifié et centré
+test@DESKTOP:~$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{PLtermunix}
+
+\begin{PLtermosx}[0.5\linewidth]{titre=Terminal MacOSX}[flush right] %1/2-largeur et titre modifié et droite
+[test@server]$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{PLtermosx}
+\end{minted}
+
+produira :
+
+\begin{PLtermwin}[15cm]{}
+Microsoft Windows [version 10.0.22000.493]
+(c) Microsoft Corporation. Tous droits réservés.
+
+C:\Users\test>ping -c 2ctan.org
+Envoi d'une requête 'ping' sur ctan.org [5.35.249.60] avec 32 octets de données :
+\end{PLtermwin}
+
+\begin{PLtermunix}[12cm]{titre=Terminal Ubuntu}[center]
+test@DESKTOP:~$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{PLtermunix}
+
+\begin{PLtermosx}[0.5\linewidth]{titre=Terminal MacOSX}[flush right]
+[test@server]$ ping -c 2 ctan.org
+PING ctan.org (5.35.249.60) 56(84) bytes of data.
+\end{PLtermosx}
+
+\newpage
+
\section{Historique}
-{\small \bverb|v1.0.2| : Ajout des environnements pour Python
+{\small \bverb|v1.0.5| : Ajout d'un environnement pour Python (minted)
-{\small \bverb|v1.0.1| : Modification mineure liée au chargement de \ctex{xcolor}
+{\small \bverb|v1.0.4| : Ajout des environnements pour Terminal (win, osx, unix)
-{\small \bverb|v1.0 | : Version initiale}
+{\small \bverb|v1.0.3| : Ajout des environnements pour PseudoCode
-%\newpage
-%
-%\section{Codes du package splinetikz.sty}
-%
-%\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-%\NeedsTeXFormat{LaTeX2e}
-%\ProvidesPackage{splinetikz}[2022/02/10 - v1.0 - Splines cubiques, en TikZ]
-%
-%%------Packages utiles
-%\RequirePackage[dvipsnames,table]{xcolor}
-%\RequirePackage{tikz}
-%\RequirePackage{pgf,pgffor,pgfplots}
-%\pgfplotsset{compat=1.18}
-%\RequirePackage{ifthen}
-%\RequirePackage{xkeyval}
-%\RequirePackage{xfp}
-%\RequirePackage{xstring}
-%\RequirePackage{simplekv}
-%\RequirePackage{listofitems}
-%\RequirePackage{xintexpr}
-%\usetikzlibrary{decorations.pathreplacing}
-%\usetikzlibrary{decorations.markings}
-%\usetikzlibrary{arrows.meta}
-%\end{minted}
-%
-%\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-%%------commande utile pour extraire des infos d'une liste
-%\newcommand\extractcoeff[2]{% #1=liste & #2=numero
-% \setsepchar{§}%
-% \readlist\lcoeffs{#1}
-% \ifnum \lcoeffslen=1
-% \def\COEFFA{#1}
-% \def\COEFFB{#1}
-% \else
-% \itemtomacro\lcoeffs[#2]\COEFF
-% \IfSubStr{\COEFF}{/}%
-% {\StrCut{\COEFF}{/}{\COEFFA}{\COEFFB}}%
-% {\def\COEFFA{\COEFF}\def\COEFFB{\COEFF}}
-% \fi
-%}
-%\end{minted}
-%
-%\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2]{tex}
-%%------tangente(s) en TikZ, avec point/dérivée ou liste points/dérivées
-%\defKV[tgte]{%
-% liste=\def\TGTliste{#1},%
-% width=\def\TGTepaisseur{#1},%
-% couleur=\def\TGTcouleur{#1},%
-% xl=\def\TGTXL{#1},%
-% xr=\def\TGTXR{#1},%
-% style=\def\TGTstyle{#1},%
-% point=\def\TGTnumpt{#1}
-%}
-%
-%\setKVdefault[tgte]{
-% liste=,%
-% width=1.25pt,%
-% couleur=red,%
-% xl=0.5,xr=0.5,%
-% style=,%
-% point=1
-%}
-%
-%\newcommand\tangentetikz[1][]{%
-% \useKVdefault[tgte]%
-% \setKV[tgte]{#1}% on paramètres les nouvelles clés et on les simplifie
-% \setsepchar[.]{§./}%
-% \readlist\TGTlistepoints\TGTliste
-% \itemtomacro\TGTlistepoints[\TGTnumpt,1]\xa
-% \itemtomacro\TGTlistepoints[\TGTnumpt,2]\ya
-% \itemtomacro\TGTlistepoints[\TGTnumpt,3]\fprimea
-% \def\TGTDEB{\fpeval{\xa-\TGTXL}}\def\TGTFIN{\fpeval{\xa+\TGTXR}}%
-% \draw[line width=\TGTepaisseur,\TGTcouleur,domain=\TGTDEB:\TGTFIN,\TGTstyle] plot (\x,{\fprimea*(\x-\xa)+\ya}) ;%
-%}
-%\end{minted}
-%
-%\begin{minted}[frame=lines,framesep=2mm,bgcolor=LightGray,fontsize=\footnotesize,tabsize=2,breaklines]{tex}
-%%------splines en tikz avec ..controls
-%\defKV[spline]{%
-% liste=\def\SPLliste{#1},%
-% width=\def\SPLepaisseur{#1},%
-% couleur=\def\SPLcouleur{#1},%
-% coeffs=\def\SPLcoeffs{#1},%
-% couleurpoints=\def\SPLcouleurpoints{#1},%
-% taillepoints=\def\SPLtaillepoints{#1},%
-% style=\def\SPLstyle{#1}
-%}
-%
-%\setKVdefault[spline]{%
-% liste=,%
-% width=1.25pt,%
-% couleur=red,%
-% coeffs=3,%
-% couleurpoints=black,%
-% taillepoints=2pt,%
-% affpoints=false,%
-% style=
-%}
-%
-%\newcommand\splinetikz[1][]{%
-% \useKVdefault[spline]
-% \setKV[spline]{#1}% on paramètres les nouvelles clés et on les simplifie
-% %on lit la liste des points/nbderivés et on stocke dans \listepoints
-% \setsepchar[.]{§./}
-% \readlist\SPLlistepoints\SPLliste
-% \def\SPLnbsplines{\inteval{\SPLlistepointslen-1}}
-% %si uniquement deux points, pas de boucle...
-% \ifnum \SPLlistepointslen=2
-% %extraction des coeffs de compensation
-% \extractcoeff{\SPLcoeffs}{1}
-% %extraction des coordonnées
-% \itemtomacro\SPLlistepoints[1,1]\xa
-% \itemtomacro\SPLlistepoints[1,2]\ya
-% \itemtomacro\SPLlistepoints[1,3]\fprimea
-% \itemtomacro\SPLlistepoints[2,1]\xb
-% \itemtomacro\SPLlistepoints[2,2]\yb
-% \itemtomacro\SPLlistepoints[2,3]\fprimeb
-% \draw[line width=\SPLepaisseur,\SPLcouleur,\SPLstyle] (\xa,\ya) ..controls +({atan \fprimea}:{(\xb-\xa)/\COEFFA}) and +({-180 + atan \fprimeb}:{(\xb-\xa)/\COEFFA}).. (\xb,\yb) ;%
-% %sinon on construit bout par bout !
-% \else
-% \foreach \i in {1,2,...,\SPLnbsplines}{
-% %extraction des coeffs de compensation
-% \extractcoeff{\SPLcoeffs}{\i}
-% \def\j{\inteval{\i+1}}
-% \itemtomacro\SPLlistepoints[\i,1]\xa
-% \itemtomacro\SPLlistepoints[\i,2]\ya
-% \itemtomacro\SPLlistepoints[\i,3]\fprimea
-% \itemtomacro\SPLlistepoints[\j,1]\xb
-% \itemtomacro\SPLlistepoints[\j,2]\yb
-% \itemtomacro\SPLlistepoints[\j,3]\fprimeb
-% \draw[line width=\SPLepaisseur,\SPLcouleur,\SPLstyle] (\xa,\ya) ..controls +({atan \fprimea}:{(\xb-\xa)/\COEFFA}) and +({-180 + atan \fprimeb}:{(\xb-\xa)/\COEFFB}).. (\xb,\yb) ;%
-% }
-% \fi
-% \ifboolKV[spline]{affpoints}%on affiche les points de contrôle
-% {%
-% \foreach \i in {1,2,...,\SPLlistepointslen}{%
-% \itemtomacro\SPLlistepoints[\i,1]\xa
-% \itemtomacro\SPLlistepoints[\i,2]\ya
-% \filldraw[\SPLcouleurpoints] (\xa,\ya) circle[radius=\SPLtaillepoints] ;%
-% }
-% }
-% {}
-%}
-%\end{minted}
+{\small \bverb|v1.0.2| : Ajout des environnements pour Python (pythontex)
+
+{\small \bverb|v1.0.1| : Modification mineure liée au chargement de \ctex{xcolor}
+
+{\small \bverb|v1.0 | : Version initiale}
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
index ceaf2ef191..8938888868 100644
--- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty
+++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty
@@ -3,22 +3,29 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ProfLycee}[2022/02/13 - v1.0.2 - Aide pour l'utilisation de LaTeX en lycée]
+\ProvidesPackage{ProfLycee}[2022/02/16 - v1.0.5 - Aide pour l'utilisation de LaTeX en lycée]
+% 1.0.5 Environnement code python avec minted
+% 1.0.4 Environnement pour simuler terminal windows & linux
+% 1.0.3 Environnement pour présenter du pseudocode
% 1.0.2 Environnement pour présenter du code python (avec pythontex)
% 1.0.1 Modif mineure du chargement de xcolor (compatibilité avec d'autres packages notamment...)
% 1.0 Version initiale
%------Packages utiles
\RequirePackage[table,svgnames]{xcolor}%Gestion des couleurs
+\RequirePackage{amssymb}
\RequirePackage{tikz}
\RequirePackage{pgf,pgffor}
\RequirePackage{ifthen}
+\RequirePackage{environ}
+\RequirePackage{xparse}
\RequirePackage{xkeyval}
\RequirePackage{xfp}
\RequirePackage{xstring}
\RequirePackage{simplekv}
\RequirePackage{listofitems}
\RequirePackage{xintexpr}
+\RequirePackage{tabularray}
\RequirePackage{fontawesome5}
%librairies tikz
\usetikzlibrary{calc}
@@ -248,7 +255,6 @@
{}
}
-
%=========CONSOLEPYTHON=========== OK !!
\defKV[envpythonconsole]{%
largeur=\def\CSPYlargeur{#1},%
@@ -309,7 +315,7 @@
top=2pt,bottom=1pt,left=6pt,right=6pt
},
fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
- title={\scriptsize\faPython}\:Code Python\vphantom{/},
+ title={\scriptsize\faPython}\:Code Python\vphantom{p},
watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50,
}
}
@@ -358,4 +364,284 @@
\verbcenterpost
}
+%=========PYTHONMINTED========= OK !!
+\tcbuselibrary{minted}
+
+\tcbset{pytmintedno/.style={%
+ listing engine=minted,minted style=colorful,
+ minted language=python,listing only,
+ minted options={tabsize=4,fontsize=\small,autogobble},
+ }
+}
+
+\tcbset{pytminted/.style={%
+ listing engine=minted,minted style=colorful,
+ minted language=python,listing only,
+ minted options={tabsize=4,fontsize=\small,autogobble,xleftmargin=16pt,linenos,numbersep=10pt},
+ }
+}
+
+\DeclareTCBListing{envcodepythonminted}{ s O{12cm} O{} }{% étoilée sans numéro, taille puis option...
+ \IfBooleanTF{#1}{pytmintedno}{pytminted},
+ enhanced,width=#2,#3,
+ colframe=Green,colback=ForestGreen!5,%
+ boxrule=1.25pt,
+ sharp corners=downhill,arc=12pt,
+ before skip=12pt,after skip=12pt,%
+ leftupper=8pt,top=10pt,bottom=4pt,rightupper=4pt,%
+ attach boxed title to top right={yshift=-\tcboxedtitleheight},
+ boxed title style={
+ size=small,colback=ForestGreen!25,boxrule=1.25pt,
+ colframe=Green,boxsep=1.25pt,
+ sharp corners=downhill,
+ arc=12pt,
+ top=2pt,bottom=1pt,left=6pt,right=6pt
+ },
+ fonttitle=\color{ForestGreen}\itshape\ttfamily\footnotesize,
+ title={\scriptsize\faPython}\:Code Python\vphantom{y},
+ watermark text={\faPython},watermark opacity=0.175,watermark zoom=0.50,
+ before upper = \renewcommand{\theFancyVerbLine}{\scriptsize\ttfamily\color{Green}\arabic{FancyVerbLine}}
+}
+
+%=========PSEUDOCODE=========== OK !!
+\ifluatex
+ \tcbuselibrary{listings}
+ \lstdefinelanguage{langnat}{%
+ keywords={},
+ inputencoding=utf8,
+ comment=[l]{}}
+\else
+ \tcbuselibrary{listingsutf8}
+ \lstdefinelanguage{langnat}{%
+ keywords={},
+ inputencoding=utf8/latin1,
+ comment=[l]{}}
+\fi
+
+%language pseudocode listings
+\lstdefinestyle{pseudocodePL}{%
+ language=langnat,
+ basicstyle=\footnotesize\ttfamily,
+ numberstyle=\scriptsize\ttfamily\color{gray},
+ keywordstyle=\bfseries,
+ stringstyle=\color{red!75},
+ keepspaces=true,
+ tabsize=4,numbersep=10pt,
+ xleftmargin=14pt,
+ numbers=left,
+ morestring=[b]",
+ showstringspaces=false,
+ %showtabs=false,
+ escapeinside={(*}{*)}
+}
+
+\lstdefinestyle{pseudocodenoPL}{%
+ language=langnat,
+ basicstyle=\footnotesize\ttfamily,
+ numberstyle=\scriptsize\ttfamily\color{gray},
+ keywordstyle=\bfseries,
+ stringstyle=\color{red!75},
+ keepspaces=true,
+ tabsize=4,numbersep=10pt,
+ numbers=none,
+ showstringspaces=false,
+ morestring=[b]",
+ %showtabs=true,
+ escapeinside={(*}{*)}
+}
+
+%style tcbox pseudocode avec bannière hautdroite
+\tcbset{stylepseudocodePL/.style={%
+ %fontupper=\small\sffamily,%
+ enhanced,boxrule=1.25pt,sharp corners=downhill,arc=12pt,
+ before skip=12pt,after skip=12pt,leftupper=10pt,top=8pt,bottom=2pt,rightupper=4pt,%
+ attach boxed title to top right={yshift=-\tcboxedtitleheight},
+ boxed title style={
+ size=small,colback=gray!25,boxrule=1.25pt,
+ colframe=darkgray,boxsep=1.25pt,
+ sharp corners=downhill,
+ arc=12pt,
+ top=2pt,bottom=1pt,left=6pt,right=6pt
+ },
+ fonttitle=\color{darkgray}\ttfamily\footnotesize,
+ title={\scriptsize\faFileCode}\:\textit{Pseudo-Code}\vphantom{p},
+ watermark text={\faCode},watermark opacity=0.175,watermark zoom=0.50,
+ }
+}
+
+\ifluatex
+ \newcommand\algomathttPL[1]{\symtt{#1}}
+\else
+ \newcommand\algomathttPL[1]{\mathtt{#1}}
+\fi
+
+\DeclareTCBListing{envpseudocode}{ s O{12cm} O{} }{% étoilée sans numéro, taille puis option...
+ width=#2,#3,
+ stylepseudocodePL,
+ listing only,listing engine=listings,
+ listing options={
+ style=\IfBooleanTF{#1}{pseudocodenoPL}{pseudocodePL},%version étoilée sans numéro de lignes
+ aboveskip=2pt,belowskip=2pt,
+ columns=fullflexible,
+ literate={é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1%
+ {ú}{{\'u}}1 {Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1%
+ {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1%
+ {À}{{\`A}}1 {È}{{\'E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1%
+ {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1%
+ {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1%
+ {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1%
+ {Â}{{\^A}}1 {Ê}{{\^E}}1 {Î}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1%
+ {œ}{{\oe}}1 {Œ}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1%
+ {ű}{{\H{u}}}1 {Ű}{{\H{U}}}1 {ő}{{\H{o}}}1 {Ő}{{\H{O}}}1%
+ {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {å}{{\r a}}1 {Å}{{\r A}}1%
+ {€}{{\texteuro}}1 {£}{{\pounds}}1%
+ {=}{\textleftarrow}1 {==}{=}1%
+ {*}{$\algomathttPL{\times}$}{1}%
+ }
+}
+
+%============FakeTerm===========
+%couleurs (inspirées par termsim !)
+\definecolor{PLmpurple}{RGB}{48,10,36}
+\definecolor{PLmgray}{RGB}{70,72,67}
+\definecolor{PLogray}{RGB}{148,147,141}
+\definecolor{PLoorange}{RGB}{233,101,56}
+\definecolor{PLterminal}{RGB}{80,78,70}
+\definecolor{PLlinux}{RGB}{0,39,51}
+\definecolor{PLwinblue}{HTML}{1883D7}
+\definecolor{PLosxgray}{HTML}{D8D6D9}
+
+%WINDOWS
+\tcbset{PLfaketermwin/.style={%
+ enhanced,boxrule=1pt,sharp corners,before skip=12pt,after skip=12pt,%
+ colframe=PLwinblue,colback=black,colbacktitle=white,colupper=white,coltitle=black,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[fakeTERMwin]{titre={Terminal Windows}}
+
+\newcommand\PLcommandeswin{%
+ \begin{tikzpicture}[thick,scale=0.66]
+ \draw (0,0)--(1em,0) ; \draw (2em,0) rectangle (3em,1em) ; \draw (4em,1em)--(5em,0) (4em,0)--(5em,1em) ;
+ \end{tikzpicture}%
+}
+
+\newcommand\termwintitre[1][]{%
+ \restoreKV[fakeTERMwin]
+ \setKV[fakeTERMwin]{#1}
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={X[l]r}}
+ {\footnotesize\faTerminal}~~\useKV[fakeTERMwin]{titre} & \PLcommandeswin \\ %
+ \end{tblr}
+}
+
+\DeclareTCBListing{PLtermwin}{ O{\linewidth} m !O{} }{%[taille] puis {titre=...} puis [option]
+ PLfaketermwin,title={\termwintitre[#2]},%
+ listing only,listing engine=listings,%
+ listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},%
+ width=#1,#3
+}
+
+%LINUX
+\newcommand{\PLUbuntuWhite}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[PLmgray] (0,0.25em) circle[radius=0.5em] ;
+ \end{tikzpicture}%
+}
+\newcommand{\PLUbuntuMin}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=PLogray!50!white] (0,0.25em) circle[radius=0.5em];
+ \draw[PLterminal](-0.35em,0.25em)--(0.35em,0.25em);
+ \end{tikzpicture}%
+}
+\newcommand{\PLUbuntuClose}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=PLoorange!70!white] (0,0.25em) circle[radius=0.5em];
+ \draw[PLterminal] (-0.32em,-0.07em)--(0.32em,0.57em);
+ \draw[PLterminal] (-0.32em,0.57em)--(0.32em,-0.07em);
+ \end{tikzpicture}%
+}
+\newcommand{\PLUbuntuMax}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[color=PLogray!50!white] (0,0.25em) circle[radius=0.5em];
+ \draw[PLterminal] (-0.32em,0.5em) rectangle (0.32em,0);
+ \end{tikzpicture}%
+}
+
+\tcbset{PLtermlinux/.style={%
+ enhanced,boxrule=1pt,arc=4pt,before skip=12pt,after skip=12pt,%
+ colframe=PLmgray,colback=PLmpurple,colbacktitle=PLmgray,colupper=white,coltitle=white,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\setKVdefault[fakeTERMnux]{titre={Terminal UNiX}}
+
+\newcommand\termnuxtitre[1][]{%
+ \restoreKV[fakeTERMnux]
+ \setKV[fakeTERMnux]{#1}
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={lX[c]r}}
+ \PLUbuntuWhite~~\PLUbuntuWhite~~\PLUbuntuWhite & \vphantom{p}\useKV[fakeTERMnux]{titre} & \PLUbuntuMin~~\PLUbuntuMax~~\PLUbuntuClose \\
+ \end{tblr}
+}
+
+\DeclareTCBListing{PLtermunix}{ O{\linewidth} m !O{} }{%[taille] puis {titre=...} puis [option]
+ PLtermlinux,title={\termnuxtitre[#2]},%
+ listing only,listing engine=listings,%
+ listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},%
+ width=#1,#3
+}
+
+%OSX
+\tcbset{PLfaketermosx/.style={%
+ enhanced,boxrule=1pt,arc=6pt,before skip=12pt,after skip=12pt,%
+ colframe=PLosxgray,colback=lightgray!15,colbacktitle=PLosxgray,colupper=black,coltitle=black,%
+ titlerule=0.4pt,left=2pt,top=2pt,bottom=2pt,right=2pt,middle=2pt,%
+ fonttitle=\bfseries\small\sffamily
+ }
+}
+
+\newcommand{\PLOSXRed}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[red] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\PLOSXOrange}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[orange] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\PLOSXGreen}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[ForestGreen] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\newcommand{\PLOSXLG}{%
+ \begin{tikzpicture}[thick,anchor=base,baseline]
+ \filldraw[PLosxgray] (0,0.25em) circle[radius=0.45em] ;
+ \end{tikzpicture}%
+}
+
+\setKVdefault[fakeTERMosx]{titre={Terminal OSX}}
+
+\newcommand\termosxtitre[1][]{%
+ \restoreKV[fakeTERMosx]
+ \setKV[fakeTERMosx]{#1}
+ \begin{tblr}{colsep=0pt,rowsep=0pt,width=\linewidth,colspec={lX[c]r}}
+ \PLOSXRed~\PLOSXOrange~\PLOSXGreen & \vphantom{p}\useKV[fakeTERMosx]{titre} & \PLOSXLG~\PLOSXLG~\PLOSXLG \\
+ \end{tblr}
+}
+
+\DeclareTCBListing{PLtermosx}{ O{\linewidth} m !O{} }{%[taille] puis {titre=...} puis [option]
+ PLfaketermosx,title={\termosxtitre[#2]},%
+ listing only,listing engine=listings,%
+ listing options={style=tcblatex,language={},basicstyle=\footnotesize\ttfamily},%
+ width=#1,#3
+}
+
\endinput \ No newline at end of file
diff --git a/macros/latex/contrib/wrapfig2/README.txt b/macros/latex/contrib/wrapfig2/README.txt
index 720a426f33..368a0784d0 100644
--- a/macros/latex/contrib/wrapfig2/README.txt
+++ b/macros/latex/contrib/wrapfig2/README.txt
@@ -1,5 +1,5 @@
%%%% README.txt file
-This README.txt for package wrapfig2[2022-01-26 v.5.0.7 ...]
+This README.txt for package wrapfig2[2022-02-16 v.6.0.0 ...]
This work is author maintained
@@ -27,6 +27,9 @@ older than 1st January 2019. In any case this package loading is
aborted in order to avoid conflicts, and in some other circumstances;
the error messages describe why the process was aborted.
+Version 6 of this package accepts options in the form key=value.
+Options are available to fall back to version 5 and version 4.
+
Claudio Beccari
claudio dot beccari at gmail dot com \ No newline at end of file
diff --git a/macros/latex/contrib/wrapfig2/commodilla.jpg b/macros/latex/contrib/wrapfig2/commodilla.jpg
deleted file mode 100644
index 4c8dc01e2e..0000000000
--- a/macros/latex/contrib/wrapfig2/commodilla.jpg
+++ /dev/null
Binary files differ
diff --git a/macros/latex/contrib/wrapfig2/stele-todi-small.jpg b/macros/latex/contrib/wrapfig2/stele-todi-small.jpg
new file mode 100644
index 0000000000..8f85df10a8
--- /dev/null
+++ b/macros/latex/contrib/wrapfig2/stele-todi-small.jpg
Binary files differ
diff --git a/macros/latex/contrib/wrapfig2/wrapfig2.dtx b/macros/latex/contrib/wrapfig2/wrapfig2.dtx
index 55147dcd01..dbcec7a0c6 100644
--- a/macros/latex/contrib/wrapfig2/wrapfig2.dtx
+++ b/macros/latex/contrib/wrapfig2/wrapfig2.dtx
@@ -45,7 +45,7 @@ wrapfig2.sty and wrapfig2.pdf, plus this file README.txt.
%<+package>\ProvidesPackage{wrapfig2}%
%^^A<+readme>File README.txt for package wrapfig2
%<*package|readme>
- [2022-01-26 v.5.0.7 Wrap text around figures, tables, framed text blocks]
+ [2022-02-16 v.6.0.0 Wrap text around figures, tables, framed text blocks]
%</package|readme>
%<*driver>
%
@@ -65,6 +65,7 @@ wrapfig2.sty and wrapfig2.pdf, plus this file README.txt.
\date{Version \fileversion~--~Last revised \filedate.}
%
\providecommand*\diff{\mathop{}\!\mathrm{d}}
+\providecommand*\ped[1]{\ensuremath{_{\mathrm{#1}}}}
\renewcommand\meta[1]{{\normalfont\textlangle\textit{#1}\textrangle}}
\renewcommand\marg[1]{\texttt{\{\meta{#1}\}}}
\providecommand\opz{}
@@ -156,7 +157,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%
% \begin{abstract}
% This new package \pack{wrapfig2} is a fork that extends Donald
-% Arseneau's package \pack{wrapfig} (version 2.6, dated 2003) by
+% Arseneau's package \pack{wrapfig} (version 3.6, dated 2003) by
% adding some \LaTeXiii definitions that accept a final optional star;
% its presence changes the meaning of the first optional
% argument so that it becomes a correction to the number of lines
@@ -166,8 +167,9 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% to wrap a small framed text block on a coloured background; the
% philosophy of this new environment is similar to that of the
% other two environments, but the syntax was different with
-% version~4.0 of this package, and is very similar with this
-% version 5.0. A fall back option is available for backwards
+% version~4 of this package, and is very similar with
+% version 5.0; a further important enhancement is implemented
+% in version~6. Fall back options are available for backwards
% compatibility.
% \end{abstract}
%
@@ -189,14 +191,12 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% The purpose of this package is manyfold. On one side it tries
-% to modernise the original software by Donald Arseneau by
-% upgrading it to the \LaTeXiii modern language. On another it
+% to upgrade the original software by Donald Arseneau by
+% using some parts of the \LaTeXiii modern language. On another it
% creates a new environment, with the same philosophy
% of the original Arseneau's ones, such that a document author
-% can emphasise short blocks of text by framing them while
-% typesetting the text on a coloured background by means of
-% the \pack{curve2e} functionalities, and wrapping this
-% inserted text with the surrounding main text.
+% can emphasise short blocks of wrapped text by framing them while
+% typesetting the text on a coloured background.
%
% The original software had some idiosyncrasies; Donald Arseneau
% described them in the documentation of his package; we are sorry
@@ -223,15 +223,16 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% section; or at the beginning of a chapter that starts with plain
% text, in particular just at the beginning of the first paragraph.
%
-% The code of this package does very little if anything to correct
+% The code of this package does very little, if anything, to correct
% such idiosyncrasies. They are caused by the limitations of the
% \cs{ShipOut} \LaTeXe kernel macro, and very little we were able
% to do in addition to what Arseneau already did.
%
-% Another purpose of this package is to add an optional argument
+% Another purpose of this package is to add another optional argument
% so that the \meta{number of indented lines} argument does not mean
% the total number, but the correction number to add-to or subtract-from
% the value computed by the default mechanism devised by Arseneau.
+%
% We assume that most users first use the software to insert an object
% to be wrapped by the surrounding text without specifying any value
% with the specific optional argument; then they evaluate the result,
@@ -248,28 +249,33 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% to a user who was asking for such an arrangement; the solution
% resorted to a specific use of the \Env{wrapfigure} environment and
% used the \Env{tcolorbox} environment.
+%
% We thought that an \emph{ad hoc} solution would be a better one,
% since the parameters to be used for a figure have nothing or
% little to do with a text, therefore most of them would be useless
% with a wrapped text. Nevertheless the \meta{location} of the wrapped
% text and the optional correction of the indented lines number would
% still be necessary. We added also the possibility of optionally
-% specifying the measure of the wrapped text, even if this measure
-% should not be too different from a half the wrapping text measure.
+% specifying the measure of the wrapped text, even if it
+% should not be too different from a half of the wrapping text measure.
% In facts, with a value too different from \texttt{0.5\cs{linewidth}}
% either the wrapped text has problems with inter word spaces and
% hyphenation because of the small measure, or, on the opposite, the
% indented lines of the wrapping text would have similar problems.
%
-% Notice that the first implementation of this package, version~4.0,
+% Notice that the first implementation of this package, version~4,
% achieved the desired result but there were two drawbacks: $(a)$
-% the syntax was different from that of the other environments,
+% the syntax was rather different from that of the other environments,
% and $(b)$ any possible caption was typeset within the same
-% framing environment. In version~5.0 both drawbacks were
+% framing environment. In version~5 both drawbacks were
% eliminated, but since the environment syntax is different,
% in oder to assure backwards compatibility a package option
-% was defined in order to fall back to the previous version~4.0
-% behaviour.
+% was defined in order to fall back to the previous version~4
+% behaviour. In version 6.0 the \Env{wraptext} environment was
+% further enhanced so as to accept several \texttt{key=value} settings
+% concerned wit the text appearance, the colours, and other details
+% relative to the wrapping process. Again another fall back option
+% was defined in order to use the same functionalities of version~5.
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \section{Environment syntax}
@@ -284,9 +290,9 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% requires the first four optional and mandatory arguments to be
% maintained identical. When the optional star is specified, the
% \meta{indented lines number} is interpreted as the correction to the
-% computed number.
+% computed value.
%
-% Notice the different syntax in version 4.0 and version 5.0 of the
+% Notice the different syntax in versions~4, 5, and~6 of the
% \Env{wraptext} syntax.
%
% \begin{ttsintassi}\setfontsize{8.00}
@@ -298,40 +304,52 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%\qquad\meta{table}
%\Eambiente{wraptable}
%~
-%\textnormal{\color{red}Package option \opt{WFold} required for backwards compatibility with version 4.0.*}.
+%\textnormal{\color{red}Package option \opt{WFold} required for backwards compatibility with version 4.*}.
%~
%\Bambiente{wraptext}\oarg{location}\barg{width}\aarg{indented line number correction}\parg{caption label}
%\qquad\meta{text to frame}
%\Eambiente{wraptext}
%~
-%\textnormal{\color{red}No package option required for version 5.0.*}.
+%\textnormal{\color{red}Package option \opt{WFfive} required for backwards compatibility with version 5.*}.
%~
-%\Bambiente{wraptext}\oarg{indented lines number correction} \marg{location} \oarg{overhang} \oarg{width}
+%\Bambiente{wraptext}\oarg{indented lines number correction} \marg{location} \oarg{overhang} \marg{width}
%\qquad \meta{optional colour settings}
-%\qquad\cs{includeframedtext}\marg{text to frame}\Oarg{\meta{frame thickness},\meta{frame separation}}
+%\qquad\cs{includeframedtext}\oarg{insertion measure}\marg{text to frame}\oarg{\meta{frame thickness},\meta{frame separation}}\oarg{radius}
+%\Eambiente{wraptext}
+%~
+%\textnormal{\color{red} No package option required for version~6.*}.
+%~
+%\Bambiente{wraptext}\oarg{indented lines number correction}\marg{location}\oarg{overhang}\marg{width}
+%\qquad \meta{optional style settings}
+%\qquad\cs{includeframedtext}\oarg{insertion measure}\marg{text to frame}\oarg{settings}\oarg{radius}
%\Eambiente{wraptext}
% \end{ttsintassi}
%^^A
-% Please notice that both syntaxes, thanks to differently
+% Please notice that all three syntaxes, thanks to differently
% delimited optional arguments with peculiar default values,
% become very similar when such optional arguments are reduced
% to a minimum; only the \meta{location} argument is delimited
% by brackets with the old version and with braces with the newer
-% one.
+% ones.
%
% It may be useful to compare the \cs{includeframedtext} macro,
% used to insert a framed test into a \Env{wraptext} environment,
-% with \cs{includegrphics}, used to insert an external image into
+% with \cs{includegraphics}, used to insert an external image into
% a \Env{figure} environment. Their functions are similar even if
% they refer to different objects to include. Their codes are
% obviously very different and the latter is much more complex
% than the former. The solution for a framed text used by
-% version~4.0 was inspired by the information found on
+% version~4 was inspired by the information found on
% \texttt{texstackexchange} that used the very elaborate \Env{tcolorbox}
-% environment; version~5.0 uses instead a much simpler command
+% environment; version~5 uses instead a much simpler command
% \cs{framedbox} based on the \pack{curve2e} package macro
-% \cs{Curve}. As it can be seen, the logic behind these different
-% macros are very similar.
+% \cs{Curve}. Version 6.0 admits many settings, not just the
+% \meta{frame thickness} and the space around the framed text, but
+% several others ones collectively indicated with \meta{settings};
+% such settings refer to colours, dimensions, styles, and so on,
+% relative to the text and to the frame; moreover they are set by
+% means of the \texttt{key=value} syntax. As it can be seen, the
+% logic, not the code, behind these different macros are very similar.
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%\section{Examples}
@@ -345,9 +363,19 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \subsection{A wrapped figure}
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
+%
+%\begin{wrapfigure}{r}{50mm}
+%\centering\unitlength=1mm
+%\begin{picture}(40,30)
+%\polygon(0,0)(40,0)(40,30)(0,30)
+%\Line(0,0)(40,30)\Line(0,30)(40,0)
+%\end{picture}
+%\caption{A rectangle with its diagonals}\label{fig:figure}
+%\end{wrapfigure}
+%{\itshape \kant[1]}
% The code used to type figure~\ref{fig:figure} is the following:
%
-%\begin{flushleft}\obeylines%
+%\begin{flushleft}\ttfamily\obeylines%
%\noindent\Bambiente{wrapfigure}\Marg{r}\Marg{50mm}
%\cs{centering}\cs{unitlength}=1mm
%\Bambiente{picture}\texttt{(40,30)}
@@ -362,33 +390,10 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% No asterisk was used because the package succeeded to correctly
% compute the necessary number of indented lines.
%
-%\begin{wrapfigure}{r}{50mm}
-%\centering\unitlength=1mm
-%\begin{picture}(40,30)
-%\polygon(0,0)(40,0)(40,30)(0,30)
-%\Line(0,0)(40,30)\Line(0,30)(40,0)
-%\end{picture}
-%\caption{A rectangle with its diagonals}\label{fig:figure}
-%\end{wrapfigure}
-%{\itshape \kant[1]}
-%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{A wrapped table}
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Wrapping a small table is a little more difficult than wrapping
-% a figure, because the width of the inserted object is not known
-% exactly in advance and is difficult to estimate; therefore it is
-% possible that several trial compilations are necessary. In any
-% case a \cs{centering} command might help to center the table
-% within the indention of the wrapping text. Nevertheless the
-% software can compute the object width if a zero value is specified
-% or if the \meta{width} parameter is completely omitted together
-% with its braces; this second possibility is a feature of this
-% package, that uses a \LaTeXiii property by which even a braced
-% argument can be treated as an optional argument with a predefined
-% default value; see below more details about this feature.
-%
-%\begin{wraptable}{l}
+%\begin{wraptable}[-1]{l}*
%\centering
% \begin{tabular}{cc}
% \hline
@@ -396,14 +401,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% Third & Fourth\\
% \hline
%\end{tabular}
-%\caption{A small table}
+%\caption{A small table}\label{tab;small-table}
%\end{wraptable}
%{\itshape \kant[2]}
%
-% The above wrapped small table has been typeset by means of the
-% following code.
+% The wrapped small table~\ref{tab;small-table} has been typeset
+% by means of the following code.
%\begin{flushleft}\ttfamily\obeylines
-%\Bambiente{wraptable}\Marg{l}
+%\Bambiente{wraptable}\Oarg{-1}\Marg{l}*
%\quad\cs{centering}
%\quad\Bambiente{tabular}\Marg{cc}
%\qquad\cs{hline}
@@ -413,20 +418,21 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%\quad\Eambiente{tabular}
%\quad\cs{caption}\Marg{A small table}
%\Eambiente{wraptable}
-%\Marg{\cs{\itshape} \cs{kant}\Oarg{2}}
+%\Marg{\cs{itshape} \cs{kant}\Oarg{2}}
%\end{flushleft}
%
-% You notice the absence of the braced width value; as said above,
-% this braced value is optional, and the software autonomously
-% computes the width of the wrapped object. This feature may be
-% useful in many instances, although a smart use of
-% this width parameter might yield better looking results.
-%
-% On the opposite if the user estimates that the table with its
-% caption might use 5~lines, and specified such a value as the
-% first (optional) argument to the environment, the result would
-% be the following poor one, with the last caption line overlapping the
-% wrapping text.
+% Wrapping a small table is a little more difficult than wrapping
+% a figure, because the width of the inserted object is not known
+% exactly in advance, and it is difficult to estimate; therefore
+% it might be necessary to execute several trial compilations. In any
+% case a \cs{centering} command might help to center the table
+% within the indention of the wrapping text. Nevertheless the
+% software can compute the object width if a zero value is specified,
+% or if the \meta{width} parameter is completely omitted together
+% with its braces; this second possibility is a feature of this
+% package, that uses a \LaTeXiii property by which even a braced
+% argument can be treated as an optional argument with a predefined
+% default value; see below more details about this feature.
%
%\begin{wraptable}[5]{l}
%\centering
@@ -436,12 +442,24 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% Third & Fourth\\
% \hline
%\end{tabular}
-%\caption{A small table}
+%\caption{A small table}\label{tab:wrong-wrapped-table}
%\end{wraptable}
%{\itshape \kant[2]}
%
+% Notice the absence of the braced width value; as said above,
+% this braced value is optional, and the software autonomously
+% computes the width of the wrapped object. This feature may be
+% useful in many instances, although a smart use of
+% this width parameter might yield better looking results.
+%
+% On the opposite if the user estimates that the table with its
+% caption might use 5~lines, and specified such a value as the
+% first (optional) argument to the environment, the result is
+% shown in table~\ref{tab:wrong-wrapped-table}, but it is a very
+% poor one, with the last caption line overlapping the wrapping text.
+%
%^^A\goodpagebreak
-% \newpage
+%^^A \newpage
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \subsection{A wrapped text}
@@ -457,15 +475,15 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \Bamb{wraptext}\Marg{l}
% \cs{includeframedtext}\Marg{\ttfamily Text, text, text, text, text, text, text, text, text, text, text.}
% \Eamb{wraptext}
-% \Marg{\itshape \cs{kant}[3]}
+% \Marg{\cs{itshape} \cs{kant}[3]}
%\end{flushleft}
%
-% The result is the same as that obtainable with version~4.0 of this
-% package where the \meta{location} argument specification is braced
+% The result is the same as that obtainable with version~4 of this
+% package, but the \meta{location} argument specification is braced
% instead of bracketed.
%
-% If a caption is specified, version~4.0 would print it within the
-% framed box, while version 5.0 prints it outside the framed box.
+% If a caption is specified, version~4 would print it within the
+% framed box, while versions~5 and~6 print it outside the framed box.
%
% \begin{wraptext}{r}
% \includeframedtext{Text, text, text, text, text, text, text, text, text, text, text.}
@@ -473,7 +491,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \end{wraptext}
% {\itshape \kant[3]}
%
-% The further feature introduced by version~5.0.* is the
+% The further feature introduced by version~5 is the
% possibility of choosing the colours for all three elements of the
% framed text; if within the environment \Env{wraptext} and before using
% \cs{includeframedtext} the following colours are set, it is
@@ -484,31 +502,152 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%\cs{SetWFbgd}\marg{background colour}
%\cs{SetWFtxt}\marg{text colour}
% \end{ttsintassi}
-%See figure~\ref{fig:framed text}
+% Such commands, in version~6, are already taken care by the relevant
+% \texttt{key=value} options. With version~5 these are user commands.
+% See figure~\ref{fig:framed text} typeset with various version~6
+% options.
%
%\begin{figure}
-%\includeframedtext[0.45\linewidth]{Text}\hspace{9mm}%
-%\includeframedtext[0.45\linewidth]{Text}[3pt,1ex]\\[2ex]
-%{\SetWFtxt{red}\includeframedtext[0.45\linewidth]{Text}[2pt,0.6em]}\hspace{9mm}%
-%{\Large\includeframedtext[0.45\linewidth]{Text}[1pt,1ex]}\\[2ex]
-%{\SetWFbgd{yellow}\includeframedtext[0.45\linewidth]{Text}}\hspace{9mm}%
-%{\SetWFfrm{blue}\SetWFbgd{yellow}\includeframedtext[0.45\linewidth]{Text}[3pt,1ex]}%
+%\makebox[\textwidth]{\includeframedtext{Text}[insertionwidth=0.45\linewidth]
+%\hfill
+%\includeframedtext{Text}[insertionwidth=0.45\linewidth,fboxrule=3pt]}\\[2ex]
+%\makebox[\textwidth]{\includeframedtext{Text}[insertionwidth=0.45\linewidth,textcolor=red,fboxrule=2pt]
+%\hfill
+%\includeframedtext{Text}[insertionwidth=0.45\linewidth,fontstyle=\Large]}\\[2ex]
+%\makebox[\textwidth]{\includeframedtext{Text}[insertionwidth=0.45\linewidth,backgroundcolor=yellow]
+%\hfill
+%\includeframedtext{Text}[insertionwidth=0.45\linewidth,framecolor=blue,backgroundcolor=yellow,fboxrule=1mm]}\\[2ex]
+% \makebox[\textwidth]{\includeframedtext{Text}[insertionwidth=0.5\linewidth, fboxrule=0pt, backgroundcolor=cyan, textcolor=white, fontstyle=\Huge\bfseries]}
%\caption{Some framed text boxes with different dimension parameters,
% different font size, and different colours}\label{fig:framed text}
%\end{figure}
%
+% Figure~\ref{fig:framed text} used the following code, where it is
+% evident that the \cs{includeframedtext} command is available even
+% outside the \Env{wraptext} environment.
+%\begin{flushleft}\ttfamily\obeylines
+%\Bambiente{figure}
+%\cs{makebox}[\cs{textwidth}]\Marg{\cs{includeframedtext}\Marg{Text}\%
+%\qquad [insertionwidth=0.45\cs{linewidth}]
+%\quad\cs{hfill}
+%\quad\cs{includeframedtext}\Marg{Text}\%
+%\quad [insertionwidth=0.45\cs{linewidth},fboxrule=3pt]}\cs{\char92}[2ex]
+%\%
+%\cs{makebox}[\cs{textwidth}]\Marg{\cs{includeframedtext}\Marg{Text}\%
+%\quad [insertionwidth=0.45\cs{linewidth},textcolor=red,fboxrule=2pt]
+%\quad\cs{hfill}
+%\quad\cs{includeframedtext}\Marg{Text}\%
+%\qquad[insertionwidth=0.45\cs{linewidth},fontstyle=\cs{Large}]}\cs{\char92}[2ex]
+%\%
+%\cs{makebox}[\cs{textwidth}]{\cs{includeframedtext}\Marg{Text}\%
+%\quad[insertionwidth=0.45\cs{linewidth}, backgroundcolor=yellow]
+%\quad\cs{hfill}
+%\quad\cs{includeframedtext}\Marg{Text}\%
+%\qquad[insertionwidth=0.45\cs{linewidth},framecolor=blue,
+%\qquad backgroundcolor=yellow,fboxrule=1mm]}\cs{\char92}[2ex]
+%\%
+% \cs{makebox}[\cs{textwidth}]{\cs{includeframedtext}\Marg{Text}\%
+%\quad [insertionwidth=0.5\cs{linewidth}, fboxrule=0pt,\%
+%\qquad backgroundcolor=cyan,textcolor=white,fontstyle=\cs{Huge}\cs{bfseries}]}
+%\cs{caption}\Marg{Some framed text boxes ... different colours}
+%\cs{label}\Marg{fig:framed text}
+%\Eambiente{figure}
+%\end{flushleft}
+%
+%
+% As it is possible to notice from figure~\ref{fig:framed text},
+% version~6 adds another facility; the colours and dimensions of the
+% elements of the wrapped objects are inserted as
+% \textit{key=value} options to the \cs{includeframedtext} third
+% argument \meta{settings}; its default value is “empty”; the
+% users can introduce as many options as they desire, among the
+% valid ones; if an option is misspelled or its value is not
+% coherent with its nature, either the option is ignored, or an
+% error is raised. The valid options are the following; they are
+% listed in alphabetical order, because the options described with the
+% \texttt{key=value} syntax do not require either a specific order
+% or their presence; the users can therefore specify from zero to
+% nine options.
+%\begin{description}
+%^^A
+%\item{\ttfamily backgroundcolor} sets the background colour among
+% those defined by the default set provided by package \pack{xcolor}.
+% The default colour is a light grey.
+%^^A
+% \item{\ttfamily fboxrule} sets the thickness of the line
+% around the frame; a zero value is allowed, otherwise it should
+% not be smaller than \texttt{0.4pt}; on the opposite it
+% should not be set too large and \texttt{1mm} appears as
+% a thick enough line around the wrapped text.
+%^^A
+% \item{\ttfamily fboxsep} sets the distance of the frame from
+% the wrapped text; by default it is set to \texttt{1ex};
+% also in this case it is better to avoid exaggerations.
+% Notice that the default value depends on the wrapping text
+% font x-height.
+%^^A
+%\item{\ttfamily fontstyle} sets any available \emph{declaration}
+% that changes the characteristics of a font: size, series,
+% shape; it is possible to use also the \cs{usefont} command
+% with all its four arguments, even the font encoding. This
+% \pack{wrapfig2} has available also the \cs{setfontsize}
+% command that can select any size with any font that has
+% available at least a step wise continuous size set; for
+% example the Latin Modern fonts have a stepwise continuous
+% size set, while Computer Modern have available only a discrete
+% size set.
+%^^A
+%\item{\ttfamily framecolor} sets the color of the frame; the colours
+% available are those available with package \pack{xcolor} to which
+% no options have been specified; see its documentation and in case
+% load \pack{xcolor} with the desired options before this package
+% \pack{wrapfig2}. The default colour is a very dark grey.
+%^^A
+%\item{\ttfamily insertionwidth} sets the insertion width; as
+% it was previously specified, if this width is too small
+% or too large it will be automatically reassigned a value
+% within the allowed range.
+%^^A
+%\item{\ttfamily radius} sets the optional radius of the frame
+% rounded “corners”; if it is not specified, such radius is
+% equal to the default value of \cs{fboxsep}. Although it is
+% possible to use it, we suggest to abide from using it.
+%^^A
+% \item{\ttfamily scalefactor} sets the value that establishes
+% a reasonable range of the insertion width; users can specify
+% any value in the range $xy_0 = y\ped{min} \leq y \leq
+% y\ped{max} = y_0/x$ , where $y_0$ is the default value,
+% and $x$ is the scaling factor that by default equals $0.8$;
+% this means $y_0$ equals half the current measure and the
+% inserted wrapped text produces an indentation of the wrapping
+% lines approximately between 60\% and 40\% the current measure;
+% the wrapped text should never have a too short measure and the
+% wrapping indented lines never have a too short measure. If users
+% specify a different value to this key, they might get problems
+% with inter word spacing and of hyphenation.
+%^^A
+%\item{\ttfamily textcolor} sets the text colour among those available
+% among those available with the default set provided by package
+% \pack{xcolor}. The default colour is black.
+%^^A
+%\end{description}
+%
+% This version~6 has a more flexible way compared to version~5
+% to specify the details relative to the framed text, but they are
+% relevant only for the \cs{includeframedtext} command; the syntax
+% for the \Env{wraptext} environment opening command is identical.
% As it was previously shown, the syntax of environment \Env{wraptext}
-% for version~5.0 is practically identical to the one used for the
+% for version~6 and~5 is practically identical to the one used for the
% other two environments; actually, as it can be seen below in
-% the code description of this version~5.0, it has a fairly
+% the code description of version~6 and~5, it has a fairly
% longer definition; it is required by the necessity of avoiding
-% the \cs{caption} redefinition by the adjustments foreseen in
-% version~4.0, but in effects the new definition of the \Env{wraptex}
-% environment uses the same \cs{wrapfloat} and \cs{endwrapfloat}
-% commands.
+% the \cs{caption} changes foreseen in package{wrapfig} when
+% \pack{float} is used to define another floating object, but in
+% effects the new definition of the \Env{wraptext} environment uses
+% the same \cs{wrapfloat} and \cs{endwrapfloat} commands.
%
-% In all cases the \meta{width} parameter is a braced optional
-% argument; for the \Env{wraptext} environment its preset value is
+% In all three cases the \meta{width} parameter is a \emph{braced optional
+% argument}; for the \Env{wraptext} environment its preset value is
% half the column width, that in one column typesetting mode
% coincides with the text width. The wrapped text is typeset
% in justified mode within a \cs{parbox} argument; the
@@ -517,14 +656,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% word spacing might be too large; at the same time the measure
% of the mini paragraph cannot be too large, otherwise the indented
% wrapping lines, generally justified, might get a bad word
-% spacing. Therefore it is suggested to avoid specifying the
-% optional \meta{widh} outside the range of 40\% to 60\% the
-% column width. Actually specifying \texttt{0.2\cs{textwidth}}
+% spacing. As it was already explained, it is recoommended to avoid
+% specifying the optional \meta{widh} outside the range of 40\% to 60\%
+% the column width. Actually specifying \texttt{0.2\cs{textwidth}}
% or \texttt{0.4\cs{columnwidth}} when typesetting in two column
% mode produces approximately the same result, because
% \cs{columnwidth} is a little less than half the \cs{textwidth}.
-% In any case version~5.0 of \Env{wrapfig2} resets any specified
-% width outside the above range at the nearest range bound.
+% In any case versions~6 and~5 of \Env{wrapfig2} reset any specified
+% width outside the above range to the nearest range bound.
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \section{Remarks}
@@ -532,7 +671,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%
% The syntax of the original environments \amb{wrapfigure} and
% \amb{wraptable} has not been changed, except for a last optional
-% star. The fact that the last braced argument is optional does not
+% star. The fact that the last \emph{braced argument is optional} does not
% change the backward compatibility with the original environments.
%
% Therefore the optional \meta{line number} argument maintains its
@@ -548,29 +687,25 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%
% We tested all of them, but as a (possibly questionable) personal
% choice we prefer to place the wrapped object at the left of the text,
-% without floating it and irrespective of the page number parity.
+% without floating it and irrespective of the folio parity.
+%
+%\begin{wraptext}{l}{0.5\textwidth}%
+%\includegraphics[width=\hsize]{stele-todi-small}
+%\caption{The Todi stela written in Gallic and Latin. Gregorian Etruscan Museum in Rome.}\label{txt:todi-stela}
+%\end{wraptext}
+%{\itshape\kant[4]}
%
% As in the previous examples, we prefer to specify the wrapping
% environment just before a sufficiently long paragraph. Should the
% paragraph be too short to completely wrap the object, all
% the environments are capable of counting the number of used indented
-% lines and to apply the remaining number and the \cs{overhang} amount
+% lines and to apply the remaining number (and the \cs{overhang} amount)
% to the following paragraph(s); in these circumstances
% it might be necessary to recourse to the optional star in order
% to correct the indention, since the mechanism does not consider
% the inter paragraph spacing that \LaTeX introduces only at ship~out
% time.
%
-%\begin{wraptext}{l}
-%\includegraphics[width=\hsize]{commodilla}
-%\caption{A IX century text written in a language half way between
-% Latin and Italian. It is written on the frame of a fresco in the
-% Comodilla catacombs, Rome; an apparently free picture is available
-% from the internet site of the Bibliotheca Augustana in Germany.
-% The text is: «Non dicere ille secrita a bboce».}\label{fig:commodilla}
-%\end{wraptext}
-%{\textit{\kant[4]}
-%
% We avoid also to enter the wrapping environment before paragraphs
% that are close to a page break; this action would tickle the
% idiosyncrasies of the software, and requires moving the wrapping
@@ -584,9 +719,9 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% that a section title falls alone at the bottom of the page and
% the wrapping environment with its wrapping text gets typeset on the next
% page; this of course is not acceptable. We found the place to
-% correct and this version~5.0 more often than not does not
+% correct and versions~6 and~5 more often than not do not
% exhibit any more this “feature”. Unfortunately in some rare cases
-% this “feature” pops up agains; a \cs{newpage} command before the
+% this “feature” pops up again; a \cs{newpage} command before the
% section title solves the problem. This rare feature could be avoided
% if the sectioning commands are redefined; but this would imply
% modifications to a large number of redefinitions due to the large
@@ -597,7 +732,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% does exactly what its name implies: the wrapped object protrudes
% into the adjacent margin exactly by the specified amount. This
% parameter is not available for the \Env{wraptext} environment,
-% or better, it is still available in version~5.0, but we recommend
+% or better, it is still available in versions~6 and~5, but we recommend
% to abide from using it; we believe that a wrapped text logically
% pairs the wrapping text; of course this personal opinion might be wrong.
%
@@ -608,7 +743,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% insertion width can be specified but it should not be too different
% from its default value $y_0$, set to 50\% of the current measure.
% For the standard environments this parameter value appears to be
-% mandatory; actually it is a braced optional argument only for the
+% mandatory; actually it is a braced really optional argument only for the
% redefined environments \env{wrapfigure} and \env{wraptable}.
%
% Matter of facts, for the \Env{wraptext} environment we defined a
@@ -621,20 +756,21 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% the \cs{WFscalefactor} macro, but such resetting is strongly
% discouraged; the default value is~$0.8$.
%
+%\begin{wraptext}{l}
+%\includeframedtext{^^A
+% \foreignlanguage{greek}{Κα᾽γὼ σὲ πατάξας διαλύσω τὸ κρανὶον}}
+% \caption{A sample text in Greek}\label{txt:greek}
+%\end{wraptext}
+%{\itshape\kant[7]}
+%
% If optional parameters are not used and the mandatory ones are
% reduced to a minimum (remember the \meta{width}, in spite of being
% braced is optional) the three environments produce the same results;
% the difference, in spite of the nature of the wrapped object differs
-% only with the environment name. Text~\ref{fig:commodilla} displays
-% an image that contains some text; it is reasonable to insert it with
-% the \Env{wrapfigure} environment, but it is not absurd to insert
-% it with the \Env{wraptext} one.
-%
-%\begin{wraptext}{l}
-%\includeframedtext{%
-% \foreignlanguage{greek}{Κα᾽γὼ σὲ πατάξας διαλύσω τὸ κρανὶον}}\caption{A sample text in Greek}\label{txt:greek}
-%\end{wraptext}
-%{\textit{\kant[7]}
+% only with the environment name. Text~\ref{txt:todi-stela} displays
+% an \emph{image} that contains some text; it is reasonable to insert
+% it with the \Env{wrapfigure} environment, but it is not absurd to insert
+% it with the \Env{wraptext} one as we did with text~\ref{txt:todi-stela}.
%
% The wrapped text may be written also in a foreign language, even
% if it uses a differente alphabet. Evidently this language should
@@ -657,7 +793,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% objects may be defined by means of other packages, such as
% \pack{float}, or classes, such as \class{memoir}. Besides floating,
% the main difference is the name of the caption “label”: Figure, Table,
-% Algorithm, Example, and so on and the lists of such objects.
+% Algorithm, Example, and so on, and the lists of such objects.
%
% If floating is not necessary, this package (as well as the original
% one) allows to use the underlying environment \Env{wrapfloat}
@@ -678,33 +814,33 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%\end{flushleft}
%
% By reading the documentation of the original \pack{wrapfig} package,
-% it may be assumed that if the floating \meta{location} codes have to
+% it may be assumed that, if the floating \meta{location} codes have to
% be used, another floating object with the desired \meta{object name}
-% has to be previously defined by means of the functionalities of other
+% has to be previously defined by means of the functionalities of other
% packages or classes. But, if the non floating \meta{location} codes
% are used, the presence of another \meta{floating object} environment
% appears to be unnecessary.
%
-% This is actually possible by “cheating” a little bit; it can be actually
-% wraped any \meta{object} by using the \Env{wrapfigure} environment,
+% This is actually possible by “cheating” a little bit: it can be actually
+% wrapped any \meta{object} by using the \Env{wrapfigure} environment,
% while assigning a different name to the caption label; something
% similar to typeset a small figure within a non floating environment.
% The obvious draw back is that the caption is numbered as a figure.
%
% In order to avoid such drawbacks and to have a real floating
-% \Env{text} environment it is necessary to procede by defining
+% \meta{other object} environment it is necessary to procede by defining
% a new real floating environment with that name. To do this task,
-% \pack{wrapfig2} version~5.0 uses the \pack{float} package.
+% \pack{wrapfig2} versions~5 and~6 use the \pack{float} package.
%
% As it is possible to verify by reading the section where the
% code is documented, the operation is not that simple because
% \pack{float} redefines several internal macros that are incompatible
% with both \pack{wrapfig} and \pack{wrapfig2}. This is why, even
-% with \pack{wrapfig2} in version~5.0, that loads the \pack{float}
-% package, the code for this environment redefines the \cs{caption}
+% with \pack{wrapfig2} in versions~5 and~6, that load the \pack{float}
+% package, the code for this environment redefines the \cs{caption}
% command so that Arseneau had to define some adjusting macros in order
% to deal with something different from what it was with the \LaTeXe
-% kernel. We did not modify what Arseneau defined in although it did not
+% kernel. We did not modify what Arseneau defined, although it did not
% work correctly with the new \Env{text} floating environment. Therefore
% we reinstated the \LaTeXe kernel relevant definitions.
%
@@ -712,32 +848,36 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% necessary also with floating objects defined by other means, for
% example by using the functionalities of \class{memoir}. We admit
% we did not test this package functionality with class
-% \class{memoir}; feedback on this compatibility issue is very
-% welcome
+% \class{memoir}; \textcolor{red}{feedback on this compatibility issue
+% is very welcome}.
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% \section*{Acknowledgements}
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% We gratefully thank Donald Arseneau who gave the \TeX community
-% the original \Env{wrapfig} package.
+% the original \Env{wrapfig} package. For what concerns wrapped text,
+% we did not use Arseneau's \pack{framed} package, because we wanted a
+% frame with rounded corners. Nevertheless, while developing our package,
+% we experimented also with his package that yields good results but
+% with the ordinary right angle frame corners.
%
% Thanks to Heinrich Fleck who submitted to our attention the
% \texttt{texstackexchange} message where the problem of wrapping text was
% presented possibly for the first time. The solution presented in
% \texttt{texstackexchange} appears to be oversimple, almost trivial;
-% especially it does not solve the problem of a caption if one is desired
-% under the wrapped text.
-% Moreover the solution of \texttt{texstackexchange} uses an almost
-% trivial usage of the \Env{tcolorbox} environment, that behind the
-% scenes uses a very heavy set of multifunctional macros the offer
-% functionalities are not required for this problem.
+% especially it does not solve the problem of a caption if one is desired
+% to describe that wrapped text.
+% Moreover the solution of \texttt{texstackexchange} used in a very
+% simple way the \Env{tcolorbox} environment, that behind the
+% scenes uses a very heavy set of multifunctional macros that offer
+% functionalities that are not required for this problem.
%
% Warm thanks also to Juan Luis Varona Malumbres for his precious
% feedback and his suggestions.
%
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% \CheckSum{1345}
+% \CheckSum{1411}
% \StopEventually{}
%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -759,15 +899,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% First of all we check if certain packages have already been
% loaded; some of these packages, such as \pack{wrapfig}, that
% might have been previously directly loaded, or might have been
-% loaded by other packages, are incompatible with this new version
-% (and also with the previous versions, but the problem was less
-% serious). That package might have been loaded by other packages,
-% such as \pack{caption} or \pack{subcaption}, that redefine some
-% internals that we did not want to replace so as to avoid other
+% loaded by other packages, are incompatible with this package
+% \pack{wrapfig2}. \pack{wrapfig} might have been loaded by other
+% packages, such as \pack{caption} or \pack{subcaption}, that redefine
+% some internals that we did not want to replace so as to avoid other
% possible incompatibilities. We first check if a specific macro
% with the \texttt{WF} prefix has already been defined; if so,
-% this package loading is aborted with a very evident error
-% message. In contrast the job is not aborted, because the presence
+% this package \emph{loading} is aborted with a very evident error
+% message. In contrast the \emph{job} is not aborted, because the presence
% of the original \pack{wrapfig} package might still be sufficient;
% evidently there will be many errors if some new user commands
% or environments are used.
@@ -786,27 +925,30 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
Package `wrapfig' has already been loaded perhaps \MessageBreak
by other packages, for example caption or subcaption.\MessageBreak
Such packages are incompatible with wrapfig2 \MessageBreak
- Loading `wrapfig2' aborted \MessageBreak
+ Loading of`wrapfig2' is aborted \MessageBreak
****************************************************\MessageBreak
}{You might type X <return> and might get along without\MessageBreak
this package if you don't use the new environment \MessageBreak
- `wraptext'; otherwise you get errors about such \MessageBreak
- environment not being defined; you must kill your job!}
+ `wraptext' and the new commands; otherwise you get \MessageBreak
+ errors about such environment not being defined; \MessageBreak
+ you must kill your job!}
\expandafter\endinput\fi
% \end{macrocode}
% We keep the original definition of the \cs{WF@warning} and the
% original definition of the \opt{verbose} option; but we add the
-% new \opt{WFold} option in order to fall back to the functionalities
-% of the previous version~4.0, at least for what concerns the
-% \Env{swraptext} environment.
+% new \opt{WFold} and \opt{WFfivw} options in order to fall back
+% to the functionalities of the previous version~4 or~5, at least
+% for what concerns the \Env{wraptext} environment.
%
%
% \begin{macrocode}
\def\WF@warning{\PackageWarning{wrapfig2}}
\DeclareOption{verbose}{\def\WF@info{\PackageInfo{wrapfig2}}}
\newif\ifWFnew \let\ifWFnew\iftrue
+\newif\ifWFfive \let\ifWFfive\iffalse
\DeclareOption{WFold}{\let\ifWFnew\iffalse}
+\DeclareOption{WFfive}{\let\ifWFnew\iffalse \let\ifWFfive\iftrue}
\ProcessOptions
% \end{macrocode}
@@ -828,12 +970,13 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% now available directly within the \LaTeXe kernel.
%\end{quote}
% Their availability eases the treatment of the backwards
-% compatibility of this software with the original \pack{wrapfig}
-% functionality. It deals with the mandatory \meta{width} argument
-% of the \Env{wrapfigure}, \Env{wraptable}, the new \Env{wraptext},
-% and \Env{wrapfloat} environments, where it was possible to specify
-% a zero value. Now it is possible to omit it completely because it
-% is a \emph{braced optional argument} with a \texttt{0pt} default value.
+% compatibility of this software with the original \pack{wrapfig} and
+% \pack{wraptable} functionality. It deals with the mandatory
+% \meta{width} argument of the \Env{wrapfigure}, \Env{wraptable},
+% the new \Env{wraptext}, and \Env{wrapfloat} environments, where
+% it was possible to specify a zero value. Now it is possible to
+% omit it completely because it is a \emph{braced optional argument}
+% with a \texttt{0pt} default value.
%
%
% \begin{macrocode}
@@ -845,12 +988,13 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}%
}
\@ifpackageloaded{curve2e}{}{\RequirePackage{curve2e}}
+\@ifpackageloaded{xkeyval}{}{\RequirePackage{xkeyval}}
% \end{macrocode}
% Notice that we loaded the \pack{xcolor} package without any option
% in order to avoid option clash errors, and users who want to use
% \pack{xcolor} with options should load it \emph{before} this package
-% \pack{wrapfig2}, version~5.0.*. {\color{red}Users are warned
+% \pack{wrapfig2}, version~5 and~6. {\color{red}Users are warned
% to pay attention to this \pack{color} package loading: they should load
% it neither before nor after loading \pack{wrapfig2}; if they do, they
% receive various warning or error messages because \pack{xcolor}
@@ -858,8 +1002,8 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% explained in the \pack{xcolor} documentation.}
%
% In order to define the new floating object \texttt{text} we have
-% to load the package \pack{float}, but only if version~5.0.*
-% is used; in other words only if the \cs{ifWFnew} switch
+% to load the package \pack{float}, but only if versions~5 or~6
+% ae used; in other words only if the \cs{ifWFnew} switch
% is \texttt{true}.
%
% If the \cs{chapter} command is or is not defined we have to load
@@ -871,24 +1015,25 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \Env{text} environment correctly reset the right counter with the
% right label before the object number.
% \begin{macrocode}
-\ifWFnew
- \floatstyle{plain}
+\ifboolexpr{ bool{WFfive} or bool{WFnew} }%
+ {\floatstyle{plain}%
\ifcsname chapter\endcsname
- \newfloat{text}{tbp}{lotx}[chapter]
- \else
- \newfloat{text}{tbp}{lotx}
+ \newfloat{text}{tbp}{lotx}[chapter]%
+ \else
+ \newfloat{text}{tbp}{lotx}%
\fi
- \floatname{text}{Text}
+ \floatname{text}{Text}% come personalizzare con le diverse lingue?
\let\WF@text@caption\float@caption
-\fi
+ }{}
% \end{macrocode}
%
% If the users wanted to add the \texttt{text} counter to some
-% sectioning command counter reset list they might use the
+% sectioning command counter reset list, they might use the
% \cs{counterwithin} command now available with the recent updates
% of the \LaTeX kernel; see the \LaTeX newsletter~28 for details
-% (terminal command \texttt{texdoc ltnews28}). Its syntax is the following:
+% (terminal command \texttt{texdoc ltnews28}). Its syntax is the
+% following:
%\begin{ttsintassi}
%\cs{counterwithin}\marg{counter}\marg{main counter reset list}
%\end{ttsintassi}
@@ -903,7 +1048,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \begin{macrocode}
\newdimen\wrapoverhang \wrapoverhang\z@
\newdimen\WF@size
-\newcounter{WF@wrappedlines}
+\newcount\c@WF@wrappedlines
\newbox\WF@box
\newbox\NWF@box
\newtoks\WF@everypar
@@ -913,6 +1058,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\let\WF@@everypar\everypar
\newdimen\insertwidth
+\newdimen\radius
\newdimen\WFinsertwidthL
\newdimen\WFinsertwidthH
@@ -922,8 +1068,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\def\SetWFbgd#1{\colorlet{WFbackground}{#1}}
\def\SetWFfrm#1{\colorlet{WFframe}{#1}}
\def\SetWFtxt#1{\colorlet{WFtext}{#1}}
+
+
\def\WFsplitdimens#1,#2!{\fboxrule=#1\relax\fboxsep=#2\relax}
+\providecommand\setfontsize{}
+\RenewDocumentCommand\setfontsize{O{1.2} m}{%
+ \fontsize{#2}{\fpeval{#1*#2}}\selectfont}
+
\def\WFscalefactor{0.8}%
\newcommand*\WFscalewidth{%
\WFinsertwidthL=\fpeval{\WFscalefactor*0.5\columnwidth}\p@
@@ -938,20 +1090,51 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
}%
% \end{macrocode}
+% We define several options that use the \texttt{key=value} syntax.
+% Above we have already loaded the \pack{xkeyval} package that
+% offers also some ‘X’ labeled macros that mimic the corresponding
+% \LaTeXe kernel macros, but that are necessary for using the
+% \pack{xkeyval} internal macros. We chose the \texttt{wraptext}
+% option family name, because such options are to be used mostly within
+% the \cs{includeframedtext} macro.
+% The \cs{ExecuteOptionX} used here stands for a general
+% initialisation of the listed options, but it will be used also
+% within the \cs{includeframedtext} command in order to set the
+% specified options for the specific use of this command.
+% \begin{macrocode}
+\DeclareOptionX<wraptext>{scalefactor}[0.8]{\def\WFscalefactor{#1}}
+\DeclareOptionX<wraptext>{fboxrule}[1pt]{\fboxrule=#1}
+\DeclareOptionX<wraptext>{fboxsep}[1ex]{\fboxsep=#1}
+\DeclareOptionX<wraptext>{framecolor}[WFframe]{\SetWFfrm{#1}}
+\DeclareOptionX<wraptext>{backgroundcolor}[WFbackground]{\SetWFbgd{#1}}
+\DeclareOptionX<wraptext>{textcolor}[WFtext]{\SetWFtxt{#1}}
+\DeclareOptionX<wraptext>{fontstyle}[\normalfont]{#1}
+\DeclareOptionX<wraptext>{radius}[\fboxsep]{\radius=#1}
+\DeclareOptionX<wraptext>{insertionwidth}[0.5\columnwidth]{\insertwidth=#1}
+
+\DeclareOptionX*{\PackageWarning{wrapfig2}{`\CurrentOption' ignored}}
+
+\ExecuteOptionsX<wraptext>{scalefactor, fboxrule, fboxsep, framecolor,
+backgroundcolor, textcolor, fontstyle, radius, insertionwidth}
+
+\ProcessOptionsX*
+
+% \end{macrocode}
%
%
% {\color{red}Should the format file be not so up to date, a multitude
% of errors would be produced, and the user should take care to load the
% \pack{xparse} and \pack{xfp} packages before loading \pack{wrapfig2}.
-% Notice that most of the \pack{xparse} package functionalities
-% at the date required for the format file are already included. The
-% \pack{xparse} package has been available since about 2018; should the
-% users have available a definitely older \TeX system installation, they
-% should upgrade it, or must avoid using this \pack{wrapfig2} package
-% and use the original \pack{wrapfig} one; if they need to wrap text,
-% they should resort to some ingenious, not so trivial, tricks to do it.}
-%
-% Originally version~4.0 used the \pack{tcolrbox} package to frame
+% Notice that most of the \pack{xparse} package functionalities are
+% already included in the format file at the date required for this
+% file. The \pack{xparse} package has been available since about 2018;
+% should the users have available a definitely older \TeX system
+% installation, either they upgrade it, or they must avoid using this
+% \pack{wrapfig2} package and should use the original \pack{wrapfig} one;
+% if they need to wrap text, they should resort to some ingenious,
+% not so trivial tricks to do it.}
+%
+% Originally version~4 used the \pack{tcolrbox} package to frame
% the wrapped text; we thought that loading that package was too
% heavy on memory, even if the modern computers have large working
% memories. But in order to maintain and track possible errors
@@ -959,10 +1142,10 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% help; therefore in oder to draw a framed box with rounded corners
% we thought it would be much simpler to load the \pack{curve2e}
% package, just a second level extension of the original \Env{picture}
-% environment defined in the \LaTeXe kernel; just some 30 lines of code
+% environment defined in the \LaTeXe kernel; only some 30 lines of code
% are sufficient to replace the extremely powerful \pack{tcolorbox}
-% functionalities needed by this \pack{wrapfig2} package.
-%
+% functionalities otherwise required to frame wrapped text with this
+% \pack{wrapfig2} package.
%
% The definitions of the \Env{wrapfigure} and \Env{wraptable}
% environments are very simple by means of the underlaying
@@ -987,21 +1170,39 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% to insert it with its frame into the \Env{wraptext} environment body.
% Here is the code of some extra macros and of the \Env{wraptext}
% environment.
+%
+% We start with two different \cs{includeframedtext}, one for
+% version~6, that accepts \texttt{key=velue} options, and
+% another one for version~5, that requires only a comma
+% separated list of dimensional values.
% \begin{macrocode}
+\ifbool{WFnew}{%
+\NewDocumentCommand\includeframedtext{O{\insertwidth} m O{} o}{\bgroup%
+ \ExecuteOptionsX<wraptext>{#3}% executes possible key=value options
+ \insertwidth=#1\WFscalewidth
+ \framedbox{#2}{\fboxrule}{\fboxsep}[\radius]\egroup}
+}{}
+
+\ifbool{WFfive}{%
\NewDocumentCommand\includeframedtext{O{\insertwidth} m O{1pt,1ex} o}%
-{\bgroup \WFsplitdimens #3!%
-\insertwidth=#1\relax
-\IfNoValueTF{#4}%
- {\framedbox{#2}{\fboxrule}{\fboxsep}}%
- {\framedbox{#2}{\fboxrule}{\fboxsep}[#4]}%
-\egroup}
+{\bgroup
+ \WFsplitdimens #3!\relax
+ \IfNoValueTF{#4}%
+ {\framedbox{#2}{\fboxrule}{\fboxsep}}%
+ {\framedbox{#2}{\fboxrule}{\fboxsep}[#4]}
+\egroup}%
+}{}
% \end{macrocode}
%
-%
-% Its simple syntax is the following
+% Their simple syntaxes are the following
%\begin{ttsintassi}
-%\cs{includeframedtext}\oarg{text width}\marg{text}\oarg{settings}\oarg{radius}
+%~
+%\% for version 6.0
+%\cs{includeframedtext}\oarg{text width}\marg{text}\oarg{options}\oarg{radius}
+%
+%\% for version 5.0
+%\cs{includeframedtext}\oarg{text width}\marg{text}\oarg{dimensions}\oarg{radius}
%\end{ttsintassi}
%
% The optional \meta{text width} is the (possibly scaled) width computed
@@ -1010,36 +1211,42 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% in any case the default value is half the current measure
% \cs{linewidth}. The \meta{text} is the unformatted text to be wrapped;
% it will be boxed and framed by the service macro \cs{framedbox}; the
-% \meta{settings} are passed on to \cs{framedbox} command; they are a
+% \meta{dimensions} are passed on to \cs{framedbox} command; they are a
% comma separated list of dimensions, namely the thickness of the frame
-% and the necessary distance of the frame from the formatted text; the
-% last optional \meta{radius} is the curvature radius of the rounded frame
-% corners; no default value is specified, because it is going to be
-% received by \cs{framedbox} that by default sets it equal to the frame
-% separation width; this value is certainly the best one, but the user
-% can specify a different value, of course not too different from the
-% default one. See some examples in figure~\ref{fig:framed text}.
+% and the necessary frame distance from the formatted text. The
+% \meta{options} contains a comma separated list of zero to nine options
+% with the syntax \texttt{key=vale} that are going to be used by both
+% the \cs{includeframedtext} and \cs{framedbox}. The last optional
+% \meta{radius} is the curvature radius of the rounded frame corners;
+% the default value is going to be set to \cs{fboxsep}: in
+% version~5 \cs{framedbox} by default sets it equal to the frame
+% separation width, while with version~6 its value is received with
+% the option \texttt{radius=\meta{dimension}}; the default value is
+% certainly the best one, but the users can specify a different value,
+% of course not too different from the default one. See some examples
+% in figure~\ref{fig:framed text}.
%
% The definition of the \cs{framedbox} command appears to be
% complicated; it is just an apparent complication due to the
% fact that it uses the powerful \cs{Curve} command that draws an
-% arbitrary curved line or fills the area delimited by the
+% arbitrary curved line or fills the area delimited by such
% curved line; it suffices to specify the nodes and the tangents
% to each node; the nodes are the points the line should pass
% through, their tangents may be specified with arbitrary vector
% components along the horizontal and vertical axes. For a
-% rectangle such vector componente are just 0 or $\pm 1$. The
-% node coordinates, on the opposite, must be determined with
-% accuracy; we used the \cs{fpeval} function of package \pack{xfp},
-% that performs precise operation on operands in fractional
-% decimal numbers; if the operands are dimensions, the operands
-% are their fractional values in printer points, the results of
-% such operations are pure fractional decimal numbers without units;
-% if the numerical result is to be interpreted again as the measure of a
-% dimensional entity, \texttt{pt} must be appended to the
-% assignments to a dimension register; within the \Env{picture}
+% rectangle such vector components are just 0 or $\pm 1$. The
+% node coordinates of the rounded corners, on the opposite, must be
+% determined with accuracy; we used the \cs{fpeval} function of
+% package \pack{xfp}, that performs precise computations on operands
+% in fractional decimal numbers; if the operands are dimensions, the
+% operands are their fractional decimal values in printer points, the
+% results of such operations are pure fractional decimal numbers
+% without units; if the numerical result is to be interpreted again
+% as the measure of a dimensional entity, \texttt{pt} must be appended
+% to the assignments to a dimension register; within the \Env{picture}
% environment, any coordinate is expressed in multiples of
-% \cs{unitlength}.
+% \cs{unitlength}, therefore no unit of measure is necessary, once
+% \cs{unitlength} has been specified.
%
% For a rectangle with curved corners of a given radius \cs{R}
% we have four quarter circles joined by straight lines; therefore
@@ -1047,42 +1254,50 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%
% The shaded background and the coloured frame have the same contour;
% but the former is filled, while the latter is stroked; we have to
-% draw the same curve two times; first the shaded background, then
-% the frame.
+% draw the same curve two times; first the shaded background, then we
+% superimpose the frame
%
-% This shaded framed rectangle is at the center of the coordinate
-% system of a \Env{piture} environment, and has the correct dimensions
-% to receive the boxed text; it is trivial to center the text within a
-% zero dimensioned box, typical of the \Env{picture} environment.
+% This shaded framed curved corners rectangle is at the center of the
+% coordinate system of a \Env{piture} environment, and has the correct
+% dimensions to receive the boxed text; it is trivial to center the text
+% by means of a zero dimensioned box, typical of the \Env{picture}
+% environment.
%
% The code of this long but simple code is the following.
% \begin{macrocode}
\NewDocumentCommand\framedbox{ m m m O{#3}}{\bgroup
\fboxrule=#2\fboxsep=#3\relax
-\setbox0\hbox{\fboxrule=0pt\fboxsep=#3\relax
-\framebox{\parbox{%
- \fpeval{\insertwidth-2\fboxrule-2\fboxsep}pt}{\textcolor{WFtext}{#1}}}}%
-%
-\unitlength=\fpeval{\wd0/100}pt
-\edef\x{100}\edef\y{\fpeval{(\ht0 +\dp0)/\unitlength}}%
-\edef\xc{50}\edef\yc{\fpeval{\y/2}}\edef\R{\fpeval{#4/\unitlength}}%
-%
+\setbox0\hbox{\fboxrule=\z@\fboxsep=#3\relax
+\framebox{\parbox{% draw a framed box without the frame
+ \fpeval{\insertwidth-2\fboxrule-2\fboxsep}\p@}{\textcolor{WFtext}{#1}}}}
+
+\unitlength=\fpeval{\wd0/100}\p@ % set the picture \unitlength
+ % determine the picture coordinates and displacement of the axes origin
+\edef\x{100}%
+\edef\y{\fpeval{(\ht0 +\dp0)/\unitlength}}%
+\edef\xc{50}%
+\edef\yc{\fpeval{\y/2}}\edef\R{\fpeval{#4/\unitlength}}%
+\edef\R{\fpeval{#4/\unitlength}}% radius in unit lengths
+ % compute the horizontal and vertical shifts of the corner extrema
\edef\WFXds{\fpeval{-\xc+\R}}\edef\WFXsd{-\WFXds}%
\edef\WFYuo{\fpeval{\yc-\R}}\edef\WFYou{-\WFYuo}%
-%
+ % compute the coordinates of the curved corners frame contour
\edef\PSEl{\WFXsd,-\yc}\edef\PSEu{\xc,\WFYou}\edef\PNEd{\xc,\WFYuo}%
\edef\PNEl{\WFXsd,\yc}\edef\PNWr{\WFXds,\yc}\edef\PNWd{-\xc,\WFYuo}%
\edef\PSWu{-\xc,\WFYou}\edef\PSWr{\WFXds,-\yc}%
-%
-\def\WFrectangle{%
+
+\def\WFrectangle{% define the contour as the argument of \Curve
(\WFXsd,-\yc)<1,0>(\xc,\WFYou)<0,1>(\xc,\WFYuo)<0,1>%
(\WFXsd,\yc)<-1,0>(\WFXds,\yc)<-1,0>(-\xc,\WFYuo)<0,-1>%
(-\xc,\WFYou)<0,-1>(\WFXds,-\yc)<1,0>(\WFXsd,-\yc)<1,0>}%
-\def\CurveStar{\Curve*}%
-%
+\def\CurveStar{\Curve*}% define a macro for adding the asterisk
+
\begin{picture}(\x,\y)(-\xc,-\yc)
-{\color{WFbackground}\expandafter\CurveStar\WFrectangle}%
-{\color{WFframe}\linethickness{#2}\expandafter\Curve\WFrectangle}%
+{\color{WFbackground}\expandafter\CurveStar\WFrectangle}% draw background
+\ifdim\fboxrule>\z@% draw the frame if its thickness is not zero
+ {\color{WFframe}\linethickness{#2}\expandafter\Curve\WFrectangle}%
+\fi
+ % put the text block in a null box at the coordinates origin
\put(0,0){\makebox(0,0)[cc]{\box0}}%
\end{picture}
\egroup}
@@ -1094,14 +1309,14 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
%\end{ttsintassi}
%
% The default value of the \meta{corner radius} is assigned to
-% equal argument number~3, that is the \meta{frame separation}; both
-% have a default value of \texttt{1ex} therefore they vary with the
+% equal argument number~3, that is the \meta{frame separation} and both
+% have a default value of \texttt{1ex}; therefore they vary with the
% current font size. See figure~\ref{fig:framed text}. The frame
% thickness is given a default value of \texttt{1pt} if the command is
% used within the body of the \cs{includeframedtext}; but if this
% command received a different value the frame may be thicker,
% or even vanish; we discourage values higher than \texttt{3pt}
-% (about \texttt{1mm}) and lower than \texttt{1pt}.
+% (about \texttt{1mm}) and lower than \texttt{1pt} unless is zero.
%
% The definition of the \Env{wraptext} environment is more detailed,
% because most of the computations must be done on the actual text
@@ -1110,10 +1325,12 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% problems with its justification or the justification of the wrapping
% lines. The framed box width is preset to 50\% of the normal text
% measure, but it can be optionally specified to a different value (not
-% too different from 50\%); as with the other wrapping environments, the
-% inserted material width is a \emph{braced optional parameter}.
+% too different from 50\%); as with the other wrapping environments,
+% with versions~6 and~5 the inserted material width is a \emph{braced
+% optional argument}; with version 6.0 the default value of
+% the \opz{radius} option is equal to \cs{fboxsep}.
%
-% For what concerns \Env{wraptext}, the first statement argument
+% For what concerns \Env{wraptext}, the opening statement argument
% description list does not contain any descriptor for an optional
% star. There is no need because the computation of the insertion
% block height is pretty precise and at most the user might desire
@@ -1121,15 +1338,17 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% and that of the inserted block and/or the measure of the indented
% wrapping lines; sometimes it might be necessary to get rid of the
% space below the inserted block when it gets typeset at the bottom
-% of a page.
+% of a page. The asterisk is not needed because for this environment
+% the optional first argument is always interpreted as the indented
+% lines number correction.
%
% It is true that some of the input parameters specified to the opening
% command of any environment with \LaTeXiii are available also to the
% closing commands; see the last paragraph of section~2 in the
% \pack{xparse} documentation.
-% But the following definition, besides using special delimiters for
-% optional parameters, uses the separate opening and closing
-% macros of the \Env{wrapfloat} environment; such procedure
+%
+% But the following definition uses the separate opening and closing
+% macros of the \Env{wrapfloat} environment; such procedure
% breaks this second availability of the input parameters,
% therefore it is necessary to save them into local macros or count
% registers (assignments to \TeX count registers are \emph{local},
@@ -1137,38 +1356,41 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% \cs{setcounter} macro and its siblings, are \emph{global}) so
% that we can use their values within the closing commands.
%
-% The \cs{NWF@box} box register has been allocated at the beginning;
+% The \cs{NWF@box} box register has been allocated at the code beginning;
% remember that \LaTeXiii registers of any kind are not limited in number
% as they were some years ago with \LaTeXe.
%
% The last opening commands are conceived to box the object to be
% wrapped, typeset within a coloured box with the default of
-% specified width; compared to version 4.0.*, this new version~5.0.*
-% does not use anymore the functionalities provided by package
-% \pack{tcolorbox}; instead it uses the \pack{curve2e} package
+% specified width; compared to version~4, these new versions~5
+% and~6 do not use anymore the functionalities provided by package
+% \pack{tcolorbox}; instead they use the \pack{curve2e} package
% functionalities to draw similar framed and shaded boxes; this
% implies much less memory used by the almost unlimited,
% but unused, functionalities of the \pack{tikz} package on which
-% \pack{tcolorbox} relies.
-%
-% Notice the \Env{wraptext} has two definitions depending on the
-% logical switch \texttt{WFnew}; if this switch is \texttt{true}
-% the definition applies to version~5.0.* of this package; otherwise
-% the second definition is a fall back to the functionality and the
-% syntax of the previous version~4.0.* implementation of this package;
-% in this latter case, in spite of the fact the the previous version
+% \pack{tcolorbox} relies. Notice that the plain \Env{picture}
+% environment extended with the \pack{pict2e} package can draw
+% “ovals”, that is rectangles with rounded corners, but as far as
+% we know they have the frame but cannot be filled.
+%
+% Notice the \Env{wraptext} has two or three definitions depending on the
+% logical switches \texttt{WFnew} and \texttt{WFfive}; if one of these
+% switches is \texttt{true} the definitions apply to either version~5
+% or~6 of this package; otherwise the last definition is a fall back to
+% the functionality and the syntax of the previous version~4 of this
+% package; in this case, in spite of the fact the the previous version
% used package \pack{tcolorbox}, the new code relies on the
% \pack{curve2e} functionalities in oder to get the same results
% without using the memory heavy \pack{tcolorbox} package.
%
-% With this new solution the frame that surrounds the wrapped text
+% With version 6.0, the frame that surrounds the wrapped text
% has the desired rounded corners; it is possible to easily
% specify the background and the frame colours, that by default
-% are maintained to light grey and black respectively; this new
+% are maintained to light grey and almost black respectively; this
% flexibility allows to set also the frame thickness and the
% separation width of the frame from its contents; by default
% they are~1pt for the frame thickness, and~1ex for the separation
-% width, that changes with the size of the surrounding fonts.
+% width, that changes with the font size.
% The number of indented lines is computed by means of the
% \cs{fpeval} \LaTeXiii function; among the operands of this
% function there is the number \texttt{2} used to take into
@@ -1179,7 +1401,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% a better choice.
%
% Eventually the opening \Env{wrapfloat} statement is created by
-% expanding the whole line complete of arguments, by means of the
+% expanding the whole line complete of its arguments, by means of the
% usual trick of defining a dummy macro within a group that contains
% among its expansion the group closing command, so that while
% it is being executed, it deletes itself from memory.
@@ -1188,13 +1410,13 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% absolutely identical to that of the other two wrapping environments
% in terms of \meta{line number correction}, mandatory \meta{location},
% optional \meta{overhang} and braced optional \meta{width}. See below
-% for the very different syntax of the fall back version~4.0.* opening
+% for the very different syntax of the fall back version~4 opening
% \Env{wraptext} statement; they become almost identical when no
% optional parameters are specified, the only little difference being
-% that the \meta{location} argument is mandatory for version~5.0.*,
-% while it is optional for version~4.0.*.
+% that the \meta{location} argument is mandatory for versions~5 and~6,
+% while it is optional for version~4.
% \begin{macrocode}
-\ifWFnew
+\ifboolexpr{bool{WFnew} or bool{WFfive}}{% definition for versions 5 and 6
\NewDocumentEnvironment{wraptext}{O{0} m O{0pt} G{0.5\columnwidth}}{%
\insertwidth=#4\WFscalewidth
\def\textplacement{#2}%
@@ -1202,7 +1424,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\def\textoverhang{#3}%
\bgroup\edef\x{\egroup\noexpand\wrapfloat{text}%
[\textcorrection]{\textplacement}[\textoverhang]{\insertwidth}*}\x%
- \def\caption{\unskip
+ \def\caption{\unskip
\refstepcounter\@captype
\let\@tempf\@caption
\unless\ifcsname @float@c@\@captype\endcsname
@@ -1214,16 +1436,16 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
}{\endwrapfloat\ignorespaces}%
% \end{macrocode}
%
-% For the fallback definition of this \Env{wraptext} environment
-% we have to start with the old list of specifically delimited
-% optional arguments. We remember that this opening statement
-% receives in order a bracket delimited \meta{location} parameter,
-% a vertical bar delimited optional \meta{width}, an angle bracket
-% delimited \meta{line number correction}, a round parenthesis
-% delimited \meta{caption label}; the different delimiters allow
-% to specify any optional argument without regard with the other
-% ones, provided they are in the same logical order when more than one
-% optional argument is specified.
+% For the fallback to version!4 definition of this \Env{wraptext}
+% environment we have to start with the old list of specifically
+% delimited optional arguments. We remember that this opening statement
+% receives in order a bracket delimited optional \meta{location}
+% parameter, a vertical bar delimited optional \meta{width}, an angle
+% bracket delimited optional \meta{line number correction}, a round
+% parenthesis delimited optional \meta{caption label}; the different
+% delimiters allow to specify any optional argument without regard with
+% the other ones, provided they are in the same logical order when more
+% than one optional argument is specified.
%
% Notice that the third optional argument contains the
% \meta{line number correction}, therefore the star used with the
@@ -1235,35 +1457,32 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% easily obtained with a \Env{minipage} environment, of which the
% internal commands are used; this insures that the text is
% typeset with the correct measure; with the closing commands
-% this boxed text shall be fed to the \cs{framedbox} command, in
-% oder to be framed and assigned a default background color.
+% this boxed text is fed to the \cs{framedbox} command, in
+% order to be framed and assigned a default background color.
% There is no possibility of specifying the colours unless the
% whole \Env{wraptext} environment, preceded by explicit color
-% settings, is confined within a group delimited, for example
-%, by the \cs{begingroup} and \cs{endgroup} commands.
-% \begin{macrocode}
-\else %
+% settings, is confined within a group delimited, for example,
+% by the \cs{begingroup} and \cs{endgroup} commands.
+% \begin{macrocode}
+}{% definition for version 4 fall back
%
\NewDocumentEnvironment{wraptext}%
{O{l} D||{0.5\columnwidth} D<>{0} D(){text} }%
- {%
+ {% Open environment
\insertwidth=#2
\def\textplacement{#1}%
\def\textcorrection{#3}%
\def\WF@caption@label{#4}%
\setbox0\hbox\bgroup
\minipage{\dimexpr\insertwidth-2pt-6ex}%
-}{\endminipage\egroup
+}{% Close environment
+ \endminipage\egroup
\begin{lrbox}{\NWF@box}%
\framedbox{\box0}{1pt}{1ex}%
\end{lrbox}
- \edef\NWF@wli
- {%
- \fpeval{%
- round((\ht\NWF@box+\dp\NWF@box)/\baselineskip,0)+2+
- \textcorrection
- }%
- }%
+ \edef\NWF@wli]{\fpeval{%
+ round((\ht\NWF@box+\dp\NWF@box)/\baselineskip,0)+2+\textcorrection}%
+ }%
\unles\ifhmode
\leavevmode\noindent
\fi
@@ -1273,7 +1492,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\endwrapfloat
\ignorespaces
}
-\fi
+}
% \end{macrocode}
%
@@ -1289,7 +1508,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% to be wrapped, but certain tasks are demanded to other service
% macros.
%
-% It is possible to set the width of the box if the \meta{width}
+% It is possible to set the width of the box if the \meta{width}
% parameter is specified; otherwise it closes the \cs{hbox} that was used;
% then it closes the main vertical box \cs{WF@box}. After executing
% \cs{WF@floatstyhook}, necessary when package \pack{float.sty}
@@ -1299,11 +1518,11 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% in the same box register with a negative initial vertical skip
% that raises the box contents.
%
-% Now comes the definition of the fundamental environment \Env{wrapfloat};
-% compared to the original Arseneau's definition it is much longer,
-% but it contains the code that Arseneau, who used the \LaTeXe
-% language, had to split in several macros in order to handle the
-% multitude of interspersed mandatory and optional arguments.
+% Now comes the new actual definition of the fundamental environment
+% \Env{wrapfloat}; compared to the original Arseneau's definition it is
+% much longer, but it contains the code that Arseneau, who used the
+% \LaTeXe language, and had to split it in several macros in order to
+% handle the multitude of interspersed mandatory and optional arguments.
%
% The main function of this environment is to handle the box that
% contains the figure, or the table, or the framed text, or what
@@ -1315,25 +1534,27 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% corrected. As it can be seen the optional star is not among
% the argument descriptors of the opening commands; it will be
% the following macro \cs{WR@wr} responsible of taking care of
-% the list of arguments and see if a star has been specified and
-% not yet read by the preceding commands.
+% the list of arguments and see if a star has been specified but
+% is still in the input flow.
%
% In order to handle any kind of wrapped object, this environment
% first argument is the \meta{caption label}. It may remain blank;
% but for wrapping figures or tables their respective definitions
% specify the name of the floating object they belong to; it is
% necessary that there exists a floating environment with the same
-% name of the wrapped object, even when its wrapping environment
+% name of the wrapped object, even when its wrapping environment
% is not specified with a floating \meta{location} argument.
%
% \begin{macrocode}
-
\NewDocumentEnvironment{wrapfloat}{m o m o G{\z@}}%
- {\def\@captype{#1}\WF@wr[#2]{#3}[#4]{#5}}%
- {\ifdim\hsize>\z@
+{% open environment code
+ \def\@captype{#1}\WF@wr[#2]{#3}[#4]{#5}%
+}{% close environment code
+ \ifdim\hsize>\z@
\par\hrule\@width\hsize\@height\z@ % force width with invisible rule
\else
- \unskip \egroup \box\z@ % or close hbox
+% \unskip % is the \unskip necessary?
+ \egroup \box\z@ % or close hbox
\fi
\egroup % close the vtop box; its width now is known
\WF@floatstyhook % support for float.sty
@@ -1354,7 +1575,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\fi
\fi
\global\@ignoretrue
- }
+}
% \end{macrocode}
%
@@ -1380,19 +1601,24 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% height to \cs{WF@size}. Afterwards some unusual macros are executed;
% they were devised by Arseneau to deal with possibly floating wrapped
% objects. The optional star is not accepted by this macro; if the user
-% specified it, it is still in the input flux; notice that the
-% \Env{wraptext} environment in version~4.0 does not accept the
-% optional star; if the user specifies it for this environment, an
-% asterisk appears at the beginning of the wrapped text; with
-% version~5.0 the asterisk appears at the left of the framed text.
-% In both cases, in facts, the first optional parameter is always
-% interpreted as the \meta{line number correction}.
+% specified it, it is still in the input flow; notice that the
+% \Env{wraptext} environment does not accept the optional star; if the
+% user indadvertedly specifies it for this environment, an
+% asterisk appears at the beginning of the wrapped text with version~4;
+% with versions~5 and~6 the asterisk appears at the left of the framed
+% text. In all three cases, in facts, the first optional parameter is
+% always interpreted as the \meta{line number correction}.
%
% The braced \meta{width} fourth parameter (actually a
% \textit{braced optional parameter}) may be specified
% to be \texttt{0pt}; in any case \texttt{0pt} is the default parameter
% value; if so, the object is treated at its natural width, by
-% boxing it into an hbox and using this box width as the working width.
+% boxing it into an hbox and using this box width as the working
+% width of course this works only with \Env{wrapfigure} and
+% \Env{wraptable}, because what is being wrapped has its own natural
+% width; with text the natural width is the default setting made
+% with the \emph{braced optional argument} described with the
+% \texttt{G} descriptor.
% \begin{macrocode}
\NewDocumentCommand\WF@wr{o m o m s}{%
\xdef\WF@wfname{wrap\@captype\space}%
@@ -1434,9 +1660,8 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\IfBooleanTF{#5}% if the asterisk is present set the numerical switch
{\global\WF@correctlines@switch=\@ne}%
{\global\WF@correctlines@switch=\z@}%
- \global\@ignoretrue
-}
+}
% \end{macrocode}
%
% At this point the main box \cs{WF@box} is opened in order to
@@ -1514,26 +1739,23 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\vskip-\parskip \global\WF@floatfalse
\let\pagetotal\maxdimen % kludge flag for "not top of page"
\else % outer page
- \unless\ifWFnew \@tempdima\pagedepth \fi% save page depth
{\advance\parskip\@tempdima\vskip-\parskip}% back up to base line
\penalty\interlinepenalty % update page parameters
- \@tempdimb\pagegoal \advance\@tempdimb-\pagetotal % room left on page
+ \@tempdimb\dimexpr\pagegoal - \pagetotal \relax% room left on page
\ifdim \@tempdimb<\z@ % page already full
\global\WF@floatfalse
- \unless\ifdim-\@tempdimb>\pageshrink
- \pagebreak
- \fi
+ \unless\ifdim-\@tempdimb>\pageshrink \pagebreak \fi
\else
\ifdim\WF@size>\@tempdimb% box too high does not fit in \@tempdimb
\ifWF@float
- \dimen@.5\baselineskip
+ \dimen@ 0.5\baselineskip
\else
\dimen@ 2\baselineskip
\fi
\ifdim\pagestretch>\dimen@ \dimen@\pagestretch \fi
\ifdim\pagefilstretch>\z@ \dimen@\@tempdimb \fi
\ifdim\pagefillstretch>\z@ \dimen@\@tempdimb \fi
- \advance\dimen@.5\baselineskip
+ \advance\dimen@ 0.5\baselineskip
\ifdim\dimen@>\@tempdimb % stretch page contents
\global\WF@floatfalse \pagebreak
\fi
@@ -1541,7 +1763,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\global\WF@floatfalse
\fi
\fi
- \vskip\@tempdima\relax % return erased page depth
+ \vskip\@tempdima% return erased page depth
\fi
\noindent
\ifWF@float
@@ -1562,7 +1784,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\ifnum `l=\WF@place % object on left
\hss
\def\@tempa{\kern\columnsep}% take right gap into action
- \else % insert on light
+ \else % object on right
\@tempdima\z@ % no left indentation
\kern\@tempdimb \kern\columnsep
\def\@tempa{\hss}% object overlaps space to the right
@@ -1586,9 +1808,10 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\aftergroup\WF@startwrapping
\fi
}
+
% \end{macrocode}
%
-% Here comes the very important macro that counts the wrapping indented
+% Here comes the very important macro that counts the indented wrapping
% lines, so that wrapping is correct; of course the limitations
% of the \LaTeX processing (needed to ship out a complete
% page) forbid to take into account the spaces inserted between
@@ -1614,18 +1837,19 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\ifnum\WF@correctlines@switch>\z@ % line number correction
\setcounter{WF@wrappedlines}
{\fpeval{round((\WF@size)/\baselineskip,0)+\WF@wli}}%
- \xdef\WF@wli{\value{WF@wrappedlines}}%
+ \xdef\WF@wli{\the\c@WF@wrappedlines}%
\else
\setcounter{WF@wrappedlines}{\WF@wli}% absolute number of lines
- \global\advance\c@WF@wrappedlines\@ne
+ \stepcounter{WF@wrappedlines}%
\fi
\fi
\ifnum\c@WF@wrappedlines>\@ne % fine tuning
\let\parshape\WF@fudgeparshape \let\WF@pspars\@empty \let\WF@@par\par
\def\@setpar##1{\def\WF@@par{##1}}\def\par{\@par}\let\@par\WF@mypar
- \xdef\WF@restoretol{\tolerance\the\tolerance}\tolerance9999
+ \xdef\WF@restoretol{\tolerance\the\tolerance}\tolerance9999\relax
\advance\linewidth-\WF@adjlw \advance\@totalleftmargin\WF@adjtlm
- \fi}
+ \fi
+}
% \end{macrocode}
%
@@ -1692,7 +1916,7 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
\ifnum\c@WF@wrappedlines<\tw@
\WF@finale
\else
- \afterassignment\WF@fudgeparshapee \fam
+ \afterassignment\WF@fudgeparshapee \fam
\fi
}
@@ -1826,18 +2050,18 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
% with package \pack{float.sty}, since, after defining a new float
% \meta{foo}, it suffices to define the new environment
% \Env{wrap\meta{foo}}. This fork version of his package should do
-% the same: is suffices to mimic the definitions of environments
+% the same: it suffices to mimic the definitions of environments
% \Env{wrapfigure} or \Env{wraptable}.
%
% Here there is some Arseneau's code that renders his \pack{wrapfig}
% code compatible with \cs{newfloat} of class \class{memoir}, and
-% with \cs{newfloatlist} of package \pack{ccaption}. We leave his code
-% hereafter; but we did not test it with this package.
-% \begin{macrocode}
+% with \cs{newfloatlist} of package \pack{ccaption}. We keep his code,
+% but we did not test it with this package.
+% \begin{macrocode}
\let\WF@floatstyhook\relax
-%
+
\@ifundefined{newfloat}{}{% \newfloat comes from somewhere besides
-% float.sty
+ % float.sty
\@ifundefined{restylefloat}{%
\@ifclassloaded{memoir}{%
\toks@=\expandafter\expandafter\expandafter
@@ -1850,10 +2074,11 @@ X\ifdim\fontdimen1\font=0pt\kern-0.15em\fi
}% end memoir support
{}% other origins of \newfloat here?
}{% float.sty handler. Ops: Two versions for different versions
-% Changing \floatstyle or \restylefloat changes \newfloat too.
+ % Changing \floatstyle or \restylefloat changes also \newfloat.
\@ifundefined{float@restyle}%
{% older float.sty
- \toks@=\expandafter{\restylefloat{#1}% env. might be undefined
+
+ \toks@=\expandafter{\restylefloat{##1}% env. might be undefined
\@namedef{wrap#1}{%
\def\@captype{#1}\@nameuse{fst@#1}%
\def\WF@floatstyhook{\let\@currbox\WF@box \columnwidth\wd\WF@box
diff --git a/macros/latex/contrib/wrapfig2/wrapfig2.pdf b/macros/latex/contrib/wrapfig2/wrapfig2.pdf
index dcbb079d64..d8b27c3e18 100644
--- a/macros/latex/contrib/wrapfig2/wrapfig2.pdf
+++ b/macros/latex/contrib/wrapfig2/wrapfig2.pdf
Binary files differ
diff --git a/systems/mac/mactex/ExtrasFolder.pdf b/systems/mac/mactex/ExtrasFolder.pdf
index 7979f494db..5d3938cd8f 100644
--- a/systems/mac/mactex/ExtrasFolder.pdf
+++ b/systems/mac/mactex/ExtrasFolder.pdf
Binary files differ
diff --git a/systems/mac/mactex/Licenses.txt b/systems/mac/mactex/Licenses.txt
index af4c1ddb9c..e57bd00253 100644
--- a/systems/mac/mactex/Licenses.txt
+++ b/systems/mac/mactex/Licenses.txt
@@ -1,6 +1,6 @@
$Id: Licenses.txt,v 1.14 2007/02/28 14:23:19 herbs Exp $
-Brief summary of the licensing of the various applications included as of 2022/02/12
+Brief summary of the licensing of the various applications included as of 2022/02/15
Aquamacs Emacs (Intel) - 3.5 - gpl - http://aquamacs.org/
Aquatkbibtex - 1.3 - gpl - http://aquatkbibtex.sourceforge.net/
@@ -18,4 +18,4 @@ Symbols Widget - 1.4.3 - gpl - http://vocaro.com/trevor/so
TeX FoG (10.4+) - 1.3.2 - gpl - http://homepage.mac.com/marco_coisson/TeXFoG/
TeX Live Utility (10.9+) - 1.53 - bsd - https://github.com/amaxwell/tlutility/releases
TexMaker (10.13+) - 5.1.2 - gpl - http://www.xm1math.net/texmaker/
-TeXShop (10.12+) - 4.68 - gpl - http://www.uoregon.edu/~koch/texshop/texshop.html
+TeXShop (10.12+) - 4.69 - gpl - http://www.uoregon.edu/~koch/texshop/texshop.html
diff --git a/systems/texlive/tlnet/install-tl b/systems/texlive/tlnet/install-tl
index f66ddc12f0..6c98a5d713 100755
--- a/systems/texlive/tlnet/install-tl
+++ b/systems/texlive/tlnet/install-tl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: install-tl 62016 2022-02-14 06:44:19Z preining $
+# $Id: install-tl 62031 2022-02-15 01:54:19Z karl $
# Copyright 2007-2021
# Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg.
# This file is licensed under the GNU General Public License version 2
@@ -10,7 +10,7 @@
use strict; use warnings;
-my $svnrev = '$Revision: 62016 $';
+my $svnrev = '$Revision: 62031 $';
$svnrev =~ m/: ([0-9]+) /;
$::installerrevision = ($1 ? $1 : 'unknown');
@@ -725,14 +725,20 @@ if ($opt_gui eq 'text' or $opt_gui eq 'extl' or $opt_profile ne "") {
if (@::installation_failed_packages) {
print <<EOF;
-*************** WARNING *************************
-The following list of inessential packages have failed to install
+*** PLEASE READ THIS WARNING ***********************************
+
+The following (inessential) packages failed to install properly:
+
@::installation_failed_packages
-You can fix this by running
+
+You can fix this by running this command:
tlmgr update --all --reinstall-forcibly-removed
-to complete the installation. Doing this immediately might not work
-and the command needs to be called later on.
-************************************************
+to complete the installation.
+
+However, if the problem was a failure to download (by far the
+most common cause), you should ensure that your network connection
+is working first.
+******************************************************************
EOF
}
}
@@ -3143,7 +3149,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: install-tl 62016 2022-02-14 06:44:19Z preining $
+$Id: install-tl 62031 2022-02-15 01:54:19Z karl $
=cut
# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 97c12aa16c..c42577c520 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -1,5 +1,8 @@
$mirrors = {
'Africa' => {
+ 'Morocco' => {
+ 'https://mirror.marwan.ma/ctan/' => 1,
+ },
'South Africa' => {
'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1,
'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
@@ -148,13 +151,13 @@ $mirrors = {
'Russia' => {
'https://ctan.altspu.ru/' => 1,
'https://mirror.macomnet.net/pub/CTAN/' => 1,
- 'https://mirror.truenetwork.ru/CTAN/' => 1,
'https://mirrors.mi-ras.ru/CTAN/' => 1,
},
'Slovenia' => {
'https://ctan.ijs.si/tex-archive/' => 1,
},
'Spain' => {
+ 'https://ctan.javinator9889.com/' => 1,
'https://osl.ugr.es/CTAN/' => 1,
},
'Sweden' => {
@@ -175,6 +178,7 @@ $mirrors = {
'https://ctan.mirror.globo.tech/' => 1,
'https://ctan.mirror.rafal.ca/' => 1,
'https://mirror.csclub.uwaterloo.ca/CTAN/' => 1,
+ 'https://mirror.its.dal.ca/ctan/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
'Costa Rica' => {
@@ -190,6 +194,7 @@ $mirrors = {
'https://mirror.las.iastate.edu/tex-archive/' => 1,
'https://mirror.math.princeton.edu/pub/CTAN/' => 1,
'https://mirror.mwt.me/ctan/' => 1,
+ 'https://mirrors.concertpass.com/tex-archive/' => 1,
'https://mirrors.mit.edu/CTAN/' => 1,
'https://mirrors.rit.edu/CTAN/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 845ea5a4a5..4953105875 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2021
-depend revision/62027
+depend revision/62035
name 00texlive.image
category TLCore
@@ -4530,7 +4530,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 62016
+revision 62031
shortdesc TeX Live standalone installer package
longdesc This package defines the files to go into the installer
longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -299067,14 +299067,14 @@ docfiles size=539
name texlive-msg-translations
category TLCore
-revision 60760
+revision 62030
shortdesc translations of the TeX Live installer and TeX Live Manager
longdesc This package contains the translated messages of the TeX Live
longdesc installer and TeX Live Manager. For information on creating or
longdesc updating translations, see
longdesc http://tug.org/texlive/doc.html#install-tl-xlate.
-containersize 146056
-containerchecksum 2d9b5040eda6606ecb6050452d0485332f6265b7876169f1507c629d59d587a5c74a9b7bec606d8e028a1cf5f5bc9e0a92d30d36588ac637bfa1d9508e862f47
+containersize 146040
+containerchecksum 3bc96b3e9859e728b97deb833d3849025632f7e3da269ad90ff2b7fcb68ac72122b763fd3e044108885bbdf3db91827c59e8b1112e626fff3aa409c298367337
runfiles size=366
tlpkg/translations/README
tlpkg/translations/cs.po
@@ -299136,7 +299136,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 62016
+revision 62031
shortdesc TeX Live infrastructure programs
longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for
longdesc tlmgr to run but still ours. Not included in tlcritical.
@@ -299144,10 +299144,10 @@ depend texlive-scripts.ARCH
depend texlive.infra
execute addMap mathpple.map
postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat
-containersize 108616
-containerchecksum c255f311a90038088b51316576d36bee78ffb4211b261292c2871a4b19f863c3a96104bb204a13f28258510bcae96bc2fcfe23ec3772097a419be072496a0c7b
-doccontainersize 403372
-doccontainerchecksum b9e2e2451fd91881afd42a69e563c3f0dfb80f1a736afa249dad371b6d7bdc21f6c739c81d3ef9c002e484ab165c69794bb83595529e023a9dc3dbffd955797c
+containersize 108696
+containerchecksum 9055b381caf00bb6d32d9f0f6eb035ea5bc2285bc4e2386e65f0e415f008ae84b61801e1b3072ba9c014f25bc62f9987716bd51dc036c3fb3f8d6759797ca27b
+doccontainersize 403440
+doccontainerchecksum c1b49c49044b2e2b44975f0702349095669c2b07815366c5a6c7b8d57b157845bc9581ba3f29f3d7295a2be415b7418da8769021504dadf7b412a00e4ad55124
docfiles size=502
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 5c312855e3..988cf89143 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-cf05029f7512044e915b1bd61573b016 texlive.tlpdb
+088618013a76ce1a1ebcf9d067813aea texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index cc9f995ce5..2dd2f347c2 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-0b0e316d8eb418ba18e9bfe4a62084eea2ac456102af302c526db25b79dfdadbac796b22e124c387b0152c5299f431a74d8ea19c12573c6de941d376df65c637 texlive.tlpdb
+25c06ca0ebe21d93e6230009705db237be516d833c620a64df46ef3dc27f88d503f7e1c36a4dd30eb3ee1733ed92f05aa8e5595a798d29934818806926b39463 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 8f6d419d51..0200647970 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
@@ -1,10 +1,10 @@
-----BEGIN PGP SIGNATURE-----
-iQEcBAEBCgAGBQJiCvljAAoJEEzhh34ZQ4xwhGYH/RFcLR0szggRds54VLrahSTZ
-k876nI6D4dnjTxJhFZvp+LVqHRsgRrbCJqkkY6tv9O+OzocxvEaWNs85JmeWJqvL
-47jN6/kBG9mHrZw4rluMlAfyDQdyvfXVgYGV3WFVhSptgeXz1ovDhtDiALOOGCr1
-0l2iiXA7UUsV2YjQ1h/6YUh7xPxMY0aGkXddIuxuNjNs14X/aLy7n1fQGrUS+GCF
-2fdsWlueSGnbkqwUamTa6zc+YaFXgRXCvQ+2X3LXP7gvqwfdFlPbi6ZKmd8po0H0
-QvLbRQ0zaHomJN4gpCsfqvtY+sZjOtyQW1ySDxaJ5r09dVhsKWLRrf4Bcyebexo=
-=uygp
+iQEcBAEBCgAGBQJiDErlAAoJEEzhh34ZQ4xw4FoH/2zPiZXUX7neerjn4L6+kc3i
+LbYzJ8SkBcb2as0/TIIKi8P6nvVl9TP72Ue5mzG09Pq1zim9A5qTvxGPXhYgBoxJ
+kW/zxTH+LlfDhLw+cH46eACEW7h0GY+DqDXmll/w63T6ccRZWYq1GSEu0lJH4X6s
+ruZHj2HmpB+kwpZmFYh/rnY6FsUJKyRMvYYyQ06u7Ji4wN/wN0399EPJSKMScpb4
+egl5bc4B/WyK0EUtwPP1Sy8yKtsjOQhkkN7BthTF04P3AewUJ/e03K7BeCUaiXpu
+Mwg+PxtV++F1iLXAmVzwzbZrdLHfDqLH9YKmvC+ewykPIBPAp28RYvYRtIMCu88=
+=s/mK
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 50407000ce..c93f42ed07 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/translations/cs.po b/systems/texlive/tlnet/tlpkg/translations/cs.po
index 1a525ebbfa..155141bc3f 100644
--- a/systems/texlive/tlnet/tlpkg/translations/cs.po
+++ b/systems/texlive/tlnet/tlpkg/translations/cs.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-11 09:18+0300\n"
"Last-Translator: Petr Sojka <sojka@fi.muni.cz>\n"
"Language-Team: Czech <>\n"
@@ -1930,11 +1930,11 @@ msgstr "Podpůrné programy výhradně pro Windows"
msgid "XeTeX and packages"
msgstr "XeTeX a balíky"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Vítejte v TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1949,7 +1949,7 @@ msgstr ""
"podporu přijetím členství ve sdružení, které je Vám nejbližší (CSTUG). "
"Seznam skupin u6ivatel; najdete na webu https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/da.po b/systems/texlive/tlnet/tlpkg/translations/da.po
index e6e635c557..c099b1c530 100644
--- a/systems/texlive/tlnet/tlpkg/translations/da.po
+++ b/systems/texlive/tlnet/tlpkg/translations/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live 2021\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-05-05 10:13+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -1931,11 +1931,11 @@ msgstr "Programmer, der kun understøttes på Windows"
msgid "XeTeX and packages"
msgstr "XeTeX med pakker"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Velkommen til TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1950,7 +1950,7 @@ msgstr ""
"rundt; overvej venligt at støtte den gruppe, der passer bedst med dine "
"behov. En liste med grupper er at finde på https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/de.po b/systems/texlive/tlnet/tlpkg/translations/de.po
index 778c3f2199..7c16b9e080 100644
--- a/systems/texlive/tlnet/tlpkg/translations/de.po
+++ b/systems/texlive/tlnet/tlpkg/translations/de.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-05-02 19:49+0200\n"
"Last-Translator: Uwe Ziegenhagen <ziegenhagen@gmail.com>\n"
"Language-Team: TL German Translation Team <tex-live@tug.org>\n"
@@ -1922,11 +1922,11 @@ msgstr "Zusatzprogramme (nur-Windows)"
msgid "XeTeX and packages"
msgstr "XeTeX und XeTeX-Pakete"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Willkommen bei TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1941,7 +1941,7 @@ msgstr ""
"weltweit, werden Sie Mitglied um ihre Arbeit zu unterstützen. Die Liste der "
"Gruppen finden Sie unter https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/es.po b/systems/texlive/tlnet/tlpkg/translations/es.po
index a005dcc2f9..be962fd263 100644
--- a/systems/texlive/tlnet/tlpkg/translations/es.po
+++ b/systems/texlive/tlnet/tlpkg/translations/es.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2019-03-30 17:58-0400\n"
"Last-Translator: linguafalsa <linguafalsa@gmail.com>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1922,11 +1922,11 @@ msgstr "Programas de respaldo solamente para Windows"
msgid "XeTeX and packages"
msgstr "XeTeX y paquetes"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "¡Bienvenido a Tex Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1942,7 +1942,7 @@ msgstr ""
"apoyarlo formando parte de un grupo que más conveniente sea para usted. La "
"lista de grupos está disponible en el web en https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/fr.po b/systems/texlive/tlnet/tlpkg/translations/fr.po
index dc66fc605a..4d42c8a3fe 100644
--- a/systems/texlive/tlnet/tlpkg/translations/fr.po
+++ b/systems/texlive/tlnet/tlpkg/translations/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-24 08:08+0100\n"
"Last-Translator: Denis Bitouzé <denis.bitouze@univ-littoral.fr>\n"
"Language-Team: French <kde-i18n-doc@kde.org>\n"
@@ -1938,11 +1938,11 @@ msgstr "Programmes pour le support de Windows seulement"
msgid "XeTeX and packages"
msgstr "XeTeX et packages associés"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Bienvenue sous TeX Live !"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1959,7 +1959,7 @@ msgstr ""
"groupes est disponible sur le web à l'adresse http://tug.org/usergroups."
"html ;la page du groupe francophone est http://www.gutenberg.eu.org/."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/it.po b/systems/texlive/tlnet/tlpkg/translations/it.po
index 73c0f117ac..ba021f9ce9 100644
--- a/systems/texlive/tlnet/tlpkg/translations/it.po
+++ b/systems/texlive/tlnet/tlpkg/translations/it.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Tex Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-22 06:20+0100\n"
"Last-Translator: Marco Pallante\n"
"Language-Team: <>\n"
@@ -1929,11 +1929,11 @@ msgstr "Programmi di supporto solo per Windows"
msgid "XeTeX and packages"
msgstr "XeTeX e pacchetti"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Benvenuto in TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1949,7 +1949,7 @@ msgstr ""
"voi. La lista dei gruppi è disponibile sul web all’indirizzo https://tug.org/"
"usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/ja.po b/systems/texlive/tlnet/tlpkg/translations/ja.po
index 78e709aec6..f65ed41c5c 100644
--- a/systems/texlive/tlnet/tlpkg/translations/ja.po
+++ b/systems/texlive/tlnet/tlpkg/translations/ja.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-18 11:41+0900\n"
"Last-Translator: Takuto Asakura <tkt.asakura@gmail.com>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1926,11 +1926,11 @@ msgstr "Windows 専用プログラム"
msgid "XeTeX and packages"
msgstr "XeTeX とパッケージ"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "TeX Live へようこそ!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1946,7 +1946,7 @@ msgstr ""
"入会することをご検討ください.TeX ユーザ会の一覧はhttps://tug.org/usergroups."
"html でご確認いただけます."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/messages.pot b/systems/texlive/tlnet/tlpkg/translations/messages.pot
index f884807e2e..9b731fcd13 100644
--- a/systems/texlive/tlnet/tlpkg/translations/messages.pot
+++ b/systems/texlive/tlnet/tlpkg/translations/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live 2021\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1868,11 +1868,11 @@ msgstr ""
msgid "XeTeX and packages"
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1882,7 +1882,7 @@ msgid ""
"list of groups is available on the web at https://tug.org/usergroups.html."
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/nl.po b/systems/texlive/tlnet/tlpkg/translations/nl.po
index 611da66819..64c163ff86 100644
--- a/systems/texlive/tlnet/tlpkg/translations/nl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/nl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-08 12:17+0100\n"
"Last-Translator: Siep Kroonenberg <siepo@bitmuis.nl>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1927,11 +1927,11 @@ msgstr "Ondersteunende programma's specifiek voor Windows"
msgid "XeTeX and packages"
msgstr "XeTeX en bijbehorende pakketten"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Welkom bij TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1946,7 +1946,7 @@ msgstr ""
"wereldwijd; overweeg ondersteuning door lid te worden van zo'n groep. De "
"lijst van gebruikersgroepen staat op https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/pl.po b/systems/texlive/tlnet/tlpkg/translations/pl.po
index a0718db28e..7881a2574e 100644
--- a/systems/texlive/tlnet/tlpkg/translations/pl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live 2020\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-22 01:37+0100\n"
"Last-Translator: Jerzy Ludwichowski <Jerzy.Ludwichowski@umk.pl>\n"
"Language-Team: \n"
@@ -1933,11 +1933,11 @@ msgstr "Dodatkowe programy tylko dla Windows"
msgid "XeTeX and packages"
msgstr "XeTeX i pakiety"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Witamy w TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1953,7 +1953,7 @@ msgstr ""
"rozważ wsparcie poprzez przystąpienie do jednej z grup.\n"
"Lista grup dostępna jest na stronie https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/pt_BR.po b/systems/texlive/tlnet/tlpkg/translations/pt_BR.po
index 8cdc62217b..b22c7a93fa 100644
--- a/systems/texlive/tlnet/tlpkg/translations/pt_BR.po
+++ b/systems/texlive/tlnet/tlpkg/translations/pt_BR.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-03 06:45-0300\n"
"Last-Translator: Paulo Roberto Massa Cereda <cereda.paulo@gmail.com>\n"
"Language-Team: Paulo Roberto Massa Cereda <cereda.paulo@gmail.com>\n"
@@ -1929,11 +1929,11 @@ msgstr "Programas de suporte exclusivos para Windows"
msgid "XeTeX and packages"
msgstr "XeTeX e pacotes"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Bem-vindo ao TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1949,7 +1949,7 @@ msgstr ""
"inscrevendo-se em um grupo que lhe seja oportuno. A lista de grupos está "
"disponível na web no endereço https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/sk.po b/systems/texlive/tlnet/tlpkg/translations/sk.po
index 09c02ea02f..6f0c31fece 100644
--- a/systems/texlive/tlnet/tlpkg/translations/sk.po
+++ b/systems/texlive/tlnet/tlpkg/translations/sk.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-11 09:24+0300\n"
"Last-Translator: Ján Buša <jan.busa@tuke.sk>\n"
"Language-Team: tex-live@tug.org\n"
@@ -1931,11 +1931,11 @@ msgstr "Podporné programy len pre Windows"
msgid "XeTeX and packages"
msgstr "XeTeX a balíky"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Vitajte vo svete TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1951,7 +1951,7 @@ msgstr ""
"najlepšej. Zoznam skupín je dostupný na webe na https://tug.org/usergroups."
"html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/sl.po b/systems/texlive/tlnet/tlpkg/translations/sl.po
index 17faa87628..72eb7078e2 100644
--- a/systems/texlive/tlnet/tlpkg/translations/sl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/sl.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-02-07 21:14+0100\n"
"Last-Translator: Mojca Miklavec <mojca.miklavec.lists@gmail.com>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -2007,11 +2007,11 @@ msgstr "Programi za MS Windows"
msgid "XeTeX and packages"
msgstr "XeTeX s paketi"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Dobrodošli v TeX Live-u!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -2026,7 +2026,7 @@ msgstr ""
"sveta; podprete ga lahko s pridružitvijo vam najbližjemu društvu. Seznam le-"
"teh je na voljo na strani https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/sr.po b/systems/texlive/tlnet/tlpkg/translations/sr.po
index e41a79972d..a8156d4305 100644
--- a/systems/texlive/tlnet/tlpkg/translations/sr.po
+++ b/systems/texlive/tlnet/tlpkg/translations/sr.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2019-10-23 02:13+0300\n"
"Last-Translator: Nikola Lečić <nikola.lecic@anthesphoria.net>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1928,11 +1928,11 @@ msgstr "Помоћни програми за Windows"
msgid "XeTeX and packages"
msgstr "XeTeX и повезани пакети"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Добродошли у TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1947,7 +1947,7 @@ msgstr ""
"света; молимо вас да размотрите учлањење у најближу из њих. Списак група "
"можете пронаћи овде: https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/uk.po b/systems/texlive/tlnet/tlpkg/translations/uk.po
index b0e7a44109..f3ecf9af42 100644
--- a/systems/texlive/tlnet/tlpkg/translations/uk.po
+++ b/systems/texlive/tlnet/tlpkg/translations/uk.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live 2010\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2019-03-23 09:02+0200\n"
"Last-Translator: Andriy Bandura <andriykopanytsia@gmail.com>\n"
"Language-Team: Ukrainian <andriykopanytsia@gmail.com>\n"
@@ -1912,11 +1912,11 @@ msgstr "Додаткові програми лише під Windows"
msgid "XeTeX and packages"
msgstr "XeTeX та пакунки"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Ласкаво просимо до TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1931,7 +1931,7 @@ msgstr ""
"світу; будь ласка, підтримайте нас, приєднавшись до групи, найкращої для "
"вас. Список груп доступний на веб-сторінці https://tug.org/usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/vi.po b/systems/texlive/tlnet/tlpkg/translations/vi.po
index 7952b7c472..ff48c4041a 100644
--- a/systems/texlive/tlnet/tlpkg/translations/vi.po
+++ b/systems/texlive/tlnet/tlpkg/translations/vi.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2021-03-13 11:02+0100\n"
"Last-Translator: Anh K. Huỳnh <kyanh@viettug.org>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1923,11 +1923,11 @@ msgstr "Các chương trình chỉ cho Windows"
msgid "XeTeX and packages"
msgstr "XeTeX và các gói của nó"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "Chào mừng đến với TeX Live!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1943,7 +1943,7 @@ msgstr ""
"hợp nhất. Danh sách các nhóm người dùng có thể tìm thấy tại http://tug.org/"
"usergroups.html."
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
index eef6998743..9ce92eb459 100644
--- a/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
+++ b/systems/texlive/tlnet/tlpkg/translations/zh_CN.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2009-09-22 12:54+0800\n"
"Last-Translator: Jiang Jiang <gzjjgod@gmail.com>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1872,11 +1872,11 @@ msgstr ""
msgid "XeTeX and packages"
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "欢迎进入 TeX Live 的世界!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1886,7 +1886,7 @@ msgid ""
"list of groups is available on the web at https://tug.org/usergroups.html."
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
index 689a219593..a254587ba8 100644
--- a/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
+++ b/systems/texlive/tlnet/tlpkg/translations/zh_TW.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
-"POT-Creation-Date: 2021-10-14 01:48+0200\n"
+"POT-Creation-Date: 2022-02-15 01:48+0100\n"
"PO-Revision-Date: 2009-09-03 12:34+0200\n"
"Last-Translator: Norbert Preining <preining@logic.at>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
@@ -1898,11 +1898,11 @@ msgstr ""
msgid "XeTeX and packages"
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2616
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2648
msgid "Welcome to TeX Live!"
msgstr "歡迎進入 TeX Live 的世界!"
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2619
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2651
#, perl-format
msgid ""
"See %s/index.html for links to documentation.\n"
@@ -1912,7 +1912,7 @@ msgid ""
"list of groups is available on the web at https://tug.org/usergroups.html."
msgstr ""
-#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2629
+#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:2661
#, perl-format
msgid ""
"Add %s/texmf-dist/doc/man to MANPATH.\n"
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 6c8781a2ad..3244e760f8 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=1644959840
+date=1645046232
lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9
-lstdigest=efd7e12f1560956b3d5ba49be1e2e927
+lstdigest=617f7b510356513aa8ecae627bfbc172
numpkg=5349
relstate=next
-version=8081
+version=8082
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: KzJEgJTys3PLqf7V2/GHQW5yPr5JFEXmr9QKs7bo+O/JS5JVEXbnL7FTA0kknZzfzXWta1SW6FpWnq4uUZxGD6jTvQ9dPsnMOFeouEs4/vdRNK8/s+7qk1wJcB27FNart9PpieSKdthUgqxP6p+/kHF4iOZPAHazfzlQSecO8qBEC9NOya78CDwftXvtNKpOvqeAp0qyQrdjgZuTFE5FykMu1qIiOE1j5/XDu2FNY5TxdpLDdm4yzXUCal115V+uPxhFrSG5jDht1bqy3wGNZmZ5EJo9Mera3S7IADYybOD+qf73x6cLAdABVWwtd8NpQxNC9OPD0zeqNZsNJgzKbQ==
+;;;; signature/miktex: Qweo8n1DfAZijtAvglf+vtjovOvFrLeGe7A50fkxibn3vrR1zCgNJy93TfTCeYMtkSw3AglbfT8Fk67M2Nqj2HJjika7h5mnaM12TZ/YOPuqDZKzD6CVxEWi3x0oneZ2h43w5xTfqvwCq3smHLPigRexmiyO5q3/TOuHinO6gpR7AcL1FfGEJxgqLwoNHMFrLRJ5+/wgyvt598psZ1O+hkVGLYcM67k5PdBhkNSoGrBOPvPp2lU6p5h14KtYCtp++wRle8600zOSOKFbgZ0tSvdokFPjkIAI9817uWiYHDGPG4dC8ktlGNVEA94f0v0/8OdbGwoLSPeh4X/DBq6nIQ==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 4436d5d460..40388fe2f2 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1644959486
+date=1645045878
lastupd=erewhon-math erewhon-math__doc erewhon-math__source hamnosys hamnosys__doc hamnosys__source luafindfont luafindfont__doc luafindfont__source spbmark spbmark__doc spbmark__source tikz-karnaugh tikz-karnaugh__doc tikz-karnaugh__source tkz-euclide tkz-euclide__doc tkz-euclide__source tkz-fct tkz-fct__doc
-lstdigest=9c91ad76721ce6b91623c4da8e1ec73a
+lstdigest=aebb549817cd572f654b72c9f676b5c5
numpkg=5349
relstate=stable
-version=8081
+version=8082
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: B2tTGkpcqnm98UrgmR5+e/L9HsS8x25mFmIPzh9JbxgBteW73RZl3ONgrGu0wRT4m6wulRUCpZ7fyj4cPo8tDfk2xdyM8nmMjIvVLol16NIX4Iq/tVj18uSUL6MX8g+wv25Rel5JwCElJ93Vsbd2yFex+2HGGAYiUV266egGwHQUJeg2r9scsiZ2ILAdkxhoCcrnRPxS6vSxi9CZKKQCw3ORs/s7tbZzg+wpzZ3TAgLv6ZWYw747lFfDOJejLlU3Q/QhCSQAFEYL+Sb4shicLAKJDiWqNHUwTJZKPNS3MWK93qD7bnXhObWhhGxfY2oXHqV3FkMTGKLmYD8xD+PZRg==
+;;;; signature/miktex: KnRKgrNt6w3SLWWr7r6U/wynl33aVvezSnKp1F2n0NAvWZMw2BqeC4eH1G6OAmb2dBY+fwu/lqpNIZf8305xqqgWgelgZMqlWTrWGRyOBFBE6i+NGMAzW6K0Xi5cUc9dFpET5WCBjanJ/FQ7PhPry8C7zncW9kMNbJ/8rkeDmmPJ/A/6wTkF/0pyv9AcrPcJ89lBzZaBug7yDqlx1Z1XP8HD9PMDu/oRN708C0RzMg8ewDeJLWqqQC5PeppAXp22rZy1FGiGYlFmM7BEbvm31YvmpY3ihxEAClzvwwiH3UzX0xcXJ8I3a6XKAxVHsj6f+1vMDfV9IpPxGlEArCRUPg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index d49f4ebf74..c929605fe8 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-02-16-02-02
+2022-02-17-02-02