summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-07-10 03:00:39 +0000
committerNorbert Preining <norbert@preining.info>2022-07-10 03:00:39 +0000
commit20ce5b015c76436ed3c8022b778a877bcf4852dd (patch)
tree1f3e497cdfb61208cb0bbc703320a6df0c2e9d63
parent7891283a2f2fb8a8a884bb212c36da8082764a9b (diff)
CTAN sync 202207100300
-rw-r--r--FILES.byname155
-rw-r--r--FILES.byname.gzbin2442310 -> 2442384 bytes
-rw-r--r--FILES.last07days518
-rw-r--r--macros/latex/contrib/derivative/README.md4
-rw-r--r--macros/latex/contrib/derivative/derivative.pdfbin180462 -> 183631 bytes
-rw-r--r--macros/latex/contrib/derivative/derivative.sty770
-rw-r--r--macros/latex/contrib/derivative/derivative.tex114
-rw-r--r--macros/latex/contrib/fixdif/fixdif.dtx78
-rw-r--r--macros/latex/contrib/fixdif/fixdif.pdfbin324100 -> 314029 bytes
-rw-r--r--macros/latex/contrib/flexipage/README.txt20
-rw-r--r--macros/latex/contrib/flexipage/Test-flexipage.pdfbin0 -> 57617 bytes
-rw-r--r--macros/latex/contrib/flexipage/Test-flexipage.tex141
-rw-r--r--macros/latex/contrib/flexipage/flexipage.dtx818
-rw-r--r--macros/latex/contrib/flexipage/flexipage.ins64
-rw-r--r--macros/latex/contrib/flexipage/flexipage.pdfbin0 -> 267815 bytes
-rw-r--r--macros/latex/contrib/inlinelabel/README.md5
-rw-r--r--macros/latex/contrib/inlinelabel/inlinelabel.pdfbin159832 -> 159742 bytes
-rw-r--r--macros/latex/contrib/inlinelabel/inlinelabel.sty2
-rw-r--r--macros/latex/contrib/inlinelabel/inlinelabel.tex373
-rw-r--r--macros/latex/contrib/jpneduenumerate/README.md25
-rw-r--r--macros/latex/contrib/jpneduenumerate/jpneduenumerate-en.md114
-rw-r--r--macros/latex/contrib/jpneduenumerate/jpneduenumerate-ja.md114
-rw-r--r--macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdfbin0 -> 153607 bytes
-rw-r--r--macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty177
-rw-r--r--macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex599
-rw-r--r--macros/latex/contrib/rescansync/README24
-rw-r--r--macros/latex/contrib/rescansync/rescansync.pdfbin0 -> 378207 bytes
-rw-r--r--macros/latex/contrib/rescansync/rescansync.sty145
-rw-r--r--macros/latex/contrib/rescansync/rescansync.tex162
-rw-r--r--macros/latex/contrib/sidenotesplus/README.txt5
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.dtx55
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.pdfbin213799 -> 233491 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdfbin218699 -> 218822 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog12
-rw-r--r--support/TeX4ht/source/Makefile9
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex23
-rw-r--r--support/TeX4ht/source/tex4ht-jats.tex63
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl11
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb286
-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.xzbin2391744 -> 2392676 bytes
-rw-r--r--timestamp2
44 files changed, 3506 insertions, 1400 deletions
diff --git a/FILES.byname b/FILES.byname
index d4ff10f2b4..19f775ae3d 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5260,7 +5260,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/07/08 | 171843 | FILES.last07days
+2022/07/09 | 182027 | 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
@@ -212814,11 +212814,11 @@
2022/06/13 | 14679 | macros/latex/contrib/denisbdoc/denisbdoc.pdf
2022/06/13 | 485 | macros/latex/contrib/denisbdoc/README.md
2022/06/13 | 38375 | macros/latex/contrib/denisbdoc.zip
-2021/06/03 | 180462 | macros/latex/contrib/derivative/derivative.pdf
-2021/06/03 | 47332 | macros/latex/contrib/derivative/derivative.sty
-2021/06/03 | 103642 | macros/latex/contrib/derivative/derivative.tex
-2021/06/03 | 1490 | macros/latex/contrib/derivative/README.md
-2021/06/03 | 205706 | macros/latex/contrib/derivative.zip
+2022/07/09 | 183631 | macros/latex/contrib/derivative/derivative.pdf
+2022/07/09 | 46030 | macros/latex/contrib/derivative/derivative.sty
+2022/07/09 | 106168 | macros/latex/contrib/derivative/derivative.tex
+2022/07/09 | 1490 | macros/latex/contrib/derivative/README.md
+2022/07/09 | 209070 | macros/latex/contrib/derivative.zip
2012/09/17 | 4069 | macros/latex/contrib/designcon/DesignCon.bib
2012/09/17 | 2766 | macros/latex/contrib/designcon/designcon.cls
2012/09/17 | 3697 | macros/latex/contrib/designcon/designcon.layout
@@ -215996,11 +215996,11 @@
2019/08/05 | 201807 | macros/latex/contrib/fixcmex/fixcmex.pdf
2019/08/05 | 810 | macros/latex/contrib/fixcmex/README
2019/08/05 | 203748 | macros/latex/contrib/fixcmex.zip
-2022/05/29 | 20167 | macros/latex/contrib/fixdif/fixdif.dtx
-2022/05/29 | 3061 | macros/latex/contrib/fixdif/fixdif.ins
-2022/05/29 | 324100 | macros/latex/contrib/fixdif/fixdif.pdf
-2022/05/29 | 707 | macros/latex/contrib/fixdif/README.md
-2022/05/29 | 320004 | macros/latex/contrib/fixdif.zip
+2022/07/09 | 20269 | macros/latex/contrib/fixdif/fixdif.dtx
+2022/07/09 | 3061 | macros/latex/contrib/fixdif/fixdif.ins
+2022/07/09 | 314029 | macros/latex/contrib/fixdif/fixdif.pdf
+2022/07/09 | 707 | macros/latex/contrib/fixdif/README.md
+2022/07/09 | 310159 | macros/latex/contrib/fixdif.zip
2010/02/20 | 56191 | macros/latex/contrib/fixfoot/fixfoot.pdf
2007/12/12 | 7792 | macros/latex/contrib/fixfoot/fixfoot.sty
2010/02/20 | 1925 | macros/latex/contrib/fixfoot/fixfoot.tex
@@ -216074,6 +216074,13 @@
2010/09/13 | 2495 | macros/latex/contrib/flashmovie/test-flv.tex
2010/09/09 | 1288 | macros/latex/contrib/flashmovie/test.tex
2010/11/17 | 1352243 | macros/latex/contrib/flashmovie.zip
+2022/07/09 | 27097 | macros/latex/contrib/flexipage/flexipage.dtx
+2022/05/27 | 2443 | macros/latex/contrib/flexipage/flexipage.ins
+2022/07/09 | 267815 | macros/latex/contrib/flexipage/flexipage.pdf
+2022/07/09 | 973 | macros/latex/contrib/flexipage/README.txt
+2022/05/28 | 57617 | macros/latex/contrib/flexipage/Test-flexipage.pdf
+2022/07/09 | 3718 | macros/latex/contrib/flexipage/Test-flexipage.tex
+2022/07/09 | 302811 | macros/latex/contrib/flexipage.zip
2012/03/07 | 203131 | macros/latex/contrib/flipbook/flipbook-doc.pdf
2012/03/07 | 10564 | macros/latex/contrib/flipbook/flipbook-doc.tex
2012/03/07 | 187528 | macros/latex/contrib/flipbook/flipbook-ex.pdf
@@ -219228,10 +219235,11 @@
2018/08/15 | 1985 | macros/latex/contrib/inline-images/README.md
2018/08/15 | 13130 | macros/latex/contrib/inline-images/screenshots/example.jpg
2018/08/16 | 123229 | macros/latex/contrib/inline-images.zip
-2022/07/08 | 159832 | macros/latex/contrib/inlinelabel/inlinelabel.pdf
-2022/07/08 | 2799 | macros/latex/contrib/inlinelabel/inlinelabel.sty
-2022/07/08 | 754 | macros/latex/contrib/inlinelabel/README.md
-2022/07/07 | 155208 | macros/latex/contrib/inlinelabel.zip
+2022/07/08 | 159742 | macros/latex/contrib/inlinelabel/inlinelabel.pdf
+2022/07/08 | 2801 | macros/latex/contrib/inlinelabel/inlinelabel.sty
+2022/07/08 | 14112 | macros/latex/contrib/inlinelabel/inlinelabel.tex
+2022/07/08 | 858 | macros/latex/contrib/inlinelabel/README.md
+2022/07/09 | 159448 | macros/latex/contrib/inlinelabel.zip
2019/11/29 | 409433 | macros/latex/contrib/inputenx/inputenx.dtx
2019/11/29 | 875227 | macros/latex/contrib/inputenx/inputenx.pdf
2019/11/29 | 197 | macros/latex/contrib/inputenx/README.md
@@ -219754,11 +219762,11 @@
2019/11/08 | 12465 | macros/latex/contrib/jnuexam/jnuexam.tex
2018/07/15 | 175 | macros/latex/contrib/jnuexam/README
2020/11/06 | 837019 | macros/latex/contrib/jnuexam.zip
-2022/06/29 | 2919 | macros/latex/contrib/jpneduenumerate/jpneduenumerate-en.md
-2022/06/29 | 3244 | macros/latex/contrib/jpneduenumerate/jpneduenumerate-ja.md
-2022/06/29 | 10336 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
-2022/06/29 | 797 | macros/latex/contrib/jpneduenumerate/README.md
-2022/06/29 | 5548 | macros/latex/contrib/jpneduenumerate.zip
+2022/07/09 | 153607 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf
+2022/07/09 | 15483 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
+2022/07/09 | 21309 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex
+2022/07/09 | 723 | macros/latex/contrib/jpneduenumerate/README.md
+2022/07/09 | 155491 | macros/latex/contrib/jpneduenumerate.zip
2022/06/29 | 8766 | macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols-en.md
2022/06/28 | 29830 | macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.pdf
2022/06/29 | 1755 | macros/latex/contrib/jpnedumathsymbols/jpnedumathsymbols_example.tex
@@ -227343,6 +227351,11 @@
2019/12/05 | 27174 | macros/latex/contrib/rerunfilecheck/rerunfilecheck.dtx
2019/12/05 | 315092 | macros/latex/contrib/rerunfilecheck/rerunfilecheck.pdf
2019/12/06 | 318729 | macros/latex/contrib/rerunfilecheck.zip
+2022/07/09 | 784 | macros/latex/contrib/rescansync/README
+2022/07/09 | 378207 | macros/latex/contrib/rescansync/rescansync.pdf
+2022/07/09 | 4276 | macros/latex/contrib/rescansync/rescansync.sty
+2022/07/09 | 6128 | macros/latex/contrib/rescansync/rescansync.tex
+2022/07/09 | 381105 | macros/latex/contrib/rescansync.zip
2018/02/22 | 1194 | macros/latex/contrib/resphilosophica/Makefile
2019/04/14 | 2258 | macros/latex/contrib/resphilosophica/README
2015/08/22 | 1438 | macros/latex/contrib/resphilosophica/resphilosophica.bib
@@ -228850,13 +228863,13 @@
2020/03/24 | 7069 | macros/latex/contrib/sidenotes/caesar_book.cls
2020/03/24 | 86126 | macros/latex/contrib/sidenotes/caesar_example.pdf
2020/03/24 | 6216 | macros/latex/contrib/sidenotes/caesar_example.tex
-2022/05/31 | 882 | macros/latex/contrib/sidenotesplus/README.txt
-2022/05/31 | 38294 | macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
-2022/05/31 | 2472 | macros/latex/contrib/sidenotesplus/sidenotesplus.ins
-2022/05/31 | 213799 | macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
-2022/05/31 | 218699 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
-2022/05/31 | 10840 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
-2022/05/31 | 414446 | macros/latex/contrib/sidenotesplus.zip
+2022/07/09 | 935 | macros/latex/contrib/sidenotesplus/README.txt
+2022/07/09 | 39116 | macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+2022/07/09 | 2472 | macros/latex/contrib/sidenotesplus/sidenotesplus.ins
+2022/07/09 | 233491 | macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+2022/07/09 | 218822 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
+2022/07/09 | 10840 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
+2022/07/09 | 427047 | macros/latex/contrib/sidenotesplus.zip
2020/03/24 | 413 | macros/latex/contrib/sidenotes/README
2020/03/24 | 17783 | macros/latex/contrib/sidenotes/sidenotes.dtx
2020/03/24 | 1675 | macros/latex/contrib/sidenotes/sidenotes.ins
@@ -280166,9 +280179,9 @@
2021/01/21 | 860228 | systems/texlive/tlnet/archive/achemso.doc.r57479.tar.xz
2021/01/21 | 19268 | systems/texlive/tlnet/archive/achemso.r57479.tar.xz
2021/01/21 | 31504 | systems/texlive/tlnet/archive/achemso.source.r57479.tar.xz
-2022/05/30 | 4654032 | systems/texlive/tlnet/archive/acmart.doc.r63437.tar.xz
-2022/05/30 | 41920 | systems/texlive/tlnet/archive/acmart.r63437.tar.xz
-2022/05/30 | 58960 | systems/texlive/tlnet/archive/acmart.source.r63437.tar.xz
+2022/07/09 | 4657016 | systems/texlive/tlnet/archive/acmart.doc.r63837.tar.xz
+2022/07/09 | 42000 | systems/texlive/tlnet/archive/acmart.r63837.tar.xz
+2022/07/09 | 59048 | systems/texlive/tlnet/archive/acmart.source.r63837.tar.xz
2019/02/28 | 89944 | systems/texlive/tlnet/archive/acmconf.doc.r15878.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/acmconf.r15878.tar.xz
2019/02/28 | 18700 | systems/texlive/tlnet/archive/acmconf.source.r15878.tar.xz
@@ -280621,8 +280634,8 @@
2019/02/28 | 4036 | systems/texlive/tlnet/archive/assoccnt.r38497.tar.xz
2022/01/24 | 251112 | systems/texlive/tlnet/archive/association-matrix.doc.r61719.tar.xz
2022/01/24 | 3604 | systems/texlive/tlnet/archive/association-matrix.r61719.tar.xz
-2022/06/29 | 1808 | systems/texlive/tlnet/archive/asternote.doc.r63746.tar.xz
-2022/06/29 | 1244 | systems/texlive/tlnet/archive/asternote.r63746.tar.xz
+2022/07/09 | 117844 | systems/texlive/tlnet/archive/asternote.doc.r63838.tar.xz
+2022/07/09 | 1400 | systems/texlive/tlnet/archive/asternote.r63838.tar.xz
2019/02/28 | 4220 | systems/texlive/tlnet/archive/astro.doc.r15878.tar.xz
2019/02/28 | 12824 | systems/texlive/tlnet/archive/astro.r15878.tar.xz
2019/02/28 | 214116 | systems/texlive/tlnet/archive/asyfig.doc.r17512.tar.xz
@@ -281454,17 +281467,17 @@
2022/02/14 | 1388 | systems/texlive/tlnet/archive/bidi-atbegshi.r62009.tar.xz
2019/02/28 | 30508 | systems/texlive/tlnet/archive/bidicontour.doc.r34631.tar.xz
2019/02/28 | 1848 | systems/texlive/tlnet/archive/bidicontour.r34631.tar.xz
-2022/07/08 | 4051644 | systems/texlive/tlnet/archive/bidi.doc.r63833.tar.xz
+2022/07/09 | 4051068 | systems/texlive/tlnet/archive/bidi.doc.r63846.tar.xz
2019/02/28 | 43416 | systems/texlive/tlnet/archive/bidihl.doc.r37795.tar.xz
2019/02/28 | 2356 | systems/texlive/tlnet/archive/bidihl.r37795.tar.xz
2019/02/28 | 25800 | systems/texlive/tlnet/archive/bidipagegrid.doc.r34632.tar.xz
2019/02/28 | 3264 | systems/texlive/tlnet/archive/bidipagegrid.r34632.tar.xz
2019/02/28 | 75456 | systems/texlive/tlnet/archive/bidipresentation.doc.r35267.tar.xz
2019/02/28 | 28048 | systems/texlive/tlnet/archive/bidipresentation.r35267.tar.xz
-2022/07/08 | 131336 | systems/texlive/tlnet/archive/bidi.r63833.tar.xz
+2022/07/09 | 131368 | systems/texlive/tlnet/archive/bidi.r63846.tar.xz
2019/02/28 | 120564 | systems/texlive/tlnet/archive/bidishadowtext.doc.r34633.tar.xz
2019/02/28 | 1312 | systems/texlive/tlnet/archive/bidishadowtext.r34633.tar.xz
-2022/07/08 | 148072 | systems/texlive/tlnet/archive/bidi.source.r63833.tar.xz
+2022/07/09 | 148072 | systems/texlive/tlnet/archive/bidi.source.r63846.tar.xz
2019/02/28 | 736348 | systems/texlive/tlnet/archive/bigfoot.doc.r38248.tar.xz
2019/02/28 | 11372 | systems/texlive/tlnet/archive/bigfoot.r38248.tar.xz
2019/02/28 | 43760 | systems/texlive/tlnet/archive/bigfoot.source.r38248.tar.xz
@@ -282369,7 +282382,7 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2022/07/08 | 6692 | systems/texlive/tlnet/archive/collection-latexextra.r63830.tar.xz
+2022/07/09 | 6696 | systems/texlive/tlnet/archive/collection-latexextra.r63843.tar.xz
2022/06/10 | 700 | systems/texlive/tlnet/archive/collection-latex.r63515.tar.xz
2022/06/12 | 736 | systems/texlive/tlnet/archive/collection-latexrecommended.r63547.tar.xz
2022/06/27 | 908 | systems/texlive/tlnet/archive/collection-luatex.r63732.tar.xz
@@ -288968,9 +288981,9 @@
2019/12/07 | 298264 | systems/texlive/tlnet/archive/pdflscape.doc.r53047.tar.xz
2019/12/07 | 2252 | systems/texlive/tlnet/archive/pdflscape.r53047.tar.xz
2019/12/07 | 6000 | systems/texlive/tlnet/archive/pdflscape.source.r53047.tar.xz
-2022/06/15 | 8611040 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r63594.tar.xz
-2022/06/15 | 73816 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r63594.tar.xz
-2022/06/15 | 127816 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r63594.tar.xz
+2022/07/09 | 8607416 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r63839.tar.xz
+2022/07/09 | 73792 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r63839.tar.xz
+2022/07/09 | 127728 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r63839.tar.xz
2019/02/28 | 381552 | systems/texlive/tlnet/archive/pdfmarginpar.doc.r23492.tar.xz
2019/02/28 | 2424 | systems/texlive/tlnet/archive/pdfmarginpar.r23492.tar.xz
2021/11/02 | 564176 | systems/texlive/tlnet/archive/pdfoverlay.doc.r60923.tar.xz
@@ -289504,9 +289517,9 @@
2019/02/28 | 1860 | systems/texlive/tlnet/archive/postcards.r21641.tar.xz
2019/02/28 | 93292 | systems/texlive/tlnet/archive/poster-mac.doc.r18305.tar.xz
2019/02/28 | 3152 | systems/texlive/tlnet/archive/poster-mac.r18305.tar.xz
-2022/07/07 | 970884 | systems/texlive/tlnet/archive/postnotes.doc.r63822.tar.xz
-2022/07/07 | 7496 | systems/texlive/tlnet/archive/postnotes.r63822.tar.xz
-2022/07/07 | 20952 | systems/texlive/tlnet/archive/postnotes.source.r63822.tar.xz
+2022/07/09 | 968696 | systems/texlive/tlnet/archive/postnotes.doc.r63840.tar.xz
+2022/07/09 | 7496 | systems/texlive/tlnet/archive/postnotes.r63840.tar.xz
+2022/07/09 | 20944 | systems/texlive/tlnet/archive/postnotes.source.r63840.tar.xz
2021/05/20 | 948160 | systems/texlive/tlnet/archive/powerdot.doc.r59272.tar.xz
2019/11/26 | 280080 | systems/texlive/tlnet/archive/powerdot-fuberlin.doc.r52922.tar.xz
2019/11/26 | 2704 | systems/texlive/tlnet/archive/powerdot-fuberlin.r52922.tar.xz
@@ -289540,8 +289553,8 @@
2019/02/28 | 32696 | systems/texlive/tlnet/archive/prettyref.doc.r15878.tar.xz
2019/02/28 | 1212 | systems/texlive/tlnet/archive/prettyref.r15878.tar.xz
2019/02/28 | 2464 | systems/texlive/tlnet/archive/prettyref.source.r15878.tar.xz
-2022/05/29 | 338204 | systems/texlive/tlnet/archive/prettytok.doc.r63430.tar.xz
-2022/05/29 | 5544 | systems/texlive/tlnet/archive/prettytok.r63430.tar.xz
+2022/07/09 | 372452 | systems/texlive/tlnet/archive/prettytok.doc.r63842.tar.xz
+2022/07/09 | 5376 | systems/texlive/tlnet/archive/prettytok.r63842.tar.xz
2022/02/22 | 326124 | systems/texlive/tlnet/archive/preview.doc.r62130.tar.xz
2022/02/22 | 6984 | systems/texlive/tlnet/archive/preview.r62130.tar.xz
2022/02/22 | 22852 | systems/texlive/tlnet/archive/preview.source.r62130.tar.xz
@@ -290279,8 +290292,8 @@
2019/02/28 | 4116 | systems/texlive/tlnet/archive/reotex.r34924.tar.xz
2019/02/28 | 1216 | systems/texlive/tlnet/archive/repeatindex.doc.r24305.tar.xz
2019/02/28 | 1904 | systems/texlive/tlnet/archive/repeatindex.r24305.tar.xz
-2021/11/05 | 1250048 | systems/texlive/tlnet/archive/repere.doc.r60946.tar.xz
-2021/11/05 | 20316 | systems/texlive/tlnet/archive/repere.r60946.tar.xz
+2022/07/09 | 1392744 | systems/texlive/tlnet/archive/repere.doc.r63836.tar.xz
+2022/07/09 | 24036 | systems/texlive/tlnet/archive/repere.r63836.tar.xz
2020/09/26 | 426068 | systems/texlive/tlnet/archive/repltext.doc.r56433.tar.xz
2020/09/26 | 1412 | systems/texlive/tlnet/archive/repltext.r56433.tar.xz
2020/09/26 | 7104 | systems/texlive/tlnet/archive/repltext.source.r56433.tar.xz
@@ -290466,6 +290479,8 @@
2019/02/28 | 3968 | systems/texlive/tlnet/archive/sauterfonts.r15878.tar.xz
2019/02/28 | 4908 | systems/texlive/tlnet/archive/sauterfonts.source.r15878.tar.xz
2019/02/28 | 12500 | systems/texlive/tlnet/archive/sauter.r13293.tar.xz
+2022/07/09 | 387612 | systems/texlive/tlnet/archive/saveenv.doc.r63843.tar.xz
+2022/07/09 | 2024 | systems/texlive/tlnet/archive/saveenv.r63843.tar.xz
2019/02/28 | 173704 | systems/texlive/tlnet/archive/savefnmark.doc.r15878.tar.xz
2019/02/28 | 1380 | systems/texlive/tlnet/archive/savefnmark.r15878.tar.xz
2019/02/28 | 3980 | systems/texlive/tlnet/archive/savefnmark.source.r15878.tar.xz
@@ -290543,9 +290558,9 @@
2019/02/28 | 122072 | systems/texlive/tlnet/archive/scrjrnl.doc.r27810.tar.xz
2019/02/28 | 2608 | systems/texlive/tlnet/archive/scrjrnl.r27810.tar.xz
2019/02/28 | 4896 | systems/texlive/tlnet/archive/scrjrnl.source.r27810.tar.xz
-2021/04/06 | 244532 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.doc.r58746.tar.xz
-2021/04/06 | 1420 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.r58746.tar.xz
-2021/04/06 | 11100 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.source.r58746.tar.xz
+2022/07/09 | 323932 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.doc.r63844.tar.xz
+2022/07/09 | 1424 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.r63844.tar.xz
+2022/07/09 | 10672 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.source.r63844.tar.xz
2020/10/23 | 88404 | systems/texlive/tlnet/archive/scrlttr2copy.doc.r56733.tar.xz
2020/10/23 | 1876 | systems/texlive/tlnet/archive/scrlttr2copy.r56733.tar.xz
2020/03/04 | 480336 | systems/texlive/tlnet/archive/scsnowman.doc.r54080.tar.xz
@@ -291670,7 +291685,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/07/08 | 417724 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63827.tar.xz
+2022/07/09 | 417756 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63835.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
@@ -291694,7 +291709,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/07/08 | 113284 | systems/texlive/tlnet/archive/texlive-scripts.r63827.tar.xz
+2022/07/09 | 113276 | systems/texlive/tlnet/archive/texlive-scripts.r63835.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/04/19 | 36296 | systems/texlive/tlnet/archive/texlive-scripts.win32.r63068.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -293480,9 +293495,9 @@
2022/01/12 | 3284 | systems/texlive/tlnet/archive/zlmtt.r61567.tar.xz
2019/03/28 | 135268 | systems/texlive/tlnet/archive/zootaxa-bst.doc.r50619.tar.xz
2019/03/28 | 6228 | systems/texlive/tlnet/archive/zootaxa-bst.r50619.tar.xz
-2022/07/07 | 1071364 | systems/texlive/tlnet/archive/zref-check.doc.r63824.tar.xz
-2022/07/07 | 5652 | systems/texlive/tlnet/archive/zref-check.r63824.tar.xz
-2022/07/07 | 19416 | systems/texlive/tlnet/archive/zref-check.source.r63824.tar.xz
+2022/07/09 | 1070120 | systems/texlive/tlnet/archive/zref-check.doc.r63845.tar.xz
+2022/07/09 | 5652 | systems/texlive/tlnet/archive/zref-check.r63845.tar.xz
+2022/07/09 | 19412 | systems/texlive/tlnet/archive/zref-check.source.r63845.tar.xz
2022/05/29 | 1524120 | systems/texlive/tlnet/archive/zref-clever.doc.r63428.tar.xz
2022/05/29 | 23168 | systems/texlive/tlnet/archive/zref-clever.r63428.tar.xz
2022/05/29 | 50684 | systems/texlive/tlnet/archive/zref-clever.source.r63428.tar.xz
@@ -293507,16 +293522,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/06/23 | 123973 | systems/texlive/tlnet/install-tl
-2022/07/08 | 5805904 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/07/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/07/09 | 5805870 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/07/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/07/08 | 20460334 | systems/texlive/tlnet/install-tl-windows.exe
-2022/07/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/07/08 | 25489148 | systems/texlive/tlnet/install-tl.zip
-2022/07/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/07/09 | 20461075 | systems/texlive/tlnet/install-tl-windows.exe
+2022/07/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/07/09 | 25489142 | systems/texlive/tlnet/install-tl.zip
+2022/07/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -293526,7 +293541,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/05/27 | 49794 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/07/07 | 7348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/07/08 | 7303 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/04/27 | 215352 | 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
@@ -293568,12 +293583,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/07/08 | 17543963 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/07/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/07/09 | 17545130 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/07/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/04/18 | 86658 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/07/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/07/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/07/08 | 2393536 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/07/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/07/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/07/09 | 2391744 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2022/04/18 | 42116 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -303252,7 +303267,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/07/09 | 186 | timestamp
+2022/07/10 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2022/02/28 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index a7349358c7..e090fdfbf9 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index c225bf52f6..f62fe60ed4 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,7 +1,83 @@
+2022/07/09 | 973 | macros/latex/contrib/flexipage/README.txt
+2022/07/09 | 968696 | systems/texlive/tlnet/archive/postnotes.doc.r63840.tar.xz
+2022/07/09 | 935 | macros/latex/contrib/sidenotesplus/README.txt
+2022/07/09 | 8607416 | systems/texlive/tlnet/archive/pdfmanagement-testphase.doc.r63839.tar.xz
+2022/07/09 | 784 | macros/latex/contrib/rescansync/README
+2022/07/09 | 7496 | systems/texlive/tlnet/archive/postnotes.r63840.tar.xz
+2022/07/09 | 73792 | systems/texlive/tlnet/archive/pdfmanagement-testphase.r63839.tar.xz
+2022/07/09 | 723 | macros/latex/contrib/jpneduenumerate/README.md
+2022/07/09 | 707 | macros/latex/contrib/fixdif/README.md
2022/07/09 | 676 | macros/latex/contrib/hideanswer/README.md
+2022/07/09 | 6696 | systems/texlive/tlnet/archive/collection-latexextra.r63843.tar.xz
+2022/07/09 | 6128 | macros/latex/contrib/rescansync/rescansync.tex
+2022/07/09 | 59048 | systems/texlive/tlnet/archive/acmart.source.r63837.tar.xz
+2022/07/09 | 5805870 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/07/09 | 5652 | systems/texlive/tlnet/archive/zref-check.r63845.tar.xz
+2022/07/09 | 5376 | systems/texlive/tlnet/archive/prettytok.r63842.tar.xz
+2022/07/09 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/07/09 | 4657016 | systems/texlive/tlnet/archive/acmart.doc.r63837.tar.xz
+2022/07/09 | 46030 | macros/latex/contrib/derivative/derivative.sty
+2022/07/09 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/07/09 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/07/09 | 4276 | macros/latex/contrib/rescansync/rescansync.sty
+2022/07/09 | 427047 | macros/latex/contrib/sidenotesplus.zip
+2022/07/09 | 42000 | systems/texlive/tlnet/archive/acmart.r63837.tar.xz
+2022/07/09 | 417756 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63835.tar.xz
+2022/07/09 | 4051068 | systems/texlive/tlnet/archive/bidi.doc.r63846.tar.xz
+2022/07/09 | 39116 | macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+2022/07/09 | 387612 | systems/texlive/tlnet/archive/saveenv.doc.r63843.tar.xz
+2022/07/09 | 381105 | macros/latex/contrib/rescansync.zip
+2022/07/09 | 378207 | macros/latex/contrib/rescansync/rescansync.pdf
+2022/07/09 | 372452 | systems/texlive/tlnet/archive/prettytok.doc.r63842.tar.xz
+2022/07/09 | 3718 | macros/latex/contrib/flexipage/Test-flexipage.tex
2022/07/09 | 3328 | macros/latex/contrib/hideanswer/hideanswer.sty
+2022/07/09 | 323932 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.doc.r63844.tar.xz
+2022/07/09 | 314029 | macros/latex/contrib/fixdif/fixdif.pdf
+2022/07/09 | 310159 | macros/latex/contrib/fixdif.zip
+2022/07/09 | 3061 | macros/latex/contrib/fixdif/fixdif.ins
+2022/07/09 | 302811 | macros/latex/contrib/flexipage.zip
+2022/07/09 | 27097 | macros/latex/contrib/flexipage/flexipage.dtx
+2022/07/09 | 267815 | macros/latex/contrib/flexipage/flexipage.pdf
+2022/07/09 | 25489142 | systems/texlive/tlnet/install-tl.zip
+2022/07/09 | 2472 | macros/latex/contrib/sidenotesplus/sidenotesplus.ins
+2022/07/09 | 24036 | systems/texlive/tlnet/archive/repere.r63836.tar.xz
+2022/07/09 | 2391744 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/07/09 | 233491 | macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+2022/07/09 | 218822 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
+2022/07/09 | 21309 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex
+2022/07/09 | 20944 | systems/texlive/tlnet/archive/postnotes.source.r63840.tar.xz
+2022/07/09 | 209070 | macros/latex/contrib/derivative.zip
+2022/07/09 | 20461075 | systems/texlive/tlnet/install-tl-windows.exe
+2022/07/09 | 20269 | macros/latex/contrib/fixdif/fixdif.dtx
+2022/07/09 | 2024 | systems/texlive/tlnet/archive/saveenv.r63843.tar.xz
+2022/07/09 | 19412 | systems/texlive/tlnet/archive/zref-check.source.r63845.tar.xz
+2022/07/09 | 183631 | macros/latex/contrib/derivative/derivative.pdf
+2022/07/09 | 17545130 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/07/09 | 159448 | macros/latex/contrib/inlinelabel.zip
+2022/07/09 | 155491 | macros/latex/contrib/jpneduenumerate.zip
+2022/07/09 | 15483 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
+2022/07/09 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/07/09 | 153607 | macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf
+2022/07/09 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/07/09 | 1490 | macros/latex/contrib/derivative/README.md
+2022/07/09 | 148072 | systems/texlive/tlnet/archive/bidi.source.r63846.tar.xz
+2022/07/09 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/07/09 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2022/07/09 | 14335 | macros/latex/contrib/hideanswer/hideanswer.tex
+2022/07/09 | 1424 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.r63844.tar.xz
+2022/07/09 | 1400 | systems/texlive/tlnet/archive/asternote.r63838.tar.xz
+2022/07/09 | 1392744 | systems/texlive/tlnet/archive/repere.doc.r63836.tar.xz
+2022/07/09 | 131368 | systems/texlive/tlnet/archive/bidi.r63846.tar.xz
+2022/07/09 | 127728 | systems/texlive/tlnet/archive/pdfmanagement-testphase.source.r63839.tar.xz
2022/07/09 | 122619 | macros/latex/contrib/hideanswer/hideanswer.pdf
+2022/07/09 | 117844 | systems/texlive/tlnet/archive/asternote.doc.r63838.tar.xz
+2022/07/09 | 113276 | systems/texlive/tlnet/archive/texlive-scripts.r63835.tar.xz
+2022/07/09 | 10840 | macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
+2022/07/09 | 1070120 | systems/texlive/tlnet/archive/zref-check.doc.r63845.tar.xz
+2022/07/09 | 10672 | systems/texlive/tlnet/archive/scrlayer-fancyhdr.source.r63844.tar.xz
+2022/07/09 | 106168 | macros/latex/contrib/derivative/derivative.tex
2022/07/08 | 9 | macros/latex/contrib/saveenv/DEPENDS.txt
2022/07/08 | 9 | macros/latex/contrib/prettytok/DEPENDS.txt
2022/07/08 | 999 | fonts/simpleicons/map/simpleicons.map
@@ -27,6 +103,7 @@
2022/07/08 | 874 | macros/latex/contrib/prettytok/README
2022/07/08 | 86782380 | systems/texlive/tlnet/archive/biber.universal-darwin.r63832.tar.xz
2022/07/08 | 86758 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/07/08 | 858 | macros/latex/contrib/inlinelabel/README.md
2022/07/08 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2022/07/08 | 81460 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/07/08 | 80077 | macros/latex/contrib/qrbill/qrbill.pdf
@@ -39,7 +116,6 @@
2022/07/08 | 761651 | macros/xetex/latex/bidi/gull.jpg
2022/07/08 | 758953 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
2022/07/08 | 755741 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/07/08 | 754 | macros/latex/contrib/inlinelabel/README.md
2022/07/08 | 7479 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
2022/07/08 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2022/07/08 | 738986 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
@@ -48,6 +124,7 @@
2022/07/08 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
2022/07/08 | 73476 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
2022/07/08 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/07/08 | 7303 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/08 | 72887 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2022/07/08 | 72146 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
2022/07/08 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
@@ -65,7 +142,6 @@
2022/07/08 | 67255 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2022/07/08 | 672516 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
2022/07/08 | 6716 | systems/texlive/tlnet/archive/ut-thesis.source.r63833.tar.xz
-2022/07/08 | 6692 | systems/texlive/tlnet/archive/collection-latexextra.r63830.tar.xz
2022/07/08 | 665 | fonts/simpleicons/README.md
2022/07/08 | 664 | macros/latex/contrib/asternote/README.md
2022/07/08 | 659074 | macros/latex/contrib/acmart/samples/sample-xelatex.pdf
@@ -102,7 +178,6 @@
2022/07/08 | 5823 | macros/xetex/latex/bidi/bidi-doc-plain-basics.ltx
2022/07/08 | 580 | macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
2022/07/08 | 580848 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
-2022/07/08 | 5805904 | systems/texlive/tlnet/install-tl-unx.tar.gz
2022/07/08 | 577920 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
2022/07/08 | 57656 | systems/texlive/tlnet/archive/uwa-letterhead.doc.r63833.tar.xz
2022/07/08 | 57617 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
@@ -145,7 +220,6 @@
2022/07/08 | 5043 | macros/latex/contrib/pdfmanagement-testphase/output-patches-tmp-ltx.dtx
2022/07/08 | 49769 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2022/07/08 | 4948 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
-2022/07/08 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2022/07/08 | 4884 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.ins
2022/07/08 | 48825 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2022/07/08 | 484369 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
@@ -157,10 +231,6 @@
2022/07/08 | 46065 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
2022/07/08 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2022/07/08 | 45740 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/07/08 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/07/08 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2022/07/08 | 4547 | macros/xetex/latex/bidi/bidi-doc-latex-pkgs.ltx
2022/07/08 | 45467 | macros/latex/contrib/qrbill/qrbill.dtx
2022/07/08 | 4497 | macros/xetex/latex/bidi/bidi-doc-latex-programming.ltx
@@ -174,11 +244,9 @@
2022/07/08 | 4280227 | macros/xetex/latex/bidi.zip
2022/07/08 | 425881 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
2022/07/08 | 417757 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
-2022/07/08 | 417724 | systems/texlive/tlnet/archive/texlive-scripts.doc.r63827.tar.xz
2022/07/08 | 41304 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2022/07/08 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
2022/07/08 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/07/08 | 4051644 | systems/texlive/tlnet/archive/bidi.doc.r63833.tar.xz
2022/07/08 | 4042 | macros/latex/contrib/saveenv/saveenv.sty
2022/07/08 | 4041 | macros/latex/contrib/pdfmanagement-testphase/l3ref-tmp.sty
2022/07/08 | 40148 | macros/latex/contrib/scrlayer-fancyhdr/scrlayer-fancyhdr.dtx
@@ -241,7 +309,7 @@
2022/07/08 | 283861 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
2022/07/08 | 283821 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
2022/07/08 | 2820686 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/07/08 | 2799 | macros/latex/contrib/inlinelabel/inlinelabel.sty
+2022/07/08 | 2801 | macros/latex/contrib/inlinelabel/inlinelabel.sty
2022/07/08 | 27977 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
2022/07/08 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
2022/07/08 | 2760 | macros/latex/contrib/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty
@@ -272,7 +340,6 @@
2022/07/08 | 254 | fonts/simpleicons/tex/usimpleiconstwo.fd
2022/07/08 | 254 | fonts/simpleicons/tex/usimpleiconssix.fd
2022/07/08 | 254 | fonts/simpleicons/tex/usimpleiconsone.fd
-2022/07/08 | 25489148 | systems/texlive/tlnet/install-tl.zip
2022/07/08 | 2541 | fonts/simpleicons/enc/simpleiconssix.enc
2022/07/08 | 251128 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
2022/07/08 | 25105 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
@@ -284,7 +351,6 @@
2022/07/08 | 2413 | fonts/simpleicons/enc/simpleiconsnine.enc
2022/07/08 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2022/07/08 | 23945 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/07/08 | 2393536 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2022/07/08 | 23131 | macros/xetex/latex/bidi/bidi-doc-latex-basics.ltx
2022/07/08 | 2302 | macros/latex/contrib/prettytok/prettytok.lua
2022/07/08 | 22834104 | systems/texlive/tlnet/archive/biber.win32.r63832.tar.xz
@@ -297,7 +363,6 @@
2022/07/08 | 210274 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2022/07/08 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/07/08 | 20475 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
-2022/07/08 | 20460334 | systems/texlive/tlnet/install-tl-windows.exe
2022/07/08 | 203835 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
2022/07/08 | 202834 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2022/07/08 | 20183 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
@@ -326,7 +391,6 @@
2022/07/08 | 176639 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
2022/07/08 | 176529 | macros/xetex/latex/bidi/bidi-doc.pdf
2022/07/08 | 1756 | macros/latex/contrib/qrbill/README.md
-2022/07/08 | 17543963 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
2022/07/08 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
2022/07/08 | 17492 | systems/texlive/tlnet/archive/oup-authoring-template.r63833.tar.xz
2022/07/08 | 174086 | fonts/simpleicons/tex/simpleiconsglyphs-xeluatex.tex
@@ -339,25 +403,21 @@
2022/07/08 | 16559 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
2022/07/08 | 16501 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2022/07/08 | 1648 | systems/texlive/tlnet/archive/cprotectinside.r63833.tar.xz
-2022/07/08 | 159832 | macros/latex/contrib/inlinelabel/inlinelabel.pdf
+2022/07/08 | 159742 | macros/latex/contrib/inlinelabel/inlinelabel.pdf
2022/07/08 | 1581456 | graphics/metapost/contrib/macros/repere.zip
2022/07/08 | 15698 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
2022/07/08 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
2022/07/08 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2022/07/08 | 154360 | systems/texlive/tlnet/archive/inlinelabel.doc.r63833.tar.xz
-2022/07/08 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/07/08 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
2022/07/08 | 152029 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2022/07/08 | 150154 | macros/latex/contrib/pdfmanagement-testphase/fontspec-luatex-tmp-ltx.sty
2022/07/08 | 1501238 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/07/08 | 14937 | macros/latex/contrib/asternote/asternote.tex
-2022/07/08 | 148072 | systems/texlive/tlnet/archive/bidi.source.r63833.tar.xz
2022/07/08 | 1468675 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
2022/07/08 | 1467021 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/07/08 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2022/07/08 | 1454765 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/07/08 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
2022/07/08 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/07/08 | 14112 | macros/latex/contrib/inlinelabel/inlinelabel.tex
2022/07/08 | 1396 | macros/xetex/latex/bidi/bidi-doc-intro.ltx
2022/07/08 | 139101 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2022/07/08 | 138448 | systems/texlive/tlnet/archive/ut-thesis.doc.r63833.tar.xz
@@ -370,7 +430,6 @@
2022/07/08 | 1328 | fonts/simpleicons/tex/simpleicons.sty
2022/07/08 | 1323 | macros/xetex/latex/bidi/README
2022/07/08 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/07/08 | 131336 | systems/texlive/tlnet/archive/bidi.r63833.tar.xz
2022/07/08 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2022/07/08 | 12786582 | macros/latex/contrib/acmart.zip
2022/07/08 | 126533 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
@@ -397,7 +456,6 @@
2022/07/08 | 1156463 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
2022/07/08 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
2022/07/08 | 1153 | macros/latex/contrib/qrbill/qrbill_swiss-cross.pdf
-2022/07/08 | 113284 | systems/texlive/tlnet/archive/texlive-scripts.r63827.tar.xz
2022/07/08 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
2022/07/08 | 112587 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
2022/07/08 | 11212402 | macros/latex/contrib/pdfmanagement-testphase.zip
@@ -419,19 +477,15 @@
2022/07/08 | 100485 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/07/07 | 99078253 | systems/win32/TLW64/tl-win64.zip
2022/07/07 | 9835880 | systems/texlive/tlnet/archive/profcollege.doc.r63823.tar.xz
-2022/07/07 | 970884 | systems/texlive/tlnet/archive/postnotes.doc.r63822.tar.xz
2022/07/07 | 95911 | macros/latex/contrib/postnotes/postnotes.dtx
2022/07/07 | 88883 | macros/latex/contrib/zref-check/zref-check.dtx
2022/07/07 | 881 | macros/latex/contrib/postnotes/README.md
2022/07/07 | 812284 | macros/latex/contrib/postnotes/postnotes-code.pdf
2022/07/07 | 761 | macros/latex/contrib/precattl/README
-2022/07/07 | 7496 | systems/texlive/tlnet/archive/postnotes.r63822.tar.xz
2022/07/07 | 743709 | macros/latex/contrib/zref-check/zref-check-code.pdf
-2022/07/07 | 7348 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/07/07 | 726560 | systems/texlive/tlnet/archive/bodeplot.doc.r63820.tar.xz
2022/07/07 | 714984 | systems/texlive/tlnet/archive/latex.source.r63825.tar.xz
2022/07/07 | 65 | systems/mac/mactex/mactex-MacTeXtras-20220707.zip.md5
-2022/07/07 | 5652 | systems/texlive/tlnet/archive/zref-check.r63824.tar.xz
2022/07/07 | 555 | graphics/metapost/contrib/macros/repere/README.md
2022/07/07 | 5492 | systems/texlive/tlnet/archive/pst-magneticfield.r63821.tar.xz
2022/07/07 | 5337 | macros/latex/contrib/precattl/precattl.tex
@@ -452,15 +506,12 @@
2022/07/07 | 22935364 | systems/texlive/tlnet/archive/pst-magneticfield.doc.r63821.tar.xz
2022/07/07 | 227544 | systems/texlive/tlnet/archive/latex.r63825.tar.xz
2022/07/07 | 2171 | macros/latex/contrib/zref-check/zref-check-code.tex
-2022/07/07 | 20952 | systems/texlive/tlnet/archive/postnotes.source.r63822.tar.xz
2022/07/07 | 2088384 | systems/texlive/tlnet/archive/kpfonts-otf.doc.r63819.tar.xz
-2022/07/07 | 19416 | systems/texlive/tlnet/archive/zref-check.source.r63824.tar.xz
2022/07/07 | 17921804 | biblio/biber/biber-cygwin/biber-2.18-1-cygwin_x86_64.tar.gz
2022/07/07 | 17907435 | biblio/biber/biber-cygwin/biber-2.18-1-cygwin_i386.tar.gz
2022/07/07 | 176560 | macros/latex/contrib/postnotes/postnotes.pdf
2022/07/07 | 161 | systems/mac/mactex/mactex-MacTeXtras-20220707.zip.sha512
2022/07/07 | 1612 | systems/mac/mactex/Licenses.txt
-2022/07/07 | 155208 | macros/latex/contrib/inlinelabel.zip
2022/07/07 | 15216 | systems/texlive/tlnet/archive/bodeplot.source.r63820.tar.xz
2022/07/07 | 14 | macros/latex/contrib/postnotes/DEPENDS.txt
2022/07/07 | 145 | systems/mac/mactex/MacTeXtras.zip.sha512
@@ -471,7 +522,6 @@
2022/07/07 | 1195255 | macros/latex/contrib/zref-check.zip
2022/07/07 | 119521 | graphics/metapost/contrib/macros/repere/repere.mp
2022/07/07 | 1083676 | systems/texlive/tlnet/archive/kpfonts-otf.r63819.tar.xz
-2022/07/07 | 1071364 | systems/texlive/tlnet/archive/zref-check.doc.r63824.tar.xz
2022/07/07 | 1067 | macros/latex/contrib/postnotes/CHANGELOG.md
2022/07/07 | 1002 | macros/latex/contrib/zref-check/README.md
2022/07/06 | 992859 | graphics/pgf/contrib/bodeplot/bodeplot.pdf
@@ -1734,409 +1784,3 @@
2022/07/03 | 1011828 | systems/texlive/tlnet/archive/xepersian.doc.r63791.tar.xz
2022/07/03 | 100 | support/texlab/src/syntax/latex/snapshots/texlab__syntax__latex__parser__tests__empty.snap
2022/07/03 | 1003 | support/texlab/tests/integration/lsp/text_document/snapshots/integration__lsp__text_document__formatting__bibtex_internal_multiple_entries.snap
-2022/07/02 | 99 | macros/latex/contrib/biblatex/latex/bbx/authoryear-icomp.bbx
-2022/07/02 | 9916 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate-trad16.cbx
-2022/07/02 | 98 | macros/latex/contrib/biblatex/latex/bbx/authoryear-ibid.bbx
-2022/07/02 | 98 | macros/latex/contrib/biblatex/latex/bbx/authoryear-comp.bbx
-2022/07/02 | 98 | macros/latex/contrib/biblatex/latex/bbx/alphabetic-verb.bbx
-2022/07/02 | 9853 | macros/latex/contrib/biblatex/latex/cbx/authoryear-icomp.cbx
-2022/07/02 | 98442 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment-biber.pdf
-2022/07/02 | 98437 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment-bibtex.pdf
-2022/07/02 | 98395 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section-biber.pdf
-2022/07/02 | 98390 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section-bibtex.pdf
-2022/07/02 | 9804 | graphics/pgf/contrib/circuitikz/tex/pgfcircflow.tex
-2022/07/02 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad3.bbx
-2022/07/02 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad2.bbx
-2022/07/02 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-trad1.bbx
-2022/07/02 | 97 | macros/latex/contrib/biblatex/latex/bbx/verbose-inote.bbx
-2022/07/02 | 9732 | systems/texlive/tlnet/archive/create-theorem.r63776.tar.xz
-2022/07/02 | 9725 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2.tex
-2022/07/02 | 96 | macros/latex/contrib/biblatex/latex/bbx/verbose-note.bbx
-2022/07/02 | 96 | macros/latex/contrib/biblatex/latex/bbx/verbose-ibid.bbx
-2022/07/02 | 9620 | macros/latex/contrib/biblatex/latex/cbx/verbose-inote.cbx
-2022/07/02 | 9538 | graphics/pgf/contrib/circuitikz/tex/pgfcirccurrent.tex
-2022/07/02 | 938 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.tex
-2022/07/02 | 937130 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2-body.tex
-2022/07/02 | 92 | macros/latex/contrib/biblatex/latex/bbx/numeric-verb.bbx
-2022/07/02 | 92 | macros/latex/contrib/biblatex/latex/bbx/numeric-comp.bbx
-2022/07/02 | 929934 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.1.2.tex
-2022/07/02 | 92456 | macros/latex/contrib/biblatex/latex/biblatex.def
-2022/07/02 | 91 | macros/latex/contrib/biblatex/latex/bbx/verbose.bbx
-2022/07/02 | 9091 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad1.cbx
-2022/07/02 | 88905 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry-bibtex.pdf
-2022/07/02 | 88905 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry-biber.pdf
-2022/07/02 | 880 | macros/latex/contrib/biblatex/latex/lbx/newzealand.lbx
-2022/07/02 | 87 | macros/latex/contrib/biblatex/latex/cbx/reading.cbx
-2022/07/02 | 8784 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad2.cbx
-2022/07/02 | 8737 | macros/latex/contrib/biblatex/latex/cbx/authoryear-comp.cbx
-2022/07/02 | 87269 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-trad-appendix.pdf
-2022/07/02 | 8688 | macros/latex/contrib/biblatex/latex/cbx/verbose-note.cbx
-2022/07/02 | 86325 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-legal-sample.pdf
-2022/07/02 | 8543 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate16.cbx
-2022/07/02 | 8433 | macros/latex/contrib/biblatex/latex/blx-case-expl3.sty
-2022/07/02 | 8431 | graphics/pgf/contrib/circuitikz/doc/ctikzmanutils.sty
-2022/07/02 | 841340 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0-body.tex
-2022/07/02 | 840 | macros/latex/contrib/biblatex/doc/examples/82-style-debug.tex
-2022/07/02 | 8363 | macros/latex/contrib/biblatex/latex/blx-case-latex2e.sty
-2022/07/02 | 834142 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.0.tex
-2022/07/02 | 81705 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section-bibtex.pdf
-2022/07/02 | 81705 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section-biber.pdf
-2022/07/02 | 8163135 | support/latex2nemeth.zip
-2022/07/02 | 8115 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3.tex
-2022/07/02 | 810 | macros/latex/contrib/biblatex/doc/examples/91-sorting-schemes.tex
-2022/07/02 | 806 | macros/latex/contrib/biblatex/latex/lbx/australian.lbx
-2022/07/02 | 8029 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote.tex
-2022/07/02 | 8024 | macros/latex/contrib/biblatex/latex/bbx/authoryear.bbx
-2022/07/02 | 801916 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.doc.r63775.tar.xz
-2022/07/02 | 80156 | macros/latex/contrib/biblatex/doc/examples/04-delimiters-biber.pdf
-2022/07/02 | 80152 | macros/latex/contrib/biblatex/doc/examples/04-delimiters-bibtex.pdf
-2022/07/02 | 7936 | macros/latex/contrib/biblatex/latex/cbx/verbose-trad3.cbx
-2022/07/02 | 791 | macros/latex/contrib/biblatex/doc/examples/81-style-draft.tex
-2022/07/02 | 783 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type.tex
-2022/07/02 | 78060 | systems/texlive/tlnet/archive/create-theorem.doc.r63776.tar.xz
-2022/07/02 | 7801 | macros/latex/contrib/biblatex/latex/cbx/verbose-ibid.cbx
-2022/07/02 | 775123 | macros/xetex/latex/xepersian/xepersian.pdf
-2022/07/02 | 7742 | macros/latex/contrib/biblatex/doc/examples/96-dates.tex
-2022/07/02 | 7710 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear.tex
-2022/07/02 | 769 | macros/latex/contrib/biblatex/latex/lbx/nswissgerman.lbx
-2022/07/02 | 758991 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6-body.tex
-2022/07/02 | 757 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template.tex
-2022/07/02 | 751663 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.6.tex
-2022/07/02 | 7478 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid.tex
-2022/07/02 | 744 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb.tex
-2022/07/02 | 7419 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/legal-test.bib
-2022/07/02 | 728 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4.sty
-2022/07/02 | 7288 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp.tex
-2022/07/02 | 70792 | systems/texlive/tlnet/archive/phonenumbers.r63774.tar.xz
-2022/07/02 | 705908 | systems/texlive/tlnet/archive/tabularray.doc.r63778.tar.xz
-2022/07/02 | 7002 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid.tex
-2022/07/02 | 7000 | macros/latex/contrib/biblatex/latex/cbx/verbose.cbx
-2022/07/02 | 69 | macros/latex/contrib/biblatex/latex/biblatex.cfg
-2022/07/02 | 690729 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3-body.tex
-2022/07/02 | 683433 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.9.3.tex
-2022/07/02 | 68013 | macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bib
-2022/07/02 | 68013 | macros/latex/contrib/biblatex/bibtex/bib/biblatex/biblatex-examples.bib
-2022/07/02 | 6744 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/README
-2022/07/02 | 6648 | macros/latex/contrib/biblatex/latex/cbx/authortitle-icomp.cbx
-2022/07/02 | 65483 | macros/latex/contrib/biblatex/bibtex/bst/biblatex.bst
-2022/07/02 | 641 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3.sty
-2022/07/02 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7.sty
-2022/07/02 | 635 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6.sty
-2022/07/02 | 633 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.6.sty
-2022/07/02 | 63347 | macros/latex/contrib/biblatex/doc/examples/92-bibliographylists-biber.pdf
-2022/07/02 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7.sty
-2022/07/02 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.1.2.sty
-2022/07/02 | 632 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.9.3.sty
-2022/07/02 | 631 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6.sty
-2022/07/02 | 626 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.0.sty
-2022/07/02 | 59591 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-dates-intro.tex
-2022/07/02 | 5888 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note.tex
-2022/07/02 | 5780 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp.tex
-2022/07/02 | 571 | macros/latex/contrib/biblatex/latex/lbx/naustrian.lbx
-2022/07/02 | 568 | systems/texlive/tlnet/archive/install-latex-guide-zh-cn.r63775.tar.xz
-2022/07/02 | 5681 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-legal-sample.tex
-2022/07/02 | 5661 | macros/latex/contrib/biblatex/latex/cbx/authortitle-comp.cbx
-2022/07/02 | 56233 | graphics/pgf/contrib/circuitikz/tex/pgfcircmonopoles.tex
-2022/07/02 | 545 | macros/latex/contrib/biblatex/doc/examples/02-annotations.tex
-2022/07/02 | 524209 | macros/latex/contrib/biblatex/latex/biblatex.sty
-2022/07/02 | 520 | macros/latex/contrib/biblatex/latex/lbx/ngerman.lbx
-2022/07/02 | 5197 | macros/latex/contrib/biblatex/README
-2022/07/02 | 5175 | macros/latex/contrib/biblatex/doc/examples/01-introduction.tex
-2022/07/02 | 5131 | macros/latex/contrib/biblatex/latex/cbx/authoryear-ibid.cbx
-2022/07/02 | 5091 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple.tex
-2022/07/02 | 505 | macros/latex/contrib/biblatex/doc/examples/95-customlists.bib
-2022/07/02 | 5047 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose.tex
-2022/07/02 | 49574 | macros/latex/contrib/biblatex/CHANGES.md
-2022/07/02 | 488379 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex
-2022/07/02 | 47877 | macros/latex/contrib/biblatex/latex/lbx/spanish.lbx
-2022/07/02 | 47572 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-american.lbx
-2022/07/02 | 474 | macros/latex/contrib/biblatex/latex/lbx/swissgerman.lbx
-2022/07/02 | 4611 | macros/latex/contrib/biblatex/latex/bbx/reading.bbx
-2022/07/02 | 45859 | macros/latex/contrib/biblatex/latex/lbx/russian.lbx
-2022/07/02 | 4578 | macros/latex/contrib/biblatex/latex/cbx/numeric.cbx
-2022/07/02 | 45731 | macros/latex/contrib/biblatex/latex/lbx/lithuanian.lbx
-2022/07/02 | 45257 | macros/latex/contrib/biblatex/latex/lbx/bulgarian.lbx
-2022/07/02 | 44946 | macros/latex/contrib/biblatex/latex/lbx/ukrainian.lbx
-2022/07/02 | 4487 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-british.lbx
-2022/07/02 | 44324 | graphics/pgf/contrib/circuitikz/doc/changelog.tex
-2022/07/02 | 43837 | macros/latex/contrib/biblatex/latex/lbx/latvian.lbx
-2022/07/02 | 426 | macros/latex/contrib/biblatex/doc/examples/97-annotations.bib
-2022/07/02 | 4261 | macros/latex/contrib/biblatex/latex/cbx/alphabetic.cbx
-2022/07/02 | 422295 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.8.3-body.tex
-2022/07/02 | 4218 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-trad-appendix.tex
-2022/07/02 | 418 | graphics/pgf/contrib/circuitikz/doc/compatibility.tex
-2022/07/02 | 417108 | systems/texlive/tlnet/archive/msu-thesis.doc.r63777.tar.xz
-2022/07/02 | 416850 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-0.8.3.tex
-2022/07/02 | 40468 | graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex
-2022/07/02 | 403567 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.7-body.tex
-2022/07/02 | 4032 | macros/latex/contrib/biblatex/latex/bbx/debug.bbx
-2022/07/02 | 39965 | macros/latex/contrib/biblatex/latex/lbx/english.lbx
-2022/07/02 | 39823 | macros/latex/contrib/biblatex/doc/examples/93-nameparts-biber.pdf
-2022/07/02 | 39798 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-ngerman.lbx
-2022/07/02 | 39795 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-german.lbx
-2022/07/02 | 3976 | macros/latex/contrib/biblatex/latex/cbx/authoryear.cbx
-2022/07/02 | 393884 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.6-body.tex
-2022/07/02 | 39269 | macros/latex/contrib/biblatex/latex/lbx/magyar.lbx
-2022/07/02 | 39251 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys.tex
-2022/07/02 | 391 | macros/latex/contrib/biblatex/doc/examples/90-related-entries.tex
-2022/07/02 | 38577 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-notes-intro.tex
-2022/07/02 | 3850 | macros/latex/contrib/biblatex/latex/cbx/authortitle-ibid.cbx
-2022/07/02 | 3802 | graphics/pgf/contrib/circuitikz/README.md
-2022/07/02 | 3786 | macros/latex/contrib/biblatex/latex/blx-unicode.def
-2022/07/02 | 37452 | macros/latex/contrib/biblatex/latex/lbx/finnish.lbx
-2022/07/02 | 374435 | graphics/pgf/contrib/circuitikz/tex/pgfcirctripoles.tex
-2022/07/02 | 3713 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle.tex
-2022/07/02 | 36722 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-dutch.lbx
-2022/07/02 | 36721 | macros/latex/contrib/biblatex/latex/lbx/catalan.lbx
-2022/07/02 | 364117 | graphics/pgf/contrib/circuitikz/tex/circuitikz-0.4-body.tex
-2022/07/02 | 36088 | macros/latex/contrib/biblatex/latex/lbx/greek.lbx
-2022/07/02 | 3590 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex
-2022/07/02 | 3588 | macros/latex/contrib/biblatex/doc/examples/22-indexing-subentry.tex
-2022/07/02 | 35782 | macros/latex/contrib/biblatex/latex/lbx/romanian.lbx
-2022/07/02 | 35745 | macros/latex/contrib/biblatex/latex/lbx/marathi.lbx
-2022/07/02 | 35678 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-romanian.lbx
-2022/07/02 | 35438 | graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex
-2022/07/02 | 35241 | macros/latex/contrib/biblatex/latex/lbx/french.lbx
-2022/07/02 | 3520 | macros/latex/contrib/biblatex/doc/examples/94-labelprefix.tex
-2022/07/02 | 34708 | systems/texlive/tlnet/archive/tabularray.r63778.tar.xz
-2022/07/02 | 3454 | macros/latex/contrib/biblatex/latex/cbx/authortitle-ticomp.cbx
-2022/07/02 | 3437 | macros/latex/contrib/biblatex/latex/bbx/authortitle.bbx
-2022/07/02 | 34233 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-spanish.lbx
-2022/07/02 | 3411357 | macros/latex/contrib/biblatex-contrib/biblatex-chicago.zip
-2022/07/02 | 34046 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-swedish.lbx
-2022/07/02 | 339964 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-notes.cbx
-2022/07/02 | 33955 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-finnish.lbx
-2022/07/02 | 33908 | macros/latex/contrib/biblatex/latex/lbx/german.lbx
-2022/07/02 | 33871 | macros/latex/contrib/biblatex/latex/lbx/serbianc.lbx
-2022/07/02 | 33851 | macros/latex/contrib/biblatex/latex/lbx/czech.lbx
-2022/07/02 | 33796 | macros/latex/contrib/biblatex/latex/lbx/estonian.lbx
-2022/07/02 | 33313 | graphics/pgf/contrib/circuitikz/tex/pgfcircshapes.tex
-2022/07/02 | 32943 | macros/latex/contrib/biblatex/latex/lbx/slovak.lbx
-2022/07/02 | 328741 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1-biber.pdf
-2022/07/02 | 32796 | macros/latex/contrib/biblatex/latex/lbx/polish.lbx
-2022/07/02 | 32749 | macros/latex/contrib/biblatex/latex/lbx/turkish.lbx
-2022/07/02 | 3273 | macros/latex/contrib/biblatex/doc/examples/95-customlists.tex
-2022/07/02 | 327370 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1-bibtex.pdf
-2022/07/02 | 32731 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-french.lbx
-2022/07/02 | 32455 | macros/latex/contrib/biblatex/latex/blx-dm.def
-2022/07/02 | 32285 | macros/latex/contrib/biblatex/latex/lbx/danish.lbx
-2022/07/02 | 3206 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid.tex
-2022/07/02 | 32062 | macros/latex/contrib/biblatex/latex/lbx/slovene.lbx
-2022/07/02 | 3150 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-legacy.tex
-2022/07/02 | 31486 | macros/latex/contrib/biblatex/latex/lbx/basque.lbx
-2022/07/02 | 3146572 | install/graphics/pgf/contrib/circuitikz.tds.zip
-2022/07/02 | 31451 | macros/latex/contrib/biblatex/latex/lbx/dutch.lbx
-2022/07/02 | 31281 | macros/latex/contrib/biblatex/doc/examples/90-related-entries-biber.pdf
-2022/07/02 | 3127440 | graphics/pgf/contrib/circuitikz.zip
-2022/07/02 | 3036 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp.tex
-2022/07/02 | 30140 | macros/latex/contrib/biblatex/latex/lbx/portuguese.lbx
-2022/07/02 | 30036 | macros/latex/contrib/biblatex/latex/lbx/norsk.lbx
-2022/07/02 | 29922 | macros/latex/contrib/biblatex/latex/lbx/brazilian.lbx
-2022/07/02 | 29861 | macros/latex/contrib/biblatex/latex/lbx/croatian.lbx
-2022/07/02 | 29814 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-nynorsk.lbx
-2022/07/02 | 29733 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-norwegian.lbx
-2022/07/02 | 29721 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-norsk.lbx
-2022/07/02 | 29443 | macros/latex/contrib/biblatex/latex/lbx/galician.lbx
-2022/07/02 | 2934 | macros/latex/contrib/biblatex/latex/cbx/authortitle-tcomp.cbx
-2022/07/02 | 29312 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-brazilian.lbx
-2022/07/02 | 29274 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms-icelandic.lbx
-2022/07/02 | 2917 | macros/latex/contrib/biblatex/latex/lbx/british.lbx
-2022/07/02 | 290007 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle-biber.pdf
-2022/07/02 | 2899 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid.tex
-2022/07/02 | 2893 | macros/latex/contrib/biblatex/latex/cbx/authortitle.cbx
-2022/07/02 | 286590 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-notes-intro.pdf
-2022/07/02 | 283555 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-biber.pdf
-2022/07/02 | 2833 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp.tex
-2022/07/02 | 283040 | macros/latex/contrib/biblatex/doc/examples/03-localization-keys-bibtex.pdf
-2022/07/02 | 280 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-example.tex
-2022/07/02 | 280070 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear-biber.pdf
-2022/07/02 | 277799 | macros/latex/contrib/biblatex/doc/examples/50-style-authoryear-bibtex.pdf
-2022/07/02 | 276 | macros/latex/contrib/biblatex/latex/lbx/austrian.lbx
-2022/07/02 | 275259 | macros/latex/contrib/biblatex/doc/examples/60-style-authortitle-bibtex.pdf
-2022/07/02 | 274161 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote-biber.pdf
-2022/07/02 | 273584 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2-biber.pdf
-2022/07/02 | 272786 | macros/latex/contrib/biblatex/doc/examples/73-style-verbose-inote-bibtex.pdf
-2022/07/02 | 272203 | macros/latex/contrib/biblatex/doc/examples/75-style-verbose-trad2-bibtex.pdf
-2022/07/02 | 272059 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid-biber.pdf
-2022/07/02 | 270799 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3-biber.pdf
-2022/07/02 | 270652 | macros/latex/contrib/biblatex/doc/examples/71-style-verbose-ibid-bibtex.pdf
-2022/07/02 | 270384 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note-biber.pdf
-2022/07/02 | 26958 | macros/latex/contrib/biblatex/latex/lbx/swedish.lbx
-2022/07/02 | 269420 | macros/latex/contrib/biblatex/doc/examples/76-style-verbose-trad3-bibtex.pdf
-2022/07/02 | 268908 | macros/latex/contrib/biblatex/doc/examples/72-style-verbose-note-bibtex.pdf
-2022/07/02 | 2688 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric.tex
-2022/07/02 | 268058 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose-biber.pdf
-2022/07/02 | 266542 | macros/latex/contrib/biblatex/doc/examples/70-style-verbose-bibtex.pdf
-2022/07/02 | 26398 | macros/latex/contrib/biblatex/latex/lbx/icelandic.lbx
-2022/07/02 | 2635 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse.tex
-2022/07/02 | 261896 | graphics/pgf/contrib/circuitikz/tex/pgfcircbipoles.tex
-2022/07/02 | 25985 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-dates-sample.tex
-2022/07/02 | 2585 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp.tex
-2022/07/02 | 2580 | macros/latex/contrib/biblatex/doc/examples/80-style-reading.tex
-2022/07/02 | 2572 | macros/latex/contrib/biblatex/latex/cbx/numeric-verb.cbx
-2022/07/02 | 25680 | macros/latex/contrib/biblatex/latex/bbx/standard.bbx
-2022/07/02 | 256022 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-dates-intro.pdf
-2022/07/02 | 25280 | macros/latex/contrib/biblatex/doc/examples/96-dates-biber.pdf
-2022/07/02 | 25174 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-trad-sample.tex
-2022/07/02 | 24647 | macros/latex/contrib/biblatex/latex/lbx/serbian.lbx
-2022/07/02 | 24613 | macros/latex/contrib/biblatex/latex/blx-bibtex.def
-2022/07/02 | 244291 | macros/latex/contrib/biblatex/doc/examples/80-style-reading-bibtex.pdf
-2022/07/02 | 244291 | macros/latex/contrib/biblatex/doc/examples/80-style-reading-biber.pdf
-2022/07/02 | 243511 | macros/xetex/latex/xepersian/xepersian-doc.pdf
-2022/07/02 | 2434 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single.tex
-2022/07/02 | 24027 | macros/latex/contrib/biblatex/doc/examples/94-labelprefix-biber.pdf
-2022/07/02 | 23970 | macros/latex/contrib/biblatex/latex/lbx/italian.lbx
-2022/07/02 | 2395 | macros/latex/contrib/biblatex/doc/examples/04-delimiters.tex
-2022/07/02 | 2388 | macros/latex/contrib/biblatex/latex/cbx/debug.cbx
-2022/07/02 | 234422 | support/latex2nemeth/doc/unicode-math-braille.tex
-2022/07/02 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-bibtex.pdf
-2022/07/02 | 225925 | macros/latex/contrib/biblatex/doc/examples/53-style-authoryear-icomp-biber.pdf
-2022/07/02 | 2257 | macros/latex/contrib/biblatex/latex/cbx/alphabetic-verb.cbx
-2022/07/02 | 222705 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp-bibtex.pdf
-2022/07/02 | 222705 | macros/latex/contrib/biblatex/doc/examples/63-style-authortitle-icomp-biber.pdf
-2022/07/02 | 2190 | macros/latex/contrib/biblatex/latex/blx-natbib.def
-2022/07/02 | 2188 | graphics/pgf/contrib/circuitikz/tex/ctikzstyle-romano.tex
-2022/07/02 | 21707 | macros/latex/contrib/biblatex/doc/examples/91-sorting-schemes-biber.pdf
-2022/07/02 | 213637 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid-bibtex.pdf
-2022/07/02 | 213637 | macros/latex/contrib/biblatex/doc/examples/51-style-authoryear-ibid-biber.pdf
-2022/07/02 | 2126 | macros/latex/contrib/biblatex/latex/blx-mcite.def
-2022/07/02 | 207854 | macros/latex/contrib/biblatex/doc/examples/02-annotations-biber.pdf
-2022/07/02 | 207609 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic-biber.pdf
-2022/07/02 | 207478 | macros/latex/contrib/biblatex/doc/examples/02-annotations-bibtex.pdf
-2022/07/02 | 206748 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-notes16.cbx
-2022/07/02 | 205707 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-dates-sample.pdf
-2022/07/02 | 20546 | macros/latex/contrib/biblatex/latex/lbx/nynorsk.lbx
-2022/07/02 | 203055 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid-bibtex.pdf
-2022/07/02 | 203055 | macros/latex/contrib/biblatex/doc/examples/61-style-authortitle-ibid-biber.pdf
-2022/07/02 | 1994 | macros/latex/contrib/biblatex/doc/examples/10-references-per-section.tex
-2022/07/02 | 199318 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic-bibtex.pdf
-2022/07/02 | 1988 | macros/latex/contrib/biblatex/doc/examples/40-style-alphabetic.tex
-2022/07/02 | 196392 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-bibtex.pdf
-2022/07/02 | 195323 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse-bibtex.pdf
-2022/07/02 | 195323 | macros/latex/contrib/biblatex/doc/examples/64-style-authortitle-terse-biber.pdf
-2022/07/02 | 1942 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1.tex
-2022/07/02 | 18786676 | macros/latex/contrib/biblatex.zip
-2022/07/02 | 1876 | macros/latex/contrib/biblatex/doc/examples/11-references-by-section.tex
-2022/07/02 | 186808 | macros/latex/contrib/biblatex/doc/examples/31-style-numeric-comp-biber.pdf
-2022/07/02 | 184700 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/dates-test.bib
-2022/07/02 | 183623 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword-biber.pdf
-2022/07/02 | 183127 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category-biber.pdf
-2022/07/02 | 1818 | macros/latex/contrib/biblatex/latex/bbx/numeric.bbx
-2022/07/02 | 181606 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb-bibtex.pdf
-2022/07/02 | 181606 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb-biber.pdf
-2022/07/02 | 1808 | macros/latex/contrib/biblatex/latex/cbx/draft.cbx
-2022/07/02 | 180128 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-trad-sample.pdf
-2022/07/02 | 180012 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-notes-sample.pdf
-2022/07/02 | 1781 | macros/latex/contrib/biblatex/doc/examples/97-annotations.tex
-2022/07/02 | 177358 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple-biber.pdf
-2022/07/02 | 177233 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric-bibtex.pdf
-2022/07/02 | 177233 | macros/latex/contrib/biblatex/doc/examples/30-style-numeric-biber.pdf
-2022/07/02 | 17645 | graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf
-2022/07/02 | 176169 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single-biber.pdf
-2022/07/02 | 175130 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword-bibtex.pdf
-2022/07/02 | 174634 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category-bibtex.pdf
-2022/07/02 | 1731 | macros/latex/contrib/biblatex/latex/bbx/alphabetic.bbx
-2022/07/02 | 171031 | macros/latex/contrib/biblatex/doc/examples/21-indexing-multiple-bibtex.pdf
-2022/07/02 | 169 | macros/latex/contrib/biblatex/latex/lbx/american.lbx
-2022/07/02 | 169812 | macros/latex/contrib/biblatex/doc/examples/20-indexing-single-bibtex.pdf
-2022/07/02 | 1682 | macros/latex/contrib/biblatex/doc/examples/14-references-by-category.tex
-2022/07/02 | 167962 | macros/latex/contrib/biblatex/doc/examples/01-introduction-bibtex.pdf
-2022/07/02 | 167962 | macros/latex/contrib/biblatex/doc/examples/01-introduction-biber.pdf
-2022/07/02 | 16722 | graphics/pgf/contrib/circuitikz/tex/pgfcircpath.tex
-2022/07/02 | 16647 | macros/latex/contrib/biblatex/doc/examples/97-annotations-biber.pdf
-2022/07/02 | 165715 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate.bbx
-2022/07/02 | 163 | macros/latex/contrib/biblatex/latex/lbx/canadian.lbx
-2022/07/02 | 1639913 | macros/latex/contrib/biblatex/doc/biblatex.pdf
-2022/07/02 | 16350 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cmsendnotes.sty
-2022/07/02 | 159 | macros/latex/contrib/biblatex/doc/examples/95-customlists.dbx
-2022/07/02 | 158306 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed-biber.pdf
-2022/07/02 | 157684 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1-biber.pdf
-2022/07/02 | 157655 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2-biber.pdf
-2022/07/02 | 157616 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed-bibtex.pdf
-2022/07/02 | 156540 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2-bibtex.pdf
-2022/07/02 | 156540 | macros/latex/contrib/biblatex/doc/examples/16-numeric-prefixed-1-bibtex.pdf
-2022/07/02 | 155631 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/notes-test.bib
-2022/07/02 | 1549 | macros/latex/contrib/biblatex/doc/examples/92-bibliographylists.tex
-2022/07/02 | 1546 | macros/latex/contrib/biblatex/doc/examples/32-style-numeric-verb.tex
-2022/07/02 | 1545633 | graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf
-2022/07/02 | 15442 | graphics/pgf/contrib/circuitikz/tex/pgfcirclabel.tex
-2022/07/02 | 153367 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-notes.bbx
-2022/07/02 | 153295 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-dates-common.cbx
-2022/07/02 | 149733 | macros/latex/contrib/biblatex/doc/examples/81-style-draft-bibtex.pdf
-2022/07/02 | 149733 | macros/latex/contrib/biblatex/doc/examples/81-style-draft-biber.pdf
-2022/07/02 | 149679 | macros/latex/contrib/biblatex/doc/examples/82-style-debug-biber.pdf
-2022/07/02 | 148860 | macros/latex/contrib/biblatex/doc/examples/82-style-debug-bibtex.pdf
-2022/07/02 | 147776 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp-bibtex.pdf
-2022/07/02 | 147776 | macros/latex/contrib/biblatex/doc/examples/66-style-authortitle-ticomp-biber.pdf
-2022/07/02 | 147304 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp-bibtex.pdf
-2022/07/02 | 147304 | macros/latex/contrib/biblatex/doc/examples/52-style-authoryear-comp-biber.pdf
-2022/07/02 | 14587 | graphics/pgf/contrib/circuitikz/tex/pgfcircutils.tex
-2022/07/02 | 143176 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp-bibtex.pdf
-2022/07/02 | 143176 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp-biber.pdf
-2022/07/02 | 141906 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate16.bbx
-2022/07/02 | 14153 | macros/latex/contrib/biblatex/doc/examples/74-style-verbose-trad1.tex
-2022/07/02 | 1409 | macros/latex/contrib/biblatex/doc/examples/19-alphabetic-prefixed.tex
-2022/07/02 | 13919 | macros/latex/contrib/biblatex/latex/blx-compat.def
-2022/07/02 | 1390 | macros/xetex/latex/xepersian/README
-2022/07/02 | 13737 | graphics/pgf/contrib/circuitikz/tex/circuitikz.sty
-2022/07/02 | 13622 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-notes-sample.tex
-2022/07/02 | 1346 | macros/latex/contrib/biblatex/doc/examples/65-style-authortitle-tcomp.tex
-2022/07/02 | 1340 | macros/latex/contrib/biblatex/doc/examples/12-references-by-segment.tex
-2022/07/02 | 1334 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp.tex
-2022/07/02 | 132 | macros/latex/contrib/biblatex/latex/lbx/portuges.lbx
-2022/07/02 | 132465 | macros/latex/contrib/biblatex/doc/examples/biblatex-examples.bltxml
-2022/07/02 | 132465 | macros/latex/contrib/biblatex/biber/bltxml/biblatex-examples.bltxml
-2022/07/02 | 1311 | macros/latex/contrib/biblatex/doc/examples/13-references-by-keyword.tex
-2022/07/02 | 129 | macros/latex/contrib/biblatex/latex/lbx/USenglish.lbx
-2022/07/02 | 1295671 | install/macros/xetex/latex/xepersian.tds.zip
-2022/07/02 | 128 | macros/latex/contrib/biblatex/latex/lbx/brazil.lbx
-2022/07/02 | 1287 | macros/latex/contrib/biblatex/doc/examples/17-numeric-prefixed-2.tex
-2022/07/02 | 1284 | macros/latex/contrib/biblatex/latex/cbx/authortitle-terse.cbx
-2022/07/02 | 12838 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-noteref-demo.tex
-2022/07/02 | 127 | macros/latex/contrib/biblatex/latex/lbx/UKenglish.lbx
-2022/07/02 | 127 | macros/latex/contrib/biblatex/latex/lbx/slovenian.lbx
-2022/07/02 | 12799 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate-trad.cbx
-2022/07/02 | 1268516 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/biblatex-chicago.pdf
-2022/07/02 | 126042 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp-bibtex.pdf
-2022/07/02 | 126042 | macros/latex/contrib/biblatex/doc/examples/62-style-authortitle-comp-biber.pdf
-2022/07/02 | 125 | macros/latex/contrib/biblatex/latex/lbx/hungarian.lbx
-2022/07/02 | 12416 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cmsdocs.sty
-2022/07/02 | 12400 | macros/latex/contrib/biblatex/doc/examples/93-nameparts.tex
-2022/07/02 | 12296 | macros/latex/contrib/biblatex/doc/examples/95-customlists-biber.pdf
-2022/07/02 | 119927 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/RELEASE
-2022/07/02 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-bibtex.pdf
-2022/07/02 | 119269 | macros/latex/contrib/biblatex/doc/examples/15-references-by-type-biber.pdf
-2022/07/02 | 1167224 | systems/texlive/tlnet/archive/phonenumbers.doc.r63774.tar.xz
-2022/07/02 | 1160 | macros/latex/contrib/biblatex/latex/bbx/draft.bbx
-2022/07/02 | 1130406 | macros/xetex/latex/xepersian.zip
-2022/07/02 | 112916 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid-bibtex.pdf
-2022/07/02 | 112916 | macros/latex/contrib/biblatex/doc/examples/18-numeric-hybrid-biber.pdf
-2022/07/02 | 112203 | graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex
-2022/07/02 | 11208 | systems/texlive/tlnet/archive/msu-thesis.r63777.tar.xz
-2022/07/02 | 111947 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb-bibtex.pdf
-2022/07/02 | 111947 | macros/latex/contrib/biblatex/doc/examples/41-style-alphabetic-verb-biber.pdf
-2022/07/02 | 11049 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate.cbx
-2022/07/02 | 110272 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-notes16.bbx
-2022/07/02 | 1101499 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/biblatex-chicago.tex
-2022/07/02 | 109852 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-dates-common16.cbx
-2022/07/02 | 109286 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/doc/cms-noteref-demo.pdf
-2022/07/02 | 1081680 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.4.6-body.tex
-2022/07/02 | 107976 | graphics/pgf/contrib/circuitikz/tex/pgfcircquadpoles.tex
-2022/07/02 | 10791 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/biblatex-chicago.sty
-2022/07/02 | 1073051 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.4.6.tex
-2022/07/02 | 105 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate-trad16.bbx
-2022/07/02 | 1059899 | macros/latex/contrib/biblatex/doc/biblatex.tex
-2022/07/02 | 10374 | macros/latex/contrib/biblatex/latex/cbx/numeric-comp.cbx
-2022/07/02 | 102 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ticomp.bbx
-2022/07/02 | 102 | macros/latex/contrib/biblatex/doc/examples/93-nameparts.dbx
-2022/07/02 | 102 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/cms.dbx
-2022/07/02 | 1021798 | graphics/pgf/contrib/circuitikz/tex/circuitikz-1.2.7-body.tex
-2022/07/02 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-terse.bbx
-2022/07/02 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-tcomp.bbx
-2022/07/02 | 101 | macros/latex/contrib/biblatex/latex/bbx/authortitle-icomp.bbx
-2022/07/02 | 101 | macros/latex/contrib/biblatex-contrib/biblatex-chicago/latex/chicago-authordate-trad.bbx
-2022/07/02 | 1014383 | graphics/pgf/contrib/circuitikz/tex/t-circuitikz-1.2.7.tex
-2022/07/02 | 101002 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template-bibtex.pdf
-2022/07/02 | 101002 | macros/latex/contrib/biblatex/doc/examples/42-style-alphabetic-template-biber.pdf
-2022/07/02 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-ibid.bbx
-2022/07/02 | 100 | macros/latex/contrib/biblatex/latex/bbx/authortitle-comp.bbx
diff --git a/macros/latex/contrib/derivative/README.md b/macros/latex/contrib/derivative/README.md
index 9b8aec07fe..d9dc312780 100644
--- a/macros/latex/contrib/derivative/README.md
+++ b/macros/latex/contrib/derivative/README.md
@@ -1,4 +1,4 @@
-## README for derivative package v1.1 dated 2021-06-03
+## README for derivative package v1.2 dated 2022-07-09
The package provides a set of commands `\NewDerivative`, `\NewDifferential` etc. that can be used to define a derivative or a differential operator, respectively. The package have already defined several derivatives and differentials:
@@ -16,7 +16,7 @@ The package provides a set of commands `\NewDerivative`, `\NewDifferential` etc.
### Copyright and license
-Copyright 2019-2021 Simon Jensen
+Copyright 2019-2022 Simon Jensen
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/derivative/derivative.pdf b/macros/latex/contrib/derivative/derivative.pdf
index 606ae17783..9e4203f7b6 100644
--- a/macros/latex/contrib/derivative/derivative.pdf
+++ b/macros/latex/contrib/derivative/derivative.pdf
Binary files differ
diff --git a/macros/latex/contrib/derivative/derivative.sty b/macros/latex/contrib/derivative/derivative.sty
index a26080b431..4e9a8308c2 100644
--- a/macros/latex/contrib/derivative/derivative.sty
+++ b/macros/latex/contrib/derivative/derivative.sty
@@ -1,5 +1,5 @@
% derivative.sty
-% Copyright 2019-2021 Simon Jensen
+% Copyright 2019-2022 Simon Jensen
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -15,9 +15,9 @@
\NeedsTeXFormat{LaTeX2e}
-\RequirePackage{expl3,xparse}[2018/05/09]
+\RequirePackage{expl3,xparse}[2021/11/07]
\RequirePackage{l3keys2e}
-\ProvidesExplPackage{derivative}{2021/06/03}{1.1}{Nice and easy derivatives and differentials for LaTeX}
+\ProvidesExplPackage{derivative}{2022/07/09}{1.2}{Nice and easy derivatives and differentials for LaTeX}
\bool_new:N \l__deriv_pkg_italic_bool
\bool_new:N \l__deriv_pkg_upright_bool
@@ -25,34 +25,34 @@
\keys_define:nn { deriv/pkg }
{
italic .choice:,
+ italic .usage:n = { load },
italic .default:n = { true },
italic / true .code:n =
- {
- \bool_set_true:N \l__deriv_pkg_italic_bool
- \bool_set_false:N \l__deriv_pkg_upright_bool
- },
+ {
+ \bool_set_true:N \l__deriv_pkg_italic_bool
+ \bool_set_false:N \l__deriv_pkg_upright_bool
+ },
italic / false .code:n =
- {
- \bool_set_false:N \l__deriv_pkg_italic_bool
- \bool_set_true:N \l__deriv_pkg_upright_bool
- },
- italic / unknown .code:n =
- { \msg_error:nnx { deriv } { boolean-values-only } \l_keys_key_str },
-
+ {
+ \bool_set_false:N \l__deriv_pkg_italic_bool
+ \bool_set_true:N \l__deriv_pkg_upright_bool
+ },
+ italic / unknown .code:n = { \msg_error:nnx { deriv } { boolean-values-only } \l_keys_key_str },
+
upright .choice:,
+ upright .usage:n = { load },
upright .default:n = { true },
upright / true .code:n =
- {
- \bool_set_true:N \l__deriv_pkg_upright_bool
- \bool_set_false:N \l__deriv_pkg_italic_bool
- },
+ {
+ \bool_set_true:N \l__deriv_pkg_upright_bool
+ \bool_set_false:N \l__deriv_pkg_italic_bool
+ },
upright / false .code:n =
- {
- \bool_set_false:N \l__deriv_pkg_upright_bool
- \bool_set_true:N \l__deriv_pkg_italic_bool
- },
- upright / unknown .code:n =
- { \msg_error:nnx { deriv } { boolean-values-only } \l_keys_key_str },
+ {
+ \bool_set_false:N \l__deriv_pkg_upright_bool
+ \bool_set_true:N \l__deriv_pkg_italic_bool
+ },
+ upright / unknown .code:n = { \msg_error:nnx { deriv } { boolean-values-only } \l_keys_key_str },
upright .initial:n = true,
}
@@ -60,33 +60,15 @@
%%%%% Useful conditionals %%%%%
-\prg_new_conditional:Npnn \__deriv_if_pkg:n #1 { p, TF }
-{
- \@ifpackageloaded{unicode-math}
- { \prg_return_true: }
- { \prg_return_false: }
-}
-
-\prg_new_conditional:Npnn \__deriv_if_novalue:n #1 { T , F , TF }
+\prg_new_conditional:Npnn \__deriv_if_value:n #1 { T, TF }
{
\tl_if_novalue:nTF {#1}
- { \prg_return_true: }
+ { \prg_return_false: }
{
\tl_if_blank:nTF {#1}
- { \prg_return_true: }
- { \prg_return_false: }
- }
-}
-
-\prg_new_conditional:Npnn \__deriv_if_novalue_and:nn #1 #2 { F, TF }
-{
- \__deriv_if_novalue:nTF {#1}
- {
- \__deriv_if_novalue:nTF {#2}
- { \prg_return_true: }
- { \prg_return_false: }
+ { \prg_return_false: }
+ { \prg_return_true: }
}
- { \prg_return_false: }
}
\prg_new_conditional:Npnn \__deriv_show_order:N #1 { T, TF }
@@ -96,67 +78,35 @@
{ \prg_return_true: }
}
-\cs_new:Npn \__deriv_case:n #1
-{ \exp:w \__deriv_case_begin:nTF {#1} { } { } }
-
-\cs_new:Npn \__deriv_case:nT #1#2
-{ \exp:w \__deriv_case_begin:nTF {#1} {#2} { } }
-
-\cs_new:Npn \__deriv_case:nF #1#2
-{ \exp:w \__deriv_case_begin:nTF {#1} { } {#2} }
-
-\cs_new:Npn \__deriv_case:nTF #1
-{ \exp:w \__deriv_case_begin:nTF {#1} }
-
-\cs_new:Npn \__deriv_case_begin:nTF #1#2#3
-{ \__deriv_case:w #1 \c_true_bool { } \q_mark {#2} \q_mark {#3} \q_stop }
-
-\cs_new:Npn \__deriv_case:w #1#2
-{
- \bool_if:nTF {#1}
- { \__deriv_case_end:nw {#2} }
- { \__deriv_case:w }
-}
-
-\cs_new:Npn \__deriv_case_end:nw #1#2#3 \q_mark #4#5 \q_stop
-{ \exp_end: #1 #4 }
-
%%%%% Variables: derivatives %%%%%
-\tl_new:N \l__deriv_cs_name_tl
-\tl_new:N \l__deriv_derivset_tl
+\tl_new:N \l__deriv_dv_denom_tl
-\seq_new:N \l__deriv_new_var_seq
-\seq_new:N \l__deriv_rubber_seq
+\seq_new:N \l__deriv_dv_var_seq
+\seq_new:N \l__deriv_dv_order_seq
-\prop_new:N \l__deriv_tmp_keys_prop
-\seq_new:N \l__deriv_tmp_keys_seq
-\tl_new:N \l__deriv_tmp_keys_tl
+\seq_new:N \l__deriv_dv_variant_seq
%%%%% Variables: differential %%%%%
\seq_new:N \l__deriv_i_var_seq
-\seq_new:N \l__deriv_i_orders_seq
-\tl_new:N \l__deriv_i_tmpa_tl
+\seq_new:N \l__deriv_i_order_seq
\tl_new:N \l__deriv_i_denom_tl
\seq_new:N \l__deriv_i_variant_seq
%%%%% Variables: other %%%%%
-
-\seq_new:N \l__deriv_dv_variant_seq
-\seq_new:N \l__deriv_add_var_bool_seq
+\tl_new:N \l__deriv_cs_name_tl
+\tl_new:N \l__deriv_derivset_tl
\tl_new:N \l__deriv_tmpa_tl
\tl_new:N \l__deriv_tmpb_tl
\tl_new:N \l__deriv_tmpc_tl
\seq_new:N \l__deriv_tmpa_seq
-\tl_new:N \l__deriv_dv_denom_tl
-
-\seq_new:N \l__deriv_dv_var_seq
-\seq_new:N \l__deriv_dv_order_seq
-\seq_new:N \l__deriv_dv_mo_seq
+\seq_new:N \l__deriv_new_var_seq
+\seq_new:N \l__deriv_rubber_seq
+\seq_new:N \l__deriv_add_var_bool_seq
\int_new:N \l__deriv_vmo_int
@@ -168,27 +118,20 @@
\seq_new:N \l__deriv_input_seq
\seq_new:N \l__deriv_extract_seq
-\seq_new:N \l__deriv_unsorted_seq
+\seq_new:N \l__deriv_permutation_seq
\seq_new:N \l__deriv_sorted_seq
-
\seq_new:N \l__deriv_symbol_seq
\seq_new:N \l__deriv_number_seq
-\seq_new:N \l__deriv_rebuild_seq
+\int_new:N \l__deriv_var_count_int
\int_new:N \l__deriv_tmpa_int
\int_new:N \l__deriv_tmpb_int
\int_new:N \l__deriv_numerical_int
-\int_new:N \l__deriv_sort_counter_int
\int_new:N \l__deriv_sort_max_int
-\int_new:N \l__deriv_position_int
-\int_new:N \l__deriv_rebuild_int
-
-\bool_new:N \l__deriv_tmpa_bool
-
-\regex_const:Nn \c__deriv_pattern_regex { \A([\+\-]?\d*)(.*) }
\regex_const:Nn \c__deriv_cs_numbers_regex { \A\-?\d+(?:,\d+){0,2}\Z }
+\tl_const:Nn \c__deriv_digits_tl {-1234567890}
%%%%% default values %%%%%
@@ -223,12 +166,14 @@
sep-eval-sp = 0,
switch-* = false,
switch-/ = false,
+ switch-sort = true,
sort-method = {sign, symbol, abs},
sort-numerical = auto,
sort-abs-reverse = false,
sort-number-reverse = false,
sort-sign-reverse = false,
sort-symbol-reverse = false,
+ sort-lexical-reverse = false,
fun = false,
frac = false,
var = none,
@@ -286,16 +231,16 @@
\keys_define:nn { deriv/dv/#1 }
{
style-inf .tl_set:c = { l__deriv_dv_#1_style_inf_tl },
- style-var .tl_set:c = { l__deriv_dv_#1_style_var_tl },
+ style-var .code:n = { \__deriv_set_style_var:nn {#1} {##1} },
style-frac .cs_set:cp = { __deriv_dv_#1_style_frac:nn } {##1},
style-frac-/ .cs_set:cp = { __deriv_dv_#1_style_frac_slash:nn } {##1},
- scale-eval .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_eval_tl } {##1} },
- scale-eval-/ .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_eval_slash_tl } {##1} },
- scale-fun .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_fun_tl } {##1} },
- scale-var .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_var_tl } {##1} },
- scale-frac .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_frac_tl } {##1} },
- scale-frac-/ .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_dv_#1_scale_frac_slash_tl } {##1} },
+ scale-eval .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { eval } },
+ scale-eval-/ .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { eval_slash } },
+ scale-fun .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { fun } },
+ scale-var .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { var } },
+ scale-frac .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { frac } },
+ scale-frac-/ .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {dv_#1} {##1} { frac_slash } },
delims-eval .tl_set:c = { l__deriv_dv_#1_delims_eval_tl },
delims-eval-/ .tl_set:c = { l__deriv_dv_#1_delims_eval_slash_tl },
@@ -318,6 +263,7 @@
switch-* .bool_set:c = { l__deriv_dv_#1_switch_star_bool },
switch-/ .bool_set:c = { l__deriv_dv_#1_switch_slash_bool },
+ switch-sort .bool_set:c = { l__deriv_dv_#1_switch_sort_bool },
fun .bool_set:c = { l__deriv_dv_#1_misc_fun_bool },
frac .bool_set:c = { l__deriv_dv_#1_misc_frac_bool },
@@ -329,27 +275,94 @@
mixed-order .tl_set:c = { l__deriv_dv_#1_misc_mixed_order_tl },
mixord .tl_set:c = { l__deriv_dv_#1_misc_mixed_order_tl },
- sort-method .clist_set:c = { l__deriv_dv_#1_sort_method_clist },
+ sort-method .code:n = { \__deriv_set_sort_method:nn {#1} {##1} },
sort-numerical .choices:nn = { auto, first, last, symbolic } { \tl_set:cn { l__deriv_dv_#1_sort_numerical_tl } {##1} },
- sort-abs-reverse .bool_set:c = { l__deriv_dv_#1_sort_abs_reverse_bool },
- sort-number-reverse .bool_set:c = { l__deriv_dv_#1_sort_number_reverse_bool },
- sort-sign-reverse .bool_set:c = { l__deriv_dv_#1_sort_sign_reverse_bool },
- sort-symbol-reverse .bool_set:c = { l__deriv_dv_#1_sort_symbol_reverse_bool }
+ sort-abs-reverse .bool_set:c = { l__deriv_dv_#1_sort_abs_reverse_bool },
+ sort-number-reverse .bool_set:c = { l__deriv_dv_#1_sort_number_reverse_bool },
+ sort-sign-reverse .bool_set:c = { l__deriv_dv_#1_sort_sign_reverse_bool },
+ sort-symbol-reverse .bool_set:c = { l__deriv_dv_#1_sort_symbol_reverse_bool },
+ sort-lexical-reverse .bool_set:c = { l__deriv_dv_#1_sort_lexical_reverse_bool },
+ }
+}
+% variant, value
+\cs_new:Npn \__deriv_set_sort_method:nn #1 #2
+{
+ \seq_clear:c { l__deriv_dv_#1_sort_method_seq }
+ \seq_set_from_clist:Nn \l__deriv_tmpa_seq {#2}
+ \seq_map_indexed_inline:Nn \l__deriv_tmpa_seq
+ {
+ \str_case:nn {##2}
+ {
+ { sign } { \seq_put_right:cn { l__deriv_dv_#1_sort_method_seq } { \__deriv_sort_sign:n } }
+ { symbol } { \seq_put_right:cn { l__deriv_dv_#1_sort_method_seq } { \__deriv_sort_symbol:n } }
+ { abs } { \seq_put_right:cn { l__deriv_dv_#1_sort_method_seq } { \__deriv_sort_abs:n } }
+ { number } { \seq_put_right:cn { l__deriv_dv_#1_sort_method_seq } { \__deriv_sort_number:n } }
+ { lexical } { \seq_put_right:cn { l__deriv_dv_#1_sort_method_seq } { \__deriv_sort_lexical:n } }
+ }
+ \int_compare:nNnT {##1} = { 3 } { \seq_map_break: }
+ }
+}
+% variant, value
+\cs_new:Npn \__deriv_set_style_var:nn #1 #2
+{
+ \str_case:nn {#2}
+ {
+ { single } { \tl_set:cn { l__deriv_dv_#1_style_var_tl } { \__deriv_dv_build_single:NNNn } }
+ { multiple } { \tl_set:cn { l__deriv_dv_#1_style_var_tl } { \__deriv_dv_build_multiple:NNNn } }
+ }
+}
+% varaint, value, name
+\cs_new:Npn \__deriv_set_style_notation:nnn #1 #2 #3
+{
+ \str_case:nn {#2}
+ {
+ { single } { \tl_set:cn { l__deriv_i_#1_style_notation#3_tl } { \__deriv_i_build_single:NNNnn } }
+ { multiple } { \tl_set:cn { l__deriv_i_#1_style_notation#3_tl } { \__deriv_i_build_multiple:NNNnn } }
+ { mixed } { \tl_set:cn { l__deriv_i_#1_style_notation#3_tl } { \__deriv_i_build_mixed:NNNnn } }
+ }
+}
+% dv_variant, scale, name
+\cs_new:Npn \__deriv_set_scale:nnn #1 #2 #3
+{
+ \str_case:nnF {#2}
+ {
+ { auto } { \tl_set:cn { l__deriv_#1_scale_#3_tl } { \__deriv_scale_auto:nnn } }
+ { none } { \tl_set:cn { l__deriv_#1_scale_#3_tl } { \__deriv_scale_none:nnn } }
+ }
+ { \tl_set:cn { l__deriv_#1_scale_#3_tl } { \__deriv_scale_big:nnnn {#2} } }
+}
+% muskip, tl
+\cs_new:Npn \__deriv_set_rubber_length:Nn #1 #2
+{
+ \regex_match:NnTF \c__deriv_cs_numbers_regex {#2}
+ {
+ \str_case:nnF {#2}
+ {
+ { 0 } { \tl_clear:N #1 }
+ { 0,0 } { \tl_clear:N #1 }
+ { 0,0,0 } { \tl_clear:N #1 }
+ }
+ {
+ \seq_set_split:Nnn \l__deriv_rubber_seq { , } {#2}
+ \tl_set:Nf #1 { \seq_use:Nnnn \l__deriv_rubber_seq { mu plus } { mu plus } { mu minus } mu }
+ \tl_put_left:Nn #1 { \mskip }
+ }
}
+ { \tl_set:Nn #1 {#2} }
}
%%%%%% Key-val: derivatives %%%%%%
-
+% variant
\cs_new:Npn \__deriv_i_define_keys:n #1
{
\keys_define:nn { deriv/i/#1 }
{
style-inf .tl_set:c = { l__deriv_i_#1_style_inf_tl },
- style-notation .tl_set:c = { l__deriv_i_#1_style_notation_tl },
- style-notation-* .tl_set:c = { l__deriv_i_#1_style_notation_star_tl },
+ style-notation .code:n = { \__deriv_set_style_notation:nnn {#1} {##1} {} },
+ style-notation-* .code:n = { \__deriv_set_style_notation:nnn {#1} {##1} { _star } },
- scale-var .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_i_#1_scale_var_tl } {##1} },
- scale-var-* .choices:nn = { auto, none, big, Big, bigg, Bigg } { \tl_set:cn { l__deriv_i_#1_scale_var_star_tl } {##1} },
+ scale-var .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {i_#1} {##1} { var } },
+ scale-var-* .choices:nn = { auto, none, big, Big, bigg, Bigg } { \__deriv_set_scale:nnn {i_#1} {##1} { var_slash } },
delims-var .tl_set:c = { l__deriv_i_#1_delims_var_tl },
delims-var-* .tl_set:c = { l__deriv_i_#1_delims_var_star_tl },
@@ -430,9 +443,6 @@
{ \__deriv_preamble_aux:Vnn #1 { style-inf={#3} } {#5} }
{ \__deriv_preamble_aux:Vnn #1 { style-inf={#3}, #4} {#5} }
}
-% variant, inf, dv/i
-\cs_new_protected:Npn \deriv_set_style_inf:nnn #1 #2 #3
-{ \__deriv_set_default:nnn {#1} { style-inf = {#2} } {#3} }
% variant, key-value, dv/i
\cs_new_protected:Npn \__deriv_preamble_aux:nnn #1 #2 #3
{
@@ -459,10 +469,10 @@
\__deriv_new:nnnn { tl } {dv_#1} { scale } { eval, eval_slash, fun, var, frac, frac_slash }
\__deriv_new:nnnn { tl } {dv_#1} { delims } { eval, eval_slash, fun, var, frac, frac_slash }
\__deriv_new:nnnn { tl } {dv_#1} { sep } { inf_ord, inf_fun, ord_fun, frac_fun, inf_var, var_ord, var_inf, ord_inf, eval_sb, eval_sp }
- \__deriv_new:nnnn { bool } {dv_#1} { switch } { star, slash }
- \__deriv_new:nnnn { clist } {dv_#1} { sort } { method }
+ \__deriv_new:nnnn { bool } {dv_#1} { switch } { star, slash, sort }
+ \__deriv_new:nnnn { seq } {dv_#1} { sort } { method }
\__deriv_new:nnnn { tl } {dv_#1} { sort } { numerical }
- \__deriv_new:nnnn { bool } {dv_#1} { sort } { abs_reverse, sign_reverse, symbol_reverse, number_reverse }
+ \__deriv_new:nnnn { bool } {dv_#1} { sort } { abs_reverse, sign_reverse, symbol_reverse, number_reverse, lexical_reverse }
\__deriv_new:nnnn { bool } {dv_#1} { misc } { fun, frac }
\__deriv_new:nnnn { clist } {dv_#1} { misc } { var }
@@ -489,30 +499,17 @@
{
\tl_if_novalue:nTF {#2}
{ \prop_set_eq:cc { l__deriv_#3_#1_user_keys_prop } { c__deriv_#3_pkg_keys_prop } }
- { \__deriv_update_prop:cn { l__deriv_#3_#1_user_keys_prop } {#2} }
+ { \prop_put_from_keyval:cn { l__deriv_#3_#1_user_keys_prop } {#2} }
- \__deriv_set_default_from_prop:Nc \l__deriv_tmp_keys_tl { l__deriv_#3_#1_user_keys_prop }
- \__deriv_set_default_aux:Vnn \l__deriv_tmp_keys_tl {#1} {#3}
-}
-% user-prop, key-val
-\cs_new_protected:Npn \__deriv_update_prop:Nn #1 #2
-{
- \prop_set_from_keyval:Nn \l__deriv_tmp_keys_prop {#2}
- \prop_map_inline:Nn \l__deriv_tmp_keys_prop { \prop_put:Nnn #1 {##1} {##2} }
-}
-% user-prop
-\cs_new_protected:Npn \__deriv_set_default_from_prop:NN #1 #2
-{
- \seq_clear:N \l__deriv_tmp_keys_seq
- \prop_map_inline:Nn #2 { \seq_put_right:Nn \l__deriv_tmp_keys_seq { ##1 = {##2} } }
- \tl_set:Nx #1 { \seq_use:Nn \l__deriv_tmp_keys_seq { , } }
+ \__deriv_set_default_auxi:cnn { l__deriv_#3_#1_user_keys_prop } {#1} {#3}
+ \keys_set:nn { deriv/#3/#1 } { default }
}
+% prop-key-val, variant, dv/i
+\cs_new_protected:Npn \__deriv_set_default_auxi:Nnn #1 #2 #3
+{ \__deriv_set_default_auxii:fnn { \prop_to_keyval:N #1 } {#2} {#3} }
% key-val, variant, dv/i
-\cs_new_protected:Npn \__deriv_set_default_aux:nnn #1 #2 #3
-{
- \keys_define:nn { deriv/#3/#2 } { default .meta:n = {#1} }
- \keys_set:nn { deriv/#3/#2 } { default }
-}
+\cs_new_protected:Npn \__deriv_set_default_auxii:nnn #1 #2 #3
+{ \keys_define:nn { deriv/#3/#2 } { default .meta:n = {#1} } }
% new/delare/renew/provide, variant, macro
\cs_new_protected:Npn \deriv_dv_define:Nnn #1 #2 #3
{
@@ -608,7 +605,8 @@
{ \__deriv_dv_denominator:n {#1} }
}
}
-}% variant, function
+}
+% variant, function
\cs_new_protected:Npn \__deriv_dv_numerator_fun:nn #1 #2
{
\__deriv_insert_inf:n {#1}
@@ -636,28 +634,18 @@
\seq_set_from_clist:Nn \l__deriv_dv_var_seq {#3}
\seq_set_from_clist:Nc \l__deriv_dv_order_seq { l__deriv_#2_misc_order_clist }
- \__deriv_dv_choose_var:NNNn \l__deriv_dv_var_seq \l__deriv_dv_order_seq #1 {#2}
-}
-% var-seq, order-seq, denom-tl, variant
-\cs_new_protected:Npn \__deriv_dv_choose_var:NNNn #1 #2 #3 #4
-{
- \exp_args:Nv
- \str_case:nn { l__deriv_#4_style_var_tl }
- {
- { single } { \__deriv_dv_build_single:NNNn #1 #2 #3 {#4} }
- { multiple } { \__deriv_dv_build_multiple:NNNn #1 #2 #3 {#4} }
- }
+ \tl_use:c { l__deriv_#2_style_var_tl } \l__deriv_dv_var_seq \l__deriv_dv_order_seq #1 {#2}
}
% var_seq, order_seq, denom-tl, variant
\cs_new_protected:Npn \__deriv_dv_build_multiple:NNNn #1 #2 #3 #4
{
- \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #1 }
- \__deriv_adjust_ord_seq:NN #1 #2
+ \int_set:Nn \l__deriv_var_count_int { \seq_count:N #1 }
+ \__deriv_adjust_ord_seq:NN \l__deriv_var_count_int #2
\str_if_eq:cNT { l__deriv_#4_misc_mixed_order_tl } 1
{ \__deriv_mixed_order:cNn { l__deriv_#4_misc_mixed_order_tl } #2 {#4} }
- \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_tmpa_seq \l__deriv_tmpa_int
+ \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_tmpa_seq \l__deriv_var_count_int
\seq_map_indexed_inline:Nn #1
{
@@ -671,11 +659,11 @@
\__deriv_show_order:NTF \l__deriv_tmpa_tl
{
\__deriv_insert_ord:Nnn \l__deriv_tmpa_tl {#4} { var_ord }
- \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
+ \int_compare:nNnF {##1} = { \l__deriv_var_count_int }
{ \__deriv_insert_mskip:nn {#4} { ord_inf } }
}
{
- \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
+ \int_compare:nNnF {##1} = { \l__deriv_var_count_int }
{ \__deriv_insert_mskip:nn {#4} { var_inf } }
}
}
@@ -684,10 +672,10 @@
% var_seq, order_seq, denom-tl, variant
\cs_new_protected:Npn \__deriv_dv_build_single:NNNn #1 #2 #3 #4
{
- \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #1 }
- \tl_set:Nx \l__deriv_tmpa_tl { \seq_use:Nn #1 { \__deriv_insert_mskip:nn {#4} { var_var } } }
+ \int_set:Nn \l__deriv_var_count_int { \seq_count:N #1 }
+ \tl_set:Nf \l__deriv_tmpa_tl { \seq_use:Nn #1 { \__deriv_insert_mskip:nn {#4} { var_var } } }
- \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_tmpa_seq \l__deriv_tmpa_int
+ \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_tmpa_seq \l__deriv_var_count_int
\seq_pop_left:NN #2 \l__deriv_tmpb_tl
\seq_pop_left:NN \l__deriv_tmpa_seq \l__deriv_tmpc_tl
@@ -705,19 +693,12 @@
% var_seq, order_seq
\cs_new_protected:Npn \__deriv_adjust_ord_seq:NN #1 #2
{
- \int_set:Nn \l__deriv_vmo_int { \seq_count:N #1 - \seq_count:N #2 }
-
+ \int_set:Nn \l__deriv_vmo_int { #1 - \seq_count:N #2 }
\int_compare:nNnF { \l__deriv_vmo_int } = { 0 }
{
\int_compare:nNnTF { \l__deriv_vmo_int } < { 0 }
- {
- \int_step_inline:nn { -1 * \l__deriv_vmo_int }
- { \seq_pop_right:NN #2 \l__deriv_tmpa_tl }
- }
- {
- \int_step_inline:nn { \l__deriv_vmo_int }
- { \seq_put_right:Nn #2 { 1 } }
- }
+ { \int_step_inline:nn { -1*\l__deriv_vmo_int } { \seq_pop_right:NN #2 \l__deriv_tmpa_tl } }
+ { \int_step_inline:nn { \l__deriv_vmo_int } { \seq_put_right:Nn #2 { 1 } } }
}
}
% avd-clist, bool-seq, count
@@ -725,16 +706,10 @@
{
\seq_clear:N #2
\clist_if_in:NnTF #1 { all }
- {
- \exp_args:NNx
- \seq_set_from_clist:Nn #2 { \prg_replicate:nn {#3} { \c_true_bool , } }
- }
+ { \exp_args:NNf \seq_set_from_clist:Nn #2 { \prg_replicate:nn {#3} { \c_true_bool , } } }
{
\clist_if_in:NnTF #1 { none }
- {
- \exp_args:NNx
- \seq_set_from_clist:Nn #2 { \prg_replicate:nn {#3} { \c_false_bool , } }
- }
+ { \exp_args:NNf \seq_set_from_clist:Nn #2 { \prg_replicate:nn {#3} { \c_false_bool , } } }
{
\int_step_inline:nn {#3}
{
@@ -749,7 +724,6 @@
\cs_new_protected:Npn \__deriv_adjust_trailing_ord:NN #1 #2
{
\seq_clear:N \l__deriv_tmpa_seq
- \bool_set_false:N \l__deriv_tmpa_bool
\int_set:Nn \l__deriv_vmo_int { \seq_count:N #2 - \seq_count:N #1 }
\int_compare:nNnT { \l__deriv_vmo_int } < { 0 }
@@ -758,21 +732,15 @@
{ \seq_pop_right:NN #1 \l__deriv_tmpa_tl }
}
- \seq_reverse:N #1
- \seq_map_inline:Nn #1
+ \int_step_inline:nn { \seq_count:N #1 }
{
- \bool_if:NTF \l__deriv_tmpa_bool
- { \seq_put_right:Nn \l__deriv_tmpa_seq {##1} }
+ \seq_pop_right:NN #1 \l__deriv_tmpa_tl
+ \str_if_eq:VnF \l__deriv_tmpa_tl { 1 }
{
- \str_if_eq:nnF {##1} { 1 }
- {
- \seq_put_right:Nn \l__deriv_tmpa_seq {##1}
- \bool_set_true:N \l__deriv_tmpa_bool
- }
+ \seq_put_right:NV #1 \l__deriv_tmpa_tl
+ \prg_break:
}
}
- \seq_set_eq:NN #1 \l__deriv_tmpa_seq
- \seq_reverse:N #1
}
%%%%% infinisimal definition %%%%%
@@ -803,27 +771,16 @@
\seq_set_from_clist:Nn \l__deriv_i_var_seq {#3}
\seq_set_from_clist:Nc \l__deriv_i_order_seq { l__deriv_#2_misc_order_clist }
- \__deriv_i_choose_build:NNNnn \l__deriv_i_var_seq \l__deriv_i_order_seq #1 {#2} {#4}
-}
-% var-seq, order-seq, print-tl, variant, if star
-\cs_new_protected:Npn \__deriv_i_choose_build:NNNnn #1 #2 #3 #4 #5
-{
- \exp_args:Nv
- \str_case:nn { l__deriv_#4_style_notation#5_tl }
- {
- { single } { \__deriv_i_build_single:NNNnn #1 #2 #3 {#4} {#5} }
- { multiple } { \__deriv_i_build_multiple:NNNnn #1 #2 #3 {#4} {#5} }
- { mixed } { \__deriv_i_build_mixed:NNNnn #1 #2 #3 {#4} {#5} }
- }
+ \tl_use:c { l__deriv_#2_style_notation#4_tl } \l__deriv_i_var_seq \l__deriv_i_order_seq #1 {#2} {#4}
}
% var-seq, order-seq, print-tl, variant, if star
\cs_new_protected:Npn \__deriv_i_build_single:NNNnn #1 #2 #3 #4 #5
{
- \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #1 }
- \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_tmpa_int
+ \int_set:Nn \l__deriv_var_count_int { \seq_count:N #1 }
+ \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_var_count_int
\__deriv_adjust_trailing_ord:NN #2 #1
- \int_set:Nn \l__deriv_tmpb_int { \seq_count:N #2 }
+ \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #2 }
\seq_map_indexed_inline:Nn #1
{
@@ -831,7 +788,7 @@
\tl_put_right:Nx \l__deriv_tmpb_tl
{
\__deriv_insert_var:Nnnn \l__deriv_tmpa_tl {##2} {#4} {#5}
- \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
+ \int_compare:nNnF {##1} = { \l__deriv_var_count_int }
{ \__deriv_insert_mskip:nn {#4} { var_var } }
}
}
@@ -840,7 +797,7 @@
\tl_put_right:Nx \l__deriv_tmpc_tl
{
\exp_not:n {##2}
- \int_compare:nNnF {##1} = { \l__deriv_tmpb_int }
+ \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
{ \__deriv_insert_mskip:nn {#4} { ord_ord } }
}
}
@@ -865,9 +822,9 @@
% var-seq, order-seq, print-tl, variant
\cs_new_protected:Npn \__deriv_i_build_multiple:NNNnn #1 #2 #3 #4 #5
{
- \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #1 }
- \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_tmpa_int
- \__deriv_adjust_ord_seq:NN #1 #2
+ \int_set:Nn \l__deriv_var_count_int { \seq_count:N #1 }
+ \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_var_count_int
+ \__deriv_adjust_ord_seq:NN \l__deriv_var_count_int #2
\seq_map_indexed_inline:Nn #1
{
@@ -884,7 +841,7 @@
{ \__deriv_insert_mskip:nn {#4} { inf_var } }
\__deriv_insert_var:Nnnn \l__deriv_tmpb_tl {##2} {#4} {#5}
- \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
+ \int_compare:nNnF {##1} = { \l__deriv_var_count_int }
{ \__deriv_insert_mskip:nn {#4} { var_inf } }
}
}
@@ -892,9 +849,9 @@
% var-seq, order-seq, print-tl, variant
\cs_new_protected:Npn \__deriv_i_build_mixed:NNNnn #1 #2 #3 #4 #5
{
- \int_set:Nn \l__deriv_tmpa_int { \seq_count:N #1 }
- \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_tmpa_int
- \__deriv_adjust_ord_seq:NN #1 #2
+ \int_set:Nn \l__deriv_var_count_int { \seq_count:N #1 }
+ \__deriv_var_bool_seq:cNN { l__deriv_#4_misc_var_clist } \l__deriv_add_var_bool_seq \l__deriv_var_count_int
+ \__deriv_adjust_ord_seq:NN \l__deriv_var_count_int #2
\seq_map_indexed_inline:Nn #1
{
@@ -910,7 +867,7 @@
\__deriv_insert_mskip:nn {#4} { inf_var }
\__deriv_insert_var:Nnnn \l__deriv_tmpb_tl {##2} {#4} {#5}
}
- \int_compare:nNnF {##1} = { \l__deriv_tmpa_int }
+ \int_compare:nNnF {##1} = { \l__deriv_var_count_int }
{ \__deriv_insert_mskip:nn {#4} { var_inf } }
}
}
@@ -955,31 +912,7 @@
}
% dv, name
\cs_new:Npn \__deriv_insert_mskip:nn #1 #2
-{
- %[#2]
- \tl_if_empty:cF { l__deriv_#1_sep_#2_tl }
- { \exp_not:v { l__deriv_#1_sep_#2_tl } }
- %\exp_not:v { l__deriv_#1_sep_#2_tl }
-}
-% muskip, length
-\cs_new:Npn \__deriv_set_rubber_length:Nn #1 #2
-{
- \regex_match:NnTF \c__deriv_cs_numbers_regex {#2}
- {
- \str_case_e:nnF {#2}
- {
- { 0 } { \tl_clear:N #1 }
- { 0,0 } { \tl_clear:N #1 }
- { 0,0,0 } { \tl_clear:N #1 }
- }
- {
- \seq_set_split:Nnn \l__deriv_rubber_seq { , } {#2}
- \tl_set:Nf #1 { \seq_use:Nnnn \l__deriv_rubber_seq { mu plus } { mu plus } { mu minus } mu }
- \tl_put_left:Nn #1 { \mskip }
- }
- }
- { \tl_set:Nn #1 {#2} }
-}
+{ \exp_not:v { l__deriv_#1_sep_#2_tl } }
%%%%% Scale, delimiters, evaluation %%%%%
% variable
@@ -1009,63 +942,82 @@
% dv, sub, sup, code-for-fraction
\cs_new:Npn \__deriv_evaluation:nnnn #1 #2 #3 #4
{
- \__deriv_if_novalue_and:nnTF {#2} {#3}
- {#4}
+ \__deriv_if_value:nTF {#2}
{
\__deriv_add_delims:nnn {#1} { eval } {#4}
- \__deriv_if_novalue:nF {#2} { \sb{ \__deriv_insert_mskip:nn {#1} { eval_sb } #2 } }
- \__deriv_if_novalue:nF {#3} { \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 } }
+ \sb{ \__deriv_insert_mskip:nn {#1} { eval_sb } #2 }
+ \__deriv_if_value:nT {#3}
+ { \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 } }
+ }
+ {
+ \__deriv_if_value:nTF {#3}
+ {
+ \__deriv_add_delims:nnn {#1} { eval } {#4}
+ \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 }
+ }
+ {#4}
}
}
% dv, sub, sup, code-for-fraction
\cs_new:Npn \__deriv_evaluation_slash:nnnn #1 #2 #3 #4
{
- \__deriv_if_novalue_and:nnTF {#2} {#3}
- {#4}
+ \__deriv_if_value:nTF {#2}
{
\__deriv_add_delims:nnn {#1} { eval_slash } {#4}
- \__deriv_if_novalue:nF {#2} { \sb{ \__deriv_insert_mskip:nn {#1} { eval_sb } #2 } }
- \__deriv_if_novalue:nF {#3} { \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 } }
+ \sb{ \__deriv_insert_mskip:nn {#1} { eval_sb } #2 }
+ \__deriv_if_value:nT {#3}
+ { \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 } }
+ }
+ {
+ \__deriv_if_value:nTF {#3}
+ {
+ \__deriv_add_delims:nnn {#1} { eval_slash } {#4}
+ \sp{ \__deriv_insert_mskip:nn {#1} { eval_sp } #3 }
+ }
+ {#4}
}
}
% dv, name, value
\cs_new:Npn \__deriv_add_delims:nnn #1 #2 #3
+{ \tl_use:c { l__deriv_#1_scale_#2_tl } {#1} {#2} {#3} }
+% dv, name, code
+\cs_new:Npn \__deriv_scale_auto:nnn #1 #2 #3
{
- \__deriv_scale:Nnnnn \__deriv_auto_left:n {#1} {#2} { 1 } { l }
+ \__deriv_auto_left:n \tl_item:cn { l__deriv_#1_delims_#2_tl } { 1 }
#3
- \__deriv_scale:Nnnnn \__deriv_auto_right:n {#1} {#2} { 2 } { r }
+ \__deriv_auto_right:n \tl_item:cn { l__deriv_#1_delims_#2_tl } { 2 }
}
-% dv, name
-\cs_new:Npn \__deriv_scale:Nnnnn #1 #2 #3 #4 #5
+% dv, name, code
+\cs_new:Npn \__deriv_scale_none:nnn #1 #2 #3
{
- \exp_args:Nv \str_case:nnF { l__deriv_#2_scale_#3_tl }
- {
- { auto } { \__deriv_scale_auto:Nnnn #1 {#2} {#3} {#4} }
- { none } { \__deriv_scale_none:nnn {#2} {#3} {#4} }
- }
- { \__deriv_scale_big:nnnn {#2} {#3} {#4} {#5} }
+ \__deriv_dont_use_dot:x { \tl_item:cn { l__deriv_#1_delims_#2_tl } { 1 } }
+ #3
+ \__deriv_dont_use_dot:x { \tl_item:cn { l__deriv_#1_delims_#2_tl } { 2 } }
}
-% left/right, variant, name, number
-\cs_new:Npn \__deriv_scale_auto:Nnnn #1 #2 #3 #4
-{ #1 \tl_item:cn { l__deriv_#2_delims_#3_tl } {#4} }
-% dv, name, number
-\cs_new:Npn \__deriv_scale_none:nnn #1 #2 #3
-{ \str_if_eq:cNF { l__deriv_#1_delims_#2_tl } . { \tl_item:cn { l__deriv_#1_delims_#2_tl } {#3} } }
-% dv, name, number, l/r
+% item
+\cs_new:Npn \__deriv_dont_use_dot:n #1
+{ \str_if_eq:nnF {#1} { . } {#1} }
+% dv, name, code
\cs_new:Npn \__deriv_scale_big:nnnn #1 #2 #3 #4
-{ \tl_use:c { \tl_use:c { l__deriv_#1_scale_#2_tl } #4 } { \tl_item:cn { l__deriv_#1_delims_#2_tl } {#3} } }
-
+{ \__deriv_scale_big_auxi:ncn {#1} { l__deriv_#2_delims_#3_tl } {#4} }
+% scaling, delims, code
+\cs_new:Npn \__deriv_scale_big_auxi:nNn #1 #2 #3
+{
+ \tl_use:c { #1 l } { \tl_item:Nn #2 { 1 } }
+ #3
+ \tl_use:c { #1 r } { \tl_item:Nn #2 { 2 } }
+}
%%%%% Calculation of mixed order %%%%%
-% mixed-order-tl, mixed-order-seq, variant
+% mixed-order-tl, order-seq, variant
\cs_new:Npn \__deriv_mixed_order:NNn #1 #2 #3
{
\__deriv_replace:NN \l__deriv_input_seq #2
- \__deriv_seq_counting:N \l__deriv_input_seq
- \__deriv_combine_seq:Nn \l__deriv_unsorted_seq {#3}
- \__deriv_sort:NNn \l__deriv_sorted_seq \l__deriv_unsorted_seq {#3}
+ \__deriv_seq_counting:NNN \l__deriv_symbol_seq \l__deriv_number_seq \l__deriv_input_seq
+ \__deriv_sort:NNNn \l__deriv_permutation_seq \l__deriv_symbol_seq \l__deriv_number_seq {#3}
+ \__deriv_combine_seq:NNNNn \l__deriv_sorted_seq \l__deriv_permutation_seq \l__deriv_symbol_seq \l__deriv_number_seq {#3}
\__deriv_output:NNNn #1 \l__deriv_sorted_seq \l__deriv_numerical_int {#3}
}
-% input-seq, mixed-order-seq
+% input-seq, order-seq
\cs_new_protected:Npn \__deriv_replace:NN #1 #2
{
\tl_set:Nf \l__deriv_input_tl { \seq_use:Nn #2 { , } }
@@ -1074,29 +1026,38 @@
\tl_replace_all:Nnn \l__deriv_input_tl { - } { ,- }
\tl_replace_all:Nnn \l__deriv_input_tl { + } { , }
- \exp_args:NNV \seq_set_from_clist:Nn #1 \l__deriv_input_tl
+ \seq_set_split:NnV #1 { , } \l__deriv_input_tl
+ \seq_remove_all:Nn #1 {}
}
-% input-seq
-\cs_new_protected:Npn \__deriv_seq_counting:N #1
+% symbol-seq, number-seq, input-seq
+\cs_new_protected:Npn \__deriv_seq_counting:NNN #1 #2 #3
{
- \seq_clear:N \l__deriv_symbol_seq
- \seq_clear:N \l__deriv_number_seq
+ \seq_clear:N #1
+ \seq_clear:N #2
- \seq_map_inline:Nn #1
+ \seq_map_inline:Nn #3
{
\__deriv_extract:NNn \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl {##1}
\seq_if_in:NVTF \l__deriv_symbol_seq \l__deriv_sym_tmpa_tl
- { \__deriv_update_seq:NN \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl }
- { \__deriv_add_to_seq:NN \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl }
+ { \__deriv_update_seq:NNNN #1 #2 \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl }
+ { \__deriv_add_to_seq:NNNN #1 #2 \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl }
}
}
% sym-tl, num-tl, seq-item
\cs_new_protected:Npn \__deriv_extract:NNn #1 #2 #3
{
- \regex_extract_once:NnN \c__deriv_pattern_regex {#3} \l__deriv_extract_seq
- \seq_pop_right:NN \l__deriv_extract_seq #1
- \seq_pop_right:NN \l__deriv_extract_seq #2
+ \int_zero:N \l__deriv_tmpa_int
+ \tl_map_inline:nn {#3}
+ {
+ \tl_if_in:NnTF \c__deriv_digits_tl {##1}
+ { \int_incr:N \l__deriv_tmpa_int }
+ { \tl_map_break: }
+ }
+
+ \tl_set:Nx #2 { \tl_range:nnn {#3} { 1 } \l__deriv_tmpa_int }
+ \int_incr:N \l__deriv_tmpa_int
+ \tl_set:Nx #1 { \tl_range:nnn {#3} \l__deriv_tmpa_int { -1 } }
\exp_args:NV \str_case:nn #2
{
@@ -1104,167 +1065,164 @@
{ - } { \tl_set:Nn #2 { -1 } }
}
}
-% unsorted-seq, variant
-\cs_new:Npn \__deriv_combine_seq:Nn #1 #2
+% sym-tl, num-tl
+\cs_new_protected:Npn \__deriv_add_to_seq:NNNN #1 #2 #3 #4
+{
+ \seq_put_right:NV #1 #3
+ \seq_put_right:NV #2 #4
+}
+% sym-tl, num-tl
+\cs_new_protected:Npn \__deriv_update_seq:NNNN #1 #2 #3 #4
+{
+ \seq_map_indexed_inline:Nn #1
+ {
+ \tl_if_eq:NnT #3 {##2}
+ {
+ \exp_args:NNnx
+ \seq_set_item:Nnn #2 {##1}
+ { \int_eval:n { \seq_item:Nn #2 {##1} + #4 } }
+ \seq_map_break:
+ }
+ }
+}
+% sorted-seq, permutation-seq, symbol-seq, number-seq, variant
+\cs_new:Npn \__deriv_combine_seq:NNNNn #1 #2 #3 #4 #5
{
\seq_clear:N #1
\int_zero:N \l__deriv_numerical_int
- \seq_map_inline:Nn \l__deriv_symbol_seq
+ \seq_map_inline:Nn #2
{
- \seq_pop_left:NN \l__deriv_number_seq \l__deriv_num_tmpa_tl
- \__deriv_eval_term:NVnn #1 \l__deriv_num_tmpa_tl {##1} {#2}
+ \tl_set:Nx \l__deriv_sym_tmpa_tl { \seq_item:Nn #3 {##1} }
+ \tl_set:Nx \l__deriv_num_tmpa_tl { \seq_item:Nn #4 {##1} }
+ \__deriv_eval_term:NVVn #1 \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl {#5}
}
}
-% unsorted-seq, num-tl, seq-item (sym), variant
+% sorted-seq, sym-tl, num-tl, variant
\cs_new_protected:Npn \__deriv_eval_term:Nnnn #1 #2 #3 #4
{
- \__deriv_case:nF
+ \tl_if_empty:nTF {#2}
+ { \__deriv_numerical_term:Nnn #1 {#3} {#4} }
{
- { \tl_if_empty_p:n {#3} } { \__deriv_numerical_term:Nnn #1 {#2} {#4} }
- { \int_compare_p:nNn {#2} = { 1 } } { \seq_put_left:Nn #1 {#3} }
- { \int_compare_p:nNn {#2} = { 0 } } { \prg_do_nothing: }
- { \int_compare_p:nNn {#2} = { -1 } } { \seq_put_left:Nn #1 { -#3 } }
+ \int_compare:nNnTF {#3} = { 1 }
+ { \seq_put_right:Nn #1 {#2} }
+ {
+ \int_compare:nNnTF {#3} = { 0 }
+ { \prg_do_nothing: }
+ {
+ \int_compare:nNnTF {#3} = { -1 }
+ { \seq_put_right:Nn #1 { -#2 } }
+ { \seq_put_right:Nn #1 {#3#2} }
+ }
+ }
}
- { \seq_put_left:Nn #1 {#2#3} }
}
-% unsorted-seq, num-tl, variant
+% sorted-seq, num-tl, variant
\cs_new_protected:Npn \__deriv_numerical_term:Nnn #1 #2 #3
{
\str_if_eq:vnTF { l__deriv_#3_sort_numerical_tl } { symbolic }
- { \seq_put_left:Nn #1 {#2} }
+ { \seq_put_right:Nn #1 {#2} }
{ \int_set:Nn \l__deriv_numerical_int {#2} }
}
-% sym-tl, num-tl
-\cs_new_protected:Npn \__deriv_add_to_seq:NN #1 #2
+% permutation-seq, symbol-seq, number-seq, variant
+\cs_new_protected:Npn \__deriv_sort:NNNn #1 #2 #3 #4
{
- \seq_put_left:NV \l__deriv_symbol_seq #1
- \seq_put_left:NV \l__deriv_number_seq #2
-}
-% sym-tl, num-tl
-\cs_new_protected:Npn \__deriv_update_seq:NN #1 #2
-{
- \__deriv_get_position:NN \l__deriv_position_int #1
- \__deriv_rebuild_seq:NNN \l__deriv_number_seq \l__deriv_position_int #2
-}
-% position-int, sym-tl
-\cs_new:Npn \__deriv_get_position:NN #1 #2
-{
- \int_zero:N #1
- \seq_map_inline:Nn \l__deriv_symbol_seq
- {
- \int_incr:N #1
- \exp_args:NV \tl_if_eq:nnT #2 {##1} { \seq_map_break: }
- }
-}
-% num-seq, position-int, num-tl
-\cs_new_protected:Npn \__deriv_rebuild_seq:NNN #1 #2 #3
-{
- \int_zero:N \l__deriv_rebuild_int
- \seq_clear:N \l__deriv_rebuild_seq
+ \seq_clear:N #1
+ \int_step_inline:nn { \seq_count:N #2 }
+ { \seq_put_right:Nn #1 {##1} }
- \seq_map_inline:Nn #1
+ \bool_if:cT { l__deriv_#4_switch_sort_bool }
{
- \int_incr:N \l__deriv_rebuild_int
- \int_compare:nNnTF \l__deriv_rebuild_int = #2
+ \int_set:Nn \l__deriv_sort_max_int { \seq_count:c { l__deriv_#4_sort_method_seq } }
+ \seq_sort:Nn #1
{
- \tl_set:Nf \l__deriv_num_tmpb_tl { \int_eval:n { ##1 + #3 } }
- \seq_put_right:NV \l__deriv_rebuild_seq \l__deriv_num_tmpb_tl
+ \tl_set:Nx \l__deriv_sym_tmpa_tl { \seq_item:Nn #2 {##1} }
+ \tl_set:Nx \l__deriv_sym_tmpb_tl { \seq_item:Nn #2 {##2} }
+ \tl_set:Nx \l__deriv_num_tmpa_tl { \seq_item:Nn #3 {##1} }
+ \tl_set:Nx \l__deriv_num_tmpb_tl { \seq_item:Nn #3 {##2} }
+
+ \__deriv_sort_method:cn { l__deriv_#4_sort_method_seq } {#4}
}
- { \seq_put_right:Nn \l__deriv_rebuild_seq {##1} }
- }
- \seq_set_eq:NN #1 \l__deriv_rebuild_seq
-}
-% sorted-seq, unsorted-seq, variant
-\cs_new_protected:Npn \__deriv_sort:NNn #1 #2 #3
-{
- \int_set:Nn \l__deriv_sort_max_int { \int_min:nn { 3 } { \clist_count:c { l__deriv_#3_sort_method_clist } } }
-
- \seq_sort:Nn #2
- {
- \__deriv_extract:NNn \l__deriv_sym_tmpa_tl \l__deriv_num_tmpa_tl {##1}
- \__deriv_extract:NNn \l__deriv_sym_tmpb_tl \l__deriv_num_tmpb_tl {##2}
- \int_zero:N \l__deriv_sort_counter_int
- \__deriv_sort_method:n {#3}
}
- \seq_set_eq:NN #1 #2
}
-% dv
-\cs_new_protected:Npn \__deriv_sort_method:n #1
+% method-seq, dv
+\cs_new_protected:Npn \__deriv_sort_method:Nn #1 #2
{
- \int_incr:N \l__deriv_sort_counter_int
-
- \exp_args:Nf
- \str_case:nn { \clist_item:cn { l__deriv_#1_sort_method_clist } { \l__deriv_sort_counter_int } }
+ \seq_map_indexed_inline:Nn #1
{
- { sign } { \__deriv_sort_sign:n {#1} }
- { symbol } { \__deriv_sort_symbol:n {#1} }
- { abs } { \__deriv_sort_abs:n {#1} }
- { number } { \__deriv_sort_number:n {#1} }
+ ##2 {#2}
+ \int_compare:nNnT {##1} = { \l__deriv_sort_max_int }
+ { \seq_map_break:n { \sort_return_same: } }
}
}
% dv
\cs_new_protected:Npn \__deriv_sort_sign:n #1
{
- \__deriv_case:nF
+ \tl_if_head_eq_charcode:VNTF \l__deriv_num_tmpb_tl -
{
- { \tl_if_head_eq_charcode_p:VN \l__deriv_num_tmpb_tl - && ! \tl_if_head_eq_charcode_p:VN \l__deriv_num_tmpa_tl - } { \__deriv_sort_reverse:nnn {#1} { sign } { same } }
- { \tl_if_head_eq_charcode_p:VN \l__deriv_num_tmpa_tl - && ! \tl_if_head_eq_charcode_p:VN \l__deriv_num_tmpb_tl - } { \__deriv_sort_reverse:nnn {#1} { sign } { swapped } }
+ \tl_if_head_eq_charcode:VNF \l__deriv_num_tmpa_tl -
+ { \__deriv_sort_reverse:Nnn \c_false_bool {#1} { sign } }
}
{
- \int_compare:nNnTF { \l__deriv_sort_counter_int } = { \l__deriv_sort_max_int }
- { \sort_return_same: }
- { \__deriv_sort_method:n {#1} }
+ \tl_if_head_eq_charcode:VNT \l__deriv_num_tmpa_tl -
+ { \__deriv_sort_reverse:Nnn \c_true_bool {#1} { sign } }
}
}
% dv
\cs_new_protected:Npn \__deriv_sort_symbol:n #1
{
- \__deriv_case:nF
+ \int_set:Nn \l__deriv_tmpa_int { \tl_count:N \l__deriv_sym_tmpa_tl }
+ \int_set:Nn \l__deriv_tmpb_int { \tl_count:N \l__deriv_sym_tmpb_tl }
+
+ \int_compare:nNnTF \l__deriv_tmpa_int > \l__deriv_tmpb_int
+ { \__deriv_sort_reverse:Nnn \c_false_bool {#1} { symbol } }
{
- { \int_compare_p:nNn { \tl_count:N \l__deriv_sym_tmpa_tl } > { \tl_count:N \l__deriv_sym_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { symbol } { same } }
- { \int_compare_p:nNn { \tl_count:N \l__deriv_sym_tmpa_tl } < { \tl_count:N \l__deriv_sym_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { symbol } { swapped } }
+ \int_compare:nNnT \l__deriv_tmpa_int < \l__deriv_tmpb_int
+ { \__deriv_sort_reverse:Nnn \c_true_bool {#1} { symbol } }
}
+}
+% dv
+\cs_new_protected:Npn \__deriv_sort_lexical:n #1
+{ \__deriv_sort_lexical_auxi:VVn \l__deriv_sym_tmpa_tl \l__deriv_sym_tmpb_tl {#1} }
+% dv
+\cs_new_protected:Npn \__deriv_sort_lexical_auxi:nnn #1 #2 #3
+{
+ \str_compare:nNnTF {#1} < {#2}
+ { \__deriv_sort_reverse:Nnn \c_false_bool {#3} { lexical } }
{
- \int_compare:nNnTF { \l__deriv_sort_counter_int } = { \l__deriv_sort_max_int }
- { \sort_return_same: }
- { \__deriv_sort_method:n {#1} }
+ \str_compare:nNnT {#1} > {#2}
+ { \__deriv_sort_reverse:Nnn \c_true_bool {#3} { lexical } }
}
}
% dv
\cs_new_protected:Npn \__deriv_sort_abs:n #1
{
- \__deriv_case:nF
- {
- { \int_compare_p:nNn { \int_abs:n \l__deriv_num_tmpa_tl } > { \int_abs:n \l__deriv_num_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { abs } { same } }
- { \int_compare_p:nNn { \int_abs:n \l__deriv_num_tmpa_tl } < { \int_abs:n \l__deriv_num_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { abs } { swapped } }
- }
+ \int_set:Nn \l__deriv_tmpa_int { \int_abs:n \l__deriv_num_tmpa_tl }
+ \int_set:Nn \l__deriv_tmpb_int { \int_abs:n \l__deriv_num_tmpb_tl }
+
+ \int_compare:nNnTF \l__deriv_tmpa_int > \l__deriv_tmpb_int
+ { \__deriv_sort_reverse:Nnn \c_false_bool {#1} { abs } }
{
- \int_compare:nNnTF { \l__deriv_sort_counter_int } = { \l__deriv_sort_max_int }
- { \sort_return_same: }
- { \__deriv_sort_method:n {#1} }
+ \int_compare:nNnT \l__deriv_tmpa_int < \l__deriv_tmpb_int
+ { \__deriv_sort_reverse:Nnn \c_true_bool {#1} { abs } }
}
}
% dv
\cs_new_protected:Npn \__deriv_sort_number:n #1
{
- \__deriv_case:nF
+ \int_compare:nNnTF \l__deriv_num_tmpa_tl > \l__deriv_num_tmpb_tl
+ { \__deriv_sort_reverse:Nnn \c_false_bool {#1} { number } }
{
- { \int_compare_p:nNn { \l__deriv_num_tmpa_tl } > { \l__deriv_num_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { number } { same } }
- { \int_compare_p:nNn { \l__deriv_num_tmpa_tl } < { \l__deriv_num_tmpb_tl } } { \__deriv_sort_reverse:nnn {#1} { number } { swapped } }
- }
- {
- \int_compare:nNnTF { \l__deriv_sort_counter_int } = { \l__deriv_sort_max_int }
- { \sort_return_same: }
- { \__deriv_sort_method:n {#1} }
+ \int_compare:nNnT \l__deriv_num_tmpa_tl < \l__deriv_num_tmpb_tl
+ { \__deriv_sort_reverse:Nnn \c_true_bool {#1} { number } }
}
}
-% dv, sort-method, same/swapped
-\cs_new_protected:Npn \__deriv_sort_reverse:nnn #1 #2 #3
+% true/false, dv, sort-method
+\cs_new_protected:Npn \__deriv_sort_reverse:Nnn #1 #2 #3
{
- \exp_args:Nc
- \bool_xor:nnTF { l__deriv_#1_sort_#2_reverse_bool } { \str_if_eq_p:nn {#3} { same } }
- { \sort_return_same: }
- { \sort_return_swapped: }
+ \exp_args:NNc
+ \bool_xor:nnTF #1 { l__deriv_#2_sort_#3_reverse_bool }
+ { \seq_map_break:n { \sort_return_swapped: } }
+ { \seq_map_break:n { \sort_return_same: } }
}
% mixed-order-tl, sorted-seq, numerical-term, variant
\cs_new_protected:Npn \__deriv_output:NNNn #1 #2 #3 #4
@@ -1282,7 +1240,7 @@
{ first } { \tl_put_left:Nx #1 { \int_use:N #3 + } }
}
{
- \bool_if:nTF { \tl_if_head_eq_charcode_p:VN #1 - }
+ \tl_if_head_eq_charcode:VNTF #1 -
{ \tl_put_left:NV #1 #3 }
{ \tl_put_right:Nx #1 { + \int_use:N #3 } }
}
@@ -1420,28 +1378,25 @@
%%%%% Generate variants %%%%%
\prg_generate_conditional_variant:Nnn \__deriv_show_order:N { c } { T, TF }
+\prg_generate_conditional_variant:Nnn \tl_if_head_eq_charcode:nN { V } { T, F, TF }
-\cs_generate_variant:Nn \tl_if_head_eq_charcode_p:nN { V }
\cs_generate_variant:Nn \__deriv_set_rubber_length:Nn { c }
-\cs_generate_variant:Nn \__deriv_dv_variables:n { V }
-\cs_generate_variant:Nn \__deriv_dv_define_keys:n { V }
\cs_generate_variant:Nn \deriv_dv_define:Nnn { NV }
-\cs_generate_variant:Nn \__deriv_i_variables:n { V }
-\cs_generate_variant:Nn \__deriv_i_define_keys:n { V }
\cs_generate_variant:Nn \deriv_i_define:Nnn { NV }
\cs_generate_variant:Nn \deriv_set_keys:nn { V }
+\cs_generate_variant:Nn \__deriv_dont_use_dot:n { x }
+\cs_generate_variant:Nn \__deriv_scale_big_auxi:nNn { nc }
\cs_generate_variant:Nn \__deriv_insert_ord:Nnn { c }
\cs_generate_variant:Nn \__deriv_insert_var:Nnn { NV }
-\prg_generate_conditional_variant:Nnn \__deriv_if_novalue:n { f } { T }
-\prg_generate_conditional_variant:Nnn \__deriv_if_novalue:n { V } { TF }
\cs_generate_variant:Nn \__deriv_mixed_order:NNn { c }
-\cs_generate_variant:Nn \__deriv_eval_term:Nnnn { NV }
+\cs_generate_variant:Nn \__deriv_sort_method:Nn { c }
+\cs_generate_variant:Nn \__deriv_eval_term:Nnnn { NVV }
+\cs_generate_variant:Nn \__deriv_sort_lexical_auxi:nnn { VV }
-\cs_generate_variant:Nn \__deriv_set_default_aux:nnn { V }
-\cs_generate_variant:Nn \__deriv_set_default_from_prop:NN { Nc }
-\cs_generate_variant:Nn \__deriv_update_prop:Nn { c }
+\cs_generate_variant:Nn \__deriv_set_default_auxi:Nnn { c }
+\cs_generate_variant:Nn \__deriv_set_default_auxii:nnn { f }
\cs_generate_variant:Nn \__deriv_preamble_aux:nnn { V }
\cs_generate_variant:Nn \__deriv_var_bool_seq:NNN { c }
@@ -1480,15 +1435,14 @@
{ \derivset{all}[scale-auto = mleftmright] }
{ \derivset{all}[scale-auto = leftright] }
-\cs_new_protected:Npn \deriv_define_legacy_italic_cs:
+
+\bool_if:NTF \l__deriv_pkg_italic_bool
{
\DeclareDerivative{\odv}{\mathnormal{d}}
\DeclareDerivative{\mdv}{\mathnormal{D}}
\DeclareDifferential{\odif}{\mathnormal{d}}
\DeclareDifferential{\mdif}{\mathnormal{D}}[style-notation=single, style-notation-*=mixed]
}
-
-\cs_new_protected:Npn \deriv_define_legacy_upright_cs:
{
\DeclareDerivative{\odv}{\mathrm{d}}
\DeclareDerivative{\mdv}{\mathrm{D}}
@@ -1496,12 +1450,6 @@
\DeclareDifferential{\mdif}{\mathrm{D}}[style-notation=single, style-notation-*=mixed]
}
-\__deriv_case:n
-{
- { \l__deriv_pkg_italic_bool } { \deriv_define_legacy_italic_cs: }
- { \l__deriv_pkg_upright_bool } { \deriv_define_legacy_upright_cs: }
-}
-
\DeclareDerivative{\fdv}{\delta}
\DeclareDerivative{\adv}{\Delta}
\DeclareDerivative{\jdv}{\partial}[fun=true, var=1]
diff --git a/macros/latex/contrib/derivative/derivative.tex b/macros/latex/contrib/derivative/derivative.tex
index d7c50df7b8..837a7695d0 100644
--- a/macros/latex/contrib/derivative/derivative.tex
+++ b/macros/latex/contrib/derivative/derivative.tex
@@ -1,5 +1,5 @@
% derivative.tex
-% Copyright 2019-2021 Simon Jensen
+% Copyright 2019-2022 Simon Jensen
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -83,8 +83,8 @@ indent_length "2"
\RequirePackage[unicode]{hyperref}
\RequirePackage[nameinlink]{cleveref}
-\makeatletter
\ExplSyntaxOn
+\makeatletter
\tl_new:N \pakkenavn
\tl_new:N \titel
@@ -147,7 +147,7 @@ indent_length "2"
columns = fullflexible,
basicstyle = \ttfamily\upshape\small,
alsoletter = {\\,-,*,/},
- keywords = [0]{style-inf, style-var, style-frac, style-frac-/, style-notation, style-notation-*, scale-eval, scale-eval-/, scale-fun, scale-var, scale-frac, scale-frac-/, scale-var, scale-var-*, delims-eval, delims-eval-/, delims-fun, delims-var, delims-frac, delims-var-*, delims-frac-/, sep-inf-ord, sep-inf-fun, sep-ord-fun, sep-frac-fun, sep-inf-var, sep-var-ord, sep-var-inf, sep-ord-inf, sep-var-var, sep-eval-sb, sep-eval-sp, sep-begin, sep-inf-ord, sep-inf-var, sep-ord-var, sep,var-inf, sep-var-var, sep-ord-ord, sep-end, switch-*, switch-/, add-delims, remove-delims, add-var-delims, order, morder, sort-method, sort-numerical, sort-abs-reverse, sort-number-reverse, sort-sign-reverse, sort-symbol-reverse, fun, frac, var, order, ord, mixed-order, mixord, scale-auto},
+ keywords = [0]{style-inf, style-var, style-frac, style-frac-/, style-notation, style-notation-*, scale-eval, scale-eval-/, scale-fun, scale-var, scale-var-*, scale-frac, scale-frac-/, delims-eval, delims-eval-/, delims-fun, delims-var, delims-var-*, delims-frac, delims-frac-/, sep-inf-ord, sep-inf-fun, sep-ord-fun, sep-frac-fun, sep-inf-var, sep-var-ord, sep-var-inf, sep-ord-inf, sep-var-var, sep-eval-sb, sep-eval-sp, sep-begin, sep-inf-ord, sep-inf-var, sep-ord-var, sep-var-inf, sep-ord-ord, sep-end, switch-*, switch-/, switch-sort, sort-method, sort-numerical, sort-abs-reverse, sort-lexical-reverse, sort-number-reverse, sort-sign-reverse, sort-symbol-reverse, fun, frac, var, order, ord, mixed-order, mixord, scale-auto},
keywordstyle = [0]\__mydoc_option_font:,
keywords = [1]{\\odv, \\pdv, \\mdv, \\fdv, \\adv, \\jdv, \\odif, \\pdif, \\mdif, \\fdif, \\adif, \\NewDerivative, \\RenewDerivative, \\ProvideDerivative, \\DeclareDerivative, \\NewDifferential, \\RenewDifferential, \\ProvideDifferential, \\DeclareDifferential, \\slashfrac, \\derivset},
keywordstyle = [1]\__mydoc_function_font:,
@@ -395,7 +395,6 @@ indent_length "2"
{
}
-
\tl_new:N \l__mydoc_number_tl
\tl_new:N \l_mydoc_index_item_tl
\tl_new:N \l_mydoc_index_subitem_tl
@@ -659,7 +658,10 @@ indent_length "2"
\group_begin:
\small \ttfamily
New: \tl_use:N \c_space_tl
- \tl_use:N #1
+
+ \tl_if_head_eq_charcode:fNTF {#1} v
+ { \tl_use:N #1 }
+ { v\tl_use:N #1 }
\group_end:
}
@@ -668,7 +670,10 @@ indent_length "2"
\group_begin:
\small \ttfamily
Updated: \tl_use:N \c_space_tl
- \tl_use:N #1
+
+ \tl_if_head_eq_charcode:fNTF {#1} v
+ { \tl_use:N #1 }
+ { v\tl_use:N #1 }
\group_end:
}
@@ -1318,15 +1323,16 @@ indent_length "2"
{ \mydoc_cs_to_str:N #1 }
\ExplSyntaxOff
+\makeatother
\Pakkenavn{derivative}
\Titel{The \pakkenavn{} package}
\Forfatter{Simon Jensen}
\Email{sjelatex@gmail.com}
-\Dato{2021/06/03}
-\Version{1.1}
+\Dato{2022/07/09}
+\Version{1.2}
-\RequirePackage[upright]{derivative}[\dato]
+\RequirePackage{derivative}[\dato]
% \derivset{all}[scale-auto = mleftmright]
\hypersetup
@@ -1360,17 +1366,21 @@ indent_length "2"
\begin{document}
- \forside{%
- The \mypackage{} package provides a set of commands which makes writing ordinary and partial derivatives of arbitrary order in a straight forward manner. Additionally, this package provides a set of commands to define variants of the aforementioned derivatives. A set of optional arguments along with lots of package options allow for easy and great flexibility over the derivative's format, such as where the function is positioned, point of evaluation, and switching between fraction styles. Moreover, the mixed order of the partial derivative and variants hereof is automatically computed. This package is written in the \pkg{expl3} language and requires therefore the \LaTeX3 package bundles \pkg{l3kernel} and \pkg{l3package}. Additionally, the \pkg{mleftright} package is optional and provides the improved automatically scaling \cs{mleft} and \cs{mright}.}
+ \forside{The \mypackage{} package provides a set of commands which makes writing ordinary and partial derivatives of arbitrary order in a straight forward manner. Additionally, this package provides a set of commands to define variants of the aforementioned derivatives. A set of optional arguments along with lots of package options allow for easy and great flexibility over the derivative's format, such as where the function is positioned, point of evaluation, and switching between fraction styles. Moreover, the mixed order of the partial derivative and variants hereof is automatically computed. This package is written in the \pkg{expl3} language and requires therefore the \LaTeX3 package bundles \pkg{l3kernel} and \pkg{l3package}. Additionally, the \pkg{mleftright} package is optional and provides the improved automatically scaling \cs{mleft} and \cs{mright}.}
\clearpage
\tableofcontents
\clearpage
+ \section{Introduction}
This package started as a personal package a few years ago that I used in various projects. Firstly, it was written in \tex{} and \latex, which gave rise to various errors as the complexity of the package grew larger and ended up as a spaghetti code. Therefore, the code was rewritten into the \latex3 language and may now be easily maintained. Originally this package was written because there did not exist any great package for derivatives. It was first much later that I discovered the \pkg{diffcoeff} package, which does a good job. However, at this time, I had already written much of the code with no documentation. So I decided to write one and make it into a package for the public.
As a note on terminology, I use the wording \emph{infinitesimal} abbreviated as \texttt{inf} for the operator symbols $d, \partial, \delta$ etc. that used in derivatives like $\odv{y}{x}, \pdv{y}{x}, \fdv{y}{x}$ and in differentials like $\odif{x}, \pdif{x}, \fdif{x}$. In the description of macros and options, I often write \emph{cs-\meta{placeholder}} to denote a comma-separated list of \meta{placeholder}. For example, \oarg{cs-numbers} is used in the option section for math space keys to denote comma-separated list of numbers. It should also be noted that whenever an argument reads \meta{keyvalue list}, it means that it is a comma-separated list of keyvalue pairs.
+ \bigskip
+
+ \noindent The github respository can be found at \href{https://github.com/sjelatex/derivative}{www.github.com/sjelatex/derivative}.
+
\clearpage
@@ -1477,7 +1487,7 @@ indent_length "2"
\begin{equation*}
\odv{f}{x} = \lim_{h\to 0} \mleft( \frac{ f(x+h) - f(x) }{ h } \mright)
\end{equation*}
- However it can always be changed with the \key{style-inf} key.
+ However it can always be changed with the \key{style-inf} key.
\end{function}
\begin{function}{\mdv}[updated=v1.1]
@@ -1990,16 +2000,34 @@ indent_length "2"
\noindent respectively. The key's default value is \default.
\end{option}
+ \begin{option}{switch-sort}[new = 1.2]
+ \begin{values}[default = true]
+ true, false
+ \end{values}
+ The sorting algorithm of the mixed order is turned on when given the value \val{true} i.e. the methods given in \keyval*{sort-method}{\dots} are applied. Likewise, the sorting algorithm is turned off when given the value \val{false} i.e. the terms in the mixed order are ordered by first appearance in \keyval*{order}{\dots}. As an example, compare below where the option is turned on (\val{true}) and off (\val{false})
+
+ \begin{example}
+ \pdv[switch-sort=false, order={a+b,2kn-d,2-2b}]{f}{x,y,z} \\
+ \pdv[switch-sort=true, order={a+b,2kn-d,2-2b}]{f}{x,y,z}
+ \end{example}
+
+ \noindent respectively. The key's default value is \default.
+ \end{option}
+
\subsubsection*{Sort}
The keys given in this subsection will be briefly described here and a in-depth description will be given in \cref{ssec:overall_order}.
- \begin{option}{sort-method}[updated = v1.0]
+ \begin{option}{sort-method}[updated = v1.2]
\begin{values}[default = {sign, symbol, abs}]
- abs, number, sign, symbol
+ abs, lexical, number, sign, symbol
\end{values}
- This key sets the sorting method behind the mixed order using build-in algorithms. The symbolic terms in the mixed order are sorted by their sign, symbolic length, numerical value and absolute value by the \val{sign}, \val{symbol}, \val{number} and \val{abs} algorithms, respectively. The key takes its input as a comma-separated list of values, accepting up to three values e.g.
+ This key sets the sorting method behind the mixed order using build-in algorithms. The symbolic terms in the mixed order are sorted by their sign, symbolic length, numerical value and absolute value by the \val{sign}, \val{symbol}, \val{number} and \val{abs} algorithms, respectively. The value \val{lexical} sorts the terms by lexicographical order i.e. alphabetically. The key takes its input as a comma-separated list of values, accepting up to three values e.g.
\begin{example}
+ \pdv[sort-method=abs, order={c+kn,-b+2a}]{f}{x,y} \\
+ \pdv[sort-method=lexical, order={c+kn,-b+2a}]{f}{x,y} \\
+ \pdv[sort-method=number, order={c+kn,-b+2a}]{f}{x,y} \\
+ \pdv[sort-method=symbol, order={c+kn,-b+2a}]{f}{x,y} \\
\pdv[sort-method=sign, order={c+kn,-b+2a}]{f}{x,y} \\
\pdv[sort-method={sign,symbol}, order={c+kn,-b+2a}]{f}{x,y} \\
\pdv[sort-method={sign,symbol,abs}, order={c+kn,-b+2a}]{f}{x,y}
@@ -2033,6 +2061,13 @@ indent_length "2"
The sorting algorithm \val{abs} sorts the terms by their absolute value in a descending manner. If the value \val{true} is used, then the terms will be sorted in an ascending manner instead. See \cref{ssec:sort-reverse} for more information.
\end{option}
+ \begin{option}{sort-lexical-reverse}[new = v1.2]
+ \begin{values}[default = false]
+ true, false
+ \end{values}
+ The sorting algorithm \val{lexical} sorts the terms in lexicographical order according to their character code i.e. alphabetically. If the value \val{true} is used, then the terms will be sorted in reverse lexicographical order instead. See \cref{ssec:sort-reverse} for more information.
+ \end{option}
+
\begin{option}{sort-number-reverse}[new = v1.0]
\begin{values}[default = false]
true, false
@@ -2104,7 +2139,7 @@ indent_length "2"
Sets the order of differentiation for each variable as a comma separated list of values.
\end{option}
- \bigskip\bigskip
+ \clearpage
\begin{option}{mixed-order, mixord}[cat=misc, new = v1.0]
\begin{values}[default = 1]
@@ -2137,7 +2172,6 @@ indent_length "2"
\odif[style-notation=single, order={n,1,2}]{x,y,z,t} \\
\odif[style-notation=mixed, order={n,1,2}]{x,y,z,t}
\end{example}
-
\end{option}
\begin{option}{style-notation-*}
@@ -2208,8 +2242,6 @@ indent_length "2"
This key sets the math space that is inserted in the infinitesimal's power left to the order. It is only inserted when the mixed order is different from \num{1}. The key's default value is \default{} \texttt{mu}.
\end{option}
- \clearpage
-
\begin{option}{sep-inf-var}
\begin{values}[default = 0]
\meta{cs-number}, \marg{mspace}, \marg{delimiter}
@@ -2370,10 +2402,11 @@ indent_length "2"
A unique feature of this package is that the sorting method behind the mixed order may be changed using built-in algorithms and there are currently four available: \val{abs}, \val{number}, \val{sign} and \val{symbol}. The algorithms have been chosen such that it the terms in the mixed order may be arranged in many ways with as few algorithms as possible to suit your liking. A sorting method may consist of up to three algorithms which are applied in layers.
\begin{itemize}
- \item The sorting algorithm \val{sign} separates the positive and negative terms, and puts the positive terms before the negative terms in the mixed order. The option \keyval{sort-sign-reverse}{true} reverses ordering is reversed such that the negative terms appear before the positive terms.
- \item The sorting algorithm \val{symbol} separates the terms by their symbolic length, where the terms are sorted in a descending manner according to their length. The option \keyval{sort-symbol-reverse}{true} sorts the terms in a ascending manner instead.
- \item The sorting by \val{abs} separates the terms by their absolute value, where the terms are ordered in a descending manner. The option \keyval{sort-abs-reverse}{true} sorts the terms in an ascending manner instead.
- \item The sorting by \val{number} separates the terms by their numerical value, where the terms are ordered in a descending manner. The option \keyval{sort-number-reverse}{true} sort the terms in an ascending manner instead.
+ \item The sorting algorithm \val{sign} separates the positive and negative terms, and puts the positive terms before the negative terms in the mixed order. The option \keyval{sort-sign-reverse}{true} reverses ordering such that the negative terms appear before the positive terms.
+ \item The sorting algorithm \val{symbol} sorts the terms in a descending manner according to their length. The option \keyval{sort-symbol-reverse}{true} sorts the terms in a ascending manner instead.
+ \item The sorting by \val{abs} sorts the terms in a descending manner. The option \keyval{sort-abs-reverse}{true} sorts the terms in an ascending manner instead.
+ \item The sorting by \val{number} sorts the terms in a descending manner. The option \keyval{sort-number-reverse}{true} sort the terms in an ascending manner instead.
+ \item The sorting by \val{lexical} sorts the terms in a lexicographical order that is alphabetically. The option \keyval{sort-number-reverse}{true} sort the terms in reverse lexicographical ordering.
\end{itemize}
When using the option \keyval{sort-method}{\{...\}}, the number of algorithms determines the number of layers e.g. \keyval*{sort-method}{sign,symbol} is a sorting method with two layers, where the algorithms \val{sign} and \val{symbol} are applied in layer \num{1} and layer \num{2}, respectively. E.i the \val{sign} algorithm splits the terms into two groups, one with positive terms and one with negative terms. Then the \val{symbol} algorithm will sorts the terms within each groups according to the terms symbolic length. The mixed order is then formed by combining these two groups.
@@ -2460,9 +2493,7 @@ indent_length "2"
as expected.
\subsection{The numerical term} \label{ssec:sort-numerical}
- With the symbolic part of the mixed order treated, it is time to look at the numerical term\footref{foot:numerical-term} which have a symbolic of zero. For this reason it is treated differently than the symbolic terms.
-
- The numerical term can be placed either at the beginning or at the end of the mixed order with the values \val{first} and \val{last}, respectively. The package can also determine where to place the numerical term with the value \val{auto}. Compare below
+ With the symbolic part of the mixed order treated, it is time to look at the numerical term\footref{foot:numerical-term} which have a symbolic of zero. For this reason it is treated differently than the symbolic terms. The numerical term can be placed either at the beginning or at the end of the mixed order with the values \val{first} and \val{last}, respectively. The package can also determine where to place the numerical term with the value \val{auto}. Compare below
\begin{align*}
\text{\inlinecode{sort-numerical=auto:}} &&
\pdv[order={\beta, 2}, sort-numerical=auto]{f}{x,y} &&
@@ -2476,19 +2507,21 @@ indent_length "2"
\text{\inlinecode{sort-numerical=symbolic:}} &&
\pdv[order={\beta, 2}, sort-numerical=symbolic]{f}{x,y} && \pdv[order={\beta, -2}, sort-numerical=symbolic]{f}{x,y} && \pdv[order={-\beta, 2}, sort-numerical=symbolic]{f}{x,y} && \pdv[order={-\beta, -2}, sort-numerical=symbolic]{f}{x,y}
\end{align*}
- These three options should satisfy every needs.
+ These four options should satisfy every needs.
\subsection{Reversing the sort algorithm} \label{ssec:sort-reverse}
- The reverse keys serves to reverse the ordering of the terms by the sorting algorithms. This allows for even greater flexibility over the sorting method. So if the default ordering of an algorithm is not wished it may be reversed with the corresponding reverse key. For example, the \val{sign} algorithm places the positive terms before the negative terms, but is opposite with \keyval{sort-sign-reverse}{true}. The reverse keys in action are shown below (\keyval[index=false]{sort-method}{\meta{1 algorithm only}} is also used to better show off the reverse functionality)
+ The reverse keys serves to reverse the ordering of the sorting algorithms. This allows for even greater flexibility over the sorting method. So if the default ordering of an algorithm is not wished it may be reversed with the corresponding reverse key. The reverse keys in action are shown below (\keyval[index=false]{sort-method}{\meta{1 algorithm only}} is also used to better show off the reverse functionality)
\begin{align*}
- \text{\inlinecode{sort-abs-reverse=false:}} && \pdv[sort-method={abs}, sort-abs-reverse=false, order={2a, -3b}]{f}{x,y} &&
- \text{\inlinecode{sort-abs-reverse=true:}} && \pdv[sort-method={abs}, sort-abs-reverse=true, order={2a, -3b}]{f}{x,y} \\
- \text{\inlinecode{sort-number-reverse=false:}} && \pdv[sort-method={number}, sort-number-reverse=false, order={2a, -3b}]{f}{x,y} &&
- \text{\inlinecode{sort-number-reverse=true:}} && \pdv[sort-method={number}, sort-number-reverse=true, order={2a, -3b}]{f}{x,y} \\
- \text{\inlinecode{sort-sign-reverse=false:}} && \pdv[sort-method={sign}, sort-sign-reverse=false, order={a, -b}]{f}{x,y} &&
- \text{\inlinecode{sort-sign-reverse=true:}} && \pdv[sort-method={sign}, sort-sign-reverse=true, order={a, -b}]{f}{x,y} \\
- \text{\inlinecode{sort-symbol-reverse=false:}} && \pdv[sort-method={symbol}, sort-symbol-reverse=false, order={ab, c}]{f}{x,y} &&
- \text{\inlinecode{sort-symbol-reverse=true:}} && \pdv[sort-method={symbol}, sort-symbol-reverse=true, order={ab, c}]{f}{x,y}
+ \text{\inlinecode{sort-abs-reverse=false:}} && \pdv[sort-method={abs}, sort-abs-reverse=false, order={2a, -3b}]{f}{x,y} &&
+ \text{\inlinecode{sort-abs-reverse=true:}} && \pdv[sort-method={abs}, sort-abs-reverse=true, order={2a, -3b}]{f}{x,y} \\
+ \text{\inlinecode{sort-number-reverse=false:}} && \pdv[sort-method={number}, sort-number-reverse=false, order={2a, -3b}]{f}{x,y} &&
+ \text{\inlinecode{sort-number-reverse=true:}} && \pdv[sort-method={number}, sort-number-reverse=true, order={2a, -3b}]{f}{x,y} \\
+ \text{\inlinecode{sort-sign-reverse=false:}} && \pdv[sort-method={sign}, sort-sign-reverse=false, order={a, -b}]{f}{x,y} &&
+ \text{\inlinecode{sort-sign-reverse=true:}} && \pdv[sort-method={sign}, sort-sign-reverse=true, order={a, -b}]{f}{x,y} \\
+ \text{\inlinecode{sort-symbol-reverse=false:}} && \pdv[sort-method={symbol}, sort-symbol-reverse=false, order={ab, c}]{f}{x,y} &&
+ \text{\inlinecode{sort-symbol-reverse=true:}} && \pdv[sort-method={symbol}, sort-symbol-reverse=true, order={ab, c}]{f}{x,y} \\
+ \text{\inlinecode{sort-lexical-reverse=false:}} && \pdv[sort-method={lexical}, sort-lexical-reverse=false, order={a, c, b}]{f}{x,y,z} &&
+ \text{\inlinecode{sort-lexical-reverse=true:}} && \pdv[sort-method={lexical}, sort-lexical-reverse=true, order={a, c, b}]{f}{x,y,z} \\
\end{align*}
\subsection{Mixed order override}
@@ -2632,6 +2665,13 @@ indent_length "2"
\item The package no longer uses \cs{symup} which have been replaced with \cs{mathrm} for simplicity
\item If \pkg{mleftright} is loaded then the default value of \key[index=false]{scale-auto} is \val{mleftmright}
\end{change}
+ \begin{change}[version = 1.2, date = 2022-07-09, beta = false]
+ \item Code clean-up and optimisation that significantly speeds up usage of the package
+ \item Added new sorting algorithm \keyval[index=false]{sort-method}{lexical} that sorts terms alphabetically
+ \item Added the option \key[index=false]{sort-lexical-reverse}
+ \item Added the option \key[index=false]{switch-sort} that turns on/off the sorting algorithm of the mixed order
+ \item Fixed bug concerning \keyval[index=false]{scale-\meta{\dots}}{none} when the corresponding delimiter option contained a period.
+ \item Fixed documentation errors
+ \end{change}
\end{changelog}
-
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/fixdif/fixdif.dtx b/macros/latex/contrib/fixdif/fixdif.dtx
index 9e06f1067a..bced2e43bf 100644
--- a/macros/latex/contrib/fixdif/fixdif.dtx
+++ b/macros/latex/contrib/fixdif/fixdif.dtx
@@ -126,7 +126,7 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
%</internal>
%
%<*driver>
-\ProvidesFile{fixdif.dtx}[2022/05/29 (c) Copyright 2022 by Zhang Tingxuan]
+\ProvidesFile{fixdif.dtx}[2022/07/09 (c) Copyright 2022 by Zhang Tingxuan]
\documentclass{ltxdoc}
\usepackage{xcolor}
@@ -145,7 +145,7 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
\title{The \pkg{fixdif} Package}
\author{Zhang Tingxuan}
-\date{2022/05/29\quad Version 1.1\thanks{\url{https://github.com/AlphaZTX/fixdif}}}
+\date{2022/07/09\quad Version 1.2\thanks{\url{https://github.com/AlphaZTX/fixdif}}}
\usepackage{hyperref}
\hypersetup{
@@ -329,7 +329,7 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
% can be used in preamble only!}
%
% \subsection{Define commands with a single command name}
-% \noindent\textbf{\cs{letdif}\marg{cmd}\marg{csname}}\DescribeMacro{\letdif}
+% \noindent\textcolor{titlecolor}{\cs{letdif}\marg{cmd}\marg{csname}}\DescribeMacro{\letdif}
% \hfill(preamble only)
%
% The \cs{letdif} command has two arguments~--- the first is the newly-defined
@@ -351,7 +351,7 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
% The second argument \meta{csname} of \cs{letdif} command can be used
% repeatedly.
%
-% \noindent\textbf{\cs{letdif*}\marg{cmd}\marg{csname}}\DescribeMacro{\letdif*}
+% \noindent\textcolor{titlecolor}{\cs{letdif*}\marg{cmd}\marg{csname}}\DescribeMacro{\letdif*}
% \hfill(preamble only)
%
% This command is basically the same as \cs{letdif}, but this command will
@@ -372,14 +372,14 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
%
% \subsection{Define commands with multi commands or a string}
%
-% \noindent\textbf{\cs{newdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif}
+% \noindent\textcolor{titlecolor}{\cs{newdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif}
% \hfill(without correction, preamble only)\\
-% \noindent\textbf{\cs{newdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif*}
+% \noindent\textcolor{titlecolor}{\cs{newdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif*}
% \hfill(with correction, preamble only)
%
% The first argument of these commands is the newly-defined command; and the
-% second argument should contain \emph{more than one commands} or
-% \emph{a string}. For example, if you have loaded the \pkg{xcolor} package,
+% second argument should contain \emph{more than one} tokens.
+% For example, if you have loaded the \pkg{xcolor} package,
% you can use the following line:
% \begin{Verbatim}
% \newdif{\redsfd}{\textsf{\color{red}d}}
@@ -396,9 +396,9 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
% These two commands will check whether \meta{cmd} has been defined already.
% If so, an error message will be given.
%
-% \noindent\textbf{\cs{renewdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif}
+% \noindent\textcolor{titlecolor}{\cs{renewdif}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif}
% \hfill(without correction, preamble only)\\
-% \noindent\textbf{\cs{renewdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif*}
+% \noindent\textcolor{titlecolor}{\cs{renewdif*}\marg{cmd}\marg{multi-cmd}}\DescribeMacro{\newdif*}
% \hfill(with correction, preamble only)
%
% These two commands are basically the same as \cs{newdif} and \cs{newdif*}.
@@ -497,7 +497,7 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
% \DescribeMacro{\d}
% Redefine the \cs{d} command. In text, we need to expand the stuffs after \cs{d}
% \begin{macrocode}
-\gdef\d{\relax\ifmmode\@dif\else\expandafter\d@accent\fi}
+\DeclareRobustCommand\d{\ifmmode\@dif\else\expandafter\d@accent\fi}
% \end{macrocode}
%
% \subsection{User's interface for defining new differential operators}
@@ -505,71 +505,71 @@ Copyright (C) 2022 by Zhang Tingxuan <alphaztx@163.com>.
% Define the \cs{letdif} and \cs{letdif*} command. The internal version of \cs{letdif}
% is \cs{@letdif}, of \cs{letdif*} is \cs{s@letdif}.
% \begin{macrocode}
-\def\@letdif#1#2{\AtBeginDocument{
+\def\@letdif#1#2{\AtBeginDocument{%
% \end{macrocode}
% |#1| is the final command; |#2| is the ``control sequence name'' of |#1|'s initial definition.
% Here we create a command (\cs{csname}|#2@old|\cs{endcsname}) to restore |#2|.
% \begin{macrocode}
- \ifcsname #2@old\endcsname\else
- \expandafter\let\csname #2@old\expandafter\endcsname%
- \csname #2\endcsname
- \fi
+ \ifcsname #2@old\endcsname\else%
+ \expandafter\let\csname #2@old\expandafter\endcsname
+ \csname #2\endcsname%
+ \fi%
% \end{macrocode}
% Finally let |#1| be the new command.
% \begin{macrocode}
- \gdef#1{\mathinner{\csname #2@old\endcsname}\mup@tch}
+ \gdef#1{\mathinner{\csname #2@old\endcsname}\mup@tch}%
}}
% \end{macrocode}
% The definition of \cs{s@letdif} is similar, but with the patch for negative skips.
% \begin{macrocode}
-\def\s@letdif#1#2{\AtBeginDocument{
- \ifcsname #2@old\endcsname\else
- \expandafter\let\csname #2@old\expandafter\endcsname%
- \csname #2\endcsname
- \fi
- \gdef#1{\mathinner{\s@beforep@tch\csname #2@old\endcsname\mbox{}}\mup@tch}
+\def\s@letdif#1#2{\AtBeginDocument{%
+ \ifcsname #2@old\endcsname\else%
+ \expandafter\let\csname #2@old\expandafter\endcsname
+ \csname #2\endcsname%
+ \fi%
+ \gdef#1{\mathinner{\s@beforep@tch\csname #2@old\endcsname\mbox{}}\mup@tch}%
}}
\def\letdif{\@ifstar\s@letdif\@letdif}
% \end{macrocode}
% \DescribeMacro{\newdif}\DescribeMacro{\newdif*}
% Define the \cs{newdif} and \cs{newdif*} commands. |#1| is the final command; |#2| is the ``long'' argument.
% \begin{macrocode}
-\long\def\@newdif#1#2{\AtBeginDocument{
+\long\def\@newdif#1#2{\AtBeginDocument{%
\ifdefined#1
\PackageError{fixdif}{\string#1 is already defined.}
- {Try another command instead of \string#1.}
+ {Try another command instead of \string#1.}%
\else
- \long\gdef#1{\mathinner{#2}\mup@tch}
- \fi
+ \long\gdef#1{\mathinner{#2}\mup@tch}%
+ \fi%
}}
-\long\def\s@newdif#1#2{\AtBeginDocument{
+\long\def\s@newdif#1#2{\AtBeginDocument{%
\ifdefined#1
\PackageError{fixdif}{\string#1 is already defined.}
- {Try another command instead of \string#1.}
+ {Try another command instead of \string#1.}%
\else
- \long\gdef#1{\s@beforep@tch\mathinner{#2\mbox{}}\mup@tch}
- \fi
+ \long\gdef#1{\s@beforep@tch\mathinner{#2\mbox{}}\mup@tch}%
+ \fi%
}}
\def\newdif{\@ifstar\s@newdif\@newdif}
% \end{macrocode}
% \DescribeMacro{\renewdif}\DescribeMacro{\renewdif*}
% Define the \cs{renewdif} and \cs{renewdif*} commands.
% \begin{macrocode}
-\long\def\@renewdif#1#2{\AtBeginDocument{
+\long\def\@renewdif#1#2{\AtBeginDocument{%
\ifdefined#1
- \long\gdef#1{\mathinner{#2}\mup@tch}
+ \long\gdef#1{\mathinner{#2}\mup@tch}%
\else
\PackageError{fixdif}{\string#1 has not been defined yet.}
- {You should use \string\newdif instead of \string\renewdif.}
- \fi
+ {You should use \string\newdif instead of \string\renewdif.}%
+ \fi%
}}
-\long\def\s@renewdif#1#2{\AtBeginDocument{
+\long\def\s@renewdif#1#2{\AtBeginDocument{%
\ifdefined#1
- \long\gdef#1{\s@beforep@tch\mathinner{#2\mbox{}}\mup@tch}
+ \long\gdef#1{\s@beforep@tch\mathinner{#2\mbox{}}\mup@tch}%
\else
\PackageError{fixdif}{\string#1 has not been defined yet.}
- {You should use \string\newdif instead of \string\renewdif.}
- \fi
+ {You should use \string\newdif instead of \string\renewdif.}%
+ \fi%
}}
\def\renewdif{\@ifstar\s@renewdif\@renewdif}
%</package>
diff --git a/macros/latex/contrib/fixdif/fixdif.pdf b/macros/latex/contrib/fixdif/fixdif.pdf
index dd066756f0..e83fd2d10d 100644
--- a/macros/latex/contrib/fixdif/fixdif.pdf
+++ b/macros/latex/contrib/fixdif/fixdif.pdf
Binary files differ
diff --git a/macros/latex/contrib/flexipage/README.txt b/macros/latex/contrib/flexipage/README.txt
new file mode 100644
index 0000000000..92a9499b93
--- /dev/null
+++ b/macros/latex/contrib/flexipage/README.txt
@@ -0,0 +1,20 @@
+LaTeX package flexipage
+Copyright (c) Anton Vrba, 2022
+-------------------------------------------------------------------
+Version:
+ 2022/07/09 1.00 Initial release
+Licence:
+ This work may be distributed and/or modified under the conditions
+ of the LaTeX Project Public License, version 1.3c of the license.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3c or later is part of all distributions of LaTeX
+ version 2008-05-04 or later.
+Abstract:
+ The package flexipage allows easy page layout if marginalia is
+ required. Mid document changes are possible such as: new marginal
+ width, full width text, and landscape text without marginal.
+ Partners well with the package sidenotesplus. The package also
+ aids the layout for book printing, adding binding corrections
+ and adding page bleed, if required by the printers
+------------------------------------------------------------------- \ No newline at end of file
diff --git a/macros/latex/contrib/flexipage/Test-flexipage.pdf b/macros/latex/contrib/flexipage/Test-flexipage.pdf
new file mode 100644
index 0000000000..05cb03349f
--- /dev/null
+++ b/macros/latex/contrib/flexipage/Test-flexipage.pdf
Binary files differ
diff --git a/macros/latex/contrib/flexipage/Test-flexipage.tex b/macros/latex/contrib/flexipage/Test-flexipage.tex
new file mode 100644
index 0000000000..be69577405
--- /dev/null
+++ b/macros/latex/contrib/flexipage/Test-flexipage.tex
@@ -0,0 +1,141 @@
+\documentclass[twoside,8pt]{extarticle}
+\PassOptionsToPackage{
+ paperheight =5in, % inherits from class
+ paperwidth = 4in, % inherits from class
+% inner = , % default 36pt or 0.5in
+% outer = , % 36pt or 0.5in
+% top = , % 36pt or 0.5in
+% bot = , % 36pt or 0.5in
+% binding = 9pt, % 9pt or 0.125in
+ outerbleed = 9pt, % 0pt, but check with your printer
+ innerbleed = 4pt, % 0pt, but check with your printer
+% grid , % 12 it is just a number
+% marginalgrid = , % 3 it is just a number
+% marginparsep = , % 3ex, if using sidenotesplus change to 4 or 5ex
+% headsep = , % inherits from class
+% headheight = , % inherits from class
+% footskip= , % inherits from class
+ show, % a switch to show frames around the printable areas.
+% fancyhdrOff
+}{flexipage}
+\usepackage{flexipage}
+\usepackage[]{lucimatx}
+\linespread{1.06}
+\usepackage{lipsum}
+\setlipsum{%
+ par-before = \begingroup\color{gray},
+ par-after = \endgroup,
+ sentence-before = \begingroup\color{gray},
+ sentence-after = \endgroup
+}
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+\fancyhead[EL,OR]{\thepage}
+\fancyhead[ER]{My New Book}
+\fancyhead[OL]{Chapter 1}
+\renewcommand{\headrulewidth}{0pt}
+
+\usepackage{microtype}
+
+\begin{document}
+
+
+\begin{verbatim}
+\documentclass[twoside,8pt]{extbook}
+\PassOptionsToPackage{
+ paperheight = 5in, % inherits from class
+ paperwidth = 4in , % inherits from class
+% inner = , % default 36pt or 0.5in
+ outer = , % 36pt or 0.5in
+% top = , % 36pt or 0.5in
+% bot = , % 36pt or 0.5in
+% binding = , % 9pt or 0.125in
+ outerbleed = 9pt, % 0pt,
+ innerbleed = 4pt, % 0pt,
+% grid = , % 12
+% marginalgrid = , % 3
+% marginparsep = , % 3ex,
+% headsep = , % inherits from class
+% headheight = , % inherits from class
+% footskip= , % inherits from class
+ show , % a switch to show frames
+% fancyhdrOff % not using fancyhdr
+}{flexipage}
+\end{verbatim}
+\footnotesize
+
+ \lipsum[10][1-3] \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[8]}
+
+ \lipsum[2] \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[8][1-5]}
+
+ \lipsum[2][1-6]
+
+~
+
+{\normalsize
+\noindent\verb"\NewMarginPage<6ex>{4}" increases marginal and \verb"\parsep" on next page}
+\NewMarginPage<6ex>{4} % Increase margin size
+
+ \lipsum[3][1-3] \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[10][1-4]}
+
+ \lipsum[1][1-8]
+
+ \lipsum[2][1-7]
+
+~
+
+{\normalsize
+\noindent\verb"\ResetFlexiPage" to original page setup with the narrower margin}
+\ResetFlexiPage
+
+ \lipsum[10][1-5] \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[1][1-3]} \lipsum[2]
+
+~
+
+{\normalsize
+\noindent\verb"\Lanscape" enters landscape mode}
+\begin{Landscape} % enter lanscape mode,
+
+ \lipsum[1-4]
+
+~
+
+{\normalsize
+\noindent\verb"\endLandscape" exits landscape mode }
+\end{Landscape} % exit lanscape mode,
+ \lipsum[2][1-5] \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[1][1-3]} \lipsum[11]
+
+~
+
+{\normalsize
+\noindent\verb"\begin{landscape}" enters landscape environment}
+ \begin{landscape}
+ \lipsum[2-5]
+ \end{landscape}
+{\normalsize
+\noindent\verb"\end{landscape}" exits landscape environment}
+
+~
+
+ \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[1][1-3]} \lipsum[17]
+
+~
+
+{\normalsize
+\noindent\verb"\NewFullPage" enters full page mode}
+\NewFullPage
+
+ \lipsum[1-4]
+
+~
+
+{\normalsize
+\noindent\verb"\OldMarginPage " restores the previous page format}
+\OldMarginPage
+
+ \marginpar[{\itshape\tiny\lipsum[1][1-4]}]{\itshape\tiny\lipsum[1][1-3]} \lipsum[17]
+
+
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/flexipage/flexipage.dtx b/macros/latex/contrib/flexipage/flexipage.dtx
new file mode 100644
index 0000000000..2188b2790f
--- /dev/null
+++ b/macros/latex/contrib/flexipage/flexipage.dtx
@@ -0,0 +1,818 @@
+% \iffalse meta-comment
+%
+% Copyright (C) 2022 by <+author+> <<+email+>>
+% ---------------------------------------------------------------------------
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is <+maintainer+>.
+%
+% This work consists of the files flexipage.dtx and flexipage.ins
+% and the derived filebase flexipage.sty.
+%
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{flexipage.dtx}
+%</driver>
+%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
+%<package>\ProvidesPackage{flexipage}
+%<*package>
+ [2022/07/09 1.00 Easy page geometry]
+%</package>
+%
+%<*driver>
+\documentclass{ltxdoc}
+\usepackage{xspace}
+\usepackage{tikz,amsmath, amssymb,bm,color}
+\usetikzlibrary{shapes,arrows}
+\usetikzlibrary{calc}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+ \voffset = -45pt
+ \textheight=210mm
+ \DocInput{flexipage.dtx}
+ \PrintChanges
+% \PrintIndex
+\end{document}
+%</driver>
+% \fi
+%
+%
+%
+% \CharacterTable
+% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+%
+% \changes{<+version+>}{<+date+>}{Converted to DTX file}
+%
+% \DoNotIndex{\newcommand,\newenvironment}
+%
+%
+% \providecommand*{\url}{\texttt}
+% \providecommand\lgtarg[1]{{\ttfamily<}\meta{#1}{\ttfamily>}}
+% \GetFileInfo{flexipage.dtx}
+%
+% \title{The \textsf{flexipage} package}
+% \author{Anton Vrba\\\small%
+% Home Page: \url{https://github.com/anton-vrba/flexipage} }
+% \date{\fileversion~from \filedate\\}
+%
+%
+% \maketitle
+%
+% \begin{abstract}
+% \noindent The package flexipage allows easy page layout if marginalia is required.
+% Mid document changes are possible such as: new marginal width, full width text,
+% and landscape text without marginal. Partners well with the package \textsf{sidenotesplus}.
+% The package also aids the layout for book printing, allowing for binding corrections
+% and adding page bleed, if required,
+% \end{abstract}
+%
+%
+%
+% \noindent The aim is an easy to use the page geometry setup,
+% and allow mid-document changes such as from portrait
+% to landscape, or change the text body width to marginalia width ratio.
+% The philosophy is simple, easy to understand options quickly set up the page geometry:
+% \begin{enumerate}
+% \item |pageheight| and |pagewidth| of final document, default inherited.
+% \item Defines page margins |inner|, |outer|, |top| and |bot|. Inner refers to the binding
+% that is the left side margin of on odd pages in |twoside| documents, or
+% of pages in |oneside| documents. Page margins surround the printable area.
+% Default for all |36pt|, or |0.5in|.
+% \item Add a |binding| correction, default |9pt|.
+% \item Add an |outerbleed|, increases the papersize by adding a bleed area to the
+% non bound margins. For the seldom requirement an |innerbleed| adds to the
+% paperwidth on the inner side.
+% Refer to your publisher. Default for both |0pt|.
+% \item Divide the remaining printable area into a vertical |grid|, default |12|.
+% \item Insert a |marginparsep| (default |3ex|) at the |margingrid| position
+% counting from the outer edge; 0 is for no
+% marginalia, 1 is a narrow marginal note area, and 4 is a marginal note area
+% of one halve the width of the text body area's width when |grid=12|.
+% The marginal area is placed by the outer edge.
+% \item The \LaTeX\xspace |headsep|, |headheight| and |footskip| dimension
+% can also be passed as options, otherwise default to class values.
+% \item As a visual guide, the option |show| frames the page geometry in the output
+% \end{enumerate}
+%
+% \footnotesize
+% \noindent \begin{tikzpicture}
+%
+% \draw [fill=yellow!30] (-4,4.4) node (v1) {} rectangle (3,-4.2);
+% \draw[fill=white] (-3.8,4.2) rectangle (2.8,-4);
+% \draw [color=green, fill=green!20 ] (-2.8,3.6) rectangle (2.2,-3.4);%
+% \draw [fill=orange!10] (-2.8,3.6) rectangle (0.8,3.4);
+% \draw [fill=orange!10] (1,3) rectangle (2.2,-2.8);
+% \draw [fill=orange!10](-2.8,3) rectangle (0.8,-2.8);
+% \draw [fill=violet!10] (-3.8,-4.2) rectangle (v1);
+
+% \draw [loosely dashed, blue] (-3.4,4.2) -- (-3.4,-4);
+% \draw (-2.8,-3.4) -- (0.8,-3.4);
+% \draw [loosely dashed] (1.8,3) -- (1.8,-2.8);
+% \draw [loosely dashed] (1.4,3) -- (1.4,-2.8);
+% \draw [loosely dashed] (0.4,3) -- (0.4,-2.8);
+% \draw [loosely dashed] (0,3) -- (0,-2.8);
+% \draw [loosely dashed] (-0.4,3) -- (-0.4,-2.8);
+% \draw [loosely dashed] (-0.8,3) -- (-0.8,-2.8);
+% \draw [loosely dashed] (-1.2,3) -- (-1.2,-2.8);
+% \draw [loosely dashed] (-1.6,3) -- (-1.6,-2.8);
+% \draw [loosely dashed](-2,3) -- (-2,-2.8);
+% \draw [loosely dashed](-2.4,3) -- (-2.4,-2.8);
+% \node at (-1.2,3.5) {Header};
+% \node at (-0.9,0.3) {Text Body};
+% \node [rotate=90] at (1.6,0.3) {Marginal};
+% \node [text width=65mm, right ] at (3.5,0.1)
+% {\small The basic paper geometry for book printing is illustrated to the left.
+% This for odd page numbers, the recto page. The even pages mirror this geometry
+% to maintain verso--recto symmetry.
+% The final page size is the white area. The yellow outer coloured area is the
+% |outerbleed| and the violet colored area on the left is the |innerbleed|, these
+% are trimmed and discarded. Please refer to your publisher if needed.
+%
+% ~~~The green area is the text block containing the text body, the marginal,
+% the header and footer and is defined by the margins |top|,
+% |outer| and |bottom| to the trimmed paper's edge.
+% The inner side (left) vertical dot-dashed line represents the |binding| correction and the |inner|
+% margin is defined from this line.
+%
+% ~~~Here the illustrated text width plus the marginal width are divided into 12 equal |grid=12| divisions
+% with the marginal takin 3 of them, defined by |marginalgrid=3|.
+% .};
+% \node at (-1.2,-3.3) {Footer};
+% \end{tikzpicture}\small
+% \\ Also refer to:
+% \url{https://www.overleaf.com/learn/latex/Single\_sided\_and\_double\_sided\_documents}
+% \normalsize
+%
+% \section{Usage}
+% \subsection{Document preamble}
+% \small
+% \begin{verbatim}
+% \PassOptionsToPackage{
+% % a4paper , % or another recognised paper size
+% % paperheight = , % inherits from class
+% % paperwidth = , % inherits from class
+% % inner = , % default 36pt or 0.5in
+% % outer = , % 36pt or 0.5in
+% % top = , % 36pt or 0.5in
+% % bot = , % 36pt or 0.5in
+% % binding = , % 9pt or 0.125in
+% % outerbleed = , % 0pt, but check with your printer
+% % innerbleed = , % 0pt, but check with your printer
+% % grid = , % 12 it is just a number
+% % marginalgrid = , % 3 it is just a number
+% % marginparsep = , % 3ex, if using sidenotesplus change to 4 or 5ex
+% % headsep = , % inherits from class
+% % headheight = , % inherits from class
+% % footskip= , % inherits from class
+% % show , % a switch to show frames around the printable areas.
+% % fancyhdrOff , % Do not use the fancyhdr package
+% % NoFixMargin % a possible future requirement
+% }{flexipage}
+% \usepackage{flexipage}
+% \end{verbatim}
+% \normalsize\vspace{-20pt}
+%
+% \paragraph{Known Issue:} If using the option |show| and the package \textsf{xcolor}
+% is loaded later with options, an error will occur. The reason
+% is that when option |show| is specified the package \textsf{eso-pic} is loaded
+% whch in turns loads \textsf{xcolor} without options.
+%
+% \paragraph{Marginalia Position Issue:} When doing mid document changes to |\textwidth|
+% and |\marginparwidth| then |\marginpar{content}| renders the marginalia to the correct
+% width but places it at the old position. A patch is provided here
+% to correct this issue. Should this ever be fixed in the
+% latex base software then the |NoFixMargin| option would be required.
+%
+% \paragraph{Using \textsf{fancyhdr} package} By default the \textsf{fancyhdr} package
+% is loaded and the |\headerlength| is set to span the page, that is it overhangs the
+% text body. The advantage here is that the header has the same format throughout
+% the document if mid-document layout changes are made. If no such changes are
+% made then use the |fancyhdrOff| and load \textsf{fancyhdr} in your preamble. Now
+% the header does not overhang the text body and is as shown in the previous illustration.
+%
+%
+% The following paper sizes are recognised:
+%
+% ~
+%
+% \begin{tabular}{rlp{2ex}rl}
+% \multicolumn{2}{c}{Standard Paper} & &\multicolumn{2}{c}{Standard Book} \\
+% a4paper &210$\times$297mm & & US-Trade &6$\times$9in \\
+% a5paper &148$\times$210mm & & UK-B-Format &135$\times$210mm \\
+% b4paper &250$\times$353mm & & US-B-Format &129$\times$198mm \\
+% b5paper &176$\times$250mm & & UK-Royal &156$\times$234mm \\
+% c4paper &229$\times$324mm & & Quarto &9.5$\times$12in \\
+% c5paper &162$\times$229mm & & Octavo &6$\times$9in \\
+% b4jpaper &257$\times$364mm & & CrownQuarto &189$\times$246mm \\
+% b5jpaper &182$\times$257mm & & Demi &138$\times$216mm \\
+% letterpaper &8.5$\times$11in \\
+% legalpaper &8.5$\times$14in \\
+% executivepaper &7.25$\times$10.5in \\
+% \end{tabular}
+
+%
+%\subsection{User Interfaces}
+%
+%
+% \DescribeMacro{\NewMarginPage} Changes text--marginal ratio.
+% |\NewMarginPage|\oarg{g}\lgtarg{parsep}\marg{m}
+% where optionally the grid count is reset to |grid|=\textit{g}, and marginal width is
+% determined by |marginalgrid|=\textit{m}. The ratio of the lengths |\textwidth|
+% to |\marginparwidth| is $g-m$ to $n$. The second option changes the |\parsep| length.
+%
+%
+% \DescribeMacro{\NewFullPage} Continues the document with a new page without margins,
+% and is equivalent to |\NewMarginPage|\marg{0}
+%
+%
+%
+% \DescribeMacro{\OldMarginPage}
+% \DescribeMacro{\ResetFlexiPage} After |\NewMarginPage| or |\NewFullPage| revert to
+% the previous page geometry, these are not stacked. |\ResetFlexiPage| reverts to the layout specified in
+% the initial options
+%
+%
+%
+%
+% \DescribeEnv{Landscape}
+% \DescribeEnv{landscape}
+% These two environments provide landscape layouts. The big |Landscape| provides
+% full text block landscape. The small |landscape| environments respects the
+% portrait orientated marginal space which now is white space. Do not use
+% marginalia in landscape mode.
+%
+% \DescribeMacro{\Landscape}
+% \DescribeMacro{\endLandscape}
+% \DescribeMacro{\landscape}
+% \DescribeMacro{\endlandscape} Alternatives to |\begin{Landscape}| $\cdots$ $\cdots$ |\end{Landscape}|
+% %
+%
+% \section{Implementation}
+%
+% \iffalse
+%<*package>
+% \fi
+%
+% \begin{macrocode}
+\RequirePackage{xparse} % new LaTeX3 syntax to define macros and environments
+\RequirePackage{l3keys2e} % nice way for option processing
+\RequirePackage{calc} % length manipulation
+\RequirePackage{fp} % floating point calculation
+\RequirePackage{ifoddpage}
+\RequirePackage{graphics} % provides landscaping
+\RequirePackage{mparhack} % not needed here, but the user certainly needs it.
+\RequirePackage{etoolbox} % provides \patchcmd
+% ****** \RequirePackage{eso-pic} only loaded later if option show is specified
+\newlength{\fleximarginparsep}
+\newlength{\flx@paperheight}
+\newlength{\flx@paperwidth}
+\newlength{\flx@temp}
+\newlength{\flx@LSfix}
+\setlength{\flx@LSfix}{0pt}
+\newlength{\flx@lsfix}
+\setlength{\flx@lsfix}{0pt}
+\newlength{\flx@textheigt}
+\newlength{\flx@orgtextwidth}
+\newlength{\flx@oldparsep}
+\newlength{\flx@oparsep}
+\newlength{\flx@binding}
+\newlength{\marginparsepodd}
+\newlength{\marginparsepeven}
+\newlength{\flx@inner}
+\newlength{\flx@outer}
+\newlength{\flx@top}
+\newlength{\flx@bot}
+\newlength{\flx@parsep}
+\newlength{\flx@printarea}
+\newlength{\flx@outerbleed}
+\newlength{\flx@innerbleed}
+\setlength{\flx@binding} {9pt}
+\setlength{\flx@inner} {36pt}
+\setlength{\flx@outer} {36pt}
+\setlength{\flx@top} {36pt}
+\setlength{\flx@bot} {45pt}
+\setlength{\flx@parsep}{3ex}
+\setlength{\flx@outerbleed} {0pt}
+\setlength{\flx@innerbleed} {0pt}
+\FPset\flx@m{3}
+\FPset\flx@g{12}
+\newif\ifSF@frame\SF@framefalse
+\newif\ifFix@Margin\Fix@Margintrue
+\newif\ifUse@fancyhdr\Use@fancyhdrtrue
+% \end{macrocode}
+%
+%
+%
+% \begin{macrocode}
+\setlength{\flx@paperheight}{\paperheight}
+\setlength{\flx@paperwidth}{\paperwidth}
+
+\NewDocumentCommand \flx@setpapersize {o o m}{
+\setlength{\flx@paperheight}{#2#3}
+\setlength{\flx@paperwidth}{#2#3}
+}
+
+
+\ExplSyntaxOn
+\keys_define:nn { flexiprint }
+{
+ binding .code:n = \setlength{\flx@binding}{#1},
+ inner .code:n = \setlength{\flx@inner}{#1},
+ outer .code:n = \setlength{\flx@outer}{#1},
+ top .code:n = \setlength{\flx@top}{#1},
+ bot .code:n = \setlength{\flx@bot}{#1},
+ marginparsep .code:n = \setlength{\flx@parsep}{#1},
+ paperheight .code:n = \setlength{\flx@paperheight}{#1},
+ paperwidth .code:n = \setlength{\flx@paperwidth}{#1},
+ outerbleed .code:n = \setlength{\flx@outerbleed}{#1},
+ innerbleed .code:n = \setlength{\flx@innerbleed}{#1},
+ grid .code:n = \FPset\flx@g{#1},
+ marginalgrid .code:n = \FPset\flx@m{#1} ,
+ show .code:n = \SF@frametrue ,
+ NoFixMargin .code:n = \Fix@Marginfalse ,
+ headsep .code:n = \setlength{\headsep}{#1},
+ headheight .code:n = \setlength{\headheight}{#1},
+ footskip .code:n = \setlength{\footskip}{#1},
+ fancyhdrOff .code:n = \Use@fancyhdrfalse,
+ a4paper .code:n = \flx@setpapersize[210][297]{mm},
+ a5paper .code:n = \flx@setpapersize[148][210]{mm},
+ b4paper .code:n = \flx@setpapersize[250][353]{mm},
+ b5paper .code:n = \flx@setpapersize[176][250]{mm},
+ c4paper .code:n = \flx@setpapersize[229][324]{mm},
+ c5paper .code:n = \flx@setpapersize[162][229]{mm},
+ b4jpaper .code:n = \flx@setpapersize[257][364]{mm},
+ b5jpaper .code:n = \flx@setpapersize[182][257]{mm},
+ letterpaper .code:n = \flx@setpapersize[8.5][11]{in},
+ legalpaper .code:n = \flx@setpapersize[8.5][14]{in},
+ executivepaper .code:n = \flx@setpapersize[7.25][10.5]{in},
+ 10x8paper .code:n = \flx@setpapersize[8][10]{in},
+ US-Trade .code:n = \flx@setpapersize[6][9]{in},
+ UK-B-Format .code:n = \flx@setpapersize[135][210]{mm},
+ US-B-Format .code:n = \flx@setpapersize[129][198]{mm},
+ UK-Royal .code:n = \flx@setpapersize[156][234]{mm},
+ Quarto .code:n = \flx@setpapersize[9.5][12]{in},
+ Octavo .code:n = \flx@setpapersize[6][9]{in},
+ CrownQuarto .code:n = \flx@setpapersize[189][246]{mm},
+ Demi .code:n = \flx@setpapersize[138][216]{mm},
+}
+\ProcessKeysOptions { flexiprint }
+
+\DeclareExpandableDocumentCommand{\IfNoValueOrEmptyTF}{ m m m }
+{
+ \IfNoValueTF{#1}
+ {#2}
+ {\tl_if_empty:nTF {#1} {#2} {#3}}
+}
+\ExplSyntaxOff
+
+\FPset\flx@oldg{\flx@g}
+\FPset\flx@oldm{\flx@m}
+\FPset\flx@og{\flx@g}
+\FPset\flx@om{\flx@m}
+\setlength{\flx@oparsep}{\flx@parsep}
+\ifUse@fancyhdr
+ \RequirePackage{fancyhdr}
+ \pagestyle{fancy}
+\fi
+
+\setlength{\flx@oldparsep}{\flx@parsep}
+\setlength{\flx@oparsep}{\flx@parsep}
+\addtolength{\flx@binding}{\flx@innerbleed}
+\global\hoffset=0pt
+\global\voffset=0pt
+
+% \end{macrocode}
+%
+% \begin{macro}{\flx@setpagevertical}
+% \begin{macrocode}
+\NewDocumentCommand \flx@setpagevertical {} {
+ \setlength{\flx@temp}{\flx@paperwidth+\flx@innerbleed+\flx@outerbleed}
+ \global\paperwidth=\flx@temp
+
+ \setlength{\flx@temp}{\flx@paperheight+2\flx@outerbleed}
+ \global\paperheight=\flx@temp
+
+ \setlength{\flx@temp}{\flx@top+\flx@outerbleed-72pt}
+ \setlength{\topmargin}{\flx@temp}
+
+ \setlength{\flx@temp}{\paperheight - \flx@top %
+ - \headheight - \headsep -\footskip - \flx@bot - 2\flx@outerbleed}
+ \setlength{\textheight}{\flx@temp}
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\flx@setpagevertical
+\setlength{\flx@textheigt}{\textheight}
+\newlength{\flx@linewidth}
+% \end{macrocode}
+%
+% \begin{macro}{\flx@setpage}
+% \begin{macrocode}
+
+\NewDocumentCommand \flx@setpage {} {
+ \FPifgt\flx@m0\relax\else\setlength{\flx@parsep}{0pt}\fi
+ \setlength{\flx@temp}{\flx@binding+\flx@inner-72pt}
+ \global\oddsidemargin=\flx@temp
+
+ \setlength{\flx@linewidth}{\paperwidth-\oddsidemargin-\flx@outer-72pt-\flx@outerbleed}
+ \ifUse@fancyhdr
+ \setlength{\headwidth}{\flx@linewidth}
+ \fi
+ \setlength{\flx@printarea}{\flx@linewidth-\flx@parsep}
+ \FPsub\flx@t\flx@g\flx@m
+ \setlength{\flx@temp}{\flx@printarea * \real{\flx@t}/\real{\flx@g} }
+ \global\textwidth=\flx@temp
+
+ \setlength{\flx@temp}{\flx@printarea * \real{\flx@m}/\real{\flx@g} }
+ \global\marginparwidth=\flx@temp
+ \global\marginparsep=\flx@parsep
+ \if@twoside
+ \setlength{\flx@temp}{\flx@outer+\marginparwidth+\marginparsep-1in+\flx@outerbleed}
+ \global\evensidemargin=\flx@temp
+ \else
+ \global\evensidemargin=\oddsidemargin
+ \fi
+ \global\fleximarginparsep=\marginparsep
+ \global\hsize=\textwidth
+}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+\flx@setpage
+\flx@orgtextwidth=\textwidth
+\FPset\flx@oldg\flx@g
+\FPset\flx@oldm\flx@m
+\setlength{\flx@oparsep}{\flx@parsep}
+\setlength{\flx@oldparsep}{\flx@parsep}
+% \end{macrocode}
+%
+%
+% \begin{macro}{\NewMarginPage}
+% \begin{macrocode}
+\NewDocumentCommand \NewMarginPage {o d<> m} {
+ \FPset\flx@oldg\flx@g
+ \FPset\flx@oldm\flx@m
+ \setlength{\flx@oldparsep}{\flx@parsep}
+ \ResetFlexiPage
+ \IfNoValueOrEmptyTF{#2}{\relax}{\setlength{\flx@parsep}{#2} }
+ \IfNoValueOrEmptyTF{#1}{\relax}{\FPset\flx@g{#1}}
+ \FPset\flx@m{#3}
+ \flx@setpage
+ \flx@marginparcorrection
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\OldMarginPage}
+% \begin{macrocode}
+\NewDocumentCommand \OldMarginPage {} {
+ \FPset\flx@m\flx@oldm
+ \FPset\flx@g\flx@oldg
+ \flx@ResetFlexiPage
+ \setlength{\flx@parsep}{\flx@oldparsep}
+ \flx@setpage
+ \flx@marginparcorrection
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\NewFullPage}
+% \begin{macrocode}
+\NewDocumentCommand \NewFullPage {}{
+ \FPset\flx@oldg\flx@g
+ \FPset\flx@oldm\flx@m
+ \setlength{\flx@oldparsep}{\flx@parsep}
+ \flx@ResetFlexiPage
+ \FPset\flx@m{0}
+ \setlength{\flx@parsep}{0pt}
+ \flx@setpage
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\ResetFlexiPage}
+% \begin{macrocode}
+\NewDocumentCommand \ResetFlexiPage{} {
+ \FPset\flx@oldg\flx@g
+ \FPset\flx@oldm\flx@m
+ \flx@ResetFlexiPage
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\flx@ResetFlexiPage}
+% \begin{macrocode}
+\NewDocumentCommand \flx@ResetFlexiPage{} {
+ \clearpage
+ \FPset\flx@g\flx@og
+ \FPset\flx@m\flx@om
+ \setlength{\flx@parsep}{\flx@oparsep}
+ \flx@setpage
+ \flx@marginparcorrection
+}
+% \end{macrocode}
+% \end{macro}%
+%
+% \begin{macro}{\Landscape}
+% \begin{macrocode}
+\NewDocumentCommand \Landscape {}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+{
+ \FPset\flx@oldm\flx@m
+ \FPset\flx@oldg\flx@g
+ \setlength{\flx@oldparsep}{\flx@parsep}
+ \clearpage
+ \setlength{\flx@LSfix}{\textheight-\flx@linewidth}
+ \FPset\flx@m{0}
+ \setlength{\flx@parsep}{0ex}
+ \flx@setpage
+ \flx@landscape
+}
+% \end{macrocode}
+%
+% \begin{macro}{\endLandscape}
+% \begin{macrocode}
+\NewDocumentCommand \endLandscape {}
+{
+ \flx@endlandscape
+ \FPset\flx@m\flx@oldm
+ \FPset\flx@g\flx@oldg
+ \setlength{\flx@parsep}{\flx@oldparsep}
+ \flx@setpage
+ \setlength{\flx@LSfix}{0pt}
+ \flx@marginparcorrection
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% \begin{macro}{\landscape}
+% \begin{macrocode}
+\NewDocumentCommand \landscape {}
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macrocode}
+{
+ \FPset\flx@oldm\flx@m
+ \FPset\flx@oldg\flx@g
+ \setlength{\flx@oldparsep}{\flx@parsep}
+ \clearpage
+ \setlength{\flx@LSfix}{\textheight-\textwidth}
+ \FPset\flx@m{0}
+ \setlength{\flx@parsep}{0ex}
+ \flx@landscape
+}
+% \end{macrocode}
+%
+% \begin{macro}{\endlandscape}
+% \begin{macrocode}
+\NewDocumentCommand \endlandscape {}
+{
+ \flx@endlandscape
+ \FPset\flx@m\flx@oldm
+ \FPset\flx@g\flx@oldg
+ \setlength{\flx@parsep}{\flx@oldparsep}
+ \flx@setpage
+ \setlength{\flx@LSfix}{0pt}
+ \flx@marginparcorrection
+}
+% \end{macrocode}
+% \end{macro}
+%
+%
+% If the page layout includes a marginal these lscape.sty package
+% respect these
+%
+%
+% \begin{macrocode}
+%
+
+\def\flx@LS@rot{%
+ \setbox\@outputbox\vbox{\hbox{\rotatebox{90}{\box\@outputbox}}}}
+
+\def\flx@landscape{%
+ \let\flx@LS@makecol=\@makecol
+ \let\flx@LS@makefcolumn=\@makefcolumn
+ \clearpage
+ \begingroup
+ \global\vsize=\textwidth
+ \global\hsize=\textheight
+ \linewidth=\hsize
+ \columnwidth=\hsize
+ \@colroom=\vsize
+ \textheight=\vsize
+ \@colht=\vsize
+ \def\@makecol{\flx@LS@makecol\flx@LS@rot}%
+ \def\@makefcolumn##1{\flx@LS@makefcolumn{##1}\flx@LS@rot}}
+
+\def\flx@endlandscape{%
+ \clearpage
+ \endgroup
+ \global\@colht=\textheight
+ \global\vsize=\textheight
+ \global\@colroom=\textheight}
+%
+% \end{macrocode}
+%
+%
+%
+% \begin{macro}{\flx@marginparcorrection }
+%
+% Mid-document changes to textwidth are not communicated the LaTeX marginpar
+% routines hence the patch to correct the odd-side marginparsep.
+%
+% lifted from https://tex.stackexchange.com/questions/174605
+%
+% % \end{macro}
+%
+%
+% \begin{macrocode}
+\NewDocumentCommand\flx@marginparcorrection{}{
+\ifFix@Margin
+ \setlength{\marginparsepodd}{\marginparsep-\flx@orgtextwidth+\textwidth}
+ \setlength{\marginparsepeven}{\marginparsep}
+ \patchcmd{\@addmarginpar}%In this command
+ {\mph@orig@addmarginpar}%...replace this...
+ {\if@twoside\ifodd\c@page\relax%...with this
+ \marginparsep=\marginparsepodd%Page isodd
+ \else%twoside and eveb
+ \marginparsep=\marginparsepeven%Page iseven
+ \fi
+ \else% oneside
+ \marginparsep=\marginparsepodd
+ \fi
+ \mph@orig@addmarginpar}
+ {}%success
+ {\message{Error! Couldn't hook into command %failure
+ `\string\@addmarginpar'}} %end patch command
+
+ {
+ \def\patcherr{%
+ \message{Error!Couldn't hook into command`\string\@mn@@@marginnote'}}
+ \def\patchok{%
+ \let\patcherr\relax%Only display error if first patch fails
+ \patch%Now patch again.
+ }
+ \def\patch{
+ \patchcmd{\@mn@@@marginnote}%In this command
+ {\kern\marginparsep}%...replace this...
+ {\ifx\@mn@currpage\relax\else%...with this
+ \if@twoside\ifodd\@mn@currpage\relax
+ \kern\marginparsepodd%Page is odd
+ \else
+ \kern\marginparsepeven
+ \fi
+ \else% one side
+ \kern\marginparsepodd
+ \fi
+ \fi}
+ {\message{Patched!}\patchok}%success(recurse)
+ {\patcherr}%fail
+ }
+ \message{Patching`\string\@mn@@@marginnote`!}
+ \patch
+ \global\let\@mn@@@marginnote\@mn@@@marginnote%Makepatch global
+ }
+\fi
+}
+% \end{macrocode}
+%
+%
+% The package showframe.sty is adapted and localised
+%
+%
+% \begin{macrocode}
+\ifSF@frame\RequirePackage{eso-pic}\fi % so that below code can draw frames
+
+\ifSF@frame\AddToShipoutPictureBG{\flx@ShowFramePicture}\fi
+
+\newcommand*\flx@framecolor{\color{green}}
+\newcommand*\flx@frameline{.8pt}
+\newdimen\SF@tempdima
+
+\newcommand\flx@ShowFramePicture{%
+ \begingroup
+ \color{orange}\linethickness{\flx@frameline}%
+ \if@twoside
+ \ifodd\c@page
+ \AtPageUpperLeft{%
+ \put(\flx@innerbleed,-\paperheight+\flx@outerbleed){%
+ \framebox(\paperwidth-\flx@outerbleed-\flx@innerbleed,\paperheight-2\flx@outerbleed){}}}%
+ \else
+ \AtPageUpperLeft{%
+ \put(\flx@outerbleed,-\paperheight+\flx@outerbleed){%
+ \framebox(\paperwidth-\flx@outerbleed-\flx@innerbleed,\paperheight-2\flx@outerbleed){}}}%
+ \fi
+ \else
+ \AtPageUpperLeft{%
+ \put(\flx@innerbleed,-\paperheight+\flx@outerbleed){%
+ \framebox(\paperwidth-\flx@outerbleed-\flx@innerbleed,\paperheight-2\flx@outerbleed){}}}%
+ \fi
+ \flx@framecolor\linethickness{\flx@frameline}%
+ \AtTextLowerLeft{%
+ \put(0,-\flx@LSfix){\framebox(\textwidth,\textheight+\flx@LSfix){}}}%
+
+\ifUse@fancyhdr
+ \if@twoside
+ \ifodd\c@page
+ \AtPageUpperLeft{%
+ \put(\flx@inner+\flx@binding,-\flx@outerbleed-\flx@top-\headheight){%
+ \framebox(\flx@linewidth,\headheight){}}}%
+ \AtPageUpperLeft{%
+ \put(\flx@inner+\flx@binding,%
+ -\flx@outerbleed-\flx@top-\headheight-\headsep-\textheight%
+ -\footskip -\flx@LSfix){%
+ \line(1,0){\flx@linewidth}}}%
+ \else
+ \AtPageUpperLeft{%
+ \put(\flx@outer+\flx@outerbleed,-\flx@outerbleed-\flx@top-\headheight){%
+ \framebox(\flx@linewidth,\headheight){}}}%
+ \AtPageUpperLeft{%
+ \put(\flx@outer+\flx@outerbleed,%
+ -\flx@outerbleed-\flx@top-\headheight-\headsep-\textheight%
+ -\footskip -\flx@LSfix){%
+ \line(1,0){\flx@linewidth}}}%
+
+ \fi
+ \else
+ \AtPageUpperLeft{%
+ \put(\flx@inner+\flx@binding,-\flx@outerbleed-\flx@top-\headheight){%
+ \framebox(\flx@linewidth,\headheight){}}}%
+ \AtPageUpperLeft{%
+ \put(\flx@inner+\flx@binding,%
+ -\flx@outerbleed-\flx@top-\headheight-\headsep-\textheight%
+ -\footskip -\flx@LSfix){%
+ \line(1,0){\flx@linewidth}}}%
+ \fi
+%
+\else
+ \AtTextUpperLeft{%
+ \put(0,\headsep){%
+ \framebox(\textwidth,\headheight){}}}%
+ \AtTextLowerLeft{%
+ \put(0,-\footskip-\flx@LSfix){%
+ \line(1,0){\textwidth}}}%
+\fi
+%
+\FPifgt\flx@m 0{%
+ \AtTextLowerLeft{%
+ \SF@tempdima=\textwidth\advance\SF@tempdima\marginparsep%
+ \if@twoside
+ \ifodd\c@page\else
+ \if@mparswitch
+ \SF@tempdima=-\marginparsep\advance\SF@tempdima-\marginparwidth
+ \fi
+ \fi
+ \fi
+ \put(\SF@tempdima,0)%
+ {\framebox(\marginparwidth,\textheight){}}%
+ }%
+ }\fi
+ \endgroup
+}
+% \end{macrocode}
+%
+%
+% \iffalse
+%</package>
+% \fi
+%
+% \Finale
+\endinput
diff --git a/macros/latex/contrib/flexipage/flexipage.ins b/macros/latex/contrib/flexipage/flexipage.ins
new file mode 100644
index 0000000000..bac888a859
--- /dev/null
+++ b/macros/latex/contrib/flexipage/flexipage.ins
@@ -0,0 +1,64 @@
+%% Copyright (C) 2022 by Anton Vrba
+%%
+%% Home Page: https://github.com/anton-vrba/sidenotesplus
+%% Issues: https://github.com/anton-vrba/sidenotesplus/issues
+%% --------------------------------------------------------------------------
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Anton Vrba.
+%%
+%% This work consists of the files sidenotesplus.dtx and sidenotesplus.ins
+%% and the derived filebase sidenotesplus.sty.
+%%
+
+\input docstrip.tex
+\keepsilent
+
+
+\preamble
+
+ Copyright (C) 2022 by Anton Vrba
+ --------------------------------
+
+ This work may be distributed and/or modified under the
+ conditions of the LaTeX Project Public License, either version 1.3
+ of this license or (at your option) any later version.
+ The latest version of this license is in
+ http://www.latex-project.org/lppl.txt
+ and version 1.3c or later is part of all distributions of LaTeX
+ version 2008-05-04 or later.
+
+
+ This work has the LPPL maintenance status `maintained'.
+
+ The Current Maintainer of this work is Anton Vrba.
+
+
+\endpreamble
+
+\generate{\file{flexipage.sty}{\from{flexipage.dtx}{package}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* sidenotesplus.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file sidenotesplus.dtx *}
+\Msg{* through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/macros/latex/contrib/flexipage/flexipage.pdf b/macros/latex/contrib/flexipage/flexipage.pdf
new file mode 100644
index 0000000000..50018e6bfd
--- /dev/null
+++ b/macros/latex/contrib/flexipage/flexipage.pdf
Binary files differ
diff --git a/macros/latex/contrib/inlinelabel/README.md b/macros/latex/contrib/inlinelabel/README.md
index ea7e66799c..ed2838e8d4 100644
--- a/macros/latex/contrib/inlinelabel/README.md
+++ b/macros/latex/contrib/inlinelabel/README.md
@@ -5,7 +5,7 @@ This package can assign equation numbers to inline equations. When Japanese is s
## Documents
-Documents for this pacakge are available in English and Japanese.
+Documents for this package are available in English and Japanese.
## License
@@ -17,6 +17,9 @@ This package released under [the MIT license](https://ctan.org/license/mit).
## Revision History
++ Version 1.2.1 2022-07-08
+ + Add the .tex source of the documentation.
+ + Improve the documentation.
+ Version 1.2 2022-07-08
+ Add the \equationreset.
+ Improve the documentation.
diff --git a/macros/latex/contrib/inlinelabel/inlinelabel.pdf b/macros/latex/contrib/inlinelabel/inlinelabel.pdf
index 4aef9a8f7d..253ea95264 100644
--- a/macros/latex/contrib/inlinelabel/inlinelabel.pdf
+++ b/macros/latex/contrib/inlinelabel/inlinelabel.pdf
Binary files differ
diff --git a/macros/latex/contrib/inlinelabel/inlinelabel.sty b/macros/latex/contrib/inlinelabel/inlinelabel.sty
index d249d60ad3..384c7fddb4 100644
--- a/macros/latex/contrib/inlinelabel/inlinelabel.sty
+++ b/macros/latex/contrib/inlinelabel/inlinelabel.sty
@@ -10,7 +10,7 @@
%%
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{inlinelabel}[2022/07/08 v1.2]
+\ProvidesPackage{inlinelabel}[2022/07/08 v1.2.1]
%
% When you meet ''Package pxufont Error: You must load this package
% after 'otf'.'', move \usepackage{otf} to a forward row.
diff --git a/macros/latex/contrib/inlinelabel/inlinelabel.tex b/macros/latex/contrib/inlinelabel/inlinelabel.tex
new file mode 100644
index 0000000000..66f961ce7b
--- /dev/null
+++ b/macros/latex/contrib/inlinelabel/inlinelabel.tex
@@ -0,0 +1,373 @@
+\documentclass[%
+fleqn,%
+paper=a4paper,%
+fontsize=10pt,%
+open_bracket_pos=zenkakunibu_nibu,%
+hanging_punctuation,%
+]%
+{jlreq}
+\jlreqsetup{%
+itemization_beforeafter_space=0pt,%
+itemization_itemsep=0pt%
+}
+\makeatletter
+\RequirePackage{luatexja}
+\RequirePackage{luatexja-otf}
+\RequirePackage{graphicx}
+\RequirePackage{amsmath}
+\DeclareRobustCommand{\metaphysicaicon}{\raisebox{-4.0pt}{\includegraphics[width=16pt]{metaphysicaicon.pdf}}}
+\RequirePackage[normalem]{ulem}
+\RequirePackage[explicit]{titlesec}
+\titleformat{\section}[hang]{}{}{0pt}{\uuline{\raisebox{1pt}{\textsf{\thesection\quad #1}}}}[\vspace{0.35\baselineskip}]
+\renewcommand{\thesection}{\S\,\arabic{section}}
+\let\originalsection\section
+\DeclareRobustCommand{\section}{\@ifstar{\@metaphysica@section@star}{\@metaphysica@section@nostar}}
+\DeclareRobustCommand{\@metaphysica@section@star}[1]{\vspace{0.5\baselineskip}\originalsection{#1}\vspace*{-\baselineskip}}
+\DeclareRobustCommand{\@metaphysica@section@nostar}[1]{\vspace{0.5\baselineskip}\originalsection{#1}}
+\RequirePackage[%
+truedimen,%
+margin=30truemm,
+includehead%
+]{geometry}
+\RequirePackage{lastpage}
+\RequirePackage{fancyhdr}
+\pagestyle{fancy}
+\DeclareRobustCommand{\headertitle}[2][\metaphysicaicon]{%
+\rhead[#2]{#1{}\quad\thepage{}/{}\pageref{LastPage}}%
+\lhead[\thepage{}/{}\pageref{LastPage}\quad{}#1]{#2}%
+\cfoot{}%
+}
+\RequirePackage{setspace}
+\setstretch{1.155}
+\DeclareRobustCommand{\linespace}{\@ifstar{\vspace{\baselineskip}}{\vspace{0.25\baselineskip}}}
+\DeclareRobustCommand{\linesmash}{\@ifstar{\vspace{-\baselineskip}}{\vspace{-0.25\baselineskip}}}
+\AtBeginDocument{%
+\abovedisplayskip =0.125\abovedisplayskip
+\abovedisplayshortskip=0.125\abovedisplayshortskip
+\belowdisplayskip =0.125\belowdisplayskip
+\belowdisplayshortskip=0.125\belowdisplayshortskip}
+\setlength{\jot}{0pt}%
+\setlength{\mathindent}{2\zw}%
+\renewcommand{\floatpagefraction}{0.75}
+\allowdisplaybreaks[2]
+\RequirePackage[no-math]{fontspec}
+\RequirePackage[no-math,deluxe,haranoaji]{luatexja-preset}
+\RequirePackage{multicolpar}
+\RequirePackage[style=iso]{datetime2}
+\RequirePackage[unicode]{hyperref}
+\RequirePackage{xparse}
+\RequirePackage{dashbox}
+\newcounter{psuedosectioncounter}
+\setcounter{psuedosectioncounter}{1}
+\newcounter{psuedocontentscounter}
+\setcounter{psuedocontentscounter}{1}
+\DeclareRobustCommand{\psuedosection}[3]{%
+\hypertarget{#1}{\mbox{}}\begin{multicolpar}{2}%
+\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #2}}}}
+
+\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #3}}}}
+\end{multicolpar}%
+\stepcounter{psuedosectioncounter}%
+\vspace{\baselineskip}%
+}
+\DeclareRobustCommand{\psuedocontents}[3]{%
+\begin{multicolpar}{2}%
+\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #2}}}
+
+\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #3}}}\end{multicolpar}%
+\stepcounter{psuedocontentscounter}%
+}
+\newenvironment{translateing}%
+{\begin{multicolpar}{2}}
+{\end{multicolpar}\vspace{\baselineskip}}
+\DeclareRobustCommand{\maketitletranslating}%
+{\maketitle\thispagestyle{fancy}
+\vspace{\baselineskip}\begin{multicolpar}{2}
+\textsf{English}
+
+\noindent
+\textsf{日本語 (Japanese)}
+\end{multicolpar}\vspace{\baselineskip}}
+\NewDocumentCommand\macroexplanation{v}{%
+\noindent\hspace*{\fill}{\texttt{#1}}\hspace*{\fill}\linespace%
+}
+\NewDocumentEnvironment{macroexample}{O{0.625} +b}{%
+\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{%
+#2%
+}}\hspace*{\fill}}%
+{\vspace{\baselineskip}}
+\NewDocumentEnvironment{macroexample*}{O{0.625} m +b}{%
+\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{%
+\vspace{-0.5\baselineskip}\begin{#2}%
+#3
+\end{#2}%
+}}\hspace*{\fill}}
+{\vspace{\baselineskip}}
+\let\code\texttt
+\setlength{\fboxsep}{1em}
+\setstretch{1.05}
+\DeclareRobustCommand{\commandtojskip}{\hspace{2.40554pt plus 1.49994pt minus 0.59998pt}}
+\RequirePackage{listings, jlisting}
+\lstset{
+ language=[LaTeX]TeX,
+ basicstyle={\ttfamily},
+ identifierstyle={\small},
+ commentstyle={\small\itshape},
+ keywordstyle={\small\bfseries},
+ ndkeywordstyle={\small},
+ stringstyle={\small\ttfamily},
+ frame=single,
+ breaklines=true,
+ columns=[l]{fullflexible},
+ stepnumber=1,
+ xrightmargin=0.1709\textwidth,
+ xleftmargin=0.1709\textwidth,
+ lineskip=-0.5ex
+}
+\RequirePackage{bxtexlogo}
+\RequirePackage{shortvrb}
+\MakeShortVerb{\|}
+\RequirePackage[luacircled]{inlinelabel}
+\makeatother
+%
+\hypersetup{%
+bookmarksnumbered=true,%
+colorlinks=true,%
+linkcolor=blue,%
+urlcolor=blue,%
+setpagesize=false,%
+pdftitle={The inlinelabel package},%
+pdfauthor={Yukoh KUSAKABE},%
+pdfsubject={The inlinelabel package},%
+pdfkeywords={TeX LaTeX inlinel label}}
+\title{The \code{inlinelabel} package:\\[0.25\baselineskip]
+assign equation numbers to inline equations}
+\author{Yukoh KUSAKABE}
+%\author{Y\=uk\=o KUSAKABE}
+\date{\today}
+\headertitle[Yukoh KUSAKABE\quad\metaphysicaicon]{The \code{inlinelabel} package}
+%\headertitle[Y\=uk\=o KUSAKABE\quad\metaphysicaicon]{The \code{inlinelabel} package}
+\begin{document}
+\maketitletranslating
+
+\begin{translateing}
+This package can assign equation numbers to inline equations. When Japanese is supported, you can switch to circled equation numbers.
+
+このパッケージは,インライン数式に数式番号を振ることができます。また,日本語を扱えるときには,丸で囲まれた数式番号に切り替えることができます。
+\end{translateing}
+
+%\psuedocontents{inlinelabel}
+%{Package \code{inlinelabel}}
+%{\code{inlinelabel} パッケージ}
+
+\psuedocontents{Requirements}{System Requirements}{前提条件}
+
+\psuedocontents{Installation}{Installation}{インストール}
+
+\psuedocontents{Loading}{Loading}{読み込み}
+
+\psuedocontents{Usage}{Usage}{使用方法}
+
+\psuedocontents{moreinfo}{For More Information}{問い合わせ・詳しくは}
+
+%\psuedosection{inlinelabel}{Package \code{inlinelabel}}{\code{inlinelabel} パッケージ}
+%
+%\begin{translateing}
+%This package can assign equation numbers to inline equations. When Japanese is supported, you can switch to circled equation numbers.
+%
+%このパッケージは,インライン数式に数式番号を振ることができます。また,日本語を扱えるときには,丸で囲まれた数式番号に切り替えることができます。
+%\end{translateing}
+
+\psuedosection{Requirements}{System Requirements}{前提条件}
+
+\begin{translateing}
+\textbullet\ \LaTeXe\ format\\
+\textbullet\ \code{amsmath} package\\
+\textbullet\ \code{refcount} package\\
+\textbullet\ \pTeX\ engine (\code{[circled]} only)\\
+\textbullet\ \code{japanese-otf} package (\code{[circled]} only)\\
+\textbullet\ \LuaTeX\ engine (\code{[luacircled]} only)\\
+\textbullet\ \scalebox{0.95}[1]{\code{luatexja-otf} package (\code{[luacircled]} only)}
+
+\noindent
+\textbullet\ \LaTeXe フォーマット\\
+\textbullet\ \code{amsmath} パッケージ\\
+\textbullet\ \code{refcount} パッケージ\\
+\textbullet\ \pTeX エンジン(\code{[circled]}使用時)\\
+\textbullet\ \scalebox{0.9}[1]{\code{japanese-otf} パッケージ(\code{[circled]}使用時)}\\
+%\textbullet\ \code{luatexja-otf} パッケージ\\
+%\hfill (\code{[luacircled]}使用時)
+\textbullet\ \LuaTeX エンジン(\code{[luacircled]}使用時)\!\\
+\textbullet\ \scalebox{0.8375}[1]{\code{luatexja-otf} パッケージ(\code{[luacircled]}使用時)}
+\end{translateing}
+
+\newpage
+\psuedosection{Installation}{Installation}{インストール}
+
+\begin{translateing}
+If not available, move inlinelabel.sty file to\\\code{\$TEXMF/tex/latex/inlinelabel}.
+
+直ちに使えなければ,inlinelabel.sty を\\\code{\$TEXMF/tex/latex/inlinelabel}\\%(\TeX が見つけられる場所)
+に置いてください。
+\end{translateing}
+
+\psuedosection{Loading}{Loading}{読み込み}
+
+\begin{translateing}
+To use this package, load .sty file with |\usepackage{inlinelabel}| command in
+preamble.
+
+このパッケージを使用するには,プリアンブルに\commandtojskip|\usepackage{inlinelabel}|\commandtojskip と書いてください。
+%\end{translateing}
+
+%\begin{translateing}
+There are three options:\\
+\textbullet\ |[nospace]| swaps with no space command and with space command.\\
+\textbullet\ |[circled]| switches to circled equation numbers on \pLaTeX, which is an engine for Japanese.\\
+\textbullet\ |[luacircled]| switches to circled equation numbers on \LuaLaTeX\ (and Japanese environment required).
+
+3つのオプションがあります。\\
+\textbullet\ |[nospace]|はスペースなし命令とスペースあり命令が入れ替えます。\\
+\textbullet\ |[circled]|は丸で囲まれた数式番号に切り替えます(\pLaTeX 用)。\\
+\textbullet\ |[luacircled]|は丸で囲まれた数式番号に切り替えます(\LuaLaTeX 用)。
+\end{translateing}
+
+
+
+\psuedosection{Usage}{Usage}{使用方法}
+
+\macroexplanation{\inlinelabel{<label>}}
+
+\begin{translateing}
+This command puts the inline equation number. It takes the name of the label as an argument. Place it outside of the equation (outside of the \$--\$). It makes a small margin before and after the text to make it look natural (in Japanese). If you don't want margins, use |\inlinelabel*{<label>}|.
+
+インラインの数式番号を置きます。引数にラベルの名前を取ります。数式(\$--\$)の外に置いてください。自然に見せるために,前後に少しの余白を取ります。余白がいらないときは\commandtojskip|\inlinelabel*{<label>}|\commandtojskip を使ってください。
+%
+%If you don't want margins (not in Japanese), use |\inlinelabel*{<label>}|.
+%
+%日本語組版を念頭に作っていますので,英語では |\inlinelabel*{<label>}| を使って原稿でスペースを入れるのが自然でしょう。
+
+For inconvenience, there is the |[nospace]| option.
+In this case, |\inlinelabel{<label>}| is swapped with no space and |\inlinelabel*{<label>}| has space.
+
+それが面倒なときのために,|[nospace]|オプションが用意されています。
+このとき,|\inlinelabel{<label>}|\commandtojskip がスペースなし,|\inlinelabel*{<label>}|\commandtojskip がスペースありに入れ替わります。
+\end{translateing}
+
+\begin{lstlisting}
+An inlinelabel makes
+$e^{i\theta}=\cos\theta+i\sin\theta$\inlinelabel{test1}.
+
+An asterisked one makes
+$e^{i\pi}+1=0$\inlinelabel*{test2}.
+\end{lstlisting}
+
+\begin{macroexample}
+An inlinelabel makes $e^{i\theta}=\cos\theta+i\sin\theta$\hspace{0.5em}(1)\hspace{0.5em}.
+
+An asterisked one makes $e^{i\pi}+1=0$(2).
+\end{macroexample}
+
+\begin{translateing}
+The |<label>| can be used for |\ref|.
+
+|<label>|\commandtojskip を\commandtojskip|\ref|で使うことができます。
+\end{translateing}
+
+\begin{lstlisting}
+Substituting $\theta=\pi$
+for (\ref{test1}) yields (\ref{test2}).
+\end{lstlisting}
+
+\begin{macroexample}
+Substituting $\theta=\pi$ for (\ref*{test1}) yields (\ref*{test2}).
+\end{macroexample}
+
+\macroexplanation{Options [circled] [luacircled]}
+
+\begin{translateing}
+Assuming you are using a Japanese environment. Switch to circled equation numbers. All equation numbers are rewritten, not just the inline equation numbers.
+
+あなたが日本語の環境を使用していることを前提とします。丸で囲まれた数式番号に切り替えます。インラインの数式番号だけでなく,すべての数式番号が書き換えられます。
+
+When using \pLaTeX\ with the \code{japanese-otf} package, specify \code{[circled]}; when using \LuaLaTeX\ with the \code{luatexja-otf} package, specify \code{[luacircled]}.
+
+\pLaTeX を使っているときは,\code{japanese-otf} パッケージの読み込みとともに\code{[circled]}オプションを指定してください。
+\LuaLaTeX を使っているときは,\code{luatexja-otf} パッケージの読み込みとともに\code{[luacircled]}オプションを指定してください。
+\end{translateing}
+%
+%\begin{lstlisting}
+%$e^{i\theta}=\cos\theta+i\sin\theta$\inlinelabel{test1}はテストです。
+%
+%アスタリスクをつけると$e^{i\pi}+1=0$\inlinelabel*{test2}です。
+%\end{lstlisting}
+
+\begin{macroexample}
+$e^{i\theta}=\cos\theta+i\sin\theta$\inlinelabel{test1}はテストです。
+
+アスタリスクをつけると$e^{i\pi}+1=0$\inlinelabel*{test2}です。
+\end{macroexample}
+
+\begin{translateing}
+The following example is just an align environment.
+
+次の例は単なる align 環境です。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{align}
+&\phantom{=}\log_{3}x+\log_{3}(6-x)\\
+&=\log_{3}x(6-x)\\
+&=\log_{3}(-(x-3)^{2}+9)
+\end{align}
+\end{lstlisting}
+
+%\equationreset
+\begin{macroexample*}{align}
+&\phantom{=}\log_{3}x+\log_{3}(6-x)\\
+&=\log_{3}x(6-x)\\
+&=\log_{3}(-(x-3)^{2}+9)
+\end{macroexample*}
+
+\macroexplanation{\circledref{<label>} \equationref{<label>}}
+
+\begin{translateing}
+These commands are only valid when \code{[circled]} or \code{[luacircled]} option is loaded.
+They refer to the circled equation number.
+
+\code{[circled]}または\code{[luacircled]}オプションを読み込んでいるときにのみ有効です。
+丸で囲まれた数式番号を参照します。
+\end{translateing}
+
+\begin{translateing}
+|\equationref| is synonym with |\circledref|.
+
+|\equationref|は\commandtojskip|\circledref|の別名です。
+\end{translateing}
+
+\begin{lstlisting}
+Substituting $\theta=\pi$
+for \equationref{test1} yields \equationref{test2}.
+\end{lstlisting}
+
+\begin{macroexample}
+Substituting $\theta=\pi$ for \equationref{test1} yields \equationref{test2}.
+\end{macroexample}
+
+\macroexplanation{\equationreset}
+
+\begin{translateing}
+Reset the equation number back to 1.
+
+数式番号を1に戻します。
+\end{translateing}
+
+\psuedosection{moreinfo}{For More Information}{問い合わせ・詳しくは}
+
+\noindent\hspace*{\fill}\begin{tabular}{rl}
+The inlinelabel package:&\url{https://www.metaphysica.info/technote/package_inlinelabel/}\\
+Yukoh KUSAKABE:&\url{https://www.metaphysica.info/}\\
+&\url{https://twitter.com/metaphysicainfo}\\
+&(screen-name, 日下部幽考 in Japanese)
+\end{tabular}\hspace*{\fill}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/jpneduenumerate/README.md b/macros/latex/contrib/jpneduenumerate/README.md
index 216b463305..aec10d0b35 100644
--- a/macros/latex/contrib/jpneduenumerate/README.md
+++ b/macros/latex/contrib/jpneduenumerate/README.md
@@ -1,31 +1,28 @@
-# Jpneduenumerate Package
+# jpneduenumerate
Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces enumerative expressions in Japanese education.
-## System Requirements
+## Documents
-+ TeX format: LaTeX
-+ TeX engine: pTeX, upTeX
-+ Prerequisite package: enumitem, japanese-otf and refcount
-
-Since the unit zw is used, it can be used only in the pTeX series.
-
-
-## Installation
-
-Move jpneduenumerate.sty file to $TEXMF/tex/latex/jpneduenumerate.
+Documents for this package are available in English and Japanese.
## License
This package released under [the MIT license](https://ctan.org/license/mit).
+(C) 2022 Yukoh KUSAKABE
+
## Revision History
-+ Version 1.0 2022-06-29
- + The first public version.
++ Version 1.1 2022-07-09
+ + Rewrite README.
+ + Add the document (jpneduenumerate.pdf).
+ + Add the [lua] option.
++ Version 1.0 2022-06-28
+ + The first public version.
---
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate-en.md b/macros/latex/contrib/jpneduenumerate/jpneduenumerate-en.md
deleted file mode 100644
index a8e6658084..0000000000
--- a/macros/latex/contrib/jpneduenumerate/jpneduenumerate-en.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Jpneduenumerate Package
-
-Mathematical equation representation in Japanese education differs somewhat from the standard LaTeX writing style. This package introduces enumerative expressions in Japanese education.
-
-
-## System Requirements
-
-+ TeX format: LaTeX
-+ TeX engine: pTeX, upTeX
-+ Prerequisite package: enumitem, japanese-otf and refcount
-
-Since the unit zw is used, it can be used only in the pTeX series.
-
-
-## Installation
-
-Move jpneduenumerate.sty file to $TEXMF/tex/latex/jpneduenumerate.
-
-
-## Usage
-
-### astarisked environments
-
-The environment we will describe can be replaced with asterisked ones to eliminate the parindent.
-
-
-### environment enumerate and itemize
-
-The margins in the enumerate and itemize environments are automatically changed when the package is loaded. The symbols in the enumerate and itemize environments are automatically changed when the package is loaded. \labelenumi is (1), \labelenumii is (a), and \item is text bullet.
-
-
-### environment romanenumerate and caseenumerate
-
-This environment replaces the symbol (i) in the enumerate environment. caseenumerate is another name for romanenumerate.
-
-
-### environment Romanenumerate and stepenumerate
-
-This environment replaces the symbol (I) in the enumerate environment. stepenumerate is another name for Romanenumerate.
-
-
-### \parenref{<label>}
-
-Referred to as (1) depending on the label.
-
-
-### \romanref{<label>}
-
-Referred to as i depending on the label.
-
-
-### \parenromanref{<label>}
-
-Referred to as (i) depending on the label.
-
-
-### \Romanref{<label>}
-
-Referred to as I depending on the label.
-
-
-### \parenRomanref{<label>}
-
-Referred to as (I) depending on the labe
-
-
-### \??auto \??keep \??reset \??ref{<label>}
-
-\??auto outputs headings that automatically advance in numbering. \??keep outputs the heading with the previous number. \??reset resets the heading number back to 1. \??ref referred to as (1) depending on the label. \??ref{<label>} is referenced by label. The ?? parts can be the following:
-
-+ square (framed by square)
-+ question (another name for square)
-+ enumerate (1)
-+ subquestion (1)
-+ case (i)
-+ step (I)
-
-
-Non-asterisked commands are heading. Asterisked commands are not heading.
-
-\case is another name for \caseauto.
-
-\step is another name for \stepauto.
-
-
-### \equationreset
-
-Reset the equation number back to 1.
-
-
-### \question
-
-\questionauto and reset the equation, subquestion, enumerate, case and step numbers back to 1. \question* is another name for \questionauto*.
-
-
-### \subquestion
-
-\subquestion and reset the case and step numbers back to 1. \subquestion* is another name for \subquestionauto*.
-
-
-## License
-
-This package released under [the MIT license](https://ctan.org/license/mit).
-
-
-## Revision History
-
-+ Version 1.0 2022-06-29
- + The first public version.
-
-
----
-
-[Yukoh KUSAKABE](https://twitter.com/metaphysicainfo) (screen-name) at [metaphysica.info](https://www.metaphysica.info/) \ No newline at end of file
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate-ja.md b/macros/latex/contrib/jpneduenumerate/jpneduenumerate-ja.md
deleted file mode 100644
index 2b5b0cb2b5..0000000000
--- a/macros/latex/contrib/jpneduenumerate/jpneduenumerate-ja.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# Jpneduenumerate パッケージ
-
-日本の教育における数式表現には,LaTeX の標準である書きかたとはやや異なる部分があります。このパッケージでは,日本の教育における列挙表現を導入します。
-
-
-## 前提条件
-
-+ TeX format: LaTeX
-+ TeX engine: pTeX, upTeX
-+ Prerequisite package: enumitem, japanese-otf and refcount
-
-単位 zw を用いていますので,pTeX 系列でのみ使用できます。
-
-
-## インストール
-
-jpneduenumerate.sty を $TEXMF/tex/latex/jpneduenumerate (TeXが見つけられる場所)に置いてください。
-
-
-## 使用方法
-
-### アスタリスクのついた環境
-
-これから説明する環境は,アスタリスクをつけることで parindent がなくなります。
-
-
-### enumerate 環境と itemize 環境
-
-パッケージを読み込むと自動的に enumerate 環境と itemize 環境の余白が変更されます。パッケージを読み込むと自動的に enumerate 環境と itemize 環境の記号が変更されます。\labelenumi は (1),\labelenumii は (a),\item は ・ です。
-
-
-### romanenumerate 環境と caseenumerate 環境
-
-この環境は enumerate 環境の記号を (i) に置き換えたものです。caseenumerate は romanenumerate の別名です。
-
-
-### Romanenumerate 環境と stepenumerate 環境
-
-この環境は enumerate 環境の記号を (I) に置き換えたものです。stepenumerate は Romanenumerate の別名です。
-
-
-### \parenref{<label>}
-
-ラベルによって (1) のように参照します。
-
-
-### \romanref{<label>}
-
-ラベルによって i のように参照します。
-
-
-### \parenromanref{<label>}
-
-
-ラベルによって (i) のように参照します。
-
-
-### \Romanref{<label>}
-
-ラベルによって I のように参照します。
-
-
-### \parenRomanref{<label>}
-
-ラベルによって (I) のように参照します。
-
-
-### \??auto \??keep \??reset \??ref{<label>}
-
-\??auto は自動で番号が進む見出しを出力します。\??keep は直前の番号のままで見出しを出力します。\??reset は見出しの番号を1に戻します。\??ref{<label>} はラベルによって参照します。?? の部分には以下のものが使えます。
-
-+ square (framed by square)
-+ question (another name for square)
-+ enumerate (1)
-+ subquestion (1)
-+ case (i)
-+ step (I)
-
-アスタリスクのない命令は見出しになります。アスタリスクの付いた命令は見出しになりません。
-
-\case は \caseauto の別名です。
-
-\step は \stepauto の別名です。
-
-
-### \equationreset
-
-数式番号を1に戻します。
-
-
-### \question
-
-\questionauto を出力し,equation subquestion enumerate case step をすべて1に戻します。\question* は \questionauto* の別名です。
-
-
-### \subquestion
-
-\questionauto を出力し,case step をともに1に戻します。
-
-
-## ライセンス
-
-このパッケージは[MITライセンス](https://ctan.org/license/mit)のもとで配布しています。
-
-
-## 更新履歴
-
-+ Version 1.0 2022-06-29
- + The first public version.
-
-
----
-
-[Yukoh KUSAKABE](https://twitter.com/metaphysicainfo) (screen-name) at [metaphysica.info](https://www.metaphysica.info/) \ No newline at end of file
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf
new file mode 100644
index 0000000000..c7928aaac1
--- /dev/null
+++ b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.pdf
Binary files differ
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
index fa09f9b030..bfe092f80c 100644
--- a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
+++ b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.sty
@@ -11,17 +11,15 @@
%%
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jpneduenumerate}[2022/06/29 v1.0]
-%
-% %% \if@jpneduenumerate@meaning
-% \newif\if@jpneduenumerate@meaning
-% \@jpneduenumerate@meaningfalse
-% %
-% %% [meaning]
-% \DeclareOption{meaning}{\@jpneduenumerate@meaningtrue}
-% %
-% \ExecuteOptions{}
-% \ProcessOptions\relax
+\ProvidesPackage{jpneduenumerate}[2022/07/09 v1.1]
+%
+%% [lua]
+\newif\if@jpnedu@enumerate@lua
+\@jpnedu@enumerate@luafalse
+\DeclareOption{lua}{\@jpnedu@enumerate@luatrue}%
+%
+\ExecuteOptions{}
+\ProcessOptions\relax
%
%% replace defaluts
% for \setlist
@@ -30,9 +28,105 @@
% for \getrefnumber
\RequirePackage{refcount}
%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% with [lua] %%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\if@jpnedu@enumerate@lua
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
% for \ajroman \ajRoman
-\RequirePackage{otf}
+\RequirePackage{luatexja-otf}
+%
+% If you do not use pLaTeX, LaTeX cannot use '\zw'.
+% In that case, please write \usepackage{bxjacalcux}.
+\setlist{nosep,leftmargin=2\zw,itemindent=1\zw,labelsep=1.15\zw,listparindent=1\zw}
+\setlist[itemize,1]{label=\textbf{\textperiodcentered}}
+\renewcommand{\labelenumi}{(\arabic{enumi})}
+\renewcommand{\labelenumii}{(\alph{enumii})}
+%%
+%
+% Asterisked envionments don't have parindent.
+%
+%% \begin{itemize*}
+\newenvironment{itemize*}%
+{\begin{itemize}[nosep,leftmargin=3\zw,itemindent=0\zw,labelsep=1.15\zw]}%
+{\end{itemize}}
+%
+%% \begin{enumerate*}
+\newenvironment{enumerate*}%
+{\begin{enumerate}[nosep,leftmargin=3\zw,itemindent=0\zw,labelsep=1.15\zw]}%
+{\end{enumerate}}
+%
+%% \begin{romanenumerate}
+%% \begin{romanenumerate*}
+\newenvironment{romanenumerate}%
+{\begin{enumerate}[nosep,leftmargin=2\zw,itemindent=1\zw,labelsep=1.15\zw,listparindent=1\zw]%
+\renewcommand{\labelenumi}{(\ajLabel\ajroman{enumi})}%
+\renewcommand{\labelenumii}{(\alph{enumii})}%
+}%
+{\end{enumerate}}
+\newenvironment{romanenumerate*}%
+{\begin{enumerate}[nosep,leftmargin=3\zw,itemindent=0\zw,labelsep=1.15\zw]%
+\renewcommand{\labelenumi}{(\ajLabel\ajroman{enumi})}%
+\renewcommand{\labelenumii}{(\alph{enumii})}%
+}%
+{\end{enumerate}}
+%
+%% \begin{Romanenumerate}
+%% \begin{Romanenumerate*}
+\newenvironment{Romanenumerate}%
+{\begin{enumerate}[nosep,leftmargin=2\zw,itemindent=1\zw,labelsep=1.15\zw,listparindent=1\zw]%
+\renewcommand{\labelenumi}{(\ajLabel\ajRoman{enumi})}%
+\renewcommand{\labelenumii}{(\alph{enumii})}%
+}%
+{\end{enumerate}}
+\newenvironment{Romanenumerate*}%
+{\begin{enumerate}[nosep,leftmargin=3\zw,itemindent=0\zw,labelsep=1.15\zw]%
+\renewcommand{\labelenumi}{(\ajLabel\ajRoman{enumi})}%
+\renewcommand{\labelenumii}{(\alph{enumii})}%
+}%
+{\end{enumerate}}
+%
+%% \begin{caseenumerate}
+%% \begin{caseenumerate*}
+%% \begin{stepenumerate}
+%% \begin{stepenumerate*}
+\newenvironment{caseenumerate}%
+{\begin{romanenumerate}}%
+{\end{romanenumerate}}
+\newenvironment{caseenumerate*}%
+{\begin{romanenumerate*}}%
+{\end{romanenumerate*}}
+\newenvironment{stepenumerate}%
+{\begin{Romanenumerate}}%
+{\end{Romanenumerate}}
+\newenvironment{stepenumerate*}%
+{\begin{Romanenumerate*}}%
+{\end{Romanenumerate*}}
+%%
+%
+%% \@jpneduenumerate@z@w@space
+\chardef\@jpneduenumerate@z@w@space=\jis"2121\relax
%
+%% \@jpneduenumerate@makenumber
+% Non-stared macros are heading ones.
+% Stared macros are non-heading ones.
+\newcommand{\@jpneduenumerate@makenumber}[2]{%
+\expandafter\newcommand\csname #1\endcsname%
+{\@ifstar{\csname @jpneduenumerate#1@star\endcsname}{\csname @jpneduenumerate#1@nostar\endcsname}}%
+\expandafter\newcommand\csname @jpneduenumerate#1@star\endcsname[1]%
+{#2}%
+\expandafter\newcommand\csname @jpneduenumerate#1@nostar\endcsname[1]%
+{\noindent#2\hspace{0.5\zw}}}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% without [lua] %%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\else
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% for \ajroman \ajRoman
+\RequirePackage{otf}
%
% If you do not use pLaTeX, LaTeX cannot use 'zw'.
% In that case, please write \usepackage{bxjacalcux}.
@@ -102,9 +196,6 @@
{\end{Romanenumerate*}}
%%
%
-%% \@jpneduenumerate@zwspace
-\chardef\@jpneduenumerate@zwspace=\jis"2121\relax
-%
%% \@jpneduenumerate@makenumber
% Non-stared macros are heading ones.
% Stared macros are non-heading ones.
@@ -116,6 +207,15 @@
\expandafter\newcommand\csname @jpneduenumerate#1@nostar\endcsname[1]%
{\noindent#2\hspace{0.5zw}}}
%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% common %%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%% \@jpneduenumerate@z@w@space
+\chardef\@jpneduenumerate@z@w@space=\jis"2121\relax
+%
%% Refs
% \ref{<\labelenumii of romanenumerate and Romanenumerate>} doesn't work.
\@jpneduenumerate@makenumber{parenref}{(\ref{#1})}
@@ -167,9 +267,40 @@
%%
%%*
%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% with [lua] %%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\if@jpnedu@enumerate@lua
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%% Numbers
+\@jpneduenumeratetext@makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate@z@w@space}}
+\@jpneduenumeratetext@makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1\zw\@jpneduenumerate@z@w@space}}
+% NG: \mbox{(#1)}
+\@jpneduenumeratetext@makenumber{subquestion}{\:(#1)}
+\@jpneduenumeratetext@makenumber{enumerate}{\:(#1)}
+\@jpneduenumeratetext@makenumber{case}{\mbox{(\ajroman{#1})}}
+\@jpneduenumeratetext@makenumber{step}{\mbox{(\ajRoman{#1})}}
+%%
+%
+%% Refs
+\@jpneduenumerate@makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}}
+\@jpneduenumerate@makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}}
+% \@jpneduenumerate@makenumber{questionref}{\mbox{\@jpneduenumerate@z@w@space\kern-1\zw\framebox[1.3em]{\ref{#1}}\kern-1\zw\@jpneduenumerate@z@w@space}}
+\@jpneduenumerate@makenumber{subquestionref}{\:\mbox{(\ref{#1})}}
+\@jpneduenumerate@makenumber{enumerateref}{\:\mbox{(\ref{#1})}}
+\@jpneduenumerate@makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}}
+\@jpneduenumerate@makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}}
+%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% without [lua] %%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\else
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
%% Numbers
-\@jpneduenumeratetext@makenumber{square}{\mbox{\@jpneduenumerate@zwspace\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@zwspace}}
-\@jpneduenumeratetext@makenumber{question}{\mbox{\@jpneduenumerate@zwspace\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@zwspace}}
+\@jpneduenumeratetext@makenumber{square}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@z@w@space}}
+\@jpneduenumeratetext@makenumber{question}{\mbox{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}#1}\kern-1zw\@jpneduenumerate@z@w@space}}
% NG: \mbox{(#1)}
\@jpneduenumeratetext@makenumber{subquestion}{\:(#1)}
\@jpneduenumeratetext@makenumber{enumerate}{\:(#1)}
@@ -178,14 +309,20 @@
%%
%
%% Refs
-\@jpneduenumerate@makenumber{squareref}{\@jpneduenumerate@zwspace\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@zwspace}
-\@jpneduenumerate@makenumber{questionref}{\@jpneduenumerate@zwspace\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@zwspace}
-% \@jpneduenumerate@makenumber{questionref}{\mbox{\@jpneduenumerate@zwspace\kern-1zw\framebox[1.3em]{\ref{#1}}\kern-1zw\@jpneduenumerate@zwspace}}
+\@jpneduenumerate@makenumber{squareref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}}
+\@jpneduenumerate@makenumber{questionref}{{\setlength{\fboxsep}{3pt}\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.5em]{\vphantom{\raisebox{2pt}{1}\raisebox{-2pt}{1}}\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}}
+% \@jpneduenumerate@makenumber{questionref}{\mbox{\@jpneduenumerate@z@w@space\kern-1zw\framebox[1.3em]{\ref{#1}}\kern-1zw\@jpneduenumerate@z@w@space}}
\@jpneduenumerate@makenumber{subquestionref}{\:\mbox{(\ref{#1})}}
\@jpneduenumerate@makenumber{enumerateref}{\:\mbox{(\ref{#1})}}
\@jpneduenumerate@makenumber{caseref}{\refused{#1}\mbox{(\ajroman{\getrefnumber{#1}})}}
\@jpneduenumerate@makenumber{stepref}{\refused{#1}\mbox{(\ajRoman{\getrefnumber{#1}})}}
%
+%%%%%%%%%%%%%%%%%%%%%%%%
+% common %%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%
+\fi
+%%%%%%%%%%%%%%%%%%%%%%%%
+%
%%* AVOID ERROR of COUNTER
%% case
\renewcommand{\caseauto}{\@ifstar{\@jpneduenumeratetext@avoid@caseauto@star}{\@jpneduenumeratetext@avoid@caseauto@nostar}}
diff --git a/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex
new file mode 100644
index 0000000000..0f54fe909b
--- /dev/null
+++ b/macros/latex/contrib/jpneduenumerate/jpneduenumerate.tex
@@ -0,0 +1,599 @@
+\documentclass[%
+fleqn,%
+paper=a4paper,%
+fontsize=10pt,%
+open_bracket_pos=zenkakunibu_nibu,%
+hanging_punctuation,%
+]%
+{jlreq}
+\jlreqsetup{%
+itemization_beforeafter_space=0pt,%
+itemization_itemsep=0pt%
+}
+\makeatletter
+\RequirePackage{luatexja}
+\RequirePackage{luatexja-otf}
+\RequirePackage{graphicx}
+\RequirePackage{amsmath}
+\DeclareRobustCommand{\metaphysicaicon}{\raisebox{-4.0pt}{\includegraphics[width=16pt]{metaphysicaicon.pdf}}}
+\RequirePackage[normalem]{ulem}
+\RequirePackage[explicit]{titlesec}
+\titleformat{\section}[hang]{}{}{0pt}{\uuline{\raisebox{1pt}{\textsf{\thesection\quad #1}}}}[\vspace{0.35\baselineskip}]
+\renewcommand{\thesection}{\S\,\arabic{section}}
+\let\originalsection\section
+\DeclareRobustCommand{\section}{\@ifstar{\@metaphysica@section@star}{\@metaphysica@section@nostar}}
+\DeclareRobustCommand{\@metaphysica@section@star}[1]{\vspace{0.5\baselineskip}\originalsection{#1}\vspace*{-\baselineskip}}
+\DeclareRobustCommand{\@metaphysica@section@nostar}[1]{\vspace{0.5\baselineskip}\originalsection{#1}}
+\RequirePackage[%
+truedimen,%
+margin=30truemm,
+includehead%
+]{geometry}
+\RequirePackage{lastpage}
+\RequirePackage{fancyhdr}
+\pagestyle{fancy}
+\DeclareRobustCommand{\headertitle}[2][\metaphysicaicon]{%
+\rhead[#2]{#1{}\quad\thepage{}/{}\pageref{LastPage}}%
+\lhead[\thepage{}/{}\pageref{LastPage}\quad{}#1]{#2}%
+\cfoot{}%
+}
+\RequirePackage{setspace}
+\setstretch{1.155}
+\DeclareRobustCommand{\linespace}{\@ifstar{\vspace{\baselineskip}}{\vspace{0.25\baselineskip}}}
+\DeclareRobustCommand{\linesmash}{\@ifstar{\vspace{-\baselineskip}}{\vspace{-0.25\baselineskip}}}
+\AtBeginDocument{%
+\abovedisplayskip =0.125\abovedisplayskip
+\abovedisplayshortskip=0.125\abovedisplayshortskip
+\belowdisplayskip =0.125\belowdisplayskip
+\belowdisplayshortskip=0.125\belowdisplayshortskip}
+\setlength{\jot}{0pt}%
+\setlength{\mathindent}{2\zw}%
+\renewcommand{\floatpagefraction}{0.75}
+\allowdisplaybreaks[2]
+\RequirePackage[no-math]{fontspec}
+\RequirePackage[no-math,deluxe,haranoaji]{luatexja-preset}
+\RequirePackage{multicolpar}
+\RequirePackage[style=iso]{datetime2}
+\RequirePackage[unicode]{hyperref}
+\RequirePackage{xparse}
+\RequirePackage{dashbox}
+\newcounter{psuedosectioncounter}
+\setcounter{psuedosectioncounter}{1}
+\newcounter{psuedocontentscounter}
+\setcounter{psuedocontentscounter}{1}
+\DeclareRobustCommand{\psuedosection}[3]{%
+\hypertarget{#1}{\mbox{}}\begin{multicolpar}{2}%
+\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #2}}}}
+
+\noindent\uuline{{\raisebox{1pt}{\textsf{\S\ \thepsuedosectioncounter\quad #3}}}}
+\end{multicolpar}%
+\stepcounter{psuedosectioncounter}%
+\vspace{\baselineskip}%
+}
+\DeclareRobustCommand{\psuedocontents}[3]{%
+\begin{multicolpar}{2}%
+\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #2}}}
+
+\noindent{\textsf{\hyperlink{#1}{\S\ \thepsuedocontentscounter\quad #3}}}\end{multicolpar}%
+\stepcounter{psuedocontentscounter}%
+}
+\newenvironment{translateing}%
+{\begin{multicolpar}{2}}
+{\end{multicolpar}\vspace{\baselineskip}}
+\DeclareRobustCommand{\maketitletranslating}%
+{\maketitle\thispagestyle{fancy}
+\vspace{\baselineskip}\begin{multicolpar}{2}
+\textsf{English}
+
+\noindent
+\textsf{日本語 (Japanese)}
+\end{multicolpar}\vspace{\baselineskip}}
+\NewDocumentCommand\macroexplanation{v}{%
+\noindent\hspace*{\fill}{\texttt{#1}}\hspace*{\fill}\linespace%
+}
+\NewDocumentEnvironment{macroexample}{O{0.625} +b}{%
+\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{%
+#2%
+}}\hspace*{\fill}}%
+{\vspace{\baselineskip}}
+\NewDocumentEnvironment{macroexample*}{O{0.625} m +b}{%
+\noindent\hspace*{\fill}\dbox{\parbox{#1\textwidth}{%
+\vspace{-0.5\baselineskip}\begin{#2}%
+#3
+\end{#2}%
+}}\hspace*{\fill}}
+{\vspace{\baselineskip}}
+\let\code\texttt
+\setlength{\fboxsep}{1em}
+\setstretch{1.05}
+\DeclareRobustCommand{\commandtojskip}{\hspace{2.40554pt plus 1.49994pt minus 0.59998pt}}
+\RequirePackage{listings, jlisting}
+\lstset{
+ language=[LaTeX]TeX,
+ basicstyle={\ttfamily},
+ identifierstyle={\small},
+ commentstyle={\small\itshape},
+ keywordstyle={\small\bfseries},
+ ndkeywordstyle={\small},
+ stringstyle={\small\ttfamily},
+ frame=single,
+ breaklines=true,
+ columns=[l]{fullflexible},
+ stepnumber=1,
+ xrightmargin=0.1709\textwidth,
+ xleftmargin=0.1709\textwidth,
+ lineskip=-0.5ex
+}
+\RequirePackage{bxtexlogo}
+\RequirePackage{shortvrb}
+\MakeShortVerb{\|}
+\RequirePackage[lua]{jpneduenumerate}
+\makeatother
+%
+\hypersetup{%
+bookmarksnumbered=true,%
+colorlinks=true,%
+linkcolor=blue,%
+urlcolor=blue,%
+setpagesize=false,%
+pdftitle={The jpneduenumerate package},%
+pdfauthor={Yukoh KUSAKABE},%
+pdfsubject={The jpneduenumerate package},%
+pdfkeywords={TeX LaTeX enumerate Japanese education}}
+\title{The \code{jpneduenumerate} package:\\[0.25\baselineskip]
+enumerative expressions in Japanese education}
+\author{Yukoh KUSAKABE}
+\date{\today}
+\headertitle[Yukoh KUSAKABE\quad\metaphysicaicon]{The \code{jpneduenumerate} package}
+\begin{document}
+\maketitletranslating
+
+\begin{translateing}
+Mathematical equation representation in Japanese education differs somewhat from the standard \LaTeX\ writing style.
+This package introduces enumerative expressions in Japanese education.
+
+日本の教育における数式表現には,\LaTeX の標準である書きかたとはやや異なる部分があります。
+このパッケージでは,日本の教育における列挙表現を導入します。
+\end{translateing}
+
+\psuedocontents{Requirements}{System Requirements}{前提条件}
+
+\psuedocontents{Installation}{Installation}{インストール}
+
+\psuedocontents{Loading}{Loading}{読み込み}
+
+\psuedocontents{Usage}{Usage}{使用方法}
+
+\psuedocontents{moreinfo}{For More Information}{問い合わせ・詳しくは}
+
+\psuedosection{Requirements}{System Requirements}{前提条件}
+
+\begin{translateing}
+\textbullet\ \LaTeXe\ format\\
+\textbullet\ \code{enumitem} package\\
+\textbullet\ \code{refcount} package\\
+\textbullet\ \scalebox{0.875}[1]{\pTeX/\upTeX\ engine (when no options are loaded)}\\
+\textbullet\ \code{japanese-otf} package\\\hfill(when no options are loaded)\\
+\textbullet\ \LuaTeX\ engine (\code{[lua]} only)\\
+\textbullet\ \code{luatexja} package (\code{[lua]} only)\\
+\textbullet\ \code{luatexja-otf} package (\code{[lua]} only)
+
+\noindent
+\textbullet\ \LaTeXe フォーマット\\
+\textbullet\ \code{enumitem}パッケージ\\
+\textbullet\ \code{refcount}パッケージ\\
+\textbullet\ \scalebox{0.925}[1]{\pTeX/\upTeX エンジン(オプション不使用時)}\\
+\textbullet\ \code{japanese-otf}パッケージ\\\hfill(オプション不使用時)\\
+\textbullet\ \LuaTeX エンジン(\code{[lua]}使用時)\\
+\textbullet\ \code{luatexja}パッケージ(\code{[lua]}使用時)\\
+\textbullet\ \code{luatexja-otf}パッケージ(\code{[lua]}使用時)
+\end{translateing}
+
+\psuedosection{Installation}{Installation}{インストール}
+
+\begin{translateing}
+If not available, move jpneduenumerate.sty file to \code{\$TEXMF/tex/latex/jpneduenumerate}.
+
+直ちに使えなければ,jpneduenumerate.sty を\commandtojskip\code{\$TEXMF/tex/latex/jpneduenumerate}%(\TeX が見つけられる場所)
+に置いてください。
+\end{translateing}
+
+\psuedosection{Loading}{Loading}{読み込み}
+
+\begin{translateing}
+To use this package, load .sty file with |\usepackage{jpneduenumerate}| command in preamble.
+
+このパッケージを使用するには,プリアンブルに\commandtojskip|\usepackage{jpneduenumerate}| と書いてください。
+%\end{translateing}
+
+%\begin{translateing}
+There are the |[lua]| options:
+This option changes the engine this package runs on from \pTeX/\upTeX\ to \LuaTeX. It does not change the appearance of the output.
+Since the unit |zw| is used when no options are loaded, it can be used only in the \pTeX/\upTeX\ series.
+Since the unit |\zw| is used when the \code{[lua]} loaded, it can be used only in the \LuaTeX\ series and \LuaTeX-ja.
+
+|[lua]| オプションがあります。
+このオプションは,このパッケージが動作するエンジンを\pTeX/\upTeX から\LuaTeX に変更します。それは出力の見た目には変化を及ぼしません。
+オプションを使用しないときには単位|zw|を用いますので,\pTeX/\upTeX 系列でのみ使用できます。
+\code{[lua]}を読み込むと単位\commandtojskip|\zw|を用いますので,\LuaTeX 系列でのみ使用できます。
+\end{translateing}
+
+\psuedosection{Usage}{Usage}{使用方法}
+
+\macroexplanation{astarisked environments}
+
+\begin{translateing}
+The environment we will describe can be replaced with asterisked ones to eliminate the |parindent|.
+For example:
+
+これから説明する環境は,アスタリスクをつけることで|parindent|がなくなります。
+たとえば,次のようになります。
+\end{translateing}
+
+\newpage
+
+\noindent\hspace*{\fill}\fbox{\parbox{0.625\textwidth}{%
+\ttfamily\textbackslash begin\{itemize\}\\
+\textbackslash item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。\\
+\textbackslash item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。\\
+\textbackslash end\{itemize\}
+
+\linespace*
+\textbackslash begin\{itemize*\}\\
+\textbackslash item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。\\
+\textbackslash item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。\\
+\textbackslash end\{itemize*\}%
+}}\hspace*{\fill}%
+{\vspace{\baselineskip}}
+
+\begin{macroexample}
+\begin{itemize}
+\item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。
+\item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。
+\end{itemize}
+
+\begin{itemize*}
+\item 石炭をば早や積み果てつ。中等室の卓のほとりはいと靜にて、熾熱燈の光の晴れがましきも徒なり。
+\item 今宵は夜毎にこゝに集ひ來る骨牌仲間も「ホテル」に宿りて、舟に殘れるは余一人のみなれば。
+\end{itemize*}
+\end{macroexample}
+
+\begin{translateing}
+For the purpose of this package, example sentences are in Japanese.
+If you use this package in a Latin text, the |parindent| will be set to the same size, i.e., one full-width character.
+
+このパッケージの目的から,例文は日本語としました。
+欧文のもとでこのパッケージを使用しても,同じ大きさすなわち全角1文字分の|parindent|が設定されます。
+\end{translateing}
+
+\macroexplanation{environment enumerate and itemize}
+
+\begin{translateing}
+The margins and the symbols in the |enumerate| and |itemize| environments are automatically changed when the package is loaded.
+|\labelenumi| is (1), |\labelenumii| is (a), and |\item| is text bullet.
+See the examples immediately above.
+
+パッケージを読み込むと自動的に|enumerate|環境と|itemize|環境の余白と記号が変更されます。
+|\labelenumi|\commandtojskip は(1),|\labelenumii|\commandtojskip は(a),|\item|\commandtojskip は・です。
+例は直前のものを見てください。
+\end{translateing}
+
+\newpage
+\macroexplanation{environment romanenumerate and caseenumerate}
+
+\begin{translateing}
+This environment replaces the symbols in the |enumerate| environment with a full-width (i).
+|caseenumerate| is synonym for |romanenumerate|.
+
+この環境は|enumerate|環境の記号を全角の(i)に置き換えたものです。
+|caseenumerate|は|romanenumerate|の別名です。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{caseenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{caseenumerate}
+\end{lstlisting}
+
+\begin{macroexample}
+\begin{caseenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{caseenumerate}
+\end{macroexample}
+
+\macroexplanation{environment Romanenumerate and stepenumerate}
+
+\begin{translateing}
+This environment replaces the symbols in the |enumerate| environment with a full-width (I).
+|stepenumerate| is synonym for |Romanenumerate|.
+
+この環境は|enumerate|環境の記号を全角の(I)に置き換えたものです。
+|stepenumerate|は|Romanenumerate|の別名です。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{stepenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{stepenumerate}
+\end{lstlisting}
+
+\begin{macroexample}
+\begin{stepenumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.
+\item They must be felt with the heart.
+\end{stepenumerate}
+\end{macroexample}
+
+\newpage
+\macroexplanation{\parenref{<label>}}
+
+\begin{translateing}
+Referred to as (1) depending on the label.
+
+ラベルによって(1)のように参照します。
+\end{translateing}
+
+\macroexplanation{\romanref{<label>}}
+
+\begin{translateing}
+Referred to as \ajroman{1} depending on the label.
+
+ラベルによって\ajroman{1}のように参照します。
+\end{translateing}
+
+\macroexplanation{\parenromanref{<label>}}
+
+\begin{translateing}
+Referred to as (\ajroman{1}) depending on the label.
+
+ラベルによって(\ajroman{1})のように参照します。
+\end{translateing}
+
+\macroexplanation{\Romanref{<label>}}
+
+\begin{translateing}
+Referred to as \ajRoman{1} depending on the label.
+
+ラベルによって\ajRoman{1}のように参照します。
+\end{translateing}
+
+\macroexplanation{\parenRomanref{<label>}}
+
+\begin{translateing}
+Referred to as (\ajRoman{1}) depending on the label.
+
+ラベルによって(\ajRoman{1})のように参照します。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{enumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.\label{A}
+\item They must be felt with the heart.\label{B}
+\end{enumerate}
+
+\parenref{A}\parenref{B}
+\romanref{A}\romanref{B}
+\parenromanref{A}\parenromanref{B}
+\Romanref{A}\Romanref{B}
+\parenRomanref{A}\parenRomanref{B}
+\end{lstlisting}
+
+\begin{macroexample}
+\begin{enumerate}
+\item The best and most beautiful things in the world cannot be seen or even touched.\label{A}
+\item They must be felt with the heart.\label{B}
+\end{enumerate}
+
+\parenref{A}\parenref{B}
+\romanref{A}\romanref{B}
+\parenromanref{A}\parenromanref{B}
+\Romanref{A}\Romanref{B}
+\parenRomanref{A}\parenRomanref{B}
+\end{macroexample}
+
+\begin{translateing}
+Since the label only manages numbers, the appearance is achieved by changing the ref type.
+
+ラベルは数字しか管理していないので,見た目はrefの種類を変えることで実現します。
+
+As in the example above, these commands except |\parenref| disable |hyperref|.
+
+上の例で分かる通り,|\parenref|以外のこれらのコマンドは|hyperref|を無効にします。
+\end{translateing}
+
+\newpage
+\macroexplanation{\??auto \??keep \??reset \??ref{<label>}}
+
+\begin{translateing}
+|\??auto| outputs headings that automatically advance in numbering.
+|\??keep| outputs the heading with the previous number.
+|\??reset| resets the heading number back to 1.
+%|\??ref| referred to as (1) depending on the label.
+|\??ref{<label>}| is referenced by label.
+The |??| parts can be the following:\\
+\textbullet\ |square| or |question| (\squarenumber*{1})\\
+\textbullet\ |enumerate| (1)\\
+\textbullet\ |subquestion| (1)\\
+\textbullet\ |case| (\ajroman{1})\\
+\textbullet\ |step| (\ajRoman{1})
+
+|\??auto|は自動で番号が進む見出しを出力します。
+|\??keep|は直前の番号のままで見出しを出力します。
+|\??reset|は見出しの番号を1に戻します。
+|\??ref{<label>}|\commandtojskip はラベルによって参照します。
+|??|の部分には以下のものが使えます。\\
+\textbullet\ |square|または|question| (\squarenumber*{1})\\
+\textbullet\ |enumerate| (1)\\
+\textbullet\ |subquestion| (1)\\
+\textbullet\ |case| (\ajroman{1})\\
+\textbullet\ |step| (\ajRoman{1})
+
+Non-asterisked commands are heading.
+Asterisked commands are not heading.
+
+アスタリスクのない命令は見出しになります。
+アスタリスクの付いた命令は見出しになりません。
+
+|\case| is synonym for |\caseauto|.
+|\step| is synonym for |\stepauto|.
+
+|\case|は\commandtojskip|\caseauto|の別名です。
+|\step|は\commandtojskip|\stepauto|の別名です。
+\end{translateing}
+
+\begin{lstlisting}
+\setlength{\parindent}{1em}
+\squareauto is heading.
+
+\squareauto* is not heading.
+
+\enumerateauto\enumerateauto\enumeratekeep\enumeratekeep%
+\enumerateauto\label{test}\enumerateauto\enumerateauto%
+\enumeratereset\enumerateauto\enumerateref{test}
+
+\questionauto\subquestionauto\subquestionauto\\
+\caseauto\caseauto\caseauto\caseauto
+\stepauto\stepauto\stepauto\stepauto
+\end{lstlisting}
+
+\begin{macroexample}
+\setlength{\parindent}{1em}
+\squareauto is heading.
+
+\squareauto* is not heading.
+
+\enumerateauto\enumerateauto\enumeratekeep\enumeratekeep%
+\enumerateauto\label{test}\enumerateauto\enumerateauto%
+\enumeratereset\enumerateauto\enumerateauto\enumerateauto
+\enumeratereset\enumerateauto\enumerateref{test}
+
+\questionauto\subquestionauto\subquestionauto\\
+\caseauto\caseauto\caseauto\caseauto
+\stepauto\stepauto\stepauto\stepauto
+\end{macroexample}
+
+\macroexplanation{\equationreset}
+
+\begin{translateing}
+Reset the equation number back to 1.
+
+数式番号を1に戻します。
+\end{translateing}
+
+\begin{lstlisting}
+\begin{gather}
+A\\
+B
+\end{gather}
+\equationreset
+\begin{equation}
+C
+\end{equation}
+\end{lstlisting}
+
+\begin{macroexample}
+\begin{gather}
+A\\
+B
+\end{gather}
+\equationreset
+\begin{equation}
+C
+\end{equation}
+\end{macroexample}
+
+\macroexplanation{\question}
+
+\begin{translateing}
+|\questionauto| and reset the equation, subquestion, enumerate, case and step numbers back to 1.
+
+|\questionauto|を出力し,equation・subquestion・enumerate・case・stepの番号を1に戻します。
+
+|\question*| is synonym for |\questionauto*| (and doesn't reset numbers).
+
+|\question*|\commandtojskip は\commandtojskip|\questionauto*|\commandtojskip の別名です(から,番号は戻しません)。
+\end{translateing}
+
+\macroexplanation{\subquestion}
+
+\begin{translateing}
+|\subquestionauto| and reset the case and step numbers back to 1.
+
+|\subquestionauto|を出力し,|case|と|step|の番号を1に戻します。
+
+|\subquestion*| is another name for |\subquestionauto*| (and doesn't reset numbers).
+
+|\subquestion*|\commandtojskip は\commandtojskip|\subquestionauto*|\commandtojskip の別名です(から,番号は戻しません)。
+\end{translateing}
+
+\newpage
+\questionreset
+\begin{lstlisting}
+\question\subquestion\case\case\subquestion\case\case
+\begin{gather}
+A\\
+B
+\end{gather}
+\subquestion
+
+\question\subquestion\step\step\subquestion\step\step
+\begin{equation}
+C
+\end{equation}
+\end{lstlisting}
+
+\begin{macroexample}
+\question\subquestion\case\case\subquestion\case\case
+\begin{gather}
+A\\
+B
+\end{gather}
+\subquestion
+
+\question\subquestion\step\step\subquestion\step\step
+\begin{equation}
+C
+\end{equation}
+\end{macroexample}
+
+\begin{translateing}
+In the default setting, the equation number and the appearance of the |\subquestion| are identical, which makes it difficult to understand.
+In Japanese high school mathematics, equation numbers are generally expressed as circled numbers, so we have kept this in mind.
+It can be achieved, for example, with the |[circled]| or |[luacircled]| option of my |inlinelabel| package.
+
+既定の設定では数式番号と|\subquestion|の見た目が一致しており分かりにくくなっています。
+日本の高校数学では数式番号は丸囲み数字で表されることが一般的ですから,それを念頭に置いています。
+それは,たとえば私が作成した|inlinelabel|パッケージの|[circled]|または|[luacircled]|オプションで実現できます。
+\end{translateing}
+
+%\def\tagform@#1{\maketag@@@{$\ldots\hspace*{-0.075em}$\ignorespaces\ajMaru{#1}\unskip\@@italiccorr}}%
+\questionreset
+\hspace*{\fill}with |\usepackage[circled]{inlinelabel}| or |\usepackage[luacircled]{inlinelabel}|:\hspace*{\fill}\\
+\begin{macroexample}
+\question\subquestion\case\case\subquestion\case\case
+\begin{gather*}
+A\hspace*{21.05\zw}\ldots\mbox{\ajMaru{1}}\\
+B\hspace*{21\zw}\ldots\mbox{\ajMaru{2}}
+\end{gather*}
+\subquestion
+
+\question\subquestion\step\step\subquestion\step\step
+\begin{equation*}
+C\hspace*{21\zw}\ldots\mbox{\ajMaru{1}}\
+\end{equation*}
+\end{macroexample}
+
+\psuedosection{moreinfo}{For More Information}{問い合わせ・詳しくは}
+
+\noindent\hspace*{\fill}\begin{tabular}{rl}
+\multicolumn{2}{l}{The jpneduenumerate package:}%&
+\\%
+\multicolumn{2}{r}{\hspace{8\zw}\url{https://www.metaphysica.info/technote/package_jpneduenumerate/}}\\
+Yukoh KUSAKABE:&\url{https://www.metaphysica.info/}\\
+&\url{https://twitter.com/metaphysicainfo}\\
+&(screen-name, 日下部幽考 in Japanese)
+\end{tabular}\hspace*{\fill}
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/rescansync/README b/macros/latex/contrib/rescansync/README
new file mode 100644
index 0000000000..27851c5f61
--- /dev/null
+++ b/macros/latex/contrib/rescansync/README
@@ -0,0 +1,24 @@
+rescansync -- Re-scan tokens with synctex information
+Allow users to execute saved code to typeset text while preserving Sync\TeX\ information.
+
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+
+Report bugs at https://github.com/user202729/TeXlib
+
+========
+
+Copyright 2022 user202729
+
+This work may be distributed and/or modified under the conditions of the
+LaTeX Project Public License (LPPL), either version 1.3c of this license or
+(at your option) any later version. The latest version of this license is in
+the file:
+
+ http://www.latex-project.org/lppl.txt
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is user202729.
+
+This work consists of the files rescansync.sty.
diff --git a/macros/latex/contrib/rescansync/rescansync.pdf b/macros/latex/contrib/rescansync/rescansync.pdf
new file mode 100644
index 0000000000..67d2c7c790
--- /dev/null
+++ b/macros/latex/contrib/rescansync/rescansync.pdf
Binary files differ
diff --git a/macros/latex/contrib/rescansync/rescansync.sty b/macros/latex/contrib/rescansync/rescansync.sty
new file mode 100644
index 0000000000..197a7cad89
--- /dev/null
+++ b/macros/latex/contrib/rescansync/rescansync.sty
@@ -0,0 +1,145 @@
+% File: rescansync.sty
+% Copyright 2022 user202729
+%
+% This work may be distributed and/or modified under the conditions of the
+% LaTeX Project Public License (LPPL), either version 1.3c of this license or
+% (at your option) any later version. The latest version of this license is in
+% the file:
+%
+% http://www.latex-project.org/lppl.txt
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is user202729.
+
+\ProvidesExplPackage{rescansync}{2022/07/09}{0.0.0}{Re-scan tokens with synctex information}
+
+\cs_generate_variant:Nn \regex_replace_all:nnN {nxN}
+\cs_generate_variant:Nn \tl_replace_all:Nnn {Nxn}
+
+\msg_new:nnn {rescansync} {currfile-package-not-loaded}
+ {currfile~package~is~needed~for~this~functionality}
+
+\msg_new:nnn {rescansync} {saveenv-package-not-loaded}
+ {saveenv~package~is~needed~for~this~functionality}
+
+\makeatletter
+
+\sys_if_engine_luatex:TF {
+ \let \_RS_optionaldirectlua \directlua
+ \cs_new:Npn \rescansync_gettag: {
+ \directlua{
+ tex.sprint(tex.get_synctex_tag())
+ }
+ }
+}
+{
+ \let \_RS_optionaldirectlua \@gobble
+ \let \rescansync_gettag: \empty
+}
+
+
+
+%\let \rescansyncTMPfixsync \undefined
+
+\tl_gset:Nn \_RS_count {0}
+\edef \_RS_j_tl {\char_generate:nn {`\^^J} {12}}
+
+\iow_new:N \_RS_file
+
+% #1: the content (will be detokenized)
+% #2: the number (line offset)
+% #3: the file name
+% #4: the synctex tag (get from \rescansync_gettag:)
+%
+% content is an expl3 string with ^^J represent line break -- same format as expected by iow_now
+%
+% NOTE: because filecontentsdef make character >= 128 in pdftex active character and
+% they cannot be \write safely, we detokenize it then replace ^^M later.
+\cs_new_protected:Npn \rescansync:nnnn #1 #2 #3 #4 {
+ \tl_gset:Nx \_RS_count {\int_eval:n {\_RS_count+1}}
+ \tl_set:Nx \_RS_filename {RS\_RS_count-#3}
+
+ \begingroup % will be closed by the active `~` later
+ \iow_open:Nn \_RS_file {\_RS_filename}
+
+ \iow_now:Nx \_RS_file {
+ % print some initial padding newlines first
+ \prg_replicate:nV {#2} \_RS_j_tl
+
+ % prepend some content to the start of the line...
+ \c_backslash_str a \c_backslash_str _RS_optionaldirectlua{tex.set_synctex_tag( #4 )} \c_tilde_str % this one works
+ % note that the directlua must be directly inside the file, not indirectly invoked through some macro
+
+ % print the content
+ \detokenize{#1}
+ }
+
+ \iow_close:N \_RS_file
+
+ \int_step_inline:nnn {33} {125} {\catcode ##1=11~} % set all to letter
+ \catcode `\~ \active
+ \catcode `\\ 0
+ \catcode `\{ 1
+ \catcode `\} 2~
+
+ % just so that the content '\_RS_optionaldirectlua{tex.set_synctex_tag( ... )}~' is interpreted correctly...
+
+
+ \char_set_active_eq:NN \~ \endgroup
+ \exp_args:NNNo \expandafter \_RS_skip_initial_endlinechars \@@input {\_RS_filename}
+}
+
+\cs_new_protected:Npn \rescansync:nnn #1 #2 #3 {
+ \rescansync:nnnn {#1} {#2} {#3} {\rescansync_gettag:} % #4 will be expanded inside
+}
+
+\cs_new_protected:Npn \_RS_skip_initial_endlinechars #1 \a {} % #1: tokens generated by endlinechar
+
+\NewDocumentEnvironment {rescansyncSaveenvPacked} {m} {
+ \edef \_RS_lineno {\the\inputlineno}
+ \cs_if_free:NT \saveenv {
+ \msg_error:nn {rescansync} {saveenv-package-not-loaded}
+ }
+ \cs_if_free:NT \currfilename {
+ \msg_error:nn {rescansync} {currfile-package-not-loaded}
+ }
+ \saveenv \_RS_body
+} {
+ \endsaveenv
+ \global\edef #1 { {\_RS_body} {\_RS_lineno} {\currfilename} }
+ %\pretty:V #1
+}
+
+\NewDocumentEnvironment {rescansyncSaveenvghostPacked} {m} {
+ \edef \_RS_lineno {\the\inputlineno}
+ \cs_if_free:NT \saveenv {
+ \msg_error:nn {rescansync} {saveenv-package-not-loaded}
+ }
+ \cs_if_free:NT \currfilename {
+ \msg_error:nn {rescansync} {currfile-package-not-loaded}
+ }
+ \saveenvghost \_RS_body
+} {
+ \endsaveenvghost
+ \global\edef #1 { {\_RS_body} {\_RS_lineno} {\currfilename} }
+ %\pretty:V #1
+}
+
+\NewDocumentCommand \rescansyncPacked {m} {
+ %\pretty:V {#1}
+ \exp_last_unbraced:Nx \rescansync:nnn {#1}
+}
+
+
+
+\cs_generate_variant:Nn \iow_now:Nn {No}
+\cs_generate_variant:Nn \prg_replicate:nn {nV}
+
+% #1: the macro that contain the content, #2: the number (line offset)
+\cs_new_protected:Npn \rescansync:nn #1 #2 {
+ \cs_if_free:NT \currfilename {
+ \msg_error:nn {rescansync} {currfile-package-not-loaded}
+ }
+ \rescansync:nnn {#1} {#2} {\currfilename}
+}
diff --git a/macros/latex/contrib/rescansync/rescansync.tex b/macros/latex/contrib/rescansync/rescansync.tex
new file mode 100644
index 0000000000..c68dd3e29d
--- /dev/null
+++ b/macros/latex/contrib/rescansync/rescansync.tex
@@ -0,0 +1,162 @@
+%%! TEX program = lualatex
+\ProvidesFile{rescansync.tex} [2022/07/09 v0.0.0 ]
+\documentclass{l3doc}
+\EnableCrossrefs
+\CodelineIndex
+\RecordChanges
+\fvset{gobble=0,tabsize=4,frame=single,numbers=left,numbersep=3pt}
+\usepackage{hyperref}
+\usepackage{csquotes}
+
+%\MakeOuterQuote{"}
+\begin{document}
+\GetFileInfo{\jobname.tex}
+
+\title{\textsf{rescansync} --- Re-scan tokens with synctex information
+\thanks{This file describes version \fileversion, last revised \filedate.}
+}
+\author{user202729%
+%\thanks{E-mail: (not set)}
+}
+\date{Released \filedate}
+
+\maketitle
+
+\begin{abstract}
+Allow users to execute saved code to typeset text while preserving Sync\TeX\ information.
+\end{abstract}
+
+\section{Simple interface}
+
+\DescribeEnv{rescansyncSaveenvPacked}
+Saves the environment body into the specified macro after the environment name, with additional information required to execute it later.
+
+The macro is stored in some internal format. If the user want to modify the content, use one of the advanced interface described below.
+
+Requires the \pkg{saveenv} and \pkg{currfile} package to be loaded. If you want to save the environment body using some other package, use the advanced interface.
+
+\begin{function}{\rescansyncPacked}
+ \begin{syntax}
+ \tn{rescansyncPacked} \meta{macro}
+ \end{syntax}
+ Execute the stored content in \meta{macro}.
+
+ The content must be stored with \env{rescansyncSaveenvPacked} environment or similar.
+\end{function}
+
+To give an usage example: the following code
+\begin{verbatim}
+% the following line will save the content "123 456"
+% and some auxiliary information into the macro \mycontent.
+\begin{rescansyncSaveenvPacked}{\mycontent}
+123
+
+456
+\end{rescansyncSaveenvPacked}
+
+% the following line will typeset 789 as usual.
+789
+
+% the following line will typeset "123 456".
+\rescansyncPacked{\mycontent}
+\end{verbatim}
+will typeset \enquote{789 123 456} as 3 separate paragraphs, with Sync\TeX\ information preserved.
+
+If the engine is not \LuaTeX, there will still be limited Sync\TeX\ information that points to a temporary file, but the line number is preserved.
+
+\DescribeEnv{rescansyncSaveenvghostPacked}
+The usage of this environment is similar to the \env{rescansyncSaveenvPacked} above, except that the content is still typeset with Sync\TeX\ information preserved while it's stored.
+
+In the example above, if this environment is used instead
+\begin{verbatim}
+\begin{rescansyncSaveenvghostPacked}{\mycontent}
+123
+
+456
+\end{rescansyncSaveenvghostPacked}
+
+789
+
+\rescansyncPacked{\mycontent}
+\end{verbatim}
+the content typeset will be \enquote{123 456 789 123 456}.
+
+As with \env{saveenvghost} environment (read \pkg{saveenv} package documentation for more details), the Sync\TeX\ information of the first section is guaranteed to be preserved, but there might be some performance hit.
+
+\section{Advanced interface}
+
+\begin{function}{\rescansync:nn}
+ \begin{syntax}
+ \cs{rescansync:nn} \Arg{content} \Arg{line offset}
+ \end{syntax}
+ Execute (rescan) the \Arg{content}. Requires \pkg{currfile}.
+
+ Details: \Arg{content} will be detokenized, and characters with char code 10 will be interpreted as a line break
+ (the behavior is inherited from |\iow_now:Nn| function. As a consequence, it's not allowed to write literal character with char code 10 to the file;
+ however this is not very useful regardless because on some operating systems this is equivalent to a real newline)
+
+ \Arg{line offset} is some non-negative number. If it's 0 then the first line of \Arg{content} corresponds to the first line in the target file.
+
+ Remark: If \pkg{newverbs}, \pkg{xparse} or \pkg{filecontentsdef} is used to collect multiline verbatim environment,
+ they have the line separation characters separated by character with char code 13 by default, you need to
+ manually replace them.
+
+ Even though the Sync\TeX\ information points to the correct file, if there's some error the temporary file name (which has the form
+ \texttt{RS\meta{number}-\meta{file name}} will be shown.
+
+ Engines other than \LuaTeX\ has the limitations described above.
+\end{function}
+
+\begin{function}{\rescansync:nnn}
+ \begin{syntax}
+ \cs{rescansync:nnn} \Arg{content} \Arg{line offset} \Arg{file name}
+ \end{syntax}
+
+ Similar to above, but use \Arg{file name} as the temporary file name. (only important in error messages, the Sync\TeX\ information
+ points to the file that the content is scanned.)
+\end{function}
+
+\begin{function}{\rescansync:nnnn}
+ \begin{syntax}
+ \cs{rescansync:nnnn} \Arg{content} \Arg{line offset} \Arg{file name} \Arg{Sync\TeX\ tag}
+ \end{syntax}
+
+ Similar to above, but you're allowed to specify the Sync\TeX\ tag.
+
+ More details: each file ever read has an associated Sync\TeX\ tag value, which is a number. The Sync\TeX\ information will point to that file.
+
+ On engines other than \LuaTeX, this feature is not supported and the function returns empty.
+\end{function}
+
+\begin{function}[EXP]{\rescansync_gettag:}
+ \begin{syntax}
+ \cs{rescansync_gettag:}
+ \end{syntax}
+
+ Function that fully expands to some token list that represents the Sync\TeX\ tag that corresponds to some file.
+
+ Note that if a file is |\input| more than once (or if |\file_get:nnN| \pkg{expl3} function is used on that file, which internally uses the \TeX\ |\input| primitive),
+ the tag value will be different and forward search may fail to work.
+\end{function}
+
+As a full example, assume there's a file named \file{a.tex}:
+\begin{verbatim}
+\tl_set:Nx \mytag {\rescansync_gettag:}
+\end{verbatim}
+After it's executed, a file \file{b.tex} executes:
+\begin{verbatim}
+\rescansync:nnnV {abcdef} {3} {rescanned-a} \mytag
+\end{verbatim}
+then the text |abcdef| will be typesetted, the Sync\TeX\ information points to line $1+3=4$ in the file \file{a.tex}
+(as the code |abcdef| is on the first line of the \Arg{content}, and the line offset is 3).
+
+If there's any error while typesetting |abcdef|, the error file name will be reported as for example, \file{RS1-rescanned-a.tex} (the number |1| might vary) instead of \file{a.tex}.
+
+\StopEventually{%
+ \PrintChanges
+ \PrintIndex
+}
+\Finale
+\end{document}
+
+
diff --git a/macros/latex/contrib/sidenotesplus/README.txt b/macros/latex/contrib/sidenotesplus/README.txt
index e602b7cd34..c2a416610f 100644
--- a/macros/latex/contrib/sidenotesplus/README.txt
+++ b/macros/latex/contrib/sidenotesplus/README.txt
@@ -2,7 +2,7 @@ LaTeX package sidenotesplus
Copyright (c) Anton Vrba, 2022
-------------------------------------------------------------------
Version:
- 2022/05/31 1.01
+ 2022/07/09 1.02 added Ragged option
Licence:
This work may be distributed and/or modified under the conditions
of the LaTeX Project Public License, version 1.3c of the license.
@@ -17,5 +17,6 @@ Abstract:
For biblatex users, routines for side references are provided.
-------------------------------------------------------------------
-Previous Versions:
+Previous Versions:
+ 2022/05/31 1.01 Minor bug fix
2022/05/15 1.00 Initial release
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
index b6c51d20d2..7e76cd609d 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
@@ -36,7 +36,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<package>\ProvidesPackage{sidenotesplus}
%<*package>
- [2022/05/31 v1.01 rich text marginal notes, tables and figures ]
+ [2022/07/09 1.02 rich text marginal notes, tables and figures ]
%</package>
%<package>\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
%<package>\RequirePackage{caption} % handles the captions (in the margin)
@@ -94,8 +94,9 @@
%
% \maketitle
%
-% \changes{v1.0}{2022/05/15}{Initial Release}
-% \changes{v1.01}{2022/05/31}{Environment text* improved}
+% \changes{1.0}{2022/05/15}{Initial Release}
+% \changes{1.01}{2022/05/31}{Environment text* improved}
+% \changes{1.02}{2022/07/09}{added Ragged option}
%
% \begin{abstract}
% \noindent A package to manage the margin notes, figures, tables and captions.
@@ -124,6 +125,7 @@
% |size=| & |footnote, normal, small, script| \\
% |shape=| & | up, it, sl|\\
% |ragged| & switches to ragged outer margins\\
+% |Ragged| & switches to ragged outer margins but uses ragged2e package\\
% |classic| & switches to a classic look\\
% |sepdiff=| & |1em|, or a valid length within reason \\
% |alerton| & switches on the rendering of the margin alerts \\
@@ -132,9 +134,13 @@
% ~
%
% The normal page style is that margin notes are left-right justified with the
-% last line ragged to the outer edge. The option |ragged| changes this
+% last line ragged to the outer edge. The option |ragged| or |Ragged| changes this
% style to ragged-outer, that is the left page's marginal notes are |\raggedleft|
% and the right page's are |\raggedright|.
+% If you opt to use |Ragged| the package |ragged2e| is loaded and |RaggedLeft/Right|
+% is used instead of |raggedleft/right|. Load package |ragged2e| with required
+% options before |sidenotesplus| is loaded, otherwise |sidenotesplus| loads
+% |ragged2e| without any options.
%
% The marginal note's reference number or mark is placed in the margin separator,
% that is on the left page the mark is on the right hand side of the note.
@@ -325,6 +331,8 @@
% \item[ifoddpage] provides the command |\ifoddpage|
% \item[etoolbox] provides the command |\patchcmd|
% \item[calc] provides calculation such as adding lengths
+% \item[ragged2e] if |Ragged| option is used, and provides hyphenation
+% to prevent very short lines
%
% \end{description}%
@@ -360,7 +368,7 @@
\snp@size\snp@shape\snp@font\leavevmode%
\lineskip=0pt \lineskiplimit=0pt %
\tolerance=2000 \hyphenpenalty=300 \exhyphenpenalty=300%
- \doublehyphendemerits=100000%
+ \doublehyphendemerits=300%
\finalhyphendemerits=\doublehyphendemerits
}
\NewDocumentCommand \snp@sideformat {} {}
@@ -385,6 +393,7 @@
\bool_new:N \l@snp@alerton
\bool_new:N \l@snp@alertmarkon
\bool_new:N \l@snp@ragged
+\bool_new:N \l@snp@Ragged
\bool_new:N \l@snp@symmetric
\bool_new:N \l@snp@page
@@ -392,6 +401,7 @@
\bool_set_false:N \l@snp@alerton
\bool_set_false:N \l@snp@alertmarkon
\bool_set_false:N \l@snp@ragged
+\bool_set_false:N \l@snp@Ragged
\bool_set_true:N \l@snp@symmetric
@@ -430,9 +440,19 @@
ragged .code:n = { \RenewDocumentCommand \snp@leftmarginstyle {}{\raggedleft}
\RenewDocumentCommand \snp@rightmarginstyle {}{\raggedright}
\bool_set_true:N \l@snp@ragged },
+ Ragged .code:n = { \RenewDocumentCommand \snp@leftmarginstyle {}{\RaggedLeft}
+ \RenewDocumentCommand \snp@rightmarginstyle {}{\RaggedRight}
+ \bool_set_true:N \l@snp@Ragged
+ \bool_set_true:N \l@snp@ragged },
alerton .code:n = {\bool_set_true:N \l@snp@alerton},
}
\ProcessKeysOptions { sidenoteplus }
+\bool_if:NTF \l@snp@Ragged
+ {
+ \@ifpackageloaded{ragged2e}
+ {\relax}{\RequirePackage{ragged2e}}
+ }
+ {\relax}
\bool_if:NTF \l@snp@ragged
{\setlength{\snp@marginsepdiff}{0pt} \bool_set_false:N \l@snp@symmetric}
{\relax}
@@ -683,13 +703,13 @@
% --
%
% \begin{macrocode}
-\NewDocumentCommand \sidenotemark {s d() d!! m }
+\NewDocumentCommand \sidenotemark {s d() d!! }
{
\IfBooleanTF{#1}
{ % starred
\relax}
{% unstarred
- \IfNoValueOrEmptyT{#3}
+ \IfNoValueOrEmptyTF{#3}
{\snp@sidenotemark (#2)}
{\snp@sidenotemark !#3!( #2)}
}
@@ -1213,19 +1233,14 @@
% \begin{macrocode}
\RenewDocumentEnvironment{table*}{O{htbp} }
{
- \begin{table}[#1]
- \begin{@snp@autoadjustwidth}{}{\d@snp@extrawidth}
- \if@twoside
- \snp@isoddpage{\raggedright}{\raggedleft}
- \snp@isoddpage
- {\captionsetup{margin={0pt,0pt}} }
- {\captionsetup{margin={-\d@snp@extrawidth,\d@snp@extrawidth}} }
- \else
- \raggedright \captionsetup{margin={0pt,0pt}}
- \fi
-}
-{ % end part
- \end{@snp@autoadjustwidth}
+ \begin{table}[#1]
+ \begin{@snp@autoadjustwidth}{}{\d@snp@extrawidth}
+ \begin{minipage}[c]{\linewidth}
+ \centering
+ \captionsetup{ margin={\d@snp@extrawidth/2,\d@snp@extrawidth/2}}
+}{ % end part
+ \end{minipage}
+ \end{@snp@autoadjustwidth}
\end{table}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
index 5237810fea..46bd149c76 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
index e9cf85133f..dcf7635717 100644
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index e6939da8cc..bebf8a70a5 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,15 @@
+2022-07-08 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-jats.tex (jats.4ht): overwrite MathML redefinitions for
+ basic font commands configurations.
+
+2022-07-07 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-fonts-mnsymbol.tex: added support for the MnSymbol fonts.
+ * tex4ht-4ht.tex (usepackage.4ht, bookmark-hooks.4ht): prevent
+ errors with the Bookmark package.
+ https://tex.stackexchange.com/a/650128/2891
+
2022-07-05 Karl Berry <karl@freefriends.org>
* Makefile (tex4ht_4ht_derived): add texpower.
diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile
index 3c48521b3d..01a6b62e90 100644
--- a/support/TeX4ht/source/Makefile
+++ b/support/TeX4ht/source/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1171 2022-07-05 21:29:31Z karl $
+# $Id: Makefile 1173 2022-07-07 13:29:07Z michal_h21 $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
@@ -219,6 +219,10 @@ tex4ht_fonts_opensans_derived = \
# xx and many more
# whither tmp? how change target dir? what happened to cmtex.htf? etc.
+derived += $(tex4ht_fonts_mnsymbol_derived)
+tex4ht_fonts_mnsymbol_derived = \
+ $(ht_fonts_devdir)/unicode/MnSymbol/MnSymbolA-Bold10.htf
+
# htcmd not used
#derived += $(tex4ht_htcmd_derived)
#tex4ht_htcmd_derived = htcmd.c
@@ -438,6 +442,9 @@ $(tex4ht_fonts_kpfonts_derived): tex4ht-fonts-kpfonts.tex
$(tex4ht_fonts_opensans_derived): tex4ht-fonts-opensans.tex
$(HTTEX) $< ""
+$(tex4ht_fonts_mnsymbol_derived): tex4ht-fonts-mnsymbol.tex
+ $(HTTEX) $< ""
+
# requires more memory than configured in other tex programs.
$(tex4ht_fonts_4hf): tex4ht-fonts-4hf.tex
dvilualatex $<
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index 753ebab863..abba9548e6 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1171 2022-07-05 21:29:31Z karl $
+% $Id: tex4ht-4ht.tex 1172 2022-07-07 12:17:55Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -6220,6 +6220,27 @@ Hype: \hyperref[sec:foobar]{Link to Section \ref*{sec:foobar}}
\EndVerbatim
\EndHPage{}]
+\Section{bookmark.sty}
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht}
+>>>
+
+\<bookmark-hooks.4ht\><<<
+% bookmark-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+|<pass draft mode to bookmark|>
+\endinput
+>>> \AddFile{9}{bookmark-hooks}
+
+The bookmark package redefines sectioning commands, biliography, etc., which we don't
+want, as it clashes with TeX4ht. It is useful only in the PDF mode anayway.
+
+\<pass draft mode to bookmark\><<<
+\PassOptionsToPackage{draft}{bookmark}
+>>>
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Chapter{Miscellaneous Environments}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/support/TeX4ht/source/tex4ht-jats.tex b/support/TeX4ht/source/tex4ht-jats.tex
index e969844c70..dc9ae8e5b9 100644
--- a/support/TeX4ht/source/tex4ht-jats.tex
+++ b/support/TeX4ht/source/tex4ht-jats.tex
@@ -73,8 +73,14 @@ https://jats.nlm.nih.gov/archiving/tag-library/1.3/chapter/getting-started.html
\<configure jats latex\><<<
|<latex fonts|>
+% We must override MathML's version of basic font commands.
+\AtBeginDocument{%
+|<mathml fonts|>
+}
>>>
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Classes}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -453,22 +459,6 @@ about font name and size is lost.
>>>
\<latex fonts\><<<
-\Configure{textit}{\Protect\HCode{<italic>}\NoFonts}{\EndNoFonts\Protect\Tg</italic>}
-\Configure{textbf}{\Protect\HCode{<bold>}\NoFonts}{\EndNoFonts\Protect\Tg</bold>}
-\Configure{textsc}{\Protect\HCode{<sc>}\NoFonts}{\EndNoFonts\Protect\Tg</sc>}
-\Configure{textrm}{\Protect\HCode{<roman>}\NoFonts}
- {\EndNoFonts\Protect\HCode{</roman>}}
-\Configure{textup}{\Protect\HCode{<span class="textup">}\NoFonts}
- {\EndNoFonts\Protect\HCode{</span>}}
-\Configure{textsf}{\Protect\HCode{<sans-serif>}\NoFonts}
- {\EndNoFonts\Protect\HCode{</sans-serif>}}
-\Configure{textsl}{\Protect\HCode{<italic>}\NoFonts}
- {\EndNoFonts\Protect\HCode{</italic>}}
-\Configure{texttt}{\Protect\HCode{<monospace>}\NoFonts}
- {\EndNoFonts\Protect\HCode{</monospace>}}
-\Configure{emph}{\Protect\HCode{<italic>}\NoFonts}
- {\EndNoFonts\Protect\HCode{</italic>}}
-
\Configure{underline}
{\HCode{<underline>}\:gobble}
{\HCode{</underline>}}
@@ -482,6 +472,47 @@ about font name and size is lost.
{\HCode{</sub>}}
>>>
+The basic font commands are redefined in mathml.4ht, so we need to redefine them again
+
+\<mathml fonts\><<<
+\Configure{texttt}
+ {\ifmathml\providemtextclass{\mml:class="texttt"
+ mathvariant="monospace" }\else\Protect\HCode{<monospace>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</monospace>}\fi}%
+\Configure{textit}
+ {\ifmathml \providemtextclass{\mml:class="textit"
+ mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+\Configure{textrm}
+ {\ifmathml \providemtextclass{\mml:class="textrm"
+ mathvariant="normal" }\else\Protect\HCode{<roman>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</roman>}\fi}%
+\Configure{textup}
+ {\ifmathml \providemtextclass{\mml:class="textup"
+ mathvariant="normal" }\else\Protect\HCode{<roman>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</roman>}\fi}%
+\Configure{textsl}
+ {\ifmathml \providemtextclass{\mml:class="textsl"
+ mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+\Configure{textsf}
+ {\ifmathml \providemtextclass{\mml:class="textsf"
+ mathvariant="sans-serif" }\else\Protect\HCode{<sans-serif>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</sans-serif>}\fi}%
+\Configure{textbf}
+ {\ifmathml \providemtextclass{\mml:class="textbf"
+ mathvariant="bold" }\else\Protect\HCode{<bold>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</bold>}\fi}%
+\Configure{textsc}
+ {\ifmathml \providemtextclass{\mml:class="textsc"
+ mathvariant="normal" }\else\Protect\HCode{<sc>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</sc>}\fi}%
+\Configure{emph}
+ {\ifmathml \providemtextclass{\mml:class="emph"
+ mathvariant="italic" }\else\Protect\HCode{<italic>}\NoFonts\fi}
+ {\ifmathml\else\EndNoFonts\Protect\HCode{</italic>}\fi}%
+>>>
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\chapter{Document structure}
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index ba115377ba..7f4b2d2393 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -13,7 +13,6 @@ $mirrors = {
'https://mirror.bjtu.edu.cn/CTAN/' => 1,
'https://mirrors.aliyun.com/CTAN/' => 1,
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
- 'https://mirrors.cloud.tencent.com/CTAN/' => 1,
'https://mirrors.cqu.edu.cn/CTAN/' => 1,
'https://mirrors.hit.edu.cn/CTAN/' => 1,
'https://mirrors.nju.edu.cn/CTAN/' => 1,
@@ -47,9 +46,11 @@ $mirrors = {
},
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
+ 'https://cran.asia/tex/' => 1,
'https://ftp.harukasan.org/CTAN/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://lab.uklee.pe.kr/tex-archive/' => 1,
+ 'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
},
'Philippines' => {
@@ -122,9 +123,6 @@ $mirrors = {
'Hungary' => {
'https://mirror.szerverem.hu/ctan/' => 1,
},
- 'Italy' => {
- 'https://ctan.mirror.garr.it/mirrors/ctan/' => 1,
- },
'Netherlands' => {
'https://ftp.snt.utwente.nl/pub/software/tex/' => 1,
'https://mirror.koddos.net/CTAN/' => 1,
@@ -176,9 +174,7 @@ $mirrors = {
'Canada' => {
'https://ctan.math.ca/tex-archive/' => 1,
'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' => {
@@ -209,9 +205,6 @@ $mirrors = {
},
},
'South America' => {
- 'Brazil' => {
- 'https://linorg.usp.br/CTAN/' => 1,
- },
'Chile' => {
'https://ctan.dcc.uchile.cl/' => 1,
},
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 62566c0ad4..f557f5900f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/63846
+depend revision/63858
name 00texlive.image
category TLCore
-revision 63844
+revision 63856
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -3571,6 +3571,7 @@ runfiles size=12912
tlpkg/tlpsrc/repere.tlpsrc
tlpkg/tlpsrc/repltext.tlpsrc
tlpkg/tlpsrc/rerunfilecheck.tlpsrc
+ tlpkg/tlpsrc/rescansync.tlpsrc
tlpkg/tlpsrc/resphilosophica.tlpsrc
tlpkg/tlpsrc/rest-api.tlpsrc
tlpkg/tlpsrc/resumecls.tlpsrc
@@ -4596,7 +4597,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 63835
+revision 63848
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
@@ -69008,7 +69009,7 @@ containerchecksum c73220abd1545907a1d8de37cb534d2c6bd2534f1b55f03c069f39f535c326
name collection-latexextra
category Collection
-revision 63843
+revision 63856
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -70107,6 +70108,7 @@ depend relenc
depend relsize
depend repeatindex
depend repltext
+depend rescansync
depend returntogrid
depend rgltxdoc
depend rjlparshap
@@ -70458,8 +70460,8 @@ depend zref-clever
depend zref-vario
depend zwgetfdate
depend zwpagelayout
-containersize 6696
-containerchecksum 18704a1a3e864f848c7c6bc454c2ea3db47aacf2ef59aabcb4f9435bdb80ebf6e6ef09c3a5d31864ba8f762acf407e0c4ec7406a5758b6c030c4504d1aa906f4
+containersize 6704
+containerchecksum 41af622e8dd7b9bd6692f670f1949e7f21f00d0293fa5439f737712fbeec907582b2aebdcd291091cfe6d0211ebe9a1738d7f27691f55aa500cc4836d7ac913b
name collection-latexrecommended
category Collection
@@ -91077,7 +91079,7 @@ catalogue-version 0.9.4
name derivative
category Package
-revision 59453
+revision 63850
shortdesc Nice and easy derivatives
relocated 1
longdesc Typesetting derivatives and differentials in a consistent way
@@ -91095,10 +91097,10 @@ longdesc commands. It also provides a set of commands that can define
longdesc custom derivatives and differential operators. The options
longdesc follow a consistent naming scheme making them easy to use and
longdesc understand.
-containersize 8604
-containerchecksum 0b386fae5bbbda6bdc5124807d8995e7137b48ef04cafbd798f472514ca2c2c29e16066193d305f1e5640eb4ea2d0eba2bde71a016931fde600e00e9bff62a01
-doccontainersize 196092
-doccontainerchecksum 8af91b830d2ae2bc70be524c6c07a8aadb39ab645cbc7c2deaef89469b53b55c3b32631c32329dbf9f0ced7d9066a96ff0de0dd26b842e45a58a99fec3a785a9
+containersize 8456
+containerchecksum 67e5c2a148105051ca882b70d2f3f9c63a06e2f34bb72b84b13bf225a7583bcf919c525890071e3ffe3bbaa0bbc616b8fc62ba050d1c910fceb161131a6fb3a9
+doccontainersize 199584
+doccontainerchecksum 8e2986eda21c8688feaa0f659bd79a8f8f2931381f0dad7fbd055dbf98d8e8fb7c1724df8d2d081ae0ec45781c7eab10edf01535076d28830fef9aff5d4452f4
docfiles size=72
RELOC/doc/latex/derivative/README.md details="Readme"
RELOC/doc/latex/derivative/derivative.pdf details="Package documentation"
@@ -91106,10 +91108,11 @@ docfiles size=72
runfiles size=12
RELOC/tex/latex/derivative/derivative.sty
catalogue-also diffcoeff
+catalogue-contact-repository https://github.com/sjelatex/derivative
catalogue-ctan /macros/latex/contrib/derivative
catalogue-license lppl1.3
catalogue-topics maths expl3
-catalogue-version 1.1
+catalogue-version 1.2
name detex
category TLCore
@@ -122669,22 +122672,22 @@ catalogue-version 1.1
name fixdif
category Package
-revision 63444
+revision 63851
shortdesc Macros for typesetting differential operators
relocated 1
longdesc This package redefines the \d command in LaTeX and provides an
longdesc interface to define new commands for differential operators. It
longdesc is compatible with pdfTeX, XeTeX and LuaTeX, and can also be
longdesc used with the unicode-math package.
-containersize 1760
-containerchecksum 54d461e2227007209c93a4ad162ace8698f85ffe41195c3d88939a79dd66f802db34361412f69fb6bca47b13bbb5b7f5c72802f8fe95aed5fb36d3cdfb36dbb4
-doccontainersize 315264
-doccontainerchecksum 4f0a9bf725c1611d71b495ba6d19ebe860c0b60a5707a2c631b230aadb3fd9d1d05b76739226cd82e4d7141bf90199fca1d87ff01db7fab94baa4a3c6d34b76d
-docfiles size=81
+containersize 1772
+containerchecksum ca5d5d722ce1e81b967b027edbb7ec8292ad9689497b083e6c4ca485d691a676df1adc865377f11497f6c8f5b24bf87723380ecbe6b2db5055c3f419620e0b43
+doccontainersize 305340
+doccontainerchecksum 5cb946b431a268b9fb003bcb7b67fcdfbb098da7021b71a3daed45c12bc675aea885afe99c7f3e9a43b6abd0b1d7553c56b1c3bfda7f728f798a8fea3cf00646
+docfiles size=78
RELOC/doc/latex/fixdif/README.md details="Readme"
RELOC/doc/latex/fixdif/fixdif.pdf details="Package documentation"
-srccontainersize 6124
-srccontainerchecksum c2ce3df024d6e9066710464af66d00564c26a11964a1e74cce369c46b6c6335ad01c5ef378847d64d6dbcc872157fabe34bebdc04f1493e6669271cbe2ea5e83
+srccontainersize 6136
+srccontainerchecksum 971c584b176b16775fcb97d310d582ab05a5bcf3e69b4d75ef2755448910cbd045df638ef53fc62ff030053c83b464911b447f8e76733dd4505e91c903a20e2e
srcfiles size=6
RELOC/source/latex/fixdif/fixdif.dtx
RELOC/source/latex/fixdif/fixdif.ins
@@ -122696,7 +122699,7 @@ catalogue-contact-support https://github.com/CTeX-org/forum
catalogue-ctan /macros/latex/contrib/fixdif
catalogue-license lppl1.3c
catalogue-topics maths
-catalogue-version 1.1
+catalogue-version 1.2
name fixfoot
category Package
@@ -140308,28 +140311,27 @@ catalogue-version 0.61
name hideanswer
category Package
-revision 63746
+revision 63852
shortdesc Generate documents with and without answers by toggling a switch
relocated 1
longdesc This package can generate documents with and without answers
longdesc from a single file by toggling a switch. However, it can only
longdesc be used to create documents to be printed on paper.
-containersize 1228
-containerchecksum a541acd2da2d96886fe793c1d808f257f1ac0a39077cadf71b1c47491ead19bdb8c00e5600519031e440a78cd8e7ffc4493cc416403bb7ae3143d12657d037cc
-doccontainersize 2172
-doccontainerchecksum 4a865c373d6006c4367549561af6c8912fd773f781d27528903918b3de41aacaf37616d52014497fd58534548bccc35cc8e3db218d9bd64a8fc7948a39709340
-docfiles size=4
+containersize 1236
+containerchecksum 9124e631262dce82cea19158e34353817129e014ec5808dbfbe87df661127d516664de2a895622344dc663c68ca51731bb6d887a5043789e3d830fa908b82cdf
+doccontainersize 119560
+doccontainerchecksum f9bad79f55157a0f9007c1f551592d0e054f2a519aeda36c175afa807a70542068cce1b9bffb31855de8e99e8460fa22f41f046be25c2bb4757ba859300b77b2
+docfiles size=35
RELOC/doc/latex/hideanswer/README.md details="Readme"
- RELOC/doc/latex/hideanswer/hideanswer-en.md details="Package documentation (English)"
- RELOC/doc/latex/hideanswer/hideanswer-ja.md details="Package documentation (Japanese)" language="ja"
- RELOC/doc/latex/hideanswer/hideanswer_example.tex
+ RELOC/doc/latex/hideanswer/hideanswer.pdf details="Package documentation"
+ RELOC/doc/latex/hideanswer/hideanswer.tex
runfiles size=1
RELOC/tex/latex/hideanswer/hideanswer.sty
catalogue-contact-home https://www.metaphysica.info/technote/package_hideanswer/
catalogue-ctan /macros/latex/contrib/hideanswer
catalogue-license mit
catalogue-topics cond-comp exam
-catalogue-version 1.0
+catalogue-version 1.1
name highlightlatex
category Package
@@ -146587,26 +146589,27 @@ catalogue-version 1.0
name inlinelabel
category Package
-revision 63833
+revision 63853
shortdesc Assign equation numbers to inline equations
relocated 1
longdesc This package can assign equation numbers to inline equations.
longdesc When Japanese is supported, you can switch to circled equation
longdesc numbers.
-containersize 1232
-containerchecksum 33dc741a4242865972dde3c0ae70896de33b9d18bdca55ba8910353cf53ff7d4ec02de52947ec137afcaa9899b6f1c815121b3de93bb5ea797a2ed92f8ad5556
-doccontainersize 154360
-doccontainerchecksum ece20dc0dfab9cd593ddf6adc7c29296a9d170213c6bd1b00c62b695a0ee56ad67aeb86aa77014f72f380faa038578b00760f1035dc653a89695ec86cc1da046
-docfiles size=41
+containersize 1236
+containerchecksum 66d105c71bd5896019ec584a4ca0a26fadadd8d922be95ec7c8e0ee8f9b5a265304359a19ad77036e8bc885ec0e786e03ee8e1edb72addd1adb5d064eb40ab08
+doccontainersize 158132
+doccontainerchecksum 0d70c8f7d7b9f022444c95657b3ecef395790ca80697511e8ebcef975ae19edbfc43abb223bed03888943203e870e8732cfb37f2f07e0e4e2575b8e2d495f8ce
+docfiles size=44
RELOC/doc/latex/inlinelabel/README.md details="Readme"
RELOC/doc/latex/inlinelabel/inlinelabel.pdf details="Package documentation"
+ RELOC/doc/latex/inlinelabel/inlinelabel.tex
runfiles size=1
RELOC/tex/latex/inlinelabel/inlinelabel.sty
catalogue-contact-home https://www.metaphysica.info/technote/package_inlinelabel/
catalogue-ctan /macros/latex/contrib/inlinelabel
catalogue-license mit
catalogue-topics label-ref
-catalogue-version 1.2
+catalogue-version 1.2.1
name innerscript
category Package
@@ -158790,28 +158793,28 @@ catalogue-topics font font-body font-sans font-mono font-otf font-type1 font-pro
name jpneduenumerate
category Package
-revision 63758
+revision 63854
shortdesc Enumerative expressions in Japanese education
relocated 1
longdesc Mathematical equation representation in Japanese education
longdesc differs somewhat from the standard LaTeX writing style. This
longdesc package introduces enumerative expressions in Japanese
longdesc education.
-containersize 2396
-containerchecksum e77cede5a7867c728290f54225f196d8bb8d3a7eaab4f95e3679f8665f29ee4fdab9db510653451efcb55490c30b0ff5a6bad44b479dc9d746b6358901413dc6
-doccontainersize 2272
-doccontainerchecksum d4b2187103752e6d2a8d919224944357ab8f90b9b7ff858f3a73048c3d4c87933cfad11124316fb6491c3ea647941f43a90992e2ffe11acf55f1007eb8b0adc5
-docfiles size=3
+containersize 2576
+containerchecksum 1ca178e7bb36ea4d0fe639240ce05106f3582116fe771195dc6cb8ae56f631221410946df149b2c7fa0372a50de01973c2327082e42614d67c878689cec58930
+doccontainersize 152288
+doccontainerchecksum b57c3e1c5eca42709b130092e22bc7980bc35c789c41553135de351387f002dcdcdf1aceafca16f01e17ba3f9f9336ca269419f9e5af8422ef5cb83857d69d1d
+docfiles size=45
RELOC/doc/latex/jpneduenumerate/README.md details="Readme"
- RELOC/doc/latex/jpneduenumerate/jpneduenumerate-en.md details="Package documentation (English)"
- RELOC/doc/latex/jpneduenumerate/jpneduenumerate-ja.md details="Package documentation (Japanese)"
-runfiles size=3
+ RELOC/doc/latex/jpneduenumerate/jpneduenumerate.pdf details="Package documentation" language="en,ja"
+ RELOC/doc/latex/jpneduenumerate/jpneduenumerate.tex
+runfiles size=4
RELOC/tex/latex/jpneduenumerate/jpneduenumerate.sty
catalogue-contact-home https://www.metaphysica.info/technote/package_jpneduenumerate/
catalogue-ctan /macros/latex/contrib/jpneduenumerate
catalogue-license mit
catalogue-topics maths japanese list-enum
-catalogue-version 1.0
+catalogue-version 1.1
name jpnedumathsymbols
category Package
@@ -260942,7 +260945,7 @@ runfiles size=30
name qrbill
category Package
-revision 59232
+revision 63855
shortdesc Create QR bills using LaTeX
relocated 1
longdesc This LaTeX package provides support for creating QR-bills for
@@ -260952,23 +260955,22 @@ longdesc these regulations and can be adapted for international use.
longdesc Packages loaded by qrbill are expl3, fontspec (except if one is
longdesc using a custom font setup), graphicx, scrbase, qrcode, iftex,
longdesc l3keys2e, and numprint.
-containersize 6892
-containerchecksum d48352eb7f3d52b9cb567eb8cf4aaac8543d6cbb300b01c9b27c7eb50aedd1ef7c2ae31f0145c0b9b395edce1cce5c7012b97d705e26dc58f9dfd0c932a1caed
-doccontainersize 154576
-doccontainerchecksum 87b9238e3c1652c551464653149ac36de2c4ac39932d7c39d49a16c57fd2c7cef6950ef97072163f2e6ae019a3b093ddcbecae4fa33ecf9539f30d9cec09ddfd
-docfiles size=43
+containersize 7216
+containerchecksum 93a149a4a96f0740b5962c34dd02cc0dfcaea7d9cf1cba29d9268cfa63af7e92d50e9861eba82687d2c89bdc1ac2ec9bd3f669bef04fe516e5b4a740c235c9b0
+doccontainersize 79788
+doccontainerchecksum 629e3f38b7896eb726ba95bdf531211755b57dc5140d6e36fe6c041843aa8d4645583ee6829b6a575ed0c086fc0762c501ef41e2f3afa4fd5074b9946607ab2e
+docfiles size=23
RELOC/doc/latex/qrbill/README.md details="Readme"
- RELOC/doc/latex/qrbill/qrbill-letter-demo.pdf
RELOC/doc/latex/qrbill/qrbill-letter-demo.tex
- RELOC/doc/latex/qrbill/qrbill-standalone-demo.pdf
RELOC/doc/latex/qrbill/qrbill-standalone-demo.tex
RELOC/doc/latex/qrbill/qrbill.pdf details="Package documentation"
-srccontainersize 11744
-srccontainerchecksum 5ed0929c0e31673099f8733bc3cfe29f9eb8e56ee814436dda804047f12b997e507b10a6fac844b11ab10421417db0b3a0603f7f60446f3be56fd6564f831cf8
-srcfiles size=12
+srccontainersize 12708
+srccontainerchecksum 5b587acb06ae07608bec7ecb3766b0b8725b57a1a6a814e1ad2c9e74c37b184cd4be3be9a59f807cf0abf330c69cfa247b36393aa2ea8ea10c7f32ed527d27d2
+srcfiles size=13
RELOC/source/latex/qrbill/qrbill.dtx
RELOC/source/latex/qrbill/qrbill.ins
-runfiles size=9
+runfiles size=10
+ RELOC/tex/latex/qrbill/epc.qrbill-cfg.tex
RELOC/tex/latex/qrbill/qrbill-vocab.csv
RELOC/tex/latex/qrbill/qrbill.sty
RELOC/tex/latex/qrbill/qrbill_swiss-cross.pdf
@@ -260978,7 +260980,7 @@ catalogue-contact-repository https://github.com/peitex/qrbill
catalogue-ctan /macros/latex/contrib/qrbill
catalogue-license lppl1.3c
catalogue-topics qrcode invoice swiss expl3
-catalogue-version 1.03
+catalogue-version 1.04
name qrcode
category Package
@@ -264251,6 +264253,29 @@ catalogue-license lppl1.3
catalogue-topics compilation
catalogue-version 1.9
+name rescansync
+category Package
+revision 63856
+shortdesc Re-scan tokens with synctex information
+relocated 1
+longdesc Allow users to execute saved code to typeset text while
+longdesc preserving SyncTeX information.
+containersize 2096
+containerchecksum 4ad1b90e89a005930d1ad5500418c0d867a1100d21429af64edcc803811e29bf4cd79815fc0018505c8d9504069f7f17bf6e09465484bff5ddb3dbc79f54aab1
+doccontainersize 380868
+doccontainerchecksum 602eaceabe16b326a1e2546b3fea21f22c17b92d01500dfc30f0659f0cad8d93c4e919a18af4a96e8633afcc4c08346dec8f5e84f55fb1f54cc2067e2b54ca42
+docfiles size=96
+ RELOC/doc/latex/rescansync/README details="Readme"
+ RELOC/doc/latex/rescansync/rescansync.pdf details="Package documentation"
+ RELOC/doc/latex/rescansync/rescansync.tex
+runfiles size=2
+ RELOC/tex/latex/rescansync/rescansync.sty
+catalogue-contact-repository https://github.com/user202729/TeXlib
+catalogue-ctan /macros/latex/contrib/rescansync
+catalogue-license lppl1.3c
+catalogue-topics expl3 macro-supp
+catalogue-version 0.0.0
+
name resphilosophica
category Package
revision 50935
@@ -277936,7 +277961,7 @@ catalogue-version 1.6a
name simpleicons
category Package
-revision 63335
+revision 63849
shortdesc Simple Icons for LaTeX
relocated 1
longdesc Similar to FontAwesome icons being provided on LaTeX by the
@@ -277944,18 +277969,18 @@ longdesc fontawesome package, this package aims to do the same with
longdesc Simple Icons. For reference, visit their website:
longdesc https://simpleicons.org/.
execute addMap simpleicons.map
-containersize 2537724
-containerchecksum 8260b596aad8538d92758d648af9e84cf10bc3ede11887fa6514fea820661869d2332a3925993b8c446834f0abc80705ad08c89ed268de3850984d7ca0c4bee6
-doccontainersize 1916492
-doccontainerchecksum 7e7db9df394c8a8474c0078615508e26888af5aeba6b7624d42a62b050846234a9c3c610863537a262b6479618af6dbfe8b3424a697c1f68f7bcc8926fcf8b0b
-docfiles size=581
+containersize 2570300
+containerchecksum 5a91c0c057f460ba6ad69248f0e4b69713b53d102ca156e3fc50f05ed1584a24c6d52aab1a56d911ffffabbffe91fcb60eb145f8086295cfea7472286eee99c4
+doccontainersize 1997768
+doccontainerchecksum 492e3e45f29cd29b110a3233d64def2fac0787ce7565c0f358d9ae13d44b6a7563a5961e388e68bc684b06e7d818c1aaf270ba2421a6c763f3c98c8a68d8d1a9
+docfiles size=605
RELOC/doc/fonts/simpleicons/README.md details="Readme"
RELOC/doc/fonts/simpleicons/bindings.tex
RELOC/doc/fonts/simpleicons/simpleicons.pdf details="Package documentation"
RELOC/doc/fonts/simpleicons/simpleicons.tex
RELOC/doc/fonts/simpleicons/simpleiconsglyphs-pdftex.tex
RELOC/doc/fonts/simpleicons/simpleiconsglyphs-xeluatex.tex
-runfiles size=865
+runfiles size=875
RELOC/fonts/enc/dvips/simpleicons/simpleiconseight.enc
RELOC/fonts/enc/dvips/simpleicons/simpleiconsfive.enc
RELOC/fonts/enc/dvips/simpleicons/simpleiconsfour.enc
@@ -277992,7 +278017,7 @@ catalogue-contact-repository https://github.com/ineshbose/simple-icons-latex
catalogue-ctan /fonts/simpleicons
catalogue-license cc-by-1
catalogue-topics font font-symbol font-supp-symbol font-otf font-type1
-catalogue-version 0.0.1
+catalogue-version 7.4.0
name simpleinvoice
category Package
@@ -295217,7 +295242,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 63816
+revision 63858
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -295238,10 +295263,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 948872
-containerchecksum 97ba7891b4a059cdc0c29921706a60880f0ec441ba7e469810b4d5c28120f785f48ad8870cbed01740cce237d85e9b78efd0f6229aba616e2cb2e7eadbbec782
+containersize 952684
+containerchecksum 39abb4224c27c080034330a6e832e5c4dbc9dc314776763689d871565741ef2df92d9939746f86ee4ea2859990781647b09c368e1e05fcadf9fbf21468c42a3d
doccontainersize 136384
-doccontainerchecksum d935162bb2cb7a1908f09be3d0b9ae102f66aec92d15a2928b778ab9f0c0fdb81a218d6672434f8053db0ada61fe232c212c0affc0fbd17b75f77da86f993a6a
+doccontainerchecksum 58edc27be1a1414c385e3145d926b39aae37133c35848e0ce6c0bea4b674fac0c3b217ff771b2ab84937c53ac63bc3d9f50977e6d45b1b0cc425d543de97a4bd
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -295313,8 +295338,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1253684
-srccontainerchecksum dc28f4f77f9e804591f82cf67f6b2b556bf1f633a73365998f47377d6a95863d7552d89e3797b29d3511348297cdc34683b54251b1dba7c6684edf5cbe5bb1fe
+srccontainersize 1264640
+srccontainerchecksum 055b7345a9feb35f337e228f53511839673632256966b20fd634bdff1b41afa98b1625b249e61d0f76b0a9dc221e9c4b439334a8da2d23738e61b73361599136
srcfiles size=3819
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -295390,7 +295415,7 @@ srcfiles size=3819
texmf-dist/source/generic/tex4ht/update-htfonts
texmf-dist/source/generic/tex4ht/wripro.tex
texmf-dist/source/generic/tex4ht/xtpipes.tex
-runfiles size=11079
+runfiles size=11186
texmf-dist/scripts/tex4ht/ht.sh
texmf-dist/scripts/tex4ht/htcontext.sh
texmf-dist/scripts/tex4ht/htcopy.pl
@@ -295469,6 +295494,7 @@ runfiles size=11079
texmf-dist/tex/generic/tex4ht/bibtopic.4ht
texmf-dist/tex/generic/tex4ht/bm.4ht
texmf-dist/tex/generic/tex4ht/book.4ht
+ texmf-dist/tex/generic/tex4ht/bookmark-hooks.4ht
texmf-dist/tex/generic/tex4ht/booktabs.4ht
texmf-dist/tex/generic/tex4ht/boxedminipage.4ht
texmf-dist/tex/generic/tex4ht/braket.4ht
@@ -297265,6 +297291,97 @@ runfiles size=11079
texmf-dist/tex4ht/ht-fonts/alias/Linux_Libertine_T/LinLibertineTZI-tosf-sc-t1.htf
texmf-dist/tex4ht/ht-fonts/alias/Linux_Libertine_T/LinLibertineTZI-tosf-t1.htf
texmf-dist/tex4ht/ht-fonts/alias/Linux_Libertine_T/LinLibertineTZI-tosf-ts1.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolA9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolB9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolC9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolD9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolE9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolF9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS-Bold9.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS10.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS12.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS5.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS6.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS7.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS8.htf
+ texmf-dist/tex4ht/ht-fonts/alias/MnSymbol/MnSymbolS9.htf
texmf-dist/tex4ht/ht-fonts/alias/NewTXMath/ntx-BoldItalic-osf-ot1.htf
texmf-dist/tex4ht/ht-fonts/alias/NewTXMath/ntx-BoldItalic-tlf-ot1.htf
texmf-dist/tex4ht/ht-fonts/alias/NewTXMath/ntx-BoldItalic-tosf-ot1.htf
@@ -302783,6 +302900,13 @@ runfiles size=11079
texmf-dist/tex4ht/ht-fonts/unicode/MinLib/MinLibReg-ly1.htf
texmf-dist/tex4ht/ht-fonts/unicode/MinLib/MinLibReg-ot1.htf
texmf-dist/tex4ht/ht-fonts/unicode/MinLib/MinLibReg-t1.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolA-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolB-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolC-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolD-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolE-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolF-Bold10.htf
+ texmf-dist/tex4ht/ht-fonts/unicode/MnSymbol/MnSymbolS-Bold10.htf
texmf-dist/tex4ht/ht-fonts/unicode/NCXFourierMath/zncfbmia.htf
texmf-dist/tex4ht/ht-fonts/unicode/NCXFourierMath/zncfmia.htf
texmf-dist/tex4ht/ht-fonts/unicode/NewTXMath/ntx-BoldItalic-lf-ot1.htf
@@ -305674,7 +305798,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 63835
+revision 63848
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.
@@ -305682,10 +305806,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 113276
-containerchecksum c8768fa4023b6859f7cfd7da746a71235e5e9e8b7c589391033168c403f5fe8dad4bcc167e00ea037b1404fbad02652921a85f69739dbb373c8fc64a3300bd9d
-doccontainersize 417756
-doccontainerchecksum 9a5d495879643665e6651762e42db4e7c1aab4035604010ecbca93295373220e3f0d04bfeb4d94199fb56293d0a0d5c51640d6c7cb646e9a693a7a9b8ce603df
+containersize 113240
+containerchecksum b33e791131929ba810bc4f59896fa959ac734539005b887987b83eaa787031ff2799fc3107ddcb6c414788047eefbc54a295a807b0071b18acde5b2682eadee0
+doccontainersize 417968
+doccontainerchecksum 32927a0ee19e87a09de110b9fd79220cfcb0d1390beb360a0e36f98ab43c75b2c080c726c598afa0bc4f000bc36b3b4fb15f4bc11a59f8baabaee6ec9b3d9f8a
docfiles size=515
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 18fdc636b5..bf9cbeb7d4 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-3d52bbe6c081c292b791e0817ec48fe6 texlive.tlpdb
+4e1a229c4a8e0abde05883f7ff7ee1e2 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 5b5b7c501c..8f5575f7b8 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-fc6a5d918ddb988987c4486aa590e56082088dfc60330a79c6e0b11cd14c50e594e54177559884948a8c4cc03cf3ba165a8efd73b46d56313d8366367ca08469 texlive.tlpdb
+23ef02f8910c9b61b8f773a07fcd0176745af8c60af07aad3bd760607b15c736e081856c0e6936d92fd61f02bd8dd4a6ca37448484e8f7ecdaecddbba47b5e71 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 563870e1ac..f53c46dc8a 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-----
-iQEcBAEBCgAGBQJiyMOnAAoJEEzhh34ZQ4xwwyIIALN5cM1PYP4scJrIRNn+dUGl
-nGXbmzzlDzybtFDdsbarb7J+yEy1kHz+Md7t+1A3pGcdQ2NPEUCjx38zlmamosGp
-+v/4HFD/oJ70FPriCRrjP0uSRlakMRdkJnNCPMTtdLu+OT8dlF0yn09+NQEySVi7
-W5eBwBP0fIRCKPn/Q4sl3v1sZR1KNRjGIvnum7xdehaVidNNkhq6mXtrQ3kJaToN
-lO1oAsNsHEjkacQ4w/wfzf/mcn/eLnn8W6htLBJRUMGo5h5o0x/GQVMgQNZanra2
-//HCqoR4WBYAU+JkNBSLjRISPCnj4lV3X2lVfqlxMi34rQXV7emSeDyBpTgvaV8=
-=cPNn
+iQEcBAEBCgAGBQJiyhUoAAoJEEzhh34ZQ4xwxJ8H/09GbFsn7NOjRrMBkjnxu1b6
+jAsr8aUUkpfydOl0cV8nZB4xknmu2fzfcEFbRkWpKrQaJJvxycz2lZJDJeK6sAQk
+U/Bt7dRtcUCEPvvZVpHx+xT0QwFzAviaHT4ufvYLaZJxSpv25KcyQ+5swKcVZ1D/
+KxuoYbwIv+iFDYQUw4CNZBLbrGgerCEWZYdOykkfDZxAol/EegTj44GK00sOhNNM
+aD3nIF8q/SIPgSem4WOjEzkpMOzINiORrkQ4RFMCXmFFcC+vo76nYrTBKBXnj8yi
+BoIO9oV1UdiOqvA4vH5VAg3JwMcDrploGcyC4geOx6hcgFUz1UySBqoLZtlFxeM=
+=v9u+
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index d1ab086782..da2ee256c9 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/timestamp b/timestamp
index 6df7b5a6db..6ff800bf99 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-07-09-02-02
+2022-07-10-02-02