summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-04-06 03:01:01 +0000
committerNorbert Preining <norbert@preining.info>2022-04-06 03:01:01 +0000
commit333540a9182285f9d72d7d39be3fa730c135d664 (patch)
treebdffc5aea11535dc73e81752b4a77eed105989ff
parenta4e931576165d0a4a143915f4725399272e06fee (diff)
CTAN sync 202204060301
-rw-r--r--FILES.byname857
-rw-r--r--FILES.byname.gzbin2416406 -> 2416986 bytes
-rw-r--r--FILES.last07days882
-rw-r--r--biblio/pbibtex/pbibtex-manual/README.md2
-rw-r--r--biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdfbin118781 -> 150261 bytes
-rw-r--r--biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex234
-rw-r--r--indexing/hsindex/HsIndex.cabal58
-rw-r--r--indexing/hsindex/LICENSE674
-rw-r--r--indexing/hsindex/README150
-rw-r--r--indexing/hsindex/README.md7
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/English.hs34
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/French.hs108
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/German.hs76
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/Russian.hs73
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/SubsIEC.hs128
-rw-r--r--indexing/hsindex/src/HsIndex/CharLists/Symbols.hs30
-rw-r--r--indexing/hsindex/src/HsIndex/Files.hs156
-rw-r--r--indexing/hsindex/src/HsIndex/Functions.hs206
-rw-r--r--indexing/hsindex/src/HsIndex/Parser.hs542
-rw-r--r--indexing/hsindex/src/HsIndex/Show.hs324
-rw-r--r--indexing/hsindex/src/HsIndex/Sorting.hs246
-rw-r--r--indexing/hsindex/src/HsIndex/Types.hs205
-rw-r--r--indexing/hsindex/src/hsindex.hs395
-rw-r--r--info/mendex-doc/LICENSE2
-rw-r--r--info/mendex-doc/Makefile1
-rw-r--r--info/mendex-doc/README.md2
-rw-r--r--info/mendex-doc/mendex.pdfbin225190 -> 230127 bytes
-rw-r--r--info/mendex-doc/mendex.tex115
-rw-r--r--info/ptex-manual/LICENSE2
-rw-r--r--info/ptex-manual/README.md2
-rw-r--r--info/ptex-manual/eptex_resume.pdfbin694464 -> 1012994 bytes
-rw-r--r--info/ptex-manual/eptexdoc.pdfbin356743 -> 378172 bytes
-rw-r--r--info/ptex-manual/eptexdoc.tex134
-rw-r--r--info/ptex-manual/jfm.pdfbin197862 -> 215779 bytes
-rw-r--r--info/ptex-manual/jfm.tex155
-rw-r--r--info/ptex-manual/ptex-guide-en.pdfbin105110 -> 106870 bytes
-rw-r--r--info/ptex-manual/ptex-guide-en.tex60
-rw-r--r--info/ptex-manual/ptex-manual.pdfbin288365 -> 322239 bytes
-rw-r--r--info/ptex-manual/ptex-manual.sty14
-rw-r--r--info/ptex-manual/ptex-manual.tex634
-rw-r--r--language/japanese/jlreq/README-ja.md9
-rw-r--r--language/japanese/jlreq/README.md10
-rw-r--r--language/japanese/jlreq/jlreq-ja.pdfbin369879 -> 371465 bytes
-rw-r--r--language/japanese/jlreq/jlreq.cls1639
-rw-r--r--language/japanese/jlreq/jlreq.pdfbin119257 -> 119712 bytes
-rw-r--r--macros/latex/contrib/srdp-mathematik/README.md (renamed from macros/latex/contrib/srdp-mathematik/README.txt)24
-rw-r--r--macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdfbin178836 -> 175330 bytes
-rw-r--r--macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty17
-rw-r--r--macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex82
-rw-r--r--macros/texinfo/latest/texinfo.tex45
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/AMS_Refs.pdf (renamed from macros/latex/contrib/ametsoc/AMS_Refs.pdf)bin172127 -> 172127 bytes
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/README (renamed from macros/latex/contrib/ametsoc/README)0
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/ametsoc.cls (renamed from macros/latex/contrib/ametsoc/ametsoc.cls)0
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/ametsoc2014.bst (renamed from macros/latex/contrib/ametsoc/ametsoc2014.bst)0
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/amsdocs.pdf (renamed from macros/latex/contrib/ametsoc/amsdocs.pdf)bin234479 -> 234479 bytes
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/references.bib (renamed from macros/latex/contrib/ametsoc/references.bib)0
-rw-r--r--obsolete/macros/latex/contrib/ametsoc/template.tex (renamed from macros/latex/contrib/ametsoc/template.tex)0
-rw-r--r--support/TeX4ht/source/ChangeLog11
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex2
-rw-r--r--support/TeX4ht/source/tex4ht-ooffice.tex57
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl7
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt4
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb867
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.md52
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha5122
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc14
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb.xzbin2365960 -> 2365340 bytes
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/nl.po2
-rw-r--r--systems/texlive/tlnet/tlpkg/translations/ru.po39
-rw-r--r--systems/win32/miktex/tm/packages/files.csv.lzmabin647651 -> 644704 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/files.csv.lzmabin647348 -> 644630 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/pr.ini10
-rw-r--r--systems/win32/miktex/tm/packages/pr.ini12
-rw-r--r--timestamp2
74 files changed, 7009 insertions, 2356 deletions
diff --git a/FILES.byname b/FILES.byname
index ca4aa14a2b..a9a4a7ced5 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -1900,17 +1900,17 @@
2022/02/06 | 20984 | biblio/pbibtex/pbibtex-base/tieice.bst
2022/02/06 | 20673 | biblio/pbibtex/pbibtex-base/tipsj.bst
2022/02/06 | 85939 | biblio/pbibtex/pbibtex-base.zip
-2022/02/06 | 257313 | biblio/pbibtex/pbibtex-manual/jbibtex.pdf
-2022/02/06 | 30811 | biblio/pbibtex/pbibtex-manual/jbibtex.tex
-2022/02/06 | 289185 | biblio/pbibtex/pbibtex-manual/jbtxdoc.pdf
-2022/02/06 | 53326 | biblio/pbibtex/pbibtex-manual/jbtxdoc.tex
-2022/02/06 | 247228 | biblio/pbibtex/pbibtex-manual/jbtxhak.pdf
-2022/02/06 | 38536 | biblio/pbibtex/pbibtex-manual/jbtxhak.tex
-2022/02/06 | 1554 | biblio/pbibtex/pbibtex-manual/LICENSE
-2022/02/06 | 118781 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
-2022/02/06 | 13420 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
-2022/02/06 | 942 | biblio/pbibtex/pbibtex-manual/README.md
-2022/02/06 | 951818 | biblio/pbibtex/pbibtex-manual.zip
+2022/04/05 | 257313 | biblio/pbibtex/pbibtex-manual/jbibtex.pdf
+2022/04/05 | 30811 | biblio/pbibtex/pbibtex-manual/jbibtex.tex
+2022/04/05 | 289185 | biblio/pbibtex/pbibtex-manual/jbtxdoc.pdf
+2022/04/05 | 53326 | biblio/pbibtex/pbibtex-manual/jbtxdoc.tex
+2022/04/05 | 247228 | biblio/pbibtex/pbibtex-manual/jbtxhak.pdf
+2022/04/05 | 38536 | biblio/pbibtex/pbibtex-manual/jbtxhak.tex
+2022/04/05 | 1554 | biblio/pbibtex/pbibtex-manual/LICENSE
+2022/04/05 | 150261 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
+2022/04/05 | 22384 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
+2022/04/05 | 942 | biblio/pbibtex/pbibtex-manual/README.md
+2022/04/05 | 985604 | biblio/pbibtex/pbibtex-manual.zip
1995/04/07 | 4266 | biblio/tib/CHANGES
1989/11/08 | 1571 | biblio/tib/doc/Styles
1995/04/07 | 5042 | biblio/tib/elisp/tib.el
@@ -5228,7 +5228,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2022/04/04 | 59988 | FILES.last07days
+2022/04/05 | 70360 | FILES.last07days
2021/07/24 | 1139410 | fonts/aboensis/Aboensis.glyphs
2021/07/24 | 18907382 | fonts/aboensis/aboensis.pdf
2021/07/24 | 137860 | fonts/aboensis/Aboensis-Regular.otf
@@ -161436,6 +161436,24 @@
1992/04/08 | 1305 | indexing/glo+idxtex/README
1992/04/08 | 1771 | indexing/glo+idxtex/TAGS
2006/04/18 | 415211 | indexing/glo+idxtex.zip
+2020/12/06 | 1739 | indexing/hsindex/HsIndex.cabal
+2022/04/05 | 35085 | indexing/hsindex/LICENSE
+2022/04/05 | 4711 | indexing/hsindex/README
+2020/12/06 | 205 | indexing/hsindex/README.md
+2020/12/06 | 872 | indexing/hsindex/src/HsIndex/CharLists/English.hs
+2020/12/06 | 1536 | indexing/hsindex/src/HsIndex/CharLists/French.hs
+2020/12/06 | 1223 | indexing/hsindex/src/HsIndex/CharLists/German.hs
+2020/12/06 | 1140 | indexing/hsindex/src/HsIndex/CharLists/Russian.hs
+2020/12/06 | 2879 | indexing/hsindex/src/HsIndex/CharLists/SubsIEC.hs
+2020/12/06 | 608 | indexing/hsindex/src/HsIndex/CharLists/Symbols.hs
+2020/12/06 | 5461 | indexing/hsindex/src/HsIndex/Files.hs
+2020/12/06 | 7762 | indexing/hsindex/src/HsIndex/Functions.hs
+2020/12/06 | 14136 | indexing/hsindex/src/hsindex.hs
+2020/12/06 | 15506 | indexing/hsindex/src/HsIndex/Parser.hs
+2020/12/06 | 12397 | indexing/hsindex/src/HsIndex/Show.hs
+2020/12/06 | 11510 | indexing/hsindex/src/HsIndex/Sorting.hs
+2020/12/06 | 7767 | indexing/hsindex/src/HsIndex/Types.hs
+2022/04/05 | 36861 | indexing/hsindex.zip
1991/09/07 | 129 | indexing/lamstex-index/config.MS.h
1991/09/07 | 335 | indexing/lamstex-index/config.sun-gcc.h
1991/09/07 | 107149 | indexing/lamstex-index/DOS-EXE/INDEX.EXE
@@ -184064,13 +184082,13 @@
2018/09/14 | 37369 | info/memdesign/memetc.bib
2018/09/14 | 2471 | info/memdesign/README
2018/09/14 | 1795144 | info/memdesign.zip
-2021/06/25 | 1585 | info/mendex-doc/jpbase.ist
-2021/06/25 | 1554 | info/mendex-doc/LICENSE
-2021/06/25 | 1366 | info/mendex-doc/Makefile
-2021/06/25 | 225190 | info/mendex-doc/mendex.pdf
-2021/06/25 | 36435 | info/mendex-doc/mendex.tex
-2021/06/25 | 1429 | info/mendex-doc/README.md
-2021/06/25 | 235472 | info/mendex-doc.zip
+2022/04/05 | 1585 | info/mendex-doc/jpbase.ist
+2022/04/05 | 1554 | info/mendex-doc/LICENSE
+2022/04/05 | 1398 | info/mendex-doc/Makefile
+2022/04/05 | 230127 | info/mendex-doc/mendex.pdf
+2022/04/05 | 39196 | info/mendex-doc/mendex.tex
+2022/04/05 | 1429 | info/mendex-doc/README.md
+2022/04/05 | 241094 | info/mendex-doc.zip
2006/06/04 | 192518 | info/metafont/beginners/metafont-for-beginners.pdf
2009/10/09 | 48528 | info/metafont/beginners/metafont-for-beginners.tex
2009/10/09 | 182733 | info/metafont/beginners.zip
@@ -184345,30 +184363,30 @@
2014/06/23 | 584 | info/pstricks_calcnotes/README
2014/04/03 | 652952 | info/pstricks_calcnotes/ThreeAppsPDF.pdf
2014/06/22 | 2060099 | info/pstricks_calcnotes.zip
-2021/08/04 | 356743 | info/ptex-manual/eptexdoc.pdf
-2021/08/04 | 73849 | info/ptex-manual/eptexdoc.tex
-2021/08/04 | 694464 | info/ptex-manual/eptex_resume.pdf
-2021/08/04 | 95260 | info/ptex-manual/eptex_resume.tex
-2021/08/04 | 3173 | info/ptex-manual/fam256d.tex
-2021/08/04 | 3372 | info/ptex-manual/fam256p.tex
-2021/08/04 | 197862 | info/ptex-manual/jfm.pdf
-2021/08/04 | 34279 | info/ptex-manual/jfm.tex
-2021/08/04 | 251872 | info/ptex-manual/jtex_asciimw.pdf
-2021/08/04 | 35293 | info/ptex-manual/jtex_asciimw.tex
-2021/08/04 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
-2021/08/04 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
-2021/08/04 | 1516 | info/ptex-manual/LICENSE
-2021/08/04 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
-2021/08/04 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
-2021/08/04 | 105110 | info/ptex-manual/ptex-guide-en.pdf
-2021/08/04 | 40955 | info/ptex-manual/ptex-guide-en.tex
-2021/08/04 | 288365 | info/ptex-manual/ptex-manual.pdf
-2021/08/04 | 4347 | info/ptex-manual/ptex-manual.sty
-2021/08/04 | 80251 | info/ptex-manual/ptex-manual.tex
-2021/08/04 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
-2021/08/04 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
-2021/08/04 | 1206 | info/ptex-manual/README.md
-2021/08/04 | 2519491 | info/ptex-manual.zip
+2022/04/05 | 378172 | info/ptex-manual/eptexdoc.pdf
+2022/04/05 | 77399 | info/ptex-manual/eptexdoc.tex
+2022/04/05 | 1012994 | info/ptex-manual/eptex_resume.pdf
+2022/04/05 | 95260 | info/ptex-manual/eptex_resume.tex
+2022/04/05 | 3173 | info/ptex-manual/fam256d.tex
+2022/04/05 | 3372 | info/ptex-manual/fam256p.tex
+2022/04/05 | 215779 | info/ptex-manual/jfm.pdf
+2022/04/05 | 40504 | info/ptex-manual/jfm.tex
+2022/04/05 | 251872 | info/ptex-manual/jtex_asciimw.pdf
+2022/04/05 | 35293 | info/ptex-manual/jtex_asciimw.tex
+2022/04/05 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
+2022/04/05 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
+2022/04/05 | 1516 | info/ptex-manual/LICENSE
+2022/04/05 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
+2022/04/05 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
+2022/04/05 | 106870 | info/ptex-manual/ptex-guide-en.pdf
+2022/04/05 | 42193 | info/ptex-manual/ptex-guide-en.tex
+2022/04/05 | 322239 | info/ptex-manual/ptex-manual.pdf
+2022/04/05 | 4903 | info/ptex-manual/ptex-manual.sty
+2022/04/05 | 95383 | info/ptex-manual/ptex-manual.tex
+2022/04/05 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
+2022/04/05 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
+2022/04/05 | 1206 | info/ptex-manual/README.md
+2022/04/05 | 2956803 | info/ptex-manual.zip
1994/01/21 | 22111 | info/qh2winh.zip
2021/04/25 | 3133138 | info/russian/basiclatex-ru/BasicLatex.pdf
2021/07/05 | 628 | info/russian/basiclatex-ru/README
@@ -185815,7 +185833,7 @@
2021/12/12 | 1613162 | 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/11/04 | 10952440 | install/language/japanese/jlreq.tds.zip
+2022/04/05 | 10955679 | install/language/japanese/jlreq.tds.zip
2021/12/11 | 1827908 | install/language/japanese/platex.tds.zip
2021/05/31 | 907477 | install/language/japanese/uplatex.tds.zip
2022/03/13 | 7725339 | install/language/vietnamese/vntex.tds.zip
@@ -195253,24 +195271,24 @@
2021/03/07 | 3600 | language/japanese/jlreq-deluxe/vf/zjlreq--uprubyminr-h.vf
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
-2021/07/22 | 49222 | language/japanese/jlreq/jfm-jlreq.lua
-2021/11/04 | 282259 | language/japanese/jlreq/jlreq.cls
-2021/11/04 | 21198 | language/japanese/jlreq/jlreq-helpers.sty
-2021/11/04 | 369879 | language/japanese/jlreq/jlreq-ja.pdf
-2021/11/04 | 119257 | language/japanese/jlreq/jlreq.pdf
-2021/08/11 | 7808 | language/japanese/jlreq/jlreq-trimmarks-ja.md
-2021/08/12 | 6497 | language/japanese/jlreq/jlreq-trimmarks.md
-2021/11/04 | 48379 | 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/11/04 | 45145 | language/japanese/jlreq/README-ja.md
-2021/11/04 | 6231 | language/japanese/jlreq/README.md
+2022/02/18 | 5662 | language/japanese/jlreq/jfm-jlreq-jidori.lua
+2022/02/18 | 49222 | language/japanese/jlreq/jfm-jlreq.lua
+2022/04/05 | 287360 | language/japanese/jlreq/jlreq.cls
+2022/02/18 | 21198 | language/japanese/jlreq/jlreq-helpers.sty
+2022/04/04 | 371465 | language/japanese/jlreq/jlreq-ja.pdf
+2022/04/04 | 119712 | language/japanese/jlreq/jlreq.pdf
+2022/02/18 | 7808 | language/japanese/jlreq/jlreq-trimmarks-ja.md
+2022/02/18 | 6497 | language/japanese/jlreq/jlreq-trimmarks.md
+2022/02/18 | 48379 | language/japanese/jlreq/jlreq-trimmarks.sty
+2022/02/18 | 1348 | language/japanese/jlreq/LICENSE
+2022/01/07 | 11487 | language/japanese/jlreq/luajfm2pl.lua
+2022/02/18 | 9170 | language/japanese/jlreq/Makefile
+2022/02/18 | 5652 | language/japanese/jlreq/make_variant_jfm.lua
+2022/04/04 | 45660 | language/japanese/jlreq/README-ja.md
+2022/04/04 | 6690 | 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/11/04 | 597908 | language/japanese/jlreq.zip
+2022/01/07 | 3315 | language/japanese/jlreq/README-template.tex
+2022/04/05 | 600820 | 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
@@ -203209,14 +203227,6 @@
2022/01/25 | 19106 | macros/latex/contrib/altsubsup/LICENSE
2022/01/25 | 118 | macros/latex/contrib/altsubsup/README.md
2022/03/16 | 355440 | macros/latex/contrib/altsubsup.zip
-2014/05/07 | 34753 | macros/latex/contrib/ametsoc/ametsoc2014.bst
-2014/08/25 | 34302 | macros/latex/contrib/ametsoc/ametsoc.cls
-2014/08/25 | 234479 | macros/latex/contrib/ametsoc/amsdocs.pdf
-2014/05/12 | 172127 | macros/latex/contrib/ametsoc/AMS_Refs.pdf
-2014/12/31 | 1920 | macros/latex/contrib/ametsoc/README
-2014/05/07 | 6320 | macros/latex/contrib/ametsoc/references.bib
-2014/08/25 | 6658 | macros/latex/contrib/ametsoc/template.tex
-2015/01/05 | 424285 | macros/latex/contrib/ametsoc.zip
2013/04/03 | 10197 | macros/latex/contrib/amsaddr/amsaddr.dtx
2012/03/21 | 1713 | macros/latex/contrib/amsaddr/amsaddr.ins
2013/04/03 | 194137 | macros/latex/contrib/amsaddr/amsaddr.pdf
@@ -226401,12 +226411,12 @@
2004/11/06 | 1611 | macros/latex/contrib/srcltx/srcltx.ins
2006/12/06 | 130115 | macros/latex/contrib/srcltx/srcltx.pdf
2006/12/07 | 120683 | macros/latex/contrib/srcltx.zip
-2022/03/04 | 1352 | macros/latex/contrib/srdp-mathematik/README.txt
-2022/03/04 | 178836 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
-2022/03/04 | 74401 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
-2022/03/04 | 45702 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
+2022/04/05 | 985 | macros/latex/contrib/srdp-mathematik/README.md
+2022/04/05 | 175330 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
+2022/04/05 | 74703 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
+2022/04/05 | 46958 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
2021/11/09 | 112313 | macros/latex/contrib/srdp-mathematik/srdp-tables.sty
-2022/03/04 | 187793 | macros/latex/contrib/srdp-mathematik.zip
+2022/04/05 | 185027 | macros/latex/contrib/srdp-mathematik.zip
2013/09/06 | 64496 | macros/latex/contrib/sseq/sseq.dtx
2009/04/10 | 112 | macros/latex/contrib/sseq/sseq.ins
2013/09/06 | 215050 | macros/latex/contrib/sseq/sseq.pdf
@@ -259314,6 +259324,14 @@
2020/08/07 | 1465 | obsolete/macros/latex/contrib/acroflex/README.md
2008/07/18 | 267347 | obsolete/macros/latex/contrib/acroflex/swf/AcroFleX.swf
2020/08/07 | 1338685 | obsolete/macros/latex/contrib/acroflex.zip
+2014/05/07 | 34753 | obsolete/macros/latex/contrib/ametsoc/ametsoc2014.bst
+2014/08/25 | 34302 | obsolete/macros/latex/contrib/ametsoc/ametsoc.cls
+2014/08/25 | 234479 | obsolete/macros/latex/contrib/ametsoc/amsdocs.pdf
+2014/05/12 | 172127 | obsolete/macros/latex/contrib/ametsoc/AMS_Refs.pdf
+2014/12/31 | 1920 | obsolete/macros/latex/contrib/ametsoc/README
+2014/05/07 | 6320 | obsolete/macros/latex/contrib/ametsoc/references.bib
+2014/08/25 | 6658 | obsolete/macros/latex/contrib/ametsoc/template.tex
+2015/01/05 | 424285 | obsolete/macros/latex/contrib/ametsoc.zip
1998/04/20 | 6373 | obsolete/macros/latex/contrib/ar/ar10.mf
1998/04/20 | 6393 | obsolete/macros/latex/contrib/ar/ar12.mf
1998/04/20 | 6386 | obsolete/macros/latex/contrib/ar/ar5.mf
@@ -272808,7 +272826,7 @@
2021/05/03 | 629 | support/TeX4ht/doc/README
2020/08/24 | 358454 | support/TeX4ht/doc/TeX4ht-doc.tex
2021/05/11 | 262 | support/TeX4ht/README
-2022/03/21 | 186077 | support/TeX4ht/source/ChangeLog
+2022/04/04 | 187791 | support/TeX4ht/source/ChangeLog
2021/05/03 | 1375 | support/TeX4ht/source/checklog.lua
2021/05/03 | 1189 | support/TeX4ht/source/common-code.tex
2021/05/03 | 2727 | support/TeX4ht/source/common-info.tex
@@ -272816,11 +272834,11 @@
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/vcss
2021/05/06 | 15 | support/TeX4ht/source/extra-bin/xmllint
2022/03/20 | 27082 | support/TeX4ht/source/Makefile
-2022/03/21 | 7978 | support/TeX4ht/source/mktex4ht-cnf.tex
+2022/04/04 | 8000 | support/TeX4ht/source/mktex4ht-cnf.tex
2021/05/03 | 1121 | support/TeX4ht/source/README
2021/05/03 | 1744 | support/TeX4ht/source/t1fontmake.lua
2021/05/03 | 297 | support/TeX4ht/source/t1fontsample.tex
-2022/03/21 | 1111005 | support/TeX4ht/source/tex4ht-4ht.tex
+2022/04/04 | 1112730 | support/TeX4ht/source/tex4ht-4ht.tex
2021/05/03 | 7127 | support/TeX4ht/source/tex4ht-auto-script.tex
2021/05/16 | 1539 | support/TeX4ht/source/tex4ht-bibtex2.tex
2021/05/03 | 21247 | support/TeX4ht/source/tex4ht-cond4ht.tex
@@ -272845,7 +272863,7 @@
2021/05/03 | 14218 | support/TeX4ht/source/tex4ht-htcmd.tex
2021/05/03 | 70683 | support/TeX4ht/source/tex4ht-html0.tex
2021/05/03 | 164748 | support/TeX4ht/source/tex4ht-html32.tex
-2022/03/20 | 611922 | support/TeX4ht/source/tex4ht-html4.tex
+2022/04/04 | 612729 | support/TeX4ht/source/tex4ht-html4.tex
2022/01/23 | 10834 | support/TeX4ht/source/tex4ht-html5.tex
2021/06/17 | 648233 | support/TeX4ht/source/tex4ht-html-speech.tex
2021/05/03 | 59483 | support/TeX4ht/source/tex4ht-html-speech-xtpipes.tex
@@ -272861,17 +272879,17 @@
2021/05/03 | 22748 | support/TeX4ht/source/tex4ht-jsmath.tex
2021/05/03 | 104631 | support/TeX4ht/source/tex4ht-jsml.tex
2021/05/03 | 90707 | support/TeX4ht/source/tex4ht-jsml-xtpipes.tex
-2021/12/02 | 5289 | support/TeX4ht/source/tex4ht-mathjax.tex
+2022/04/04 | 5302 | support/TeX4ht/source/tex4ht-mathjax.tex
2021/05/03 | 102444 | support/TeX4ht/source/tex4ht-mathltx.tex
2021/12/01 | 141726 | support/TeX4ht/source/tex4ht-mathml.tex
2021/05/03 | 8860 | support/TeX4ht/source/tex4ht-mathplayer.tex
2021/06/20 | 49012 | support/TeX4ht/source/tex4ht-mkht.tex
2021/05/03 | 26652 | support/TeX4ht/source/tex4ht-moz.tex
-2022/02/06 | 336643 | support/TeX4ht/source/tex4ht-ooffice.tex
+2022/04/04 | 336645 | support/TeX4ht/source/tex4ht-ooffice.tex
2021/05/03 | 11161 | support/TeX4ht/source/tex4ht-ooimpress.tex
2021/05/03 | 45918 | support/TeX4ht/source/tex4ht-oo-xtpipes.tex
2021/06/21 | 13398 | support/TeX4ht/source/tex4ht-options.tex
-2021/09/15 | 289521 | support/TeX4ht/source/tex4ht-sty.tex
+2022/04/04 | 289985 | support/TeX4ht/source/tex4ht-sty.tex
2021/05/03 | 7226 | support/TeX4ht/source/tex4ht-svg.tex
2021/05/03 | 106563 | support/TeX4ht/source/tex4ht-t4ht.tex
2021/05/03 | 44160 | support/TeX4ht/source/tex4ht-tei.tex
@@ -277395,9 +277413,9 @@
2019/02/28 | 110184 | systems/texlive/tlnet/archive/babel-irish.doc.r30277.tar.xz
2019/02/28 | 2276 | systems/texlive/tlnet/archive/babel-irish.r30277.tar.xz
2019/02/28 | 4252 | systems/texlive/tlnet/archive/babel-irish.source.r30277.tar.xz
-2020/05/22 | 446484 | systems/texlive/tlnet/archive/babel-italian.doc.r55232.tar.xz
-2020/05/22 | 3808 | systems/texlive/tlnet/archive/babel-italian.r55232.tar.xz
-2020/05/22 | 22436 | systems/texlive/tlnet/archive/babel-italian.source.r55232.tar.xz
+2022/04/05 | 463660 | systems/texlive/tlnet/archive/babel-italian.doc.r62890.tar.xz
+2022/04/05 | 3908 | systems/texlive/tlnet/archive/babel-italian.r62890.tar.xz
+2022/04/05 | 23708 | systems/texlive/tlnet/archive/babel-italian.source.r62890.tar.xz
2021/02/14 | 518004 | systems/texlive/tlnet/archive/babel-japanese.doc.r57733.tar.xz
2021/02/14 | 2428 | systems/texlive/tlnet/archive/babel-japanese.r57733.tar.xz
2021/02/14 | 8192 | systems/texlive/tlnet/archive/babel-japanese.source.r57733.tar.xz
@@ -277633,8 +277651,8 @@
2020/04/22 | 787504 | systems/texlive/tlnet/archive/bearwear.doc.r54826.tar.xz
2020/04/22 | 2376 | systems/texlive/tlnet/archive/bearwear.r54826.tar.xz
2020/04/22 | 5992 | systems/texlive/tlnet/archive/bearwear.source.r54826.tar.xz
-2022/03/21 | 648688 | systems/texlive/tlnet/archive/beaulivre.doc.r62833.tar.xz
-2022/03/21 | 4376 | systems/texlive/tlnet/archive/beaulivre.r62833.tar.xz
+2022/04/05 | 663672 | systems/texlive/tlnet/archive/beaulivre.doc.r62900.tar.xz
+2022/04/05 | 4248 | systems/texlive/tlnet/archive/beaulivre.r62900.tar.xz
2022/03/05 | 889508 | systems/texlive/tlnet/archive/beebe.r62423.tar.xz
2019/02/28 | 709916 | systems/texlive/tlnet/archive/begingreek.doc.r36294.tar.xz
2019/02/28 | 1664 | systems/texlive/tlnet/archive/begingreek.r36294.tar.xz
@@ -277787,8 +277805,8 @@
2022/03/07 | 29108 | systems/texlive/tlnet/archive/biblatex-ext.r62471.tar.xz
2019/02/28 | 595408 | systems/texlive/tlnet/archive/biblatex-fiwi.doc.r45876.tar.xz
2019/02/28 | 16768 | systems/texlive/tlnet/archive/biblatex-fiwi.r45876.tar.xz
-2022/03/15 | 1446388 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.doc.r62704.tar.xz
-2022/03/15 | 46236 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.r62704.tar.xz
+2022/04/05 | 1456148 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.doc.r62891.tar.xz
+2022/04/05 | 46320 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.r62891.tar.xz
2020/11/16 | 167748 | systems/texlive/tlnet/archive/biblatex-german-legal.doc.r56939.tar.xz
2020/11/16 | 5348 | systems/texlive/tlnet/archive/biblatex-german-legal.r56939.tar.xz
2021/05/09 | 999720 | systems/texlive/tlnet/archive/biblatex-gost.doc.r59135.tar.xz
@@ -278873,14 +278891,14 @@
2020/03/04 | 408 | systems/texlive/tlnet/archive/collection-langpolish.r54074.tar.xz
2020/03/04 | 392 | systems/texlive/tlnet/archive/collection-langportuguese.r54074.tar.xz
2020/03/07 | 380 | systems/texlive/tlnet/archive/collection-langspanish.r54141.tar.xz
-2022/03/12 | 6616 | systems/texlive/tlnet/archive/collection-latexextra.r62647.tar.xz
+2022/04/05 | 6628 | systems/texlive/tlnet/archive/collection-latexextra.r62901.tar.xz
2020/12/03 | 696 | systems/texlive/tlnet/archive/collection-latex.r57048.tar.xz
2021/02/24 | 772 | systems/texlive/tlnet/archive/collection-latexrecommended.r57862.tar.xz
2022/03/21 | 796 | systems/texlive/tlnet/archive/collection-luatex.r62829.tar.xz
2022/03/10 | 1572 | systems/texlive/tlnet/archive/collection-mathscience.r62559.tar.xz
2021/06/10 | 548 | systems/texlive/tlnet/archive/collection-metapost.r59531.tar.xz
2021/02/24 | 476 | systems/texlive/tlnet/archive/collection-music.r57878.tar.xz
-2022/03/10 | 1512 | systems/texlive/tlnet/archive/collection-pictures.r62566.tar.xz
+2022/04/05 | 1512 | systems/texlive/tlnet/archive/collection-pictures.r62888.tar.xz
2021/07/06 | 956 | systems/texlive/tlnet/archive/collection-plaingeneric.r59850.tar.xz
2021/12/17 | 812 | systems/texlive/tlnet/archive/collection-pstricks.r61329.tar.xz
2022/03/21 | 1616 | systems/texlive/tlnet/archive/collection-publishers.r62836.tar.xz
@@ -278903,8 +278921,8 @@
2019/02/28 | 2020 | systems/texlive/tlnet/archive/colorinfo.r15878.tar.xz
2019/02/28 | 25984 | systems/texlive/tlnet/archive/coloring.doc.r41042.tar.xz
2019/02/28 | 1480 | systems/texlive/tlnet/archive/coloring.r41042.tar.xz
-2022/03/21 | 110292 | systems/texlive/tlnet/archive/colorist.doc.r62833.tar.xz
-2022/03/21 | 8828 | systems/texlive/tlnet/archive/colorist.r62833.tar.xz
+2022/04/05 | 111760 | systems/texlive/tlnet/archive/colorist.doc.r62900.tar.xz
+2022/04/05 | 10028 | systems/texlive/tlnet/archive/colorist.r62900.tar.xz
2019/02/28 | 27632 | systems/texlive/tlnet/archive/colorprofiles.doc.r49086.tar.xz
2019/02/28 | 87972 | systems/texlive/tlnet/archive/colorprofiles.r49086.tar.xz
2019/02/28 | 1884 | systems/texlive/tlnet/archive/colorsep.r13293.tar.xz
@@ -278949,6 +278967,8 @@
2019/02/28 | 8200 | systems/texlive/tlnet/archive/commedit.source.r50116.tar.xz
2019/02/28 | 535056 | systems/texlive/tlnet/archive/comment.doc.r41927.tar.xz
2019/02/28 | 4124 | systems/texlive/tlnet/archive/comment.r41927.tar.xz
+2022/04/05 | 324112 | systems/texlive/tlnet/archive/commonunicode.doc.r62901.tar.xz
+2022/04/05 | 5628 | systems/texlive/tlnet/archive/commonunicode.r62901.tar.xz
2020/06/13 | 549992 | systems/texlive/tlnet/archive/commutative-diagrams.doc.r55526.tar.xz
2020/06/13 | 12684 | systems/texlive/tlnet/archive/commutative-diagrams.r55526.tar.xz
2019/02/28 | 1860 | systems/texlive/tlnet/archive/compactbib.r15878.tar.xz
@@ -279178,8 +279198,8 @@
2020/06/24 | 31152 | systems/texlive/tlnet/archive/cquthesis.source.r55643.tar.xz
2019/02/28 | 29448 | systems/texlive/tlnet/archive/crbox.doc.r29803.tar.xz
2019/02/28 | 1544 | systems/texlive/tlnet/archive/crbox.r29803.tar.xz
-2022/03/20 | 127788 | systems/texlive/tlnet/archive/create-theorem.doc.r62803.tar.xz
-2022/03/20 | 8464 | systems/texlive/tlnet/archive/create-theorem.r62803.tar.xz
+2022/04/05 | 128252 | systems/texlive/tlnet/archive/create-theorem.doc.r62892.tar.xz
+2022/04/05 | 8476 | systems/texlive/tlnet/archive/create-theorem.r62892.tar.xz
2022/03/03 | 125188 | systems/texlive/tlnet/archive/crefthe.doc.r62349.tar.xz
2022/03/03 | 2896 | systems/texlive/tlnet/archive/crefthe.r62349.tar.xz
2020/03/24 | 34244 | systems/texlive/tlnet/archive/crimson.doc.r54512.tar.xz
@@ -279921,8 +279941,8 @@
2021/10/31 | 281156 | systems/texlive/tlnet/archive/dsserif.doc.r60898.tar.xz
2021/10/31 | 90204 | systems/texlive/tlnet/archive/dsserif.r60898.tar.xz
2021/10/31 | 1000 | systems/texlive/tlnet/archive/dsserif.source.r60898.tar.xz
-2021/12/25 | 426648 | systems/texlive/tlnet/archive/dtk-bibliography.doc.r61396.tar.xz
-2021/12/25 | 516 | systems/texlive/tlnet/archive/dtk-bibliography.r61396.tar.xz
+2022/04/05 | 428044 | systems/texlive/tlnet/archive/dtk-bibliography.doc.r62889.tar.xz
+2022/04/05 | 516 | systems/texlive/tlnet/archive/dtk-bibliography.r62889.tar.xz
2022/03/11 | 78968 | systems/texlive/tlnet/archive/dtk.doc.r62607.tar.xz
2022/03/11 | 16612 | systems/texlive/tlnet/archive/dtk.r62607.tar.xz
2022/03/01 | 20520 | systems/texlive/tlnet/archive/dtl.aarch64-linux.r62280.tar.xz
@@ -280348,8 +280368,8 @@
2019/02/28 | 4224 | systems/texlive/tlnet/archive/eiad-ltx.source.r15878.tar.xz
2019/02/28 | 25636 | systems/texlive/tlnet/archive/eiad.r15878.tar.xz
2019/02/28 | 6960 | systems/texlive/tlnet/archive/eijkhout.r15878.tar.xz
-2022/03/21 | 542136 | systems/texlive/tlnet/archive/einfart.doc.r62833.tar.xz
-2022/03/21 | 4504 | systems/texlive/tlnet/archive/einfart.r62833.tar.xz
+2022/04/05 | 557156 | systems/texlive/tlnet/archive/einfart.doc.r62900.tar.xz
+2022/04/05 | 4376 | systems/texlive/tlnet/archive/einfart.r62900.tar.xz
2021/11/05 | 284620 | systems/texlive/tlnet/archive/ejpecp.doc.r60950.tar.xz
2021/11/05 | 5704 | systems/texlive/tlnet/archive/ejpecp.r60950.tar.xz
2021/11/05 | 7428 | systems/texlive/tlnet/archive/ejpecp.source.r60950.tar.xz
@@ -282039,8 +282059,8 @@
2019/02/28 | 24892 | systems/texlive/tlnet/archive/hustthesis.source.r42547.tar.xz
2021/06/02 | 150588 | systems/texlive/tlnet/archive/hvarabic.doc.r59423.tar.xz
2021/06/02 | 1468 | systems/texlive/tlnet/archive/hvarabic.r59423.tar.xz
-2022/03/02 | 8715968 | systems/texlive/tlnet/archive/hvfloat.doc.r62322.tar.xz
-2022/03/02 | 11408 | systems/texlive/tlnet/archive/hvfloat.r62322.tar.xz
+2022/04/05 | 8718616 | systems/texlive/tlnet/archive/hvfloat.doc.r62893.tar.xz
+2022/04/05 | 11704 | systems/texlive/tlnet/archive/hvfloat.r62893.tar.xz
2019/02/28 | 76336 | systems/texlive/tlnet/archive/hvindex.doc.r46051.tar.xz
2019/02/28 | 1672 | systems/texlive/tlnet/archive/hvindex.r46051.tar.xz
2022/03/02 | 86228 | systems/texlive/tlnet/archive/hvlogos.doc.r62324.tar.xz
@@ -282989,15 +283009,15 @@
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.amd64-freebsd.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.amd64-netbsd.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.armhf-linux.r32150.tar.xz
-2022/03/14 | 1140100 | systems/texlive/tlnet/archive/latexindent.doc.r62690.tar.xz
+2022/04/05 | 1149024 | systems/texlive/tlnet/archive/latexindent.doc.r62906.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/latexindent.i386-cygwin.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.i386-freebsd.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.i386-linux.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.i386-netbsd.r32150.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.i386-solaris.r32150.tar.xz
-2022/03/14 | 67800 | systems/texlive/tlnet/archive/latexindent.r62690.tar.xz
+2022/04/05 | 69260 | systems/texlive/tlnet/archive/latexindent.r62906.tar.xz
2021/02/25 | 344 | systems/texlive/tlnet/archive/latexindent.universal-darwin.r57908.tar.xz
-2022/03/14 | 4061868 | systems/texlive/tlnet/archive/latexindent.win32.r62690.tar.xz
+2022/04/05 | 4064244 | systems/texlive/tlnet/archive/latexindent.win32.r62906.tar.xz
2019/02/28 | 344 | systems/texlive/tlnet/archive/latexindent.x86_64-cygwin.r33557.tar.xz
2019/02/28 | 352 | systems/texlive/tlnet/archive/latexindent.x86_64-darwinlegacy.r43871.tar.xz
2019/02/28 | 348 | systems/texlive/tlnet/archive/latexindent.x86_64-linuxmusl.r46840.tar.xz
@@ -283134,8 +283154,8 @@
2020/11/08 | 344060 | systems/texlive/tlnet/archive/leaflet.doc.r56878.tar.xz
2020/11/08 | 5652 | systems/texlive/tlnet/archive/leaflet.r56878.tar.xz
2020/11/08 | 13844 | systems/texlive/tlnet/archive/leaflet.source.r56878.tar.xz
-2022/03/21 | 565164 | systems/texlive/tlnet/archive/lebhart.doc.r62833.tar.xz
-2022/03/21 | 4384 | systems/texlive/tlnet/archive/lebhart.r62833.tar.xz
+2022/04/05 | 559924 | systems/texlive/tlnet/archive/lebhart.doc.r62900.tar.xz
+2022/04/05 | 4260 | systems/texlive/tlnet/archive/lebhart.r62900.tar.xz
2019/02/28 | 1126000 | systems/texlive/tlnet/archive/lecturer.doc.r23916.tar.xz
2019/02/28 | 18668 | systems/texlive/tlnet/archive/lecturer.r23916.tar.xz
2020/02/03 | 2080 | systems/texlive/tlnet/archive/lectures.doc.r53642.tar.xz
@@ -283645,8 +283665,8 @@
2022/03/13 | 2266876 | systems/texlive/tlnet/archive/luajittex.x86_64-darwinlegacy.r62668.tar.xz
2022/03/13 | 3967112 | systems/texlive/tlnet/archive/luajittex.x86_64-linuxmusl.r62668.tar.xz
2022/03/13 | 2766096 | systems/texlive/tlnet/archive/luajittex.x86_64-linux.r62668.tar.xz
-2022/01/01 | 160940 | systems/texlive/tlnet/archive/luakeys.doc.r61458.tar.xz
-2022/01/01 | 5312 | systems/texlive/tlnet/archive/luakeys.r61458.tar.xz
+2022/04/05 | 170660 | systems/texlive/tlnet/archive/luakeys.doc.r62904.tar.xz
+2022/04/05 | 6180 | systems/texlive/tlnet/archive/luakeys.r62904.tar.xz
2019/02/28 | 137620 | systems/texlive/tlnet/archive/lualatex-doc-de.doc.r30474.tar.xz
2019/02/28 | 536 | systems/texlive/tlnet/archive/lualatex-doc-de.r30474.tar.xz
2019/02/28 | 112928 | systems/texlive/tlnet/archive/lualatex-doc.doc.r30473.tar.xz
@@ -284317,8 +284337,8 @@
2019/02/28 | 435560 | systems/texlive/tlnet/archive/minifp.doc.r32559.tar.xz
2019/02/28 | 10000 | systems/texlive/tlnet/archive/minifp.r32559.tar.xz
2019/02/28 | 43836 | systems/texlive/tlnet/archive/minifp.source.r32559.tar.xz
-2022/03/21 | 114840 | systems/texlive/tlnet/archive/minimalist.doc.r62833.tar.xz
-2022/03/21 | 8008 | systems/texlive/tlnet/archive/minimalist.r62833.tar.xz
+2022/04/05 | 113144 | systems/texlive/tlnet/archive/minimalist.doc.r62900.tar.xz
+2022/04/05 | 9164 | systems/texlive/tlnet/archive/minimalist.r62900.tar.xz
2022/03/05 | 296672 | systems/texlive/tlnet/archive/minim.doc.r62419.tar.xz
2022/03/05 | 26048 | systems/texlive/tlnet/archive/minim-hatching.doc.r62395.tar.xz
2022/03/05 | 2232 | systems/texlive/tlnet/archive/minim-hatching.r62395.tar.xz
@@ -285000,9 +285020,9 @@
2021/11/24 | 13784 | systems/texlive/tlnet/archive/numspell.r61132.tar.xz
2021/01/16 | 182360 | systems/texlive/tlnet/archive/nunito.doc.r57429.tar.xz
2021/01/16 | 4627580 | systems/texlive/tlnet/archive/nunito.r57429.tar.xz
-2022/03/21 | 2192904 | systems/texlive/tlnet/archive/nwafuthesis.doc.r62872.tar.xz
-2022/03/21 | 19208 | systems/texlive/tlnet/archive/nwafuthesis.r62872.tar.xz
-2022/03/21 | 59920 | systems/texlive/tlnet/archive/nwafuthesis.source.r62872.tar.xz
+2022/04/05 | 2241144 | systems/texlive/tlnet/archive/nwafuthesis.doc.r62905.tar.xz
+2022/04/05 | 19564 | systems/texlive/tlnet/archive/nwafuthesis.r62905.tar.xz
+2022/04/05 | 61028 | systems/texlive/tlnet/archive/nwafuthesis.source.r62905.tar.xz
2022/02/22 | 1321156 | systems/texlive/tlnet/archive/nwejm.doc.r62129.tar.xz
2022/02/22 | 4089520 | systems/texlive/tlnet/archive/nwejm.r62129.tar.xz
2022/02/22 | 49332 | systems/texlive/tlnet/archive/nwejm.source.r62129.tar.xz
@@ -286016,9 +286036,9 @@
2019/02/28 | 2324 | systems/texlive/tlnet/archive/progressbar.r33822.tar.xz
2019/02/28 | 80808 | systems/texlive/tlnet/archive/progress.doc.r19519.tar.xz
2019/02/28 | 4192 | systems/texlive/tlnet/archive/progress.r19519.tar.xz
-2022/03/21 | 679816 | systems/texlive/tlnet/archive/projlib.doc.r62868.tar.xz
-2022/03/21 | 36896 | systems/texlive/tlnet/archive/projlib.r62868.tar.xz
-2022/03/21 | 43896 | systems/texlive/tlnet/archive/projlib.source.r62868.tar.xz
+2022/04/05 | 679948 | systems/texlive/tlnet/archive/projlib.doc.r62900.tar.xz
+2022/04/05 | 23552 | systems/texlive/tlnet/archive/projlib.r62900.tar.xz
+2022/04/05 | 44948 | systems/texlive/tlnet/archive/projlib.source.r62900.tar.xz
2022/02/08 | 446708 | systems/texlive/tlnet/archive/proof-at-the-end.doc.r61933.tar.xz
2022/02/08 | 6944 | systems/texlive/tlnet/archive/proof-at-the-end.r61933.tar.xz
2022/02/08 | 20480 | systems/texlive/tlnet/archive/proof-at-the-end.source.r61933.tar.xz
@@ -286962,9 +286982,9 @@
2019/02/28 | 513152 | systems/texlive/tlnet/archive/sclang-prettifier.doc.r35087.tar.xz
2019/02/28 | 2248 | systems/texlive/tlnet/archive/sclang-prettifier.r35087.tar.xz
2019/02/28 | 9276 | systems/texlive/tlnet/archive/sclang-prettifier.source.r35087.tar.xz
-2020/01/24 | 358504 | systems/texlive/tlnet/archive/scontents.doc.r53504.tar.xz
-2020/01/24 | 8844 | systems/texlive/tlnet/archive/scontents.r53504.tar.xz
-2020/01/24 | 29576 | systems/texlive/tlnet/archive/scontents.source.r53504.tar.xz
+2022/04/05 | 367028 | systems/texlive/tlnet/archive/scontents.doc.r62902.tar.xz
+2022/04/05 | 8172 | systems/texlive/tlnet/archive/scontents.r62902.tar.xz
+2022/04/05 | 29640 | systems/texlive/tlnet/archive/scontents.source.r62902.tar.xz
2021/09/27 | 193772 | systems/texlive/tlnet/archive/scrambledenvs.doc.r60615.tar.xz
2021/09/27 | 2408 | systems/texlive/tlnet/archive/scrambledenvs.r60615.tar.xz
2021/09/27 | 5752 | systems/texlive/tlnet/archive/scrambledenvs.source.r60615.tar.xz
@@ -287186,6 +287206,8 @@
2019/02/28 | 2420 | systems/texlive/tlnet/archive/simpleinvoice.r45673.tar.xz
2020/04/28 | 332620 | systems/texlive/tlnet/archive/simplekv.doc.r54915.tar.xz
2020/04/28 | 2908 | systems/texlive/tlnet/archive/simplekv.r54915.tar.xz
+2022/04/05 | 208680 | systems/texlive/tlnet/archive/simplenodes.doc.r62888.tar.xz
+2022/04/05 | 2172 | systems/texlive/tlnet/archive/simplenodes.r62888.tar.xz
2020/03/04 | 83472 | systems/texlive/tlnet/archive/simpleoptics.doc.r54080.tar.xz
2020/03/04 | 1100 | systems/texlive/tlnet/archive/simpleoptics.r54080.tar.xz
2019/02/28 | 96196 | systems/texlive/tlnet/archive/simple-resume-cv.doc.r43057.tar.xz
@@ -287199,8 +287221,8 @@
2019/02/28 | 4412 | systems/texlive/tlnet/archive/simplewick.source.r15878.tar.xz
2019/02/28 | 942836 | systems/texlive/tlnet/archive/simplified-latex.doc.r20620.tar.xz
2019/02/28 | 380 | systems/texlive/tlnet/archive/simplified-latex.r20620.tar.xz
-2022/03/21 | 699340 | systems/texlive/tlnet/archive/simplivre.doc.r62833.tar.xz
-2022/03/21 | 4472 | systems/texlive/tlnet/archive/simplivre.r62833.tar.xz
+2022/04/05 | 711804 | systems/texlive/tlnet/archive/simplivre.doc.r62900.tar.xz
+2022/04/05 | 4352 | systems/texlive/tlnet/archive/simplivre.r62900.tar.xz
2019/02/28 | 136908 | systems/texlive/tlnet/archive/simurgh.doc.r31719.tar.xz
2019/02/28 | 246476 | systems/texlive/tlnet/archive/simurgh.r31719.tar.xz
2021/06/24 | 323456 | systems/texlive/tlnet/archive/sistyle.doc.r59682.tar.xz
@@ -287212,9 +287234,9 @@
2021/06/26 | 250232 | systems/texlive/tlnet/archive/siunits.doc.r59702.tar.xz
2021/06/26 | 6040 | systems/texlive/tlnet/archive/siunits.r59702.tar.xz
2021/06/26 | 34532 | systems/texlive/tlnet/archive/siunits.source.r59702.tar.xz
-2022/02/17 | 1208812 | systems/texlive/tlnet/archive/siunitx.doc.r62048.tar.xz
-2022/02/17 | 62812 | systems/texlive/tlnet/archive/siunitx.r62048.tar.xz
-2022/02/17 | 108792 | systems/texlive/tlnet/archive/siunitx.source.r62048.tar.xz
+2022/04/05 | 1208380 | systems/texlive/tlnet/archive/siunitx.doc.r62903.tar.xz
+2022/04/05 | 62872 | systems/texlive/tlnet/archive/siunitx.r62903.tar.xz
+2022/04/05 | 108860 | systems/texlive/tlnet/archive/siunitx.source.r62903.tar.xz
2022/01/24 | 200108 | systems/texlive/tlnet/archive/skak.doc.r61719.tar.xz
2019/02/28 | 316212 | systems/texlive/tlnet/archive/skaknew.doc.r20031.tar.xz
2019/02/28 | 160064 | systems/texlive/tlnet/archive/skaknew.r20031.tar.xz
@@ -287849,14 +287871,14 @@
2022/02/27 | 108804 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r62206.tar.xz
2022/02/27 | 87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r62220.tar.xz
2022/03/01 | 71588 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r62280.tar.xz
-2022/03/21 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r62875.tar.xz
+2022/04/05 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r62897.tar.xz
2022/03/01 | 58328 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r62282.tar.xz
2022/02/27 | 93760 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r62206.tar.xz
2022/02/27 | 91280 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r62210.tar.xz
2022/02/27 | 76200 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r62220.tar.xz
2022/02/27 | 83964 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r62206.tar.xz
-2022/03/21 | 950016 | systems/texlive/tlnet/archive/tex4ht.r62875.tar.xz
-2022/03/21 | 1248172 | systems/texlive/tlnet/archive/tex4ht.source.r62875.tar.xz
+2022/04/05 | 950592 | systems/texlive/tlnet/archive/tex4ht.r62897.tar.xz
+2022/04/05 | 1250184 | systems/texlive/tlnet/archive/tex4ht.source.r62897.tar.xz
2022/02/28 | 184748 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r62258.tar.xz
2022/02/27 | 57768 | systems/texlive/tlnet/archive/tex4ht.win32.r62199.tar.xz
2022/03/01 | 58016 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r62279.tar.xz
@@ -288091,7 +288113,7 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2022/03/21 | 405592 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62858.tar.xz
+2022/04/05 | 405604 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62882.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
@@ -288115,7 +288137,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2022/03/21 | 109840 | systems/texlive/tlnet/archive/texlive-scripts.r62858.tar.xz
+2022/04/05 | 109876 | systems/texlive/tlnet/archive/texlive-scripts.r62882.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2022/02/27 | 36292 | systems/texlive/tlnet/archive/texlive-scripts.win32.r62199.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -288635,7 +288657,7 @@
2019/02/28 | 348 | systems/texlive/tlnet/archive/tlcockpit.x86_64-linuxmusl.r47036.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/tlcockpit.x86_64-linux.r46798.tar.xz
2019/02/28 | 340 | systems/texlive/tlnet/archive/tlcockpit.x86_64-solaris.r46798.tar.xz
-2021/09/30 | 8374008 | systems/texlive/tlnet/archive/tlgs.win32.r60648.tar.xz
+2022/04/05 | 8138304 | systems/texlive/tlnet/archive/tlgs.win32.r62895.tar.xz
2021/09/24 | 171580 | systems/texlive/tlnet/archive/tlmgrbasics.doc.r60588.tar.xz
2021/09/24 | 428 | systems/texlive/tlnet/archive/tlmgrbasics.r60588.tar.xz
2021/05/07 | 444724 | systems/texlive/tlnet/archive/tlmgr-intro-zh-cn.doc.r59100.tar.xz
@@ -289916,16 +289938,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2022/03/16 | 108660 | systems/texlive/tlnet/install-tl
-2022/03/21 | 5797017 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2022/03/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2022/03/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/05 | 5796982 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2022/03/21 | 20459294 | systems/texlive/tlnet/install-tl-windows.exe
-2022/03/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2022/03/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2022/03/21 | 25481050 | systems/texlive/tlnet/install-tl.zip
-2022/03/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2022/03/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/05 | 20462353 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/05 | 25481038 | systems/texlive/tlnet/install-tl.zip
+2022/04/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2022/04/03 | 1229 | systems/texlive/tlnet/README.md
2022/04/03 | 0 | systems/texlive/tlnet/TEXLIVE_2022
2022/02/28 | 7791 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -289935,7 +289957,7 @@
2022/02/28 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2022/01/12 | 49482 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2022/03/21 | 7408 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2022/03/21 | 7562 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2022/03/19 | 211170 | 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
@@ -289977,12 +289999,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/12/21 | 5429 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/12/21 | 27582 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2022/03/21 | 17243809 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2022/03/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/05 | 17246669 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/12/21 | 86654 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2022/03/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2022/03/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2022/03/21 | 2363652 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/05 | 2365960 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/12/21 | 58848 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/12/21 | 42112 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/12/21 | 16130 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -293451,13 +293473,13 @@
2022/03/07 | 57679 | systems/win32/miktex/tm/packages/acmart__source.tar.lzma
2022/03/07 | 39741 | systems/win32/miktex/tm/packages/acmart.tar.lzma
2016/07/19 | 105378 | systems/win32/miktex/tm/packages/acmconf.tar.lzma
-2022/02/07 | 1223290 | systems/win32/miktex/tm/packages/acro__doc.tar.lzma
+2022/04/05 | 1230532 | systems/win32/miktex/tm/packages/acro__doc.tar.lzma
2016/08/30 | 774465 | systems/win32/miktex/tm/packages/acroflex.tar.lzma
2020/06/28 | 815002 | systems/win32/miktex/tm/packages/acromemory.tar.lzma
2020/04/15 | 301327 | systems/win32/miktex/tm/packages/acronym.tar.lzma
2020/06/22 | 2271156 | systems/win32/miktex/tm/packages/acrosort.tar.lzma
-2022/02/07 | 23421 | systems/win32/miktex/tm/packages/acro__source.tar.lzma
-2022/02/07 | 43863 | systems/win32/miktex/tm/packages/acro.tar.lzma
+2022/04/05 | 23957 | systems/win32/miktex/tm/packages/acro__source.tar.lzma
+2022/04/05 | 44439 | systems/win32/miktex/tm/packages/acro.tar.lzma
2010/11/24 | 163309 | systems/win32/miktex/tm/packages/acroterm.tar.lzma
2021/10/14 | 2815704 | systems/win32/miktex/tm/packages/acrotex__doc.tar.lzma
2021/11/06 | 590049 | systems/win32/miktex/tm/packages/acrotex-js__doc.tar.lzma
@@ -293564,6 +293586,9 @@
2022/02/22 | 30576 | systems/win32/miktex/tm/packages/animate__source.tar.lzma
2022/02/22 | 24198 | systems/win32/miktex/tm/packages/animate.tar.lzma
2020/08/09 | 1139079 | systems/win32/miktex/tm/packages/annee-scolaire.tar.lzma
+2022/04/05 | 124205 | systems/win32/miktex/tm/packages/annotate-equations__doc.tar.lzma
+2022/04/05 | 3484 | systems/win32/miktex/tm/packages/annotate-equations__source.tar.lzma
+2022/04/05 | 3131 | systems/win32/miktex/tm/packages/annotate-equations.tar.lzma
2018/08/27 | 1599994 | systems/win32/miktex/tm/packages/annot-pro.tar.lzma
2010/02/22 | 189080 | systems/win32/miktex/tm/packages/anonchap.tar.lzma
2020/05/13 | 385905 | systems/win32/miktex/tm/packages/anonymous-acm.tar.lzma
@@ -293732,7 +293757,9 @@
2017/02/16 | 121651 | systems/win32/miktex/tm/packages/babel-indonesian.tar.lzma
2014/05/21 | 116595 | systems/win32/miktex/tm/packages/babel-interlingua.tar.lzma
2014/05/21 | 117128 | systems/win32/miktex/tm/packages/babel-irish.tar.lzma
-2020/05/23 | 475182 | systems/win32/miktex/tm/packages/babel-italian.tar.lzma
+2022/04/05 | 466374 | systems/win32/miktex/tm/packages/babel-italian__doc.tar.lzma
+2022/04/05 | 24074 | systems/win32/miktex/tm/packages/babel-italian__source.tar.lzma
+2022/04/05 | 4141 | systems/win32/miktex/tm/packages/babel-italian.tar.lzma
2021/02/15 | 528233 | systems/win32/miktex/tm/packages/babel-japanese.tar.lzma
2014/05/21 | 134496 | systems/win32/miktex/tm/packages/babel-kurmanji.tar.lzma
2021/07/01 | 183357 | systems/win32/miktex/tm/packages/babel-latin__doc.tar.lzma
@@ -293858,9 +293885,9 @@
2013/04/15 | 341764 | systems/win32/miktex/tm/packages/beamertheme-upenn-bc.tar.lzma
2015/12/29 | 623849 | systems/win32/miktex/tm/packages/beamer-verona.tar.lzma
2020/04/22 | 794111 | systems/win32/miktex/tm/packages/bearwear.tar.lzma
-2022/03/29 | 647047 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
-2022/03/29 | 15348 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2022/03/29 | 4389 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
+2022/04/05 | 650116 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
+2022/04/05 | 15367 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
+2022/04/05 | 4416 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
2016/11/05 | 310673 | systems/win32/miktex/tm/packages/beebe.tar.lzma
2005/06/02 | 43896 | systems/win32/miktex/tm/packages/begriff.cab
2020/08/30 | 759144 | systems/win32/miktex/tm/packages/beilstein.tar.lzma
@@ -293931,9 +293958,9 @@
2022/03/07 | 39359 | systems/win32/miktex/tm/packages/biblatex-ext__source.tar.lzma
2022/03/07 | 28970 | systems/win32/miktex/tm/packages/biblatex-ext.tar.lzma
2017/11/22 | 616165 | systems/win32/miktex/tm/packages/biblatex-fiwi.tar.lzma
-2022/03/17 | 1363091 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__doc.tar.lzma
-2022/03/17 | 89557 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__source.tar.lzma
-2022/03/17 | 46036 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015.tar.lzma
+2022/04/05 | 1372666 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__doc.tar.lzma
+2022/04/05 | 89557 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__source.tar.lzma
+2022/04/05 | 46119 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015.tar.lzma
2020/11/24 | 173898 | systems/win32/miktex/tm/packages/biblatex-german-legal.tar.lzma
2021/05/18 | 1022019 | systems/win32/miktex/tm/packages/biblatex-gost.tar.lzma
2010/08/24 | 601778 | systems/win32/miktex/tm/packages/biblatex-historian.tar.lzma
@@ -294435,9 +294462,9 @@
2020/10/20 | 240260 | systems/win32/miktex/tm/packages/color-edits.tar.lzma
2018/09/25 | 31097260 | systems/win32/miktex/tm/packages/coloremoji.tar.lzma
2016/05/15 | 27866 | systems/win32/miktex/tm/packages/coloring.tar.lzma
-2022/03/29 | 104777 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
-2022/03/29 | 7712 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2022/03/29 | 9605 | systems/win32/miktex/tm/packages/colorist.tar.lzma
+2022/04/05 | 105668 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
+2022/04/05 | 7758 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
+2022/04/05 | 10192 | systems/win32/miktex/tm/packages/colorist.tar.lzma
2018/12/20 | 115731 | systems/win32/miktex/tm/packages/colorprofiles.tar.lzma
2001/05/14 | 2083 | systems/win32/miktex/tm/packages/colorsep.tar.lzma
2019/03/28 | 124213 | systems/win32/miktex/tm/packages/colorspace.tar.lzma
@@ -294459,6 +294486,9 @@
2019/02/25 | 612669 | systems/win32/miktex/tm/packages/commedit.tar.lzma
2016/08/30 | 542821 | systems/win32/miktex/tm/packages/comment.tar.lzma
2016/07/18 | 16387 | systems/win32/miktex/tm/packages/committee-font.tar.lzma
+2022/04/05 | 321669 | systems/win32/miktex/tm/packages/commonunicode__doc.tar.lzma
+2022/04/05 | 1307 | systems/win32/miktex/tm/packages/commonunicode__source.tar.lzma
+2022/04/05 | 5822 | systems/win32/miktex/tm/packages/commonunicode.tar.lzma
2020/06/13 | 565907 | systems/win32/miktex/tm/packages/commutative-diagrams.tar.lzma
2001/05/31 | 2089 | systems/win32/miktex/tm/packages/compactbib.tar.lzma
2018/05/04 | 7572 | systems/win32/miktex/tm/packages/competences.tar.lzma
@@ -294522,9 +294552,9 @@
2018/05/11 | 2710331 | systems/win32/miktex/tm/packages/cqubeamer.tar.lzma
2020/06/24 | 1215573 | systems/win32/miktex/tm/packages/cquthesis.tar.lzma
2013/04/08 | 31446 | systems/win32/miktex/tm/packages/crbox.tar.lzma
-2022/03/29 | 123299 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
-2022/03/29 | 5724 | systems/win32/miktex/tm/packages/create-theorem__source.tar.lzma
-2022/03/29 | 8647 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
+2022/04/05 | 123685 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
+2022/04/05 | 5824 | systems/win32/miktex/tm/packages/create-theorem__source.tar.lzma
+2022/04/05 | 8666 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
2022/03/07 | 122499 | systems/win32/miktex/tm/packages/crefthe__doc.tar.lzma
2022/03/07 | 4385 | systems/win32/miktex/tm/packages/crefthe__source.tar.lzma
2022/03/07 | 3101 | systems/win32/miktex/tm/packages/crefthe.tar.lzma
@@ -294777,8 +294807,8 @@
2021/11/01 | 280840 | systems/win32/miktex/tm/packages/dsserif__doc.tar.lzma
2021/11/01 | 4332 | systems/win32/miktex/tm/packages/dsserif__source.tar.lzma
2021/11/01 | 90559 | systems/win32/miktex/tm/packages/dsserif.tar.lzma
-2022/01/02 | 48564 | systems/win32/miktex/tm/packages/dtk-bibliography__source.tar.lzma
-2022/01/02 | 378482 | systems/win32/miktex/tm/packages/dtk-bibliography.tar.lzma
+2022/04/05 | 48865 | systems/win32/miktex/tm/packages/dtk-bibliography__source.tar.lzma
+2022/04/05 | 379480 | systems/win32/miktex/tm/packages/dtk-bibliography.tar.lzma
2021/04/07 | 95995 | systems/win32/miktex/tm/packages/dtk.tar.lzma
2022/03/12 | 383950 | systems/win32/miktex/tm/packages/dtxdescribe__doc.tar.lzma
2022/03/12 | 20597 | systems/win32/miktex/tm/packages/dtxdescribe__source.tar.lzma
@@ -294857,9 +294887,9 @@
2020/04/07 | 32910 | systems/win32/miktex/tm/packages/ehhline.tar.lzma
2009/01/10 | 276496 | systems/win32/miktex/tm/packages/eiad.tar.lzma
2006/09/22 | 7331 | systems/win32/miktex/tm/packages/eijkhout.cab
-2022/03/29 | 540322 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
-2022/03/29 | 16341 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
-2022/03/29 | 4517 | systems/win32/miktex/tm/packages/einfart.tar.lzma
+2022/04/05 | 542924 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
+2022/04/05 | 16362 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
+2022/04/05 | 4554 | systems/win32/miktex/tm/packages/einfart.tar.lzma
2021/11/07 | 266695 | systems/win32/miktex/tm/packages/ejpecp__doc.tar.lzma
2021/11/07 | 26159 | systems/win32/miktex/tm/packages/ejpecp__source.tar.lzma
2021/11/07 | 5944 | systems/win32/miktex/tm/packages/ejpecp.tar.lzma
@@ -295156,7 +295186,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2022/04/04 | 647651 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/05 | 644704 | 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
@@ -295303,9 +295333,9 @@
2016/07/29 | 5333 | systems/win32/miktex/tm/packages/fullpict.tar.lzma
2011/12/01 | 290068 | systems/win32/miktex/tm/packages/fullwidth.tar.lzma
2004/07/24 | 29345 | systems/win32/miktex/tm/packages/functan.cab
-2022/03/29 | 377705 | systems/win32/miktex/tm/packages/functional__doc.tar.lzma
-2022/03/29 | 23004 | systems/win32/miktex/tm/packages/functional__source.tar.lzma
-2022/03/29 | 7134 | systems/win32/miktex/tm/packages/functional.tar.lzma
+2022/04/05 | 501573 | systems/win32/miktex/tm/packages/functional__doc.tar.lzma
+2022/04/05 | 31250 | systems/win32/miktex/tm/packages/functional__source.tar.lzma
+2022/04/05 | 8364 | systems/win32/miktex/tm/packages/functional.tar.lzma
2012/04/17 | 191031 | systems/win32/miktex/tm/packages/fundus-calligra.tar.lzma
2012/04/17 | 1626 | systems/win32/miktex/tm/packages/fundus-cyr.tar.lzma
2012/04/17 | 195571 | systems/win32/miktex/tm/packages/fundus-la.tar.lzma
@@ -295639,9 +295669,9 @@
2016/07/28 | 127569 | systems/win32/miktex/tm/packages/huncial.tar.lzma
2016/11/28 | 817841 | systems/win32/miktex/tm/packages/hustthesis.tar.lzma
2021/06/03 | 152237 | systems/win32/miktex/tm/packages/hvarabic.tar.lzma
-2022/03/07 | 7234750 | systems/win32/miktex/tm/packages/hvfloat__doc.tar.lzma
-2022/03/07 | 1843908 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
-2022/03/07 | 11591 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
+2022/04/05 | 7239077 | systems/win32/miktex/tm/packages/hvfloat__doc.tar.lzma
+2022/04/05 | 1844015 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
+2022/04/05 | 11887 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
2017/12/14 | 78242 | systems/win32/miktex/tm/packages/hvindex.tar.lzma
2022/03/07 | 84758 | systems/win32/miktex/tm/packages/hvlogos__doc.tar.lzma
2022/03/07 | 2653 | systems/win32/miktex/tm/packages/hvlogos__source.tar.lzma
@@ -295844,8 +295874,8 @@
2022/01/24 | 6258 | systems/win32/miktex/tm/packages/karnaugh-map.tar.lzma
2015/05/25 | 338988 | systems/win32/miktex/tm/packages/karnaughmap.tar.lzma
2016/07/20 | 146948 | systems/win32/miktex/tm/packages/karnaugh.tar.lzma
-2022/03/12 | 141796 | systems/win32/miktex/tm/packages/kaytannollista-latexia__source.tar.lzma
-2022/03/12 | 847178 | systems/win32/miktex/tm/packages/kaytannollista-latexia.tar.lzma
+2022/04/05 | 141741 | systems/win32/miktex/tm/packages/kaytannollista-latexia__source.tar.lzma
+2022/04/05 | 847634 | systems/win32/miktex/tm/packages/kaytannollista-latexia.tar.lzma
2021/02/10 | 348142 | systems/win32/miktex/tm/packages/kblocks.tar.lzma
2011/11/03 | 732961 | systems/win32/miktex/tm/packages/kdgdocs.tar.lzma
2016/07/16 | 106291 | systems/win32/miktex/tm/packages/kdgreek.tar.lzma
@@ -295887,9 +295917,9 @@
2018/04/22 | 563537 | systems/win32/miktex/tm/packages/koma-script-examples.tar.lzma
2021/11/21 | 7012959 | systems/win32/miktex/tm/packages/koma-script__source.tar.lzma
2021/11/21 | 136769 | systems/win32/miktex/tm/packages/koma-script.tar.lzma
-2022/03/07 | 445768 | systems/win32/miktex/tm/packages/kotex-oblivoir__doc.tar.lzma
-2022/03/07 | 36903 | systems/win32/miktex/tm/packages/kotex-oblivoir__source.tar.lzma
-2022/03/07 | 43293 | systems/win32/miktex/tm/packages/kotex-oblivoir.tar.lzma
+2022/04/05 | 504999 | systems/win32/miktex/tm/packages/kotex-oblivoir__doc.tar.lzma
+2022/04/05 | 37058 | systems/win32/miktex/tm/packages/kotex-oblivoir__source.tar.lzma
+2022/04/05 | 43630 | systems/win32/miktex/tm/packages/kotex-oblivoir.tar.lzma
2015/10/14 | 10343 | systems/win32/miktex/tm/packages/kotex-plain.tar.lzma
2015/10/10 | 7697628 | systems/win32/miktex/tm/packages/kotex-utf.tar.lzma
2016/01/09 | 73703 | systems/win32/miktex/tm/packages/kotex-utils.tar.lzma
@@ -295997,9 +296027,9 @@
2022/03/17 | 2506625 | systems/win32/miktex/tm/packages/latex-graphics-dev__doc.tar.lzma
2022/03/17 | 57226 | systems/win32/miktex/tm/packages/latex-graphics-dev__source.tar.lzma
2022/03/17 | 16127 | systems/win32/miktex/tm/packages/latex-graphics-dev.tar.lzma
-2022/03/29 | 1020707 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
-2022/03/29 | 123381 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
-2022/03/29 | 68387 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
+2022/04/05 | 1027652 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
+2022/04/05 | 123283 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
+2022/04/05 | 68670 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
2022/03/17 | 2303179 | systems/win32/miktex/tm/packages/latex-lab-dev__doc.tar.lzma
2022/03/17 | 29784 | systems/win32/miktex/tm/packages/latex-lab-dev__source.tar.lzma
2022/03/17 | 10865 | systems/win32/miktex/tm/packages/latex-lab-dev.tar.lzma
@@ -296038,9 +296068,9 @@
2022/01/09 | 17228 | systems/win32/miktex/tm/packages/leadsheets.tar.lzma
2020/11/09 | 359651 | systems/win32/miktex/tm/packages/leaflet.tar.lzma
2004/07/13 | 333977 | systems/win32/miktex/tm/packages/leawood.cab
-2022/03/29 | 543194 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2022/03/29 | 15935 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
-2022/03/29 | 4396 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
+2022/04/05 | 546044 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
+2022/04/05 | 15963 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
+2022/04/05 | 4423 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
2011/09/13 | 1558514 | systems/win32/miktex/tm/packages/lecturer.tar.lzma
2022/03/07 | 47561 | systems/win32/miktex/tm/packages/lectureslides__doc.tar.lzma
2022/03/07 | 2302 | systems/win32/miktex/tm/packages/lectureslides__source.tar.lzma
@@ -296240,9 +296270,9 @@
2019/04/06 | 2685 | systems/win32/miktex/tm/packages/luaimageembed.tar.lzma
2011/02/19 | 180907 | systems/win32/miktex/tm/packages/luaindex.tar.lzma
2010/11/24 | 424357 | systems/win32/miktex/tm/packages/luainputenc.tar.lzma
-2022/01/02 | 156386 | systems/win32/miktex/tm/packages/luakeys__doc.tar.lzma
-2022/01/02 | 5729 | systems/win32/miktex/tm/packages/luakeys__source.tar.lzma
-2022/01/02 | 5837 | systems/win32/miktex/tm/packages/luakeys.tar.lzma
+2022/04/05 | 165849 | systems/win32/miktex/tm/packages/luakeys__doc.tar.lzma
+2022/04/05 | 5959 | systems/win32/miktex/tm/packages/luakeys__source.tar.lzma
+2022/04/05 | 6729 | systems/win32/miktex/tm/packages/luakeys.tar.lzma
2013/05/21 | 154494 | systems/win32/miktex/tm/packages/lualatex-doc-de.tar.lzma
2013/05/21 | 128214 | systems/win32/miktex/tm/packages/lualatex-doc.tar.lzma
2022/01/02 | 201693 | systems/win32/miktex/tm/packages/lualatex-math__doc.tar.lzma
@@ -296289,9 +296319,9 @@
2022/03/07 | 7878 | systems/win32/miktex/tm/packages/lua-uni-algos.tar.lzma
2021/01/11 | 294199 | systems/win32/miktex/tm/packages/lua-visual-debug.tar.lzma
2021/03/03 | 103795 | systems/win32/miktex/tm/packages/luavlna.tar.lzma
-2022/03/29 | 347370 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
-2022/03/29 | 14289 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
-2022/03/29 | 10635 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
+2022/04/05 | 347884 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
+2022/04/05 | 14294 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
+2022/04/05 | 10889 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
2021/10/14 | 114779 | systems/win32/miktex/tm/packages/luaxml__doc.tar.lzma
2021/10/14 | 9729 | systems/win32/miktex/tm/packages/luaxml__source.tar.lzma
2021/10/14 | 32350 | systems/win32/miktex/tm/packages/luaxml.tar.lzma
@@ -296372,9 +296402,9 @@
2018/07/27 | 222854 | systems/win32/miktex/tm/packages/marginfit.tar.lzma
2020/05/12 | 265372 | systems/win32/miktex/tm/packages/marginfix.tar.lzma
2018/08/14 | 331408 | systems/win32/miktex/tm/packages/marginnote.tar.lzma
-2022/03/07 | 909676 | systems/win32/miktex/tm/packages/markdown__doc.tar.lzma
-2022/03/07 | 88297 | systems/win32/miktex/tm/packages/markdown__source.tar.lzma
-2022/03/07 | 42279 | systems/win32/miktex/tm/packages/markdown.tar.lzma
+2022/04/05 | 947514 | systems/win32/miktex/tm/packages/markdown__doc.tar.lzma
+2022/04/05 | 89812 | systems/win32/miktex/tm/packages/markdown__source.tar.lzma
+2022/04/05 | 42914 | systems/win32/miktex/tm/packages/markdown.tar.lzma
2012/04/17 | 561606 | systems/win32/miktex/tm/packages/marvosym.tar.lzma
2022/03/12 | 4785503 | systems/win32/miktex/tm/packages/matapli__doc.tar.lzma
2022/03/12 | 11211 | systems/win32/miktex/tm/packages/matapli__source.tar.lzma
@@ -296739,9 +296769,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2022/03/12 | 39680 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2022/03/29 | 43240 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/04 | 273397 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2022/04/04 | 1443153 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/04/04 | 1331798 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/05 | 274242 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/05 | 1440477 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/05 | 1330022 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2022/03/12 | 13516 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2022/03/29 | 14391 | 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
@@ -296754,9 +296784,9 @@
2013/07/01 | 286736 | systems/win32/miktex/tm/packages/minibox.tar.lzma
2017/04/13 | 193445 | systems/win32/miktex/tm/packages/minidocument.tar.lzma
2014/01/06 | 486298 | systems/win32/miktex/tm/packages/minifp.tar.lzma
-2022/03/29 | 107067 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
-2022/03/29 | 7810 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
-2022/03/29 | 8834 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
+2022/04/05 | 107148 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
+2022/04/05 | 7833 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
+2022/04/05 | 9323 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
2022/03/07 | 292362 | systems/win32/miktex/tm/packages/minim__doc.tar.lzma
2022/03/07 | 24845 | systems/win32/miktex/tm/packages/minim-hatching__doc.tar.lzma
2022/03/07 | 2370 | systems/win32/miktex/tm/packages/minim-hatching__source.tar.lzma
@@ -296965,191 +296995,191 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2022/04/04 | 647348 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/04 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/04 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/04 | 1021845 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2022/04/04 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/04 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/04/04 | 31522 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/04 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2022/04/04 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/04 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/04/04 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/04/04 | 86756 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2022/04/04 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/04/04 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/04/04 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/04/04 | 27247 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/04 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/04 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/04/04 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/04/04 | 32954 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/04/04 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/04/04 | 51485 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2022/04/04 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/04/04 | 244962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2022/04/04 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/04 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2022/04/04 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2022/04/04 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/04/04 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/04 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2022/04/04 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/04/04 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/04 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/04 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/04 | 285712 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/04 | 326661 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/04 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/04 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/04/04 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/04/04 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/04 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2022/04/04 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/04 | 99816 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2022/04/04 | 113053 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/04 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2022/04/04 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2022/04/04 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/04 | 28570 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/04/04 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/04 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/04/04 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/04 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/04/04 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/04 | 78976 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/04/04 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2022/04/04 | 81460 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/04/04 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/04/04 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/04/04 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2022/04/04 | 25058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/04/04 | 97199 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/04 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/04/04 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/04 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/04/04 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/04/04 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/04 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2022/04/04 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/04/04 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/04 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/04/04 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
-2022/04/04 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
-2022/04/04 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2022/04/04 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/04/04 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2022/04/04 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/04/04 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2022/04/04 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/04/04 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/04/04 | 30541 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/04/04 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/04 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/04/04 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2022/04/04 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/04/04 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2022/04/04 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/04/04 | 93958 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2022/04/04 | 103338 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/04 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/04/04 | 1982085 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/04 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/04 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/04 | 27590 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/04 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/04/04 | 7752 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/04 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/04 | 190503 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2022/04/04 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/04/04 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/04 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/04 | 99256 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2022/04/04 | 104554 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/04/04 | 126533 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2022/04/04 | 139104 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/04 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/04 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2022/04/04 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2022/04/04 | 181516 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/04 | 49769 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2022/04/04 | 55569 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/04/04 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/04 | 35167 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/04/04 | 38559 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/04 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/04 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/04 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/04 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2022/04/04 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/04 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/04/04 | 213278 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/04/04 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/04/04 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2022/04/04 | 755741 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2022/04/04 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/04 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2022/04/04 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/04 | 210274 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2022/04/04 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/04 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/04 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2022/04/04 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2022/04/04 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/04/04 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2022/04/04 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2022/04/04 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/04 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/04/04 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/04 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/04/04 | 50798 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2022/04/04 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/04/04 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/04 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/04/04 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/04 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/04/04 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2022/04/04 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/04 | 57617 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/04 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2022/04/04 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2022/04/04 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/04 | 16559 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/04 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/04 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2022/04/04 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/04/04 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2022/04/04 | 173006 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2022/04/04 | 58666 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/04 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2022/04/04 | 100486 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2022/04/04 | 107704 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2022/04/04 | 2694875 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2022/04/04 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/04/04 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2022/04/04 | 62381 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/04/04 | 37115 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/04 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/04 | 28691 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/04 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/04/04 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2022/04/04 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/04 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/04 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/04 | 55756 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/04 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/04 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/04/04 | 629429 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2022/04/04 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/04 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/04 | 273447 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2022/04/04 | 1442929 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/04/04 | 1331780 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2022/04/04 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/04/04 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/05 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/05 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/05 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/05 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/05 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/05 | 28796 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/05 | 31519 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/05 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/05 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/05 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/05 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/05 | 86758 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/05 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/05 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/05 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/05 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/05 | 31342 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/05 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/05 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/05 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/05 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/05 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/05 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/05 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/05 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/05 | 179876 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/05 | 196115 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/05 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/05 | 103092 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/05 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/05 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/05 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/05 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/05 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/05 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/05 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/05 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/05 | 45822 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/05 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/05 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/05 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/05 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/05 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/05 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/05 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/05 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/05 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/05 | 28568 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/05 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/05 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/05 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/05 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/05 | 73479 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/05 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/05 | 72015 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/05 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/05 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/05 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/05 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/05 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/05 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/05 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/05 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/05 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/05 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/05 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/05 | 38425 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/05 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/05 | 484372 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/05 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/05 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/05 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/05 | 152028 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/05 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/05 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/05 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/05 | 16504 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/05 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/05 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/05 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/05 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/05 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/05 | 532453 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/05 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/05 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/05 | 528017 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/05 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/05 | 103338 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/05 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/05 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/05 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/05 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/05 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/05 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/05 | 7752 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/05 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/05 | 190504 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/05 | 208806 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/05 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/05 | 286413 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/05 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/05 | 104555 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/05 | 126534 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/05 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/05 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/05 | 325270 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/05 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/05 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/05 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/05 | 55569 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/05 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/05 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/05 | 38562 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/05 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/05 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/05 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/05 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/05 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/05 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/05 | 213278 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/05 | 36050 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/05 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/05 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/05 | 824372 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/05 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/05 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/05 | 210273 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/05 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/05 | 79026 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/05 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/05 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/05 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/05 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/05 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/05 | 31587 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/05 | 37374 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/05 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/05 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/05 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/05 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/05 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/05 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/05 | 1357070 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/05 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/05 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/05 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/05 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/05 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/05 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/05 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/05 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/05 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/05 | 64491 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/05 | 71006 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/05 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/05 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/05 | 58664 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/05 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/05 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/04/05 | 107703 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/05 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/05 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/05 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/05 | 62379 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/05 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/05 | 41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/05 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/05 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/05 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/05 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/05 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/05 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/05 | 55756 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/05 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/05 | 591568 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/05 | 629429 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/05 | 39726 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/05 | 43225 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/05 | 274348 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/05 | 1440131 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/05 | 1329160 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/05 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/05 | 14410 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2022/04/04 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/05 | 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
@@ -297242,9 +297272,9 @@
2021/11/25 | 3927 | systems/win32/miktex/tm/packages/numspell__source.tar.lzma
2021/11/25 | 13944 | systems/win32/miktex/tm/packages/numspell.tar.lzma
2021/01/17 | 4842977 | systems/win32/miktex/tm/packages/nunito.tar.lzma
-2022/03/29 | 1965758 | systems/win32/miktex/tm/packages/nwafuthesis__doc.tar.lzma
-2022/03/29 | 802243 | systems/win32/miktex/tm/packages/nwafuthesis__source.tar.lzma
-2022/03/29 | 25940 | systems/win32/miktex/tm/packages/nwafuthesis.tar.lzma
+2022/04/05 | 2012074 | systems/win32/miktex/tm/packages/nwafuthesis__doc.tar.lzma
+2022/04/05 | 835642 | systems/win32/miktex/tm/packages/nwafuthesis__source.tar.lzma
+2022/04/05 | 26305 | systems/win32/miktex/tm/packages/nwafuthesis.tar.lzma
2022/02/22 | 1321604 | systems/win32/miktex/tm/packages/nwejm__doc.tar.lzma
2022/02/22 | 49626 | systems/win32/miktex/tm/packages/nwejm__source.tar.lzma
2022/02/22 | 4098367 | systems/win32/miktex/tm/packages/nwejm.tar.lzma
@@ -297256,8 +297286,8 @@
2014/04/07 | 854578 | systems/win32/miktex/tm/packages/obnov.tar.lzma
2013/01/24 | 541997 | systems/win32/miktex/tm/packages/ocg-p.tar.lzma
2013/08/19 | 4002337 | systems/win32/miktex/tm/packages/ocgtools.tar.lzma
-2021/06/20 | 6592 | systems/win32/miktex/tm/packages/ocgx2__doc.tar.lzma
-2021/06/20 | 17256 | systems/win32/miktex/tm/packages/ocgx2.tar.lzma
+2022/04/05 | 6630 | systems/win32/miktex/tm/packages/ocgx2__doc.tar.lzma
+2022/04/05 | 17351 | systems/win32/miktex/tm/packages/ocgx2.tar.lzma
2012/12/20 | 1003744 | systems/win32/miktex/tm/packages/ocgx.tar.lzma
2011/01/07 | 294157 | systems/win32/miktex/tm/packages/ocr-b-outline.tar.lzma
2011/01/07 | 10750 | systems/win32/miktex/tm/packages/ocr-b.tar.lzma
@@ -297615,7 +297645,7 @@
2022/02/22 | 6917 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2022/04/04 | 970 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/05 | 1006 | 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
@@ -297632,9 +297662,9 @@
2017/05/12 | 61936 | systems/win32/miktex/tm/packages/program.tar.lzma
2014/05/05 | 89072 | systems/win32/miktex/tm/packages/progressbar.tar.lzma
2010/10/16 | 85014 | systems/win32/miktex/tm/packages/progress.tar.lzma
-2022/03/29 | 660276 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
-2022/03/29 | 44760 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
-2022/03/29 | 23225 | systems/win32/miktex/tm/packages/projlib.tar.lzma
+2022/04/05 | 660336 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
+2022/04/05 | 45102 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
+2022/04/05 | 23571 | systems/win32/miktex/tm/packages/projlib.tar.lzma
2022/02/08 | 446538 | systems/win32/miktex/tm/packages/proof-at-the-end__doc.tar.lzma
2022/02/08 | 23162 | systems/win32/miktex/tm/packages/proof-at-the-end__source.tar.lzma
2022/02/08 | 7175 | systems/win32/miktex/tm/packages/proof-at-the-end.tar.lzma
@@ -297820,9 +297850,9 @@
2018/04/04 | 204193 | systems/win32/miktex/tm/packages/pxcjkcat.tar.lzma
2009/01/22 | 695938 | systems/win32/miktex/tm/packages/pxfonts.tar.lzma
2011/03/17 | 62963 | systems/win32/miktex/tm/packages/pxgreeks.tar.lzma
-2022/03/17 | 132531 | systems/win32/miktex/tm/packages/pxjahyper__doc.tar.lzma
-2022/03/17 | 5226 | systems/win32/miktex/tm/packages/pxjahyper__source.tar.lzma
-2022/03/17 | 17147 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma
+2022/04/05 | 136649 | systems/win32/miktex/tm/packages/pxjahyper__doc.tar.lzma
+2022/04/05 | 5509 | systems/win32/miktex/tm/packages/pxjahyper__source.tar.lzma
+2022/04/05 | 17669 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma
2020/05/06 | 121548 | systems/win32/miktex/tm/packages/pxjodel.tar.lzma
2013/05/06 | 2352 | systems/win32/miktex/tm/packages/pxpgfmark.tar.lzma
2021/12/14 | 316121 | systems/win32/miktex/tm/packages/pxpic__doc.tar.lzma
@@ -298047,7 +298077,9 @@
2006/08/19 | 180408 | systems/win32/miktex/tm/packages/sciposter.cab
2011/04/20 | 3067 | systems/win32/miktex/tm/packages/sciwordconv.tar.lzma
2014/09/08 | 527711 | systems/win32/miktex/tm/packages/sclang-prettifier.tar.lzma
-2020/01/22 | 396869 | systems/win32/miktex/tm/packages/scontents.tar.lzma
+2022/04/05 | 367374 | systems/win32/miktex/tm/packages/scontents__doc.tar.lzma
+2022/04/05 | 30000 | systems/win32/miktex/tm/packages/scontents__source.tar.lzma
+2022/04/05 | 8116 | systems/win32/miktex/tm/packages/scontents.tar.lzma
2021/10/03 | 194402 | systems/win32/miktex/tm/packages/scrambledenvs__doc.tar.lzma
2021/10/03 | 6186 | systems/win32/miktex/tm/packages/scrambledenvs__source.tar.lzma
2021/10/03 | 2643 | systems/win32/miktex/tm/packages/scrambledenvs.tar.lzma
@@ -298105,9 +298137,9 @@
2019/01/19 | 332245 | systems/win32/miktex/tm/packages/sesstime.tar.lzma
2012/10/17 | 65276 | systems/win32/miktex/tm/packages/setdeck.tar.lzma
2011/12/21 | 8626 | systems/win32/miktex/tm/packages/setspace.tar.lzma
-2022/03/29 | 486682 | systems/win32/miktex/tm/packages/seu-ml-assign__doc.tar.lzma
-2022/03/29 | 3905 | systems/win32/miktex/tm/packages/seu-ml-assign__source.tar.lzma
-2022/03/29 | 4371 | systems/win32/miktex/tm/packages/seu-ml-assign.tar.lzma
+2022/04/05 | 171002 | systems/win32/miktex/tm/packages/seu-ml-assign__doc.tar.lzma
+2022/04/05 | 5809 | systems/win32/miktex/tm/packages/seu-ml-assign__source.tar.lzma
+2022/04/05 | 4975 | systems/win32/miktex/tm/packages/seu-ml-assign.tar.lzma
2014/02/28 | 2501355 | systems/win32/miktex/tm/packages/seuthesis.tar.lzma
2016/03/29 | 3303744 | systems/win32/miktex/tm/packages/seuthesix.tar.lzma
2018/02/14 | 995610 | systems/win32/miktex/tm/packages/sexam.tar.lzma
@@ -298156,22 +298188,25 @@
2014/11/20 | 300788 | systems/win32/miktex/tm/packages/simplecv.tar.lzma
2017/11/03 | 228224 | systems/win32/miktex/tm/packages/simpleinvoice.tar.lzma
2020/05/06 | 338375 | systems/win32/miktex/tm/packages/simplekv.tar.lzma
+2022/04/05 | 207761 | systems/win32/miktex/tm/packages/simplenodes__doc.tar.lzma
+2022/04/05 | 4323 | systems/win32/miktex/tm/packages/simplenodes__source.tar.lzma
+2022/04/05 | 2419 | systems/win32/miktex/tm/packages/simplenodes.tar.lzma
2019/09/08 | 84935 | systems/win32/miktex/tm/packages/simpleoptics.tar.lzma
2017/01/03 | 3929797 | systems/win32/miktex/tm/packages/simple-resume-cv.tar.lzma
2015/12/15 | 61175 | systems/win32/miktex/tm/packages/simpler-wick.tar.lzma
2017/01/03 | 2409668 | systems/win32/miktex/tm/packages/simple-thesis-dissertation.tar.lzma
2007/12/09 | 78409 | systems/win32/miktex/tm/packages/simplewick.tar.lzma
-2022/03/29 | 695510 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
-2022/03/29 | 15928 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
-2022/03/29 | 4491 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
+2022/04/05 | 698426 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
+2022/04/05 | 15952 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
+2022/04/05 | 4523 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
2013/08/19 | 11748 | systems/win32/miktex/tm/packages/simpsons.tar.lzma
2014/04/02 | 363940 | systems/win32/miktex/tm/packages/simurgh.tar.lzma
2008/07/22 | 360807 | systems/win32/miktex/tm/packages/sistyle.tar.lzma
2011/04/21 | 76017 | systems/win32/miktex/tm/packages/sitem.tar.lzma
2007/12/09 | 81490 | systems/win32/miktex/tm/packages/siunits.tar.lzma
-2022/02/18 | 1212441 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
-2022/02/18 | 108851 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
-2022/02/18 | 62283 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
+2022/04/05 | 1212040 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
+2022/04/05 | 108925 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
+2022/04/05 | 62347 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
2009/02/21 | 477338 | systems/win32/miktex/tm/packages/skaknew.tar.lzma
2018/02/08 | 221377 | systems/win32/miktex/tm/packages/skak.tar.lzma
2011/06/23 | 1471957 | systems/win32/miktex/tm/packages/skb.tar.lzma
@@ -298264,7 +298299,9 @@
2021/07/24 | 5621 | systems/win32/miktex/tm/packages/stackengine.tar.lzma
2016/07/20 | 6148 | systems/win32/miktex/tm/packages/stack.tar.lzma
2005/04/09 | 58072 | systems/win32/miktex/tm/packages/stage.cab
-2020/02/25 | 157005 | systems/win32/miktex/tm/packages/stage.tar.lzma
+2022/04/05 | 154966 | systems/win32/miktex/tm/packages/stage__doc.tar.lzma
+2022/04/05 | 5044 | systems/win32/miktex/tm/packages/stage__source.tar.lzma
+2022/04/05 | 3040 | systems/win32/miktex/tm/packages/stage.tar.lzma
2021/06/06 | 271850 | systems/win32/miktex/tm/packages/standalone__doc.tar.lzma
2021/06/06 | 38915 | systems/win32/miktex/tm/packages/standalone__source.tar.lzma
2021/06/06 | 12043 | systems/win32/miktex/tm/packages/standalone.tar.lzma
@@ -298718,7 +298755,9 @@
2011/09/04 | 79548 | systems/win32/miktex/tm/packages/turnthepage.tar.lzma
2021/07/18 | 1018 | systems/win32/miktex/tm/packages/twemoji-colr__doc.tar.lzma
2021/07/18 | 565351 | systems/win32/miktex/tm/packages/twemoji-colr.tar.lzma
-2021/04/23 | 4683034 | systems/win32/miktex/tm/packages/twemojis.tar.lzma
+2022/04/05 | 4744108 | systems/win32/miktex/tm/packages/twemojis__doc.tar.lzma
+2022/04/05 | 68040 | systems/win32/miktex/tm/packages/twemojis__source.tar.lzma
+2022/04/05 | 4426423 | systems/win32/miktex/tm/packages/twemojis.tar.lzma
2010/02/25 | 73903 | systems/win32/miktex/tm/packages/twoinone.tar.lzma
2020/05/12 | 57155 | systems/win32/miktex/tm/packages/twoup-gen.tar.lzma
2007/02/28 | 27957 | systems/win32/miktex/tm/packages/twoup.tar.bz2
@@ -299155,7 +299194,9 @@
2022/02/18 | 1522743 | systems/win32/miktex/tm/packages/zref-clever__doc.tar.lzma
2022/02/18 | 50646 | systems/win32/miktex/tm/packages/zref-clever__source.tar.lzma
2022/02/18 | 22909 | systems/win32/miktex/tm/packages/zref-clever.tar.lzma
-2020/10/10 | 703582 | systems/win32/miktex/tm/packages/zref.tar.lzma
+2022/04/05 | 666950 | systems/win32/miktex/tm/packages/zref__doc.tar.lzma
+2022/04/05 | 37806 | systems/win32/miktex/tm/packages/zref__source.tar.lzma
+2022/04/05 | 14658 | systems/win32/miktex/tm/packages/zref.tar.lzma
2022/02/18 | 698494 | systems/win32/miktex/tm/packages/zref-vario__doc.tar.lzma
2022/02/18 | 11034 | systems/win32/miktex/tm/packages/zref-vario__source.tar.lzma
2022/02/18 | 4254 | systems/win32/miktex/tm/packages/zref-vario.tar.lzma
@@ -299426,7 +299467,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2022/04/05 | 186 | timestamp
+2022/04/06 | 186 | timestamp
2002/08/26 | 61898 | usergrps/dante/antrag.pdf
2002/08/26 | 118217 | usergrps/dante/antrag.ps
2021/11/11 | 917 | usergrps/dante/dtk/doc/beispiel.bib
diff --git a/FILES.byname.gz b/FILES.byname.gz
index b6ee08c794..d1f0bd6016 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index b14a71ae94..412c4dd427 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,246 +1,521 @@
-2022/04/04 | 99816 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/05 | 99817 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2022/04/05 | 99258 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2022/04/05 | 985 | macros/latex/contrib/srdp-mathematik/README.md
+2022/04/05 | 985604 | biblio/pbibtex/pbibtex-manual.zip
+2022/04/05 | 97200 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2022/04/05 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2022/04/05 | 95434 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2022/04/05 | 95383 | info/ptex-manual/ptex-manual.tex
+2022/04/05 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2022/04/05 | 95260 | info/ptex-manual/eptex_resume.tex
+2022/04/05 | 950592 | systems/texlive/tlnet/archive/tex4ht.r62897.tar.xz
+2022/04/05 | 947514 | systems/win32/miktex/tm/packages/markdown__doc.tar.lzma
+2022/04/05 | 942 | biblio/pbibtex/pbibtex-manual/README.md
+2022/04/05 | 93959 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2022/04/05 | 9323 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
+2022/04/05 | 92918 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2022/04/05 | 9164 | systems/texlive/tlnet/archive/minimalist.r62900.tar.xz
+2022/04/05 | 89812 | systems/win32/miktex/tm/packages/markdown__source.tar.lzma
+2022/04/05 | 89557 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__source.tar.lzma
+2022/04/05 | 88152 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2022/04/05 | 8783 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2022/04/05 | 8718616 | systems/texlive/tlnet/archive/hvfloat.doc.r62893.tar.xz
+2022/04/05 | 86758 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2022/04/05 | 8666 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
+2022/04/05 | 8476 | systems/texlive/tlnet/archive/create-theorem.r62892.tar.xz
+2022/04/05 | 847634 | systems/win32/miktex/tm/packages/kaytannollista-latexia.tar.lzma
+2022/04/05 | 8364 | systems/win32/miktex/tm/packages/functional.tar.lzma
+2022/04/05 | 835642 | systems/win32/miktex/tm/packages/nwafuthesis__source.tar.lzma
+2022/04/05 | 824372 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2022/04/05 | 8172 | systems/texlive/tlnet/archive/scontents.r62902.tar.xz
+2022/04/05 | 81461 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2022/04/05 | 8138304 | systems/texlive/tlnet/archive/tlgs.win32.r62895.tar.xz
+2022/04/05 | 8116 | systems/win32/miktex/tm/packages/scontents.tar.lzma
+2022/04/05 | 79026 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2022/04/05 | 78974 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2022/04/05 | 7833 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
+2022/04/05 | 7758 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
+2022/04/05 | 7752 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2022/04/05 | 77399 | info/ptex-manual/eptexdoc.tex
+2022/04/05 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2022/04/05 | 758956 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
+2022/04/05 | 755743 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2022/04/05 | 74703 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
+2022/04/05 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2022/04/05 | 73528 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2022/04/05 | 73479 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2022/04/05 | 73148 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2022/04/05 | 72886 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2022/04/05 | 7239077 | systems/win32/miktex/tm/packages/hvfloat__doc.tar.lzma
+2022/04/05 | 72015 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2022/04/05 | 711804 | systems/texlive/tlnet/archive/simplivre.doc.r62900.tar.xz
+2022/04/05 | 71006 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2022/04/05 | 698426 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
+2022/04/05 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
+2022/04/05 | 69260 | systems/texlive/tlnet/archive/latexindent.r62906.tar.xz
+2022/04/05 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2022/04/05 | 68670 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
+2022/04/05 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2022/04/05 | 68040 | systems/win32/miktex/tm/packages/twemojis__source.tar.lzma
+2022/04/05 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2022/04/05 | 679948 | systems/texlive/tlnet/archive/projlib.doc.r62900.tar.xz
+2022/04/05 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2022/04/05 | 6729 | systems/win32/miktex/tm/packages/luakeys.tar.lzma
+2022/04/05 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2022/04/05 | 666950 | systems/win32/miktex/tm/packages/zref__doc.tar.lzma
+2022/04/05 | 663672 | systems/texlive/tlnet/archive/beaulivre.doc.r62900.tar.xz
+2022/04/05 | 6630 | systems/win32/miktex/tm/packages/ocgx2__doc.tar.lzma
+2022/04/05 | 6628 | systems/texlive/tlnet/archive/collection-latexextra.r62901.tar.xz
+2022/04/05 | 660336 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
+2022/04/05 | 65055 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2022/04/05 | 650116 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
+2022/04/05 | 64710 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2022/04/05 | 64543 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2022/04/05 | 64491 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2022/04/05 | 644704 | systems/win32/miktex/tm/packages/files.csv.lzma
+2022/04/05 | 644630 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2022/04/05 | 63740 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2022/04/05 | 63311 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2022/04/05 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2022/04/05 | 629429 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2022/04/05 | 62872 | systems/texlive/tlnet/archive/siunitx.r62903.tar.xz
+2022/04/05 | 62379 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2022/04/05 | 62347 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
+2022/04/05 | 6180 | systems/texlive/tlnet/archive/luakeys.r62904.tar.xz
+2022/04/05 | 61028 | systems/texlive/tlnet/archive/nwafuthesis.source.r62905.tar.xz
+2022/04/05 | 600820 | language/japanese/jlreq.zip
+2022/04/05 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2022/04/05 | 5959 | systems/win32/miktex/tm/packages/luakeys__source.tar.lzma
+2022/04/05 | 591568 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2022/04/05 | 58664 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2022/04/05 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2022/04/05 | 5824 | systems/win32/miktex/tm/packages/create-theorem__source.tar.lzma
+2022/04/05 | 5822 | systems/win32/miktex/tm/packages/commonunicode.tar.lzma
+2022/04/05 | 5809 | systems/win32/miktex/tm/packages/seu-ml-assign__source.tar.lzma
+2022/04/05 | 5796982 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2022/04/05 | 57619 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2022/04/05 | 57526 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2022/04/05 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2022/04/05 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2022/04/05 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2022/04/05 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2022/04/05 | 565928 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2022/04/05 | 5628 | systems/texlive/tlnet/archive/commonunicode.r62901.tar.xz
+2022/04/05 | 559924 | systems/texlive/tlnet/archive/lebhart.doc.r62900.tar.xz
+2022/04/05 | 55756 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2022/04/05 | 557156 | systems/texlive/tlnet/archive/einfart.doc.r62900.tar.xz
+2022/04/05 | 55569 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2022/04/05 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2022/04/05 | 5509 | systems/win32/miktex/tm/packages/pxjahyper__source.tar.lzma
+2022/04/05 | 546044 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
+2022/04/05 | 542924 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
+2022/04/05 | 53326 | biblio/pbibtex/pbibtex-manual/jbtxdoc.tex
+2022/04/05 | 532453 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2022/04/05 | 528017 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/05 | 52480 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2022/04/05 | 52327 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2022/04/05 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2022/04/05 | 516 | systems/texlive/tlnet/archive/dtk-bibliography.r62889.tar.xz
+2022/04/05 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2022/04/05 | 51484 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2022/04/05 | 50799 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2022/04/05 | 504999 | systems/win32/miktex/tm/packages/kotex-oblivoir__doc.tar.lzma
+2022/04/05 | 5044 | systems/win32/miktex/tm/packages/stage__source.tar.lzma
+2022/04/05 | 501573 | systems/win32/miktex/tm/packages/functional__doc.tar.lzma
+2022/04/05 | 49771 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2022/04/05 | 4975 | systems/win32/miktex/tm/packages/seu-ml-assign.tar.lzma
+2022/04/05 | 4903 | info/ptex-manual/ptex-manual.sty
+2022/04/05 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2022/04/05 | 48865 | systems/win32/miktex/tm/packages/dtk-bibliography__source.tar.lzma
+2022/04/05 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2022/04/05 | 484372 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2022/04/05 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2022/04/05 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2022/04/05 | 477846 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2022/04/05 | 4744108 | systems/win32/miktex/tm/packages/twemojis__doc.tar.lzma
+2022/04/05 | 4711 | indexing/hsindex/README
+2022/04/05 | 46958 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
+2022/04/05 | 466374 | systems/win32/miktex/tm/packages/babel-italian__doc.tar.lzma
+2022/04/05 | 463660 | systems/texlive/tlnet/archive/babel-italian.doc.r62890.tar.xz
+2022/04/05 | 46320 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.r62891.tar.xz
+2022/04/05 | 46119 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015.tar.lzma
+2022/04/05 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2022/04/05 | 45822 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2022/04/05 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/05 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2022/04/05 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2022/04/05 | 4554 | systems/win32/miktex/tm/packages/einfart.tar.lzma
+2022/04/05 | 4523 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
+2022/04/05 | 45102 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
+2022/04/05 | 44948 | systems/texlive/tlnet/archive/projlib.source.r62900.tar.xz
+2022/04/05 | 44439 | systems/win32/miktex/tm/packages/acro.tar.lzma
+2022/04/05 | 4426423 | systems/win32/miktex/tm/packages/twemojis.tar.lzma
+2022/04/05 | 4423 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
+2022/04/05 | 4416 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
+2022/04/05 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2022/04/05 | 43825 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2022/04/05 | 4376 | systems/texlive/tlnet/archive/einfart.r62900.tar.xz
+2022/04/05 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2022/04/05 | 43630 | systems/win32/miktex/tm/packages/kotex-oblivoir.tar.lzma
+2022/04/05 | 4352 | systems/texlive/tlnet/archive/simplivre.r62900.tar.xz
+2022/04/05 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2022/04/05 | 4323 | systems/win32/miktex/tm/packages/simplenodes__source.tar.lzma
+2022/04/05 | 43225 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2022/04/05 | 42914 | systems/win32/miktex/tm/packages/markdown.tar.lzma
+2022/04/05 | 42818 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2022/04/05 | 428044 | systems/texlive/tlnet/archive/dtk-bibliography.doc.r62889.tar.xz
+2022/04/05 | 4260 | systems/texlive/tlnet/archive/lebhart.r62900.tar.xz
+2022/04/05 | 4248 | systems/texlive/tlnet/archive/beaulivre.r62900.tar.xz
+2022/04/05 | 42357 | info/ptex-manual/ptexdoc_asciimw.tex
+2022/04/05 | 42193 | info/ptex-manual/ptex-guide-en.tex
+2022/04/05 | 4141 | systems/win32/miktex/tm/packages/babel-italian.tar.lzma
+2022/04/05 | 41306 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2022/04/05 | 41202 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2022/04/05 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2022/04/05 | 4064244 | systems/texlive/tlnet/archive/latexindent.win32.r62906.tar.xz
+2022/04/05 | 405604 | systems/texlive/tlnet/archive/texlive-scripts.doc.r62882.tar.xz
+2022/04/05 | 40504 | info/ptex-manual/jfm.tex
+2022/04/05 | 39726 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2022/04/05 | 394369 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2022/04/05 | 39196 | info/mendex-doc/mendex.tex
+2022/04/05 | 3908 | systems/texlive/tlnet/archive/babel-italian.r62890.tar.xz
+2022/04/05 | 38562 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2022/04/05 | 38536 | biblio/pbibtex/pbibtex-manual/jbtxhak.tex
+2022/04/05 | 38425 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2022/04/05 | 379480 | systems/win32/miktex/tm/packages/dtk-bibliography.tar.lzma
+2022/04/05 | 378172 | info/ptex-manual/eptexdoc.pdf
+2022/04/05 | 37806 | systems/win32/miktex/tm/packages/zref__source.tar.lzma
+2022/04/05 | 37374 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2022/04/05 | 37117 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2022/04/05 | 37080 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/05 | 37058 | systems/win32/miktex/tm/packages/kotex-oblivoir__source.tar.lzma
+2022/04/05 | 36861 | indexing/hsindex.zip
+2022/04/05 | 367374 | systems/win32/miktex/tm/packages/scontents__doc.tar.lzma
+2022/04/05 | 367028 | systems/texlive/tlnet/archive/scontents.doc.r62902.tar.xz
+2022/04/05 | 36050 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2022/04/05 | 35293 | info/ptex-manual/jtex_asciimw.tex
+2022/04/05 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2022/04/05 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2022/04/05 | 35168 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2022/04/05 | 35085 | indexing/hsindex/LICENSE
+2022/04/05 | 3484 | systems/win32/miktex/tm/packages/annotate-equations__source.tar.lzma
+2022/04/05 | 347884 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
+2022/04/05 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2022/04/05 | 3372 | info/ptex-manual/fam256p.tex
+2022/04/05 | 332414 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2022/04/05 | 32956 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2022/04/05 | 326660 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2022/04/05 | 325270 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2022/04/05 | 324112 | systems/texlive/tlnet/archive/commonunicode.doc.r62901.tar.xz
+2022/04/05 | 322239 | info/ptex-manual/ptex-manual.pdf
+2022/04/05 | 321669 | systems/win32/miktex/tm/packages/commonunicode__doc.tar.lzma
+2022/04/05 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2022/04/05 | 3173 | info/ptex-manual/fam256d.tex
+2022/04/05 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2022/04/05 | 31587 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2022/04/05 | 31519 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2022/04/05 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2022/04/05 | 31342 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2022/04/05 | 3131 | systems/win32/miktex/tm/packages/annotate-equations.tar.lzma
+2022/04/05 | 31250 | systems/win32/miktex/tm/packages/functional__source.tar.lzma
+2022/04/05 | 30811 | biblio/pbibtex/pbibtex-manual/jbibtex.tex
+2022/04/05 | 30542 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2022/04/05 | 3040 | systems/win32/miktex/tm/packages/stage.tar.lzma
+2022/04/05 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2022/04/05 | 30000 | systems/win32/miktex/tm/packages/scontents__source.tar.lzma
+2022/04/05 | 29640 | systems/texlive/tlnet/archive/scontents.source.r62902.tar.xz
+2022/04/05 | 296039 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2022/04/05 | 2956803 | info/ptex-manual.zip
+2022/04/05 | 289185 | biblio/pbibtex/pbibtex-manual/jbtxdoc.pdf
+2022/04/05 | 288201 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2022/04/05 | 28796 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2022/04/05 | 287360 | language/japanese/jlreq/jlreq.cls
+2022/04/05 | 28689 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2022/04/05 | 286413 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2022/04/05 | 285715 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2022/04/05 | 28568 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2022/04/05 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2022/04/05 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2022/04/05 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2022/04/05 | 27591 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2022/04/05 | 274348 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2022/04/05 | 274242 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2022/04/05 | 27248 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2022/04/05 | 270300 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2022/04/05 | 2694876 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2022/04/05 | 264764 | info/ptex-manual/ptexdoc_asciimw.pdf
+2022/04/05 | 26305 | systems/win32/miktex/tm/packages/nwafuthesis.tar.lzma
+2022/04/05 | 259257 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2022/04/05 | 257313 | biblio/pbibtex/pbibtex-manual/jbibtex.pdf
+2022/04/05 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2022/04/05 | 25481038 | systems/texlive/tlnet/install-tl.zip
+2022/04/05 | 251872 | info/ptex-manual/jtex_asciimw.pdf
+2022/04/05 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2022/04/05 | 25107 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2022/04/05 | 25059 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2022/04/05 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
+2022/04/05 | 247228 | biblio/pbibtex/pbibtex-manual/jbtxhak.pdf
+2022/04/05 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2022/04/05 | 244960 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2022/04/05 | 2419 | systems/win32/miktex/tm/packages/simplenodes.tar.lzma
+2022/04/05 | 24120 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2022/04/05 | 241094 | info/mendex-doc.zip
+2022/04/05 | 24074 | systems/win32/miktex/tm/packages/babel-italian__source.tar.lzma
+2022/04/05 | 23957 | systems/win32/miktex/tm/packages/acro__source.tar.lzma
+2022/04/05 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2022/04/05 | 23708 | systems/texlive/tlnet/archive/babel-italian.source.r62890.tar.xz
+2022/04/05 | 2365960 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2022/04/05 | 23571 | systems/win32/miktex/tm/packages/projlib.tar.lzma
+2022/04/05 | 23552 | systems/texlive/tlnet/archive/projlib.r62900.tar.xz
+2022/04/05 | 230127 | info/mendex-doc/mendex.pdf
+2022/04/05 | 2241144 | systems/texlive/tlnet/archive/nwafuthesis.doc.r62905.tar.xz
+2022/04/05 | 22384 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
+2022/04/05 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2022/04/05 | 2172 | systems/texlive/tlnet/archive/simplenodes.r62888.tar.xz
+2022/04/05 | 215779 | info/ptex-manual/jfm.pdf
+2022/04/05 | 213278 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2022/04/05 | 21314 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2022/04/05 | 210273 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2022/04/05 | 208806 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2022/04/05 | 208680 | systems/texlive/tlnet/archive/simplenodes.doc.r62888.tar.xz
+2022/04/05 | 207761 | systems/win32/miktex/tm/packages/simplenodes__doc.tar.lzma
+2022/04/05 | 20462353 | systems/texlive/tlnet/install-tl-windows.exe
+2022/04/05 | 203837 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
+2022/04/05 | 20341 | info/ptex-manual/jtexdoc_asciimw.tex
+2022/04/05 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2022/04/05 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2022/04/05 | 2012074 | systems/win32/miktex/tm/packages/nwafuthesis__doc.tar.lzma
+2022/04/05 | 200397 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2022/04/05 | 199832 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2022/04/05 | 1982084 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2022/04/05 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2022/04/05 | 19615 | info/ptex-manual/ptexskip_asciimw.tex
+2022/04/05 | 196115 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2022/04/05 | 19564 | systems/texlive/tlnet/archive/nwafuthesis.r62905.tar.xz
+2022/04/05 | 190504 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2022/04/05 | 185027 | macros/latex/contrib/srdp-mathematik.zip
+2022/04/05 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2022/04/05 | 1844015 | systems/win32/miktex/tm/packages/hvfloat__source.tar.lzma
+2022/04/05 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2022/04/05 | 181515 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2022/04/05 | 179876 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2022/04/05 | 17669 | systems/win32/miktex/tm/packages/pxjahyper.tar.lzma
+2022/04/05 | 175330 | macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
+2022/04/05 | 1752146 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2022/04/05 | 17351 | systems/win32/miktex/tm/packages/ocgx2.tar.lzma
+2022/04/05 | 173008 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2022/04/05 | 17246669 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2022/04/05 | 171002 | systems/win32/miktex/tm/packages/seu-ml-assign__doc.tar.lzma
+2022/04/05 | 170660 | systems/texlive/tlnet/archive/luakeys.doc.r62904.tar.xz
+2022/04/05 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2022/04/05 | 165849 | systems/win32/miktex/tm/packages/luakeys__doc.tar.lzma
+2022/04/05 | 16561 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2022/04/05 | 16504 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2022/04/05 | 164929 | info/ptex-manual/ptexskip_asciimw.pdf
+2022/04/05 | 16362 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
+2022/04/05 | 15963 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
+2022/04/05 | 15952 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
+2022/04/05 | 1585 | info/mendex-doc/jpbase.ist
+2022/04/05 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2022/04/05 | 1554 | info/mendex-doc/LICENSE
+2022/04/05 | 1554 | biblio/pbibtex/pbibtex-manual/LICENSE
+2022/04/05 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2022/04/05 | 154966 | systems/win32/miktex/tm/packages/stage__doc.tar.lzma
+2022/04/05 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2022/04/05 | 15367 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
+2022/04/05 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2022/04/05 | 152028 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2022/04/05 | 1516 | info/ptex-manual/LICENSE
+2022/04/05 | 1512 | systems/texlive/tlnet/archive/collection-pictures.r62888.tar.xz
+2022/04/05 | 150261 | biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
+2022/04/05 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2022/04/05 | 14658 | systems/win32/miktex/tm/packages/zref.tar.lzma
+2022/04/05 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2022/04/05 | 145704 | info/ptex-manual/jtexdoc_asciimw.pdf
+2022/04/05 | 1456148 | systems/texlive/tlnet/archive/biblatex-gb7714-2015.doc.r62891.tar.xz
+2022/04/05 | 1454764 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2022/04/05 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2022/04/05 | 14410 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2022/04/05 | 1440477 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2022/04/05 | 1440131 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2022/04/05 | 1429 | info/mendex-doc/README.md
+2022/04/05 | 14294 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
+2022/04/05 | 141741 | systems/win32/miktex/tm/packages/kaytannollista-latexia__source.tar.lzma
+2022/04/05 | 1398 | info/mendex-doc/Makefile
+2022/04/05 | 139102 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2022/04/05 | 1372666 | systems/win32/miktex/tm/packages/biblatex-gb7714-2015__doc.tar.lzma
+2022/04/05 | 136649 | systems/win32/miktex/tm/packages/pxjahyper__doc.tar.lzma
+2022/04/05 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r62897.tar.xz
+2022/04/05 | 135948 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2022/04/05 | 1357070 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2022/04/05 | 135378 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2022/04/05 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2022/04/05 | 1330022 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2022/04/05 | 1329160 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2022/04/05 | 1322742 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2022/04/05 | 1307 | systems/win32/miktex/tm/packages/commonunicode__source.tar.lzma
+2022/04/05 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2022/04/05 | 128252 | systems/texlive/tlnet/archive/create-theorem.doc.r62892.tar.xz
+2022/04/05 | 126534 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2022/04/05 | 1250184 | systems/texlive/tlnet/archive/tex4ht.source.r62897.tar.xz
+2022/04/05 | 124205 | systems/win32/miktex/tm/packages/annotate-equations__doc.tar.lzma
+2022/04/05 | 123685 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
+2022/04/05 | 123283 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
+2022/04/05 | 1230532 | systems/win32/miktex/tm/packages/acro__doc.tar.lzma
+2022/04/05 | 1212040 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
+2022/04/05 | 1208380 | systems/texlive/tlnet/archive/siunitx.doc.r62903.tar.xz
+2022/04/05 | 1206 | info/ptex-manual/README.md
+2022/04/05 | 120616 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2022/04/05 | 11887 | systems/win32/miktex/tm/packages/hvfloat.tar.lzma
+2022/04/05 | 1181126 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/05 | 11704 | systems/texlive/tlnet/archive/hvfloat.r62893.tar.xz
+2022/04/05 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2022/04/05 | 1156465 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2022/04/05 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2022/04/05 | 1149024 | systems/texlive/tlnet/archive/latexindent.doc.r62906.tar.xz
+2022/04/05 | 113144 | systems/texlive/tlnet/archive/minimalist.doc.r62900.tar.xz
+2022/04/05 | 113052 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2022/04/05 | 112589 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2022/04/05 | 111760 | systems/texlive/tlnet/archive/colorist.doc.r62900.tar.xz
+2022/04/05 | 109876 | systems/texlive/tlnet/archive/texlive-scripts.r62882.tar.xz
+2022/04/05 | 10955679 | install/language/japanese/jlreq.tds.zip
+2022/04/05 | 109478 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/05 | 108925 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
+2022/04/05 | 10889 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
+2022/04/05 | 108860 | systems/texlive/tlnet/archive/siunitx.source.r62903.tar.xz
+2022/04/05 | 107703 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2022/04/05 | 107148 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
+2022/04/05 | 106870 | info/ptex-manual/ptex-guide-en.pdf
+2022/04/05 | 105668 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
+2022/04/05 | 104555 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2022/04/05 | 103338 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2022/04/05 | 103092 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2022/04/05 | 1027652 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
+2022/04/05 | 1021847 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2022/04/05 | 10192 | systems/win32/miktex/tm/packages/colorist.tar.lzma
+2022/04/05 | 1012994 | info/ptex-manual/eptex_resume.pdf
+2022/04/05 | 1006 | systems/win32/miktex/tm/packages/pr.ini
+2022/04/05 | 100488 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2022/04/05 | 10028 | systems/texlive/tlnet/archive/colorist.r62900.tar.xz
2022/04/04 | 996 | macros/latex/contrib/siunitx/README.md
-2022/04/04 | 99256 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
2022/04/04 | 98548 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2022/04/04 | 98208 | macros/latex/contrib/projlib/ProjLib-doc.dtx
2022/04/04 | 9813934 | support/latexindent/latexindent.exe
2022/04/04 | 9759 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
-2022/04/04 | 97199 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2022/04/04 | 970 | systems/win32/miktex/tm/packages/pr.ini
-2022/04/04 | 96634 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2022/04/04 | 95433 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
2022/04/04 | 9537 | support/latexindent/LatexIndent/IfElseFi.pm
-2022/04/04 | 95285 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/04/04 | 93958 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
2022/04/04 | 9316 | support/latexindent/LatexIndent/Lines.pm
-2022/04/04 | 92917 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2022/04/04 | 88151 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
2022/04/04 | 8798 | macros/latex/contrib/siunitx/siunitx-command.dtx
-2022/04/04 | 8784 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2022/04/04 | 86756 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
2022/04/04 | 857 | macros/latex/contrib/projlib/ProjLib-doc.ins
2022/04/04 | 835 | support/latexindent/LatexIndent/Version.pm
-2022/04/04 | 824370 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/04/04 | 81460 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2022/04/04 | 8075 | support/latexindent/LatexIndent/FileExtension.pm
2022/04/04 | 806 | macros/luatex/generic/luakeys/luakeys.sty
2022/04/04 | 804847 | macros/unicodetex/latex/simplivre.zip
2022/04/04 | 8026 | support/latexindent/documentation/sec-the-line-switch.tex
+2022/04/04 | 8000 | support/TeX4ht/source/mktex4ht-cnf.tex
2022/04/04 | 7951 | support/latexindent/documentation/sec-introduction.tex
2022/04/04 | 793 | macros/luatex/generic/luakeys/luakeys-debug.sty
-2022/04/04 | 79024 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2022/04/04 | 78976 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
2022/04/04 | 776410 | macros/latex/contrib/projlib.zip
-2022/04/04 | 7752 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2022/04/04 | 77068 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/04/04 | 758954 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64.tar.lzma
-2022/04/04 | 755741 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
2022/04/04 | 750249 | macros/unicodetex/latex/beaulivre.zip
2022/04/04 | 74181 | support/latexindent/documentation/sec-default-user-local.tex
-2022/04/04 | 74068 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/04/04 | 73529 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2022/04/04 | 73478 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2022/04/04 | 73147 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/04/04 | 72885 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
2022/04/04 | 7214 | support/latexindent/LatexIndent/MandatoryArgument.pm
-2022/04/04 | 72014 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
2022/04/04 | 7193 | support/latexindent/documentation/subsubsec-no-add-remaining-code-blocks.tex
2022/04/04 | 7187 | support/latexindent/LatexIndent/BackUpFileProcedure.pm
2022/04/04 | 7161 | support/latexindent/documentation/figure-schematic.png
-2022/04/04 | 71007 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
2022/04/04 | 701 | macros/luatex/generic/luakeys/luakeys.tex
-2022/04/04 | 693068 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin.tar.lzma
-2022/04/04 | 68873 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2022/04/04 | 681941 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/04/04 | 68010 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2022/04/04 | 67705 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
2022/04/04 | 6742 | support/latexindent/LatexIndent/Environment.pm
-2022/04/04 | 67254 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
2022/04/04 | 6703 | support/latexindent/LatexIndent/TrailingComments.pm
+2022/04/04 | 6690 | language/japanese/jlreq/README.md
2022/04/04 | 66115 | support/latexindent/documentation/subsec-poly-switches.tex
2022/04/04 | 6600 | macros/latex/contrib/minimalist/minimart.cls
2022/04/04 | 6597 | macros/latex/contrib/minimalist/minimbook.cls
2022/04/04 | 6585 | support/latexindent/LatexIndent/Item.pm
2022/04/04 | 65393 | macros/latex/contrib/siunitx/CHANGELOG.md
-2022/04/04 | 65056 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2022/04/04 | 6483 | support/latexindent/LatexIndent/OptionalArgument.pm
-2022/04/04 | 647651 | systems/win32/miktex/tm/packages/files.csv.lzma
-2022/04/04 | 647348 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2022/04/04 | 64709 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2022/04/04 | 64542 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2022/04/04 | 64487 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
2022/04/04 | 640392 | macros/latex/contrib/siunitx/siunitx.pdf
-2022/04/04 | 63739 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
2022/04/04 | 633 | support/latexindent/documentation/cmhlistings.tex
-2022/04/04 | 63310 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/04/04 | 631279 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2022/04/04 | 629429 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
2022/04/04 | 62589 | macros/unicodetex/latex/nwafuthesis/nwafuthesis-doc.dtx
-2022/04/04 | 62381 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2022/04/04 | 61982 | support/latexindent/LatexIndent/AlignmentAtAmpersand.pm
+2022/04/04 | 612729 | support/TeX4ht/source/tex4ht-html4.tex
2022/04/04 | 6124842 | support/latexindent.zip
2022/04/04 | 610 | support/latexindent/documentation/sec-references.tex
2022/04/04 | 608331 | macros/latex/contrib/siunitx/siunitx-code.pdf
-2022/04/04 | 598230 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
2022/04/04 | 5969 | support/latexindent/LatexIndent/Else.pm
2022/04/04 | 5958 | support/latexindent/documentation/subsubsec-commands-with-arguments.tex
-2022/04/04 | 591569 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2022/04/04 | 58666 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2022/04/04 | 58663 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2022/04/04 | 585061 | macros/unicodetex/latex/lebhart.zip
2022/04/04 | 584447 | macros/unicodetex/latex/einfart.zip
2022/04/04 | 5842 | macros/latex/contrib/colorist/colorart.cls
2022/04/04 | 5839 | macros/latex/contrib/colorist/colorbook.cls
2022/04/04 | 5771 | support/latexindent/LatexIndent/UnNamedGroupingBracesBrackets.pm
-2022/04/04 | 57617 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2022/04/04 | 57527 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2022/04/04 | 57330 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/04/04 | 57270 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
2022/04/04 | 5717 | support/latexindent/documentation/test-default-settings.tex
2022/04/04 | 5715 | support/latexindent/documentation/subsec-combine-text-wrap-para-line-breaks.tex
-2022/04/04 | 56993 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2022/04/04 | 56618 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2022/04/04 | 565929 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/04/04 | 55756 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2022/04/04 | 55569 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/04/04 | 55286 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
2022/04/04 | 54385 | support/latexindent/documentation/latexindent-yaml-schema.json
-2022/04/04 | 532454 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
2022/04/04 | 5306 | support/latexindent/LatexIndent/KeyEqualsValuesBraces.pm
-2022/04/04 | 528018 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2022/04/04 | 5302 | support/TeX4ht/source/tex4ht-mathjax.tex
2022/04/04 | 5266 | support/latexindent/documentation/subsubsec-headings.tex
2022/04/04 | 5259 | macros/latex/contrib/siunitx/siunitx-locale.dtx
-2022/04/04 | 52479 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/04/04 | 52326 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/04/04 | 52094 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/04/04 | 51557 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2022/04/04 | 51485 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
2022/04/04 | 50881 | macros/latex/contrib/siunitx/siunitx-table.dtx
-2022/04/04 | 50798 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
2022/04/04 | 5011 | support/latexindent/LatexIndent/Check.pm
2022/04/04 | 499727 | fonts/utilities/ps2pk.zip
-2022/04/04 | 49769 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2022/04/04 | 4893 | macros/latex/contrib/minimalist/minimalist.sty
-2022/04/04 | 48826 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
2022/04/04 | 4855 | support/latexindent/documentation/subsubsec-ifelsefi.tex
-2022/04/04 | 484371 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2022/04/04 | 481498 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2022/04/04 | 47923 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/04/04 | 477849 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2022/04/04 | 4757 | macros/latex/contrib/projlib/README.md
2022/04/04 | 4748 | macros/latex/contrib/siunitx/siunitx-abbreviations.cfg
2022/04/04 | 4662 | support/latexindent/LatexIndent/BlankLines.pm
-2022/04/04 | 46066 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2022/04/04 | 45825 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2022/04/04 | 45755 | support/latexindent/LatexIndent/GetYamlSettings.pm
-2022/04/04 | 45743 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2022/04/04 | 45660 | language/japanese/jlreq/README-ja.md
2022/04/04 | 45375 | macros/latex/contrib/colorist/colorist-fancy.sty
2022/04/04 | 44096 | support/latexindent/documentation/logo.png
-2022/04/04 | 43917 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/04/04 | 43824 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/04/04 | 43646 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
2022/04/04 | 4355 | support/latexindent/LatexIndent/RoundBrackets.pm
-2022/04/04 | 43361 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2022/04/04 | 43226 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/04/04 | 42817 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
2022/04/04 | 4270 | support/latexindent/LatexIndent/NamedGroupingBracesBrackets.pm
-2022/04/04 | 41305 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2022/04/04 | 41204 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2022/04/04 | 41182 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2022/04/04 | 4009 | macros/latex/contrib/colorist/colorist.sty
2022/04/04 | 398398 | macros/latex/contrib/scontents.zip
-2022/04/04 | 39728 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2022/04/04 | 394370 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/04/04 | 38559 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2022/04/04 | 38426 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
2022/04/04 | 3831 | support/latexindent/documentation/subsubsec-special.tex
-2022/04/04 | 37375 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2022/04/04 | 37115 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2022/04/04 | 37081 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2022/04/04 | 371465 | language/japanese/jlreq/jlreq-ja.pdf
2022/04/04 | 3687 | macros/latex/contrib/siunitx/siunitx.ins
2022/04/04 | 36452 | macros/latex/contrib/minimalist/minimalist-classical.sty
2022/04/04 | 3614 | support/latexindent/LatexIndent/Replacement.pm
-2022/04/04 | 36049 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2022/04/04 | 35243 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/04/04 | 351697 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/04/04 | 35167 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
2022/04/04 | 347608 | macros/latex/contrib/commonunicode.zip
2022/04/04 | 34543 | macros/latex/contrib/siunitx/siunitx-print.dtx
2022/04/04 | 3433 | support/latexindent/documentation/subsubsec-environments-with-items.tex
2022/04/04 | 34287 | macros/latex/contrib/minimalist/minimalist-plain.sty
2022/04/04 | 3418139 | macros/unicodetex/latex/nwafuthesis.zip
-2022/04/04 | 34052 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
2022/04/04 | 33865 | macros/unicodetex/latex/nwafuthesis/logo/workflow.pdf
2022/04/04 | 33799 | macros/latex/contrib/siunitx/siunitx-compound.dtx
2022/04/04 | 3378 | support/latexindent/LatexIndent/HorizontalWhiteSpace.pm
+2022/04/04 | 336645 | support/TeX4ht/source/tex4ht-ooffice.tex
2022/04/04 | 336010 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.pdf
2022/04/04 | 3340 | support/latexindent/LatexIndent/Tokens.pm
-2022/04/04 | 332413 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2022/04/04 | 32954 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2022/04/04 | 326661 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/04/04 | 325269 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
2022/04/04 | 3229 | macros/latex/contrib/projlib/ProjLib.ins
2022/04/04 | 322407 | macros/latex/contrib/projlib/ProjLib-doc-cn.pdf
-2022/04/04 | 32134 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
2022/04/04 | 320663 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.pdf
2022/04/04 | 31738 | macros/latex/contrib/siunitx/siunitx-version-1.cfg
2022/04/04 | 31735 | macros/latex/contrib/siunitx/siunitx-emulation.dtx
-2022/04/04 | 316242 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2022/04/04 | 31588 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2022/04/04 | 31522 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/04/04 | 31412 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2022/04/04 | 31344 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/04/04 | 30541 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/04/04 | 30146 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
2022/04/04 | 2997 | support/latexindent/documentation/sec-the-m-switch.tex
2022/04/04 | 2986 | support/latexindent/latexindent.pl
-2022/04/04 | 296038 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2022/04/04 | 29311 | macros/unicodetex/latex/simplivre/simplivre.cls
2022/04/04 | 29307 | macros/unicodetex/latex/einfart/einfart.cls
+2022/04/04 | 289985 | support/TeX4ht/source/tex4ht-sty.tex
2022/04/04 | 2883 | macros/latex/contrib/siunitx/siunitx-binary.dtx
-2022/04/04 | 288199 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2022/04/04 | 28797 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2022/04/04 | 28691 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2022/04/04 | 286412 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/04/04 | 285712 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2022/04/04 | 28570 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
2022/04/04 | 28447 | macros/unicodetex/latex/beaulivre/beaulivre.cls
2022/04/04 | 28443 | macros/unicodetex/latex/lebhart/lebhart.cls
-2022/04/04 | 28422 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2022/04/04 | 2820688 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
2022/04/04 | 28132 | support/latexindent/documentation/sec-appendices.tex
-2022/04/04 | 27637 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/04/04 | 27590 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2022/04/04 | 273447 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
2022/04/04 | 273398 | macros/latex/contrib/siunitx/siunitx-v2.sty
-2022/04/04 | 273397 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
2022/04/04 | 27286 | support/latexindent/LatexIndent/Verbatim.pm
-2022/04/04 | 27247 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2022/04/04 | 270299 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2022/04/04 | 2694875 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2022/04/04 | 266431 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.pdf
2022/04/04 | 2662 | support/latexindent/LatexIndent/Preamble.pm
2022/04/04 | 262328 | macros/unicodetex/latex/nwafuthesis/nwafuthesis.dtx
2022/04/04 | 25985 | macros/latex/contrib/siunitx/siunitx-complex.dtx
-2022/04/04 | 259256 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2022/04/04 | 25552 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
2022/04/04 | 2537 | macros/latex/contrib/minimalist/README.md
-2022/04/04 | 251130 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2022/04/04 | 25106 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2022/04/04 | 25058 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
2022/04/04 | 2492 | support/latexindent/LatexIndent/Switches.pm
2022/04/04 | 2492 | macros/latex/contrib/siunitx/siunitx-code.tex
2022/04/04 | 248999 | macros/unicodetex/latex/einfart/einfart-doc-cn.pdf
2022/04/04 | 24812 | support/latexindent/documentation/sec-how-to-use.tex
-2022/04/04 | 247334 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin-x64.tar.lzma
2022/04/04 | 24664 | macros/latex/contrib/minimalist/minimalist-doc.tex
-2022/04/04 | 245096 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/04/04 | 244962 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
2022/04/04 | 24321 | macros/latex/contrib/colorist/colorist-doc.tex
2022/04/04 | 2422 | macros/latex/contrib/colorist/README.md
2022/04/04 | 24156 | macros/unicodetex/latex/einfart/einfart-doc-fr.tex
-2022/04/04 | 24121 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/04/04 | 23944 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
2022/04/04 | 23944 | support/latexindent/documentation/latexindent.tex
2022/04/04 | 239148 | indexing/makeindexk.zip
2022/04/04 | 23876 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.tex
@@ -253,37 +528,24 @@
2022/04/04 | 2231 | support/latexindent/LatexIndent/Logger.pm
2022/04/04 | 22270 | macros/unicodetex/latex/einfart/einfart-doc-en.tex
2022/04/04 | 22172 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.tex
-2022/04/04 | 22147 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2022/04/04 | 21996 | macros/unicodetex/latex/lebhart/lebhart-doc-en.tex
2022/04/04 | 21892 | support/latexindent/LatexIndent/Document.pm
2022/04/04 | 21628 | support/latexindent/documentation/sec-replacements.tex
2022/04/04 | 213759 | macros/unicodetex/latex/beaulivre/beaulivre-doc-fr.pdf
-2022/04/04 | 213278 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/04/04 | 21312 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
2022/04/04 | 21203 | macros/unicodetex/latex/einfart/einfart-doc-cn.tex
2022/04/04 | 2109 | support/latexindent/documentation/sec-demonstration.tex
-2022/04/04 | 210274 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
2022/04/04 | 20945 | macros/unicodetex/latex/simplivre/simplivre-doc-en.tex
-2022/04/04 | 208808 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
2022/04/04 | 208770 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.pdf
2022/04/04 | 20565 | support/latexindent/LatexIndent/Indent.pm
2022/04/04 | 20549 | macros/unicodetex/latex/lebhart/lebhart-doc-cn.tex
2022/04/04 | 20446 | macros/unicodetex/latex/beaulivre/beaulivre-doc-en.tex
-2022/04/04 | 203838 | systems/win32/miktex/tm/packages/next/miktex-hitex-bin.tar.lzma
2022/04/04 | 20380 | support/latexindent/documentation/subsec-text-wrap.tex
-2022/04/04 | 202835 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/04/04 | 20184 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2022/04/04 | 201834 | macros/latex/contrib/projlib/ProjLib-doc-fr.pdf
-2022/04/04 | 200396 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
2022/04/04 | 200297 | macros/latex/contrib/projlib/ProjLib-doc-en.pdf
-2022/04/04 | 199831 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
2022/04/04 | 19924 | support/latexindent/LatexIndent/Sentence.pm
2022/04/04 | 19904 | support/latexindent/defaultSettings.yaml
2022/04/04 | 19901 | macros/unicodetex/latex/simplivre/simplivre-doc-cn.tex
2022/04/04 | 19900 | macros/latex/contrib/siunitx/siunitx.dtx
-2022/04/04 | 1982085 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/04/04 | 197036 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2022/04/04 | 196117 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2022/04/04 | 1930 | support/latexindent/documentation/sec-conclusions-know-limitations.tex
2022/04/04 | 192758 | macros/latex/contrib/projlib/ProjLib.dtx
2022/04/04 | 19148 | macros/luatex/generic/luakeys/luakeys.lua
@@ -294,43 +556,30 @@
2022/04/04 | 19106 | macros/latex/contrib/projlib/LICENSE
2022/04/04 | 19106 | macros/latex/contrib/minimalist/LICENSE
2022/04/04 | 19106 | macros/latex/contrib/colorist/LICENSE
-2022/04/04 | 190503 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
2022/04/04 | 18996 | macros/unicodetex/latex/beaulivre/beaulivre-doc-cn.tex
2022/04/04 | 1887 | support/latexindent/documentation/subsec-noAdditionalIndent-indentRules.tex
2022/04/04 | 1879 | support/latexindent/documentation/figure-schematic.tex
+2022/04/04 | 187791 | support/TeX4ht/source/ChangeLog
2022/04/04 | 1876 | support/latexindent/README
-2022/04/04 | 18492 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/04/04 | 18369 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/04/04 | 181516 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/04/04 | 179877 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
2022/04/04 | 179052 | dviware/dvidvi.zip
2022/04/04 | 177690 | macros/luatex/generic/luakeys.zip
-2022/04/04 | 1752147 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2022/04/04 | 173006 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
2022/04/04 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2022/04/04 | 169502 | macros/luatex/generic/luakeys/luakeys-doc.pdf
-2022/04/04 | 168820 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2022/04/04 | 16709 | macros/latex/contrib/siunitx/siunitx-angle.dtx
2022/04/04 | 1664 | support/latexindent/documentation/logo.tex
2022/04/04 | 16615 | support/latexindent/LatexIndent/ModifyLineBreaks.pm
2022/04/04 | 1658 | macros/luatex/generic/luakeys/README.md
2022/04/04 | 16560 | support/latexindent/documentation/subsubsec-environments-and-their-arguments.tex
-2022/04/04 | 16559 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2022/04/04 | 16502 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2022/04/04 | 1648 | macros/luatex/generic/luakeys/luakeys-debug.tex
2022/04/04 | 16296 | macros/luatex/generic/luakeys/luakeys-doc.tex
2022/04/04 | 160964 | macros/unicodetex/latex/einfart/einfart-doc-fr.pdf
2022/04/04 | 15950 | support/latexindent/documentation/sec-fine-tuning.tex
-2022/04/04 | 156964 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
2022/04/04 | 15666 | support/latexindent/LatexIndent/Wrap.pm
2022/04/04 | 1558 | support/latexindent/latexindent-module-installer.pl
-2022/04/04 | 155497 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
2022/04/04 | 154480 | macros/unicodetex/latex/einfart/einfart-doc-en.pdf
2022/04/04 | 1542 | macros/unicodetex/latex/nwafuthesis/README.md
2022/04/04 | 15317 | macros/latex/contrib/siunitx/siunitx-quantity.dtx
-2022/04/04 | 152031 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2022/04/04 | 150602 | macros/unicodetex/latex/lebhart/lebhart-doc-fr.pdf
-2022/04/04 | 1501237 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
2022/04/04 | 149431 | macros/latex/contrib/siunitx/siunitx.tex
2022/04/04 | 1483 | support/latexindent/LatexIndent/DoubleBackSlash.pm
2022/04/04 | 1479 | support/latexindent/documentation/title.tex
@@ -340,51 +589,25 @@
2022/04/04 | 146477 | macros/unicodetex/latex/lebhart/lebhart-doc-en.pdf
2022/04/04 | 1460 | macros/unicodetex/latex/lebhart/README.md
2022/04/04 | 1458 | macros/unicodetex/latex/beaulivre/README.md
-2022/04/04 | 1454763 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/04/04 | 1443153 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2022/04/04 | 1442929 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2022/04/04 | 14411 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2022/04/04 | 1424629 | macros/latex/contrib/siunitx.zip
2022/04/04 | 14024 | support/latexindent/documentation/subsec-commands-and-their-options.tex
2022/04/04 | 13969 | support/latexindent/LatexIndent/Special.pm
-2022/04/04 | 139104 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/04/04 | 135949 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2022/04/04 | 1357073 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2022/04/04 | 135376 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/04/04 | 13513 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2022/04/04 | 1331798 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2022/04/04 | 1331780 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
2022/04/04 | 132387 | macros/latex/contrib/minimalist.zip
-2022/04/04 | 1322743 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/04/04 | 1302482 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2022/04/04 | 12661 | support/latexindent/LatexIndent/Braces.pm
-2022/04/04 | 126533 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2022/04/04 | 125809 | macros/latex/contrib/colorist.zip
2022/04/04 | 12434 | support/latexindent/LatexIndent/LogFile.pm
2022/04/04 | 12430 | support/latexindent/LatexIndent/HiddenChildren.pm
2022/04/04 | 124008 | macros/latex/contrib/siunitx/siunitx-number.dtx
-2022/04/04 | 120617 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2022/04/04 | 1181125 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2022/04/04 | 119712 | language/japanese/jlreq/jlreq.pdf
2022/04/04 | 11640 | support/latexindent/LatexIndent/FileContents.pm
-2022/04/04 | 115657 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/04/04 | 1156464 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/04/04 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2022/04/04 | 113053 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/04/04 | 112590 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2022/04/04 | 109479 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2022/04/04 | 1112730 | support/TeX4ht/source/tex4ht-4ht.tex
2022/04/04 | 10829 | support/latexindent/documentation/sec-indent-config-and-settings.tex
2022/04/04 | 10802 | support/latexindent/LatexIndent/Heading.pm
-2022/04/04 | 107704 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2022/04/04 | 1069437 | support/latexindent/documentation/latexindent.pdf
-2022/04/04 | 104554 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
2022/04/04 | 103703 | macros/latex/contrib/minimalist/minimalist-doc.pdf
2022/04/04 | 10347 | support/latexindent/LatexIndent/Command.pm
-2022/04/04 | 103338 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/04/04 | 103093 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/04/04 | 1021845 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
2022/04/04 | 101825 | macros/latex/contrib/colorist/colorist-doc.pdf
2022/04/04 | 10106 | macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
-2022/04/04 | 100486 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2022/04/03 | 894 | macros/latex/contrib/commonunicode/doc/commonunicode.tex
2022/04/03 | 862 | info/dtk-bibliography/dtk-bibliography.tex
2022/04/03 | 74997 | macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015/README.md
@@ -570,288 +793,7 @@
2022/03/30 | 861548 | macros/latex/contrib/twemojis/twemojis.dtx
2022/03/30 | 6929935 | macros/latex/contrib/twemojis/all-twemojis.pdf
2022/03/30 | 6517071 | macros/latex/contrib/twemojis/twemojis.pdf
-2022/03/30 | 60210963 | systems/win32/TLW64/gs9560w64full-gpl.exe
2022/03/30 | 573 | macros/latex/contrib/twemojis/twemojis.ins
2022/03/30 | 4161 | macros/latex/contrib/twemojis/README.md
2022/03/30 | 2480 | systems/win32/TLW64/00README.TLW64
2022/03/30 | 10032787 | macros/latex/contrib/twemojis.zip
-2022/03/29 | 9970 | macros/latex/contrib/annotate-equations/annotate-equations.tex
-2022/03/29 | 993939 | systems/win32/miktex/tm/packages/figchild__doc.tar.lzma
-2022/03/29 | 986842 | systems/win32/miktex/tm/packages/mcf2graph__doc.tar.lzma
-2022/03/29 | 97391 | systems/win32/miktex/tm/packages/latexmk.tar.lzma
-2022/03/29 | 9721 | systems/win32/miktex/tm/packages/dataref__source.tar.lzma
-2022/03/29 | 9605 | systems/win32/miktex/tm/packages/colorist.tar.lzma
-2022/03/29 | 95321 | systems/win32/miktex/tm/packages/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2022/03/29 | 9453 | systems/win32/miktex/tm/packages/figchild__source.tar.lzma
-2022/03/29 | 943519 | systems/win32/miktex/tm/packages/csplain__source.tar.lzma
-2022/03/29 | 9249410 | systems/win32/miktex/tm/packages/noto-emoji.tar.lzma
-2022/03/29 | 921180 | systems/win32/miktex/tm/packages/letgut__doc.tar.lzma
-2022/03/29 | 9099 | macros/luatex/generic/lua-widow-control/lua-widow-control.sty
-2022/03/29 | 8834 | systems/win32/miktex/tm/packages/minimalist.tar.lzma
-2022/03/29 | 881 | systems/win32/miktex/tm/packages/noto-emoji__doc.tar.lzma
-2022/03/29 | 88127 | systems/win32/miktex/tm/packages/miktex-png-bin-x64-2.9.tar.lzma
-2022/03/29 | 8766 | systems/win32/miktex/tm/packages/miktex-md5-bin-x64-2.9.tar.lzma
-2022/03/29 | 8647 | systems/win32/miktex/tm/packages/create-theorem.tar.lzma
-2022/03/29 | 8601 | macros/luatex/generic/lua-widow-control/lwc-documentation.mkxl
-2022/03/29 | 8533012 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__doc.tar.lzma
-2022/03/29 | 8337 | systems/win32/miktex/tm/packages/texlogfilter__doc.tar.lzma
-2022/03/29 | 824840 | systems/win32/miktex/tm/packages/miktex-pdftex-bin-x64-2.9.tar.lzma
-2022/03/29 | 8210 | systems/win32/miktex/tm/packages/ieejtran__source.tar.lzma
-2022/03/29 | 8208 | systems/win32/miktex/tm/packages/adjmulticol__source.tar.lzma
-2022/03/29 | 81447 | systems/win32/miktex/tm/packages/miktex-freeglut-bin-x64-2.9.tar.lzma
-2022/03/29 | 8105 | systems/win32/miktex/tm/packages/oup-authoring-template__source.tar.lzma
-2022/03/29 | 8101 | systems/win32/miktex/tm/packages/make4ht__source.tar.lzma
-2022/03/29 | 808080 | systems/win32/miktex/tm/packages/ieeetran__source.tar.lzma
-2022/03/29 | 802243 | systems/win32/miktex/tm/packages/nwafuthesis__source.tar.lzma
-2022/03/29 | 797975 | systems/win32/miktex/tm/packages/istgame__doc.tar.lzma
-2022/03/29 | 79168 | systems/win32/miktex/tm/packages/miktex-fonts-bin-x64-2.9.tar.lzma
-2022/03/29 | 7810 | systems/win32/miktex/tm/packages/minimalist__source.tar.lzma
-2022/03/29 | 7776 | systems/win32/miktex/tm/packages/dataref.tar.lzma
-2022/03/29 | 773688 | systems/win32/miktex/tm/packages/miktex-ptex-bin-x64.tar.lzma
-2022/03/29 | 7712 | systems/win32/miktex/tm/packages/colorist__source.tar.lzma
-2022/03/29 | 77011 | systems/win32/miktex/tm/packages/miktex-bibtex-bin-x64-2.9.tar.lzma
-2022/03/29 | 7505 | macros/latex/contrib/annotate-equations/annotate-equations.sty
-2022/03/29 | 740140 | systems/win32/miktex/tm/packages/caption__doc.tar.lzma
-2022/03/29 | 74005 | systems/win32/miktex/tm/packages/miktex-lzma-bin-x64-2.9.tar.lzma
-2022/03/29 | 73553 | systems/win32/miktex/tm/packages/miktex-web-bin-x64-2.9.tar.lzma
-2022/03/29 | 73268 | systems/win32/miktex/tm/packages/miktex-graphite2-bin-x64-2.9.tar.lzma
-2022/03/29 | 7295 | systems/win32/miktex/tm/packages/biblatex-lncs__doc.tar.lzma
-2022/03/29 | 72816 | systems/win32/miktex/tm/packages/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2022/03/29 | 720241 | systems/win32/miktex/tm/packages/cooking-units__doc.tar.lzma
-2022/03/29 | 7137 | systems/win32/miktex/tm/packages/zxjafont__source.tar.lzma
-2022/03/29 | 7134 | systems/win32/miktex/tm/packages/functional.tar.lzma
-2022/03/29 | 711 | macros/luatex/generic/lua-widow-control/lua-widow-control.opm
-2022/03/29 | 70930 | systems/win32/miktex/tm/packages/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2022/03/29 | 705659 | macros/latex/contrib/zref.zip
-2022/03/29 | 698729 | macros/latex/contrib/zref/zref.pdf
-2022/03/29 | 695510 | systems/win32/miktex/tm/packages/simplivre__doc.tar.lzma
-2022/03/29 | 68387 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
-2022/03/29 | 68314 | systems/win32/miktex/tm/packages/cooking-units__source.tar.lzma
-2022/03/29 | 681669 | systems/win32/miktex/tm/packages/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2022/03/29 | 67164 | systems/win32/miktex/tm/packages/miktex-texify-bin-x64-2.9.tar.lzma
-2022/03/29 | 660276 | systems/win32/miktex/tm/packages/projlib__doc.tar.lzma
-2022/03/29 | 649857 | systems/win32/miktex/tm/packages/polyglossia__doc.tar.lzma
-2022/03/29 | 64981 | systems/win32/miktex/tm/packages/miktex-bibarts-bin-x64-2.9.tar.lzma
-2022/03/29 | 647047 | systems/win32/miktex/tm/packages/beaulivre__doc.tar.lzma
-2022/03/29 | 63727 | systems/win32/miktex/tm/packages/miktex-tdsutil-bin-x64.tar.lzma
-2022/03/29 | 6357 | systems/win32/miktex/tm/packages/checkcites.tar.lzma
-2022/03/29 | 63351 | systems/win32/miktex/tm/packages/miktex-fmt-bin-x64-2.9.tar.lzma
-2022/03/29 | 628959 | systems/win32/miktex/tm/packages/miktex-yap-bin-x64-2.9.tar.lzma
-2022/03/29 | 6276 | systems/win32/miktex/tm/packages/beamertheme-trigon.tar.lzma
-2022/03/29 | 62741 | systems/win32/miktex/tm/packages/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2022/03/29 | 600073 | systems/win32/miktex/tm/packages/beamertheme-trigon__source.tar.lzma
-2022/03/29 | 59960 | systems/win32/miktex/tm/packages/istgame__source.tar.lzma
-2022/03/29 | 599002 | systems/win32/miktex/tm/packages/miktex-libressl-bin-x64-2.9.tar.lzma
-2022/03/29 | 59578 | systems/win32/miktex/tm/packages/caption.tar.lzma
-2022/03/29 | 594375 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
-2022/03/29 | 59369 | systems/win32/miktex/tm/packages/ieeetran.tar.lzma
-2022/03/29 | 58620 | systems/win32/miktex/tm/packages/miktex-psutils-bin-x64-2.9.tar.lzma
-2022/03/29 | 581 | macros/latex/contrib/zref/README.md
-2022/03/29 | 5787 | macros/latex/contrib/stage/stage.cls
-2022/03/29 | 575085 | systems/win32/miktex/tm/packages/luaotfload.tar.lzma
-2022/03/29 | 57420 | systems/win32/miktex/tm/packages/miktex-xml2pmx-bin-x64.tar.lzma
-2022/03/29 | 57350 | systems/win32/miktex/tm/packages/miktex-arctrl-bin-x64-2.9.tar.lzma
-2022/03/29 | 57330 | systems/win32/miktex/tm/packages/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2022/03/29 | 572689 | systems/win32/miktex/tm/packages/ieeetran__doc.tar.lzma
-2022/03/29 | 5724 | systems/win32/miktex/tm/packages/create-theorem__source.tar.lzma
-2022/03/29 | 565852 | systems/win32/miktex/tm/packages/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2022/03/29 | 5648 | systems/win32/miktex/tm/packages/checkcites__source.tar.lzma
-2022/03/29 | 55581 | systems/win32/miktex/tm/packages/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2022/03/29 | 5466 | systems/win32/miktex/tm/packages/zxjafont.tar.lzma
-2022/03/29 | 546402 | systems/win32/miktex/tm/packages/luaotfload__doc.tar.lzma
-2022/03/29 | 543194 | systems/win32/miktex/tm/packages/lebhart__doc.tar.lzma
-2022/03/29 | 54158 | systems/win32/miktex/tm/packages/xetexko.tar.lzma
-2022/03/29 | 540322 | systems/win32/miktex/tm/packages/einfart__doc.tar.lzma
-2022/03/29 | 531679 | systems/win32/miktex/doc/miktex.pdf
-2022/03/29 | 527786 | systems/win32/miktex/tm/packages/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2022/03/29 | 52456 | systems/win32/miktex/tm/packages/miktex-synctex-bin-x64-2.9.tar.lzma
-2022/03/29 | 52307 | systems/win32/miktex/tm/packages/miktex-m-tx-bin-x64-2.9.tar.lzma
-2022/03/29 | 52113 | systems/win32/miktex/tm/packages/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2022/03/29 | 51810 | systems/win32/miktex/tm/packages/mcf2graph__source.tar.lzma
-2022/03/29 | 51804 | systems/win32/miktex/tm/packages/make4ht.tar.lzma
-2022/03/29 | 50588 | systems/win32/miktex/tm/packages/pdfmanagement-testphase.tar.lzma
-2022/03/29 | 49440 | systems/win32/miktex/tm/packages/njuthesis__source.tar.lzma
-2022/03/29 | 48787 | systems/win32/miktex/tm/packages/miktex-expat-bin-x64-2.9.tar.lzma
-2022/03/29 | 486682 | systems/win32/miktex/tm/packages/seu-ml-assign__doc.tar.lzma
-2022/03/29 | 483710 | systems/win32/miktex/tm/packages/gbt7714__doc.tar.lzma
-2022/03/29 | 481334 | systems/win32/miktex/tm/packages/miktex-doc.tar.lzma
-2022/03/29 | 47862 | systems/win32/miktex/tm/packages/miktex-mtprint-bin-x64-2.9.tar.lzma
-2022/03/29 | 47312 | systems/win32/miktex/tm/packages/thuthesis__source.tar.lzma
-2022/03/29 | 4701944 | systems/win32/miktex/tm/packages/genealogytree__doc.tar.lzma
-2022/03/29 | 45703 | systems/win32/miktex/tm/packages/miktex-dvipng-bin-x64-2.9.tar.lzma
-2022/03/29 | 456985 | systems/win32/miktex/tm/packages/lwarp__source.tar.lzma
-2022/03/29 | 4554 | systems/win32/miktex/tm/packages/luaaddplot__source.tar.lzma
-2022/03/29 | 4517 | systems/win32/miktex/tm/packages/einfart.tar.lzma
-2022/03/29 | 4491 | systems/win32/miktex/tm/packages/simplivre.tar.lzma
-2022/03/29 | 44760 | systems/win32/miktex/tm/packages/projlib__source.tar.lzma
-2022/03/29 | 4396 | systems/win32/miktex/tm/packages/lebhart.tar.lzma
-2022/03/29 | 43938 | systems/win32/miktex/tm/packages/miktex-mthelp-bin-x64-2.9.tar.lzma
-2022/03/29 | 4389 | systems/win32/miktex/tm/packages/beaulivre.tar.lzma
-2022/03/29 | 43793 | systems/win32/miktex/tm/packages/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2022/03/29 | 4371 | systems/win32/miktex/tm/packages/seu-ml-assign.tar.lzma
-2022/03/29 | 43644 | systems/win32/miktex/tm/packages/gzt__source.tar.lzma
-2022/03/29 | 43497 | systems/win32/miktex/tm/packages/tuda-ci.tar.lzma
-2022/03/29 | 43240 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2022/03/29 | 42897 | systems/win32/miktex/tm/packages/thuthesis.tar.lzma
-2022/03/29 | 41177 | systems/win32/miktex/tm/packages/miktex-patgen-bin-x64.tar.lzma
-2022/03/29 | 41158 | systems/win32/miktex/tm/packages/miktex-upmendex-bin-x64.tar.lzma
-2022/03/29 | 394355 | systems/win32/miktex/tm/packages/miktex-cairo-bin-x64-2.9.tar.lzma
-2022/03/29 | 39289 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
-2022/03/29 | 3905 | systems/win32/miktex/tm/packages/seu-ml-assign__source.tar.lzma
-2022/03/29 | 3895 | macros/luatex/generic/lua-widow-control/lwc-sample.tex
-2022/03/29 | 387 | macros/latex/contrib/stage/README
-2022/03/29 | 3852 | systems/win32/miktex/tm/packages/texlogfilter__source.tar.lzma
-2022/03/29 | 3844 | systems/win32/miktex/tm/packages/texlogfilter.tar.lzma
-2022/03/29 | 383012 | install/macros/luatex/generic/lua-widow-control.tds.zip
-2022/03/29 | 379478 | macros/luatex/generic/lua-widow-control.zip
-2022/03/29 | 379185 | macros/luatex/generic/lua-widow-control/lua-widow-control.pdf
-2022/03/29 | 377705 | systems/win32/miktex/tm/packages/functional__doc.tar.lzma
-2022/03/29 | 3755783 | systems/win32/miktex/tm/packages/media9__doc.tar.lzma
-2022/03/29 | 37345 | systems/win32/miktex/tm/packages/miktex-posix-bin-x64-2.9.tar.lzma
-2022/03/29 | 37066 | systems/win32/miktex/tm/packages/miktex-chktex-bin-x64-2.9.tar.lzma
-2022/03/29 | 35447 | systems/win32/miktex/tm/packages/genealogytree.tar.lzma
-2022/03/29 | 35210 | systems/win32/miktex/tm/packages/miktex-axohelp-bin-x64-2.9.tar.lzma
-2022/03/29 | 352024 | systems/win32/miktex/tm/packages/miktex-xetex-bin-x64-2.9.tar.lzma
-2022/03/29 | 35189 | systems/win32/miktex/tm/packages/miktex-mspack-bin-x64-2.9.tar.lzma
-2022/03/29 | 347370 | systems/win32/miktex/tm/packages/lua-widow-control__doc.tar.lzma
-2022/03/29 | 34577 | systems/win32/miktex/tm/packages/gzt.tar.lzma
-2022/03/29 | 34039 | systems/win32/miktex/tm/packages/bxjscls.tar.lzma
-2022/03/29 | 34007 | systems/win32/miktex/tm/packages/miktex-uriparser-bin-x64-2.9.tar.lzma
-2022/03/29 | 338848 | systems/win32/miktex/tm/packages/luatexko__doc.tar.lzma
-2022/03/29 | 33444 | systems/win32/miktex/tm/packages/letgut__source.tar.lzma
-2022/03/29 | 3311 | systems/win32/miktex/tm/packages/beamertheme-trigon__doc.tar.lzma
-2022/03/29 | 3296 | systems/win32/miktex/tm/packages/gbt7714__source.tar.lzma
-2022/03/29 | 326362 | systems/win32/miktex/tm/packages/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2022/03/29 | 325340 | systems/win32/miktex/tm/packages/miktex-mo-bin-x64-2.9.tar.lzma
-2022/03/29 | 3250 | systems/win32/miktex/tm/packages/adjmulticol.tar.lzma
-2022/03/29 | 32110 | systems/win32/miktex/tm/packages/miktex-makeindex-bin-x64-2.9.tar.lzma
-2022/03/29 | 316391 | systems/win32/miktex/tm/packages/oup-authoring-template__doc.tar.lzma
-2022/03/29 | 31548 | systems/win32/miktex/tm/packages/miktex-autosp-bin-x64-2.9.tar.lzma
-2022/03/29 | 31336 | systems/win32/miktex/tm/packages/miktex-bzip2-bin-x64-2.9.tar.lzma
-2022/03/29 | 3121 | macros/latex/contrib/annotate-equations/README.md
-2022/03/29 | 311445 | systems/win32/miktex/tm/packages/adjmulticol__doc.tar.lzma
-2022/03/29 | 3064037 | systems/win32/miktex/tm/packages/lwarp__doc.tar.lzma
-2022/03/29 | 30576 | systems/win32/miktex/tm/packages/miktex-lacheck-bin-x64-2.9.tar.lzma
-2022/03/29 | 295960 | systems/win32/miktex/tm/packages/miktex-freetype2-bin-x64-2.9.tar.lzma
-2022/03/29 | 295478 | systems/win32/miktex/tm/packages/figchild.tar.lzma
-2022/03/29 | 29363 | macros/luatex/generic/lua-widow-control/lwc-documentation.tex
-2022/03/29 | 293257 | systems/win32/miktex/tm/packages/checkcites__doc.tar.lzma
-2022/03/29 | 291020 | systems/win32/miktex/tm/packages/biblatex-iso690__doc.tar.lzma
-2022/03/29 | 286636 | systems/win32/miktex/tm/packages/miktex-metapost-bin-x64-2.9.tar.lzma
-2022/03/29 | 28532 | systems/win32/miktex/tm/packages/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2022/03/29 | 2837 | systems/win32/miktex/tm/packages/biblatex-lncs.tar.lzma
-2022/03/29 | 282226 | systems/win32/miktex/tm/packages/latexmk__doc.tar.lzma
-2022/03/29 | 2819426 | systems/win32/miktex/tm/packages/miktex-texworks-bin-x64-2.9.tar.lzma
-2022/03/29 | 27587 | systems/win32/miktex/tm/packages/miktex-teckit-bin-x64-2.9.tar.lzma
-2022/03/29 | 270652 | systems/win32/miktex/tm/packages/miktex-console-bin-x64-2.9.tar.lzma
-2022/03/29 | 2699 | macros/luatex/generic/lua-widow-control/lua-widow-control-2022-02-22.sty
-2022/03/29 | 2690 | macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkxl
-2022/03/29 | 2690 | macros/luatex/generic/lua-widow-control/t-lua-widow-control.mkiv
-2022/03/29 | 2629 | macros/luatex/generic/lua-widow-control/README.md
-2022/03/29 | 260973 | systems/win32/miktex/tm/packages/xetexko__doc.tar.lzma
-2022/03/29 | 25940 | systems/win32/miktex/tm/packages/nwafuthesis.tar.lzma
-2022/03/29 | 258270 | systems/win32/miktex/tm/packages/luaaddplot__doc.tar.lzma
-2022/03/29 | 25773 | systems/win32/miktex/tm/packages/bfh-ci.tar.lzma
-2022/03/29 | 255719 | systems/win32/miktex/tm/packages/dataref__doc.tar.lzma
-2022/03/29 | 25514248 | systems/win32/miktex/setup/windows-x64/setup-5.1-x64.exe
-2022/03/29 | 25035 | systems/win32/miktex/tm/packages/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2022/03/29 | 24958 | systems/win32/miktex/tm/packages/quantumarticle.tar.lzma
-2022/03/29 | 24957 | systems/win32/miktex/tm/packages/letgut.tar.lzma
-2022/03/29 | 247671 | systems/win32/miktex/tm/packages/miktex-hitex-bin-x64.tar.lzma
-2022/03/29 | 24581 | systems/win32/miktex/tm/packages/uni-titlepage__source.tar.lzma
-2022/03/29 | 245116 | systems/win32/miktex/tm/packages/miktex-pmx-bin-x64-2.9.tar.lzma
-2022/03/29 | 24065 | systems/win32/miktex/tm/packages/miktex-devnag-bin-x64-2.9.tar.lzma
-2022/03/29 | 240095 | systems/win32/miktex/tm/packages/msu-thesis__doc.tar.lzma
-2022/03/29 | 23917 | systems/win32/miktex/tm/packages/miktex-popt-bin-x64-2.9.tar.lzma
-2022/03/29 | 23623 | systems/win32/miktex/tm/packages/luatexko.tar.lzma
-2022/03/29 | 234735 | systems/win32/miktex/tm/packages/bfh-ci__doc.tar.lzma
-2022/03/29 | 23225 | systems/win32/miktex/tm/packages/projlib.tar.lzma
-2022/03/29 | 23069 | systems/win32/miktex/tm/packages/miktex-misc.tar.lzma
-2022/03/29 | 23004 | systems/win32/miktex/tm/packages/functional__source.tar.lzma
-2022/03/29 | 224408 | systems/win32/miktex/tm/packages/citation-style-language__doc.tar.lzma
-2022/03/29 | 213682 | systems/win32/miktex/tm/packages/miktex-omegaware-bin-x64-2.9.tar.lzma
-2022/03/29 | 211696 | systems/win32/miktex/tm/packages/lwarp.tar.lzma
-2022/03/29 | 211055 | systems/win32/miktex/tm/packages/miktex-metafont-bin-x64-2.9.tar.lzma
-2022/03/29 | 210 | macros/latex/contrib/stage/Makefile
-2022/03/29 | 21009 | systems/win32/miktex/tm/packages/cooking-units.tar.lzma
-2022/03/29 | 209795 | systems/win32/miktex/tm/packages/caption__source.tar.lzma
-2022/03/29 | 209400 | systems/win32/miktex/tm/packages/msu-thesis__source.tar.lzma
-2022/03/29 | 20759816 | systems/win32/miktex/setup/windows-x86/setup-5.1.exe
-2022/03/29 | 20614 | macros/luatex/generic/lua-widow-control/lua-widow-control.lua
-2022/03/29 | 202946 | systems/win32/miktex/tm/packages/miktex-pixman-bin-x64-2.9.tar.lzma
-2022/03/29 | 2021820 | systems/win32/miktex/tm/packages/miktex-luatex-bin-x64-2.9.tar.lzma
-2022/03/29 | 197081 | macros/latex/contrib/zref/zref.dtx
-2022/03/29 | 1965758 | systems/win32/miktex/tm/packages/nwafuthesis__doc.tar.lzma
-2022/03/29 | 196159 | systems/win32/miktex/tm/packages/miktex-curl-bin-x64-2.9.tar.lzma
-2022/03/29 | 1900327 | systems/win32/miktex/tm/packages/media9.tar.lzma
-2022/03/29 | 18780 | systems/win32/miktex/tm/packages/istgame.tar.lzma
-2022/03/29 | 18495 | systems/win32/miktex/tm/packages/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2022/03/29 | 18349 | systems/win32/miktex/tm/packages/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2022/03/29 | 1827609 | systems/win32/miktex/tm/packages/uni-titlepage__doc.tar.lzma
-2022/03/29 | 181484 | systems/win32/miktex/tm/packages/miktex-mpfr-bin-x64-2.9.tar.lzma
-2022/03/29 | 1812 | macros/luatex/generic/lua-widow-control/lua-widow-control.tex
-2022/03/29 | 179574 | macros/latex/contrib/seu-ml-assign.zip
-2022/03/29 | 17831 | systems/win32/miktex/tm/packages/ieejtran.tar.lzma
-2022/03/29 | 17741 | CTAN.sites
-2022/03/29 | 17686 | systems/win32/miktex/tm/packages/oup-authoring-template.tar.lzma
-2022/03/29 | 172934 | systems/win32/miktex/tm/packages/miktex-tex-bin-x64-2.9.tar.lzma
-2022/03/29 | 170622 | systems/win32/miktex/tm/packages/make4ht__doc.tar.lzma
-2022/03/29 | 168767 | systems/win32/miktex/tm/packages/miktex-hunspell-bin-x64-2.9.tar.lzma
-2022/03/29 | 166304 | systems/win32/miktex/tm/packages/zxjafont__doc.tar.lzma
-2022/03/29 | 16341 | systems/win32/miktex/tm/packages/einfart__source.tar.lzma
-2022/03/29 | 16106 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2022/03/29 | 160279 | macros/latex/contrib/stage.zip
-2022/03/29 | 15935 | systems/win32/miktex/tm/packages/lebhart__source.tar.lzma
-2022/03/29 | 15928 | systems/win32/miktex/tm/packages/simplivre__source.tar.lzma
-2022/03/29 | 1566361 | systems/win32/miktex/tm/packages/bxjscls__doc.tar.lzma
-2022/03/29 | 156588 | systems/win32/miktex/tm/packages/polyglossia__source.tar.lzma
-2022/03/29 | 155567 | systems/win32/miktex/tm/packages/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2022/03/29 | 15433 | systems/win32/miktex/tm/packages/quantumarticle__source.tar.lzma
-2022/03/29 | 15348 | systems/win32/miktex/tm/packages/beaulivre__source.tar.lzma
-2022/03/29 | 1502704 | systems/win32/miktex/tm/packages/miktex-runtime-bin-x64-2.9.tar.lzma
-2022/03/29 | 1492 | macros/luatex/generic/lua-widow-control/lwc-documentation.bib
-2022/03/29 | 14846 | systems/win32/miktex/tm/packages/latexmk__source.tar.lzma
-2022/03/29 | 1457148 | systems/win32/miktex/tm/packages/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2022/03/29 | 14391 | systems/win32/miktex/tm/packages/miktex-zzip-bin-x64-2.9.tar.lzma
-2022/03/29 | 14289 | systems/win32/miktex/tm/packages/lua-widow-control__source.tar.lzma
-2022/03/29 | 142397 | systems/win32/miktex/tm/packages/ieejtran__doc.tar.lzma
-2022/03/29 | 1414619 | systems/win32/miktex/tm/packages/thuthesis__doc.tar.lzma
-2022/03/29 | 139104 | systems/win32/miktex/tm/packages/miktex-mktex-bin-x64-2.9.tar.lzma
-2022/03/29 | 1357701 | systems/win32/miktex/tm/packages/miktex-runtime-bin-2.9.tar.lzma
-2022/03/29 | 135432 | systems/win32/miktex/tm/packages/miktex-dvips-bin-x64-2.9.tar.lzma
-2022/03/29 | 13356 | systems/win32/miktex/tm/packages/biblatex-iso690.tar.lzma
-2022/03/29 | 13332 | systems/win32/miktex/tm/packages/njuthesis.tar.lzma
-2022/03/29 | 1322411 | systems/win32/miktex/tm/packages/miktex-poppler-bin-x64-2.9.tar.lzma
-2022/03/29 | 128663 | macros/latex/contrib/annotate-equations.zip
-2022/03/29 | 128235 | systems/win32/miktex/tm/packages/pdfmanagement-testphase__source.tar.lzma
-2022/03/29 | 1263708 | systems/win32/miktex/tm/packages/quantumarticle__doc.tar.lzma
-2022/03/29 | 12516 | systems/win32/miktex/tm/packages/luatexko__source.tar.lzma
-2022/03/29 | 124665 | macros/latex/contrib/annotate-equations/annotate-equations.pdf
-2022/03/29 | 123472 | systems/win32/miktex/tm/packages/csplain.tar.lzma
-2022/03/29 | 123381 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
-2022/03/29 | 123299 | systems/win32/miktex/tm/packages/create-theorem__doc.tar.lzma
-2022/03/29 | 12196 | systems/win32/miktex/tm/packages/xetexko__source.tar.lzma
-2022/03/29 | 1193 | systems/win32/miktex/tm/packages/luaaddplot.tar.lzma
-2022/03/29 | 1182916 | systems/win32/miktex/tm/packages/gzt__doc.tar.lzma
-2022/03/29 | 117928 | systems/win32/miktex/tm/packages/polyglossia.tar.lzma
-2022/03/29 | 1165116 | systems/win32/miktex/tm/packages/njuthesis__doc.tar.lzma
-2022/03/29 | 1159867 | systems/win32/miktex/tm/packages/miktex-asymptote-bin-x64-2.9.tar.lzma
-2022/03/29 | 115719 | systems/win32/miktex/tm/packages/miktex-gregorio-bin-x64-2.9.tar.lzma
-2022/03/29 | 11371 | systems/win32/miktex/tm/packages/gbt7714.tar.lzma
-2022/03/29 | 113004 | systems/win32/miktex/tm/packages/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2022/03/29 | 112643 | systems/win32/miktex/tm/packages/miktex-gd-bin-x64-2.9.tar.lzma
-2022/03/29 | 1107835 | systems/win32/miktex/tm/packages/tuda-ci__doc.tar.lzma
-2022/03/29 | 109470 | systems/win32/miktex/tm/packages/miktex-jpeg-bin-x64-2.9.tar.lzma
-2022/03/29 | 1090 | macros/latex/contrib/annotate-equations/LICENSE
-2022/03/29 | 107683 | systems/win32/miktex/tm/packages/miktex-texware-bin-x64-2.9.tar.lzma
-2022/03/29 | 10737 | systems/win32/miktex/tm/packages/msu-thesis.tar.lzma
-2022/03/29 | 107067 | systems/win32/miktex/tm/packages/minimalist__doc.tar.lzma
-2022/03/29 | 10660 | systems/win32/miktex/tm/packages/uni-titlepage.tar.lzma
-2022/03/29 | 106484 | systems/win32/miktex/tm/packages/citation-style-language.tar.lzma
-2022/03/29 | 10635 | systems/win32/miktex/tm/packages/lua-widow-control.tar.lzma
-2022/03/29 | 105022 | systems/win32/miktex/tm/packages/miktex-mfware-bin-x64-2.9.tar.lzma
-2022/03/29 | 104777 | systems/win32/miktex/tm/packages/colorist__doc.tar.lzma
-2022/03/29 | 103329 | systems/win32/miktex/tm/packages/miktex-lua53-bin-x64-2.9.tar.lzma
-2022/03/29 | 103249 | systems/win32/miktex/tm/packages/bxjscls__source.tar.lzma
-2022/03/29 | 102960 | systems/win32/miktex/tm/packages/miktex-cweb-bin-x64-2.9.tar.lzma
-2022/03/29 | 1020707 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
diff --git a/biblio/pbibtex/pbibtex-manual/README.md b/biblio/pbibtex/pbibtex-manual/README.md
index bb31242e0c..660eec2c44 100644
--- a/biblio/pbibtex/pbibtex-manual/README.md
+++ b/biblio/pbibtex/pbibtex-manual/README.md
@@ -29,6 +29,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2022-02-06
+2022-04-05
Japanese TeX Development Community
diff --git a/biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf b/biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
index 8fd53ff60f..d4e09f6fd1 100644
--- a/biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
+++ b/biblio/pbibtex/pbibtex-manual/pbibtex-manual.pdf
Binary files differ
diff --git a/biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex b/biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
index b88387f012..1c1cde7aca 100644
--- a/biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
+++ b/biblio/pbibtex/pbibtex-manual/pbibtex-manual.tex
@@ -50,12 +50,6 @@
%%%%%%%%%%%%%%%%
% logos
-\def\eTeX{$\varepsilon$-\TeX}
-\def\pTeX{p\kern-.10em\TeX}
-\def\epTeX{$\varepsilon$-\pTeX}
-\def\upTeX{u\pTeX}
-\def\eupTeX{$\varepsilon$-\upTeX}
-
\def\JTeX{\leavevmode\textcompwordmark\lower.5ex\hbox{J}\kern-.17em\TeX}
\def\JBibTeX{\leavevmode\textcompwordmark\lower.5ex\hbox{J}\kern-.08em\BibTeX}
\def\pBibTeX{p\kern-.05em\BibTeX}
@@ -80,7 +74,7 @@
\title{\emph{\pBibTeX~/~\upBibTeX マニュアル}}
\author{日本語\TeX 開発コミュニティ\null
\thanks{\url{https://texjp.org},\ e-mail: \texttt{issue(at)texjp.org}}}
-\date{version 0.99d-j0.33,\today}
+\date{version 0.99d-j0.34,\today}
\maketitle
\pBibTeX と\upBibTeX は,それぞれ\pTeX と\upTeX と組み合わせて使用することを
@@ -121,28 +115,48 @@
\item 日本語文字とそれ以外の区別
\end{itemize}
-\subsection{多バイト文字の扱い}
+\subsection{多バイト文字の扱い}\label{sec:substring}
(u)\pBibTeX は,\BibTeX から最小の変更量で日本語を含む文献情報を
扱えるようにした都合上,多バイト文字の扱いは以下のとおりとなっている.
\begin{itemize}
\item \emph{文字列の位置や長さは「文字単位」ではなく「バイト単位」でカウントする}.
\item その結果として,開始位置や終了位置が多バイト文字の途中となる場合は,
- \emph{多バイト文字の途中で切られないように位置を調整して多めに切り出す}.
+ \emph{多バイト文字の途中で切られないように位置を調整する}.
\end{itemize}
具体的には,以下のスタイルパラメータが該当する.
\begin{itemize}
\item |substring$|\\
- 整数値2つ(長さ,開始位置)と文字列リテラル1つをpopし,
+ 整数値2つ(長さ,起点)と文字列リテラル1つをpopし,
指定の長さ(バイト長)の部分文字列をpushする組込関数である.
- \begin{itemize}
- \item 開始位置が多バイト文字の2バイト目以降であれば,1バイト目から取り出す.
- \item 終了位置が多バイト文字の最終バイトでなければ,最終バイトまで取り出す.
- \end{itemize}
- したがって,\pBibTeX (内部コード|euc|)では最大2バイト長く,
+ 起点に指定された整数値が正であれば文字列の先頭から,
+ 負であれば末尾から長さを数えて取り出す.
+
+ 多バイト文字についての開始・終了位置の調整は以下の順で行う.
+\begin{quotation}
+ \begin{enumerate}
+ \item[(1)] 開始位置が多バイト文字の2バイト目以降であれば,1バイト目から取り出す.
+ \item[(2)] 終了位置が多バイト文字の最終バイトでなければ,最終バイトまで取り出す.
+ \end{enumerate}
+\end{quotation}
+ したがって,この時点で\pBibTeX (内部コード|euc|)では最大2バイト長く,
\upBibTeX (内部コード|uptex|)では最大6バイト長い文字列が取り出されうる.
+ さらに,(u)\pBibTeX~j0.34 (\TeX~Live 2022)以降では% r62095 (2022-02-20)
+\begin{quotation}
+ \begin{enumerate}
+ \item[(3)] 起点が|#2|以上に指定されたにもかかわらず,上の(1)の調整により
+ 開始位置が文字列の先頭になってしまった場合は,
+ その先頭の多バイト文字を切り捨てる.
+ \item[(4)] 起点が|#-2|以下に指定されたにもかかわらず,上の(2)の調整により
+ 終了位置が文字列の末尾になってしまった場合は,
+ その末尾の多バイト文字を切り捨てる.
+ \end{enumerate}
+\end{quotation}
+ という調整も加えてある.したがって,\pBibTeX では最大1バイト短く,
+ \upBibTeX では最大3バイト短くなる(場合によっては空になる)ことがある.
+
\item |text.prefix$|\\
整数値(長さ)と文字列リテラルをpopし,文字列の先頭から指定の長さ(バイト長)の
連続した文字列をpushする組込関数である.
@@ -157,9 +171,34 @@
\pBibTeX と\upBibTeX では同じ文字でもバイト長が異なる場合があり,
その結果として取り出される見かけの文字数が異なることに注意.
-\pBibTeX (内部コード|euc|)の場合\par\medskip
+\par\medskip\noindent
+\begin{minipage}{0.45\textwidth}
+\begin{verbatim}
+例1:長めに調整(2)
+"あいうえお" #1 #1 substring$
+"あいうえお" #1 #2 substring$
+"あいうえお" #1 #3 substring$
+"あいうえお" #1 #4 substring$
+"あいうえお" #1 #5 substring$
+"あいうえお" #1 #6 substring$
+\end{verbatim}
+\end{minipage}
\begin{minipage}{0.5\textwidth}
+\begin{tabular}{lll}
+ & \pBibTeX & \upBibTeX \\
+最初の1文字 & 「あ」 & 「あ」 \\
+最初の2文字 & 「あ」 & 「あ」 \\
+最初の3文字 & 「あい」 & 「あ」 \\
+最初の4文字 & 「あい」 & 「あい」 \\
+最初の5文字 & 「あいう」 & 「あい」 \\
+最初の6文字 & 「あいう」 & 「あい」
+\end{tabular}
+\end{minipage}
+
+\par\medskip\noindent
+\begin{minipage}{0.45\textwidth}
\begin{verbatim}
+例2:長めに調整(1)
"あいうえお" #-1 #1 substring$
"あいうえお" #-1 #2 substring$
"あいうえお" #-1 #3 substring$
@@ -168,34 +207,88 @@
"あいうえお" #-1 #6 substring$
\end{verbatim}
\end{minipage}
-\begin{minipage}{0.4\textwidth}
-最後の1文字 = 「お」\par
-最後の2文字 = 「お」\par
-最後の3文字 = 「えお」\par
-最後の4文字 = 「えお」\par
-最後の5文字 = 「うえお」\par
-最後の6文字 = 「うえお」
-\end{minipage}\par\medskip
-
-\upBibTeX (内部コード|uptex|)の場合\par\medskip
\begin{minipage}{0.5\textwidth}
+\begin{tabular}{lll}
+ & \pBibTeX & \upBibTeX \\
+最後の1文字 & 「お」 & 「お」 \\
+最後の2文字 & 「お」 & 「お」 \\
+最後の3文字 & 「えお」 & 「お」 \\
+最後の4文字 & 「えお」 & 「えお」 \\
+最後の5文字 & 「うえお」 & 「えお」 \\
+最後の6文字 & 「うえお」 & 「えお」
+\end{tabular}
+\end{minipage}
+
+\par\medskip\noindent
+\begin{minipage}{0.45\textwidth}
\begin{verbatim}
-"あいうえお" #-1 #1 substring$
-"あいうえお" #-1 #2 substring$
-"あいうえお" #-1 #3 substring$
-"あいうえお" #-1 #4 substring$
-"あいうえお" #-1 #5 substring$
+例3:先頭文字の途中調整(3)
+"あいうえお" #1 #6 substring$
+"あいうえお" #2 #5 substring$
+"あいうえお" #3 #4 substring$
+"あいうえお" #4 #3 substring$
+"あいうえお" #5 #2 substring$
+"あいうえお" #6 #1 substring$
+\end{verbatim}
+\end{minipage}
+\begin{minipage}{0.5\textwidth}
+\begin{tabular}{lll}
+ & \pBibTeX & \upBibTeX \\
+最初の6文字 & 「あいう」 & 「あい」 \\
+最初の1文字を除く5文字 & 「いう」 & 「い」 \\
+最初の2文字を除く4文字 & 「いう」 & 「い」 \\
+最初の3文字を除く3文字 & 「いう」 & 「い」 \\
+最初の4文字を除く2文字 & 「う」 & 「い」 \\
+最初の5文字を除く1文字 & 「う」 & 「い」
+\end{tabular}
+\end{minipage}
+
+\par\medskip\noindent
+\begin{minipage}{0.45\textwidth}
+\begin{verbatim}
+例4:末尾文字の途中調整(4)
"あいうえお" #-1 #6 substring$
+"あいうえお" #-2 #5 substring$
+"あいうえお" #-3 #4 substring$
+"あいうえお" #-4 #3 substring$
+"あいうえお" #-5 #2 substring$
+"あいうえお" #-6 #1 substring$
\end{verbatim}
\end{minipage}
-\begin{minipage}{0.4\textwidth}
-最後の1文字 = 「お」\par
-最後の2文字 = 「お」\par
-最後の3文字 = 「お」\par
-最後の4文字 = 「えお」\par
-最後の5文字 = 「えお」\par
-最後の6文字 = 「えお」
-\end{minipage}\par\medskip
+\begin{minipage}{0.5\textwidth}
+\begin{tabular}{lll}
+ & \pBibTeX & \upBibTeX \\
+最後の6文字 & 「うえお」 & 「えお」 \\
+最後の1文字を除く5文字 & 「うえ」 & 「え」 \\
+最後の2文字を除く4文字 & 「うえ」 & 「え」 \\
+最後の3文字を除く3文字 & 「うえ」 & 「え」 \\
+最後の4文字を除く2文字 & 「う」 & 「え」 \\
+最後の5文字を除く1文字 & 「う」 & 「え」
+\end{tabular}
+\end{minipage}
+
+\par\medskip
+\begin{dangerous}
+ (u)\pBibTeX~j0.33 (\TeX~Live 2021)以前の|substring$|では,
+ オリジナルの\JBibTeX と同様,上記のうち調整(1)と(2)しか
+ 行っていなかった.すなわち「開始位置や終了位置が多バイトの文字の
+ 途中となる場合は,位置を調整して\emph{常に長めに切り出す}」という
+ 仕様であった.しかし,これでは
+\begin{verbatim}
+"(あいうえお" #2 global.max$ substring$ % 最初の1文字を除去したい
+"あいうえお)" #-2 global.max$ substring$ % 最後の1文字を除去したい
+\end{verbatim}
+ のような場合に文字を除去できず,例えば「|while$|ループ内で
+ |substring$|関数により文字列を1つずつ切り詰めて短くする処理」に
+ 和文文字リテラルが渡ると文字列が一向に短くならず,
+ 無限ループが起きてしまっていた\cite{tjb133}.
+ そこで,(u)\pBibTeX~j0.34 (\TeX~Live 2022)以降は調整(3)と(4)を加え,
+ \emph{カウント起点が「先頭の多バイト文字の途中」または「末尾の多バイト文字の
+ 途中」の場合に限って取り除くことで短めに切り出す}こととした.
+ なお,カウント終点側の多バイト文字については常に長めに切り出すし,
+ カウント起点が先頭でも末尾でもない多バイト文字の場合は長めに切り出す
+ という点は従来と同じである.上記の例を見るのが早いであろう.
+\end{dangerous}
\subsection{文字種が増えたことへの対応}
@@ -242,9 +335,54 @@
\end{itemize}
\end{itemize}
-(u)\pBibTeX 用のスタイルファイルでは,しばしば
+(u)\pBibTeX 用のスタイルファイルでは,しばしば著者名のフォーマットで
「日本人の姓名の間にはスペースを入れない」という挙動を実現するために
-|is.kanji.str$|関数が実用されている.
+|is.kanji.str$|関数が実用されているし,
+他にも``, et~al.''の代わりに「ほか」としたり``Vol.~2''の代わりに「第2巻」と
+したりといったローカライズにも多用されている.
+
+\begin{dangerous}
+ |is.kanji.str$|について,\pBibTeX は松井氏の\JBibTeX の仕様を踏襲している.
+ \upBibTeX のバージョンu1.27以降では上記の調整を行っているが,これは
+ \begin{itemize}
+ \item |is.kanji.str$|が「日本語文字」が
+ \emph{最低1つでも含まれていれば}真となること
+ \item 各種スタイルファイルで「著者名の文字列について
+ |is.kanji.str$|が真ならば姓名の間にスペースを入れないという
+ 使われ方が多いこと
+ \end{itemize}
+ を踏まえたものである.少なくともラテン文字(15)はASCIIの範囲(0--127)に
+ 収まらないが欧文扱いされたほうが都合がよいし,
+ さもないとErwin Schrödingerのような姓名の間のスペースが失われてしまう.
+ また,記号類(18)の一部は欧文の文脈で使われる可能性もある\footnote{さらに言えば
+ ギリシャ文字とキリル文字も一部JIS~X~0208に含まれ,(u)\pTeX の既定で和文扱い
+ される(いわゆる全角文字である)し,\upTeX での\.{kcatcode}はともに18で
+ 記号類と同じ扱いである(ちなみに\pTeX ではギリシャ文字は17,キリル文字は18).}.
+ 上記の調整を行うことで,文字列全体で見たときに「日本語の文脈なら真,
+ そうでなければ偽」となるので都合がよいという算段である.
+ なお,漢字・かな・ハングルの文字で真としているのは,日本人・中国人・韓国人の
+ 姓名の間にはスペースを入れない記法がよく行われることに依る.
+\end{dangerous}
+
+\subsection{その他詳細}\label{sec:jnewline}
+
+(u)\pBibTeX は,文献データベース(BIBファイル)を読み込んで文献リスト(BBLファイル)を
+出力するが,ファイルの行末の扱いは以下のとおりである.% r62001 (2022-02-08)
+\begin{itemize}
+ \item \emph{入力BIBファイル内}の改行は,(u)\pBibTeX では一律に半角空白と同様に扱われる.
+ すなわち,(u)\pTeX とは異なり\emph{日本語文字直後の改行も半角空白と等価である}.
+ \item \emph{BBLファイルの出力時}に,長いエントリを一行に出力するか複数行に分割するか決定
+ する場面において,オリジナルの\BibTeX は任意の半角空白を分割可能箇所とみなす
+ \footnote{\BibTeX~0.99c以前では半角空白以外の箇所も行末に\code{\%}を補って改行された
+ が,2010年の0.99dでURLなどの長い文字列を壊さないように半角空白以外での分割が
+ 禁止された.}が,(u)\pBibTeX~j0.34 (\TeX~Live 2022)以降は\emph{日本語文字の直後でない
+ 半角空白のみを分割可能箇所とみなす}.これは,元々BIBファイルにあった日本語文字直後の
+ 半角空白が仮にBBLファイルで改行に置換されれば,(u)\pTeX での読込時に「日本語文字直後の
+ 改行は空白を発生しない」という仕様により半角空白が消えてしまうためである\cite{tjb132}.
+ % ここでの「日本語文字」は\pBibTeX/\upBibTeX ともに単に「ASCIIの範囲(0--127)に
+ % 収まらない文字」としている(\upBibTeX でも|is.kanji.str$|のような調整は行わないし
+ % 敢えて改行を増やす必要はない).
+\end{itemize}
\section{コマンドラインオプション}
@@ -279,12 +417,16 @@
\item 2002年,アスキーにより|-kanji|オプションの追加 → \JBibTeX~0.33
\item 2009年,日本語\TeX 開発コミュニティが\JBibTeX をフォークし,\pBibTeX に改名
\item 2010年,\pBibTeX が\pTeX とともに\TL へ収録される.のちに\BibTeX~0.99d対応
+ \item 2012年,\upBibTeX が\upTeX とともに\TL へ収録される.
+ \item 2022年,出力BBLファイルでの行分割の改良(第\ref{sec:jnewline}節を参照)\\
+ |substring$|関数の改良(第\ref{sec:substring}節を参照) → \pBibTeX~j0.34
\end{itemize}
\JBibTeX は当初NTT \JTeX と組み合わせて使用することを想定して開発されたため,
文字コードに関する扱いにNTT \JTeX 由来のものが多かった.
-具体的には以下の機能があったが,コマンド名が|jbibtex|から|pbibtex|(\pTeX と同じ接頭辞)
-に改名された2009年に削除されている\cite{ptexlive}:
+これらはコマンド名が|jbibtex|から|pbibtex|(\pTeX と同じ接頭辞)
+に改名された2009年に削除された\cite{ptexlive}ため,\pBibTeX は\JBibTeX と
+以下の点で異なっている:
\begin{itemize}
\item JISコードにおいて日本語文字コード開始・終了を示す
種々のエスケープ・シーケンス(|ESC$@|と|ESC$B|,|ESC(J|と|ESC(B|など)を区別しない.
@@ -308,6 +450,12 @@
\bibitem{tjb109} Haruhiko Okumura,「upbibtexで名と姓の間のスペースが消える」,
2020/10/11,\\
\url{https://github.com/texjporg/tex-jp-build/issues/109}
+ \bibitem{tjb132} Hironobu Yamashita,「(u)pbibtexで和文文字直後の半角スペースで改行が起きる」,
+ 2022/02/07,\\
+ \url{https://github.com/texjporg/pbibtex-manual/issues/1}
+ \bibitem{tjb133} Hironobu Yamashita,「(u)pbibtex: freeze at en-dash etc. + sieicej.bst」,
+ 2022/02/19,\\
+ \url{https://github.com/texjporg/tex-jp-build/issues/133}
\end{thebibliography}
\end{document}
diff --git a/indexing/hsindex/HsIndex.cabal b/indexing/hsindex/HsIndex.cabal
new file mode 100644
index 0000000000..afe8e5c183
--- /dev/null
+++ b/indexing/hsindex/HsIndex.cabal
@@ -0,0 +1,58 @@
+-- Initial classement-multi.cabal generated by cabal init. For further
+-- documentation, see http://haskell.org/cabal/users-guide/
+-- cabal install --global
+name: HsIndex
+-- PVP summary: +-+------- breaking API changes
+-- | | +----- non-breaking API additions
+-- | | |
+version: 0.12.0
+synopsis: A program to generate indexes for LaTeX
+-- description:
+homepage: www.jeanjoux.fr
+license: GPL-3
+license-file: LICENSE
+author: Jean-Luc JOULIN
+maintainer: Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- copyright:
+-- category:
+build-type: Simple
+cabal-version: >=1.8
+
+
+library
+ hs-source-dirs: src
+ exposed-modules:
+ HsIndex.Types
+ , HsIndex.Sorting
+ , HsIndex.Show
+ , HsIndex.Parser
+ , HsIndex.Functions
+ , HsIndex.Files
+ , HsIndex.CharLists.English
+ , HsIndex.CharLists.French
+ , HsIndex.CharLists.German
+ , HsIndex.CharLists.Russian
+ , HsIndex.CharLists.Symbols
+ , HsIndex.CharLists.Substitutions
+
+ build-depends: base > 4.5
+ , parsec > 3.1
+ , directory
+ , transformers
+ , text
+
+
+executable hsindex
+ hs-source-dirs: src
+ main-Is: hsindex.hs
+ other-modules:
+ build-depends: base > 4.5
+ , parsec > 3.1
+ , cmdargs > 0.9
+ , directory
+ , transformers
+ , text
+
+
+
+
diff --git a/indexing/hsindex/LICENSE b/indexing/hsindex/LICENSE
new file mode 100644
index 0000000000..6fdf4aa7f2
--- /dev/null
+++ b/indexing/hsindex/LICENSE
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ HsIndex
+ Copyright (C) 2019-2020 Jean-Luc JOULIN
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ HsIndex Copyright (C) 2019-2020 Jean-Luc JOULIN
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/indexing/hsindex/README b/indexing/hsindex/README
new file mode 100644
index 0000000000..d18cf480ab
--- /dev/null
+++ b/indexing/hsindex/README
@@ -0,0 +1,150 @@
+ _ _ _____ _____ __ __
+ | | | | |_ _| | __ \ \ \ / /
+ | |__| |___ | | _ __ | | | | ___ \ V /
+ | __ / __| | | | '_ \| | | |/ _ \ > <
+ | | | \__ \_| |_| | | | |__| | __// . \
+ |_| |_|___/_____|_| |_|_____/ \___/_/ \_\
+
+ Copyright (c) 2018-2020 Jean-Luc JOULIN <jeanjoux@orange.fr>
+
+
+HsIndeX is a general purpose index generator for LaTeX and XeTeX. This release contains the binary of version 0.11.1 and this README file
+
+
+
+USAGE
+=====
+The usage of HsIndex is the same as "makeindex", it must be used after the first compilation of you LaTeX documents with "imakeidx" package and before the second pass.
+
+Basic usage
+-----------
+
+A english index can be generated with :
+
+>>> hsindex english -i input.idx -o output.ind
+
+A French index can be generated with :
+
+>>> hsindex french -i input.idx -o output.ind
+
+
+Advanced usage
+--------------
+
+A custom style can be provided with:
+
+>>> hsindex english --style="myindexstyle.sty" --input=input.idx --output=output.ind
+
+A custom language definition can be used with:
+
+
+>>> hsindex custom --def="mylanguage.def" --style="myindexstyle.sty" --input=input.idx --output=output.ind
+
+Successives pages numbers can be converted into ranges with the option --range. 3 or more succesives pages numbers will be converted into a range using a specific delimiter.
+
+>>> hsindex english --range --style="myindexstyle.sty" --input=input.idx --output=output.ind
+
+Style file
+==========
+
+A style file is composed with several tags containing the LaTeX commands to be executed at specific locations of the index. The tags are almost the same than the "makeindex" program with a few exceptions.
+
+This is the standard style implemented in the hsindex program.
+
+
+Tags setting the beginning and the end of the index.
+
+>>> preamble "\begin{theindex}\\n"
+>>> postamble "\\n\\n\end{theindex}\\n"
+
+
+Tags setting the first layer letters heading (First letter) The "headings_flag" is a bit different from "makeindex" in the where it can be set to :
+ 0 or None : No heading showed
+ 1 or UpperCase : First letter in upper case.
+-1 or LowerCase : First letter in lower case.
+
+>>> headings_flag UpperCase
+>>> heading_prefix "{\vspace{1.5cm}\huge{\textbf{"
+>>> heading_suffix "}}\hfill}\\nopagebreak\\n"
+
+
+
+Tags setting the second layer letters heading (Two first letters) These tags don't exist with "makeindex":
+
+>>> headings_flag1 None
+>>> heading_prefix1 ""
+>>> heading_suffix1 ""
+
+
+Tags to set the title of the Symbol and Number sections:
+
+>>> symhead_positive "Symbols"
+>>> numhead_positive "Numbers"
+
+Tags to set the skip between two group of items of the same layer.
+The "group_skip1" don't exist in "makeindex":
+>>> group_skip "\\n \indexspace\\n" -- "\\n\\n \indexspace\\n"
+>>> group_skip1 ""
+
+
+The following tags are used to define the LaTeX commands to declare items, subitems and subsubitems:
+>>> item_0 "\\n \item "
+>>> item_1 "\\n \subitem "
+>>> item_2 "\\n \subsubitem "
+>>> item_01 "\\n \subitem "
+>>> item_12 "\\n \subsubitem "
+
+The following tags are used to define the delimiters betwen items and pages numbers:
+>>> delim_0 ", " -- \hfill
+>>> delim_1 ", "
+>>> delim_2 ", "
+>>> delim_n ", "
+
+
+
+Language file
+=============
+
+The language file allow the user to define a new language and its custom letters order and substitutions.
+
+
+The LETTERS section allow the user to give the list of characters considered as letters and their sorting order. This section is mandatory.
+
+>>> LETTERS
+>>> abcdefghijklmnopqrstuvwxyz
+
+
+The NUMBERS section allow the user to give the list of characters considered as numbers and their sorting order. This section is optional.
+
+>>> NUMBERS
+>>> 0123456789
+
+The SYMBOLS section allow the user to give the list of characters considered as symbols and their sorting order. This section is optional.
+
+>>> SYMBOLS
+>>> ~*@&
+
+The SUBSTITUTIONS section define the characters substitutions to perform. These substitutions are taken into consideration to sort and classify the items. The substituions bellow means that th "œ" character will be replaced by "oe", the accentuated "ê" and "é" will be treated as an "e" and the "_" and "-" will be treated as a space " ".
+
+>>> SUBSTITUTIONS
+>>> œ->oe
+>>> ê->e
+>>> é->e
+>>> _->
+>>> -->
+
+
+Feedback and improvement
+========================
+
+If you whish to improve this program and add languages or features, this project is available on gitlab :
+
+https://gitlab.com/JeanJouX/hsindex
+
+I hope this program will be usefull for you !
+
+
+
+
+
+
diff --git a/indexing/hsindex/README.md b/indexing/hsindex/README.md
new file mode 100644
index 0000000000..1452a0157d
--- /dev/null
+++ b/indexing/hsindex/README.md
@@ -0,0 +1,7 @@
+# HsIndex
+
+**HsIndex** is an index generator for **LaTeX**, **XeLaTeX** written with **Haskell**.
+
+It parse **imakeidx** *.idx files and generate *.ind LaTeX index files.
+
+This an alternative to **xindy**. \ No newline at end of file
diff --git a/indexing/hsindex/src/HsIndex/CharLists/English.hs b/indexing/hsindex/src/HsIndex/CharLists/English.hs
new file mode 100644
index 0000000000..27adf8186e
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/English.hs
@@ -0,0 +1,34 @@
+-- |
+-- Module : HsIndex.CharLists.English
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The letters, numbers and symbol definition for the english language.
+
+
+module HsIndex.CharLists.English where
+
+import HsIndex.Types
+import HsIndex.Functions
+import HsIndex.CharLists.Symbols
+import HsIndex.CharLists.French
+
+
+
+ordEnglish = lstLatinLetter
+
+ordEnglishUpperLower = upperLower lstLatinLetter
+
+
+-- |
+langDefEnglish :: LangDef
+langDefEnglish = LangDef
+ { lstLetters = lstSpace ++ ordEnglishUpperLower
+ , lstNumbers = lstDigit
+ , lstSymbols = Nothing
+ , lstSubs = subsFrenchUpperLower++subsSymb
+ , lstSecOrder = [Symbols, Numbers, Letters]
+ }
+
diff --git a/indexing/hsindex/src/HsIndex/CharLists/French.hs b/indexing/hsindex/src/HsIndex/CharLists/French.hs
new file mode 100644
index 0000000000..a2b54e0a54
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/French.hs
@@ -0,0 +1,108 @@
+-- |
+-- Module : HsIndex.CharLists.French
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The letters, numbers and symbol definition for the french language.
+
+
+module HsIndex.CharLists.French where
+
+import HsIndex.Functions
+import HsIndex.CharLists.Symbols
+import HsIndex.Types
+
+lstSubsLatin = take 1
+
+
+ordFrench = lstLatinLetter
+
+ordFrenchUpperLower = upperLower lstLatinLetter
+
+
+
+
+lstLatinLetter =
+ [ 'a'
+ , 'b'
+ , 'c'
+ , 'd'
+ , 'e'
+ , 'f'
+ , 'g'
+ , 'h'
+ , 'i'
+ , 'j'
+ , 'k'
+ , 'l'
+ , 'm'
+ , 'n'
+ , 'o'
+ , 'p'
+ , 'q'
+ , 'r'
+ , 's'
+ , 't'
+ , 'u'
+ , 'v'
+ , 'w'
+ , 'x'
+ , 'y'
+ , 'z'
+ ]
+
+
+subsFrenchUpperLower = replaUpperLower subsFrench
+
+
+
+
+subsFrench =
+ [ ('à', "a")
+ , ('â', "a")
+ , ('å', "a")
+ , ('ä', "a")
+
+ , ('ç', "c")
+
+ , ('é', "e")
+ , ('è', "e")
+ , ('ê', "e")
+ , ('ë', "e")
+
+ , ('î', "i")
+ , ('ï', "i")
+
+ , ('ô', "o")
+ , ('ö', "o")
+
+ , ('ù', "u")
+ , ('û', "u")
+ , ('ü', "u")
+
+
+ , ('æ', "ae")
+ , ('œ', "oe")
+ ]
+
+
+subsSymb =
+ [ ('-', " ")
+ , ('_', " ")
+ , ('\\', " ")
+ ]
+
+
+
+langDefFrench = LangDef
+ { lstLetters = lstSpace ++ ordFrenchUpperLower -- ++ (map substituted subsFrenchUpperLower)
+ , lstNumbers = lstDigit
+ , lstSymbols = Nothing
+ , lstSubs = subsFrenchUpperLower++subsSymb
+ , lstSecOrder = [Symbols, Numbers, Letters]
+ }
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/CharLists/German.hs b/indexing/hsindex/src/HsIndex/CharLists/German.hs
new file mode 100644
index 0000000000..cb7df65686
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/German.hs
@@ -0,0 +1,76 @@
+-- |
+-- Module : HsIndex.CharLists.German
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The letters, numbers and symbol definition for the german language.
+
+
+module HsIndex.CharLists.German where
+
+
+import HsIndex.Functions
+import HsIndex.Types
+import HsIndex.CharLists.Symbols
+import HsIndex.CharLists.French ( lstLatinLetter )
+
+
+
+ordGerman = lstLatinLetter
+
+ordGermanLowerUpper = lowerUpper lstLatinLetter
+
+lstGermanLetter =
+ [ 'a'
+ , 'b'
+ , 'c'
+ , 'd'
+ , 'e'
+ , 'f'
+ , 'g'
+ , 'h'
+ , 'i'
+ , 'j'
+ , 'k'
+ , 'l'
+ , 'm'
+ , 'n'
+ , 'o'
+ , 'p'
+ , 'q'
+ , 'r'
+ , 's'
+ , 'ß'
+ , 't'
+ , 'u'
+ , 'v'
+ , 'w'
+ , 'x'
+ , 'y'
+ , 'z'
+ ]
+
+
+charSubsGerman =
+ [ ('æ', "ae")
+ , ('ä', "a")
+ , ('ö', "o")
+ , ('ß', "ss")
+ , ('ü', "u")
+ ]
+
+
+
+
+langDefGerman = LangDef
+ { lstLetters = lstSpace ++ ordGermanLowerUpper -- ++ map substituted charSubsGerman
+ , lstNumbers = lstDigit
+ , lstSymbols = Nothing
+ , lstSubs = charSubsGerman
+ , lstSecOrder = [Symbols, Letters, Numbers]
+ }
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/CharLists/Russian.hs b/indexing/hsindex/src/HsIndex/CharLists/Russian.hs
new file mode 100644
index 0000000000..1e9c3c96dc
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/Russian.hs
@@ -0,0 +1,73 @@
+-- |
+-- Module : HsIndex.CharLists.Russian
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The letters, numbers and symbol definition for the russian language.
+
+
+module HsIndex.CharLists.Russian where
+
+import HsIndex.Functions
+import HsIndex.Types
+import HsIndex.CharLists.Symbols
+
+ordRussian = lstCyrillic
+
+ordRussianUpperLower = upperLower lstCyrillic
+
+-- | List of cyrillic characters.
+lstCyrillic =
+ [ 'а'
+ , 'б'
+ , 'в'
+ , 'г'
+ , 'д'
+ , 'е'
+ , 'ё'
+ , 'ж'
+ , 'з'
+ , 'и'
+ , 'й'
+ , 'к'
+ , 'л'
+ , 'м'
+ , 'н'
+ , 'о'
+ , 'п'
+ , 'р'
+ , 'с'
+ , 'т'
+ , 'у'
+ , 'ф'
+ , 'х'
+ , 'ц'
+ , 'ч'
+ , 'ш'
+ , 'щ'
+ , 'ъ'
+ , 'ы'
+ , 'ь'
+ , 'э'
+ , 'ю'
+ , 'я'
+ ]
+
+
+
+
+
+lettersRussian = lstCyrillic
+
+langDefRussian = LangDef
+ { lstLetters = lstSpace ++ ordRussianUpperLower
+ , lstNumbers = lstDigit
+ , lstSymbols = Nothing
+ , lstSubs = []
+ , lstSecOrder = [Symbols, Numbers, Letters]
+ }
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/CharLists/SubsIEC.hs b/indexing/hsindex/src/HsIndex/CharLists/SubsIEC.hs
new file mode 100644
index 0000000000..33813a6ce8
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/SubsIEC.hs
@@ -0,0 +1,128 @@
+-- |
+-- Module : HsIndex.CharLists.SubsIEC
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The list of imakeidx IEC substitution hard-coded for all languages.
+
+
+module HsIndex.CharLists.SubsIEC where
+
+
+-- | List of characters substitutions for parsing the 'imakeindex' output file.
+lstLaTeXSubs =
+ [ ("'e" , 'é')
+ , ("`e" , 'è')
+ , ("^e" , 'ê')
+ , ("\"e" , 'ë')
+ , ("`a" , 'à')
+ , ("^a" , 'â')
+ , ("\"a" , 'ä')
+ , ("\"\\i" , 'ï')
+ , ("^\\i " , 'î')
+ , ("^u" , 'û')
+ , ("\"u" , 'ü')
+ , ("^o" , 'ô')
+ , ("\"o" , 'ö')
+ , ("'E" , 'É')
+ , ("`E" , 'È')
+ , ("^E" , 'Ê')
+ , ("\"E" , 'Ë')
+ , ("`A" , 'À')
+ , ("^A" , 'Â')
+ , ("\"A" , 'Ä')
+ , ("\"\\I" , 'Ï')
+ , ("^\\I " , 'Î')
+ , ("^U" , 'Û')
+ , ("\"U" , 'Ü')
+ , ("^O" , 'Ô')
+ , ("\"O" , 'Ö')
+ , ("r a" , 'å')
+ , ("ae" , 'æ')
+ , ("oe" , 'œ')
+ , ("c c" , 'ç')
+ , ("ss" , 'ß')
+ , ("r A" , 'Å')
+ , ("AE" , 'Æ')
+ , ("OE" , 'Œ')
+ , ("cyra" , 'а')
+ , ("cyrb" , 'б')
+ , ("cyrv" , 'в')
+ , ("cyrg" , 'г')
+ , ("cyrd" , 'д')
+ , ("cyre" , 'е')
+ , ("cyryo" , 'ё')
+ , ("cyrzh" , 'ж')
+ , ("cyrz" , 'з')
+ , ("cyri" , 'и')
+ , ("cyrishrt", 'й')
+ , ("cyrk" , 'к')
+ , ("cyrl" , 'л')
+ , ("cyrm" , 'м')
+ , ("cyrn" , 'н')
+ , ("cyro" , 'о')
+ , ("cyrp" , 'п')
+ , ("cyrr" , 'р')
+ , ("cyrs" , 'с')
+ , ("cyrt" , 'т')
+ , ("cyru" , 'у')
+ , ("cyrf" , 'ф')
+ , ("cyrh" , 'х')
+ , ("cyrc" , 'ц')
+ , ("cyrch" , 'ч')
+ , ("cyrsh" , 'ш')
+ , ("cyrshch" , 'щ')
+ , ("cyrhrdsn", 'ъ')
+ , ("cyrery" , 'ы')
+ , ("cyrsftsn", 'ь')
+ , ("cyrerev" , 'э')
+ , ("cyryu" , 'ю')
+ , ("cyrya" , 'я')
+ , ("CYRA" , 'А')
+ , ("CYRB" , 'Б')
+ , ("CYRV" , 'В')
+ , ("CYRG" , 'Г')
+ , ("CYRD" , 'Д')
+ , ("CYRE" , 'Е')
+ , ("CYRYO" , 'Ё')
+ , ("CYRZH" , 'Ж')
+ , ("CYRZ" , 'З')
+ , ("CYRI" , 'И')
+ , ("CYRISHRT", 'Й')
+ , ("CYRK" , 'К')
+ , ("CYRL" , 'Л')
+ , ("CYRM" , 'М')
+ , ("CYRN" , 'Н')
+ , ("CYRO" , 'О')
+ , ("CYRP" , 'П')
+ , ("CYRR" , 'Р')
+ , ("CYRS" , 'С')
+ , ("CYRT" , 'Т')
+ , ("CYRU" , 'У')
+ , ("CYRF" , 'Ф')
+ , ("CYRH" , 'Х')
+ , ("CYRC" , 'Ц')
+ , ("CYRCH" , 'Ч')
+ , ("CYRSH" , 'Ш')
+ , ("CYRSHCH" , 'Щ')
+ , ("CYRHRDSN", 'Ъ')
+ , ("CYRERY" , 'Ы')
+ , ("CYRSFTSN", 'Ь')
+ , ("CYREREV" , 'Э')
+ , ("CYRYU" , 'Ю')
+ , ("CYRYA" , 'Я')
+
+
+ , ("textquoteleft" , '‘')
+ , ("textquoteright" , '’')
+ , ("nobreakspace" , ' ')
+
+
+ ]
+
+
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/CharLists/Symbols.hs b/indexing/hsindex/src/HsIndex/CharLists/Symbols.hs
new file mode 100644
index 0000000000..813bacfbde
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/CharLists/Symbols.hs
@@ -0,0 +1,30 @@
+-- |
+-- Module : HsIndex.CharLists.Symbols
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The list of symbols for all languages.
+
+
+module HsIndex.CharLists.Symbols where
+
+
+-- | Allowed symbols.
+allowedSymb = " &~\"'()[]{}<>*+/`^#@°=$£µ%§:;.,?"
+
+-- | Forbidden symbols.
+--
+-- These symbols
+forbiddenSymb = "!|\n\r" -- "!|{}\n\r"
+
+-- | The hyphens symbols.
+lstHyph = "-_"
+
+-- | List of digits.
+lstDigit = "0123456789"
+
+lstSpace = " "
+
+
diff --git a/indexing/hsindex/src/HsIndex/Files.hs b/indexing/hsindex/src/HsIndex/Files.hs
new file mode 100644
index 0000000000..5f1d15c3ea
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Files.hs
@@ -0,0 +1,156 @@
+--
+-- GNU General Public License (GPLv3)
+--
+-- THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) “AS IS” AND ANY EXPRESS OR
+-- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+-- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+-- IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+-- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+-- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+-- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+-- ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-- |
+-- Module : HsIndex.Files
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- Module for reading input and style files.
+--
+-- This module also provide the function to write output file.
+--
+
+
+
+
+module HsIndex.Files
+ (
+ -- * Read functions
+ readIndexFile
+ , readStyleFile
+ , readDefinitionFile
+ , readAllFile
+
+ -- * Writing function
+ , writeIndex
+ )
+ where
+
+import Data.Char
+import HsIndex.Functions
+import HsIndex.Show
+import HsIndex.Parser
+import HsIndex.Types
+import Text.Parsec
+import Text.Parsec.String
+import System.Directory ( doesFileExist )
+import qualified Data.Text as T
+import qualified Data.Text.IO as T
+import Data.Functor.Identity
+
+
+-- | Read an index input file.
+readIndexFile :: FilePath -- ^ The path to the index file.
+ -> ParsecT String () Identity t -- ^ The parser to apply on the file to extract datas.
+ -> (t -> IO ()) -- ^ List of operations to perform on parsed datas.
+ -> IO ()
+readIndexFile fidx parsfun fun = do
+ e <- doesFileExist fidx
+ if e
+ then do
+ f <- readFile fidx
+ case parse parsfun "(stdin)" f of
+ Left err -> do
+ putStrLn $ "/!\\ ERROR reading Index file : " ++ fidx
+ print err
+ Right resu -> fun resu
+ else
+ putStrLn
+ $ "/!\\ ERROR the Index file : "
+ ++ fidx
+ ++ " does not exist !\n"
+
+
+-- | Read a style input file
+--
+-- If no path is provided for the style file, the standard style 'styleBasic' is applied.
+--
+readStyleFile :: IndexType -- ^ The type of style.
+ -> (IndexStyle -> IO ()) -- ^ Operations to apply with the parsed style.
+ -> IO ()
+readStyleFile StyleBasic fun = do
+ putStrLn "Using the default basic style"
+ fun styleBasic
+
+readStyleFile StyleDouble fun = do
+ putStrLn "Using the default double letters style"
+ fun styleDoubleHeading
+
+
+
+readStyleFile (Stylecustom fsty) fun = do
+ e <- doesFileExist fsty
+ if e
+ then do
+ f <- readFile fsty
+ case parse (parseStyleFile styleBasic) "(stdin)" f of
+ Left err -> do
+ putStrLn $ "/!\\ ERROR reading Style file : " ++ fsty
+ print err
+ Right resu -> fun resu
+ else
+ putStrLn
+ $ "/!\\ ERROR the Style file : "
+ ++ fsty
+ ++ " does not exist !\n"
+
+
+-- | Read a language definition input file.
+readDefinitionFile :: FilePath -- ^ The path to the definition file.
+ -> (LangDef -> IO ()) -- ^ Operations to apply with the parsed style.
+ -> IO ()
+readDefinitionFile fdef fun = do
+ e <- doesFileExist fdef
+ if e
+ then do
+ f <- readFile fdef
+ case runParser (parseLanguageFile) emptyPermState "(stdin)" f of
+ Left err -> do
+ putStrLn $ "/!\\ ERROR reading Definition file : " ++ fdef
+ print err
+ Right resu -> fun resu
+ else
+ putStrLn
+ $ "/!\\ ERROR the Definition file : "
+ ++ fdef
+ ++ " does not exist !\n"
+
+
+-- | Read both an index input file and style file.
+--
+-- If no path is provided for the style file, the standard style 'styleBasic' is applied.
+--
+readAllFile :: FilePath -- ^ The path to the index file.
+ -> IndexType -- ^ The type of index.
+ -> ParsecT String () Identity t -- ^ The parser to apply on the index file.
+ -> (t -> IndexStyle -> IO ()) -- ^ Operations to apply with the parsed index data and style.
+ -> IO ()
+readAllFile fidx mbfsty parsfun fun =
+ readIndexFile fidx parsfun (readStyleFile mbfsty . fun)
+
+
+-- | Write the sorted entries in a output file with the format provided in the `IndexStyle`.
+writeIndex :: FilePath -- ^ The path to the output file
+ -> IndexStyle -- ^ The style file.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> Index -- ^ The index.
+ -> IO ()
+writeIndex file style rng sec = do
+ putStrLn $ "Writing index to File : " ++ file
+ T.writeFile file $ showIndex style rng sec
+
+
diff --git a/indexing/hsindex/src/HsIndex/Functions.hs b/indexing/hsindex/src/HsIndex/Functions.hs
new file mode 100644
index 0000000000..344a1c515e
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Functions.hs
@@ -0,0 +1,206 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- |
+-- Module : HsIndex.Files
+-- Copyright : Jean-Luc JOULIN 2018-2020
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- This module provide miscellaneous functions for comparing
+-- and cutting list of IndexItem
+
+
+
+
+module HsIndex.Functions (
+ splitIndex
+ , concatPagesItems
+ , substituteCharInString
+ -- ~ , upperLower
+ , upperLower
+ , lowerUpper
+ , replaUpper
+ , substituted
+ , literalNewLine
+ , replaUpperLower
+ , sepArobase
+ ) where
+
+
+import HsIndex.Types
+import Data.List
+import Data.Char
+import HsIndex.Show
+import qualified Data.Text as T
+
+
+-- | Convert a list of 'IndexItem's into an 'Index' by splitting the liste
+-- according to the first letter of the equivalent name and section (layer 1).
+--
+-- The input list of 'IndexItem' must be sorted with 'sortItems' before
+-- using this function.
+--
+splitIndex :: IndexStyle -- ^ The style of the 'Index'.
+ -> [IndexItem] -- ^ List of 'IndexItem's to sort in a 'Index'.
+ -> Index -- ^ The final index.
+splitIndex style [] = []
+splitIndex style lst@(x : xs) = if null d
+ then splitIndex style f
+ else IndexSection tit (splitIndex' style d) : splitIndex style f
+ where
+ -- ~ (d, f) = span (\c -> areItemsEqual False (itemEqui c) (itemEqui x)) lst
+ (d, f) = partition (\c -> areItemsEqual False (itemEqui c) (itemEqui x)) lst
+ tit = showHeading1 style (itemEqui (head d))
+
+
+-- | Test if layer 1 equivalent names of two items are equals.
+areItemsEqual :: Bool -- ^ Test is Case sensitive
+ -> (Section, T.Text) -- ^ First equivalent name to compare.
+ -> (Section, T.Text) -- ^ Second equivalent name to compare.
+ -> Bool
+areItemsEqual True (Letters, a) (Letters, b) = T.take 1 a == T.take 1 b -- Test if the first letters are the same (Case sensitive)
+areItemsEqual False (Letters, a) (Letters, b) = T.toUpper (T.take 1 a) == T.toUpper (T.take 1 b) -- Test if the first letters are the same (Case sensitive)
+areItemsEqual _ (Numbers, a) (Numbers, b) = True -- Numbers are always number in L1
+areItemsEqual _ (Symbols, a) (Symbols, b) = True -- Symbols are always symbols in L1
+areItemsEqual _ _ _ = False
+
+
+-- | Convert a list of 'IndexItem's into an 'Index' by splitting the liste
+-- according to the first two letters of the equivalent name and section (layer 2).
+--
+-- The input list of 'IndexItem' must be sorted with 'sortItems' before
+-- using this function.
+--
+splitIndex' :: IndexStyle -- ^ The style of the 'Index'.
+ -> [IndexItem] -- ^ List of 'IndexItem's to sort in a 'Index'.
+ -> [IndexSubSection]
+splitIndex' style [] = []
+splitIndex' style lst@(x : xs) = if null d
+ then splitIndex' style f
+ else IndexSubSection tit d : splitIndex' style f
+ where
+ -- ~ (d, f) = span (\c -> areItemsEqual' False (itemEqui c) (itemEqui x)) lst
+ (d, f) = partition (\c -> areItemsEqual' False (itemEqui c) (itemEqui x)) lst
+ tit = showHeading2 style (itemEqui (head d))
+
+
+-- | Test if layer 2 equivalent names of two items are equals.
+areItemsEqual' True (Letters, a) (Letters, b) = T.take 2 a == T.take 2 b -- Test if the two first letters are the same (Case sensitive)
+areItemsEqual' True (Numbers, a) (Numbers, b) = T.take 1 a == T.take 1 b -- Test if the first numbers are the same (Case sensitive)
+areItemsEqual' True (Symbols, a) (Symbols, b) = T.take 1 a == T.take 1 b -- Test if the first symbols are the same (Case sensitive)
+areItemsEqual' False (Letters, a) (Letters, b) = T.toUpper (T.take 2 a) == T.toUpper (T.take 2 b) -- Test if the two first letters are the same (Case insensitive)
+areItemsEqual' False (Numbers, a) (Numbers, b) = T.toUpper (T.take 1 a) == T.toUpper (T.take 1 b) -- Test if the first numbers are the same (Case insensitive)
+areItemsEqual' False (Symbols, a) (Symbols, b) = T.toUpper (T.take 1 a) == T.toUpper (T.take 1 b) -- Test if the first symbols are the same (Case insensitive)
+areItemsEqual' _ _ _ = False
+
+
+-- | Extract the first letters of a string after letters substitutions.
+firstLetters :: Int
+ -> T.Text
+ -> T.Text
+firstLetters n "" = error "no letters"
+firstLetters n str = T.take n str
+
+
+-- | Substitute the string "\\n" into a String by a '\n' newline character.
+literalNewLine :: T.Text -> T.Text
+literalNewLine str = T.replace (T.pack "\\\\n") (T.pack "\n") str
+
+
+
+-- | Concatenate pages numbers of entries.
+--
+-- Pages numbers are sorted and filtered to get each page number once.
+concatPagesItems :: [IndexItem]
+ -> [IndexItem]
+concatPagesItems [] = []
+concatPagesItems lst@(IndexItem nam equ com pag sub : xs) = IndexItem nam equ com pages subentries : concatPagesItems a
+ where
+ (p, a) = partition (\e -> itemName e == nam) xs
+ pages = nub $ sort $ concat $ pag : map itemPages p
+ subentries = concatPagesSubItems $ concat $ sub : map itemContent p
+
+
+-- | Concatenate pages numbers of subentries.
+--
+-- Pages numbers are sorted and filtered to get each page number once.
+concatPagesSubItems :: [IndexSubItem]
+ -> [IndexSubItem]
+concatPagesSubItems [] = []
+concatPagesSubItems lst@(IndexSubItem nam equ com pag subsub : xs) = IndexSubItem nam equ com pages subsubentries
+ : concatPagesSubItems a
+ where
+ (p, a) = partition (\e -> subItemName e == nam) xs
+ pages = nub $ sort $ concat $ pag : map subItemPages p
+ subsubentries = concatPagesSubSubItems $ concat $ subsub : map subItemContent p
+
+
+-- | Concatenate pages numbers of subsubentries.
+--
+-- Pages numbers are sorted and filtered to get each page number once.
+concatPagesSubSubItems :: [IndexSubSubItem]
+ -> [IndexSubSubItem]
+concatPagesSubSubItems [] = []
+concatPagesSubSubItems lst@(IndexSubSubItem nam equ com pag : xs) = IndexSubSubItem nam equ com pages
+ : concatPagesSubSubItems a
+ where
+ (p, a) = partition (\e -> subSubItemName e == nam) xs
+ pages = nub $ sort $ concat $ pag : map subSubItemPages p
+
+
+-- | Substitute 'Char's listed in the 'CharSubs' list in a String
+--
+-- >>> substituteCharInString [CharSubs 'œ' "oe"] "oeil"
+--
+substituteCharInString :: [(Char,String)] -- ^ The list of substitutions
+ -> T.Text -- ^ The string where to perform substitutions
+ -> T.Text
+substituteCharInString repl text = replaces repl text
+
+
+-- | Set the substitutions to uppercase.
+replaUpper :: [(Char, String)] -> [(Char, String)]
+replaUpper = map (\(a, b) -> (toUpper a, map toUpper b))
+
+-- | Set the substitutions to lowercase.
+replaLower :: [(Char, String)] -> [(Char, String)]
+replaLower = map (\(a, b) -> (toLower a, map toLower b))
+
+
+
+
+
+upperLower [] = []
+upperLower (x : xs) = toUpper x : toLower x : upperLower xs
+
+
+lowerUpper [] = []
+lowerUpper (x : xs) = toLower x : toUpper x : lowerUpper xs
+
+
+replaUpperLower lst = replaUpper lst ++ replaLower lst
+
+
+substituted (a, b) = a -- TODO A supprimer
+
+
+replaces repl text = foldl (\t (r, s) -> T.replace (T.pack [r]) (T.pack s) t) text repl
+
+
+sepArobase str | null item = (str, "")
+ | otherwise = (tail item, equ)
+ where
+ equ = takeWhile (/= '@') str
+ item = dropWhile (/= '@') str
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/Parser.hs b/indexing/hsindex/src/HsIndex/Parser.hs
new file mode 100644
index 0000000000..35063ab43b
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Parser.hs
@@ -0,0 +1,542 @@
+-- |
+-- Module : HsIndex.Parser
+-- Copyright : Jean-Luc JOULIN 2018-2020
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The parsing functions for the hsindex program.
+
+
+
+module HsIndex.Parser
+ (
+ -- * Parsing the index file
+
+
+ -- * Parsing the style file
+
+
+ -- * Parsing the custom language definition file
+ --
+ -- ** Description of a custom file
+ --
+ -- A custom language can be defined with a specific file.
+ -- This file must respect the following format and contain in any order :
+ --
+ -- 1. A mandatory ordered list of letters describing the alphabet.
+ --
+ -- > LETTERS
+ -- > abcdefghijkl
+ --
+ -- 2. An optional ordered list of numbers.
+ --
+ -- > NUMBERS
+ -- > 0123456789
+ --
+ -- 3. An optional ordered list of symbols.
+ --
+ -- > SYMBOLS
+ -- > 0123456789
+ --
+ -- 4. An optional substitution list. This list describe the character substitutions
+ -- to perform before sorting the words.
+ --
+ -- > SUBSTITUTIONS
+ -- > œ->oe
+ -- > à->a
+ -- > ê->e
+ --
+ -- ** example of custom file
+ --
+ --
+ styleBasic
+ , styleDoubleHeading
+ , parseStyleFile
+ , parseLanguageFile
+ , parseIndexFile
+ , emptyDef
+ ) where
+
+
+import Data.Char
+import Data.Functor.Identity
+import Data.Functor
+import HsIndex.CharLists.French
+import HsIndex.CharLists.Russian
+import HsIndex.CharLists.SubsIEC
+import HsIndex.CharLists.Symbols
+import HsIndex.Functions
+ ( literalNewLine
+ -- ~ , upperLower
+ -- ~ , replaUpperLower
+ , sepArobase
+ )
+import HsIndex.Types
+import qualified Data.Text as T
+import Text.Parsec
+import Text.Parsec.Perm
+import Text.Parsec.Text
+
+
+
+-- | The default 'IndexStyle' applied to an index.
+--
+-- This default style have :
+--
+-- * Basic preamble and postamble
+--
+-- * Uppercase Layer 0 heading
+--
+-- * No Layer 1 heading
+--
+styleBasic = IndexStyle
+ { idxPreamble = T.pack "\\begin{theindex}\n"
+ , idxPostamble = T.pack "\n\n\\end{theindex}\n"
+ , idxHeadingFlag0 = UpperCase
+ , idxHeadingFlag1 = None
+ , idxHeadingPreL0 = T.pack "{\\vspace{1.5cm}\\huge{\\textbf{"
+ , idxHeadingSufL0 = T.pack "}}\\hfill}\\nopagebreak\n"
+ , idxHeadingPreL1 = T.pack "" -- TODO Remplacer par empty
+ , idxHeadingSufL1 = T.pack ""
+ , idxSymhead = T.pack "Symbols"
+ , idxNumhead = T.pack "Numbers"
+ , idxGroupSkip0 = T.pack "\n \\indexspace\n" -- "\n\n \\indexspace\n"
+ , idxGroupSkip1 = T.pack ""
+ , idxItem0 = T.pack "\n \\item "
+ , idxItem1 = T.pack "\n \\subitem "
+ , idxItem2 = T.pack "\n \\subsubitem "
+ , idxItem01 = T.pack "\n \\subitem "
+ , idxItem12 = T.pack "\n \\subsubitem "
+ , idxDelim0 = T.pack ", " -- \\hfill
+ , idxDelim1 = T.pack ", "
+ , idxDelim2 = T.pack ", "
+ , idxDelimn = T.pack ", "
+ , idxDelimr = T.pack "--"
+ , idxEncapPre = T.pack "{"
+ , idxEncapSuf = T.pack "}"
+ }
+
+
+-- | Another 'IndexStyle' applied to an index.
+--
+-- This default style have :
+--
+-- * Basic preamble and postamble
+--
+-- * Uppercase Layer 0 headings
+--
+-- * Uppercase Layer 1 headings
+--
+styleDoubleHeading = IndexStyle
+ { idxPreamble = T.pack "\\begin{theindex}\n"
+ , idxPostamble = T.pack "\n\n\\end{theindex}\n"
+ , idxHeadingFlag0 = UpperCase
+ , idxHeadingFlag1 = UpperCase
+ , idxHeadingPreL0 = T.pack "{\\vspace{1.5cm}\\huge{\\textbf{"
+ , idxHeadingSufL0 = T.pack "}}\\hfill}\\nopagebreak\n\n"
+ , idxHeadingPreL1 = T.pack "\n{\\vspace{0.5cm}\\large{\\textbf{"
+ , idxHeadingSufL1 = T.pack "}}\\hfill}\\nopagebreak"
+ , idxSymhead = T.pack "Symbols"
+ , idxNumhead = T.pack "Numbers"
+ , idxGroupSkip0 = T.pack "\n\n \\indexspace\n"
+ , idxGroupSkip1 = T.pack "\n\n \\indexspace\n"
+ , idxItem0 = T.pack "\n \\item "
+ , idxItem1 = T.pack "\n \\subitem "
+ , idxItem2 = T.pack "\n \\subsubitem "
+ , idxItem01 = T.pack "\n \\subitem "
+ , idxItem12 = T.pack "\n \\subsubitem "
+ , idxDelim0 = T.pack ", " -- \\hfill
+ , idxDelim1 = T.pack ", "
+ , idxDelim2 = T.pack ", "
+ , idxDelimn = T.pack ", "
+ , idxDelimr = T.pack "--"
+ , idxEncapPre = T.pack "{"
+ , idxEncapSuf = T.pack "}"
+ }
+
+
+-- | Parse a style file
+--
+-- A style file can contain several optional keywords definition to set the design
+-- of an index.
+--
+-- Keywords can be :
+--
+-- [preamble] To set the beginning of the index.
+--
+--
+-- [postamble] To set the end of the index.
+--
+parseStyleFile :: IndexStyle -- ^ The default 'Style' to use.
+ -> ParsecT String () Identity IndexStyle -- ^ The new 'Style' parsed.
+parseStyleFile sty = do
+ emptyLines -- Possibles emptylines at the beginning of the file
+ sty <- permute
+ ( IndexStyle -- all possible permutations
+ <$?> (idxPreamble sty , try $ parseStyleDef "preamble") -- Parse the preamble
+ <|?> (idxPostamble sty , try $ parseStyleDef "postamble")
+ <|?> (idxHeadingFlag0 sty, try $ parseStyleDefHead "headings_flag")
+ <|?> (idxHeadingFlag1 sty, try $ parseStyleDefHead "headings_flag1")
+ <|?> (idxHeadingPreL0 sty, try $ parseStyleDef "heading_prefix")
+ <|?> (idxHeadingSufL0 sty, try $ parseStyleDef "heading_suffix")
+ <|?> (idxHeadingPreL1 sty, try $ parseStyleDef "heading_prefix1")
+ <|?> (idxHeadingSufL1 sty, try $ parseStyleDef "heading_suffix1")
+ <|?> (idxSymhead sty , try $ parseStyleDef "symhead_positive")
+ <|?> (idxNumhead sty , try $ parseStyleDef "numhead_positive")
+ <|?> (idxGroupSkip0 sty , try $ parseStyleDef "group_skip")
+ <|?> (idxGroupSkip1 sty , try $ parseStyleDef "group_skip1")
+ <|?> (idxItem0 sty , try $ parseStyleDef "item_0")
+ <|?> (idxItem1 sty , try $ parseStyleDef "item_1")
+ <|?> (idxItem2 sty , try $ parseStyleDef "item_2")
+ <|?> (idxItem01 sty , try $ parseStyleDef "item_01")
+ <|?> (idxItem12 sty , try $ parseStyleDef "item_12")
+ <|?> (idxDelim0 sty , try $ parseStyleDef "delim_0")
+ <|?> (idxDelim1 sty , try $ parseStyleDef "delim_1")
+ <|?> (idxDelim2 sty , try $ parseStyleDef "delim_2")
+ <|?> (idxDelimn sty , try $ parseStyleDef "delim_n")
+ <|?> (idxDelimr sty , try $ parseStyleDef "delim_r")
+ <|?> (idxEncapPre sty , try $ parseStyleDef "encap_infix")
+ <|?> (idxEncapSuf sty , try $ parseStyleDef "encap_suffix")
+
+ )
+ eof -- the end of file
+ return sty
+
+
+-- | Parse many empty lines.
+emptyLines = many emptyLine
+
+
+-- | Parse an empty line.
+emptyLine = do
+ many (oneOf " \t") -- possibly some spaces and tabulations.
+ endOfLineP -- The end of line
+
+
+-- | Parse a style definition
+--
+-- > item_0 "my style definition"
+--
+parseStyleDef :: String -- ^ The name of the style
+ -> ParsecT String () Identity T.Text -- ^ The definition of the style.
+parseStyleDef str = do
+ string str
+ many1 (char ' ')
+ def <- between (char '"') (char '"') (many1 $ noneOf "\r\n\t\"")
+ many (char ' ')
+ endOfLineP
+ emptyLines
+ return (literalNewLine $ T.pack def)
+
+
+
+parseStyleDefHead str = try (parseStyleDefHeadNum str)
+ <|> try (parseStyleDefHeadNone str)
+ <|> try (parseStyleDefHeadUpper str)
+ <|> (parseStyleDefHeadLower str)
+
+
+
+parseStyleDefHeadNone :: String -> ParsecT String () Identity Heading
+parseStyleDefHeadNone str = do
+ string str
+ many1 (char ' ')
+ s <- string "None"
+ many (char ' ')
+ endOfLineP
+ emptyLines
+ return None
+
+
+parseStyleDefHeadUpper :: String -> ParsecT String () Identity Heading
+parseStyleDefHeadUpper str = do
+ string str
+ many1 (char ' ')
+ s <- string "Upper"
+ many (char ' ')
+ endOfLineP
+ emptyLines
+ return UpperCase
+
+
+parseStyleDefHeadLower :: String -> ParsecT String () Identity Heading
+parseStyleDefHeadLower str = do
+ string str
+ many1 (char ' ')
+ s <- string "Lower"
+ many (char ' ')
+ endOfLineP
+ emptyLines
+ return LowerCase
+
+
+parseStyleDefHeadNum :: String -> ParsecT String () Identity Heading
+parseStyleDefHeadNum str = do
+ string str
+ many1 (char ' ')
+ s <- option ' ' (char '-')
+ h <- many1 digit
+ many (char ' ')
+ endOfLineP
+ emptyLines
+ return (val2Heading (read (s : h)))
+
+
+
+val2Heading 0 = None
+val2Heading n = if n > 0
+ then UpperCase
+ else LowerCase
+
+
+-- | Try to parse a IeC LaTeX substitution.
+-- Return the associated character if succeed.
+lstParseIeC lst = try $ do
+ string "\\IeC"
+ many (char ' ')
+ choice $ map (\(s, r) ->
+ (try $ do
+ braces $ do
+ many (char ' ')
+ char '\\'
+ string s
+ many (char ' ')
+ return r
+ )) lst
+
+
+
+
+-- | Parse a number
+parseNumber :: ParsecT String () Identity Char
+parseNumber = try digit
+
+-- | Parse a symbol
+parseSymbol :: ParsecT String () Identity Char
+parseSymbol = try (oneOf allowedSymb)
+
+
+-- | Parse an hyphen character
+parseHyph :: ParsecT String () Identity Char
+parseHyph = try (oneOf lstHyph)
+
+
+parseAnything :: ParsecT String () Identity Char
+parseAnything = try (noneOf forbiddenSymb)
+
+
+
+braces = between (char '{') (char '}')
+
+braces' = between (char '{') (try $ do char '}';lookAhead (char '{' ))
+
+
+-- | Parse a single entry command from "imakeidx" LaTeX package.
+parseIDX :: ParsecT String () Identity Char -> ParsecT String () Identity IndexItem
+parseIDX pars = do
+ string "\\indexentry"
+ many (char ' ')
+ ((itm,itmE),com) <- braces'
+ (do
+ itm <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ com <- option "" $ try $do
+ char '|'
+ optional (char '(')
+ many (notFollowedBy (do char '}';char '{') >> parseAnything)
+ return (itm,com)
+ )
+ many (char ' ')
+ n <- braces (many1 digit)
+ return (IndexItem (T.pack itm) (Letters, T.pack itmE) (T.pack com) [read n] [])
+
+
+-- | Parse a entry command containing a subentry from "imakeidx" LaTeX package.
+parseIDXSub :: ParsecT String () Identity Char -> ParsecT String () Identity IndexItem
+parseIDXSub pars = do
+ string "\\indexentry"
+ many (char ' ')
+ ((itm,itmE), (sub,subE),com) <- braces'
+ (do
+ itm <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ char '!'
+ sub <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ -- ~ string "|hyperpage"
+ com <- option "" $ try $do
+ char '|'
+ optional (char '(')
+ many (notFollowedBy (do char '}';char '{') >> parseAnything)
+ return (itm, sub,com)
+ )
+ many (char ' ')
+ n <- braces (many1 digit)
+ return (IndexItem (T.pack itm) (Letters, T.pack itmE) T.empty [] [IndexSubItem (T.pack sub) (Letters, T.pack subE) (T.pack com) [read n] []])
+
+
+-- | Parse a entry command containing a subsubentry from "imakeidx" LaTeX package.
+parseIDXSubSub :: ParsecT String () Identity Char -> ParsecT String () Identity IndexItem
+parseIDXSubSub pars = do
+ string "\\indexentry"
+ many (char ' ')
+ ((itm,itmE), (sub,subE), (ssub,ssubE),com) <- braces'
+ (do
+ itm <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ char '!'
+ sub <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ char '!'
+ ssub <- sepArobase <$> many1 (notFollowedBy (do char '}';char '{') >> pars)
+ -- ~ string "|hyperpage"
+ com <- option "" $ try $ do
+ char '|'
+ optional (char '(')
+ many (notFollowedBy (do char '}';char '{') >> parseAnything)
+ return (itm, sub, ssub,com)
+ )
+ many (char ' ')
+ n <- braces (many1 digit)
+ return (IndexItem (T.pack itm) (Letters, T.pack itmE) T.empty [] [IndexSubItem (T.pack sub) (Letters, T.pack subE) T.empty [] [IndexSubSubItem (T.pack ssub) (Letters, T.pack ssubE) (T.pack com) [read n]]])
+
+
+-- | Parse all possible forms of entry from "imakeidx" LaTeX package.
+parseIndexItem pars = try (parseIDXSubSub pars)
+ <|> try (parseIDXSub pars)
+ <|> parseIDX pars
+
+
+parseIndexFile :: ParsecT String () Identity [IndexItem]
+parseIndexFile = do
+ emptyLines
+ itms <- endBy (parseIndexItem parseCharL) endOfLineP
+ emptyLines
+ eof
+ return itms
+
+
+
+
+-- | Parse a end of line in both UNIX and WINDOWS format.
+-- ~ endOfLineP :: ParsecT String () Identity String
+endOfLineP = try (string "\n") -- Fin de ligne Unix/Linux (LF : Line feed)
+ <|> try (string "\r\n") -- Fin de ligne Windows (CRLF : Carriage return Line feed)
+
+
+
+-- | Standard parser for chars.
+--
+-- Try to parse :
+--
+-- 1. The specific char output from the "imakeidx" LaTeX package.
+--
+-- 2. Numbers
+--
+-- 3.
+parseCharL :: ParsecT String () Identity Char
+parseCharL = lstParseIeC lstLaTeXSubs
+ <|> parseAnything
+
+
+
+
+-- | Parse a file containing the lists of chars defining a language.
+--
+parseLanguageFile :: ParsecT String PermState Identity LangDef
+parseLanguageFile = do
+ emptyLines -- Possibles emptylines at the beginning of the file
+ -- ~ putState emptyPermState
+ def <- permute
+ ( (\a b c d -> LangDef a b c d []) -- all possible permutations
+ <$$> try (parseCharDefLetters ) -- <$$>
+ <|?> ([], try $ parseCharDefNumbers )
+ <|?> (Nothing, try $ parseCharDefSymbols )
+ <|?> ([], try $ parseSubstitutions )
+ )
+ eof -- the end of file
+ stat <- getState
+ return def{lstSecOrder=order stat}
+
+
+-- | Parse a char list definition.
+--
+-- A char list is defined by:
+--
+-- * A title
+--
+-- * A list of chars describing the sorting order of letters of this language.
+--
+parseCharDefLetters = do
+ string "LETTERS"
+ endOfLineP
+ chrs <- many (noneOf "\n\t")
+ endOfLineP
+ emptyLines
+ modifyState (\st -> st{order=order st++[Letters]})
+ return ( chrs)
+
+
+parseCharDefNumbers = do
+ string "NUMBERS"
+ endOfLineP
+ chrs <- many (noneOf "\n\t")
+ endOfLineP
+ emptyLines
+ modifyState (\st -> st{order=order st++[Numbers]})
+ return ( chrs)
+
+
+-- | Parse a char list definition.
+--
+-- A char list is defined by:
+--
+-- * A title
+--
+-- * A list of chars describing the sorting order of letters of this language.
+--
+parseCharDefSymbols = do
+ string "SYMBOLS"
+ endOfLineP
+ chrs <- many (noneOf "\n\t")
+ endOfLineP
+ emptyLines
+ modifyState (\st -> st{order=order st++[Symbols]})
+ return (Just ( chrs))
+
+
+-- | Parse a list of substitutions
+--
+-- A substitution give an equivalent string to a char. A list of substitution is defined by :
+--
+-- * A title
+--
+-- * A list of substitutions :
+--
+-- > œ->oe
+-- > à->a
+-- > ê->e
+--
+-- note: The arrow -> musn't be preceded or followed by spaces.
+--
+-- A special char can be substituted by a space with the following substitution.
+--
+-- > _->
+-- > -->
+--
+parseSubstitutions = do
+ string "SUBSTITUTIONS"
+ endOfLineP
+ repl <- many1 parseSubstitution
+ emptyLines
+ return repl -- (replaUpperLower repl)
+
+parseSubstitution = do
+ cha <- noneOf "\r\n\t"
+ string "->"
+ str <- many1 (noneOf "\r\n\t")
+ -- many (char ' ')
+ endOfLineP
+ return (cha, str)
+
+
+-- | The empty list of chars.
+emptyDef = LangDef [] [] Nothing [] []
+
+
diff --git a/indexing/hsindex/src/HsIndex/Show.hs b/indexing/hsindex/src/HsIndex/Show.hs
new file mode 100644
index 0000000000..6bab73245c
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Show.hs
@@ -0,0 +1,324 @@
+{-# LANGUAGE OverloadedStrings #-}
+-- |
+-- Module : HsIndex.Show
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The functions to display data types.
+
+-- This module provide functions to
+
+module HsIndex.Show
+ (
+ -- * Function to show the whole index.
+ showIndex
+ , showHeading1
+ , showHeading2
+
+ -- * Function to show a style.
+ , showStyle
+ , showLangDef
+ ) where
+
+
+import HsIndex.Types
+import Data.List
+import Data.Char
+import qualified Data.Text as T
+
+
+
+
+
+-- | Convert a 'IndexStyle' into String
+--
+-- This string is readable by hsindex.
+--
+showStyle style = unlines
+ [ "preamble " ++ show (idxPreamble style)
+ , "postamble " ++ show (idxPostamble style)
+ , "headings_flag " ++ showStyleHeading (idxHeadingFlag0 style)
+ , "heading_prefix " ++ show (idxHeadingPreL0 style)
+ , "heading_suffix " ++ show (idxHeadingSufL0 style)
+ , "headings_flag1 " ++ showStyleHeading (idxHeadingFlag1 style)
+ , "heading_prefix1 " ++ show (idxHeadingPreL1 style)
+ , "heading_suffix1 " ++ show (idxHeadingSufL1 style)
+ , "symhead_positive " ++ show (idxSymhead style)
+ , "numhead_positive " ++ show (idxNumhead style)
+ , "group_skip " ++ show (idxGroupSkip0 style)
+ , "group_skip1 " ++ show (idxGroupSkip1 style)
+ , "item_0 " ++ show (idxItem0 style)
+ , "item_1 " ++ show (idxItem1 style)
+ , "item_2 " ++ show (idxItem2 style)
+ , "item_01 " ++ show (idxItem01 style)
+ , "item_12 " ++ show (idxItem12 style)
+ , "delim_0 " ++ show (idxDelim0 style)
+ , "delim_1 " ++ show (idxDelim1 style)
+ , "delim_2 " ++ show (idxDelim2 style)
+ , "delim_n " ++ show (idxDelimn style)
+ , "delim_r " ++ show (idxDelimr style)
+ , "encap_infix " ++ show (idxEncapPre style)
+ , "encap_suffix " ++ show (idxEncapSuf style)
+ ]
+
+
+-- | Convert 'Heading' into 'String'.
+showStyleHeading None = "None"
+showStyleHeading UpperCase = "UpperCase"
+showStyleHeading LowerCase = "LowerCase"
+
+
+showLangDef def = unlines $ ["LETTERS", lstLetters def] ++ if null (lstNumbers def)
+ then []
+ else
+ ["NUMBERS", lstNumbers def]
+
+ ++ case lstSymbols def of
+ Nothing -> []
+ Just sym -> ["SYMBOLS", sym]
+ ++ if null (lstSubs def) then [] else ["SUBSTITUTIONS"] ++ subS (lstSubs def)
+
+ where
+ subS [] = []
+ subS ((a, b) : xs) = (a : "->" ++ b) : subS xs
+
+
+-- | convert an index into a 'Text'
+showIndex :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexSection] -- ^ The list of section of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndex style rng lst = T.concat [idxPreamble style, showIndexSections style rng lst, idxPostamble style]
+
+
+-- | convert list of 'IndexSection' into a 'Text' readable with LaTeX.
+showIndexSections :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexSection] -- ^ The list of section of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndexSections style _ [] = T.empty
+showIndexSections style rng lst = T.intercalate (idxGroupSkip0 style) (map (showIndexSection style rng) lstf)
+ where lstf = filter (\(IndexSection tit sub) -> not (null sub)) lst
+
+
+showIndexSection :: IndexStyle -> Bool -> IndexSection -> T.Text
+showIndexSection style rng (IndexSection "" sub) =
+ showIndexSubSections style rng sub
+showIndexSection style rng (IndexSection tit []) =
+ T.concat [idxHeadingPreL0 style, tit, idxHeadingSufL0 style]
+showIndexSection style rng (IndexSection tit sub) = T.concat
+ [ idxHeadingPreL0 style
+ , tit
+ , idxHeadingSufL0 style
+ , showIndexSubSections style rng sub
+ ]
+
+
+-- | convert list of 'IndexSubSection' into a 'Text' readable with LaTeX.
+showIndexSubSections :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexSubSection] -- ^ The list of subsection of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndexSubSections style _ [] = ""
+showIndexSubSections style rng lst = T.intercalate
+ (idxGroupSkip1 style)
+ (map (showIndexSubSection style rng) lstf)
+ where lstf = filter (\(IndexSubSection tit ent) -> not (null ent)) lst
+
+
+showIndexSubSection :: IndexStyle -> Bool -> IndexSubSection -> T.Text
+showIndexSubSection style rng (IndexSubSection "" ent) =
+ showIndexItems style rng ent
+showIndexSubSection style _ (IndexSubSection tit []) =
+ T.concat [idxHeadingPreL1 style, tit, idxHeadingSufL1 style]
+showIndexSubSection style rng (IndexSubSection tit ent) = T.concat
+ [ idxHeadingPreL1 style
+ , tit
+ , idxHeadingSufL1 style
+ , showIndexItems style rng ent
+ ]
+
+
+-- | Convert a list of 'IndexItem' into a 'Text' readable with LaTeX.
+showIndexItems :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexItem] -- ^ The list of items of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndexItems style _ [] = ""
+showIndexItems style rng (IndexItem n _ com p [] : xs) = T.concat
+ [ idxItem0 style
+ , n
+ , idxDelim0 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexItems style rng xs
+ ]
+showIndexItems style rng (IndexItem n _ _ [] sub : xs) = T.concat
+ [ idxItem0 style
+ , n
+ , showIndexSubItems style rng sub
+ , showIndexItems style rng xs
+ ]
+showIndexItems style rng (IndexItem n _ com p sub : xs) = T.concat
+ [ idxItem0 style
+ , n
+ , idxDelim0 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubItems style rng sub
+ , showIndexItems style rng xs
+ ]
+
+
+-- | Convert an 'IndexSubItem' into a 'Text' readable with LaTeX.
+--
+-- This function is a transition between entry and its subentries.
+showIndexSubItems :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexSubItem] -- ^ The list of subitems of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndexSubItems style _ [] = ""
+showIndexSubItems style rng (IndexSubItem n _ com p [] : xs) = T.concat
+ [ idxItem01 style
+ , n
+ , idxDelim1 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubItems' style rng xs
+ ]
+showIndexSubItems style rng (IndexSubItem n _ _ [] subsub : xs) = T.concat
+ [ idxItem01 style
+ , n
+ , showIndexSubSubItems style rng subsub
+ , showIndexSubItems' style rng xs
+ ]
+showIndexSubItems style rng (IndexSubItem n _ com p subsub : xs) = T.concat
+ [ idxItem01 style
+ , n
+ , idxDelim1 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubSubItems style rng subsub
+ , showIndexSubItems' style rng xs
+ ]
+
+
+-- | Convert an 'IndexItem' into a 'Text' readable with LaTeX.
+showIndexSubItems' :: IndexStyle -> Bool -> [IndexSubItem] -> T.Text
+showIndexSubItems' style _ [] = ""
+showIndexSubItems' style rng (IndexSubItem n _ com p [] : xs) = T.concat
+ [ idxItem1 style
+ , n
+ , idxDelim1 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubItems' style rng xs
+ ]
+showIndexSubItems' style rng (IndexSubItem n _ _ [] subsub : xs) = T.concat
+ [ idxItem1 style
+ , n
+ , showIndexSubSubItems style rng subsub
+ , showIndexSubItems' style rng xs
+ ]
+showIndexSubItems' style rng (IndexSubItem n _ com p subsub : xs) = T.concat
+ [ idxItem1 style
+ , n
+ , idxDelim1 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubSubItems style rng subsub
+ , showIndexSubItems' style rng xs
+ ]
+
+
+-- | Convert an 'IndexSubSubItem' into a 'Text' readable with LaTeX.
+--
+-- This function is a transition between subentries and its subsubentries.
+
+showIndexSubSubItems :: IndexStyle -- ^ The index style.
+ -> Bool -- ^ Automatic conversion to pages ranges
+ -> [IndexSubSubItem] -- ^ The list of subsubitems of the index.
+ -> T.Text -- ^ The output string in the LaTeX format.
+showIndexSubSubItems style _ [] = ""
+showIndexSubSubItems style rng (IndexSubSubItem n _ com p : xs) = T.concat
+ [ idxItem12 style
+ , n
+ , idxDelim2 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubSubItems' style rng xs
+ ]
+
+
+-- | Convert an 'IndexSubSubItem' into a 'Text' usable with LaTeX.
+showIndexSubSubItems' :: IndexStyle -> Bool -> [IndexSubSubItem] -> T.Text
+showIndexSubSubItems' style _ [] = ""
+showIndexSubSubItems' style rng (IndexSubSubItem n _ com p : xs) = T.concat
+ [ idxItem2 style
+ , n
+ , idxDelim2 style
+ , showPageRange style com (if rng then 3 else 1000) p
+ , showIndexSubSubItems' style rng xs
+ ]
+
+
+
+
+
+
+
+
+
+-- | Return the string of the heading (Layer 1) according to the style and
+-- the equivalent name of an item.
+showHeading1 :: IndexStyle -- ^ The index style.
+ -> (Section, T.Text) -- ^ The equivalent name.
+ -> T.Text
+showHeading1 sty (Letters, a) | idxHeadingFlag0 sty == UpperCase = T.toUpper (T.take 1 a)
+ | idxHeadingFlag0 sty == LowerCase = T.toLower (T.take 1 a)
+ | otherwise = T.empty
+
+showHeading1 sty (Numbers, a) | idxHeadingFlag0 sty == UpperCase = idxNumhead sty
+ | idxHeadingFlag0 sty == LowerCase = idxNumhead sty
+ | otherwise = T.empty
+
+showHeading1 sty (Symbols, a) | idxHeadingFlag0 sty == UpperCase = idxSymhead sty
+ | idxHeadingFlag0 sty == LowerCase = idxSymhead sty
+ | otherwise = T.empty
+
+
+-- | Return the string of the heading (Layer 1) according to the style and
+-- the equivalent name of an item.
+showHeading2 :: IndexStyle -- ^ The index style.
+ -> (Section, T.Text) -- ^ The equivalent name.
+ -> T.Text
+showHeading2 sty (Letters, a) | idxHeadingFlag1 sty == UpperCase = T.toUpper (T.take 2 a)
+ | idxHeadingFlag1 sty == LowerCase = T.toLower (T.take 2 a)
+ | otherwise = T.empty
+
+showHeading2 sty (Numbers, a) | idxHeadingFlag1 sty == UpperCase = T.take 1 a
+ | idxHeadingFlag1 sty == LowerCase = T.take 1 a
+ | otherwise = T.empty
+
+showHeading2 sty (Symbols, a) | idxHeadingFlag1 sty == UpperCase = T.take 1 a
+ | idxHeadingFlag1 sty == LowerCase = T.take 1 a
+ | otherwise = T.empty
+
+
+groupedBySuccessors [] = []
+groupedBySuccessors lst@(x : xs) = map fst ok : groupedBySuccessors (map fst nok)
+ where
+ lstC = [x ..]
+ (ok, nok) = span (\(a, b) -> a == b) $ zip lst lstC
+
+
+showPageRange style com n nums = if com == T.empty
+ then T.intercalate (idxDelimn style) (map showRange grps)
+ else T.intercalate (idxDelimn style) (map showRangeCom grps)
+ where
+ showRangeCom gr = if length gr >= n
+ then T.concat ["\\", com, idxEncapPre style, T.pack $ show (head gr), idxDelimr style, T.pack $ show (last gr), idxEncapSuf style]
+ else T.intercalate (idxDelimn style) (map (\v -> T.concat ["\\", com, idxEncapPre style, T.pack $ show v, idxEncapSuf style]) gr)
+
+ showRange gr = if length gr >= n
+ then T.concat [T.pack $ show (head gr), idxDelimr style, T.pack $ show (last gr)]
+ else T.intercalate (idxDelimn style) (map (\v -> T.concat [T.pack $ show v]) gr)
+
+ grps = groupedBySuccessors nums
+
+
diff --git a/indexing/hsindex/src/HsIndex/Sorting.hs b/indexing/hsindex/src/HsIndex/Sorting.hs
new file mode 100644
index 0000000000..4a33259947
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Sorting.hs
@@ -0,0 +1,246 @@
+-- |
+-- Module : HsIndex.Sorting
+-- Copyright : Jean-Luc JOULIN 2018-2019
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The functions to sort data types.
+
+
+
+module HsIndex.Sorting where
+
+
+import Data.List
+import Data.Char
+import HsIndex.Types
+
+import HsIndex.Functions
+import qualified Data.Text as T
+
+
+
+-- | Generate the equivalent name of 'IndexItem's.
+--
+--
+equivItems :: Bool -- ^ Case sensitivity.
+ -> LangDef -- ^ Lists of chars in each sections.
+ -> [IndexItem]
+ -> [IndexItem]
+equivItems _ _ [] = []
+equivItems False cha (x : xs)
+ | T.head equi `elem` map toUpper (lstLetters cha) = x { itemEqui = (Letters, equi),itemContent = equivSubItems False cha (itemContent x) } : equivItems False cha xs
+ | T.head equi `elem` map toUpper (lstNumbers cha) = x { itemEqui = (Numbers, equi),itemContent = equivSubItems False cha (itemContent x) } : equivItems False cha xs
+ | otherwise = case lstSymbols cha of
+ Nothing -> x { itemEqui = (Symbols, equi) } : equivItems False cha xs
+ Just ch -> if T.head equi `elem` map toUpper ch
+ then x { itemEqui = (Symbols, equi) } : equivItems False cha xs
+ else equivItems False cha xs
+ where
+ equi =
+ T.toUpper $ if snd (itemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (itemName x)
+ else snd (itemEqui x)
+
+equivItems True cha (x : xs)
+ | T.head equi `elem` lstLetters cha = x { itemEqui = (Letters, equi),itemContent = equivSubItems True cha (itemContent x) } : equivItems True cha xs
+ | T.head equi `elem` lstNumbers cha = x { itemEqui = (Numbers, equi),itemContent = equivSubItems True cha (itemContent x) } : equivItems True cha xs
+ | otherwise = case lstSymbols cha of
+ Nothing -> x { itemEqui = (Symbols, equi) } : equivItems True cha xs
+ Just ch -> if T.head equi `elem` ch
+ then x { itemEqui = (Symbols, equi) } : equivItems True cha xs
+ else equivItems True cha xs
+ where
+ equi =
+ if snd (itemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (itemName x)
+ else snd (itemEqui x)
+
+
+
+equivSubItems :: Bool -- ^ Case sensitivity.
+ -> LangDef -- ^ Lists of chars in each sections.
+ -> [IndexSubItem]
+ -> [IndexSubItem]
+equivSubItems _ _ [] = []
+equivSubItems False cha (x : xs)
+ | T.head equi `elem` map toUpper (lstLetters cha) = x { subItemEqui = (Letters, equi),subItemContent = equivSubSubItems False cha (subItemContent x) } : equivSubItems False cha xs
+ | T.head equi `elem` map toUpper (lstNumbers cha) = x { subItemEqui = (Numbers, equi),subItemContent = equivSubSubItems False cha (subItemContent x) } : equivSubItems False cha xs
+ | otherwise = case lstSymbols cha of
+ Nothing -> x { subItemEqui = (Symbols, equi) } : equivSubItems False cha xs
+ Just ch -> if T.head equi `elem` map toUpper ch
+ then x { subItemEqui = (Symbols, equi) } : equivSubItems False cha xs
+ else equivSubItems False cha xs
+ where
+ equi = T.toUpper $ if snd (subItemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (subItemName x)
+ else snd (subItemEqui x)
+
+equivSubItems True cha (x : xs)
+ | T.head equi `elem` lstLetters cha = x { subItemEqui = (Letters, equi),subItemContent = equivSubSubItems True cha (subItemContent x) } : equivSubItems True cha xs
+ | T.head equi `elem` lstNumbers cha = x { subItemEqui = (Numbers, equi),subItemContent = equivSubSubItems True cha (subItemContent x) } : equivSubItems True cha xs
+ | otherwise = case lstSymbols cha of
+ Nothing -> x { subItemEqui = (Symbols, equi) } : equivSubItems True cha xs
+ Just ch -> if T.head equi `elem` ch
+ then x { subItemEqui = (Symbols, equi) } : equivSubItems True cha xs
+ else equivSubItems True cha xs
+ where
+ equi = if snd (subItemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (subItemName x)
+ else snd (subItemEqui x)
+
+
+equivSubSubItems :: Bool -- ^ Case sensitivity.
+ -> LangDef -- ^ Lists of chars in each sections.
+ -> [IndexSubSubItem]
+ -> [IndexSubSubItem]
+equivSubSubItems _ _ [] = []
+equivSubSubItems False cha (x : xs)
+ | T.head equi `elem` map toUpper (lstLetters cha)
+ = x { subSubItemEqui = (Letters, equi) } : equivSubSubItems False cha xs
+ | T.head equi `elem` map toUpper (lstNumbers cha)
+ = x { subSubItemEqui = (Numbers, equi) } : equivSubSubItems False cha xs
+ | otherwise
+ = case lstSymbols cha of
+ Nothing -> x { subSubItemEqui = (Symbols, equi) } : equivSubSubItems False cha xs
+ Just ch -> if T.head equi `elem` map toUpper ch
+ then x { subSubItemEqui = (Symbols, equi) } : equivSubSubItems False cha xs
+ else equivSubSubItems False cha xs
+ where
+ equi = T.toUpper $ if snd (subSubItemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (subSubItemName x)
+ else snd (subSubItemEqui x)
+
+
+equivSubSubItems True cha (x : xs)
+ | T.head equi `elem` lstLetters cha = x { subSubItemEqui = (Letters, equi) } : equivSubSubItems True cha xs
+ | T.head equi `elem` lstNumbers cha = x { subSubItemEqui = (Numbers, equi) } : equivSubSubItems True cha xs
+ | otherwise = case lstSymbols cha of
+ Nothing -> x { subSubItemEqui = (Symbols, equi) } : equivSubSubItems True cha xs
+ Just ch -> if T.head equi `elem` ch
+ then x { subSubItemEqui = (Symbols, equi) } : equivSubSubItems True cha xs
+ else equivSubSubItems True cha xs
+ where
+ equi = if snd (subSubItemEqui x) == T.empty
+ then substituteCharInString (lstSubs cha) (subSubItemName x)
+ else snd (subSubItemEqui x)
+
+
+sortItems :: Bool
+ -> LangDef -- ^ The list of 'Char's for each section.
+ -> [IndexItem]
+ -> [IndexItem]
+sortItems True cha lst = sortBy (\a b -> compareBySection True cha (itemEqui a) (itemEqui b)) nlst
+ where nlst = map (\itm -> itm { itemContent = sortSubItems True cha (itemContent itm) }) lst
+
+
+sortItems False cha lst = sortBy (\a b -> compareBySection False cha ( itemEqui a) ( itemEqui b)) nlst
+ where nlst = map (\itm -> itm { itemContent = sortSubItems False cha (itemContent itm) }) lst
+
+
+
+
+sortSubItems :: Bool
+ -> LangDef -- ^ The list of 'Char's for each section.
+ -> [IndexSubItem]
+ -> [IndexSubItem]
+sortSubItems True cha lst = sortBy (\a b -> compareBySection True cha (subItemEqui a) (subItemEqui b)) nlst
+ where nlst = map (\itm -> itm { subItemContent = sortSubSubItems True cha (subItemContent itm) }) lst
+
+
+sortSubItems False cha lst = sortBy (\a b -> compareBySection False cha (subItemEqui a) (subItemEqui b)) nlst
+ where nlst = map (\itm -> itm { subItemContent = sortSubSubItems False cha (subItemContent itm) }) lst
+
+
+sortSubSubItems :: Bool
+ -> LangDef -- ^ The list of 'Char's for each section.
+ -> [IndexSubSubItem]
+ -> [IndexSubSubItem]
+sortSubSubItems True cha lst = sortBy (\a b -> compareBySection True cha (subSubItemEqui a) (subSubItemEqui b)) lst
+
+sortSubSubItems False cha lst = sortBy (\a b -> compareBySection False cha (subSubItemEqui a) (subSubItemEqui b)) lst
+
+
+
+-- | compareBySection two items according to :
+--
+-- 1. The 'Section' they belongs to. The section order is given in argument.
+--
+-- 2. Their alphabetical order given by a list of 'Char's.
+--
+compareBySection :: Bool
+ -> LangDef -- ^ The list of 'Char's for each section.
+ -> (Section, T.Text) -- ^ The first item to compareBySection.
+ -> (Section, T.Text) -- ^ The second index to compareBySection.
+ -> Ordering -- ^ The 'Ordering'.
+compareBySection cas cha (seca, stra) (secb, strb) = case (ind_a, ind_b) of
+ (Just ia, Just ib) | ia == ib -> if cas
+ then compareByString (genListChar cha) (T.unpack stra) (T.unpack strb)
+ else compareByString' (genListChar cha) (T.unpack stra) (T.unpack strb)
+ | ia < ib -> LT
+ | otherwise -> GT
+ where
+ recu
+ | seca == Letters = if cas
+ then compareByString (lstLetters cha) (T.unpack stra) (T.unpack strb)
+ else compareByString' (lstLetters cha) (T.unpack stra) (T.unpack strb)
+ | seca == Numbers = if cas
+ then compareByString (lstNumbers cha) (T.unpack stra) (T.unpack strb)
+ else compareByString' (lstNumbers cha) (T.unpack stra) (T.unpack strb)
+ | seca == Symbols = case lstSymbols cha of
+ Nothing -> EQ -- error "No list of symbols defined"
+ Just ch -> if cas
+ then compareByString ch (T.unpack stra) (T.unpack strb)
+ else compareByString' ch (T.unpack stra) (T.unpack strb)
+ (Nothing, _ ) -> error ""
+ (_ , Nothing) -> error ""
+ where
+ ind_a = elemIndex seca (lstSecOrder cha)
+ ind_b = elemIndex secb (lstSecOrder cha)
+
+
+compareByString' ord stra strb = compareByString (map toUpper ord) (map toUpper stra) (map toUpper strb)
+
+
+-- | Compare two 'String's according to a list of 'Char'.
+compareByString :: String -- ^ The list of Char's giving the order.
+ -> String -- ^ The first 'String' to compare.
+ -> String -- ^ The second 'String' to compare.
+ -> Ordering -- ^ The 'Ordering' result.
+compareByString ordlst [] [] = EQ
+compareByString ordlst [] (b : bx) = LT -- GT
+compareByString ordlst (a : ax) [] = GT -- LT
+compareByString ordlst (a : ax) (b : bx) = case (ind_a, ind_b) of
+ -- If both char are presents in the ordering list, we compare their indexes
+ (Just ia, Just ib) | ia == ib -> compareByString ordlst ax bx -- Same indexes, we compare the next chars
+ | ia < ib -> LT
+ | otherwise -> GT
+ (Nothing, Nothing) -> compareByString ordlst ax bx -- compare a b
+ (Nothing, _ ) -> LT
+ (_ , Nothing) -> GT
+ where
+ ind_a = elemIndex a ordlst -- Seek the char index of the first string in the ordering list
+ ind_b = elemIndex b ordlst -- Seek the char index of the second string in the ordering list
+
+
+
+-- | Generate the concatenated list of Char of all Sections in
+-- the sorting order.
+genListChar cha = genListChar' cha (lstSecOrder cha)
+ where
+ genListChar' _ [] = ""
+ genListChar' cha (Letters : xs) = lstLetters cha ++ genListChar' cha xs
+ genListChar' cha (Numbers : xs) = lstNumbers cha ++ genListChar' cha xs
+ genListChar' cha (Symbols : xs) = case lstSymbols cha of
+ Nothing -> genListChar' cha xs
+ Just str -> str ++ genListChar' cha xs
+
+
+
+
+
+
+
+
+
diff --git a/indexing/hsindex/src/HsIndex/Types.hs b/indexing/hsindex/src/HsIndex/Types.hs
new file mode 100644
index 0000000000..cc7340d7d2
--- /dev/null
+++ b/indexing/hsindex/src/HsIndex/Types.hs
@@ -0,0 +1,205 @@
+-- |
+-- Module : HsIndex.Types
+-- Copyright : Jean-Luc JOULIN 2018-2020
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The definition of main types for HsIndex.
+
+
+
+
+module HsIndex.Types where
+
+
+import Text.Parsec
+import Text.Parsec.String
+
+import Data.Char
+import qualified Data.Text as T
+
+--
+-- The main data structure of an index is made like this
+--
+-- * Section ""
+--
+-- * Subsection ""
+--
+-- * Entry "" [4]
+--
+-- * Entry "" [17,12]
+--
+-- * SubEntry "" [21]
+--
+-- * SubSubEntry "" [22]
+--
+-- * SubEntry "" [29]
+--
+-- * Subsection ""
+--
+--
+-- * Section B"
+--
+-- * ....
+--
+-- * ....
+--
+--
+-- Sections are made to store SubSections starting with the same first letter.
+--
+-- SubSections are made to store Entries starting with the same two letters.
+--
+-- Entry is made to store a word, it's pages numbers and a list of SubEntries. It's equivalent to "imakeidx" items.
+--
+-- SubEntry is made to store a word, it's pages numbers and a list of SubSubEntries. It's equivalent to "imakeidx" subitems.
+--
+-- SubSubEntry is made to store a word and it's pages numbers. It's equivalent to "imakeidx" subsubitems.
+--
+--
+-- This data structure is deep enough to comply with "imakeidx" LaTeX package.
+--
+
+
+
+
+
+
+
+
+
+
+
+-- | The type to describe the style of the Index
+--
+-- preamble
+--
+-- prefix heading layer1 suffix
+--
+-- name1 delimiters 1, 3, 4
+--
+-- name2 delimiters 4, 9
+--
+-- name3 delimiters 9, 12
+--
+-- postamble
+--
+data IndexStyle =
+ IndexStyle { idxPreamble :: T.Text -- ^ The preamble
+ , idxPostamble :: T.Text -- ^ The postamble
+ , idxHeadingFlag0 :: Heading -- ^ The flag for the layer 0 heading, in connection with 'IndexSection's
+ , idxHeadingFlag1 :: Heading -- ^ The flag for the layer 1 heading, in connection with 'IndexSubSection's
+ , idxHeadingPreL0 :: T.Text -- ^ The prefix for the Layer 0 heading, in connection with 'IndexSection's
+ , idxHeadingSufL0 :: T.Text -- ^ The suffix for the Layer 0 heading, in connection with 'IndexSection's
+ , idxHeadingPreL1 :: T.Text -- ^ The prefix for the Layer 1 heading, in connection with 'IndexSubSection's
+ , idxHeadingSufL1 :: T.Text -- ^ The suffix for the Layer 1 heading, in connection with 'IndexSubSection's
+ , idxSymhead :: T.Text -- ^ The title for the "symbols" section
+ , idxNumhead :: T.Text -- ^ The title for the "numbers" section
+ , idxGroupSkip0 :: T.Text -- ^ The skip command after a layer 0 group ('IndexSection')
+ , idxGroupSkip1 :: T.Text -- ^ The skip command after a layer 1 group ('IndexSubSection')
+ , idxItem0 :: T.Text -- ^ The command to place before the index "items"
+ , idxItem1 :: T.Text -- ^ The command to place before the index "subitems"
+ , idxItem2 :: T.Text -- ^ The command to place before the index "subsubitems"
+ , idxItem01 :: T.Text -- ^ The command to place between an index "items" and an index "subitems"
+ , idxItem12 :: T.Text -- ^ The command to place between an index "subitems" and an index "subsubitems"
+ , idxDelim0 :: T.Text -- ^ The delimiter between the name and the pages numbers for "items"
+ , idxDelim1 :: T.Text -- ^ The delimiter between the name and the pages numbers for "subitems"
+ , idxDelim2 :: T.Text -- ^ The delimiter between the name and the pages numbers for "subsubitems"
+ , idxDelimn :: T.Text -- ^ The delimiter between pages numbers.
+ , idxDelimr :: T.Text -- ^ The delimiter between pages range.
+ , idxEncapPre :: T.Text
+ , idxEncapSuf :: T.Text
+ }
+
+
+-- | The list of chars to define a language.
+data LangDef = LangDef { lstLetters :: [Char] -- ^ Chars considered as letters.
+ , lstNumbers :: [Char] -- ^ Chars considered as numbers.
+ , lstSymbols :: Maybe [Char] -- ^ Chars considered as symbols.
+ , lstSubs :: [(Char,String)] -- ^ List of substitutions to perform.
+ , lstSecOrder :: [Section]
+ }
+
+
+-- | The style of a heading.
+data Heading = None -- ^ No heading
+ | UpperCase -- ^ Upper case heading
+ | LowerCase -- ^ Lower case heading
+ deriving (Eq)
+
+
+-- | The category of a section.
+--
+-- A section can be one of these three categories :
+--
+-- * Letters
+--
+-- * Numbers
+--
+-- * Symbols
+--
+data Section = Letters
+ | Numbers
+ | Symbols
+ deriving (Eq, Show)
+
+-- | An alias for a list of 'IndexSection's
+type Index = [IndexSection]
+
+
+-- | The type for a section.
+data IndexSection =
+ IndexSection { secTitle :: T.Text -- ^ The section title.
+ , secSubSections :: [IndexSubSection] -- ^ The subsections.
+ }
+ deriving (Show)
+
+-- | The type for a subsection.
+data IndexSubSection =
+ IndexSubSection { subSecTitle :: T.Text -- ^ The subsection title.
+ , subSecEntries :: [IndexItem] -- ^ The entries.
+ }
+ deriving (Show)
+
+-- | The type for an item.
+data IndexItem =
+ IndexItem { itemName :: T.Text -- ^ The name of the index item.
+ , itemEqui :: (Section, T.Text) -- ^ The equivalent name and the section of the item.
+ , itemPageCommand :: T.Text -- ^ The command to insert before page number
+ , itemPages :: [Int] -- ^ The pages numbers it refers to.
+ , itemContent :: [IndexSubItem] -- ^ The subitems.
+ }
+ deriving (Show)
+
+-- | The type for a subitem.
+data IndexSubItem =
+ IndexSubItem { subItemName :: T.Text -- ^ The name of the index subitem.
+ , subItemEqui :: (Section, T.Text) -- ^ The equivalent name and the section of the subitem.
+ , subItemPageCommand :: T.Text -- ^ The command to insert before page number
+ , subItemPages :: [Int] -- ^ The pages numbers it refers to.
+ , subItemContent :: [IndexSubSubItem] -- ^ The subsubitems.
+ }
+ deriving (Show)
+
+-- | The type for a subsubitem.
+data IndexSubSubItem =
+ IndexSubSubItem { subSubItemName :: T.Text -- ^ The name of the index subsubitem.
+ , subSubItemEqui :: (Section, T.Text) -- ^ The equivalent name and the section of the subsubitem.
+ , subSubItemPageCommand :: T.Text -- ^ The command to insert before page number
+ , subSubItemPages :: [Int] -- ^ The pages numbers it refers to.
+ }
+ deriving (Show)
+
+
+-- | The type of index to use
+data IndexType = StyleBasic -- ^ The default basic style
+ | StyleDouble -- ^ The default double header style
+ | Stylecustom FilePath -- ^ A custom style (path to the style file).
+
+
+-- | A state to accumulate the 'Section' order.
+data PermState = PermState{ order::[Section]}
+
+-- | The empty state
+emptyPermState = PermState []
+
diff --git a/indexing/hsindex/src/hsindex.hs b/indexing/hsindex/src/hsindex.hs
new file mode 100644
index 0000000000..bee37119cf
--- /dev/null
+++ b/indexing/hsindex/src/hsindex.hs
@@ -0,0 +1,395 @@
+-- |
+-- Module : HsIndex.Files
+-- Copyright : Jean-Luc JOULIN 2018-2020
+-- License : General Public Licence (GPLv3)
+-- Maintainer : Jean-Luc JOULIN <jean-luc-joulin@orange.fr>
+-- Stability : alpha
+-- Portability : portable
+-- The Main program for the index generator
+--
+
+
+import Prelude hiding (getContents, putStrLn)
+
+
+
+import Control.Monad
+
+import Data.Char
+import Data.Function
+import Data.List
+import Data.Maybe
+import Data.Ord
+import Debug.Trace
+import GHC.IO.Encoding -- solve bug commitBuffer: invalid argument (invalid character)
+import HsIndex.CharLists.English
+import HsIndex.CharLists.French
+import HsIndex.CharLists.German
+import HsIndex.CharLists.Russian
+import HsIndex.Files
+import HsIndex.Functions
+import HsIndex.Parser
+import HsIndex.Show
+import HsIndex.Sorting
+import HsIndex.Types
+import qualified Prelude (getContents, putStrLn)
+import System.Console.CmdArgs.Explicit
+import System.Console.CmdArgs.Text
+import System.Environment
+import System.Exit
+import System.IO
+import Text.Parsec
+import Text.Printf
+
+import System.Directory
+import System.FilePath
+
+
+-- | The ASCII art for the CLI title.
+logo =
+ [
+ " _ _ _____ _____ __ __ "
+ , " | | | | |_ _| | __ \\ \\ \\ / / "
+ , " | |__| |___ | | _ __ | | | | ___ \\ V / "
+ , " | __ / __| | | | '_ \\| | | |/ _ \\ > < "
+ , " | | | \\__ \\_| |_| | | | |__| | __// . \\ "
+ , " |_| |_|___/_____|_| |_|_____/ \\___/_/ \\_\\ "
+ ]
+
+
+-- | Available options for the CLI.
+data MyModes =
+
+ IndexRussian { fileIn :: FilePath -- ^ The input file
+ , fileOut :: FilePath -- ^ The output file
+ , fileStyle :: IndexType -- ^ The style type
+ , autoRange :: Bool
+ , caseSens :: Bool
+ }
+ | IndexFrench { fileIn :: FilePath
+ , fileOut :: FilePath
+ , fileStyle :: IndexType -- ^ The style type
+ , autoRange :: Bool
+ , caseSens :: Bool
+ }
+ | IndexGerman { fileIn :: FilePath
+ , fileOut :: FilePath
+ , fileStyle :: IndexType -- ^ The style type
+ , autoRange :: Bool
+ , caseSens :: Bool
+ }
+ | IndexEnglish { fileIn :: FilePath
+ , fileOut :: FilePath
+ , fileStyle :: IndexType -- ^ The style type
+ , autoRange :: Bool
+ , caseSens :: Bool
+ }
+ | IndexCustom { fileIn :: FilePath
+ , fileOut :: FilePath
+ , fileStyle :: IndexType -- ^ The style type
+ , autoRange :: Bool
+ , caseSens :: Bool
+ , fileDef :: FilePath
+ }
+ | IndexCheck { checkInternalStyle :: Bool
+ , checkLanguageDef :: Maybe String
+ }
+
+ | ArgHelp
+ | ArgVersion
+
+
+-- | The basic options for English language.
+initialOptsIndexEnglish = IndexEnglish "" "" StyleBasic False True
+
+-- | The basic options for French language.
+initialOptsIndexFrench = IndexFrench "" "" StyleBasic False True
+
+-- | The basic options for German language.
+initialOptsIndexGerman = IndexGerman "" "" StyleBasic False True
+
+-- | The basic options for Russian language.
+initialOptsIndexRussian = IndexRussian "" "" StyleBasic False True
+
+-- | The basic options for custom language.
+initialOptsIndexCustom = IndexCustom "" "" StyleBasic False True ""
+
+-- | The basic options for cheking the program.
+initialOptsCheck = IndexCheck False Nothing
+
+
+-- | The cli mode for English language.
+modeGenIndexEnglish :: Mode MyModes
+modeGenIndexEnglish = mode "english" initialOptsIndexEnglish description unnamedArg convertFlags
+ where
+ description = "Generate a English index"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+
+ convertFlags =
+ [ flagReq ["input", "i"] setInputFile "<File>" "Input file"
+ , flagReq ["output", "o"] setOutpuFile "<File>" "Output file"
+ , flagReq ["style", "s"] setStyleFile "<File>" "Style file"
+ , flagNone ["range"] setRange "Convert sequences of page into range"
+ , flagNone ["nocase"] setNoCase "Case insensitive ordering"
+ , flagNone ["dbl"] setDblHeader "Two letters headers"
+ ]
+
+-- | The cli mode for French language.
+modeGenIndexFrench :: Mode MyModes
+modeGenIndexFrench = mode "french" initialOptsIndexFrench description unnamedArg convertFlags
+ where
+ description = "Generate a French index"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+ convertFlags =
+ [ flagReq ["input", "i"] setInputFile "<File>" "Input file"
+ , flagReq ["output", "o"] setOutpuFile "<File>" "Output file"
+ , flagReq ["style", "s"] setStyleFile "<File>" "Style file"
+ , flagNone ["range"] setRange "Convert sequences of page into range"
+ , flagNone ["nocase"] setNoCase "Case insensitive ordering"
+ , flagNone ["dbl"] setDblHeader "Two letters headers"
+ ]
+
+-- | The cli mode for German language.
+modeGenIndexGerman :: Mode MyModes
+modeGenIndexGerman = mode "german" initialOptsIndexGerman description unnamedArg convertFlags
+ where
+ description = "Generate a German index"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+ convertFlags =
+ [ flagReq ["input", "i"] setInputFile "<File>" "Input file"
+ , flagReq ["output", "o"] setOutpuFile "<File>" "Output file"
+ , flagReq ["style", "s"] setStyleFile "<File>" "Style file"
+ , flagNone ["range"] setRange "Convert sequences of page into range"
+ , flagNone ["nocase"] setNoCase "Case insensitive ordering"
+ , flagNone ["dbl"] setDblHeader "Two letters headers"
+ ]
+
+-- | The cli mode for Russian language.
+modeGenIndexRussian :: Mode MyModes
+modeGenIndexRussian = mode "russian" initialOptsIndexRussian description unnamedArg convertFlags
+ where
+ description = "Generate a Russian index"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+ convertFlags =
+ [ flagReq ["input", "i"] setInputFile "<File>" "Input file"
+ , flagReq ["output", "o"] setOutpuFile "<File>" "Output file"
+ , flagReq ["style", "s"] setStyleFile "<File>" "Style file"
+ , flagNone ["range"] setRange "Convert sequences of page into range"
+ , flagNone ["nocase"] setNoCase "Case insensitive ordering"
+ , flagNone ["dbl"] setDblHeader "Two letters headers"
+ ]
+
+-- | The cli mode for a custom language.
+modeGenIndexCustom :: Mode MyModes
+modeGenIndexCustom = mode "custom" initialOptsIndexCustom description unnamedArg convertFlags
+ where
+ description = "Generate a index with a custom language"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+
+ convertFlags =
+ [ flagReq ["input", "i"] setInputFile "<File>" "Input file"
+ , flagReq ["output", "o"] setOutpuFile "<File>" "Output file"
+ , flagReq ["style", "s"] setStyleFile "<File>" "Style file"
+ , flagReq ["def", "d"] setDefFile "<File>" "Definition file"
+ , flagNone ["range"] setRange "Convert sequences of page into range"
+ , flagNone ["nocase"] setNoCase "Case insensitive ordering"
+ , flagNone ["dbl"] setDblHeader "Two letters headers"
+ ]
+
+-- | The cli mode for a checking the program.
+modeGenCheck :: Mode MyModes
+modeGenCheck = mode "check" initialOptsCheck description unnamedArg convertFlags
+ where
+ description = "Check the internal parameter of the program"
+ unnamedArg = Arg { argValue = updateUnnamed, argType = "", argRequire = False }
+ where updateUnnamed str opts = Left ("Error unknown argument : " ++ str)
+
+ convertFlags =
+ [ flagNone ["style"] setCheckStyle "Check built-in default style"
+ , flagReq ["language", "l"] setCheckLanguage "<Lang>" "Check built-in language definition"
+ ]
+
+
+
+
+-- | Set the input file.
+setInputFile str opts = Right $ opts { fileIn = str }
+
+-- | Set the output file.
+setOutpuFile str opts = Right $ opts { fileOut = str }
+
+-- | Set the style file.
+setStyleFile str opts = Right $ opts { fileStyle = Stylecustom str }
+
+-- | Set the definition file.
+setDefFile str opts = Right $ opts { fileDef = str }
+
+-- | Enable automatic conversion of pages sequences into ranges.
+setRange opts = opts { autoRange = True }
+
+-- | Enable the checking of the internal default style.
+setCheckStyle opts = opts { checkInternalStyle = True }
+
+-- | Disable case sensitivity in ordering.
+setNoCase opts = opts { caseSens = False }
+
+-- | Enable the two letters defaults header
+setDblHeader opts = opts { fileStyle = StyleDouble }
+
+
+-- | Set the language definition to check
+setCheckLanguage "english" opts = Right $ opts { checkLanguageDef = Just "english" }
+setCheckLanguage "french" opts = Right $ opts { checkLanguageDef = Just "french" }
+setCheckLanguage "german" opts = Right $ opts { checkLanguageDef = Just "german" }
+setCheckLanguage "russian" opts = Right $ opts { checkLanguageDef = Just "russian" }
+setCheckLanguage str opts = Left $ "/!\\ ERROR The language " ++ str ++ " is not recognized"
+
+
+-- | List of all possibles cli modes.
+lstModes :: [Mode MyModes]
+lstModes =
+ [ modeGenIndexEnglish
+ , modeGenIndexFrench
+ , modeGenIndexGerman
+ , modeGenIndexRussian
+ , modeGenIndexCustom
+ , modeGenCheck
+ ]
+
+
+
+-- | The main cli mode.
+--
+-- Contain all the languages modes with the help and version flags.
+modesCLI mods = (modes _ProgName ArgHelp "" mods) { modeGroupFlags = toGroup [helpFlag, versionFlag] }
+ where
+ helpFlag = flagNone ["help", "h", "?"] (const ArgHelp) "Help message"
+ versionFlag = flagNone ["version", "V"] (const ArgVersion) "Version informations"
+
+
+
+_ProgName = "hsindex"
+_ProgDetails = "A program to create indexes for LaTeX and XeTeX"
+_Auteur = "(c) Jean-Luc JOULIN 2018-2020"
+_Version = "0.12.0"
+
+
+-- | The main function.
+main :: IO ()
+main = do
+ setLocaleEncoding utf8 -- solve bug commitBuffer: invalid argument (invalid character)
+ opts <- processArgs $ modesCLI lstModes
+ outputScreen opts
+
+
+-- | Main function to output result to screen.
+outputScreen opts@(IndexEnglish fin fou fsty rng cas ) = do
+ let fout = if null fou then ((dropExtension fin) ++ ".ind") else fou
+ readAllFile
+ fin
+ fsty
+ parseIndexFile
+ (\ent idx -> do
+ let entc = concatPagesItems ent
+ ents = sortItems cas langDefEnglish (equivItems True langDefEnglish entc)
+ entd = splitIndex idx ents
+ writeIndex fout idx rng entd
+ )
+
+outputScreen opts@(IndexFrench fin fou fsty rng cas ) = do
+ let fout = if null fou then ((dropExtension fin) ++ ".ind") else fou
+ readAllFile
+ fin
+ fsty
+ parseIndexFile
+ (\ent idx -> do
+ let entc = concatPagesItems ent
+ ents = sortItems cas langDefFrench (equivItems True langDefFrench entc)
+ entd = splitIndex idx ents
+ writeIndex fout idx rng entd
+ )
+
+outputScreen opts@(IndexGerman fin fou fsty rng cas ) = do
+ let fout = if null fou then ((dropExtension fin) ++ ".ind") else fou
+ readAllFile
+ fin
+ fsty
+ parseIndexFile
+ (\ent idx -> do
+ let entc = concatPagesItems ent
+ ents = sortItems cas langDefGerman (equivItems True langDefGerman entc)
+ entd = splitIndex idx ents
+ writeIndex fout idx rng entd
+ )
+
+outputScreen opts@(IndexRussian fin fou fsty rng cas ) = do
+ let fout = if null fou then ((dropExtension fin) ++ ".ind") else fou
+ readAllFile
+ fin
+ fsty
+ parseIndexFile
+ (\ent idx -> do
+ let entc = concatPagesItems ent
+ ents = sortItems cas langDefRussian (equivItems True langDefRussian entc)
+ entd = splitIndex idx ents
+ writeIndex fout idx rng entd
+ )
+
+outputScreen opts@(IndexCustom fin fou fsty rng cas fdef) = do
+ let fout = if null fou then ((dropExtension fin) ++ ".ind") else fou
+ readDefinitionFile
+ fdef
+ (\def -> readAllFile
+ fin
+ fsty
+ parseIndexFile
+ (\ent idx -> do
+ let entc = concatPagesItems ent
+ ents = sortItems cas def { lstLetters = (lstLetters def) } (equivItems True def entc)
+ entd = splitIndex idx ents
+ putStrLn $ "Building index with custom language definition"
+ putStrLn $ showLangDef def
+ writeIndex fout idx rng entd
+ )
+ )
+
+outputScreen opts@(IndexCheck sty mblang ) = do
+ if sty
+ then do
+ putStrLn $ showStyle styleBasic
+ else putStrLn ""
+ case mblang of
+ Nothing -> do
+ putStrLn ""
+ Just "english" -> putStrLn $ showLangDef langDefEnglish
+ Just "french" -> putStrLn $ showLangDef langDefFrench
+ Just "german" -> putStrLn $ showLangDef langDefGerman
+ Just "russian" -> putStrLn $ showLangDef langDefRussian
+
+outputScreen opts@ArgHelp = do
+ putStrLn $ unlines logo
+ putStrLn $ " " ++ _ProgDetails
+ putStrLn $ " " ++ _Auteur
+ putStrLn $ " Version : " ++ _Version
+ print $ helpText [] HelpFormatAll (modesCLI lstModes)
+ exitSuccess
+
+outputScreen opts@ArgVersion = do
+ putStrLn $ unlines logo
+ putStrLn $ " " ++ _ProgDetails
+ putStrLn $ " " ++ _Auteur
+ putStrLn $ " Version : " ++ _Version
+ exitSuccess
+
+
+
+
+
+
+
+
diff --git a/info/mendex-doc/LICENSE b/info/mendex-doc/LICENSE
index dfb12d3800..c5f477cd6b 100644
--- a/info/mendex-doc/LICENSE
+++ b/info/mendex-doc/LICENSE
@@ -1,5 +1,5 @@
Copyright (C) 2010 ASCII MEDIA WORKS.
-Copyright (C) 2016-2021 Japanese TeX Development Community
+Copyright (C) 2016-2022 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/info/mendex-doc/Makefile b/info/mendex-doc/Makefile
index 30e1c2bcfb..881f227bb2 100644
--- a/info/mendex-doc/Makefile
+++ b/info/mendex-doc/Makefile
@@ -14,6 +14,7 @@ all: $(PDFTARGET)
.SUFFIXES: .tex .dvi .pdf
.tex.dvi:
+ $(MDX) -h 2>mendex-version.log
$(LTX) $<
$(MDX) mendex-sub
mv mendex-sub.ind mendex-sub-0.ind
diff --git a/info/mendex-doc/README.md b/info/mendex-doc/README.md
index e327fc98bc..e9e4800212 100644
--- a/info/mendex-doc/README.md
+++ b/info/mendex-doc/README.md
@@ -45,6 +45,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
### Release Date
-2021-06-25
+2022-04-05
Japanese TeX Development Community
diff --git a/info/mendex-doc/mendex.pdf b/info/mendex-doc/mendex.pdf
index ffe0cdb6de..1ddaa11053 100644
--- a/info/mendex-doc/mendex.pdf
+++ b/info/mendex-doc/mendex.pdf
Binary files differ
diff --git a/info/mendex-doc/mendex.tex b/info/mendex-doc/mendex.tex
index 3e900a8447..f685e7e9e7 100644
--- a/info/mendex-doc/mendex.tex
+++ b/info/mendex-doc/mendex.tex
@@ -34,8 +34,17 @@
\newcommand{\Meta}[1]{$\langle$\mbox{}\textit{#1}\mbox{}$\rangle$}
\newcommand{\jMeta}[1]{$\langle$\mbox{}\textsf{#1}\mbox{}$\rangle$}
+% バージョン番号取得
+\IfFileExists{mendex-version.log}{%
+ \immediate\openin10=mendex-version.log
+ \readline10 to\MendexVersion
+ \immediate\closein10
+ \edef\MendexVersion{\noexpand\STRIP\MendexVersion\noexpand\NIL}
+ \def\STRIP##1, ##2 (##3\NIL{\\\texttt{##2}}
+}{\def\MendexVersion{}}
+
% 文書情報
-\title{\SoftName{mendex}:索引整形ツール}
+\title{\SoftName{mendex}:索引整形ツール \MendexVersion}
\author{アスキー・メディアワークス \and 日本語\TeX 開発コミュニティ}
\begin{document}
@@ -149,7 +158,7 @@
\item[|--|]
以降はオプション文字列と解釈しません.
-これは,ファイル名の先頭の文字が|-|であるファイルを扱う場合に有用です.
+これは,ファイル名の先頭の文字が |-| であるファイルを扱う場合に有用です.
\end{description}
以上のうち,オプション |-U|, |-I|, |--help|, |--| はオリジナルのアスキー版にはなかった機能で,
@@ -157,6 +166,7 @@
また,\SoftName{mendex} |version 3.5 [6-Jun-2021]|以降では,|-s| オプションによる
スタイルファイルを複数指定することができます.
同じパラメータが複数回指定された場合は,後から指定された方が有効になります.
+% https://github.com/texjporg/tex-jp-build/issues/116
\subsection{スタイルファイル}
@@ -202,7 +212,8 @@
\SoftName{makeindex}で日本語の索引を作成しようとすると,全ての項目について
|\index{かんじ@漢字}| のように |actual| のシンボルの前に「読み」を,
後ろに実際に表示する索引文字列を書く必要がありました.
-\SoftName{mendex}では,辞書ファイルを用いることで,その手間を最小限にできます.
+\SoftName{mendex}では辞書ファイルを用いることで手間を最小限にできますが,
+辞書と異なる読みを持つ項目がある場合にこの書式を用います.
\item[|encap|] \ParamChar+|+ \par
このシンボルに続く文字列が,ページ番号に付くコマンド名として使われる.
@@ -213,6 +224,10 @@
\item[|page\string_precedence|] \ParamString*|rnaRA|
ページ番号の記法の優先順位.`|R|' および `|r|' はローマ数字,`|n|' はアラビア数字,
`|A|' および `|a|' はアルファベットによる記法を表す.
+\footnote{ローマ数字とアラビア数字のページ番号が混在するとき,
+\SoftName{makeindex}並みに動作するようになったのは
+|version 3.6 [4-Sep-2021]|以降.}
+% https://github.com/texjporg/tex-jp-build/issues/112
\item[|quote|] \ParamChar|"|
\SoftName{mendex}のパラメータ文字に対するエスケープキャラクタ.
@@ -262,8 +277,11 @@
% |lethead_prefix| と |lethead_suffix| も同様.
\item[|heading\string_flag|] \ParamNum|0|
-|lethead_flag| と同じ.\\
-\SoftName{makeindex}では |headings_flag| という名称のため,互換性がありません.
+|lethead_flag| と同じ.(\SoftName{mendex}専用,\SoftName{makeindex}には認識されない)
+
+\item[|headings\string_flag|] \ParamNum|0|
+|lethead_flag| と同じ.(\SoftName{mendex} v3.6で新たにサポート,\SoftName{makeindex}互換)
+% https://github.com/texjporg/tex-jp-build/issues/124
\item[|item\string_0|] \ParamString*|\n \\item |
主エントリ間に挿入するコマンド.
@@ -278,13 +296,13 @@
主−サブエントリ間に挿入するコマンド.
\item[|item\string_x1|] \ParamString*|\n \\subitem |
-主−サブエントリ間に挿入するコマンド(主エントリにページ番号がないとき).
+主エントリにページ番号がないときに,主−サブエントリ間に挿入するコマンド.
\item[|item\string_12|] \ParamString*|\n \\subsubitem |
サブ−サブサブエントリ間に挿入するコマンド.
\item[|item\string_x2|] \ParamString*|\n \\subsubitem |
-サブ−サブサブエントリ間に挿入するコマンド(サブエントリにページ番号がないとき).
+サブエントリにページ番号がないときに,サブ−サブサブエントリ間に挿入するコマンド.
\item[|delim\string_0|] \ParamString*|, |
主エントリと最初のページ番号の間の区切り文字列.
@@ -329,39 +347,56 @@
\item[|line\string_max|] \ParamNum|72|
1行の最大文字数.それを超えると折り返す.
-\item[|indent\string_space|] \ParamString*||
+\item[|indent\string_space|] \ParamString*|\t\t|
折り返した行の頭に挿入するスペース.
\item[|indent\string_length|] \ParamNum|16|
折り返した行の頭に挿入されるスペースの長さ.
\item[|symhead\string_positive|] \ParamString*|Symbols|
-|lethead_flag| または |heading_flag| が正数の場合に数字・記号の頭文字として出力する文字列.
+|lethead_flag|(または |heading_flag| または |headings_flag|)が正数の場合に
+記号の頭文字として出力する文字列.
\item[|symhead\string_negative|] \ParamString*|symbols|
-|lethead_flag| または |heading_flag| が負数の場合に数字・記号の頭文字として出力する文字列.
+|lethead_flag|(または |heading_flag| または |headings_flag|)が負数の場合に
+記号の頭文字として出力する文字列.
\item[|symbol|] \ParamString*||
-|symbol_flag| が|0|でない場合に,数字・記号の頭文字として出力する文字列.文字列が定義されて
-いれば,|symhead_positive| および |symhead_negative| より優先される(\SoftName{mendex}専用).
+|symbol_flag| が|0|でない場合に,記号の頭文字として出力する文字列.
+文字列が定義されていれば,|symhead_positive| および |symhead_negative| より
+優先される.(\SoftName{mendex}専用)
+
+\item[|numhead\string_positive|] \ParamString*|Numbers|
+|lethead_flag|(または |heading_flag| または |headings_flag|)が正数,
+かつ |symbol_flag| が|2|の場合に数字の頭文字として出力する文字列.
+
+\item[|numhead\string_negative|] \ParamString*|numbers|
+|lethead_flag|(または |heading_flag| または |headings_flag|)が負数,
+かつ |symbol_flag| が|2|の場合に数字の頭文字として出力する文字列.
\item[|symbol\string_flag|] \ParamNum|1|
-数字・記号の頭文字の出力フラグ.|0|のとき出力しない(\SoftName{mendex}専用).
+数字・記号の頭文字の出力フラグ.|0|のとき見出しを出力しない.
+|1|のとき数字を記号の一部として扱い記号の見出しを出力する.
+|2|のとき数字と記号を別の集合に分類し数字と記号の見出しを出力する.
+(\SoftName{mendex}専用,値|2|のサポートはv3.6以降)
\item[|letter\string_head|] \ParamNum|1|
-日本語の頭文字の出力のフラグ.|1|のときカタカナ,|2|のときひらがなで出力する
-(\SoftName{mendex}専用).
+日本語の頭文字の出力のフラグ.|1|のときカタカナ,|2|のときひらがなで出力する.
+(\SoftName{mendex}専用)
\item[|priority|] \ParamNum|0|
-英字と日本語との混在した索引語のソート方法についてのフラグ.|0|でなければ英字と日本語との
-間に半角スペースを入れた状態でソートする(\SoftName{mendex}専用).
+英字と日本語との混在した索引語のソート方法についてのフラグ.|0|でなければ英字と
+日本語との間に半角スペースを入れた状態でソートする.(\SoftName{mendex}専用)
\item[|character\string_order|] \ParamString*|SNEJ|
-記号,英字,日本語の優先順位.`|S|' は記号,`|N|' は数字,`|E|' は英字,`|J|' は日本語を表す
-(\SoftName{mendex}専用).
-\SoftName{mendex}では,後述のとおり,索引項目の分類として「数字」は「記号」に含める
-仕様としています\footnote{\SoftName{makeindex}では,記号類と数字を別のブロックに
-(|group\_skip|を挿入)しますが,\SoftName{mendex}では同一のブロックにします.}ので,
+記号,英字,日本語の優先順位.
+`|S|' は記号,`|N|' は数字,`|E|' は英字,`|J|' は日本語を表す.
+(\SoftName{mendex}専用)
+
+後述のとおり,|symbol_flag| が|1|以下の場合に\SoftName{mendex}は
+索引項目の分類として「数字」は「記号」に含める仕様としています
+\footnote{\SoftName{makeindex}では,記号類と数字を別のブロックに
+(|group\_skip| を挿入)しますが,\SoftName{mendex}では同一のブロックにします.}ので,
`|S|' と `|N|' は必ず隣り合わせてください(数字と数字以外の記号の順序入れ替えは可能です).
% もともと "SEJ" とドキュメントされていたが,実装に合わせて "SNEJ" と規定する.
% 以下の議論も参考に.
@@ -378,17 +413,20 @@
\begin{itemize}
\item \SoftName{makeindex}には索引項目の分類として「記号」,「アルファベット」の
他に,数字のみの項目として「数字」という分類がありますが,
- \SoftName{mendex}では数字は「記号」に含まれます.
- また,\SoftName{makeindex}に存在するスタイルパラメータのうち,
- |numhead_positive|と|numhead_negative|は認識されません.
+ \SoftName{mendex}では |symbol_flag| が|1|以下の場合に数字を「記号」に含めます.
+ また,そのとき\SoftName{makeindex}に存在するスタイルパラメータのうち,
+ |numhead_positive| と |numhead_negative| は認識されません.
+ \SoftName{mendex} v3.6以降では |symbol_flag| を|2|に設定すると「記号」と「数字」が
+ 区別され |numhead_positive| と |numhead_negative| は認識されます.
\item 数字・記号→欧文→和文の順にこだわらない索引の作成が可能です
- (|character_order|パラメータを追加).他に\SoftName{mendex}で追加された
+ (|character_order| パラメータを追加).他に\SoftName{mendex}で追加された
スタイルパラメータには,|symbol|,|symbol_flag|,|letter_head|,|priority|があります.
-\item \SoftName{makeindex}の |headings_flag| は,\SoftName{mendex}では
- |heading_flag| となっており,互いに互換性がありません.
- また,|lethead_flag|,|lethead_prefix|,|lethead_suffix|は,かつて\SoftName{makeindex}の
+\item \SoftName{makeindex}の |headings_flag| は,\SoftName{mendex} v3.5以前では
+ |heading_flag| となっており互換性がありませんでしたが,
+ \SoftName{mendex} v3.6に |headings_flag| が追加されました.
+ また,|lethead_flag|,|lethead_prefix|,|lethead_suffix| は,かつて\SoftName{makeindex}の
文書で言及されていましたが,現在は削除され\SoftName{mendex}専用となっています.
\item \SoftName{makeindex}の項目の並び順は,頭文字は
@@ -403,6 +441,21 @@
日本語の頭文字の区切りを切り換えるオプションになっています.
\end{itemize}
+% [TODO] 吉永徹美 著『LaTeX2e辞典 増補改訂版』(2018) の気になる記述
+% (2021-06-08 @aminophen)
+%
+% (1) p.512
+% 文字型の値として文字「'」を指定する場合,
+% mendex 用の ist ファイルでは「'''」と記述しますが,
+% makeindex 用の ist ファイルでは「'\''」と記述します.
+%
+% (2) p.516
+% makeindex を用いる場合には,page_precedence パラメータでの「r」などの順序を
+% 文書全体における「ページ番号の形式の変更順」に合わせておくと,
+% (idx ファイルを複数に分割している場合にも)索引項目でのページ番号リストを
+% 適切に並べ替えることができます.
+% → https://github.com/texjporg/tex-jp-build/issues/112 とも関連
+
\section{日本語の扱いについて}
\SoftName{mendex}は日本語の索引をできるだけ楽に扱えるようになっています.
@@ -601,12 +654,12 @@ postamble "\n\n\\end{theindex}\n"
これらの命令をプリアンブルで予め定義しておけば,それが優先されます.例えば
\begin{verbatim}
\newcommand{\makeidxhead}[1]{{\vbox{\hbox to \linewidth{%
- ■\hfill\sffamily\bfseries #1\hfill ■}\vskip1pt\hrule}}\nopagebreak}
+ \sffamily\bfseries ■\hfill #1\hfill ■}\vskip1pt\hrule}}\nopagebreak}
\end{verbatim}
とすれば見出しの表示形式が
\begingroup
\newcommand{\makeidxhead}[1]{{\vbox{\hbox to \linewidth{%
- ■\hfill\sffamily\bfseries #1\hfill ■}\vskip1pt\hrule}}\nopagebreak}
+ \sffamily\bfseries ■\hfill #1\hfill ■}\vskip1pt\hrule}}\nopagebreak}
\begin{minipage}{.3\linewidth}
\makeidxhead{あ}
\end{minipage}
diff --git a/info/ptex-manual/LICENSE b/info/ptex-manual/LICENSE
index 4309b809b8..65cd471041 100644
--- a/info/ptex-manual/LICENSE
+++ b/info/ptex-manual/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2017-2021 Japanese TeX Development Community
+Copyright (C) 2017-2022 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/info/ptex-manual/README.md b/info/ptex-manual/README.md
index aa2aa78556..9c872c4f25 100644
--- a/info/ptex-manual/README.md
+++ b/info/ptex-manual/README.md
@@ -36,6 +36,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2021-08-04
+2022-04-05
Japanese TeX Development Community
diff --git a/info/ptex-manual/eptex_resume.pdf b/info/ptex-manual/eptex_resume.pdf
index 7a91fe6e15..5b70a13ac9 100644
--- a/info/ptex-manual/eptex_resume.pdf
+++ b/info/ptex-manual/eptex_resume.pdf
Binary files differ
diff --git a/info/ptex-manual/eptexdoc.pdf b/info/ptex-manual/eptexdoc.pdf
index 1e5aa65c0e..6542ef9392 100644
--- a/info/ptex-manual/eptexdoc.pdf
+++ b/info/ptex-manual/eptexdoc.pdf
Binary files differ
diff --git a/info/ptex-manual/eptexdoc.tex b/info/ptex-manual/eptexdoc.tex
index e89ece5bcf..caa69a5297 100644
--- a/info/ptex-manual/eptexdoc.tex
+++ b/info/ptex-manual/eptexdoc.tex
@@ -27,16 +27,6 @@
\MakeShortVerb*{|}
%%%%%%%%%%%%%%%%
-% logos
-\newcommand{\OMEGA}{\texorpdfstring{$\Omega$}{Ω}}
-\protected\def\epTeX{$\varepsilon$\nobreakdash-\pTeX}
-\protected\def\eupTeX{$\varepsilon$\nobreakdash-\upTeX}
-\protected\def\eTeX{$\varepsilon$\nobreakdash-\TeX}
-\def\upTeX{u\pTeX}\def\pTeX{p\kern-.15em\TeX}
-\def\NTS{\leavevmode\hbox{$\cal N\kern-0.35em\lower0.5ex\hbox{$\cal T$}%
- \kern-0.2emS$}\,}
-\def\TeXXeT{\TeX-\reflectbox{\bfseries\TeX-}}
-
\makeatletter
{\lccode`\!=`\_
\lowercase{%
@@ -484,7 +474,7 @@ delimiter codeについても同様である.
\footnote{%
現在ではさらに状況が動き,
2021年以降は,\LaTeXe 自体が本節で述べたプリミティブを
- 要求する予定である(\cite{l2e31}).
+ 要求している(\cite{l2e31}).
}などからあり,
ほとんど\hologo{pdfTeX}における実装をそのまま真似する形で実装している.
@@ -715,17 +705,18 @@ min10フォントメトリックで「ちょっと」を組むと「ょっ」の
\csitem[\.{lastnodechar} (read-only integer)]
現在構築中のリストの「最後のノード」が文字由来であれば,
そのコード番号(内部コード)を内部整数として返す.
+ リストが空の場合,また
+ 「最後のノード」が文字を表すものでなかった場合は,$-1$が返る.
上記「最後のノード」では,\pTeX によって自動挿入される
\begin{itemize}
- \item JFMによって入るグルー
+ \item メトリック由来の空白(JFMグルー,カーン)
\item 行末禁則処理のために挿入されるペナルティ
\item 欧文文字のベースライン補正用のノード
\end{itemize}
- は無視される.また,「最後のノード」が欧文文字のリガチャであった場合は,
- リガチャそれ自身のコード番号ではなく,
- 最後の構成要素の文字のコード番号を返す.
- 「最後のノード」が文字を表すものでなかった場合は,$-1$が返る.
+ は無視される.また,現在の実装では「最後のノード」が欧文文字のリガチャで
+ あった場合は,リガチャそれ自身のコード番号ではなく,
+ 最後の構成要素の文字のコード番号を返すようにしている.
\end{cslist}
例えば,\.{lastnodechar}を使って
@@ -751,8 +742,9 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\begin{quote}
abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\end{quote}
-となり,見た目では同じ「fi」が\.{lastnodechar}実行時の「最後のノード」であるかのように見えても,
-それが合字の場合(左側)では\.{lastnodechar}の実行結果は最後の構成要素「i」のコード番号105となる.
+となり,見た目では同じ「fi」が\.{lastnodechar}実行時の「最後のノード」で
+あるかのように見えても,それが合字の場合(左側)では\.{lastnodechar}の
+実行結果は最後の構成要素「i」のコード番号105となる.
\begin{dangerous}
「|これは,|」とソース中に入力したときの
@@ -769,8 +761,8 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\JY1/hmc/m/it/10 ,
\glue(refer from jfm) 4.62341 minus 4.62341
\end{verbatim}
- しかし,数段落上の説明の通り,\.{lastnodechar}は\pTeX の和文処理によって自動的に挿入された
- これらJFM由来の空白を無視する.
+ しかし,数段落上の説明の通り,\.{lastnodechar}は\pTeX の和文処理によって
+ 自動的に挿入されたこれらJFM由来の空白を無視する.
\end{dangerous}
「最後のノード」を見ているので,
@@ -784,23 +776,60 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\end{quote}
と「,」の内部コードが取得される.
+
+%%%
+\ifnum\epTeXversion>220213
+\subsection{\.{lastnodefont}プリミティブ}
+\.{lastnodechar}を補完するものとして,\epTeX~220214 (\TeX~Live 2022)で実装された.
+\begin{cslist}
+ \csitem[\.{lastnodefont} (read-only font identifier)]
+ 現在構築中のリストの「最後のノード」が文字由来であれば,
+ そのフォント(内部識別子)を返す.
+ リストが空の場合,また
+ 「最後のノード」が文字を表すものでなかった場合は,|\nullfont|が返る.
+
+ ここでも「最後のノード」は\.{lastnodechar}と同様で
+ \begin{itemize}
+ \item メトリック由来の空白(JFMグルー,カーン)
+ \item 行末禁則処理のために挿入されるペナルティ
+ \item 欧文文字のベースライン補正用のノード
+ \end{itemize}
+ は無視される.
+\end{cslist}
+
+\TeX~Live 2020の\pTeX~(p3.8.3)で追加された\.{ifjfont}, \.{iftfont}と
+組み合わせれば,「最後のノード」が和文文字かどうかを判別できる
+\footnote{\epTeX では「\.{lastnodechar}が256以上かどうか」でも判別できるが,
+\eupTeX では文字コード0--255の和文文字ノードも存在しうることに注意.}.
+\fi
+%%%
+
+
\subsection{\.{lastnodesubtype}プリミティブ}
-\cite{tjb28,plt63}などの議論で,「最後のグルーがJFMグルーだけ\.{unskip}する」処理の必要性が
-唱えられてきた.\epTeX にはもともと最後のノードの種別を返す\.{lastnodetype}プリミティブが
+\cite{tjb28,plt63}などの議論で,「最後のグルーがJFMグルーの場合のみ
+\.{unskip}する」処理の必要性が唱えられてきた.
+\eTeX にはもともと最後のノードの種別を返す\.{lastnodetype}プリミティブが
あったが,これでは最後のノードがグルーであるかしかわからない.
-そのため,\epTeX~180226で\.{lastnodesubtype}プリミティブを追加した.
+そのため,\epTeX~180226で\.{lastnodetype}を補完するものとして,
+\.{lastnodesubtype}プリミティブを追加した.
\begin{cslist}
\csitem[\.{lastnodesubtype} (read-only integer)]
- 現在構築中のリストの「最後のノード」(\.{lastnodechar}プリミティブと同様)の
- subtype値を内部整数として返す.
+ 現在構築中のリストの最後のノードのsubtype値を内部整数として返す.
+ ここでの最後のノードは\.{lastnodetype}と同様である.
+ すなわち,\.{lastnodechar}や\.{lastnodefont}とは
\begin{itemize}
- \item 「最後のノード」が文字ノードのときは0が返る.
+ \item メトリック由来の空白(JFMグルー,カーン)
+ \item 行末禁則処理のために挿入されるペナルティ
+ \end{itemize}
+ も対象とするという点で異なる.
+ \begin{itemize}
+ \item 最後のノードが文字ノードのときは0が返る.
\item 現在構築中のリストが空のときは$-1$が返る.
%%%
\ifnum\epTeXversion>210629
- \item \epTeX~210701以降では,数式内のノードについてはsubtype値そのままではほとんど意味がないので,
- 次ページの表の値を返す.
+ \item \epTeX~210701以降では,数式内のノードについてはsubtype値
+ そのままではほとんど意味がないので,次ページの表の値を返す.
\fi
%%%
\end{itemize}
@@ -915,7 +944,8 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\footnotetext{\.{displaystyle}, \.{textstyle}, \.{scriptstyle}, \.{scriptscriptstyle}.}
なお,\verb+\left...[\middle]...\right+の直後で\.{lastnodesubtype}を使用しても,
\verb+\left...[\middle]...\right+全体が一つの内部数式(\.{mathinner})となるので,
- \.{right}に「対応する」\.{lastnodesubtype}の値は取得できない.\.{over}プリミティブなどによる分数についても類似の事情がある.
+ \.{right}に「対応する」\.{lastnodesubtype}の値は取得できない.
+ \.{over}プリミティブなどによる分数についても類似の事情がある.
\end{description}
\fi
%%%
@@ -1024,6 +1054,8 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\section{Unicode \TeX 由来の機能}
+
+\subsection{\.{Uchar}, \.{Ucharcat}プリミティブ}
\hologo{XeTeX}, \hologo{LuaTeX}には,文字コード<character code>を引数にとり
\emph{文字トークン}に展開される「\.{Uchar} <character code>」というプリミティブが存在する
\footnote{\.{char}は展開不能プリミティブであることに注意.}.また\hologo{XeTeX}には,
@@ -1108,6 +1140,25 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\end{dangerous}
+%%%
+\ifdefined\suppresslongerror %% e-pTeX 211207
+\subsection{エラー抑制(\.{suppress...error})}
+\hologo{LuaTeX}に実装されているエラー発生を抑止するプリミティブたちのうち
+いくつかを,\epTeX~211207で追加した.
+% 説明文は https://github.com/texjporg/tex-jp-build/pull/127 より
+\begin{cslist}
+ \csitem[\.{suppresslongerror} (integer)]
+ この内部整数が非ゼロのとき,\.{long}なしで定義されたマクロの引数に\.{par}が入った
+ 場合の \texttt{! Paragraph ended before \.{...} was complete.} というエラーを抑止する.
+ \csitem[\.{suppressoutererror} (integer)]
+ この内部整数が非ゼロのとき,\.{outer}由来のエラーを抑止する.
+ \csitem[\.{suppressmathparerror} (integer)]
+ この内部整数が非ゼロのとき,数式モード中の\.{par}に由来するエラーを抑止する.
+\end{cslist}
+\fi
+%%%
+
+
\section{\TeX~Liveによる拡張}
2021年以降の\epTeX/\eupTeX には,\TeX~Liveチームによって
\hologo{pdfTeX}及び\hologo{XeTeX}と共通の
@@ -1116,6 +1167,10 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
% * tracingstacklevels.ch (add |\tracingstacklevels| since TL2021)
% * partokenname.ch (add |\tracingstacklevels| since TL2022)
% の change file は e-(u)pTeX のみならず,素の\pTeX にも適用されている.
+% 残りの
+% * char-warning-eptex.ch (enhance |\tracinglostchars| since TL2021)
+% * showstream.ch (add |\showstream| since TL2022)
+% の change file は e-TeX からの変更であるため,素の\pTeX には適用されない.
\subsection{デバッグ機能(\.{tracing...})}
\begin{cslist}
@@ -1222,6 +1277,25 @@ abcfi\the\lastnodechar, abc\char"1C \the\lastnodechar
\fi
%%%
+%%%
+\ifdefined\showstream %% 2021-11-07
+\subsection{\.{show}系コマンドの出力制御}
+\begin{cslist}
+ \csitem[\.{showstream} (integer)]
+ 通常,\.{show}系コマンド\footnote{具体的には
+ \TeX82の\.{show}, \.{showbox}, \.{showlists}, \.{showthe}と
+ \eTeX の\.{showgroups}, \.{showifs}, \.{showtokens}が該当.
+ さらに\pTeX 系列では\.{showmode}も加わる.}は
+ エラー発生と同様に一旦停止し,種々の情報をターミナルやログファイルに出力する.
+ しかし,内部整数\.{showstream}の値をオープンな出力ストリーム(\.{openout}で
+ オープンされる)に一致させると,種々の情報の出力先がリダイレクトされ,
+ ターミナルやログファイルには出力せず一旦停止もしない.
+ 既定値は$-1$であり,これはファイルと一致しないため\TeX82と同じ動作となる.
+ 2021-11-07のコミットr60992(\TeX~Liveでは2022年以降)で追加された.
+\end{cslist}
+\fi
+%%%
+
\begin{comment}
\section{互換性}
@@ -1362,7 +1436,7 @@ $3$\,sp)だが,どこか気になるところである.
\url{https://github.com/latex3/latex2e/issues/95}
\bibitem{tjb81} 北川 弘典,「バイト列と和文文字トークンの区別」,2019/06/08.\\
\url{https://github.com/texjporg/tex-jp-build/issues/81}.
- \bibitem{tjb83} aminophen,「[e-pTeX] |\ifincsname|」,2019/07/09.\\
+ \bibitem{tjb83} aminophen,「[e-pTeX] \.{ifincsname}」,2019/07/09.\\
\url{https://github.com/texjporg/tex-jp-build/issues/83}.
\bibitem{tjb94} aminophen,「e(u)ptex: add |\current(x)spacingmode|, |\currentcjktoken|」,%
2019/10/28.\\
diff --git a/info/ptex-manual/jfm.pdf b/info/ptex-manual/jfm.pdf
index 7386fccf68..4d15ec2ab0 100644
--- a/info/ptex-manual/jfm.pdf
+++ b/info/ptex-manual/jfm.pdf
Binary files differ
diff --git a/info/ptex-manual/jfm.tex b/info/ptex-manual/jfm.tex
index 984f185f8a..0e8d9b1573 100644
--- a/info/ptex-manual/jfm.tex
+++ b/info/ptex-manual/jfm.tex
@@ -13,11 +13,7 @@
\def\size#1{\mathit{#1}}
\def\code#1{\texttt{#1}}
-\def\codechar#1{\ensuremath{\langle\mbox{\null\code{#1}\null}\rangle}}
-
-% logos
-\def\pTeX{p\kern-.10em\TeX}\def\upTeX{u\pTeX}
-\def\OMEGA{$\Omega$}
+\def\codechar#1{\ensuremath{\langle\mbox{\kern0pt\code{#1}\kern0pt}\rangle}}
\title{\emph{JFMファイルフォーマット}}
\author{ASCII Corporation \& Japanese \TeX\ Development Community}
@@ -136,7 +132,7 @@ JFMファイルでもTFMファイルと同じく,拡張子は\code{.tfm}が用
\item[\node{remainder} (8bits)]
\end{description}
-JFMでは$\size{bc}$は必ずゼロ\footnote{前節にある通り,文字コード及び
+JFMでは$\size{bc}$は必ずゼロ\footnote{前節にあるとおり,文字コード及び
文字タイプの項が0のものが必ず1つ存在するため.}なので,
1つのJFMに含まれる\node{char\_info}は全部で$\size{ec}+1$ワードになる.
@@ -275,14 +271,46 @@ JFMで扱うことができなかった.また,オリジナルの仕様で
それと同様である.2018年2月に日本語\TeX{}開発コミュニティによって,
\pTeX{}及びpPLtoTFで新たにサポートされた.
+\subsection{JFMフォーマットの制約事項}
-\section{JPLファイル}\label{jpl-format}
+冒頭に述べたとおり,文字タイプ(\node{char\_type})の上限は255であり,
+それに伴い可能な字幅も最大256種類しか許されない(さらに同じ字幅でも
+\node{glue}又は\node{kern}の挿入規則を変える場合はその分減る).
+しかし,実際のフォントでは字幅が256種類を超えることもあり,
+そのような時にJFMフォーマットは使用できない.
-TFMはバイナリ形式であるが,これをプロパティ(特性)という概念を使って
-テキスト形式で視覚化したものがPL (Property List)ファイルである.
-同様に,JFMをテキスト形式で視覚化したものが
-\emph{JPL (Japanese Property List)}ファイルである.
-JPLファイルでもPLファイルと同じく,拡張子は\code{.pl}が用いられる.
+例として,OTFパッケージ(japanese-otf) \cite{jotf}が提供する
+「ヒラギノフォントのプロポーショナル仮名を使う|\propshape|命令」では
+\begin{itemize}
+ \item 組版時に使われる\code{(up)phiraminw3-h.tfm}などの
+ 「(u)\pTeX 用JFM」は,約物類とプロポーショナル仮名のみに対応する
+ ので,字幅が256種類以内
+ \item VFを介して実際のフォントに割り当てられる
+ \code{hiramin-w3-h.tfm}などの「DVIドライバ用JFM」は,
+ Adobe-Japan1-5の20{,}317文字を全てCIDコード順に実際のフォントに
+ 即して定義しようとして,字幅が256種類を超えてしまう
+\end{itemize}
+という状況になっており,後者はJFMフォーマットで定義できない.
+
+一方で,\OMEGA で使われるOFMフォーマットは最大65{,}536種類の字幅を
+定義でき,かつ主要なDVIドライバ(\code{dvipdfmx}, \code{dvips})は
+JFMとOFMの両方に対応している.
+そこで\emph{あくまで回避策であるが},(u)\pTeX 用JFMはそのままに,
+機能しないDVIドライバ用JFMの代わりに「正しい字幅を定義したOFM」を
+用意して\code{dvipdfmx}や\code{dvips}に優先的に使わせるという方法が
+長らく用いられてきた.OTFパッケージが提供するOFMファイル群(|\CID|で
+使われる\code{otf-cjmr-h.ofm}\footnote{実はこちらは字幅が256種類
+以内であり,JFMフォーマットで十分対応できるが.}や|\propshape|で
+使われる\code{hiramin-w3-h.ofm}など)はこの目的で用意されている\cite{cidofm}.
+% メモ:\def\xspace{}
+% * OTFパッケージの|\CID|, |\propshape|では
+% DVIドライバ用JFMに割り当てるCMapは恒等変換|Identity-{H,V}|を指定
+% * \TL~2021以前の\code{dvips}では,
+% 回避策として用意された縦組用OFMがかえって邪魔となり不正な出力になった
+% (\code{-noomega}でOFMを無視する必要があった)が,
+% \TL~2022以降は「OFMの|FONTDIR RT|をJFMの|DIRECTION TATE|と同等に扱う」
+% という改修を入れており,
+% \code{otf-cj**-v.ofm}や\code{hira***-w*-v.ofm}もそれを利用するようにした
% -- tables begin
@@ -359,6 +387,91 @@ $\size{ng}$ & $\size{np}$ \\ \hline
\clearpage
+\section{JPLファイル}\label{jpl-format}
+
+TFMはバイナリ形式であるが,これをプロパティ(特性)という概念を使って
+テキスト形式で視覚化したものがPL (Property List)ファイルである.
+同様に,JFMをテキスト形式で視覚化したものが
+\emph{JPL (Japanese Property List)}ファイルである.
+JPLファイルでもPLファイルと同じく,拡張子は\code{.pl}が用いられる.
+
+和文用JPLに特有のプロパティとして,以下が存在する.
+
+\subsection{\code{CHARSINTYPE}}
+\code{CHARSINTYPE \codechar{1バイト長の整数} \codechar{任意個数の和文文字}}の
+形式で,文字タイプ\node{char\_type}及びそれに属する文字コードを設定する.
+以下に示すのは,開き括弧類を\node{char\_type}が1のグループに,
+閉じ括弧類を\node{char\_type}が2のグループに指定する例である(最初の
+\code{O 1}と\code{O 2}はそれぞれ8進数の1,2).
+\begin{verbatim}
+(CHARSINTYPE O 1
+ ( 〔 [ { 〈 《 「 『 【
+ )
+(CHARSINTYPE O 2
+ ) 〕 ] } 〉 》 」 』 】
+ )
+\end{verbatim}
+
+なお,\codechar{任意個数の和文文字}は直接入力のほか16進数コード値で与える
+こともできる.JISコードの場合は\code{J}で始め,UCSコード(\upTeX 専用)の
+場合は\code{U}で始める.
+以下の指定は上の例と等価である(例えば\codechar{(}はJIS~0x214A).
+\begin{verbatim}
+(CHARSINTYPE O 1
+ J 214A J 214C J 214E J 2150 J 2152 J 2154 J 2156 J 2158 J 215A
+ )
+(CHARSINTYPE O 2
+ J 214B J 214D J 214F J 2151 J 2153 J 2155 J 2157 J 2159 J 215B
+ )
+\end{verbatim}
+
+\subsection{\code{TYPE}}
+\code{TYPE \codechar{1バイト長の整数} \codechar{プロパティリスト}}の
+形式で,文字タイプ\node{char\_type}に含まれる文字の性質を定義する.
+欧文用PLの\code{CHARACTER}プロパティに相当するが,利用可能な下位のプロパティは
+\begin{itemize}
+ \item \code{CHARWD \codechar{実数値}}:文字の幅
+ \item \code{CHARHT \codechar{実数値}}:文字の高さ
+ \item \code{CHARDP \codechar{実数値}}:文字の深さ
+ \item \code{CHARIC \codechar{実数値}}:文字のイタリック補正値
+\end{itemize}
+に限られる(\code{NEXTLARGER}と\code{VARCHAR}は使えない).
+
+以下の例は,\pTeX の既定で使用している|min10.tfm|のソース|min10.pl|からの
+抜粋である.|min10.tfm|のデザインサイズは10.0\,ptであるので,これは
+文字タイプ0に含まれる文字の幅を9.62216\,pt,高さを7.77588\,pt,
+深さを1.38855\,ptという定義である.
+\begin{verbatim}
+(TYPE O 0
+ (CHARWD R 0.962216)
+ (CHARHT R 0.777588)
+ (CHARDP R 0.138855)
+ )
+\end{verbatim}
+
+\subsection{\code{GLUEKERN}}
+JFMの\node{glue\_kern}テーブルに収めるプログラムを記述する.
+欧文用PLの\code{LIGTABLE}と似ているが,\code{LIG}の代わりに\code{GLUE}を
+用いるところが異なる.
+% [TODO] 書きかけ
+
+\subsection{\code{DIRECTION}}
+\code{DIRECTION \codechar{文字列}}の形式で,日本語フォントの組方向を指定する.
+\codechar{文字列}の一文字目が|Y|であれば横組,|T|であれば縦組として扱う.
+未指定の場合はデフォルトで横組として扱う.
+(u)\pTeX と一緒に標準で配布しているものは,横組用に
+\begin{verbatim}
+(DIRECTION YOKO)
+\end{verbatim}
+を,縦組用に
+\begin{verbatim}
+(DIRECTION TATE)
+\end{verbatim}
+を指定している.
+
+\clearpage
+
+
\section{JFMを扱うプログラム}\label{jfm-program}
\pTeX と\upTeX ,あるいはそれらが生成したDVIを扱うプログラムが
@@ -529,7 +642,7 @@ JFMおよび和文VFを操作する種々の機能を提供するPerlスクリ
しばしば「|min10|系」と呼ばれる.
歴史が非常に古く,開発当時のドキュメントは残念ながらほとんど残っていない.
-以下は,株式会社アスキーによる「日本語\TeX version j1.7」\cite{jtex1.7}に
+以下は,株式会社アスキーによる「日本語\TeX\ version j1.7」\cite{jtex1.7}に
付属していたドキュメント|README.KANJI|からの抜粋である.
\begin{quotation}
@@ -574,13 +687,15 @@ I」を参照して下さい。(中略)
があります。
\end{quotation}
+\jfont\minten=min10 % used in this paragraph!
通常の和文フォントは正方形の仮想ボディに収まるようにデザインされるが,
-例えば公称10ポイントの|min10|は「幅9.62216pt,高さ7.77588pt,深さ1.38855pt」の
+例えば公称10ポイントの|min10|は「幅\the\fontcharwd\minten`漢,
+高さ\the\fontcharht\minten`漢,深さ\the\fontchardp\minten`漢」の
+% 幅9.62216pt,高さ7.77588pt,深さ1.38855pt
扁平な矩形でデザインされている($\mathrm{zw}=9.62216\,\mathrm{pt}$と
$\mathrm{zh}=9.16443\,\mathrm{pt}$が一致しない).
-また,例えば|ちょっと|が「ちょっと」ではなく
-「{\jfont\minten=min10 \minten ちょっと}」と詰まるなどの
-不自然な挙動も知られている\cite{min10otobe}.
+また,例えば|ちょっと|が「ちょっと」ではなく「{\minten ちょっと}」と
+詰まるなどの不自然な挙動も知られている\cite{min10otobe}.
ただし,\emph{互換性維持のため,コミュニティが修正を行う予定はない}.
\paragraph{JISフォントメトリック}
@@ -647,6 +762,12 @@ zw,zhの値を仮定した既存スタイルに影響を与えないように
\bibitem{jistfm}
奥村晴彦,「pLaTeX2e 新ドキュメントクラス」,2016/07/07,\\
|https://oku.edu.mie-u.ac.jp/~okumura/jsclasses/|
+ \bibitem{jotf}
+ Shuzaburo Saito,「Open Type Font用VF」,2019/04/01,\\
+ |https://psitau.kitunebi.com/otf.html|
+ \bibitem{cidofm}
+ Hironobu Yamashita,「otf-cjXX-X.ofm は何のため?」,2019/05/31,\\
+ |https://github.com/texjporg/japanese-otf-mirror/issues/15|
\end{thebibliography}
\end{document}
diff --git a/info/ptex-manual/ptex-guide-en.pdf b/info/ptex-manual/ptex-guide-en.pdf
index b5656817bf..71cae26336 100644
--- a/info/ptex-manual/ptex-guide-en.pdf
+++ b/info/ptex-manual/ptex-guide-en.pdf
Binary files differ
diff --git a/info/ptex-manual/ptex-guide-en.tex b/info/ptex-manual/ptex-guide-en.tex
index 470ee81d45..13fd54ccc6 100644
--- a/info/ptex-manual/ptex-guide-en.tex
+++ b/info/ptex-manual/ptex-guide-en.tex
@@ -53,17 +53,6 @@
% foreign text -> italic
\def\Foreign#1{\textit{#1}}
-% logos
-\def\eTeXpre{$\varepsilon$-}
-\def\eTeX{\leavevmode\hbox{\eTeXpre\TeX}}
-\def\epTeX{\leavevmode\hbox{\eTeXpre\pTeX}}
-\def\eupTeX{\leavevmode\hbox{\eTeXpre\upTeX}}
-\def\pTeX{p\kern-.10em\TeX}\def\upTeX{u\pTeX}
-\def\pLaTeX{p\LaTeX}\def\upLaTeX{u\pLaTeX}
-\def\pdfTeX{pdf\TeX}
-\def\OMEGA{$\Omega$}
-\def\TL{\TeX\ Live\xspace}
-
\def\_{\leavevmode\vrule width .45em height -.2ex depth .3ex\relax}
\frenchspacing
@@ -444,16 +433,16 @@ is to load a package \Pkg{mathfam256}\footnote{%
%%% 拡張プリミティブ
\subsection{Additional primitives and keywords}
-% -- as of r60088
+% -- as of r62095
% tex -ini: 322 multiletter control sequences
-% ptex -ini: 373 multiletter control sequences (= 322 + p:47 + TL:3 + SyncTeX: 1)
-% uptex -ini: 380 multiletter control sequences (= 373 + up:7)
-% eptex -ini: 386 multiletter control sequences
-% eptex -ini -etex: 480 multiletter control sequences (= 373 + e:66 + ep:41)
-% euptex -ini: 393 multiletter control sequences
-% euptex -ini -etex: 488 multiletter control sequences (= 380 + e:66 + ep:41 + eup:1)
-% etex (pdftex) -ini: 476 multiletter control sequences
-% etex (pdftex) -ini -etex: 545 multiletter control sequences
+% ptex -ini: 374 multiletter control sequences (= 322 + p:48 + TL:3 + SyncTeX: 1)
+% uptex -ini: 381 multiletter control sequences (= 374 + up:7)
+% eptex -ini: 388 multiletter control sequences
+% eptex -ini -etex: 486 multiletter control sequences (= 374 + e:66 + ep:45 + TL:1)
+% euptex -ini: 395 multiletter control sequences
+% euptex -ini -etex: 494 multiletter control sequences (= 381 + e:66 + ep:46 + eup:1 + TL:1)
+% etex (pdftex) -ini: 477 multiletter control sequences
+% etex (pdftex) -ini -etex: 546 multiletter control sequences
Here we provide only complete lists of additional primitives
of \pTeX\ family in alphabetical order.
@@ -464,6 +453,7 @@ The features of each primitive can be found in Japanese edition.
% [TODO] 追加されたバージョン情報は正しいか?
\def\New#1{--- New primitive since #1}
+\def\NewKey#1{--- New keyword since #1}
\def\NewMoved#1#2{--- Imported from #1, since #2}
%%% pTeX のやつ
@@ -499,6 +489,7 @@ The features of each primitive can be found in Japanese edition.
\csitem[\.{noautoxspacing}]
\csitem[\.{postbreakpenalty}]
\csitem[\.{prebreakpenalty}]
+ \csitem[\.{ptexlineendmode} \New{p4.0.0 (\TL2022)}]
\csitem[\.{ptexminorversion} \New{p3.8.0 (\TL2018)}]
\csitem[\.{ptexrevision} \New{p3.8.0 (\TL2018)}]
\csitem[\.{ptexversion} \New{p3.8.0 (\TL2018)}]
@@ -538,6 +529,7 @@ The features of each primitive can be found in Japanese edition.
%%% e-pTeX/e-upTeX の pdfTeX 由来
%%% e-pTeX/e-upTeX の Omega 由来
+%%% e-pTeX/e-upTeX の XeTeX/LuaTeX 由来
%%% その他の独自拡張
\subsubsection{\epTeX\ additions (available in \epTeX, \eupTeX)}
\begin{simplelist}
@@ -550,6 +542,7 @@ The features of each primitive can be found in Japanese edition.
\csitem[\.{ifincsname} \New{190709 (\TL2020)}]
\csitem[\.{ifpdfprimitive} \New{150805 (\TL2016)}]
\csitem[\.{lastnodechar} \New{141108 (\TL2015)}]
+ \csitem[\.{lastnodefont} \New{220214 (\TL2022)}]
\csitem[\.{lastnodesubtype} \New{180226 (\TL2018)}]
\csitem[\.{odelcode}]
\csitem[\.{odelimiter}]
@@ -579,9 +572,12 @@ The features of each primitive can be found in Japanese edition.
\csitem[\.{pdfstrcmp}]
\csitem[\.{pdfuniformdeviate} \New{161114 (\TL2017)}]
\csitem[\.{readpapersizespecial} \New{180901 (\TL2019)}]
+ \csitem[\.{suppresslongerror} \New{211207 (\TL2022)}]
+ \csitem[\.{suppressmathparerror} \New{211207 (\TL2022)}]
+ \csitem[\.{suppressoutererror} \New{211207 (\TL2022)}]
\csitem[\.{Uchar} \New{191112 (\TL2020)}]
\csitem[\.{Ucharcat} \New{191112 (\TL2020)}]
- \csitem[\.{vadjust} \texttt{pre} \New{210701 (\TL2022)}]
+ \csitem[\.{vadjust} \texttt{pre} \NewKey{210701 (\TL2022)}]
\csitem[\.{vfi}]
\csitem[\texttt{fi}\index{fi=\texttt{fi}}]
\end{simplelist}
@@ -606,6 +602,7 @@ Sync\TeX\ extension (available in \pTeX, \upTeX, \epTeX, \eupTeX):
\begin{simplelist}
\csitem[\.{partokencontext} \New{\TL2022}]
\csitem[\.{partokenname} \New{\TL2022}]
+ \csitem[\.{showstream} \New{\TL2022}] % only e-(u)pTeX, not (u)pTeX
\csitem[\.{tracingstacklevels} \New{\TL2021}]
\end{simplelist}
@@ -1024,6 +1021,7 @@ corresponding to the whole valid Japanese character code range.\label{jfont}
%%% 縦組は諦めよう
% [TODO] どこに書くか困ったので最後に:内部コードのアレな話
+%%% 和文文字コードは連続でない
\subsection{Internal kanji encodings}\label{kanji-internal}
The <character code> is a union of the following two:
@@ -1051,6 +1049,8 @@ where
\]
Therefore, the overall range of <character code> is \emph{not} continuous.
+%%% 和文文字の内部コードとして有効(is_char_kanji が真)かどうかの判定
+%%% → ! Bad character code. エラーを出さないために使える
To check whether an integer is a valid Japanese character code or not,
you can use \.{iffontchar} with \epTeX~190709 or later (\TL2020).
Suppose a count register |\mycount| stores an integer, you can do it as follows:
@@ -1064,6 +1064,24 @@ a representative non-empty\footnote{This assumption is always safe after
one of the standard \pTeX\ formats (e.g. plain \pTeX, \pLaTeX) is loaded.}
Japanese font containing all valid Japanese character code (see \ref{jfont}).
+%%% pTeX がサポートする文字集合は JIS X 0208 のみで,内部コードとして有効な範囲より狭い
+%%% → JIS X 0208 に含まれる文字を表す整数値の判定もできる
+Note that \pTeX\ (not including \upTeX\ with internal Unicode) does not
+support typesetting characters outside JIS~X~0208,
+which is a subset of accepted range of <character code> described above.
+To check if an integer is in the range of JIS~X~0208,
+you can use \.{toucs} with \pTeX~p3.10.0 or later (\TL2022):
+\begin{verbatim}
+ \ifnum\toucs\mycount>0
+ % \mycount is in the range of JIS X 0208
+ \fi
+\end{verbatim}
+The primitive \.{toucs} converts an integer value
+from an internal \Foreign{kanji} code to a Unicode.
+This conversion is based on JIS-Unicode mapping table,\footnote{Defined in
+\code{jisx0208.h} of \code{ptexenc} library.} and returns $-1$
+if no mapping is available for the input integer.
+
\newpage
diff --git a/info/ptex-manual/ptex-manual.pdf b/info/ptex-manual/ptex-manual.pdf
index 47c8812072..04e46db2e7 100644
--- a/info/ptex-manual/ptex-manual.pdf
+++ b/info/ptex-manual/ptex-manual.pdf
Binary files differ
diff --git a/info/ptex-manual/ptex-manual.sty b/info/ptex-manual/ptex-manual.sty
index 6d57f3c840..9956ef10b4 100644
--- a/info/ptex-manual/ptex-manual.sty
+++ b/info/ptex-manual/ptex-manual.sty
@@ -134,4 +134,18 @@
\def\dotfill{\leaders\hbox to.6em{\hss .\hss}\hskip\z@ plus1fill}%
\def\pfill{\unskip~\dotfill\nobreak}
+% logos
+\def\eTeXpre{\texorpdfstring{$\varepsilon$\protect\nobreakdash-}{ε-}}
+\def\eTeX{\eTeXpre\TeX}
+\def\epTeX{\eTeXpre\pTeX}\def\eupTeX{\eTeXpre\upTeX}
+\def\pTeX{\texorpdfstring{p\kern-.10em\TeX}{pTeX}}
+\def\upTeX{u\pTeX}\def\pLaTeX{p\LaTeX}\def\upLaTeX{u\pLaTeX}
+\def\NTS{\leavevmode\hbox{$\cal N\kern-0.35em\lower0.5ex\hbox{$\cal T$}%
+ \kern-0.2emS$}\,}
+\def\TeXXeT{\TeX-\reflectbox{\bfseries\TeX-}}
+\def\OMEGA{\texorpdfstring{$\Omega$}{Ω}}
+\def\pdfTeX{pdf\TeX}
+\def\TL{\TeX\ Live\xspace}
+\AtBeginDocument{\providecommand{\texorpdfstring}[2]{#1}}
+
%%% EOF
diff --git a/info/ptex-manual/ptex-manual.tex b/info/ptex-manual/ptex-manual.tex
index a2e2dc6247..2b11bd6e95 100644
--- a/info/ptex-manual/ptex-manual.tex
+++ b/info/ptex-manual/ptex-manual.tex
@@ -17,7 +17,6 @@
\usepackage{pxjahyper}
\usepackage{hologo}
\usepackage{makeidx}\makeindex
-
% common
\usepackage{ptex-manual}
@@ -48,11 +47,6 @@
\MakeShortVerb*{|}
%%%%%%%%%%%%%%%%
-% logos
-\def\epTeX{$\varepsilon$-\pTeX}\def\eTeX{$\varepsilon$-\TeX}
-\def\eupTeX{$\varepsilon$-\upTeX}\def\upTeX{u\pTeX}
-\def\pTeX{p\kern-.10em\TeX}
-
\def\_{\leavevmode\vrule width .45em height -.2ex depth .3ex\relax}
\frenchspacing
@@ -69,12 +63,10 @@
(以下,「コミュニティ版\pTeX 」)についてまとめたものである.
\pTeX はもともとアスキー株式会社によって開発された\footnote{最新版は
p3.1.11 (2009/08/17).\url{https://asciidwango.github.io/ptex/}}ので,
-しばしば「ASCII \pTeX 」と呼ばれる.
-コミュニティ版\pTeX は,ASCII \pTeX に幾つかの改良を加えた
-「ptexenc版\pTeX\footnote{2004年から2011年まで開発されていた,
-UNIX向け日本語\TeX ディストリビューションptetexや後継のptexliveの
-一部であった.なお,バージョン番号はASCII~\pTeX と同じとされた.}」を
-基にしている.そのため,オリジナルのASCII~\pTeX とは
+しばしば「アスキー\pTeX 」または「ASCII \pTeX 」と呼ばれる.
+コミュニティ版\pTeX は,日本語\TeX 開発コミュニティがアスキー\pTeX を
+国際的なディストリビューション(かつてのte\TeX や現在の\TeX~Live)へ
+導入するにあたって幾つかの改良を加えたものであり,オリジナルとは
動作が異なる点もあるので注意されたい.
\begin{itemize}
\item コミュニティ版\pTeX の開発元:\\
@@ -108,24 +100,100 @@ UNIX向け日本語\TeX ディストリビューションptetexや後継のptexl
% https://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=460
\TeX82で扱える文字コードの範囲は0--255であった.
-\pTeX ではこれに加えてJIS~X~0208の文字も利用可能になっている.
+\pTeX ではこれに加えてJIS~X~0208の文字も利用可能になっており,
+入力ファイルの文字コードはISO-2022-JP (jis),EUC-JP (euc),
+Shift-JIS (sjis)またはUTF-8 (utf8)に対応している.
+
+\begin{dangerous}
+ここでは,歴史に興味のある読者への情報として,アスキー\pTeX から
+現在のコミュニティ版\pTeX に至る文字コードの扱いの変遷を述べる.
+
+初期のアスキー\pTeX は「EUC版\pTeX 」「SJIS版\pTeX 」「JIS版\pTeX 」の
+3つのプログラムを別々に用意しており,一つの\pTeX バイナリでは文字コードが
+EUC-JP,Shift-JIS,ISO-2022-JPのどれか一つのファイルしか処理できなかった.
+% JIS のファイルなら EUC/SJIS どちらの ptex でも読み込めますが,
+% これも最初からではなく p2.1.5 (1997年) 以降のようで,
+% それまではスタイルファイルも EUC や SJIS にしておく必要があったようです.
+|-kanji| オプションが追加され,一つの\pTeX バイナリで複数の文字コードを
+選択処理できるようになったのは\pTeX~p3.0.1とp3.0.4の間(2002年10月頃)である.
+% http://tutimura.ath.cx/ptexlive/?ptexenc%2FDetails
+% の土村さんのコメント (2008-02-23) より
+
+コミュニティ版\pTeX は,UNIX向け日本語\TeX ディストリビューション
+ptetex\footnote{土村展之さんによって2004年から2009年まで開発.
+その後継のptexliveは,2010年に\pTeX が\TeX~Liveに取り込まれる際のベースに
+なった.}の開発過程で誕生した.
+2006年頃から文字コードがUTF-8のファイル入力への対応が進められ,2007年には
+文字コード変換を担う関数群が\code{ptexenc}というライブラリに切り出された.
+現在の\TeX~Liveでも\code{ptexenc}は種々のプログラムで利用されている.
+\end{dangerous}
+
+\subsection{ファイルの文字コードと内部コード}
+\pTeX への入力は,ファイルの文字コードそのままで扱われるとは限らず,
+\emph{内部コード}に変換されて内部処理に回される.ファイルの文字コードと
+内部コードは,それぞれ起動時のオプションによって制御できる.
+\begin{itemize}
+ \item |-kanji=|<encoding>
+ \begin{quotation}
+ 入出力テキストファイルの文字コードを指定する.\\
+ 利用可能な<encoding>の値:\code{euc}, \code{sjis}, \code{jis}, \code{utf8}
+ \end{quotation}
+ \item |-kanji-internal=|<encoding>
+ \begin{quotation}
+ 内部コードを指定する(INIモード専用\footnote{フォーマットファイルは
+ 内部コードに依存するので,実際の処理と整合性をとるため
+ virtual modeでは読み込んだフォーマットファイルと同じ内部コードで
+ 動作するように固定している.\pTeX\ p3.8.2以降の仕様.}).\\
+ 利用可能な<encoding>の値:\code{euc}, \code{sjis}
+ \end{quotation}
+\end{itemize}
+このとおり,\pTeX への入力を仮にUTF-8としても,
+必ずEUC-JPかShift-JISのいずれかの内部コードに変換されるため,
+\emph{\pTeX はJIS~X~0208外の文字をサポートしない}.
-\pTeX への入力は\emph{「7ビットASCII文字集合」に
-「ISO-2022-JP (jis),EUC-JP (euc),Shift-JIS (sjis)または
-UTF-8 (utf8)のいずれかでエンコードされたJIS~X~0208の文字集合」を
-加えたもの}として解釈される.
-なお,入出力ファイルの文字コードは,起動時のオプション|-kanji=|<encoding>に
-よって指定できる(可能な<encoding>の値は|utf8|,|euc|,|sjis|,|jis|).
+\pTeX の入出力ファイルの文字コードと内部コードは起動時のバナーから分かる.
+例えば
+\begin{verbatim}
+This is pTeX, Version 3.14159265-p3.8.0 (utf8.euc) (TeX Live 2018)
+(preloaded format=ptex)
+\end{verbatim}
+というバナーの場合は,|(utf8.euc)| から
+\begin{itemize}
+ \item 入出力ファイルの(既定)文字コードはUTF-8(但し,JIS~X~0208の範囲内)
+ \item \pTeX の内部コードはEUC-JP
+\end{itemize}
+という情報が見て取れる.入出力ファイルの文字コードと内部コードが同じ場合は,
+\begin{verbatim}
+This is pTeX, Version 3.14159265-p3.8.0 (sjis) (TeX Live 2018)
+(preloaded format=ptex)
+\end{verbatim}
+のように表示される.この例は,入出力ファイルの文字コードと内部コードが
+ともにShift-JISであることを示す.
+\begin{dangerous}
+上にはこのように書いたが,
+極めて細かい話をすれば,起動時のバナーは時にウソをつくので注意.
+ログファイルには記録されるバナーは常に正しい.これは以下の事情による.
+
+virtual modeでは,起動直後にバナーを表示してから,フォーマットファイル
+読込が行われる.この時点で初めて,起動時の内部コードとフォーマットの
+内部コードの整合性が確認される.ここでもし合致しなかった場合は,\pTeX は
+警告を表示してフォーマットに合った内部コードを選択し,以降の処理を行う.
+ログファイルはこの後にオープンされるため,そこには正しい内部コード
+(フォーマットと同じ内部コード)が書き込まれる\cite{build55}.
+
+このようなウソは,\pTeX に限らず\code{(preloaded format=***)}でも見られる.
+\end{dangerous}
+
+\subsection{和文文字と欧文文字の区別}
+\pTeX への入力は\emph{「7ビットASCII文字集合」に「あるファイルの文字コードで
+エンコードされたJIS~X~0208の文字集合」を加えたもの}として解釈される.
そして,以下の規則により欧文文字と和文文字に区別して取り扱われる.
-なお,内部コードは|-kanji-internal=|<encoding>によって変更できる
-(可能な値は|euc|,|sjis|)が,こちらはini modeでのフォーマット作成時
-に限られ,virtual modeでは不可である(フォーマットの内部コードと実際の
-処理の整合性をとるため,\pTeX\ p3.8.2以降の仕様).
\begin{itemize}
\item 7ビットASCII文字集合は欧文文字として扱われる.
\item 最上位ビットが1の場合,\pTeX はそのバイトで始まる列について
- EUC-JPまたはShift-JISのいずれかの内部コードへの変換を試みる.
+ ファイルの文字コードからEUC-JPまたはShift-JISのいずれかの
+ 内部コードへの変換を試みる.
和文文字の内部コードとして許される整数は
$256c_1+c_2$,但し$c_i\in C_i$であり,ここで
\begin{description}
@@ -136,13 +204,43 @@ UTF-8 (utf8)のいずれかでエンコードされたJIS~X~0208の文字集合
$C_2=\{\hex{40},\dots,\hex{7e}\}\cup\{\hex{80},\dots,\hex{fc}\}$.
\end{description}
である.この内部コードのパターンに合えば和文文字として扱われ,
- 合わなければ8ビット欧文文字のバイト列として扱われる.\footnote{例えば,
+ 合わなければ8ビット欧文文字のバイト列として扱われる\footnote{例えば,
入力ファイルの文字コードがUTF-8の場合,JIS~X~0208にない文字は
- UTF-8のバイト列として読み込まれる.}
+ UTF-8のバイト列として読み込まれる.}.
\end{itemize}
% 参考:kanji.c の |is_char_kanji| の実装
-% [TODO] 8ビット欧文文字の ^^ab 形式への変換について
+なお,\TeX82には「|^^|記法」という間接的な入力法があり,|^^ab|のように
+カテゴリーコード7の文字2つに続いて|0|--|9|, |a|--|f|のいずれかが2つ続くと
+それを16進文字コードとする文字入力がなされたのと同じ処理に回るが,
+\pTeX 系列ではこれは\emph{常に欧文扱い}される(アスキー\pTeX~3.1.4以降
+\footnote{\pTeX~3.1.8で制御綴内での扱いが改善された.また,
+コミュニティ版\pTeX~4.0.0で文字列化においても常に欧文扱いするように改修した.
+これについては\ref{sec:printkanji16bit}節を参照.}).
+
+最近(2010年代以降)では,\pTeX でもファイルの文字コードをUTF-8とする
+利用が増えてきた.
+コミュニティ版\pTeX では,\code{ptexenc}ライブラリによって
+UTF-8ファイル入力を内部コードEUC-JPまたはShift-JISに変換する際に
+以下の特殊な加工を行っている.
+% http://tutimura.ath.cx/ptetex/?UTF-8%C2%D0%B1%FE%282%29
+\begin{itemize}
+ \item Unicodeでのバラツキを同一視する多対一変換
+ \footnote{例えば,ソースファイル中の全角ダーシ(\code{U+2015})と
+ EMダーシ(\code{U+2014})は同一視され,内部的にはJISコード\code{"213D}と
+ して扱われ,ファイルに書き出される時は\code{U+2015}になる.}
+ \item BOMの無視(ファイル先頭に限らず)
+ \item 濁音・半濁音の合字処理
+ \item JISに変換できない文字を|^^ab|形式に変換
+ \footnote{例えば,ソースファイル中にçのような欧文文字を直接書くと,
+ これは和文文字の内部コードに変換できないため|^^c3^^a7|に変換される.}
+\end{itemize}
+なお,UTF-8ファイル出力時にはこのような加工の逆変換は行わない(入力時に
+加工されたままで出力される).
+
+このように\emph{\pTeX は入力を内部コードに変換する処理を含むため,
+オリジナルの\TeX や\pdfTeX などの欧文\TeX とは入力に関して必ずしも
+互換でない}ことに注意が必要である.
\begin{dangerous}
以上で述べた「内部コードの範囲」はJIS~X~0213の漢字集合1面(Shift-JISの場合は2面も)を
@@ -165,45 +263,7 @@ UTF-8 (utf8)のいずれかでエンコードされたJIS~X~0208の文字集合
意図通りに出力されるかは全くの別問題である.
\end{dangerous}
-\pTeX の入出力ファイルの文字コードと内部コードは起動時のバナーから分かる.
-例えば
-\begin{verbatim}
-This is pTeX, Version 3.14159265-p3.8.0 (utf8.euc) (TeX Live 2018)
-(preloaded format=ptex)
-\end{verbatim}
-というバナーの場合は,|(utf8.euc)| から
-\begin{itemize}
- \item 入出力ファイルの(既定)文字コードはUTF-8(但し,JIS~X~0208の範囲内)
- \item \pTeX の内部コードはEUC-JP
-\end{itemize}
-という情報が見て取れる.入出力ファイルの文字コードと内部コードが同じ場合は,
-\begin{verbatim}
-This is pTeX, Version 3.14159265-p3.8.0 (sjis) (TeX Live 2018)
-(preloaded format=ptex)
-\end{verbatim}
-のように表示される(この例は,入出力ファイルの文字コードと内部コードが
-ともにShift-JISの場合).
-
-\begin{dangerous}
-上にはこのように書いたが,
-極めて細かい話をすれば,起動時のバナーは時にウソをつくので注意.
-ログファイルには記録されるバナーは常に正しい.これは以下の事情による.
-
-virtual modeでは,起動直後にバナーを表示してから,フォーマットファイル
-読込が行われる.この時点で初めて,起動時の内部コードとフォーマットの
-内部コードの整合性が確認される.ここでもし合致しなかった場合は,\pTeX は
-警告を表示してフォーマットに合った内部コードを選択し,以降の処理を行う.
-ログファイルはこの後にオープンされるため,そこには正しい内部コード
-(フォーマットと同じ内部コード)が書き込まれる\cite{build55}.
-
-このようなウソは,\pTeX に限らず|(preloaded format=***)|でも見られる.
-\end{dangerous}
-
-なお,\pTeX はDVIファイル内の和文文字コードとしてはJISコードを出力する.
-ただし,|\special|命令の文字列は内部コードで符号化されたバイト列として書き出される.
-
-\section{文字コードの取得と指定}
-
+\subsection{文字コードの取得と指定}
\pTeX でも\TeX82と同様に,
バッククオート(|`|)を使って「|`あ|」のようにして和文文字の内部コードを
内部整数として得ることができる.欧文文字については,1文字の制御綴を
@@ -234,70 +294,15 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
有限オートマトンとして記述できる(\cite{topic}).
\pTeX では,和文文字には
16~($\mathit{kanji}$), 17~($\mathit{kana}$), 18~($\mathit{other\_kchar}$)の
-カテゴリーコードの3つのいずれかが
-割り当てられており,\pTeX の入力プロセッサの状態遷移図は
-\autoref{fig:ptex_input}のように\TeX82のそれを拡張したものになっている.
+カテゴリーコードのいずれかが割り当てられている,
-\autoref{fig:ptex_input}を見れば分かるように,
+また,\pTeX~p4.0.0での入力プロセッサは
+\ref{sec:ptex_input}節で述べるように\TeX82のそれを拡張したものになっている.
+後の\autoref{fig:ptex_input}を見れば分かるように,
(欧文文字直後の改行は空白文字扱いされるのと対照的に)
-\emph{和文文字直後の改行は何も発生しない}.和文文字の直後にグループ開始・終了が来て
-行が終わった場合も同様である.
-
-\begin{figure}[b]
-\small
-\[
-\entrymodifiers={++[o][F-]}
-\xymatrix{%
- *\txt{}&*\txt{}&*\txt{}&*\txt{}\\
- *\txt{}\ar[r]&
- \textit{N} \ar@(ur,ul)[rr]^{1,2,7,13,E}
- \ar[u]^{5\tpar, 14}
- \ar@(d,l)[]^{9\tign,10\tign}
- \ar@/_3em/[ddrr]^(0.55){J}
- \ar[dr]^(0.4){0}&*\txt{}
- &\textit{M}
- \ar[u]^-{5\tsp,14}\ar@/_.5em/[dd]_(0.7){J}
- \ar@/_3em/[lldd]_(0.85){10}
- \ar@(u,r)[]^{1,2,7,9\tign,13,E}
- \ar@/_1ex/[dl]_0&*\txt{}\\
- *\txt{}&*\txt{}&*+[F-]\txt{\mbox{制御綴読み取り}}
- \ar@{-->}@/^.5em/[dl]\ar@{-->}@/_1ex/[ur]\\
- *\txt{}&
- \textit{S}\ar@/^.5em/[ur]^-(0.4){0}
- \ar[d]^-{5,14}
- \ar@(d,l)^{9\tign,10\tign}
- \ar@(d,d)@/_3em/[rr]_{J}
- \ar@/_3em/[uurr]_(0.3){1,2,7,13,E}&*\txt{}&
- \textit{K}\ar[ul]^(0.3){0}\ar@/_.5em/[uu]_{7,13,E}
- \ar@/^1.5em/[ll]^{10}
- \ar@(d,r)[]_{1,2,9\tign,J}
- \ar[d]_-{5,14}
- &*\txt{}\\
- *\txt{}&*\txt{}&*\txt{}&*\txt{}
-%
-}
-\]
-\begin{itemize}
- \item 状態\textit{N} (new line),状態\textit{M} (middle of line),
- 状態\textit{S} (skipping spaces)は\TeX82と同じであるが,
- 新たに状態\textit{K} (middle of kanji)が追加されている.
- \item 矢印の上下に書いた数字はカテゴリーコードを表す.
- \item ``E''はカテゴリーコード3, 4, 6, 8, 11, 12の文字達を,
- ``J''は和文文字を表す.
- \item ``$5\tpar$''のような下付き添字は「挿入するトークン」を表している.
- 但し,``$9\tign$'', ``$10\tign$''はその文字を無視することを示している.
- \item 図中央の「制御綴読み取り」の後で$S$,~$M$どちらの状態になるかは,
- 次のように決まっている:
- \begin{itemize}
- \item 制御綴が「|\ |」のようなカテゴリーコード10の文字
- からなるコントロールシンボルのときは状態$S$に遷移する.
- \item 制御綴が「|\#|」「|\】|」のようなその他のコントロールシンボルのときは状態$M$に遷移する.
- \item 制御綴がコントロールワードのときは状態$S$に遷移する.
- \end{itemize}
-\end{itemize}
-\caption{\pTeX の入力プロセッサの状態遷移図}
-\label{fig:ptex_input}
-\end{figure}
+\emph{和文文字直後の改行は何も発生しない}.
+これは,日本語の原稿内では自由な箇所で改行が行えたほうが便利なためである.
+% jtexdoc.tex に記載あり
和文文字のカテゴリーコードの値による動作の違いは次のようになる:
\begin{itemize}
@@ -321,10 +326,10 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
\begin{cslist}
\csitem[\.{kcatcode} <character code>=<16--18>]
- 日本語\TeX 開発コミュニティ版の\pTeX では,和文文字のカテゴリーコード(|\kcatcode|)は
+ コミュニティ版\pTeX では,和文文字のカテゴリーコード(|\kcatcode|)は
DVI中の上位バイトごと(すなわち,JISコードでいう区ごと)に値が設定可能である
\footnote{%
- オリジナルのASCII~\pTeX では,内部コードの上位バイトごとに値が設定可能であった.
+ オリジナルのアスキー\pTeX では,内部コードの上位バイトごとに値が設定可能であった.
すなわち,内部コードがEUC-JPのときは区ごとに設定可能であったが,
内部コードがShift-JISのときは
$2n-1$区・$2n$区($1\leq n\leq 47$)は同一のカテゴリーコードを持つことになる.
@@ -346,18 +351,19 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
% * TeX Live 2019 rebuild 2019-05-30 (p3.8.2)
% * TeX Live 2020 (p3.8.3)
% * TeX Live 2021 (p3.9.0)
-
- なお,\upTeX においては,|\kcatcode|は大きく仕様変更されている.
\end{cslist}
\begin{dangerous}
- 例えば,以下のコードで定義される|\X|, |\Y|で引数終端をしめす「あ」には
- カテゴリーコードの情報は格納されない.そのため,|\X|,~|\Y|は全く同じ動作となる.
- \begin{verbatim}
+ 例えば,以下のコードで定義される|\X|, |\Y|で引数終端を示す「あ」には
+ カテゴリーコードの情報は格納されない.
+ そのため,\pTeX では|\X|,~|\Y|は全く同じ動作となる.
+\begin{verbatim}
\kcatcode`あ=16
\def\X#1あ{\message{X: #1}}
\kcatcode`あ=17
\def\Y#1あ{\message{X: #1}}
- \end{verbatim}
+\end{verbatim}
+ なお,\upTeX では|\kcatcode|は大きく仕様変更されており,
+ |\X|と|\Y|は異なる動作となる.
\end{dangerous}
\begin{dangerous}
@@ -367,10 +373,307 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
事実上は「16--18のどれかを格納可能な追加レジスタ」程度の使い方しかない.
\end{dangerous}
-% [TODO] 和文文字を含む文字列化の挙動
-% "kanji character " になることも明文化したい
-% どの \section に含めるかわからないのでとりあえずここに置く
-|\string|や|\meaning|などの文字トークン列生成については以下の通り:
+\subsection{\pTeX の入力プロセッサ【\pTeX~4.0.0での改修を含む】}\label{sec:ptex_input}
+\TeX82の入力プロセッサは有限オートマトンとして記述できる.\pTeX においてもその点は
+変わらないが,和文文字絡みで拡張されたものになっている.
+
+\begin{figure}[tb]
+\small
+\[
+\entrymodifiers={++[o][F-]}
+\xymatrix{%
+ *\txt{}&*\txt{}&*\txt{}&*\txt{}\\
+ *\txt{}\ar[r]&
+ \textit{N} \ar@(ur,ul)[rr]^{1,2,7,13,E}
+ \ar[u]^{5\tpar, 14}
+ \ar@(d,l)[]^{9\tign,10\tign}
+ \ar@/_3em/[ddrr]^(0.55){J}
+ \ar[dr]^(0.4){0}&*\txt{}
+ &\textit{M}
+ \ar[u]^-{5\tsp,14}\ar@/_.5em/[dd]_(0.7){J}
+ \ar@/_3em/[lldd]_(0.85){10}
+ \ar@(u,r)[]^{1,2,7,9\tign,13,E}
+ \ar@/_1ex/[dl]_0&*\txt{}\\
+ *\txt{}&*\txt{}&*+[F-]\txt{\mbox{制御綴読み取り}}
+ \ar@{-->}@/^1ex/[dl]\ar@{-->}@/_1ex/[ur]
+ \ar@{-->}@/^1ex/[rrr]
+ &*\txt{}&*\txt{}&\textit{T}
+ \ar@/^1ex/[lll]^(0.25){0}
+ \ar[llu]_{7,13,E}\ar[d]^-{5,14}\ar@/^1ex/[lld]^{1,2,J}
+ \ar@(u,r)[]^{9\tign,10\tign}
+ \\
+ *\txt{}&
+ \textit{S}\ar@/^.5em/[ur]^-(0.4){0}
+ \ar[d]^-{5,14}
+ \ar@(d,l)^{9\tign,10\tign}
+ \ar@(d,d)@/_3em/[rr]_{J}
+ \ar@/_3em/[uurr]_(0.3){1,2,7,13,E}&*\txt{}&
+ \textit{K}\ar[ul]^(0.3){0}\ar@/_.5em/[uu]_(0.3){7,13,E}
+ \ar@/^1.5em/[ll]^{10}
+ \ar@(d,r)[]_{1,2,9\tign,J}
+ \ar[d]_-{5,14}
+ &*\txt{}&*\txt{}\\
+ *\txt{}&*\txt{}&*\txt{}&*\txt{}
+%
+}
+\]
+ \centering
+ \parbox{35zw}{%
+ ``E''はカテゴリーコード3, 4, 6, 8, 11, 12の文字達を,``J''は和文文字を表す.\\
+ ``$5\tpar$''のような下付き添字は「挿入するトークン」を表す.\\
+ 但し,``$9\tign$'', ``$10\tign$''はその文字を無視することを示している.
+ }
+ \caption{\pTeX~p4.0.0(既定)の入力プロセッサの状態遷移図}
+ \label{fig:ptex_input}
+\end{figure}
+
+\autoref{fig:ptex_input}は\emph{\pTeX~p4.0.0既定時}における入力プロセッサの状態遷移図である.
+\TeX82から拡張された点,および説明が必要な点を以下に述べる.
+\begin{description}
+ \item[内部状態の追加] \TeX82 では状態\textit{N} (new line),状態\textit{M} (middle of line),
+ 状態\textit{S} (skipping spaces)という3状態であったが,\pTeX では
+ 次の2状態が追加された:
+ \begin{description}
+ \item[状態\textit{K}] 和文文字の直後.状態\textit{M}との差異は改行でスペースを出力しないこと.
+ \item[状態\textit{T}] 和文文字で終わるコントロールワードの直後.
+ 状態\textit{S}との差異はグループ開始・終了(|{|, |}|)での遷移先が
+ 状態\textit{M}でなく状態\textit{K}であること.
+ \end{description}
+ \item[「制御綴読み取り」後の状態] 以下のように決まっている:
+ \begin{itemize}
+ \item 制御綴が「|\ |」のようなカテゴリーコード10の文字
+ からなるコントロールシンボルのときは状態$S$に遷移する.
+ \item 制御綴が「|\#|」「|\】|」のようなその他のコントロールシンボルのときは状態$M$に遷移する.
+ \item 制御綴がコントロールワードのときは,
+ その名称の末尾の文字が欧文文字のときは状態$S$に,和文文字のときは状態$T$に遷移する.
+ \end{itemize}
+\end{description}
+
+実際には以下に説明する\.{ptexlineendmode}プリミティブによって,\pTeX の入力プロセッサの挙動は
+ある程度ユーザが制御できる.
+
+\begin{cslist}
+ \csitem[\.{ptexlineendmode}=<0--7>]
+ \pTeX の入力プロセッサの挙動を制御する.この値を2進法で$zyx$と表したとき
+ \footnote{%
+ つまり$x$は「一の位」,$y$は「二の位」,$z$は「四の位」である.
+ 8以上の値を指定した場合は,下位3~bitの値が使われる.
+ 負数を指定してもエラーは発生しないが,その場合の動作は未定義である.
+ },$x$,~$y$,~$z$の値は,それぞれ以下のような状態で行が終わった場合,
+ 改行が空白文字を発生させるかを制御する.
+ いずれも0では「空白文字を発生させない」,1では「空白文字を発生させる」.
+ \begin{description}
+ \item[$x$] 和文文字で終わるコントロールワードの直後にグループ開始・終了が1つ以上
+ \footnote{%
+ \pTeX では,このとき「改行が何も発生させない」挙動を伝統的にとってきた
+ (\TeX82からの改造量を減らしたかったのであろう).
+ この挙動の是非が\.{ptexlineendmode}実装の一要因となった.
+ }
+ \item[$y$] 和文文字からなるコントロールシンボルの直後
+ \item[$z$] (コントロールワード・コントロールシンボルの名称の一部でない)
+ 和文文字の直後にグループ開始・終了が1つ以上
+ \end{description}
+
+ このプリミティブは\pTeX~p4.0.0で追加された.既定値は0(つまり$x=y=z=0$).
+\end{cslist}
+\begin{dangerous}
+ 「和文文字からなるコントロールシンボルの直後にグループ開始・終了が1つ以上ある」状態で行が終了した場合,
+ 改行が空白文字を発生させるのは$y$,~$z$のうち少なくとも1つが1のときである.
+\end{dangerous}
+
+\begin{dangerous}
+ 従って,和文文字と行末の関係を例で示すと,以下のようになる:
+ \medskip
+
+ \begin{enumerate}
+ \itemsep\medskipamount
+ \item コントロールワード・コントロールシンボルの一部でない和文文字で行が終わった場合,
+ 改行は何も発生しない.
+
+ \medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+あいあ
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+あいあ
+い
+ \end{minipage}%
+
+ \item コントロールワード・コントロールシンボルの一部でない和文文字の直後に
+ グループ開始・終了(|{|, |}|)が1つ以上ある状態で行が終わった場合,
+ \.{ptexlineendmode}の値が0--3のとき,改行は何も発生しない.
+ 4--7のとき,改行は空白文字を発生する.
+
+ \medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=0
+{あいあ}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=0
+{あいあ}
+い
+ \end{minipage}%
+ \hfill\vrule\hfill\kern-2zw
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=4
+{あいあ}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=4
+{あいあ}
+い
+ \end{minipage}
+ \item 和文文字で終わるコントロールワードの直後にグループ開始・終了が
+ 1つ以上ある状態で行が終わった場合,
+ \.{ptexlineendmode}の値が偶数のとき,改行は何も発生しない.
+ 奇数のとき,改行は空白文字を発生する.
+
+ \medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=0
+\def\漢{あ}{\漢}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=0
+\def\漢{あ}{\漢}
+い
+ \end{minipage}%
+ \hfill\vrule\hfill\kern-2zw
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=1
+\def\漢{あ}{\漢}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=1
+\def\漢{あ}{\漢}
+い
+ \end{minipage}
+ \item 和文文字からなるコントロールシンボルで行が終わった場合,
+ \.{ptexlineendmode}の値が0,~1, 4,~5のとき,改行は何も発生しない.
+ 2,~3, 6,~7のとき,改行は空白文字を発生する.
+
+ \medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=0
+\def\】{あ}\】
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=0
+\def\】{あ}\】
+い
+ \end{minipage}%
+ \hfill\vrule\hfill\kern-2zw
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=2
+\def\】{あ}\】
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=2
+\def\】{あ}\】
+い
+ \end{minipage}
+ \item 和文文字からなるコントロールシンボルの直後にグループ開始・終了が1つ以上ある状態で行が終わった場合,
+ \.{ptexlineendmode}の値が0,~1のとき,改行は何も発生しない.
+ その他のとき,改行は空白文字を発生する.
+
+ \medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=0
+\def\】{あ}{\】}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=0
+\def\】{あ}{\】}
+い
+ \end{minipage}%
+ \hfill\vrule\hfill\kern-2zw
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=1
+\def\】{あ}{\】}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=1
+\def\】{あ}{\】}
+い
+ \end{minipage}
+ \par\medskip
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=2
+\def\】{あ}{\】}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=2
+\def\】{あ}{\】}
+い
+ \end{minipage}%
+ \hfill\vrule\hfill\kern-2zw
+ \begin{minipage}[t]{13zw}
+\begin{verbatim}
+\ptexlineendmode=4
+\def\】{あ}{\】}
+い
+\end{verbatim}
+ \end{minipage}\quad →\quad
+ \begin{minipage}[t]{5zw}
+\ptexlineendmode=4
+\def\】{あ}{\】}
+い
+ \end{minipage}
+ \medskip
+ \end{enumerate}
+\ptexlineendmode=0
+
+ なお,以前の\pTeX の入力プロセッサの挙動は
+ \begin{itemize}
+ \item \pTeX~p3.8.1以前(アスキー版も同じ)の挙動は|\ptexlineendmode=3|~($(x,y,z)=(1,1,0)$)
+ \item \pTeX~p3.8.2以降p3.10.0まで挙動は|\ptexlineendmode=1|~($(x,y,z)=(1,0,0)$)
+ \end{itemize}
+ としてそれぞれ再現できる(\cite{build87}).
+
+% * 欧文文字直後の改行では空白文字を発生させる
+% * コントロールワードや「\ 」の直後の改行は何も発生しない
+% * 「\ 」以外のコントロールシンボルの直後の改行は空白文字を発生させる
+% * 和文文字直後の改行は何も発生させない
+% * 和文文字→グループ境界 {, } が有限個という状態で行が終わった場合も,
+% 何も発生しない(!)
+% ref. https://qiita.com/h-kitagawa/items/de963380bd3e576ab4e3
+\end{dangerous}
+
+
+
+\subsection{和文文字の文字列化の挙動【\pTeX~4.0.0での改修を含む】}\label{sec:printkanji16bit}
+|\string|や|\meaning|などの文字トークン列生成については以下の通りである.
\begin{itemize}
\item 欧文文字は\TeX82と同様で,(文字コード32の空白を除き)
すべてカテゴリーコード12の文字トークンになるが,
@@ -383,7 +686,7 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
という問題があった.
\TeX~Live 2018の\pTeX~p3.8.1でこの問題は修正された(\cite{build37}).}.
\item 和文文字はそのカテゴリーコードによらず,|\meaning|すると
- \begin{itemize}
+ \begin{itemize}% すべて "kanji character " になる
\item \the\kcatcode`漢:\quad \texttt{\meaning 漢}
\item \the\kcatcode`あ:\quad \texttt{\meaning あ}
\item \the\kcatcode`):\quad \texttt{\meaning )}
@@ -391,6 +694,42 @@ virtual modeでは,起動直後にバナーを表示してから,フォー
となる.
\end{itemize}
+さて,\pTeX~version 3系列(\TeX~Live 2021まで)では|\meaning|,|\string|等の
+文字列化や制御綴名において和文文字と欧文文字の区別が失われてしまうケースがあった.
+% 途中の結果を一旦配列 |str_pool| に格納する処理で和欧文の区別が失われていた.
+\pTeX~4.0.0以降(\TeX~Live 2022)では,この状況でも
+和欧文の区別が維持される\cite{build81}.
+\begin{dangerous}
+\TeX~Live 2021では,ファイル文字コードUTF-8,内部コードEUC-JPの場合に例えば
+\begin{verbatim}
+ \def\fuga{^^c3^^bf 耽}\fuga
+ \meaning\fuga
+\end{verbatim}
+と入力すると,一行目は\def\fuga{^^c3^^bf 耽}「\code{\fuga}」であるのに対し
+二行目は「\code{macro:->耽 耽}」となっていた(\char\euc"C3BFはEUC-JPで
+\code{"C3BF}である.|^^c3^^bf|の代わりに直接\code{ÿ}と入力しても同様).
+また
+\begin{verbatim}
+ \catcode"C3=11 \catcode"BF=11
+ \def\耽{P} \def\^^c3^^bf{Q}
+\end{verbatim}
+としたときの|\meaning\耽|は「|macro:->Q|」であった.
+改修後の\TeX~Live 2022では,一つ目の例は
+ \def\fuga{^^c3^^bf 耽}「\code{\meaning\fuga}」% 和欧文が区別される
+であるし,二つ目の例は
+ \catcode"C3=11 \catcode"BF=11
+ \def\耽{P} \def\^^c3^^bf{Q}
+ 「\code{\meaning\耽}」% 和欧文が区別されるので "P" になるはず
+となる.
+% メモ:上の例は「^^c5^^bf <=> 顛」でもよかったのだが,
+% マニュアルの欧文フォント newtx/newtx で表示可能な文字にした.
+% 外部ファイル出力の変化例:
+% \label{ß}% % TL2021: <C3>^^9f => TL2022: ^^c3^^9f
+% \label{^^c3^^9f}% % TL2021: <C3>^^9f => TL2022: ^^c3^^9f
+% \label{ÿ}% % TL2021: 耽 => TL2022: ^^c3^^bf
+% \label{^^c3^^bf}% % TL2021: 耽 => TL2022: ^^c3^^bf
+\end{dangerous}
+
% jtex.tex の「ラインブレーク」を簡略化
\section{禁則}
\label{sec:kinsoku}
@@ -1269,8 +1608,8 @@ p3.1.2で復活したという経緯がある.}.
% luatexja.dtx より pTeX 用に移植
\begin{dangerous}
- 以上に挙げたプリミティブ(|\kuten|, |\jis|, |\euc|, |\sjis|, |\kansuji|)は
- 展開可能(expandable)であり,
+ 以上に挙げたプリミティブ(|\kuten|, |\jis|, |\euc|, |\sjis|, |\ucs|,
+ |\toucs|, |\kansuji|)は展開可能(expandable)であり,
内部整数を引数にとるが,実行結果は\emph{文字列}であることに注意
(\TeX82の|\number|, |\romannumeral|と同様).
@@ -1518,6 +1857,9 @@ has been |\let| equal to a non-active character token.
\pTeX でも通常2であるが,\pTeX の拡張DVI命令である|dir|が
使用されている場合のみ3にセットされる.
+% [TODO] 書き方を工夫したい.
+|\special|命令の文字列は内部コードで符号化されたバイト列として書き出される.
+
\begin{thebibliography}{99}
\bibitem{topic} Victor Eijkhout, \textit{\TeX\ by Topic, A \TeX nician's Reference},
Addison-Wesley, 1992.\\
@@ -1560,6 +1902,12 @@ has been |\let| equal to a non-active character token.
\bibitem{man4} aminophen, 「pTeX の和文文字トークンのカテゴリーコード」,
2019/04/22,\\
\url{https://github.com/texjporg/ptex-manual/issues/4}
+ \bibitem{build87} h-kitagawa, 「[ptex] [和字]+[ブレース]で終わっている行の行端の扱い」,
+ 2019/08/05,\\
+ \url{https://github.com/texjporg/tex-jp-build/issues/87}
+ \bibitem{build81} h-kitagawa, 「バイト列と和文文字トークンの区別」,
+ 2019/06/08,\\
+ \url{https://github.com/texjporg/tex-jp-build/issues/81}
\bibitem{dvistd0} TUG DVI Standards Working Group,
\textit{The DVI Driver Standard, Level 0}.\\
\url{https://ctan.org/pkg/dvistd}
diff --git a/language/japanese/jlreq/README-ja.md b/language/japanese/jlreq/README-ja.md
index 5fa67b371b..192995610f 100644
--- a/language/japanese/jlreq/README-ja.md
+++ b/language/japanese/jlreq/README-ja.md
@@ -528,7 +528,14 @@ JFMの名前は次の通りです.`[]`で囲まれている文字は設定に
- LaTeXのフック関連コードの多くを削除.(まだ安定していなそうなので.)
- `\RequirePackage{ifthen}`をやめた.
- upLaTeXにおける`\kcatcode`の再設定をやめた.
-
+* 2022-04-05
+ - `\jlreqsetup`に`warichu_opening`と`warichu_closing`を追加.
+ - 別行見出し周りのペナルティを少し調整.
+ - `\DeclareFontShape`後の`\selectfont`でエラーが出るバグ修正.
+ - `use_reverse_pagination`がうまく動いていなかったのを修正.
+ - 二番目の柱を使うと不自然に消えることがあるバグの修正.ついでに`\DeclarePageStyle`を書き直した.
+ - `\@makefntext`を調整.
+ - その他バグ修正.
--------------
Noriyuki Abe
diff --git a/language/japanese/jlreq/README.md b/language/japanese/jlreq/README.md
index 6703885bdd..9c4454ef73 100644
--- a/language/japanese/jlreq/README.md
+++ b/language/japanese/jlreq/README.md
@@ -162,7 +162,15 @@ This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENS
- Removed many codes relating with LaTeX hooks mechanism (because it seems not stable.)
- Removed `\RequirePackage{ifthen}`.
- Removed `\kcatcode`settings with upLaTeX.
-
+* 2022-04-05
+ - Added `warichu_opening` and `warichu_closing` to `\jlreqsetup`.
+ - Change a little bit penalties around block heading.
+ - Fixed a bug: `\selectfont` after `\DeclareFontShape` raised an error.
+ - Fixed a bug: `use_reverse_pagination` did not work.
+ - Fixed a bug: A second running head disappeared sometimes.
+ - Rewrote `\DeclarePageStyle`.
+ - Deleted `\@makefntext`, define `\@makefntext` directly.
+ - Fixed other bugs.
--------------
Noriyuki Abe
diff --git a/language/japanese/jlreq/jlreq-ja.pdf b/language/japanese/jlreq/jlreq-ja.pdf
index a4fbea437d..f6d242e355 100644
--- a/language/japanese/jlreq/jlreq-ja.pdf
+++ b/language/japanese/jlreq/jlreq-ja.pdf
Binary files differ
diff --git a/language/japanese/jlreq/jlreq.cls b/language/japanese/jlreq/jlreq.cls
index a06ad633fc..2f94644b9e 100644
--- a/language/japanese/jlreq/jlreq.cls
+++ b/language/japanese/jlreq/jlreq.cls
@@ -5,25 +5,32 @@
%%
% (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/)
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{jlreq}[2021/11/05 jlreq]
+\ProvidesClass{jlreq}[2022/04/05 jlreq]
\RequirePackage{l3keys2e}
\RequirePackage{etoolbox}
-\RequirePackage{jlreq-helpers}
+\RequirePackage{jlreq-helpers}[2021/08/12]
\ExplSyntaxOn
-\tl_new:N \l_jlreq_tmpa_tl
+\int_new:N \l__jlreq_tmpa_int
+\tl_new:N \l__jlreq_tmpa_tl
+\tl_new:N \l__jlreq_tmpb_tl
+\tl_new:N \l__jlreq_tmpc_tl
\cs_new:Nn \l_jlreq_do: {}
-\str_new:N \l_jlreq_tmpa_str
-\str_new:N \l_jlreq_tmpb_str
-\str_new:N \l_jlreq_tmpc_str
+\str_new:N \l__jlreq_tmpa_str
+\str_new:N \l__jlreq_tmpb_str
+\str_new:N \l__jlreq_tmpc_str
\bool_new:N \l_jlreq_tmpa_bool
\clist_new:N \l_jlreq_tmpa_clist
-\seq_new:N \l_jlreq_tmpa_seq
-\dim_new:N \l_jlreq_tmpa_dim
+\seq_new:N \l__jlreq_tmpa_seq
+\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
+\prop_new:N \l__jlreq_tmpa_prop
+
+\tl_new:N \l__jlreq_result_tl
+\prop_new:N \l__jlreq_result_prop
\cs_set:Nn \__jlreq_undeferr:n {\ClassError{jlreq}{Trying~to~delete~\string#1~even~though~it~is~not~defined,~may~be~a~bug}{\@ehc}}
% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする
@@ -66,11 +73,29 @@
\expandafter\endgroup
\jlreq@do
}
+
\def\jlreq@useoriginalcs#1{%
\jlreq@if{\ifcsname jlreq@original@#1\endcsname\fi}%
{\csname jlreq@original@#1\endcsname}%
{#1}%
}
+\def\jlreq@useoriginalcs@witharguments#1#2{%
+ \group_begin:
+ \tl_set:Nx \l__jlreq_do_tl {
+ \exp_not:n{\escapechar=`\\\relax}%
+ \exp_not:n{\catcode`@=11\relax}%
+ \exp_not:N \scantokens{%
+ \jlreq@if{\ifcsname jlreq@original@#1\endcsname\fi}%
+ {\exp_not:o {\csname jlreq@original@#1\endcsname}}%
+ {\exp_not:o {\csname #1\endcsname}}%
+ \exp_not:n {#2}%
+ }
+ \exp_not:N \catcode`@=\the\catcode`@\exp_not:N \relax
+ \exp_not:N \escapechar=\the\escapechar\exp_not:N \relax
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+}
\def\jlreq@restoreoriginalcs#1{%
\jlreq@if{\ifcsname jlreq@original@\expandafter\@gobble\string#1\endcsname\fi}%
{\expandafter\let\expandafter#1\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}{}%
@@ -113,8 +138,7 @@
}
\keys_define:nn { jlreq } {
paper .code:n = {
- \str_case:nVF {#1} \g__jlreq_papersizelist_tl
- {
+ \str_case:nVF {#1} \g__jlreq_papersizelist_tl {
\jlreq@helper@dividebycomma{#1}%
\legacy_if:nTF { jlreq@result } {
\setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}
@@ -303,13 +327,13 @@
%.. 柱とノンブル
% 本文とヘッダ/フッタの間の空き
-\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos}
+\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@headfoot@verticalpos
% 柱やノンブルの左右の空き
-\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin}
+\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin }
%.. 段間
-\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap}
+\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap }
\__jlreq_aftercls_addtodeletecs:N \jlreq@option@column@gap
%.. 行送り,指定無しの場合は文字サイズの1.7倍とする.(1.5から2倍が好ましい:2.4.2.d 注3)
@@ -500,7 +524,7 @@
% #1の先頭が文字か
\long\def\jlreq@ifletter#1{%
- \jlreq@iffirsttoken{#1}{ }{\@secondoftwo}{%
+ \jlreq@iffirsttoken{#1}{~}{\@secondoftwo}{%
\expandafter\expandafter\expandafter\jlreq@helper@ifletter\jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@
}%
}
@@ -805,25 +829,29 @@
\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}
- \tl_if_in:NnTF \l_jlreq_tmpa_tl { jfm=jlreq} {
- \tl_if_in:NnTF \l_jlreq_tmpa_tl { jfm=jlreqv }{
- \tl_replace_all:Nnn \l_jlreq_tmpa_tl { jfm=jlreqv } { jfm=jlreqv-jidori }
+ \tl_set:Nx \l__jlreq_tmpa_tl {#5}
+ \tl_if_in:NnTF \l__jlreq_tmpa_tl { jfm=jlreq} {
+ \tl_if_in:NnTF \l__jlreq_tmpa_tl { jfm=jlreqv }{
+ \tl_replace_all:Nnn \l__jlreq_tmpa_tl { jfm=jlreqv } { jfm=jlreqv-jidori }
}{
- \tl_replace_all:Nnn \l_jlreq_tmpa_tl { jfm=jlreq } { jfm=jlreq-jidori }
+ \tl_replace_all:Nnn \l__jlreq_tmpa_tl { jfm=jlreq } { jfm=jlreq-jidori }
}
\cs_set:Nx \l_jlreq_do: {
- \exp_not:n{ \jlreq@useoriginalcs{DeclareFontShape} {#1} {#2} {#3} { #4-jidori } }
- { \tl_use:N \l_jlreq_tmpa_tl } {#6}
+ \exp_not:N \jlreq@useoriginalcs@witharguments{DeclareFontShape} {
+ \exp_not:n { {#1} {#2} {#3} { #4-jidori } }
+ { \tl_use:N \l__jlreq_tmpa_tl } { \exp_not:n {#6} }
+ }
}
}{
- \tl_if_in:NnT \l_jlreq_tmpa_tl {<->ssub} {
- \cs_set:Nn \l_jlreq_do: {\jlreq@useoriginalcs{DeclareFontShape} {#1} {#2} {#3} { #4-jidori } {#5} {#6} }
+ \tl_if_in:NnT \l__jlreq_tmpa_tl {<->ssub} {
+ \cs_set:Nn \l_jlreq_do: {
+ \jlreq@useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} { #4-jidori } {#5} {#6} }
+ }
}
}
}
\exp_after:wN \group_end: \l_jlreq_do:
- \jlreq@useoriginalcs{DeclareFontShape} {#1} {#2} {#3} {#4} {#5} {#6}
+ \jlreq@useoriginalcs@witharguments{DeclareFontShape} { {#1} {#2} {#3} {#4} {#5} {#6} }
}
\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}{}
@@ -890,16 +918,17 @@
\edef\jlreq@charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq@engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚
%.. 行頭括弧調整
-\jlreq@saveoriginalcs{item}
\ifx l\jlreq@engine
% \itemの直後は折り返し行頭と同じにする.
+ \jlreq@saveoriginalcs{@item}
\cs_set:Nn \__jlreq_hook_everypar: {}
- \renewcommand*{\item}{%
+ \def\@item[#1]{%
\cs_set:Nn \__jlreq_hook_everypar: { \cs_set:Nn \__jlreq_hook_everypar: {} \inhibitglue }
+ \jlreq@useoriginalcs{@item}[#1]%
\expandafter\everypar\expandafter{\the\everypar\__jlreq_hook_everypar:}
- \jlreq@useoriginalcs{item}%
}
\else
+ \jlreq@saveoriginalcs{item}
\AtBeginDocument{\PushPostHook{par}{\jlreq@hook@everypar}}
\def\jlreq@hook@everypar{}
% 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処.
@@ -1156,7 +1185,7 @@
\ifx l\jlreq@engine
{
\catcode` =\active
- \global\let =\jlreq@zenkakuspace@main
+ \protected\gdef {\futurelet\jlreq@nextchar\jlreq@zenkakuspace@ignorespaces}
}
\AtBeginDocument{\catcode` =\active}
\fi
@@ -1651,7 +1680,7 @@
%. システム設定
%.. 逆ノンブル
\ifjlreq@option@use@reverse@pagination
- \AtEndDocument{\clearpage\jlreq@reference@immediate@write{lastpage}{\noexpand\arabic{page}}}%
+ \AtEndDocument{\clearpage\jlreq@reference@immediate@write{lastpage}{\arabic{page}}}%
\def\c@jlreqreversepage{\numexpr\jlreq@reference@ref{lastpage}{0} - \c@page + 1\relax}
\def\thejlreqreversepage{\arabic{jlreqreversepage}}
\fi
@@ -1895,9 +1924,8 @@
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
\exp_not:o {\jlreq@tempb}%
}%
- \def\@tempa##1##2##3{##1}%
+ \long\def\@tempa##1##2##3{##1}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
- \noexpand\allowbreak
\exp_not:o {\@tempa#4}%
\exp_not:o {\jlreq@resulta}%
\ifjlreq@tempa\unexpanded{%
@@ -1905,11 +1933,11 @@
\edef\jlreq@BlockHeading@currentpage{\the\jlreq@currentpage}%
}\fi
}%
- \def\@tempa##1##2##3{##2}%
+ \long\def\@tempa##1##2##3{##2}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@format@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
\exp_not:o {\@tempa#4}%
}%
- \def\@tempa##1##2##3{##3}%
+ \long\def\@tempa##1##2##3{##3}%
\expandafter\xdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{%
\exp_not:o {\jlreq@resultc}%
\ifjlreq@tempa\unexpanded{%
@@ -2115,13 +2143,13 @@
\jlreq@tempskipa=0pt
\jlreq@tempskipb=0pt
\jlreq@tempskipc=0pt
- \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
+ \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
- \tl_set_rescan:Nnn \l_jlreq_tmpa_tl {\ExplSyntaxOn}{#2}
- \__jlreq_BlockHeading_start_analyzespace:V \l_jlreq_tmpa_tl
+ \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}%
@@ -2212,7 +2240,6 @@
% 行取り情報をゲットだぜ
% \jlreq@resultに{1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}を入れる
% #2#3#4はそれぞれ前空き,後ろ開き,トータル行数のデフォルト値
-% *つきは\setkeys*を使う.[]はkeyvalのファミリー.
\def\jlreq@BlockHeading@gyodori@parsekeyval{%
\@ifstar{\jlreq@BlockHeading@gyodori@parsekeyval@{*}}{\jlreq@BlockHeading@gyodori@parsekeyval@{}}%
}
@@ -2241,11 +2268,16 @@
\keys_set:nn {#2} {#3}
% before/after_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:NF \l__jlreq_before_lines_tl { \tl_set:Nx \l__jlreq_before_space_tl {\exp_not:o {\l__jlreq_before_lines_tl} \exp_not:N \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:NF \l__jlreq_after_lines_tl { \tl_set:Nx \l__jlreq_after_space_tl { a:\exp_not:o {\l__jlreq_after_lines_tl} \exp_not:N \baselineskip } }
\tl_if_empty:NT \l__jlreq_after_space_tl { \tl_set:Nn \l__jlreq_after_space_tl {#5} }
+ % 内部での空き指定は[asr]:(寸法)の形
+ % prefixのasrは次の意味:
+ % r -> before/after_spaceの指定
+ % a -> before/after_linesの指定
+ % s -> beforelinesの指定だが*つき.
\cs_set:Nx \l__jlreq_do: {
\exp_not:n {\def\jlreq@result}{
{\exp_not:o {\l__jlreq_before_space_tl } }
@@ -2510,7 +2542,11 @@
{}{}%
}%
}%
- {{}{\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}}%
+ {{\exp_not:n {
+ \par
+ \addpenalty\@secpenalty
+ \addvspace{0pt}\relax % 改ページ関係(#54,#100),よくわかっていない
+ }}{\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}}%
}}%
\noexpand\def\exp_not:c {#1}{\exp_not:c {jlreq@headingcs@#1}}%
}%
@@ -2554,7 +2590,7 @@
% \jlreq@BlockHeading@spaces@current@after@<n>
% : n番目の見出しの後ろに出すもの
% \jlreq@BlockHeading@spaces@current@count
-% : 現在いくつ目の連続する見出しを処理しているかのカウンター
+% : 現在いくつの連続する見出しを処理しているかのカウンター
\newcount\jlreq@BlockHeading@spaces@current@count
\jlreq@BlockHeading@spaces@current@count=0
\def\jlreq@BlockHeading@spaces@current@sequence{}
@@ -2973,22 +3009,22 @@
% 一行で処理したときの見出し長さを計測
\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}
+ \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} {
+ \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 }{
+ \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_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}%
+ \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}
}
@@ -3077,25 +3113,25 @@
\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}
+ \tl_set:Nn \l__jlreq_tmpa_tl {#2}
+ \str_set:Nn \l__jlreq_tmpa_str {#2}
\str_case_e:nn { \jlreq@HeadingType {#1} } {
{ BlockHeading } {
\bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l_jlreq_tmpa_str { before_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l_jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l_jlreq_tmpa_tl {before_lines={},} }
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
+ \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} }
\bool_set_false:N \l_jlreq_tmpa_bool
- \str_if_in:NnT \l_jlreq_tmpa_str { after_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \str_if_in:NnT \l_jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
- \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l_jlreq_tmpa_tl {after_lines={},}}
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l_jlreq_tmpa_bool }
+ \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool }
+ \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}}
}
}
\cs_set:Nx \l_jlreq_do: {
\exp_args:Nc \exp_not:o { jlreq@heading@type@#1 }
{ \exp_not:n { #1 } }
{ \exp_args:Nc \exp_not:o { jlreq@heading@level@#1 } }
- { \exp_args:Nc \exp_not:o { jlreq@heading@setting@#1 },\exp_not:V \l_jlreq_tmpa_tl }
+ { \exp_args:Nc \exp_not:o { jlreq@heading@setting@#1 },\exp_not:V \l__jlreq_tmpa_tl }
}
\exp_after:wN \group_end:
\l_jlreq_do:
@@ -3257,7 +3293,6 @@
}
}
-\newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}}
\keys_define:nn { jlreqsetup } {
footnote_second_indent .code:n = {
\legacy_if:nF { @tate }{
@@ -3266,27 +3301,29 @@
( \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).}}
}
- \cs_set:Npn \jlreq@makefntext ##1 {
- \skip_if_eq:nnF { #1 } { 0pt } { \addtolength{\leftskip}{\glueexpr #1\relax} }
- % インデントの計算:脚注の長さが文字の整数倍になるように字下げする(4.2.5.b)
- \group_begin:
- \@tempdima=\dimexpr\columnwidth - \jlreq@footnoteindent\relax
- \@tempdimb=1\jlreq@zw
- \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
- \cs_set:Nx \l__jlreq_do: {
- \exp_not:N \addtolength { \exp_not:N \leftskip } {\dim_eval:n { \columnwidth - \@tempdima - 0.0001pt } }
- \exp_not:n {
- \parindent=1\jlreq@zw
- \noindent
- \hskip-\glueexpr #1\relax
- \jlreq@referencemark@format{\@thefnmark}%
- \hskip\glueexpr 1\jlreq@zw\relax
+ % ほかからの更新があったならばこれ以上触らない.
+ \jlreq@if{\ifx\jlreq@saved@@makefntext\@makefntext\fi}{
+ \cs_set:Npn \@makefntext ##1 {
+ \skip_if_eq:nnF { #1 } { 0pt } { \addtolength{\leftskip}{\glueexpr #1\relax} }
+ % インデントの計算:脚注の長さが文字の整数倍になるように字下げする(4.2.5.b)
+ \group_begin:
+ \@tempdima=\dimexpr\columnwidth - \jlreq@footnoteindent\relax
+ \@tempdimb=1\jlreq@zw
+ \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb
+ \cs_set:Nx \l__jlreq_do: {
+ \exp_not:N \addtolength { \exp_not:N \leftskip } {\dim_eval:n { \columnwidth - \@tempdima - 0.0001pt } }
}
- }
- \exp_after:wN \group_end:
- \l__jlreq_do:
- ##1
- }
+ \exp_after:wN \group_end:
+ \l__jlreq_do:
+ \parindent=1\jlreq@zw
+ \noindent
+ \hskip-\glueexpr #1\relax
+ \hbox{\jlreq@referencemark@format{\@thefnmark}}%
+ \hskip\glueexpr 1\jlreq@zw\relax
+ ##1%
+ }
+ \let\jlreq@saved@@makefntext=\@makefntext
+ }{}
}
}
@@ -3590,7 +3627,7 @@
\jlreq@tempafalse % headingsが指定された
\jlreq@tempbfalse % paragraphが指定された
% \jlreq@tempcにセクション名たちを入れていく
- \seq_clear:N \l_jlreq_tmpa_seq
+ \seq_clear:N \l__jlreq_tmpa_seq
\clist_map_variable:nNn {#1} \jlreq@tempa {
\tl_set:Nx \@tempa { \tl_trim_spaces:o \@tempa }
\str_case_e:nnF {\jlreq@tempa} {
@@ -3601,7 +3638,7 @@
}
}{
\str_if_eq:eeTF { \str_head:N \jlreq@tempa } {_} {
- \seq_put_left:Nx \l_jlreq_tmpa_seq { \tl_tail:N \jlreq@tempa }
+ \seq_put_left:Nx \l__jlreq_tmpa_seq { \tl_tail:N \jlreq@tempa }
}{
\ClassError{jlreq}{Invalid~value~\jlreq@tempa\space in~endnote_position}{\@ehc}
}
@@ -3623,7 +3660,7 @@
\cs_set:Nn \g__jlreq_endnote_hook_beforeheading:n {\theendnotes}
\else
\tl_set:Nn \l__jlreq_tmpa_tl {}
- \seq_map_inline:Nn \l_jlreq_tmpa_seq {
+ \seq_map_inline:Nn \l__jlreq_tmpa_seq {
\tl_if_empty:nF {##1} {
\tl_put_right:Nn \l__jlreq_tmpa_tl { {##1} {\theendnotes} }
}
@@ -3765,6 +3802,21 @@
\ifvmode\leavevmode\fi
\IfBooleanTF {#1} { \jlreq@inlinenote@noauto {#2} } { \jlreq@inlinenote@auto {#2} }
}
+\keys_define:nn { jlreqsetup } {
+ warichu_opening .code:n = {
+ \tl_set:Nn \l__jlreq_tmpa_tl {}
+ \str_set:Nx \l__jlreq_tmpa_str { \tl_to_str:n {#1} }
+ \str_set:Nx \l__jlreq_tmpa_str { \str_head:N \l__jlreq_tmpa_str }
+ \tl_map_inline:Nn \jlreq@charlist@openingbrackets {
+ \str_if_eq:eeT { \l__jlreq_tmpa_str } { \tl_to_str:n {##1} } {
+ \tl_set:Nn \l__jlreq_tmpa_tl { \jlreq@open@bracket@before@space }
+ }
+ }
+ \edef\jlreq@warichu@opening{\expandonce{\l__jlreq_tmpa_tl}\unexpanded{#1}}
+ },
+ warichu_closing .tl_set:N = \jlreq@warichu@closing
+}
+\keys_set:nn { jlreqsetup } { warichu_opening = {(}, warichu_closing = {)} }
\def\jlreq@inlinenote@auto#1{%
% 割注初め括弧の前の場所を保存
@@ -3772,11 +3824,11 @@
% \jlreq@tempdimbに,現在行の残り長さを入れる
\jlreq@tempdimb=\jlreq@rest@linewidth
% 括弧の分を引いたものが,割注の使える長さ
- \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space(\inhibitglue}%
+ \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@warichu@opening\inhibitglue}%
\addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}%
\ifdim\jlreq@tempdimb<0pt\jlreq@tempdimb=\linewidth\fi
{%
- \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue \jlreq@open@bracket@before@space(}%
+ \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@warichu@opening}%
\jlreq@box@putcenter\jlreq@tempboxa
}%
% 「初回」時はここに強制改行を入れる.これにより現在位置の取得がより正しくなる……といいなぁ
@@ -3831,7 +3883,7 @@
\splitmaxdepth=\maxdimen
% 現在行の残り長さを思い出す
\jlreq@tempdimb=\jlreq@rest@linewidth
- \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space(\inhibitglue}%
+ \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@warichu@opening\inhibitglue}%
\addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}%
\setbox\@tempboxa=\box\jlreq@resultbox
\@whilenum\@tempcnta<\jlreq@inlinenote@lines\do{%
@@ -3871,7 +3923,7 @@
}
\def\jlreq@inlinenote@noauto#1{%
- \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space(}%
+ \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@warichu@opening}%
\inhibitglue\jlreq@box@putcenter\jlreq@tempboxa
\jlreq@inlinenote@noauto@#1\\\jlreq@endmark\jlreq@endmark
\jlreq@inlinenote@endnote
@@ -3909,7 +3961,7 @@
\def\jlreq@inlinenote@endnote{%
\jlreq@in@inlinenotefalse
{%
- \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize)}%
+ \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@warichu@closing}%
\jlreq@box@putcenter\jlreq@tempboxa
\inhibitglue
}%
@@ -4053,14 +4105,6 @@
}%
}
-% #1のleftとrightを入れ替えて#1に代入
-\def\jlreq@reverse@leftright#1{%
- \str_case_e:nn {#1} {
- { left }{ \def#1{right} }
- { right }{ \def#1{left} }
- }%
-}
-
%.. マークの拡張
\def\jlreq@markregistername#1{jlreq@extramark@register@#1}
\def\jlreq@extraleftmark#1{\jlreq@extramark@{#1}{\expandafter\@firstoftwo\botmarks}}
@@ -4071,11 +4115,18 @@
}
\def\jlreq@extramark@@#1#2{#2#1\@empty\@empty}
-\def\jlreq@setextraleftmark@#1#2{{#2}{\expandafter\@secondoftwo#1}}
-\def\jlreq@setextrarightmark@#1#2{{\expandafter\@firstoftwo#1}{#2}}
-\def\jlreq@setextraleftmark#1#2{\jlreq@setextramark{#1}{#2}{\jlreq@setextraleftmark@}}
-\def\jlreq@setextrarightmark#1#2{\jlreq@setextramark{#1}{#2}{\jlreq@setextrarightmark@}}
-\def\jlreq@setextramark#1#2#3{%
+
+\def\jlreq@extramarkright#1#2{%
+ \jlreq@if{\ifcsname\jlreq@markregistername{#1}\endcsname\fi}{%
+ \expandafter\expandafter\expandafter\jlreq@extramarkright@\csname\jlreq@markregistername{#1}@themark\endcsname{#2}{#1}%
+ }{%
+ \jlreq@extramarkboth{#1}{}{#2}%
+ }%
+}
+\def\jlreq@extramarkright@#1#2#3#4{%
+ \jlreq@extramarkboth{#4}{#1}{#3}%
+}
+\def\jlreq@extramarkboth#1#2#3{
\jlreq@if{\ifcsname\jlreq@markregistername{#1}\endcsname\fi}{}{%
\expandafter\newmarks\csname\jlreq@markregistername{#1}\endcsname
\expandafter\def\csname\jlreq@markregistername{#1}@themark\endcsname{{}{}}%
@@ -4084,305 +4135,667 @@
\let\label\relax
\let\index\relax
\let\glossary\relax
- \def\jlreq@@themark@csname{\jlreq@markregistername{#1}@themark}%
- \expandafter\unrestored@protected@xdef\csname\jlreq@@themark@csname\endcsname{%
- \expandafter#3\expandafter{\csname\jlreq@@themark@csname\endcsname}{#2}%
- }%
- \expandafter\expandafter\expandafter\@temptokena\expandafter\expandafter\expandafter{\csname\jlreq@@themark@csname\endcsname}%
+ \expandafter\unrestored@protected@xdef\csname\jlreq@markregistername{#1}@themark\endcsname{ {#2}{#3} }
+ \expandafter\expandafter\expandafter\@temptokena\expandafter\expandafter\expandafter{\csname\jlreq@markregistername{#1}@themark\endcsname}%
\expandafter\marks\csname\jlreq@markregistername{#1}\endcsname{\the\@temptokena}%
\endgroup
- \if@nobreak\ifvmode\nobreak\fi\fi
+ \if@nobreak\ifvmode\nobreak\fi\fi
}
+
\let\jlreq@markboth=\markboth
\let\jlreq@markright=\markright
%.. \DeclarePageStyle内で使うもの
-% mark情報の取得を行う.
-% #1の中身をみて,#2 = 何段目見出しか,#3 = odd/even,\csname #4@<見出し命令名>\endcsnameに必要情報を追加し,#5の見出し命令名リストに追加
-% #1@heading@levelにレベルを入れる
-\def\jlreq@pagestyle@setmark#1#2#3#4#5{%
- \begingroup
- \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
- \int_compare:nTF { #2 = 0 } { \exp_not:N \leftmark } { \exp_not:n {\jlreq@extraleftmark{#2}} }
- \else
- \int_compare:nTF { #2 = 0 } { \exp_not:N \rightmark } { \exp_not:n {\jlreq@extrarightmark{#2}} }
- \fi
- }%
- }%
- \edef\jlreq@headingname{\expandafter\@gobble#1}% 見出し命令名
- \edef\jlreq@tempa{\noexpand\@removeelement{\exp_not:o {\jlreq@headingname}}}%
- \expandafter\jlreq@tempa\expandafter{#5}{#5}%
- \@ifundefined{#4@\jlreq@headingname}{\expandafter\def\csname #4@\jlreq@headingname\endcsname{}}{}%
- \tl_put_right:Nx \jlreq@do {%
- \exp_not:N \@ifundefined {#4@\jlreq@headingname} { \exp_not:N \@namedef {#4@\jlreq@headingname} {} } {}
- \noexpand\let\exp_not:c {\expandafter\@gobble\string #1@heading@level}=\exp_not:c {jlreq@heading@level@\jlreq@headingname}%
- \exp_not:n {\def#5}{\exp_not:o {#5},\exp_not:o {\jlreq@headingname}}%
- \exp_not:N \tl_put_right:Nn \exp_not:c {#4@\jlreq@headingname} {{{\int_compare:nT {#2=0} {#3}}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}%
- }%
- }{\def\jlreq@do{}}%
- \expandafter\endgroup
- \jlreq@do
+%フォーマットを適用する.\def\@tempa##1{#3}して,\@tempa{#2}の結果を#1に返す.
+%#3が値なしだったら#4を使う.
+%#2: もと
+%#3: フォーマット
+%#4: デフォルトフォーマット
+\cs_set:Nn \__jlreq_pagestyle_applyformat:NnNN {
+ % #3が無効の時は,#2が空なら空にする.
+ \bool_if:nTF { \tl_if_empty_p:n {#2} && \tl_if_eq_p:NN #3 \c_novalue_tl } {
+ \tl_set:Nn #1 {#2}
+ }{
+ \group_begin:
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n {\def\jlreq@tempa##1}{\tl_if_eq:NNTF #3 \c_novalue_tl {\exp_not:o #4}{\exp_not:o #3}} }
+ \l__jlreq_do_tl
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n {\def#1} {\exp_not:o {\jlreq@tempa{#2}} } }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+ }
}
-% \def\<見出し>mark#1{...}というのを\jlreq@resultに入れる,
-% #1:*ならばextramarkを使う
-% #2: 見出し命令名,#3: mark_format
-% #4: {{mark_formatからさらに調べるやつ (odd|even)}{マークの何番目か.extraでない場合は0}{l or r(leftかrightか)}}の並び
-\def\jlreq@pagestyle@make@headingmark#1#2#3#4{%
- \begingroup
- \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{}%
- }%
- \jlreq@pagestyle@make@headingmark@{#2}{#3}#4\jlreq@endmark
- \def\jlreq@do{}% とりあえず#1markの中身を入れていく
- % leftを設定する時は対応するrightを空にする.
- \expandafter\ifx\csname jlreq@leftmark@0\endcsname\@empty
- \expandafter\ifx\csname jlreq@rightmark@0\endcsname\@empty\else
- \tl_put_right:Nx \jlreq@do {
- \jlreq@ifempty{#1}{\noexpand\markright}{\noexpand\jlreq@markright}{\exp_args:Nc \exp_not:o {jlreq@rightmark@0}}
- }%
- \fi
- \else
- \tl_put_right:Nx \jlreq@do {
- \jlreq@ifempty{#1}{\noexpand\markboth}{\noexpand\jlreq@markboth}{\exp_args:Nc \exp_not:o {jlreq@leftmark@0}}{\exp_args:Nc \exp_not:o {jlreq@rightmark@0}}
- }%
- \fi
- \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
- \tl_put_right:Nx \jlreq@do {\noexpand\jlreq@setextrarightmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@rightmark@\jlreq@i}}}%
- \fi
- \else
- \tl_put_right:Nx \jlreq@do{%
- \noexpand\jlreq@setextraleftmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@leftmark@\jlreq@i}}%
- \noexpand\jlreq@setextrarightmark{\jlreq@i}{\exp_args:Nc \exp_not:o {jlreq@rightmark@\jlreq@i}}%
- }%
- \fi
- }%
- \ifx\jlreq@do\@empty\else
- \edef\jlreq@do{%
- \unexpanded{\edef\jlreq@result}{\noexpand\unexpanded{%
- \noexpand\def\exp_not:c {#2mark}\unexpanded{##1}{%
- \exp_not:o {\jlreq@do}%
- }}%
- }%
- }%
- \fi
- \expandafter\endgroup
- \jlreq@do
-}%
-\def\jlreq@pagestyle@make@headingmark@#1#2#3{%
- \jlreq@ifendmark{#3}{}{\jlreq@pagestyle@make@headingmark@@{#1}{#2}#3}%
+\cs_generate_variant:Nn \__jlreq_pagestyle_applyformat:NnNN { NocN }
+
+% mark系の処理をする.
+% #2: 奇数ページ柱(prop,{0,1,2}->柱の中身)
+% #3: 偶数ページ柱(prop,{0,1,2}->柱の中身)
+% #4: mark format(prop,{(見出し名)}->フォーマット)
+% #2,#3の中身が見出し名ならば\leftmark/\rightmarkなどに書き換えられる.
+% #1(prop)に{<見出し名>}{\<見出し名>markの定義}を入れる
+\cs_set:Nn \__jlreq_pagestyle_makemarkcommand:NNNN {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_do_tl { \prop_clear:N #1 }
+ \prop_clear:N \l__jlreq_tmpa_prop % markの定義を入れる.
+ \clist_map_inline:nn { 0,1,2 } {
+ \prop_clear:N \l__jlreq_tmpb_prop % \rightmarkになる\<見出し>markの定義を入れる
+ \prop_clear:N \l__jlreq_tmpc_prop % \leftmarkになる\<見出し>markの定義を入れる
+ \__jlreq_pagestyle_makemarkcommand_aux:NNNnnN \l__jlreq_tmpb_prop \l__jlreq_tmpa_tl #2 { odd } { ##1 } #4
+ \tl_put_right:No \l__jlreq_do_tl \l__jlreq_tmpa_tl
+ \__jlreq_pagestyle_makemarkcommand_aux:NNNnnN \l__jlreq_tmpc_prop \l__jlreq_tmpa_tl #3 { even } { ##1 } #4
+ \tl_put_right:No \l__jlreq_do_tl \l__jlreq_tmpa_tl
+ \prop_map_inline:Nn \l__jlreq_tmpc_prop {
+ \prop_put:Nnx \l__jlreq_tmpa_prop {####1} {
+ \prop_item:Nn \l__jlreq_tmpa_prop {####1}
+ \int_compare:nNnTF { ##1 } = { 0 } { \exp_not:N \markboth } { \exp_not:N \jlreq@extramarkboth {##1} }
+ { \exp_not:n {####2} }
+ { \prop_item:Nn \l__jlreq_tmpb_prop {####1} }
+ }
+ }
+ \prop_map_inline:Nn \l__jlreq_tmpb_prop {
+ \prop_if_in:NnF \l__jlreq_tmpc_prop {####1} {
+ \prop_put:Nnx \l__jlreq_tmpa_prop {####1} {
+ \prop_item:Nn \l__jlreq_tmpa_prop {####1}
+ \int_compare:nNnTF { ##1 } = { 0 } { \exp_not:N \markright } { \exp_not:N \jlreq@extramarkright {##1} }
+ { \exp_not:n {####2} }
+ }
+ }
+ }
+ }
+ \prop_map_inline:Nn \l__jlreq_tmpa_prop {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \prop_put:Nnn #1 {##1} } {
+ \exp_not:N \def \exp_not:o { \csname ##1mark\endcsname ####1 } { \exp_not:n {##2} }
+ }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+}
+
+% mark処理サブ
+% #3: 柱(prop)
+% #4: odd or even
+% #5: 何番目か=0,1,2
+% #6: mark_format(prop)
+% #1(prop)にmark用のフォーマットを入れる.
+% キーは<見出し名>
+% #2に#3の中身を書き換えるコード(\prop_put:Nnn #3 {section}{\rightmark}のような)を入れる
+\cs_set:Nn \__jlreq_pagestyle_makemarkcommand_aux:NNNnnN {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_do_tl { \tl_set:Nn #2 {} }
+ \prop_get:NnN #3 {#5} \l__jlreq_tmpa_tl
+% \message{TL=\exp_not:o \l__jlreq_tmpa_tl}
+% \str_set:NV \l__jlreq_tmpa_str \l__jlreq_tmpa_tl
+ \str_if_eq:eeT { \str_head:N \l__jlreq_tmpa_tl } {_} {
+ % 柱の書き換え
+ \str_if_eq:nnTF { #4 } { odd } {
+ \int_compare:nNnTF {#5}={0} {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \tl_put_right:Nn #2 } { \exp_not:n { \prop_put:Nnn #3 } {#5} { \exp_not:N \rightmark } }
+ }
+ }{
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \tl_put_right:Nn #2 } { \exp_not:n { \prop_put:Nnn #3 } {#5} { \exp_not:n { \jlreq@extrarightmark{#5} } } }
+ }
+ }
+ }{
+ \int_compare:nNnTF {#5}={0} {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \tl_put_right:Nn #2 } { \exp_not:n { \prop_put:Nnn #3 } {#5} { \exp_not:N \leftmark } }
+ }
+ }{
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \tl_put_right:Nn #2 } { \exp_not:n { \prop_put:Nnn #3 } {#5} { \exp_not:n { \jlreq@extraleftmark{#5} } } }
+ }
+ }
+ }
+ % 見出し名
+ \str_set:Nx \l__jlreq_tmpa_str {\exp_after:wN \use_none:n \l__jlreq_tmpa_tl }
+ % _<見出し名>優先でmark formatを取得して\l__jlreq_tmpb_tlに入れる.
+ \prop_get:NoNF #6 \l__jlreq_tmpa_tl \l__jlreq_tmpb_tl {
+ \prop_get:NnNF #6 {#4} \l__jlreq_tmpb_tl {
+ \tl_set:Nx \l__jlreq_tmpb_tl {
+ \exp_not:c {the\l__jlreq_tmpa_str}
+ \exp_not:N \ifx \exp_not:c {the\l__jlreq_tmpa_str} \exp_not:n {\@empty\else\protect\quad\fi}
+ \exp_not:n {##1}
+ }
+ }
+ }
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \prop_put:Nnn #1 } { \l__jlreq_tmpa_str } { \exp_not:o { \l__jlreq_tmpb_tl } }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-\def\jlreq@pagestyle@make@headingmark@@#1#2#3#4#5{%
- % \jlreq@tempbに\***markの定義を入れる
- \edef\jlreq@tempb{%
- \exp_not:c {the#1}%
- \noexpand\ifx\exp_not:c {the#1}\unexpanded{\@empty\else\protect\quad\fi}%
- \unexpanded{##1}%
- }%
- \jlreq@parsekeyval@nokey{%
- \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{\exp_not:o {\jlreq@tempb}}%
- \else
- \expandafter\edef\csname jlreq@rightmark@#4\endcsname{\exp_not:o {\jlreq@tempb}}%
- \fi
- \jlreq@pagestyle@make@headingmark@{#1}{#2}%
+% \prop_item:Nn #1 {#2}が_***だったら***に,そうでなければ空に展開される.
+\cs_set:Nn \__jlreq_pagestyle_get_runninghead_section:Nn {
+ \exp_args:Ne \__jlreq_pagestyle_get_runninghead_section_aux:n { \prop_item:Nn #1 {#2} }
}
-% #2 #3 #4と並んだヘッダを作り#1に入れる.#1,#2,#3はコンロトールシークエンスの名前とする.
-\def\jlreq@pagestyle@setheadfoot#1#2#3#4{%
- \begingroup
- \edef\jlreq@do{\noexpand\jlreq@pagestyle@setheadfoot@{\unexpanded{#1}}{\exp_args:Nc \exp_not:o {#2}}{\exp_args:Nc \exp_not:o {#3}}{\exp_args:Nc \exp_not:o {#4}}}%
- \expandafter\endgroup
- \jlreq@do
+\cs_set:Nn \__jlreq_pagestyle_get_runninghead_section_aux:n {
+ \str_if_eq:eeTF { \str_head:n {#1} } {_} { \exp_not:o {\use_none:n #1} } {}
}
-% \edef内だと,#1 != 0ptならば\hskip \dimexpr#1\relaxになる
-\def\jlreq@pagestyle@hskip#1{%
- \dim_compare:nF { #1 = 0pt }{\noexpand\hskip\noexpand\dimexpr#1\noexpand\relax}%
+%#1: 位置情報がleft-topのように入っているもの,prop
+%#2: デフォルト
+%#1の中身を書き換えて返す.
+\cs_set:Nn \__jlreq_pagestyle_normalizeposition:Nn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_do_tl {}
+ \tl_clear:N \l__jlreq_tmpa_tl % デフォルト位置
+ \tl_set:Nx \l__jlreq_tmpa_tl { \prop_item:Nn #1 {0} }
+ \exp_args:No \jlreq@pagestyle@parse@position \l__jlreq_tmpa_tl \l__jlreq_tmpa_tl {#2}
+ \prop_map_inline:Nn #1 {
+ \exp_args:Nnno \jlreq@pagestyle@parse@position {##2} \l__jlreq_tmpb_tl \l__jlreq_tmpa_tl
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \prop_put:Nnn #1 {##1} } {\exp_not:o {\l__jlreq_tmpb_tl} }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-\def\jlreq@pagestyle@setheadfoot@#1#2#3#4{%
- \begingroup
- % - \Cdpは端にそろえるための補正
- \jlreq@ifempty{#2}{\def\jlreq@left{}}{\edef\jlreq@left{\jlreq@pagestyle@hskip{\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate - \Cdp\fi}\unexpanded{#2}}}%
- % +\topskip - \Chtは\jlreq@headfoot@sidemargin = 0ptの時に本文の右に一致させるための補正.
- \jlreq@ifempty{#4}{\def\jlreq@right{}}{\edef\jlreq@right{\unexpanded{#4}\jlreq@pagestyle@hskip{\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate + \topskip - \Cht\fi}}}%
- \jlreq@ifempty{#3}{%
- \edef\jlreq@do{\unexpanded{\def#1}{\exp_not:o {\jlreq@left}\hfil\exp_not:o {\jlreq@right}}}%
- \jlreq@ifempty{#2}{\jlreq@ifempty{#4}{\def\jlreq@do{\def#1{}}}{}}{}%
- }{% #3を完全に真ん中に配置するために左右の幅を0にしておく
- \ifx\jlreq@left\@empty\else\edef\jlreq@left{\noexpand\hbox to 0pt{\exp_not:o {\jlreq@left}\noexpand\hss}}\fi
- \ifx\jlreq@right\@empty\else\edef\jlreq@right{\noexpand\hbox to 0pt{\noexpand\hss\exp_not:o {\jlreq@right}}}\fi
- \edef\jlreq@do{%
- \unexpanded{\def#1}{\exp_not:o {\jlreq@left}\hfil\unexpanded{#3}\hfil\exp_not:o {\jlreq@right}}%
- }%
- }%
- \expandafter\endgroup
- \jlreq@do
-}%
-% #1の左右に傍注調整用の空白を入れて#1に代入する
-\def\jlreq@pagestyle@addsidenotemargin@left#1{%
- \jlreq@pagestyle@addsidenotemargin@{#1}{\jlreq@sidenote@length + \jlreq@sidenote@sep}{}%
+%#2: 柱
+%#3: フォント
+%#4: 位置
+%#5: 空き
+%#1に返す
+\cs_set:Nn \__jlreq_pagestyle_maketate_runhead:NNNNn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_result_tl {}
+ \__jlreq_pagestyle_maketate_rearrange:NNNNn \l__jlreq_tmpa_seq #2 #3 #4 {#5}
+ \seq_map_inline:Nn \l__jlreq_tmpa_seq {
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_args:No \exp_not:n {\use_i:nn ##1} } % 場所
+ \tl_set:Nx \l__jlreq_tmpb_tl { \exp_args:No \exp_not:n {\use_ii:nn ##1} } % 中身
+ \tl_put_right:Nx \l__jlreq_result_tl {
+ \exp_not:N \hbox to~0pt {
+ \exp_not:n {\hskip\glueexpr\headsep + \headheight}
+ \legacy_if:nF { @tate } { \exp_not:n {+ \topskip - \Cht} }
+ \tl_if_empty:oF \l__jlreq_tmpa_tl { + \exp_not:o \l__jlreq_tmpa_tl } \exp_not:N \relax
+ \exp_not:o \l__jlreq_tmpb_tl
+ \exp_not:N \hss
+ }
+ }
+ }
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n { \tl_set:Nn #1 } { \exp_not:o \l__jlreq_result_tl } }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-\def\jlreq@pagestyle@addsidenotemargin@right#1{%
- \jlreq@pagestyle@addsidenotemargin@{#1}{}{\jlreq@sidenote@length + \jlreq@sidenote@sep}%
+\cs_generate_variant:Nn \__jlreq_pagestyle_maketate_runhead:NNNNn { NcNNo }
+
+%#2: ノンブル
+%#3: フォント
+%#4: 位置
+%#5: 空き
+%#1に返す
+\cs_set:Nn \__jlreq_pagestyle_maketate_nombre:NNNNn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_result_tl {}
+ \__jlreq_pagestyle_maketate_rearrange:NNNNn \l__jlreq_tmpa_seq #2 #3 #4 {#5}
+ \seq_map_inline:Nn \l__jlreq_tmpa_seq {
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_args:No \exp_not:n {\use_i:nn ##1} } % 場所
+ \tl_set:Nx \l__jlreq_tmpb_tl { \exp_args:No \exp_not:n {\use_ii:nn ##1} } % 中身
+ \tl_put_right:Nx \l__jlreq_result_tl {
+ \exp_not:N \hbox to~0pt {
+ \exp_not:N \hss
+ \exp_not:o \l__jlreq_tmpb_tl
+ \tl_if_empty:oF \l__jlreq_tmpa_tl {
+ \exp_not:n { \hskip\glueexpr } \exp_not:o \l__jlreq_tmpa_tl \exp_not:N \relax
+ }
+ }
+ }
+ }
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n { \tl_set:Nn #1 } { \exp_not:o \l__jlreq_result_tl } }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+}
+\cs_generate_variant:Nn \__jlreq_pagestyle_maketate_nombre:NNNNn { NNNNo }
+
+%#2: 中身
+%#3: フォント
+%#4: 位置
+%#5: 空き
+% tate指定のページスタイルの時は,空き指定は
+% (1)なければ前のやつに続いて
+% (2)あれば絶対的な位置指定
+% となる.この関数で,(1)によってまとまるものを一つにまとめて,seqにして返す.
+% #1に{空き}{トークン列}のseqを返す.
+\cs_set:Nn \__jlreq_pagestyle_maketate_rearrange:NNNNn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_do_tl { \seq_clear:N #1 }
+ \tl_set:Nn \l__jlreq_tmpa_tl {} % 現在処理中
+ \tl_set:Nn \l__jlreq_tmpc_tl {} % 現在の位置
+ \clist_map_inline:nn {0,1,2} {
+ \tl_set:Nx \l__jlreq_tmpb_tl { \prop_item:Nn #2 {##1} }
+ \tl_if_empty:oF \l__jlreq_tmpb_tl {
+ \tl_set:Nx \l__jlreq_tmpb_tl { \prop_item:Nn #4 {##1} } % pos
+ \tl_if_empty:NTF \l__jlreq_tmpb_tl { % pos = empty
+ \tl_put_right:Nx \l__jlreq_tmpa_tl {
+ \tl_if_empty:NF \l__jlreq_tmpa_tl { \exp_not:n { \hskip\glueexpr #5\relax } }
+ }
+ }{
+ \tl_if_empty:oF \l__jlreq_tmpa_tl {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \seq_put_right:Nn #1 } {
+ { \exp_not:o \l__jlreq_tmpc_tl } { \exp_not:o \l__jlreq_tmpa_tl }
+ }
+ }
+ \tl_set:Nn \l__jlreq_tmpa_tl {}
+ }
+ }
+ \tl_if_empty:oT \l__jlreq_tmpa_tl { \tl_set:Nx \l__jlreq_tmpc_tl { \prop_item:Nn #4 { ##1 } } }
+ \tl_set:Nx \l__jlreq_tmpb_tl { \prop_item:Nn #3 {##1} }
+ \tl_put_right:Nx \l__jlreq_tmpa_tl {
+ \tl_if_empty:NTF \l__jlreq_tmpb_tl
+ { \prop_item:Nn #2 {##1} }
+ { { \exp_not:o \l__jlreq_tmpb_tl \prop_item:Nn #2 {##1} } }
+ }
+ }
+ }
+ \tl_if_empty:oF \l__jlreq_tmpa_tl {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \seq_put_right:Nn #1 } { { \exp_not:o \l__jlreq_tmpc_tl } { \exp_not:o \l__jlreq_tmpa_tl } }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-\def\jlreq@pagestyle@addsidenotemargin@bothside#1{%
- \jlreq@pagestyle@addsidenotemargin@{#1}{\jlreq@sidenote@length + \jlreq@sidenote@sep}{\jlreq@sidenote@length + \jlreq@sidenote@sep}%
+
+
+%#2: odd/even
+%#3: 位置
+%#2 = evenならば位置を反転させて#1 = strに返す.
+\cs_set:Nn \__jlreq_pagestyle_reversepos_ifeven:Nnn {
+ \str_set:Nn #1 {#3}
+ \str_if_eq:nnT {#2} {even} {
+ \str_if_eq:nnT {#3} {right} { \str_set:Nn #1 {left} }
+ \str_if_eq:nnT {#3} {left} { \str_set:Nn #1 {right} }
+ }
}
-% #2: 左,#3:右,#4:#2 + #3
-\def\jlreq@pagestyle@addsidenotemargin@#1#2#3{%
- \ifx#1\@empty\else
- \edef#1{%
- \jlreq@ifempty{#2}{}{\unexpanded{\hskip-\dimexpr #2\relax}}%
- \exp_not:o {#1}%
- \jlreq@ifempty{#3}{}{\unexpanded{\hskip-\dimexpr #3\relax}}%
- }%
- \fi
+
+% 各場所(六カ所),柱 or ノンブルのトークン列を作る.#1に返す
+%#2: odd/even
+%#3: 縦方向場所(top/bottom)
+%#4: 横方向場所(left/right/center)
+%#5: 中身(柱 or ノンブル,prop)
+%#6: フォント(prop)
+%#7: 場所(prop)
+%#8: 空き
+\cs_set:Nn \__jlreq_pagestyle_makeyoko_each:NnnnNNNn {
+ \group_begin:
+ \__jlreq_pagestyle_makeyoko_sequence:NnnNNN \l__jlreq_tmpa_seq {#3} {#4} #5 #6 #7
+ \__jlreq_pagestyle_reversepos_ifeven:Nnn \l__jlreq_tmpa_str {#2} {#4}
+ \__jlreq_pagestyle_makeyoko_concat_withspaces:NVNn \l__jlreq_tmpa_tl \l__jlreq_tmpa_str \l__jlreq_tmpa_seq {#8}
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n { \tl_set:Nn #1 } { \exp_not:o \l__jlreq_tmpa_tl } }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
+\cs_generate_variant:Nn \__jlreq_pagestyle_makeyoko_each:NnnnNNNn { NnnncNNo }
-% #1が空かつ#4が空でないならば#2に#3と#4の中身を追加し,#4を空にする.引数は全てコントロールシークエンス
-\def\jlreq@pagestyle@addifempty#1#2#3#4{%
- \ifx#1\@empty\ifx#4\@empty\else\tl_put_right:Nx #2{ \exp_not:o {#3}\exp_not:o {#4} }\def#4{}\fi\fi
+%#2: 縦方向場所(top/bottom)
+%#3: 横方向場所(left/right/center)
+%#4: 中身(柱 or ノンブル,prop)
+%#5: フォント(prop)
+%#6: 場所(prop)
+%#1に左から{フォント}{中身}を並べた配列を返す.
+\cs_set:Nn \__jlreq_pagestyle_makeyoko_sequence:NnnNNN {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_do_tl { \seq_clear:N #1 }
+ \clist_map_inline:nn {0,1,2} {
+ \tl_set:Nx \l__jlreq_tmpa_tl { \prop_item:Nn #4 {##1} }
+ \tl_if_empty:NF \l__jlreq_tmpa_tl {
+ \exp_args:Nxx \tl_if_eq:nnT {{#2}{#3}} { \prop_item:Nn #6 {##1} } {
+ \tl_put_right:Nx \l__jlreq_do_tl {
+ \exp_not:n { \seq_put_right:Nn #1 } { {\prop_item:Nn #5 {##1}}{\exp_not:o \l__jlreq_tmpa_tl} }
+ }
+ }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-\newif\ifjlreq@PageStyle@first
-% #1に入っている{柱1}{柱2}...{柱n}という並びから,実際に出力する柱を構築する.n>=1を仮定する.
-% 間に空白を入れる.
-% #1: ターゲットなコントロールシークエンスの名前,#2:*ならばreverseする,#3:空き
-\def\jlreq@pagestyle@make@runninghead#1#2#3{%
- \jlreq@if{\expandafter\ifx\csname #1\endcsname\@empty\fi}{}{%
- \edef\jlreq@do{%
- \noexpand\jlreq@tempatrue % 最初の処理かフラグ
- \unexpanded{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}}\exp_args:Nc \exp_not:o {#1}\noexpand\jlreq@endmark
- }%
- \expandafter\def\csname #1\endcsname{}%
- \jlreq@do
- % 項目が二つ以上あった.
- \ifjlreq@tempa\else\tl_put_left:cn {#1} {\jlreq@PageStyle@firsttrue} \fi
- }%
+% 各場所(左,真ん中,右)のヘッダのトークン列を作る
+%#2: 横方向場所
+%#3: {フォント}{中身}の配列
+%#4: スペース
+%#1に結果のトークン列を入れる
+\cs_set:Nn \__jlreq_pagestyle_makeyoko_concat_withspaces:NnNn {
+ \seq_if_empty:NTF #3 {
+ \tl_set:Nn #1 {}
+ }{
+ \str_if_eq:nnTF {#2}{right}{
+ \__jlreq_pagestyle_concat_withspaces_right:NNn #1 #3 {#4}
+ }{
+ \__jlreq_pagestyle_concat_withspaces_left:NNn #1 #3 {#4}
+ }
+ }
}
-\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@ifempty{#2}{\tl_put_right:cn}{\tl_put_left:cn}{#1}{#4}%
- }{%
- % 最初の空でない柱に出会うまでは柱の間の空白を入れない.
- % 空でない柱に出会ってないならば\ifjlreq@PageStyle@firstはtrue.
- % 一番最初の\jlreq@PageStyle@firsttrueは後で入れる.
- \jlreq@ifempty{#2}{\tl_put_right:cn}{\tl_put_left:cn}{#1}{%
- \protected@edef\jlreq@tempa{#4}%
- \ifx\jlreq@tempa\@empty\else
- \ifjlreq@PageStyle@first\else\hskip\glueexpr#3\relax\fi
- \jlreq@tempa
- \jlreq@PageStyle@firstfalse
- \fi
- }%
- \jlreq@tempafalse
- \jlreq@ifendmark{#5}{}{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}{#5}}%
- }%
+\cs_generate_variant:Nn \__jlreq_pagestyle_makeyoko_concat_withspaces:NnNn { NVNn }
+
+%#2: {フォント}{中身}の配列
+%#3: スペース
+%#1に結果のトークン列を入れる
+\cs_set:Nn \__jlreq_pagestyle_concat_withspaces_left:NNn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_reuslt_tl {}
+ \seq_pop_right:NN #2 \l__jlreq_tmpc_tl % 最後の項目
+ \seq_map_inline:Nn #2 {
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_args:No \exp_not:n {\use_i:nn ##1} }
+ \tl_set:Nx \l__jlreq_tmpb_tl { \exp_args:No \exp_not:n {\use_ii:nn ##1} }
+ \tl_put_right:Nx \l__jlreq_result_tl {
+ \exp_not:n {\setbox\@tempboxa=\hbox}
+ { \tl_if_empty:NTF \l__jlreq_tmpa_tl {\exp_not:o \l__jlreq_tmpb_tl}{\exp_not:o \l__jlreq_tmpa_tl \exp_not:N \l__jlreq_tmpb_tl} }
+ \exp_not:n { \copy\@tempboxa }
+ \exp_not:n {
+ \ifnum0
+ \ifdim\wd\@tempboxa=0pt~\else 1\fi
+ \ifdim\ht\@tempboxa=0pt~\else 1\fi
+ \ifdim\dp\@tempboxa=0pt~\else 1\fi
+ >0~\hskip\glueexpr #3\relax\fi
+ }
+ }
+ }
+ \cs_set:Nn \l__jlreq_tmpa:nn {
+ \tl_if_empty:nTF{##1} { \exp_not:n {##2} }{ \exp_not:n {{##1##2}} }
+ }
+ \tl_put_right:Nx \l__jlreq_result_tl {\exp_after:wN \l__jlreq_tmpa:nn \l__jlreq_tmpc_tl}
+ \tl_set:Nx \l__jlreq_do_tl {
+ \exp_not:n { \tl_set:Nn #1} {\exp_not:o \l__jlreq_result_tl}
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
-% #1= cs,#2 = フォーマットの入ったcs,#3 = デフォルトフォーマットの入ったcs
-\def\jlreq@pagestyle@applyformat#1#2#3{%
- % デフォルト時に限り,\hbox to ***{空トークン}を避ける
- \ifnum 0\ifx#1\@empty\else 1\fi\ifx#2\relax\else 1\fi>0
- \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\ifx#2\relax\exp_not:o {#3}\else\exp_not:o {#2}\fi}}\jlreq@do
- \edef#1{\expandafter\exp_not:o \expandafter{\expandafter\jlreq@tempa\expandafter{#1}}}%
- \fi
+%#2: {フォント}{中身}の配列
+%#3: スペース
+%#1に結果のトークン列を入れる
+\cs_set:Nn \__jlreq_pagestyle_concat_withspaces_right:NNn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_result_tl {}
+ \bool_set_true:N \l__jlreq_tmpa_bool % 最初か
+ \seq_map_inline:Nn #2 {
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_args:No \exp_not:n {\use_i:nn ##1} }
+ \tl_set:Nx \l__jlreq_tmpb_tl { \exp_args:No \exp_not:n {\use_ii:nn ##1} }
+ \bool_if:NTF \l__jlreq_tmpa_bool {
+ \tl_put_right:Nx \l__jlreq_result_tl {
+ \tl_if_empty:NTF \l__jlreq_tmpa_tl {\exp_not:o \l__jlreq_tmpb_tl}{{\exp_not:o \l__jlreq_tmpa_tl \exp_not:o \l__jlreq_tmpb_tl}}
+ }
+ }{
+ \tl_put_right:Nx \l__jlreq_result_tl {
+ \exp_not:n { \setbox\@tempboxa=\hbox}
+ { \tl_if_empty:NTF \l__jlreq_tmpa_tl {\exp_not:o \l__jlreq_tmpb_tl }{\exp_not:o \l__jlreq_tmpa_tl \exp_not:o \l__jlreq_tmpb_tl} }
+ \exp_not:n {
+ \ifnum0
+ \ifdim\wd\@tempboxa=0pt~\else 1\fi
+ \ifdim\ht\@tempboxa=0pt~\else 1\fi
+ \ifdim\dp\@tempboxa=0pt~\else 1\fi
+ >0~\hskip\glueexpr #3\relax\fi
+ }
+ \exp_not:n { \box\@tempboxa }
+ }
+ }
+ \bool_set_false:N \l__jlreq_tmpa_bool
+ }
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n { \tl_set:Nn #1} {\exp_not:o \l__jlreq_result_tl} }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
+\cs_generate_variant:Nn \__jlreq_pagestyle_concat_withspaces_right:NnN {NoN}
-% フォント情報を追加する.#1:制御綴り名,#2:フォント命令の入っている制御綴名,#1に返す
-\def\jlreq@pagestyle@addfont@tocs#1#2{%
- \expandafter\ifx\csname #1\endcsname\@empty\else
- \expandafter\ifx\csname #2\endcsname\@empty\else
- \expandafter\edef\csname #1\endcsname{{\exp_args:Nc \exp_not:o {#2}\exp_args:Nc \exp_not:o {#1}}}%
- \fi
- \fi
+
+%#2: odd or even(even時は左右をひっくり返して処理される)
+%#3: 左
+%#4: 真ん中
+%#5: 右
+% #1に返す.
+\cs_set:Nn \__jlreq_pagestyle_concat_left_center_right:Nnnnn {
+ \str_if_eq:nnTF {#2} {odd} {
+ \__jlreq_pagestyle_concat_left_center_right_aux:Nnnn #1 {#3} {#4} {#5}
+ }{
+ % evenでは左右入れ替え
+ \__jlreq_pagestyle_concat_left_center_right_aux:Nnnn #1 {#5} {#4} {#3}
+ }
}
-% こちらは#1にトークン列を与える.\edefで展開される.制御綴名#3に代入.
-\def\jlreq@pagestyle@addfont@totokens#1#2#3{%
- \begingroup
- \edef\jlreq@do{\noexpand\edef\exp_not:c {#3}{\unexpanded{#1}}}%
- \expandafter\ifx\csname #2\endcsname\@empty\else
- \edef\jlreq@tempa{#1}%
- \ifx\jlreq@tempa\@empty\else
- \edef\jlreq@do{%
- \noexpand\edef\exp_not:c {#3}{\noexpand\unexpanded{%
- {\exp_args:Nc \exp_not:o {#2}\exp_not:o {\jlreq@tempa}}%
- }}%
- }%
- \fi
- \fi
- \expandafter\endgroup
- \jlreq@do
+
+\cs_generate_variant:Nn \__jlreq_pagestyle_concat_left_center_right:Nnnnn { Nneee }
+
+% #2: 左,#3: 真ん中,#4: 右をくっつける
+% #1に返す
+\cs_set:Nn \__jlreq_pagestyle_concat_left_center_right_aux:Nnnn {
+ \group_begin:
+ \tl_set:Nn \l__jlreq_tmpa_tl {} % 左
+ \tl_set:Nn \l__jlreq_tmpb_tl {} % 右
+ \tl_set:Nn \l__jlreq_tmpc_tl {} % 戻り値
+ \tl_if_empty:nF {#2} {
+ \bool_if:nT { ( !\dim_compare_p:nNn {\jlreq@headfoot@sidemargin}={0pt} ) || \legacy_if_p:n {@tate} }{
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:n {\hskip\dimexpr} \jlreq@expand@speciallength{\jlreq@headfoot@sidemargin} \legacy_if:nT { @tate } { \exp_not:n { -\Cdp } } \exp_not:N \relax }
+ }
+ \tl_put_right:Nn \l__jlreq_tmpa_tl {#2}
+ }
+ \tl_if_empty:nF {#4} {
+ \tl_set:Nn \l__jlreq_tmpb_tl {#4}
+ % \jlreq@headfoot@sidemargin = 0ptの時に本文の右に一致させるための補正.
+ \bool_if:nT { ( !\dim_compare_p:nNn {\jlreq@headfoot@sidemargin}={0pt} ) || \legacy_if_p:n {@tate} }{
+ \tl_put_right:Nx \l__jlreq_tmpb_tl { \exp_not:n {\hskip\dimexpr} \jlreq@expand@speciallength{\jlreq@headfoot@sidemargin} \legacy_if:nT { @tate } { \exp_not:n { + \topskip - \Cht } } \exp_not:N \relax }
+ }
+ }
+ \tl_if_empty:nTF {#3} {
+ \bool_if:nF { \tl_if_empty_p:n {#2} && \tl_if_empty_p:n {#4} } {
+ \tl_set:Nx \l__jlreq_tmpc_tl { \exp_not:o \l__jlreq_tmpa_tl \exp_not:N \hfil \exp_not:o \l__jlreq_tmpb_tl }
+ }
+ }{
+ % 真ん中のを完全に真ん中に配置するために左右の幅を0にしておく
+ \tl_if_empty:nF { #2 } { \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:N \hbox to~0pt { \exp_not:o { \l__jlreq_tmpa_tl } \exp_not:N \hss } } }
+ \tl_if_empty:nF { #4 } { \tl_set:Nx \l__jlreq_tmpb_tl { \exp_not:N \hbox to~0pt { \exp_not:o { \l__jlreq_tmpb_tl } \exp_not:N \hss } } }
+ \tl_set:Nx \l__jlreq_tmpc_tl {
+ \exp_not:o \l__jlreq_tmpa_tl\exp_not:N \hfil \exp_not:n {#3} \exp_not:N \hfil \exp_not:o \l__jlreq_tmpb_tl
+ }
+ }
+ \tl_set:Nx \l__jlreq_do_tl { \exp_not:n {\tl_set:Nn #1 } { \exp_not:o \l__jlreq_tmpc_tl } }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+}
+
+%#2: 横方向位置
+%#3: odd/even
+%#4: 柱
+%#5: ヘッダ
+%#6: 空き
+%#1 に戻す
+\cs_set:Nn \__jlreq_pagestyle_concat_runhead_nombre:Nnnnnn {
+ \tl_if_empty:nTF {#4} {
+ \tl_set:Nn #1 {#5}
+ }{
+ \tl_if_empty:nTF {#5} {
+ \tl_set:Nn #1 {#4}
+ }{
+ \group_begin:
+ \__jlreq_pagestyle_reversepos_ifeven:Nnn \l__jlreq_tmpa_str {#3} {#2}
+ \jlreq@ifleftpage{#3}{
+ \str_if_eq:VnTF \l__jlreq_tmpa_str {right} {
+ \tl_set:Nn \l__jlreq_do_tl {
+ \__jlreq_pagestyle_concat_runhead_nombre_aux_leftpage_right:Nnnn #1 {#4} {#5} {#6}
+ }
+ }{
+ \tl_set:Nn \l__jlreq_do_tl {
+ \__jlreq_pagestyle_concat_runhead_nombre_aux_leftpage_left:Nnnn #1 {#4} {#5} {#6}
+ }
+ }
+ }{
+ \str_if_eq:VnTF \l__jlreq_tmpa_str {left} {
+ \tl_set:Nn \l__jlreq_do_tl {
+ \__jlreq_pagestyle_concat_runhead_nombre_aux_rightpage_left:Nnnn #1 {#4} {#5} {#6}
+ }
+ }{
+ \tl_set:Nn \l__jlreq_do_tl {
+ \__jlreq_pagestyle_concat_runhead_nombre_aux_rightpage_right:Nnnn #1 {#4} {#5} {#6}
+ }
+ }
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
+ }
+ }
+}
+\cs_generate_variant:Nn \__jlreq_pagestyle_concat_runhead_nombre:Nnnnnn { Nnnooo }
+
+% <ノンブル><空き><柱>,左寄せ,ノンブルは常に空でないと仮定する.
+\cs_set:Nn \__jlreq_pagestyle_concat_runhead_nombre_aux_leftpage_left:Nnnn {
+ \tl_set:Nn #1 {
+ #3\hskip\glueexpr #4\relax#2
+ }
+}
+% <ノンブル><空き><柱>,右寄せ
+\cs_set:Nn \__jlreq_pagestyle_concat_runhead_nombre_aux_leftpage_right:Nnnn {
+ \tl_set:Nn #1 {
+ \setbox\jlreq@PageStyle@box=\hbox{#2}
+ #3
+ \ifnum 0
+ \ifdim\wd\jlreq@PageStyle@box=0pt~\else 1\fi
+ \ifdim\ht\jlreq@PageStyle@box=0pt~\else 1\fi
+ \ifdim\dp\jlreq@PageStyle@box=0pt~\else 1\fi
+ >0~\hskip\glueexpr #4\relax\fi
+ \box\jlreq@PageStyle@box
+ }
+}
+% <柱><空き><ノンブル>,左寄せ
+\cs_set:Nn \__jlreq_pagestyle_concat_runhead_nombre_aux_rightpage_left:Nnnn {
+ \tl_set:Nn #1 {
+ \setbox\jlreq@PageStyle@box=\hbox{#2}
+ \copy\jlreq@PageStyle@box
+ \ifnum 0
+ \ifdim\wd\jlreq@PageStyle@box=0pt~\else 1\fi
+ \ifdim\ht\jlreq@PageStyle@box=0pt~\else 1\fi
+ \ifdim\dp\jlreq@PageStyle@box=0pt~\else 1\fi
+ >0~\hskip\glueexpr #4\relax\fi
+ #3
+ }
+}
+% <柱><空き><ノンブル>,右寄せ
+\cs_set:Nn \__jlreq_pagestyle_concat_runhead_nombre_aux_rightpage_right:Nnnn {
+ \tl_set:Nn #1 {
+ #2\hskip\glueexpr #4\relax#3
+ }
}
+% #1の左右に傍注調整用の空白を入れて#1に代入する
+\cs_set:Nn \__jlreq_pagestyle_addsidenotemargin_left:N {
+ \__jlreq_pagestyle_addsidenotemargin_aux:Nnn #1 {\jlreq@sidenote@length + \jlreq@sidenote@sep} {}
+}
+\cs_set:Nn \__jlreq_pagestyle_addsidenotemargin_right:N {
+ \__jlreq_pagestyle_addsidenotemargin_aux:Nnn #1 {} {\jlreq@sidenote@length + \jlreq@sidenote@sep}
+}
+\cs_set:Nn \__jlreq_pagestyle_addsidenotemargin_bothside:N {
+ \__jlreq_pagestyle_addsidenotemargin_aux:Nnn #1 {\jlreq@sidenote@length + \jlreq@sidenote@sep} {\jlreq@sidenote@length + \jlreq@sidenote@sep}
+}
+% #2: 左,#3:右,#4:#2 + #3
+\cs_set:Nn \__jlreq_pagestyle_addsidenotemargin_aux:Nnn {
+ \tl_if_empty:NF #1 {
+ \tl_set:Nx #1 {
+ \tl_if_empty:nF {#2} { \exp_not:n { \hskip-\dimexpr #2\relax } }
+ \exp_not:o #1
+ \tl_if_empty:nF {#3} { \exp_not:n { \hskip-\dimexpr #3\relax } }
+ }
+ }
+}
+
+
%.. \DeclarePageStyle
-\newbox\jlreq@PageStyle@box
+% markの処理
+% 出力する柱は偶数ページでは\leftmark,奇数ページでは\rightmark.
+% 見出し<HEAD>に\rightmarkがついていれば,\<HAED>markを\markrightに書き換える.
+% \leftmarkならば\markbothを使う.
+% \leftmark\rightmark両方の時は\markboth?
+% 現れる全ての見出しのレベルよりも小さいレベルの見出しについては\<HEAD>markを空にする処理を入れる.
+% 実際の出力:
+% yoko:
+% 左ページ(縦奇数ページ横偶数ページ)ではノンブルが左(2.6.1.c),なので<ノンブル><空き><柱>
+% 空きが無駄に入らないように気をつける.(右寄せの場合は柱が空なら空きを入れない.)
+% \setbox..=して,幅が0か否かで判定する.
+% 右ページでは逆になる.<柱><空き><ノンブル>
+% 空きは柱文字で文字サイズ基準で計算する.
+% <ノンブル>も<柱>もi,ii,...はiが左になるようにする.
+% <柱>も<ノンブル>も<i中身><空き><ii中身><空き><iii中身>となる
+% ただし空きは無駄に入れない.左寄せの場合は<i中身>が空ならばその右の<空き>は入れない.
+% 空かの判定は\protected@edefして\ifx\@emptyで判定する.
+
+\newbox \jlreq@PageStyle@box
+\tl_new:N \l__jlreq_pagestyle_odd_top_format_tl
+\tl_new:N \l__jlreq_pagestyle_even_top_format_tl
+\tl_new:N \l__jlreq_pagestyle_odd_bottom_format_tl
+\tl_new:N \l__jlreq_pagestyle_even_bottom_format_tl
+\prop_new:N \l__jlreq_pagestyle_nombre_prop
+\prop_new:N \l__jlreq_pagestyle_nombre_position_prop
+\prop_new:N \l__jlreq_pagestyle_odd_runninghead_prop
+\prop_new:N \l__jlreq_pagestyle_even_runninghead_prop
+\prop_new:N \l__jlreq_pagestyle_runninghead_position_prop
+\prop_new:N \l__jlreq_pagestyle_nombre_font_prop
+\prop_new:N \l__jlreq_pagestyle_runninghead_font_prop
+\prop_new:N \l__jlreq_pagestyle_mark_format_prop
+\tl_new:N \l__jlreq_pagestyle_command_tl
+\tl_new:N \l__jlreq_pagestyle_gap_tl
+\tl_new:N \l__jlreq_pagestyle_nombre_gap_tl
+\tl_new:N \l__jlreq_pagestyle_runninghead_gap_tl
+% 柱とノンブルの間
+\bool_new:N \l__jlreq_pagestyle_clearmarkcommand_bool
+\bool_new:N \l__jlreq_pagestate_tate_bool
+% 作業用
+\tl_new:N \l__jlreq_pagestyle_markcommands_tl
\NewDocumentCommand{\DeclarePageStyle} { m +m } {%
\expandafter\edef\csname jlreq@pagestyle@setting@#1\endcsname{\unexpanded{#2}}%
- \begingroup
- % フォーマットを空という可能性もあるかもしれないので,デフォルト値は\relaxで表す.
- \let\jlreq@oddheadformat\relax
- \let\jlreq@evenheadformat\relax
- \let\jlreq@oddfootformat\relax
- \let\jlreq@evenfootformat\relax
- % 柱とノンブルの間
- \newif\ifjlreq@clearmarkcommand
- \newif\ifjlreq@pstate % PageStyleTATE
+ \group_begin:
+ % フォーマットを空という可能性もあるかもしれないので,デフォルト値は\c_novalue_tlで表す.
+ \tl_set_eq:NN \l__jlreq_pagestyle_odd_top_format_tl \c_novalue_tl
+ \tl_set_eq:NN \l__jlreq_pagestyle_even_top_format_tl \c_novalue_tl
+ \tl_set_eq:NN \l__jlreq_pagestyle_odd_bottom_format_tl \c_novalue_tl
+ \tl_set_eq:NN \l__jlreq_pagestyle_even_bottom_format_tl \c_novalue_tl
\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,
+ tate .code:n = {\bool_set_true:N \l__jlreq_pagestate_tate_bool},
+ yoko .code:n = {\bool_set_false:N \l__jlreq_pagestate_tate_bool},
+ nombre .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_prop {0} {##1} },
+ nombre_position .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_position_prop {0} {##1} },
+ running_head_position .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_runninghead_position_prop {0} {##1} },
+ odd_running_head .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_odd_runninghead_prop {0} {##1} },
+ even_running_head .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_even_runninghead_prop {0} {##1} },
font .code:n = {
- \def\jlreq@nombre@font{##1}%
- \def\jlreq@running@head@font{##1}%
+ \prop_put:Nnn \l__jlreq_pagestyle_nombre_font_prop {0} {##1}
+ \prop_put:Nnn \l__jlreq_pagestyle_runninghead_font_prop {0} {##1}
+ },
+ nombre_font .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_font_prop {0} {##1} },
+ running_head_font .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_runninghead_font_prop {0} {##1} },
+ mark_format .code:n = {
+ \prop_clear:N \l__jlreq_pagestyle_mark_format_prop
+ \prop_put_from_keyval:Nn \l__jlreq_pagestyle_mark_format_prop {##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,
+ command .tl_set:N = \l__jlreq_pagestyle_command_tl,
+ gap .tl_set:N = \l__jlreq_pagestyle_gap_tl,
+ nombre_gap .tl_set:N = \l__jlreq_pagestyle_nombre_gap_tl,
+ running_head_gap .tl_set:N = \l__jlreq_pagestyle_runninghead_gap_tl,
% trueにすると,\ps@***実行時にまず\***markを全て\@gobbleにする.
- 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 .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 .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
+ clear_markcommand .bool_set:N = \l__jlreq_pagestyle_clearmarkcommand_bool,
+ odd_head_format .code:n = { \tl_set:Nx \l__jlreq_pagestyle_odd_top_format_tl { \exp_not:n {##1} } },
+ even_head_format .code:n = { \tl_set:Nx \l__jlreq_pagestyle_even_top_format_tl { \exp_not:n {##1} } },
+ odd_foot_format .code:n = { \tl_set:Nx \l__jlreq_pagestyle_odd_bottom_format_tl { \exp_not:n {##1} } },
+ even_foot_format .code:n = { \tl_set:Nx \l__jlreq_pagestyle_even_bottom_format_tl { \exp_not:n {##1} } },
+ }
+ \cs_set:Nn \l__jlreq_tmpa:nn {
+ \keys_define:nn { PageStyle:#1 } {
+ nombre_##1 .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_prop {##2} {####1} },
+ nombre_##1_position .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_position_prop {##2} {####1} },
+ running_head_##1_position .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_runninghead_position_prop {##2} {####1} },
+ odd_running_head_##1 .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_odd_runninghead_prop {##2} {####1} },
+ even_running_head_##1 .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_even_runninghead_prop {##2} {####1} },
+ nombre_##1_font .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_nombre_font_prop {##2} {####1} },
+ running_head_##1_font .code:n = { \prop_put:Nnn \l__jlreq_pagestyle_runninghead_font_prop {##2} {####1} }
+ }
+ }
+ \clist_map_inline:nn {1,2}{
+ \str_set:Nx \l__jlreq_tmpa_str { \int_to_roman:n { ##1 + 1 } }
+ \exp_args:Nx \l__jlreq_tmpa:nn { \l__jlreq_tmpa_str } { ##1 }
}
\keys_set:nn { PageStyle:#1 } {
yoko,
@@ -4393,359 +4806,191 @@
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},
+ 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
- \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)が_<見出し命令>で与えられている場合,次のようにする.
- % * \jlreq@(odd|even)@running@head(@ii)をマーク出力命令(\(left|right)mark or \jlreq@extra(left|right)mark{<num>})に書き換える
- % - evenの場合はleft,oddの場合はright.
- % - @iiがなければ\(left|right)mark,@iiがあれば\jlreq@extra(left|right)mark{1}
- % * 例えば_<見出し命令>が_sectionならば,\jlreq@markdata@sectionに{{<I1>}{<I2>}{<I3>}}を追加する.ここで<I1>,<I2>,<I3>は
- % - I1: @iiが無いときにodd or even
- % - I2: @iiが無ければ0,あれば1.
- % - I3: マーク出力命令がleftかrightに応じて l or r.(上述のようにoddかevenかで判定される.)
- % * 他にも_sectionが指定されている柱があれば,\jlreq@markdata@sectionにさらに追加で加えていく.
- % * \jlreq@(odd|even)@running@head(@ii)@heading@levelに<見出し命令>のレベルを入れる.レベルが不明な時は\relaxになる.
- % また,\jlreq@headingmarklistに<見出し命令>の一覧を入れる.
- \def\jlreq@headingmarklist{}%
- \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{\exp_not:c {jlreq@\jlreq@parity @running@head@\@roman\numexpr\jlreq@i + 1\relax}}{\exp_not:o {\jlreq@i}}{\exp_not:o {\jlreq@parity}}{jlreq@markdata}{\noexpand\jlreq@headingmarklist}}%
- \jlreq@next
- }%
- }%
- % \jlreq@minimumlevelに見出しの最低(数値が小さいという意味)レベルを入れる.
- \let\jlreq@minimumlevel=\@undefined
- \def\jlreq@markdefinecommand{}%
- \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
- \ifx\jlreq@minimumlevel\@undefined\let\jlreq@minimumlevel=\jlreq@level
- \else\ifnum\jlreq@minimumlevel>\jlreq@level\space\let\jlreq@minimumlevel=\jlreq@level\fi\fi
- \fi
- % \jlreq@markdata@<見出し命令>にある情報とmark_formatをもとに,\<見出し命令>markを定義するマクロを作成,\jlreq@markdefinecommandに入れる.
- \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@headingmark{\ifjlreq@headii@exist *\fi}{\exp_not:o {\jlreq@heading}}{\exp_not:o {\jlreq@mark@format}}{\exp_args:Nc \exp_not:o {jlreq@markdata@\jlreq@heading}}}%
- \jlreq@do
- \tl_put_right:Nx \jlreq@markdefinecommand { \exp_not:o {\jlreq@result} }%
- \fi
- }%
- \ifx\jlreq@minimumlevel\@undefined\else
- \tl_put_right:Nx \jlreq@markdefinecommand { \exp_not:N \jlreq@pagestyle@setclearmark { \exp_not:o {\jlreq@minimumlevel} } }
- \fi
% 見出しを出す場合:evenに章などの高いレベルの見出しを出す(2.6.3.a)
- \@ifundefined{jlreq@odd@running@head@i@heading@level}{}{\@ifundefined{jlreq@even@running@head@i@heading@level}{}{%
- \ifnum\jlreq@odd@running@head@i@heading@level<\jlreq@even@running@head@i@heading@level
- \jlreq@note{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる (ページスタイル #1 内,2.6.3.a).}%
- \fi
- }}%
- % 二番目以降にフォント設定を追加
- \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}%
- }%
- % \jlreq@oddhead,\jlreq@oddfoot,\jlreq@evenhead,\jlreq@evenfootに必要なものを入れる.
- \jlreq@if{\ifjlreq@pstate\fi}{% tate
- % headの方に処理を入れる.footは空.
- \def\jlreq@oddfoot{}\def\jlreq@evenfoot{}%
- \ifx\jlreq@nombre@i@position\@empty\def\jlreq@nombre@i@position{5\jlreq@zw}\fi
- \ifx\jlreq@running@head@i@position\@empty\def\jlreq@running@head@i@position{4\jlreq@zw}\fi
- \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\exp_not:o {\jlreq@nombre@gap}\noexpand\relax}%
- \jlreq@pagestyle@addifempty{\jlreq@nombre@iii@position}{\jlreq@nombre@ii}{\jlreq@gapcs}{\jlreq@nombre@iii}%
- \jlreq@pagestyle@addifempty{\jlreq@nombre@ii@position}{\jlreq@nombre@i}{\jlreq@gapcs}{\jlreq@nombre@ii}%
- \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\exp_not:o {\jlreq@running@head@gap}\noexpand\relax}%
- \jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@odd@running@head@ii}{\jlreq@gapcs}{\jlreq@odd@running@head@iii}%
- \jlreq@pagestyle@addifempty{\jlreq@running@head@ii@position}{\jlreq@odd@running@head@i}{\jlreq@gapcs}{\jlreq@odd@running@head@ii}%
- \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{}% ノンブルを入れる(下の方に出力)
- \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{}}{}%
- \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@nombre@\jlreq@i\endcsname
- \jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@nombre@font}%
- \tl_put_right:Nx \jlreq@nombre@contents {%
- \exp_not:N \hbox to 0pt{\exp_not:N \hss
- \exp_not:o {\jlreq@tempa}%
- \ifx\jlreq@position\@empty\else\exp_not:n {\hskip \glueexpr}\exp_not:o {\jlreq@position}\exp_not:N \relax\fi
- }%
- }%
- \fi
- }%
- % \jlreq@(odd|even)@contentsに柱を入れる(上の方に出力)
- \clist_map_variable:nNn { odd, even } \jlreq@parity {
- \expandafter\def\csname jlreq@\jlreq@parity @contents\endcsname{}%
- \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{}}{}%
- \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname
- \jlreq@pagestyle@addfont@tocs{jlreq@tempa}{jlreq@running@head@font}%
- \tl_put_right:cx {jlreq@\jlreq@parity @contents} {%
- \exp_not:N \hbox to 0pt{\exp_not:n {\hskip\glueexpr\headsep + \headheight}%
- \if@tate\else\exp_not:n {+ \topskip - \Cht}\fi
- \ifx\jlreq@position\@empty\else + \exp_not:o {\jlreq@position}\fi\exp_not:N \relax
- \exp_not:o {\jlreq@tempa}%
- \exp_not:N \hss
- }%
- }%
- \fi
- }%
- % \jlreq@(odd|even)headの構築
- % 空き指定には基本版面の文字サイズを使う(2.6.1.c)
- \@ifundefined{jlreq@\jlreq@parity headformat}
- {\def\jlreq@format{####1}}%
- {\expandafter\let\expandafter\jlreq@format\csname jlreq@\jlreq@parity headformat\endcsname}%
- \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\exp_not:o {\jlreq@format}}}\jlreq@do
- \edef\jlreq@tempb{%
- \exp_args:Nc \exp_not:o {jlreq@\jlreq@parity @contents}%
- \noexpand\hfil
- \exp_not:o {\jlreq@nombre@contents}%
- }%
- \expandafter\edef\csname jlreq@\jlreq@parity head\endcsname{%
- \unexpanded{\setbox\jlreq@tempboxa=\hbox to \dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{- \topskip + 1\jlreq@zh}\fi\noexpand\relax
- {%
- \unexpanded{\tate\adjustbaseline}%
- \expandafter\exp_not:o \expandafter{\expandafter\jlreq@tempa\expandafter{\jlreq@tempb}}%
- }%
+ \@ifundefined{jlreq@heading@level@\__jlreq_pagestyle_get_runninghead_section:Nn \l__jlreq_pagestyle_odd_runninghead_prop {0}}{}{
+ \@ifundefined{jlreq@heading@level@\__jlreq_pagestyle_get_runninghead_section:Nn \l__jlreq_pagestyle_even_runninghead_prop {0}}{}{
+ \int_compare:nNnT
+ {\csname jlreq@heading@level@\__jlreq_pagestyle_get_runninghead_section:Nn \l__jlreq_pagestyle_odd_runninghead_prop {0}\endcsname}
+ <
+ {\csname jlreq@heading@level@\__jlreq_pagestyle_get_runninghead_section:Nn \l__jlreq_pagestyle_even_runninghead_prop {0}\endcsname}
+ {
+ \jlreq@note{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる (ページスタイル #1 内,2.6.3.a).}%
+ }
+ }
+ }
+ % ノンブル同士の間や柱同士の間のデフォルトはノンブルと柱の間の空き量
+ \tl_if_empty:NT \l__jlreq_pagestyle_nombre_gap_tl { \tl_set_eq:NN \l__jlreq_pagestyle_nombre_gap_tl \l__jlreq_pagestyle_gap_tl }
+ \tl_if_empty:NT \l__jlreq_pagestyle_runninghead_gap_tl { \tl_set_eq:NN \l__jlreq_pagestyle_runninghead_gap_tl \l__jlreq_pagestyle_gap_tl }
+ % \<見出し>markを作り,\l__jlreq_tmpa_propに格納
+ \__jlreq_pagestyle_makemarkcommand:NNNN \l__jlreq_tmpa_prop \l__jlreq_pagestyle_odd_runninghead_prop \l__jlreq_pagestyle_even_runninghead_prop \l__jlreq_pagestyle_mark_format_prop
+ % \<見出し>markを定義するコマンドを入れる
+ \tl_set:Nn \l__jlreq_pagestyle_markcommands_tl {}
+ % 最小レベルの決定を行い,\<見出し命令>markの定義を入れていく.
+ \int_set:Nn \l__jlreq_tmpa_int {9999}
+ \prop_map_inline:Nn \l__jlreq_tmpa_prop {
+ \int_compare:nNnT { \l__jlreq_tmpa_int } > { \csname jlreq@heading@level@##1 \endcsname } {
+ \int_set:Nn \l__jlreq_tmpa_int { \csname jlreq@heading@level@##1 \endcsname }
+ }
+ \tl_put_right:Nx \l__jlreq_pagestyle_markcommands_tl { \exp_not:n {##2} }
+ }
+ \int_compare:nNnF {\l__jlreq_tmpa_int}={9999} {
+ \tl_put_right:Nx \l__jlreq_pagestyle_markcommands_tl {
+ \exp_not:N \jlreq@pagestyle@setclearmark {\int_use:N \l__jlreq_tmpa_int }
+ }
+ }
+ \bool_if:NTF \l__jlreq_pagestate_tate_bool {
+ \tl_set:Nx \l__jlreq_do_tl {}
+ \prop_clear:N \l__jlreq_tmpa_prop
+ \clist_map_inline:nn { odd,even } {
+ % .柱→\l__jlreq_tmpa_tl
+ \__jlreq_pagestyle_maketate_runhead:NcNNo \l__jlreq_tmpa_tl { l__jlreq_pagestyle_##1_runninghead_prop } \l__jlreq_pagestyle_runninghead_font_prop \l__jlreq_pagestyle_runninghead_position_prop \l__jlreq_pagestyle_runninghead_gap_tl
+ % ノンブル→\l__jlreq_tmpb_tl
+ \__jlreq_pagestyle_maketate_nombre:NNNNo \l__jlreq_tmpb_tl \l__jlreq_pagestyle_nombre_prop \l__jlreq_pagestyle_nombre_font_prop \l__jlreq_pagestyle_nombre_position_prop \l__jlreq_pagestyle_nombre_gap_tl
+ % 柱とノンブルを結合→\l__jlreq_tmpa_tl
+ \tl_set:Nx \l__jlreq_tmpa_tl { \exp_not:o \l__jlreq_tmpa_tl \exp_not:N \hfil \exp_not:o \l__jlreq_tmpb_tl }
+ % formatを適用.
+ \tl_set:Nn \l__jlreq_tmpb_tl {####1} % デフォルトフォーマット
+ \__jlreq_pagestyle_applyformat:NocN \l__jlreq_tmpa_tl \l__jlreq_tmpa_tl { l__jlreq_pagestyle_##1_top_format_tl } \l__jlreq_tmpb_tl
+ % 周りのボックスをつける.結果は\l__jlreq_tmpa_propにいれる.
+ \prop_put:Nnx \l__jlreq_tmpa_prop { ##1-top } {
+ \exp_not:n {\setbox\@tempboxa=\hbox to \dimexpr\headsep + \headheight + \textheight}
+ \legacy_if:nF { @tate } { \exp_not:n { - \topskip + 1\jlreq@zh } }
+ \exp_not:N \relax
+ { \exp_not:n { \tate\adjustbaseline } \exp_not:o \l__jlreq_tmpa_tl }
% Underful対策
\ifx l\jlreq@engine
- \unexpanded{\wd\jlreq@tempboxa=\headheight}%
+ \unexpanded{\wd\@tempboxa=\headheight}%
\else
- \unexpanded{\ht\jlreq@tempboxa=\headheight\dp\jlreq@tempboxa=0pt}%
+ \unexpanded{\ht\@tempboxa=\headheight\dp\@tempboxa=0pt}%
\fi
- }%
- }%
- % \jlreq@tempboxaを正しく配置する
- \edef\jlreq@lefthead@adjustbox{%
- \noexpand\hskip\noexpand\dimexpr\if@tate\unexpanded{- \Cdp}\fi \unexpanded{- \headsep - 1\jlreq@zw\relax}%
- \unexpanded{\box\jlreq@tempboxa\hfil}%
- }%
- \edef\jlreq@righthead@adjustbox{%
- \noexpand\hskip\unexpanded{\dimexpr\textwidth}\if@tate\unexpanded{- \topskip + \Cht}\fi\unexpanded{ + \headsep\relax}%
- \unexpanded{\box\jlreq@tempboxa\hss}%
- }%
- \if@tate
- \tl_put_right:Nx \jlreq@oddhead{\exp_not:o {\jlreq@lefthead@adjustbox}}%
- \tl_put_right:Nx \jlreq@evenhead{\exp_not:o {\jlreq@righthead@adjustbox}}%
- \else
- \tl_put_right:Nx \jlreq@oddhead{\exp_not:o {\jlreq@righthead@adjustbox}}%
- \tl_put_right:Nx \jlreq@evenhead{\exp_not:o {\jlreq@lefthead@adjustbox}}%
- \fi
+ }
+ }
+ % 位置調整,左側に柱+ノンブルがある場合
+ \tl_set:Nx \l__jlreq_tmpa_tl {
+ \exp_not:n { \hskip\dimexpr } \legacy_if:nT { @tate } { \exp_not:n { - \Cdp } } \exp_not:n { - \headsep - 1\jlreq@zw\relax }
+ \exp_not:n { \box\@tempboxa\hfil }
+ }
+ % 位置調整,右側に柱+ノンブルがある場合
+ \tl_set:Nx \l__jlreq_tmpb_tl {
+ \exp_not:n { \hskip\dimexpr\textwidth } \legacy_if:nT { @tate } { \exp_not:n { - \topskip + \Cht } } \exp_not:n { + \headsep\relax }
+ \exp_not:n { \box\@tempboxa\hss }
+ }
+ % 位置調整とすでに構築したブロックをくっつける.
+ \legacy_if:nTF { @tate } {
+ \prop_put:Nnx \l__jlreq_tmpa_prop { odd-top } { \prop_item:Nn \l__jlreq_tmpa_prop { odd-top } \exp_not:o \l__jlreq_tmpa_tl }
+ \prop_put:Nnx \l__jlreq_tmpa_prop { even-top } { \prop_item:Nn \l__jlreq_tmpa_prop { even-top } \exp_not:o \l__jlreq_tmpb_tl }
+ }{
+ \prop_put:Nnx \l__jlreq_tmpa_prop { odd-top } { \prop_item:Nn \l__jlreq_tmpa_prop { odd-top } \exp_not:o \l__jlreq_tmpb_tl }
+ \prop_put:Nnx \l__jlreq_tmpa_prop { even-top } { \prop_item:Nn \l__jlreq_tmpa_prop { even-top } \exp_not:o \l__jlreq_tmpa_tl }
+ }
+ % \l__jlreq_tmpa_tlに定義を入れる
+ \tl_set:Nx \l__jlreq_tmpa_tl {
+ \exp_not:n { \def\@oddhead } { \prop_item:Nn \l__jlreq_tmpa_prop { odd-top } }
+ \exp_not:n { \def\@oddfoot } { }
+ \exp_not:n { \def\@evenhead } { \prop_item:Nn \l__jlreq_tmpa_prop { even-top } }
+ \exp_not:n { \def\@evenfoot } { }
+ }
}{% yoko
- % 場所を正規化する.
- \def\jlreq@nombre@i@position@default{{bottom}{center}}%
- \def\jlreq@running@head@i@position@default{{top}{center}}%
- % ii以降の位置は指定されていない場合はiのそれに合わせる
- \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}%
- }%
- }%
- \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{\exp_args:Nc \exp_not:o {\jlreq@tempa}}{\exp_not:c {\jlreq@tempa}}{\exp_args:Nc \exp_not:o {\jlreq@tempa @default}}}%
- \jlreq@next
- }%
+ \__jlreq_pagestyle_normalizeposition:Nn \l__jlreq_pagestyle_runninghead_position_prop {{top}{center}}
+ \__jlreq_pagestyle_normalizeposition:Nn \l__jlreq_pagestyle_nombre_position_prop {{bottom}{center}}
+ % 警告
+ \cs_set:Nn \__jlreq_tmpa:Nn { \str_set:Nx ##1 { \use_ii:nn ##2 } }
+ \cs_generate_variant:Nn \__jlreq_tmpa:Nn { No }
+ \tl_set:Nx \l__jlreq_tmpa_tl { \prop_item:Nn \l__jlreq_pagestyle_nombre_position_prop {0} }
+ \__jlreq_tmpa:No \l__jlreq_tmpa_str \l__jlreq_tmpa_tl
+ \tl_set:Nx \l__jlreq_tmpb_tl { \prop_item:Nn \l__jlreq_pagestyle_runninghead_position_prop {0} }
+ \__jlreq_tmpa:No \l__jlreq_tmpb_str \l__jlreq_tmpb_tl
\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 }
+ \str_if_eq_p:Vn \l__jlreq_tmpa_str { right } ||
+ \str_if_eq_p:Vn \l__jlreq_tmpb_str { 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 }
+ \str_if_eq_p:Vn \l__jlreq_tmpa_str { left } ||
+ \str_if_eq_p:Vn \l__jlreq_tmpb_str { left }
)
) } {
- \if@twoside
+ \legacy_if:nT { @twoside } {
\jlreq@note{柱やノンブルは,左ページでは,基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか,基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する (ページスタイル #1 内,2.6.1.b).}%
- \fi
+ }
}%
% フォント変更命令に文字出力命令が入っているとエラーになるのを回避するために\setboxでごまかす.
- \setbox\jlreq@tempboxa=\hbox{\jlreq@running@head@font
+ \setbox\jlreq@tempboxa=\hbox{\prop_item:Nn \l__jlreq_pagestyle_runninghead_font_prop {0}
\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 }
+ \dim_compare_p:n { \l__jlreq_pagestyle_gap_tl < 1.49\jlreq@zw } ||
+ ( \dim_compare_p:n { \l__jlreq_pagestyle_gap_tl > 1.51\jlreq@zw } && \dim_compare_p:n { \l__jlreq_pagestyle_gap_tl < 1.99\jlreq@zw } ) ||
+ \dim_compare_p:n { \l__jlreq_pagestyle_gap_tl > 2.01\jlreq@zw }
}{
\jlreq@note{ノンブルと柱との空き量は柱に使用する文字サイズの2倍又は1.5倍とする (ページスタイル #1 内,2.6.1.c).}
}
}%
- % 初期化
- \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{}%
- }%
- }%
- }%
- % ページが左か右か
- \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が左になるようにする.
- \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}%
- \str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
- \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\tl_put_right:cx}{\let\jlreq@addtocs\tl_put_left:cx}%
- \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}\exp_not:o {\jlreq@nombre@gap}\noexpand\relax}\fi
- \jlreq@addtocs{\jlreq@csname}{\exp_args:Nc \exp_not:o {jlreq@nombre@\jlreq@i}}%
- \fi
- % running@head
- % 一度「紙面の外から」の順番で{A}{B}{C}と入れる
- \expandafter\ifx\csname jlreq@\jlreq@parity @running@head@\jlreq@i \endcsname\@empty\else
- \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}%
- \str_if_eq:VnT \jlreq@parity { even } {\jlreq@reverse@leftright{\jlreq@hor}}
- \str_if_eq:VVTF \jlreq@hor \jlreq@pagehor {\let\jlreq@addtocs=\tl_put_right:cx}{\let\jlreq@addtocs=\tl_put_left:cx}%
- \edef\jlreq@csname{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}%
- \jlreq@addtocs{\jlreq@csname}{{\exp_args:Nc \exp_not:o {jlreq@\jlreq@parity @running@head@\jlreq@i}}}%
- \fi
- }%
- % {A}{B}{C}の順だった柱を結合する.本体は\jlreq@pagestyle@make@runninghead.
- \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}{\exp_not:o {\jlreq@tempa}}{\exp_not:o {\jlreq@running@head@gap}}}%
- \jlreq@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}%
- % nombreにフォント設定を追加.
- \expandafter\ifx\csname\jlreq@nombrecsname\endcsname\@empty\else
- \ifx\jlreq@nombre@font\@empty\else
- \expandafter\edef\csname\jlreq@nombrecsname\endcsname{{\exp_not:o {\jlreq@nombre@font}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}}%
- \fi
- \fi
- \jlreq@if{\expandafter\ifx\csname\jlreq@runheadcsname\endcsname\@empty\fi}{%
- % 柱が空:ノンブルのみでよい
- \expandafter\let\csname\jlreq@csname\expandafter\endcsname\csname\jlreq@nombrecsname\endcsname
- }{%
- \jlreq@if{\expandafter\ifx\csname\jlreq@nombrecsname\endcsname\@empty\fi}{%
-% % ノンブルが空.柱のみでよい.
- \jlreq@pagestyle@addfont@tocs{\jlreq@runheadcsname}{jlreq@running@head@font}%
- \expandafter\let\csname\jlreq@csname\expandafter\endcsname\csname\jlreq@runheadcsname\endcsname
- }{%
-% % 両方ある場合:左ページではノンブルが左,右ページではノンブルが右.
- \jlreq@ifleftpage{\jlreq@parity}{%
- \str_if_eq:VnTF \jlreq@hor { right } {
- % <ノンブル><空き><柱>,右寄せ
- % 柱が空出ないときに限り<空き>を入れる.
- \jlreq@pagestyle@addfont@totokens{\exp_not:N \dim_compare:nF { \exp_not:n { \wd\jlreq@PageStyle@box=0pt } } { \exp_not:N \hskip\exp_not:o {\jlreq@gap}\exp_not:N \relax } }{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{%
- \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\exp_not:o {\jlreq@running@head@font}\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}%
- \exp_args:Nc \exp_not:o {\jlreq@nombrecsname}\exp_not:o {\jlreq@tempa}\unexpanded{\box\jlreq@PageStyle@box}%
- }%
- }{%
- % <ノンブル><空き><柱>,左寄せ
- % ノンブルは常に空ではないと仮定する.
- \jlreq@pagestyle@addfont@totokens{\unexpanded{\hskip\glueexpr}\exp_not:o {\jlreq@gap}\noexpand\relax\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}\exp_not:o {\jlreq@tempa}}%
- }%
- }{%
- \str_if_eq:VnTF \jlreq@hor { left } {
- % <柱><空き><ノンブル>,左寄せ
- \jlreq@pagestyle@addfont@totokens{%
- \unexpanded{\setbox\jlreq@PageStyle@box=\hbox}{\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}}%
- \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{\exp_not:o {\jlreq@tempa}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}%
- }{%
- % <柱><空き><ノンブル>,右寄せ
- \jlreq@pagestyle@addfont@totokens{\exp_args:Nc \exp_not:o {\jlreq@runheadcsname}\unexpanded{\hskip\glueexpr}\exp_not:o {\jlreq@gap}\noexpand\relax}{jlreq@running@head@font}{jlreq@tempa}%
- \expandafter\edef\csname\jlreq@csname\endcsname{\exp_not:o {\jlreq@tempa}\exp_args:Nc \exp_not:o {\jlreq@nombrecsname}}%
- }%
- }%
- }%
- }%
- }%
- }%
- }%
- % 四カ所構築
- \jlreq@pagestyle@setheadfoot{\jlreq@oddhead}{jlreq@odd@top@left}{jlreq@odd@top@center}{jlreq@odd@top@right}%
- \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}%
- \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}%
- }%
- \jlreq@pagestyle@applyformat{\jlreq@oddhead}{\jlreq@oddheadformat}{\jlreq@defaultformat}%
- \jlreq@pagestyle@applyformat{\jlreq@evenhead}{\jlreq@evenheadformat}{\jlreq@defaultformat}%
- \jlreq@pagestyle@applyformat{\jlreq@oddfoot}{\jlreq@oddfootformat}{\jlreq@defaultformat}%
- \jlreq@pagestyle@applyformat{\jlreq@evenfoot}{\jlreq@evenfootformat}{\jlreq@defaultformat}%
- % 傍注用調整
- \ifdim\jlreq@sidenote@length>0pt
- \if@tate\else
- \if@twocolumn
- \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@oddhead}%
- \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@oddfoot}%
- \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@evenhead}%
- \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@evenfoot}%
- \else
- \jlreq@pagestyle@addsidenotemargin@right{\jlreq@oddhead}%
- \jlreq@pagestyle@addsidenotemargin@right{\jlreq@oddfoot}%
- \jlreq@pagestyle@addsidenotemargin@left{\jlreq@evenhead}%
- \jlreq@pagestyle@addsidenotemargin@left{\jlreq@evenfoot}%
- \fi
- \fi
- \fi
- }%
- \edef\jlreq@do{%
- \noexpand\edef\exp_not:c {ps@#1}{%
- \noexpand\unexpanded{%
- \unexpanded{\def\jlreq@current@pagestyle{#1}}%
- \ifjlreq@clearmarkcommand\unexpanded{\jlreq@heading@execmacro@toallheadings\jlreq@clearheadingmarks}\fi
- \ifjlreq@headii@exist
- \unexpanded{\let\@mkboth=\jlreq@markboth}%
- \else
- \unexpanded{\let\@mkboth=\markboth}%
- \fi
- \unexpanded{\def\@oddhead}{\exp_not:o {\jlreq@oddhead}}%
- \unexpanded{\def\@oddfoot}{\exp_not:o {\jlreq@oddfoot}}%
- \unexpanded{\def\@evenhead}{\exp_not:o {\jlreq@evenhead}}%
- \unexpanded{\def\@evenfoot}{\exp_not:o {\jlreq@evenfoot}}%
- \exp_not:o {\jlreq@markdefinecommand}%
- \exp_not:o {\jlreq@command}%
- }%
- }%
- }%
- \expandafter\endgroup
- \jlreq@do
+ \prop_clear:N \l__jlreq_tmpa_prop % \l__jlreq_tmpa_prop{odd-top}に中身トークン列
+ \clist_map_inline:nn { odd,even } { % ##1
+ \clist_map_inline:nn { top,bottom } { % ####1
+ \prop_clear:N \l__jlreq_tmpb_prop % 左,真ん中,右のトークン列をいったん入れる
+ \clist_map_inline:nn {left,center,right} { % ########1
+ % even時は左右がひっくり返るが,それは下位マクロに任せる
+ % 柱→\l__jlreq_tmpa_tl
+ \__jlreq_pagestyle_makeyoko_each:NnnncNNo \l__jlreq_tmpa_tl {##1} {####1} {########1} { l__jlreq_pagestyle_##1_runninghead_prop } \l__jlreq_pagestyle_runninghead_font_prop \l__jlreq_pagestyle_runninghead_position_prop \l__jlreq_pagestyle_runninghead_gap_tl
+ % ノンブル→\l__jlreq_tmpa_tl
+ \__jlreq_pagestyle_makeyoko_each:NnnncNNo \l__jlreq_tmpb_tl {##1} {####1} {########1} { l__jlreq_pagestyle_nombre_prop } \l__jlreq_pagestyle_nombre_font_prop \l__jlreq_pagestyle_nombre_position_prop \l__jlreq_pagestyle_nombre_gap_tl
+ % 柱とノンブルを結合し\l__jlreq_tmpb_propへ代入
+ \__jlreq_pagestyle_concat_runhead_nombre:Nnnooo \l__jlreq_tmpa_tl {########1} {##1} \l__jlreq_tmpa_tl \l__jlreq_tmpb_tl \l__jlreq_pagestyle_gap_tl
+ \prop_put:Nno \l__jlreq_tmpb_prop {########1} \l__jlreq_tmpa_tl
+ }
+ % 左,中央,右を結合し\l__jlreq_tmpa_tlへ
+ \__jlreq_pagestyle_concat_left_center_right:Nneee \l__jlreq_tmpa_tl {##1} {\prop_item:Nn \l__jlreq_tmpb_prop {left} } {\prop_item:Nn \l__jlreq_tmpb_prop {center} } {\prop_item:Nn \l__jlreq_tmpb_prop {right} }
+ % デフォルトのフォーマットの設定
+ \bool_if:nTF { \dim_compare_p:n { \jlreq@sidenote@length > 0pt } && (! \legacy_if_p:n { @tate } ) }{
+ \tl_set:Nn \l__jlreq_tmpb_tl {\hss\hbox to \jlreqyokoheadlength{########1}\hss}
+ }{
+ \tl_set:Nn \l__jlreq_tmpb_tl {########1}
+ }
+ \__jlreq_pagestyle_applyformat:NocN \l__jlreq_tmpa_tl \l__jlreq_tmpa_tl { l__jlreq_pagestyle_##1_####1_format_tl } \l__jlreq_tmpb_tl
+ % 傍注用調整
+ \dim_compare:nNnT {\jlreq@sidenote@length}>{0pt} {
+ \legacy_if:nF { @tate } {
+ \legacy_if:nTF { @twocolumn } {
+ \__jlreq_pagestyle_addsidenotemargin_bothside:N \l__jlreq_tmpa_tl
+ }{
+ \str_if_eq:nnTF { ##1} { odd } {
+ \__jlreq_pagestyle_addsidenotemargin_right:N \l__jlreq_tmpa_tl
+ }{
+ \__jlreq_pagestyle_addsidenotemargin_left:N \l__jlreq_tmpa_tl
+ }
+ }
+ }
+ }
+ \prop_put:Nno \l__jlreq_tmpa_prop {##1-####1} \l__jlreq_tmpa_tl
+ }
+ }
+ % \l__jlreq_tmpa_tlに定義を入れる
+ \tl_set:Nx \l__jlreq_tmpa_tl {
+ \exp_not:n { \def\@oddhead } { \prop_item:Nn \l__jlreq_tmpa_prop { odd-top } }
+ \exp_not:n { \def\@oddfoot } { \prop_item:Nn \l__jlreq_tmpa_prop { odd-bottom } }
+ \exp_not:n { \def\@evenhead } { \prop_item:Nn \l__jlreq_tmpa_prop { even-top } }
+ \exp_not:n { \def\@evenfoot } { \prop_item:Nn \l__jlreq_tmpa_prop { even-bottom } }
+ }
+ }
+ % _iiが存在するか調べて\l__jlreq_tmpa_boolに入れる
+ \bool_set:Nn \l__jlreq_tmpa_bool {
+ \prop_if_in_p:Nn \l__jlreq_pagestyle_odd_runninghead_prop {1} || \prop_if_in_p:Nn \l__jlreq_pagestyle_odd_runninghead_prop {2}
+ }
+ \tl_set:Nx \l__jlreq_do_tl {
+ \exp_not:n {\edef} \exp_not:c {ps@#1} { \exp_not:N \exp_not:n {
+ \exp_not:n { \def\jlreq@current@pagestyle{#1} }
+ \bool_if:nT { \l__jlreq_pagestyle_clearmarkcommand_bool } { \exp_not:n { \jlreq@heading@execmacro@toallheadings\jlreq@clearheadingmarks } }
+ \exp_not:n {\let\@mkboth=}\bool_if:NTF \l__jlreq_tmpa_bool { \exp_not:N \markboth } { \exp_not:N \jlreq@markboth }
+ \exp_not:o \l__jlreq_tmpa_tl
+ \exp_not:o \l__jlreq_pagestyle_markcommands_tl
+ }}
+ }
+ \exp_after:wN \group_end:
+ \l__jlreq_do_tl
}
\if@tate
@@ -4945,11 +5190,11 @@
*top .code:n = { \__jlreq_@makecaption_align_set_with_check_value:Vn \l_keys_key_str {#1} },
*bottom .code:n = { \__jlreq_@makecaption_align_set_with_check_value:Vn \l_keys_key_str {#1} },
unknown .code:n = {
- \clist_map_variable:nNn {#1} \l_jlreq_tmpa_tl {
- \tl_trim_spaces:N \l_jlreq_tmpa_tl
- \str_set_eq:NN \l_jlreq_tmpa_str \l_keys_key_str
- \str_put_left:Nn \l_jlreq_tmpa_str {@}
- \__jlreq_@makecaption_align_set:VV \l_jlreq_tmpa_str \l_jlreq_tmpa_tl
+ \clist_map_variable:nNn {#1} \l__jlreq_tmpa_tl {
+ \tl_trim_spaces:N \l__jlreq_tmpa_tl
+ \str_set_eq:NN \l__jlreq_tmpa_str \l_keys_key_str
+ \str_put_left:Nn \l__jlreq_tmpa_str {@}
+ \__jlreq_@makecaption_align_set:VV \l__jlreq_tmpa_str \l__jlreq_tmpa_tl
}
}
}
@@ -5939,7 +6184,7 @@
\hbox_to_wd:nn {##1} {
\def#1 { }
\kanjishape{n-jidori}\selectfont
- \def\kanjishape####1{\jlreq@useoriginalcs{kanjishape}{####1-jidori}}
+ \def\kanjishape####1{\jlreq@useoriginalcs@witharguments{kanjishape}{{####1-jidori}}}
##2
\hskip\glueexpr 0pt~minus~1fil\relax
}
@@ -5965,7 +6210,7 @@
\NewDocumentCommand { \akigumi } { m m } {
\mode_if_vertical:TF { \leavevmode } {}
\group_begin:
- \__jlreq_setkanjiskip:nn { \jlreqkanjiskip + #1 } { }
+ \__jlreq_setkanjiskip:nn { \jlreqkanjiskip + #1 } { \jlreqxkanjiskip + #1 }
\hbox:n {#2}
\group_end:
}
diff --git a/language/japanese/jlreq/jlreq.pdf b/language/japanese/jlreq/jlreq.pdf
index 8c24ea8a46..a0e4e66fdb 100644
--- a/language/japanese/jlreq/jlreq.pdf
+++ b/language/japanese/jlreq/jlreq.pdf
Binary files differ
diff --git a/macros/latex/contrib/srdp-mathematik/README.txt b/macros/latex/contrib/srdp-mathematik/README.md
index 5ebd2ac109..be20314ea2 100644
--- a/macros/latex/contrib/srdp-mathematik/README.txt
+++ b/macros/latex/contrib/srdp-mathematik/README.md
@@ -1,19 +1,4 @@
-__________________________________
-
- The
- srdp-mathematik package
- v1.9.5
-
- 2022/03/04
-___________________________________
-
-Maintainer: Christoph Weberndorfer
-E-mail : c.weberndorfer@gmail.com
- Comments, bug reports and suggestions are welcome.
-Licence : Released under the LaTeX Project Public License 1.3c or
- later, see http://www.latex-project.org/lppl.txt
-
-----------------------------------------------------------------------
+# srdp-mathematik.sty v1.9.6
This package provides basic commands for the defined formats of the Austrian sRDP in mathematics.
Furthermore, it includes ways to implement answers in the tex file, which can be voluntarily displayed in the pdf file and
@@ -25,4 +10,11 @@ Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der öste
Reife- und Diplomprüfung (sRDP) in Mathematik.
Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen.
Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen.
+
+----------------------------------------------------------------------
+
+Maintainer: Christoph Weberndorfer
+
+
+
diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
index c2dff7ff86..c9bada9a13 100644
--- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
+++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.pdf
Binary files differ
diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
index 4209fa9c14..1b1bbde374 100644
--- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
+++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.sty
@@ -10,7 +10,7 @@
%
\NeedsTeXFormat{LaTeX2e}[1996/12/26]
-\ProvidesPackage{srdp-mathematik}[2022/03/04 v1.9.5 Standard-Schularbeitsformate]
+\ProvidesPackage{srdp-mathematik}[2022/04/05 v1.9.6 Standard-Schularbeitsformate]
\usepackage{color}
@@ -129,6 +129,18 @@
}}}}}}}}}
+\ExplSyntaxOn
+\NewDocumentCommand{\stringprocess}{ m m }
+{\egreg_string_process:nn{#1}{#2}}
+\cs_new_protected:Npn \egreg_string_process:nn#1#2
+{\tl_map_inline:nn{#2}{#1{##1}}}
+\ExplSyntaxOff
+
+\newcommand{\boxchar}[2]{\strut#2#1}
+\newcommand{\stretchstring}[2][\ \ ]{\stringprocess{\boxchar{#1}}{#2}}
+
+
+
\newcommand{\antwort}[2][]{\ifthenelse{\theAntworten=1}{{\color[rgb]{1,0,0}#2}}{#1}}
\newcommand{\info}[2][]{\ifthenelse{\theinfo=1}{
@@ -141,9 +153,10 @@
\ifthenelse{\theAntworten=1}{\switchon}{}
+
\def\antwortzeile #1\\{%
\ifswitch%
-{\color[rgb]{1,0,0}#1}\\
+\color[rgb]{1,0,0}#1\\
\fi%
}
diff --git a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
index ece0c2195a..5e4ef530bc 100644
--- a/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
+++ b/macros/latex/contrib/srdp-mathematik/srdp-mathematik.tex
@@ -55,7 +55,7 @@ hidelinks
\vfill
-\Huge The \textit{srdp-mathematik} package v1.9.5\\[1cm]
+\Huge The \textit{srdp-mathematik} package v1.9.6\\[1cm]
Documentation \\ [1cm]
@@ -235,29 +235,24 @@ Die Option 3 \texttt{ms} ermöglicht die Darstellung des Notenschlüssels entspr
%\textsc{Ausgabe:}
%\notenschluessel[1/2]{0.91}{0.8}{0.64}{0.5}
-\subsubsection{\texttt{\textbackslash beurteilungsraster}}
+\subsubsection{\texttt{\textbackslash beurteilung}}
-Der Befehl \texttt{beurteilungsraster} entspricht der aktuellen Vorgabe der Beurteilung der standardisierten Reifeprüfung (Stand 2019). Dabei müssen die Punkte für Teil 1, Ausgleichspunkte und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der bei der Reifeprüfung verwendeten prozentuellen Notenverteilung, können jedoch jederzeit verändert werden. \leer
+Der Befehl \texttt{\textbackslash beurteilung} ist ein für Schularbeiten angepasstes Beurteilungsschema der standardisierten Reifeprüfung und ist für das Deckblatt der Schularbeit vorgesehen. Dabei müssen die Punkte für Teil 1 und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der empfohlenen prozentuellen Notenverteilung, die jedoch jederzeit individuell angepasst werden können. \leer
\textsc{Eingabe:}
\begin{verbatim}
-\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
- T1={24}, % Punkte im Teil 1
- AP={4}, % Ausgleichspunkte aus Teil 2
- T2={20}, % Punkte im Teil 2
- }
+\beurteilung{0.875}{0.75}{0.625}{1/2}{ % Prozentschluessel
+ T1={16}, % Punkte im Teil 1
+ T2={8}, % Punkte im Teil 2
+ }
\end{verbatim}
\textsc{Ausgabe:}\leer
-siehe nächste Seite \newpage
-
-
-\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
- T1={24}, % Punkte im Teil 1
- AP={4}, % Ausgleichspunkte aus Teil 2
- T2={20}, % Punkte im Teil 2
+\beurteilung{0.875}{0.75}{0.625}{1/2}{ % Prozentschluessel
+ T1={16}, % Punkte im Teil 1
+ T2={8}, % Punkte im Teil 2
}
\newpage
@@ -312,6 +307,20 @@ wird.]
{Dies ist die notwendige Eingabe und wird in rot angezeigt und nur wenn
\texttt{'solution\_on'} eingestellt ist.}
+\subsubsection{\texttt{\textbackslash antwortzeile}}
+In manchen Fällen ist es notwendig, dass ganze Zeilen einer Tabelle als Lösung ein- und ausgeblendet werden können. Zu diesem Zweck kann der Befehl \texttt{\textbackslash antwortzeile} verwendet werden.\leer
+
+\textsc{Eingabe:}
+
+\begin{verbatim}
+\begin{tabular}{c|c}
+$x$ & $f(x)$ \\ \hline
+0 & 2 \\
+2 & 4 \\
+\antwortzeile 4 & 16 \\
+\end{tabular}
+\end{verbatim}
+
\subsection{Paketoption -- Erstellung von Gruppen: \texttt{[random=0,1,2,\ldots]}}
Das \texttt{srdp-mathematik}-Paket ermöglicht auch die automatische Erstellung von Gruppen für Schularbeiten, durch Vertauschung der Antwortmöglichkeiten aller Typ-1-Aufgaben. Dazu kann die \texttt{random}-Option im \texttt{srdp-mathematik}-Paket eingebunden geladen werden. Also:
@@ -469,6 +478,47 @@ Der Winkel Alpha ist 30\degre. ($\alpha = 30 \degre$)
Der Winkel Alpha ist 30\degre. ($\alpha = 30 \degre$)
+\subsubsection{\texttt{\textbackslash stretchstring}}
+Der Befehl \texttt{\textbackslash stretchstring} erleichtert es, einen Text (oder Zahlen) durch Leerzeichen zu trennen, um etwa Rechnungen auf Arbeitsblättern zum Ausfüllen zu erstellen.
+
+\textsc{Eingabe:}
+\begin{verbatim}
+\begin{tabular}{r}
+\stretchstring{35}\\
+\stretchstring{724}\\
+\stretchstring{28}\\
+\stretchstring{436}\\ \hline
+\stretchstring{1223}\\
+\end{tabular}
+\end{verbatim}
+
+\textsc{Ausgabe:}\\
+\begin{tabular}{r}
+\stretchstring{35}\\
+\stretchstring{724}\\
+\stretchstring{28}\\
+\stretchstring{436}\\ \hline
+\stretchstring{1223}\\
+\end{tabular}\leer
+
+Es ist außerdem möglich, den Abstand zwischen den Zeichen individuell anzugeben.\leer
+
+\textsc{Eingabe:}
+\begin{verbatim}
+\stretchstring[\,]{4126}
+
+\stretchstring[\quad]{4126}
+
+\stretchstring[\hspace{2cm}]{4126}
+\end{verbatim}
+
+\textsc{Ausgabe:}\\
+\stretchstring[\,]{4126}
+
+\stretchstring[\quad]{4126}
+
+\stretchstring[\hspace{2cm}]{4126}
+
\section{Typ-1-Aufgaben}
Das \texttt{srdp-mathematik}-Paket ermöglicht die Verwendung vorgefertigter Aufgabenformate, die bei der österreichischen, standardisierten Reifeprüfung Anwendung finden.
@@ -635,8 +685,6 @@ Wichtig zu erwähnen ist dabei, dass ausschließlich die Zahl in eckigen Klammer
}
-\newpage
-
Die Eingabe in eckiger Klammer ist dabei optional. Wird sie nicht angegeben, wird der Standard von 5 angenommen.
\leer
diff --git a/macros/texinfo/latest/texinfo.tex b/macros/texinfo/latest/texinfo.tex
index 951ac11fcf..ab837e82eb 100644
--- a/macros/texinfo/latest/texinfo.tex
+++ b/macros/texinfo/latest/texinfo.tex
@@ -3,9 +3,9 @@
% Load plain if necessary, i.e., if running under initex.
\expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
%
-\def\texinfoversion{2022-01-02.12}
+\def\texinfoversion{2022-03-13.19}
%
-% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc.
+% Copyright 1985, 1986, 1988, 1990-2022 Free Software Foundation, Inc.
%
% This texinfo.tex file is free software: you can redistribute it and/or
% modify it under the terms of the GNU General Public License as
@@ -3171,16 +3171,8 @@ end
% Default is `distinct'.
\kbdinputstyle distinct
-% @kbd is like @code, except that if the argument is just one @key command,
-% then @kbd has no effect.
-\def\kbd#1{{\def\look{#1}\expandafter\kbdsub\look??\par}}
-
-\def\xkey{\key}
-\def\kbdsub#1#2#3\par{%
- \def\one{#1}\def\three{#3}\def\threex{??}%
- \ifx\one\xkey\ifx\threex\three \key{#2}%
- \else{\tclose{\kbdfont\setcodequotes\look}}\fi
- \else{\tclose{\kbdfont\setcodequotes\look}}\fi
+\def\kbd#1{%
+ \tclose{\kbdfont\setcodequotes#1}%
}
% definition of @key that produces a lozenge. Doesn't adjust to text size.
@@ -4417,7 +4409,6 @@ $$%
% Find the correct column width
\hsize=\expandafter\csname col\the\colcount\endcsname
%
- \rightskip=0pt
\ifnum\colcount=1
\advance\hsize by\leftskip % Add indent of surrounding text
\else
@@ -5961,7 +5952,7 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% Chapters, sections, etc.
% Let's start with @part.
-\outer\parseargdef\part{\partzzz{#1}}
+\parseargdef\part{\partzzz{#1}}
\def\partzzz#1{%
\chapoddpage
\null
@@ -8680,9 +8671,11 @@ might help (with 'rm \jobname.?? \jobname.??s')%
}
\def\wordTop{Top}
-% Until the next @node or @bye command, divert output to a box that is not
-% output.
-\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}%
+% Until the next @node, @part or @bye command, divert output to a box that
+% is not output.
+\def\ignorenode{\setbox\dummybox\vbox\bgroup
+\def\part{\egroup\part}%
+\def\node{\egroup\node}%
\ignorenodebye
}
@@ -9391,13 +9384,12 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\catcode`\^^M = 5 % in case we're inside an example
\normalturnoffactive % allow _ et al. in names
\makevalueexpandable
- % If the image is by itself, center it.
\ifvmode
\imagevmodetrue
\else \ifx\centersub\centerV
% for @center @image, we need a vbox so we can have our vertical space
\imagevmodetrue
- \vbox\bgroup % vbox has better behavior than vtop herev
+ \vbox\bgroup % vbox has better behavior than vtop here
\fi\fi
%
\ifimagevmode
@@ -9405,11 +9397,14 @@ might help (with 'rm \jobname.?? \jobname.??s')%
% Usually we'll have text after the image which will insert
% \parskip glue, so insert it here too to equalize the space
% above and below.
- \nobreak\vskip\parskip
- \nobreak
+ \vskip\parskip
+ %
+ % Place image in a \vtop for a top page margin that is (close to) correct,
+ % as \topskip glue is relative to the first baseline.
+ \vtop\bgroup\hrule height 0pt\vskip-\parskip
\fi
%
- % Leave vertical mode so that indentation from an enclosing
+ % Enter horizontal mode so that indentation from an enclosing
% environment such as @quotation is respected.
% However, if we're at the top level, we don't want the
% normal paragraph indentation.
@@ -9438,8 +9433,9 @@ might help (with 'rm \jobname.?? \jobname.??s')%
\fi
%
\ifimagevmode
+ \egroup
\medskip % space after a standalone image
- \fi
+ \fi
\ifx\centersub\centerV \egroup \fi
\endgroup}
@@ -10898,6 +10894,9 @@ directory should work if nowhere else does.}
\DeclareUnicodeCharacter{1EF8}{\~Y}%
\DeclareUnicodeCharacter{1EF9}{\~y}%
%
+ % Exotic spaces
+ \DeclareUnicodeCharacter{2007}{\hphantom{0}}%
+ %
% Punctuation
\DeclareUnicodeCharacter{2013}{--}%
\DeclareUnicodeCharacter{2014}{---}%
diff --git a/macros/latex/contrib/ametsoc/AMS_Refs.pdf b/obsolete/macros/latex/contrib/ametsoc/AMS_Refs.pdf
index a7ab773eb7..a7ab773eb7 100644
--- a/macros/latex/contrib/ametsoc/AMS_Refs.pdf
+++ b/obsolete/macros/latex/contrib/ametsoc/AMS_Refs.pdf
Binary files differ
diff --git a/macros/latex/contrib/ametsoc/README b/obsolete/macros/latex/contrib/ametsoc/README
index d6e0ad62ad..d6e0ad62ad 100644
--- a/macros/latex/contrib/ametsoc/README
+++ b/obsolete/macros/latex/contrib/ametsoc/README
diff --git a/macros/latex/contrib/ametsoc/ametsoc.cls b/obsolete/macros/latex/contrib/ametsoc/ametsoc.cls
index bda341f632..bda341f632 100644
--- a/macros/latex/contrib/ametsoc/ametsoc.cls
+++ b/obsolete/macros/latex/contrib/ametsoc/ametsoc.cls
diff --git a/macros/latex/contrib/ametsoc/ametsoc2014.bst b/obsolete/macros/latex/contrib/ametsoc/ametsoc2014.bst
index 4fb598c363..4fb598c363 100644
--- a/macros/latex/contrib/ametsoc/ametsoc2014.bst
+++ b/obsolete/macros/latex/contrib/ametsoc/ametsoc2014.bst
diff --git a/macros/latex/contrib/ametsoc/amsdocs.pdf b/obsolete/macros/latex/contrib/ametsoc/amsdocs.pdf
index 1c4c97060e..1c4c97060e 100644
--- a/macros/latex/contrib/ametsoc/amsdocs.pdf
+++ b/obsolete/macros/latex/contrib/ametsoc/amsdocs.pdf
Binary files differ
diff --git a/macros/latex/contrib/ametsoc/references.bib b/obsolete/macros/latex/contrib/ametsoc/references.bib
index 01891a64f9..01891a64f9 100644
--- a/macros/latex/contrib/ametsoc/references.bib
+++ b/obsolete/macros/latex/contrib/ametsoc/references.bib
diff --git a/macros/latex/contrib/ametsoc/template.tex b/obsolete/macros/latex/contrib/ametsoc/template.tex
index c7d447fdac..c7d447fdac 100644
--- a/macros/latex/contrib/ametsoc/template.tex
+++ b/obsolete/macros/latex/contrib/ametsoc/template.tex
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 8bd91f94e1..8ee941ac8c 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,14 @@
+2022-04-05 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-ooffice.tex (ooffice.4ht): added option to produce inline
+ description lists.
+ https://puszcza.gnu.org.ua/bugs/?531
+
+2022-04-04 Karl Berry <karl@freefriends.org>
+
+ * tex4ht-4ht.tex (minted.4ht),
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): copyright 2022.
+
2022-04-04 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (minted.4ht): fixed spurious whitespace produced by
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index c8020013b0..f12d318268 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1106 2022-04-04 10:06:26Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1107 2022-04-04 14:44:55Z karl $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
diff --git a/support/TeX4ht/source/tex4ht-ooffice.tex b/support/TeX4ht/source/tex4ht-ooffice.tex
index 56de7c4c9c..eebe62995f 100644
--- a/support/TeX4ht/source/tex4ht-ooffice.tex
+++ b/support/TeX4ht/source/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1101 2022-03-28 11:52:50Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1108 2022-04-05 15:59:08Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -1979,8 +1979,19 @@ change the configuration slightly. We modify directly the
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
\<configure ooffice latex\><<<
+\:CheckOption{description-inline}\if:Option
+|<oo-description-inline|>
+\else
+\Log:Note{for description lists where header is in the same paragraph as
+ description, use the `description-inline' command option}
+|<oo-default-description|>
+\fi
+>>>
+
+
+
+\<oo-default-description\><<<
\let\end:itm=\empty
\ConfigureList{description}%
{\EndP
@@ -2019,6 +2030,37 @@ change the configuration slightly. We modify directly the
+\<oo-description-inline\><<<
+\let\end:itm=\empty
+\ConfigureList{description}%
+ {\EndP
+ \bgroup
+ \HCode{<text:list
+ text:style-name="description\if@rl-rtl\fi"
+ text:name="description"\Hnewline>}%
+ \PushMacro\end:itm
+ \global\let\end:itm=\empty
+ \HTML:PAR{description-inline|<cond rtl class|>}{description-inline|<cond rtl class|>}%
+ \gHAdvance\BegEnd:D by 1
+ }
+ {\gHAdvance\BegEnd:D by -1
+ \PopMacro\end:itm \global\let\end:itm \end:itm
+ \EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}
+ \HCode{</text:list>}%
+ \egroup
+ \ShowPar}
+ {\end:itm
+ \global\def\end:itm{\EndP
+ \HCode{<!--/dd-->}%
+ \HCode{</text:list-item>}%
+ }%
+ \HCode{<text:list-item>}\par\ShowPar%
+ }
+ {}
+>>>
+
@@ -2060,7 +2102,6 @@ change the configuration slightly. We modify directly the
-
\<oo-description for enumerate\><<<
\ConfigureOO{enumerate}%
{|<shared oo+ enumerate style|>%
@@ -2212,6 +2253,16 @@ change the configuration slightly. We modify directly the
fo:font-weight="bold"
/>
</style:style>
+<style:style
+ style:name="description-inline"
+ style:family="paragraph"
+ style:parent-style-name="">
+ <style:paragraph-properties
+ fo:margin-left="0.35in"
+ fo:margin-right="0in"
+ fo:text-indent="-0.35in"
+ style:auto-text-indent="false"/>
+</style:style>
>>>
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 781f195f5c..c31e6c39af 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -4,7 +4,6 @@ $mirrors = {
'https://mirror.marwan.ma/ctan/' => 1,
},
'South Africa' => {
- 'http://ftp.leg.uct.ac.za/pub/packages/ctan/' => 1,
'http://ftp.sun.ac.za/ftp/CTAN/' => 1,
'https://mirror.ufs.ac.za/ctan/' => 1,
},
@@ -16,7 +15,6 @@ $mirrors = {
'https://mirrors.bfsu.edu.cn/CTAN/' => 1,
'https://mirrors.cloud.tencent.com/CTAN/' => 1,
'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,
@@ -97,7 +95,6 @@ $mirrors = {
'https://ctan.tetaneutral.net/' => 1,
'https://distrib-coffee.ipsl.jussieu.fr/pub/mirrors/ctan/' => 1,
'https://mirror.ibcp.fr/pub/CTAN/' => 1,
- 'https://mirrors.chevalier.io/CTAN/' => 1,
'https://mirrors.ircam.fr/pub/CTAN/' => 1,
'https://texlive.mycozy.space/' => 1,
},
@@ -169,7 +166,6 @@ $mirrors = {
},
'Sweden' => {
'https://ftp.acc.umu.se/mirror/CTAN/' => 1,
- 'https://ftpmirror1.infania.net/mirror/CTAN/' => 1,
},
'Switzerland' => {
'https://mirror.foobar.to/CTAN/' => 1,
@@ -188,9 +184,6 @@ $mirrors = {
'https://mirror.its.dal.ca/ctan/' => 1,
'https://muug.ca/mirror/ctan/' => 1,
},
- 'Costa Rica' => {
- 'https://mirrors.ucr.ac.cr/CTAN/' => 1,
- },
'USA' => {
'http://bay.uchicago.edu/CTAN/' => 1,
'http://mirrors.ibiblio.org/pub/mirrors/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt b/systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
index e91e25fa27..5dbd0af270 100644
--- a/systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
+++ b/systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
@@ -1,7 +1,7 @@
##
## Bundle of CA Root Certificates
##
-## Certificate data from Mozilla as of: Fri Mar 18 12:29:51 2022 GMT
+## Certificate data from Mozilla as of: Tue Mar 29 03:12:05 2022 GMT
##
## This is a bundle of X.509 certificates of public Certificate Authorities
## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
## Just configure this file as the SSLCACertificateFile.
##
## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 187ef9dc231135324fe78830cf4462f1ecdeab3e6c9d5e38d623391e88dc5d3c
+## SHA256: d59c5c83ce7a7635fa95521d8d245677949b86d5574bfcc6f855b6a48f2d5566
##
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index e191e92022..8310813358 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
@@ -26,11 +26,11 @@ depend container_split_src_files/1
depend frozen/0
depend minrelease/2016
depend release/2022
-depend revision/62907
+depend revision/62958
name 00texlive.image
category TLCore
-revision 62901
+revision 62959
shortdesc TeX Live files only in the source repository
longdesc The files here are not copied by the installer and containers
longdesc are not built for them; they exist only in the source
@@ -40,7 +40,7 @@ longdesc IgnorePatterns in the check_files routine in tlmgr.pl augment
longdesc this list. Those are not included in the source/ tarball. For
longdesc information on the 00texlive prefix see
longdesc 00texlive.installation(.tlpsrc)
-runfiles size=12539
+runfiles size=12540
.mkisofsrc
autorun.inf
texmf-dist/README
@@ -449,7 +449,6 @@ runfiles size=12539
tlpkg/tlpsrc/alterqcm.tlpsrc
tlpkg/tlpsrc/altfont.tlpsrc
tlpkg/tlpsrc/altsubsup.tlpsrc
- tlpkg/tlpsrc/ametsoc.tlpsrc
tlpkg/tlpsrc/amiri.tlpsrc
tlpkg/tlpsrc/amiweb2c-guide.tlpsrc
tlpkg/tlpsrc/amsaddr.tlpsrc
@@ -468,6 +467,7 @@ runfiles size=12539
tlpkg/tlpsrc/andika.tlpsrc
tlpkg/tlpsrc/animate.tlpsrc
tlpkg/tlpsrc/annee-scolaire.tlpsrc
+ tlpkg/tlpsrc/annotate-equations.tlpsrc
tlpkg/tlpsrc/annotate.tlpsrc
tlpkg/tlpsrc/anonchap.tlpsrc
tlpkg/tlpsrc/anonymous-acm.tlpsrc
@@ -2218,6 +2218,7 @@ runfiles size=12539
tlpkg/tlpsrc/ieeeconf.tlpsrc
tlpkg/tlpsrc/ieeepes.tlpsrc
tlpkg/tlpsrc/ieeetran.tlpsrc
+ tlpkg/tlpsrc/ieejtran.tlpsrc
tlpkg/tlpsrc/ietfbibs.tlpsrc
tlpkg/tlpsrc/iexec.tlpsrc
tlpkg/tlpsrc/ifallfalse.tlpsrc
@@ -2307,6 +2308,7 @@ runfiles size=12539
tlpkg/tlpsrc/japanese-otf.tlpsrc
tlpkg/tlpsrc/jbact.tlpsrc
tlpkg/tlpsrc/jfmutil.tlpsrc
+ tlpkg/tlpsrc/jieeetran.tlpsrc
tlpkg/tlpsrc/jigsaw.tlpsrc
tlpkg/tlpsrc/jkmath.tlpsrc
tlpkg/tlpsrc/jknapltx.tlpsrc
@@ -4186,6 +4188,7 @@ runfiles size=12539
tlpkg/tlpsrc/turnstile.tlpsrc
tlpkg/tlpsrc/turnthepage.tlpsrc
tlpkg/tlpsrc/twemoji-colr.tlpsrc
+ tlpkg/tlpsrc/twemojis.tlpsrc
tlpkg/tlpsrc/twoinone.tlpsrc
tlpkg/tlpsrc/twoup.tlpsrc
tlpkg/tlpsrc/txfonts.tlpsrc
@@ -4552,7 +4555,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 62882
+revision 62909
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
@@ -8761,7 +8764,7 @@ catalogue-version 1.3
name acro
category Package
-revision 61762
+revision 62925
shortdesc Typeset acronyms
relocated 1
longdesc The package enables the author to create acronyms in a simple
@@ -8774,11 +8777,11 @@ longdesc which automatically sorts the list created by \printacronyms.
depend etoolbox
depend l3kernel
depend l3packages
-containersize 43856
-containerchecksum ea08c14724aa2bef27b7b01d94b73330d0cfcd305abb083f028744fb9519f72a86fc5020fa0c9454253b77a921e31da5e512c31b5cc9b0d26edb1bd64723a2ba
-doccontainersize 1239228
-doccontainerchecksum 222af2ac3e1fca522eae70a20ac6e3d24bcb3ff30e2ea9e20232c331443e8b56da6ba6ce140c9b3451bedc2a38fd04e8c229f0c86c390434b1d93839ae29cff4
-docfiles size=370
+containersize 44440
+containerchecksum 25c0dc9cda98db7ead55613aea92946cd90e7edfa1213d59966eb8fdd93ae1bc7b532f7849c43fb8fa77291b23dc5d8dc80cba4584c991a7b38e55564bd59ea3
+doccontainersize 1246936
+doccontainerchecksum c827f8dc5fa88b67e84e48d0cfb6d47aa5bfa98fbceed86e6262d98111a956d425d0a2f3cf54b18cba7593dfac17accc2cbe71cc04f1ea2157c511d670c41daa
+docfiles size=373
RELOC/doc/latex/acro/README details="Readme"
RELOC/doc/latex/acro/acro-manual.pdf details="Package documentation"
RELOC/doc/latex/acro/acro-manual.tex
@@ -8808,7 +8811,7 @@ docfiles size=370
RELOC/doc/latex/acro/examples/acro.example.texsx-542461.tex
RELOC/doc/latex/acro/examples/acro.example.units.pdf
RELOC/doc/latex/acro/examples/acro.example.units.tex
-runfiles size=80
+runfiles size=81
RELOC/tex/latex/acro/acro-examples.sty
RELOC/tex/latex/acro/acro.sty
RELOC/tex/latex/acro/acro2.sty
@@ -8817,7 +8820,7 @@ catalogue-contact-repository https://github.com/cgnieder/acro/
catalogue-ctan /macros/latex/contrib/acro
catalogue-license lppl1.3c
catalogue-topics acronym expl3
-catalogue-version 3.7
+catalogue-version 3.8
name acronym
category Package
@@ -9374,25 +9377,25 @@ catalogue-version 1.7.1
name adjmulticol
category Package
-revision 54157
+revision 62935
shortdesc Adjusting margins for multicolumn and single column output
relocated 1
longdesc The package adds, to the multicol package, the option to change
longdesc the margins for multicolumn and unicolumn layout. The package
longdesc understands the difference between the even and odd margins for
longdesc two side printing.
-containersize 3000
-containerchecksum 4243fb86e7122ec721b975c16eebadcdb867313270a7c351543bad78be73eb82780f7eb1878f1901b8c1956d0103531f1973d9ba10bdeded7eeaa51b190a1514
-doccontainersize 299732
-doccontainerchecksum afa625a205d566369b4a702062ff39f62529f2191ec4293b282fe818f4e001b8cc9c65eec3a0df0175586969d77ec83e03b22ff41cff36788375c59d1f20c586
-docfiles size=77
+containersize 3052
+containerchecksum 58549a244937d6760d6aa1fdea1589c86de92a02450c101b035c16e071fc05fa86f1975ad1d4a8c23fe49a98af0d92a94436feac2ce180bbe06f571832e8403e
+doccontainersize 311496
+doccontainerchecksum 3365e87b43caa88fa8d5cc29faabc724c0610488941cd731e7b9306a0a3f4f4c61243cd21eeb79174b945aeb9649d7605132eda56a160f2cdbadfeda79c0772e
+docfiles size=81
RELOC/doc/latex/adjmulticol/README details="Readme"
RELOC/doc/latex/adjmulticol/adjmulticol.bib
RELOC/doc/latex/adjmulticol/adjmulticol.pdf details="Package documentation"
RELOC/doc/latex/adjmulticol/sample.pdf
RELOC/doc/latex/adjmulticol/sample.tex
-srccontainersize 7256
-srccontainerchecksum e1a9e8245494eb1bd09e82e914fc0009ac696d94ec0d4499a828bb5187e90741f0ae26cce956429fe802cb5c2af7d9c68454bc11deeca87bae8a531ed2a1d4dd
+srccontainersize 7320
+srccontainerchecksum 42167225098e4a158c36fbe91389d33a9ed8cdf75466bdd6444a2d73f5fb4ca46aac5f772be96bbcaa62ae0183314a9658021af1002840f92c8fe0c5aa97bf45
srcfiles size=7
RELOC/source/latex/adjmulticol/Makefile
RELOC/source/latex/adjmulticol/adjmulticol.dtx
@@ -9404,7 +9407,7 @@ catalogue-contact-repository https://github.com/borisveytsman/adjmulticol
catalogue-ctan /macros/latex/contrib/adjmulticol
catalogue-license lppl1.3
catalogue-topics multicol layout
-catalogue-version 1.2
+catalogue-version 1.3
name adjustbox
category Package
@@ -17040,35 +17043,6 @@ catalogue-license lppl1.3
catalogue-topics maths subsup-pos
catalogue-version 1.1
-name ametsoc
-category Package
-revision 36030
-shortdesc Official American Meteorological Society LaTeX Template
-relocated 1
-longdesc This bundle contains all the files necessary to write an
-longdesc article using LaTeX for the American Meteorological Society
-longdesc journals. The article and bibliography style files are provided
-longdesc (with documentation) and a blank template for authors to use
-longdesc when writing their article. Also available is a separate style
-longdesc package used to format a two-column, journal page layout draft
-longdesc for the author's personal use.
-containersize 16160
-containerchecksum 34d99bedd34ea4195d4b0f60560c80c7d3624c2dcb3137a559eaa1b5a16bf465c39a0c54b6a5e64d2488dd7d4c1c82636d7c3adcee3e2e687a66b51b96fe6c48
-doccontainersize 5648
-doccontainerchecksum 80b64ca57599aab07dbd0d000e67fd002a19a8d8227bf9d635bbbefe84417d1f99cd75d81ff67e0d7a7e28231ab5438b4e51e90bbb5405f566877a4ec87b8d48
-docfiles size=6
- RELOC/doc/latex/ametsoc/README details="Readme"
- RELOC/doc/latex/ametsoc/README.TEXLIVE
- RELOC/doc/latex/ametsoc/references.bib
- RELOC/doc/latex/ametsoc/template.tex
-runfiles size=18
- RELOC/bibtex/bst/ametsoc/ametsoc2014.bst
- RELOC/tex/latex/ametsoc/ametsoc.cls
-catalogue-ctan /macros/latex/contrib/ametsoc
-catalogue-license lppl
-catalogue-topics journalpub
-catalogue-version 4.3.2
-
name amiri
category Package
revision 55403
@@ -18748,6 +18722,33 @@ catalogue-ctan /biblio/bibtex/contrib/misc/annotate.bst
catalogue-license other-free
catalogue-topics bibtex-sty
+name annotate-equations
+category Package
+revision 62932
+shortdesc Easily annotate math equations using TikZ
+relocated 1
+longdesc This package provides commands that make it easy to highlight
+longdesc terms in equations and add annotation labels using TikZ. It
+longdesc should work with pdfLaTeX as well as LuaLaTeX.
+containersize 2916
+containerchecksum b4e7665b8285509e8fc603dfc3284ea37f862a26aecbcf9f85e4d2a9e2298192bf5dcd97437e31c2b54f8abee2ec02f60d5426e8f7b00caab99aa6afae9d7b03
+doccontainersize 126536
+doccontainerchecksum 6ef62fc560f51a3f34233f4d4fa4d5685b81461d6f1530b1df082b2e06bd57a96e3ba7cb89e7f56ac58c9f41e3fbe830ade1d87bb3d5d4dec29854516a9bf523
+docfiles size=36
+ RELOC/doc/latex/annotate-equations/LICENSE
+ RELOC/doc/latex/annotate-equations/README.md details="Readme"
+ RELOC/doc/latex/annotate-equations/annotate-equations.pdf details="Package documentation"
+ RELOC/doc/latex/annotate-equations/annotate-equations.tex
+runfiles size=2
+ RELOC/tex/latex/annotate-equations/annotate-equations.sty
+catalogue-contact-bugs https://github.com/st--/annotate-equations/issues
+catalogue-contact-development https://github.com/st--/annotate-equations/pulls
+catalogue-contact-repository https://github.com/st--/annotate-equations
+catalogue-ctan /macros/latex/contrib/annotate-equations
+catalogue-license mit
+catalogue-topics maths decoration pgf-tikz
+catalogue-version 0.1.0
+
name anonchap
category Package
revision 17049
@@ -35384,18 +35385,18 @@ catalogue-version 1.4
name bfh-ci
category Package
-revision 62318
+revision 62951
shortdesc Corporate Design for Bern University of Applied Sciences
relocated 1
longdesc This bundle provides possibilities to use the Corporate Design
longdesc of Bern University of Applied Sciences (BFH) with LaTeX. To
longdesc this end it contains classes as well as some helper packages
longdesc and config files together with some demo files.
-containersize 25604
-containerchecksum b2434e659052788e8e873457dba774e75939c2ccfe43738b81c170ab717a977b2a48130e3711912ae63ca1ae04200fb8a642fa2a476a91e366b4a2f028db6893
-doccontainersize 233316
-doccontainerchecksum 6ac75b3e0a032d7756658c6da2f0aa3392ac7cbf9366f37594c171424082be1f0de2fa17f3fc48c033df4f2708fb55a3788b70a6eca7f3d4e359a294688033f6
-docfiles size=116
+containersize 25608
+containerchecksum 7a42b62d032acf6854fbdd7d911057345a1d2884c025fb6033f35f96b7df29ef146389f8f4687574c6afd5b033f97c1948b052760c71eceb221f36e9f551d784
+doccontainersize 235248
+doccontainerchecksum 3f3bf9803355f387c7c0cffcfe4b9b2123dc1e6afc86f3ed90900253186541b0dc4f1eb103297fbd546d4b3d40edf8e8987830173bdb673fbfb54b698d8e95b6
+docfiles size=117
RELOC/doc/latex/bfh-ci/DEMO-BFHBeamer-Sidebar.pdf details="Example presentation (2)"
RELOC/doc/latex/bfh-ci/DEMO-BFHBeamer-Sidebar.tex
RELOC/doc/latex/bfh-ci/DEMO-BFHBeamer.pdf details="Example presentation (1)"
@@ -35455,7 +35456,7 @@ catalogue-contact-repository https://gitlab.ti.bfh.ch/bfh-latex/bfh-ci/
catalogue-ctan /macros/latex/contrib/bfh-ci
catalogue-license lppl1.3c
catalogue-topics class doc-templ letter dissertation presentation poster std-conform
-catalogue-version 2.1.2
+catalogue-version 2.1.3
name bgteubner
category Package
@@ -38476,16 +38477,16 @@ catalogue-version 0.1
name biblatex-lncs
category Package
-revision 61633
+revision 62937
shortdesc BibLaTeX style for Springer Lecture Notes in Computer Science
relocated 1
longdesc This is a BibLaTeX style for Springer Lecture Notes in Computer
longdesc Science (LNCS). It extends the standard BiBTeX model by an
longdesc acronym entry.
-containersize 2628
-containerchecksum b629ccce8c85ae96719b2d2672971ec5348123014fe1d09fcd3f62a44c615cb0e078cfb0c3093093dd62151beeb92eb12ec5c5a8236d1c2f94fc8e7be7ec2b86
-doccontainersize 8684
-doccontainerchecksum ee6c3f271e249ea8959ebdcdf7f8d42a8f313d2ae81e59836946aecb1dc87f66d52ec5d6ad6e09c16005b791e6deb169255c65b661db2783411a406db431240b
+containersize 2648
+containerchecksum 6bcc10d5f613a49ce580d8fde9de3b5877d99be934f433dc88ddc8a7db161200ab315296e611fc5bd7d1eeb0b26d7f4344b2bc7cf3e02c5b2acd6559a8405e7c
+doccontainersize 8664
+doccontainerchecksum c32834d59f2d9a8fd5623023db1c3efbc552086b2c098d5bba9f18998409d96320f84f30a2c4c70723d8684d1e3d21bd1611df54ce8bcac30505d214fbb82333
docfiles size=8
RELOC/doc/latex/biblatex-lncs/LICENSE
RELOC/doc/latex/biblatex-lncs/README.md details="Readme"
@@ -38500,7 +38501,7 @@ catalogue-contact-repository https://github.com/mgttlinger/biblatex-lncs
catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-lncs
catalogue-license lppl1.3c
catalogue-topics biblatex journalpub
-catalogue-version 0.4
+catalogue-version 0.5
name biblatex-lni
category Package
@@ -53856,28 +53857,28 @@ catalogue-version 0.8
name checkcites
category Package
-revision 52022
+revision 62954
shortdesc Check citation commands in a document
longdesc The package provides a lua script written for the sole purpose
longdesc of detecting undefined and unused references from LaTeX
longdesc auxiliary or bibliography files.
depend checkcites.ARCH
-containersize 6152
-containerchecksum 65af6aa0b8a8f0d6f4e3a1dbaeabea845bdec985beffe8589bef06784fde37a02baf41c3ea65055b3ff2b21dd003b51749b20a84ef0e1d0337bdb8ea416a0751
-doccontainersize 295052
-doccontainerchecksum 35b79a866235727c65053f0fa2dae53372230395a61e8ed4b530b02c4760d9cb3a89f81e4ac905ed4966ed4137c8047dd80655f6d94ebb260bfd96e441e45781
+containersize 6124
+containerchecksum 13eaac23b26cf4af6e5cabf20d398286912301ab5e1ba4b13635a43291ff8edf76d52af0282bc064587087eb157b699fdaeec4ac66e18b94bbc27c1bc9317679
+doccontainersize 295412
+doccontainerchecksum 3be431670c84e137b87a6d4aab27cb0d4d3f276b1db4f1f6cf4f9a73e87dcba170fb80e8edeb2821c46781a93bd8bd2ccf0b72fa10d31906d9058d4849413b26
docfiles size=78
texmf-dist/doc/support/checkcites/README details="Readme"
texmf-dist/doc/support/checkcites/checkcites-doc.pdf details="Package documentation"
texmf-dist/doc/support/checkcites/checkcites-doc.tex
runfiles size=7
texmf-dist/scripts/checkcites/checkcites.lua
-catalogue-contact-bugs https://github.com/cereda/checkcites/issues
-catalogue-contact-repository https://github.com/cereda/checkcites
+catalogue-contact-bugs https://gitlab.com/islandoftex/checkcites/issues
+catalogue-contact-repository https://gitlab.com/islandoftex/checkcites
catalogue-ctan /support/checkcites
catalogue-license lppl1.3
catalogue-topics debug-supp
-catalogue-version 2.4
+catalogue-version 2.5
name checkcites.aarch64-linux
category Package
@@ -68467,7 +68468,7 @@ containerchecksum 6ec5e8a62e3c1ed8e3c23542381091d38c77af507af7088a55e44f1e34b85d
name collection-langjapanese
category Collection
-revision 62077
+revision 62958
shortdesc Japanese
relocated 1
longdesc Support for Japanese; additional packages are in
@@ -68491,10 +68492,12 @@ depend gckanbun
depend gentombow
depend haranoaji
depend haranoaji-extra
+depend ieejtran
depend ifptex
depend ifxptex
depend ipaex
depend japanese-otf
+depend jieeetran
depend jlreq
depend jlreq-deluxe
depend jsclasses
@@ -68530,8 +68533,8 @@ depend uptex-fonts
depend wadalab
depend zxjafbfont
depend zxjatype
-containersize 628
-containerchecksum 375d8f04d68e1ffa0ab790612aac02152c84d33c6904c7285d0f8ed2254eb3233af5a26100de92ed6a4d8b24f6b7c0b9977f8a9474a9caafff5a9a4ce66e967e
+containersize 644
+containerchecksum 952e3270a9e268b4dec32f74cc9ab3cfa1a3cc6ff0b067380814cbed060efc2541b10713cba2cd8d00c5b95ae2b8c2a9d2f7f285b4b870b0828a4da1c1601ee0
name collection-langkorean
category Collection
@@ -70375,7 +70378,7 @@ containerchecksum be322b40c207bdb700a0616aeb1be3b28c1d88ac2bcda7677d3e0e4b1cd2cd
name collection-mathscience
category Collection
-revision 62559
+revision 62932
shortdesc Mathematics, natural sciences, computer science packages
relocated 1
depend 12many
@@ -70390,6 +70393,7 @@ depend algxpar
depend aligned-overset
depend amscdx
depend amstex
+depend annotate-equations
depend apxproof
depend autobreak
depend axodraw2
@@ -70612,8 +70616,8 @@ depend youngtab
depend yquant
depend ytableau
depend zx-calculus
-containersize 1572
-containerchecksum 4e41e0e1f0b9c945cfb7c7f30544b8abe240018235fec00421b4797ed1216f4325a9534fffbef90c051beaef2d686d4dea471e93a10e36ce139c516537b67dae
+containersize 1580
+containerchecksum d4c933720a1b72e640eff7c9b49686efda2433eff51bd25a84f8de6a48febf3e1334003f86a6a9e7e8077a6201936c904735c7c9e617299e6b60d08efd0e28d0
name collection-metapost
category Collection
@@ -70714,7 +70718,7 @@ containerchecksum bc842942513a72c6a0f2346025739f09477ae1e920eaefc5e396e0b68ba534
name collection-pictures
category Collection
-revision 62888
+revision 62930
shortdesc Graphics, pictures, diagrams
relocated 1
longdesc Including TikZ, pict, etc., but MetaPost and PStricks are
@@ -70937,6 +70941,7 @@ depend tonevalue
depend tqft
depend tsemlines
depend tufte-latex
+depend twemojis
depend tzplot
depend utfsym
depend venndiagram
@@ -70945,8 +70950,8 @@ depend worldflags
depend xistercian
depend xpicture
depend xypic
-containersize 1512
-containerchecksum 6ec4c8384ecce23e8488530e2eb35f7ad0a581a3961d40b7e6d21dbd53f0d9e56ea1e15a23d3efd94fb9cd61555a7f2cea1979633b30271ded65943844bf3e91
+containersize 1516
+containerchecksum c7dae382d5766627eaa670e29f488e3545b42b4ce86bdc74edf2ce2c811fd268dbf0d327d60eecf0ae8642941036259d54e18120328fcd266a96d615adbd639d
name collection-plaingeneric
category Collection
@@ -71191,7 +71196,7 @@ containerchecksum 54e2b23dfd58d514d577f535e4f8bab08b2a124c43abdea796847d5c8cdf5c
name collection-publishers
category Collection
-revision 62836
+revision 62917
shortdesc Publisher styles, theses, etc.
relocated 1
depend aastex
@@ -71205,7 +71210,6 @@ depend afparticle
depend afthesis
depend aguplus
depend aiaa
-depend ametsoc
depend anonymous-acm
depend anufinalexam
depend aomart
@@ -71454,8 +71458,8 @@ depend yathesis
depend yazd-thesis
depend yb-book
depend york-thesis
-containersize 1616
-containerchecksum 1096cdbd73f5195c81aae109e7d698d6d61d4338b60aff2cc03e35265fef8c11c62d3d25beeac55d63891add3cef0934b61da3a6ff93e20a99db89cbde1caf9c
+containersize 1612
+containerchecksum 584e7cc5682b6b56ce0b1a600f1ea80b34a68ef37d097e20f8e89d8c09893147573ce0ec71fb15529c9352e561fc4d79bea45f09dbb4bde0b51b1b6c22d158e9
name collection-texworks
category Collection
@@ -79962,7 +79966,7 @@ catalogue-version 0.9b
name cooking-units
category Package
-revision 59542
+revision 62938
shortdesc Typeset and convert units for cookery books and recipes
relocated 1
longdesc The package provides commands to typeset amounts and units
@@ -79971,15 +79975,15 @@ longdesc convert one unit into another (for example 'dag' to 'g'; see
longdesc the documentation for more examples). This packages requires
longdesc expl3 and xparse, translations, xfrac, l3keys2e, and,
longdesc optionally, fmtcount.
-containersize 20768
-containerchecksum b49ea95a00d3db95a67f32b2833d4e48feb26cabdf12670cbe7988af51f299c7c60f1f4ad42161b9be533d4e79db6b5fdc6676d99eea290214910f7cf3c6cbf0
-doccontainersize 725860
-doccontainerchecksum 9583096d5d88ba4703aa82c29ecbc28ce917457a2c528e1990add753f179e7a51b2e628719d6a4836e3ff7f6b3389a490bf2d0b029a0c167ae66b48595749a48
-docfiles size=184
+containersize 20920
+containerchecksum 941797a5f044c5193712bd81a7cc847c2df203ddf198fd78fd09e2c6178a0a49e7b83181ae806b8e707b3a64077911fc8beeecb192206281efd31ede86274bed
+doccontainersize 716856
+doccontainerchecksum 5d39240c57ec1c9943da2c38670e87b8e27832a9880b1ae1eafe4a186ca1a5babed7c6cde3630f80bf5757cbd2888ae29ddeef0544e2937a5f8e08955ce65ea8
+docfiles size=182
RELOC/doc/latex/cooking-units/README.md details="Readme"
RELOC/doc/latex/cooking-units/cooking-units.pdf details="Package documentation"
-srccontainersize 68828
-srccontainerchecksum 4f2cc334c5f1698bd61af7d17f5fff362a4c4138ed90a3e4eb4850a680569f8da2e744b6ce6620ccee90cab787bb9b689815ffe548302acfc14e948f042dd7c4
+srccontainersize 68016
+srccontainerchecksum 22c6b8fd5ee4239eb8e2acd2be6c85f9f7110f6a5d8f73ab2067f07841f77a595bce9a8b1d5648917d4626e30bbfd6f24ad4177452a779deac163f67350ec989
srcfiles size=86
RELOC/source/latex/cooking-units/cooking-units.dtx
RELOC/source/latex/cooking-units/cooking-units.ins
@@ -79989,7 +79993,7 @@ catalogue-contact-repository https://github.com/Vidabe/cooking-units
catalogue-ctan /macros/latex/contrib/cooking-units
catalogue-license lppl1.3c
catalogue-topics cooking units expl3
-catalogue-version 2.00
+catalogue-version 2.00a
name cookingsymbols
category Package
@@ -87688,28 +87692,28 @@ catalogue-version 2.0h
name dataref
category Package
-revision 42883
+revision 62942
shortdesc Manage references to experimental data
relocated 1
longdesc The package provides a mechanism that maintains a fixed
longdesc symbolic reference to numerical results; such results may vary
longdesc as the project proceeds (and hence the project report
longdesc develops).
-containersize 6868
-containerchecksum 8b76861673fe05785582abbfb50d46ee6beea2cd63bd7f622e2640acce9c88a39e4fbf57b6db7872dc3f3b473d3e33581bb6c93f305e036148efb1c3ad4b6d8f
-doccontainersize 247204
-doccontainerchecksum 2d1bb12245c071b8282db3d0aaf198206fe2b8509527ef6e56950464b6f13d20be8381015fa62a1b0c7469e004664182170ba400c7650b38bc597e269f1d173d
-docfiles size=68
+containersize 7604
+containerchecksum da099bb462ae2698784097cb04268b039f0900fbe57d77284532c0ef694c50d422436e5e0d8ffdc9442b98c12d52c72629b29f772b0d66f226ebabca579b2249
+doccontainersize 263744
+doccontainerchecksum 6f51ed66ef467438a856ed22a7644d2bc574c789e89025cead65393d701abaee299861873d97c9509522ac7e478a35693e34d2afc0bee3d08d862b11992e4230
+docfiles size=73
RELOC/doc/latex/dataref/README.md details="Readme"
RELOC/doc/latex/dataref/dataref-doc.pdf details="Package documentation"
RELOC/doc/latex/dataref/dataref-doc.tex
-runfiles size=7
+runfiles size=8
RELOC/tex/latex/dataref/dataref.sty
catalogue-contact-repository https://github.com/stettberger/dataref
catalogue-ctan /macros/latex/contrib/dataref
catalogue-license lppl1.3
catalogue-topics label-ref data-manip
-catalogue-version 0.6
+catalogue-version 0.7
name datatool
category Package
@@ -106482,7 +106486,7 @@ catalogue-version 1.0.1
name els-cas-templates
category Package
-revision 59170
+revision 62931
shortdesc Elsevier updated LaTeX templates
relocated 1
longdesc This bundle provides two class and corresponding template files
@@ -106491,11 +106495,11 @@ longdesc Elsevier's updated workflow. One of the sets is meant for
longdesc one-column, the other for two-column layout. These are now
longdesc accepted for submitting articles both in Elsevier's electronic
longdesc submission system and elsewhere.
-containersize 21152
-containerchecksum d022c993c21c40acc3672738f42ce42aad76f3845d30bcb2c1c23f69af877a36a14ecc06ae3feff149a808e86ffadd7968462c75e081b42e50b073aa2d56e424
-doccontainersize 367564
-doccontainerchecksum 1c6bda6c29db8260c06cbb16a2045c889f43196b27e4525a62cfe9f77fa812392825b577cec4cb4d5ffa456db50c86d80e85b5c6eebdcde7848bce01dfb101c5
-docfiles size=274
+containersize 54856
+containerchecksum ecb340e796a94aab2e26abeb7d4d72ba5d68adcb15a0d99d3511236b8be5f8ab21d8d32995b1dcf1b0a3ea15eb321df75bbc016c52630b06498b75e9e5f164f8
+doccontainersize 349288
+doccontainerchecksum b616f6a170484f75dea1134f0570133b63ba40fd1bd474e13ae3e46249224b8ee7a777d0d18e11e828d0e5e59c2635acfecea99537060a7cea03fc2761dca892
+docfiles size=262
RELOC/doc/latex/els-cas-templates/README details="Readme"
RELOC/doc/latex/els-cas-templates/cas-dc-template.tex
RELOC/doc/latex/els-cas-templates/cas-refs.bib
@@ -106509,17 +106513,17 @@ docfiles size=274
RELOC/doc/latex/els-cas-templates/doc/rvdtx.sty
RELOC/doc/latex/els-cas-templates/doc/sc-sample.pdf
RELOC/doc/latex/els-cas-templates/manifest.txt
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-email.jpeg
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-facebook.jpeg
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-gplus.jpeg
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-linkedin.jpeg
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-twitter.jpeg
- RELOC/doc/latex/els-cas-templates/thumbnails/cas-url.jpeg
-runfiles size=31
+runfiles size=43
RELOC/bibtex/bst/els-cas-templates/cas-model2-names.bst
RELOC/tex/latex/els-cas-templates/cas-common.sty
RELOC/tex/latex/els-cas-templates/cas-dc.cls
RELOC/tex/latex/els-cas-templates/cas-sc.cls
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-email.jpeg
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-facebook.jpeg
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-gplus.jpeg
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-linkedin.jpeg
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-twitter.jpeg
+ RELOC/tex/latex/els-cas-templates/thumbnails/cas-url.jpeg
catalogue-ctan /macros/latex/contrib/els-cas-templates
catalogue-license lppl1.2
catalogue-topics class doc-templ journalpub
@@ -118701,7 +118705,7 @@ catalogue-topics bibtex-util
name figchild
category Package
-revision 58964
+revision 62945
shortdesc Pictures for creating children's activities
relocated 1
longdesc This package was created with the aim of facilitating the work
@@ -118711,23 +118715,24 @@ longdesc the Computational Mathematics discipline offered at the Federal
longdesc University of Vicosa -- Campus UFV -- Florestal by professor
longdesc Fernando de Souza Bastos. It makes use of the TikZ and xcolor
longdesc packages.
-containersize 49072
-containerchecksum 53fc2af05bc5f68d1fd14ac999c0ce957feb7e545596089ee06acc64ffc43102bf374957a805664a5443ffee420a9afaee2f912fdf5f6b52442b36ebc1f70879
-doccontainersize 625944
-doccontainerchecksum 87c6e78b3989d5bd9d0b527c79f9c69783319b4dc02754ede8e027e187f8a3c59d3194b23d6a5d8510fe6c3e129c0df1bad272b6d667d292b7510f3c1baa904e
-docfiles size=168
+containersize 295868
+containerchecksum 74775cfe7d7ef14acdb22bc6c60aa4db512183441828025c8e68f30e9e95c4e5a1492c99a31f459035956a0c50de054bbdb664f9cc68b73879d96a4ead5f2dd9
+doccontainersize 1000520
+doccontainerchecksum 68cc451292f68cb433ff567252837c438938a8d16c4e48987abdd76bcafc9dca9482ad29c540ec24cfdd66f55da801b9c3e052615e805de055c944df82f3971c
+docfiles size=279
RELOC/doc/latex/figchild/README.md details="Readme"
RELOC/doc/latex/figchild/capa.tex
RELOC/doc/latex/figchild/figchild.pdf details="Package documentation"
- RELOC/doc/latex/figchild/figchild.tex
RELOC/doc/latex/figchild/latexmkrc
-runfiles size=90
+ RELOC/doc/latex/figchild/main.tex
+runfiles size=508
RELOC/tex/latex/figchild/figchild.sty
+catalogue-contact-home https://github.com/fsbmat-ufv/figchild
catalogue-contact-repository https://github.com/fsbmat-ufv/figchild
catalogue-ctan /graphics/pgf/contrib/figchild
catalogue-license lppl1.3c
catalogue-topics graphics pgf-tikz teaching amusements
-catalogue-version 1.1.1
+catalogue-version 2.1.1
name figflow
category Package
@@ -127611,7 +127616,7 @@ catalogue-topics maths
name functional
category Package
-revision 62804
+revision 62926
shortdesc Provide an intuitive LaTeX2 interface for expl3
relocated 1
longdesc The LaTeX3 programming layer (expl3) is very powerful for
@@ -127623,15 +127628,15 @@ longdesc package, the evaluation of functions is from inside to outside,
longdesc which is the same as for other programming languages such as
longdesc JavaScript or Lua. In this way it is rather easy to debug code,
longdesc too.
-containersize 6996
-containerchecksum 52dfcb00f64ca3ee069dafd469b2697b81e92fc48ca16e06495068ee629bc9d86e4037064d7ba690697d6e5d59731b276eb9185e008fe077f3b32b04a0464b4f
-doccontainersize 399796
-doccontainerchecksum e55b73d7a7abbde48d61a1c53bd4ccba64d4460dce3fa5f152d01a272016fd21119a6ed59dce3467a4f5ac14713bb2629a89ae560ed7a1f1e6f92e7f0ad9b309
-docfiles size=155
+containersize 8232
+containerchecksum 3b3547a572d067198445f166d62cee68b505cbf5b34a2859ddc1cc5bb02d19b4915b1e48e162311df1d77aa3f0c38ea6979c99bfaac16f593c94386b60f48132
+doccontainersize 532136
+doccontainerchecksum d162f7952c32b7b1f264f12fccc8efef8aaabba9aab8f2824ada02179068ecd932a367c5ef5a40b465d0365c7215fd0c350b4cc31b33a626d94113dab1fc1244
+docfiles size=211
RELOC/doc/latex/functional/README.txt details="Readme"
RELOC/doc/latex/functional/functional.pdf details="Package documentation"
RELOC/doc/latex/functional/functional.tex
-runfiles size=13
+runfiles size=16
RELOC/tex/latex/functional/functional.sty
catalogue-contact-announce https://github.com/lvjr/functional/wiki/ChangeLog
catalogue-contact-bugs https://github.com/lvjr/functional/issues
@@ -127641,7 +127646,7 @@ catalogue-contact-support https://github.com/lvjr/functional/discussions
catalogue-ctan /macros/latex/contrib/functional
catalogue-license lppl1.3c
catalogue-topics macro-supp latex3 expl3
-catalogue-version 2022B
+catalogue-version 2022C
name fundus-calligra
category Package
@@ -143830,6 +143835,33 @@ catalogue-license lppl1.3
catalogue-topics journalpub class
catalogue-version 1.8b
+name ieejtran
+category Package
+revision 62957
+shortdesc Unofficial bibliography style file for the Institute of Electrical Engineers of Japan
+relocated 1
+longdesc This package provides an unofficial BibTeX style for authors of
+longdesc the Institute of Electrical Engineers of Japan (IEEJ)
+longdesc transactions journals and conferences.
+containersize 17644
+containerchecksum e61293c30d05ba10f281b2ddf4455f786c3439491ba6f38dc74b0f91c3769032dbedd84136121f01026fc238e332f4eafc5f38c385066d7c00f21ec7aeac4796
+doccontainersize 149524
+doccontainerchecksum 612e27f0ecab3c6befb40b5e7ef9cb89a1471b6f8c9c6d4c4555b059b9ec4b6ccf0735cd5230a22a4b96628395f7e352ae2e7d7f45096fa7184ffc7758bcc00f
+docfiles size=46
+ RELOC/doc/bibtex/ieejtran/README details="Readme"
+ RELOC/doc/bibtex/ieejtran/ieejtran-en.pdf details="Package documentation (English)"
+ RELOC/doc/bibtex/ieejtran/ieejtran-en.tex
+ RELOC/doc/bibtex/ieejtran/ieejtran.pdf details="Package documentation (Japanese)" language="ja"
+ RELOC/doc/bibtex/ieejtran/ieejtran.tex
+ RELOC/doc/bibtex/ieejtran/mixej.py
+runfiles size=21
+ RELOC/bibtex/bst/ieejtran/IEEJtran.bst
+catalogue-contact-repository https://github.com/ehki/jIEEEtran
+catalogue-ctan /biblio/bibtex/contrib/ieejtran
+catalogue-license mit
+catalogue-topics bibtex-sty japanese
+catalogue-version 0.18
+
name ietfbibs
category Package
revision 41332
@@ -146652,7 +146684,7 @@ catalogue-version 2.2
name install-latex-guide-zh-cn
category Package
-revision 62312
+revision 62922
shortdesc A short introduction to LaTeX installation written in Chinese
relocated 1
longdesc This package will introduce the operations related to
@@ -146661,10 +146693,10 @@ longdesc macro packages, and compiling simple documents on Windows 10,
longdesc Ubuntu 20.04, and macOS systems, and mainly introducing command
longdesc line operations.
containersize 568
-containerchecksum a6b3e208ff4c4e7fad180f54181202d14383958f13aa037e6daccd8399559bc3880aea6b08b74f7e3218cf22038f9ecea73b63be3a3fa84c171e47e21e7ce890
-doccontainersize 780664
-doccontainerchecksum 4ac0a8be1f9398d79addf770c3af38826ead3cedbf99199b7dbdad92511302e18489d5b7902428a86c8fddb989751d15c267bd4c7faa1ce52b19d334dc1497d2
-docfiles size=224
+containerchecksum 50f1a8b82cc03ec8156652aabe1877490ec8b4a97798b49859e50e97567c82cb4802fb3abbe9d293730f3b778cb1ac29262937de4879f84be38d0a2c622d6b67
+doccontainersize 784944
+doccontainerchecksum dcbfd082620292d86d385961fa190d3f32adb99581ef8d7822e4fcf660fe5ed7aa36e0ede4f4aa34bdfa7150d2553b659512d2726bebc9fd9e70e5e6d719c74f
+docfiles size=225
RELOC/doc/latex/install-latex-guide-zh-cn/LICENSE
RELOC/doc/latex/install-latex-guide-zh-cn/README.md details="Readme"
RELOC/doc/latex/install-latex-guide-zh-cn/appendix/mirror.tex
@@ -146686,7 +146718,7 @@ catalogue-contact-repository https://github.com/OsbertWang/install-latex-guide-z
catalogue-ctan /info/install-latex-guide-zh-cn
catalogue-license lppl1.3c
catalogue-topics chinese-doc tutorial
-catalogue-version 2022.3.1
+catalogue-version 2022.4.1
name installfont
category Package
@@ -151030,7 +151062,7 @@ catalogue-version 1.1
name istgame
category Package
-revision 49848
+revision 62946
shortdesc Draw Game Trees with TikZ
relocated 1
longdesc This LaTeX package provides macros based on TikZ to draw a game
@@ -151042,22 +151074,22 @@ longdesc 'great-grandchildren'). Using this package you can draw a game
longdesc tree as easily as drawing a game tree with pen and paper. This
longdesc package depends on expl3, TikZ, and xparse. The 'ist' prefix
longdesc stands for "it's a simple tree" or "In-Sung's simple tree."
-containersize 18008
-containerchecksum 3380e604bb3153d94ed21ca3c5fa16bcf0d81ff3ff878a3f19ee3f1beea0ab32185ea9d8b0118eaddfb15e483d040bbc5f915ab7bd3033978518fd30aeb5f609
-doccontainersize 751764
-doccontainerchecksum 9838728c32479b6a1229d2f9e9755209c07520bd691452bfba81a62f21ba929237bc916c5f49523610516aec6c054d080086c82be277eedd5fe4b0006b4be8e5
-docfiles size=250
+containersize 18292
+containerchecksum 40ea41a683ecff33942fb3287f57489079be48eb5e7512b04f5b7038da34bf9daeb523b9d15325444f27493119d2258302838b4a44becc7dad205504064cb5da
+doccontainersize 857172
+doccontainerchecksum 275d45c62d3e140b5a292e0499c555716a43ed4cd06c69c59edc49b0e832371d39b320de954452226dcdabce7a140a622f3d3d1e8acb69fdd4aa0c62b39fe0f4
+docfiles size=280
RELOC/doc/latex/istgame/README.txt details="Readme"
- RELOC/doc/latex/istgame/istgame-doc-v2.0.tex
+ RELOC/doc/latex/istgame/istgame-doc-v2.1.tex
RELOC/doc/latex/istgame/istgame-doc.pdf details="Package documentation"
RELOC/doc/latex/istgame/istgame-doc.tex
RELOC/doc/latex/istgame/istgame.ist
-runfiles size=29
+runfiles size=30
RELOC/tex/latex/istgame/istgame.sty
catalogue-ctan /graphics/pgf/contrib/istgame
catalogue-license lppl1.3c
-catalogue-topics pgf-tikz games tree
-catalogue-version 2.0
+catalogue-topics pgf-tikz games tree expl3
+catalogue-version 2.1
name itnumpar
category Package
@@ -155930,6 +155962,33 @@ containerchecksum 922296ed3f4006351b09b90f2b3b9f9f1c32d175191ef02f0b3564269a5cda
binfiles arch=x86_64-solaris size=1
bin/x86_64-solaris/jfmutil
+name jieeetran
+category Package
+revision 62958
+shortdesc UnofficiaL BibTeX style for citing Japanese articles in IEEE format
+relocated 1
+longdesc This package provides an unofficial BibTeX style for authors
+longdesc trying to cite Japanese articles in the Institute of Electrical
+longdesc and Electronics Engineers (IEEE) format.
+containersize 17652
+containerchecksum 3c92aeb3c8f4dca2bb7a03a5a8113223fa202a2a9a38d62bb036d57f1e9b4ff0ab0a5ef8c56d15177ee075a5825ab49eb883377e6c1345c807e19f22eb821b46
+doccontainersize 151932
+doccontainerchecksum 002714b1e8ac29c5b997e5b56ad63c5fdc2138cfa9b208243aea9749cfa4e2be6b28e4a7bc05d65c7d89826268525739a1adca0d319e98d94b69c148501adc2c
+docfiles size=47
+ RELOC/doc/bibtex/jieeetran/README details="Readme"
+ RELOC/doc/bibtex/jieeetran/jieeetran-en.pdf details="Package documentation (English)"
+ RELOC/doc/bibtex/jieeetran/jieeetran-en.tex
+ RELOC/doc/bibtex/jieeetran/jieeetran.pdf details="Package documentation (Japanese)" language="ja"
+ RELOC/doc/bibtex/jieeetran/jieeetran.tex
+ RELOC/doc/bibtex/jieeetran/mixej.py
+runfiles size=21
+ RELOC/bibtex/bst/jieeetran/jIEEEtran.bst
+catalogue-contact-repository https://github.com/ehki/jIEEEtran
+catalogue-ctan /biblio/bibtex/contrib/jieeetran
+catalogue-license mit
+catalogue-topics bibtex-sty japanese
+catalogue-version 0.18
+
name jigsaw
category Package
revision 49111
@@ -156051,17 +156110,17 @@ catalogue-topics labels
name jlreq
category Package
-revision 60947
+revision 62916
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 136684
-containerchecksum 8929adfd3f40c43389371a8deb7dc63b549cf33e0bbae9f72f2148e53248269918ce6be4a9e4359f82a1498c5a682cbdbb31935b9950d7d13fd7766f48c82bd4
-doccontainersize 515944
-doccontainerchecksum 01ba50b1ad1b99297b5c52d5454d1b1b4a1debdd4ea73c42830f2f3ccc3fac0c46b247c6fef26ba0f235cd1a0990b3ad1a9cd5f59facc0e29789df22b5177d03
+containersize 137096
+containerchecksum 00713e77445d8e38fbbaf561239ca9416f92c1d1dbd7132b44a77586a42437399dc2d80887598ecbbc6f3610b59e532bc5eec04b5d24ac414559042a4be372e1
+doccontainersize 518520
+doccontainerchecksum 59278f5e0e303035a34df74a87f2e07d7293a8970c48293d561b8302d738dc5e54a73da55215f7b83936907b20f834c6a644adfe3afe20f88bbc2c1239fad635
docfiles size=168
RELOC/doc/latex/jlreq/LICENSE
RELOC/doc/latex/jlreq/README-ja.md details="Readme" language="ja"
@@ -156075,14 +156134,14 @@ docfiles size=168
RELOC/doc/latex/jlreq/jlreq.html
RELOC/doc/latex/jlreq/jlreq.pdf details="Package documentation"
srccontainersize 8208
-srccontainerchecksum 98b9a5865edecdd27a1ce3fb90ca1a7a9b33b4027eda4940a0784f00a9e8c78b0efddfbd6a09db2ac1b7e26bff4c4c230187624d9e67a2d3a297beb15ec503ea
+srccontainerchecksum 45777de078f03214b38625a25e7c6ef079878964888442f6504db7e652aab82a7ab446e118004dbebaadb5634bd24983949c97251cbb2770943ce7681f9a4ace
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=8653
+runfiles size=8655
RELOC/fonts/tfm/public/jlreq/bjlreq-v.tfm
RELOC/fonts/tfm/public/jlreq/bjlreq.tfm
RELOC/fonts/tfm/public/jlreq/bjlreqg-v.tfm
@@ -158991,7 +159050,7 @@ catalogue-topics numbers
name kaytannollista-latexia
category Package
-revision 62549
+revision 62923
shortdesc Practical manual for LaTeX (Finnish)
relocated 1
longdesc "Kaytannollista Latexia" is a practical manual for LaTeX
@@ -158999,10 +159058,10 @@ longdesc written in the Finnish language. The manual covers most of the
longdesc topics that a typical document author needs. So it can be a
longdesc useful guide for beginners as well as a reference manual for
longdesc advanced users.
-containersize 572
-containerchecksum 590f48559bfd3a98f7bcf48d47f6541b78bcd37b1ad2d9d0fe0e0cf5bfb2eda1dbd100a05f4e7efc2ba85307dfa79928a6460fbd1f44d3c6059cf65d4efb0c9b
-doccontainersize 987516
-doccontainerchecksum b652e01fc234cf815dca7e248c8aada58844f1970014b97219c70277f6de19f26fd912ca427df7b1fdb44b7910beb3fc98a4cb53932259bff21e478a22dab250
+containersize 568
+containerchecksum 70fd1a4ec4346b82eb663f8278ee04dbf34b0f8c953e3ea9d6842f81a4381753008634ef7d6f2a7df1ffe0f3dfbff377f7c7452fd2b85770398729083c1703f5
+doccontainersize 987984
+doccontainerchecksum 5dc033e76647c7413d47ce18cc68e3d24a0ff93cf335f959e2af257e8b9fb43d0f43f55487d7d575b4946dcd8b6aacb166211239aac5087517676afd20e12dae
docfiles size=368
RELOC/doc/latex/kaytannollista-latexia/README.md details="Readme"
RELOC/doc/latex/kaytannollista-latexia/kaytannollista-latexia.pdf details="The document itself" language="fi"
@@ -159021,7 +159080,7 @@ catalogue-contact-repository https://github.com/tlikonen/latex-opas
catalogue-ctan /info/kaytannollista-latexia
catalogue-license cc-by-sa-4
catalogue-topics tut-latex finnish-doc
-catalogue-version 2022.3
+catalogue-version 2022.4
name kblocks
category Package
@@ -161753,7 +161812,7 @@ catalogue-version 0.9.2
name kotex-oblivoir
category Package
-revision 62856
+revision 62924
shortdesc A LaTeX document class for typesetting Korean documents
relocated 1
longdesc The class is based on memoir, and is adapted to typesetting
@@ -161762,13 +161821,14 @@ longdesc belongs to the ko.TeX bundle. It depends on memoir and
longdesc kotex-utf to function.
depend kotex-utf
depend memoir
-containersize 43068
-containerchecksum 578274ac84e9cd84f9c57331504b2129523068b72225c6cc9d012029f910ebab510a26af5179e8e393c3e509683c8d345d8f6cbb2b177186cf462303a546b7b7
-doccontainersize 479928
-doccontainerchecksum e711566125aa6326f366bcb996c0cd4739f7119863beeca8e6efe7895fc3a0da00940738357eb6346ee65fc02d2252e5f75c604c5cdcd17e9b262dbdc16cd5a2
-docfiles size=156
+containersize 43340
+containerchecksum 75e15d4c82fb54b92ab93a512628ab926cc80bd63ae9eae10244ff1188c2310af0c9f1fd462b0b2fbe6c9458dd0ef853f4ed69154ebc9c479d71d94514381300
+doccontainersize 539196
+doccontainerchecksum bfb221b2da1fffd5c1613f5a75bd57574035363587288c03501ed48cb7d261e0952123ac6e8533c199ac7a2ef75af2b54ac04742ca50af470dd5a98e15fc5257
+docfiles size=186
RELOC/doc/latex/kotex-oblivoir/ChangeLog
RELOC/doc/latex/kotex-oblivoir/README details="Readme"
+ RELOC/doc/latex/kotex-oblivoir/chapstyfig.pdf
RELOC/doc/latex/kotex-oblivoir/ob-mathleading-doc.pdf
RELOC/doc/latex/kotex-oblivoir/ob-mathleading-doc.tex
RELOC/doc/latex/kotex-oblivoir/obchaptertoc-doc.pdf
@@ -161812,7 +161872,7 @@ runfiles size=71
catalogue-ctan /language/korean/kotex-oblivoir
catalogue-license lppl1.3c
catalogue-topics korean class
-catalogue-version 3.1.2
+catalogue-version 3.1.3
name kotex-plain
category Package
@@ -174866,7 +174926,7 @@ catalogue-version 1.0a
name letgut
category Package
-revision 62879
+revision 62949
shortdesc Class for the newsletter "La Lettre GUTenberg" of the French TeX User Group GUTenberg
relocated 1
longdesc The French TeX User Group GUTenberg has been publishing "The
@@ -174892,15 +174952,17 @@ longdesc d'Administration de l'association, elu en novembre 2020, a
longdesc souhaite fournir une classe mieux structuree, davantage perenne
longdesc et documentee, a meme d'etre publiee sur le CTAN. C'est
longdesc desormais chose faite avec la presente classe letgut.
-containersize 24820
-containerchecksum 09bef6496ead631df7b721bcb0578a474758b748beb73c12bec0124c9f1e8afed32e160b3dc9fb741db4ab6070e938a955f9b7bb1ec5fa3550495ddf0bebbc5b
-doccontainersize 757060
-doccontainerchecksum b5971c2e23be18ff63e290bcc6b02c8af4ddfb1e4261e77ebe86b68a4a0675356c6a37a70875334a93bfa442f2ee991abba4634a4cca40d737befb3a0f9ecce4
-docfiles size=236
+containersize 24884
+containerchecksum 7fa05ae0bc5c33323c08924f87a94a3ece415aabe869c2c68c3781f4fbb20c999756ed65a15db7b486a382b64f6f7bd28a33284203255f59d39ffd08432c9cfa
+doccontainersize 920644
+doccontainerchecksum 0524964c7860a982eae4661173e96e07a5ddf5d1316bff75dd03e8bd20f3c9f74082b8c6cefb6668267ef44036c239e116200607e3d762a0fe9e2b431890c490
+docfiles size=289
RELOC/doc/lualatex/letgut/CHANGELOG.md
RELOC/doc/lualatex/letgut/README.md details="Readme"
RELOC/doc/lualatex/letgut/exemple-nouveautes.pdf
RELOC/doc/lualatex/letgut/latexmkrc
+ RELOC/doc/lualatex/letgut/letgut-banner-code.pdf
+ RELOC/doc/lualatex/letgut/letgut-banner-code.tex
RELOC/doc/lualatex/letgut/letgut-code.pdf details="Package documentation"
RELOC/doc/lualatex/letgut/letgut-code.tex
RELOC/doc/lualatex/letgut/letgut.bib
@@ -174909,17 +174971,17 @@ docfiles size=236
RELOC/doc/lualatex/letgut/listings-conf.tex
RELOC/doc/lualatex/letgut/localconf.tex
RELOC/doc/lualatex/letgut/xindex-letgut.lua
-srccontainersize 31588
-srccontainerchecksum b298d25e58a173339fdae86be46bb1635e28d0ceacbca736ddd624d88945e1a8c200e8748e47f61d1c794b3286baf54b376af8b289b00ddbed93a6a380216814
-srcfiles size=35
+srccontainersize 33060
+srccontainerchecksum 094c37ab969ab102a40bf45a5f7d5bdfbfa95d78fa8ec8a481874e9fddab3840f28b4d5bb4e5a2cb0f253fbbb39619791637a888bfaac375f9668720f2f62ef0
+srcfiles size=36
RELOC/source/lualatex/letgut/HOWTO.md
RELOC/source/lualatex/letgut/letgut-banner.org
RELOC/source/lualatex/letgut/letgut.org
runfiles size=27
- RELOC/tex/lualatex/letgut/Flag_of_La_Francophonie-crop.pdf
RELOC/tex/lualatex/letgut/informations-gut.tex
RELOC/tex/lualatex/letgut/letgut-acronyms.tex
RELOC/tex/lualatex/letgut/letgut-banner.sty
+ RELOC/tex/lualatex/letgut/letgut-francophony-icon.pdf
RELOC/tex/lualatex/letgut/letgut.cbx
RELOC/tex/lualatex/letgut/letgut.cls
RELOC/tex/lualatex/letgut/letgut.dbx
@@ -174927,11 +174989,11 @@ runfiles size=27
RELOC/tex/lualatex/letgut/logo-gut.pdf
catalogue-contact-bugs https://framagit.org/gutenberg/classe-lettre-gut/-/issues
catalogue-contact-development https://framagit.org/gutenberg/classe-lettre-gut/-/merge_requests
-catalogue-contact-repository https://framagit.org/gutenberg/classe-lettre-gut
+catalogue-contact-repository https://framagit.org/gutenberg/classe-lettre-gut/
catalogue-ctan /macros/luatex/latex/letgut
catalogue-license lppl1.3c
catalogue-topics magazine luatex
-catalogue-version 0.9
+catalogue-version 0.9.1
name letltxmacro
category Package
@@ -188140,7 +188202,7 @@ catalogue-version 0.8
name lua-widow-control
category Package
-revision 62870
+revision 62934
shortdesc Automatically remove widows and orphans from any document
relocated 1
longdesc Unmodified TeX has very few ways of preventing widows and
@@ -188161,21 +188223,21 @@ longdesc start of your document. To load: Plain LuaTeX: \input
longdesc lua-widow-control LuaLaTeX: \usepackage{lua-widow-control}
longdesc ConTeXt (LMTX): \usemodule[lua-widow-control] OpTeX:
longdesc \load[lua-widow-control]
-containersize 10336
-containerchecksum 1b295692005acd52bd1035d75037b572fe79ffb81102877dcdf0f8ce4b601f2ec74130fde99c3f64212680b6641c587d5bd9927910deb9f17d167f952a1c629e
-doccontainersize 346692
-doccontainerchecksum df4842c3e9d1a33cfddc71209a7292182b41cfa4c4b576d81f8d6fb9d216ce6de93a3a2c9f79b9a67453dad27533e91f725753a35bd16a4808356fb85e306073
-docfiles size=93
+containersize 10596
+containerchecksum fd36c8b051cc48fbda23de3d0ada19e9fc3dae5bb53dacdd46340ffa332df9174ba20cad06d8a8673597abe648e3c69db5c0ab0a501a10a93ed7f2d3fc93c704
+doccontainersize 347124
+doccontainerchecksum 4e198fc4bc3a4752f1e2a65d2f608aa424c9dea16f4790a2a59f552f190b1b67df2041221f1b3d5b3483b08b30419f87f1bd2f3b34f75c68c066d5573ad249bb
+docfiles size=94
RELOC/doc/luatex/lua-widow-control/README.md details="Readme"
RELOC/doc/luatex/lua-widow-control/lua-widow-control.pdf details="Package documentation"
srccontainersize 13680
-srccontainerchecksum d27420931545f9c3bdb1964f05fc77fb8d9756bc9e5d49d1757df8a1a211a55a2a13e793d2fde4588a56fbfb417525a2745ab89b164aa033f5c72552c392a9fc
+srccontainerchecksum a1f80024547de45fdb867d324431741477f117de7302227c3f233a5aa3ba6e7f3f52249722867c6472a4d558b8af4d6b6e789dfa4a19f22a2dbb58ed0bef269d
srcfiles size=13
RELOC/source/luatex/lua-widow-control/lwc-documentation.bib
RELOC/source/luatex/lua-widow-control/lwc-documentation.mkxl
RELOC/source/luatex/lua-widow-control/lwc-documentation.tex
RELOC/source/luatex/lua-widow-control/lwc-sample.tex
-runfiles size=13
+runfiles size=14
RELOC/tex/context/third/lua-widow-control/t-lua-widow-control.mkiv
RELOC/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl
RELOC/tex/lualatex/lua-widow-control/lua-widow-control-2022-02-22.sty
@@ -188189,7 +188251,7 @@ catalogue-contact-support https://github.com/gucci-on-fleek/lua-widow-control/di
catalogue-ctan /macros/luatex/generic/lua-widow-control
catalogue-license other-free cc-by-sa-4
catalogue-topics layout luatex expl3
-catalogue-version 2.0.2
+catalogue-version 2.0.3
name luaaddplot
category Package
@@ -190704,7 +190766,7 @@ catalogue-topics luatex table
name lwarp
category Package
-revision 62761
+revision 62952
shortdesc Converts LaTeX to HTML
longdesc This package converts LaTeX to HTML by using LaTeX to process
longdesc the user's document and generate HTML tags. External utility
@@ -190724,17 +190786,17 @@ longdesc utilities, and Perl. Detailed installation instructions are
longdesc included for each of the major operating systems and TeX
longdesc distributions. A quick-start tutorial is provided.
depend lwarp.ARCH
-containersize 212596
-containerchecksum 245cbe3d160481b18404f32f153cd024ac23e5a295c16215455366fe1cc2c5be75f340a389e1dd22942e8934b075066cc4170b3da66c3eac52e04c722704ee1c
-doccontainersize 3056788
-doccontainerchecksum 447f6513be992ee6197d61865817fb9d49325d1cd6894fc19612b73bbb9f01cc8d5bed5e487d30a9e596e306bdc2dc5f8e2897de94b48209e154f5b150dbed4c
-docfiles size=779
+containersize 213084
+containerchecksum 649fac290658f746c221be7adcb2a62bdd993bd845f9811f23237ba62769c844bb67df5186112b0db48cf3e670192592eeff78a81ed3beb87d4a1242480295f3
+doccontainersize 3060772
+doccontainerchecksum 8fdbe01d26e7790758d54886322bf76e2af2916a8d9eccc3d710e65bdb65d5f6bd189423aaa94b9940d81321331d09b5e4e948c710856c334d2a4915093026b4
+docfiles size=780
texmf-dist/doc/latex/lwarp/README.txt details="Readme"
texmf-dist/doc/latex/lwarp/lwarp.pdf details="Package documentation"
texmf-dist/doc/latex/lwarp/lwarp_tutorial.txt details="Quick-start tutorial"
-srccontainersize 457956
-srccontainerchecksum b54451be100f2c408ef502291d9070e12bb54ad52e97d042342ef9da3028583f0f2674ff5de7a757e259f45cc3777caf86065472a9812684af7fa21d0cde6034
-srcfiles size=701
+srccontainersize 458760
+srccontainerchecksum d71f8631ff32a6d14b177bd064793af48a5abd95e8d856d0d4ed076ebc4db9c9b63cc784248b0d97c9f3842c9458da2c7adc161b598f24b07fde13cc8254804f
+srcfiles size=703
texmf-dist/source/latex/lwarp/lwarp.dtx
texmf-dist/source/latex/lwarp/lwarp.ins
runfiles size=803
@@ -191333,7 +191395,7 @@ catalogue-contact-home http://bdtechconcepts.com/
catalogue-ctan /macros/latex/contrib/lwarp
catalogue-license lppl1.3
catalogue-topics cvt-html
-catalogue-version 0.904a
+catalogue-version 0.905
name lwarp.aarch64-linux
category Package
@@ -192358,17 +192420,17 @@ catalogue-version 1.0
name make4ht
category Package
-revision 62075
+revision 62953
shortdesc A build system for tex4ht
longdesc make4ht is a simple build system for tex4ht, a TeX to XML
longdesc converter. It provides a command line tool that drives the
longdesc conversion process. It also provides a library which can be
longdesc used to create customized conversion tools.
depend make4ht.ARCH
-containersize 51724
-containerchecksum 4e05da70d09f43c3dfa10d2e8c4836eb8589b876b73b2de6ee53ea28ead4080ce58273b44556b6dfdbd200e5af9d8355e8e92526e0a5e883c707dd0c03d04be8
-doccontainersize 176540
-doccontainerchecksum 7a377e846ef6a569bc2f3fa7b4eb245fa14c6b9435ddd3f01dd5993d734d1d8bbfa899128006b2ef5af3d3719eec2f2184ba9fa0f6393530e5abc7ba2042c755
+containersize 51816
+containerchecksum 591b69770285fee1f3bd407e176b6e783ccca6d217a0f147780da9c535a4ae7e87e95a8a9bd3a220b342a3397df3845934e229ecf7f2bea0085acf94983461a1
+doccontainersize 177016
+doccontainerchecksum b83f6cb2d6b514e4514512f803c916f943b2b915d4a1de02e0f1c304072e41e673317c02e43f777159ff60a775a9ccdff528277885c5305110383c2ac4022d12
docfiles size=72
texmf-dist/doc/support/make4ht/README details="Readme"
texmf-dist/doc/support/make4ht/changelog.tex
@@ -192443,7 +192505,7 @@ catalogue-contact-repository https://github.com/michal-h21/make4ht
catalogue-ctan /support/make4ht
catalogue-license lppl1.3
catalogue-topics cvt-html
-catalogue-version 0.3k
+catalogue-version 0.3l
name make4ht.aarch64-linux
category Package
@@ -193763,7 +193825,7 @@ catalogue-version 1.4b
name markdown
category Package
-revision 62342
+revision 62928
shortdesc A package for converting and rendering markdown documents inside TeX
relocated 1
longdesc The package provides facilities for the conversion of markdown
@@ -193776,11 +193838,11 @@ longdesc down and rewritten for the needs of the package. Lunamark
longdesc provides speedy markdown parsing for the rest of the package.
longdesc On top of Lunamark sits code for the plain TeX, LaTeX, and
longdesc ConTeXt formats by Vit Novotny.
-containersize 41996
-containerchecksum 3293efdbd8c29238a62837b69b6e3bed467e8c05b398b307e1f5e175150a7b6aece103edcd97c33a668233c740c3dd0d7d9e5165c4f23f9de1844639af487252
-doccontainersize 912120
-doccontainerchecksum 113e890af4358347426aeeda85da37f2012a0fc5bd9c7b14e07c531b175cc9d8b9dfc45dab9180863d53a3f9d5b2ff9f3550abf81d2ac364eb4f5e56cf2e3ea0
-docfiles size=398
+containersize 42740
+containerchecksum 2e15f2b4be09cb52002472f8bd2983de31d919b243dae13451a0f1e2e8a408befbe6bb548ee8d0fe2907ec58b6cff0519e83e5c5dde8bade1bfbfd450a78882c
+doccontainersize 949952
+doccontainerchecksum cc174614536cd043d516ef39d4f11b170190e752216087d60caa7e1e7bf62bb25e85f52b636039ad0b1d9481890907c99fd98da1e312041205e12a7f2d213f8a
+docfiles size=414
RELOC/doc/context/third/markdown/examples/context-mkii.tex
RELOC/doc/context/third/markdown/examples/context-mkiv.tex
RELOC/doc/context/third/markdown/examples/example.md
@@ -193794,13 +193856,13 @@ docfiles size=398
RELOC/doc/latex/markdown/examples/example.md
RELOC/doc/latex/markdown/examples/latex.tex
RELOC/doc/latex/markdown/examples/scientists.csv
-srccontainersize 88100
-srccontainerchecksum 7a185d5b47e4a8db424f79231e9e09baa539548cf6041a93d2a32adf286b1cf781b6ddcf91ccbcf855365002218b2e15e5fa315c5e5c1a4d21744c62bee226bb
-srcfiles size=151
+srccontainersize 89692
+srccontainerchecksum 0f7ef0e64bdbe98b1aafcf2a53b7e09827465fa43a31f06b7dab0a16f5804a0d07582313b0bfa430cecbe4db52c65274cd8166b0a66d8923c86cf8aa7e1c2c4c
+srcfiles size=156
RELOC/source/generic/markdown/docstrip.cfg
RELOC/source/generic/markdown/markdown.dtx
RELOC/source/generic/markdown/markdown.ins
-runfiles size=67
+runfiles size=70
RELOC/scripts/markdown/markdown-cli.lua
RELOC/tex/context/third/markdown/t-markdown.tex
RELOC/tex/generic/markdown/markdown.tex
@@ -193817,7 +193879,7 @@ catalogue-contact-repository https://github.com/Witiko/markdown
catalogue-ctan /macros/generic/markdown
catalogue-license lppl1.3
catalogue-topics markup
-catalogue-version 2.14.1-0-gb933d81
+catalogue-version 2.15.0-0-g9296cf1
name marvosym
category Package
@@ -196689,16 +196751,16 @@ catalogue-version 0.5
name mcf2graph
category Package
-revision 62678
+revision 62936
shortdesc Draw chemical structure diagrams with MetaPost
relocated 1
longdesc The Molecular Coding Format (MCF) is a linear notation for
longdesc describing chemical structure diagrams. This package converts
longdesc MCF to graphic files using MetaPost.
-containersize 448
-containerchecksum 8050e1b5395783ccdde11b5c7246e4d0c5fbf2a8aec0b1dd46124e57164a45ebc12ccdb453ad0a7c973187d1fe66d301aab2bfcc94e5a9dd468eef6774c46ae7
-doccontainersize 1035040
-doccontainerchecksum ee2a4973598ef5ce0c717c5c2203783172b4516613d2fa94eb3fc58be036e3e973b4bf91653dd54bbe6922b9995b5d829206039e48aa3f4c0fe01b29cf403efa
+containersize 444
+containerchecksum bac4da2f647c282236e2f176573f85812e7457dc87e33c7b42e3cdb22efc569fa9f7dc9abb9075227f90ff25d39ec9b9e864893a6f899938c816563c9a3b36af
+doccontainersize 1035636
+doccontainerchecksum b260824ac54a8fa1a47c0a8fe2d0ddab4c13fbc56f6c94d129a6c60b132896e42e8fafac3e886969d53410331f53c4d1ac532c4273ad95235a7d5f086c189fbc
docfiles size=334
RELOC/doc/metapost/mcf2graph/CHANGELOG
RELOC/doc/metapost/mcf2graph/README details="Readme"
@@ -196717,7 +196779,7 @@ docfiles size=334
catalogue-ctan /graphics/mcf2graph
catalogue-license mit
catalogue-topics graphics graphics-mpost chemistry
-catalogue-version 4.82
+catalogue-version 4.83
name mcite
category Package
@@ -197513,23 +197575,23 @@ catalogue-version 0.1.1
name mendex-doc
category Package
-revision 59706
+revision 62914
shortdesc Documentation for Mendex index processor
relocated 1
longdesc This package provides documentation for Mendex (Japanese index
longdesc processor). The source code of the program is not included, it
longdesc can be obtained from TeX Live subversion repository.
containersize 1368
-containerchecksum 15240dcab30c8afd330857889ede633c9549fa091899accd3d194a0257e308ac0e8d66892a59390917f3676d9fa4f02905574244526b6321980aa4855aebb76b
-doccontainersize 233848
-doccontainerchecksum 515241f6b1c3285511eacb68d313a926b63b9cd5bdff6a42d933a802413a173b868c8826c5358887a9bfa37cd970c711464c0972c5982ff1c12469c426ffbd0e
-docfiles size=66
+containerchecksum 76f59e31e7d2a4240ab7b258745a7c94b8d78f8e308ad2bcf0ab85fc2d4b0ad77f7e1268014960cd29913bc3a81fdf2d6bbf6a8ab0b0845f2587c3134efb20c0
+doccontainersize 239468
+doccontainerchecksum 1a56d1ceab9536869e6d7da57146bc126f45893bfa998ab42eaddca7c48a9ee9d5b69abb31cf02cb6590d7acab68029f5eacb8547de6e877ed893c5f51acd923
+docfiles size=69
RELOC/doc/support/mendex-doc/LICENSE
RELOC/doc/support/mendex-doc/README.md details="Readme"
RELOC/doc/support/mendex-doc/mendex.pdf details="Package documentation" language="ja"
RELOC/doc/support/mendex-doc/mendex.tex
-srccontainersize 784
-srccontainerchecksum a6f375bc6c10866d7039b58dfff2eca7160a1cf827dc6bf89592ce54632245384738ed1f88d81bdff525c6e6d9e78312708eb14644ff70a81287ae959b6c6d1c
+srccontainersize 800
+srccontainerchecksum e22c3a7573e8f57d8324d7ca74b3c6b4c716dfa0ea6f43ba3e6eaa63aecf0fe0591ccf9cc4b18984ed2730fc5b9e0b84287bca677717f81c583e0c3c3e0c564c
srcfiles size=1
RELOC/source/latex/mendex-doc/Makefile
runfiles size=1
@@ -211850,7 +211912,7 @@ catalogue-topics psychology journalpub bibtex-sty apa
name msu-thesis
category Package
-revision 62407
+revision 62941
shortdesc Class for Michigan State University Master's and PhD theses
relocated 1
longdesc This is a class file for producing dissertations and theses
@@ -211860,10 +211922,10 @@ longdesc Dissertations. The class should meet all current requirements
longdesc and is updated whenever the university guidelines change. The
longdesc class is based on the memoir document class, and inherits the
longdesc functionality of that class.
-containersize 10540
-containerchecksum 024ced88959828799179d872a35e3b55592217e762ef9872d683eeb9e4ea281112dddfb0de304ba378f9adc204a41d1cc3042aa5e0598c86481971d587262e7e
-doccontainersize 444296
-doccontainerchecksum e150b07c60c9fe358e0fd921d94e3a5eea88ea166f16b45d12fb74dc709a46f6359a2adf799175c7d0168cf71d93e06ddb8a2740563a8ed684cb63259d6bc423
+containersize 10568
+containerchecksum 85f7ae2991a48e14949c585cd486a4f2e0394c682a1520d8f9c9c548ddd9e4706bb3e1a3f4f4b9672ca98f7721874ff3c762fd0d4db18352d879ced4e13700a3
+doccontainersize 446268
+doccontainerchecksum 7f02bd77962761e4badfb5b3d6e7b01f77b5d96c4dace03b23ffcea35db86fe07c11b7e7c6a8c0e29ef9195f93b8a492c7ff2c9d0079a7187486fcdb88f9d5fe
docfiles size=123
RELOC/doc/latex/msu-thesis/README.md details="Readme"
RELOC/doc/latex/msu-thesis/msu-thesis.pdf details="Package documentation"
@@ -211879,7 +211941,7 @@ catalogue-contact-repository https://github.com/amunn/msu-thesis
catalogue-ctan /macros/latex/contrib/msu-thesis
catalogue-license lppl1.3
catalogue-topics class dissertation doc-templ std-conform
-catalogue-version 3.1
+catalogue-version 3.1b
name mtgreek
category Package
@@ -220000,26 +220062,26 @@ catalogue-version 0.0.1
name njuthesis
category Package
-revision 62813
+revision 62939
shortdesc LaTeX thesis template for Nanjing University
relocated 1
longdesc The njuthesis class is intended for typesetting Nanjing
longdesc University dissertations with LaTeX, providing support for
longdesc bachelor, master, and doctoral thesis.
-containersize 12504
-containerchecksum 28f34eee7c3e3507605ad1d62675b667f69cbe6f9e8ff2ebe5d9606d31c7e627f22455dc8479d7542c3a761d09fb9d08b01d4bc883492111e2948b1d0dbd3ca9
-doccontainersize 1144552
-doccontainerchecksum a45b187e647e634371a51d726b87ce40e39c2b2f2550f9732965d7de6c638064006798ab0b4da68750d574415fa05f5ace49a9e206e9cc8eb20178fe4a443a84
-docfiles size=286
+containersize 13208
+containerchecksum 1616405ff2d48a476765d45155d7488b1a0409ba8b26360df38e44e6c90e1d92ff5fb1a921ce6dab7d4b66e1e8d36c854ffc5f221cf1ca68630622e4cb9d059c
+doccontainersize 1158452
+doccontainerchecksum a569ebee4c04b6d00f9445828e6ab12c0fb9165652d408c0fbcebb9962b28f65dc1cfa5a912e79b9bd595b6c30fce856d1ed7bb3231b4ed800ac04e98cf17bad
+docfiles size=289
RELOC/doc/latex/njuthesis/LICENSE
RELOC/doc/latex/njuthesis/README.md details="Readme"
RELOC/doc/latex/njuthesis/njuthesis.pdf details="Package documentation" language="zh"
-srccontainersize 47540
-srccontainerchecksum f78978875633dd269b8cccb9bf73dfe3bb0673023686f64e2f3eb27707d7df314df408a4dd9c5d99074590fab78f33efb5054519556320151e99e8df2a16d8a9
-srcfiles size=51
+srccontainersize 49180
+srccontainerchecksum 345f632cf9ff46132d34e78323765451da2b400a33c93a1a48fdac399cfd5662a340943848674288ec9231ee74d435e892f3cdfdcad6650f4e7ded6f0e0d7572
+srcfiles size=52
RELOC/source/latex/njuthesis/njuthesis.dtx
RELOC/source/latex/njuthesis/njuthesis.ins
-runfiles size=16
+runfiles size=18
RELOC/tex/latex/njuthesis/njuthesis-graduate.def
RELOC/tex/latex/njuthesis/njuthesis-undergraduate.def
RELOC/tex/latex/njuthesis/njuthesis.cls
@@ -220031,7 +220093,7 @@ catalogue-contact-support https://github.com/nju-lug/NJUThesis/discussions
catalogue-ctan /macros/unicodetex/latex/njuthesis
catalogue-license lppl1.3c
catalogue-topics dissertation proposal latex3 chinese
-catalogue-version 0.16.0
+catalogue-version 0.16.1
name njuvisual
category Package
@@ -226571,18 +226633,18 @@ catalogue-topics font font-body font-proportional font-mono font-multilingual fo
name noto-emoji
category Package
-revision 59355
+revision 62950
shortdesc Noto Emoji fonts
relocated 1
longdesc Noto Color Emoji supports all emoji defined in the latest
longdesc Unicode version.
-containersize 9803288
-containerchecksum a6d041f781389bd1fa4e329adb2f0e28e19b003c708ce73e22c74d4a8580d362712a0bc3bef72e6f527e159662c5953dcf7cdcc104dff43329401da933ab4049
-doccontainersize 616
-doccontainerchecksum 3c94966e2e822047d43c0a999e46729fa801b93d4dfc5c98432479a419d12faadd345df0bc1471ca44b6767316c806aba85e256e031fcb17b3233fdd59c66f58
+containersize 9251416
+containerchecksum 68400eedc7540f11c0d3649558ce14ac1bb0bf7f2ed56dfda355fa08c7bf37e947a4c48040075e52b4f4205250df2688a7de22fcbde8285ae4549deb5e02e263
+doccontainersize 612
+doccontainerchecksum 6c0d286c903b49e6c09c570a8586b0f480497f5b64eaf7e9a99d81a143ff9c383cc281d2d1c06293d82c459b5ac108cd960f1d5e4ddd80a70f6c39b4ae3a7d75
docfiles size=1
RELOC/doc/fonts/noto-emoji/README.md details="Readme"
-runfiles size=2647
+runfiles size=2512
RELOC/fonts/truetype/google/noto-emoji/NotoColorEmoji.ttf
RELOC/fonts/truetype/google/noto-emoji/NotoEmoji-Regular.ttf
catalogue-contact-bugs https://github.com/googlefonts/noto-emoji/issues
@@ -226591,7 +226653,7 @@ catalogue-contact-repository https://github.com/googlefonts/noto-emoji
catalogue-ctan /fonts/noto-emoji
catalogue-license ofl
catalogue-topics font font-ttf font-symbol
-catalogue-version 2020-09-16-unicode13_1
+catalogue-version 2.034
name notoccite
category Package
@@ -228479,7 +228541,7 @@ catalogue-version 0.5
name ocgx2
category Package
-revision 59618
+revision 62927
shortdesc Drop-in replacement for 'ocgx' and 'ocg-p'
relocated 1
longdesc This package serves as a drop-in replacement for the packages
@@ -228490,10 +228552,10 @@ longdesc known engines and back-ends including: LaTeX - dvips -
longdesc ps2pdf/Distiller (Xe)LaTeX(x) - dvipdfmx pdfLaTeX and LuaLaTeX
longdesc . It also ensures compatibility with the media9 and animate
longdesc packages.
-containersize 17116
-containerchecksum 4b409a298faa576388c625a93a3ec32eacb1810d3307013a6a07407fb4c513e2cb460a566462ff6ba3033ab8dec7554492d72e7db111134d19250d9e0a056f01
-doccontainersize 6128
-doccontainerchecksum 65e87909d7b6aff0d6f43e4e4a96c9ccbf022b4d0d204e8acf6759cde7186b07b286d157d51c315a9dc6c500d27a7b457ca7c40abfb2cf6a841b931710ff4eda
+containersize 17216
+containerchecksum 8506d1526e1b8d98268d11b78fab61b51b2713f9c21ef34fa9e835f3cbf9344251e03cab2836d329ba60480b1b4fc18aa9324f40cf50e1c964a9115ea33546c4
+doccontainersize 6172
+doccontainerchecksum 78cdff92f4fb8edde110baa4c7e14804996fb149db18b692f3fa7a71d13aeb3154b76284105aeaf8ca46a6e73eaf8d0d4c44cf762e33425bb285b50e85e6ab2f
docfiles size=5
RELOC/doc/latex/ocgx2/ChangeLog
RELOC/doc/latex/ocgx2/README.txt
@@ -228506,7 +228568,7 @@ catalogue-contact-repository https://gitlab.com/agrahn/ocgx2
catalogue-ctan /macros/latex/contrib/ocgx2
catalogue-license lppl
catalogue-topics pdf-feat adobe-distiller expl3
-catalogue-version 0.53
+catalogue-version 0.54
name ocherokee
category Package
@@ -232832,7 +232894,7 @@ catalogue-topics maths
name oup-authoring-template
category Package
-revision 62856
+revision 62943
shortdesc A general template for journals published by Oxford University Press (OUP)
relocated 1
longdesc This package provides a general LaTeX template for journals
@@ -232843,24 +232905,24 @@ longdesc with large, medium and small page options. For more information
longdesc see
longdesc https://academic.oup.com/journals/pages/authors/preparing_your_
longdesc manuscript.
-containersize 15132
-containerchecksum fd738de51bfa47a4b3a121a2850372a57df7bb4f4f0d0359792c2dd875d37b7a19e7e23d2c2d8cc15c57d25d0d10e3578b7aaa33f2387c750f8d00a294ea3cb9
-doccontainersize 511088
-doccontainerchecksum b5b2eb8c2849c1c7971944d0dc17abae90e64d13bea0a6f5c181a4425e96c398cf9aec5e63cfc406ac75ad22b95f2f58f62d630286babc649b17a60cf343484e
-docfiles size=159
+containersize 17492
+containerchecksum 5e0490d1d90d7c06a3334c832b970990d4d16896fda36c9ddbbdb06b0bf12ddfa88eecf9bd1258f6a65e35a1399a5824347cf33d65fbd543061cfa796e453b7b
+doccontainersize 322092
+doccontainerchecksum ac604c5b880b80c46767585db8df40230f7a1dd6a3565d4b2cbdb0e8c35fc139f8bbdb88c741ee4fb14da5d0f511226360a964662564801f5f161fdbc41f546c
+docfiles size=115
RELOC/doc/latex/oup-authoring-template/README details="Readme"
RELOC/doc/latex/oup-authoring-template/doc/oup-authoring-template-doc.pdf details="User manual"
RELOC/doc/latex/oup-authoring-template/doc/oup-authoring-template-doc.tex
RELOC/doc/latex/oup-authoring-template/manifest.txt
RELOC/doc/latex/oup-authoring-template/oup-authoring-template.pdf details="Example of use"
RELOC/doc/latex/oup-authoring-template/oup-authoring-template.tex
-runfiles size=29
+runfiles size=31
RELOC/tex/latex/oup-authoring-template/oup-authoring-template.cls
catalogue-contact-home http://academic.oup.com/journals/pages/authors/preparing_your_manuscript
catalogue-ctan /macros/latex/contrib/oup-authoring-template
catalogue-license lppl1.2
catalogue-topics journalpub class doc-templ
-catalogue-version 1.0
+catalogue-version 1.1
name outerhbox
category Package
@@ -235927,17 +235989,17 @@ catalogue-topics biblio japanese
name pbibtex-manual
category Package
-revision 61915
+revision 62913
shortdesc Documentation files for (u)pBibTeX
relocated 1
longdesc The bundle contains documentation files for Japanese pBibTeX
longdesc and upBibTeX. For historical reasons, this also contains old
longdesc documentation files for JBibTeX.
containersize 460
-containerchecksum 6e5f1058a6e8c1ad0ca88638b91fe9dd1263f733c0e1da4d04edf345f584419ef4809126a583fb99abc308bdf1bd21c85934961ca9658267f3c5b3092279fb99
-doccontainersize 943344
-doccontainerchecksum 3b574a4d681a91a89d45cfd89f614a44505ff450fce32432508abee13469cf6f4a8e8a1962685eb5e610fd5a14e24e38ad555ecf86f446d7a6d4d6964ab40fb8
-docfiles size=262
+containerchecksum afee2e70ddbf92910e08425ac6caec1ed8ed55ed8e1e4d183bdf15072de18516193c97af05af316b567ddc81aa78fdc1e8d1e376adf6913edd961205e05b7330
+doccontainersize 977292
+doccontainerchecksum 318cfa9e0540149de336e021b2ea928bd68b1ef633f58a5dacd85cc51e62f835c46b27160ed2cb444f68b82c3e859eb464064213013ed57e43fdf3f6e2863ecb
+docfiles size=272
RELOC/doc/latex/pbibtex-manual/LICENSE
RELOC/doc/latex/pbibtex-manual/README.md details="Readme"
RELOC/doc/latex/pbibtex-manual/jbibtex.pdf
@@ -248128,7 +248190,7 @@ catalogue-version 1.101
name polyglossia
category Package
-revision 58869
+revision 62940
shortdesc An alternative to babel for XeLaTeX and LuaLaTeX
relocated 1
longdesc This package provides a complete Babel replacement for users of
@@ -248140,11 +248202,11 @@ depend fontspec
depend iftex
depend makecmds
depend xkeyval
-containersize 115840
-containerchecksum cc76a010e93e9aafbc74d4894b1cb44cd8a569eff1f42b1017d49a0f86fdf577334e8100e2ce8be68c5bf430b6895f80513adee5aacced508244e1f5d5e5f0f5
-doccontainersize 641576
-doccontainerchecksum 64147a6df9eb9f12f0c74792f3b7e0d9c465354a3966d7b1279aa64432021d37d1bbbfc2a310c1a27fef92723ba5803bdcb25995ce930e134553383c3b766904
-docfiles size=205
+containersize 118592
+containerchecksum 253853da60c34146ac69486de4904330db376d8c11ccf558cade016ac55c3870491326efa8e5bf27d2636c3c1f976cda36a35ad5ff8ba6fd3916271d4d5bee4e
+doccontainersize 649796
+doccontainerchecksum ede5636c9a5d58b6763c4bdef83399264403eb053b37cca6a647f0cd3681dfcc58e9c2211f3b2672e5a4316669a58883c8b28f4842ae44ac39a531969820ab98
+docfiles size=208
RELOC/doc/latex/polyglossia/README.md details="Readme"
RELOC/doc/latex/polyglossia/example-arabic.pdf
RELOC/doc/latex/polyglossia/example-arabic.tex
@@ -248158,11 +248220,11 @@ docfiles size=205
RELOC/doc/latex/polyglossia/polyglossia.tex
RELOC/doc/latex/polyglossia/test-welsh.pdf
RELOC/doc/latex/polyglossia/test-welsh.tex
-srccontainersize 152892
-srccontainerchecksum 1f534fe32af11b3b83a7814c5615c046869c66e3af0781cef6730dfefecaae093e08eb53c73ac2a417d34aeed0f4a9f8dfde5debbb552ecba1ae00359c172de6
-srcfiles size=229
+srccontainersize 156628
+srccontainerchecksum 5b5166d7c5acaa99658136e4cdf047f447950de2280e421fca14f2893c7568bff861a8e102151ab44fce9edf6c8a38677cea80bd6806275d712bf6b511ebee81
+srcfiles size=234
RELOC/source/latex/polyglossia/polyglossia.dtx
-runfiles size=369
+runfiles size=371
RELOC/fonts/misc/xetex/fontmapping/polyglossia/arabicdigits.map
RELOC/fonts/misc/xetex/fontmapping/polyglossia/arabicdigits.tec
RELOC/fonts/misc/xetex/fontmapping/polyglossia/bengalidigits.map
@@ -248344,7 +248406,6 @@ runfiles size=369
RELOC/tex/latex/polyglossia/gloss-la-x-medieval.ldf
RELOC/tex/latex/polyglossia/gloss-la.ldf
RELOC/tex/latex/polyglossia/gloss-lao.ldf
- RELOC/tex/latex/polyglossia/gloss-latex.ldf
RELOC/tex/latex/polyglossia/gloss-latin.ldf
RELOC/tex/latex/polyglossia/gloss-latinclassic.ldf
RELOC/tex/latex/polyglossia/gloss-latinecclesiastic.ldf
@@ -248433,7 +248494,7 @@ catalogue-contact-repository https://github.com/reutenauer/polyglossia
catalogue-ctan /macros/unicodetex/latex/polyglossia
catalogue-license mit lppl1.3 cc0
catalogue-topics multilingual use-xetex use-luatex
-catalogue-version 1.53
+catalogue-version 1.54
name polynom
category Package
@@ -256356,16 +256417,16 @@ catalogue-topics font-cjk
name ptex-manual
category Package
-revision 60158
+revision 62915
shortdesc Japanese pTeX manual
relocated 1
longdesc This package contains the Japanese pTeX manual. Feedback is
longdesc welcome!
containersize 392
-containerchecksum 47c365cd1e802afb5a456a890e5045d30098908310aa3dc15c997e63ab5fcfc34f642604200318e5a6b6c27c4bda6ded2e615fdc044bcbd15e9455db2b87a4fa
-doccontainersize 2480612
-doccontainerchecksum 24c183cd00423def3871ba2f18eb5b7de418e5c3110b593c9739e98addb9791418d30165fa9a85b2f67ee66650832487265e40a857f9cacb80996c13aa0932de
-docfiles size=726
+containerchecksum 3748c0c1ac982aeb2f8210d877b20fe9a6c42582d21fb7e43b9c254e787f22259a90ef1d398e498ede493dd3663be521b42d47cdfe0c5fbae3f43ad5be16e446
+doccontainersize 2925100
+doccontainerchecksum f84a8a047c4387ee45214b6bc98cf2710cdd3497e5a6066fed518b754fa4dbcbe1602cdedaa0f48638f37801f7f7801ad40f288a2e5b8e03cb36848d3992a7d7
+docfiles size=828
RELOC/doc/ptex/ptex-manual/LICENSE
RELOC/doc/ptex/ptex-manual/README.md details="Readme"
RELOC/doc/ptex/ptex-manual/eptex_resume.pdf
@@ -257732,17 +257793,17 @@ catalogue-version 1.0
name pxjahyper
category Package
-revision 62736
+revision 62921
shortdesc Hyperref support for pLaTeX
relocated 1
longdesc This package adjusts the behavior of hyperref on (u)pLaTeX so
longdesc that authors can properly create PDF documents that contain
longdesc document information in Japanese.
-containersize 16872
-containerchecksum 0e818df30360adfa40ba5d0cfb49649e01dc87a99c9db4ecb4286324c0f97284082c101f362b91211d1ad3688f4481e48648fba6941e4f5d2074ff051f6c5d23
-doccontainersize 135748
-doccontainerchecksum 32155467eb9a128b223928546caa175a4d14b91f9a0f074709da4341a87717348e4c54e09c85c4ee5068e0922b8d360d7610d6d017483c5c828b3567644f3363
-docfiles size=40
+containersize 17432
+containerchecksum 1dfedad891d61a0ee1b062a23f9ed2a7a1389737485f5fa2e918e953a797e24829b8003346dcad61fcd8eeefc88a5c8041161203460579d67ddd67b66bed6b8b
+doccontainersize 140108
+doccontainerchecksum 14098f055905443e5a316ffffbcc2c01bd7459910dd0a9373ae7c223cb3db4bff265fc32d98bd7ba7450fcfba6924f180ef99e7bc119f60f982953f6991bfab7
+docfiles size=41
RELOC/doc/platex/pxjahyper/LICENSE
RELOC/doc/platex/pxjahyper/README-ja.md details="Readme (Japanese)" language="ja"
RELOC/doc/platex/pxjahyper/README.md details="Readme"
@@ -257757,7 +257818,7 @@ catalogue-contact-repository https://github.com/zr-tex8r/PXjahyper
catalogue-ctan /language/japanese/pxjahyper
catalogue-license mit
catalogue-topics japanese hyper
-catalogue-version 0.9d
+catalogue-version 1.0
name pxjodel
category Package
@@ -259558,7 +259619,7 @@ catalogue-version 0.9.6
name quantumarticle
category Package
-revision 56862
+revision 62944
shortdesc Document class for submissions to the Quantum journal
relocated 1
longdesc This package provides the preferred document class for papers
@@ -259566,29 +259627,44 @@ longdesc to be submitted to "Quantum -- the open journal of quantum
longdesc science". It is based on the widely used article document class
longdesc and designed to allow a seamless transition from documents
longdesc typeset with the article, revtex4-1, and elsarticle document
-longdesc classes. The quantumarticle document class also offers an
-longdesc option to remove the Quantum-related branding. In that way,
-longdesc users appreciating the esthetics of this document class can use
-longdesc it for their notes as well.
-containersize 14560
-containerchecksum 2d06c5ba42e81ff65171a37ad78e6bc8331bb4eb294056d6955bd1cc48e8c257c6eccf1055772147f6435094b934ea6792ea638c9eca58e94f3c1e387ecf3375
-doccontainersize 702388
-doccontainerchecksum 6de1d9d40a6055f5e7282b532c6f4078d749620fc720c9d23841f5a335bd7bf5d37017ee82fff8f91811b2ea32b8792936592de20c9e48001bbc942f673f09d7
-docfiles size=192
+longdesc classes. As a service to authors, the document class comes with
+longdesc a predefined bibilography style quantum.bst that is optimized
+longdesc to be used with the quantumarticle document class.
+longdesc Additionally, the quantumview documentclass is provided, which
+longdesc can be used as a proxy to typeset the HTML-only editorial
+longdesc pieces in Quantum Views in a LaTeX editor. The quantumarticle
+longdesc document class also offers an option to remove the
+longdesc Quantum-related branding. In that way, users appreciating the
+longdesc esthetics of this document class can use it for their notes as
+longdesc well.
+containersize 24760
+containerchecksum 26e91134a37df19c95e62e0f3756bac78f6bcd87bbc9368f868f9706cfbf72f652a8262455fe0fdf73bda242732c38b525c683f922fd276e1a1c0e97d5688c03
+doccontainersize 1271516
+doccontainerchecksum 8297f035750576a74b7d28317668460be39b72953c240b3e7715db71e613a67bb19fc7c511d65bed105f8aa4aa19191295c9714f313479d09b641986b574bb12
+docfiles size=344
RELOC/doc/latex/quantumarticle/README.md details="Readme"
+ RELOC/doc/latex/quantumarticle/example-plot.pdf
+ RELOC/doc/latex/quantumarticle/quantum-bibliographystyle-demo.bib
+ RELOC/doc/latex/quantumarticle/quantum-bibliographystyle-demo.pdf
+ RELOC/doc/latex/quantumarticle/quantum-bibliographystyle-demo.tex
RELOC/doc/latex/quantumarticle/quantum-template.pdf details="Example of use (template)"
RELOC/doc/latex/quantumarticle/quantum-template.tex
RELOC/doc/latex/quantumarticle/quantumarticle.pdf details="Package documentation"
RELOC/doc/latex/quantumarticle/quantumarticle.tex
-runfiles size=15
+ RELOC/doc/latex/quantumarticle/quantumview-template.bib
+ RELOC/doc/latex/quantumarticle/quantumview-template.pdf
+ RELOC/doc/latex/quantumarticle/quantumview-template.tex
+runfiles size=35
+ RELOC/bibtex/bst/quantumarticle/quantum.bst
RELOC/tex/latex/quantumarticle/quantumarticle.cls
+ RELOC/tex/latex/quantumarticle/quantumview.cls
catalogue-contact-bugs https://github.com/quantum-journal/quantum-journal/issues
catalogue-contact-home https://quantum-journal.org
catalogue-contact-repository https://github.com/quantum-journal/quantum-journal
catalogue-ctan /macros/latex/contrib/quantumarticle
catalogue-license lppl1.3c
catalogue-topics class journalpub physics
-catalogue-version 5.1
+catalogue-version 6.0
name quattrocento
category Package
@@ -272056,27 +272132,32 @@ catalogue-version 6.7a
name seu-ml-assign
category Package
-revision 62836
+revision 62933
shortdesc Southeast University Machine Learning Assignment template
relocated 1
longdesc This is a template for the Southeast University Machine
longdesc Learning Assignment that can be easily adapted to other usages.
-containersize 4196
-containerchecksum 5ac5514dbb304cac7c1a95fe88912b0916415fc2ac408218f3208335ed6d73a6a713127f047a1ae2c513c95e3edaec2dd47e2920d058317a533b31502137acd5
-doccontainersize 486580
-doccontainerchecksum 03bc3a4e9426a12355c3678f32836f38ed73c0247f36dd017b909e56f7ed4f1c73dd78cbf88ccd859dbe8f23fc1fe288b7ba5438b5a13a7bdd11226dc6aec09e
-docfiles size=127
+longdesc This template features a colorful theme that makes it look
+longdesc elegant and attractive. You can also find the template
+longdesc available on Overleaf.
+containersize 4772
+containerchecksum 929cf4aa8b1a55a74cc13e4f823f6d814fadb425f7a6ea53c18cf4244a14b9bee8afd8c06327add62b016ff36e7ecfddc29323105362a63342d382febbabc428
+doccontainersize 175096
+doccontainerchecksum fa1d6be46bac0c2075b8e43c1f39d74092cf86b975b4c281c57b778ba16aa6345258261e26690fc84f79fdfd57082eba64d894002a723ee8bd821fd9d99e7774
+docfiles size=53
RELOC/doc/latex/seu-ml-assign/README.md details="Readme"
RELOC/doc/latex/seu-ml-assign/seu-ml-assign-doc.pdf details="Package documentation"
RELOC/doc/latex/seu-ml-assign/seu-ml-assign-doc.tex
RELOC/doc/latex/seu-ml-assign/seu-ml-assign-sample.tex
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/seu-ml-assign/seu-ml-assign.cls
-catalogue-contact-repository https://github.com/Teddy-van-Jerry/SEU-ML-Assign_LaTeX_Template/
+catalogue-contact-bugs https://github.com/Teddy-van-Jerry/SEU-ML-Assign_LaTeX_Template/issues
+catalogue-contact-home https://seu-ml-assign.github.io
+catalogue-contact-repository https://github.com/Teddy-van-Jerry/SEU-ML-Assign_LaTeX_Template
catalogue-ctan /macros/latex/contrib/seu-ml-assign
catalogue-license mit
-catalogue-topics class exercise
-catalogue-version 1.0
+catalogue-topics class exercise doc-templ
+catalogue-version 1.1
name seuthesis
category Package
@@ -281187,21 +281268,21 @@ catalogue-version 4.11
name stage
category Package
-revision 53915
+revision 62929
shortdesc A LaTeX class for stage plays
relocated 1
longdesc Stage.cls is a LaTeX class for creating plays of any length in
longdesc a standard manuscript format for production and submission.
-containersize 2824
-containerchecksum 3e59c8794ba63b4ed5ff0a0e99fadfba4371a93ec2076a818dc0c84b00b5f555ddd09caa89128ef52f59bf888609a045c522adb24417040a321407e4d7d2b679
-doccontainersize 153640
-doccontainerchecksum f047288e15f2ded21da1a6e1288951f3ff480c60b31dd3e43aff030e8a3fb111d87ce13b5f98a07e03123ac4f0a81e3661dfb433b389f088e8318134a5677712
-docfiles size=41
+containersize 2800
+containerchecksum 8472bc96265ea7fd3be748f147238b6852079ba002f9c7548f5a5e8cb0f34a8155a799635ee5e31b22bb30554795a6fd08e62312b25ce83e727e10f6ccd13f37
+doccontainersize 158680
+doccontainerchecksum 82df4a8fa154a09cd8231c21f3a450a089796306e8275b17291bfc903ef00b316a1ae0a4175637294ecbed0dd6eeffa7baf134d60352284aa07e0a1a0224c205
+docfiles size=42
RELOC/doc/latex/stage/README details="Package README"
RELOC/doc/latex/stage/stage-documentation.pdf details="Package documentation"
RELOC/doc/latex/stage/stage-documentation.tex
-srccontainersize 420
-srccontainerchecksum f69a495f6e49bdccef6d69e5740bb548d1f5f10cedc86865a16e4110dc78ce32176e96432fedb8247500357099e6ce3e88e6de71ab1510e470b4c32ca40d7f18
+srccontainersize 436
+srccontainerchecksum 82255aaf0407da34f219f220deb5b12edd5dea55f168a4ae11a5bc5fbc6144fb45d7e79a4d9562405f838955e72efc3a5533269f05b493a48027bd35713ddd65
srcfiles size=1
RELOC/source/latex/stage/Makefile
runfiles size=2
@@ -281212,8 +281293,8 @@ catalogue-contact-home https://github.com/rrthomas/stage
catalogue-contact-repository https://github.com/rrthomas/stage
catalogue-ctan /macros/latex/contrib/stage
catalogue-license lppl1.3
-catalogue-topics drama-script
-catalogue-version 1.01
+catalogue-topics class drama-script
+catalogue-version 1.03
name standalone
category Package
@@ -290569,7 +290650,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 62897
+revision 62918
shortdesc Convert (La)TeX to HTML/XML
longdesc A converter from TeX and LaTeX to SGML-based formats such as
longdesc (X)HTML, MathML, OpenDocument, and Docbook, providing a
@@ -290590,10 +290671,10 @@ longdesc files from them is nontrivial, and generally done with the
longdesc Makefile in development, from which the TeX4ht package in TeX
longdesc Live is updated.
depend tex4ht.ARCH
-containersize 950592
-containerchecksum 3810aa11a30522c0ead085eb57fed9408e6abf8eb7dbf0c47b4da0f096af01917eeba8f9e2bb3b89fabf6edc2190ebc487459171f796c0e19630254a36fc3ce0
+containersize 950684
+containerchecksum 769b7afeedbeab0e297a7c28449cb7efe0efe3924e541ea880b670e3c14a7d71c8990e86286c60c8f7dbbbc1b3bfbd405abd6570be21eab0e842824cf9971b36
doccontainersize 136384
-doccontainerchecksum f56e765719f638593e3cb4d28fbe89bbfc04eea3c9522ab1a7c1b7780e447a6c4cd784846fafdb582d19d0f53c57018a66d0a7e9818d1f0bb88394078adbfbb6
+doccontainerchecksum 22c5b1a736c5e5db359228e8b9bd6ddf53555803270c7bf02f831c5fd60ed73ab97b97a5c42de6cd00344bea011f8e8292a7abbc9aa7c00d96f085c58f3b57e5
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -290665,8 +290746,8 @@ docfiles size=260
texmf-dist/doc/generic/tex4ht/mn56.html
texmf-dist/doc/generic/tex4ht/mn5x.png
texmf-dist/doc/generic/tex4ht/mn6x.png
-srccontainersize 1250184
-srccontainerchecksum ed9422dc775c0b72cd414f9f8a3423afbd74a4f3791c654f238da2a25d1be47cdd70dfc0c7eb9fabd9b13ed5004b990f579902738871db59e6fe8e59068d3ba2
+srccontainersize 1247704
+srccontainerchecksum 390b0fae04961f39ef76d390cf38c4f4d3985118b63a17cdc34a048597018b3ec47683cb28c22c7828b1459f5327a4e825c648a9cdcc00b3c3ceed3ae67c96e4
srcfiles size=3807
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -300944,14 +301025,14 @@ docfiles size=544
name texlive-msg-translations
category TLCore
-revision 62851
+revision 62955
shortdesc translations of the TeX Live installer and TeX Live Manager
longdesc This package contains the translated messages of the TeX Live
longdesc installer and TeX Live Manager. For information on creating or
longdesc updating translations, see
longdesc http://tug.org/texlive/doc.html#install-tl-xlate.
-containersize 146932
-containerchecksum 586b9ab7d8cfcace82405a4021c3fa6c4cca4b14127cf2b7abfd7f86858d87041550fd6b41ae587e9a818253eebfad525622e2aa3ad9d0751330844a5f235cee
+containersize 147176
+containerchecksum 1b3b1c192597f073dfc3131b6dc4e63f956766c306acdc5aafd3bc89bb40156f26774809cad50c660450c20ee7364cf0c18859a9fb65fa91a14bf4c0ab0fe8a7
runfiles size=372
tlpkg/translations/README
tlpkg/translations/cs.po
@@ -301013,7 +301094,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 62882
+revision 62909
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.
@@ -301021,10 +301102,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 109876
-containerchecksum 46ab002cc4c93d41d4df7977727e91e2f6b2a9d23696240ffa26f585591aacb3180ff46b078955fd9bd08d1e63ddbac600a28d2cd32bb6c1d5bd48add9379428
-doccontainersize 405604
-doccontainerchecksum d3b225366aa50fa9143e15b455ec94730384a1683014988591d9fa49f8365589b84414526648cfed550e195052c77b13978c84d7a685ef25132e3fb0682a477f
+containersize 109816
+containerchecksum d4d10a617a1244333585c912c4e80ccd80edbbfda2900bb010a6776465debfa87d594368d63cd9a2aaa3724095768ce843f252af8508c2c398f9f42d125a1803
+doccontainersize 405640
+doccontainerchecksum 6be1eaa570a2cfed18c119d2d6de53f0cf85d0082be569fa79eac255c9f4c72d367f1182144db22ede6946f0c946282ddb73fa1a74f91057f59d23b62ee75376
docfiles size=504
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -311013,7 +311094,7 @@ binfiles arch=x86_64-solaris size=1
name tlgs.win32
category TLCore
-revision 62895
+revision 62959
catalogue ghostscript
shortdesc Freely available PostScript interpreter
longdesc Ghostscript is a freely available PostScript interpreter which
@@ -311022,9 +311103,9 @@ longdesc complement to a TeX installation, used in many utilities,
longdesc including PostScript/PDF viewers such as gv and GSview.
longdesc Ghostscript is no longer held on CTAN: please see the home page
longdesc for downloads.
-containersize 8138304
-containerchecksum a0803a800d009dbb74e3a39d3ec85f41f5d0b00747a552c49bbc4bd34d244dd4688e743bc95802ff786bf0d91edaa2b2391c32eb1a15cb6a9e1d42f6a5ad8c21
-binfiles arch=win32 size=7703
+containersize 8126996
+containerchecksum 9b99dadcb0298c6b646aa98a7aa4b3ab08929fd582e0cb75a68b0f8c4a9bcf983cdfe41b24498a6e3e4f694a8248a6bff8ab20d0c2b025f0dafaffe20d1c0f01
+binfiles arch=win32 size=7687
bin/win32/eps2eps.exe
bin/win32/pdf2dsc.exe
bin/win32/pdfopt.exe
@@ -311446,12 +311527,10 @@ binfiles arch=win32 size=7703
tlpkg/tlgs/lib/afmdiff.awk
tlpkg/tlgs/lib/align.ps
tlpkg/tlgs/lib/caption.ps
- tlpkg/tlgs/lib/cat.ps
tlpkg/tlgs/lib/cid2code.ps
tlpkg/tlgs/lib/cidfmap
tlpkg/tlgs/lib/cidfmap.TeXLive
tlpkg/tlgs/lib/docie.ps
- tlpkg/tlgs/lib/font2pcl.ps
tlpkg/tlgs/lib/gs_ce_e.ps
tlpkg/tlgs/lib/gs_css_e.ps
tlpkg/tlgs/lib/gs_il2_e.ps
@@ -311467,7 +311546,6 @@ binfiles arch=win32 size=7703
tlpkg/tlgs/lib/ht_ccsto.ps
tlpkg/tlgs/lib/image-qa.ps
tlpkg/tlgs/lib/jispaper.ps
- tlpkg/tlgs/lib/jobseparator.ps
tlpkg/tlgs/lib/landscap.ps
tlpkg/tlgs/lib/lines.ps
tlpkg/tlgs/lib/mkcidfm.ps
@@ -311482,8 +311560,6 @@ binfiles arch=win32 size=7703
tlpkg/tlgs/lib/ps2ai.ps
tlpkg/tlgs/lib/ps2epsi.ps
tlpkg/tlgs/lib/rollconv.ps
- tlpkg/tlgs/lib/stcinfo.ps
- tlpkg/tlgs/lib/stcolor.ps
tlpkg/tlgs/lib/stocht.ps
tlpkg/tlgs/lib/traceimg.ps
tlpkg/tlgs/lib/traceop.ps
@@ -316609,7 +316685,7 @@ catalogue-version 1.0
name tuda-ci
category Package
-revision 61958
+revision 62948
shortdesc LaTeX templates of Technische Universitat Darmstadt
relocated 1
longdesc The TUDa-CI-Bundle provides a possibility to use the Corporate
@@ -316617,11 +316693,11 @@ longdesc Design of TU Darmstadt in LaTeX. It contains documentclasses as
longdesc well as some helper packages and config files together with
longdesc some templates for user documentation, which currently are only
longdesc available in German.
-containersize 43368
-containerchecksum 1000a43218d04637245126a88a344c2a811efe0689bb4bdd2b580b16ff7b1de7872aaea90cf3d655e4f1594fcd79f598859938dc02d77c812bfbe5fb96659f38
-doccontainersize 1141928
-doccontainerchecksum fefd5c55cd353b7a66f791f0a4949b8bcb18b3e96c8c3a570b45cae9539c2515c6d48cf776be518ecccce7cf74851933d314d187a39c6fc673a195f5c2542bbe
-docfiles size=1614
+containersize 43348
+containerchecksum e1ee9258b818446932895f87de80c556de6c2bdeb532a07b884f147ba2be9df80eaed0fc71e08a3894e69e2357327e1ba9acc5bf3d3d173f571e21974a83ebe7
+doccontainersize 1106516
+doccontainerchecksum a891317ed34e2481c2e0b40e38845db99352048f355a18d452c56d66ad61581507f85c4952732c32472e26470bc334c736829f8799eee8dcf1c2699a28a31bc6
+docfiles size=1477
RELOC/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaAnnouncement.tex
RELOC/doc/latex/tuda-ci/DEMO-TUDaBeamer.pdf details="Example presentation" language="de"
@@ -316630,7 +316706,6 @@ docfiles size=1614
RELOC/doc/latex/tuda-ci/DEMO-TUDaExercise.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaExercise.tex
RELOC/doc/latex/tuda-ci/DEMO-TUDaFromaddress.lco
- RELOC/doc/latex/tuda-ci/DEMO-TUDaLeaflet.pdf
RELOC/doc/latex/tuda-ci/DEMO-TUDaLeaflet.tex
RELOC/doc/latex/tuda-ci/DEMO-TUDaLetter.pdf details="Example letter" language="de"
RELOC/doc/latex/tuda-ci/DEMO-TUDaLetter.tex
@@ -316683,7 +316758,7 @@ catalogue-contact-repository https://github.com/tudace/tuda_latex_templates
catalogue-ctan /macros/latex/contrib/tuda-ci
catalogue-license lppl1.3c
catalogue-topics class doc-templ letter dissertation presentation poster std-conform
-catalogue-version 3.22
+catalogue-version 3.23
name tudscr
category Package
@@ -317187,6 +317262,37 @@ catalogue-license cc-by-sa-4 apache2
catalogue-topics font font-ttf font-symbol
catalogue-version 0.6.0
+name twemojis
+category Package
+revision 62930
+shortdesc Use Twitter's open source emojis through LaTeX commands
+relocated 1
+longdesc This package provides a simple wrapper which allows to use
+longdesc Twitter's open source emojis through LaTeX commands. This
+longdesc relies on images, so no fancy unicode-font stuff is needed and
+longdesc it should work on every installation.
+containersize 4425040
+containerchecksum d9204536ff2cf76cfb341bf8096ea71571663527dea945de901758032393f6e4f53c88f0d274e37da4cccf6b61149cb64f19a8712df80523c2f921354155b797
+doccontainersize 4751536
+doccontainerchecksum 3f2f3b13f898545a32aeccef972ed52c448f3547a6834c8cc1a5589e2ff8479b822591d20acdc41f1cfaab1e43469d75abfd0841baed7b1a1dcd4000b87d1045
+docfiles size=1594
+ RELOC/doc/latex/twemojis/README.md details="Readme"
+ RELOC/doc/latex/twemojis/twemojis.pdf details="Package documentation"
+srccontainersize 70504
+srccontainerchecksum e9c85a850603cfc49b5ab4f5c51a303dae326a3e44af547c5c9e77319422273c762facc885b76234e935c82b217e53945af524ec9e9431d834ad6645265f78bc
+srcfiles size=212
+ RELOC/source/latex/twemojis/twemojis.dtx
+ RELOC/source/latex/twemojis/twemojis.ins
+runfiles size=1782
+ RELOC/tex/latex/twemojis/all-twemojis.pdf
+ RELOC/tex/latex/twemojis/twemojis.sty
+catalogue-contact-bugs https://gitlab.com/rossel.jost/latex-twemojis/-/issues
+catalogue-contact-repository https://gitlab.com/rossel.jost/latex-twemojis
+catalogue-ctan /macros/latex/contrib/twemojis
+catalogue-license lppl1.3 cc-by-4
+catalogue-topics graphics text-symbol
+catalogue-version 1.3.1 (twemoji v14.0.1)
+
name twoinone
category Package
revision 17024
@@ -323536,7 +323642,7 @@ catalogue-topics font-ttf korean
name uni-titlepage
category Package
-revision 61729
+revision 62947
shortdesc Universal titlepages with configuration options and predefined styles
relocated 1
longdesc Creation of title pages is something most authors should not
@@ -323546,11 +323652,11 @@ longdesc the title instead of only one -- at least five are typical for
longdesc a thesis! --, it also provides a bunch of predefined titlepage
longdesc styles with several standard elements, and optionally
longdesc additional elements.
-containersize 10268
-containerchecksum 05d1f19babf218a56731938ff1cb066b0ae7a7e7683f0800d5d3b1d7bf3c77ffad71f59235df21697caab07a39f3a74568ce349cacd0e5ec890527f099e8165d
-doccontainersize 1594188
-doccontainerchecksum a49fb5c7890c6af860c971c88dec82dc2b42c8fb5708f5cb5b438a309308471ce98c0cf0980a696431626a3543176b9bbe9f0b220f989d6f9c966c1b2cab0b06
-docfiles size=477
+containersize 10520
+containerchecksum c8326428138f4b2e73e0247644fe7a7b03bad475a883800eaca5dfea2b67bad9de85babdd773bd08da32fd8024d3a101a32175b37fb6f801b1d03f05651056a7
+doccontainersize 1828932
+doccontainerchecksum 85fcf2e92577b942a9c6a0b5204799c530aa5b011df138b8d632351c26be3537b174731077e5e4a7a6a57a5e4ad3c4bb4bee8c3033b3cd6545e22c2264303667
+docfiles size=546
RELOC/doc/latex/uni-titlepage/LICENSE.md
RELOC/doc/latex/uni-titlepage/README.md details="Readme"
RELOC/doc/latex/uni-titlepage/titlepage-DHBW.pdf details="Example of use (style DHBW)"
@@ -323580,9 +323686,9 @@ docfiles size=477
RELOC/doc/latex/uni-titlepage/titlepage-WWUM.pdf details="Example of use (style WWUM)"
RELOC/doc/latex/uni-titlepage/titlepage-WWUM.tex
RELOC/doc/latex/uni-titlepage/uni-titlepage.pdf details="Package documentation"
-srccontainersize 23668
-srccontainerchecksum d4f7bf60fe393135ec846258c43b6427cabb00bd50321dd2592a40f83080196ca13ef5a64a1c16f5beed8ef826d83b81e269feaf772b40ec0bd002e7107a7f14
-srcfiles size=33
+srccontainersize 24188
+srccontainerchecksum 0afd0096ae5b1c77648c14ed30c3752205fc88ae5faf8a4bb43c326462865479e0d8b175ebf91007dc0095232d95db45eca95ad75f28a59030806e879ef8eed3
+srcfiles size=34
RELOC/source/latex/uni-titlepage/uni-titlepage.drv
RELOC/source/latex/uni-titlepage/uni-titlepage.dtx
runfiles size=29
@@ -323608,7 +323714,7 @@ catalogue-contact-repository https://github.com/komascript/uni-titlepage.git
catalogue-ctan /macros/latex/contrib/uni-titlepage
catalogue-license lppl1.3c
catalogue-topics titlepage
-catalogue-version 0.7b
+catalogue-version 1.0
name uni-wtal-ger
category Package
@@ -348702,7 +348808,7 @@ catalogue-version 1.0
name zref
category Package
-revision 56611
+revision 62956
shortdesc A new reference scheme for LaTeX
relocated 1
longdesc This package offers a means to remove the limitation, of only
@@ -348727,16 +348833,19 @@ longdesc zref-savepos, make positions on a page available; zref-dotfill,
longdesc controlled dot-filling; zref-env, record the latest
longdesc environment's name and the line it started on; and zref-xr,
longdesc provide the facilities of the xr and xr-hyper packages.
-containersize 14364
-containerchecksum f64604e9308278b34347bcbcaed39b500371c575082311c1fb28bf6bd7db26fc2d2e3d3e8843e3a195fd22050450bffb18c3e8b64a54f0787c1122ac3901ad2f
-doccontainersize 651440
-doccontainerchecksum 928c54696572694b1fc7712a0f8357851c18d83bf723c6f03a9f784dfbd123b2c886593bc95de0d3b7f8109e1d0b3a52cc6ef1a877c0506130e7c5d96b046a67
-docfiles size=166
+containersize 14472
+containerchecksum 39fe62e03fe5f1e78a71bf88f753f5f8ebf49998fe3e0200b06b94b14ae58ff29f6c0a41dd5d02ab3468f1612070a91c9d006b93a1257cefd6d5cbb329f74ef1
+doccontainersize 667608
+doccontainerchecksum a13b2c896ec08c6fe73bff69508c9c674f6345db20557ce2a248c7e880ff5a535fe6b8e3ca2e4c47410aff700188034dc6b6853b34e90d8ebce22b045064ad8d
+docfiles size=176
RELOC/doc/latex/zref/README.md details="Readme"
+ RELOC/doc/latex/zref/zref-example-lastpage.tex
+ RELOC/doc/latex/zref/zref-example-nextpage.tex
+ RELOC/doc/latex/zref/zref-example.tex
RELOC/doc/latex/zref/zref.pdf details="Package documentation"
-srccontainersize 36852
-srccontainerchecksum 82e6c4210453e9f7adfd93673aa2e7dfbf2c39e938b9ad0d2309ea59b53259d1d1d9b05924f2f6f9f64ba29ecdbda8e074527923fdfd1551a42b1057450b2fc5
-srcfiles size=48
+srccontainersize 37200
+srccontainerchecksum 1d552e315cacb11f55f7c609fa5646b80647dc1893f6760e87bc4d6da97796c563735723137d16d7d1da30389276effa92e55d46ac0ed5be7445717a837f993f
+srcfiles size=49
RELOC/source/latex/zref/zref.dtx
runfiles size=37
RELOC/tex/latex/zref/zref-abspage.sty
@@ -348765,7 +348874,7 @@ catalogue-contact-repository https://github.com/ho-tex/zref
catalogue-ctan /macros/latex/contrib/zref
catalogue-license lppl1.3c
catalogue-topics label-ref
-catalogue-version 2.32
+catalogue-version 2.33
name zref-check
category Package
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index fa7d42ffb3..7fa0804889 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-c31d9afdf9d6ffbb39b02e237961c744 texlive.tlpdb
+72faa164b3a3d7afd2d53c15454d0a75 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 6ec1269fdc..57a0129484 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-94b827ec4db4995ddf59f6383fdd7a9c02f14a4357c0dd30926a62ca2462ac3777c6612b2c794fef37c7a816ef6581a4a6a63f8ec82cc78c0c6c23a08f754a68 texlive.tlpdb
+67dac95bee495a4f5eb83ea9d9cf91f51e96d680d04caec74512d44a9b7cafabc3ecd0902cb9b57d1845b443723f2382ff5c5efcb1500ef2071941266d6e2d7c texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 530cd811cd..cdcfabda21 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-----
-iQEcBAEBCgAGBQJiS4WxAAoJEEzhh34ZQ4xwQroH/1n+37NEl9t74dgTYw3OmUHt
-M5p02FvIO2ZKXTGMBEjV/+MbKAQrcwFBhnb5563t+stFQ5rVYMzYCwo9gA+H6C3a
-BMRDyb2fKrcVN5/oC6yb4vnmAbmQTVKf1epWitYWEOdhSex/qz+rpsjG1FPs4q8v
-lrGbeHeSahUEhymr2RQwpyVnP4U3+px4/eu367EVkLMfaryHJrtTsIsOvw0oSc/m
-ipXaRpKDlmcSqxZuZg1X0h2MDT60nGTiVJ0jo4kueVaa+PHM/IEa3OQmRLOWy0n5
-od/j65A+gYxd4SJ5tcJi8nelDY6J/L3Vg4H1eOgsYXoCLiCHE1db+BnXnaaKh0s=
-=zRhn
+iQEcBAEBCgAGBQJiTNatAAoJEEzhh34ZQ4xwbWkH/ROHzvp44ZDDd3unzs13ewiH
+YcIKZZc1jm8b49iexZFwIkq2+cVedth2D6+rKp4vgmbEuDvStYpNxcyjHPHKW6QO
+L2h+GNC+L58QiIBDfxbafx77KzV6oP2l0EGv+ddnMnJuWpfJxsx6q8yyUMS60d6a
+lxofIMHW/+wAoBofB77YNdE3nZB12xDKCXoilXDBo4kYrQsygS5bBQkyxhCU+6mV
+QrkU0YdyujoBPu53UE0Qr98q++zcxuQ9SGIh4iawwHo4yeUwSKclHQ7tG674Nu8/
+AiB+/bToVKEh08uETCJDJCmPgFVGvxm8hS8VoYPdmpS0p8t/N1xXk29m9497GJY=
+=+Zb5
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 765e328327..3fed4c26d5 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/texlive/tlnet/tlpkg/translations/nl.po b/systems/texlive/tlnet/tlpkg/translations/nl.po
index 04aba97f9d..f85c0741d5 100644
--- a/systems/texlive/tlnet/tlpkg/translations/nl.po
+++ b/systems/texlive/tlnet/tlpkg/translations/nl.po
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
"POT-Creation-Date: 2022-03-19 01:49+0100\n"
-"PO-Revision-Date: 2021-03-08 12:17+0100\n"
+"PO-Revision-Date: 2022-03-19 19:34+0100\n"
"Last-Translator: Siep Kroonenberg <siepo@bitmuis.nl>\n"
"Language-Team: TL Translation Team <tex-live@tug.org>\n"
"Language: nl\n"
diff --git a/systems/texlive/tlnet/tlpkg/translations/ru.po b/systems/texlive/tlnet/tlpkg/translations/ru.po
index 5aadaab115..bce4076b0f 100644
--- a/systems/texlive/tlnet/tlpkg/translations/ru.po
+++ b/systems/texlive/tlnet/tlpkg/translations/ru.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: TeX Live translation\n"
"Report-Msgid-Bugs-To: tex-live@tug.org\n"
"POT-Creation-Date: 2022-03-19 01:49+0100\n"
-"PO-Revision-Date: 2021-03-08 12:43+0800\n"
+"PO-Revision-Date: 2022-03-23 09:50+0800\n"
"Last-Translator: Vladimir Lomov <irk.translator@yandex.ru>\n"
"Language-Team: Russian <tldoc@tug.org>\n"
"Language: ru\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 2.4.1\n"
+"X-Generator: Poedit 3.0.1\n"
#: texmf-dist/scripts/texlive/tlmgrgui.pl:137
#: tlpkg/installer/install-menu-text.pl:37
@@ -332,7 +332,7 @@ msgstr "Платформы ..."
#: texmf-dist/scripts/texlive/tlmgrgui.pl:553
msgid "GUI language ..."
-msgstr ""
+msgstr "Язык ..."
#: texmf-dist/scripts/texlive/tlmgrgui.pl:557
#: texmf-dist/scripts/texlive/tlmgrgui.pl:1458
@@ -1022,11 +1022,11 @@ msgstr "Корневой каталог установки"
#: tlpkg/installer/install-tl-gui.tcl:598
msgid "Prefix"
-msgstr ""
+msgstr "Префикс"
#: tlpkg/installer/install-tl-gui.tcl:608
msgid "Prefix must exist"
-msgstr ""
+msgstr "Префикс должен существовать"
#: tlpkg/installer/install-tl-gui.tcl:616
msgid "Localized directory names will be replaced by their real names"
@@ -1088,7 +1088,7 @@ msgstr "Документация в Info"
#: tlpkg/installer/install-tl-gui.tcl:1315
msgid "Not enough room"
-msgstr ""
+msgstr "Не достаточно места"
#: tlpkg/installer/install-tl-gui.tcl:1356
#: texmf-dist/scripts/tlshell/tlshell.tcl:2736
@@ -1181,7 +1181,7 @@ msgstr "Требуется места на диске (в МБ):"
#: tlpkg/installer/install-tl-gui.tcl:1600
msgid "Disk space available (in MB):"
-msgstr ""
+msgstr "Доступно (в МБ):"
#: tlpkg/installer/install-tl-gui.tcl:1630
msgid "Default paper size"
@@ -1475,7 +1475,7 @@ msgid ""
"\n"
"%s"
msgstr ""
-"Будут установлены зависимости\n"
+"Установить зависимости\n"
"\n"
"%s"
@@ -1491,7 +1491,7 @@ msgid ""
"\n"
"%s?"
msgstr ""
-"Будем обновлять зависимости\n"
+"Обновлять зависимости\n"
"\n"
"%s?"
@@ -1517,7 +1517,7 @@ msgid ""
"\n"
"%s?"
msgstr ""
-"Будем удалять зависимости\n"
+"Удалить зависимости\n"
"\n"
"%s?"
@@ -1545,6 +1545,11 @@ msgid ""
"does not cover user mode or backup and restore.\n"
"Consult the 'Tlmgr Help' menu for full documentation on tlmgr itself."
msgstr ""
+"Эта оболочка диспетчера TeX Live должна быть интуитивно понятной.\n"
+"Однако, она не предоставляет всех возможностей tlmgr. В частности, нет "
+"пользовательского режима или создание архива и восстановления.\n"
+"Посмотрите пункт меню «Справка по Tlmgr» чтобы посмтреть всю документацию по "
+"tlmgr."
#: texmf-dist/scripts/tlshell/tlshell.tcl:2329
#, tcl-format
@@ -1594,19 +1599,19 @@ msgstr "Пересоздание файлов fontmap..."
#: texmf-dist/scripts/tlshell/tlshell.tcl:2720
msgid "Add/replace 64-bit binaries"
-msgstr ""
+msgstr "Добавить/заменить 64-битные программы"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2723
msgid "Add/replace from local file"
-msgstr ""
+msgstr "Добавить/заменить из локального файла"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2727
msgid "Resynchronize with 32-bit"
-msgstr ""
+msgstr "Синхронизировать с 32-битной"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2731
msgid "Remove 64-bit binaries"
-msgstr ""
+msgstr "Удалить 64-битные программы"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2750
msgid "GUI font scaling"
@@ -1614,11 +1619,11 @@ msgstr "Шрифт"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2776
msgid "TLShell Help"
-msgstr ""
+msgstr "Справка по TLShell"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2777
msgid "Tlmgr Help"
-msgstr ""
+msgstr "Справка по Tlmgr"
#: texmf-dist/scripts/tlshell/tlshell.tcl:2796
msgid "Restart self"
@@ -1744,7 +1749,7 @@ msgstr ""
#: texmf-dist/scripts/tlshell/tlshell.tcl:3099
msgid "See internal help"
-msgstr ""
+msgstr "Посмотреть встроенную справку"
#: /home/texlive/karl/Master/tlpkg/translations/shortdesc.pl:1
msgid "basic scheme (plain and latex)"
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index 2184f527b2..c64c3e64b0 100644
--- a/systems/win32/miktex/tm/packages/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/files.csv.lzma b/systems/win32/miktex/tm/packages/next/files.csv.lzma
index b4c987cfe4..69cd6d24a6 100644
--- a/systems/win32/miktex/tm/packages/next/files.csv.lzma
+++ b/systems/win32/miktex/tm/packages/next/files.csv.lzma
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/next/pr.ini b/systems/win32/miktex/tm/packages/next/pr.ini
index 180fb505e5..e2e2c9e642 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=1649103536
+date=1649190008
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=9892fe67adbe0da774abc8e9850f062b
-numpkg=5509
+lstdigest=f6238ff50d6a20b51a8b27685ab6f6eb
+numpkg=5528
relstate=next
-version=8129
+version=8130
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: DMJhRK7RxJpWD70hmjW3UVMBtS+NmKr4SNi5qb58ci7ew6VflquPxT3oFaHKjBVEMecYN5+jU9YwakYQ3vsGxiaz7cD2MWUYCzXoUCYtjWeLk5vFwII3gSrdG8ZTxmszFwqoPwcRGAcmyukxXrTMjI13HItfuWDzrQMaSPw+6mwS5TkgZFVY3BU831dHj0AfGFiIbBdAuDfC1C1IAIKQMagfhXNJGJW7Tss+hJItln/tG1oiTiicYANtqX6/QT664y5df6aInwodKYMF2oV9L35scEbsufYXwzAKqda4ee3pkFMXpJBVH/l/CKREDYCPi3Ez7570PECWZmFNmFNkcQ==
+;;;; signature/miktex: DOqVoonIaadXqv3cugBkx/04cs1ispLzkr7js6WvZ1uJU8I8mmAeix2UhjFXFQaGmgsy33pUONDP4XF60ZW1b4KRz+Pef7gjW0d1RYb7YRUS6TptKYERKZ+nGxbYlPvGUbhZ+LsDZTVpumILPuKtOWArhgOpTeGytPLPZAMWO1vnR8uRfpxPIWDtyAeA6ldVn8m1EqbTLaqhGBzqui/uyhyrXfdMy55CajmteW9areNfOYIDnMvI/yhcHmwvWxEEC67KswKP/72x1CeuRVpIqNPhUgUqFtMB8zlgzeC28dL0EywYvUpblXBG8zG4YCCDNXCax/1NJQHxzdo/HaDvqA==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 0ff25dad8c..17b86e25d8 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1649103121
-lastupd=adjmulticol adjmulticol__doc adjmulticol__source beamertheme-trigon beamertheme-trigon__doc beamertheme-trigon__source beaulivre beaulivre__doc beaulivre__source bfh-ci bfh-ci__doc biblatex-iso690 biblatex-iso690__doc biblatex-lncs biblatex-lncs__doc bxjscls bxjscls__doc bxjscls__source caption caption__doc
-lstdigest=a0ee3406eba42a01fe46caf5efc80925
-numpkg=5509
+date=1649189514
+lastupd=acro acro__doc acro__source annotate-equations annotate-equations__doc annotate-equations__source babel-italian babel-italian__doc babel-italian__source beaulivre beaulivre__doc beaulivre__source biblatex-gb7714-2015 biblatex-gb7714-2015__doc biblatex-gb7714-2015__source colorist colorist__doc colorist__source commonunicode commonunicode__doc
+lstdigest=d3b6f8c8c77d5fd4cc2a0f0079c476aa
+numpkg=5528
relstate=stable
-version=8129
+version=8130
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: NPrzVQ93pgYMYvZh7+8JEbJxGbFgr5bSkQNC4IoHVN9eYSyg4JvR8jIE+qibjct3/1mkrnmhNW6XLRGxUlN2WeDlJryIvbCu0llGMzjtGqiNRIi2CjmpgSO0piP/rJEaLkxjOUOLMl7TjzoXX+FtSQiVNrTdLeez4lk+bqNF7seqLDMqkGgmhNQeX1CN/fJMyGWuBvAgpAALSyxxOOwb59JKRQd+SdEBbo7XgmPcLsVBHuIjZBc8YMnS39Sgu+SSVZm5bLcKc0292RrgWPyycX5vxOtV3k0AKZ7UIQMg66SoNiFkLSIIItw5y0wHEMEzW3wkCUmLlIIQMEd3ULIjVQ==
+;;;; signature/miktex: ssLaynAcfhmNfH/+7qzEnJyyZlojEsWig3syMdWc335Tseg+2NrQ0QXa+097rovOGH4yKeqKhbjXXQmNjg/zm9PpRhXeMQZCGzo+4oJz4S/kY1dfuTQXbmVjQ+5G5hhfZVnje59/U6LOtLiLczCQwcRg0AA9D+Tmptagz6I4CI0BBK97r5d/0ywssY1/Z6tQUP3m7Z0VCiqwAfHkQB22pec6jUtQBs/QzQ+d+L3fEAlevNu+YXUljYIm4crCm5pXNlLRWZGi+1kbF2/XofpZXczL0h45rRUniQi/eTCgUp55EkWF+HDLO/UDTtqvd3bCwXgeyZVIbbZvnxgWObThvw==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index c136abd36c..3efbbb9829 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2022-04-05-02-02
+2022-04-06-02-02