CTAN sync 202107230300

51 files changed, 2824 insertions, 2883 deletions

diff --git a/FILES.byname b/FILES.byname
index 5902de54df..61f646c06e 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5100,7 +5100,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
-2021/07/21 |     117275 | FILES.last07days
+2021/07/22 |     113799 | FILES.last07days
 2020/08/14 |     104065 | fonts/academicons/academicons.pdf
 2020/08/14 |      17247 | fonts/academicons/academicons.sty
 2020/08/14 |       6546 | fonts/academicons/academicons.tex
@@ -132624,24 +132624,24 @@
 2006/11/20 |      37756 | fonts/utopia/putri8a.pfb
 2006/11/17 |       1777 | fonts/utopia/README-utopia.txt
 2006/11/20 |     176430 | fonts/utopia.zip
-2018/02/13 |     131707 | fonts/variablelm/doc/control_scaling_lm_fonts.pdf
-2018/02/13 |       1396 | fonts/variablelm/doc/control_scaling_lm_fonts.tex
-2018/02/13 |        967 | fonts/variablelm/README.md
-2017/02/12 |       1179 | fonts/variablelm/tex/omlvlmm.fd
-2017/02/12 |       1150 | fonts/variablelm/tex/omlvlmr.fd
-2017/02/12 |       1149 | fonts/variablelm/tex/omsvlmr.fd
-2017/02/12 |       1078 | fonts/variablelm/tex/omsvlmsy.fd
-2017/02/12 |        698 | fonts/variablelm/tex/omxvlmex.fd
-2017/02/12 |       2590 | fonts/variablelm/tex/ot1vlmr.fd
-2017/02/12 |       3386 | fonts/variablelm/tex/ot1vlmtt.fd
-2017/02/12 |       2576 | fonts/variablelm/tex/t1vlmr.fd
-2017/02/12 |       2083 | fonts/variablelm/tex/t1vlmss.fd
-2017/02/12 |       1342 | fonts/variablelm/tex/t1vlmssq.fd
-2018/02/12 |       3558 | fonts/variablelm/tex/t1vlmtt.fd
-2017/02/12 |       2248 | fonts/variablelm/tex/t1vlmvtt.fd
-2017/02/12 |       2623 | fonts/variablelm/tex/ts1vlmr.fd
-2018/02/13 |       2264 | fonts/variablelm/tex/variablelm.sty
-2018/02/12 |     143268 | fonts/variablelm.zip
+2021/07/22 |     134823 | fonts/variablelm/doc/control_scaling_lm_fonts.pdf
+2021/07/22 |       1394 | fonts/variablelm/doc/control_scaling_lm_fonts.tex
+2021/05/16 |        965 | fonts/variablelm/README.md
+2021/05/16 |       1179 | fonts/variablelm/tex/omlvlmm.fd
+2021/05/16 |       1150 | fonts/variablelm/tex/omlvlmr.fd
+2021/05/16 |       1149 | fonts/variablelm/tex/omsvlmr.fd
+2021/05/16 |       1078 | fonts/variablelm/tex/omsvlmsy.fd
+2021/05/16 |        698 | fonts/variablelm/tex/omxvlmex.fd
+2021/05/16 |       2590 | fonts/variablelm/tex/ot1vlmr.fd
+2021/05/16 |       3386 | fonts/variablelm/tex/ot1vlmtt.fd
+2021/05/16 |       2576 | fonts/variablelm/tex/t1vlmr.fd
+2021/05/16 |       2083 | fonts/variablelm/tex/t1vlmss.fd
+2021/05/16 |       1342 | fonts/variablelm/tex/t1vlmssq.fd
+2021/05/16 |       3558 | fonts/variablelm/tex/t1vlmtt.fd
+2021/05/16 |       2248 | fonts/variablelm/tex/t1vlmvtt.fd
+2021/05/16 |       2623 | fonts/variablelm/tex/ts1vlmr.fd
+2021/05/16 |       2293 | fonts/variablelm/tex/variablelm.sty
+2021/07/22 |     145027 | fonts/variablelm.zip
 1996/03/10 |        244 | fonts/va/t1va.fd
 1996/03/10 |       6102 | fonts/va/va14.mf
 1996/03/10 |       6146 | fonts/va/vacal14.mf
@@ -172926,7 +172926,7 @@
 2021/06/20 |    1615285 | install/language/chinese/ctex.tds.zip
 2016/11/23 |     413896 | install/language/chinese/zhmcjk.tds.zip
 2017/03/09 |     168862 | install/language/hebrew/cjhebrew.tds.zip
-2021/05/28 |   10938667 | install/language/japanese/jlreq.tds.zip
+2021/07/22 |   10947557 | install/language/japanese/jlreq.tds.zip
 2021/06/27 |    1829497 | install/language/japanese/platex.tds.zip
 2021/05/31 |     907477 | install/language/japanese/uplatex.tds.zip
 2013/05/18 |    7628531 | install/language/vietnamese/vntex.tds.zip
@@ -173204,7 +173204,7 @@
 2012/09/24 |     130991 | install/macros/latex/contrib/scrjrnl.tds.zip
 2020/02/15 |    1097592 | install/macros/latex/contrib/sdaps.tds.zip
 2019/12/10 |     544332 | install/macros/latex/contrib/selinput.tds.zip
-2021/07/20 |    3343893 | install/macros/latex/contrib/siunitx.tds.zip
+2021/07/22 |    3346426 | install/macros/latex/contrib/siunitx.tds.zip
 2019/10/15 |     315856 | install/macros/latex/contrib/skmath.tds.zip
 2019/10/16 |     345652 | install/macros/latex/contrib/skrapport.tds.zip
 2019/12/15 |     357584 | install/macros/latex/contrib/soulutf8.tds.zip
@@ -173270,7 +173270,7 @@
 2021/06/17 |    7348487 | install/macros/latex-dev/required/latex-tools-dev.tds.zip
 2021/06/15 |   34394602 | install/macros/latex/latex-base.tds.zip
 2020/06/01 |    1578753 | install/macros/latex/required/amscls.tds.zip
-2021/07/19 |    2827365 | install/macros/latex/required/babel-base.tds.zip
+2021/07/22 |    2824954 | install/macros/latex/required/babel-base.tds.zip
 2021/06/01 |    2763317 | install/macros/latex/required/latex-amsmath.tds.zip
 2021/06/28 |     211494 | install/macros/latex/required/latexbug.tds.zip
 2018/04/06 |    1324669 | install/macros/latex/required/latex-cyrillic.tds.zip
@@ -182323,23 +182323,23 @@
 2021/03/07 |       3532 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminr-v.vf
 2021/03/13 |    1138379 | language/japanese/jlreq-deluxe.zip
 2020/12/29 |       5662 | language/japanese/jlreq/jfm-jlreq-jidori.lua
-2020/12/19 |      40988 | language/japanese/jlreq/jfm-jlreq.lua
-2021/05/28 |     274733 | language/japanese/jlreq/jlreq.cls
-2021/05/28 |      23293 | language/japanese/jlreq/jlreq-helpers.sty
-2021/05/28 |     361307 | language/japanese/jlreq/jlreq-ja.pdf
-2021/05/28 |     117613 | language/japanese/jlreq/jlreq.pdf
-2020/05/01 |       7677 | language/japanese/jlreq/jlreq-trimmarks-ja.md
-2020/05/01 |       6378 | language/japanese/jlreq/jlreq-trimmarks.md
-2020/10/05 |      44853 | language/japanese/jlreq/jlreq-trimmarks.sty
+2021/07/22 |      49222 | language/japanese/jlreq/jfm-jlreq.lua
+2021/07/22 |     280501 | language/japanese/jlreq/jlreq.cls
+2021/07/22 |      23412 | language/japanese/jlreq/jlreq-helpers.sty
+2021/07/22 |     366748 | language/japanese/jlreq/jlreq-ja.pdf
+2021/07/22 |     117978 | language/japanese/jlreq/jlreq.pdf
+2021/07/22 |       7742 | language/japanese/jlreq/jlreq-trimmarks-ja.md
+2021/07/22 |       6436 | language/japanese/jlreq/jlreq-trimmarks.md
+2021/07/22 |      44975 | language/japanese/jlreq/jlreq-trimmarks.sty
 2021/03/19 |       1348 | language/japanese/jlreq/LICENSE
 2019/04/01 |      11487 | language/japanese/jlreq/luajfm2pl.lua
 2021/03/18 |       9170 | language/japanese/jlreq/Makefile
 2021/03/17 |       5652 | language/japanese/jlreq/make_variant_jfm.lua
-2021/05/28 |      42570 | language/japanese/jlreq/README-ja.md
-2021/05/28 |       5519 | language/japanese/jlreq/README.md
+2021/07/22 |      44371 | language/japanese/jlreq/README-ja.md
+2021/07/22 |       5764 | language/japanese/jlreq/README.md
 2019/04/01 |       3094 | language/japanese/jlreq/README-template.html
 2020/03/27 |       3315 | language/japanese/jlreq/README-template.tex
-2021/05/28 |     585385 | language/japanese/jlreq.zip
+2021/07/22 |     593339 | language/japanese/jlreq.zip
 1995/08/05 |       7067 | language/japanese/jtex/00NEWS
 1995/07/26 |       1558 | language/japanese/jtex/00README
 1995/06/21 |       1825 | language/japanese/jtex/jlatex2e-add1.tar.gz
@@ -186413,7 +186413,7 @@
 2013/04/01 |      14776 | macros/context/contrib/context-visualcounter/tex/context/third/visualcounter/t-visualcounter.mkvi
 2018/03/05 |         11 | macros/context/contrib/context-visualcounter/VERSION
 2018/03/22 |     276789 | macros/context/contrib/context-visualcounter.zip
-2021/07/16 |  122920214 | macros/context/latest/cont-tmf.zip
+2021/07/21 |  122946807 | macros/context/latest/cont-tmf.zip
 2016/04/21 |      32846 | macros/cstex/base/cmexb.tar.gz
 2016/06/26 |    1728262 | macros/cstex/base/csfonts-t1.tar.gz
 2007/03/01 |     187106 | macros/cstex/base/csfonts.tar.gz
@@ -197736,11 +197736,11 @@
 2008/02/10 |      19110 | macros/latex/contrib/ean13isbn/License.txt
 2021/01/24 |        422 | macros/latex/contrib/ean13isbn/README
 2021/01/24 |     322624 | macros/latex/contrib/ean13isbn.zip
-2021/07/19 |     152239 | macros/latex/contrib/easybook/easybook.dtx
+2021/07/22 |     156466 | macros/latex/contrib/easybook/easybook.dtx
 2021/07/03 |       1627 | macros/latex/contrib/easybook/easybook.ins
-2021/07/19 |     591310 | macros/latex/contrib/easybook/easybook.pdf
+2021/07/22 |     598988 | macros/latex/contrib/easybook/easybook.pdf
 2021/07/14 |       1664 | macros/latex/contrib/easybook/README.md
-2021/07/19 |     629922 | macros/latex/contrib/easybook.zip
+2021/07/22 |     638791 | macros/latex/contrib/easybook.zip
 2009/06/17 |      82589 | macros/latex/contrib/easy/doc/docbib.pdf
 2009/06/17 |      78378 | macros/latex/contrib/easy/doc/docbmat.pdf
 2009/06/17 |      99132 | macros/latex/contrib/easy/doc/doceqn.pdf
@@ -212145,35 +212145,35 @@
 2007/12/02 |       2971 | macros/latex/contrib/SIunits/SIunits.ins
 2007/12/02 |     328621 | macros/latex/contrib/SIunits/SIunits.pdf
 2007/12/02 |     296391 | macros/latex/contrib/SIunits.zip
-2021/07/20 |      44662 | macros/latex/contrib/siunitx/CHANGELOG.md
-2021/07/20 |        964 | macros/latex/contrib/siunitx/README.md
-2021/07/20 |      10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2021/07/20 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2021/07/20 |      16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
-2021/07/20 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2021/07/20 |       2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2021/07/20 |    1496050 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2021/07/20 |       2426 | macros/latex/contrib/siunitx/siunitx-code.tex
-2021/07/20 |       8752 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2021/07/20 |      25939 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2021/07/20 |      33434 | macros/latex/contrib/siunitx/siunitx-compound.dtx
-2021/07/20 |      19804 | macros/latex/contrib/siunitx/siunitx.dtx
-2021/07/20 |      31333 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2021/07/20 |       3687 | macros/latex/contrib/siunitx/siunitx.ins
-2021/07/20 |       4746 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2021/07/20 |     115602 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2021/07/20 |     635529 | macros/latex/contrib/siunitx/siunitx.pdf
-2021/07/20 |      31661 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2021/07/20 |     484555 | macros/latex/contrib/siunitx/siunitx-print.pdf
-2021/07/20 |      15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
-2021/07/20 |       9040 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2021/07/20 |      48827 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2021/07/20 |     146108 | macros/latex/contrib/siunitx/siunitx.tex
-2021/07/20 |      98189 | macros/latex/contrib/siunitx/siunitx-unit.dtx
-2021/07/20 |     627332 | macros/latex/contrib/siunitx/siunitx-unit.pdf
-2021/07/20 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2021/07/20 |      31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2021/07/20 |    3305270 | macros/latex/contrib/siunitx.zip
+2021/07/22 |      44963 | macros/latex/contrib/siunitx/CHANGELOG.md
+2021/07/22 |        964 | macros/latex/contrib/siunitx/README.md
+2021/07/22 |      10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2021/07/22 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2021/07/22 |      16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2021/07/22 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2021/07/22 |       2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2021/07/22 |    1497883 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2021/07/22 |       2426 | macros/latex/contrib/siunitx/siunitx-code.tex
+2021/07/22 |       8752 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2021/07/22 |      25939 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2021/07/22 |      33434 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2021/07/22 |      19826 | macros/latex/contrib/siunitx/siunitx.dtx
+2021/07/22 |      31333 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2021/07/22 |       3687 | macros/latex/contrib/siunitx/siunitx.ins
+2021/07/22 |       4746 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2021/07/22 |     115830 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2021/07/22 |     636251 | macros/latex/contrib/siunitx/siunitx.pdf
+2021/07/22 |      31661 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2021/07/22 |     484555 | macros/latex/contrib/siunitx/siunitx-print.pdf
+2021/07/22 |      15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2021/07/22 |       9040 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2021/07/22 |      49090 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2021/07/22 |     146242 | macros/latex/contrib/siunitx/siunitx.tex
+2021/07/22 |      98189 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2021/07/22 |     627332 | macros/latex/contrib/siunitx/siunitx-unit.pdf
+2021/07/22 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2021/07/22 |      31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2021/07/22 |    3307734 | macros/latex/contrib/siunitx.zip
 2011/06/03 |     662398 | macros/latex/contrib/skb/doc/skb.pdf
 2011/03/15 |       1485 | macros/latex/contrib/skb/doc/user-guide/database/acronyms.tex
 2011/03/15 |        722 | macros/latex/contrib/skb/doc/user-guide/database/bibliography.tex
@@ -212518,10 +212518,10 @@
 2016/10/06 |     136549 | macros/latex/contrib/spalign/spalign.pdf
 2016/10/06 |     132943 | macros/latex/contrib/spalign.zip
 2021/06/27 |        571 | macros/latex/contrib/spbmark/README.md
-2021/06/30 |      13121 | macros/latex/contrib/spbmark/spbmark.dtx
+2021/07/22 |      13250 | macros/latex/contrib/spbmark/spbmark.dtx
 2021/06/27 |       1365 | macros/latex/contrib/spbmark/spbmark.ins
-2021/06/30 |      68944 | macros/latex/contrib/spbmark/spbmark.pdf
-2021/06/30 |      72208 | macros/latex/contrib/spbmark.zip
+2021/07/22 |      68498 | macros/latex/contrib/spbmark/spbmark.pdf
+2021/07/22 |      71744 | macros/latex/contrib/spbmark.zip
 2010/10/31 |     241052 | macros/latex/contrib/sphack/sphack-doc.pdf
 2010/10/31 |       4122 | macros/latex/contrib/sphack/sphack-doc.tex
 2010/12/23 |       4230 | macros/latex/contrib/sphack/sphack.sty
@@ -212942,10 +212942,10 @@
 1994/05/24 |       3765 | macros/latex/contrib/ssqquote/ssqquote.readme
 2005/04/30 |       9000 | macros/latex/contrib/ssqquote.zip
 2016/10/05 |       1154 | macros/latex/contrib/stackengine/README
-2021/07/15 |     385976 | macros/latex/contrib/stackengine/stackengine.pdf
-2021/07/15 |      16273 | macros/latex/contrib/stackengine/stackengine.sty
-2021/07/15 |      59427 | macros/latex/contrib/stackengine/stackengine.tex
-2021/07/15 |     375443 | macros/latex/contrib/stackengine.zip
+2021/07/22 |     385801 | macros/latex/contrib/stackengine/stackengine.pdf
+2021/07/22 |      16455 | macros/latex/contrib/stackengine/stackengine.sty
+2021/07/21 |      59427 | macros/latex/contrib/stackengine/stackengine.tex
+2021/07/22 |     375345 | macros/latex/contrib/stackengine.zip
 2002/01/20 |      10845 | macros/latex/contrib/stack/stack.dtx
 2002/01/20 |        151 | macros/latex/contrib/stack/stack.ins
 2005/04/30 |       4264 | macros/latex/contrib/stack.zip
@@ -214743,11 +214743,11 @@
 1994/05/15 |       7262 | macros/latex/contrib/timing/timing.sty
 1994/05/17 |       9458 | macros/latex/contrib/timing/timing.tex
 2005/06/28 |     106439 | macros/latex/contrib/timing.zip
-2021/06/10 |     125338 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
-2021/06/10 |       3008 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
-2021/06/10 |        689 | macros/latex/contrib/tiscreen/README
-2021/06/10 |       1781 | macros/latex/contrib/tiscreen/tex/tiscreen.sty
-2021/06/10 |     127291 | macros/latex/contrib/tiscreen.zip
+2021/07/22 |     133505 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+2021/07/22 |       3334 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+2021/07/22 |        724 | macros/latex/contrib/tiscreen/README
+2021/07/22 |       2058 | macros/latex/contrib/tiscreen/tex/tiscreen.sty
+2021/07/22 |     135483 | macros/latex/contrib/tiscreen.zip
 2013/04/11 |        447 | macros/latex/contrib/titlecaps/README
 2015/01/30 |     272789 | macros/latex/contrib/titlecaps/titlecaps.pdf
 2015/01/30 |      15251 | macros/latex/contrib/titlecaps/titlecaps.sty
@@ -222820,14 +222820,14 @@
 2021/06/01 |     454662 | macros/latex/required/amsmath/testmath.pdf
 2021/06/01 |      82371 | macros/latex/required/amsmath/testmath.tex
 2021/06/01 |    2733510 | macros/latex/required/amsmath.zip
-2021/07/19 |     713940 | macros/latex/required/babel/base/babel.dtx
-2021/07/19 |       7461 | macros/latex/required/babel/base/babel.ins
-2021/07/19 |     852005 | macros/latex/required/babel/base/babel.pdf
-2021/07/19 |      21890 | macros/latex/required/babel/base/bbcompat.dtx
-2021/07/19 |       3526 | macros/latex/required/babel/base/bbidxglo.dtx
-2021/07/19 |     786454 | macros/latex/required/babel/base/locale.zip
-2021/07/19 |       2073 | macros/latex/required/babel/base/README.md
-2021/07/19 |    1825584 | macros/latex/required/babel/base.zip
+2021/07/22 |     714006 | macros/latex/required/babel/base/babel.dtx
+2021/07/22 |       7461 | macros/latex/required/babel/base/babel.ins
+2021/07/22 |     849481 | macros/latex/required/babel/base/babel.pdf
+2021/07/22 |      21890 | macros/latex/required/babel/base/bbcompat.dtx
+2021/07/22 |       3526 | macros/latex/required/babel/base/bbidxglo.dtx
+2021/07/22 |     786454 | macros/latex/required/babel/base/locale.zip
+2021/07/22 |       2176 | macros/latex/required/babel/base/README.md
+2021/07/22 |    1823178 | macros/latex/required/babel/base.zip
 2018/04/06 |       5462 | macros/latex/required/cyrillic/changes.txt
 2018/04/06 |      57716 | macros/latex/required/cyrillic/cyinpenc.dtx
 2018/04/06 |     206017 | macros/latex/required/cyrillic/cyinpenc.pdf
@@ -270571,13 +270571,13 @@
 2019/02/28 |        388 | systems/texlive/tlnet/archive/fontools.amd64-freebsd.r25997.tar.xz
 2019/02/28 |        388 | systems/texlive/tlnet/archive/fontools.amd64-netbsd.r30191.tar.xz
 2019/02/28 |        384 | systems/texlive/tlnet/archive/fontools.armhf-linux.r30015.tar.xz
-2021/04/06 |     129732 | systems/texlive/tlnet/archive/fontools.doc.r58747.tar.xz
+2021/07/22 |     131536 | systems/texlive/tlnet/archive/fontools.doc.r60005.tar.xz
 2019/02/28 |        384 | systems/texlive/tlnet/archive/fontools.i386-cygwin.r25997.tar.xz
 2019/02/28 |        388 | systems/texlive/tlnet/archive/fontools.i386-freebsd.r25997.tar.xz
 2019/02/28 |        384 | systems/texlive/tlnet/archive/fontools.i386-linux.r25997.tar.xz
 2019/02/28 |        384 | systems/texlive/tlnet/archive/fontools.i386-netbsd.r30191.tar.xz
 2019/02/28 |        384 | systems/texlive/tlnet/archive/fontools.i386-solaris.r25997.tar.xz
-2021/04/06 |      50108 | systems/texlive/tlnet/archive/fontools.r58747.tar.xz
+2021/07/22 |      50492 | systems/texlive/tlnet/archive/fontools.r60005.tar.xz
 2021/02/25 |        388 | systems/texlive/tlnet/archive/fontools.universal-darwin.r57908.tar.xz
 2019/02/28 |        728 | systems/texlive/tlnet/archive/fontools.win32.r25997.tar.xz
 2019/02/28 |        388 | systems/texlive/tlnet/archive/fontools.x86_64-cygwin.r33557.tar.xz
@@ -272604,9 +272604,9 @@
 2019/02/28 |       1376 | systems/texlive/tlnet/archive/linop.r41304.tar.xz
 2020/06/05 |    1464640 | systems/texlive/tlnet/archive/lion-msc.doc.r55415.tar.xz
 2020/06/05 |      45376 | systems/texlive/tlnet/archive/lion-msc.r55415.tar.xz
-2021/03/05 |     808520 | systems/texlive/tlnet/archive/lipsum.doc.r58123.tar.xz
-2021/03/05 |      75536 | systems/texlive/tlnet/archive/lipsum.r58123.tar.xz
-2021/03/05 |      86992 | systems/texlive/tlnet/archive/lipsum.source.r58123.tar.xz
+2021/07/22 |     747972 | systems/texlive/tlnet/archive/lipsum.doc.r60008.tar.xz
+2021/07/22 |     125056 | systems/texlive/tlnet/archive/lipsum.r60008.tar.xz
+2021/07/22 |      16180 | systems/texlive/tlnet/archive/lipsum.source.r60008.tar.xz
 2019/02/28 |     142988 | systems/texlive/tlnet/archive/lisp-on-tex.doc.r38722.tar.xz
 2019/02/28 |      13164 | systems/texlive/tlnet/archive/lisp-on-tex.r38722.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/listbib.aarch64-linux.r46208.tar.xz
@@ -277137,8 +277137,8 @@
 2019/02/28 |        340 | systems/texlive/tlnet/archive/texdiff.x86_64-linuxmusl.r46840.tar.xz
 2019/02/28 |        336 | systems/texlive/tlnet/archive/texdiff.x86_64-linux.r15506.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/texdiff.x86_64-solaris.r18442.tar.xz
-2021/07/16 |       6052 | systems/texlive/tlnet/archive/texdimens.doc.r59939.tar.xz
-2021/07/16 |       3708 | systems/texlive/tlnet/archive/texdimens.r59939.tar.xz
+2021/07/22 |       5948 | systems/texlive/tlnet/archive/texdimens.doc.r60006.tar.xz
+2021/07/22 |       5508 | systems/texlive/tlnet/archive/texdimens.r60006.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/texdirflatten.aarch64-linux.r46208.tar.xz
 2019/02/28 |        344 | systems/texlive/tlnet/archive/texdirflatten.amd64-freebsd.r16472.tar.xz
 2019/02/28 |        340 | systems/texlive/tlnet/archive/texdirflatten.amd64-netbsd.r30191.tar.xz
@@ -277298,7 +277298,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
-2021/07/21 |     398840 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59995.tar.xz
+2021/07/22 |     398744 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60004.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
@@ -277322,7 +277322,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
-2021/07/21 |     108048 | systems/texlive/tlnet/archive/texlive-scripts.r59995.tar.xz
+2021/07/22 |     108032 | systems/texlive/tlnet/archive/texlive-scripts.r60004.tar.xz
 2021/02/25 |        572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
 2021/04/12 |      36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
 2020/05/17 |        588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -277824,8 +277824,8 @@
 2019/07/06 |        344 | systems/texlive/tlnet/archive/tlshell.x86_64-linuxmusl.r47036.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.x86_64-linux.r45015.tar.xz
 2019/07/06 |        340 | systems/texlive/tlnet/archive/tlshell.x86_64-solaris.r45015.tar.xz
-2021/07/16 |     186296 | systems/texlive/tlnet/archive/to-be-determined.doc.r59943.tar.xz
-2021/07/16 |       1488 | systems/texlive/tlnet/archive/to-be-determined.r59943.tar.xz
+2021/07/22 |     186000 | systems/texlive/tlnet/archive/to-be-determined.doc.r60009.tar.xz
+2021/07/22 |       1484 | systems/texlive/tlnet/archive/to-be-determined.r60009.tar.xz
 2019/02/28 |     311568 | systems/texlive/tlnet/archive/tocbibind.doc.r20085.tar.xz
 2019/02/28 |       2916 | systems/texlive/tlnet/archive/tocbibind.r20085.tar.xz
 2019/02/28 |      12776 | systems/texlive/tlnet/archive/tocbibind.source.r20085.tar.xz
@@ -278329,9 +278329,9 @@
 2020/10/23 |    1890332 | systems/texlive/tlnet/archive/utfsym.r56729.tar.xz
 2019/02/28 |       2820 | systems/texlive/tlnet/archive/utopia.doc.r15878.tar.xz
 2019/02/28 |     205556 | systems/texlive/tlnet/archive/utopia.r15878.tar.xz
-2021/05/05 |     117040 | systems/texlive/tlnet/archive/ut-thesis.doc.r59078.tar.xz
-2021/05/05 |       2720 | systems/texlive/tlnet/archive/ut-thesis.r59078.tar.xz
-2021/05/05 |       6828 | systems/texlive/tlnet/archive/ut-thesis.source.r59078.tar.xz
+2021/07/22 |     140680 | systems/texlive/tlnet/archive/ut-thesis.doc.r60010.tar.xz
+2021/07/22 |       2776 | systems/texlive/tlnet/archive/ut-thesis.r60010.tar.xz
+2021/07/22 |       6864 | systems/texlive/tlnet/archive/ut-thesis.source.r60010.tar.xz
 2019/02/28 |      11764 | systems/texlive/tlnet/archive/uwmslide.doc.r27354.tar.xz
 2019/02/28 |       3916 | systems/texlive/tlnet/archive/uwmslide.r27354.tar.xz
 2019/02/28 |     137544 | systems/texlive/tlnet/archive/uwthesis.doc.r15878.tar.xz
@@ -278902,8 +278902,8 @@
 2019/06/24 |     789680 | systems/texlive/tlnet/archive/xskak.doc.r51432.tar.xz
 2019/06/24 |      14052 | systems/texlive/tlnet/archive/xskak.r51432.tar.xz
 2019/06/24 |      14172 | systems/texlive/tlnet/archive/xskak.source.r51432.tar.xz
-2019/02/28 |     656876 | systems/texlive/tlnet/archive/xstring.doc.r49946.tar.xz
-2019/02/28 |      11216 | systems/texlive/tlnet/archive/xstring.r49946.tar.xz
+2021/07/22 |     674940 | systems/texlive/tlnet/archive/xstring.doc.r60007.tar.xz
+2021/07/22 |      11252 | systems/texlive/tlnet/archive/xstring.r60007.tar.xz
 2019/02/28 |     362720 | systems/texlive/tlnet/archive/xtab.doc.r23347.tar.xz
 2019/02/28 |       4668 | systems/texlive/tlnet/archive/xtab.r23347.tar.xz
 2019/02/28 |      19556 | systems/texlive/tlnet/archive/xtab.source.r23347.tar.xz
@@ -279034,16 +279034,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
 2021/05/02 |     105152 | systems/texlive/tlnet/install-tl
-2021/07/21 |    6811233 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/07/21 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/07/22 |    6811228 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/07/22 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
 2021/04/11 |       4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/07/21 |   20811264 | systems/texlive/tlnet/install-tl-windows.exe
-2021/07/21 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/07/21 |   25585318 | systems/texlive/tlnet/install-tl.zip
-2021/07/21 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/07/22 |   20810097 | systems/texlive/tlnet/install-tl-windows.exe
+2021/07/22 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/07/22 |   25585314 | systems/texlive/tlnet/install-tl.zip
+2021/07/22 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
 2021/04/01 |       1229 | systems/texlive/tlnet/README.md
 2021/04/01 |          0 | systems/texlive/tlnet/TEXLIVE_2021
 2021/07/03 |       7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -279053,7 +279053,7 @@
 2021/07/03 |       1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
 2021/07/02 |      49348 | systems/texlive/tlnet/tlpkg/installer/config.guess
 2010/11/11 |      11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/07/20 |       6957 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/07/21 |       6910 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2020/04/15 |     223687 | 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
@@ -279095,12 +279095,12 @@
 2021/05/16 |      20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
 2021/05/16 |       5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
 2021/05/16 |      27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/07/21 |   17328203 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/07/21 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/07/22 |   17328408 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/07/22 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
 2021/05/16 |      86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/07/21 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/07/21 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/07/21 |    2324392 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/07/22 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/07/22 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/07/22 |    2321548 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
 2021/05/16 |      58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
 2021/05/16 |      42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
 2021/05/16 |      16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -283952,7 +283952,7 @@
 2020/10/03 |     318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
 2012/12/04 |     924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
 2011/09/21 |     281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/07/21 |     591231 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/07/22 |     591231 | systems/win32/miktex/tm/packages/files.csv.lzma
 2001/05/14 |       5617 | systems/win32/miktex/tm/packages/finbib.tar.lzma
 2015/10/20 |      44379 | systems/win32/miktex/tm/packages/findhyph.tar.lzma
 2011/10/21 |      89323 | systems/win32/miktex/tm/packages/fink.tar.lzma
@@ -285268,9 +285268,9 @@
 2018/01/12 |     157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
 2021/07/17 |      39091 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
 2021/07/17 |      43361 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/21 |     229176 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/07/21 |    1315955 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/07/21 |    1223502 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/07/22 |     229199 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/07/22 |    1314797 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/07/22 |    1222713 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
 2021/07/17 |      13442 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
 2021/07/17 |      14316 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
 2016/07/15 |      35914 | systems/win32/miktex/tm/packages/mil3.tar.lzma
@@ -285463,189 +285463,189 @@
 2018/04/09 |     400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
 2011/09/19 |     101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
 2021/03/17 |     232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/07/21 |     591126 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/07/21 |      51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/07/21 |      56473 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/07/21 |     975017 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/07/21 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/07/21 |      29034 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/07/21 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/07/21 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/07/21 |      34663 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/07/21 |      50151 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/07/21 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/07/21 |      83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/07/21 |      95399 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/07/21 |      67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/07/21 |      75790 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/07/21 |      27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/07/21 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/07/21 |     330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/07/21 |     392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/07/21 |      32670 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/07/21 |      36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/07/21 |      51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/07/21 |      56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/07/21 |     241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/07/21 |     263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/07/21 |     180009 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/07/21 |     195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/07/21 |      54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/07/21 |      61810 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/07/21 |      21222 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/07/21 |      23362 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/07/21 |     461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/07/21 |      45904 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/07/21 |      51200 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/07/21 |     284578 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/07/21 |     325041 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/07/21 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/07/21 |      45309 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/07/21 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/07/21 |     133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/07/21 |    1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/07/21 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/07/21 |     100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/07/21 |     112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/07/21 |      43025 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/07/21 |      48250 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/07/21 |      25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/07/21 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/07/21 |      56316 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/07/21 |      62784 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/07/21 |     136815 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/07/21 |     154425 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/07/21 |      73192 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/07/21 |      77949 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/07/21 |      71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/07/21 |      80446 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/07/21 |     258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/07/21 |     295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/07/21 |      22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/07/21 |      24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/07/21 |      97337 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/07/21 |     112085 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/07/21 |      64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/07/21 |      73145 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/07/21 |      96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/07/21 |     115349 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/07/21 |      38139 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/07/21 |      43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/07/21 |     483652 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/07/21 |     566525 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/07/21 |     147370 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/07/21 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/07/21 |      94797 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/07/21 |     109027 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/07/21 |      16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/07/21 |      17978 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/07/21 |      28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/07/21 |      30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/07/21 |     629398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/07/21 |     681250 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/07/21 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/07/21 |     596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/07/21 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/07/21 |     510585 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/07/21 |      94308 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/07/21 |     103398 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/07/21 |    1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/07/21 |    2009904 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/07/21 |      67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/07/21 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/07/21 |      27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/07/21 |      31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/07/21 |       7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/07/21 |       8767 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/07/21 |     196870 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/07/21 |     215246 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/07/21 |     250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/07/21 |     284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/07/21 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/07/21 |     103201 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/07/21 |      60636 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/07/21 |      68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/07/21 |     124279 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/07/21 |     136818 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/07/21 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/07/21 |     196739 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/07/21 |     199731 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/07/21 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/07/21 |      67480 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/07/21 |      76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/07/21 |      31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/07/21 |      35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/07/21 |      37804 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/07/21 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/07/21 |      42889 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/07/21 |      46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/07/21 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/07/21 |      52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/07/21 |     194380 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/07/21 |     206601 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/07/21 |      35689 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/07/21 |      40227 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/07/21 |     744116 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/07/21 |     815241 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/07/21 |     198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/07/21 |     202793 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/07/21 |     208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/07/21 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/07/21 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/07/21 |      87775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/07/21 |    1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/07/21 |    1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/07/21 |      20135 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/07/21 |      23901 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/07/21 |      31534 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/07/21 |      37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/07/21 |      64182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/07/21 |      72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/07/21 |      50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/07/21 |      57726 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/07/21 |    1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/07/21 |    1464201 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/07/21 |      42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/07/21 |      51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/07/21 |      56512 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/07/21 |      60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/07/21 |      25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/07/21 |      27388 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/07/21 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/07/21 |      18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/07/21 |      63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/07/21 |      69913 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/07/21 |     154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/07/21 |     169241 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/07/21 |      57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/07/21 |      65785 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/07/21 |      98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/07/21 |     105218 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/07/21 |    2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/07/21 |    2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/07/21 |      56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/07/21 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/07/21 |      33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/07/21 |      37356 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/07/21 |      27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/07/21 |      33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/07/21 |      65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/07/21 |      70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/07/21 |     312105 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/07/21 |     345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/07/21 |      55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/07/21 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/07/21 |     589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/07/21 |     624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/07/21 |      39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/07/21 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/21 |     229240 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/07/21 |    1314594 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/07/21 |    1223434 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/07/21 |      13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/07/21 |      14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/07/22 |     591126 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/07/22 |      51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/07/22 |      56473 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/07/22 |     975015 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/07/22 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/07/22 |      29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/07/22 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/07/22 |      29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/07/22 |      34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/07/22 |      50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/07/22 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/07/22 |      83539 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/07/22 |      95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/07/22 |      67817 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/07/22 |      75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/07/22 |      27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/07/22 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/07/22 |     330785 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/07/22 |     392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/07/22 |      32671 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/07/22 |      36627 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/07/22 |      51306 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/07/22 |      56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/07/22 |     241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/07/22 |     263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/07/22 |     180006 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/07/22 |     195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/07/22 |      54630 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/07/22 |      61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/07/22 |      21223 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/07/22 |      23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/07/22 |     461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/07/22 |      45903 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/07/22 |      51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/07/22 |     284578 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/07/22 |     325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/07/22 |      41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/07/22 |      45309 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/07/22 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/07/22 |     133862 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/07/22 |    1291298 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/07/22 |    1421866 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/07/22 |     100623 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/07/22 |     112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/07/22 |      43026 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/07/22 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/07/22 |      25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/07/22 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/07/22 |      56316 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/07/22 |      62785 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/07/22 |     136815 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/07/22 |     154424 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/07/22 |      73195 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/07/22 |      77949 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/07/22 |      71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/07/22 |      80447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/07/22 |     258878 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/07/22 |     295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/07/22 |      22044 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/07/22 |      24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/07/22 |      97336 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/07/22 |     112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/07/22 |      64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/07/22 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/07/22 |      96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/07/22 |     115350 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/07/22 |      38137 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/07/22 |      43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/07/22 |     483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/07/22 |     566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/07/22 |     147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/07/22 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/07/22 |      94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/07/22 |     109030 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/07/22 |      16354 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/07/22 |      17978 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/07/22 |      28388 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/07/22 |      30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/07/22 |     629397 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/07/22 |     681248 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/07/22 |     531848 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/07/22 |     596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/07/22 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/07/22 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/07/22 |      94308 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/07/22 |     103398 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/07/22 |    1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/07/22 |    2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/07/22 |      67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/07/22 |      74209 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/07/22 |      27356 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/07/22 |      31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/07/22 |       7720 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/07/22 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/07/22 |     196868 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/07/22 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/07/22 |     250262 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/07/22 |     284022 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/07/22 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/07/22 |     103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/07/22 |      60635 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/07/22 |      68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/07/22 |     124279 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/07/22 |     136819 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/07/22 |     178350 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/07/22 |     196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/07/22 |     199730 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/07/22 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/07/22 |      67481 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/07/22 |      76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/07/22 |      31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/07/22 |      35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/07/22 |      37801 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/07/22 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/07/22 |      42888 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/07/22 |      46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/07/22 |      45969 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/07/22 |      52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/07/22 |     194379 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/07/22 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/07/22 |      35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/07/22 |      40227 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/07/22 |     744113 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/07/22 |     815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/07/22 |     198168 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/07/22 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/07/22 |     208046 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/07/22 |     243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/07/22 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/07/22 |      87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/07/22 |    1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/07/22 |    1301194 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/07/22 |      20135 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/07/22 |      23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/07/22 |      31536 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/07/22 |      37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/07/22 |      64182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/07/22 |      72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/07/22 |      50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/07/22 |      57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/07/22 |    1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/07/22 |    1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/07/22 |      42383 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/07/22 |      51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/07/22 |      56512 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/07/22 |      60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/07/22 |      25289 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/07/22 |      27389 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/07/22 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/07/22 |      18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/07/22 |      63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/07/22 |      69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/07/22 |     154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/07/22 |     169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/07/22 |      57009 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/07/22 |      65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/07/22 |      98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/07/22 |     105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/07/22 |    2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/07/22 |    2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/07/22 |      56354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/07/22 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/07/22 |      33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/07/22 |      37358 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/07/22 |      27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/07/22 |      33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/07/22 |      65616 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/07/22 |      70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/07/22 |     312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/07/22 |     345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/07/22 |      55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/07/22 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/07/22 |     589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/07/22 |     624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/07/22 |      39126 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/07/22 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/07/22 |     229226 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/07/22 |    1314022 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/07/22 |    1222482 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/07/22 |      13463 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/07/22 |      14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2019/03/12 |       1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/07/21 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/07/22 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
 2018/07/06 |     145915 | systems/win32/miktex/tm/packages/nexus-otf.tar.lzma
 2017/03/30 |     191149 | systems/win32/miktex/tm/packages/nfssext-cfr.tar.lzma
 2012/12/20 |     612251 | systems/win32/miktex/tm/packages/nicefilelist.tar.lzma
@@ -286010,7 +286010,7 @@
 2020/10/20 |     342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
 2019/06/20 |     375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
 2021/04/23 |     274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/07/21 |        937 | systems/win32/miktex/tm/packages/pr.ini
+2021/07/22 |        937 | systems/win32/miktex/tm/packages/pr.ini
 2010/09/27 |     248469 | systems/win32/miktex/tm/packages/printlen.tar.lzma
 2008/06/17 |      77313 | systems/win32/miktex/tm/packages/proba.tar.lzma
 2017/07/12 |     988486 | systems/win32/miktex/tm/packages/probsoln.tar.lzma
@@ -287397,7 +287397,7 @@
 2004/06/04 |        404 | tds/tds.sed
 2004/06/23 |      65418 | tds/tds.tex
 2019/05/29 |     304264 | tds.zip
-2021/07/22 |        186 | timestamp
+2021/07/23 |        186 | timestamp
 2002/08/26 |      61898 | usergrps/dante/antrag.pdf
 2002/08/26 |     118217 | usergrps/dante/antrag.ps
 2017/06/30 |        917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index 8af4b94791..e18f195601 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
diff --git a/FILES.last07days b/FILES.last07days
index c9f29f2158..64a4f6099b 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,349 +1,422 @@
+2021/07/22 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/07/22 |      98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/07/22 |      98189 | macros/latex/contrib/siunitx/siunitx-unit.dtx
+2021/07/22 |     975015 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/07/22 |      97336 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/07/22 |      96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/07/22 |        964 | macros/latex/contrib/siunitx/README.md
+2021/07/22 |      95401 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/07/22 |      94798 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/07/22 |      94308 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/07/22 |        937 | systems/win32/miktex/tm/packages/pr.ini
+2021/07/22 |       9040 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
+2021/07/22 |      87776 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/07/22 |       8768 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/07/22 |       8752 | macros/latex/contrib/siunitx/siunitx-command.dtx
+2021/07/22 |     849481 | macros/latex/required/babel/base/babel.pdf
+2021/07/22 |      83539 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/07/22 |     815240 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/07/22 |      80447 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/07/22 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/07/22 |     786454 | macros/latex/required/babel/base/locale.zip
+2021/07/22 |      77949 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/07/22 |       7742 | language/japanese/jlreq/jlreq-trimmarks-ja.md
+2021/07/22 |       7720 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/07/22 |      76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/07/22 |      75791 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/07/22 |     747972 | systems/texlive/tlnet/archive/lipsum.doc.r60008.tar.xz
+2021/07/22 |       7461 | macros/latex/required/babel/base/babel.ins
+2021/07/22 |     744113 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/07/22 |      74209 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/07/22 |      73195 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/07/22 |      73146 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/07/22 |        724 | macros/latex/contrib/tiscreen/README
+2021/07/22 |      72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/07/22 |      71744 | macros/latex/contrib/spbmark.zip
+2021/07/22 |      71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/07/22 |     714006 | macros/latex/required/babel/base/babel.dtx
+2021/07/22 |      70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/07/22 |      69914 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/07/22 |       6864 | systems/texlive/tlnet/archive/ut-thesis.source.r60010.tar.xz
+2021/07/22 |      68498 | macros/latex/contrib/spbmark/spbmark.pdf
+2021/07/22 |     681248 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/07/22 |    6811228 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/07/22 |      68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/07/22 |      67817 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/07/22 |      67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/07/22 |     674940 | systems/texlive/tlnet/archive/xstring.doc.r60007.tar.xz
+2021/07/22 |      67481 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/07/22 |      65786 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/07/22 |      65616 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/07/22 |      64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/07/22 |       6436 | language/japanese/jlreq/jlreq-trimmarks.md
+2021/07/22 |      64182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/07/22 |     638791 | macros/latex/contrib/easybook.zip
+2021/07/22 |      63776 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/07/22 |     636251 | macros/latex/contrib/siunitx/siunitx.pdf
+2021/07/22 |     629397 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/07/22 |      62785 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/07/22 |     627332 | macros/latex/contrib/siunitx/siunitx-unit.pdf
+2021/07/22 |     624652 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/07/22 |      62227 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/07/22 |      61811 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/07/22 |      60635 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/07/22 |      60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/07/22 |     598988 | macros/latex/contrib/easybook/easybook.pdf
+2021/07/22 |     596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/07/22 |       5948 | systems/texlive/tlnet/archive/texdimens.doc.r60006.tar.xz
+2021/07/22 |     593339 | language/japanese/jlreq.zip
+2021/07/22 |     591231 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/07/22 |     591126 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/07/22 |     589844 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/07/22 |      57728 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/07/22 |       5764 | language/japanese/jlreq/README.md
+2021/07/22 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/07/22 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/07/22 |      57009 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/07/22 |      56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/07/22 |     566529 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/07/22 |      56512 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/07/22 |      56473 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/07/22 |      56354 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/07/22 |      56316 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/07/22 |      55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/07/22 |       5508 | systems/texlive/tlnet/archive/texdimens.r60006.tar.xz
+2021/07/22 |      54630 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/07/22 |     531848 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/07/22 |      52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/07/22 |      51748 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/07/22 |      51306 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/07/22 |      51201 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/07/22 |      51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/07/22 |     510587 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/07/22 |      50492 | systems/texlive/tlnet/archive/fontools.r60005.tar.xz
+2021/07/22 |      50394 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/07/22 |      50150 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/07/22 |      49222 | language/japanese/jlreq/jfm-jlreq.lua
+2021/07/22 |      49090 | macros/latex/contrib/siunitx/siunitx-table.dtx
+2021/07/22 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/07/22 |     484555 | macros/latex/contrib/siunitx/siunitx-print.pdf
+2021/07/22 |     483653 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/07/22 |      48252 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/07/22 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/07/22 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
+2021/07/22 |       4746 | macros/latex/contrib/siunitx/siunitx-locale.dtx
+2021/07/22 |      46906 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/07/22 |     461811 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/07/22 |      45969 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/07/22 |      45903 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/07/22 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/07/22 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/07/22 |      45309 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/07/22 |      44975 | language/japanese/jlreq/jlreq-trimmarks.sty
+2021/07/22 |      44963 | macros/latex/contrib/siunitx/CHANGELOG.md
+2021/07/22 |      44371 | language/japanese/jlreq/README-ja.md
+2021/07/22 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/07/22 |      43026 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/07/22 |      43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/07/22 |      42888 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/07/22 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/07/22 |      42383 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/07/22 |      41193 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/07/22 |      40227 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/07/22 |     398744 | systems/texlive/tlnet/archive/texlive-scripts.doc.r60004.tar.xz
+2021/07/22 |     392791 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/07/22 |      39126 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/07/22 |     385801 | macros/latex/contrib/stackengine/stackengine.pdf
+2021/07/22 |      38137 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/07/22 |      37801 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/07/22 |     375345 | macros/latex/contrib/stackengine.zip
+2021/07/22 |      37358 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/07/22 |      37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/07/22 |       3687 | macros/latex/contrib/siunitx/siunitx.ins
+2021/07/22 |     366748 | language/japanese/jlreq/jlreq-ja.pdf
+2021/07/22 |      36627 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/07/22 |      35691 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/07/22 |       3526 | macros/latex/required/babel/base/bbidxglo.dtx
+2021/07/22 |      35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/07/22 |      34664 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/07/22 |     345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/07/22 |      33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/07/22 |      33545 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/07/22 |    3346426 | install/macros/latex/contrib/siunitx.tds.zip
+2021/07/22 |      33434 | macros/latex/contrib/siunitx/siunitx-compound.dtx
+2021/07/22 |       3334 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+2021/07/22 |     330785 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/07/22 |    3307734 | macros/latex/contrib/siunitx.zip
+2021/07/22 |      32671 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/07/22 |     325042 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/07/22 |      31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
+2021/07/22 |      31661 | macros/latex/contrib/siunitx/siunitx-print.dtx
+2021/07/22 |      31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/07/22 |      31536 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/07/22 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/07/22 |      31333 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
+2021/07/22 |      31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/07/22 |     312108 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/07/22 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/07/22 |      30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/07/22 |      29840 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/07/22 |     295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/07/22 |      29035 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/07/22 |       2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
+2021/07/22 |     284578 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/07/22 |     284022 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/07/22 |      28388 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/07/22 |    2824954 | install/macros/latex/required/babel-base.tds.zip
+2021/07/22 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/07/22 |     280501 | language/japanese/jlreq/jlreq.cls
+2021/07/22 |    2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/07/22 |       2776 | systems/texlive/tlnet/archive/ut-thesis.r60010.tar.xz
+2021/07/22 |      27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/07/22 |      27389 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/07/22 |      27356 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/07/22 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
+2021/07/22 |      27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/07/22 |    2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/07/22 |     263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/07/22 |      25939 | macros/latex/contrib/siunitx/siunitx-complex.dtx
+2021/07/22 |     258878 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/07/22 |   25585314 | systems/texlive/tlnet/install-tl.zip
+2021/07/22 |      25289 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/07/22 |     250262 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/07/22 |      25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/07/22 |      24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/07/22 |     243425 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/07/22 |       2426 | macros/latex/contrib/siunitx/siunitx-code.tex
+2021/07/22 |     241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/07/22 |      23902 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/07/22 |      23412 | language/japanese/jlreq/jlreq-helpers.sty
+2021/07/22 |      23363 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/07/22 |    2321548 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/07/22 |     229226 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/07/22 |     229199 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/07/22 |      22044 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/07/22 |      21890 | macros/latex/required/babel/base/bbcompat.dtx
+2021/07/22 |       2176 | macros/latex/required/babel/base/README.md
+2021/07/22 |     215248 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/07/22 |      21223 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/07/22 |   20810097 | systems/texlive/tlnet/install-tl-windows.exe
+2021/07/22 |     208046 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/07/22 |     206605 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/07/22 |       2058 | macros/latex/contrib/tiscreen/tex/tiscreen.sty
+2021/07/22 |     202796 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/07/22 |      20135 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/07/22 |    2009905 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/07/22 |     199730 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/07/22 |      19826 | macros/latex/contrib/siunitx/siunitx.dtx
+2021/07/22 |     198168 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/07/22 |     196868 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/07/22 |     196742 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/07/22 |     195636 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/07/22 |     194379 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/07/22 |     186000 | systems/texlive/tlnet/archive/to-be-determined.doc.r60009.tar.xz
+2021/07/22 |    1823178 | macros/latex/required/babel/base.zip
+2021/07/22 |      18176 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/07/22 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/07/22 |     180006 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/07/22 |      17978 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/07/22 |     178350 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/07/22 |   17328408 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/07/22 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
+2021/07/22 |    1713892 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/07/22 |     169242 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/07/22 |      16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
+2021/07/22 |      16455 | macros/latex/contrib/stackengine/stackengine.sty
+2021/07/22 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/07/22 |      16354 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/07/22 |      16180 | systems/texlive/tlnet/archive/lipsum.source.r60008.tar.xz
+2021/07/22 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/07/22 |     156466 | macros/latex/contrib/easybook/easybook.dtx
+2021/07/22 |     154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/07/22 |     154424 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/07/22 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/07/22 |      15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
+2021/07/22 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/07/22 |    1497883 | macros/latex/contrib/siunitx/siunitx-code.pdf
+2021/07/22 |       1484 | systems/texlive/tlnet/archive/to-be-determined.r60009.tar.xz
+2021/07/22 |     147371 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/07/22 |    1464203 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/07/22 |     146242 | macros/latex/contrib/siunitx/siunitx.tex
+2021/07/22 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/07/22 |     145027 | fonts/variablelm.zip
+2021/07/22 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/07/22 |      14349 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/07/22 |    1421866 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/07/22 |     140680 | systems/texlive/tlnet/archive/ut-thesis.doc.r60010.tar.xz
+2021/07/22 |       1394 | fonts/variablelm/doc/control_scaling_lm_fonts.tex
+2021/07/22 |     136819 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/07/22 |     136815 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/07/22 |     135483 | macros/latex/contrib/tiscreen.zip
+2021/07/22 |     134823 | fonts/variablelm/doc/control_scaling_lm_fonts.pdf
+2021/07/22 |      13463 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/07/22 |    1340928 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/07/22 |     133862 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/07/22 |     133505 | macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+2021/07/22 |      13250 | macros/latex/contrib/spbmark/spbmark.dtx
+2021/07/22 |     131536 | systems/texlive/tlnet/archive/fontools.doc.r60005.tar.xz
+2021/07/22 |    1314797 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/07/22 |    1314022 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/07/22 |    1301194 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/07/22 |    1291298 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/07/22 |     125056 | systems/texlive/tlnet/archive/lipsum.r60008.tar.xz
+2021/07/22 |     124279 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/07/22 |    1222713 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/07/22 |    1222482 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/07/22 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/07/22 |     117978 | language/japanese/jlreq/jlreq.pdf
+2021/07/22 |    1169718 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/07/22 |     115830 | macros/latex/contrib/siunitx/siunitx-number.dtx
+2021/07/22 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/07/22 |     115350 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/07/22 |     112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/07/22 |      11252 | systems/texlive/tlnet/archive/xstring.r60007.tar.xz
+2021/07/22 |     112086 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/07/22 |   10947557 | install/language/japanese/jlreq.tds.zip
+2021/07/22 |     109030 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/07/22 |     108032 | systems/texlive/tlnet/archive/texlive-scripts.r60004.tar.xz
+2021/07/22 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/07/22 |     105222 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/07/22 |     103398 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/07/22 |     103203 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/07/22 |      10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+2021/07/22 |     100623 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
 2021/07/21 |      99781 | macros/generic/xstring/test_etex.pdf
-2021/07/21 |      98380 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/07/21 |      98260 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/07/21 |     975017 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/07/21 |      97337 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/07/21 |      96631 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/07/21 |      95399 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
 2021/07/21 |     949513 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.pdf
 2021/07/21 |       9480 | fonts/utilities/fontools/bin/splitttc
-2021/07/21 |      94797 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/07/21 |      94308 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/07/21 |        937 | systems/win32/miktex/tm/packages/pr.ini
 2021/07/21 |      91079 | macros/generic/xstring/xstring-en.tex
-2021/07/21 |      87775 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/07/21 |       8767 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
 2021/07/21 |       8728 | systems/texlive/tlnet/archive/cjk-ko.r59996.tar.xz
-2021/07/21 |      83541 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/07/21 |     815241 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/07/21 |      80446 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
 2021/07/21 |       8032 | fonts/utilities/fontools/share/fontools_lgr.enc
-2021/07/21 |      78773 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/07/21 |      77949 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
 2021/07/21 |     774697 | macros/latex/contrib/lipsum.zip
 2021/07/21 |       7728 | macros/latex/contrib/pdfmanagement-testphase/color-ltx.sty
-2021/07/21 |       7721 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/07/21 |      76825 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/07/21 |      75790 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/07/21 |     744116 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/07/21 |      74210 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
 2021/07/21 |     739384 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.pdf
-2021/07/21 |      73192 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/07/21 |      73145 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/07/21 |      72205 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/07/21 |      71667 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
 2021/07/21 |     713300 | macros/generic/xstring.zip
-2021/07/21 |      70647 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/07/21 |      69913 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
 2021/07/21 |      69866 | fonts/utilities/fontools/doc/autoinst.pdf
-2021/07/21 |     681250 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/07/21 |    6811233 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/07/21 |      68022 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/07/21 |      67820 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/07/21 |       6910 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/07/21 |      67782 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield.dtx
-2021/07/21 |      67617 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
 2021/07/21 |      67484 | systems/texlive/tlnet/archive/bibtexu.doc.r60002.tar.xz
-2021/07/21 |      67480 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
 2021/07/21 |     664002 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.pdf
 2021/07/21 |     658859 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.pdf
-2021/07/21 |      65785 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/07/21 |      65619 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
 2021/07/21 |       6549 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.dtx
-2021/07/21 |      64426 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
 2021/07/21 |       6440 | systems/texlive/tlnet/archive/catechis.source.r59998.tar.xz
-2021/07/21 |      64182 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/07/21 |      63777 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/07/21 |     629398 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/07/21 |      62784 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/07/21 |     624655 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/07/21 |      62226 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/07/21 |      61810 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
 2021/07/21 |      61424 | systems/texlive/tlnet/archive/siunitx.r60000.tar.xz
-2021/07/21 |      60636 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/07/21 |      60038 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
 2021/07/21 |        596 | macros/generic/texdimens/LICENSE.md
-2021/07/21 |     596929 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
 2021/07/21 |     594809 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.pdf
-2021/07/21 |     591231 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/07/21 |     591126 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/07/21 |      59427 | macros/latex/contrib/stackengine/stackengine.tex
 2021/07/21 |     590152 | systems/texlive/tlnet/archive/easybook.doc.r59999.tar.xz
-2021/07/21 |     589845 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
 2021/07/21 |        580 | macros/latex/contrib/pdfmanagement-testphase/transparent-ltx.sty
 2021/07/21 |     577451 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.pdf
-2021/07/21 |      57726 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
 2021/07/21 |     576432 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.pdf
-2021/07/21 |      57548 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
 2021/07/21 |      57218 | macros/latex/contrib/pdfmanagement-testphase/l3backend-testphase.dtx
-2021/07/21 |      57138 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/07/21 |      57012 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/07/21 |      56684 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/07/21 |     566525 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/07/21 |      56512 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/07/21 |      56473 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/07/21 |      56355 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/07/21 |      56316 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
 2021/07/21 |      55972 | systems/texlive/tlnet/archive/babel-french.source.r59997.tar.xz
-2021/07/21 |      55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
 2021/07/21 |     553454 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.pdf
 2021/07/21 |      55200 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmanagement.dtx
 2021/07/21 |     548003 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.pdf
-2021/07/21 |      54632 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
 2021/07/21 |     537047 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.pdf
 2021/07/21 |     534245 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.pdf
-2021/07/21 |     531849 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
 2021/07/21 |     531031 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.pdf
 2021/07/21 |     527225 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.pdf
 2021/07/21 |     526426 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.pdf
-2021/07/21 |      52522 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
 2021/07/21 |     518408 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.pdf
-2021/07/21 |      51749 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/07/21 |      51308 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/07/21 |      51200 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/07/21 |      51110 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/07/21 |     510585 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
 2021/07/21 |     507936 | systems/texlive/tlnet/archive/babel-french.doc.r59997.tar.xz
 2021/07/21 |     505665 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.pdf
-2021/07/21 |      50393 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/07/21 |      50151 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/07/21 |         48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/07/21 |     483652 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/07/21 |      48250 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
 2021/07/21 |      48190 | macros/generic/xstring/xstring.tex
-2021/07/21 |     476918 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/07/21 |      46905 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/07/21 |     461813 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/07/21 |      45970 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/07/21 |      45904 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/07/21 |        455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/07/21 |        455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/07/21 |      45309 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
 2021/07/21 |     446478 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.pdf
-2021/07/21 |      43425 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/07/21 |      43025 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/07/21 |      43002 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/07/21 |      42889 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/07/21 |      42710 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/07/21 |      42384 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
 2021/07/21 |     421608 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
 2021/07/21 |       4212 | macros/latex/contrib/pdfmanagement-testphase/hyperxmp-patches-tmp-ltx.sty
 2021/07/21 |     418445 | macros/latex/contrib/pdfmanagement-testphase/l3pdfxform.pdf
 2021/07/21 |      41390 | macros/generic/xstring/test_latex.tex
-2021/07/21 |      41194 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/07/21 |      40227 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/07/21 |     398840 | systems/texlive/tlnet/archive/texlive-scripts.doc.r59995.tar.xz
 2021/07/21 |       3959 | macros/latex/contrib/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty
 2021/07/21 |     395736 | systems/texlive/tlnet/archive/catechis.doc.r59998.tar.xz
-2021/07/21 |     392792 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/07/21 |      39127 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
 2021/07/21 |       3872 | macros/latex/contrib/pdfmanagement-testphase/CHANGELOG.md
 2021/07/21 |       3828 | macros/generic/xstring/README
-2021/07/21 |      38139 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/07/21 |      37804 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
 2021/07/21 |      37798 | macros/generic/xstring/test_etex.tex
-2021/07/21 |      37356 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
 2021/07/21 |       3729 | fonts/utilities/fontools/share/fontools_t2b.enc
-2021/07/21 |      37240 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/07/21 |      36628 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
 2021/07/21 |      36624 | systems/texlive/tlnet/archive/easybook.source.r59999.tar.xz
 2021/07/21 |       3651 | fonts/utilities/fontools/share/fontools_t2c.enc
 2021/07/21 |         35 | macros/latex/contrib/to-be-determined/DEPENDS.txt
-2021/07/21 |      35689 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/07/21 |      35085 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/07/21 |      34663 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/07/21 |     345738 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/07/21 |      33631 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/07/21 |      33544 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/07/21 |     330786 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/07/21 |      32670 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/07/21 |     325041 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/07/21 |      31619 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/07/21 |      31534 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/07/21 |      31350 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/07/21 |      31230 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/07/21 |     312105 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/07/21 |      30822 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
 2021/07/21 |       3080 | fonts/utilities/fontools/share/fontools_ts1.enc
 2021/07/21 |      30568 | macros/latex/contrib/pdfmanagement-testphase/l3pdfmeta.dtx
-2021/07/21 |      30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
 2021/07/21 |       3003 | fonts/utilities/fontools/README
-2021/07/21 |      29841 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
 2021/07/21 |        296 | systems/texlive/tlnet/archive/bibtexu.r60002.tar.xz
-2021/07/21 |     295202 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
 2021/07/21 |       2907 | fonts/utilities/fontools/share/fontools_t2a.enc
-2021/07/21 |      29034 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
 2021/07/21 |    2858352 | systems/texlive/tlnet/archive/siunitx.doc.r60000.tar.xz
 2021/07/21 |       2855 | fonts/utilities/fontools/share/fontools_ly1.enc
-2021/07/21 |     284578 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/07/21 |     284024 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/07/21 |      28389 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/07/21 |      28179 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
 2021/07/21 |       2815 | fonts/utilities/fontools/share/fontools_t1.enc
 2021/07/21 |      28041 | macros/latex/contrib/pdfmanagement-testphase/l3pdffile.dtx
-2021/07/21 |    2796725 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
 2021/07/21 |      27837 | macros/latex/contrib/pdfmanagement-testphase/l3pdfannot.dtx
-2021/07/21 |      27727 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
 2021/07/21 |      27582 | fonts/utilities/fontools/bin/ot2kpx
 2021/07/21 |       2751 | fonts/utilities/fontools/share/fontools_ts3.enc
 2021/07/21 |      27438 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-radiobutton.dtx
 2021/07/21 |      27426 | fonts/utilities/fontools/doc/ot2kpx.pdf
-2021/07/21 |      27388 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/07/21 |      27357 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
 2021/07/21 |        272 | macros/generic/texdimens/texdimens.sty
-2021/07/21 |      27197 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
 2021/07/21 |      27053 | fonts/utilities/fontools/doc/afm2afm.pdf
-2021/07/21 |    2672609 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
 2021/07/21 |      26672 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-action.dtx
 2021/07/21 |      26662 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-pushbutton.dtx
 2021/07/21 |       2656 | fonts/utilities/fontools/share/fontools_t3.enc
-2021/07/21 |     263959 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/07/21 |     258880 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
 2021/07/21 |       2587 | fonts/utilities/fontools/share/fontools_ot1.enc
-2021/07/21 |   25585318 | systems/texlive/tlnet/install-tl.zip
-2021/07/21 |      25290 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/07/21 |     250264 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/07/21 |      25018 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/07/21 |      24993 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
 2021/07/21 |       2448 | macros/latex/contrib/to-be-determined/to-be-determined.tex
-2021/07/21 |     243426 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/07/21 |     241811 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/07/21 |      23901 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/07/21 |      23362 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/07/21 |    2324392 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
-2021/07/21 |     229240 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/07/21 |     229176 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
 2021/07/21 |       2248 | fonts/utilities/fontools/share/fontools_oml.enc
 2021/07/21 |      22113 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-textfield.dtx
-2021/07/21 |      22048 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
 2021/07/21 |     215317 | macros/generic/xstring/xstring-fr.pdf
-2021/07/21 |     215246 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
 2021/07/21 |      21431 | macros/generic/texdimens/README.md
-2021/07/21 |      21222 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/07/21 |   20811264 | systems/texlive/tlnet/install-tl-windows.exe
-2021/07/21 |     208047 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/07/21 |     206601 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
 2021/07/21 |      20571 | fonts/utilities/fontools/doc/splitttc.pdf
 2021/07/21 |      20556 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-choice.dtx
 2021/07/21 |     204731 | fonts/utilities/fontools.zip
-2021/07/21 |     202793 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/07/21 |      20135 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/07/21 |    2009904 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/07/21 |     199731 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
 2021/07/21 |     199536 | macros/generic/xstring/xstring-en.pdf
-2021/07/21 |     198169 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/07/21 |     196870 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/07/21 |     196739 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/07/21 |     195635 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
 2021/07/21 |      19509 | macros/latex/contrib/ut-thesis/ut-thesis.dtx
-2021/07/21 |     194380 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
 2021/07/21 |     186502 | macros/latex/contrib/to-be-determined.zip
 2021/07/21 |       1841 | macros/latex/contrib/ut-thesis/ut-thesis.ins
 2021/07/21 |     183126 | macros/latex/contrib/to-be-determined/to-be-determined.pdf
 2021/07/21 |      18289 | macros/latex/contrib/pdfmanagement-testphase/l3pdffield-checkbox.dtx
 2021/07/21 |       1822 | macros/latex/contrib/pdfmanagement-testphase/pdflscape-ltx.sty
-2021/07/21 |      18175 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/07/21 |     180119 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/07/21 |     180009 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
 2021/07/21 |      17997 | fonts/utilities/fontools/GPLv2.txt
-2021/07/21 |      17978 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/07/21 |     178352 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
 2021/07/21 |      17807 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-testphase.dtx
 2021/07/21 |      17429 | macros/latex/contrib/pdfmanagement-testphase/l3pdfdict.dtx
 2021/07/21 |     173339 | macros/latex/contrib/pdfmanagement-testphase/hyperref-generic.dtx
-2021/07/21 |   17328203 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/07/21 |    1713894 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/07/21 |     169241 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
 2021/07/21 |       1677 | macros/latex/contrib/ut-thesis/README
 2021/07/21 |      16725 | macros/generic/texdimens/texdimens.tex
 2021/07/21 |       1660 | systems/texlive/tlnet/archive/catechis.r59998.tar.xz
-2021/07/21 |      16412 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/07/21 |      16356 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
 2021/07/21 |     160879 | fonts/utilities/fontools/bin/autoinst
 2021/07/21 |     160448 | systems/texlive/tlnet/archive/cjk-ko.doc.r59996.tar.xz
 2021/07/21 |      16024 | systems/texlive/tlnet/archive/easybook.r59999.tar.xz
-2021/07/21 |     159578 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
 2021/07/21 |      15944 | macros/latex/contrib/pdfmanagement-testphase/ltdocinit.dtx
 2021/07/21 |       1590 | macros/latex/contrib/to-be-determined/to-be-determined.sty
 2021/07/21 |      15876 | systems/texlive/tlnet/archive/babel-french.r59997.tar.xz
 2021/07/21 |      15784 | macros/latex/contrib/pdfmanagement-testphase/l3pdftools.dtx
 2021/07/21 |     155263 | macros/generic/xstring/test_latex.pdf
-2021/07/21 |     154804 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/07/21 |     154425 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/07/21 |        153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/07/21 |        152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/07/21 |     147370 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
 2021/07/21 |     146946 | macros/latex/contrib/ut-thesis.zip
-2021/07/21 |    1464201 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/07/21 |        145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/07/21 |        144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/07/21 |      14348 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
 2021/07/21 |     142544 | macros/latex/contrib/ut-thesis/ut-thesis.pdf
-2021/07/21 |    1421867 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/07/21 |     136818 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/07/21 |     136815 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/07/21 |      13466 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/07/21 |    1340930 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/07/21 |     133864 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
 2021/07/21 |      13334 | fonts/utilities/fontools/bin/afm2afm
-2021/07/21 |    1315955 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/07/21 |    1314594 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/07/21 |    1301192 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
 2021/07/21 |       1298 | macros/latex/contrib/to-be-determined/README.md
-2021/07/21 |    1291300 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/07/21 |     124279 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
 2021/07/21 |        123 | macros/generic/xstring/xstring.sty
-2021/07/21 |    1223502 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/07/21 |    1223434 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/07/21 |  122946807 | macros/context/latest/cont-tmf.zip
 2021/07/21 |      12206 | macros/generic/texdimens.zip
-2021/07/21 |     119819 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
 2021/07/21 |       1195 | macros/latex/contrib/pdfmanagement-testphase/README.md
-2021/07/21 |    1169716 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/07/21 |       1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/07/21 |     115349 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/07/21 |     112982 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/07/21 |     112085 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
 2021/07/21 |      11151 | macros/latex/contrib/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
-2021/07/21 |     109027 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/07/21 |     108048 | systems/texlive/tlnet/archive/texlive-scripts.r59995.tar.xz
-2021/07/21 |    1077989 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
 2021/07/21 |   10657849 | macros/latex/contrib/pdfmanagement-testphase.zip
 2021/07/21 |     105756 | systems/texlive/tlnet/archive/siunitx.source.r60000.tar.xz
-2021/07/21 |     105218 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
 2021/07/21 |     103753 | macros/generic/xstring/xstring-fr.tex
-2021/07/21 |     103398 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/07/21 |     103201 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/07/21 |     100624 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/07/20 |      98189 | macros/latex/contrib/siunitx/siunitx-unit.dtx
 2021/07/20 |      98064 | macros/latex/contrib/lipsum/lipsum-cs.txt
-2021/07/20 |        964 | macros/latex/contrib/siunitx/README.md
 2021/07/20 |        951 | macros/latex/contrib/catechis/README
 2021/07/20 |      94650 | macros/latex/contrib/babel-contrib/french/frenchb-doc.tex
 2021/07/20 |      91127 | macros/latex/contrib/lipsum/lipsum-la.txt
 2021/07/20 |       9104 | language/korean/cjk-ko/cjk-ko-doc.tex
-2021/07/20 |       9040 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2021/07/20 |       8752 | macros/latex/contrib/siunitx/siunitx-command.dtx
 2021/07/20 |     838240 | systems/texlive/tlnet/archive/babel.doc.r59990.tar.xz
 2021/07/20 |     791728 | systems/texlive/tlnet/archive/fithesis.r59989.tar.xz
 2021/07/20 |     729492 | systems/texlive/tlnet/archive/fithesis.doc.r59989.tar.xz
 2021/07/20 |      71888 | systems/texlive/tlnet/archive/spectralsequences.r59992.tar.xz
-2021/07/20 |       6957 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
 2021/07/20 |     687808 | systems/texlive/tlnet/archive/babel.source.r59990.tar.xz
 2021/07/20 |     644963 | macros/latex/contrib/lipsum/lipsum.pdf
-2021/07/20 |     635529 | macros/latex/contrib/siunitx/siunitx.pdf
-2021/07/20 |     627332 | macros/latex/contrib/siunitx/siunitx-unit.pdf
 2021/07/20 |     575555 | macros/latex/contrib/babel-contrib/french.zip
 2021/07/20 |      55662 | macros/latex/contrib/lipsum/lipsum.dtx
 2021/07/20 |       5489 | language/korean/cjk-ko/cjkutf8-josa.sty
 2021/07/20 |       5380 | systems/texlive/tlnet/archive/letterswitharrows.source.r59993.tar.xz
 2021/07/20 |     494352 | systems/texlive/tlnet/archive/beamertheme-focus.doc.r59991.tar.xz
-2021/07/20 |      48827 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2021/07/20 |     484555 | macros/latex/contrib/siunitx/siunitx-print.pdf
 2021/07/20 |     480964 | systems/texlive/tlnet/archive/letterswitharrows.doc.r59993.tar.xz
-2021/07/20 |       4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
-2021/07/20 |       4746 | macros/latex/contrib/siunitx/siunitx-locale.dtx
 2021/07/20 |       4624 | language/korean/cjk-ko/kolabels-utf.sty
-2021/07/20 |      44662 | macros/latex/contrib/siunitx/CHANGELOG.md
 2021/07/20 |      44620 | systems/texlive/tlnet/archive/fithesis.source.r59989.tar.xz
 2021/07/20 |       4396 | systems/texlive/tlnet/archive/beamertheme-focus.r59991.tar.xz
 2021/07/20 |       4299 | language/korean/cjk-ko/README
@@ -351,47 +424,28 @@
 2021/07/20 |     402002 | macros/latex/contrib/catechis.zip
 2021/07/20 |     388762 | macros/latex/contrib/catechis/catechis.pdf
 2021/07/20 |       3735 | macros/latex/contrib/lipsum/lipsum.ins
-2021/07/20 |       3687 | macros/latex/contrib/siunitx/siunitx.ins
-2021/07/20 |    3343893 | install/macros/latex/contrib/siunitx.tds.zip
-2021/07/20 |      33434 | macros/latex/contrib/siunitx/siunitx-compound.dtx
 2021/07/20 |     331863 | macros/latex/contrib/babel-contrib/french/frenchb.pdf
-2021/07/20 |    3305270 | macros/latex/contrib/siunitx.zip
 2021/07/20 |       3252 | systems/texlive/tlnet/archive/letterswitharrows.r59993.tar.xz
-2021/07/20 |      31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
-2021/07/20 |      31661 | macros/latex/contrib/siunitx/siunitx-print.dtx
-2021/07/20 |      31333 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
 2021/07/20 |       3029 | macros/latex/contrib/babel-contrib/french/frenchb.ins
-2021/07/20 |       2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2021/07/20 |     273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
 2021/07/20 |       2685 | language/korean/cjk-ko/kotex.sty
 2021/07/20 |       2678 | language/korean/cjk-ko/ChangeLog
-2021/07/20 |      25939 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2021/07/20 |       2426 | macros/latex/contrib/siunitx/siunitx-code.tex
 2021/07/20 |     239147 | macros/latex/contrib/babel-contrib/french/frenchb.dtx
 2021/07/20 |       2197 | macros/latex/contrib/catechis/catechis.ins
 2021/07/20 |      21467 | macros/latex/contrib/catechis/catechis.dtx
-2021/07/20 |      19804 | macros/latex/contrib/siunitx/siunitx.dtx
 2021/07/20 |      19106 | macros/latex/contrib/catechis/lppl.txt
 2021/07/20 |    1839584 | systems/texlive/tlnet/archive/spectralsequences.doc.r59992.tar.xz
 2021/07/20 |       1832 | language/korean/cjk-ko/cjkutf8-nanummjhanja.sty
 2021/07/20 |     180588 | systems/texlive/tlnet/archive/babel.r59990.tar.xz
 2021/07/20 |     174467 | language/korean/cjk-ko.zip
 2021/07/20 |     173333 | language/korean/cjk-ko/cjk-ko-doc.pdf
-2021/07/20 |       1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
-2021/07/20 |      16529 | macros/latex/contrib/siunitx/siunitx-angle.dtx
 2021/07/20 |     159363 | macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf
 2021/07/20 |       1591 | macros/latex/contrib/babel-contrib/french/README.md
 2021/07/20 |      15827 | language/korean/cjk-ko/cjkutf8-ko.sty
-2021/07/20 |      15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
 2021/07/20 |       1525 | macros/latex/contrib/lipsum/README.txt
 2021/07/20 |         14 | macros/latex/contrib/lipsum/DEPENDS.txt
-2021/07/20 |    1496050 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2021/07/20 |     146108 | macros/latex/contrib/siunitx/siunitx.tex
 2021/07/20 |       1370 | macros/latex/contrib/catechis/CHANGES
 2021/07/20 |       1368 | macros/latex/contrib/lipsum/CHANGELOG.md
 2021/07/20 |     134671 | macros/latex/contrib/lipsum/lipsum-cicero.txt
-2021/07/20 |     115602 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2021/07/20 |      10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
 2021/07/19 |       9953 | graphics/pgf/contrib/spectralsequences/src/sseqforeach.code.tex
 2021/07/19 |       9720 | graphics/pgf/contrib/spectralsequences/examples/ASS-S_2.tex
 2021/07/19 |       9717 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-focus.jpg
@@ -399,25 +453,19 @@
 2021/07/19 |      94397 | graphics/pgf/contrib/spectralsequences/src/sseqkeys.code.tex
 2021/07/19 |      92514 | graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.pdf
 2021/07/19 |     923332 | systems/texlive/tlnet/archive/mcf2graph.doc.r59974.tar.xz
-2021/07/19 |     852005 | macros/latex/required/babel/base/babel.pdf
 2021/07/19 |      80967 | graphics/pgf/contrib/spectralsequences/src/sseqmain.code.tex
 2021/07/19 |      80068 | graphics/pgf/contrib/spectralsequences/examples/ASS-S_3.pdf
 2021/07/19 |       7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz
-2021/07/19 |     786454 | macros/latex/required/babel/base/locale.zip
 2021/07/19 |       7702 | graphics/pgf/contrib/spectralsequences/examples/SSS-KF3n.tex
 2021/07/19 |       7685 | graphics/pgf/contrib/spectralsequences/src/sseqcheckdefinitions.code.tex
-2021/07/19 |       7461 | macros/latex/required/babel/base/babel.ins
 2021/07/19 |      72391 | graphics/pgf/contrib/spectralsequences/examples/SSS-KZ3.pdf
-2021/07/19 |     713940 | macros/latex/required/babel/base/babel.dtx
 2021/07/19 |      67825 | graphics/pgf/contrib/spectralsequences/src/sseqparsers.code.tex
 2021/07/19 |     659582 | graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanual.pdf
 2021/07/19 |       6585 | graphics/pgf/contrib/spectralsequences/README.md
 2021/07/19 |       6412 | graphics/pgf/contrib/spectralsequences/examples/MaySS-tmf-A(2).tex
-2021/07/19 |     629922 | macros/latex/contrib/easybook.zip
 2021/07/19 |       6262 | graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.tex
 2021/07/19 |      61512 | graphics/pgf/contrib/spectralsequences/src/sseqdrawing.code.tex
 2021/07/19 |        602 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo_bibliography.bib
-2021/07/19 |     591310 | macros/latex/contrib/easybook/easybook.pdf
 2021/07/19 |      58887 | graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).pdf
 2021/07/19 |      57942 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-titlepage-color.jpg
 2021/07/19 |      52581 | graphics/pgf/contrib/spectralsequences/examples/ANSS-S_3.pdf
@@ -439,7 +487,6 @@
 2021/07/19 |       3640 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
 2021/07/19 |      35777 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-titlepage.jpg
 2021/07/19 |      35571 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-subsectionpage.jpg
-2021/07/19 |       3526 | macros/latex/required/babel/base/bbidxglo.dtx
 2021/07/19 |      35149 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/LICENSE
 2021/07/19 |      33923 | graphics/pgf/contrib/spectralsequences/src/sseqmessages.code.tex
 2021/07/19 |      32126 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-references.jpg
@@ -449,7 +496,6 @@
 2021/07/19 |     306784 | systems/texlive/tlnet/archive/xistercian.doc.r59976.tar.xz
 2021/07/19 |       3008 | graphics/pgf/contrib/spectralsequences/examples/HFPSS-EO2_3.tex
 2021/07/19 |      28468 | graphics/pgf/contrib/spectralsequences/examples/hatcher.pdf
-2021/07/19 |    2827365 | install/macros/latex/required/babel-base.tds.zip
 2021/07/19 |     274695 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf
 2021/07/19 |      27131 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-appendix.jpg
 2021/07/19 |       2697 | graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.tex
@@ -463,11 +509,9 @@
 2021/07/19 |     224972 | graphics/pgf/contrib/spectralsequences/examples/ASS-tmf_2.pdf
 2021/07/19 |       2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz
 2021/07/19 |      22150 | graphics/pgf/contrib/spectralsequences/src/sseqmacromakers.code.tex
-2021/07/19 |      21890 | macros/latex/required/babel/base/bbcompat.dtx
 2021/07/19 |       2160 | systems/texlive/tlnet/archive/macrolist.r59980.tar.xz
 2021/07/19 |      21492 | graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.pdf
 2021/07/19 |    2088204 | graphics/pgf/contrib/spectralsequences.zip
-2021/07/19 |       2073 | macros/latex/required/babel/base/README.md
 2021/07/19 |    2065324 | systems/texlive/tlnet/archive/latex-via-exemplos.doc.r59977.tar.xz
 2021/07/19 |    2054666 | macros/latex/contrib/fithesis.zip
 2021/07/19 |       2045 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
@@ -475,11 +519,9 @@
 2021/07/19 |      19718 | graphics/pgf/contrib/spectralsequences/manual/spectralsequencesmanualpreamble.tex
 2021/07/19 |       1936 | macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
 2021/07/19 |     185220 | systems/texlive/tlnet/archive/macrolist.doc.r59980.tar.xz
-2021/07/19 |    1825584 | macros/latex/required/babel/base.zip
 2021/07/19 |       1819 | graphics/pgf/contrib/spectralsequences/examples/MaySS-bo-A(1).tex
 2021/07/19 |      17782 | macros/latex/contrib/letterswitharrows/letterswitharrows.dtx
 2021/07/19 |       1656 | graphics/pgf/contrib/spectralsequences/examples/unstable_ASS_SO.tex
-2021/07/19 |     152239 | macros/latex/contrib/easybook/easybook.dtx
 2021/07/19 |       1500 | systems/texlive/tlnet/archive/collection-mathscience.r59975.tar.xz
 2021/07/19 |     149825 | graphics/pgf/contrib/spectralsequences/examples/J_RPinfty.pdf
 2021/07/19 |     149263 | systems/texlive/tlnet/tlpkg/TeXLive/TLUtils.pm
@@ -961,7 +1003,6 @@
 2021/07/16 |       6384 | systems/texlive/tlnet/archive/collection-latexextra.r59943.tar.xz
 2021/07/16 |       6127 | systems/win32/miktex/tm/packages/texdimens__doc.tar.lzma
 2021/07/16 |     610812 | systems/texlive/tlnet/archive/lebhart.doc.r59941.tar.xz
-2021/07/16 |       6052 | systems/texlive/tlnet/archive/texdimens.doc.r59939.tar.xz
 2021/07/16 |       6037 | systems/win32/miktex/tm/packages/pyluatex.tar.lzma
 2021/07/16 |     596220 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
 2021/07/16 |       5542 | systems/win32/miktex/tm/packages/stackengine.tar.lzma
@@ -976,7 +1017,6 @@
 2021/07/16 |       3919 | systems/win32/miktex/tm/packages/huawei__source.tar.lzma
 2021/07/16 |    3775680 | systems/win32/miktex/tm/packages/tudscr__doc.tar.lzma
 2021/07/16 |    3769988 | systems/texlive/tlnet/archive/tudscr.doc.r59942.tar.xz
-2021/07/16 |       3708 | systems/texlive/tlnet/archive/texdimens.r59939.tar.xz
 2021/07/16 |     367320 | systems/texlive/tlnet/archive/stackengine.doc.r59944.tar.xz
 2021/07/16 |       3564 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
 2021/07/16 |       3551 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
@@ -998,7 +1038,6 @@
 2021/07/16 |       2156 | systems/texlive/tlnet/archive/kdpbook.r59937.tar.xz
 2021/07/16 |       2020 | systems/win32/miktex/tm/packages/to-be-determined__source.tar.lzma
 2021/07/16 |     186756 | systems/win32/miktex/tm/packages/to-be-determined__doc.tar.lzma
-2021/07/16 |     186296 | systems/texlive/tlnet/archive/to-be-determined.doc.r59943.tar.xz
 2021/07/16 |      17694 | systems/win32/miktex/tm/packages/stackengine__source.tar.lzma
 2021/07/16 |    1732511 | systems/win32/miktex/tm/packages/nicematrix__doc.tar.lzma
 2021/07/16 |      16607 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
@@ -1008,315 +1047,13 @@
 2021/07/16 |      16133 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
 2021/07/16 |     160220 | systems/texlive/tlnet/archive/tudscr.r59942.tar.xz
 2021/07/16 |     159856 | systems/win32/miktex/tm/packages/tudscr.tar.lzma
-2021/07/16 |       1488 | systems/texlive/tlnet/archive/to-be-determined.r59943.tar.xz
 2021/07/16 |      12996 | systems/win32/miktex/tm/packages/biblatex-philosophy.tar.lzma
 2021/07/16 |     129512 | systems/win32/miktex/tm/packages/nicematrix__source.tar.lzma
 2021/07/16 |      12852 | systems/texlive/tlnet/archive/biblatex-philosophy.r59940.tar.xz
 2021/07/16 |      12605 | systems/win32/miktex/tm/packages/cartonaugh__source.tar.lzma
-2021/07/16 |  122920214 | macros/context/latest/cont-tmf.zip
 2021/07/16 |        120 | info/latex-via-exemplos/latex-via-exemplos-oneside.tex
 2021/07/16 |    1161698 | info/biblio/typeset.bib
 2021/07/16 |     111192 | systems/texlive/tlnet/archive/kdpbook.doc.r59937.tar.xz
 2021/07/16 |     105192 | systems/texlive/tlnet/archive/colorist.doc.r59941.tar.xz
 2021/07/16 |      10396 | systems/texlive/tlnet/archive/cartonaugh.source.r59938.tar.xz
 2021/07/16 |    1038943 | info/biblio/font.bib
-2021/07/15 |      99253 | macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf
-2021/07/15 |      99018 | macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf
-2021/07/15 |      98920 | macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf
-2021/07/15 |      98503 | macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf
-2021/07/15 |      98269 | macros/latex/contrib/changes/examples/changes.example.package.hyperref.pdf
-2021/07/15 |      98081 | macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf
-2021/07/15 |      97326 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf
-2021/07/15 |      97319 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf
-2021/07/15 |      97239 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf
-2021/07/15 |      97128 | macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf
-2021/07/15 |      97064 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf
-2021/07/15 |         96 | macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex
-2021/07/15 |      96944 | macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf
-2021/07/15 |       9684 | macros/latex/contrib/tudscr/source/doc/tudscr-introduction.tex
-2021/07/15 |      96849 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf
-2021/07/15 |      96684 | macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf
-2021/07/15 |      96596 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf
-2021/07/15 |      96561 | macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf
-2021/07/15 |      96528 | macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf
-2021/07/15 |      96494 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf
-2021/07/15 |       9638 | macros/luatex/latex/pyluatex/pyluatex-json.lua
-2021/07/15 |      96366 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf
-2021/07/15 |      96233 | macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf
-2021/07/15 |      96227 | macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf
-2021/07/15 |      95933 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf
-2021/07/15 |      95656 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf
-2021/07/15 |      95366 | macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf
-2021/07/15 |      95281 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf
-2021/07/15 |      94948 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf
-2021/07/15 |      94875 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf
-2021/07/15 |      94860 | macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf
-2021/07/15 |      94795 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf
-2021/07/15 |      94774 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf
-2021/07/15 |      94673 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf
-2021/07/15 |      94649 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf
-2021/07/15 |      94641 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf
-2021/07/15 |      94615 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf
-2021/07/15 |      94572 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf
-2021/07/15 |      94570 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf
-2021/07/15 |      94489 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf
-2021/07/15 |      94482 | macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf
-2021/07/15 |      94464 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf
-2021/07/15 |      94396 | macros/latex/contrib/changes/examples/changes.example.highlightmarkup.wrong.pdf
-2021/07/15 |      94349 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf
-2021/07/15 |      94339 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf
-2021/07/15 |      94303 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf
-2021/07/15 |      94285 | macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf
-2021/07/15 |      94280 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf
-2021/07/15 |      94273 | macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf
-2021/07/15 |      94235 | macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf
-2021/07/15 |       9422 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/examples.zip
-2021/07/15 |      94179 | macros/latex/contrib/changes/examples/changes.example.markup.default.pdf
-2021/07/15 |      94148 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf
-2021/07/15 |      94147 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf
-2021/07/15 |      94104 | macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf
-2021/07/15 |      94104 | macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf
-2021/07/15 |      94098 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf
-2021/07/15 |      94091 | macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf
-2021/07/15 |      94058 | macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf
-2021/07/15 |      94057 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.wrong.pdf
-2021/07/15 |      94057 | macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf
-2021/07/15 |      94049 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf
-2021/07/15 |      94008 | macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf
-2021/07/15 |      93929 | macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf
-2021/07/15 |      93926 | macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf
-2021/07/15 |      93750 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf
-2021/07/15 |      93748 | macros/latex/contrib/changes/examples/changes.example.draft.pdf
-2021/07/15 |      93585 | macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf
-2021/07/15 |      93544 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf
-2021/07/15 |      93332 | macros/latex/contrib/tudscr/source/tudscr-area.dtx
-2021/07/15 |      92984 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf
-2021/07/15 |      92919 | macros/latex/contrib/changes/examples/changes.example.simple.pdf
-2021/07/15 |         91 | macros/latex/contrib/changes/userdoc/comment_ex.tex
-2021/07/15 |      90782 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf
-2021/07/15 |     896765 | macros/latex/contrib/tudscr/doc/tutorials/treatise.pdf
-2021/07/15 |      87708 | macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf
-2021/07/15 |       8661 | macros/latex/contrib/tudscr/source/doc/tutorials/mathswap.tex
-2021/07/15 |       8624 | macros/latex/contrib/changes/regression.dtx
-2021/07/15 |      86116 | macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf
-2021/07/15 |      85486 | macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf
-2021/07/15 |      85414 | macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf
-2021/07/15 |      84173 | macros/latex/contrib/colorist/colorist.sty
-2021/07/15 |         83 | macros/latex/contrib/changes/userdoc/setauthormarkup_ex.tex
-2021/07/15 |         82 | macros/latex/contrib/changes/userdoc/usepackage_ulem_changes_ex.tex
-2021/07/15 |       8015 | macros/latex/contrib/huawei/huawei.tex
-2021/07/15 |      80072 | systems/texlive/tlnet/archive/xint.r59930.tar.xz
-2021/07/15 |         79 | macros/latex/contrib/changes/userdoc/usepackage_xcolor_changes_ex.tex
-2021/07/15 |      79469 | macros/latex/contrib/changes/examples/changes.example.final.pdf
-2021/07/15 |      77464 | macros/latex/contrib/tudscr/source/tudscr-comp.dtx
-2021/07/15 |      75683 | macros/luatex/latex/pyluatex.zip
-2021/07/15 |       7510 | macros/latex/contrib/tudscr/source/tudscr-twocolfix.dtx
-2021/07/15 |    7469761 | systems/win32/miktex/tm/packages/hvfloat__doc.tar.lzma
-2021/07/15 |        744 | systems/texlive/tlnet/archive/collection-luatex.r59928.tar.xz
-2021/07/15 |     729082 | macros/unicodetex/latex/beaulivre.zip
-2021/07/15 |       7174 | macros/luatex/latex/pyluatex/pyluatex.tex
-2021/07/15 |       7090 | macros/latex/contrib/tudscr/source/doc/tutorials/mathtype.tex
-2021/07/15 |      67260 | macros/latex/contrib/tudscr/source/tudscr-layout.dtx
-2021/07/15 |         66 | macros/latex/contrib/changes/userdoc/usepackage_authormarkupposition_changes_in.tex
-2021/07/15 |      65417 | macros/luatex/latex/pyluatex/pyluatex.pdf
-2021/07/15 |         63 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_ex.tex
-2021/07/15 |         63 | macros/latex/contrib/changes/userdoc/setanonymousname_ex.tex
-2021/07/15 |     638509 | macros/unicodetex/latex/lebhart.zip
-2021/07/15 |        631 | macros/latex/contrib/tudscr/source/doc/examples/mathswap-example.tex
-2021/07/15 |         62 | macros/latex/contrib/changes/userdoc/replaced_in.tex
-2021/07/15 |     626219 | macros/latex/contrib/nicematrix/nicematrix.dtx
-2021/07/15 |      62480 | macros/latex/contrib/changes/changes.dtx
-2021/07/15 |     620541 | install/macros/latex/contrib/biblatex-contrib/biblatex-philosophy.tds.zip
-2021/07/15 |       6160 | macros/latex/contrib/tudscr/source/doc/tudscr-examples.tex
-2021/07/15 |     603645 | macros/latex/contrib/huawei.zip
-2021/07/15 |      59453 | macros/latex/contrib/tudscr/source/tudscr-title.dtx
-2021/07/15 |      59427 | macros/latex/contrib/stackengine/stackengine.tex
-2021/07/15 |         58 | macros/latex/contrib/changes/userdoc/usepackage_authormarkuptext_changes_in.tex
-2021/07/15 |         58 | macros/latex/contrib/changes/userdoc/listofchanges_in.tex
-2021/07/15 |     588753 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy.zip
-2021/07/15 |         56 | macros/latex/contrib/changes/userdoc/usepackage_highlightmarkup_changes_in.tex
-2021/07/15 |         56 | macros/latex/contrib/changes/userdoc/setlocextension_ex.tex
-2021/07/15 |         56 | macros/latex/contrib/changes/userdoc/setdeletedmarkup_ex.tex
-2021/07/15 |         55 | macros/latex/contrib/changes/userdoc/settruncatewidth_ex.tex
-2021/07/15 |         55 | macros/latex/contrib/changes/userdoc/definechangesauthor_in.tex
-2021/07/15 |      55057 | macros/latex/contrib/tudscr/source/tudscr-base.dtx
-2021/07/15 |      54513 | macros/latex/contrib/tudscr/source/tudscr-doc.dtx
-2021/07/15 |     544676 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.pdf
-2021/07/15 |         53 | macros/latex/contrib/changes/userdoc/setsummarywidth_ex.tex
-2021/07/15 |      53767 | macros/latex/contrib/tudscr/source/doc/tudscr-packages.tex
-2021/07/15 |         52 | macros/latex/contrib/changes/userdoc/usepackage_deletedmarkup_changes_in.tex
-2021/07/15 |         52 | macros/latex/contrib/changes/userdoc/usepackage_commentmarkup_changes_in.tex
-2021/07/15 |         52 | macros/latex/contrib/changes/userdoc/setauthormarkuptext_ex.tex
-2021/07/15 |         52 | macros/latex/contrib/changes/userdoc/setaddedmarkup_ex.tex
-2021/07/15 |         51 | macros/latex/contrib/changes/userdoc/usepackage_draft_changes_in.tex
-2021/07/15 |         51 | macros/latex/contrib/changes/userdoc/usepackage_commandnameprefix_changes_in.tex
-2021/07/15 |       5157 | macros/latex/contrib/colorist/colorart.cls
-2021/07/15 |       5154 | macros/latex/contrib/colorist/colorbook.cls
-2021/07/15 |       5118 | macros/latex/contrib/tudscr/source/doc/tudscr.tex
-2021/07/15 |     510822 | install/macros/generic/expkv.tds.zip
-2021/07/15 |         50 | macros/latex/contrib/changes/userdoc/usepackage_authormarkup_changes_in.tex
-2021/07/15 |     504550 | macros/generic/expkv.zip
-2021/07/15 |       5030 | macros/latex/contrib/changes/example-screenshot.dtx
-2021/07/15 |    5014937 | macros/latex/contrib/tudscr.zip
-2021/07/15 |         49 | macros/latex/contrib/changes/userdoc/setauthormarkupposition_in.tex
-2021/07/15 |         49 | macros/latex/contrib/changes/userdoc/deleted_in.tex
-2021/07/15 |       4932 | macros/latex/contrib/changes/changes.drv
-2021/07/15 |         48 | macros/latex/contrib/changes/userdoc/usepackage_todonotes_changes_ex.tex
-2021/07/15 |         48 | macros/latex/contrib/changes/userdoc/usepackage_addedmarkup_changes_in.tex
-2021/07/15 |         48 | macros/latex/contrib/changes/userdoc/setsocextension_ex.tex
-2021/07/15 |     487605 | macros/generic/expkv/expkv.pdf
-2021/07/15 |      48720 | macros/latex/contrib/tudscr/source/tudscr-frontmatter.dtx
-2021/07/15 |         47 | macros/latex/contrib/changes/userdoc/highlight_in.tex
-2021/07/15 |         47 | macros/latex/contrib/changes/userdoc/added_in.tex
-2021/07/15 |     463891 | macros/latex/contrib/nicematrix/nicematrix-french.pdf
-2021/07/15 |     458243 | macros/latex/contrib/changes/changes.english.withcode.pdf
-2021/07/15 |       4486 | macros/luatex/latex/pyluatex/pyluatex.lua
-2021/07/15 |      44533 | macros/latex/contrib/tudscr/source/tudscr-fields.dtx
-2021/07/15 |         43 | macros/latex/contrib/changes/userdoc/usepackage_defaultcolor_changes_in.tex
-2021/07/15 |         42 | macros/latex/contrib/changes/userdoc/usepackage_todonotes_changes_in.tex
-2021/07/15 |      42475 | macros/latex/contrib/changes/userdoc/changes.de.tex
-2021/07/15 |         41 | macros/latex/contrib/changes/userdoc/usepackage_truncate_changes_in.tex
-2021/07/15 |         41 | macros/latex/contrib/changes/userdoc/usepackage_truncate_changes_ex.tex
-2021/07/15 |         41 | macros/latex/contrib/changes/userdoc/setauthormarkuptext_in.tex
-2021/07/15 |       4110 | macros/latex/contrib/tudscr/source/doc/tudscr-index.tex
-2021/07/15 |        403 | macros/latex/contrib/huawei/DEPENDS.txt
-2021/07/15 |         39 | macros/latex/contrib/changes/userdoc/usepackage_xcolor_changes_in.tex
-2021/07/15 |     394460 | systems/texlive/tlnet/archive/xint.source.r59930.tar.xz
-2021/07/15 |      39355 | macros/latex/contrib/tudscr/source/doc/tudscr-hints.tex
-2021/07/15 |         38 | macros/latex/contrib/changes/userdoc/usepackage_markup_changes_in.tex
-2021/07/15 |         38 | macros/latex/contrib/changes/userdoc/path_doc_examples_in.tex
-2021/07/15 |      38801 | macros/latex/contrib/changes/userdoc/changes.en.tex
-2021/07/15 |     385976 | macros/latex/contrib/stackengine/stackengine.pdf
-2021/07/15 |      38147 | macros/latex/contrib/tudscr/source/tudscr-localization.dtx
-2021/07/15 |      38104 | macros/latex/contrib/tudscr/source/doc/tudscr-obsolete.tex
-2021/07/15 |         37 | macros/latex/contrib/changes/userdoc/usepackage_ulem_changes_in.tex
-2021/07/15 |     378117 | macros/latex/contrib/changes/changes.ngerman.pdf
-2021/07/15 |     375443 | macros/latex/contrib/stackengine.zip
-2021/07/15 |     370498 | macros/latex/contrib/changes/changes.english.pdf
-2021/07/15 |         34 | macros/latex/contrib/changes/userdoc/sethighlightmarkup_in.tex
-2021/07/15 |       3487 | macros/latex/contrib/tudscr/source/doc/tudscr-preface.tex
-2021/07/15 |     336192 | macros/latex/contrib/huawei/huawei.pdf
-2021/07/15 |         32 | macros/latex/contrib/changes/userdoc/usepackage_options_changes_in.tex
-2021/07/15 |         32 | macros/latex/contrib/changes/userdoc/setdeletedmarkup_in.tex
-2021/07/15 |         32 | macros/latex/contrib/changes/userdoc/setcommentmarkup_in.tex
-2021/07/15 |         31 | macros/latex/contrib/changes/userdoc/setauthormarkup_in.tex
-2021/07/15 |         30 | macros/latex/contrib/changes/userdoc/setsocextension_in.tex
-2021/07/15 |         30 | macros/latex/contrib/changes/userdoc/setlocextension_in.tex
-2021/07/15 |         30 | macros/latex/contrib/changes/userdoc/setaddedmarkup_in.tex
-2021/07/15 |         29 | macros/latex/contrib/changes/userdoc/comment_in.tex
-2021/07/15 |       2988 | macros/latex/contrib/tudscr/source/tudscrsource.tex
-2021/07/15 |         28 | macros/latex/contrib/changes/userdoc/usepackage_final_changes_in.tex
-2021/07/15 |      28538 | macros/latex/contrib/tudscr/source/doc/tudscr-installation.tex
-2021/07/15 |         27 | macros/latex/contrib/changes/userdoc/settruncatewidth_in.tex
-2021/07/15 |         27 | macros/latex/contrib/changes/userdoc/setsummarytowidth_in.tex
-2021/07/15 |         27 | macros/latex/contrib/changes/userdoc/path_script_in.tex
-2021/07/15 |       2793 | macros/luatex/latex/pyluatex/pyluatex-interpreter.py
-2021/07/15 |      27069 | macros/latex/contrib/colorist/colorist-doc.tex
-2021/07/15 |         26 | macros/latex/contrib/changes/userdoc/setsummarywidth_in.tex
-2021/07/15 |         26 | macros/latex/contrib/changes/userdoc/setanonymousname_in.tex
-2021/07/15 |       2688 | systems/win32/miktex/tm/packages/kdpcover.tar.lzma
-2021/07/15 |       2630 | macros/latex/contrib/tudscr/source/doc/tudscr-additional.tex
-2021/07/15 |      26201 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
-2021/07/15 |         25 | macros/latex/contrib/changes/userdoc/script_pymergechanges_empty.tex
-2021/07/15 |      25808 | macros/latex/contrib/changes/examples.dtx
-2021/07/15 |        254 | macros/latex/contrib/changes/userdoc/listofchanges_ex.tex
-2021/07/15 |     253724 | macros/latex/contrib/huawei/huawei-cover-picture.pdf
-2021/07/15 |       2513 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/README
-2021/07/15 |      24705 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
-2021/07/15 |       2450 | systems/win32/miktex/tm/packages/kdpcover__source.tar.lzma
-2021/07/15 |      24266 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
-2021/07/15 |     241703 | macros/latex/contrib/tudscr/source/tudscr-manual.dtx
-2021/07/15 |      23385 | macros/latex/contrib/tudscr/source/tudscr-misc.dtx
-2021/07/15 |        229 | macros/latex/contrib/changes/userdoc/script_pymergechanges.tex
-2021/07/15 |      22928 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
-2021/07/15 |      22682 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
-2021/07/15 |        225 | graphics/pgf/contrib/cartonaugh/cartonaugh-example.tex
-2021/07/15 |        224 | macros/latex/contrib/changes/userdoc/replaced_ex.tex
-2021/07/15 |     224901 | macros/latex/contrib/biblatex-contrib/biblatex-philosophy/biblatex-philosophy.dtx
-2021/07/15 |        223 | macros/latex/contrib/changes/userdoc/highlight_ex.tex
-2021/07/15 |         21 | macros/latex/contrib/changes/userdoc/usepackage_changes_in.tex
-2021/07/15 |    2184512 | systems/texlive/tlnet/archive/xint.doc.r59930.tar.xz
-2021/07/15 |      21436 | macros/latex/contrib/tudscr/source/tudscr-supervisor.dtx
-2021/07/15 |      21332 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
-2021/07/15 |      20948 | macros/latex/contrib/tudscr/source/tudscr-texindy.dtx
-2021/07/15 |       2054 | macros/latex/contrib/huawei/samples/huawei-charter.tex
-2021/07/15 |        196 | macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex
-2021/07/15 |       1947 | macros/latex/contrib/huawei/samples/huawei-cfp.tex
-2021/07/15 |    1912608 | macros/latex/contrib/nicematrix.zip
-2021/07/15 |    1843877 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
-2021/07/15 |       1832 | macros/latex/contrib/tudscr/source/doc/examples/notice.tex
-2021/07/15 |      18322 | graphics/pgf/contrib/cartonaugh/cartonaugh-example.pdf
-2021/07/15 |        182 | macros/latex/contrib/changes/userdoc/added_ex.tex
-2021/07/15 |      18117 | macros/latex/contrib/tudscr/source/doc/tudscr-bundle.tex
-2021/07/15 |     178373 | graphics/pgf/contrib/cartonaugh.zip
-2021/07/15 |        177 | macros/latex/contrib/changes/userdoc/deleted_ex.tex
-2021/07/15 |        174 | macros/latex/contrib/changes/userdoc/definechangesauthor_ex.tex
-2021/07/15 |      17472 | macros/latex/contrib/tudscr/source/doc/tudscr-supervisor.tex
-2021/07/15 |      17370 | macros/latex/contrib/tudscr/source/doc/tudscr-poster.tex
-2021/07/15 |        171 | macros/latex/contrib/changes/userdoc/usepackage_markup_changes_ex.tex
-2021/07/15 |     167066 | macros/latex/contrib/tudscr/source/doc/tudscr-mainclasses.tex
-2021/07/15 |      16663 | macros/latex/contrib/huawei/huawei.cls
-2021/07/15 |        164 | macros/latex/contrib/changes/userdoc/usepackage_commandnameprefix_changes_ex.tex
-2021/07/15 |      16355 | macros/latex/contrib/tudscr/README.md
-2021/07/15 |      16273 | macros/latex/contrib/stackengine/stackengine.sty
-2021/07/15 |       1607 | macros/latex/contrib/tudscr/source/doc/examples/mathtype-example.tex
-2021/07/15 |    1551800 | systems/win32/miktex/tm/packages/circuitikz__doc.tar.lzma
-2021/07/15 |    1551384 | systems/texlive/tlnet/archive/circuitikz.doc.r59929.tar.xz
-2021/07/15 |        154 | macros/latex/contrib/changes/userdoc/usepackage_authormarkup_changes_ex.tex
-2021/07/15 |     154656 | systems/texlive/tlnet/archive/circuitikz.r59929.tar.xz
-2021/07/15 |        151 | macros/latex/contrib/changes/userdoc/usepackage_commentmarkup_changes_ex.tex
-2021/07/15 |      15042 | macros/latex/contrib/tudscr/source/tudscr-color.dtx
-2021/07/15 |       1497 | macros/latex/contrib/huawei/README.md
-2021/07/15 |      14917 | macros/latex/contrib/tudscr/source/doc/examples/treatise-example.tex
-2021/07/15 |       1490 | macros/luatex/latex/pyluatex/README.md
-2021/07/15 |     148853 | systems/win32/miktex/tm/packages/circuitikz.tar.lzma
-2021/07/15 |     148416 | graphics/pgf/contrib/cartonaugh/cartonaugh.pdf
-2021/07/15 |     148136 | macros/latex/contrib/tudscr/doc/tutorials/mathtype.pdf
-2021/07/15 |        147 | macros/latex/contrib/changes/userdoc/usepackage_deletedmarkup_changes_ex.tex
-2021/07/15 |     147675 | macros/latex/contrib/tudscr/source/tudscr-fonts.dtx
-2021/07/15 |       1461 | macros/latex/contrib/huawei/samples/huawei-main.bib
-2021/07/15 |     143467 | macros/latex/contrib/changes/examples/changes.example.screenshot.pdf
-2021/07/15 |       1430 | macros/generic/expkv/README.md
-2021/07/15 |        142 | macros/latex/contrib/changes/userdoc/usepackage_addedmarkup_changes_ex.tex
-2021/07/15 |     141958 | macros/latex/contrib/tudscr/source/doc/tutorials/treatise.tex
-2021/07/15 |       1416 | macros/luatex/latex/pyluatex/pyluatex.sty
-2021/07/15 |    1339461 | macros/latex/contrib/nicematrix/nicematrix.pdf
-2021/07/15 |       1326 | macros/latex/contrib/changes/README
-2021/07/15 |     128951 | macros/latex/contrib/tudscr/doc/tutorials/mathswap.pdf
-2021/07/15 |      12643 | macros/unicodetex/latex/beaulivre/beaulivre.cls
-2021/07/15 |      12639 | macros/unicodetex/latex/lebhart/lebhart.cls
-2021/07/15 |     122220 | macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf
-2021/07/15 |        120 | macros/latex/contrib/changes/userdoc/usepackage_authormarkupposition_changes_ex.tex
-2021/07/15 |     118694 | macros/latex/contrib/colorist.zip
-2021/07/15 |        117 | macros/latex/contrib/changes/userdoc/usepackage_highlightmarkup_changes_ex.tex
-2021/07/15 |     116920 | macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf
-2021/07/15 |      11561 | macros/latex/contrib/changes/changes.ins
-2021/07/15 |    1149093 | macros/latex/contrib/tudscr/doc/tudscr.pdf
-2021/07/15 |      11346 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
-2021/07/15 |    1133767 | macros/latex/contrib/tudscr/doc/tudscr_print.pdf
-2021/07/15 |     113230 | macros/generic/expkv/expkv.dtx
-2021/07/15 |     111392 | macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf
-2021/07/15 |       1108 | macros/latex/contrib/tudscr/doc/LICENSE.md
-2021/07/15 |      11043 | macros/latex/contrib/changes/pyMergeChanges.py
-2021/07/15 |     110096 | systems/win32/miktex/tm/packages/kdpcover__doc.tar.lzma
-2021/07/15 |        109 | macros/latex/contrib/changes/userdoc/usepackage_authormarkuptext_changes_ex.tex
-2021/07/15 |      10890 | macros/latex/contrib/tudscr/source/tudscr-mathswap.dtx
-2021/07/15 |      10789 | macros/latex/contrib/tudscr/source/tudscr.ins
-2021/07/15 |     107843 | macros/latex/contrib/tudscr/source/tudscr-pagestyle.dtx
-2021/07/15 |      10769 | macros/latex/contrib/tudscr/source/tudscr-version.dtx
-2021/07/15 |        106 | macros/latex/contrib/changes/userdoc/usepackage_defaultcolor_changes_ex.tex
-2021/07/15 |    1063109 | macros/latex/contrib/tudscr/doc/tudscrsource.pdf
-2021/07/15 |        104 | macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex
-2021/07/15 |     103987 | macros/latex/contrib/changes/examples/changes.example.setanonymousname.pdf
-2021/07/15 |     102974 | macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf
-2021/07/15 |     102637 | macros/latex/contrib/changes/examples/changes.example.language.french.pdf
-2021/07/15 |     102351 | macros/latex/contrib/changes/examples/changes.example.language.ngerman.pdf
-2021/07/15 |     102351 | macros/latex/contrib/changes/examples/changes.example.language.german.pdf
-2021/07/15 |     101693 | macros/latex/contrib/changes/examples/changes.example.language.british.pdf
-2021/07/15 |     101650 | macros/latex/contrib/changes/examples/changes.example.language.italian.pdf
-2021/07/15 |     101521 | macros/latex/contrib/changes/examples/changes.example.language.english.pdf
-2021/07/15 |     101509 | macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf
-2021/07/15 |     101105 | macros/latex/contrib/changes/examples/changes.example.setlocextension.pdf
-2021/07/15 |     101103 | macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf
-2021/07/15 |     101072 | macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf
-2021/07/15 |     100430 | macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf
diff --git a/fonts/variablelm/README.md b/fonts/variablelm/README.md
index ecf1414f21..3d82d96dd9 100644
--- a/fonts/variablelm/README.md
+++ b/fonts/variablelm/README.md
@@ -11,7 +11,7 @@ For example: Japanese--Latin.
 
 ## Version
 
-1.1.2
+1.2
 
 ## Requirements
 
diff --git a/fonts/variablelm/doc/control_scaling_lm_fonts.pdf b/fonts/variablelm/doc/control_scaling_lm_fonts.pdf
index b84c93deb6..df5bce7a8b 100644
--- a/fonts/variablelm/doc/control_scaling_lm_fonts.pdf
+++ b/fonts/variablelm/doc/control_scaling_lm_fonts.pdf
diff --git a/fonts/variablelm/doc/control_scaling_lm_fonts.tex b/fonts/variablelm/doc/control_scaling_lm_fonts.tex
index 94b3f168a9..ee694584c3 100644
--- a/fonts/variablelm/doc/control_scaling_lm_fonts.tex
+++ b/fonts/variablelm/doc/control_scaling_lm_fonts.tex
@@ -6,7 +6,7 @@
 
 \title{Control the Scaling for the Latin Modern Fonts}
 \author{Yuwsuke KIEDA}
-\date{2018/02/13 v1.1.2}
+\date{2021/05/16 v1.2}
 
 \begin{document}
 
diff --git a/fonts/variablelm/tex/variablelm.sty b/fonts/variablelm/tex/variablelm.sty
index b792666959..a74fb61250 100644
--- a/fonts/variablelm/tex/variablelm.sty
+++ b/fonts/variablelm/tex/variablelm.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{variablelm}[2018/02/13 v1.1.2 to control the scaling for Latin Modern Fonts by Yuwsuke KIEDA]
+\ProvidesPackage{variablelm}[2021/05/16 v1.2 to control the scaling for Latin Modern Fonts by Yuwsuke KIEDA]
 
 \RequirePackage{xkeyval}
 \@ifpackageloaded{lmodern}{}{\@latexerr{You must be load "lmodern" package}\@ehb}
@@ -19,6 +19,8 @@
 \renewcommand{\sfdefault}{vlmss}
 \renewcommand{\ttdefault}{vlmtt}
 
+\renewcommand{\bfdefault}{bx}
+
 \DeclareOptionX{variablett}{\renewcommand{\ttdefault}{vlmvtt}}
 \DeclareOptionX{lighttt}{\let\vlmtt@use@light@as@normal\@empty}
 
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md
index 3b46b52c7e..851bcd5d83 100644
--- a/language/japanese/jlreq/README-ja.md
+++ b/language/japanese/jlreq/README-ja.md
@@ -19,7 +19,8 @@
 ## 動作環境
 pLaTeX / upLaTeX / LuaLaTeX上�動���．以下�パッケージを内部�読�込���．
 
-* （常時）：xkeyval,everyhook,etoolbox,ifthen,lmodern
+* （常時）：l3keys2e,etoolbox,lmodern
+* （LuaLaTeX�利用時）：everyhook
 * （LuaLaTeX利用時）：luatexja,luatexja-adjust
 
 リリース時点��最新版��動作を確������．
@@ -36,7 +37,7 @@ pLaTeX / upLaTeX / LuaLaTeX上ã�§å‹•ã��ã�¾ã�™ï¼Žä»¥ä¸‹ã�®ãƒ‘ッケージを内éƒ
 ```
 ����．
 
-��他，`oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn`���よ��るオプションを��付���．
+��他，`oneside` / `twoside` / `onecolumn` / `twocolumn` / `titlepage` / `notitlepage` / `draft` / `final` / `landscape` / `openright` / `openany` / `leqno` / `fleqn`���よ��るオプションを��付���．��`disablejfam`オプションを渡��，和文フォントを数�用�登録���ん．
 
 標準的�文書クラス���よ��中身を書���������，次�よ��命令�追加 / 拡張�れ����．��，本ドキュメント��[日本語組版処���件](https://www.w3.org/TR/jlreq/?lang=ja)���る用語を断り��使���．
 
@@ -75,6 +76,9 @@ pLaTeX / upLaTeX / LuaLaTeX上ã�§å‹•ã��ã�¾ã�™ï¼Žä»¥ä¸‹ã�®ãƒ‘ッケージを内éƒ
 ### `\jidori`
 `\jidori{<寸法>}{<中身>}`�より，中身を寸法�長��字�り��も�を出力�る�������．
 
+### `\akigumi`
+`\akigumi{<寸法>}{<中身>}`�より，中身�文字間を寸法�長����空�組���果を出力�る�������．���LuaLaTeX利用時以外�正��出力�果���り��ん．
+
 ### `\jafontsize`
 和文フォントサイズを指定�る`\fontsize`��．クラスオプション�`jafontscale=0.9`��れ��る場�，`\fontsize{9pt}{15pt}`��る�和文フォント�サイズ�`8.1pt`��り���，`\jafontsize{9pt}{15pt}`��る�`9pt`��り��．（欧文フォントサイズ�`10pt`��る．）��，第二引数�`\fontsize`�第二引数�全�����．
 
@@ -103,6 +107,8 @@ pLaTeX / upLaTeX / LuaLaTeX上ã�§å‹•ã��ã�¾ã�™ï¼Žä»¥ä¸‹ã�®ãƒ‘ッケージを内éƒ
     ```
 
     �よ�����．和文�欧文�間�空白（(u)pTeX��`\xkanjiskip`�，LuateX-ja��`xkanjiskip`パラメータ�格��れ��るも�）も�様�`\jlreqxkanjiskip`を�定義�る���変更�る�������．
+* `book`指定時�，クラスオプション���`openany`を指定����も，`\mainmatter`�後�白ページ�挿入�れる����り��．�れ�標準�クラスファイル�挙動を����も���．`\jlreqsetup{mainmatter_pagebreak=clearpage}`��る���白ページ�入ら���り���，デフォルト��`\mainmatter`�ページ数をリセット�����，ページ数��奇�整�性��れ���る�能性��り��．`\jlreqsetup{frontmatter_pagination={arabic,continuous}}`�よ����通�ノンブル�変更�る��を検討��������．詳���下記�「�付����を�照������．
+
 
 ## �種設計
 設計�クラスオプション���`\jlreqsetup`�よりkeyval形��行���．���，クラスオプション��LaTeX�実装�より，本��能�入力���付�られ��ケース��り��．多��場��空白を除����より解決���．
@@ -130,6 +136,7 @@ pLaTeX / upLaTeX / LuaLaTeX上ã�§å‹•ã��ã�¾ã�™ï¼Žä»¥ä¸‹ã�®ãƒ‘ッケージを内éƒ
     - `tate`無指定時�奇数ページ左，�数ページ��余白
     - `tate`指定時�奇数ページ�，�数ページ左�余白
     - `twoside`�指定�れ����時�，常�奇数ページ扱��余白�設定�れる
+* `fore-edge=<寸法;zw,zh>`：��（�����方）�余白�大��．「日本語組版処���件���る方法�余白を指定�る�り使�れる����り��ん�，便利���も�る��実装�れ����．
 * `head_space=<寸法;zw,zh>`：天�空��．デフォルト�中央寄���るよ��値．
 * `foot_space=<寸法;zw,zh>`：地�空��．デフォルト�中央寄���るよ��値．
 * `baselineskip=<寸法;Q,H,zw,zh>`：行�り．デフォルト�`jafontsize`�1.7�．
@@ -251,6 +258,7 @@ pLaTeX / upLaTeX / LuaLaTeX上ã�§å‹•ã��ã�¾ã�™ï¼Žä»¥ä¸‹ã�®ãƒ‘ッケージを内éƒ
 * `subtitle_break=[true/false]`：見出�文字列�副題�間を改行�る�指定���．
 * `allowbreak_if_evenpage=[true/false]`：見出���数ページ����場�，��直後�改ページを許����．
 * `pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]`：見出�直��改ページを指定���．�れ�れ，改ページ，`\cleardoublepage`実行，改段，�りゆ�，奇数ページ開始，�数ページ開始，��．
+* `pagestyle=<ページスタイル�>`：見出�箇所�ページスタイルを指定���．
 * `afterindent=[true/false]`：見出�直後�段��字下�を行��を指定���．
 * `column_spanning=[true/false]`： 段抜��見出�����．`pagebreak=nariyuki`���`pagebreak=clearcolumn`�時��無視�れ��．
 * `number=[true/false]`：採番を行��を指定���．`\NewTobiraHeading`��様�注��必���．
@@ -498,6 +506,14 @@ JFMã�®å��å‰�ã�¯æ¬¡ã�®é€šã‚Šã�§ã�™ï¼Ž`[]`ã�§å›²ã�¾ã‚Œã�¦ã�„る文字ã�¯è¨­å®šã�«ã
 * 2021-05-28
     - `\jlreqsetup`�`caption_align`を拡張．
     - `\ifthenelse`を少�削除．
+* 2021-07-22
+    - `\IfHookExistsTF`�利用を中止．
+    - `\akigumi`を追加．
+    - `xkeyval`パッケージ�`ifthen`パッケージ�利用をや��．
+    - expl3コード��親和性を高��．
+    - `\DeclareBlockHeading`�`pagestyle`を追加．
+    - 
+
 
 --------------
 Noriyuki Abe
diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md
index 62fc8b3b5d..86ca8f7660 100644
--- a/language/japanese/jlreq/README.md
+++ b/language/japanese/jlreq/README.md
@@ -142,6 +142,13 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
 * 2021-05-28
     - Extended `caption_align` in `\jlreqsetup`.
     - Removed some `\ifthenelse`.
+* 2021-07-22
+    - Stopped to use `\IfHookExistsTF`.
+    - Added `\akigumi`.
+    - Stopped to load packages `xkeyval` and `ifthen`.
+    - It has more compatibility with expl3.
+    - Added `pagestyle` to `\DeclareBlockHeading`.
+    - Fixed bugs.
 
 
 --------------
diff --git a/language/japanese/jlreq/jfm-jlreq.lua b/language/japanese/jlreq/jfm-jlreq.lua
index 4b84ffcedf..6172b1b463 100644
--- a/language/japanese/jlreq/jfm-jlreq.lua
+++ b/language/japanese/jlreq/jfm-jlreq.lua
@@ -15,26 +15,26 @@ xkanjiskip�{1,-3},kanjiskip={0,0}
 local stretch_width = 0.25 -- 空�第四段階�空��
 
 local hyphen_glue = {
-	[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-	[2] = {0, 0, 0},
-	[300] = {0, 0, 0},
-	[301] = {0, 0, 0},
-	[302] = {0, 0, 0},
-	[4] = {0, 0, 0},
-	[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-	[6] = {0, 0, 0},
-	[7] = {0, 0, 0},
-	[8] = {0, stretch_width, 0, priority = {-1,0}},
-	[9] = {0, 0, 0},
-	[10] = {0, 0, 0},
-	[11] = {0, 0, 0},
-	[12] = {0, stretch_width, 0, priority = {-1,0}},
-	[13] = {0, stretch_width, 0, priority = {-1,0}},
-	[14] = {0, stretch_width, 0, priority = {-1,0}},
-	[15] = {0, stretch_width, 0, priority = {-1,0}},
-	[16] = {0, stretch_width, 0, priority = {-1,0}},
-	[0] = {0, stretch_width, 0, priority = {-1,0}},
-	[27] = {0, stretch_width, 0, priority = {-1,0}},
+	[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+	[2] = {0, 0, 0, kanjiskip_natural = 1},
+	[300] = {0, 0, 0, kanjiskip_natural = 1},
+	[301] = {0, 0, 0, kanjiskip_natural = 1},
+	[302] = {0, 0, 0, kanjiskip_natural = 1},
+	[4] = {0, 0, 0, kanjiskip_natural = 1},
+	[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+	[6] = {0, 0, 0, kanjiskip_natural = 1},
+	[7] = {0, 0, 0, kanjiskip_natural = 1},
+	[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[9] = {0, 0, 0, kanjiskip_natural = 1},
+	[10] = {0, 0, 0, kanjiskip_natural = 1},
+	[11] = {0, 0, 0, kanjiskip_natural = 1},
+	[12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+	[27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
 --[[
 	[20] = {0, 0, 0},
 	[21] = {0, 0, 0},
@@ -65,26 +65,26 @@ local jfm = {
 		width = 0.5,height = 0.88,depth = 0.12,
 		align = 'right',
 		glue = {
-			[1] = {0, 0, 0},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, 0, 0},
-			[9] = {0, 0, 0},
-			[10] = {0, 0, 0},
-			[11] = {0, 0, 0},
-			[12] = {0, 0, 0},
-			[13] = {0, 0, 0},
-			[14] = {0, 0, 0},
-			[15] = {0, 0, 0},
-			[16] = {0, 0, 0},
-			[0] = {0, 0, 0},
-			[27] = {0, 0, 0},
+			[1] = {0, 0, 0, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, 0, 0, kanjiskip_natural = 1},
+			[9] = {0, 0, 0, kanjiskip_natural = 1},
+			[10] = {0, 0, 0, kanjiskip_natural = 1},
+			[11] = {0, 0, 0, kanjiskip_natural = 1},
+			[12] = {0, 0, 0, kanjiskip_natural = 1},
+			[13] = {0, 0, 0, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+			[15] = {0, 0, 0, kanjiskip_natural = 1},
+			[16] = {0, 0, 0, kanjiskip_natural = 1},
+			[0] = {0, 0, 0, kanjiskip_natural = 1},
+			[27] = {0, 0, 0, kanjiskip_natural = 1},
 --[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0, 0},
@@ -107,26 +107,26 @@ local jfm = {
 		width = 0.5,height = 0.88,depth = 0.12,
 		align = 'left',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
-			[15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -170,26 +170,26 @@ local jfm = {
 		width = 1,height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, stretch_width, 0, priority = {-1,0}},
-			[9] = {0, 0, 0},
-			[10] = {0, 0, 0},
-			[11] = {0, 0, 0},
-			[12] = {0, stretch_width, 0, priority = {-1,0}},
-			[13] = {0, stretch_width, 0, priority = {-1,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
-			[15] = {0, stretch_width, 0, priority = {-1,0}},
-			[16] = {0, stretch_width, 0, priority = {-1,0}},
-			[0] = {0, stretch_width, 0, priority = {-1,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[9] = {0, 0, 0, kanjiskip_natural = 1},
+			[10] = {0, 0, 0, kanjiskip_natural = 1},
+			[11] = {0, 0, 0, kanjiskip_natural = 1},
+			[12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -212,26 +212,26 @@ local jfm = {
 		width = 0.5,height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}},
-			[6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
-			[12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
-			[27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}},
+			[1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}, kanjiskip_natural = 1},
+			[12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
+			[27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
 			[21] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}},
@@ -254,26 +254,26 @@ local jfm = {
 		width = 0.5,height = 0.88,depth = 0.12,
 		align = 'left',
 		glue = {
-			[1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[2] = {0, 0, 0},
-			[300] = {0.5, 0, 0, ratio = 0},
-			[301] = {0.5, 0, 0, ratio = 0},
-			[302] = {0.5, 0, 0, ratio = 0},
-			[4] = {0.5, 0, 0, ratio = 0},
-			[5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[9] = {0.5, 0, 0, ratio = 0},
-			[10] = {0.5, 0, 0, ratio = 0},
-			[11] = {0.5, 0, 0, ratio = 0},
-			[12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
-			[27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}},
+			[1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[301] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[302] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[4] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[9] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[10] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[11] = {0.5, 0, 0, ratio = 0, kanjiskip_natural = 1},
+			[12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0, ratio = 0},
@@ -296,26 +296,26 @@ local jfm = {
 		width = 0.5,height = 0.88,depth = 0.12,
 		align = 'left',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
-			[12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
-			[27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}, kanjiskip_natural = 1},
+			[12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
+			[27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}},
@@ -337,26 +337,26 @@ local jfm = {
 		width = 1,height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
 			[8] = {0, 0, 0}, -- 空�注4
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, 0, 0},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
-			[0] = {0, 0.25, 0, priority = {0,0}},
-			[27] = {0, 0.25, 0, priority = {0,0}},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -377,26 +377,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, stretch_width, 0, priority = {-1,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -417,26 +417,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, stretch_width, 0, priority = {-1,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -457,26 +457,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, stretch_width, 0, priority = {-1,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}},
@@ -497,26 +497,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
---			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, 0, 0},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
-			[0] = {0, 0.25, 0, priority = {0,0}},
-			[27] = {0, 0.25, 0, priority = {0,0}},
+			[1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+--			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -537,26 +537,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
---			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
-			[0] = {0, 0.25, 0, priority = {0,0}},
-			[27] = {0, 0.25, 0, priority = {0,0}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+--			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[27] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
@@ -577,26 +577,26 @@ local jfm = {
 		align = 'middle',
 		width= 1,height = 0.88,depth = 0.12,
 		glue = {
-			[1] = {0, stretch_width, 0, priority = {-1,0}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, stretch_width, 0, priority = {-1,0}},
-			[9] = {0, 0, 0},
-			[10] = {0, 0, 0},
-			[11] = {0, 0, 0},
-			[12] = {0, stretch_width, 0, priority = {-1,0}},
-			[13] = {0, stretch_width, 0, priority = {-1,0}},
-			[14] = {0, stretch_width, 0, priority = {-1,0}},
-			[15] = {0, stretch_width, 0, priority = {-1,0}},
-			[16] = {0, stretch_width, 0, priority = {-1,0}},
-			[0] = {0, stretch_width, 0, priority = {-1,0}},
-			[27] = {0, stretch_width, 0, priority = {-1,0}},
+			[1] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[9] = {0, 0, 0, kanjiskip_natural = 1},
+			[10] = {0, 0, 0, kanjiskip_natural = 1},
+			[11] = {0, 0, 0, kanjiskip_natural = 1},
+			[12] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[13] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[14] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[15] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[16] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[0] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
+			[27] = {0, stretch_width, 0, priority = {-1,0}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0, 0},
@@ -617,26 +617,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
---			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, 0, 0},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+--			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -659,26 +659,26 @@ local jfm = {
 		height = 0.88,depth = 0.12,
 		align = 'middle',
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
---			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, 0, 0},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+--			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -716,26 +716,26 @@ local jfm = {
 		align = 'middle',
 		width = 1,height = 0.88,depth = 0.12,
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
---			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0, 0.25, 0, priority = {0,0}},
---			[10] = {0, 0.25, 0, priority = {0,0}},
---			[11] = {0, 0.25, 0, priority = {0,0}},
---			[12] = {0, 0.25, 0, priority = {0,0}},
---			[13] = {0, 0.25, 0, priority = {0,0}},
-			[14] = {0, 0, 0},
---			[15] = {0, 0.25, 0, priority = {0,0}},
---			[16] = {0, 0.25, 0, priority = {0,0}},
---			[0] = {0, 0.25, 0, priority = {0,0}},
---			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+--			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[10] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[11] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[13] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[16] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[0] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}, kanjiskip_natural = 1},
 		--[[
 			[20] = {0, 0, 0},
 			[21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},
@@ -1003,26 +1003,26 @@ local jfm = {
 	[27] = {-- 欧文
 		chars = {'alchar'},
 		glue = {
-			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}},
-			[2] = {0, 0, 0},
-			[300] = {0, 0, 0},
-			[301] = {0, 0, 0},
-			[302] = {0, 0, 0},
-			[4] = {0, 0, 0},
-			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},
-			[6] = {0, 0, 0},
-			[7] = {0, 0, 0},
-			[8] = {0, 0.25, 0, priority = {0,0}},
---			[9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
---			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
---			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
-			[12] = {0, 0.25, 0, priority = {0,0}},
+			[1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}, kanjiskip_natural = 1},
+			[2] = {0, 0, 0, kanjiskip_natural = 1},
+			[300] = {0, 0, 0, kanjiskip_natural = 1},
+			[301] = {0, 0, 0, kanjiskip_natural = 1},
+			[302] = {0, 0, 0, kanjiskip_natural = 1},
+			[4] = {0, 0, 0, kanjiskip_natural = 1},
+			[5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}, kanjiskip_natural = 1},
+			[6] = {0, 0, 0, kanjiskip_natural = 1},
+			[7] = {0, 0, 0, kanjiskip_natural = 1},
+			[8] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
+--			[9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+--			[10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+--			[11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+			[12] = {0, 0.25, 0, priority = {0,0}, kanjiskip_natural = 1},
 			[13] = {0, 0.25, 0, priority = {0,0}},-- 空�注10
-			[14] = {0, 0, 0},
---			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
---			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
---			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}},
---			[27] = {0, 0, 0, ratio = 0, priority = {1,0}},
+			[14] = {0, 0, 0, kanjiskip_natural = 1},
+--			[15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+--			[16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+--			[0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}, kanjiskip_natural = 1},
+--			[27] = {0, 0, 0, ratio = 0, priority = {1,0}, kanjiskip_natural = 1},
 --[[
 			[20] = {0, 0, 0},
 			[21] = {0, 0.25, 0, priority = {0,0}},
diff --git a/language/japanese/jlreq/jlreq-helpers.sty b/language/japanese/jlreq/jlreq-helpers.sty
index 83251193bb..5d6ae8791c 100644
--- a/language/japanese/jlreq/jlreq-helpers.sty
+++ b/language/japanese/jlreq/jlreq-helpers.sty
@@ -1,8 +1,8 @@
 % エンジン��存�マクロ集
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-helpers}[2018/08/15 jlreq-helpers]
-\RequirePackage{xkeyval,etoolbox}
+\ProvidesPackage{jlreq-helpers}[2021/07/22 jlreq-helpers]
+\RequirePackage{etoolbox}
 
 %. helper1
 \newcount\jlreq@tempcnta
@@ -210,53 +210,53 @@
 %  *{key}{\def\val{#1}} % デフォルト値を空文字列��る
 %  {key}[choice1,choice2]{\def\valchoice{#1}}
 %}{parse対象}
-\newcommand*{\jlreq@parsekeyval}{%
-  \@ifstar{\jlreq@helper@parsekeyval@{*}}{\jlreq@helper@parsekeyval@{}}%
-}
-\def\jlreq@helper@parsekeyval@#1{%
-  \@ifnextchar[{\jlreq@helper@parsekeyval@@{#1}}{\jlreq@helper@parsekeyval@@{#1}[jlreq@key]}%
-}
-\long\def\jlreq@helper@parsekeyval@@#1[#2]#3#4{%
-  \begingroup
-    \def\jlreq@do{}% \setkeys��果処�����入れられる（よ��ループ内�利用��）
-    \jlreq@helper@parsekeyval@@@{#2}#3{\jlreq@endmark}%
-    \setkeys#1{#2}{#4}%
-  \expandafter\endgroup
-  \jlreq@do
-}
-\def\jlreq@helper@parsekeyval@@@#1#2#{%
-  \jlreq@iffirsttoken@ignorespaces{#2}{*}{%
-    \jlreq@helper@parsekeyval@@@definekeywithdefault{#1}%
-  }{%
-    \jlreq@helper@parsekeyval@@@@{#1}%
-  }%
-}
-\long\def\jlreq@helper@parsekeyval@@@@#1#2{%
-  \jlreq@ifendmark{#2}{}{%
-    \@ifnextchar[{\jlreq@helper@parsekeyval@@@choicekey{#1}{#2}}{\jlreq@helper@parsekeyval@@@definekey{#1}{#2}}%
-  }%
-}
-\long\def\jlreq@helper@parsekeyval@@@choicekey#1#2[#3]#4{%
-  \@for\@tempa:=#2\do{%
-    \edef\jlreq@next{\unexpanded{\define@choicekey{#1}}{\expandonce{\@tempa}}}%
-    \jlreq@next{#3}{\eappto\jlreq@do{\unexpanded{#4}}}%
-  }%
-  \jlreq@helper@parsekeyval@@@{#1}%
-}
-\long\def\jlreq@helper@parsekeyval@@@definekeywithdefault#1#2#3{%
-  \@for\@tempa:=#2\do{%
-    \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
-    \jlreq@next[]{\eappto\jlreq@do{\unexpanded{#3}}}%
-  }%
-  \jlreq@helper@parsekeyval@@@{#1}%
-}
-\long\def\jlreq@helper@parsekeyval@@@definekey#1#2#3{%
-  \@for\@tempa:=#2\do{%
-    \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
-    \jlreq@next{\eappto\jlreq@do{\unexpanded{#3}}}%
-  }%
-  \jlreq@helper@parsekeyval@@@{#1}%
-}
+%\newcommand*{\jlreq@parsekeyval}{%
+%  \@ifstar{\jlreq@helper@parsekeyval@{*}}{\jlreq@helper@parsekeyval@{}}%
+%}
+%\def\jlreq@helper@parsekeyval@#1{%
+%  \@ifnextchar[{\jlreq@helper@parsekeyval@@{#1}}{\jlreq@helper@parsekeyval@@{#1}[jlreq@key]}%
+%}
+%\long\def\jlreq@helper@parsekeyval@@#1[#2]#3#4{%
+%  \begingroup
+%    \def\jlreq@do{}% \setkeys��果処�����入れられる（よ��ループ内�利用��）
+%    \jlreq@helper@parsekeyval@@@{#2}#3{\jlreq@endmark}%
+%    \setkeys#1{#2}{#4}%
+%  \expandafter\endgroup
+%  \jlreq@do
+%}
+%\def\jlreq@helper@parsekeyval@@@#1#2#{%
+%  \jlreq@iffirsttoken@ignorespaces{#2}{*}{%
+%    \jlreq@helper@parsekeyval@@@definekeywithdefault{#1}%
+%  }{%
+%    \jlreq@helper@parsekeyval@@@@{#1}%
+%  }%
+%}
+%\long\def\jlreq@helper@parsekeyval@@@@#1#2{%
+%  \jlreq@ifendmark{#2}{}{%
+%    \@ifnextchar[{\jlreq@helper@parsekeyval@@@choicekey{#1}{#2}}{\jlreq@helper@parsekeyval@@@definekey{#1}{#2}}%
+%  }%
+%}
+%\long\def\jlreq@helper@parsekeyval@@@choicekey#1#2[#3]#4{%
+%  \@for\@tempa:=#2\do{%
+%    \edef\jlreq@next{\unexpanded{\define@choicekey{#1}}{\expandonce{\@tempa}}}%
+%    \jlreq@next{#3}{\eappto\jlreq@do{\unexpanded{#4}}}%
+%  }%
+%  \jlreq@helper@parsekeyval@@@{#1}%
+%}
+%\long\def\jlreq@helper@parsekeyval@@@definekeywithdefault#1#2#3{%
+%  \@for\@tempa:=#2\do{%
+%    \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
+%    \jlreq@next[]{\eappto\jlreq@do{\unexpanded{#3}}}%
+%  }%
+%  \jlreq@helper@parsekeyval@@@{#1}%
+%}
+%\long\def\jlreq@helper@parsekeyval@@@definekey#1#2#3{%
+%  \@for\@tempa:=#2\do{%
+%    \edef\jlreq@next{\unexpanded{\define@key{#1}}{\expandonce{\@tempa}}}%
+%    \jlreq@next{\eappto\jlreq@do{\unexpanded{#3}}}%
+%  }%
+%  \jlreq@helper@parsekeyval@@@{#1}%
+%}
 
 % キー指定���keyval（独自実装）
 % \jlreq@parsekeyval@nokey{<action>}{<parse対象>}
@@ -449,17 +449,20 @@
   \ifx\@tempa\@tempb\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi
 }
 
+\ExplSyntaxOn
 \newcommand*{\jlreq@helper@guessengine}{%
-  \jlreq@ifprimitive\directlua{%
-    \let\jlreq@result=l%
-  }{%
-    \jlreq@ifprimitive\ucs{%
-      \let\jlreq@result=u%
-    }{%
-      \let\jlreq@result=p%
-    }%
-  }%
+  \token_if_primitive:NTF \directlua {
+    \let\jlreq@result=l
+  }{
+    \let\jlreq@result=p
+    \token_if_primitive:NT \ucs {
+      \int_compare:nT { \ucs"FA4A = "FA4A } {
+        \let\jlreq@result=u
+      }
+    }
+  }
 }
+\ExplSyntaxOff
 
 % #1を\@undefined�，既�\@undefined�ら�#2{#1}を呼�
 \newcommand*{\jlreq@helper@undefcs}[2]{%
diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf
index 8e2afa93d2..5f28ab2f33 100644
--- a/language/japanese/jlreq/jlreq-ja.pdf
+++ b/language/japanese/jlreq/jlreq-ja.pdf
diff --git a/language/japanese/jlreq/jlreq-trimmarks-ja.md b/language/japanese/jlreq/jlreq-trimmarks-ja.md
index e75a31512d..d318c27420 100644
--- a/language/japanese/jlreq/jlreq-trimmarks-ja.md
+++ b/language/japanese/jlreq/jlreq-trimmarks-ja.md
@@ -161,6 +161,9 @@ dviドライãƒ�ã�®æŒ‡å®šã�§ã�™ï¼Žã‚¨ãƒ³ã‚¸ãƒ³ã�«`lualatex`を利用ã�™ã‚‹å ´å�ˆã
     - `\jlreqtrimmarkssetup`�`banner`を使���場�，`\@bannertoken`�中身を�奇ページ両方�出力�るよ����．
     - `\jlreqtrimmarkssetup`�`banner`を使�場�，`\@bannertoken`�中身を無視�るよ����．
     - `\jlreqtrimmarkssetup`�`banner_font`�指定�れ�場�，`\@bannerfont`を無視�るよ����．
+* 2021-07-22
+    - expl3コード��親和性を高��．
+
 
 --------------
 Noriyuki Abe
diff --git a/language/japanese/jlreq/jlreq-trimmarks.md b/language/japanese/jlreq/jlreq-trimmarks.md
index a8fb96bf48..c13c5c051f 100644
--- a/language/japanese/jlreq/jlreq-trimmarks.md
+++ b/language/japanese/jlreq/jlreq-trimmarks.md
@@ -155,6 +155,9 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
     - `jlreq-trimmarks` outputs the contents in `\@bannertoken` when `banner` in `\jlreqtrimmarkssetup` is not used.
     - `\@bannertoken` is ignored when `banner` in `\jlreqtrimmarkssetup` is used.
     - `\@bannerfont` is ignored when `banner_font` in `\jlreqtrimmarkssetup` is used.
+* 2021-07-22
+    - It has more compatibility with expl3.
+
 
 --------------
 Noriyuki Abe
diff --git a/language/japanese/jlreq/jlreq-trimmarks.sty b/language/japanese/jlreq/jlreq-trimmarks.sty
index 03c31e521a..d7eb46fa49 100644
--- a/language/japanese/jlreq/jlreq-trimmarks.sty
+++ b/language/japanese/jlreq/jlreq-trimmarks.sty
@@ -1,14 +1,16 @@
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{jlreq-trimmarks}[2020/05/01 jlreq-trimmarks]
-\RequirePackage{xkeyval,etoolbox}
+\ProvidesPackage{jlreq-trimmarks}[2021/07/22 jlreq-trimmarks]
+\RequirePackage{l3keys2e,etoolbox}
 \RequirePackage{jlreq-helpers}
 
+\ExplSyntaxOn
+
 % check \tombowdatetrue
 \ifx\tombowdatetrue\@undefined
-  \PackageError{jlreq-trimmarks}{This package only works with pLaTeX, upLaTeX or LuaTeX-ja}{\@ehc}
+  \PackageError{jlreq-trimmarks}{This~package~only~works~with~pLaTeX,~upLaTeX~or~LuaTeX-ja}{\@ehc}
 \fi
 
-\newcommand*{\jlreq@trimmarks@undeferr}[1]{\PackageError{jlreq-trimmarks}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}}
+\newcommand*{\jlreq@trimmarks@undeferr}[1]{\PackageError{jlreq-trimmarks}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
 \newcommand*{\jlreq@trimmarks@afterpkg@addtodeletecs}[1]{%
   \appto\jlreq@trimmarks@afterpkg@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@trimmarks@undeferr}}%
 }
@@ -23,31 +25,22 @@
   \undef{\jlreq@trimmarks@undeferr}%
 }
 
-\newcommand*{\jlreq@trimmarks@DeclareOption}[2]{%
-  \DeclareOptionX{#1}{%
-    \jlreq@ifempty{##1}{}{\PackageError{jlreq-trimmarks}{The option #1 should have no value}{\@ehc}}%
-    #2%
-  }%
-}
-\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@DeclareOption}
-
 \@ifclassloaded{jlreq}{\let\ifjlreq@trimmarks@jlreqloaded=\@firstoftwo}{\let\ifjlreq@trimmarks@jlreqloaded=\@secondoftwo}
 
 \def\ifjlreq@trimmarks@tate@{\jlreq@if{\if@tate\fi}}%
 % \@firstoftwo when \if@tate is defined and \if@tate=\iftrue
 \def\ifjlreq@trimmarks@tate{%
-  \jlreq@if{\ifnum0\ifx\if@tate\@undefined 1\fi\ifx\if@tate\relax 1\fi>0 \fi}{\@secondoftwo}{\ifjlreq@trimmarks@tate@}%
+  \jlreq@if{\ifnum0\ifx\if@tate\@undefined 1\fi\ifx\if@tate\relax 1\fi>0~\fi}{\@secondoftwo}{\ifjlreq@trimmarks@tate@}%
 }
 
-
 % dvipdfmx=f，dvips=s，dviout = o, lualatex = l
-\jlreq@trimmarks@DeclareOption{dvipdfmx}{\let\jlreq@trimmarks@driver=f}
-\jlreq@trimmarks@DeclareOption{dvips}{\let\jlreq@trimmarks@driver=s}
-\jlreq@trimmarks@DeclareOption{dviout}{\let\jlreq@trimmarks@driver=o}
+\keys_define:nn { jlreq-trimmarks } { dvipdfmx .code:n = {\let\jlreq@trimmarks@driver=f}, .value_forbidden:n = true }
+\keys_define:nn { jlreq-trimmarks } { dvips .code:n = {\let\jlreq@trimmarks@driver=s}, .value_forbidden:n = true }
+\keys_define:nn { jlreq-trimmarks } { dviout .code:n = {\let\jlreq@trimmarks@driver=o}, .value_forbidden:n = true }
 \let\jlreq@trimmarks@engine=\jlreq@engine
-\jlreq@trimmarks@DeclareOption{lualatex}{\let\jlreq@trimmarks@engine=l}
-\jlreq@trimmarks@DeclareOption{uplatex}{\let\jlreq@trimmarks@engine=u}
-\jlreq@trimmarks@DeclareOption{platex}{\let\jlreq@trimmarks@engine=p}
+\keys_define:nn { jlreq-trimmarks } { lualatex .code:n = {\let\jlreq@trimmarks@engine=l}, .value_forbidden:n = true }
+\keys_define:nn { jlreq-trimmarks } { uplatex .code:n = {\let\jlreq@trimmarks@engine=u}, .value_forbidden:n = true }
+\keys_define:nn { jlreq-trimmarks } { platex .code:n = {\let\jlreq@trimmarks@engine=p}, .value_forbidden:n = true }
 
 \def\jlreq@trimmarks@switchpapersize{}
 \def\jlreq@trimmarks@addpapersize#1{%
@@ -58,7 +51,7 @@
   \@tempa
 }
 \newcommand*{\jlreq@trimmarks@addpapersize@@}[3]{%
-  \@for\@tempa:=#1\do{%
+  \clist_map_variable:nNn {#1} \@tempa {
     \eappto\jlreq@trimmarks@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\def\jlreq@resulta{#2}\def\jlreq@resultb{#3}}}}%
   }%
 }
@@ -122,8 +115,7 @@
 }
 \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@analyzepapersize}
 
-\def\jlreq@trimmarks@option@papersize{+2in}
-\DeclareOptionX{trimmarks_paper}{\def\jlreq@trimmarks@option@papersize{#1}}
+\keys_define:nn { jlreq-trimmarks } { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize }
 \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@option@papersize}
 
 \newif\ifjlreq@trimmarks@digital \jlreq@trimmarks@digitaltrue
@@ -133,60 +125,64 @@
 % flag: `show` is specified or not
 \newif\ifjlreq@trimmarks@option@show \jlreq@trimmarks@option@showfalse
 
-\DeclareOptionX{show}{%
-  \jlreq@trimmarks@option@showtrue
-  \jlreq@ifempty{#1}{
-    \jlreq@trimmarks@showtrue\tombowdatetrue\jlreq@trimmarks@digitaltrue
-  }{
-    \jlreq@trimmarks@showfalse\tombowdatefalse\jlreq@trimmarks@digitalfalse
-    \@for\jlreq@trimmarks@tempa:=#1\do{%
-      \expandafter\jlreq@helper@trim\expandafter{\jlreq@trimmarks@tempa}{\jlreq@trimmarks@tempa}
-      \jlreq@switch{\jlreq@trimmarks@tempa}{
-        {trimmarks}{\jlreq@trimmarks@showtrue}
-        {banner}{\tombowdatetrue}
-        {digital}{\jlreq@trimmarks@digitaltrue}
-        {digital*}{\jlreq@trimmarks@digitaltrue\jlreq@trimmarks@show@artboxtrue}
-        {no}{\tombowdatefalse\jlreq@trimmarks@showfalse\jlreq@trimmarks@digitalfalse}
-      }[\PackageError{jlreq-trimmarks}{Unknown value `##1' in the option `show'}{\@ehc}]
+\keys_define:nn { jlreq-trimmarks } {
+  show .code:n = {
+    \jlreq@trimmarks@option@showtrue
+    \jlreq@ifempty{#1}{
+      \jlreq@trimmarks@showtrue\tombowdatetrue\jlreq@trimmarks@digitaltrue
+    }{
+      \jlreq@trimmarks@showfalse\tombowdatefalse\jlreq@trimmarks@digitalfalse
+      \clist_map_variable:nNn {#1} \jlreq@trimmarks@tempa {
+        \expandafter\jlreq@helper@trim\expandafter{\jlreq@trimmarks@tempa}{\jlreq@trimmarks@tempa}
+        \jlreq@switch{\jlreq@trimmarks@tempa}{
+          {trimmarks}{\jlreq@trimmarks@showtrue}
+          {banner}{\tombowdatetrue}
+          {digital}{\jlreq@trimmarks@digitaltrue}
+          {digital*}{\jlreq@trimmarks@digitaltrue\jlreq@trimmarks@show@artboxtrue}
+          {no}{\tombowdatefalse\jlreq@trimmarks@showfalse\jlreq@trimmarks@digitalfalse}
+        }[\PackageError{jlreq-trimmarks}{Unknown~value~`##1'~in~the~option~`show'}{\@ehc}]
+      }
     }
   }
 }
-\@for\jlreq@tempa:=top,bottom,gutter,fore-edge\do{%
-  \expandafter\def\csname jlreq@trimmarks@bleed@\jlreq@tempa\endcsname{3mm}
-}
-\DeclareOptionX{bleed_margin}{%
-  \begingroup
-    \def\jlreq@do{}%
-    \jlreq@parsekeyval@nokey{
-      \ifjlreq@parsekeyval@nokey@novalue{%
-        \@for\jlreq@tempa:=top,bottom,gutter,fore-edge\do{%
-        \epreto\jlreq@do{%
-            \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@\jlreq@tempa\endcsname}{##1}%
-          }%
-        }%
-      }{%
-        \ifthenelse{\equal{##1}{top} \OR \equal{##1}{bottom} \OR \equal{##1}{gutter} \OR \equal{##1}{fore-edge}}{%
-          \eappto\jlreq@do{%
-            \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@##1\endcsname}{##2}%
+\keys_define:nn { jlreq-trimmarks } {
+  bleed_margin .code:n = {
+    \begingroup
+      \def\jlreq@do{}%
+      \jlreq@parsekeyval@nokey{
+        \ifjlreq@parsekeyval@nokey@novalue{%
+          \clist_map_variable:nNn { top,bottom,gutter,fore-edge } \jlreq@tempa {
+          \epreto\jlreq@do{%
+              \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@\jlreq@tempa\endcsname}{##1}%
+            }%
           }%
         }{%
-          \PackageError{jlreq-trimmarks}{Unknown position `##1' in bleed_margin}{\@ehc}
+          \bool_if:nTF {
+            \str_if_eq_p:nn {##1} {top} || \str_if_eq_p:nn {##1} {bottom} ||
+            \str_if_eq_p:nn {##1} {gutter} || \str_if_eq_p:nn {##1} {fore-edge}
+          }{
+            \eappto\jlreq@do{%
+              \noexpand\def\expandonce{\csname jlreq@trimmarks@bleed@##1\endcsname}{##2}%
+            }%
+          }{%
+            \PackageError{jlreq-trimmarks}{Unknown~position~`##1'~in~bleed_margin}{\@ehc}
+          }%
         }%
-      }%
-    }{#1}%
-  \expandafter\endgroup
-  \jlreq@do
+      }{#1}%
+    \expandafter\endgroup
+    \jlreq@do
+  }
 }
 
 \newif\ifjlreq@trimmarks@landscape \jlreq@trimmarks@landscapefalse
-\jlreq@trimmarks@DeclareOption{landscape}{\jlreq@trimmarks@landscapetrue}
+\keys_define:nn { jlreq-trimmarks } { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true }
 \jlreq@trimmarks@afterpkg@addtodeleteif{\ifjlreq@trimmarks@landscape}
 
-\let\jlreq@temporary@original@@removeelement=\@removeelement
-\let\@removeelement=\jlreq@helper@removeelement
-\ProcessOptionsX*\relax
-\let\@removeelement=\jlreq@temporary@original@@removeelement
-\let\jlreq@temporary@original@@removeelement=\@undefined
+\keys_set:nn { jlreq-trimmarks } {
+  trimmarks_paper = {+2in},
+  bleed_margin = { top = 3mm, bottom = 3mm, gutter = 3mm, fore-edge = 3mm },
+}
+\ProcessKeysOptions { jlreq-trimmarks }
 
 \ifjlreq@trimmarks@option@show\else
   \ifx o\jlreq@trimmarks@driver
@@ -228,7 +224,7 @@
 
 \ifx o\jlreq@trimmarks@driver
   \ifjlreq@trimmarks@digital
-    \PackageError{jlreq-trimmarks}{`show=digital' can't be used with the driver `dviout'}{\@ehc}
+    \PackageError{jlreq-trimmarks}{`show=digital'~can't~be~used~with~the~driver~`dviout'}{\@ehc}
   \fi
 \fi
 
@@ -300,114 +296,115 @@
   \jlreq@do
 }
 
-\newcommand{\jlreqtrimmarkssetup}[1]{%
-  \jlreq@parsekeyval[jlreqtrimmarkssetup]{
-    {banner}{%
-      \@for\@tempa:=odd,even\do{%
-        \@for\jlreq@tempa:=tate,yoko,corner,inyoko,intate\do{%
-          \@for\jlreq@tempb:=top,bottom\do{%
-            \@for\jlreq@tempc:=left,right\do{%
-              \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @\jlreq@tempb @\jlreq@tempc}{}%
-            }%
-          }%
-        }%
-        \@for\jlreq@tempa:=before,after\do{%
-          \@for\jlreq@tempb:=top,bottom,in\do{%
-            \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @\jlreq@tempb @center}{}%
-          }%
-          \@for\jlreq@tempb:=left,right,in\do{%
-            \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @center@\jlreq@tempb}{}%
+\keys_define:nn { jlreqtrimmarkssetup } {
+  banner .code:n = {
+    \clist_map_variable:nNn { odd,even } \@tempa {
+      \clist_map_variable:nNn { tate,yoko,corner,inyoko,intate } \jlreq@tempa {
+        \clist_map_variable:nNn {top,bottom} \jlreq@tempb {
+          \clist_map_variable:nNn {left,right} \jlreq@tempc {
+            \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @\jlreq@tempb @\jlreq@tempc}{}%
           }%
         }%
       }%
-      \def\jlreq@do{}%
-      \jlreq@parsekeyval@nokey{%
-        \ifjlreq@parsekeyval@nokey@novalue{}{%
-          \edef\jlreq@gutterodd{\ifjlreq@trimmarks@tate{right}{left}}%
-          \if@twoside
-            \edef\jlreq@guttereven{\ifjlreq@trimmarks@tate{left}{right}}%
-          \else
-            \let\jlreq@guttereven\jlreq@gutterodd
-          \fi
-          \jlreq@switch*{####1}{
-            {top-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}}
-            {left-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{####2}}}
-            {top-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{####2}}}
-            {right-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{####2}}}
-            {top-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{####2}}}
-            {gutter-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{####2}}}
-            {top-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{####2}}}
-            {fore-edge-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{####2}}}
-            {bottom-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{####2}}}
-            {left-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{####2}}}
-            {bottom-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{####2}}}
-            {right-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{####2}}}
-            {bottom-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{####2}}}
-            {gutter-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{####2}}}
-            {bottom-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{####2}}}
-            {fore-edge-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{####2}}}
-            {top-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{####2}}}
-            {center-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{####2}}}
-            {bottom-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{####2}}}
-            {center-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{####2}}}
-            {center-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{####2}}}
-            {right-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{####2}}}
-            {center-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{####2}}}
-            {left-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{####2}}}
-            {center-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{####2}}}
-            {gutter-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{####2}}}
-            {center-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{####2}}}
-            {fore-edge-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{####2}}}
-          }%
+      \clist_map_variable:nNn {before,after} \jlreq@tempa {
+        \clist_map_variable:nNn {top,bottom,in} \jlreq@tempb {
+          \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @\jlreq@tempb @center}{}%
         }%
-      }{##1}%
-      \jlreq@if{\ifx\jlreq@do\@empty\fi}{
-        \appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##1}}%
-      }{}%
-      \jlreq@do
-    }
-    {banner_font}{\def\jlreq@trimmarks@bannerfont{##1}}
-    {trimmarks_width}{\setlength{\@tombowwidth}{##1}}
-    {color}{%
-      \jlreq@ifempty{##1}{%
-        \def\jlreq@trimmarks@color{\normalcolor}%
-      }{%
-        \@ifundefined{color}{%
-          \PackageError{jlreq-trimmarks}{`\string\color' is not defined, please load the package `color' or its variant before this package}{\@ehc}%
+        \clist_map_variable:nNn {left,right,in} \jlreq@tempb {
+          \@namedef{jlreq@trimmarks@banner@\@tempa @\jlreq@tempa @center@\jlreq@tempb}{}%
         }%
-        \jlreq@switch{##1}{
-          {c}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,0,0}}}
-          {m}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,0,0}}}
-          {y}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,1,0}}}
-          {k}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,0,1}}}
-          {cm}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,0,0}}}
-          {cy}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,1,0}}}
-          {ck}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,0,1}}}
-          {my}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,1,0}}}
-          {mk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,0,1}}}
-          {yk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,1,1}}}
-          {cmy}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,1,0}}}
-          {cmk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,0,1}}}
-          {cyk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,1,1}}}
-          {myk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,1,1}}}
-          {cmyk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,1,1}}}
-          {%
-            \jlreq@iffirsttoken{##1}{[}{%
-              \def\@tempa[####1]####2\jlreq@endmark{\def\jlreq@trimmarks@color{\color[####1]{####2}}}%
-            }{%
-              \def\@tempa####1\jlreq@endmark{\def\jlreq@trimmarks@color{\color{####1}}}%
-            }%
-            \@tempa##1\jlreq@endmark
-          }%
+      }%
+    }%
+    \def\jlreq@do{}%
+    \jlreq@parsekeyval@nokey{%
+      \ifjlreq@parsekeyval@nokey@novalue{}{%
+        \edef\jlreq@gutterodd{\ifjlreq@trimmarks@tate{right}{left}}%
+        \if@twoside
+          \edef\jlreq@guttereven{\ifjlreq@trimmarks@tate{left}{right}}%
+        \else
+          \let\jlreq@guttereven\jlreq@gutterodd
+        \fi
+        \jlreq@switch*{##1}{
+          {top-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
+          {left-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{##2}}}
+          {top-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
+          {right-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@right}{top@right}{##2}}}
+          {top-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
+          {gutter-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@gutterodd}{top@\jlreq@guttereven}{##2}}}
+          {top-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
+          {fore-edge-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{top@\jlreq@guttereven}{top@\jlreq@gutterodd}{##2}}}
+          {bottom-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
+          {left-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@left}{bottom@left}{##2}}}
+          {bottom-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
+          {right-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@right}{bottom@right}{##2}}}
+          {bottom-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
+          {gutter-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@gutterodd}{bottom@\jlreq@guttereven}{##2}}}
+          {bottom-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
+          {fore-edge-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner{bottom@\jlreq@guttereven}{bottom@\jlreq@gutterodd}{##2}}}
+          {top-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
+          {center-top}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{top@center}{top@center}{##2}}}
+          {bottom-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
+          {center-bottom}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{bottom@center}{bottom@center}{##2}}}
+          {center-right}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
+          {right-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@right}{center@right}{##2}}}
+          {center-left}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
+          {left-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@left}{center@left}{##2}}}
+          {center-gutter}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
+          {gutter-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@gutterodd}{center@\jlreq@guttereven}{##2}}}
+          {center-fore-edge}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
+          {fore-edge-center}{\appto\jlreq@do{\jlreq@trimmarks@setbanner@{center@\jlreq@guttereven}{center@\jlreq@gutterodd}{##2}}}
+        }%
+      }%
+    }{#1}%
+    \jlreq@if{\ifx\jlreq@do\@empty\fi}{
+      \appto\jlreq@do{\jlreq@trimmarks@setbanner{top@left}{top@left}{#1}}%
+    }{}%
+    \jlreq@do
+  },
+  banner_font .tl_set:N = \jlreq@trimmarks@bannerfont,
+  trimmarks_width .code:n = {\setlength{\@tombowwidth}{#1}},
+  color .code:n = {
+    \jlreq@ifempty{#1}{%
+      \def\jlreq@trimmarks@color{\normalcolor}%
+    }{%
+      \@ifundefined{color}{%
+        \PackageError{jlreq-trimmarks}{`\string\color'~is~not~defined,~please~load~the~package~`color'~or~its~variant~before~this~package}{\@ehc}%
+      }%
+      \jlreq@switch{#1}{
+        {c}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,0,0}}}
+        {m}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,0,0}}}
+        {y}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,1,0}}}
+        {k}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,0,1}}}
+        {cm}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,0,0}}}
+        {cy}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,1,0}}}
+        {ck}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,0,1}}}
+        {my}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,1,0}}}
+        {mk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,0,1}}}
+        {yk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,0,1,1}}}
+        {cmy}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,1,0}}}
+        {cmk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,0,1}}}
+        {cyk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,0,1,1}}}
+        {myk}{\def\jlreq@trimmarks@color{\color[cmyk]{0,1,1,1}}}
+        {cmyk}{\def\jlreq@trimmarks@color{\color[cmyk]{1,1,1,1}}}
+        {%
+          \jlreq@iffirsttoken{##1}{[}{%
+            \def\@tempa[####1]####2\jlreq@endmark{\def\jlreq@trimmarks@color{\color[####1]{####2}}}%
+          }{%
+            \def\@tempa####1\jlreq@endmark{\def\jlreq@trimmarks@color{\color{####1}}}%
+          }%
+          \@tempa##1\jlreq@endmark
         }%
       }%
     }%
-  }{#1}%
+  }%
+}
+\newcommand{\jlreqtrimmarkssetup}[1]{%
+  \keys_set:nn { jlreqtrimmarkssetup } {#1}
 }
 \@onlypreamble\jlreqtrimmarkssetup
 \@bannertoken{%
   \jobname\space(\number\year-\two@digits\month-\two@digits\day
-  \space\two@digits\hour:\two@digits\minute)%
+  \space\two@digits\hour :\two@digits\minute)%
 }
 \jlreqtrimmarkssetup{
   banner={\the\@bannertoken},
@@ -483,11 +480,10 @@
 \def\jlreq@trimmarks@bleed{3mm}
 % left=gutter?
 \def\ifjlreq@trimmarks@leftisgutter{%
-  \ifjlreq@trimmarks@tate{%
-    \jlreq@if{\ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \fi}{\@secondoftwo}{\@firstoftwo}%
-  }{%
-    \jlreq@if{\ifnum 0\ifodd\c@page 1\fi\if@twoside\else 1\fi>0 \fi}{\@firstoftwo}{\@secondoftwo}%
-  }%
+  \bool_if:nTF {
+    ( \legacy_if_p:n { jlreq@trimmarks@tate } && ( ! ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) ) ) ||
+    ( ! \legacy_if_p:n { jlreq@trimmarks@tate } && ( \int_if_odd_p:n { \c@page } || ! \legacy_if_p:n { @twoside } ) )
+  }
 }
 \def\jlreq@trimmarks@bleed@left{\ifjlreq@trimmarks@leftisgutter{\jlreq@trimmarks@bleed@gutter}{\expandafter\csname jlreq@trimmarks@bleed@fore-edge\endcsname}}
 \def\jlreq@trimmarks@bleed@right{\ifjlreq@trimmarks@leftisgutter{\expandafter\csname jlreq@trimmarks@bleed@fore-edge\endcsname}{\jlreq@trimmarks@bleed@gutter}}
@@ -842,18 +838,18 @@
   \edef\jlreq@trimmarks@pttobp#1{\noexpand\strip@pt\noexpand\dimexpr\strip@pt\jlreq@resultdimen\noexpand\dimexpr0.9963\noexpand\dimexpr#1\unexpanded{\relax\relax\relax}}
   \edef\jlreq@trimmarks@trimboxsize{%
     [%
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth - \paperwidth)/2}
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight - \paperheight)/2}
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth + \paperwidth)/2}
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth - \paperwidth)/2}~
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight - \paperheight)/2}~
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth + \paperwidth)/2}~
       \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight + \paperheight)/2}%
     ]
   }
   \jlreq@tempcnta=\c@page
   \def\@tempa{%
     [%
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth - \paperwidth)/2 - \jlreq@trimmarks@bleed@left}
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight - \paperheight)/2 - \jlreq@trimmarks@bleed@bottom}
-      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth + \paperwidth)/2 + \jlreq@trimmarks@bleed@right}
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth - \paperwidth)/2 - \jlreq@trimmarks@bleed@left}~
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight - \paperheight)/2 - \jlreq@trimmarks@bleed@bottom}~
+      \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperwidth + \paperwidth)/2 + \jlreq@trimmarks@bleed@right}~
       \jlreq@trimmarks@pttobp{(\jlreq@trimmarks@paperheight + \paperheight)/2 + \jlreq@trimmarks@bleed@top}%
     ]
   }
@@ -863,14 +859,14 @@
   \edef\jlreq@trimmarks@bleedboxsize@even{\@tempa}%
   \c@page=\jlreq@tempcnta
   \edef\jlreq@trimmarks@pdfattribute@odd{%
-    /TrimBox \jlreq@trimmarks@trimboxsize
-    \ifjlreq@trimmarks@show@artbox /ArtBox \jlreq@trimmarks@trimboxsize\fi
-    /BleedBox \jlreq@trimmarks@bleedboxsize@odd
+    /TrimBox~\jlreq@trimmarks@trimboxsize
+    \ifjlreq@trimmarks@show@artbox /ArtBox~\jlreq@trimmarks@trimboxsize\fi
+    /BleedBox~\jlreq@trimmarks@bleedboxsize@odd
   }
   \edef\jlreq@trimmarks@pdfattribute@even{%
-    /TrimBox \jlreq@trimmarks@trimboxsize
-    \ifjlreq@trimmarks@show@artbox /ArtBox \jlreq@trimmarks@trimboxsize\fi
-    /BleedBox \jlreq@trimmarks@bleedboxsize@even
+    /TrimBox~\jlreq@trimmarks@trimboxsize
+    \ifjlreq@trimmarks@show@artbox /ArtBox~\jlreq@trimmarks@trimboxsize\fi
+    /BleedBox~\jlreq@trimmarks@bleedboxsize@even
   }
   \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@pttobp}
   \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@trimboxsize}
@@ -880,9 +876,9 @@
   \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@pdfattribute@even}
 
   \begingroup
-    \c@page=1
+    \c@page=1\relax
     \jlreq@tempdima=\jlreq@trimmarks@bleed@left
-    \c@page=2
+    \c@page=2\relax
     \ifdim\jlreq@trimmarks@bleed@left=\jlreq@tempdima
       \global\let\jlreq@tempa\@firstoftwo
     \else
@@ -896,13 +892,13 @@
       \@tempa
     \fi
     \ifx f\jlreq@trimmarks@driver
-      \epreto\@outputtombow{\noexpand\special{pdf: put @thispage <<\jlreq@trimmarks@pdfattribute@odd>>}}
+      \epreto\@outputtombow{\noexpand\special{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@odd>>}}
     \fi
     \ifx s\jlreq@trimmarks@driver
-      \edef\@tempa{\noexpand\special{ps:SDict begin
-        [ /TrimBox \jlreq@trimmarks@trimboxsize /PAGE pdfmark
-        \ifjlreq@trimmarks@show@artbox [ /ArtBox   \jlreq@trimmarks@trimboxsize /PAGE pdfmark \fi
-        [ /BleedBox \jlreq@trimmarks@bleedboxsize@odd /PAGE pdfmark
+      \edef\@tempa{\noexpand\special{ps:SDict~begin~
+        [~/TrimBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~
+        \ifjlreq@trimmarks@show@artbox [~/ArtBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~\fi
+        [~/BleedBox~\jlreq@trimmarks@bleedboxsize@odd /PAGE~pdfmark~
       end}}%
       \@tempa
     \fi
@@ -916,20 +912,20 @@
     \fi
     \ifx f\jlreq@trimmarks@driver
       \epreto\@outputtombow{%
-        \unexpanded{\ifodd\c@page\special}{pdf: put @thispage <<\jlreq@trimmarks@pdfattribute@odd>>}%
-        \unexpanded{\else\special}{pdf: put @thispage <<\jlreq@trimmarks@pdfattribute@even>>}\noexpand\fi
+        \unexpanded{\ifodd\c@page\special}{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@odd>>}%
+        \unexpanded{\else\special}{pdf:~put~@thispage~<<\jlreq@trimmarks@pdfattribute@even>>}\noexpand\fi
       }
     \fi
     \ifx s\jlreq@trimmarks@driver
       \epreto\@outputtombow{%
-        \unexpanded{\ifodd\c@page\special}{ps:SDict begin
-          [ /TrimBox \jlreq@trimmarks@trimboxsize /PAGE pdfmark
-          \ifjlreq@trimmarks@show@artbox [ /ArtBox   \jlreq@trimmarks@trimboxsize /PAGE pdfmark \fi
-          [ /BleedBox \jlreq@trimmarks@bleedboxsize@odd /PAGE pdfmark
-        end}\unexpanded{\else\special}{ps:SDict begin
-          [ /TrimBox \jlreq@trimmarks@trimboxsize /PAGE pdfmark
-          \ifjlreq@trimmarks@show@artbox [ /ArtBox   \jlreq@trimmarks@trimboxsize /PAGE pdfmark \fi
-          [ /BleedBox \jlreq@trimmarks@bleedboxsize@even /PAGE pdfmark
+        \unexpanded{\ifodd\c@page\special}{ps:SDict~begin~
+          [~/TrimBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~
+          \ifjlreq@trimmarks@show@artbox [~/ArtBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~\fi
+          [~/BleedBox~\jlreq@trimmarks@bleedboxsize@odd /PAGE~pdfmark~
+        end}\unexpanded{\else\special}{ps:SDict~begin~
+          [~/TrimBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~
+          \ifjlreq@trimmarks@show@artbox [~/ArtBox~\jlreq@trimmarks@trimboxsize /PAGE~pdfmark~\fi
+          [~/BleedBox~\jlreq@trimmarks@bleedboxsize@even /PAGE~pdfmark~
         end}\noexpand\fi
       }
     \fi
@@ -939,5 +935,5 @@
 % always true
 \tombowtrue
 
-
+\ExplSyntaxOff
 \endinput
diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index 477a34af98..434cd4f5b8 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/jlreq/jlreq.cls
@@ -5,11 +5,10 @@
 %%
 % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2021/05/28 jlreq]
-\RequirePackage{xkeyval,everyhook,etoolbox,ifthen}
+\ProvidesClass{jlreq}[2021/07/22 jlreq]
+\RequirePackage{l3keys2e,etoolbox}
 \RequirePackage{jlreq-helpers}
 
-
 \ExplSyntaxOn
 \tl_new:N \l_jlreq_tmpa_tl
 \cs_new:Nn \l_jlreq_do: {}
@@ -18,14 +17,18 @@
 \str_new:N \l_jlreq_tmpc_str
 \bool_new:N \l_jlreq_tmpa_bool
 \clist_new:N \l_jlreq_tmpa_clist
-\ExplSyntaxOff
+\dim_new:N \l_jlreq_tmpa_dim
+\skip_new:N \l_jlreq_tmpa_skip
+\box_new:N \l_jlreq_tmpa_box
+\box_new:N \l_jlreq_tmpb_box
+\box_new:N \l_jlreq_tmpc_box
 
-\newcommand*{\jlreq@undeferr}[1]{\ClassError{jlreq}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}}
+\def\jlreq@undeferr#1{\ClassError{jlreq}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
 % クラスファイル内���使���マクロをクラスファイル終了時�未定義��る
-\newcommand*{\jlreq@aftercls@addtodeletecs}[1]{%
+\def\jlreq@aftercls@addtodeletecs#1{%
   \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@undeferr}}%
 }
-\newcommand*{\jlreq@aftercls@addtodeleteif}[1]{%
+\def\jlreq@aftercls@addtodeleteif#1{%
   \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefif{#1}{\jlreq@undeferr}}%
 }
 \jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeletecs}
@@ -43,10 +46,10 @@
 
 \def\jlreq@saveoriginalcs#1{%
   \@ifundefined{#1}{
-    \ClassError{jlreq}{Trying to save #1 but it's not defined, may be a bug}{\@ehc}%
+    \ClassError{jlreq}{Trying~to~save~#1~but~it's~not~defined,~may~be~a~bug}{\@ehc}%
   }{}
   \@ifundefined{jlreq@original@#1}{}{
-    \ClassError{jlreq}{Trying to save #1 twice, may be a bug}{\@ehc}%
+    \ClassError{jlreq}{Trying~to~save~#1~twice,~may~be~a~bug}{\@ehc}%
   }
   \begingroup
     \edef\jlreq@do{\noexpand\let\expandonce{\csname jlreq@original@#1\endcsname}=\expandonce{\csname #1\endcsname}}
@@ -67,25 +70,16 @@
 % オプション処��際���使���変数（後��れを元�別�変数を調整�る）
 % も��\jlreq@option@<key>�格��る．
 % _���@�変��る．
-% 引数無��\DeclareOptionX
-\newcommand*{\jlreq@DeclareOption}[2]{%
-  \DeclareOptionX{#1}{%
-    \jlreq@ifempty{##1}{}{\ClassError{jlreq}{The option #1 should have no value}{\@ehc}}%
-    #2%
-  }
-}
-\jlreq@aftercls@addtodeletecs{\jlreq@DeclareOption}
 % エンジン類
-\jlreq@DeclareOption{uplatex}{\let\jlreq@engine=u}
-\jlreq@DeclareOption{platex}{\let\jlreq@engine=p}
-\jlreq@DeclareOption{lualatex}{\let\jlreq@engine=l}
+\keys_define:nn { jlreq } { uplatex .code:n = { \let\jlreq@engine=u }, uplatex .value_forbidden:n = true }
+\keys_define:nn { jlreq } { platex .code:n = { \let\jlreq@engine=p }, platex .value_forbidden:n = true }
+\keys_define:nn { jlreq } { lualatex .code:n = { \let\jlreq@engine=l }, lualatex .value_forbidden:n = true }
 
 % 文書�タイプ
-\newcommand*{\jlreq@article@type}{article}
-\define@choicekey{jlreq.cls}{article_type}{article,report,book}{\renewcommand*{\jlreq@article@type}{#1}}
-\jlreq@DeclareOption{article}{\renewcommand*{\jlreq@article@type}{article}}
-\jlreq@DeclareOption{report}{\renewcommand*{\jlreq@article@type}{report}}
-\jlreq@DeclareOption{book}{\renewcommand*{\jlreq@article@type}{book}}
+\keys_define:nn { jlreq } { article_type .choices:nn = {article,report,book}{\def\jlreq@article@type{#1}} }
+\keys_define:nn { jlreq } { article .code:n = { \def\jlreq@article@type{article} }, article .value_forbidden:n = true }
+\keys_define:nn { jlreq } { report .code:n = { \def\jlreq@article@type{report} }, report .value_forbidden:n = true }
+\keys_define:nn { jlreq } { book .code:n = { \def\jlreq@article@type{book} }, book .value_forbidden:n = true }
 
 %.. 基本版�．���紙サイズ．
 \def\jlreq@switchpapersize{}
@@ -99,31 +93,36 @@
   \edef\@tempa{\unexpanded{\jlreq@addpapersize@@{#1}{#2}}\csexpandonce{jlreq@helper@papersizelist@#3}}%
   \@tempa
 }
-\newcommand*{\jlreq@addpapersize@@}[4]{%
-  \@for\@tempa:=#1\do{%
+\def\jlreq@addpapersize@@#1#2#3#4{%
+  \clist_map_variable:nNn {#1} \@tempa {
     \eappto\jlreq@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}}}%
   }%
-  \@for\@tempa:=#2\do{%
-    \expandafter\jlreq@DeclareOption\expandafter{\@tempa}{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}%
-  }%
+  \clist_map_inline:nn {#2}  {
+    \keys_define:nn { jlreq } {
+      ##1 .code:n = { \setlength{\paperwidth}{#3}\setlength{\paperheight}{#4} },
+      ##1 .value_forbidden:n = true
+    }
+  }
 }
 \jlreq@aftercls@addtodeletecs{\jlreq@addpapersize}
 \jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@}
 \jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@@}
-\DeclareOptionX{paper}{
-  \edef\jlreq@do{%
-    \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@switchpapersize}}%
-    [\unexpanded{%
-      \jlreq@helper@dividebycomma{#1}%
-      \ifjlreq@result
-        \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}%
-        \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}%
-      \else
-        \ClassError{jlreq}{The paper #1 is unknown}{\@ehc}%
-      \fi
-    }]%
-  }%
-  \jlreq@do
+\keys_define:nn { jlreq } {
+  paper .code:n = {
+    \edef\jlreq@do{%
+      \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@switchpapersize}}%
+      [\unexpanded{%
+        \jlreq@helper@dividebycomma{#1}%
+        \ifjlreq@result
+          \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}%
+          \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}%
+        \else
+          \ClassError{jlreq}{The~paper~#1~is~unknown}{\@ehc}%
+        \fi
+      }]%
+    }%
+    \jlreq@do
+  }
 }
 % 紙サイズ一覧．b*�JIS B．
 \jlreq@addpapersize{a0,A0}{}[a0]
@@ -168,91 +167,81 @@
 
 
 %.. フォントサイズ，行長，1ページ��り�行数�基本版��サイズを決�る（2.4.1.a）
-\newcommand*{\jlreq@option@fontsize}{}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@fontsize}
-\DeclareOptionX{fontsize}{\renewcommand*{\jlreq@option@fontsize}{#1}}
-\jlreq@DeclareOption{10pt}{\renewcommand*{\jlreq@option@fontsize}{10pt}}
-\jlreq@DeclareOption{11pt}{\renewcommand*{\jlreq@option@fontsize}{11pt}}
-\jlreq@DeclareOption{12pt}{\renewcommand*{\jlreq@option@fontsize}{12pt}}
-\newcommand*{\jlreq@option@jafontsize}{}
+\keys_define:nn { jlreq } { fontsize .tl_set:N = \jlreq@option@fontsize }
+\keys_define:nn { jlreq } {
+  10pt .code:n = {\def\jlreq@option@fontsize{10pt}}, 10pt .value_forbidden:n = true,
+  11pt .code:n = {\def\jlreq@option@fontsize{11pt}}, 11pt .value_forbidden:n = true,
+  12pt .code:n = {\def\jlreq@option@fontsize{12pt}}, 12pt .value_forbidden:n = true,
+}
+\keys_define:nn { jlreq } { jafontsize .tl_set:N = \jlreq@option@jafontsize}
+\keys_define:nn { jlreq } { jafontscale .tl_set:N = \jlreq@option@jafontscale}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@jafontsize}
-\DeclareOptionX{jafontsize}{\renewcommand*{\jlreq@option@jafontsize}{#1}}
-\newcommand*{\jlreq@option@jafontscale}{1}
-\DeclareOptionX{jafontscale}{\renewcommand*{\jlreq@option@jafontscale}{#1}}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@jafontscale}
 %.. 行�長�
-\newcommand*{\jlreq@option@line@length}{}
+\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq@option@line@length}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@line@length}
-\DeclareOptionX{line_length}{\renewcommand*{\jlreq@option@line@length}{#1}}
 %.. 1ページ��り�行数
-\newcommand*{\jlreq@option@number@of@lines}{}
+\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq@option@number@of@lines}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@number@of@lines}
-\DeclareOptionX{number_of_lines}{\renewcommand*{\jlreq@option@number@of@lines}{#1}}
 
 % 地�空��，���空����置�置を決�る（2.4.1.b）�略�れ�ら中央�置．
 %.. 天
-\newcommand*{\jlreq@option@head@space}{}
+\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq@option@head@space}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@head@space}
-\DeclareOptionX{head_space}{\renewcommand*{\jlreq@option@head@space}{#1}}
-
 %.. 地
-\newcommand*{\jlreq@option@foot@space}{}
+\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq@option@foot@space}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@foot@space}
-\DeclareOptionX{foot_space}{\renewcommand*{\jlreq@option@foot@space}{#1}}
 %.. ��
-\newcommand*{\jlreq@option@gutter}{}
+\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq@option@gutter}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@gutter}
-\DeclareOptionX{gutter}{\renewcommand*{\jlreq@option@gutter}{#1}}
 %.. ��
-\newcommand*{\jlreq@option@fore@edge}{}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@fore@edge}
-\DeclareOptionX{fore_edge}{\renewcommand*{\jlreq@option@fore@edge}{#1}}% 昔�����������残���る
-\DeclareOptionX{fore-edge}{\renewcommand*{\jlreq@option@fore@edge}{#1}}
+\keys_define:nn { jlreq } {
+  fore_edge .tl_set:N = \jlreq@option@fore@edge,
+  fore-edge .tl_set:N = \jlreq@option@fore@edge
+}
 
 %.. 柱�ノンブル
-\newcommand*{\jlreq@option@headfoot@verticalpos}{}
-\jlreq@aftercls@addtodeletecs{\jlreq@option@headfoot@verticalpos}
 % 本文�ヘッダ/フッタ�間�空�
-\DeclareOptionX{headfoot_verticalposition}{\renewcommand*{\jlreq@option@headfoot@verticalpos}{#1}}
+\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos}
+\jlreq@aftercls@addtodeletecs{\jlreq@option@headfoot@verticalpos}
 % 柱やノンブル�左��空�
-\newcommand*{\jlreq@headfoot@sidemargin}{0pt}
-\DeclareOptionX{headfoot_sidemargin}{\renewcommand*{\jlreq@headfoot@sidemargin}{#1}}
+\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin}
 
 %.. 段間
-\newcommand*{\jlreq@option@column@gap}{2zw}
+\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@column@gap}
-\DeclareOptionX{column_gap}{\renewcommand*{\jlreq@option@column@gap}{#1}}
 
 %.. 行�り，指定無��場��文字サイズ�1.7���る．（1.5�ら2��好���：2.4.2.d 注3）
-\newcommand*{\jlreq@option@baselineskip}{17zw/10}
+\keys_define:nn { jlreq } {
+  baselineskip .tl_set:N = \jlreq@option@baselineskip,
+  linegap .code:n = { \def\jlreq@option@baselineskip{1zw + #1} }
+}
 \jlreq@aftercls@addtodeletecs{\jlreq@option@baselineskip}
-\DeclareOptionX{baselineskip}{\def\jlreq@option@baselineskip{#1}}
-\DeclareOptionX{linegap}{\def\jlreq@option@baselineskip{1zw + #1}}
 
 %.. 組�方系
 % 行頭�括弧�������置：3.1.5
 % 段�頭指定_折り返�行頭指定 �与�る．
-\newcommand*{\jlreq@open@bracket@pos}{zenkaku_tentsuki}
-\define@choicekey{jlreq.cls}{open_bracket_pos}{zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\renewcommand*{\jlreq@open@bracket@pos}{#1}}
+\keys_define:nn { jlreq } { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq@open@bracket@pos{#1}} }
 % �ら下�組�を�る�：3.8.2 注1
 \newif\ifjlreq@burasage\jlreq@burasagefalse
-\jlreq@DeclareOption{hanging_punctuation}{\jlreq@burasagetrue}
+\keys_define:nn { jlreq } { hanging_punctuation .code:n = {\jlreq@burasagetrue}, hanging_punctuation .value_forbidden:n = true}
 % jsarticle���kanjiskipを使�
 \newif\ifjlreq@narrow@kanjiskip\jlreq@narrow@kanjiskipfalse
-\jlreq@DeclareOption{narrow_kanjiskip}{\jlreq@narrow@kanjiskiptrue}
+\keys_define:nn { jlreq } { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true}
 \jlreq@aftercls@addtodeleteif{\ifjlreq@narrow@kanjiskip}
 
 %.. 注
 % �注�タイプ
-\newcommand*{\jlreq@option@sidenote@length}{0pt}
+\keys_define:nn { jlreq } { sidenote_length .tl_set:N = \jlreq@option@sidenote@length }
 \jlreq@aftercls@addtodeletecs{\jlreq@option@sidenote@length}
-\DeclareOptionX{sidenote_length}{\renewcommand*{\jlreq@option@sidenote@length}{#1}}
 
 %.. 逆ノンブル
 \newif\ifjlreq@option@use@reverse@pagination
 \jlreq@aftercls@addtodeleteif{\ifjlreq@option@use@reverse@pagination}
 \jlreq@option@use@reverse@paginationfalse
-\jlreq@DeclareOption{use_reverse_pagination}{\jlreq@option@use@reverse@paginationtrue}
+\keys_define:nn { jlreq } { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true }
 
 %.. も�も�
 \newif\if@restonecol\@restonecolfalse
@@ -261,45 +250,48 @@
 \newif\if@tate \@tatefalse
 \newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepage�notitlepage��指定�れ�
 \jlreq@aftercls@addtodeleteif{\ifjlreq@option@titlepage}
-\jlreq@DeclareOption{landscape}{\@landscapetrue}
-\jlreq@DeclareOption{tombo}{\ClassWarningNoLine{jlreq}{The option `tombo' is not supported by jlreq class. Please use the jlreq-trimmarks package}}
-\jlreq@DeclareOption{tombow}{\ClassWarningNoLine{jlreq}{The option `tombow' is not supported by jlreq class. Please use the jlreq-trimmarks package}}
-\jlreq@DeclareOption{mentuke}{\ClassWarningNoLine{jlreq}{The option `mentuke' is not supported by jlreq class. Please use the jlreq-trimmarks package}}
-\jlreq@DeclareOption{tate}{\@tatetrue}
+\keys_define:nn { jlreq } { landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true }
+\keys_define:nn { jlreq } { tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
+\keys_define:nn { jlreq } { tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
+\keys_define:nn { jlreq } { mentuke .code:n = {\ClassWarningNoLine{jlreq}{The~option~`mentuke'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}} }
+\keys_define:nn { jlreq } { tate .code:n = { \@tatetrue }, tate .value_forbidden:n = true}
 
 \newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % oneside�twoside�指定�れ�
 \jlreq@aftercls@addtodeleteif{\ifjlreq@option@twoside}
-\jlreq@DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue}
-\jlreq@DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue}
-\jlreq@DeclareOption{onecolumn}{\@twocolumnfalse}
-\jlreq@DeclareOption{twocolumn}{\@twocolumntrue}
-\jlreq@DeclareOption{titlepage}{\jlreq@option@titlepagetrue\@titlepagetrue}
-\jlreq@DeclareOption{notitlepage}{\jlreq@option@titlepagetrue\@titlepagefalse}
-\jlreq@DeclareOption{draft}{\setlength\overfullrule{5pt}}
-\jlreq@DeclareOption{final}{\setlength\overfullrule{0pt}}
+\keys_define:nn { jlreq } { oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue }, oneside .value_forbidden:n = true }
+\keys_define:nn { jlreq } { twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue }, twoside .value_forbidden:n = true }
+\keys_define:nn { jlreq } { onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true }
+\keys_define:nn { jlreq } { twocolumn .code:n = { \@twocolumntrue }, twocolumn .value_forbidden:n = true }
+\keys_define:nn { jlreq } { titlepage .code:n = { \jlreq@option@titlepagetrue\@titlepagetrue }, titlepage .value_forbidden:n = true }
+\keys_define:nn { jlreq } { notitlepage .code:n = { \jlreq@option@titlepagetrue\@titlepagefalse }, notitlepage .value_forbidden:n = true }
+\keys_define:nn { jlreq } { draft .code:n = { \setlength\overfullrule{5pt} }, draft .value_forbidden:n = true }
+\keys_define:nn { jlreq } { final .code:n = { \setlength\overfullrule{0pt} }, final .value_forbidden:n = true }
 \newif\if@openright
 \newif\ifjlreq@option@open \jlreq@option@openfalse % openright�openany�指定�れ�
 \jlreq@aftercls@addtodeleteif{\ifjlreq@option@open}
-\jlreq@DeclareOption{openright}{\@openrighttrue\jlreq@option@opentrue}
-\jlreq@DeclareOption{openany}{\@openrightfalse\jlreq@option@opentrue}
-\jlreq@DeclareOption{leqno}{\input{leqno.clo}}
-\jlreq@DeclareOption{fleqn}{\input{fleqn.clo}}
+\keys_define:nn { jlreq } { openright .code:n = { \@openrighttrue\jlreq@option@opentrue }, openright .value_forbidden:n = true}
+\keys_define:nn { jlreq } { openany .code:n = { \@openrightfalse\jlreq@option@opentrue }, openany .value_forbidden:n = true}
+\keys_define:nn { jlreq } { leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true}
+\keys_define:nn { jlreq } { fleqn .code:n = { \input{fleqn.clo } }, fleqn .value_forbidden:n = true}
 \newif\ifjlreq@option@enablejfam \jlreq@option@enablejfamtrue
 \jlreq@aftercls@addtodeleteif{\ifjlreq@option@enablejfam}
-\jlreq@DeclareOption{disablejfam}{\jlreq@option@enablejfamfalse}
-
-\newcommand*{\jlreq@note}[1]{}
-\jlreq@DeclareOption{jlreq_notes}{\renewcommand*{\jlreq@note}[1]{\message{^^JJLReq note: ##1^^J}}}
-
-\ExecuteOptionsX{article_type=article,paper=a4,open_bracket_pos=zenkaku_tentsuki,onecolumn,final}
-% \@removeelementを一旦置�����ら\ProcessOptionsXを実行�る
-\let\jlreq@temporary@original@@removeelement=\@removeelement
-\let\@removeelement=\jlreq@helper@removeelement
-\ProcessOptionsX\relax
-\let\@removeelement=\jlreq@temporary@original@@removeelement
-\let\jlreq@temporary@original@@removeelement=\@undefined
+\keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true}
+
+\def\jlreq@note#1{}
+\keys_define:nn { jlreq } { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true}
+
+%\ExecuteOptionsX{article_type=article,paper=a4,open_bracket_pos=zenkaku_tentsuki,onecolumn,final}
+\keys_set:nn { jlreq } {
+  article_type=article,paper=a4,
+  number_of_lines={},line_length = {},
+  head_space={},foot_space={},gutter={},fore_edge={},
+  jafontsize={},jafontscale={1},baselineskip={17zw/10},
+  sidenote_length=0pt,column_gap={2zw},
+  headfoot_verticalposition = {},headfoot_sidemargin={0pt},
+  open_bracket_pos=zenkaku_tentsuki,
+  onecolumn,final}
+\ProcessKeysOptions { jlreq }
 
-\ExplSyntaxOn
 \legacy_if:nF { jlreq@option@titlepage } {
   \str_if_eq:VnTF \jlreq@article@type { article } { \@titlepagefalse } { \@titlepagetrue }
 }
@@ -316,41 +308,22 @@
 \legacy_if:nF { jlreq@option@twoside } {
   \str_if_eq:VnTF \jlreq@article@type { book } { \@twosidetrue } { \@twosidefalse }
 }
-\ExplSyntaxOff
 
-\def\jlreq@jlreqsetup@keyvallist{}
-\def\jlreq@jlreqsetup@finally{}
-\newcommand{\jlreqsetup}[1]{%
-  \begingroup
-    \edef\jlreq@do{\unexpanded{\jlreq@parsekeyval[jlreqsetup]}{\expandonce{\jlreq@jlreqsetup@keyvallist}}}%
-  \expandafter\endgroup
-  \jlreq@do{#1}%
-  \jlreq@jlreqsetup@finally
-}
-% \jlreqsetup�項目�加�るマクロ．\jlreq@jlreqsetup@add{key}{action}��る�key�対��定義��る．
-% action内��val�#1����得��る．（従��action内�マクロを定義�る際��##1を使�必���る．）
-\newcommand{\jlreq@jlreqsetup@add}[1]{%
-  \@ifnextchar[{\jlreq@jlreqsetup@add@{#1}}{\jlreq@jlreqsetup@add@@{#1}}%
-}
-\long\def\jlreq@jlreqsetup@add@#1[#2]#3{%
-  \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}[#2]{#3}}}%
-}
-\long\def\jlreq@jlreqsetup@add@@#1#2{%
-  \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}{#2}}}%
+\tl_new:N \g__jlreq_jlreqsetup_finally_tl
+\NewDocumentCommand{\jlreqsetup} { +m } {
+  \keys_set:nn { jlreqsetup } {#1}
+  \tl_use:N \g__jlreq_jlreqsetup_finally_tl
 }
 % \jlreqsetup�最後�必�実行�れる処�を入れる．
-\newcommand\jlreq@jlreqsetup@addtofinally[1]{\eappto\jlreq@jlreqsetup@finally{\unexpanded{#1}}}
-\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add}
-\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@}
-\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@@}
-\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@addtofinally}
+\cs_set:Nn \__jlreq_jlreqsetup_addtofinally:n { \tl_gput_right:Nx \g__jlreq_jlreqsetup_finally_tl { \exp_not:n {#1} } }
+\jlreq@aftercls@addtodeletecs{\__jlreq_jlreqsetup_addtofinally:n}
 \@onlypreamble\jlreqsetup
 
 % エンジン�設定
 \ifx\jlreq@engine\@undefined
   \jlreq@helper@guessengine
   \let\jlreq@engine=\jlreq@result
-  \message{jlreq guessed engine: 
+  \message{jlreq~guessed~engine:~
     \ifx l\jlreq@engine lualatex\fi
     \ifx p\jlreq@engine platex\fi
     \ifx u\jlreq@engine uplatex\fi
@@ -358,7 +331,6 @@
 \fi
 
 %.. JFM�luatexja�ロード
-\ExplSyntaxOn
 \ifx l\jlreq@engine
   \def\ltj@stdyokojfm{jlreq}
   \def\ltj@stdtatejfm{jlreqv}
@@ -377,6 +349,7 @@
   \ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=10}}
   \ltjsetparameter{shrink_priority={kanjiskip=0,xkanjiskip=-30}}
 \else
+  \RequirePackage{everyhook}
   \def\jlreq@jfmname@prefix{}
   \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix}
   \ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi
@@ -389,7 +362,6 @@
   \jlreq@aftercls@addtodeletecs{\jlreq@jfmname}
   \jlreq@aftercls@addtodeletecs{\jlreq@jfmnameg}
 \fi
-\ExplSyntaxOff
 
 % (u)pLaTeX�場�������\epTeXinputencoding�発行�れる��，
 % �れ以���和文�使���．
@@ -438,7 +410,7 @@
       \ifcat （\noexpand #11\fi
       \ifcat A\noexpand #11\fi
       \ifcat 1\noexpand #11\fi
-    >0
+    >0~
   \fi}%
 }
 
@@ -446,10 +418,10 @@
 % 組方�を判定
 % \jlreq@if(y|t)(dir|box)を定義�る．
 \jlreq@if{\ifx l\jlreq@engine\fi}{
-  \def\jlreq@ifydir{\jlreq@if{\ifnum\ltjgetparameter{direction}=4 \fi}}
-  \def\jlreq@iftdir{\jlreq@if{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8\relax=3 \fi}}
-  \def\jlreq@ifybox#1{\jlreq@if{\ifnum\ltjgetparameter{boxdir}{#1}=4 \fi}}
-  \def\jlreq@iftbox#1{\jlreq@if{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8\relax=3 \fi}}
+  \def\jlreq@ifydir { \int_compare:nTF { \ltjgetparameter{direction} == 4 } }
+  \def\jlreq@iftdir { \int_compare:nTF { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 } }
+  \def\jlreq@ifybox#1{ \int_compare:nTF { \ltjgetparameter{boxdir}{#1} == 4 } }
+  \def\jlreq@iftbox#1{ \int_compare:nTF { (\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8) == 3 } }
 }{
   \def\jlreq@ifydir{\jlreq@if{\ifydir\fi}}
   \def\jlreq@iftdir{\jlreq@if{\iftdir\fi}}
@@ -459,7 +431,6 @@
 
 % 左ページ��る�
 % #1 : odd or even or ページ数
-\ExplSyntaxOn
 \def\jlreq@ifleftpage#1{%
   \bool_if:nTF { ( \legacy_if_p:n { @tate }  &&
     \bool_lazy_or_p:nn { \str_if_eq_p:ee {#1} { odd  } }
@@ -469,19 +440,18 @@
       { \bool_lazy_and_p:nn { ! \str_if_eq_p:ee {#1} { odd  } } { ! \int_if_odd_p:n {#1} } }
   ) }
 }
-\ExplSyntaxOff
 
 \ifx l\jlreq@engine
-  \newcommand*{\jlreq@getpostbreakpenalty}[1]{\ltjgetparameter{postbreakpenalty}{#1}}
+  \def\jlreq@getpostbreakpenalty#1{\ltjgetparameter{postbreakpenalty}{#1}}
 \else
-  \newcommand*{\jlreq@getpostbreakpenalty}[1]{\postbreakpenalty#1}
+  \def\jlreq@getpostbreakpenalty#1{\postbreakpenalty#1}
 \fi
 
 % �在行�残りを得る．
 \ifx l\jlreq@engine
   % 以下�コード�LuaTeX-ja��グ？��存���る
   % https://ja.osdn.net/projects/luatex-ja/ticket/36489
-  \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{%
+  \def\jlreq@calc@current@linewidth@onecolumn{%
     \dimexpr
        \jlreq@reference@ref{jlreq@rest@width.pos.X.\the\jlreq@reference@count}{0} sp - \@totalleftmargin -
       \ifodd\jlreq@currentpage
@@ -501,7 +471,7 @@
   }{
     \def\jlreq@tombow@adjust{\iftombow -1truein \fi}
   }
-  \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{%
+  \def\jlreq@calc@current@linewidth@onecolumn{%
     \dimexpr
       \jlreq@ifydir{%
         \jlreq@reference@ref{jlreq@rest@width.pos.X.\the\jlreq@reference@count}{0} sp - \hoffset
@@ -524,7 +494,7 @@
     \relax
   }
 \fi
-\newcommand*{\jlreq@calc@current@linewidth}{%
+\def\jlreq@calc@current@linewidth{%
   \dimexpr\jlreq@calc@current@linewidth@onecolumn
     \if@twocolumn
       \ifdim\jlreq@calc@current@linewidth@onecolumn<\dimexpr\linewidth+\columnsep\relax\else
@@ -569,26 +539,26 @@
 
 % #1�#2�間�入るjmglue（(x)kanjiskipも）を\jlreq@resultskip�入れる
 \ifx l\jlreq@engine
-  \newcommand*{\jlreq@calc@jfmglue}[2]{%
+  \def\jlreq@calc@jfmglue#1#2{%
     \begingroup
       \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
       \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
       \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\dimexpr\wd\jlreq@tempboxb - \wd\jlreq@tempboxa\relax\noexpand\relax}%
       \jlreq@do
       \directlua{
-        local width = 0
-        local stretch = 0
-        local shrink = 0
-        local n = tex.box["jlreq@tempboxb"].head
-        while n do
+        local~width = 0~
+        local~stretch = 0~
+        local~shrink = 0~
+        local~n = tex.box["jlreq@tempboxb"].head~
+        while~n~do~
           % ����glue�和を計算�る．
-          if n.id == node.id("glue") then
-            width = width + n.width
-            stretch = stretch + n.stretch
-            shrink = shrink + n.shrink
-          end
-          n = n.next
-        end
+          if~n.id == node.id("glue")~then~
+            width = width + n.width~
+            stretch = stretch + n.stretch~
+            shrink = shrink + n.shrink~
+          end~
+          n = n.next~
+        end~
         tex.setglue("jlreq@tempskipa",width,stretch,shrink)
       }%
       % TeX�計測��物�一致�����れ�TeX��方を信�る
@@ -599,7 +569,7 @@
     \jlreq@do
   }
 \else
-  \newcommand*{\jlreq@calc@jfmglue}[2]{%
+  \def\jlreq@calc@jfmglue#1#2{%
     \begingroup
       \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}%
       \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}%
@@ -612,7 +582,7 @@
 \newcount\jlreq@lastnodechar
 % \jlreq@fixjfm<次�文字>�形�使�．
 % jlreq@lastnodechar�入���る値�次�トークン（\futurelet�得る）�間�入るJFMグルー等を挿入�る
-\newcommand*{\jlreq@fixjfm}{%
+\def\jlreq@fixjfm{%
   \begingroup
     \ifnum\jlreq@lastnodechar>-1
       \def\jlreq@do{\futurelet\jlreq@nextchar\jlreq@insertjfm}%
@@ -639,8 +609,8 @@
 }
 
 \ifx l\jlreq@engine
-  \newcommand*{\jlreq@divide}[2]{%
-    \jlreq@resultdimen=\directlua{tex.print(tostring(\strip@pt\dimexpr #1\relax/\strip@pt\dimexpr #2\relax) .. "pt ")}%
+  \def\jlreq@divide#1#2{%
+    \jlreq@resultdimen=\directlua{tex.print(tostring(\strip@pt\dimexpr #1\relax/\strip@pt\dimexpr #2\relax) .. "pt~")}%
   }
 \else
   \let\jlreq@divide=\jlreq@helper@divide
@@ -651,11 +621,11 @@
 \def\@ptsize{0}
 %.. (x)kanjiskip
 \ifjlreq@narrow@kanjiskip
-  \providecommand*{\jlreqkanjiskip}{0pt plus .1\jlreq@zw minus .01\jlreq@zw}
+  \providecommand*{\jlreqkanjiskip}{0pt~plus~.1\jlreq@zw ~minus~.01\jlreq@zw}
 \else
-  \providecommand*{\jlreqkanjiskip}{0pt plus 0.25\jlreq@zw minus 0pt}
+  \providecommand*{\jlreqkanjiskip}{0pt~plus~0.25\jlreq@zw ~minus~0pt}
 \fi
-\providecommand*{\jlreqxkanjiskip}{0.25\jlreq@zw plus 0.25\jlreq@zw minus 0.125\jlreq@zw}
+\providecommand*{\jlreqxkanjiskip}{0.25\jlreq@zw ~plus~0.25\jlreq@zw ~minus~0.125\jlreq@zw}
 \jlreq@if{\ifx l\jlreq@engine\fi}{
   \AtBeginDocument{%
     \ltjsetparameter{kanjiskip=\jlreqkanjiskip}%
@@ -675,10 +645,10 @@
   % Q,zw,zh�正��扱�れるよ���る．\dimexpr���展開�れる．
   \def\jlreq@expand@optionfontsize#1{%
     \dimexpr\directlua{
-      local act = string.char(92)
-      local s = [[#1]]
-      s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax")
-      tex.print(s)
+      local~act = string.char(92)~
+      local~s = [[#1]]~
+      s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax")~
+      tex.print(s)~
     }\relax
   }%
 \else
@@ -705,13 +675,11 @@
 
 
 % 行頭�括弧� \jlreq@open@bracket@before@space \inhibitglue 「�����る．
-\ExplSyntaxOn
 \str_if_eq:VnTF \jlreq@open@bracket@pos { zenkakunibu_nibu } {
   \def\jlreq@open@bracket@before@space{\hskip\glueexpr-.5\jlreq@zw\relax}
 }{
   \def\jlreq@open@bracket@before@space{}
 }
-\ExplSyntaxOff
 
 \ifx p\jlreq@engine
   \def\jlreq@yokokanjiencoding{JY1}
@@ -730,8 +698,7 @@
 \jlreq@aftercls@addtodeletecs{\jlreq@jafontscale}
 \ifx l\jlreq@engine
   \jlreq@saveoriginalcs{DeclareFontShape}
-  \ExplSyntaxOn
-  \def\DeclareFontShape#1#2#3#4#5#6{
+    \def\DeclareFontShape#1#2#3#4#5#6{
     \group_begin:
       \bool_if:nT { \str_if_eq_p:nn {#1} {JY3} || \str_if_eq_p:nn {#1} {JT3} } {
         \tl_set:Nx \l_jlreq_tmpa_tl {#5}
@@ -754,11 +721,10 @@
     \exp_after:wN \group_end: \l_jlreq_do:
     \jlreq@useoriginalcs{DeclareFontShape} {#1} {#2} {#3} {#4} {#5} {#6}
   }
-  \ExplSyntaxOff
-  \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreq;script=latn;-kern}{}
-  \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreq;script=latn;-kern}{}
-  \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreqv;script=latn;-kern}{}
-  \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreqv;script=latn;-kern}{}
+  \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont :jfm=jlreq;script=latn;-kern}{}
+  \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont :jfm=jlreq;script=latn;-kern}{}
+  \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont :jfm=jlreqv;script=latn;-kern}{}
+  \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont :jfm=jlreqv;script=latn;-kern}{}
 \else
   \DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname}{}
   \DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg}{}
@@ -770,7 +736,6 @@
   \DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n-jidori}{<->s*[\jlreq@jafontscale]\jlreq@tempa jlreq-v-jidori}{}
   \DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n-jidori}{<->s*[\jlreq@jafontscale]\jlreq@tempa jlreqg-v-jidori}{}
 \fi
-\ExplSyntaxOn
 \clist_set:NV  \l_jlreq_tmpa_clist \jlreq@yokokanjiencoding
 \clist_push:NV \l_jlreq_tmpa_clist \jlreq@tatekanjiencoding
 \clist_map_inline:Nn \l_jlreq_tmpa_clist {% #1 = encoding
@@ -790,7 +755,6 @@
     }
   }
 }
-\ExplSyntaxOff
 
 %.. 文字クラス�リスト
 % 開�括弧（文字クラス1）
@@ -823,20 +787,18 @@
 \edef\jlreq@charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダ�ヂツヅテデトドナニヌ�ノ��パヒビピフブプヘベペホボ�マミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq@engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚
 
 %.. 行頭括弧調整
-\AtBeginDocument{\PushPostHook{par}{\jlreq@hook@everypar}}
-\def\jlreq@hook@everypar{}
 \jlreq@saveoriginalcs{item}
-\ExplSyntaxOn
 \ifx l\jlreq@engine
   % \item�直後�折り返�行頭�����る．
+  \cs_set:Nn \__jlreq_hook_everypar: {}
   \def\item{%
-    \def\jlreq@hook@everypar{%
-      \def\jlreq@hook@everypar{}%
-      \inhibitglue
-    }%
     \jlreq@useoriginalcs{item}%
+    \cs_set:Nn \__jlreq_hook_everypar: { \cs_set:Nn \__jlreq_hook_everypar: {} \inhibitglue }
+    \expandafter\everypar\expandafter{\the\everypar\__jlreq_hook_everypar:}
   }
 \else
+  \AtBeginDocument{\PushPostHook{par}{\jlreq@hook@everypar}}
+  \def\jlreq@hook@everypar{}
   % �LuaTeX�場��JFM�入れ替��\everypar��処��対処．
   % 行頭括弧�対��\inhibitglueを入れ�り�る命令を作る
   % \jlreq@charlist@openingbrackets��括弧�対��，\ifx\jlreq@nextchar 「1\fi������並ん��を作る
@@ -845,9 +807,9 @@
   \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark
   % JFM glue�伸�縮��行頭括弧������を防����常�\inhibitglueを入れる．
   \str_if_eq:VnTF \jlreq@open@bracket@pos { nibu_tentsuki } {
-    \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\hskip -.5\jlreq@zw\inhibitglue}\noexpand\fi}
+    \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~\unexpanded{\hskip -.5\jlreq@zw\inhibitglue}\noexpand\fi}
   }{% zenkakunibu_nibu,zenkaku_tentsuki
-    \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi}
+    \edef\jlreq@openbracket@hook@ii{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~\unexpanded{\inhibitglue}\noexpand\fi}
   }
   % source special対策
   \def\jlreq@openbracket@hook@i{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@iii\else\expandafter\jlreq@openbracket@hook@ii\fi}
@@ -862,13 +824,12 @@
     \jlreq@useoriginalcs{item}%
   }
 \fi
-\ExplSyntaxOff
 
 %.. �則処�
 \ifx l\jlreq@engine
-  \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\ltjsetparameter{postbreakpenalty={`#1,#2}}}
-  \newcommand*{\jlreq@setprebreakpenalty@}[2]{\ltjsetparameter{prebreakpenalty={`#1,#2}}}
-  \newcommand*{\jlreq@addjaxspmode@}[2]{%
+  \def\jlreq@setpostbreakpenalty@#1#2{\ltjsetparameter{postbreakpenalty={`#1,#2}}}
+  \def\jlreq@setprebreakpenalty@#1#2{\ltjsetparameter{prebreakpenalty={`#1,#2}}}
+  \def\jlreq@addjaxspmode@#1#2{%
     \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}%
     \jlreq@switch{#2}{
       {pre}{%
@@ -887,7 +848,7 @@
       }
     }%
   }
-  \newcommand*{\jlreq@deljaxspmode@}[2]{%
+  \def\jlreq@deljaxspmode@#1#2{%
     \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}%
     \jlreq@switch{#2}{
       {pre}{%
@@ -907,9 +868,9 @@
     }%
   }
 \else
-  \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\postbreakpenalty`#1=#2}
-  \newcommand*{\jlreq@setprebreakpenalty@}[2]{\prebreakpenalty`#1=#2}
-  \newcommand*{\jlreq@addjaxspmode@}[2]{%
+  \def\jlreq@setpostbreakpenalty@#1#2{\postbreakpenalty`#1=#2}
+  \def\jlreq@setprebreakpenalty@#1#2{\prebreakpenalty`#1=#2}
+  \def\jlreq@addjaxspmode@#1#2{%
     \jlreq@tempcnta=\inhibitxspcode`#1
     \jlreq@switch{#2}{
       {pre}{%
@@ -928,7 +889,7 @@
       }
     }%
   }
-  \newcommand*{\jlreq@deljaxspmode@}[2]{%
+  \def\jlreq@deljaxspmode@#1#2{%
     \jlreq@tempcnta=\inhibitxspcode`#1
     \jlreq@switch{#2}{
       {pre}{%
@@ -949,84 +910,93 @@
   }
 \fi
 % #1{...}{#3}を...�#2�リスト�対���用．
-\newcommand*\jlreq@iterateapply[3]{%
-  \edef\jlreq@tempa{#2}%
-  \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@tempa\do{%
-    \expandafter#1\expandafter{\@tempa}{#3}%
-  }%
+\cs_set:Nn \__jlreq_iterateapply:nnn {
+  \tl_map_inline:nn {#2} {
+    #1{##1}{#3}
+  }
 }
-\def\jlreq@setpostbreakpenalty{\jlreq@iterateapply{\jlreq@setpostbreakpenalty@}}
-\def\jlreq@setprebreakpenalty{\jlreq@iterateapply{\jlreq@setprebreakpenalty@}}
-\def\jlreq@addjaxspmode{\jlreq@iterateapply{\jlreq@addjaxspmode@}}
-\def\jlreq@deljaxspmode{\jlreq@iterateapply{\jlreq@deljaxspmode@}}
-
-\jlreq@aftercls@addtodeletecs{\jlreq@iterateapply}
-\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty}
+\cs_set:Nn \__jlreq_setpostbreakpenalty:nn { \__jlreq_iterateapply:nnn {\jlreq@setpostbreakpenalty@} {#1} {#2}}
+\cs_generate_variant:Nn \__jlreq_setpostbreakpenalty:nn { Vn }
+\cs_set:Nn \__jlreq_setprebreakpenalty:nn { \__jlreq_iterateapply:nnn {\jlreq@setprebreakpenalty@} {#1} {#2} }
+\cs_generate_variant:Nn \__jlreq_setprebreakpenalty:nn { Vn }
+\cs_set:Nn \__jlreq_addjaxspmode:nn {\__jlreq_iterateapply:nnn {\jlreq@addjaxspmode@} {#1} {#2} }
+\cs_generate_variant:Nn \__jlreq_addjaxspmode:nn { Vn }
+\cs_set:Nn \__jlreq_deljaxspmode:nn { \__jlreq_iterateapply:nnn{\jlreq@deljaxspmode@} {#1} {#2} }
+\cs_generate_variant:Nn \__jlreq_deljaxspmode:nn { Vn }
+
+\jlreq@aftercls@addtodeletecs{\__jlreq_iterateapply:nnn}
+\jlreq@aftercls@addtodeletecs{\__jlreq_setpostbreakpenalty:nn}
+\jlreq@aftercls@addtodeletecs{\__jlreq_setpostbreakpenalty:Vn}
 \jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty@}
-\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty}
+\jlreq@aftercls@addtodeletecs{\__jlreq_setprebreakpenalty:nn}
+\jlreq@aftercls@addtodeletecs{\__jlreq_setprebreakpenalty:Vn}
 \jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty@}
-\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode}
+\jlreq@aftercls@addtodeletecs{\__jlreq_addjaxspmode:nn}
+\jlreq@aftercls@addtodeletecs{\__jlreq_addjaxspmode:Vn}
 \jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode@}
-\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode}
+\jlreq@aftercls@addtodeletecs{\__jlreq_deljaxspmode:nn}
+\jlreq@aftercls@addtodeletecs{\__jlreq_deljaxspmode:Vn}
 \jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode@}
 
 % 行末�則
-\jlreq@setpostbreakpenalty{\jlreq@charlist@openingbrackets}{10000}
-\jlreq@setpostbreakpenalty{\jlreq@charlist@prefixedabbreviations}{10000}
+\__jlreq_setpostbreakpenalty:Vn \jlreq@charlist@openingbrackets {10000}
+\__jlreq_setpostbreakpenalty:Vn \jlreq@charlist@prefixedabbreviations {10000}
 
 % 行頭�則
-\jlreq@setprebreakpenalty{\jlreq@charlist@closingbrackets}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@hyphens}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@dividingpunctuationmarks}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@middlenodes}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@fullstops}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@commas}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@iterationmarks}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@prolongedsoundmark}{10000}
-\jlreq@setprebreakpenalty{\jlreq@charlist@smallkana}{10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@closingbrackets {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@hyphens {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@dividingpunctuationmarks {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@middlenodes {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@fullstops {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@commas {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@iterationmarks {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@prolongedsoundmark {10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@smallkana {10000}
 
 % xkanjiskip
-\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{pre}
-\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{post}
-\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{pre}
-\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{post}
-\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{pre}
-\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{post}
-\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{pre}
-\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{post}
-\jlreq@addjaxspmode{\jlreq@charlist@katakana}{pre}
-\jlreq@addjaxspmode{\jlreq@charlist@katakana}{post}
-\jlreq@addjaxspmode{\jlreq@charlist@dividingpunctuationmarks}{post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@iterationmarks {pre}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@iterationmarks {post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@prolongedsoundmark {pre}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@prolongedsoundmark {post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@smallkana {pre}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@smallkana {post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@hiragana {pre}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@hiragana {post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@katakana {pre}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@katakana {post}
+\__jlreq_addjaxspmode:Vn \jlreq@charlist@dividingpunctuationmarks {post}
 
 % 分割�止（分離�止文字�特定�並��分割�止��，�り���一括��止����．）
-\jlreq@setprebreakpenalty{\jlreq@charlist@inseparablecharacters}{10000}
+\__jlreq_setprebreakpenalty:Vn \jlreq@charlist@inseparablecharacters {10000}
 % ￥100��70％��……
 
 %.. 文字範囲
 \ifx u\jlreq@engine
   % \kcatcode�設定
-  \def\jlreq@setkcatcode#1#2{\@for\@tempa:=#1\do{\kcatcode"\@tempa=#2\relax}}
-  \jlreq@aftercls@addtodeletecs{\jlreq@setkcatcode}
+  \cs_set:Nn \__jlreq_setkcatcode:nn {
+    \clist_map_inline:nn {#1} { \kcatcode"##1=#2\relax }
+  }
+  \jlreq@aftercls@addtodeletecs{\__jlreq_setkcatcode:nn}
   % LuaTeX-ja�デフォルト����近�設定を�る
   % 範囲1＆8
-  \jlreq@setkcatcode{80}{15} % Latin-1 Supplement，���よ�……
-  \jlreq@setkcatcode{100,180,250,2B0,300,1E00}{15}
+  \__jlreq_setkcatcode:nn {80} {15} % Latin-1 Supplement，���よ�……
+  \__jlreq_setkcatcode:nn {100,180,250,2B0,300,1E00} {15}
   % 範囲2
-  \jlreq@setkcatcode{370,400,1F00}{18}
+  \__jlreq_setkcatcode:nn {370,400,1F00} {18}
   % 範囲3
-  \jlreq@setkcatcode{2000,2070,20A0,20D0,2100,2150,2190,2200,2300,2400,2500,2580,25A0,2600,2700,2900,2980,2B00}{18}
+  \__jlreq_setkcatcode:nn {2000,2070,20A0,20D0,2100,2150,2190,2200,2300,2400,2500,2580,25A0,2600,2700,2900,2980,2B00} {18}
   % 範囲4
-  \jlreq@setkcatcode{500,530,590,600,700,750,780,7C0,800,840,8A0,900,980,A00,A80,B00,B80,C00,C80,D00,D80,E00,E80,F00,1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1C80,1CC0,1CD0,1D00,1D80,1DC0,2400,2440,27C0,27F0,2800,2A00,2C00,4DC0,A4D0,A500,A640,A6A0,A700,A720,A800,A840,A880,A8E0,A900,A930,A960,A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,FB00,FB50,FE00,FE20,FE70,10000,10080,10100,10140,10190,101D0,10280,102A0,102E0,10300,10330,10350,10380,103A0,10400,10450,10480,104B0,10500,10530,10600,10800,10840,10860,10880,108E0,10900,10920,10980,109A0,10A00,10A60,10A80,10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,11000,11080,110D0,11100,11150,11180,111E0,11200,11280,112B0,11300,11400,11480,11580,11600,11660,11680,11700,118A0,11AC0,11C00,11C70,12000,12400,12480,13000,14400,16800,16A40,16AD0,16B00,16F00,16FE0,17000,18800,1B000,1BC00,1BCA0,1D000,1D100,1D200,1D300,1D360,1D400,1D800,1E000,1E800,1E900,1EE00,1F000,1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,1F700,1F780,1F800,1F900,E000}{15}
+  \__jlreq_setkcatcode:nn {500,530,590,600,700,750,780,7C0,800,840,8A0,900,980,A00,A80,B00,B80,C00,C80,D00,D80,E00,E80,F00,1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1C80,1CC0,1CD0,1D00,1D80,1DC0,2400,2440,27C0,27F0,2800,2A00,2C00,4DC0,A4D0,A500,A640,A6A0,A700,A720,A800,A840,A880,A8E0,A900,A930,A960,A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,FB00,FB50,FE00,FE20,FE70,10000,10080,10100,10140,10190,101D0,10280,102A0,102E0,10300,10330,10350,10380,103A0,10400,10450,10480,104B0,10500,10530,10600,10800,10840,10860,10880,108E0,10900,10920,10980,109A0,10A00,10A60,10A80,10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,11000,11080,110D0,11100,11150,11180,111E0,11200,11280,112B0,11300,11400,11480,11580,11600,11660,11680,11700,118A0,11AC0,11C00,11C70,12000,12400,12480,13000,14400,16800,16A40,16AD0,16B00,16F00,16FE0,17000,18800,1B000,1BC00,1BCA0,1D000,1D100,1D200,1D300,1D360,1D400,1D800,1E000,1E800,1E900,1EE00,1F000,1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,1F700,1F780,1F800,1F900,E000} {15}
   % 範囲5（Variation Selectors Supplement�LuaTeX-ja��E01F0--E01EF��範囲5，他�範囲6）
-  \jlreq@setkcatcode{D800,DB80,DC00,E0000,F0000,100000}{15}
+  \__jlreq_setkcatcode:nn {D800,DB80,DC00,E0000,F0000,100000} {15}
   % 範囲6
-  \jlreq@setkcatcode{3040,30A0,31F0}{17} % Hiragana,Katakana,Katakana Phonetic Extensions
-  \jlreq@setkcatcode{2460,3000,3200,3300,FE10,FE30,FE50,E0100}{18} % Enclosed Alphanumerics,CJK Symbols and Punctuation,Enclosed CJK Letters and Months,CJK Compatibility,Vertical Forms,CJK Compatibility Forms,Small Form Variants,Variation Selectors Supplement
-  \jlreq@setkcatcode{2E80,3190,3400,4E00,F900,20000}{16}
+  \__jlreq_setkcatcode:nn {3040,30A0,31F0} {17} % Hiragana,Katakana,Katakana Phonetic Extensions
+  \__jlreq_setkcatcode:nn {2460,3000,3200,3300,FE10,FE30,FE50,E0100} {18} % Enclosed Alphanumerics,CJK Symbols and Punctuation,Enclosed CJK Letters and Months,CJK Compatibility,Vertical Forms,CJK Compatibility Forms,Small Form Variants,Variation Selectors Supplement
+  \__jlreq_setkcatcode:nn {2E80,3190,3400,4E00,F900,20000} {16}
   % 範囲7
-  \jlreq@setkcatcode{A000,A490}{18} % Yi Syllables,Yi Radicals
-  \jlreq@setkcatcode{1100,3130,AC00,D7B0}{19} % Hangul Jamo,Hangul Compatibility Jamo,Hangul Syllables,Hangul Jamo Extended-B
-  \jlreq@setkcatcode{2F00,2FF0,3100,31A0,31C0,A830}{16}
+  \__jlreq_setkcatcode:nn {A000,A490} {18} % Yi Syllables,Yi Radicals
+  \__jlreq_setkcatcode:nn {1100,3130,AC00,D7B0} {19} % Hangul Jamo,Hangul Compatibility Jamo,Hangul Syllables,Hangul Jamo Extended-B
+  \__jlreq_setkcatcode:nn {2F00,2FF0,3100,31A0,31C0,A830} {16}
 \fi
 
 %.. フォント
@@ -1042,7 +1012,7 @@
 \DeclareOldFontCommand{\jlreq@oldfontcommand@it}{\normalfont\itshape}{\mathit}
 \DeclareOldFontCommand{\jlreq@oldfontcommand@sl}{\normalfont\slshape}{\@nomath\sl}
 \DeclareOldFontCommand{\jlreq@oldfontcommand@sc}{\normalfont\scshape}{\@nomath\sc}
-\newcommand*{\jlreq@oldfontcommand@enable}{%
+\def\jlreq@oldfontcommand@enable{%
   \let\mc=\jlreq@oldfontcommand@mc
   \let\gt=\jlreq@oldfontcommand@gt
   \let\rm=\jlreq@oldfontcommand@rm
@@ -1053,7 +1023,7 @@
   \let\sl=\jlreq@oldfontcommand@sl
   \let\sc=\jlreq@oldfontcommand@sc
 }
-\newcommand*{\jlreq@oldfontcommand@disable}{%
+\def\jlreq@oldfontcommand@disable{%
   \let\mc=\@undefined
   \let\gt=\@undefined
   \let\rm=\@undefined
@@ -1096,9 +1066,9 @@
 }
 \expandafter\def\expandafter\jlreq@zenkakuspace@ignorespaces@\space{\　}
 \def\jlreq@tempa{}
-\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifnum\lastnodechar=`#1 1\fi}\jlreq@do}}
+\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifnum\lastnodechar=`#1~1\fi}\jlreq@do}}
 \expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark
-\edef\@tempa{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 }
+\edef\@tempa{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0~}
 \expandafter\DeclareRobustCommand\expandafter*\expandafter\jlreq@zenkakuspace@main\expandafter{\@tempa
     \hskip 1\jlreq@zw\hbox{}%
     \jlreq@lastnodechar=`　
@@ -1114,9 +1084,9 @@
 \fi
 
 % \jaspace
-\DeclareRobustCommand*{\jaspace}[1]{%
+\NewDocumentCommand{\jaspace}{ m } {
   \ifcsname jlreq@jaspace@#1\endcsname\csname jlreq@jaspace@#1\endcsname
-  \else\ClassError{jlreq}{unknown jaspace: #1}{\@ehc}\fi
+  \else\ClassError{jlreq}{unknown~jaspace:~#1}{\@ehc}\fi
 }
 \def\jlreq@jaspace@zenkaku{\hskip\glueexpr 1\jlreq@zw\relax}
 \def\jlreq@jaspace@nibu{\hskip\glueexpr .5\jlreq@zw\relax}
@@ -1128,7 +1098,7 @@
 \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar #11\fi}\jlreq@do}}
 \expandafter\jlreq@do\jlreq@charlist@closingbrackets\jlreq@endmark
 \edef\jlreq@dividingpunctuationmarkscommand{%
-  \noexpand\ifnum 0\expandonce{\jlreq@tempa}>0 \unexpanded{\expandafter\ignorespaces\else\expandafter\　\fi}%
+  \noexpand\ifnum 0\expandonce{\jlreq@tempa}>0~\unexpanded{\expandafter\ignorespaces\else\expandafter\　\fi}%
 }
 \def\jlreq@do#1{%
   \jlreq@ifendmark{#1}{}{
@@ -1151,30 +1121,28 @@
 \ifx l\jlreq@engine
   \setlength{\jlreq@baselineskip}{%
     \dimexpr\directlua{
-      local act = string.char(92)
-      local s = [[\jlreq@option@baselineskip]]
-      s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")
-      tex.print(s)
+      local~act = string.char(92)~
+      local~s = [[\jlreq@option@baselineskip]]~
+      s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")~
+      tex.print(s)~
     }\relax
   }%
 \else
   \setlength{\jlreq@baselineskip}{\dimexpr\jlreq@option@baselineskip\relax}
 \fi
 \ifdim\jlreq@fontsize>\jlreq@baselineskip
-  \ClassError{jlreq}{The baselineskip is less than fontsize}{\@ehc}%
+  \ClassError{jlreq}{The~baselineskip~is~less~than~fontsize}{\@ehc}%
 \fi
-\ExplSyntaxOn
 \bool_if:nT { \dim_compare_p:n { \jlreq@baselineskip < 1.5\zw } || \dim_compare_p:n { \jlreq@baselineskip > 2\zw } } {
   \jlreq@note { 行間�二分以上全角以下�望��� (2.4.2.d~注3)．}
 }
-\ExplSyntaxOff
 
 \emergencystretch 3\jlreq@gol
 \setlength{\parindent}{1\zw}
 \def\jlreq@setfontsizehook{}
 \jlreq@saveoriginalcs{set@fontsize}
 \apptocmd{\set@fontsize}{\expandafter\def\expandafter\size@update\expandafter{\size@update\jlreq@setfontsizehook}}{}{}
-\appto\jlreq@setfontsizehook{\ifdim\parindent>0pt \setlength{\parindent}{1\jlreq@zw}\fi}
+\appto\jlreq@setfontsizehook{ \dim_compare:nT { \parindent>0pt } { \setlength{\parindent}{1\jlreq@zw} } }
 \ifx l\jlreq@engine
   \@tempskipa=\ltjgetparameter{kanjiskip}
   \ifdim\@tempskipa=\maxdimen\else
@@ -1201,7 +1169,7 @@
   \let\jafontsize=\fontsize
 \else
   \def\@tempa#1{
-    \DeclareRobustCommand*{\jafontsize}[2]{%
+    \NewDocumentCommand{\jafontsize}{ m m }{%
       \begingroup
         \jlreq@iffloat{##1}{%
           \edef\jlreq@do{\noexpand\fontsize{\strip@pt\dimexpr#1\dimexpr##1pt\relax\relax}}%
@@ -1270,7 +1238,7 @@
 \setlength{\parskip}{0pt}
 % https://github.com/texjporg/jsclasses/issues/14
 \renewcommand*{\flushbottom}{%
-  \def\@textbottom{\vskip 0pt plus 0.1pt}%
+  \def\@textbottom{\vskip 0pt~plus~0.1pt}%
   \let\@texttop\relax
 }
 \@lowpenalty   51
@@ -1309,10 +1277,10 @@
   \def\jlreq@expand@speciallength#1{%
     % zhやzwを\zhや\zw��る．
     \directlua{
-      local act = string.char(92)
-      local s = [[#1]]
-      s = s:gsub("zw",act .. "zw"):gsub("zh",act .. "zh")
-      tex.print(s)
+      local~act = string.char(92)~
+      local~s = [[#1]]~
+      s = s:gsub("zw",act .. "zw"):gsub("zh",act .. "zh")~
+      tex.print(s)~
     }%
   }
 \else
@@ -1516,7 +1484,7 @@
   \jlreq@setsidemargin@by@gutter{\jlreq@speciallength{\jlreq@option@gutter}}
   \ifx\jlreq@option@fore@edge\@empty\else
     \ifjlreq@determine@kihonhanmen@warning@first
-      \ClassWarningNoLine{jlreq}{fore-edge is ignored}
+      \ClassWarningNoLine{jlreq}{fore-edge~is~ignored}
     \fi
   \fi
 \fi
@@ -1575,12 +1543,12 @@
     \if@tate
       \jlreq@settopmarginbyfoot{\jlreq@speciallength{\jlreq@option@foot@space}}
       \ifx\jlreq@option@line@length\@empty\else
-        \ClassWarningNoLine{jlreq}{head_space is ignored}
+        \ClassWarningNoLine{jlreq}{head_space~is~ignored}
       \fi
     \else
       \jlreq@settopmarginbyhead{\jlreq@speciallength{\jlreq@option@head@space}}
       \ifx\jlreq@option@number@of@lines\@empty\else
-        \ClassWarningNoLine{jlreq}{foot_space is ignored}
+        \ClassWarningNoLine{jlreq}{foot_space~is~ignored}
       \fi
     \fi
   \fi
@@ -1605,7 +1573,7 @@
 
 %. 見出�関係 (4.1)
 % \clear***page
-\newcommand*{\cleartooddpage}[1][]{%
+\NewDocumentCommand{\cleartooddpage}{ O{} }{
   \clearpage
   \ifodd\c@page\else
     \jlreq@ifempty{#1}{}{\thispagestyle{#1}}%
@@ -1614,7 +1582,7 @@
     \if@twocolumn\hbox{}\newpage\fi
   \fi
 }
-\newcommand*{\cleartoevenpage}[1][]{%
+\NewDocumentCommand{\cleartoevenpage}{ O{} }{
   \clearpage
   \ifodd\c@page
     \jlreq@ifempty{#1}{}{\thispagestyle{#1}}%
@@ -1635,7 +1603,7 @@
 % 見出��直��実行�れる
 \NewHook{./heading/before}
 % 見出��一覧を格��る
-\def\jlreq@heading@allheadings{}
+\seq_new:N \l__jlreq_heading_allheadings_seq
 % 目次を出力�る命令\l@<命令�>を作る命令を作る．{1 = 命令�}{2 = レベル}{3 = ラベル�フォーマット}
 % �果�\jlreq@result�入る．
 \def\jlreq@heading@make@l@#1#2#3{%
@@ -1687,11 +1655,10 @@
 
 %.. 中/�扉見出�
 % addcontentsline�渡�や�：番�出���出����
-\newcommand{\DeclareTobiraHeading}[3]{%
-  \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{./heading/before/#1}}%
-  \def\jlreq@do{\@removeelement{#1}}%
-  \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}%
-  \appto{\jlreq@heading@allheadings}{,#1}%
+\NewDocumentCommand{\DeclareTobiraHeading}{ m m +m } {
+  \ProvideHook{jlreq/heading/before/#1}
+  \seq_put_right:Nn \l__jlreq_heading_allheadings_seq {#1}
+  \seq_remove_duplicates:N \l__jlreq_heading_allheadings_seq
   \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}%
   \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}%
   \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewTobiraHeading}%
@@ -1702,21 +1669,18 @@
     \let\jlreq@contents@label@format=\@undefined
     \let\jlreq@format=\@undefined
     \edef\jlreq@label@format{\expandonce{\csname the#1\endcsname}}%
-    \def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}%
-    \def\jlreq@pagestyle{empty}%
-    \newif\ifjlreq@number \jlreq@numbertrue
-    \jlreq@parsekeyval[DeclareTobiraHeading:#1]{
-      {label_format}{\def\jlreq@label@format{##1}}
-      {format}{\def\jlreq@format####1####2{##1}}
-      {pagestyle}{\def\jlreq@pagestyle{##1}}
-      {type}[han,naka]{%
-        \jlreq@switch{##1}{
-          {han}{\def\jlreq@heading@clearpage{\clearpage}}
-          {naka}{\def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}}
-        }%
-      }
-      {number}[true,false]{\csname jlreq@number##1\endcsname}
-    }{#3}%
+    \newif\ifjlreq@number
+    \keys_define:nn { DeclareTobiraHeading:#1 } {
+      label_format .tl_set:N = \jlreq@label@format,
+      format .code:n = {\def\jlreq@format####1####2{##1}},
+      pagestyle .tl_set:N = \jlreq@pagestyle,
+      type .choice:,
+      type / han .code:n = { \def\jlreq@heading@clearpage{\clearpage} },
+      type / naka .code:n = { \def\jlreq@heading@clearpage{\clearpage\hbox{}\thispagestyle{empty}\clearpage} },
+      number .choices:nn = {true,false} { \csname jlreq@number ##1 \endcsname }
+    }
+    \keys_set:nn { DeclareTobiraHeading:#1 } { type = naka, pagestyle = empty, number = true}
+    \keys_set:nn { DeclareTobiraHeading:#1 } {#3}
     \def\jlreq@do{}%
     \ifx\jlreq@format\@undefined
       \def\jlreq@format##1##2{##1##2}%
@@ -1780,13 +1744,13 @@
   \jlreq@do
 }
 
-\newcommand{\NewTobiraHeading}[3]{%
+\NewDocumentCommand{\NewTobiraHeading}{ m m +m }{%
   \expandafter\@ifdefinable\csname #1\endcsname{\DeclareTobiraHeading{#1}{#2}{#3}}%
 }
-\newcommand{\RenewTobiraHeading}[3]{%
+\NewDocumentCommand{\RenewTobiraHeading}{ m m +m }{%
   \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareTobiraHeading{#1}{#2}{#3}}%
 }
-\newcommand{\ProvideTobiraHeading}[3]{%
+\NewDocumentCommand{\ProvideTobiraHeading}{ m m +m }{%
   \@ifundefined{#1}{\DeclareTobiraHeading{#1}{#2}{#3}}{}%
 }
 
@@ -1803,7 +1767,7 @@
 % 見出�全体�フォーマット内��#1=ラベル，#2=見出�文字列，#3=副題，�れ�れ�々�フォーマット�基��整形�れる．
 % ラベルフォーマット��#1=カウンタ�，見出�文字列フォーマット��#1=見出�文字列，副題フォーマット��#1=副題
 % ラベル���フォーマット�目次�使�れる．
-\newcommand{\jlreq@BlockHeading@start}[6]{%
+\long\def\jlreq@BlockHeading@start#1#2#3#4#5#6{%
   \if@noskipsec\leavevmode\fi
   % #5�#6�\parを�む�も�れ����引数渡�����（後�\@ifstar�詰�る）
   \edef\jlreq@BlockHeading@start@eachformat{\expandonce{\@firstoftwo#5}}%
@@ -1812,7 +1776,7 @@
   \jlreq@BlockHeading@start@{#1}{#2}{#3}{#4}%
 }
 % {1 = 命令}{2 = レベル}{3 = スペース関連}
-\newcommand{\jlreq@BlockHeading@start@}[4]{%
+\long\def\jlreq@BlockHeading@start@#1#2#3#4{%
   \@ifstar{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{#4}}}%
 }
 % {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出�}
@@ -1889,17 +1853,17 @@
 \expandafter\def\expandafter\jlreq@BlockHeading@start@afterheading@skipspaces\space{\jlreq@BlockHeading@start@afterheading}
 \def\jlreq@BlockHeading@start@afterheading@ii{%
   \def\jlreq@do{\jlreq@BlockHeading@spaces@output}%
-  \@for\@tempa:=\jlreq@BlockHeading@allheadings\do{%
-    \expandafter\ifx\csname\@tempa\endcsname\jlreq@nextchar\def\jlreq@do{}\fi
+  \seq_map_inline:Nn \l__jlreq_BlockHeading_allheadings_seq {
+    \expandafter\ifx\csname##1\endcsname\jlreq@nextchar\def\jlreq@do{}\fi
   }%
   % \jlreq@BlockHeading@HeadingSpaces@ignoretokens(@noargument)内�も��特別扱��る
-  \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@BlockHeading@HeadingSpaces@ignoretokens@noargument\do{%
-    \expandafter\ifx\@tempa\jlreq@nextchar
+  \tl_map_inline:Nn \jlreq@BlockHeading@HeadingSpaces@ignoretokens@noargument {
+    \ifx##1\jlreq@nextchar
       \def\jlreq@do{\jlreq@BlockHeading@start@afterheading@saveafter@cs@noargument}%
     \fi
   }%
-  \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@BlockHeading@HeadingSpaces@ignoretokens\do{%
-    \expandafter\ifx\@tempa\jlreq@nextchar
+  \tl_map_inline:Nn \jlreq@BlockHeading@HeadingSpaces@ignoretokens {
+    \ifx##1\jlreq@nextchar
       \def\jlreq@do{\jlreq@BlockHeading@start@afterheading@saveafter@cs}%
     \fi
   }%
@@ -2044,12 +2008,16 @@
 \def\jlreq@BlockHeading@start@removecolumn#1:{#1}
 
 % 空�指定を解釈�る．a:10pt -> \jlreq@resulta=a，\jlreq@resultb=10pt
-\def\jlreq@BlockHeading@start@analyzespace#1:#2\jlreq@endmark{%
+\cs_set:Nn \__jlreq_BlockHeading_start_analyzespace:n{%
+  \__jlreq_BlockHeading_start_analyzespace_aux#1:\jlreq@endmark
+}
+\cs_generate_variant:Nn \__jlreq_BlockHeading_start_analyzespace:n {V}
+\def\__jlreq_BlockHeading_start_analyzespace_aux#1:#2\jlreq@endmark{
   \jlreq@ifempty{#1}{%
     \def\jlreq@resulta{}%
     \def\jlreq@resultb{}%
   }{%
-    \let\jlreq@resulta=#1%
+    \let\jlreq@resulta=#1
     \edef\jlreq@resultb{\expandonce{\jlreq@BlockHeading@start@removecolumn#2}}%
   }%
 }
@@ -2064,10 +2032,13 @@
   \jlreq@tempskipa=0pt
   \jlreq@tempskipb=0pt
   \jlreq@tempskipc=0pt
-  \jlreq@BlockHeading@start@analyzespace#1:\jlreq@endmark
+  \tl_set_rescan:Nnn \l_jlreq_tmpa_tl {\ExplSyntaxOn}{#1}
+%  \message{[[[\expandafter\getcatcode\l_jlreq_tmpa_tl]]]}
+  \__jlreq_BlockHeading_start_analyzespace:V \l_jlreq_tmpa_tl
   \let\jlreq@maeakitype=\jlreq@resulta
   \let\jlreq@maeaki=\jlreq@resultb
-  \jlreq@BlockHeading@start@analyzespace#2:\jlreq@endmark
+  \tl_set_rescan:Nnn \l_jlreq_tmpa_tl {\ExplSyntaxOn}{#2}
+  \__jlreq_BlockHeading_start_analyzespace:V \l_jlreq_tmpa_tl
   \let\jlreq@ushiroakitype=\jlreq@resulta
   \let\jlreq@ushiroaki=\jlreq@resultb
   \def\jlreq@lines{#3}%
@@ -2130,29 +2101,24 @@
     \dp\jlreq@tempboxa=\dimexpr\dp\jlreq@tempboxa + \ht\jlreq@tempboxa - \jlreq@tempdimb\relax
     \ht\jlreq@tempboxa=\jlreq@tempdimb
     \box\jlreq@tempboxa
-    \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt \else\prevdepth=\jlreq@tempdimc\fi
+    \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt\relax\else\prevdepth=\jlreq@tempdimc\fi
     % \jlreq@tempdimb, \jlreq@tempdimc�利用����
   \else
     \dp\jlreq@tempboxa=\dimexpr\dp\jlreq@tempboxa + \ht\jlreq@tempboxa\relax
     \ht\jlreq@tempboxa=0pt
     \box\jlreq@tempboxa
-    \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt \else\prevdepth=0pt \fi
+    \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt\relax\else\prevdepth=0pt\relax\fi
   \fi
   \nobreak
   \jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}%
   \edef\jlreq@do{%
-    \ifdim\parskip=0pt \else
-      \unexpanded{\def\jlreq@parhook@gyodori}{%
-        \noexpand\parskip=\the\parskip
-        \unexpanded{\def\jlreq@parhook@gyodori{}}%
-      }%
-      \unexpanded{\parskip=0pt}%
-    \fi
+    \dim_compare:nF { \parskip=0pt } {
+      \noexpand\AddToHookNext{para/before}{\noexpand\parskip=\the\parskip\noexpand\relax}%
+      \noexpand\parskip=0pt
+    }
   }%
   \expandafter}\jlreq@do
 }
-\PushPostHook{par}{\jlreq@parhook@gyodori}
-\def\jlreq@parhook@gyodori{}
 
 % 行�り情報をゲット��
 % \jlreq@result�{1 = �空�}{2 = 後�空�}{3 = トータル行数}を入れる
@@ -2165,49 +2131,53 @@
   \@ifnextchar[{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}}{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}[jlreq@key]}%
 }
 \long\def\jlreq@BlockHeading@gyodori@parsekeyval@@#1[#2]#3#4#5#6{%
-  \begingroup
-    \def\jlreq@lines{#6}%
-    \def\jlreq@before@space{}%
-    \def\jlreq@before@lines{}%
-    \def\jlreq@after@space{}%
-    \def\jlreq@after@lines{}%
-    \jlreq@parsekeyval#1[#2]{
-      {lines}{\def\jlreq@lines{##1}}
-      {before_space}{\def\jlreq@before@space{##1}}
-      {after_space}{\def\jlreq@after@space{##1}}
-      {before_lines}{%
-        \jlreq@ifempty{##1}{\def\jlreq@before@lines{}}{%
-          \jlreq@iffirsttoken@ignorespaces{##1}{*}%
-            {\edef\jlreq@before@lines{s:\expandonce{\@gobble ##1}}}%
-            {\def\jlreq@before@lines{a:##1}}%
-        }%
-      }
-      {after_lines}{\def\jlreq@after@lines{##1}}
-    }{#3}%
+  \group_begin:
+    \keys_define:nn {#2} {
+      lines .tl_set:N = \l__jlreq_lines_tl,
+      before_space .tl_set:N = \l__jlreq_before_space_tl,
+      after_space .tl_set:N = \l__jlreq_after_space_tl,
+      before_lines .code:n = {
+        \tl_if_empty:nTF {##1}{
+          \tl_set:Nn \l__jlreq_before_lines_tl {}
+        }{
+          \str_if_eq:eeTF { \str_head:n {##1} } {*}
+            {\tl_set:Nx \l__jlreq_before_lines_tl {s:\exp_not:o {\use_none:n ##1}}}
+            {\tl_set:Nx \l__jlreq_before_lines_tl {a:##1}}
+        }
+      },
+      after_lines .tl_set:N = \l__jlreq_after_lines_tl
+    }
+    \tl_if_empty:nF {#1} { \keys_define:nn {#2} { unknown .code:n = {} } }
+    \keys_set:nn {#2} {lines = {#6}, before_space = {}, before_lines = {}, after_space = {}, after_lines = {} }
+    \keys_set:nn {#2} {#3} 
     % before/after_lines優先
-    \ifx\jlreq@before@space\@empty\else\edef\jlreq@before@space{r:\expandonce{\jlreq@before@space}}\fi
-    \ifx\jlreq@before@lines\@empty\else\edef\jlreq@before@space{\expandonce{\jlreq@before@lines}\baselineskip}\fi
-    \ifx\jlreq@before@space\@empty\def\jlreq@before@space{#4}\fi
-    \ifx\jlreq@after@space\@empty\else\edef\jlreq@after@space{r:\expandonce{\jlreq@after@space}}\fi
-    \ifx\jlreq@after@lines\@empty\else\edef\jlreq@after@space{a:\expandonce{\jlreq@after@lines}\baselineskip}\fi
-    \ifx\jlreq@after@space\@empty\def\jlreq@after@space{#5}\fi
-    \edef\jlreq@do{%
-      \unexpanded{\def\jlreq@result}{{\expandonce{\jlreq@before@space}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@lines}}}%
+    \tl_if_empty:NF \l__jlreq_before_space_tl { \tl_put_left:Nn \l__jlreq_before_space_tl {r:} }
+    \tl_if_empty:NF \l__jlreq_before_lines_tl { \tl_set:Nx \l__jlreq_before_space_tl {\exp_not:o {\l__jlreq_before_lines_tl} \baselineskip } }
+    \tl_if_empty:NT \l__jlreq_before_space_tl { \tl_set:Nn \l__jlreq_before_space_tl {#4} }
+    \tl_if_empty:NF \l__jlreq_after_space_tl { \tl_put_left:Nn \l__jlreq_after_space_tl {r:} }
+    \tl_if_empty:NF \l__jlreq_after_lines_tl { \tl_set:Nx \l__jlreq_after_space_tl { a:\exp_not:o {\l__jlreq_after_lines_tl} \baselineskip } }
+    \tl_if_empty:NT \l__jlreq_after_space_tl { \tl_set:Nn \l__jlreq_after_space_tl {#5} }
+    \cs_set:Nx \l__jlreq_do: {
+      \exp_not:n {\def\jlreq@result}{
+        {\exp_not:o {\l__jlreq_before_space_tl } }
+        {\exp_not:o {\l__jlreq_after_space_tl } }
+        {\exp_not:o {\l__jlreq_lines_tl } }
+      }
     }%
-  \expandafter\endgroup
-  \jlreq@do
+  \exp_after:wN \group_end:
+  \l__jlreq_do:
 }
 
 \newbox\jlreq@BlockHeading@start@label@box
 % \DeclareBlockHeading{命令�}{レベル}{設定}
-\def\jlreq@BlockHeading@allheadings{}% 別行見出�一覧
-\newcommand{\DeclareBlockHeading}[3]{%
-  \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
+\seq_new:N \l__jlreq_BlockHeading_allheadings_seq
+\NewDocumentCommand {\DeclareBlockHeading} { m m +m } {
+  \ProvideHook{jlreq/heading/before/#1}
   \def\jlreq@do{\@removeelement{#1}}%
-  \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}%
-  \appto\jlreq@heading@allheadings{,#1}%
-  \expandafter\jlreq@do\expandafter{\jlreq@BlockHeading@allheadings}{\jlreq@BlockHeading@allheadings}%
-  \appto\jlreq@BlockHeading@allheadings{,#1}%
+  \seq_put_right:Nn \l__jlreq_heading_allheadings_seq {#1}
+  \seq_remove_duplicates:N \l__jlreq_heading_allheadings_seq
+  \seq_put_right:Nn \l__jlreq_BlockHeading_allheadings_seq {#1}
+  \seq_remove_duplicates:N \l__jlreq_BlockHeading_allheadings_seq
   \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}%
   \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}%
   \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewBlockHeading}%
@@ -2215,29 +2185,12 @@
   \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}%
   \jlreq@heading@make@maketoc{#1}{#2}%
   \begingroup
-    \def\jlreq@font{}%
-    \def\jlreq@subtitle@font{}%
-    \def\jlreq@indent{0\jlreq@zw}%
-    \def\jlreq@end@indent{0\jlreq@zw}%
-    \def\jlreq@align{l}%
-    \edef\jlreq@format{\unexpanded{##1##2##3}}%
     \edef\jlreq@heading@text@format{\unexpanded{##1}}%
-    \def\jlreq@pagebreak{}%
-    \def\jlreq@label@format{\@seccntformat{#1}}%
-    \newif\ifjlreq@second@text@indent@withlabel\jlreq@second@text@indent@withlabeltrue
-    \def\jlreq@after@label@space{1\jlreq@zw}%
-    \def\jlreq@second@heading@text@indent@wlabel{0pt}%
-    \def\jlreq@second@heading@text@indent@wolabel{0pt}%
-    \edef\jlreq@subtitle@format{\unexpanded{---##1---}}%
-    \newif\ifjlreq@subtitleindent@withlabel\jlreq@subtitleindent@withlabeltrue
-    \def\jlreq@subtitle@indent{1\jlreq@zw}%
-    \def\jlreq@afterindent{\@afterindenttrue}%
-    \def\jlreq@allowbreak@evenpage{*}% �数ページ�も改ページを許��る�ら�空，������ら*
-    \newif\ifjlreq@subtitle@break\jlreq@subtitle@breaktrue
-    \def\jlreq@subtitle@indent{1\jlreq@zw}%
-    \def\jlreq@column@spanning{false}%
-    \newif\ifjlreq@column@spanning@possible\jlreq@column@spanning@possiblefalse
-    \newif\ifjlreq@number \jlreq@numbertrue
+    \newif\ifjlreq@second@text@indent@withlabel
+    \newif\ifjlreq@subtitleindent@withlabel
+    \newif\ifjlreq@subtitle@break
+    \newif\ifjlreq@column@spanning@possible
+    \newif\ifjlreq@number
     % a,b�����をa�b���る．カンマ���れ�b�空．引数を{a}{b}���##2を呼�出�．
     \def\jlreq@parsecomma##1##2{%
       \jlreq@helper@dividebycomma{##1}%
@@ -2249,26 +2202,27 @@
       \def\jlreq@tempa####1####2{##2}%
       \jlreq@do
     }%
-    \jlreq@parsekeyval[BlockHeading:#1]{
-      {lines}{}
-      {before_space}{}
-      {after_space}{}
-      {before_lines}{}
-      {after_lines}{}
-      {font}{\def\jlreq@font{##1}}
-      {subtitle_font}{\def\jlreq@subtitle@font{##1}}
-      {indent}{\def\jlreq@indent{##1}}
-      {end_indent}{\def\jlreq@end@indent{##1}}
-      {align}[left,center,right]{%
-        \jlreq@switch{##1}{
-          {left}{\def\jlreq@align{l}}
-          {center}{\def\jlreq@align{c}}
-          {right}{\def\jlreq@align{r}}
-        }%
-      }
-      {format}{\edef\jlreq@format{\unexpanded{##1}}}
-      {after_label_space}{\def\jlreq@after@label@space{##1}}
-      {second_heading_text_indent,heading_text_second_indent}{%
+    \keys_define:nn { BlockHeading:#1 } {
+      lines .code:n = {},
+      before_space .code:n = {},
+      after_space .code:n = {},
+      before_lines .code:n = {},
+      after_lines .code:n = {},
+      font .tl_set:N = \jlreq@font,
+      subtitle_font .tl_set:N = \jlreq@subtitle@font,
+      indent .tl_set:N = \jlreq@indent,
+      end_indent .tl_set:N = \jlreq@end@indent,
+      align .choice:,
+      align / left .code:n = { \def\jlreq@align{l} },
+      align / center .code:n = { \def\jlreq@align{c} },
+      align / right .code:n = { \def\jlreq@align{r} },
+      format .code:n = {\edef\jlreq@format{\unexpanded{##1}}},
+      after_label_space .tl_set:N = \jlreq@after@label@space,
+      heading_text_second_indent .code:n = {
+        \ClassError { jlreq } { `heading_text_second_indent`~was~removed,~use~`second_heading_text_indent`~instead~(in~BlockHeading:~#1) }{\@ehc}
+      },
+%      {second_heading_text_indent,heading_text_second_indent}{%
+      second_heading_text_indent .code:n = {
         \jlreq@parsecomma{##1}{%
           \jlreq@iffirsttoken{####1}{*}{%
             \jlreq@second@text@indent@withlabelfalse
@@ -2283,10 +2237,10 @@
             \def\jlreq@second@heading@text@indent@wolabel{####2}%
           }%
         }%
-      }
-      {label_format}{\edef\jlreq@label@format{\unexpanded{##1}}}
-      {subtitle_format}{\edef\jlreq@subtitle@format{\unexpanded{##1}}}
-      {subtitle_indent}{%
+      },
+      label_format .code:n = {\edef\jlreq@label@format{\unexpanded{##1}}},
+      subtitle_format .code:n = {\edef\jlreq@subtitle@format{\unexpanded{##1}}},
+      subtitle_indent .code:n = {%
         \jlreq@iffirsttoken{##1}{*}{%
           \jlreq@subtitleindent@withlabelfalse
           \edef\jlreq@subtitle@indent{\expandonce{\@gobble ##1}}%
@@ -2294,27 +2248,24 @@
           \jlreq@subtitleindent@withlabeltrue
           \def\jlreq@subtitle@indent{##1}%
         }%
-      }
-      {subtitle_break}[true,false]{\csname jlreq@subtitle@break##1\endcsname}
-      {afterindent}[true,false]{\edef\jlreq@afterindent{\expandonce{\csname @afterindent##1\endcsname}}}
-      {allowbreak_if_evenpage}[true,false]{%
-        \jlreq@switch{##1}{
-          {true}{\def\jlreq@allowbreak@evenpage{}}
-          {false}{\def\jlreq@allowbreak@evenpage{*}}
-        }%
-      }
-      {pagebreak}[clearpage,cleardoublepage,clearcolumn,nariyuki,begin_with_odd_page,begin_with_even_page]{%
-        \jlreq@switch{##1}{
-          {clearpage}{\def\jlreq@pagebreak{\clearpage}\jlreq@column@spanning@possibletrue}
-          {cleardoublepage}{\def\jlreq@pagebreak{\cleardoublepage}\jlreq@column@spanning@possibletrue}
-          {clearcolumn}{\if@twocolumn\def\jlreq@pagebreak{\newpage}\else\def\jlreq@pagebreak{}\fi\jlreq@column@spanning@possiblefalse}
-          {begin_with_even_page}{\def\jlreq@pagebreak{\cleartoevenpage[empty]}\jlreq@column@spanning@possibletrue}
-          {begin_with_odd_page}{\def\jlreq@pagebreak{\cleartooddpage[empty]}\jlreq@column@spanning@possibletrue}
-          {nariyuki}{\def\jlreq@pagebreak{}\jlreq@column@spanning@possiblefalse}
-        }%
-      }
+      },
+      subtitle_break .choices:nn = {true,false}{\csname jlreq@subtitle@break##1\endcsname},
+      afterindent .choices:nn = {true,false}{\edef\jlreq@afterindent{\expandonce{\csname @afterindent##1\endcsname}}},
+      allowbreak_if_evenpage .choices:nn = {true,false}{%
+        \str_if_eq:nnTF {##1} {true}
+          {\def\jlreq@allowbreak@evenpage{}}
+          {\def\jlreq@allowbreak@evenpage{*}}
+      },
+      pagebreak .choice:,
+      pagebreak / clearpage            .code:n = {\def\jlreq@pagebreak{\clearpage}\jlreq@column@spanning@possibletrue},
+      pagebreak / cleardoublepage      .code:n = {\def\jlreq@pagebreak{\cleardoublepage}\jlreq@column@spanning@possibletrue},
+      pagebreak / clearcolumn          .code:n = {\if@twocolumn\def\jlreq@pagebreak{\newpage}\else\def\jlreq@pagebreak{}\fi\jlreq@column@spanning@possiblefalse},
+      pagebreak / begin_with_even_page .code:n = {\def\jlreq@pagebreak{\cleartoevenpage[empty]}\jlreq@column@spanning@possibletrue},
+      pagebreak / begin_with_odd_page  .code:n = {\def\jlreq@pagebreak{\cleartooddpage[empty]}\jlreq@column@spanning@possibletrue},
+      pagebreak / nariyuki             .code:n = {\def\jlreq@pagebreak{}\jlreq@column@spanning@possiblefalse},
+      pagestyle .tl_set:N = \l__jlreq_pagestyle_tl,
       % 後々数字を��付�るよ�����り�る�も�れ����……
-      {column_spanning}{%
+      column_spanning .code:n = {%
         \jlreq@tempatrue % valid�入力�対��false
         \jlreq@ifempty{##1}{}{%
           \jlreq@ifnumber{##1}{% 数字�時�true�回�
@@ -2327,18 +2278,27 @@
             }%
           }%
         }%
-        \ifjlreq@tempa\ClassWarningNoLine{jlreq}{Invalid input `##1' for column_spanning in BlockHeading #1}\fi
-      }
-      {number}[true,false]{\csname jlreq@number##1\endcsname}
-    }{#3}%
+        \ifjlreq@tempa\ClassWarningNoLine{jlreq}{Invalid~input~`##1'~for~column_spanning~in~BlockHeading~#1}\fi
+      },
+      number .choices:nn = {true,false}{\csname jlreq@number\l_keys_choice_tl\endcsname},
+    }%
+    \keys_set:nn { BlockHeading:#1 } {
+      font = {}, subtitle_font = {},
+      indent = {0pt}, end_indent = {0pt}, align = {left}, subtitle_indent = {1\jlreq@zw}, afterindent = {true},
+      second_heading_text_indent = {0pt}, after_label_space = {1\jlreq@zw}, 
+      pagebreak = {nariyuki}, allowbreak_if_evenpage = {false}, subtitle_break = {true}, column_spanning = {false}, 
+      format = {##1##2##3}, label_format = {\@seccntformat{#1}}, subtitle_format = {---##1---}, number = {true},
+      pagestyle = {}
+    }
+    \keys_set:nn { BlockHeading:#1 } {#3}
     \def\jlreq@do{}% �期化．�れ�最終処�を入れ���．
     % 入力�ェック
-    \ifthenelse{\equal{\jlreq@column@spanning}{true}}{%
+    \str_if_eq:VnT \jlreq@column@spanning { true } {
       \jlreq@if{\unless\ifjlreq@column@spanning@possible\fi}{
-        \ClassWarningNoLine{jlreq}{column_spanning can be used only with `pagebreak=nariyuki' or `pagebreak=clearcolumn' (in BlockHeading #1)}%
+        \ClassWarningNoLine{jlreq}{column_spanning~can~be~used~only~with~`pagebreak=nariyuki'~or~`pagebreak=clearcolumn'~(in~BlockHeading~#1)}%
         \def\jlreq@column@spanning{false}%
       }{}%
-    }{}%
+    }%
     % ラベル�りフォーマット：�
     \edef\jlreq@pre@format@wlabel{%
       \noexpand\noindent
@@ -2363,12 +2323,12 @@
     \edef\jlreq@label@format@modified{%
       \noexpand\jlreq@BlockHeading@start@outputlabel
       \unexpanded{\inhibitglue\hbox{}}%
-      \ifdim\dimexpr\jlreq@after@label@space\relax=0pt \else
+      \ifdim\dimexpr\jlreq@after@label@space\relax=\dimexpr 0pt\relax\else
         \noexpand\hspace*{\noexpand\dimexpr\expandonce{\jlreq@after@label@space}\noexpand\relax}%
       \fi
     }%
     \edef\jlreq@heading@text@format@wlabel{%
-      \ifnum 0\ifdim\jlreq@second@heading@text@indent@wlabel=0pt \else 1\fi\ifjlreq@second@text@indent@withlabel 1\fi>0
+      \ifnum 0\ifdim\jlreq@second@heading@text@indent@wlabel=\dimexpr 0pt\relax\else 1\fi\ifjlreq@second@text@indent@withlabel 1\fi>0
         \unexpanded{\hangindent=\glueexpr}(\expandonce{\jlreq@second@heading@text@indent@wlabel})%
           \ifjlreq@second@text@indent@withlabel + (\expandonce{\jlreq@after@label@space}) + \unexpanded{\jlreq@BlockHeading@start@labellength}\fi
           \noexpand\relax
@@ -2376,7 +2336,7 @@
       \expandonce{\jlreq@heading@text@format}%
     }%
     \edef\jlreq@heading@text@format@wolabel{%
-      \ifdim\dimexpr\jlreq@second@heading@text@indent@wolabel\relax=0pt \else
+      \ifdim\dimexpr\jlreq@second@heading@text@indent@wolabel\relax=\dimexpr 0pt\relax\else
         \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@second@heading@text@indent@wolabel}\noexpand\relax
       \fi
       \expandonce{\jlreq@heading@text@format}%
@@ -2389,7 +2349,7 @@
           ##2%
           \unexpanded{\nobreak\noindent}%
         \else
-          \ifdim\jlreq@subtitle@indent=0pt \else
+          \ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
             \noexpand\hspace*{\expandonce{\jlreq@subtitle@indent}}%
           \fi
         \fi
@@ -2401,14 +2361,14 @@
         \noexpand\hangafter=0
         \unexpanded{\hangindent=\dimexpr}\noexpand\jlreq@BlockHeading@start@labellength + (\expandonce{\jlreq@after@label@space}) + (\expandonce{\jlreq@subtitle@indent})\noexpand\relax
       \else
-        \ifdim\jlreq@subtitle@indent=0pt \else
+        \ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
           \noexpand\hangafter=0
           \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@subtitle@indent}\noexpand\relax
         \fi
       \fi
     }%
     \jlreq@make@subtitle@format\jlreq@subtitle@format@wolabel{%
-      \ifdim\jlreq@subtitle@indent=0pt \else
+      \ifdim\jlreq@subtitle@indent=\dimexpr 0pt\relax\else
         \noexpand\hangafter=0
         \unexpanded{\hangindent=\dimexpr}\expandonce{\jlreq@subtitle@indent}\noexpand\relax
       \fi
@@ -2420,7 +2380,7 @@
     \edef\jlreq@totalformat{\unexpanded{##1}}%
     \edef\jlreq@totalformat@after{\expandonce{\jlreq@afterindent}\noexpand\@afterheading}%
     \if@twocolumn
-      \ifthenelse{\equal{\jlreq@column@spanning}{true}}{%
+      \str_if_eq:VnT \jlreq@column@spanning { true }{%
         \def\@tempa##1##2##3{%
           % �開��常�入�������，a:�時�除去�る
           \jlreq@iffirsttoken{##1}{a}{\def\jlreq@spaceset{{}{##2}{##3}}}{}%
@@ -2439,7 +2399,6 @@
         }%
         \expandafter\@tempa\jlreq@spaceset
         \def\jlreq@totalformat@after{}%
-      }{%
       }%
     \fi
     \edef\jlreq@do{%
@@ -2448,6 +2407,7 @@
         \noexpand\UseHook{jlreq/heading/before}%
         \noexpand\UseHook{jlreq/heading/before/#1}%
         \expandonce{\jlreq@pagebreak}%
+        \tl_if_empty:NF \l__jlreq_pagestyle_tl { \exp_not:N \thispagestyle {\exp_not:o { \l__jlreq_pagestyle_tl } } }
         \unexpanded{\jlreq@BlockHeading@start{#1}{#2}}%
         {{\expandonce{\jlreq@align}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@end@indent}}\expandonce{\jlreq@spaceset}{\expandonce{\jlreq@allowbreak@evenpage}}}%
         {\ifjlreq@number\else -\fi}%
@@ -2471,13 +2431,13 @@
   \jlreq@do
 }
 
-\newcommand{\NewBlockHeading}[3]{%
+\NewDocumentCommand{\NewBlockHeading}{ m m +m }{%
   \expandafter\@ifdefinable\csname #1\endcsname{\DeclareBlockHeading{#1}{#2}{#3}}%
 }
-\newcommand{\RenewBlockHeading}[3]{%
+\NewDocumentCommand{\RenewBlockHeading}{ m m +m }{%
   \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareBlockHeading{#1}{#2}{#3}}%
 }
-\newcommand{\ProvideBlockHeading}[3]{%
+\NewDocumentCommand{\ProvideBlockHeading}{ m m +m }{%
   \@ifundefined{#1}{\DeclareBlockHeading{#1}{#2}{#3}}{}%
 }
 
@@ -2513,7 +2473,7 @@
 \def\jlreq@BlockHeading@spaces@current@sequence{}
 \def\jlreq@BlockHeading@spaces@headingslist{}
 
-\newcommand{\SetBlockHeadingSpaces}[1]{%
+\NewDocumentCommand{\SetBlockHeadingSpaces} { m } {
   \begingroup
     % �段階�情報をクリア�る
     \def\jlreq@tempa{}% 見出�リスト
@@ -2521,8 +2481,8 @@
     \jlreq@SetBlockHeadingSpaces#1\jlreq@endmark
     \edef\jlreq@do{%
       \unexpanded{%
-        \@for\@tempa:=\jlreq@BlockHeading@spaces@headingslist\do{%
-          \expandafter\let\csname jlreq@BlockHeading@spaces@setlist@\@tempa\endcsname=\@undefined
+        \clist_map_inline:Nn \jlreq@BlockHeading@spaces@headingslist {
+          \expandafter\let\csname jlreq@BlockHeading@spaces@setlist@####1\endcsname=\@undefined
         }%
       }%
       \unexpanded{\def\jlreq@BlockHeading@spaces@headingslist}{\expandonce{\jlreq@tempa}}%
@@ -2563,7 +2523,7 @@
     \fi
     \eappto\jlreq@tempb{%
       \noexpand\@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@headings}{}{%
-        \noexpand\ClassError{jlreq}{The spaces for \jlreq@headings\space is defined more than once (in SetBlockHeadingSpaces)}{\noexpand\@ehc}%
+        \noexpand\ClassError{jlreq}{The~spaces~for~\jlreq@headings\space is~defined~more~than~once~(in~SetBlockHeadingSpaces)}{\noexpand\@ehc}%
       }%
       \noexpand\def\expandonce{\csname jlreq@BlockHeading@spaces@setlist@\jlreq@headings\endcsname}{{\expandonce{\jlreq@totalset}}\expandonce{\jlreq@set}}%
     }%
@@ -2582,16 +2542,16 @@
     \def\jlreq@tempb{\jlreq@uniqtoken}%
     \ifx\jlreq@tempa\jlreq@tempb\def\jlreq@do{}%
     \else\def\jlreq@do{%
-      \ClassError{jlreq}{Invalid setting ``\unexpanded{#1{#2}}'' is found, You forgot `_'? (in SetBlockHeadingSpaces)}{\@ehc}%
+      \ClassError{jlreq}{Invalid~setting~``\unexpanded{#1{#2}}''~is~found,~you~forgot~`_'?~(in~SetBlockHeadingSpaces)}{\@ehc}%
     }\fi
   \expandafter\endgroup
   \jlreq@do
 }
 
 \def\jlreq@SetBlockHeadingSpaces@iii#1{%
-  \@for\@tempa:=#1\do{%
+  \clist_map_variable:nNn {#1} \@tempa {
     \expandafter\jlreq@helper@trim\expandafter{\@tempa}{\@tempa}%
-    \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\@tempa}{_}{%
+    \str_if_eq:eeTF {\str_head:N \@tempa} {_} {
       \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi%
       \def\jlreq@lastdimen{}%
       \expandafter\jlreq@SetBlockHeadingSpaces@iv\@tempa{\jlreq@endmark}\jlreq@endmark
@@ -2611,14 +2571,16 @@
     \jlreq@tempafalse
   }%
 }
+
 \def\jlreq@SetBlockHeadingSpaces@iv#1#{%
-  \expandafter\jlreq@ifcontains\expandafter{\@gobble #1}{_}{%
-    \ClassWarning{jlreq}{Unusual heading name `\@gobble #1' is found. You forgot a comma? (in SetBlockHeadingSpaces)}%
-  }{}%
+  \str_set:Nx \l__jlreq_tmpa_str {\@gobble #1}
+  \str_if_in:NnT \l__jlreq_tmpa_str {_} {
+    \ClassWarning{jlreq}{Unusual~heading~name~`\@gobble #1'~is~found.~You~forgot~a~comma?~(in~SetBlockHeadingSpaces)}%
+  }%
   \jlreq@ifendswith{#1}{*}{{%
     \def\@tempa_##1*{\def\@tempa{##1}}%
     \@tempa#1%
-    \ClassWarning{jlreq}{The heading name `\@gobble #1' ends with `*'. Do you mean `_\@tempa{*}'? (in SetBlockHeadingSpaces)}%
+    \ClassWarning{jlreq}{The~heading~name~`\@gobble #1'~ends~with~`*'.~Do~you^mean~`_\@tempa{*}'?~(in~SetBlockHeadingSpaces)}%
   }}{}%
   \appto\jlreq@headings{#1}%
   \jlreq@SetBlockHeadingSpaces@v
@@ -2646,7 +2608,7 @@
     \def\@tempb##1##{\@temptokena\expandafter{\the\@temptokena##1}\@tempc}%
     \def\@tempc##1{\jlreq@ifendmark{##1}{}{\@temptokena\expandafter{\the\@temptokena{##1}}\@tempb}}%
     \@tempb#1%
-    \ClassWarningNoLine{jlreq}{Extra setting `\the\@temptokena' is found in SetBlockHeadingSpaces, omitted}
+    \ClassWarningNoLine{jlreq}{Extra~setting~`\the\@temptokena'~is~found~in~SetBlockHeadingSpaces,~omitted}
   }}%
 }
 
@@ -2689,13 +2651,12 @@
   \fi
 }
 
-\ExplSyntaxOn
 \def\jlreq@BlockHeading@spaces@output@#1#2\jlreq@endmark{%
   \def\jlreq@result{}%
   \jlreq@tempcnta=0
   \jlreq@BlockHeading@spaces@output@@#2\jlreq@endmark
   \jlreq@tempatrue % 周り�行�り処��必��
-  \jlreq@ifempty{#1}{\jlreq@tempafalse}{}%
+  \tl_if_empty:nT {#1} {\jlreq@tempafalse}%
   \tl_if_eq:nnT {#1} {{}{}{}} { \jlreq@tempafalse }
   \edef\jlreq@do{%
     \ifjlreq@tempa
@@ -2709,11 +2670,10 @@
   \jlreq@BlockHeading@spaces@clear
   \jlreq@do
 }
-\ExplSyntaxOff
 % jlreq@result�出力���も�を入れ���
 \def\jlreq@BlockHeading@spaces@output@@#1{%
   \jlreq@ifendmark{#1}{}{%
-    \jlreq@iffirsttoken@ignorespaces{#1}{_}{%
+    \str_if_eq:eeTF {\str_head:n {#1}} {_} {
       \advance\jlreq@tempcnta by 1
       \expandafter\jlreq@BlockHeading@spaces@output@@@\expandafter{\@gobble #1}%
     }{%
@@ -2808,13 +2768,11 @@
               \expandonce{\jlreq@tempa{#5}}%
               \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}\unexpanded{{#3}{#6}{#4}}%
             \noexpand\endgroup
-            \unexpanded{\def\jlreq@hook@everypar{\inhibitglue}}%
+            \noexpand\inhibitglue
           \noexpand\else
             \unexpanded{\everypar{}}%
           }%
-            \ifx l\jlreq@engine
-              \unexpanded{\unexpanded{\def\jlreq@hook@everypar{}}}%
-            \else
+            \ifx l\jlreq@engine\else
               \unexpanded{\unexpanded{\let\jlreq@hook@everypar\jlreq@openbracket@hook}}%
             \fi
          \unexpanded{\noexpand\fi}%
@@ -2828,11 +2786,14 @@
 \jlreq@tempa
 
 % \DeclareRuninHeading{命令�}{レベル}{設定}
-\newcommand*{\DeclareRuninHeading}[3]{%
-  \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
+\NewDocumentCommand { \DeclareRuninHeading } { m m +m } {
+  \__jlreq_declare_runin_heading:nnn {#1} {#2} {#3}
+}
+\cs_set:Nn \__jlreq_declare_runin_heading:nnn {
+  \hook_provide:n { jlreq/heading/before/#1 }
   \def\jlreq@do{\@removeelement{#1}}%
-  \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}%
-  \appto\jlreq@heading@allheadings{,#1}%
+  \seq_put_right:Nn \l__jlreq_heading_allheadings_seq {#1}
+  \seq_remove_duplicates:N \l__jlreq_heading_allheadings_seq
   \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}%
   \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}%
   \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewRuninHeading}%
@@ -2840,124 +2801,133 @@
   \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}%
   \@ifundefined{l@#1}{\expandafter\def\csname l@#1\endcsname{\@dottedtocline{#2}{0\jlreq@zw}{2\jlreq@zw}}}{}%
   \jlreq@heading@make@maketoc{#1}{#2}%
-  \begingroup
-    \def\jlreq@font{\normalfont\normalsize}%
-    \def\jlreq@indent{0pt}%
-    \def\jlreq@after@label@space{1\jlreq@zw}%
+  \group_begin:
     \def\jlreq@label@font{}%
-    \def\jlreq@label@format{\@seccntformat{#1}}%
-    \def\jlreq@after@space{1\jlreq@zw}%
-    \newif\ifjlreq@number \jlreq@numbertrue
-    \jlreq@parsekeyval[RuninHeading:#1]{%
-      {font}{\def\jlreq@font{##1}}
-      {indent}{\def\jlreq@indent{##1}}
-      {label_format}{\def\jlreq@label@format{##1}}
-      {after_label_space}{%
-        \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_label_space in Runin Heading #1 should be not negative}\fi
-        \def\jlreq@after@label@space{##1}%
-      }
-      {after_space}{%
-        \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_space in Runin Heading #1 should be not negative}\fi
-        \def\jlreq@after@space{##1}%
-      }
-      {number}{\csname jlreq@number##1\endcsname}
-    }{#3}%
-    \newif\ifjlreq@indent@zero
-    \jlreq@ifgluezero{\glueexpr\jlreq@indent\relax}{\jlreq@indent@zerotrue}{\jlreq@indent@zerofalse}%
-    \newif\ifjlreq@after@space@zero
-    \jlreq@ifgluezero{\glueexpr\jlreq@after@space\relax}{\jlreq@after@space@zerotrue}{\jlreq@after@space@zerofalse}%
-    \newif\ifjlreq@after@label@space@zero
-    \jlreq@ifgluezero{\glueexpr\jlreq@after@label@space\relax}{\jlreq@after@label@spacefalse}%
-    \edef\jlreq@format@wlabel{{%
-      \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi
-      \expandonce{\jlreq@font}%
-      \expandonce{\jlreq@label@format}%
-      \ifjlreq@after@label@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@label@space}\noexpand\relax\fi
+    \keys_define:nn { RuninHeading:#1 } {
+      font .tl_set:N = \l__jlreq_font_tl,
+      indent .tl_set:N = \l__jlreq_indent_tl,
+      label_format .tl_set:N = \l__jlreq_label_format_tl,
+      after_label_space .tl_set:N = \l__jlreq_after_label_space_tl,
+      after_space .tl_set:N = \l__jlreq_after_space_tl,
+      number .bool_set:N = \l__jlreq_number_bool,
+    }
+    \keys_set:nn { RuninHeading:#1 } {
+      font = {\normalfont\normalsize},
+      indent = {0pt},
+      label_format = {\@seccntformat{#1}},
+      after_label_space = {1\jlreq@zw},
+      after_space = {1\jlreq@zw},
+      number = true
+    }
+    \keys_set:nn { RuninHeading:#1 } {#3}
+    \dim_compare:nT { \l__jlreq_after_space_tl < 0pt } {
+      \ClassWarning{jlreq}{after_space~in~Runin~Heading~#1~should~be~not~negative}
+    }
+    \dim_compare:nT { \l__jlreq_after_label_space_tl < 0pt } {
+      \ClassWarning{jlreq}{after_label_space~in~Runin~Heading~#1~should~be~not~negative}
+    }
+    \bool_set:Nn \l__jlreq_indent_zero_bool { \skip_if_eq_p:nn { \l__jlreq_indent_tl } { 0pt } }
+    \bool_set:Nn \l__jlreq_after_space_zero_bool { \skip_if_eq_p:nn { \l__jlreq_after_space_tl } { 0pt } }
+    \bool_set:Nn \l__jlreq_after_label_space_zero_bool { \skip_if_eq_p:nn { \l__jlreq_after_label_space_tl } { 0pt } }
+    \tl_set:Nx \l__jlreq_format_wlabel_tl {{
+      \bool_if:NF \l__jlreq_indent_zero_bool { \exp_not:N \skip_horizontal:n { \exp_not:o {\l__jlreq_indent_tl} } }
+      \exp_not:o { \l__jlreq_font_tl }
+      \exp_not:o { \l__jlreq_label_format_tl }
+      \bool_if:NF \l__jlreq_after_space_zero_bool { \exp_not:N \skip_horizontal:n { \exp_not:o {\l__jlreq_after_label_space_tl} } }
       ####1%
-      \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi
+      \bool_if:NF \l__jlreq_after_space_zero_bool { \exp_not:N \skip_horizontal:n { \exp_not:o {\l__jlreq_after_space_tl} } }
     }}%
-    \edef\jlreq@format@wolabel{{%
-      \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi
-      \expandonce{\jlreq@font}%
+    \tl_set:Nx \l__jlreq_format_wolabel_tl {{
+      \bool_if:NF \l__jlreq_indent_zero_bool { \exp_not:N \skip_horizontal:n { \exp_not:o {\l__jlreq_indent_tl} } }
+      \exp_not:o { \l__jlreq_font_tl }
       ####1%
-      \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi
+      \bool_if:NF \l__jlreq_after_space_zero_bool { \exp_not:N \skip_horizontal:n {\exp_not:o {\l__jlreq_after_space_tl} } }
     }}%
-    \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}%
-    \edef\jlreq@do{%
-      \expandonce{\jlreq@result}%
+    \jlreq@heading@make@l@{#1}{#2}{\l__jlreq_label_format_tl}%
+    \cs_set:Nx \l__jlreq_do: {
+      \exp_not:o { \jlreq@result }
       % パラメータトークンを�む��，\edef��\unexpanded�包む
       \noexpand\edef\expandonce{\csname #1\endcsname}{%
         \noexpand\unexpanded{%
-          \noexpand\UseHook{jlreq/heading/before}%
-          \noexpand\UseHook{jlreq/heading/before/#1}%
-          \unexpanded{\jlreq@RuninHeading@start{#1}{#2}}{\ifjlreq@number\else -\fi}{\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@format@wlabel}}{\expandonce{\jlreq@format@wolabel}}%
+          \exp_not:N \UseHook{jlreq/heading/before}%
+          \exp_not:N \UseHook{jlreq/heading/before/#1}
+          \exp_not:n {\jlreq@RuninHeading@start{#1}{#2}}
+            {\bool_if:NF \l__jlreq_number_bool {-}}
+            {\exp_not:o {\l__jlreq_label_format_tl}}
+            {\exp_not:o {\l__jlreq_format_wlabel_tl}}
+            {\exp_not:o {\l__jlreq_format_wolabel_tl}}
         }%
       }%
     }%
-  \expandafter\endgroup
-  \jlreq@do
+  \exp_after:wN \group_end:
+  \l__jlreq_do:
 }
-\newcommand*{\NewRuninHeading}[3]{%
+
+\NewDocumentCommand{\NewRuninHeading}{ m m +m }{
   \expandafter\@ifdefinable\csname #1\endcsname{\DeclareRuninHeading{#1}{#2}{#3}}%
 }
-\newcommand*{\RenewRuninHeading}[3]{%
+\NewDocumentCommand{\RenewRuninHeading}{ m m +m }{%
   \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareRuninHeading{#1}{#2}{#3}}%
 }
-\newcommand*{\ProvideRuninHeading}[3]{%
+\NewDocumentCommand{\ProvideRuninHeading}{ m m +m }{%
   \@ifundefined{#1}{\DeclareRuninHeading{#1}{#2}{#3}}{}%
 }
 
 %.. 窓見出�
-\def\jlreq@CutinHeading@start#1#2#3#4#5#6#7{%
+\cs_set:Nn \__jlreq_CutinHeading_start:nnnnnnn {
   \if@noskipsec\leavevmode\fi
   \par
-  \jlreq@if{\ifnum\hangafter=1 \fi}{%
-    \jlreq@CutinHeading@start@{#2}{#3}{#4}{#5}{#6}{#7}%
+  \int_compare:nTF { \hangafter=1 } {
+    \__jlreq_CutinHeading_start_aux:nnnnnn{#2}{#3}{#4}{#5}{#6}{#7}%
   }{%
-    \ClassError{jlreq}{Can not use \expandafter\string\csname#1\endcsname\space here}{\@ehc}%
+    \ClassError{jlreq}{Can~not~use~\expandafter\string\csname#1\endcsname\space here}{\@ehc}%
   }%
 }
 % 1 = 書�指定，2 = インデント, 3 = 見出��本文�間, 4 = �れを越��ら二行以上，5 = �れを越��ら三行以上，6 = テキスト
-\def\jlreq@CutinHeading@start@#1#2#3#4#5#6{%
+\cs_set:Nn \__jlreq_CutinHeading_start_aux:nnnnnn{%
   % 一行�処������見出�長�を計測
-  \begingroup
-    \setbox\@tempboxa=\hbox{#1#6}%
-    \@tempdima=\wd\@tempboxa
-    % 何行必��を\jlreq@CutinHeading@linecount�入れる
-    \ifdim\@tempdima>#5\def\jlreq@CutinHeading@linecount{3}%
-    \else\ifdim\@tempdima>#4\def\jlreq@CutinHeading@linecount{2}%
-    \else\def\jlreq@CutinHeading@linecount{1}\fi\fi
-    % \@tempdima�実際�一行�長��近�
-    \divide\@tempdima by \jlreq@CutinHeading@linecount
-    % \jlreq@resultbox�見出�部分を，\jlreq@CutinHeading@linecount�見出�自身�何行使��を入れる
-    \ifnum\jlreq@CutinHeading@linecount=1\relax
-      \setbox\jlreq@resultbox=\vbox{\parindent=0pt\rightskip=0pt\leftskip=0pt\hbox{#1#6}}%
-      \def\jlreq@CutinHeading@linecount{2}%
-    \else
-      \jlreq@inlinenote@determinelength{#6}{#1}{}{\jlreq@CutinHeading@linecount}{\jlreq@CutinHeading@linecount}{\@tempdima}{\linewidth}%
-      \def\jlreq@CutinHeading@linecount{3}%
-    \fi
+  \group_begin:
+    \hbox_set:Nn \l_jlreq_tmpa_box {#1#6}
+    \dim_set:Nn \l_jlreq_tmpa_dim { \box_wd:N \l_jlreq_tmpa_box}
+    % 何行必��を\l__jlreq_cutinheading_linecount_tl�入れる
+    \dim_compare:nTF { \l_jlreq_tmpa_dim > #5} {
+      \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
+    }{
+      \dim_compare:nTF { \l_jlreq_tmpa_dim > #4 }{
+        \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {2}
+      } { \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {1} } }
+    % \l_jlreq_tmpa_dim�実際�一行�長��近�
+    \dim_set:Nn \l_jlreq_tmpa_dim { \l_jlreq_tmpa_dim / \l__jlreq_cutinheading_linecount_tl }
+    % \l_jlreq_tmpb_box�見出�部分を，\l__jlreq_cutinheading_linecount_tl�見出�自身�何行使��を入れる
+    \int_compare:nTF { \l__jlreq_cutinheading_linecount_tl = 1 }{
+      \vbox_set:Nn \l_jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\hbox_unpack_drop:N \l_jlreq_tmpa_box}
+      \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {2}
+    }{
+      \jlreq@inlinenote@determinelength{#6}{#1}{}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_cutinheading_linecount_tl}{\l_jlreq_tmpa_dim}{\linewidth}%
+      \box_set_eq:NN \l_jlreq_tmpb_box \jlreq@resultbox
+      \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3}
+    }
     % 普通�一行�高�/深������見出��ボックスを作る
-    \setbox\@tempboxa=\vtop to \dimexpr\numexpr\jlreq@CutinHeading@linecount - 1\relax\baselineskip + 1\jlreq@zh\relax{\vskip 0pt plus 1fill minus 1fill \box\jlreq@resultbox\vskip 0pt plus 1fill minus 1fill}%
+    \setbox\l_jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq@zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l_jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}%
     % 高�を通常�一行��れ��る
-    \setbox\jlreq@tempboxa=\hbox{阿}%
-    \dp\@tempboxa=\dimexpr\ht\@tempboxa + \dp\@tempboxa - \ht\jlreq@tempboxa\relax
-    \ht\@tempboxa=\ht\jlreq@tempboxa
+    \hbox_set:Nn \l_jlreq_tmpc_box {阿}
+    \box_set_dp:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpa_box + \box_dp:N \l_jlreq_tmpa_box - \box_ht:N \l_jlreq_tmpc_box }
+    \box_set_ht:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpc_box }
     \noindent
     \hspace*{#2}%
-    \copy\@tempboxa
+    \box_use:N \l_jlreq_tmpa_box
     \hspace*{#3}%
     % ���見出�ボックス�分をキャンセル�る空�を入れる
-    % \baselineskip - \ht\jlreq@tempboxa�TeX�挿入�るスキップ�分
-    \edef\jlreq@do{%
-      \noexpand\par
-      \noexpand\vskip -\the\dimexpr\ht\@tempboxa + \dp\@tempboxa + \baselineskip - \ht\jlreq@tempboxa\relax\relax
-      \noexpand\hangindent=\the\dimexpr#2 + \wd\@tempboxa + #3\relax\relax
-      \noexpand\hangafter=-\jlreq@CutinHeading@linecount\relax
+    % \baselineskip - box_ht:N \l_jlreq_tmpc_box�TeX�挿入�るスキップ�分
+    \cs_set:Nx \l__jlreq_do:{
+      \exp_not:N \par
+      \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l_jlreq_tmpa_box - \box_dp:N \l_jlreq_tmpa_box - \baselineskip + \box_ht:N \l_jlreq_tmpc_box}}
+      \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l_jlreq_tmpa_box + #3} \exp_not:N \relax
+      \exp_not:N\hangafter=-\l__jlreq_cutinheading_linecount_tl\relax
     }%
-  \expandafter\endgroup
-  \jlreq@do
-  \prevdepth=0pt
+  \exp_after:wN \group_end:
+  \l__jlreq_do:
+  \prevdepth=0pt\relax
   % 改段��起���も\hang****をキープ�るよ��\parを書������（終���ら元�戻�）．
   \def\par{%
     \ifvmode\jlreq@tempatrue\else\jlreq@tempafalse\fi
@@ -2977,50 +2947,52 @@
   \ignorespaces
 }
 
-\newcommand*{\DeclareCutinHeading}[3]{%
-  \IfHookExistsTF{jlreq/heading/before/#1}{}{\NewHook{jlreq/heading/before/#1}}%
-  \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}%
-  \expandafter\def\csname jlreq@heading@setting@#1\endcsname{#3}%
-  \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewCutinHeading}%
-  \begingroup
-    \def\jlreq@fontcommand{\sffamily\gtfamily\bfseries}%
-    \def\jlreq@onelinemax{6\jlreq@zw}%
-    \def\jlreq@twolinemax{20\jlreq@zw}%
-    \def\jlreq@indent{0pt}%
-    \def\jlreq@after@space{1\jlreq@zw}%
-    \jlreq@parsekeyval[CutinHeading:#1]{
-      {font}{\def\jlreq@fontcommand{##1}}
-      {onelinemax}{\def\jlreq@onelinemax{##1}}
-      {twolinemax}{\def\jlreq@twolinemax{##1}}
-      {indent}{\def\jlreq@indent{##1}}
-      {after_space}{\def\jlreq@after@space{##1}}
-    }{#3}%
-    \ifthenelse{\lengthtest{\jlreq@after@space < 0.99\jlreq@zw} \OR \lengthtest{\jlreq@after@space > 2.01\jlreq@zw}}{%
-      \jlreq@note{窓見出��本文��空���，基本版��文字サイズ�全角以上，2�未満��る (4.1.10.c)．}%
+\NewDocumentCommand{\DeclareCutinHeading}{ m m +m }{
+  \hook_provide:n { jlreq/heading/before/#1 }
+  \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}
+  \expandafter\def\csname jlreq@heading@setting@#1\endcsname{#3}
+  \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewCutinHeading}
+  \group_begin:
+    \keys_define:nn { CutinHeading:#1 } {
+      font .tl_set:N = \l__jlreq_fontcommand_tl,
+      onelinemax .tl_set:N = \l__jlreq_onelinemax_tl,
+      twolinemax .tl_set:N = \l__jlreq_twolinemax_tl,
+      indent .tl_set:N = \l__jlreq_indent_tl,% 0pt
+      after_space .tl_set:N = \l__jlreq_after_space_tl,
+    }
+    \keys_set:nn { CutinHeading:#1 } {
+      font = { \sffamily\gtfamily\bfseries },
+      onelinemax = { 6\jlreq@zw },
+      twolinemax = { 20\jlreq@zw } ,
+      indent = { 0pt },
+      after_space = { 1\jlreq@zw }
+    }
+    \keys_set:nn { CutinHeading:#1 } {#3}
+    \bool_if:nT { \dim_compare_p:n {\l__jlreq_after_space_tl < 0.99\jlreq@zw} || \dim_compare_p:n { \l__jlreq_after_space_tl > 2.01\jlreq@zw } }{
+      \jlreq@note{窓見出��本文��空���，基本版��文字サイズ�全角以上，2�未満��る~(4.1.10.c)．}%
     }{}%
-    \edef\jlreq@do{%
-      \noexpand\def\expandonce{\csname #1\endcsname}{%
-        \noexpand\UseHook{jlreq/heading/before}%
-        \noexpand\UseHook{jlreq/heading/before/#1}%
-        \noexpand\jlreq@CutinHeading@start{#1}{\expandonce{\jlreq@fontcommand}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@onelinemax}}{\expandonce{\jlreq@twolinemax}}%
-      }%
-    }%
-  \expandafter\endgroup
-  \jlreq@do
+    \cs_set:Nx \l__jlreq_do: {
+      \exp_not:N \DeclareDocumentCommand \exp_not:c {#1} {m} {
+        \exp_not:N \UseHook{jlreq/heading/before}%
+        \exp_not:N \UseHook{jlreq/heading/before/#1}%
+        \exp_not:N \__jlreq_CutinHeading_start:nnnnnnn{#1}{\exp_not:o \l__jlreq_fontcommand_tl}{\exp_not:o \l__jlreq_indent_tl}{\exp_not:o \l__jlreq_after_space_tl}{\exp_not:o \l__jlreq_onelinemax_tl}{\exp_not:o \l__jlreq_twolinemax_tl}{####1}
+      }
+    }
+  \exp_after:wN \group_end:
+  \l__jlreq_do:
 }
-\newcommand*{\NewCutinHeading}[3]{%
+\NewDocumentCommand{\NewCutinHeading} { m m +m } {%
   \expandafter\@ifdefinable\csname #1\endcsname{\DeclareCutinHeading{#1}{#2}{#3}}%
 }
-\newcommand*{\RenewCutinHeading}[3]{%
+\NewDocumentCommand{\RenewCutinHeading} { m m +m } {%
   \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareCutinHeading{#1}{#2}{#3}}%
 }
-\newcommand*{\ProvideCutinHeading}[3]{%
+\NewDocumentCommand{\ProvideCutinHeading} { m m +m } {%
   \@ifundefined{#1}{\DeclareCutinHeading{#1}{#2}{#3}}{}%
 }
 
-\ExplSyntaxOn
-\NewDocumentCommand{\ModifyHeading}{m m}{
-  \@ifundefined { jlreq@heading@setting@#1 } { \ClassError{jlreq}{Unknown heading: #1}{\@ehc} } {}
+\NewDocumentCommand{\ModifyHeading}{m +m}{
+  \@ifundefined { jlreq@heading@setting@#1 } { \ClassError{jlreq}{Unknown~heading:~#1}{\@ehc} } {}
   \group_begin:
     \tl_set:Nn \l_jlreq_tmpa_tl {#2}
     \str_set:Nn \l_jlreq_tmpa_str {#2}
@@ -3045,23 +3017,22 @@
   \exp_after:wN \group_end:
   \l_jlreq_do:
 }
-\ExplSyntaxOff
 % 見出�#1をマクロ#2��存�る
-\newcommand{\SaveHeading}[2]{%
-  \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown heading: #1}{\@ehc}}{}%
+\NewDocumentCommand{\SaveHeading}{ m m }{%
+  \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown~heading:~#1}{\@ehc}}{}%
   \edef#2{%
     \csexpandonce{jlreq@heading@type@#1}{\unexpanded{#1}}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1}}%
   }%
 }
 
-\newcommand*{\jlreq@keepbaselineskip}[1]{%
+\def\jlreq@keepbaselineskip#1{%
   \begingroup
     \edef\jlreq@do{\unexpanded{#1}\noexpand\baselineskip=\the\baselineskip}%
   \expandafter\endgroup
   \jlreq@do
 }
 
-\newcommand*{\jlreq@HeadingType}[1]{%
+\def\jlreq@HeadingType#1{%
   \ifcsname jlreq@heading@type@#1\endcsname
     \jlreq@HeadingType@{#1}{\RenewTobiraHeading}{TobiraHeading}{%
     \jlreq@HeadingType@{#1}{\RenewBlockHeading}{BlockHeading}{%
@@ -3072,31 +3043,15 @@
     UndefinedHeading%
   \fi
 }
-\newcommand*{\jlreq@HeadingType@}[2]{%
+\def\jlreq@HeadingType@#1#2{%
   \jlreq@if{\expandafter\expandafter\expandafter\ifx\csname jlreq@heading@type@#1\endcsname#2\fi}%
 }
 
 % 全��見出��マクロ#1を�用�る．
 \def\jlreq@heading@execmacro@toallheadings#1{%
-  \begingroup
-    \def\jlreq@do{}%
-    \ifx\jlreq@heading@allheadings\@undefined
-      \jlreq@heading@execmacro@toallheadings@{#1}{chapter,part,section,subsection,subsubsection,paragraph,subparagraph}%
-    \else
-      \def\@tempa{\jlreq@heading@execmacro@toallheadings@{#1}}%
-      \expandafter\@tempa\expandafter{\jlreq@heading@allheadings}%
-    \fi
-  \expandafter\endgroup
-  \jlreq@do
+  \seq_map_inline:Nn \l__jlreq_heading_allheadings_seq { #1{##1} }
 }
 
-\def\jlreq@heading@execmacro@toallheadings@#1#2{
-  \@for\jlreq@tempa:=#2\do{%
-    \@ifundefined{\jlreq@tempa}{}{%
-      \eappto\jlreq@do{\noexpand#1{\expandonce{\jlreq@tempa}}}%
-    }%
-  }%
-}
 \def\jlreq@clearheadingmarks#1{%
   \@ifundefined{#1mark}{}{%
     \expandafter\let\csname#1mark\endcsname=\@gobble
@@ -3120,13 +3075,13 @@
 %. 注
 % 文字サイズ�6�イント�ら�（4.2.3.a）�り���\scriptsize
 %.. ��（4.2.3）
-\newcommand*\jlreq@referencemark@format[1]{#1}
+\newcommand*{\jlreq@referencemark@format}[1]{#1}
 \newif\ifjlreqadjustreferencemark
 \jlreqadjustreferencemarktrue
-\ExplSyntaxOn
-\jlreq@jlreqsetup@add{reference_mark}[inline,interlinear]{
-  \def\jlreq@referencemark{#1}
-  \str_if_eq:VnTF \jlreq@referencemark { inline } {
+\keys_define:nn { jlreqsetup } {
+  reference_mark .choice:,
+  reference_mark / inline .code:n = {
+    \def\jlreq@referencemark{#1}
     \def\jlreq@notemark##1{%
       \jlreq@ifydir{%
         \hbox{}\hbox{\@textsuperscript{\normalfont\jlreq@referencemark@format{##1}}}\hbox{}%
@@ -3148,7 +3103,9 @@
       }%
       \noexpand\jlreq@if{\noexpand\ifnum 0\expandonce{\@tempa}>0~\noexpand\fi}{}{\noexpand\inhibitglue}%
     }
-  }{% reference_mark=interlinear
+  },
+  reference_mark / interlinear .code:n = {
+    \def\jlreq@referencemark{#1}
     \def\jlreq@notemark##1{{%
       \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}%
       \@tempdima=\wd\@tempboxa
@@ -3178,7 +3135,6 @@
     \def\jlreq@hook@postnote{\jlreq@fixjfm}
   }
 }
-\ExplSyntaxOff
 % \@footnotemarkをシンプル�も���る
 \def\jlreq@setdefaultnotemark#1#2{%
   \def#1{%
@@ -3211,51 +3167,51 @@
 \jlreq@do
 
 % インデント�計算：脚注�長��文字�整数���るよ��字下��る（4.2.5.b）
-\jlreq@jlreqsetup@add{footnote_indent}{%
-  \if@tate\else
-    \ifdim\dimexpr#1\relax=0pt \else\jlreq@note{脚注�，一般�����区切り����罫線を挿入�る��，字下��行����よ�（4.2.5.b）．}\fi
-  \fi
-  \begingroup
-    \footnotesize
-    \jlreq@footnoteindent=\dimexpr#1\relax
-    \@tempdima=\dimexpr\textwidth - \jlreq@footnoteindent\relax
-    \@tempdimb=1\jlreq@zw
-    \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
-    \edef\jlreq@do{\noexpand\jlreq@footnoteindent=\the\dimexpr\textwidth - \@tempdima\relax}%
-  \expandafter\endgroup
-  \jlreq@do
+\keys_define:nn { jlreqsetup } {
+  footnote_indent .code:n = {
+    \bool_if:nT { \legacy_if_p:n { @tate } && \dim_compare_p:n { #1 = 0pt } } {
+      \jlreq@note{脚注�，一般�����区切り����罫線を挿入�る��，字下��行����よ�（4.2.5.b）．}
+    }
+    \begingroup
+      \footnotesize
+      \jlreq@footnoteindent=\dimexpr#1\relax
+      \@tempdima=\dimexpr\textwidth - \jlreq@footnoteindent\relax
+      \@tempdimb=1\jlreq@zw
+      \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
+      \edef\jlreq@do{\noexpand\jlreq@footnoteindent=\the\dimexpr\textwidth - \@tempdima\relax}%
+    \expandafter\endgroup
+    \jlreq@do
+  }
 }
 
 \newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}}
-\ExplSyntaxOn
-\jlreq@jlreqsetup@add{footnote_second_indent}{%
-  \legacy_if:nF { @tate }{
-    \bool_if:nF {
-      ( \dim_compare_p:n {  0.99\jlreq@zw < \dimexpr #1\relax } && \dim_compare_p:n { \dimexpr #1\relax < 1.01\jlreq@zw  } ) ||
-      ( \dim_compare_p:n { -1.01\jlreq@zw < \dimexpr #1\relax } && \dim_compare_p:n { \dimexpr #1\relax < -0.99\jlreq@zw } )
-    }{\jlreq@note{脚注�2行以上����場�，脚注�2行目以下�字下�を1行目より，脚注�文字サイズ�全角アキ��る�，逆�，1行目�字下�を2行目より，脚注�文字サイズ�全角アキ��る (4.2.5.d)．}}
-  }
-  \ifdim\dimexpr #1\relax<0pt
-    \def\jlreq@makefntext{}
-  \else
-    \def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}}
-  \fi
-  \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}%
-    \unexpanded{%
-      \addtolength{\leftskip}{\jlreq@footnoteindent}%
-      \parindent=1\jlreq@zw
-      \noindent
-      \hskip-\glueexpr #1\relax
-      \jlreq@referencemark@format{\@thefnmark}%
-      \hskip\glueexpr 1\jlreq@zw\relax
-    }##1%
+\keys_define:nn { jlreqsetup } {
+  footnote_second_indent .code:n = {
+    \legacy_if:nF { @tate }{
+      \bool_if:nF {
+        ( \dim_compare_p:n {  0.99\jlreq@zw < #1 } && \dim_compare_p:n { #1 < 1.01\jlreq@zw  } ) ||
+        ( \dim_compare_p:n { -1.01\jlreq@zw < #1 } && \dim_compare_p:n { #1 < -0.99\jlreq@zw } )
+      }{\jlreq@note{脚注�2行以上����場�，脚注�2行目以下�字下�を1行目より，脚注�文字サイズ�全角アキ��る�，逆�，1行目�字下�を2行目より，脚注�文字サイズ�全角アキ��る~(4.2.5.d)．}}
+    }
+    \dim_compare:nTF { #1 < 0pt } {
+      \def\jlreq@makefntext{}
+    }{
+      \def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}}
+    }
+    \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}%
+      \unexpanded{%
+        \addtolength{\leftskip}{\jlreq@footnoteindent}%
+        \parindent=1\jlreq@zw
+        \noindent
+        \hskip-\glueexpr #1\relax
+        \jlreq@referencemark@format{\@thefnmark}%
+        \hskip\glueexpr 1\jlreq@zw\relax
+      }##1%
+    }
   }
 }
-\ExplSyntaxOff
 
-\jlreq@jlreqsetup@add{footnotetext_indent}{
-  \ClassWarningNoLine{jlreq}{footnotetext_indent was removed}
-}
+\keys_define:nn { jlreqsetup } { footnotetext_indent .code:n = {\ClassWarningNoLine{jlreq}{footnotetext_indent~was~removed} } }
 
 \ifx l\jlreq@engine
   \fnfixbottomtrue
@@ -3300,7 +3256,6 @@
   \let\footnotetext=\jlreq@temporary@saved@footnotetext
 }
 
-\ExplSyntaxOn
 \bool_if:nTF { \legacy_if_p:n { @tate } && (\legacy_if_p:n { @twoside } || \legacy_if_p:n { @twocolumn }) }{
   % 縦組��注�，��見開�内�付���る���対応�る注を，奇数ページ�左端������置�る．多段組��最下段�左端������置�る．（4.2.6.a）
   % 必��ら�\footnoteを\footnotemark�\footnotetext���，\footnotetextをアウトプット時���延�る���実��る．
@@ -3324,7 +3279,7 @@
       \def\jlreq@footnote@delayfootnote@page{%
         \jlreq@setcurrentpage
         \jlreq@resultcnt=\numexpr\jlreq@currentpage\relax
-        \ifnum\jlreq@resultcnt=\value{page}\if@firstcolumn\else\jlreq@resultcnt=-1 \fi\fi
+        \ifnum\jlreq@resultcnt=\value{page}\if@firstcolumn\else\jlreq@resultcnt=-1~\fi\fi
       }
     \fi
     \long\def\jlreq@footnote@delayfootnote@delay#1#2{%
@@ -3374,7 +3329,7 @@
         \def\jlreq@result{}#2[#4]\jlreq@result
         \def\jlreq@result{}#3[#4]{#5}%
         \jlreq@restore@jlreq@footnotes}%
-        \jlreq@if{\ifnum\jlreq@resultcnt=-1 \fi}{\noexpand\jlreq@result}{\unexpanded{%
+        \int_compare:nTF { \jlreq@resultcnt=-1 }{\noexpand\jlreq@result}{\unexpanded{%
           \xappto\jlreq@footnote@delayfootnoteslist{%
             \noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{%
               \noexpand\jlreq@restore@original@footnotes
@@ -3421,19 +3376,18 @@
     \jlreq@hook@postnote
   }
 }
-\ExplSyntaxOff
 
 % ��
 \renewcommand*{\@makefnmark}{%
   \jlreq@ifydir{\jlreq@notemark{\@thefnmark}}{\hbox{\jlreq@notemark{\@thefnmark}}}%
 }
 % 4.2.2注3
-\if@tate
+\legacy_if:nTF { @tate } {
   \renewcommand*{\thefootnote}{\jlreq@open@bracket@before@space\inhibitglue（\tatechuyoko*{\@arabic\c@footnote}）\inhibitglue}
-\else
+}{
   \renewcommand*{\thefootnote}{\arabic{footnote}\hbox{}）\inhibitglue}
-\fi
-\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\@addtoreset{footnote}{chapter}}
+}
+\str_if_eq:VnF \jlreq@article@type { article } { \@addtoreset{footnote}{chapter} }
 
 
 %.. 後注（4.2.4）
@@ -3522,12 +3476,16 @@
 }
 % 4.2.4.b
 \jlreq@endnote@indent=2\jlreq@mol
-\jlreq@jlreqsetup@add{endnote_second_indent}{
-  \def\jlreq@endnote@second@indent{#1}
-  \ifthenelse{
-    \( \lengthtest{0.99\jlreq@zw < #1} \AND \lengthtest{#1 < 1.01\jlreq@zw} \) \OR 
-    \( \lengthtest{1.99\jlreq@zw < #1} \AND \lengthtest{#1 < 2.01\jlreq@zw} \)
-  }{}{\jlreq@note{後注�2行以上����場�，後注�2行目以下�字下��，1行目より，後注�文字サイズ�2���全角��る (4.2.4.d)．}}
+\keys_define:nn { jlreqsetup } { 
+  endnote_second_indent .code:n = {
+    \def\jlreq@endnote@second@indent{#1}
+    \bool_if:nTF {
+      ( \dim_compare_p:n { 0.99\jlreq@zw < #1 } && \dim_compare_p:n { #1 < 1.01\jlreq@zw } ) ||
+      ( \dim_compare_p:n { 1.99\jlreq@zw < #1 } && \dim_compare_p:n { #1 < 2.01\jlreq@zw } )
+    } {} {
+      \jlreq@note{後注�2行以上����場�，後注�2行目以下�字下��，1行目より，後注�文字サイズ�2���全角��る (4.2.4.d)．}
+    }
+  }
 }
 \newcommand{\@makeendtext}[1]{%
   \csname\jlreq@endnotemarkname\endcsname
@@ -3537,48 +3495,49 @@
 \let\@makeendmark=\@makefnmark
 
 % \theendnote�出力を仕込む
-\jlreq@jlreqsetup@add{endnote_position}{
-  \AddToHook{jlreq/heading/before}[jlreq/endnote]{}
-  \RemoveFromHook{jlreq/heading/before}[jlreq/endnote]
-  \jlreq@tempafalse % headings�指定�れ�
-  \jlreq@tempbfalse % paragraph�指定�れ�
-  % \jlreq@tempc�セクション���を入れ���
-  \def\jlreq@tempc{}
-  \@for\jlreq@tempa:=#1\do{
-    \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
-    \jlreq@switch{\jlreq@tempa}{
-      {headings}{\jlreq@tempatrue}
-      {paragraph}{
-        \jlreq@tempatrue% _paragraph�時�_headingsも有効��る
-        \jlreq@tempbtrue
-      }
-      {
-        \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\jlreq@tempa}{_}{
-          \edef\jlreq@tempc{\jlreq@tempc,\expandafter\@gobble\jlreq@tempa}
-        }{
-          \ClassError{jlreq}{Invalid value \jlreq@tempa\space in endnote_position}{\@ehc}
+\keys_define:nn { jlreqsetup } {endnote_position .code:n = {
+    \AddToHook{jlreq/heading/before}[jlreq/endnote]{}
+    \RemoveFromHook{jlreq/heading/before}[jlreq/endnote]
+    \jlreq@tempafalse % headings�指定�れ�
+    \jlreq@tempbfalse % paragraph�指定�れ�
+    % \jlreq@tempc�セクション���を入れ���
+    \def\jlreq@tempc{}
+    \clist_map_variable:nNn {#1} \jlreq@tempa {
+      \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
+      \jlreq@switch{\jlreq@tempa}{
+        {headings}{\jlreq@tempatrue}
+        {paragraph}{
+          \jlreq@tempatrue% _paragraph�時�_headingsも有効��る
+          \jlreq@tempbtrue
+        }
+        {
+          \str_if_eq:eeTF { \str_head:N \jlreq@tempa } {_} {
+            \edef\jlreq@tempc{\jlreq@tempc,\expandafter\@gobble\jlreq@tempa}
+          }{
+            \ClassError{jlreq}{Invalid~value~\jlreq@tempa\space in~endnote_position}{\@ehc}
+          }
         }
       }
     }
-  }
-  
-  \ifjlreq@tempb
-    \edef\endnote{\unexpanded{\def\par{\@restorepar\theendnotes\par}}\expandonce{\jlreq@endnote@impl}}
-  \else
-    \let\endnote=\jlreq@endnote@impl
-  \fi
+    
+    \ifjlreq@tempb
+      \edef\endnote{\unexpanded{\def\par{\@restorepar\theendnotes\par}}\expandonce{\jlreq@endnote@impl}}
+    \else
+      \let\endnote=\jlreq@endnote@impl
+    \fi
 
-  \ifjlreq@tempa
-    \AddToHook{jlreq/heading/before}[jlreq/endnote]{\theendnotes}
-  \else
-    \@for\@tempa:=\jlreq@tempc\do{
-      \ifx\@tempa\@empty\else
-        \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{}
-        \RemoveFromHook{jlreq/heading/before/\@tempa}[jlreq/endnote]
-        \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{\theendnotes}
-      \fi
-    }
-  \fi
+    \ifjlreq@tempa
+      \AddToHook{jlreq/heading/before}[jlreq/endnote]{\theendnotes}
+    \else
+      \clist_map_variable:NNn \jlreq@tempc \@tempa {
+        \tl_if_empty:VF \@tempa {
+          \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{}
+          \RemoveFromHook{jlreq/heading/before/\@tempa}[jlreq/endnote]
+          \AddToHook{jlreq/heading/before/\@tempa}[jlreq/endnote]{\theendnotes}
+        }
+      }
+    \fi
+  }
 }
 \AtEndDocument{\theendnotes}
 
@@ -3591,7 +3550,7 @@
 % (1) ��\sidenote[]{}を定義
 % (2) ��\sidenote{見出�}{注中身}を定義
 % sidenote_length>0pt�時��定義�る
-\jlreq@if{\ifdim\jlreq@sidenote@length>0pt \fi}
+\jlreq@if{\ifdim\jlreq@sidenote@length>0pt\relax\fi}
 {
   \def\jlreq@sidenotemarkname{@thefnmark}% ��用番�を一時的�入れるマクロ�
   \long\def\@sidenotetext#1{%
@@ -3603,10 +3562,12 @@
   }
   \jlreq@setdefaultnotemark\@sidenotemark\@makesidemark
   \def\jlreq@sidenotecounter{footnote}% �注用�カウンタ�
-  \jlreq@jlreqsetup@add{sidenote_type}[number,symbol]{\def\jlreq@sidenote@type{#1}}
+  \keys_define:nn { jlreqsetup } {
+    sidenote_type .choices:nn = { number, symbol } { \def\jlreq@sidenote@type{#1} }
+  }
   \def\jlreq@sidenote@type{number}
-  \jlreq@jlreqsetup@addtofinally{
-    \ifthenelse{\equal{\jlreq@sidenote@type}{number}}{
+  \__jlreq_jlreqsetup_addtofinally:n {
+    \str_if_eq:VnT \jlreq@sidenote@type { number } {
       \def\sidenote{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenote}{\jlreq@sidenote[]}}
       \def\sidenotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenotemark}{\jlreq@sidenotemark[]}}
       \def\sidenotetext{\@ifnextchar[{\jlreq@sidenotetext}{\jlreq@sidenotetext[]}}
@@ -3643,7 +3604,8 @@
         \long\def\@makesidetext#1{　\kern-1\jlreq@zw\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1}
       \fi
       \let\@makesidemark=\@makefnmark
-    }{% sidenote_type = symbol
+    }
+    \str_if_eq:VnT \jlreq@sidenote@type { symbol } {% sidenote_type = symbol
       \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}}
       \def\sidenotemark#1{\jlreq@sidenotemark{#1}}
       \long\def\sidenotetext#1#2{\jlreq@sidenotetext{#1}{#2}}
@@ -3668,20 +3630,20 @@
       \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{}
     }
   }
-  \jlreq@jlreqsetup@add{sidenote_symbol}{\def\jlreq@sidenote@defaultmark{#1}}
-  \jlreq@jlreqsetup@add{sidenote_keyword_font}{\def\jlreq@sidenote@keywordfont{#1}}
+  \keys_define:nn { jlreqsetup } { sidenote_symbol .tl_set:N = \jlreq@sidenote@defaultmark }
+  \keys_define:nn { jlreqsetup } { sidenote_keyword_font .tl_set:N = \jlreq@sidenote@keywordfont }
 }{}
 
 %.. 割注（3.4）
 \def\inlinenotesize{.6\jlreq@jafontsize} % 割注�文字サイズ
 \let\jlreq@inlinenote@autolinebreak=\\% 計測時�\linebreakより\\�方�安定�る．悩���……．
 
-\newcommand{\jlreq@inlinenote@kakkofontsize}{%
+\def\jlreq@inlinenote@kakkofontsize{%
   \fontsize{\dimexpr\inlinenotesize * 2\relax}{\dimexpr \inlinenotesize * 2\relax}%
   \selectfont
 }
 
-\newcommand{\jlreq@inlinenote@fontsize}{%
+\def\jlreq@inlinenote@fontsize{%
   \fontsize{\inlinenotesize}{\inlinenotesize}%
   \selectfont
 }
@@ -3691,16 +3653,20 @@
 % \inlinenote*�自動�改行�れ��．\\�改行�置を指定�る．
 \newif\ifjlreq@in@inlinenote
 \jlreq@in@inlinenotefalse
-\newcommand*{\jlreq@inlinenote@}[1]{%
-  \ifjlreq@in@inlinenote\ClassError{jlreq}{\string#1\space can't be nested}{\@ehc}\fi
+\NewDocumentCommand{\inlinenote}{ s m } {
+  \ifjlreq@in@inlinenote\ClassError{jlreq}{\string\inlinenote\space can't~be~nested}{\@ehc}\fi
+  \jlreq@in@inlinenotetrue
+  \ifvmode\leavevmode\fi
+  \IfBooleanTF {#1} { \jlreq@inlinenote@noauto {#2} } { \jlreq@inlinenote@auto {#2} }
+}
+\NewDocumentCommand{\warichu}{ s m } {
+  \ifjlreq@in@inlinenote\ClassError{jlreq}{\string\warichu\space can't~be~nested}{\@ehc}\fi
   \jlreq@in@inlinenotetrue
   \ifvmode\leavevmode\fi
-  \@ifstar\jlreq@inlinenote@noauto\jlreq@inlinenote@auto
+  \IfBooleanTF {#1} { \jlreq@inlinenote@noauto {#2} } { \jlreq@inlinenote@auto {#2} }
 }
-\DeclareRobustCommand*{\inlinenote}{\jlreq@inlinenote@{\inlinenote}}
-\DeclareRobustCommand*{\warichu}{\jlreq@inlinenote@{\warichu}}
 
-\newcommand*{\jlreq@inlinenote@auto}[1]{%
+\def\jlreq@inlinenote@auto#1{%
   % 割注��括弧���場所を�存
   \jlreq@savepos@for@rest@linewidth
   % \jlreq@tempdimb�，�在行�残り長�を入れる
@@ -3730,10 +3696,10 @@
   \fi
   % \jlreq@parshapearg�\parshape�指定�る書��最後以外を入れる．
   \ifnum\@tempcntb>2\relax
-    \edef\jlreq@parshapearg{0pt \the\jlreq@tempdimb\space 0pt \the\jlreq@tempdimb}%
+    \edef\jlreq@parshapearg{0pt~\the\jlreq@tempdimb\space 0pt~\the\jlreq@tempdimb}%
     \@tempcnta=4\relax
     \@whilenum\@tempcnta<\@tempcntb\do{%
-      \edef\jlreq@parshapearg{\jlreq@parshapearg\space 0pt \the\linewidth\space 0pt \the\linewidth}%
+      \edef\jlreq@parshapearg{\jlreq@parshapearg\space 0pt~\the\linewidth\space 0pt~\the\linewidth}%
       \advance\@tempcnta by 2\relax
     }%
     \setlength{\jlreq@tempdimc}{\dimexpr\jlreq@tempdimc - \jlreq@tempdimb - \linewidth * \numexpr(\@tempcntb - 4)/2\relax\relax}%
@@ -3755,10 +3721,10 @@
       \@tempcntb=1001\relax
     \fi
     \advance\@tempcntb by 2\relax
-    \edef\jlreq@parshapearg{\jlreq@parshapearg 0pt \the\jlreq@tempdimb 0pt \the\jlreq@tempdimb}%
+    \edef\jlreq@parshapearg{\jlreq@parshapearg~0pt~\the\jlreq@tempdimb~0pt~\the\jlreq@tempdimb}%
   }%
   \ifvoid\jlreq@resultbox
-    \ClassWarning{jlreq}{\string\warichu\space failed, may be a bug}%
+    \ClassWarning{jlreq}{\string\warichu\space failed,~may~be~a~bug}%
   \else
     \@tempcnta=0
     \splittopskip=0pt\relax
@@ -3769,7 +3735,7 @@
     \addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}%
     \setbox\@tempboxa=\box\jlreq@resultbox
     \@whilenum\@tempcnta<\jlreq@inlinenote@lines\do{%
-      \ifnum\@tempcnta>0 \jlreq@inlinenote@autolinebreak\fi
+      \int_compare:nT { \@tempcnta > 0 } { \jlreq@inlinenote@autolinebreak }
       % \jlreq@tempdima�今�行�長�を入れる
       \ifnum\@tempcnta<\numexpr\jlreq@inlinenote@lines - 2\relax
         \ifnum\@tempcnta=0\jlreq@tempdima=\jlreq@tempdimb
@@ -3804,7 +3770,7 @@
   \jlreq@inlinenote@endnote
 }
 
-\newcommand*{\jlreq@inlinenote@noauto}[1]{%
+\def\jlreq@inlinenote@noauto#1{%
   \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（}%
   \inhibitglue\jlreq@box@putcenter\jlreq@tempboxa
   \jlreq@inlinenote@noauto@#1\\\jlreq@endmark\jlreq@endmark
@@ -3840,7 +3806,7 @@
   \jlreq@box@putcenter\@tempboxa
 }
 
-\newcommand{\jlreq@inlinenote@endnote}{%
+\def\jlreq@inlinenote@endnote{%
   \jlreq@in@inlinenotefalse
   {%
     \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize）}%
@@ -3856,14 +3822,14 @@
 % * �れ以��X
 % ���整形��際�，#5行以内���る．
 % \jlreq@resultbox�整形�果を返�（垂直ボックス）．見��ら����らvoid．\global�設定�る．
-\newcommand{\jlreq@inlinenote@determinelength}[7]{%
+\def\jlreq@inlinenote@determinelength#1#2#3#4#5#6#7{%
   \begingroup
   %  \message{#1 �試行開始，行数 = #5, \the\dimexpr#6\relax �ら \the\dimexpr#7\relax��}%
     \@tempcnta=1\relax
     \def\@tempa{}%
     % 調整�使�行�\parshape指定を\@tempa�入れる．長��\jlreq@tempdima．
     \@whilenum\@tempcnta<#4\do{%
-      \expandafter\def\expandafter\@tempa\expandafter{\@tempa 0pt \the\jlreq@tempdima}%
+      \expandafter\def\expandafter\@tempa\expandafter{\@tempa 0pt~\the\jlreq@tempdima}%
       \advance\@tempcnta by 1\relax
     }%
     \@tempcnta=0
@@ -3877,7 +3843,7 @@
         \setbox\@tempboxa=\vbox{#2%
           \vbadness=10000\hbadness=10000\vfuzz=\maxdimen\hfuzz=\maxdimen
           \parindent=0pt\leftskip=0pt\rightskip=0pt
-          \parshape #5 #3 \@tempa 0pt \the\maxdimen
+          \parshape #5~#3~\@tempa 0pt~\the\maxdimen
           #1\par\global\@tempcntb=\prevgraf}%
   %      \message{\string\jlreq@tempdima = \the\jlreq@tempdima �試行，行数�\the\@tempcntb , 書� #5 #3 \@tempa 0pt \the\maxdimen}%
       \fi
@@ -3918,24 +3884,27 @@
 % 2.6.1.c�後�����整�的���よ��見�る……
 % 柱：両柱�片柱（2.6.3）
 \@tempdima=\jlreq@speciallength{\jlreq@headfoot@sidemargin}
-\ifthenelse{\lengthtest{\@tempdima=0pt} \OR \(\lengthtest{0.99\zw < \@tempdima} \AND \lengthtest{\@tempdima < 1.01\zw}\)}{}{
+\bool_if:nTF {
+  \dim_compare_p:n { \@tempdima = 0pt } ||
+  ( \dim_compare_p:n { 0.99\jlreq@zw < \@tempdima } && \dim_compare_p:n { \@tempdima < 1.01\jlreq@zw} )
+} {} {
   \jlreq@note{ノンブル���柱�，基本版��左�����る�，全角アキ��寄���置��置�る (2.6.1.b)．}
 }
 
 %.. 場所指定解�
 % bottom-left�����を解釈�る．入力�順番�����も良��，出力�<top/bottom><left/right>�順番
 % #1 = bottom-left�����を{bottom}{left}�変��，#2�代入，#3�デフォルト値，出力形��入れる
-\newcommand*{\jlreq@pagestyle@parse@position}[3]{%
+\def\jlreq@pagestyle@parse@position#1#2#3{%
   \jlreq@ifempty{#1}{\def#2{#3}}%
   {%
     \begingroup
       \jlreq@pagestyle@parse@position@#1-\jlreq@endmark
-      \ifthenelse{\equal{\jlreq@tempa}{fore}}{%
+      \str_if_eq:VnTF \jlreq@tempa { fore } {
         \expandafter\jlreq@pagestyle@parse@position@\jlreq@tempb-\jlreq@endmark
-        \ifthenelse{\equal{\jlreq@tempa}{edge}}{%
+        \str_if_eq:VnTF \jlreq@tempa { edge } {
           \def\jlreq@tempa{fore-edge}%
         }{%
-          \ClassError{jlreq}{Invalid position: fore-\jlreq@tempa}{\@ehc}%
+          \ClassError{jlreq}{Invalid~position:~fore-\jlreq@tempa}{\@ehc}%
         }%
       }{}%
       % \jlreq@tempc�縦方�を，\jlreq@tempd�横方�を入れる
@@ -3953,14 +3922,14 @@
 \def\jlreq@pagestyle@parse@position@#1-#2\jlreq@endmark{%
   \def\jlreq@tempa{#1}\def\jlreq@tempb{#2}%
   \jlreq@ifempty{#2}{%
-    \ifx\jlreq@tempb\@empty\ClassError{jlreq}{Invalid position: #1}{\@ehc}\fi
+    \ifx\jlreq@tempb\@empty\ClassError{jlreq}{Invalid~position:~#1}{\@ehc}\fi
   }{%
     \def\@tempa##1-\jlreq@endmark{\def\jlreq@tempb{##1}}%
     \@tempa#2\jlreq@endmark\relax
   }%
 }
 
-\newcommand*\jlreq@pagestyle@parse@position@@[1]{%
+\def\jlreq@pagestyle@parse@position@@#1{%
   \jlreq@switch{#1}{
     {top}{\def\jlreq@tempc{#1}}
     {bottom}{\def\jlreq@tempc{#1}}
@@ -3970,16 +3939,16 @@
     {gutter}{\if@tate\def\jlreq@tempd{right}\else\def\jlreq@tempd{left}\fi}
     {fore_edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi}
     {fore-edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi}
-    {\ClassError{jlreq}{Invalid position: #1}{\@ehc}}
+    {\ClassError{jlreq}{Invalid~position:~#1}{\@ehc}}
   }%
 }
 
 % レベル#1より低�レベル�見出��**markを\markboth{}{}��る
 \def\jlreq@pagestyle@setclearmark#1{%
-  \@for\@tempa:=\jlreq@heading@allheadings\do{%
-    \@ifundefined{\@tempa}{}{%
-      \@ifundefined{jlreq@heading@level@\@tempa}{}{%
-        \ifnum\csname jlreq@heading@level@\@tempa\endcsname<#1\relax\expandafter\def\csname\@tempa mark\endcsname##1{\markboth{}{}}\fi
+  \seq_map_inline:Nn \l__jlreq_heading_allheadings_seq {
+    \@ifundefined{##1}{}{%
+      \@ifundefined{jlreq@heading@level@##1}{}{%
+        \ifnum\csname jlreq@heading@level@##1\endcsname<#1\relax\expandafter\def\csname##1 mark\endcsname####1{\markboth{}{}}\fi
       }%
     }%
   }%
@@ -4034,14 +4003,14 @@
 % #1@heading@level�レベルを入れる
 \def\jlreq@pagestyle@setmark#1#2#3#4#5{%
   \begingroup
-    \expandafter\jlreq@iffirsttoken\expandafter{#1}{_}{%
-      \ifthenelse{\equal{#3}{odd}}{\let\jlreq@leftright=r}{\let\jlreq@leftright=l}%
+    \str_if_eq:eeTF {\str_head:N #1} {_} {
+      \str_if_eq:nnTF {#3} { odd } { \let\jlreq@leftright=r } { \let\jlreq@leftright=l }
       \edef\jlreq@do{%
         \unexpanded{\def#1}{%
           \ifx l\jlreq@leftright
-            \ifnum#2=0 \noexpand\leftmark\else\unexpanded{\jlreq@extraleftmark{#2}}\fi
+            \int_compare:nTF { #2 = 0 } { \exp_not:N \leftmark } { \exp_not:n {\jlreq@extraleftmark{#2}} }
           \else
-            \ifnum#2=0 \noexpand\rightmark\else\unexpanded{\jlreq@extrarightmark{#2}}\fi
+            \int_compare:nTF { #2 = 0 } { \exp_not:N \rightmark } { \exp_not:n {\jlreq@extrarightmark{#2}} }
           \fi
         }%
       }%
@@ -4052,7 +4021,7 @@
       \eappto\jlreq@do{%
         \noexpand\let\expandonce{\csname\expandafter\@gobble\string #1@heading@level\endcsname}=\expandonce{\csname jlreq@heading@level@\jlreq@headingname\endcsname}%
         \unexpanded{\def#5}{\expandonce{#5},\expandonce{\jlreq@headingname}}%
-        \noexpand\appto\expandonce{\csname #4@\jlreq@headingname\endcsname}{{{\ifnum#2=0 #3\fi}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}%
+        \noexpand\appto\expandonce{\csname #4@\jlreq@headingname\endcsname}{{{\int_compare:nT {#2=0} {#3}}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}%
       }%
     }{\def\jlreq@do{}}%
   \expandafter\endgroup
@@ -4065,7 +4034,7 @@
 % #4: {{mark_format�ら�ら�調�るや� (odd|even)}{マーク�何番目�．extra���場��0}{l or r(left�right�)}}�並�
 \def\jlreq@pagestyle@make@headingmark#1#2#3#4{%
   \begingroup
-    \@for\jlreq@i:=0,1,2\do{%
+    \clist_map_variable:nNn {0,1,2} \jlreq@i {
       \expandafter\def\csname jlreq@leftmark@\jlreq@i\endcsname{}%
       \expandafter\def\csname jlreq@rightmark@\jlreq@i\endcsname{}%
     }%
@@ -4079,7 +4048,7 @@
     \else
       \eappto\jlreq@do{\jlreq@ifempty{#1}{\noexpand\markboth}{\noexpand\jlreq@markboth}{\csexpandonce{jlreq@leftmark@0}}{\csexpandonce{jlreq@rightmark@0}}}%
     \fi
-    \@for\jlreq@i:=1,2\do{%
+    \clist_map_variable:nNn {1,2} \jlreq@i {
       \expandafter\ifx\csname jlreq@leftmark@\jlreq@i\endcsname\@empty
         \expandafter\ifx\csname jlreq@rightmark@\jlreq@i\endcsname\@empty\else
           \eappto\jlreq@do{\noexpand\jlreq@setextrarightmark{\jlreq@i}{\csexpandonce{jlreq@rightmark@\jlreq@i}}}%
@@ -4115,8 +4084,8 @@
     \unexpanded{##1}%
   }%
   \jlreq@parsekeyval@nokey{%
-    \jlreq@ifempty{##1}{}{\ifthenelse{\equal{##1}{#3}}{\edef\jlreq@tempb{\unexpanded{##2}}}{}}%
-    \ifthenelse{\equal{##1}{_#1}}{\edef\jlreq@tempb{\unexpanded{##2}}}{}%
+    \tl_if_empty:nF {##1} {\str_if_eq:nnT {##1} {#3} {\edef\jlreq@tempb{\unexpanded{##2}}}}
+    \str_if_eq:nnT {##1} {_#1} {\edef\jlreq@tempb{\unexpanded{##2}}}%
   }{#2}%
   \ifx l#5%
     \expandafter\edef\csname jlreq@leftmark@#4\endcsname{\expandonce{\jlreq@tempb}}%
@@ -4136,8 +4105,7 @@
 
 % \edef内��，#1 != 0pt�ら�\hskip \dimexpr#1\relax��る
 \def\jlreq@pagestyle@hskip#1{%
-  \ifdim\dimexpr#1\relax=0pt \expandafter\@gobble\else\expandafter\@firstofone\fi
-    {\noexpand\hskip\noexpand\dimexpr#1\noexpand\relax}%
+  \dim_compare:nF { #1 = 0pt }{\noexpand\hskip\noexpand\dimexpr#1\noexpand\relax}%
 }
 \def\jlreq@pagestyle@setheadfoot@#1#2#3#4{%
   \begingroup
@@ -4202,7 +4170,7 @@
   }%
 }
 \def\jlreq@pagestyle@make@runninghead@#1#2#3#4#5{%
-  \jlreq@if{\ifnum\numexpr\jlreq@ifendmark{#5}{1}{0}*\ifjlreq@tempa 1\else 0\fi\relax=1 \fi}{%
+  \jlreq@if{\ifnum\numexpr\jlreq@ifendmark{#5}{1}{0}*\ifjlreq@tempa 1\else 0\fi\relax=1~\fi}{%
     % 項目�一���無�
     \jlreq@ifempty{#2}{\csappto}{\cspreto}{#1}{#4}%
   }{%
@@ -4259,89 +4227,79 @@
 
 %.. \DeclarePageStyle
 \newbox\jlreq@PageStyle@box
-\newcommand{\DeclarePageStyle}[2]{%
+\NewDocumentCommand{\DeclarePageStyle} { m +m } {%
   \expandafter\edef\csname jlreq@pagestyle@setting@#1\endcsname{\unexpanded{#2}}%
   \begingroup
-    \def\jlreq@nombre@i@position{}%
-    \def\jlreq@nombre@i{\thepage}%
-    \def\jlreq@running@head@i@position{}%
-    \def\jlreq@odd@running@head@i{}%
-    \def\jlreq@even@running@head@i{}%
-    \def\jlreq@command{}%
-    \def\jlreq@mark@format{}%
-    \def\jlreq@font{}%
-    \def\jlreq@nombre@font{}%
-    \def\jlreq@running@head@font{}%
     % フォーマットを空����能性も�る�も�れ����，デフォルト値�\relax�表�．
     \let\jlreq@oddheadformat\relax
     \let\jlreq@evenheadformat\relax
     \let\jlreq@oddfootformat\relax
     \let\jlreq@evenfootformat\relax
     % 柱�ノンブル�間
-    \def\jlreq@gap{1.5\jlreq@zw}%
-    \def\jlreq@nombre@gap{}%
-    \def\jlreq@running@head@gap{}%
-    \newif\ifjlreq@clearmarkcommand\jlreq@clearmarkcommandtrue
-    \newif\ifjlreq@pstate\jlreq@pstatefalse % PageStyleTATE
-    \@for\jlreq@i:=ii,iii\do{%
-      \expandafter\def\csname jlreq@nombre@\jlreq@i @position\endcsname{}%
-      \expandafter\def\csname jlreq@running@head@\jlreq@i @position\endcsname{}%
-      \expandafter\def\csname jlreq@nombre@\jlreq@i\endcsname{}%
-      \expandafter\def\csname jlreq@odd@running@head@\jlreq@i\endcsname{}%
-      \expandafter\def\csname jlreq@even@running@head@\jlreq@i\endcsname{}%
-      \expandafter\def\csname jlreq@nombre@\jlreq@i @font\endcsname{}%
-      \expandafter\def\csname jlreq@running@head@\jlreq@i @font\endcsname{}%
-    }%
-    \jlreq@parsekeyval[PageStyle:#1]{
-      *{tate}{\jlreq@pstatetrue}
-      *{yoko}{\jlreq@pstatefalse}
-      {nombre}{\def\jlreq@nombre@i{##1}}
-      {nombre_position}{\def\jlreq@nombre@i@position{##1}}
-      {running_head_position}{\def\jlreq@running@head@i@position{##1}}
-      {odd_running_head}{\def\jlreq@odd@running@head@i{##1}}
-      {even_running_head}{\def\jlreq@even@running@head@i{##1}}
-      {font}{%
+    \newif\ifjlreq@clearmarkcommand
+    \newif\ifjlreq@pstate % PageStyleTATE
+    \keys_define:nn { PageStyle:#1 } {
+      tate .code:n = {\jlreq@pstatetrue},
+      yoko .code:n = {\jlreq@pstatefalse},
+      nombre .tl_set:N = \jlreq@nombre@i,
+      nombre_position .tl_set:N = \jlreq@nombre@i@position,
+      running_head_position .tl_set:N = \jlreq@running@head@i@position,
+      odd_running_head .tl_set:N = \jlreq@odd@running@head@i,
+      even_running_head .tl_set:N = \jlreq@even@running@head@i,
+      font .code:n = {
         \def\jlreq@nombre@font{##1}%
         \def\jlreq@running@head@font{##1}%
-      }
-      {nombre_font}{\def\jlreq@nombre@font{##1}}
-      {running_head_font}{\def\jlreq@running@head@font{##1}}
-      {mark_format}{\edef\jlreq@mark@format{\unexpanded{##1}}}
-      {command}{\edef\jlreq@command{\unexpanded{##1}}}
-      {gap}{\def\jlreq@gap{##1}}
-      {nombre_gap}{\def\jlreq@nombre@gap{##1}}
-      {running_head_gap}{\def\jlreq@running@head@gap{##1}}
+      },
+      nombre_font .tl_set:N = \jlreq@nombre@font,
+      running_head_font .tl_set:N = \jlreq@running@head@font,
+      mark_format .code:n = {\edef\jlreq@mark@format{\unexpanded{##1}}},
+      command .code:n = {\edef\jlreq@command{\unexpanded{##1}}},
+      gap .tl_set:N = \jlreq@gap,
+      nombre_gap .tl_set:N = \jlreq@nombre@gap,
+      running_head_gap .tl_set:N = \jlreq@running@head@gap,
       % true��る�，\ps@***実行時���\***markを全�\@gobble��る．
-      {clear_markcommand}[true,false]{\csname jlreq@clearmarkcommand##1\endcsname}
-      {odd_head_format}{\edef\jlreq@oddheadformat{\unexpanded{##1}}}
-      {even_head_format}{\edef\jlreq@evenheadformat{\unexpanded{##1}}}
-      {odd_foot_format}{\edef\jlreq@oddfootformat{\unexpanded{##1}}}
-      {even_foot_format}{\edef\jlreq@evenfootformat{\unexpanded{##1}}}
+      clear_markcommand .choices:nn = {true,false}{\csname jlreq@clearmarkcommand##1\endcsname},
+      odd_head_format .code:n = {\edef\jlreq@oddheadformat{\unexpanded{##1}}},
+      even_head_format .code:n = {\edef\jlreq@evenheadformat{\unexpanded{##1}}},
+      odd_foot_format .code:n = {\edef\jlreq@oddfootformat{\unexpanded{##1}}},
+      even_foot_format .code:n = {\edef\jlreq@evenfootformat{\unexpanded{##1}}},
       % 二�目
-      {nombre_ii}{\def\jlreq@nombre@ii{##1}}
-      {nombre_ii_position}{\def\jlreq@nombre@ii@position{##1}}
-      {running_head_ii_position}{\def\jlreq@running@head@ii@position{##1}}
-      {odd_running_head_ii}{\def\jlreq@odd@running@head@ii{##1}}
-      {even_running_head_ii}{\def\jlreq@even@running@head@ii{##1}}
-      {nombre_ii_font}{\def\jlreq@nombre@ii@font{##1}}
-      {running_head_ii_font}{\def\jlreq@running@head@ii@font{##1}}
+      nombre_ii .tl_set:N = \jlreq@nombre@ii,
+      nombre_ii_position .tl_set:N = \jlreq@nombre@ii@position,
+      running_head_ii_position .tl_set:N = \jlreq@running@head@ii@position,
+      odd_running_head_ii .tl_set:N = \jlreq@odd@running@head@ii,
+      even_running_head_ii .tl_set:N = \jlreq@even@running@head@ii,
+      nombre_ii_font .tl_set:N = \jlreq@nombre@ii@font,
+      running_head_ii_font .tl_set:N = \jlreq@running@head@ii@font,
       % 三�目
-      {nombre_iii}{\def\jlreq@nombre@iii{##1}}
-      {nombre_iii_position}{\def\jlreq@nombre@iii@position{##1}}
-      {running_head_iii_position}{\def\jlreq@running@head@iii@position{##1}}
-      {odd_running_head_iii}{\def\jlreq@odd@running@head@iii{##1}}
-      {even_running_head_iii}{\def\jlreq@even@running@head@iii{##1}}
-      {nombre_iii_font}{\def\jlreq@nombre@iii@font{##1}}
-      {running_head_iii_font}{\def\jlreq@running@head@iii@font{##1}}
-    }{#2}%
+      nombre_iii .tl_set:N = \jlreq@nombre@iii,
+      nombre_iii_position .tl_set:N = \jlreq@nombre@iii@position,
+      running_head_iii_position .tl_set:N = \jlreq@running@head@iii@position,
+      odd_running_head_iii .tl_set:N = \jlreq@odd@running@head@iii,
+      even_running_head_iii .tl_set:N = \jlreq@even@running@head@iii,
+      nombre_iii_font .tl_set:N = \jlreq@nombre@iii@font,
+      running_head_iii_font .tl_set:N = \jlreq@running@head@iii@font
+    }
+    \keys_set:nn { PageStyle:#1 } {
+      yoko,
+      nombre_font = {}, nombre_position = {}, nombre = {\thepage},
+      nombre_ii_font = {}, nombre_ii_position = {}, nombre_ii = {},
+      nombre_iii_font = {}, nombre_iii_position = {}, nombre_iii = {},
+      running_head_font = {}, running_head_position = {}, odd_running_head = {}, even_running_head = {}, 
+      running_head_ii_font = {}, running_head_ii_position = {}, odd_running_head_ii = {}, even_running_head_ii = {}, 
+      running_head_iii_font = {}, running_head_iii_position = {}, odd_running_head_iii = {}, even_running_head_iii = {}, 
+      command = {}, mark_format = {}, gap = {1.5\jlreq@zw}, nombre_gap = {}, running_head_gap = {},
+      clear_markcommand = {true}, 
+    }
+    \keys_set:nn { PageStyle:#1 } {#2}
     % ノンブル�士�間や柱�士�間�デフォルト�ノンブル�柱�間�空��
     \ifx\jlreq@nombre@gap\@empty\let\jlreq@nombre@gap=\jlreq@gap\fi
     \ifx\jlreq@running@head@gap\@empty\let\jlreq@running@head@gap=\jlreq@gap\fi
     % _ii�存在�る�調��\ifjlreq@headii@exist�入れる
     \newif\ifjlreq@headii@exist
     \jlreq@headii@existfalse
-    \jlreq@for@noexpand\jlreq@tempa:=\jlreq@odd@running@head@ii,\jlreq@odd@running@head@ii\do{%
-      \expandafter\ifx\jlreq@tempa\@empty\else\jlreq@headii@existtrue\fi
+    \clist_map_inline:nn { \jlreq@odd@running@head@ii, \jlreq@odd@running@head@ii } {
+      \tl_if_empty:VF ##1 { \jlreq@headii@existtrue }
     }%
     % mark�処�
     % (odd|even)_running_head(_ii)�_<見出�命令>�与�られ��る場�，次�よ���る．
@@ -4356,8 +4314,8 @@
     % * \jlreq@(odd|even)@running@head(@ii)@heading@level�<見出�命令>�レベルを入れる．レベル��明�時�\relax��る．
     % ��，\jlreq@headingmarklist�<見出�命令>�一覧を入れる．
     \def\jlreq@headingmarklist{}%
-    \@for\jlreq@parity:=odd,even\do{%
-      \@for\jlreq@i:=0,1,2\do{%
+    \clist_map_variable:nNn { odd, even } \jlreq@parity {
+      \clist_map_variable:nNn { 0, 1, 2 } \jlreq@i {
         % \jlreq@pagestyle@setmark�上�処�を行�．
         \edef\jlreq@next{\noexpand\jlreq@pagestyle@setmark{\expandonce{\csname jlreq@\jlreq@parity @running@head@\@roman\numexpr\jlreq@i + 1\relax\endcsname}}{\expandonce{\jlreq@i}}{\expandonce{\jlreq@parity}}{jlreq@markdata}{\noexpand\jlreq@headingmarklist}}%
         \jlreq@next
@@ -4366,7 +4324,7 @@
     % \jlreq@minimumlevel�見出��最低（数値��������味）レベルを入れる．
     \let\jlreq@minimumlevel=\@undefined
     \def\jlreq@markdefinecommand{}%
-    \@for\jlreq@heading:=\jlreq@headingmarklist\do{%
+    \exp_args:No \clist_map_variable:nNn \jlreq@headingmarklist \jlreq@heading {
       \ifx\jlreq@heading\@empty\else
         \expandafter\let\expandafter\jlreq@level\csname jlreq@heading@level@\jlreq@heading\endcsname
         \ifx\jlreq@level\relax\else
@@ -4389,8 +4347,8 @@
       \fi
     }}%
     % 二番目以��フォント設定を追加
-    \@for\jlreq@i:=ii,iii\do{%
-      \@for\jlreq@parity:=odd,even\do{%
+    \clist_map_variable:nNn { ii, iii } \jlreq@i {
+      \clist_map_variable:nNn { odd, even } \jlreq@parity {
         \jlreq@pagestyle@addfont@tocs{jlreq@\jlreq@parity @running@head@\jlreq@i}{jlreq@running@head@\jlreq@i @font}%
       }%
       \jlreq@pagestyle@addfont@tocs{jlreq@nombre@\jlreq@i}{jlreq@nombre@\jlreq@i @font}%
@@ -4410,7 +4368,7 @@
       \jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@even@running@head@ii}{\jlreq@gapcs}{\jlreq@even@running@head@iii}%
       \jlreq@pagestyle@addifempty{\jlreq@running@head@ii@position}{\jlreq@even@running@head@i}{\jlreq@gapcs}{\jlreq@even@running@head@ii}%
       \def\jlreq@nombre@contents{}% ノンブルを入れる（下�方�出力）
-      \@for\jlreq@i:=i,ii,iii\do{%
+      \clist_map_variable:nNn { i, ii, iii } \jlreq@i {
         \expandafter\let\expandafter\jlreq@position\csname jlreq@nombre@\jlreq@i @position\endcsname
         \expandafter\ifx\csname jlreq@nombre@\jlreq@i\endcsname\@empty\else
           \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}%
@@ -4425,9 +4383,9 @@
         \fi
       }%
       % \jlreq@(odd|even)@contents�柱を入れる（上�方�出力）
-      \@for\jlreq@parity:=odd,even\do{%
+      \clist_map_variable:nNn { odd, even } \jlreq@parity {
         \expandafter\def\csname jlreq@\jlreq@parity @contents\endcsname{}%
-        \@for\jlreq@i:=i,ii,iii\do{%
+        \clist_map_variable:nNn { i, ii, iii } \jlreq@i {
           \expandafter\let\expandafter\jlreq@position\csname jlreq@running@head@\jlreq@i @position\endcsname
           \expandafter\ifx\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname\@empty\else
             \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}%
@@ -4489,41 +4447,50 @@
       \def\jlreq@nombre@i@position@default{{bottom}{center}}%
       \def\jlreq@running@head@i@position@default{{top}{center}}%
       % ii以���置�指定�れ����場��i��れ����る
-      \@for\jlreq@tempa:=jlreq@nombre,jlreq@running@head\do{%
-        \@for\jlreq@i:=ii,iii\do{%
+      \clist_map_variable:nNn { jlreq@nombre, jlreq@running@head } \jlreq@tempa {
+        \clist_map_variable:nNn { ii, iii } \jlreq@i {
           \expandafter\ifx\csname\jlreq@tempa @\jlreq@i @position\endcsname\@empty
             \expandafter\let\csname\jlreq@tempa @\jlreq@i @position\expandafter\endcsname\csname\jlreq@tempa @i@position\endcsname
           \fi
           \expandafter\edef\csname\jlreq@tempa @\jlreq@i @position@default\endcsname{\csname\jlreq@tempa @i@position@default\endcsname}%
         }%
       }%
-      \@for\jlreq@tempa:=jlreq@nombre@i@position,jlreq@nombre@ii@position,jlreq@nombre@iii@position,jlreq@running@head@i@position,jlreq@running@head@ii@position,jlreq@running@head@iii@position\do{%
+      \clist_map_variable:nNn {
+        jlreq@nombre@i@position, jlreq@nombre@ii@position, jlreq@nombre@iii@position, jlreq@running@head@i@position, jlreq@running@head@ii@position, jlreq@running@head@iii@position
+      } \jlreq@tempa {
         \edef\jlreq@next{\noexpand\jlreq@pagestyle@parse@position{\csexpandonce{\jlreq@tempa}}{\expandonce{\csname\jlreq@tempa\endcsname}}{\csexpandonce{\jlreq@tempa @default}}}%
         \jlreq@next
       }%
-      \ifthenelse{\(
-        \boolean{@tate} \AND \(
-          \equal{\expandafter\@secondoftwo\jlreq@nombre@i@position}{right} \OR
-          \equal{\expandafter\@secondoftwo\jlreq@running@head@i@position}{right}
-      \)\) \OR \(
-        \(\NOT \boolean{@tate}\) \AND \(
-          \equal{\expandafter\@secondoftwo\jlreq@nombre@i@position}{left} \OR
-          \equal{\expandafter\@secondoftwo\jlreq@running@head@i@position}{left}
-        \)
-      \)}{%
+      \bool_if:nT { (
+        \legacy_if_p:n { @tate } && (
+          \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq@nombre@i@position } { right } ||
+          \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq@running@head@i@position }{ right }
+          ))}{
+      )) || (
+        (! \legacy_if_p:n { @tate } ) && (
+          \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq@nombre@i@position }{ left } ||
+          \str_if_eq_p:ee { \expandafter\@secondoftwo\jlreq@running@head@i@position }{ left }
+        )
+      )}{
         \if@twoside
           \jlreq@note{柱やノンブル�，左ページ��，基本版��左端�延長線�ノンブル��柱�先頭を�����置�る�，基本版��左端�延長線�ら基本版��文字サイズ�全角アキ����寄���置��置�る (ページスタイル #1 内，2.6.1.b)．}%
         \fi
-      }{}%
+      }%
       % フォント変更命令�文字出力命令�入���る�エラー��る�を回��る���\setbox�����．
       \setbox\jlreq@tempboxa=\hbox{\jlreq@running@head@font
-        \ifthenelse{\lengthtest{\jlreq@gap < 1.49\jlreq@zw} \OR \( \lengthtest{\jlreq@gap > 1.51\jlreq@zw} \AND \lengthtest{\jlreq@gap < 1.99\jlreq@zw} \) \OR \lengthtest{\jlreq@gap > 2.01\jlreq@zw}}{\jlreq@note{ノンブル�柱��空���柱�使用�る文字サイズ�2���1.5���る (ページスタイル #1 内，2.6.1.c)．}}{}%
+        \bool_if:nT {
+          \dim_compare_p:n { \jlreq@gap < 1.49\jlreq@zw } ||
+          ( \dim_compare_p:n { \jlreq@gap > 1.51\jlreq@zw } && \dim_compare_p:n { \jlreq@gap < 1.99\jlreq@zw } ) ||
+          \dim_compare_p:n { \jlreq@gap > 2.01\jlreq@zw }
+        }{
+          \jlreq@note{ノンブル�柱��空���柱�使用�る文字サイズ�2���1.5���る (ページスタイル #1 内，2.6.1.c)．}
+        }
       }%
       % �期化
-      \@for\jlreq@parity:=odd,even\do{%
-        \@for\jlreq@vert:=top,bottom\do{%
-          \@for\jlreq@hor:=left,center,right\do{%
-            \@for\jlreq@type:=nombre,running@head\do{%
+      \clist_map_variable:nNn { odd, even } \jlreq@parity {
+        \clist_map_variable:nNn { top, bottom } \jlreq@vert {
+          \clist_map_variable:nNn { left, center, right } \jlreq@hor {
+            \clist_map_variable:nNn { nombre, running@head } \jlreq@type {
               \expandafter\def\csname jlreq@\jlreq@type @\jlreq@parity @\jlreq@vert @\jlreq@hor\endcsname{}%
             }%
           }%
@@ -4532,13 +4499,13 @@
         \jlreq@ifleftpage{\jlreq@parity}{\def\jlreq@pagehor{left}}{\def\jlreq@pagehor{right}}%
         % \jlreq@(running@head|nombre)@(odd|even)@(top|bottom)@(left|center|right)�入れ���
         % 左ページ��ノンブル�左（2.6.1.c），i,ii,...�i�左��るよ���る．
-        \@for\jlreq@i:=i,ii,iii\do{%
+        \clist_map_variable:nNn { i, ii, iii } \jlreq@i {
           % nombre
           \expandafter\ifx\csname jlreq@nombre@\jlreq@i\endcsname\@empty\else
             \edef\jlreq@position{\csname jlreq@nombre@\jlreq@i @position\endcsname}%
             \edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}%
             \edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}%
-            \ifthenelse{\equal{\jlreq@parity}{even}}{\jlreq@reverse@leftright{\jlreq@hor}}{}%
+            \str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
             \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs\csepreto}%
             \edef\jlreq@csname{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
             \expandafter\ifx\csname\jlreq@csname\endcsname\@empty\else\jlreq@addtocs{\jlreq@csname}{\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@nombre@gap}\noexpand\relax}\fi
@@ -4550,23 +4517,23 @@
             \edef\jlreq@position{\csname jlreq@running@head@\jlreq@i @position\endcsname}%
             \edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}%
             \edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}%
-            \ifthenelse{\equal{\jlreq@parity}{even}}{\jlreq@reverse@leftright{\jlreq@hor}}{}%
-            \ifthenelse{\equal{\jlreq@hor}{\jlreq@pagehor}}{\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs=\csepreto}%
+            \str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
+            \str_if_eq:VVTF \jlreq@hor \jlreq@pagehor {\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs=\csepreto}%
             \edef\jlreq@csname{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
             \jlreq@addtocs{\jlreq@csname}{{\csexpandonce{jlreq@\jlreq@parity @running@head@\jlreq@i}}}%
           \fi
         }%
         % {A}{B}{C}�順���柱を���る．本体�\jlreq@pagestyle@make@runninghead．
-        \@for\jlreq@vert:=top,bottom\do{%
-          \@for\jlreq@hor:=left,center,right\do{%
-            \ifthenelse{\equal{\jlreq@hor}{right}}{\def\jlreq@tempa{*}}{\def\jlreq@tempa{}}%
+        \clist_map_variable:nNn { top, bottom } \jlreq@vert {
+          \clist_map_variable:nNn { left, center, right } \jlreq@hor {
+            \str_if_eq:VnTF \jlreq@hor { right } { \def\jlreq@tempa{*} } { \def\jlreq@tempa{} }
             \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@runninghead{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@running@head@gap}}}%
             \jlreq@do
           }%
         }%
         % ノンブル�柱を���，必��ら�フォント設定を�る．
-        \@for\jlreq@vert:=top,bottom\do{%
-          \@for\jlreq@hor:=left,center,right\do{%
+        \clist_map_variable:nNn { top, bottom } \jlreq@vert {%
+          \clist_map_variable:nNn { left, center, right } \jlreq@hor {%
             \edef\jlreq@csname{jlreq@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
             \edef\jlreq@runheadcsname{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
             \edef\jlreq@nombrecsname{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
@@ -4587,10 +4554,10 @@
               }{%
 %                % 両方�る場�：左ページ��ノンブル�左，�ページ��ノンブル��．
                 \jlreq@ifleftpage{\jlreq@parity}{%
-                  \ifthenelse{\equal{\jlreq@hor}{right}}{%
+                  \str_if_eq:VnTF \jlreq@hor { right } {
                     % <ノンブル><空�><柱>，�寄�
                     % 柱�空出������り<空�>を入れる．
-                    \jlreq@pagestyle@addfont@totokens{\unexpanded{\ifdim\wd\jlreq@PageStyle@box=0pt \else\hskip}\expandonce{\jlreq@gap}\unexpanded{\relax\fi}}{jlreq@running@head@font}{jlreq@tempa}%
+                    \jlreq@pagestyle@addfont@totokens{\exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } { \exp_not:N \hskip\expandonce{\jlreq@gap}\exp_no:N \relax } }{jlreq@running@head@font}{jlreq@tempa}%
                     \expandafter\edef\csname\jlreq@csname\endcsname{%
                       \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\expandonce{\jlreq@running@head@font}\csexpandonce{\jlreq@runheadcsname}}%
                       \csexpandonce{\jlreq@nombrecsname}\expandonce{\jlreq@tempa}\unexpanded{\box\jlreq@PageStyle@box}%
@@ -4602,11 +4569,14 @@
                     \expandafter\edef\csname\jlreq@csname\endcsname{\csexpandonce{\jlreq@nombrecsname}\expandonce{\jlreq@tempa}}%
                   }%
                 }{%
-                  \ifthenelse{\equal{\jlreq@hor}{left}}{%
+                  \str_if_eq:VnTF \jlreq@hor { left } {
                     % <柱><空�><ノンブル>，左寄�
                     \jlreq@pagestyle@addfont@totokens{%
                       \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\csexpandonce{\jlreq@runheadcsname}}%
-                      \unexpanded{\copy\jlreq@PageStyle@box\ifdim\wd\jlreq@PageStyle@box=0pt \else\hskip\glueexpr}\expandonce{\jlreq@gap}\unexpanded{\relax\fi}%
+                      \unexpanded{\copy\jlreq@PageStyle@box}
+                      \exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } {
+                        \exp_not:n { \hskip\glueexpr } \exp_not:o {\jlreq@gap} \exp_not:N \relax
+                      }
                     }{jlreq@running@head@font}{jlreq@tempa}%
                     \expandafter\edef\csname\jlreq@csname\endcsname{\expandonce{\jlreq@tempa}\csexpandonce{\jlreq@nombrecsname}}%
                   }{%
@@ -4625,7 +4595,7 @@
       \jlreq@pagestyle@setheadfoot{\jlreq@oddfoot}{jlreq@odd@bottom@left}{jlreq@odd@bottom@center}{jlreq@odd@bottom@right}%
       \jlreq@pagestyle@setheadfoot{\jlreq@evenhead}{jlreq@even@top@left}{jlreq@even@top@center}{jlreq@even@top@right}%
       \jlreq@pagestyle@setheadfoot{\jlreq@evenfoot}{jlreq@even@bottom@left}{jlreq@even@bottom@center}{jlreq@even@bottom@right}%
-      \ifthenelse{\lengthtest{\jlreq@sidenote@length >0pt} \AND \(\NOT\boolean{@tate}\)}{%
+      \bool_if:nTF { \dim_compare_p:n { \jlreq@sidenote@length > 0pt } && (! \legacy_if_p:n { @tate } ) }{
         \def\jlreq@defaultformat{\hss\hbox to \jlreqyokoheadlength{####1}\hss}%
       }{%
         \def\jlreq@defaultformat{####1}%
@@ -4689,18 +4659,18 @@
 \fi
 \edef\jlreqtateheadlength{\unexpanded{\dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{- \topskip + 1\jlreq@zh}\fi\noexpand\relax}
 
-\newcommand*{\NewPageStyle}[2]{%
+\NewDocumentCommand{\NewPageStyle} { m +m } {%
   \expandafter\@ifdefinable\csname ps@#1\endcsname{\DeclarePageStyle{#1}{#2}}%
 }
-\newcommand*{\RenewPageStyle}[2]{%
+\NewDocumentCommand{\RenewPageStyle} { m +m } {%
   \@ifundefined{ps@#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclarePageStyle{#1}{#2}}%
 }
-\newcommand*{\ProvidePageStyle}[2]{%
+\NewDocumentCommand{\ProvidePageStyle} { m +m } {%
   \@ifundefined{ps@#1}{\DeclarePageStyle{#1}{#2}}{}%
 }
-\newcommand*{\ModifyPageStyle}[2]{%
+\NewDocumentCommand{\ModifyPageStyle} { m +m } {%
   \begingroup
-    \@ifundefined{jlreq@pagestyle@setting@#1}{\ClassError{jlreq}{Unknown pagestyle: #1}{\@ehc}}{}%
+    \@ifundefined{jlreq@pagestyle@setting@#1}{\ClassError{jlreq}{Unknown~pagestyle:~#1}{\@ehc}}{}%
     \expandafter\let\expandafter\setting\expandafter=\csname jlreq@pagestyle@setting@#1\endcsname
     \edef\jlreq@do{\noexpand\RenewPageStyle{#1}{\expandonce{\setting},\unexpanded{#2}}}%
   \expandafter\endgroup
@@ -4731,7 +4701,7 @@
           \noexpand\edef\expandonce{\csname #2\endcsname}{\unexpanded{\unexpanded{##1}}}
           \noexpand\def\expandonce{\csname #1\endcsname}{}%
         }%
-        \expandafter\@for\expandafter\jlreq@tempa\expandafter:\expandafter=\csname #1\endcsname\do{%
+        \clist_map_variable:cNn {#1} \jlreq@tempa {
           \epreto\jlreq@do{\noexpand\let\expandonce{\csname #2@\jlreq@tempa\endcsname}\noexpand\@undefined}%
         }%
       }{%
@@ -4793,12 +4763,11 @@
   \vskip\belowcaptionskip
 }}
 
-\jlreq@jlreqsetup@add{caption_font}{\jlreq@jlreqsetup@withenv{jlreq@@makecaption@font@envlist}{jlreq@@makecaption@font@setting}{#1}}
-\jlreq@jlreqsetup@add{caption_label_font}{\jlreq@jlreqsetup@withenv{jlreq@@makecaption@label@font@envlist}{jlreq@@makecaption@label@font@setting}{#1}}
-\jlreq@jlreqsetup@add{caption_label_format}{\jlreq@jlreqsetup@withenv{jlreq@@makecaption@label@format@envlist}{jlreq@@makecaption@label@format@setting}{#1}}
-\jlreq@jlreqsetup@add{caption_after_label_space}{\jlreq@jlreqsetup@withenv{jlreq@@makecaption@after@label@space@envlist}{jlreq@@makecaption@after@label@space@setting}{#1}}
+\keys_define:nn { jlreqsetup } {caption_font .code:n = {\jlreq@jlreqsetup@withenv{jlreq@@makecaption@font@envlist}{jlreq@@makecaption@font@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {caption_label_font .code:n = {\jlreq@jlreqsetup@withenv{jlreq@@makecaption@label@font@envlist}{jlreq@@makecaption@label@font@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {caption_label_format .code:n = {\jlreq@jlreqsetup@withenv{jlreq@@makecaption@label@format@envlist}{jlreq@@makecaption@label@format@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {caption_after_label_space .code:n = {\jlreq@jlreqsetup@withenv{jlreq@@makecaption@after@label@space@envlist}{jlreq@@makecaption@after@label@space@setting}{#1}}}
 
-\ExplSyntaxOn
 %% 
 %% \jlreq@@makecaption@align@setting@small(@env)����時�align，jlreq@@makecaption@align@setting@large(@env)�大�����alignを入れる．
 %% \l_jlreq_tmpb_tl��環境�設定クリア
@@ -4879,21 +4848,22 @@
   }
 }
 
-\jlreq@jlreqsetup@add{caption_align}{%
-  \group_begin:
-    \tl_clear:N \l_jlreq_tmpb_tl
-    \tl_clear:N \l_jlreq_tmpc_tl
-    \tl_clear:N \l_jlreq_tmpd_tl
-    \keys_set:nn { __jlreqsetup_caption_align } {#1}
-    \cs_set:Nx \l_jlreq_do:{
-      \exp_not:o \l_jlreq_tmpb_tl
-      \exp_not:o \l_jlreq_tmpc_tl
-      \exp_not:o \l_jlreq_tmpd_tl
-    }
-  \exp_after:wN \group_end:
-  \l_jlreq_do:
+\keys_define:nn { jlreqsetup } {
+  caption_align .code:n = {
+    \group_begin:
+      \tl_clear:N \l_jlreq_tmpb_tl
+      \tl_clear:N \l_jlreq_tmpc_tl
+      \tl_clear:N \l_jlreq_tmpd_tl
+      \keys_set:nn { __jlreqsetup_caption_align } {#1}
+      \cs_set:Nx \l_jlreq_do:{
+        \exp_not:o \l_jlreq_tmpb_tl
+        \exp_not:o \l_jlreq_tmpc_tl
+        \exp_not:o \l_jlreq_tmpd_tl
+      }
+    \exp_after:wN \group_end:
+    \l_jlreq_do:
+  }
 }
-\ExplSyntaxOff
 
 % 特�根拠���値
 \setlength\abovecaptionskip{.5\jlreq@gol}
@@ -4901,7 +4871,6 @@
 
 %.. figure環境
 \newcounter{figure}
-\ExplSyntaxOn
 \str_if_eq:VnTF \jlreq@article@type { article } {
   \renewcommand{\thefigure}{\@arabic\c@figure}
 }{%
@@ -4929,7 +4898,6 @@
 \newcommand*{\fnum@table}{\tablename\thetable}
 \newenvironment{table}{\@float{table}}{\end@float}
 \newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat}
-\ExplSyntaxOff
 
 %. タイトル周り
 \newenvironment{titlepage}{%
@@ -4947,7 +4915,6 @@
   \fi
 }
 
-\ExplSyntaxOn
 \if@titlepage
   \newcommand{\maketitle}{%
     % jarticle���ら��り変更�����
@@ -5011,7 +4978,6 @@
     \jlreq@endofmaketitle
   }
 \fi
-\ExplSyntaxOff
 % ����クリア�る．
 \def\jlreq@endofmaketitle{%
   \setcounter{footnote}{0}%
@@ -5058,7 +5024,6 @@
 
 %.. abstract
 \def\jlreq@parhook@abstract{}
-\ExplSyntaxOn
 \str_if_eq:VnF \jlreq@article@type { book } {
   \newbox\jlreq@abstractbox
   \newcommand*{\abstractname}{概�}
@@ -5145,7 +5110,6 @@
     }
   \fi
 }
-\ExplSyntaxOff
 %. 箇�書�． cf. JISX4051 8.4
 % 用語定義型
 \newenvironment{description}{\list{}{%
@@ -5173,8 +5137,8 @@
       \ifjlreq@parsekeyval@nokey@novalue{%
         % 生�値．環境�対�るも�をクリア�，全��<i-iv>���値を設定
         % 環境一覧リストもクリア．
-        \@for\jlreq@tempa:=i,ii,iii,iv,v,vi\do{%
-          \expandafter\@for\expandafter\jlreq@tempb\expandafter:\expandafter=\csname #1\endcsname\do{%
+        \clist_map_variable:nNn {i,ii,iii,iv,v,vi} \jlreq@tempa{
+          \clist_map_variable:cNn {#1} \jlreq@tempb {
             \ifx\jlreq@tempb\@empty\else
               \eappto\jlreq@generalset{\noexpand\let\expandonce{\csname #2@\jlreq@tempa @\jlreq@tempb\endcsname}\noexpand\@undefined}%
             \fi
@@ -5185,10 +5149,9 @@
         }%
         \appto\jlreq@generalset{\expandafter\def\csname #1\endcsname{}}%
       }{%
-%        \bool_if:nTF{ \str_if_eq_p:nn {##1} {i} || \str_if_eq_p:nn {##1} {ii} || \str_if_eq_p:nn {##1} {iii} || \str_if_eq_p:nn {##1} {iv} || \str_if_eq_p:nn {##1} {v} || \str_if_eq_p:nn {##1} {vi} }{
-        \ifthenelse{\equal{##1}{i} \OR \equal{##1}{ii} \OR \equal{##1}{iii} \OR \equal{##1}{iv} \OR \equal{##1}{v} \OR \equal{##1}{vi}}{%
+        \bool_if:nTF{ \str_if_eq_p:nn {##1} {i} || \str_if_eq_p:nn {##1} {ii} || \str_if_eq_p:nn {##1} {iii} || \str_if_eq_p:nn {##1} {iv} || \str_if_eq_p:nn {##1} {v} || \str_if_eq_p:nn {##1} {vi} }{
           % i=���時，環境�対応�るも�をクリア�，\#2@##1�値を入れる
-          \expandafter\@for\expandafter\jlreq@tempa\expandafter:\expandafter=\csname #1\endcsname\do{
+          \clist_map_variable:cNn {#1} \jlreq@tempa {
             \ifx\jlreq@tempa\@empty\else
               \epreto\jlreq@envset{\noexpand\let\expandonce{\csname #2@##1@\jlreq@tempa\endcsname}\noexpand\@undefined}%
             \fi
@@ -5199,7 +5162,7 @@
           \jlreq@parsekeyval@nokey{%
             \ifjlreq@parsekeyval@nokey@novalue{%
               % i - vi���全�セット�る．
-              \@for\jlreq@tempa:=i,ii,iii,iv,v,vi\do{%
+              \clist_map_variable:nNn {i,ii,iii,iv,v,vi} \jlreq@tempa{
                 \epreto\jlreq@envset{\noexpand\edef\expandonce{\csname #2@\jlreq@tempa @##1\endcsname}{\unexpanded{\unexpanded{####1}}}}%
               }%
             }{%
@@ -5222,10 +5185,10 @@
 
 
 \def\jlreq@itemization@beforeafter@space@envlist{}
-\jlreq@jlreqsetup@add{itemization_beforeafter_space}{\jlreq@jlreqsetup@itemization{jlreq@itemization@beforeafter@space@envlist}{jlreq@itemization@beforeafter@space@setting}{#1}}
-\jlreq@jlreqsetup@add{itemization_itemsep}{\jlreq@jlreqsetup@withenv{jlreq@itemization@itemsep@envlist}{jlreq@itemization@itemsep@setting}{#1}}
-\jlreq@jlreqsetup@add{itemization_labelsep}{\jlreq@jlreqsetup@withenv{jlreq@itemization@labelsep@envlist}{jlreq@itemization@labelsep@setting}{#1}}
-\jlreq@jlreqsetup@add{itemization_label_length}{\jlreq@jlreqsetup@itemization{jlreq@itemization@label@length@envlist}{jlreq@itemization@label@length@setting}{#1}}
+\keys_define:nn { jlreqsetup } {itemization_beforeafter_space .code:n = {\jlreq@jlreqsetup@itemization{jlreq@itemization@beforeafter@space@envlist}{jlreq@itemization@beforeafter@space@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {itemization_itemsep .code:n = {\jlreq@jlreqsetup@withenv{jlreq@itemization@itemsep@envlist}{jlreq@itemization@itemsep@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {itemization_labelsep .code:n = {\jlreq@jlreqsetup@withenv{jlreq@itemization@labelsep@envlist}{jlreq@itemization@labelsep@setting}{#1}}}
+\keys_define:nn { jlreqsetup } {itemization_label_length .code:n = {\jlreq@jlreqsetup@itemization{jlreq@itemization@label@length@envlist}{jlreq@itemization@label@length@setting}{#1}}}
 % enumerate, itemize用�期化，#1 = i,ii,...
 \def\jlreq@init@list#1{%
   \setlength{\partopsep}{0pt}%
@@ -5248,10 +5211,14 @@
 \def\@listvi{\jlreq@init@list{vi}}
 
 % 引用系．3.5.2�例．
-\jlreq@jlreqsetup@add{quote_indent}{\def\jlreq@quote@indent{#1}}
-\jlreq@jlreqsetup@add{quote_end_indent}{\def\jlreq@quote@end@indent{#1}}
-\jlreq@jlreqsetup@add{quote_fontsize}[normalsize,small,footnotesize,scriptsize,tiny,]{\jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\expandonce{\csname #1\endcsname}}}}
-\jlreq@jlreqsetup@add{quote_beforeafter_space}{\def\jlreq@quote@beforeafter@space{#1}}
+\keys_define:nn { jlreqsetup } { quote_indent .tl_set:N = \jlreq@quote@indent }
+\keys_define:nn { jlreqsetup } { quote_end_indent .tl_set:N = \jlreq@quote@end@indent }
+\keys_define:nn { jlreqsetup }{
+  quote_fontsize .choices:nn = {normalsize,small,footnotesize,scriptsize,tiny,{}}{
+    \jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\expandonce{\csname #1\endcsname}}}
+  }
+}
+\keys_define:nn { jlreqsetup } { quote_beforeafter_space .tl_set:N = \jlreq@quote@beforeafter@space }
 
 \newenvironment{verse}
   {\let\\\@centercr
@@ -5329,14 +5296,12 @@
 \setlength\fboxsep{.3\zw}
 \setlength\fboxrule{\jlreq@omotekeiwidth} % 根拠���
 % 後�
-\ExplSyntaxOn
 \str_if_eq:VnTF \jlreq@article@type { article } {
   \renewcommand{\theequation}{\@arabic\c@equation}
 }{%
   \@addtoreset{equation}{chapter}
   \renewcommand{\theequation}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@equation}
 }
-\ExplSyntaxOff
 
 %. 目次
 \setcounter{tocdepth}{3}
@@ -5361,12 +5326,11 @@
 
 \newcount\jlreq@top@contents % トップ見出�を入れる．レベル���値．
 \jlreq@top@contents=-100
-\newcommand*{\jlreq@set@top@contents}[1]{%
+\def\jlreq@set@top@contents#1{%
   \ifnum\jlreq@top@contents=-100
     \jlreq@top@contents=#1\relax
   \fi
 }
-\ExplSyntaxOn
 \str_if_eq:VnTF \jlreq@article@type { article } {
   \newcommand{\tableofcontents}{%
     \jlreq@top@contents=-100\relax
@@ -5394,7 +5358,6 @@
     \if@restonecol\twocolumn\fi
   }
 }
-\ExplSyntaxOff
 
 % JIS X 4051自身�目次�近��よ���……�り�れ�����．
 % 文字�大���全���（\normalsize）��る．
@@ -5496,21 +5459,22 @@
 \newcommand{\subsubitem}{\@idxitem \hspace*{3\jlreq@mol}}
 \newcommand{\indexspace}{\par \vskip 1\jlreq@gol \@plus .5\jlreq@gol \@minus .3\jlreq@gol\relax}
 \def\jlreq@theindex@pagestyle{}
-\jlreq@jlreqsetup@add{theindex_pagestyle}{
-  \def\jlreq@tempa{}% ページスタイル�
-  \def\jlreq@theindex@pagestyle{}%
-  \jlreq@tempafalse % restore
-  \jlreq@parsekeyval@nokey{%
-    \ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
-      \jlreq@switch{##1}{%
-        {restore}{\csname jlreq@tempa##2\endcsname}%
+\keys_define:nn { jlreqsetup } {theindex_pagestyle .code:n = {
+    \def\jlreq@tempa{}% ページスタイル�
+    \def\jlreq@theindex@pagestyle{}%
+    \jlreq@tempafalse % restore
+    \jlreq@parsekeyval@nokey{%
+      \ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
+        \jlreq@switch{##1}{%
+          {restore}{\csname jlreq@tempa##2\endcsname}%
+        }%
       }%
-    }%
-  }{#1}%
-  \eappto\jlreq@theindex@pagestyle{\unexpanded{\let\jlreq@theindex@savedpagestyle}\ifjlreq@tempa\noexpand\jlreq@current@pagestyle\else\noexpand\@undefined\fi}%
-  \ifx\jlreq@tempa\@empty\else
-    \eappto\jlreq@theindex@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
-  \fi
+    }{#1}%
+    \eappto\jlreq@theindex@pagestyle{\unexpanded{\let\jlreq@theindex@savedpagestyle}\ifjlreq@tempa\noexpand\jlreq@current@pagestyle\else\noexpand\@undefined\fi}%
+    \ifx\jlreq@tempa\@empty\else
+      \eappto\jlreq@theindex@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
+    \fi
+  }
 }
 
 %. �付，後付，付録
@@ -5540,13 +5504,13 @@
                 {runin}{\def\jlreq@declaretype{RenewRunin}}
                 {cutin}{\def\jlreq@declaretype{RenewCutin}}
                 {modify}{\def\jlreq@declaretype{Modify}}
-                {\ClassError{jlreq}{Unknown heading type `####2'}{\@ehc}}
+                {\ClassError{jlreq}{Unknown~heading~type~`####2'}{\@ehc}}
               }%
             }
             {heading_level}{\def\jlreq@level{####2}}
             {%
-              \jlreq@ifempty{#1}{\@firstofone}{%
-                \ifthenelse{\equal{####1}{restore}}{%
+              \tl_if_empty:nTF {#1} { \@firstofone }{%
+                \str_if_eq:nnTF {####1} { restore } {
                   \csname jlreq@tempa####2\endcsname\@gobble
                 }{\@firstofone}%
               }%
@@ -5563,7 +5527,7 @@
       }%
       % \jlreq@declare�\ModifyHeading�\Renew***Headingを入れる
       \edef\jlreq@declare{\expandonce{\csname\jlreq@declaretype Heading\endcsname}{##1}}%
-      \ifthenelse{\NOT \equal{\jlreq@declaretype}{Modify}}{%
+      \str_if_eq:VnF \jlreq@declaretype { Modify } {
         \ifx\jlreq@level\@empty
           % \frontmatter時��レベルを引用�る．
           \edef\jlreq@declare{%
@@ -5589,77 +5553,82 @@
 \def\jlreq@matter@counter@norestore#1#2{%
   \def#1{}%
   \jlreq@parsekeyval@nokey{%
-    \jlreq@parsekeyval*{
-      {value}{\appto#1{\setcounter{##1}{####1}}}
-      {the}{\eappto#1{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
-    }{##2}%
+    \keys_define:nn { __jlreq_keyval } {
+      value .code:n = \appto#1{\setcounter{##1}{####1}},
+      the .code:n = {\eappto#1{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
+    }
+    \keys_set:nn { __jlreq_keyval } {##2}
   }{#2}%
 }
 
-\ifthenelse{\equal{\jlreq@article@type}{book}}{
+\str_if_eq:VnT \jlreq@article@type { book } {
   \newif\if@mainmatter
   \@mainmattertrue
-  \jlreq@jlreqsetup@add{frontmatter_pagebreak}{%
+  \keys_define:nn { jlreqsetup } {frontmatter_pagebreak .code:n = {%
     \edef\jlreq@frontmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
+  }}
+  \keys_define:nn { jlreqsetup } {frontmatter_counter .code:n = {%
+      \def\jlreq@frontmatter@counter{}%
+      \def\jlreq@tempa{}% 復帰��るカウンタ�リスト
+      \jlreq@parsekeyval@nokey{%
+        \def\jlreq@tempb{}% 中身
+        \jlreq@tempatrue % restore
+        \keys_define:nn { frontmatter_counter } {
+          value .code:n = {\appto\jlreq@tempb{\setcounter{##1}{####1}}},
+          restore .code:n = {\csname jlreq@tempa####1\endcsname},
+          the .code:n = {\eappto\jlreq@tempb{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
+        }
+        \keys_set:nn { frontmatter_counter } {##2}
+        \ifjlreq@tempa
+          \epreto\jlreq@tempb{%
+            \noexpand\let\expandonce{\csname jlreq@frontmatter@savedcounter@the@##1\endcsname}\expandonce{\csname the##1\endcsname}%
+            \noexpand\edef\expandonce{\csname jlreq@frontmatter@savedcounter@value@##1\endcsname}{\unexpanded{\the\value{##1}}}%
+          }%
+          \eappto\jlreq@tempa{\ifx\jlreq@tempa\@empty\else ,\fi\unexpanded{##1}}%
+        \fi
+        \eappto\jlreq@frontmatter@counter{\expandonce{\jlreq@tempb}}%
+      }{#1}%
+      \eappto\jlreq@frontmatter@counter{\unexpanded{\def\jlreq@frontmatter@restorecounters}{\expandonce{\jlreq@tempa}}}%
+    }
   }
-  \jlreq@jlreqsetup@add{frontmatter_counter}{%
-    \def\jlreq@frontmatter@counter{}%
-    \def\jlreq@tempa{}% 復帰��るカウンタ�リスト
-    \jlreq@parsekeyval@nokey{%
-      \def\jlreq@tempb{}% 中身
+  \keys_define:nn { jlreqsetup } {frontmatter_heading .code:n = {\jlreq@matter@heading[\jlreq@frontmatter@restoreheadings]{jlreq@frontmatter@savedheading}{\jlreq@frontmatter@heading}{#1}}}
+  \keys_define:nn { jlreqsetup } {frontmatter_pagestyle .code:n = {%
+      \def\jlreq@tempa{}% ページスタイル�
+      \def\jlreq@frontmatter@pagestyle{}%
       \jlreq@tempatrue % restore
-      \jlreq@parsekeyval{
-        {value}{\appto\jlreq@tempb{\setcounter{##1}{####1}}}
-        {restore}{\csname jlreq@tempa####1\endcsname}
-        {the}{\eappto\jlreq@tempb{\noexpand\def\expandonce{\csname the##1\endcsname}{\unexpanded{####1}}}}
-      }{##2}%
-      \ifjlreq@tempa
-        \epreto\jlreq@tempb{%
-          \noexpand\let\expandonce{\csname jlreq@frontmatter@savedcounter@the@##1\endcsname}\expandonce{\csname the##1\endcsname}%
-          \noexpand\edef\expandonce{\csname jlreq@frontmatter@savedcounter@value@##1\endcsname}{\unexpanded{\the\value{##1}}}%
+      \jlreq@parsekeyval@nokey{%
+        \ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
+          \jlreq@switch{##1}{%
+            {restore}{\csname jlreq@tempa##2\endcsname}%
+          }%
         }%
-        \eappto\jlreq@tempa{\ifx\jlreq@tempa\@empty\else ,\fi\unexpanded{##1}}%
+      }{#1}%
+      \ifjlreq@tempa
+        \appto\jlreq@frontmatter@pagestyle{\let\jlreq@frontmatter@savedpagestyle\jlreq@current@pagestyle}%
       \fi
-      \eappto\jlreq@frontmatter@counter{\expandonce{\jlreq@tempb}}%
-    }{#1}%
-    \eappto\jlreq@frontmatter@counter{\unexpanded{\def\jlreq@frontmatter@restorecounters}{\expandonce{\jlreq@tempa}}}%
+      \ifx\jlreq@tempa\@empty\else
+        \eappto\jlreq@frontmatter@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
+      \fi
+    }
   }
-  \jlreq@jlreqsetup@add{frontmatter_heading}{\jlreq@matter@heading[\jlreq@frontmatter@restoreheadings]{jlreq@frontmatter@savedheading}{\jlreq@frontmatter@heading}{#1}}
-  \jlreq@jlreqsetup@add{frontmatter_pagestyle}{%
-    \def\jlreq@tempa{}% ページスタイル�
-    \def\jlreq@frontmatter@pagestyle{}%
-    \jlreq@tempatrue % restore
-    \jlreq@parsekeyval@nokey{%
-      \ifjlreq@parsekeyval@nokey@novalue{\def\jlreq@tempa{##1}}{%
-        \jlreq@switch{##1}{%
-          {restore}{\csname jlreq@tempa##2\endcsname}%
+  \keys_define:nn { jlreqsetup } {frontmatter_precode .code:n = {\edef\jlreq@frontmatter@precode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {frontmatter_postcode .code:n = {\edef\jlreq@frontmatter@postcode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {frontmatter_pagination .code:n = {%
+      \def\jlreq@pagination@frontmatterstyle{arabic}%
+      \let\jlreq@pagination@mainmatterpagecommand=\pagenumbering
+      \clist_map_variable:nNn {#1} \jlreq@tempa {
+        \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
+        \jlreq@switch{\jlreq@tempa}{
+          {continuous}{%
+            \def\jlreq@pagination@mainmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
+          }
+          {independent}{\let\jlreq@pagination@mainmatterpagecommand=\pagenumbering}
+          {\edef\jlreq@pagination@frontmatterstyle{\jlreq@tempa}}
         }%
       }%
-    }{#1}%
-    \ifjlreq@tempa
-      \appto\jlreq@frontmatter@pagestyle{\let\jlreq@frontmatter@savedpagestyle\jlreq@current@pagestyle}%
-    \fi
-    \ifx\jlreq@tempa\@empty\else
-      \eappto\jlreq@frontmatter@pagestyle{\noexpand\pagestyle{\expandonce{\jlreq@tempa}}}%
-    \fi
-  }
-  \jlreq@jlreqsetup@add{frontmatter_precode}{\edef\jlreq@frontmatter@precode{\unexpanded{#1}}}
-  \jlreq@jlreqsetup@add{frontmatter_postcode}{\edef\jlreq@frontmatter@postcode{\unexpanded{#1}}}
-  \jlreq@jlreqsetup@add{frontmatter_pagination}{%
-    \def\jlreq@pagination@frontmatterstyle{arabic}%
-    \let\jlreq@pagination@mainmatterpagecommand=\pagenumbering
-    \@for\jlreq@tempa:=#1\do{%
-      \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
-      \jlreq@switch{\jlreq@tempa}{
-        {continuous}{%
-          \def\jlreq@pagination@mainmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
-        }
-        {independent}{\let\jlreq@pagination@mainmatterpagecommand=\pagenumbering}
-        {\edef\jlreq@pagination@frontmatterstyle{\jlreq@tempa}}
-      }%
-    }%
+    }
   }
-  \newcommand*{\frontmatter}{%
+  \NewDocumentCommand{\frontmatter}{}{%
     \jlreq@frontmatter@precode
     \jlreq@frontmatter@pagebreak
     \@mainmatterfalse
@@ -5673,20 +5642,18 @@
   \def\jlreq@frontmatter@restorecounters{}
   \def\jlreq@frontmatter@restoreheadings{}
   \def\jlreq@frontmatter@restorecommands{}
-  \jlreq@jlreqsetup@add{mainmatter_pagebreak}{%
+  \keys_define:nn { jlreqsetup } {mainmatter_pagebreak .code:n = {%
     \edef\jlreq@mainmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
-  }
-  \jlreq@jlreqsetup@add{mainmatter_pagestyle}{%
+  }}
+  \keys_define:nn { jlreqsetup } {mainmatter_pagestyle .code:n = {%
     \edef\jlreq@mainmatter@pagestyle{\jlreq@ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
-  }
-  \jlreq@jlreqsetup@add{mainmatter_counter}{\jlreq@matter@counter@norestore{\jlreq@mainmatter@counter}{#1}}%
-  \jlreq@jlreqsetup@add{mainmatter_heading}{\jlreq@matter@heading{\jlreq@mainmatter@heading}{#1}}%
-  \jlreq@jlreqsetup@add{mainmatter_precode}{\edef\jlreq@mainmatter@precode{\unexpanded{#1}}}%
-  \jlreq@jlreqsetup@add{mainmatter_postcode}{\edef\jlreq@mainmatter@postcode{\unexpanded{#1}}}%
-  \jlreq@jlreqsetup@add{mainmatter_pagination}{%
-    \def\jlreq@pagination@mainmatterstyle{#1}%
-  }
-  \newcommand*{\mainmatter}{%
+  }}
+  \keys_define:nn { jlreqsetup } {mainmatter_counter .code:n = {\jlreq@matter@counter@norestore{\jlreq@mainmatter@counter}{#1}}}
+  \keys_define:nn { jlreqsetup } {mainmatter_heading .code:n = {\jlreq@matter@heading{\jlreq@mainmatter@heading}{#1}}}
+  \keys_define:nn { jlreqsetup } {mainmatter_precode .code:n = {\edef\jlreq@mainmatter@precode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {mainmatter_postcode .code:n = {\edef\jlreq@mainmatter@postcode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {mainmatter_pagination .tl_set:N = \jlreq@pagination@mainmatterstyle}
+  \NewDocumentCommand{\mainmatter}{}{%
     \jlreq@mainmatter@precode
     \jlreq@mainmatter@pagebreak
     \@mainmattertrue
@@ -5695,44 +5662,45 @@
     }{%
       \expandafter\pagestyle\expandafter{\jlreq@frontmatter@savedpagestyle}%
     }%
-    \@for\jlreq@tempa:=\jlreq@frontmatter@restorecounters\do{%
+    \clist_map_variable:NNn \jlreq@frontmatter@restorecounters \jlreq@tempa {
       \setcounter{\jlreq@tempa}{\csname jlreq@frontmatter@savedcounter@value@\jlreq@tempa\endcsname}%
       \expandafter\let\csname the\jlreq@tempa\expandafter\endcsname\csname jlreq@frontmatter@savedcounter@the@\jlreq@tempa\endcsname
     }%
     \jlreq@mainmatter@counter
-    \@for\jlreq@tempa:=\jlreq@frontmatter@restoreheadings\do{\csname jlreq@frontmatter@savedheading@\jlreq@tempa\endcsname}
+    \clist_map_variable:NNn \jlreq@frontmatter@restoreheadings \jlreq@tempa { \csname jlreq@frontmatter@savedheading@\jlreq@tempa\endcsname }
     \jlreq@mainmatter@heading
-    \@for\jlreq@tempa:=\jlreq@frontmatter@restorecommands\do{%
+    \clist_map_variable:NNn \jlreq@frontmatter@restorecommands \jlreq@tempa {
       \expandafter\let\csname \jlreq@tempa\expandafter\endcsname\csname jlreq@frontmatter@savedcommand@\jlreq@tempa\endcsname
     }%
     \expandafter\jlreq@pagination@mainmatterpagecommand\expandafter{\jlreq@pagination@mainmatterstyle}%
     \jlreq@mainmatter@postcode
   }
-  \jlreq@jlreqsetup@add{backmatter_pagebreak}{%
+  \keys_define:nn { jlreqsetup } {backmatter_pagebreak .code:n = {%
     \edef\jlreq@backmatter@pagebreak{\jlreq@ifempty{#1}{}{\expandonce{\csname #1\endcsname}}}%
-  }
-  \jlreq@jlreqsetup@add{backmatter_pagestyle}{%
+  }}
+  \keys_define:nn { jlreqsetup } {backmatter_pagestyle .code:n = {%
     \edef\jlreq@backmatter@pagestyle{\jlreq@ifempty{#1}{}{\unexpanded{\pagestyle{#1}}}}%
-  }
-  \jlreq@jlreqsetup@add{backmatter_counter}{\jlreq@matter@counter@norestore{\jlreq@backmatter@counter}{#1}}%
-  \jlreq@jlreqsetup@add{backmatter_heading}{\jlreq@matter@heading{\jlreq@backmatter@heading}{#1}}
-  \jlreq@jlreqsetup@add{backmatter_precode}{\edef\jlreq@backmatter@precode{\unexpanded{#1}}}
-  \jlreq@jlreqsetup@add{backmatter_postcode}{\edef\jlreq@backmatter@postcode{\unexpanded{#1}}}
-  \jlreq@jlreqsetup@add{backmatter_pagination}{
-    \let\jlreq@pagination@backmatterpagecommand=\pagenumbering
-    \def\jlreq@pagination@backmatterstyle{arabic}%
-    \@for\jlreq@tempa:=#1\do{%
-      \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
-      \jlreq@switch{\jlreq@tempa}{
-        {continuous}{%
-          \def\jlreq@pagination@backmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
-        }
-        {independent}{\let\jlreq@pagination@backmatterpagecommand=\pagenumbering}
-        {\edef\jlreq@pagination@backmatterstyle{\jlreq@tempa}}
+  }}
+  \keys_define:nn { jlreqsetup } {backmatter_counter .code:n = {\jlreq@matter@counter@norestore{\jlreq@backmatter@counter}{#1}}}
+  \keys_define:nn { jlreqsetup } {backmatter_heading .code:n = {\jlreq@matter@heading{\jlreq@backmatter@heading}{#1}}}
+  \keys_define:nn { jlreqsetup } {backmatter_precode .code:n = {\edef\jlreq@backmatter@precode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {backmatter_postcode .code:n = {\edef\jlreq@backmatter@postcode{\unexpanded{#1}}}}
+  \keys_define:nn { jlreqsetup } {backmatter_pagination .code:n = {
+      \let\jlreq@pagination@backmatterpagecommand=\pagenumbering
+      \def\jlreq@pagination@backmatterstyle{arabic}%
+      \clist_map_variable:nNn {#1} \jlreq@tempa {
+        \expandafter\jlreq@helper@trim\expandafter{\jlreq@tempa}{\jlreq@tempa}%
+        \jlreq@switch{\jlreq@tempa}{
+          {continuous}{%
+            \def\jlreq@pagination@backmatterpagecommand##1{\gdef\thepage{\csname @##1\endcsname\c@page}}%
+          }
+          {independent}{\let\jlreq@pagination@backmatterpagecommand=\pagenumbering}
+          {\edef\jlreq@pagination@backmatterstyle{\jlreq@tempa}}
+        }%
       }%
-    }%
+    }
   }
-  \newcommand*{\backmatter}{%
+  \NewDocumentCommand{\backmatter}{}{%
     \jlreq@backmatter@precode
     \jlreq@backmatter@pagebreak
     \jlreq@backmatter@pagestyle
@@ -5742,13 +5710,13 @@
     \expandafter\jlreq@pagination@backmatterpagecommand\expandafter{\jlreq@pagination@backmatterstyle}%
     \jlreq@backmatter@postcode
   }
-}{}
+}
 
-\jlreq@jlreqsetup@add{appendix_counter}{\jlreq@matter@counter@norestore{\jlreq@appendix@counter}{#1}}
-\jlreq@jlreqsetup@add{appendix_heading}{\jlreq@matter@heading{\jlreq@appendix@heading}{#1}}
-\jlreq@jlreqsetup@add{appendix_precode}{\edef\jlreq@appendix@precode{\unexpanded{#1}}}
-\jlreq@jlreqsetup@add{appendix_postcode}{\edef\jlreq@appendix@postcode{\unexpanded{#1}}}
-\newcommand*{\appendix}{%
+\keys_define:nn { jlreqsetup } {appendix_counter .code:n = {\jlreq@matter@counter@norestore{\jlreq@appendix@counter}{#1}}}
+\keys_define:nn { jlreqsetup } {appendix_heading .code:n = {\jlreq@matter@heading{\jlreq@appendix@heading}{#1}}}
+\keys_define:nn { jlreqsetup } {appendix_precode .code:n = {\edef\jlreq@appendix@precode{\unexpanded{#1}}}}
+\keys_define:nn { jlreqsetup } {appendix_postcode .code:n = {\edef\jlreq@appendix@postcode{\unexpanded{#1}}}}
+\NewDocumentCommand{\appendix}{}{%
   \par
   \jlreq@appendix@precode
   \jlreq@appendix@counter
@@ -5761,7 +5729,7 @@
 \protected\def\tatechuyoko{\@ifstar
   {\jlreq@tatechuyoko@i}%
   {%
-    \jlreq@iftdir{}{\ClassError{jlreq}{\string\tatechuyoko\space is not allowed in yoko mode}{\@ehc}}%
+    \jlreq@iftdir{}{\ClassError{jlreq}{\string\tatechuyoko\space is~not~allowed~in~yoko~mode}{\@ehc}}%
     \jlreq@tatechuyoko@ii
   }%
 }
@@ -5771,9 +5739,9 @@
   \unexpanded{\ifvmode\leavevmode\fi}%
   \ifx l\jlreq@engine\unexpanded{%
     \jlreq@lastnodechar=\lastnodechar\relax
-    \ifnum\jlreq@lastnodechar>-1 \inhibitglue\fi
+    \int_compare:nT { \jlreq@lastnodechar>-1 } { \inhibitglue }
   }\else\unexpanded{%
-    \ifnum\lastnodechar>-1 \inhibitglue\fi
+    \int_compare:nT { \jlreq@lastnodechar>-1 } { \inhibitglue }
     \jlreq@lastnodechar=\lastnodechar\relax
   }\fi
 }
@@ -5788,7 +5756,7 @@
   \hbox{\yoko
     \begingroup
       \setbox\jlreq@tempboxa=\hbox{阿}%
-      \vrule width 0pt height \ht\jlreq@tempboxa depth \dp\jlreq@tempboxa
+      \vrule width~0pt~height~\ht\jlreq@tempboxa depth~\dp\jlreq@tempboxa
     \endgroup
     #1}%
   \futurelet\jlreq@nextchar\jlreq@tatechuyoko@iii
@@ -5808,18 +5776,57 @@
   \jlreq@do
 }
 
-\ExplSyntaxOn
 \jlreq@saveoriginalcs{kanjishape}
 \ifx l\jlreq@engine
+  \cs_new:Nn \__jlreq_setkanjiskip:nn {
+    \group_begin:
+      \ltj@setpar@global
+      \cs_set:Nn \l_jlreq_do: {}
+      \tl_if_empty:nF {#1} {
+        \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+        \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
+          \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+          \exp_not:N \ltjsetkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+        }
+      }
+      \tl_if_empty:nF {#2} {
+        \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+        \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
+          \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+          \exp_not:N \ltjsetxkanjiskip \skip_use:N \l_jlreq_tmpa_skip
+        }
+      }
+    \exp_after:wN \group_end:
+    \l_jlreq_do:
+  }
+\else
+  \cs_new:Nn \__jlreq_setkanjiskip:nn {
+    \group_begin:
+      \cs_set:Nn \l_jlreq_do: {}
+      \tl_if_empty:nF {#1} {
+        \skip_set:Nn \l_jlreq_tmpa_skip { #1 }
+        \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
+          \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+          \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+        }
+      }
+      \tl_if_empty:nF {#2} {
+        \skip_set:Nn \l_jlreq_tmpa_skip { #2 }
+        \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do:
+          \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+          \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l_jlreq_tmpa_skip }
+        }
+      }
+    \exp_after:wN \group_end:
+    \l_jlreq_do:
+  }
+\fi
+\ifx l\jlreq@engine
   \cs_set:Nn \l_jlreq_tmpa:n {
     \NewDocumentCommand { \jidori } { m m } {
       \mode_if_vertical:TF { \leavevmode } {}
       \group_begin:
-        \ltj@setpar@global
-        \ltjsetkanjiskip 0pt~plus~1fil~minus~0pt
-        \ltjsetxkanjiskip 0pt~plus~1fil~minus~0pt
-        \renewcommand*{ \jlreqkanjiskip  }  { 0pt~plus~1fil~minus~0pt }
-        \renewcommand*{ \jlreqxkanjiskip } { 0pt~plus~1fil~minus~0pt }
+        \__jlreq_setkanjiskip:nn { 0pt~plus~1fil~minus~0pt } { 0pt~plus~1fil~minus~0pt }
         \hbox_to_wd:nn {##1} {
           \def#1 {　}
           \kanjishape{n-jidori}\selectfont
@@ -5837,10 +5844,7 @@
   \NewDocumentCommand { \jidori } { m m } {
     \mode_if_vertical:TF { \leavevmode } {}
     \group_begin:
-      \setlength { \kanjiskip  } { 0pt~plus~15zw~minus~0pt }
-      \setlength { \xkanjiskip } { 0pt~plus~15zw~minus~0pt }
-      \renewcommand* { \jlreqkanjiskip  } { 0pt~plus~15zw~minus~0pt }
-      \renewcommand* { \jlreqxkanjiskip } { 0pt~plus~15zw~minus~0pt }
+      \__jlreq_setkanjiskip:nn { 0pt~plus~15zw~minus~0pt } { 0pt~plus~15zw~minus~0pt }
       \hbox_to_wd:nn {#1} {
         \kanjishape{n-jidori}\selectfont
         \inhibitglue #2
@@ -5849,7 +5853,13 @@
     \group_end:
   }
 \fi
-\ExplSyntaxOff
+\NewDocumentCommand { \akigumi } { m m } {
+  \mode_if_vertical:TF { \leavevmode } {}
+  \group_begin:
+    \__jlreq_setkanjiskip:nn { \jlreqkanjiskip + #1 } { }
+    \hbox:n {#2}
+  \group_end:
+}
 
 % 日��
 \newif\if西暦
@@ -5857,21 +5867,26 @@
 \def\和暦{\西暦false}
 % #1年#2月#3日 #4�\number��\kansuji��
 \def\jlreq@wareki#1#2#3#4{%
-  \jlreq@warekiyear{#1}{#2}{#3}{#4}%
+  \__jlreq_warekiyear:nnnn{#1}{#2}{#3}{#4}%
   #4#2月#4#3日%
 }
-\def\jlreq@warekiyear#1#2#3#4{%
+\cs_set:Nn \__jlreq_warekiyear:nnnn {
   % 昭和：1989年1月7日��
-  \ifnum0\ifnum#1<1989 1\fi\ifnum#1=1989 \ifnum#2=1 \ifnum#3<8 1\fi\fi\fi>0
-    昭和\jlreq@warekiyear@{#1}{1926}{#4}%
-  % 平�：2019年4月末日��
-  \else\ifnum0\ifnum#1<2019 1\fi\ifnum#1=2019 \ifnum#2<5 1\fi\fi>0
-    平�\jlreq@warekiyear@{#1}{1989}{#4}%
-  \else
-    令和\jlreq@warekiyear@{#1}{2019}{#4}%
-  \fi\fi
+  \bool_if:nTF { \int_compare_p:n { #1 < 1989 } || 
+    ( \int_compare_p:n { #1 == 1989 } && \int_compare_p:n { #2 == 1 } && \int_compare_p:n { #3 < 8 } ) }{
+    昭和\__jlreq_warekiyear_aux:nnn{#1}{1926}{#4}%
+  }{
+    % 平�：2019年4月末日��
+    \bool_if:nTF { \int_compare_p:n { #1 < 2019 } || ( \int_compare_p:n { #1 == 2019 } && \int_compare_p:n { #2 < 5 } ) } {
+      平�\__jlreq_warekiyear_aux:nnn{#1}{1989}{#4}%
+    }{
+      令和\__jlreq_warekiyear_aux:nnn{#1}{2019}{#4}%
+    }
+  }
+}
+\cs_set:Nn \__jlreq_warekiyear_aux:nnn {
+  \int_compare:nTF { #1 = #2 } {元年} { \int_eval:n { #1 - #2 + 1 } 年 }
 }
-\def\jlreq@warekiyear@#1#2#3{\ifnum#1=#2 元年\else #3\numexpr#1-#2+1\relax 年\fi}
 \def\today{%
   \if西暦
     \jlreq@iftdir{%
@@ -5891,11 +5906,11 @@
     }%
   \fi
 }
-\jlreq@jlreqsetup@add{year_style}[seireki,wareki]{%
-  \jlreq@switch{#1}{%
-    {seireki}{\西暦true}
-    {wareki}{\西暦false}
-  }
+
+\keys_define:nn { jlreqsetup } {
+  year_style .choice:,
+  year_style / seireki .code:n = {\西暦true},
+  year_style / wareki .code:n = {\西暦false}
 }
 
 % 時刻
@@ -5933,40 +5948,42 @@
 \def\jlreq@setupamsthm{
   \newtheoremstyle{jlreq}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\jlreq@theorem@font}{\dimexpr\jlreq@theorem@indent\relax}{\jlreq@theorem@label@font}{}{1\jlreq@zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{（##3）}}
 }
-\jlreq@jlreqsetup@add{theorem_beforeafter_space}{
-  \def\jlreq@theorem@beforeafter@space{#1}
-  \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@beforeafter@space\relax\endgroup
-  \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
-}
-\jlreq@jlreqsetup@add{theorem_indent}{
-  \def\jlreq@theorem@indent{#1}
-  \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@indent\relax\endgroup
-  \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+\keys_define:nn { jlreqsetup } {theorem_beforeafter_space .code:n = {
+    \def\jlreq@theorem@beforeafter@space{#1}
+    \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@beforeafter@space\relax\endgroup
+    \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+  }
 }
-\jlreq@jlreqsetup@add{theorem_font}{
-  \def\jlreq@theorem@font{#1}
-  \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+\keys_define:nn { jlreqsetup } {theorem_indent .code:n = {
+    \def\jlreq@theorem@indent{#1}
+    \begingroup\jlreq@tempdima=\dimexpr\jlreq@theorem@indent\relax\endgroup
+    \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+  }
 }
-\jlreq@jlreqsetup@add{theorem_label_font}{
-  \def\jlreq@theorem@label@font{#1}
-  \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+\keys_define:nn { jlreqsetup } {theorem_font .code:n = {
+    \def\jlreq@theorem@font{#1}
+    \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+  }
 }
-\jlreq@jlreqsetup@add{proof_label_font}{
-  \def\jlreq@proof@label@font{#1}
+\keys_define:nn { jlreqsetup } {theorem_label_font .code:n = {
+    \def\jlreq@theorem@label@font{#1}
+    \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{}
+  }
 }
+\keys_define:nn { jlreqsetup } {proof_label_font .tl_set:N = \jlreq@proof@label@font}
 
 %. デフォルト設定
 %.. 見出�
 \if@tate
   \renewcommand{\thepart}{\jlreq@Kanji{part}}
-  \ifthenelse{\equal{\jlreq@article@type}{article}}{}{\renewcommand{\thechapter}{\jlreq@Kanji{chapter}}}
+  \str_if_eq:VnF \jlreq@article@type { article }{\renewcommand{\thechapter}{\jlreq@Kanji{chapter}}}
   \renewcommand{\thesection}{\tatechuyoko*{\@arabic\c@section}}
   \renewcommand{\thesubsection}{\tatechuyoko*{\@alph\c@subsection}}
   \renewcommand{\thesubsubsection}{\tatechuyoko*{\@arabic\c@subsubsection}}
   \renewcommand{\theparagraph}{(\tatechuyoko*{\@arabic\c@paragraph})}
   \renewcommand{\thesubparagraph}{(\tatechuyoko*{\@arabic\c@subparagraph})}
 
-  \ifthenelse{\equal{\jlreq@article@type}{article}}{
+  \str_if_eq:VnTF \jlreq@article@type { article } {
     \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE}},indent=4\jlreq@zw,lines=4,after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\large}}}
     \if@twoside\ModifyHeading{part}{allowbreak_if_evenpage=true}\fi
   }
@@ -5990,11 +6007,10 @@
   \renewcommand{\thesubsubsection}{\thesubsection .\arabic{subsubsection}}
   \renewcommand{\theparagraph}{\thesubsubsection .\arabic{paragraph}}
   \renewcommand{\thesubparagraph}{\theparagraph .\arabic{subparagraph}}
-  \ifthenelse{\equal{\jlreq@article@type}{article}}{
+  \str_if_eq:VnTF \jlreq@article@type { article } {
     \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE\sffamily\gtfamily\bfseries}},label_format={第\thepart 部},lines=4,after_label_space=1\jlreq@zw,second_heading_text_indent={-1\jlreq@zw,1\jlreq@zw},subtitle_font={\jlreq@keepbaselineskip{\large}}}
     \renewcommand{\thesection}{\arabic{section}}
-  }
-  {% book, report
+  }{% book, report
     \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq@gol}},format={\null\vfil {\Huge\sffamily\gtfamily\bfseries #1#2}\vfil}}
     \NewBlockHeading{chapter}{0}{%
       font={\jlreq@keepbaselineskip{\huge\sffamily\gtfamily\bfseries}},
@@ -6011,71 +6027,71 @@
   \NewRuninHeading{subparagraph}{5}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\gtfamily\bfseries}},indent=2\jlreq@zw}
 \fi
 
-\ifthenelse{\equal{\jlreq@article@type}{article}}{}{% book, report
-  \if@openright
+\str_if_eq:VnF \jlreq@article@type { article } {
+  \legacy_if:nTF { @openright } {
     \ModifyHeading{part}{type=naka}
-    \if@tate
+    \legacy_if:nTF { @tate } {
       \ModifyHeading{chapter}{pagebreak=begin_with_even_page}
-    \else
+    }{
       \ModifyHeading{chapter}{pagebreak=begin_with_odd_page}
-    \fi
-  \else
+    }
+  }{
     \ModifyHeading{part}{type=han}
     \ModifyHeading{chapter}{pagebreak=clearpage}
-  \fi
+  }
 }
 
 %.. ページスタイル
 \RenewPageStyle{empty}{nombre={},odd_running_head={},even_running_head={}}
-\ifthenelse{\equal{\jlreq@article@type}{article}}{
-  \if@twoside
+\str_if_eq:VnTF \jlreq@article@type { article } {
+  \legacy_if:nTF { @twoside } {
     \NewPageStyle{headings}{odd_running_head={_subsection},even_running_head={_section}}
-  \else
+  }{
     \NewPageStyle{headings}{odd_running_head={_section},even_running_head={}}
-  \fi
+  }
 }{% book, article
-  \if@twoside
+  \legacy_if:nTF { @twoside } {
     \NewPageStyle{headings}{odd_running_head={_section},even_running_head={_chapter}}
-  \else
+  }{
     \NewPageStyle{headings}{odd_running_head={_chapter},even_running_head={}}
-  \fi
+  }
   \ModifyPageStyle{headings}{mark_format={_chapter={第\thechapter 章\quad #1}}}
 }
-\if@tate
+\legacy_if:nTF { @tate } {
   \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},clear_markcommand=false}
   \NewPageStyle{myheadings}{nombre=\thepage,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false}
-  \if@twoside
+  \legacy_if:nTF { @twoside } {
     \ModifyPageStyle{plain}{nombre_position={top-left}}
     \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-left,running_head_position=top-left}
     \ModifyPageStyle{myheadings}{nombre_position=bottom-left,running_head_position=top-left}
-  \else
+  }{
     \ModifyPageStyle{plain}{nombre_position={top-center}}
     \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center}
     \ModifyPageStyle{myheadings}{nombre_position=bottom-center,running_head_position=top-center}
-  \fi
-\else% yoko
+  }
+}{% yoko
   \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},nombre_position={bottom-center},clear_markcommand=false}
   \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center}
   \NewPageStyle{myheadings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false}
-\fi
+}
 \ModifyPageStyle{plain}{font=\small}
 \ModifyPageStyle{headings}{font=\small}
 \ModifyPageStyle{myheadings}{font=\small}
 
 %.. 注
 \jlreqsetup{reference_mark=inline}
-\if@tate
+\legacy_if:nTF { @tate } {
   \jlreqsetup{footnote_indent=1\jlreq@zw}% 根拠��
-\else
+}{
   \jlreqsetup{footnote_indent=0pt}% （4.2.5.b）
-\fi
+}
 \jlreqsetup{footnote_second_indent=1\jlreq@zw}
 \jlreqsetup{endnote_second_indent=2\jlreq@zw}
 \jlreqsetup{endnote_position=headings}
-\ifdim\jlreq@sidenote@length>0pt
+\dim_compare:nT { \jlreq@sidenote@length>0pt } {
   \jlreqsetup{sidenote_type=number}
   \jlreqsetup{sidenote_symbol=＊,sidenote_keyword_font={}}
-\fi
+}
 
 %.. キャプション
 \jlreqsetup{
@@ -6087,7 +6103,7 @@
 }
 
 %.. 箇�書�
-\if@tate
+\legacy_if:nTF { @tate } {
   \renewcommand{\theenumi}{\jlreq@Kanji{enumi}}
   \renewcommand{\theenumii}{\tatechuyoko*{\@arabic\c@enumii}}
   \renewcommand{\theenumiii}{\tatechuyoko*{\@arabic\c@enumiii}}
@@ -6096,7 +6112,7 @@
   \newcommand{\labelenumii}{\theenumii}
   \newcommand{\labelenumiii}{\theenumiii}
   \newcommand{\labelenumiv}{\theenumiv}
-\else
+}{
   \renewcommand{\theenumi}{\@arabic\c@enumi}
   \renewcommand{\theenumii}{\@alph\c@enumii}
   \renewcommand{\theenumiii}{\@roman\c@enumiii}
@@ -6105,20 +6121,20 @@
   \newcommand{\labelenumii}{(\theenumii)\hspace{.5\jlreq@zw}}
   \newcommand{\labelenumiii}{\theenumiii.\hspace{.5\jlreq@zw}}
   \newcommand{\labelenumiv}{\theenumiv.\hspace{.5\jlreq@zw}}
-\fi
+}
 \renewcommand{\p@enumii}{\theenumi}
 \renewcommand{\p@enumiii}{\theenumi(\theenumii)}
 \renewcommand{\p@enumiv}{\p@enumiii\theenumiii}
 
 \newcommand{\labelitemi}{\hbox to 1\jlreq@zw{\hss\textbullet\hss}}
 %\newcommand{\labelitemi}{•}
-\if@tate
+\legacy_if:nTF { @tate } {
   \newcommand{\labelitemii}{â—‹}
   \newcommand{\labelitemiii}{＊}
-\else
+}{
   \newcommand{\labelitemii}{\hbox to 1\jlreq@zw{\hss\textendash\hss}}
   \newcommand{\labelitemiii}{\hbox to 1\jlreq@zw{\hss\textasteriskcentered\hss}}
-\fi
+}
 \newcommand{\labelitemiv}{\hbox to 1\jlreq@zw{\hss ・\hss}}
 
 % 見出��一�上�レベル�ら���ら��れ��る�を入れる．
@@ -6139,7 +6155,6 @@
 }
 
 %.. 引用
-\ExplSyntaxOn
 \jlreqsetup{
   quote_indent=2\jlreq@zw,
   quote_end_indent=0pt,
@@ -6170,11 +6185,11 @@
     mainmatter_precode = {},
     mainmatter_postcode = {},
   }
-  \if@openright
+  \legacy_if:nTF { @openright } {
     \jlreqsetup{backmatter_pagebreak=cleardoublepage}
-  \else
+  }{
     \jlreqsetup{backmatter_pagebreak=clearpage}
-  \fi
+  }
   \jlreqsetup{
     backmatter_pagestyle = plain,
     backmatter_counter = {
@@ -6193,50 +6208,49 @@
   }
 }
 \str_if_eq:VnTF \jlreq@article@type { article } {
-  \if@tate
+  \legacy_if:nTF { @tate } {
     \jlreqsetup{
       appendix_counter = {
         section = {value = 0, the = {\tatechuyoko*{\Alph{section}}}},
         subsection = {value = 0},
       }
     }
-  \else
+  }{
     \jlreqsetup{
       appendix_counter = {
         section = {value = 0, the = {\Alph{section}}},
         subsection = {value = 0},
       }
     }
-  \fi
+  }
  \jlreqsetup{appendix_heading = {},appendix_precode = {},appendix_postcode = {}}
 }{%book, report
-  \if@tate
+  \legacy_if:nTF { @tate } {
     \jlreqsetup{
       appendix_counter = {
         chapter = {value = 0, the = {\tatechuyoko*{\Alph{chapter}}}},
       }
     }
- \else
+  }{
     \jlreqsetup{
       appendix_counter = {
         chapter = {value = 0, the = {\Alph{chapter}}},
       }
     }
- \fi
- \jlreqsetup{
-   appendix_heading = {
-     chapter = {label_format = {付録\thechapter}}
-   },
-   appendix_postcode = {%
-     \str_if_eq:VnT \jlreq@current@pagestyle { headings } {
-       \def\chaptermark#1{\markboth{付録\thechapter\quad #1}{}}%
-       \ModifyPageStyle{headings}{mark_format={_chapter={付録\thechapter\quad #1}}}%
-     }{}%
-   },
-   appendix_precode = {}
- }
+  }
+  \jlreqsetup{
+    appendix_heading = {
+      chapter = {label_format = {付録\thechapter}}
+    },
+    appendix_postcode = {%
+      \str_if_eq:VnT \jlreq@current@pagestyle { headings } {
+        \def\chaptermark#1{\markboth{付録\thechapter\quad #1}{}}%
+        \ModifyPageStyle{headings}{mark_format={_chapter={付録\thechapter\quad #1}}}%
+      }{}%
+    },
+    appendix_precode = {}
+  }
 }
-\ExplSyntaxOff
 \jlreqsetup{theindex_pagestyle=plain}
 \jlreqsetup{year_style=seireki}
 \jlreqsetup{
@@ -6267,6 +6281,8 @@
   \onecolumn
   \raggedbottom
 \fi
+
+\ExplSyntaxOff
 \endinput
 
 
diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf
index 181f91ee69..a6547be669 100644
--- a/language/japanese/jlreq/jlreq.pdf
+++ b/language/japanese/jlreq/jlreq.pdf
diff --git a/macros/context/contrib/context-vim/VERSION b/macros/context/contrib/context-vim/VERSION
index 231e89b7a6..7c85282d38 100644
--- a/macros/context/contrib/context-vim/VERSION
+++ b/macros/context/contrib/context-vim/VERSION
@@ -1 +1 @@
-2021.05.31
+2021.07.22
diff --git a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl
index 05c89893d6..8fadebb780 100644
--- a/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl
+++ b/macros/context/contrib/context-vim/tex/context/third/vim/t-syntax-highlight.mkxl
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-syntax-highlight,
-%D      version=2021.05.24,
+%D      version=2021.05.31,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Code syntax highlighting,
 %D       author=Aditya Mahajan,
@@ -9,7 +9,7 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Code syntax highlighting (ver: 2021.05.24)}
+\writestatus{loading}{Code syntax highlighting (ver: 2021.05.31)}
 
 \startmodule    [syntax-highlight]
 \usemodule      [syntax-groups]
@@ -177,7 +177,7 @@
    \c!location=\v!paragraph,
    \c!style=\tttf,
    \c!color=,
-   \c!align={\v!flushleft,\v!nothyphenated}, 
+   \c!align={\v!flushleft}, 
    \c!filtercommand=echo, % placeholder
    \c!continue=yes,
    \c!read=\v!yes,
diff --git a/macros/context/contrib/context-vim/tex/context/third/vim/t-vim.tex b/macros/context/contrib/context-vim/tex/context/third/vim/t-vim.tex
index 21383e2405..16cee73bb0 100644
--- a/macros/context/contrib/context-vim/tex/context/third/vim/t-vim.tex
+++ b/macros/context/contrib/context-vim/tex/context/third/vim/t-vim.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-vim,
-%D      version=2021.05.23,
+%D      version=2021.05.31,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Vim syntax highlighting,
 %D       author=Aditya Mahajan,
@@ -9,18 +9,19 @@
 %D        email=adityam <at> ieee <dot> org,
 %D      license=Simplified BSD License]
 
-\writestatus{loading}{Vim syntax highlighting (ver: 2021.05.23)}
+\writestatus{loading}{Vim syntax highlighting (ver: 2021.05.31)}
 
 \startmodule [vim]
 \usemodule   [filter]           % loads module catcodes
 \usemodule   [syntax-highlight] % loads syntax-groups and filter module
 
+\unprotectmodulecatcodes
+
 \startinterface all
     \setinterfaceconstant {vimrc}           {vimrc}
     \setinterfaceconstant {vimcommand}      {vim\c!command}
 \stopinterface
 
-\unprotectmodulecatcodes
 
 \def\vimtyping@id          {vimtyping}
 \def\vimtyping@namespace   {@@@@\vimtyping@id}
@@ -215,7 +216,7 @@
         [Identifier]
 
     \definesyntaxgroup
-        [Condition,Repeat,Label,Operator,Keyword,Exception]
+        [Conditional,Repeat,Label,Operator,Keyword,Exception]
         [Statement]
 
     \definesyntaxgroup
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 8d62a25c7d..6f1bd7bf07 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -28,7 +28,7 @@
 %
 % \title{\sffamily easybook 文档类手册}
 % \author{瞿毅}
-% \date{2021/07/19\hskip\ccwd\relax v1.27K\thanks{\url{https://gitee.com/texl3/easybook}}}
+% \date{2021/07/22\hskip 1em\relax v1.27L\thanks{\url{https://gitee.com/texl3/easybook}}}
 %
 % \maketitle
 % \begin{abstract}
@@ -148,7 +148,7 @@
 %   cjkfont = <adobe|fandol|founder|mac|macnew|macold|ubuntu|windows|none>
 % \end{syntax}
 % 中文字体采用 \CTeX �集包�的字库并与其一致，具体�置方案�以查看 \CTeX 使用手册。它与 \opt{fontset} 选项是等效的，如果没有指定 \opt{cjkfont} 的值，将会自动检测用户的�作系统并选择相应的字体。
-% \changes{v1.27K}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体，原 \opt{font} 选项设置英文字体，中文字体使用 \CTeX 的字库。}
+% \changes{v1.27L}{2021/07/12}{新增 \opt{cjkfont} 选项设置中文字体，原 \opt{font} 选项设置英文字体，中文字体使用 \CTeX 的字库。}
 % \end{function}
 %
 % 如果需�使用其它中文字体，�以在�用选项 \opt{cjkfont = none} �，�使用 \pkg{xeCJK} �包的相关命令设置字体以�声明字体�：
@@ -535,10 +535,10 @@
 %   bodyfont = <(empty)>
 %   notefont = <(empty)>
 %   headfont = <(\tn{color}\{ctex@emph\}\tn{sffamily})>
-%   headindent = <刚性长度|(0\tn{ccwd})>
+%   headindent = <刚性长度|(0em)>
 %   spaceabove = <弹性长度|(0.75ex plus .1ex)>
 %   spacebelow = <弹性长度|(0.75ex plus .1ex)>
-%   spacepost = <刚性长度|(\tn{ccwd})>
+%   spacepost = <刚性长度|(1em)>
 %   headformat = <(\tn{NAME}\tn{space}\tn{NUMBER}\tn{NOTE})>
 %   brackets = \{<左括�>,<�括�>\}
 % \end{syntax}
@@ -612,7 +612,7 @@
 % \end{ctexexam}
 % 定义一个新的定�样��用于 \tn{declaretheorem} 的 \opt{style} 选项：
 % \begin{ctexexam}
-%   \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5\ccwd]{定�样��}
+%   \declaretheoremstyle[bodyfont = \rmfamily,spacepost = 0.5em]{定�样��}
 % \end{ctexexam}
 %
 % \subsection{页�尺寸}
@@ -672,7 +672,7 @@
 % \begin{ctexexam}
 %   \hdrset
 %     {
-%       chap-label  = [\thechapter]{\hspace{\ccwd}},
+%       chap-label  = [\thechapter]{\hspace{1em}},
 %       sec-mark    = \CTEXifname{\CTEXthesection——}{}#1
 %     }
 % \end{ctexexam}
@@ -705,9 +705,9 @@
 % \subsubsection{脚注格�}
 % \begin{function}[EXP,added = 2021-05-12,updated = 2021-07-14]{fnmargin,fnparskip,fnparindent,footnotetype,fnmark-pos,fnmark-num,fnmark-num,fnmark-form,fntext-form,afterfnmark}
 % \begin{syntax}
-%   fnmargin = <刚性长度|(0.75\tn{ccwd})>
+%   fnmargin = <刚性长度|(0.75em)>
 %   fnparskip = <弹性长度|(0ex)>
-%   fnparindent = <刚性长度|(2\tn{ccwd})>
+%   fnparindent = <刚性长度|(2em)>
 %   footnotetype = <(hang)|default|bottom>
 %   fnmark-pos = <normal|(super)>
 %   fnmark-num = <(plain)|pifont|pifont*|pifont-sans|pifont-sans*>
@@ -717,7 +717,7 @@
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{hdrset/...} \\
 % \changes{v1.25}{2021/05/12}{增加脚注样�设置选项。}
-% \changes{v1.27K}{2021/07/14}{增加脚注内容格�选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。}
+% \changes{v1.27L}{2021/07/14}{增加脚注内容格�选项 \opt{fntext-form} 和脚注类型选项 \opt{footnotetype}。}
 % \end{function}
 %
 % \begin{optdesc}
@@ -744,7 +744,7 @@
 %   format += <目录标题格�>
 %   indent = <目录标题左边缩进>
 %   rule = <目录引导线样�>
-%   numsep = <编��间�|(\tn{ccwd})>
+%   numsep = <编��间�|(1em)>
 % \end{syntax}
 % \ding{229} 以上选项路径为 \opt{tocset/(level)/...} \\
 % \opt{tocset} 将目录样�交给 \pkg{titletoc} 处�，\opt{(level)} 代表 part�chapter�section�subsection�figure�table 和 lstlisting 级别的目录，而使用 list 级别�以统一设置图片�表格和代�目录的样�。
@@ -770,7 +770,7 @@
 %       chapter     =
 %         {
 %           format  = \addvspace{8pt}\large,
-%           indent  = 1.5\ccwd,
+%           indent  = 1.5em,
 %           rule    = \tocrule[0.6pc](1.1){.}[\zihao{5}]
 %         }
 %     }
@@ -786,7 +786,7 @@
 %   belowoffset = <长度|(-1pc)>
 %   line-align = <(true)|false>
 %   hang = <true|(false)>
-%   numsep-all = <编��间�|(\tn{ccwd})>
+%   numsep-all = <编��间�|(1em)>
 %   indent-all = <目录标题左边缩进>
 %   rule-all = <目录引导线样�>
 % \end{syntax}
@@ -805,8 +805,8 @@
 %   \tocset
 %     {
 %       hang        = false,
-%       tocline-fig = 图 #1\hspace{\ccwd},
-%       tocline-lst = 代�\thelstlisting\hspace{\ccwd}
+%       tocline-fig = 图 #1\hspace{1em},
+%       tocline-lst = 代�\thelstlisting\hspace{1em}
 %     }
 %   \end{ctexexam}
 %   \item[line-align] \opt{line-align} 选项�以使目录引导线�边对�并与页���一定间隙，�则会与页�连接。
@@ -905,7 +905,7 @@
 %   \tn{end}\{hangparas\}
 % \end{syntax}
 % \tn{hangpara} 命令使其�的一个段���悬挂缩进，\env{hangparas} 环境使其中的段����悬挂缩进。缩进将以 \meta{缩进长度} 从�个段�的 \meta{缩进开始行数} 开始。
-% \changes{v1.27K}{2021/07/11}{增加悬挂缩进段�命令 \tn{hangpara} 和环境 \env{hangparas}。}
+% \changes{v1.27L}{2021/07/11}{增加悬挂缩进段�命令 \tn{hangpara} 和环境 \env{hangparas}。}
 % \end{function}
 %
 % \subsection{代�}
@@ -936,7 +936,7 @@
 %   color = <标题背景颜色�|(DeepSkyBlue)>
 %   title = <环境标题>
 %   number = <习题编�格�|(1.)>
-%   numsep = <编�与标题的间�|(0.5\tn{ccwd})>
+%   numsep = <编�与标题的间�|(0.5em)>
 %   label = <标签内容>
 % \end{syntax}
 % 第二个 \meta{键值列表} 在是�使用 + ��数时用法��，使用 + ��数时为 \pkg{tcolorbox} 的盒�选项，例如 \opt{boxrule} 和 \opt{fontupper}。�使用 + ��数时相当于设置 \tn{ctexset}\{section = {\#1}\} 键值选项列表，例如 \opt{format} 和 \opt{beforeskip}。\opt{number} 为短编�形�，应当包� A�a�I�i�或 1 其中一个符�。\opt{label} 选项用于设置习题环境的引用标签，它与标签格�命令 \tn{labelformat} 对应的计数器是 eb@exercise。
@@ -1056,7 +1056,7 @@
 % \begin{ctexexam}
 %   \labelformat{eb@theorem}{定� #1}
 %   \newcommand{\theoremhead}[1]
-%     {定� \UseCounter[chapter]{theorem}{\hspace{\ccwd}#1}}
+%     {定� \UseCounter[chapter]{theorem}{\hspace{1em}#1}}
 %   \theoremhead{定�标题}\label{thm:theorem}
 % \end{ctexexam}
 %
@@ -1069,6 +1069,43 @@
 % 除了以普通公�的方�，化学�还�用 \pkg{chemformula} 实现，无机化学�使用 \tn{ch} 命令书写。有机化学�推�在导言区载入 \pkg{chemfig} �包，使用 \tn{chemfig} 命令完�。
 % \end{function}
 %
+% \subsection{公�符�对照}
+% \begin{function}[added = 2021-07-22]{\seteqcomp,\symb,eqcomp}
+% \begin{syntax}
+%   \tn{seteqcomp}\marg{键值列表}
+%   \tn{symb*}\marg{符�}\oarg{引导符}
+%   \tn{begin}\{eqcomp\}\oarg{键值列表}\parg{键值列表}
+%   \  \tn{symb}\marg{符�}\oarg{引导符}<说明文字>
+%   \tn{end}\{eqcomp\}
+% \end{syntax}
+% 一些公�之��以使用基于列表环境的 \env{eqcomp} 进行符�对照。\tn{symb} 需�在环境内使用，带有星�的命令��独在文本段�使用。对照列表第二个 \meta{键值列表} 与 \pkg{enumitem} 的选项相�，一般较少用到，�以用于设置垂直间�等。第一个 \meta{键值列表} 也�以使用 \tn{seteqcomp} 全局设置，选项如下：
+% \changes{v1.27L}{2021/07/22}{增加公�符�对照环境 \env{eqcomp} 和命令 \tn{symb}。}
+% \end{function}
+%
+% \begin{function}{width,delim,space,item-align,delim-align,intro,font,mode}
+% \begin{syntax}
+%   width = <符�宽度|(2em)>
+%   delim = <引导符|(——)>
+%   space = <符�间隙|(0.25em)>
+%   item-align = <l|c|(r)>
+%   delim-align = <l|(c)|r>
+%   intro = <首行文字>
+%   font = <符�字体>
+%   mode = <(math)|text>
+% \end{syntax}
+% \end{function}
+%
+% \begin{optdesc}
+%   \item[width] 设置适当的符�宽度�以防止文字��和边界溢出等问题。
+%   \item[delim] 符�对照的引导符，\tn{symb} 的 \meta{引导符} 和对�方�是基于这个符�的宽度。
+%   \item[space] 符�间隙为引导符两侧与符�和说明文字间的�离。
+%   \item[item-align] 符�的对�方�，分为左（l）�中（c）和�（r）三�对�方�。
+%   \item[delim-align] 引导符的对�方�，分为左（l）�中（c）和�（r）三�对�方�。
+%   \item[intro] 符�对照的说明文字，应当为简短的几个字，�显示在第一行，其�为悬挂缩进的对照列表。
+%   \item[font] 符�的字体，数学和文本符�模�应采用��的字体命令，最�一个命令�以接�一个�数，这个�数为符�。
+%   \item[mode] 符�字体模�，�以为数学字体或者文本字体。
+% \end{optdesc}
+%
 % \subsection{引用}
 % \begin{function}[added = 2021-01-05,updated = 2021-07-15]{\ref,\footref,\labelformat}
 % \begin{syntax}
@@ -1290,7 +1327,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/07/19}{1.27K}
+\ProvidesExplClass{easybook}{2021/07/22}{1.27L}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -1525,7 +1562,7 @@
           {
             \bool_if:NTF \l__eb_title_newline_bool
               { \par\nobreak }
-              { \hspace{\ccwd} }
+              { \hspace{1em} }
           }
       },
     chapter         =
@@ -1540,7 +1577,7 @@
           {
             \bool_if:NTF \l__eb_title_newline_bool
               { \par\nobreak\vskip 1.5pc }
-              { \hspace{\ccwd} }
+              { \hspace{1em} }
           },
         beforeskip  = -1.5ex,
         afterskip   = 3ex,
@@ -1551,7 +1588,7 @@
       {
         hang        = true,
         format      = \color{ctex@frame}\sffamily\Large,
-        aftername   = \hspace{0.5\ccwd},
+        aftername   = \hspace{0.5em},
         beforeskip  = 1.5ex plus .2ex minus .1ex,
         afterskip   = 1.5ex plus .2ex minus .1ex
       },
@@ -1559,7 +1596,7 @@
       {
         hang        = true,
         format      = \color{ctex@frame}\sffamily\large,
-        aftername   = \hspace{0.5\ccwd},
+        aftername   = \hspace{0.5em},
         beforeskip  = 1.3ex plus .2ex minus .1ex,
         afterskip   = 1.3ex plus .2ex minus .1ex
       },
@@ -1567,7 +1604,7 @@
       {
         hang        = true,
         format      = \color{ctex@frame}\sffamily,
-        aftername   = \hspace{0.5\ccwd},
+        aftername   = \hspace{0.5em},
         beforeskip  = \parskip,
         afterskip   = \parskip
       }
@@ -1584,7 +1621,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/07/19}{1.27K}
+\ProvidesExplPackage{easybase}{2021/07/22}{1.27L}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \int_to_arabic:n { v }
@@ -1834,7 +1871,7 @@
   {
     vmargin         = 2.54cm,
     hmargin         = 3.17cm,
-    columnsep       = 2\ccwd,
+    columnsep       = 2em,
     headheight      = 2.04cm,
     headsep         = 0.5cm,
     footskip        = 0.79cm,
@@ -1932,11 +1969,11 @@
     subsec-mark .initial:n  =
       { \CTEXifname{\eb@mark@subsection@label}{}#1 },
     chap-label .code:n      = \eb_mark_chapter_number_bool:n {#1},
-    chap-label .initial:n   = \hspace{\ccwd},
+    chap-label .initial:n   = \hspace{1em},
     sec-label .code:n       = \eb_mark_section_number_bool:n {#1},
-    sec-label .initial:n    = \hspace{0.5\ccwd},
+    sec-label .initial:n    = \hspace{0.5em},
     subsec-label .code:n    = \eb_mark_subsection_number_bool:n {#1},
-    subsec-label .initial:n = \hspace{0.5\ccwd},
+    subsec-label .initial:n = \hspace{0.5em},
 
     headrule .tl_gset:N     = \headrule,
     headrule .initial:n     = \markrule{\l__eb_rule_width_dim},
@@ -2010,11 +2047,11 @@
 \ctex_define:nn { hdrset }
   {
     fnmargin .dim_set:N             = \footnoteindent,
-    fnmargin .initial:n             = 0.75\ccwd,
+    fnmargin .initial:n             = 0.75em,
     fnparskip .skip_set:N           = \footparskip,
     fnparskip .initial:n            = 0ex,
     fnparindent .dim_set:N          = \footparindent,
-    fnparindent .initial:n          = 2\ccwd,
+    fnparindent .initial:n          = 2em,
     fntext-form .tl_set:N           = \l__eb_fntext_format_tl,
 
     fnmark-pos .tl_set:N            = \l__eb_fnmark_position_tl,
@@ -2342,7 +2379,7 @@
         subsection/numsep = #1,
         list/numsep       = #1
       },
-    numsep-all .initial:n = \ccwd,
+    numsep-all .initial:n = 1em,
     indent-all .meta:n    =
       {
         part/indent       = #1,
@@ -2385,25 +2422,25 @@
 \ctex_set:nn { tocset }
   {
     part/format       = \addvspace{1pc}\sffamily\large,
-    part/indent       = 0\ccwd,
+    part/indent       = 0em,
     part/rule         = \tocrule{}[\bfseries],
 
     chapter/format    = \addvspace{1pc}\sffamily\large,
-    chapter/indent    = 0\ccwd,
+    chapter/indent    = 0em,
     chapter/rule      = \tocrule{$\cdot$}[\bfseries],
 
     section/format    = \addvspace{0.35pc},
     section/indent    =
-      { \bool_if:NTF \l__eb_class_book_bool { 1.5\ccwd } { 0\ccwd } },
+      { \bool_if:NTF \l__eb_class_book_bool { 1.5em } { 0em } },
     section/rule      = \tocrule{$\cdot$},
 
     subsection/format = \addvspace{0.35pc},
     subsection/indent =
-      { \bool_if:NTF \l__eb_class_book_bool { 3.8\ccwd } { 1.4\ccwd } },
+      { \bool_if:NTF \l__eb_class_book_bool { 3.8em } { 1.4em } },
     subsection/rule   = \tocrule{$\cdot$},
 
     list/format       = \addvspace{0.2pc},
-    list/indent       = 0\ccwd,
+    list/indent       = 0em,
     list/rule         = \tocrule{$\cdot$},
     list/belowoffset  =
       { \bool_if:NTF \l__eb_class_book_bool { 0pc } { 0.15pc } }
@@ -2828,7 +2865,6 @@
     unknown .code:n = \eb_msg_unknown_option:n { spread }
   }
 
-\DeclareCaptionLabelSeparator{ccwd}{\hspace{\ccwd}}
 \DeclareCaptionLabelFormat{parens}{\bothIfFirst{#1}{~}(#2)}
 \DeclareCaptionFont{eb@table@font}{\l__eb_subfont_table_tl}
 \DeclareCaptionFont{eb@figure@font}{\l__eb_subfont_figure_tl}
@@ -2838,7 +2874,7 @@
     format          = hang,
     font = {stretch = \fp_use:N \l__eb_spread_caption_fp},
     labelfont       = {color = ctex@frame},
-    labelsep        = ccwd,
+    labelsep        = quad,
     singlelinecheck = true,
     belowskip       = 0pt,
     aboveskip       = 10pt
@@ -2935,21 +2971,91 @@
 \SetEnumitemValue{ref}{enumiii}{\arabic{enumi}.\alph{enumii}.\roman*}
 \setlist
   {
-    labelsep = 0.75\ccwd,listparindent = 2\ccwd,leftmargin = *,
+    labelsep = 0.75em,listparindent = 2em,leftmargin = *,
     itemsep = 0.75ex plus .1ex,topsep = 0.75ex plus .1ex,
     partopsep = 0ex,parsep = 0ex
   }
 \newlist{eb@outline@list}{itemize}{1}
 \newlist{eb@exercise@list}{enumerate}{2}
+\newlist{eb@eqcomp@list}{description}{1}
 \setlist[eb@outline@list]{label = outline,itemsep = 0.5ex plus .1ex}
-\setlist[eb@exercise@list]{labelsep = 0.5\ccwd}
+\setlist[eb@exercise@list]{labelsep = 0.5em}
+\setlist[eb@eqcomp@list]{labelsep = 0em,nosep}
 \setlist[itemize,1]{label = bullet}
 \setlist[itemize,2]{label = endash}
 \setlist[itemize,3]{label = asterisk}
 \setlist[enumerate,1]{label = arabic,ref = \arabic*}
 \setlist[enumerate,2]{label = alph,ref = enumii}
 \setlist[enumerate,3]{label = roman,ref = enumiii,labelwidth = *}
-\setlist[description]{font = sf,labelwidth = *,leftmargin = 2\ccwd}
+\setlist[description]{font = sf,labelwidth = *,leftmargin = 2em}
+
+\keys_define:nn { eb/eqcomp }
+  {
+    width .dim_set:N        = \l__eb_eqsymb_width_dim,
+    width .initial:n        = 2em,
+    delim .tl_set:N         = \l__eb_eqsymb_delim_tl,
+    delim .initial:n        = { —— },
+    space .dim_set:N        = \l__eb_eqsymb_space_dim,
+    space .initial:n        = 0.25em,
+    item-align .tl_set:N    = \l__eb_eqsymb_item_align_tl,
+    item-align .initial:n   = r,
+    delim-align .tl_set:N   = \l__eb_eqsymb_delim_align_tl,
+    delim-align .initial:n  = c,
+    intro .tl_set:          = \l__eb_eqsymb_intro_tl,
+    font .tl_set:N          = \l__eb_eqsymb_font_tl,
+    mode .tl_set:N          = \l__eb_eqsymb_mode_tl,
+    mode .initial:n         = math
+  }
+\cs_new_protected:Npn \seteqcomp #1
+  { \keys_set:nn { eb/eqcomp} {#1} }
+
+\cs_new:Npn \eb@itembox { \item\makebox }
+\cs_new:Npn \eb_eqsymb_left_margin_calc:
+  {
+    \hbox_set:Nn \l_tmpa_box { \l__eb_eqsymb_delim_tl }
+    \hbox_set:Nn \l_tmpb_box { \l__eb_eqsymb_intro_tl }
+    \dim_set:Nn \l_tmpa_dim
+      {
+        \box_wd:N \l_tmpb_box +
+        \l__eb_eqsymb_width_dim +
+        \l__eb_eqsymb_space_dim +
+        \box_wd:N \l_tmpa_box +
+        \l__eb_eqsymb_space_dim
+      }
+  }
+\NewDocumentEnvironment{eqcomp}{oD(){}+b}
+  {
+    \IfValueT{#1}{\keys_set:nn { eb/eqcomp } {#1}}
+    \eb_eqsymb_left_margin_calc:
+    \begin{eb@eqcomp@list}[#2]
+      #3
+    \end{eb@eqcomp@list}
+  }{}
+\NewDocumentCommand{\symb}{smO{\l__eb_eqsymb_delim_tl}}
+  {
+    \IfBooleanTF{#1}
+      {
+        \eb_eqsymb_left_margin_calc:
+        \makebox
+      }
+      {\eb@itembox}[\l_tmpa_dim]
+      {
+        \makebox[\box_wd:N \l_tmpb_box]{\l__eb_eqsymb_intro_tl}
+        \makebox[\l__eb_eqsymb_width_dim][\l__eb_eqsymb_item_align_tl]
+          {
+            \tl_use:N \l__eb_eqsymb_font_tl
+              {
+                \tl_if_eq:NnT \l__eb_eqsymb_mode_tl { math } 
+                  { \ensuremath }{#2}
+              }
+          }
+        \hspace{\l__eb_eqsymb_space_dim}
+        \makebox[\box_wd:N \l_tmpa_box][\l__eb_eqsymb_delim_align_tl]{#3}
+        \hspace{\l__eb_eqsymb_space_dim}
+      }
+    \tl_clear:N \l__eb_eqsymb_intro_tl
+    \ignorespaces
+  }
 
 \cs_new_protected:Npn \eb_thm_name_set:nnn #1#2#3
   {
@@ -3030,9 +3136,9 @@
   {
     spaceabove    = 0.75ex plus .1ex,
     spacebelow    = 0.75ex plus .1ex,
-    headindent    = 0\ccwd,
+    headindent    = 0em,
     headfont      = \color{ctex@emph}\sffamily,
-    postheadspace = \ccwd,
+    postheadspace = 1em,
     within        = \bool_if:NT \l__eb_class_book_bool { chapter },
     headformat    = \NAME\space\NUMBER\NOTE
   }
@@ -3059,7 +3165,7 @@
 \setchemformula
   {
     math-scripts      = false,
-    charge-hshift     = 0.25\ccwd,
+    charge-hshift     = 0.25em,
     subscript-vshift  = -0.2ex
   }
 \IfPackageAtLeastTF{siunitx}{2021/06/22}
@@ -3121,7 +3227,7 @@
     title .tl_set:N   = \eb@tc@exercise@title,
     title .initial:n  = \c__eb_name_exercise_tl,
     numsep .dim_set:N = \eb@toc@exercise@numsep,
-    numsep .initial:n = 0.5\ccwd,
+    numsep .initial:n = 0.5em,
     label .tl_set:N   = \eb@tc@exercise@label
   }
 \cs_new_protected:Npn \setexercise #1
@@ -3431,9 +3537,9 @@
   {
     \keys_set_known:nn { ctex }
       {
-        contentsname        = 目\hspace{\ccwd}录,
-        indexname           = 索\hspace{\ccwd}引,
-        abstractname        = 摘\hspace{\ccwd}�,
+        contentsname        = 目\hspace{1em}录,
+        indexname           = 索\hspace{1em}引,
+        abstractname        = 摘\hspace{1em}�,
         listfigurename      = 图片索引,
         listtablename       = 表格索引,
         lstlistlistingname  = 代�索引,
@@ -3456,7 +3562,7 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/19}{1.27K}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/07/22}{1.27L}
   {Customization of tcolorbox for easybook}
 
 \cs_new_protected:Npn \eb_tcb_theorem_set:n #1
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 46474da34d..2462854b67 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 83907537c6..0c0c7545fa 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,16 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 
 ## [Unreleased]
 
+## [v3.0.22]
+
+### Changed
+- Support `table-text-alignment = none` for interoperation with
+  `tabularray` (issue #510)
+
+### Fixed
+- Support for `input-remove` (issue #511)
+- Interaction with `cellspace` package (issue #512)
+
 ## [v3.0.21]
 
 ### Fixed
@@ -1439,7 +1449,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
 ### Added
 - First public testing release (as `si`)
 
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.21...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.22...HEAD
+[v3.0.22]: https://github.com/josephwright/siunitx/compare/v3.0.21...v3.0.22
 [v3.0.21]: https://github.com/josephwright/siunitx/compare/v3.0.20...v3.0.21
 [v3.0.20]: https://github.com/josephwright/siunitx/compare/v3.0.19...v3.0.20
 [v3.0.19]: https://github.com/josephwright/siunitx/compare/v3.0.18...v3.0.19
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 513b2d7da8..4327acc11e 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 59a6dd8129..61ca7af103 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -514,6 +514,7 @@
 \cs_generate_variant:Nn \tl_if_blank:nTF { f }
 \cs_generate_variant:Nn \tl_if_blank_p:n { f }
 \cs_generate_variant:Nn \tl_if_in:NnTF { NV }
+\cs_generate_variant:Nn \tl_remove_all:Nn { NV }
 \cs_generate_variant:Nn \tl_replace_all:Nnn { NnV }
 %    \end{macrocode}
 %
@@ -814,6 +815,9 @@
         }
       \tl_set_eq:NN \l_@@_input_tl \l_@@_arg_tl
       \siunitx_number_normalize_symbols:N \l_@@_arg_tl
+      \protected@edef \l_@@_input_ignore_tl { \l_@@_input_ignore_tl }
+      \tl_if_empty:NF \l_@@_input_ignore_tl
+        { \tl_remove_all:NV \l_@@_arg_tl \l_@@_input_ignore_tl }
       \tl_if_empty:NF \l_@@_arg_tl
         { \@@_parse_comparator: }
       \@@_parse_check:
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index efd2c6bc9b..64ef013e17 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -200,11 +200,12 @@
 %
 % \begin{function}{table-text-alignment}
 %   \begin{syntax}
-%     |table-text-alignment| = |center|\verb"|"|left|\verb"|"|right|
+%     |table-text-alignment| = |center|\verb"|"|left|\verb"|"|none|\verb"|"|right|
 %   \end{syntax}
 %   Selects the alignment of non-numerical content with the margins of the
 %   table cell (or other boundary). See also |table-alignment| and
-%   |table-number-alignment|. The standard setting is |center|.
+%   |table-number-alignment|. Notice the additional support for |none| here.
+%   The standard setting is |center|.
 % \end{function}
 %
 % \end{documentation}
@@ -599,7 +600,8 @@
 %    \end{macrocode}
 % \end{variable}
 %
-% \begin{macro}{\@@_align_center:n, \@@_align_left:n, \@@_align_right:n}
+% \begin{macro}
+%   {\@@_align_center:n, \@@_align_left:n, \@@_align_right:n, \@@_align_none:n}
 % \begin{macro}{\@@_align_auxi:nn, \@@_align_auxii:nn}
 %   The beginning and end of each table cell have to adjust the position of
 %   the content using glue. When \pkg{colortbl} is loaded the glue is done in
@@ -613,6 +615,13 @@
   { \@@_align_auxi:nn {#1} { 0pt } }
 \cs_new_protected:Npn \@@_align_right:n #1
   { \@@_align_auxi:nn {#1} { 0pt~plus~1fill } }
+\cs_new_protected:Npn \@@_align_none:n #1
+  {
+    \bool_if:NTF \l_@@_fixed_width_bool
+      { \hbox_to_wd:nn \l_@@_column_width_dim }
+      { \use:n }
+        {#1}
+  }
 \cs_new_protected:Npn \@@_align_auxi:nn #1#2
   {
     \bool_if:NTF \l_@@_fixed_width_bool
@@ -656,7 +665,7 @@
 \keys_define:nn { siunitx }
   {
     table-text-alignment .choices:nn =
-      { center , left , right }
+      { center , left , right , none }
       { \tl_set:Nn \l_@@_align_text_tl {#1} } ,
   }
 \tl_new:N \l_@@_align_text_tl
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index 8f9b2dab57..73f54d71eb 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
 %
 % Identify the package and give the over all version information.
 %    \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2021-07-20} {3.0.21}
+\ProvidesExplPackage {siunitx} {2021-07-22} {3.0.22}
   {A comprehensive (SI) units package}
 %    \end{macrocode}
 %
@@ -472,14 +472,16 @@
 %   Creating numerical columns requires that these are declared before anything
 %   else in \cs{NC@list}: this is necessary to work with optional arguments.
 %   This means a bit of manual effort after the simple declaration of a new
-%   column type. The token assigned to the column type is not fixed as this
-%   allows the same code to be used in compatibility with version~$2$.
+%   column type.
 %    \begin{macrocode}
 \cs_new_protected:Npn \@@_declare_column:Nnn #1#2#3
   {
     \cs_if_exist:cT { NC@find@ #1 }
       {
         \cs_undefine:c { NC@find@ #1 }
+        \cs_set_protected:Npn \@@_tmp:w ##1 \NC@do #1 ##2 \q_stop
+          { \NC@list {##1##2} }
+        \exp_after:wN \@@_tmp:w \the \NC@list \q_stop
         \msg_warning:nnn { siunitx } { column-overwritten } {#1}
       }
     \newcolumntype {#1} { }
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 041c2f21c7..0d5c442a74 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index a97ab0bc58..c37e3682e0 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -2418,20 +2418,20 @@ to the layout of tabular material (Table~\ref{tab:opt:tables}).
 \DescribeOption{table-alignment-mode}
 The method used by \pkg{siunitx} to align numbers is selected using the
 \opt{table-alignment-mode} option, which may be one of \opt{marker},
-\opt{format} or \meta{none}. With the standard setting, \meta{marker}, the
+\opt{format} or \meta{none}. With the standard setting, \opt{marker}, the
 package centers the decimal marker in a tabular column, potentially leaving
-white space at the shorter end of a number. The \meta{format} mode uses
-information from the \meta{table-format} key to construct a model: this is then
+white space at the shorter end of a number. The \opt{format} mode uses
+information from the \opt{table-format} key to construct a model: this is then
 used to define the space available to a number. For asymmetrical numbers, this
 method is strongly preferable. Finally, \opt{none} disables alignment entirely:
 numbers are simply parsed.
 
 \DescribeOption{table-number-alignment}
-When \opt{table-alignment-mode} is set to \meta{format} or \meta{none}, the
+When \opt{table-alignment-mode} is set to \opt{format} or \opt{none}, the
 placement of the number \enquote{block} within the cell as a whole is set by
-the \meta{table-number-alignment} option, which may be one of \meta{left},
-\meta{center} or \meta{right}. (When \opt{table-alignment-mode} is set to
-\meta{marker}, the decimal marker is always centered in the cell.) The
+the \opt{table-number-alignment} option, which may be one of \opt{left},
+\opt{center} or \opt{right}. (When \opt{table-alignment-mode} is set to
+\opt{marker}, the decimal marker is always centered in the cell.) The
 different alignment choices are illustrated in Table~\ref{tab:S:align}, which
 uses somewhat exaggerated column headings to show the relative position of the
 cell contents.
@@ -2485,7 +2485,7 @@ Table~\ref{tab:S:parse}.
 
 \DescribeOption{table-format}
 When the \opt{table-alignment-mode} is set to \opt{format}, \pkg{siunitx} uses
-the information set in \meta{table-format} to construct a \enquote{model} which
+the information set in \opt{table-format} to construct a \enquote{model} which
 defines the space to reserve for a number. The \opt{table-format} key is
 interpreted in much the same way as a table cell. The numerical part should
 consist of a number showing how many figures to reserve in each part of the
@@ -2805,7 +2805,10 @@ the numbers themselves right-aligned (Table~\ref{tab:width:special}).
 Cell contents which are not part of a number can be protected using braces, as
 illustrated. Cells which contain no numerical data at all are aligned using the
 setting specified by the \opt{table-text-alignment} option, which recognises
-the values \opt{center}, \opt{left} and \opt{right} (Table~\ref{tab:S:text}).
+the values \opt{center}, \opt{left}, \opt{none} and \opt{right}
+(Table~\ref{tab:S:text}). The setting \opt{none} is intended for use with
+the package \pkg{tabularray}, which carries out its own alignment of textual
+values.
 \begin{LaTeXdemo}[code and float]
   \begin{table}
     \caption{Aligning text in \texttt{S} columns.%
diff --git a/macros/latex/contrib/spbmark/spbmark.dtx b/macros/latex/contrib/spbmark/spbmark.dtx
index 87e40645db..33498e535e 100644
--- a/macros/latex/contrib/spbmark/spbmark.dtx
+++ b/macros/latex/contrib/spbmark/spbmark.dtx
@@ -21,9 +21,9 @@
 %</driver>
 % \fi
 %
-% \title{\pkg{spbmark} -- Superscript and subscript of text}
+% \title{\pkg{spbmark} -- Customize superscripts and subscripts}
 % \author{Qu Yi}
-% \date{2021/06/30\hskip 1em\relax v1.01\thanks{\url{https://github.com/texl3/spbmark}}}
+% \date{2021/07/22\hskip 1em\relax v1.02\thanks{\url{https://github.com/texl3/spbmark}}}
 %
 % \maketitle
 % \begin{abstract}
@@ -60,7 +60,7 @@
 % The \meta{code} is used to format superscripts and subscripts, and can insert commands such as fonts or colors. The last command in the code can take an argument, which is either a superscript or a subscript.
 %
 % \begin{function}[added = 2021-06-30]{\sp,\sb,\spb,\textsuperscript,\textsubscript}
-% Except for the \tn{spb} command which is equivalent to \tn{supersub}, the others are \LaTeX{} kernel commands. If you use the \texttt{newsupb} package options then they will be redefined to make the command shorter, see section \ref{sec:macro package options}.
+% Except for the \tn{spb} command which is equivalent to \tn{supersub}, the others are \LaTeX{} kernel commands. If you use the \texttt{newsupb} package option then they will be redefined to make the command shorter, see section \ref{sec:macro package options}.
 %
 % If you need to use the original definitions of \tn{textsuperscript} and \tn{textsubscript}, then \tn{spb@textsuperscript@save} and \tn{spb@textsubscript@save} will be available. If you need to use the original definitions of \tn{sp} and \tn{sb}, then \tn{spb@sp@save} and \tn{spb@sb@save} will be available.
 % \end{function}
@@ -136,7 +136,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2018/12/31]
 \RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{spbmark}{2021/06/30}{1.01}
+\ProvidesExplPackage{spbmark}{2021/07/22}{1.02}
   {Customize superscripts and subscripts}
 
 \cs_new_protected:Npn \spb_define:n { \keys_define:nn { spbmark } }
@@ -222,12 +222,16 @@
       }
       {
         \IfBooleanTF{##1}
-          {\spb_tmp_hboxa_set:n { $##4{\spb_math:nn {#1} {##5}}$ }}
           {
+            \spb_tmp_hboxa_set:n
+              { \ensuremath{##4{\spb_math:nn {#1} {##5}}} }
+          }{
             \mode_if_math:TF
-              { \spb_tmp_hboxa_set:n { $##4{\spb_math:nn {#1} {##5}}$ } }
               {
                 \spb_tmp_hboxa_set:n
+                  { \ensuremath{##4{\spb_math:nn {#1} {##5}}} }
+              }{
+                \spb_tmp_hboxa_set:n
                   { ##4{\use:c { spb@text#1script@save }{##5}} }
               }
           }
@@ -245,13 +249,13 @@
   {
     \IfBooleanTF{#1}
       {
-        \spb_tmp_hboxa_set:n { $#4{\spb@sp@save{#5}}$ }
-        \spb_tmp_hboxb_set:n  { $#8{\spb@sb@save{#6}}$ }
+        \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} }
+        \spb_tmp_hboxb_set:n  { \ensuremath{#8{\spb@sb@save{#6}}} }
       }{
         \mode_if_math:TF
           {
-            \spb_tmp_hboxa_set:n { $#4{\spb@sp@save{#5}}$ }
-            \spb_tmp_hboxb_set:n  { $#8{\spb@sb@save{#6}}$ }
+            \spb_tmp_hboxa_set:n { \ensuremath{#4{\spb@sp@save{#5}}} }
+            \spb_tmp_hboxb_set:n  { \ensuremath{#8{\spb@sb@save{#6}}} }
           }
           {
             \spb_tmp_hboxa_set:n { #4{\spb@textsuperscript@save{#5}} }
diff --git a/macros/latex/contrib/spbmark/spbmark.pdf b/macros/latex/contrib/spbmark/spbmark.pdf
index 7c108609cb..541ea467ed 100644
--- a/macros/latex/contrib/spbmark/spbmark.pdf
+++ b/macros/latex/contrib/spbmark/spbmark.pdf
diff --git a/macros/latex/contrib/stackengine/stackengine.pdf b/macros/latex/contrib/stackengine/stackengine.pdf
index 829e001d2d..796a9e9cda 100644
--- a/macros/latex/contrib/stackengine/stackengine.pdf
+++ b/macros/latex/contrib/stackengine/stackengine.pdf
diff --git a/macros/latex/contrib/stackengine/stackengine.sty b/macros/latex/contrib/stackengine/stackengine.sty
index d99282df7d..4e37b5e2dd 100644
--- a/macros/latex/contrib/stackengine/stackengine.sty
+++ b/macros/latex/contrib/stackengine/stackengine.sty
@@ -1,6 +1,6 @@
-\def\stackengineversionnumber{v4.1}
+\def\stackengineversionnumber{v4.11}
 \ProvidesPackage{stackengine}
-[2021/07/15 \stackengineversionnumber\ 
+[2021/07/22 \stackengineversionnumber\ 
  Stacking text and objects in convenient ways]
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -88,6 +88,9 @@
 %       -Introduce \lstackMath and \lstackText as local versions of
 %        \stackMath and \stackText (which are global).
 %       -Eliminated \usestackstrut (became internal \@usestackstrut)
+% V4.11 -Renamed \@backgroundbox to \se@backgroundbox, to avoid
+%        conflict with adjustbox package.  Thanks to
+%        samuel.wein AT uni-tuebingen.de for the tip.
 \RequirePackage{etoolbox}
 \RequirePackage{listofitems}% REQUIRES listofitems.sty AND listofitems.tex
 \usepackage{calc}
@@ -102,7 +105,7 @@
 \newsavebox\@addedbox
 \newsavebox\@anchorbox
 \newsavebox\@insetbox
-\newsavebox\@backgroundbox
+\newsavebox\se@backgroundbox
 \newsavebox\stackedbox
 \newsavebox{\@centerbox}
 \newcounter{ROWcellindex@}
@@ -363,13 +366,13 @@
 
 %\stackinset{l/c/r}{x}{b/c/t}{y}{inset}{anchor}
 \newcommand*\stackinset[6]{%
-  \sbox\@backgroundbox{\stack@delim#6\stack@delim}%
+  \sbox\se@backgroundbox{\stack@delim#6\stack@delim}%
   \sbox\@insetbox{\stack@delim#5\stack@delim}%
   \ifstrequal{#4}{}%
     {\setlength{\stack@tmplength}{0pt}}%
     {\setlength{\stack@tmplength}{#4}}%
   \if c#3%
-    \setlength{\temp@stkl}{\ht\@backgroundbox+\dp\@backgroundbox%
+    \setlength{\temp@stkl}{\ht\se@backgroundbox+\dp\se@backgroundbox%
       -\ht\@insetbox-\dp\@insetbox}%
     \addtolength{\stack@tmplength}{.5\temp@stkl}%
   \fi%
@@ -381,7 +384,7 @@
   \else%
     \def\conditioned@inset{\stack@lroffset\usebox{\@insetbox}\stack@lroffset}%
   \fi%
-  \stackengine{-\stack@tmplength}{\usebox{\@backgroundbox}}%
+  \stackengine{-\stack@tmplength}{\usebox{\se@backgroundbox}}%
     {\conditioned@inset}{\inset@valign{#3}}{#1}{\quietstack}{T}{S}%
 }
 
diff --git a/macros/latex/contrib/tiscreen/README b/macros/latex/contrib/tiscreen/README
index dd49e6c91b..b7e593c24e 100644
--- a/macros/latex/contrib/tiscreen/README
+++ b/macros/latex/contrib/tiscreen/README
@@ -4,6 +4,7 @@ This package mimics the screen of older Texas instruments dot matrix display
 calculators, specifically the TI-82 STATS.
 
 Changes:
+- 2021/07/22 Added bracket symbols
 - 2021/06/10 Simplified example code in documentation
 - 2021/06/07 Simplified characters table in documentation
 - 2021/06/01 Added more characters
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
index ff9ccf19b0..33e5b2d735 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.pdf
diff --git a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
index 925cb809f8..dfe6216dc6 100644
--- a/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
+++ b/macros/latex/contrib/tiscreen/doc/tiscreen-doc.tex
@@ -6,7 +6,6 @@
 \usepackage[color]{tiscreen}
 \usepackage{multicol}
 \usepackage{hyperref}
-\usepackage{xspace}
 \usepackage{array}
 \usepackage{fancyvrb-ex}
 \fvset{
@@ -18,8 +17,7 @@
 }
 
 \newcommand{\LCDsymb}[1]{\large \textLCD{1}|{#1}~|}
-\newcommand{\LCDcode}[1]{\texttt{\{#1\}}}
-\newcommand{\LCDcmd}{\textbackslash\texttt{LCD}\xspace}
+\newcommand{\LCDcmd}{\texttt{\textbackslash LCD}}
 
 \title{TI calculator display\\{\small(TI-82 STATS)}}
 \author{Mustafa Ibrahim}
@@ -27,6 +25,7 @@
 \begin{document}
 
 \maketitle
+
 \begin{center}
 \tiscreen
 |10^6*(4^7+1){rarrow}X  |
@@ -38,8 +37,8 @@
 |{fcur}               |
 |                |
 \end{center}
-\tableofcontents
-\newpage
+
+\tableofcontents\newpage
 
 \section{Quickstart}
 
@@ -57,10 +56,10 @@
 |                |
 \end{SideBySideExample}
 
-
 \section{Package option(s)}
 \subsection{Color}
-Using the \texttt{color} option will change the colors used by the \LCDcmd
+
+Using the \texttt{color} option will change the colors used by the \LCDcmd{}
 command. The colors are defined as \texttt{tiscreenfg} (foreground. i.e. font
 color) and \texttt{tiscreenbg} (background). These colors can be redefined like
 this:
@@ -72,10 +71,10 @@ this:
 \end{Verbatim}
 
 \section{LCD size}
-The default LCD size is $8\times 16$ (the size of the TI-82
-STATS). It can be changed by redefining the variables used to
-determine the size of the display or by using the original
-\LCDcmd command.
+
+The default LCD size is $8 \times 16$ (the size of the TI-82 STATS). It can be
+changed by redefining the variables used to determine the size of the display
+or by using the original \LCDcmd{} command.
 
 \begin{Verbatim}
 % First method (For entire document)
@@ -92,33 +91,40 @@ determine the size of the display or by using the original
 \end{Verbatim}
 
 \section{Additional defined characters} \LCDcolors{black}{white}
-\begin{tabular}{l|l|>{\ttfamily}l}
-	\hline
-	\multicolumn{3}{c}{\textbf{Added characters}} \\
-	\hline \hline
-	Name		& Symbol		&\normalfont{\LCDcmd Code} \\
-	\hline
-	E		& \LCDsymb{sciE}	& \{sciE\} \\
-	$\sigma$	& \LCDsymb{sigma}	& \{sigma\} \\
-	$\bar x$	& \LCDsymb{barx}	& \{barx\} \\
-	$\bar y$	& \LCDsymb{bary}	& \{bary\} \\
-	$x^2$		& \LCDsymb{sq}		& \{sq\} \\
-	$x^{-1}$	& \LCDsymb{ar}		& \{ar\} \\
-	$x_1$		& \LCDsymb{sub1}	& \{sub1\} \\
-	$x_2$		& \LCDsymb{sub2}	& \{sub2\} \\
-	$x_3$		& \LCDsymb{sub3}	& \{sub3\} \\
-	$x_4$		& \LCDsymb{sub4}	& \{sub4\} \\
-	$x_5$		& \LCDsymb{sub5}	& \{sub5\} \\
-	$x_6$		& \LCDsymb{sub6}	& \{sub6\} \\
-	\hline
-	\multicolumn{3}{c}{\textbf{Redefined characters}} \\
-	\hline \hline
-	!		& \LCDsymb{!}		& \{!\} \\
-	$\sqrt{x}$	& \LCDsymb{sqrt}	& \{sqrt\} \\
-	e		& \LCDsymb{e}		& e \\
-	i		& \LCDsymb{i}		& i \\
-	v		& \LCDsymb{v}		& v \\
-	w		& \LCDsymb{w}		& w \\
-\end{tabular}
+\begin{center}
+	\begin{tabular}{|l|l|>{\ttfamily}l|}
+		\multicolumn{3}{c}{\textbf{Added characters}} \\
+		\hline
+		Name       & Symbol          &\textnormal{\LCDcmd{} Code} \\
+		\hline
+		E          & \LCDsymb{sciE}  & \{sciE\} \\
+		$\sigma$   & \LCDsymb{sigma} & \{sigma\} \\
+		$x^2$      & \LCDsymb{sq}    & \{sq\} \\
+		$x^{-1}$   & \LCDsymb{ar}    & \{ar\} \\
+		$y^x$      & \LCDsymb{cx}    & \{cx\} \\
+		$x_1$      & \LCDsymb{sub1}  & \{sub1\} \\
+		$x_2$      & \LCDsymb{sub2}  & \{sub2\} \\
+		$x_3$      & \LCDsymb{sub3}  & \{sub3\} \\
+		$x_4$      & \LCDsymb{sub4}  & \{sub4\} \\
+		$x_5$      & \LCDsymb{sub5}  & \{sub5\} \\
+		$x_6$      & \LCDsymb{sub6}  & \{sub6\} \\
+		$\bar x$   & \LCDsymb{barx}  & \{barx\} \\
+		$\bar y$   & \LCDsymb{bary}  & \{bary\} \\
+		\hline
+		\multicolumn{3}{c}{\textbf{Redefined characters}} \\
+		\hline
+		!          & \LCDsymb{!}     & \{!\} \\
+		\{         & \LCDsymb{lb}    & \{lb\} \\
+		\}         & \LCDsymb{rb}    & \{rb\} \\
+		$[$        & \LCDsymb{rb}    & \{rb\} \\
+		$]$        & \LCDsymb{rb}    & \{rb\} \\
+		$\sqrt{x}$ & \LCDsymb{sqrt}  & \{sqrt\} \\
+		e          & \LCDsymb{e}     & e \\
+		i          & \LCDsymb{i}     & i \\
+		v          & \LCDsymb{v}     & v \\
+		w          & \LCDsymb{w}     & w \\
+		\hline
+	\end{tabular}
+\end{center}
 
 \end{document}
diff --git a/macros/latex/contrib/tiscreen/tex/tiscreen.sty b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
index 3cc0136c8c..36cbdedfd4 100644
--- a/macros/latex/contrib/tiscreen/tex/tiscreen.sty
+++ b/macros/latex/contrib/tiscreen/tex/tiscreen.sty
@@ -4,10 +4,9 @@
 % license is at: http://www.latex-project.org/lppl.txt
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tiscreen}[2021/06/10 Ti calculator screen]
+\ProvidesPackage{tiscreen}[2021/07/22 Ti calculator screen]
 
-% TODO
-% Scaling option
+% TODO: Scaling option
 
 \def\tiscreenX{16}
 \def\tiscreenY{8}
@@ -26,6 +25,7 @@
 \DefineLCDchar{sub4}{00000000000100001010011100001000010}
 \DefineLCDchar{sub5}{00000000000111001000011000001001100}
 \DefineLCDchar{sub6}{00000000000011001000011100101001110}
+\DefineLCDchar{cx}{00101000100010100000000000000000000}
 % Redefine
 \DefineLCDchar{sqrt}{00111001000010000100101000110000100}
 \DefineLCDchar{!}{00100001000010000100000000010000100}
@@ -33,6 +33,10 @@
 \DefineLCDchar{i}{01000000001100001000010000101000100}
 \DefineLCDchar{w}{00000000001000110001101011010101010}
 \DefineLCDchar{v}{00000000001000110001100010101000100}
+\DefineLCDchar{[}{00110001000010000100001000010000110}
+\DefineLCDchar{]}{01100001000010000100001000010001100}
+\DefineLCDchar{lb}{00011001000010001000001000010000011}
+\DefineLCDchar{rb}{11000001000010000010001000010011000}
 
 \RequirePackage{xcolor}
 \definecolor{tiscreenfg}{HTML}{000000}
diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md
index 777d19bd2b..93074fc20a 100644
--- a/macros/latex/required/babel/base/README.md
+++ b/macros/latex/required/babel/base/README.md
@@ -1,4 +1,4 @@
-## Babel 3.62
+## Babel 3.63
 
 This package manages culturally-determined typographical (and other)
 rules, and hyphenation patterns for a wide range of languages. Many
@@ -8,9 +8,9 @@ is a set of ini files for about 250 languages.
 
 The latest stable version is available on <https://ctan.org/pkg/babel>.
 
-Changes in version 3.62 are described in:
+Changes in version 3.63 are described in:
 
-https://latex3.github.io/babel/news/whats-new-in-babel-3.62.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.63.html
 
 Apart from the manual, you can find information on some aspects of babel at:
 
@@ -46,6 +46,9 @@ respective authors.
 
 ### Summary of Latest changes
 ```
+3.63   2021-07-22
+       * Fixes a severe bug with CJK and XeTeX introduced in 3.62.
+       
 3.62   2021-07-19
        * No more errors with unknown languages in aux file.
        * Preliminary support for \AddToHook.
@@ -57,4 +60,4 @@ respective authors.
 
 ### Previous changes
 
-See https://latex3.github.io/babel/
+See https://latex3.github.io/babel/#whats-new
diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx
index e88326ebe2..28b1a76683 100644
--- a/macros/latex/required/babel/base/babel.dtx
+++ b/macros/latex/required/babel/base/babel.dtx
@@ -32,7 +32,7 @@
 %
 % \iffalse
 %<*filedriver>
-\ProvidesFile{babel.dtx}[2021/07/19 v3.62 The Babel package]
+\ProvidesFile{babel.dtx}[2021/07/22 v3.63 The Babel package]
 \documentclass{ltxdoc}
 \GetFileInfo{babel.dtx}
 \usepackage{fontspec}
@@ -1305,12 +1305,12 @@ be the same as the option name as set in |\usepackage|!).
 \end{verbatim}
 \end{example}
 
-\begin{note}
-  With a recent version of \LaTeX, an alternative method to execute
-  some code just after an |ldf| file is loaded is with |\AddToHook| and
-  the hook |file/after/<language>.ldf|. \Babel{} does not predeclare
-  it, and you have to do it yourself with |\NewHook| or |\ProvideHook|.
-\end{note}
+% \begin{note}
+%   With a recent version of \LaTeX, an alternative method to execute
+%   some code just after an |ldf| file is loaded is with |\AddToHook| and
+%   the hook |file/after/<language>.ldf|. \Babel{} does not predeclare
+%   it, and you have to do it yourself with |\NewHook| or |\ProvideHook|.
+% \end{note}
 
 \begin{warning}
   Currently this option is not compatible with languages loaded on the
@@ -3710,13 +3710,13 @@ options are also used (eg, |\ProsodicMarksOn| in \textsf{latin}).
 events. Some hooks are predefined when \luatex{} and \xetex{} are
 used.
 
-\New{3.62} This is not the only way to inject code at those points. The
-events listed below can be used as a hook name in |\AddToHook| in the
-form |babel/|\marg{name}, but there is a limitation, because the
-parameters passed with the \babel{} mechanism are not allowed. The
-|\AddToHook| mechanism does \textit{not} replace the current one in
-`babel`. Its main advantage is you can reconfigure `babel` even before
-loading it. See the example below.
+% \New{3.62} This is not the only way to inject code at those points. The
+% events listed below can be used as a hook name in |\AddToHook| in the
+% form |babel/|\marg{name}, but there is a limitation, because the
+% parameters passed with the \babel{} mechanism are not allowed. The
+% |\AddToHook| mechanism does \textit{not} replace the current one in
+% `babel`. Its main advantage is you can reconfigure `babel` even before
+% loading it. See the example below.
 
 \Describe{\AddBabelHook}{\oarg{lang}\marg{name}\marg{event}\marg{code}}
 
@@ -3800,26 +3800,26 @@ ones, they only have a single hook and replace a default definition.
   file. Used by \file{luababel.def}.
 \end{description}
 
-\begin{example}
-The generic unlocalized \LaTeX{} hooks are predefined, so that you can
-write:
-\begin{verbatim}
-\AddToHook{babel/afterextras}{\frenchspacing} 
-\end{verbatim}
-which is executed always after the extras for the language being
-selected (and just before the non-localized hooks defined with
-|\AddBabelHook|).
-
-In addition, locale-specific hooks in the form
-|babel/|\marg{hook-name}|/|\marg{language-name} are \textit{recognized}
-(executed just before the localized \babel{} hooks), but they are \textit{not
-predefined}. You have to do it yourself. For example, to set
-|\frenchspacing| only in |bengali|:
-\begin{verbatim}
-\ProvideHook{babel/afterextras/bengali}
-\AddToHook{babel/afterextras/bengali}{\frenchspacing}
-\end{verbatim}
-\end{example}
+% \begin{example}
+% The generic unlocalized \LaTeX{} hooks are predefined, so that you can
+% write:
+% \begin{verbatim}
+% \AddToHook{babel/afterextras}{\frenchspacing} 
+% \end{verbatim}
+% which is executed always after the extras for the language being
+% selected (and just before the non-localized hooks defined with
+% |\AddBabelHook|).
+
+% In addition, locale-specific hooks in the form
+% |babel/|\marg{hook-name}|/|\marg{language-name} are \textit{recognized}
+% (executed just before the localized \babel{} hooks), but they are \textit{not
+% predefined}. You have to do it yourself. For example, to set
+% |\frenchspacing| only in |bengali|:
+% \begin{verbatim}
+% \ProvideHook{babel/afterextras/bengali}
+% \AddToHook{babel/afterextras/bengali}{\frenchspacing}
+% \end{verbatim}
+% \end{example}
 
 \Describe{\BabelContentsFiles}{}
 \New{3.9a} This macro contains a list of ``toc'' types
@@ -5024,8 +5024,8 @@ help from Bernd Raichle, for which I am grateful.
 % \section{Tools}
 %
 %    \begin{macrocode}
-%<<version=3.62>>
-%<<date=2021/07/19>>
+%<<version=3.63>>
+%<<date=2021/07/22>>
 %    \end{macrocode}
 %
 % \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -13081,7 +13081,7 @@ help from Bernd Raichle, for which I am grateful.
         \ifx\AtBeginDocument\@notprerr
           \expandafter\@secondoftwo  % to execute right now
         \fi
-        \AtBeginDocument{\bbl@patchfont{\bbl@xenohyph}}%
+        \AtBeginDocument{\bbl@patchfont{\bbl@ispacesize}}%
       \fi}%
   \fi}
 \ifx\DisableBabelHook\@undefined\endinput\fi
diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins
index de98307cae..1a40cdc93a 100644
--- a/macros/latex/required/babel/base/babel.ins
+++ b/macros/latex/required/babel/base/babel.ins
@@ -26,7 +26,7 @@
 %% and covered by LPPL is defined by the unpacking scripts (with
 %% extension .ins) which are part of the distribution.
 %%
-\def\filedate{2021/07/19}
+\def\filedate{2021/07/22}
 \def\batchfile{babel.ins}
 \input docstrip.tex
 
diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf
index 4ae4792afd..5ab700e806 100644
--- a/macros/latex/required/babel/base/babel.pdf
+++ b/macros/latex/required/babel/base/babel.pdf
diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx
index ef63539302..9ed2c3c322 100644
--- a/macros/latex/required/babel/base/bbcompat.dtx
+++ b/macros/latex/required/babel/base/bbcompat.dtx
@@ -30,7 +30,7 @@
 %
 % \iffalse
 %<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/07/19 v3.62]
+\ProvidesFile{bbcompat.dtx}[2021/07/22 v3.63]
 %</dtx>
 %
 %% File 'bbcompat.dtx'
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 61ee92ce96..f6b5ffdc3f 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -20,6 +20,7 @@ $mirrors = {
       'https://mirrors.cqu.edu.cn/CTAN/' => 1,
       'https://mirrors.dgut.edu.cn/CTAN/' => 1,
       'https://mirrors.hit.edu.cn/CTAN/' => 1,
+      'https://mirrors.nju.edu.cn/CTAN/' => 1,
       'https://mirrors.sjtug.sjtu.edu.cn/ctan/' => 1,
       'https://mirrors.sustech.edu.cn/CTAN/' => 1,
       'https://mirrors.tuna.tsinghua.edu.cn/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 4c331d5a36..b4ff1f224f 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,7 +26,7 @@ depend container_split_src_files/1
 depend frozen/0
 depend minrelease/2016
 depend release/2021
-depend revision/60010
+depend revision/60021
 
 name 00texlive.image
 category TLCore
@@ -4429,7 +4429,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
 
 name 00texlive.installer
 category TLCore
-revision 60004
+revision 60012
 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
@@ -27516,7 +27516,7 @@ catalogue-version 1.0
 
 name babel
 category Package
-revision 59990
+revision 60021
 shortdesc Multilingual support for LaTeX, LuaLaTeX, XeLaTeX, and Plain TeX
 relocated 1
 longdesc This package manages culturally-determined typographical (and
@@ -27529,15 +27529,15 @@ longdesc has to be done for each language. Included is also a set of ini
 longdesc files for about 250 languages. Many language styles work with
 longdesc pdfLaTeX, as well as with XeLaTeX and LuaLaTeX, out of the box.
 longdesc A few even work with plain formats.
-containersize 180588
-containerchecksum 7b60dcc80124f6b34f411b61a9e1818e6b0eae81c409835cceac9ed6b3772d567753b55db4c679c1bf91979425717d3304037bcf218be6aee0c5f693500c459d
-doccontainersize 838240
-doccontainerchecksum 1e835d21db0d5121f2ca74ca156cf03ca4f5ca68094a0994e1f9ca4e941cc201acdb43ec94916e7e5190626e29855476024c0ad982a93b6540c2ba08bf61e1c1
-docfiles size=210
+containersize 180508
+containerchecksum db895951100ba0e32761f6e3f1a78b4a476f05b14f100c69989f58b0292ec16ad0fa1100bbab71e31b724a43da37c5c8b3efb4d248c605ad8ae9a241eef31534
+doccontainersize 835852
+doccontainerchecksum 28045b890f9779144c223354974122ffb1ae29fc895edc44185bc8cce46df003fbced694e5acf41c410d011167c2f717b755ee2c50a7a26e0de1ddcba3399c1c
+docfiles size=209
  RELOC/doc/latex/babel/README.md details="Readme"
  RELOC/doc/latex/babel/babel.pdf details="Package documentation"
-srccontainersize 687808
-srccontainerchecksum 8b2a6c43f2904bc1a7e836f756ce6b0d561e24b11b310743d8cd9ebef785d31a2fd89603d59de931473c7b694609f1838e993f5ef0bfd4e25bfb8d2b9c8d525d
+srccontainersize 687756
+srccontainerchecksum 8063e69bc239c266dec3a52fbe57d569df39fc033e077177220b4f72b5adb7011c95888ac2b90a209d6b67234a80fa97788a4176acf884bade6d19f6e6c62f5f
 srcfiles size=377
  RELOC/source/latex/babel/babel.dtx
  RELOC/source/latex/babel/babel.ins
@@ -28249,7 +28249,7 @@ catalogue-contact-repository https://github.com/latex3/babel
 catalogue-ctan /macros/latex/required/babel/base
 catalogue-license lppl1.3
 catalogue-topics multilingual
-catalogue-version 3.62
+catalogue-version 3.63
 
 name babel-albanian
 category Package
@@ -153110,18 +153110,18 @@ catalogue-topics labels
 
 name jlreq
 category Package
-revision 59376
+revision 60015
 shortdesc Japanese document class based on requirements for Japanese text layout
 relocated 1
 longdesc This package provides a Japanese document class based on
 longdesc requirements for Japanese text layout. The class file and the
 longdesc JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX /
 longdesc upLaTeX are provided.
-containersize 135864
-containerchecksum c5ddbe9d584a698b04522b150391e3664912b17d28a9ee8434df73b3a61f400456a7ff156baab9ffd63d6746b3c11f737ab37dc53cd8b91faba02ba26e706999
-doccontainersize 504148
-doccontainerchecksum 4dcc0456267ab6834a4701970526e62833cb8674f140d40644dfd739d29057ac2a4705990db0005f9f5143cfd2036184ed11ca41b76f6fc452349bb26895425b
-docfiles size=163
+containersize 137080
+containerchecksum 877597812783b482aed31d8142dc18f87dd2c5506e92cf1daf26b98beaa43888136775cca9360fb01430b7eb52fac47560b89f2e18b9be11d0d588ee291be9d3
+doccontainersize 510924
+doccontainerchecksum c58bc0b0d867e35b23626774a6ccf5ac9823720331db2f4f62d265420d647e97479ed27d1b6dd4d64efc0f2ecfd2c738d464a94649511f17bf820fdcdd851f20
+docfiles size=164
  RELOC/doc/latex/jlreq/LICENSE
  RELOC/doc/latex/jlreq/README-ja.md details="Readme" language="ja"
  RELOC/doc/latex/jlreq/README.md details="Readme"
@@ -153134,14 +153134,14 @@ docfiles size=163
  RELOC/doc/latex/jlreq/jlreq.html
  RELOC/doc/latex/jlreq/jlreq.pdf details="Package documentation"
 srccontainersize 8208
-srccontainerchecksum 101d88a25c5f6528a33e11d76def90fdc94f201cb0497d70c82e3ada192082155731eaa5425f583b83d869f05b5f11326ac55df40504a8cf3ce73c03b7d7370b
+srccontainerchecksum f511a1200c53c1bde5c16c6fc7bcc8cc01b41c73cc4800f45932b8e54d069b1ab5b02ec75bdce46b7ab52997e15d1fbc65b04bcf86b962e33afdaf0c05bd7efa
 srcfiles size=10
  RELOC/source/latex/jlreq/Makefile
  RELOC/source/latex/jlreq/README-template.html
  RELOC/source/latex/jlreq/README-template.tex
  RELOC/source/latex/jlreq/luajfm2pl.lua
  RELOC/source/latex/jlreq/make_variant_jfm.lua
-runfiles size=8646
+runfiles size=8652
  RELOC/fonts/tfm/public/jlreq/bjlreq-v.tfm
  RELOC/fonts/tfm/public/jlreq/bjlreq.tfm
  RELOC/fonts/tfm/public/jlreq/bjlreqg-v.tfm
@@ -239100,7 +239100,7 @@ catalogue-version 0.12
 
 name pdfmanagement-testphase
 category Package
-revision 59775
+revision 60016
 shortdesc LaTeX PDF management testphase bundle
 relocated 1
 longdesc This is a temporary package, which is used during a test phase
@@ -239113,11 +239113,11 @@ longdesc allow users and package authors to safely test the code. At a
 longdesc later stage it will be integrated into the LaTeX kernel (or in
 longdesc parts into permanent support packages), and the current
 longdesc testphase bundle will be removed.
-containersize 46656
-containerchecksum 6350b09caf16dd4efdfca7394369fc8a42a9bab53958110757fd2056293508e60abfc3c16e2475fc446e0b80154120d5aba9711b58dcb43932a08b5b08c62f15
-doccontainersize 8190920
-doccontainerchecksum b00fb2e5466da513cbf4bd0f39dbb55182540013b0d0c0474e14c47288d6c2b9214e613f31c0829c989570fb20c692641f8fd08f919df219357dd24ab8b5bf83
-docfiles size=2661
+containersize 47336
+containerchecksum 7b2520de8c7ef0701867e8a8d856906d1685027c983ab5f78de76c7db5ab838d1edea7b3fcf84b85f9aa0c942428bcd64736ff588f916dc98c74dc8dfe00307c
+doccontainersize 8181364
+doccontainerchecksum cd3539cb567e26a8683472c6fbbbaf34fd937e6ec072d7b67c0e186c1e4882152605221c2c93eff8838ada65673ce9d1d6cda6779ba5b91aa50e9bdc619fb811
+docfiles size=2655
  RELOC/doc/latex/pdfmanagement-testphase/CHANGELOG.md
  RELOC/doc/latex/pdfmanagement-testphase/README.md details="Readme"
  RELOC/doc/latex/pdfmanagement-testphase/hyperref-generic.pdf
@@ -239139,9 +239139,9 @@ docfiles size=2661
  RELOC/doc/latex/pdfmanagement-testphase/ltdocinit.pdf
  RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-firstaid.pdf
  RELOC/doc/latex/pdfmanagement-testphase/pdfmanagement-testphase.pdf details="Package documentation"
-srccontainersize 116764
-srccontainerchecksum aa06b4766e539ae1d53850fa494c26b234a5bb5aa47b5b629cab3090c6d6bb9bb76b1137ce992dd9a55fb9f73ba1f5edf733d2fdfe5806b129c13d02d591630c
-srcfiles size=172
+srccontainersize 118668
+srccontainerchecksum 59a2fad14fc88c457a954572c17b1e9c718343b5dd0a0849279a76c0f43968bdf1f747bf7bb574aa86a05d0737ccb282b8ddd338c81ead5464d45df9f35a9e8c
+srcfiles size=173
  RELOC/source/latex/pdfmanagement-testphase/hyperref-generic.dtx
  RELOC/source/latex/pdfmanagement-testphase/l3backend-testphase.dtx
  RELOC/source/latex/pdfmanagement-testphase/l3pdfannot.dtx
@@ -239162,7 +239162,7 @@ srcfiles size=172
  RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-firstaid.dtx
  RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.dtx
  RELOC/source/latex/pdfmanagement-testphase/pdfmanagement-testphase.ins
-runfiles size=91
+runfiles size=92
  RELOC/tex/latex/pdfmanagement-testphase/color-ltx.sty
  RELOC/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def
  RELOC/tex/latex/pdfmanagement-testphase/hyperref-colorschemes.def
@@ -239187,7 +239187,7 @@ catalogue-contact-repository https://github.com/latex3/pdfresources
 catalogue-ctan /macros/latex/contrib/pdfmanagement-testphase
 catalogue-license lppl1.3c
 catalogue-topics latex-devel pdf-feat
-catalogue-version 0.95f
+catalogue-version 0.95g
 
 name pdfmarginpar
 category Package
@@ -275271,7 +275271,7 @@ catalogue-version 1.36
 
 name siunitx
 category Package
-revision 60000
+revision 60017
 shortdesc A comprehensive (SI) units package
 relocated 1
 longdesc Typesetting values with units requires care to ensure that the
@@ -275296,10 +275296,10 @@ longdesc The package relies on LaTeX 3 support from the l3kernel and
 longdesc l3packages bundles.
 depend l3kernel
 depend l3packages
-containersize 61424
-containerchecksum 0f5d9675cd0303b288ea5d252c7649a7b7df2dc7c8b86eea1f2119ca2502b5554e125cd5c22ccf3850a59937f8b6cf0b4fc00e0a362421f4fb82426c80416311
-doccontainersize 2858352
-doccontainerchecksum bf11aba933f63fe587ff6e5c45688c50dcd1b6568a416233fd83f01f4b1c3116167432268672ee87c438770cb6d6e7b9ce305969a5c1a34e615312ab753f508c
+containersize 61464
+containerchecksum 0b2e1fd0a7acb20291fd578910737d1dc3f71c957e4335452a144152c043c1e5a0c9eb39b3bfa212636f0339a5a0a2992425fc8a90aa485d6a747c895bfeaadf
+doccontainersize 2860836
+doccontainerchecksum 3ac70e912578d7ba1d6eecf5bb9b0a4bc032e2238d49db45c219667aa7278be91c6f33cfe85b25f068b130c435a34e6b0f5cecd705cdfb9cf9fa41e5b9e088bc
 docfiles size=807
  RELOC/doc/latex/siunitx/CHANGELOG.md
  RELOC/doc/latex/siunitx/README.md details="Readme"
@@ -275307,8 +275307,8 @@ docfiles size=807
  RELOC/doc/latex/siunitx/siunitx-print.pdf
  RELOC/doc/latex/siunitx/siunitx-unit.pdf
  RELOC/doc/latex/siunitx/siunitx.pdf details="User manual"
-srccontainersize 105756
-srccontainerchecksum 16efc561e8d66f25b286fb0c6600469b914dd75a9165a313fe43c30b138a878687a70337335dd15e76cb3177391a23ce66c324f38c71137046a72f631af007d7
+srccontainersize 105856
+srccontainerchecksum 52b4c1c8f8886e7be19f4b2e4a169b125ef768d329c007ad4bfc25700bc2c3c7e7115652b85a601d95e477f792fb169ded00d3d93e8dc91f450be5ede354f8c2
 srcfiles size=161
  RELOC/source/latex/siunitx/siunitx-abbreviation.dtx
  RELOC/source/latex/siunitx/siunitx-angle.dtx
@@ -275340,7 +275340,7 @@ catalogue-contact-repository https://github.com/josephwright/siunitx
 catalogue-ctan /macros/latex/contrib/siunitx
 catalogue-license lppl1.3c
 catalogue-topics units scientific-docs expl3
-catalogue-version 3.0.21
+catalogue-version 3.0.22
 
 name skak
 category Package
@@ -279999,22 +279999,22 @@ catalogue-version 2.4
 
 name spbmark
 category Package
-revision 59777
+revision 60018
 shortdesc Customize superscripts and subscripts
 relocated 1
 longdesc This package provides three commands \super, \sub and \supersub
 longdesc to improve the layout of superscripts and subscripts which can
 longdesc be adjusted with respect to relative position and format, and
 longdesc can be used in text and math mode.
-containersize 2228
-containerchecksum 1da1d3d0b939caf0052806df67a21053f75ab891a104df1fce95414a3870ffb3c44d18d75e93c15e063caeb8f0e748012fa049f6db87f7d94a07bd840b1bd2ed
-doccontainersize 68148
-doccontainerchecksum c9946831af6434d7a2ebc89667bbd60a8fcf76714fccdd8d1d6f3169c9efd0fd0993b2427d756dd53cf6c8adbff7a3e472d21c5f8095d0e6848a91bf16fe588d
+containersize 2236
+containerchecksum 92515098f3215b9c8b011361fa0f91908dfeadee8b509a80c74063450024b4fa7b8755e6702984b2927d1a13340044b20a9c1f3d48125023c7cd22095e4b0fff
+doccontainersize 67672
+doccontainerchecksum 9ed4918ff516102313c1a99249c15cee144c960a2d2719a6f921b0ffed1c2e1661f5c872a2673a51efc3e31199718bfa6230cf09897bcfce30f66f72a675afae
 docfiles size=18
  RELOC/doc/latex/spbmark/README.md details="Readme"
  RELOC/doc/latex/spbmark/spbmark.pdf details="Package documentation"
-srccontainersize 4468
-srccontainerchecksum 4c1f5eb76a61f4a06cec5c80a8ba62e52797e1cfff7b2d866e36d98306a27e0a4c637237160feacebfd9a09c5cf0406fff8a06e00a60103be32b4adf283a4322
+srccontainersize 4464
+srccontainerchecksum 78ffd24ebe3557fb686f84713d42b7a8fa32b8a0e8e4b0d5fb04289d7b9c73ae88366240ae76484b7f7952232347d95ae4154a9f6c97b89a22598ea5c05e2819
 srcfiles size=5
  RELOC/source/latex/spbmark/spbmark.dtx
  RELOC/source/latex/spbmark/spbmark.ins
@@ -280023,8 +280023,8 @@ runfiles size=2
 catalogue-contact-repository https://github.com/texl3/spbmark
 catalogue-ctan /macros/latex/contrib/spbmark
 catalogue-license cc-by-4
-catalogue-topics subsup-pos
-catalogue-version 1.01
+catalogue-topics subsup-pos expl3
+catalogue-version 1.02
 
 name spectral
 category Package
@@ -282456,7 +282456,7 @@ catalogue-version 1.00
 
 name stackengine
 category Package
-revision 59944
+revision 60019
 shortdesc Highly customised stacking of objects, insets, baseline changes, etc
 relocated 1
 longdesc The package provides a versatile way to stack objects
@@ -282464,20 +282464,20 @@ longdesc vertically in a variety of customizable ways. A number of
 longdesc useful macros are provided, all of which make use of the
 longdesc stackengine core.
 depend listofitems
-containersize 5280
-containerchecksum 932493b5e816e9698a0237d35b30db8a056bc78f485332ccd9f101e9d34b3c2500f7a10aa8583546349f9584f4e8221cee07d385fa4ecbd673e7b43bd17544e0
-doccontainersize 367320
-doccontainerchecksum c7b53453844cee4f215e547c2f06b4fbe04fc67ec04ae8248d309551279be2682230ba7b2954ced2f24b9c67cfd9a765cb44fae2c7546f6b160af41db9e90d82
+containersize 5356
+containerchecksum 15327eda5a6eda2b58055efc419ef50b8d8cf8c35283bcc41ee85e354f61ede6efeabf5e75bbb4cd022b95e52109bce1ee2e28fc701c5940723f3b15dd44c75a
+doccontainersize 367108
+doccontainerchecksum a0edeaed3766af88d1c5e0508fd285382850bfd072cf4f6fdc1c329c8ca9f5e1eb5fe75357d9a86dd8b2476381747c9a3f7cd7dad0d7c32419bef0d37849928b
 docfiles size=111
  RELOC/doc/latex/stackengine/README details="Readme"
  RELOC/doc/latex/stackengine/stackengine.pdf details="Package documentation"
  RELOC/doc/latex/stackengine/stackengine.tex
-runfiles size=4
+runfiles size=5
  RELOC/tex/latex/stackengine/stackengine.sty
 catalogue-ctan /macros/latex/contrib/stackengine
 catalogue-license lppl1.3
 catalogue-topics macro-supp
-catalogue-version 4.1
+catalogue-version 4.11
 
 name stage
 category Package
@@ -301062,7 +301062,7 @@ docfiles size=376
 
 name texlive-scripts
 category TLCore
-revision 60004
+revision 60012
 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.
@@ -301070,10 +301070,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 108032
-containerchecksum d9a9366cec60480ed4995cb092c327a9712f860ac3dfd16c32438a9445296c000a83d8fcf2a8bff20e73e1ea4b3a25ca564a38c6c62a9d4a3fb55a2c0620fd78
-doccontainersize 398744
-doccontainerchecksum 51c14261a2a560aa53b8dbf5359da84b238fc61104193e9c2636634d31040a9c4570be2360d2e7739cffc5c13f3ad631d88111c3368b3b8c8b82404f0a334469
+containersize 108044
+containerchecksum e36e81a42b30a40699ca4ce02e3ca05e97c0c6c3d2c1036bd83f220fb3f394858955edb444bce93d083a1c8b44dcbdd3d200de536aaa41add895159ef4219509
+doccontainersize 398708
+doccontainerchecksum eb1ba2d156e59400d226bfac01dc96813e5cadd21a1abae93440b629361920882e5bb84e48ecd2c26a6fcd9f0d6f4664bb4cd45189c8919a0ce8c43620a8524c
 docfiles size=493
  doc.html
  texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -308785,17 +308785,17 @@ catalogue-version 1.5
 
 name tiscreen
 category Package
-revision 59544
+revision 60020
 shortdesc Mimic the screen of older Texas Instruments calculators
 relocated 1
 longdesc This package mimics the screen of older Texas Instruments dot
 longdesc matrix display calculators, specifically the TI-82 STATS. It
 longdesc relies on the lcd and xcolor packages.
-containersize 1136
-containerchecksum ded3bcc3c4b89356462bb37b085799128fdcc068902ceb0be3d3d3da69ae89b9e5cc6796c0c1a3bbcaf8f7f08d0a39d34b32c7426893bb70996fbbd1fe2c646f
-doccontainersize 127244
-doccontainerchecksum 8eb8259529364ffe36dc5d70abaff11bb0e9190675c1131e410cca2657307a108500c1bc12da99a6e7ca270dbecfc9653430ab2dd9c62ddbc836b07791dea3c2
-docfiles size=33
+containersize 1184
+containerchecksum f066a7c9cbe1464bac88761c6d24f128b58dbc4a667da699dde4d8a08e1942452cb0e43f6c00b5472738896b554b45a4604c8eb53712547576c302d0daf8c622
+doccontainersize 135332
+doccontainerchecksum 47eba704465400cec1c8edf68781465bcbd89e9014d245e1c26e45701ac6e9dce5297ac18c195d2a3e36fbc66e2a39aac3f53d298aec017e9fc6ceae6f249a07
+docfiles size=35
  RELOC/doc/latex/tiscreen/README details="Readme"
  RELOC/doc/latex/tiscreen/tiscreen-doc.pdf details="Package documentation"
  RELOC/doc/latex/tiscreen/tiscreen-doc.tex
@@ -327981,17 +327981,17 @@ catalogue-version 1.0
 
 name variablelm
 category Package
-revision 46611
+revision 60014
 shortdesc Font definitions for the variable Latin Modern fonts
 relocated 1
 longdesc This package provides a mechanism for scaling a typeface. It is
 longdesc directed at the Latin Modern fonts and provides the font
 longdesc definitions and the corresponding style file. This mechanism is
 longdesc useful in mixed text compositions, for example Japanese-Latin.
-containersize 3624
-containerchecksum e58a1c5a77861ed3a84f2fb372d6c3560129b656257e23a935fa9d7ce18c83b59f9863e29ff35c45c6ab800cd09aa2fe7bcb1fd01edbbe2e75112809c17faa9e
-doccontainersize 133116
-doccontainerchecksum 58611f636d5aea5ee2935c75206e0d051345d7138d04668ec7875b3ee0493e39bba54b1941aaedf33abfeb7636602fa6ac7fe7e750837b425678eae97b7495fa
+containersize 3608
+containerchecksum 1c34d4afa65db4993f3098cb32b604c68a75bc2c0b56b026a6d50c2de61392d4bace210dab2fb5ca0c15253e7486406aa3aa5084e2296bd5e8f1e9c953419627
+doccontainersize 134724
+doccontainerchecksum 56bbeff2f9cb4a99c05416d7fae7cea8cef81e712092ae8b5d1ca644769debdd95c443fb6af7edc034fe9d778147e1b37da50d951278a7f64c407dead5f6e7cb
 docfiles size=35
  RELOC/doc/fonts/variablelm/README.md details="Readme"
  RELOC/doc/fonts/variablelm/control_scaling_lm_fonts.pdf details="Package documentation"
@@ -328016,7 +328016,7 @@ catalogue-contact-repository https://github.com/yuw/texmf-variablelm
 catalogue-ctan /fonts/variablelm
 catalogue-license gfl
 catalogue-topics font-cm font-virtual font-t1enc
-catalogue-version 1.1.2
+catalogue-version 1.2
 
 name variations
 category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 69927dcc80..87ebb04862 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-c2894a2eeafbc003a50718073aeef4fb  texlive.tlpdb
+6040b0d12c689b00631eaeb8829a1218  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 0bab6fbf9d..f13049fcf1 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-efe502fd798197b549c9fc6b4aaa2725e235d7c12db5bff9e42994b5ac07f5c82fb35483be3b54792c2f84c46ea7cb3a96465870b29a992bccb97fe4dbb2eba6  texlive.tlpdb
+b607df378ffd6c479a497a11407497e1ae8d9f71898dccef74781e6cf9514ff600267edb7087b195776f5024c1b6f003fb1bacae19060ca107ef1bd9064b30a9  texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 74d1c65223..830836f4b8 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-----
 
-iQEcBAEBCgAGBQJg+LMkAAoJEEzhh34ZQ4xwJuIH/joW5C4n7hc7S5HGP4aJAsyp
-1gv9zRFBd2ZUYD7WttfrBcGovo6e2wfzHn0leAyUBJ+UhtATPcsBWNknmsZbc0om
-e01oeLoK5VLQAoJV8wh8hnRi662qW8gUdUDQ+a0i0DbNh1ESPvzm5fWCEE7U0HVN
-lb7rGOsWpSaj135pJmkwGFt4DreWX2u9Ag3WorKTPr4bnhHSmqdr3PQ6HlaJREky
-r+U1oCM3R/2iFcd7SUK29i4Ji8/4sUilPcM5S9Z4MRcHsPi1CRiqzT0bulpVAO+F
-goMNiwsJkASDEDVtH5vxtiTn04yHB2O+2SKUGD4EAn0bgERoEsoDU0DYw9LwsDE=
-=NhJo
+iQEcBAEBCgAGBQJg+gSUAAoJEEzhh34ZQ4xwWxYH/1lfs6XBegYrH0yv/gHd8ih6
+/FtCMtm1BJk0lAS0DjXpEWib2kKtbwjbr/mIFvZyWy6ncmafWwZ2fJpZof1o8xRQ
+J06Kt7itoNHEUCxvNEPYwv14H0hYbVm/PgSMAXfw7ZD2Rs1gDmM9iwlXakfpZCSD
+XW4mKF/NcG1jbBk/FnFBNszCOGQ8SYD2b3pAR/osAXDzWFep/PEIsch1zMKwOPFN
+ozsE+hSOq0P7mRcZB4R0v9Ymr5xuegLKOku8UXorWnXDI3NoVLZlYg+XeTEW97R0
+N4SA6WP96o7xnkW5UD28rG9IqXXmzxAtvPwLoDefF2xZS1jmgmL21C1g4noffPI=
+=cvBA
 -----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 8cc26bfd81..26126ff042 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 2008816e7d..fde2f8a856 100644
--- a/systems/win32/miktex/tm/packages/next/pr.ini
+++ b/systems/win32/miktex/tm/packages/next/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1626898489

+date=1626984886

 lastupd=miktex-arctrl-bin-2.9 miktex-arctrl-bin-x64-2.9 miktex-asymptote-bin-2.9 miktex-asymptote-bin-x64-2.9 miktex-autosp-bin-2.9 miktex-autosp-bin-x64-2.9 miktex-axohelp-bin-2.9 miktex-axohelp-bin-x64-2.9 miktex-bibarts-bin-2.9 miktex-bibarts-bin-x64-2.9 miktex-bibtex-bin-2.9 miktex-bibtex-bin-x64-2.9 miktex-bibtex8bit-bin-2.9 miktex-bibtex8bit-bin-x64-2.9 miktex-bzip2-bin-2.9 miktex-bzip2-bin-x64-2.9 miktex-cairo-bin-2.9 miktex-cairo-bin-x64-2.9 miktex-chktex-bin-2.9 miktex-chktex-bin-x64-2.9

-lstdigest=08e07b53e9bf147576931184fd48a38a

+lstdigest=d9bd7fd5fda2b556d241dc523af9bc75

 numpkg=4538

 relstate=next

-version=7872

+version=7873

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: V6NrpAEFxeaqP97Yf2ed8rfM/2+CqjWaENVq31C9b6Jrq6EhnZKxYs9BvVuqSt05HMT5VaDIHimlkfoH9HqdxUXGwv2qqnPOqd2rWKZ9jFaOG74aQPVrap5KAtsiiTzlfwJnvjXkFfQc6du1Ctz2GHwJR0vnIcOb47PIh+KqM/DC1op8i6e1wcNJdFX6N5cSosDSlSrY7sATo784faLs/f8o6pcAo2oN0VcHJhDlowfP5FZBgAYHyk2ujSkjhMZ2tFCQ/9Pmed1ulTEEgyj2/FnHR97FD/aqe1b+M9ul9EJqdZHNnjDh/eP2nA3Ir5Pr5f0MaVrv+AYPQFL8BLNRTQ==

+;;;; signature/miktex: eOctS6X/XqpIxAxVqiUgZd2PINvIjFAgL66knzhkguCygDC41QZcd+8G0cukXwPDUNM3qbJ+lYwYHLLZp7Z9gluzP4yL9bbHRh/EwsH9ikD1kRhTNr0Vm0hmPVMTknCSNSMs3PLgM1MG3aqX/f96sHdxri922MJbyzG9E/dyMpIRlQotpEmkGwmfXbIglNRResPNU1yly40S1EZKH8uANXBgKwsMZS4+WAmWuI4d8LGjQRJQLOtraxYqgp5QohQNqvwPefIc+u2pgQXsg5KqyyF6OmiOewNQno1Luy8D118tF2sjfPfQnmxHcBA7GY9MJRuhuKvti7VtTQrFPUsHRw==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 9830c65809..feda933945 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
 

 [repository]

-date=1626898287

+date=1626984679

 lastupd=cjk-ko cjk-ko__doc cjk-ko__source easing easing__doc easing__source emoji emoji__doc latex-via-exemplos longdivision longdivision__doc longdivision__source lwarp lwarp__doc lwarp__source twemoji-colr twemoji-colr__doc miktex-runtime-bin-2.9 miktex-runtime-bin-x64-2.9 changes

-lstdigest=7b9d28d87210fc8a97500aec02fb04d0

+lstdigest=6f6d5cf8e78f5e23d0f0d7b34b657571

 numpkg=4538

 relstate=stable

-version=7872

+version=7873

 

 ;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.

 ;;;;-----BEGIN MIKTEX SIGNATURE-----

-;;;; signature/miktex: aKwVulWfiGecGTzQme0z8R86yscILXSGlpXmZNe5ksC1FdlLNKG+ClRa6hOWr1eLSSzSM8PGZgIOWJq+XYvQoA4/cetapHe/kF2uKDePYz2cndJHjZ7LSruNPpcj03i0WFRKnkpTVHSjoZQ/Dt5I9ah7ahN7/0zGi+HpTnsmkuVpt0Kao5zWDji7dqSvcpXZ7FJhJ+XEk964bUZVkjpqJJZacf/+K6JMKQDe4HH2bNcYuxBBTo8Zd5XIbvIW8JaGmhdvma5wsNtboM2W3f9ulJofX3czlnPrrdi+p6KW/x1UJNfpmwo9WRRdQ212Us3dRTcNopDU6C7dSfUJtaIz9g==

+;;;; signature/miktex: f1xeeZNXdHV8DNT9v680hzt08uXwcArM1uIKH3bEOpQhymMm52Kp0MRHJsBsZ5bOaJu1GE6Mrrov+yQYzyOsx1Nf+HmbKZX9ImdQWmvLVReSqQW+W0tobeKti3RvxvWpZuKgRFTl9ejSM0Xj3W9L2/i4NWvoCwYkfMSSWDFZr4kfZcxj0aqEhIlBwu8HbdjKueTSh7x4g4u48H1mktQYn1ENYViFSUlJbIYNfg6dhFqoz381ihawjn0gUOKO4gCTD5vHEEx0ExvqcdF5AVtrBlokPF0+bRiT9Z6KHIdP7H9tdP5bZrCWbRSp40F8Kj9XzaIBi+81nnjk/ZkI0kEJQg==

 ;;;;-----END MIKTEX SIGNATURE-----

diff --git a/timestamp b/timestamp
index 9203921bee..db8e5437e1 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:
-2021-07-22-02-02
+2021-07-23-02-02