summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-11-22 03:03:38 +0000
committerNorbert Preining <norbert@preining.info>2021-11-22 03:03:38 +0000
commit3b45580e298046d6c1cb0431da31bea04bc6613a (patch)
treeee2b508b3e9ce370c5134f941650c4316ce9ec8c
parent25fba613796cd9c1b2042e28152d451d8cddef4a (diff)
CTAN sync 202111220303
-rw-r--r--FILES.byname807
-rw-r--r--FILES.byname.gzbin2397602 -> 2397881 bytes
-rw-r--r--FILES.last07days634
-rw-r--r--indexing/upmendex/README.md24
-rw-r--r--indexing/upmendex/doc/samples/Makefile4
-rw-r--r--indexing/upmendex/doc/samples/alphabet/alpha_es.idx2
-rw-r--r--indexing/upmendex/doc/samples/mdxsty01.ist2
-rw-r--r--indexing/upmendex/doc/samples/mdxsty02.ist2
-rw-r--r--indexing/upmendex/doc/samples/mdxsty03.ist33
-rw-r--r--indexing/upmendex/doc/samples/multi.idx11
-rw-r--r--indexing/upmendex/doc/samples/option/mdxsty_j02.ist6
-rw-r--r--indexing/upmendex/doc/upmendex.ja.txt64
-rw-r--r--indexing/upmendex/man/upmendex.199
-rw-r--r--indexing/upmendex/man/upmendex.man1.pdfbin252502 -> 253880 bytes
-rw-r--r--indexing/upmendex/source/ChangeLog107
-rw-r--r--indexing/upmendex/source/Makefile.am3
-rw-r--r--indexing/upmendex/source/Makefile.in3
-rw-r--r--indexing/upmendex/source/aclocal.m410
-rwxr-xr-xindexing/upmendex/source/configure22
-rw-r--r--indexing/upmendex/source/configure.ac6
-rw-r--r--indexing/upmendex/source/convert.c93
-rw-r--r--indexing/upmendex/source/exkana.h12
-rw-r--r--indexing/upmendex/source/exvar.h5
-rw-r--r--indexing/upmendex/source/fread.c81
-rw-r--r--indexing/upmendex/source/fwrite.c199
-rw-r--r--indexing/upmendex/source/kana.h50
-rw-r--r--indexing/upmendex/source/ktable.h98
-rw-r--r--indexing/upmendex/source/mendex.h13
-rw-r--r--indexing/upmendex/source/sort.c356
-rw-r--r--indexing/upmendex/source/styfile.c142
-rw-r--r--indexing/upmendex/source/tests/attr1.ind40
-rw-r--r--indexing/upmendex/source/tests/attr1.ist2
-rw-r--r--indexing/upmendex/source/tests/locale1.ind48
-rw-r--r--indexing/upmendex/source/tests/locale1.ist1
-rw-r--r--indexing/upmendex/source/tests/locale2-rule.ind44
-rw-r--r--indexing/upmendex/source/tests/locale2.ist1
-rw-r--r--indexing/upmendex/source/tests/pprec3.ist11
-rw-r--r--indexing/upmendex/source/tests/pprec4.ist11
-rw-r--r--indexing/upmendex/source/tests/pprecB-0.ind5
-rw-r--r--indexing/upmendex/source/tests/pprecB-3.ind5
-rw-r--r--indexing/upmendex/source/tests/pprecB-4.ind5
-rw-r--r--indexing/upmendex/source/tests/pprecB.idx9
-rw-r--r--indexing/upmendex/source/tests/range.idx126
-rw-r--r--indexing/upmendex/source/tests/range1.ind25
-rw-r--r--indexing/upmendex/source/tests/range1.ist3
-rw-r--r--indexing/upmendex/source/tests/range2.ind26
-rw-r--r--indexing/upmendex/source/tests/range2.ist4
-rw-r--r--indexing/upmendex/source/tests/range3.ind25
-rw-r--r--indexing/upmendex/source/tests/range3.ist4
-rw-r--r--indexing/upmendex/source/tests/rangetwo.idx2
-rw-r--r--indexing/upmendex/source/tests/rangetwo.ind5
-rw-r--r--indexing/upmendex/source/tests/rangetwo.ist2
-rw-r--r--indexing/upmendex/source/tests/rule.idx20
-rw-r--r--indexing/upmendex/source/tests/rule.ind40
-rw-r--r--indexing/upmendex/source/tests/rule1.ist3
-rw-r--r--indexing/upmendex/source/tests/rule2.ist3
-rw-r--r--indexing/upmendex/source/tests/rule3.ist4
-rw-r--r--indexing/upmendex/source/tests/rule4.ist4
-rwxr-xr-xindexing/upmendex/source/tests/upmendex.test74
-rw-r--r--indexing/upmendex/source/var.h7
-rw-r--r--macros/generic/expkv-cs/README.md2
-rw-r--r--macros/generic/expkv-cs/expkv-cs.dtx152
-rw-r--r--macros/generic/expkv-cs/expkv-cs.pdfbin460837 -> 458679 bytes
-rw-r--r--macros/latex/contrib/apa7/README.txt7
-rw-r--r--macros/latex/contrib/apa7/apa7.dtx38
-rw-r--r--macros/latex/contrib/apa7/apa7.ins3
-rw-r--r--macros/latex/contrib/apa7/apa7.pdfbin531855 -> 555774 bytes
-rw-r--r--macros/latex/contrib/apa7/samples/longsample.pdfbin196590 -> 204050 bytes
-rw-r--r--macros/latex/contrib/apa7/samples/shortsample.pdfbin65349 -> 69708 bytes
-rw-r--r--macros/latex/contrib/graphics-def/README.md2
-rw-r--r--macros/latex/contrib/graphics-def/dvisvgm.def6
-rw-r--r--macros/latex/contrib/xassoccnt/README10
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt.sty24
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdfbin11903 -> 11902 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdfbin14012 -> 14013 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdfbin94248 -> 94302 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_doc.pdfbin542720 -> 544244 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_doc.tex35
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdfbin79453 -> 79543 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex10
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_example.pdfbin68361 -> 68361 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdfbin46906 -> 46978 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdfbin42917 -> 42981 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdfbin31635 -> 31639 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdfbin64628 -> 64738 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdfbin35598 -> 35642 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdfbin60534 -> 60545 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex6
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdfbin65140 -> 65241 bytes
-rw-r--r--macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex6
-rw-r--r--macros/luatex/latex/ekdosis/README.md8
-rw-r--r--macros/luatex/latex/ekdosis/ekdosis.dtx418
-rw-r--r--macros/luatex/latex/ekdosis/ekdosis.el15
-rw-r--r--macros/luatex/latex/ekdosis/ekdosis.pdfbin930575 -> 949399 bytes
-rw-r--r--macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdfbin18006 -> 18006 bytes
-rw-r--r--support/TeX4ht/source/ChangeLog5
-rw-r--r--support/TeX4ht/source/tex4ht-mathjax.tex26
-rw-r--r--systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl1
-rw-r--r--systems/texlive/tlnet/tlpkg/texlive.tlpdb111
-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.xzbin2322864 -> 2322632 bytes
-rw-r--r--systems/win32/miktex/tm/packages/files.csv.lzmabin628470 -> 627451 bytes
-rw-r--r--systems/win32/miktex/tm/packages/next/files.csv.lzmabin628656 -> 627596 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
117 files changed, 2951 insertions, 1477 deletions
diff --git a/FILES.byname b/FILES.byname
index 5cef57a9af..b89527c249 100644
--- a/FILES.byname
+++ b/FILES.byname
@@ -5105,7 +5105,7 @@
1990/10/02 | 5440 | dviware/vutex/vaxvms.hlp
1990/10/02 | 812 | dviware/vutex/vaxvms.ins
1990/10/02 | 127576 | dviware/vutex/vutex.web
-2021/11/20 | 71044 | FILES.last07days
+2021/11/21 | 64156 | 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
@@ -158945,99 +158945,121 @@
2006/07/18 | 22933 | indexing/texindex/texindex.pdf
1991/07/08 | 1930 | indexing/texindex/texindex.tex
2006/07/18 | 21351 | indexing/texindex.zip
-2021/08/13 | 1464 | indexing/upmendex/COPYRIGHT
-2021/08/13 | 1992 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx
-2021/08/13 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx
-2021/08/13 | 1891 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx
-2021/08/13 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx
-2021/08/13 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx
-2021/08/13 | 2144 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx
-2021/08/13 | 1379 | indexing/upmendex/doc/samples/alphabet/Makefile
-2021/08/13 | 65 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist
-2021/08/13 | 60 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist
-2021/08/13 | 43 | indexing/upmendex/doc/samples/alphabet/mdxsty_es.ist
-2021/08/13 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head1.ist
-2021/08/13 | 261 | indexing/upmendex/doc/samples/alphabet/mdxsty_head2.ist
-2021/08/13 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head3.ist
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
-2021/08/13 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
-2021/08/13 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh21.ist
-2021/08/13 | 521 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist
-2021/08/13 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist
-2021/08/13 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist
-2021/08/13 | 435 | indexing/upmendex/doc/samples/french.idx
-2021/08/13 | 463 | indexing/upmendex/doc/samples/german.idx
-2021/08/13 | 340 | indexing/upmendex/doc/samples/greek.idx
-2021/08/13 | 1477 | indexing/upmendex/doc/samples/korean.idx
-2021/08/13 | 371 | indexing/upmendex/doc/samples/Makefile
-2021/08/13 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist
-2021/08/13 | 291 | indexing/upmendex/doc/samples/mdxsty01.ist
-2021/08/13 | 839 | indexing/upmendex/doc/samples/mdxsty02.ist
-2021/08/13 | 462 | indexing/upmendex/doc/samples/multi.idx
-2021/08/13 | 1240 | indexing/upmendex/doc/samples/option/attri1.idx
-2021/08/13 | 872 | indexing/upmendex/doc/samples/option/japanese.idx
-2021/08/13 | 749 | indexing/upmendex/doc/samples/option/Makefile
-2021/08/13 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist
-2021/08/13 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist
-2021/08/13 | 285 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist
-2021/08/13 | 334 | indexing/upmendex/doc/samples/option/mdxsty_rule0.ist
-2021/08/13 | 614 | indexing/upmendex/doc/samples/russian.idx
-2021/08/13 | 17810 | indexing/upmendex/doc/upmendex.ja.txt
-2021/08/13 | 17756 | indexing/upmendex/man/upmendex.1
-2021/08/13 | 252502 | indexing/upmendex/man/upmendex.man1.pdf
-2021/08/13 | 4016 | indexing/upmendex/README.md
-2021/08/13 | 44238 | indexing/upmendex/source/aclocal.m4
-2021/08/13 | 337 | indexing/upmendex/source/ac/withenable.ac
-2021/08/13 | 4922 | indexing/upmendex/source/c-auto.in
-2021/08/13 | 7394 | indexing/upmendex/source/ChangeLog
-2021/08/13 | 714562 | indexing/upmendex/source/configure
-2021/08/13 | 2311 | indexing/upmendex/source/configure.ac
-2021/08/13 | 9497 | indexing/upmendex/source/convert.c
-2021/08/13 | 412 | indexing/upmendex/source/exhanzi.h
-2021/08/13 | 868 | indexing/upmendex/source/exkana.h
-2021/08/13 | 1351 | indexing/upmendex/source/exvar.h
-2021/08/13 | 13316 | indexing/upmendex/source/fread.c
-2021/08/13 | 30688 | indexing/upmendex/source/fwrite.c
-2021/08/13 | 19515 | indexing/upmendex/source/hanzi.h
-2021/08/13 | 333 | indexing/upmendex/source/indexsty
-2021/08/13 | 6757 | indexing/upmendex/source/kana.h
-2021/08/13 | 1190 | indexing/upmendex/source/kp.c
-2021/08/13 | 406 | indexing/upmendex/source/kp.h
-2021/08/13 | 1842 | indexing/upmendex/source/ktable.h
-2021/08/13 | 7869 | indexing/upmendex/source/main.c
-2021/08/13 | 1326 | indexing/upmendex/source/Makefile.am
-2021/08/13 | 46897 | indexing/upmendex/source/Makefile.in
-2021/08/13 | 2441 | indexing/upmendex/source/mendex.h
-2021/08/13 | 1054 | indexing/upmendex/source/pageread.c
-2021/08/13 | 5842 | indexing/upmendex/source/qsort.c
-2021/08/13 | 400 | indexing/upmendex/source/qsort.h
-2021/08/13 | 14125 | indexing/upmendex/source/sort.c
-2021/08/13 | 10984 | indexing/upmendex/source/styfile.c
-2021/08/13 | 68 | indexing/upmendex/source/tests/foo.idx
-2021/08/13 | 58 | indexing/upmendex/source/tests/foo.ind
-2021/08/13 | 182 | indexing/upmendex/source/tests/pprec0.ist
-2021/08/13 | 179 | indexing/upmendex/source/tests/pprec1.ist
-2021/08/13 | 179 | indexing/upmendex/source/tests/pprec2.ist
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-0.ind
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-1.ind
-2021/08/13 | 96 | indexing/upmendex/source/tests/pprecA-2.ind
-2021/08/13 | 213 | indexing/upmendex/source/tests/pprecA.idx
-2021/08/13 | 46 | indexing/upmendex/source/tests/rangetwo.idx
-2021/08/13 | 61 | indexing/upmendex/source/tests/rangetwo.ind
-2021/08/13 | 23 | indexing/upmendex/source/tests/rangetwo.ist
-2021/08/13 | 158 | indexing/upmendex/source/tests/uni1.ist
-2021/08/13 | 139 | indexing/upmendex/source/tests/uni2.ist
-2021/08/13 | 64 | indexing/upmendex/source/tests/uni.dict
-2021/08/13 | 435 | indexing/upmendex/source/tests/uni.idx
-2021/08/13 | 766 | indexing/upmendex/source/tests/uni.ind
-2021/08/13 | 272 | indexing/upmendex/source/tests/uni.ist
-2021/08/13 | 1753 | indexing/upmendex/source/tests/upmendex.test
-2021/08/13 | 2198 | indexing/upmendex/source/var.h
-2021/08/13 | 98 | indexing/upmendex/source/version.h
-2021/08/13 | 459671 | indexing/upmendex.zip
+2021/11/21 | 1464 | indexing/upmendex/COPYRIGHT
+2021/11/21 | 2034 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx
+2021/11/21 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx
+2021/11/21 | 1891 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx
+2021/11/21 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx
+2021/11/21 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx
+2021/11/21 | 2144 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx
+2021/11/21 | 1379 | indexing/upmendex/doc/samples/alphabet/Makefile
+2021/11/21 | 65 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist
+2021/11/21 | 60 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist
+2021/11/21 | 43 | indexing/upmendex/doc/samples/alphabet/mdxsty_es.ist
+2021/11/21 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head1.ist
+2021/11/21 | 261 | indexing/upmendex/doc/samples/alphabet/mdxsty_head2.ist
+2021/11/21 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head3.ist
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
+2021/11/21 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh21.ist
+2021/11/21 | 521 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist
+2021/11/21 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist
+2021/11/21 | 435 | indexing/upmendex/doc/samples/french.idx
+2021/11/21 | 463 | indexing/upmendex/doc/samples/german.idx
+2021/11/21 | 340 | indexing/upmendex/doc/samples/greek.idx
+2021/11/21 | 1477 | indexing/upmendex/doc/samples/korean.idx
+2021/11/21 | 393 | indexing/upmendex/doc/samples/Makefile
+2021/11/21 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist
+2021/11/21 | 293 | indexing/upmendex/doc/samples/mdxsty01.ist
+2021/11/21 | 841 | indexing/upmendex/doc/samples/mdxsty02.ist
+2021/11/21 | 1231 | indexing/upmendex/doc/samples/mdxsty03.ist
+2021/11/21 | 647 | indexing/upmendex/doc/samples/multi.idx
+2021/11/21 | 1240 | indexing/upmendex/doc/samples/option/attri1.idx
+2021/11/21 | 872 | indexing/upmendex/doc/samples/option/japanese.idx
+2021/11/21 | 749 | indexing/upmendex/doc/samples/option/Makefile
+2021/11/21 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist
+2021/11/21 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist
+2021/11/21 | 286 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist
+2021/11/21 | 334 | indexing/upmendex/doc/samples/option/mdxsty_rule0.ist
+2021/11/21 | 614 | indexing/upmendex/doc/samples/russian.idx
+2021/11/21 | 19351 | indexing/upmendex/doc/upmendex.ja.txt
+2021/11/21 | 19390 | indexing/upmendex/man/upmendex.1
+2021/11/21 | 253880 | indexing/upmendex/man/upmendex.man1.pdf
+2021/11/21 | 4452 | indexing/upmendex/README.md
+2021/11/21 | 44397 | indexing/upmendex/source/aclocal.m4
+2021/11/21 | 337 | indexing/upmendex/source/ac/withenable.ac
+2021/11/21 | 4922 | indexing/upmendex/source/c-auto.in
+2021/11/21 | 10783 | indexing/upmendex/source/ChangeLog
+2021/11/21 | 714562 | indexing/upmendex/source/configure
+2021/11/21 | 2359 | indexing/upmendex/source/configure.ac
+2021/11/21 | 9227 | indexing/upmendex/source/convert.c
+2021/11/21 | 412 | indexing/upmendex/source/exhanzi.h
+2021/11/21 | 1349 | indexing/upmendex/source/exkana.h
+2021/11/21 | 1435 | indexing/upmendex/source/exvar.h
+2021/11/21 | 14790 | indexing/upmendex/source/fread.c
+2021/11/21 | 33080 | indexing/upmendex/source/fwrite.c
+2021/11/21 | 19515 | indexing/upmendex/source/hanzi.h
+2021/11/21 | 333 | indexing/upmendex/source/indexsty
+2021/11/21 | 5834 | indexing/upmendex/source/kana.h
+2021/11/21 | 1190 | indexing/upmendex/source/kp.c
+2021/11/21 | 406 | indexing/upmendex/source/kp.h
+2021/11/21 | 7869 | indexing/upmendex/source/main.c
+2021/11/21 | 1362 | indexing/upmendex/source/Makefile.am
+2021/11/21 | 46885 | indexing/upmendex/source/Makefile.in
+2021/11/21 | 2652 | indexing/upmendex/source/mendex.h
+2021/11/21 | 1054 | indexing/upmendex/source/pageread.c
+2021/11/21 | 5842 | indexing/upmendex/source/qsort.c
+2021/11/21 | 400 | indexing/upmendex/source/qsort.h
+2021/11/21 | 21189 | indexing/upmendex/source/sort.c
+2021/11/21 | 13105 | indexing/upmendex/source/styfile.c
+2021/11/21 | 1200 | indexing/upmendex/source/tests/attr1.ind
+2021/11/21 | 64 | indexing/upmendex/source/tests/attr1.ist
+2021/11/21 | 68 | indexing/upmendex/source/tests/foo.idx
+2021/11/21 | 58 | indexing/upmendex/source/tests/foo.ind
+2021/11/21 | 1348 | indexing/upmendex/source/tests/locale1.ind
+2021/11/21 | 16 | indexing/upmendex/source/tests/locale1.ist
+2021/11/21 | 38 | indexing/upmendex/source/tests/locale2.ist
+2021/11/21 | 1274 | indexing/upmendex/source/tests/locale2-rule.ind
+2021/11/21 | 182 | indexing/upmendex/source/tests/pprec0.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec1.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec2.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec3.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec4.ist
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-0.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-1.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-2.ind
+2021/11/21 | 213 | indexing/upmendex/source/tests/pprecA.idx
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-0.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-3.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-4.ind
+2021/11/21 | 207 | indexing/upmendex/source/tests/pprecB.idx
+2021/11/21 | 1077 | indexing/upmendex/source/tests/range1.ind
+2021/11/21 | 70 | indexing/upmendex/source/tests/range1.ist
+2021/11/21 | 1169 | indexing/upmendex/source/tests/range2.ind
+2021/11/21 | 92 | indexing/upmendex/source/tests/range2.ist
+2021/11/21 | 1077 | indexing/upmendex/source/tests/range3.ind
+2021/11/21 | 93 | indexing/upmendex/source/tests/range3.ist
+2021/11/21 | 3278 | indexing/upmendex/source/tests/range.idx
+2021/11/21 | 75 | indexing/upmendex/source/tests/rule1.ist
+2021/11/21 | 93 | indexing/upmendex/source/tests/rule2.ist
+2021/11/21 | 99 | indexing/upmendex/source/tests/rule3.ist
+2021/11/21 | 117 | indexing/upmendex/source/tests/rule4.ist
+2021/11/21 | 417 | indexing/upmendex/source/tests/rule.idx
+2021/11/21 | 1200 | indexing/upmendex/source/tests/rule.ind
+2021/11/21 | 158 | indexing/upmendex/source/tests/uni1.ist
+2021/11/21 | 139 | indexing/upmendex/source/tests/uni2.ist
+2021/11/21 | 64 | indexing/upmendex/source/tests/uni.dict
+2021/11/21 | 435 | indexing/upmendex/source/tests/uni.idx
+2021/11/21 | 766 | indexing/upmendex/source/tests/uni.ind
+2021/11/21 | 272 | indexing/upmendex/source/tests/uni.ist
+2021/11/21 | 4093 | indexing/upmendex/source/tests/upmendex.test
+2021/11/21 | 2311 | indexing/upmendex/source/var.h
+2021/11/21 | 98 | indexing/upmendex/source/version.h
+2021/11/21 | 473691 | indexing/upmendex.zip
2021/11/07 | 2349 | indexing/xindex/CHANGELOG
2021/07/06 | 1231 | indexing/xindex/doc/Makefile
2021/07/06 | 32092 | indexing/xindex/doc/tests/buch.idx
@@ -183039,7 +183061,7 @@
2015/11/14 | 558928 | install/macros/generic/catcodes.tds.zip
2015/11/16 | 603358 | install/macros/generic/commado.tds.zip
2015/11/14 | 1248858 | install/macros/generic/dowith.tds.zip
-2021/09/21 | 481498 | install/macros/generic/expkv-cs.tds.zip
+2021/11/21 | 479668 | install/macros/generic/expkv-cs.tds.zip
2021/09/21 | 424285 | install/macros/generic/expkv-def.tds.zip
2021/09/21 | 514924 | install/macros/generic/expkv.tds.zip
2020/03/06 | 222075 | install/macros/generic/iftex.tds.zip
@@ -183387,7 +183409,7 @@
2015/10/04 | 277014 | install/macros/luatex/generic/luatexbase.tds.zip
2021/11/08 | 300865 | install/macros/luatex/generic/lua-widow-control.tds.zip
2020/03/23 | 891718 | install/macros/luatex/latex/arabluatex.tds.zip
-2021/08/18 | 939765 | install/macros/luatex/latex/ekdosis.tds.zip
+2021/11/21 | 970369 | install/macros/luatex/latex/ekdosis.tds.zip
2021/07/17 | 1183440 | install/macros/luatex/latex/emoji.tds.zip
2013/09/26 | 155171 | install/macros/luatex/latex/luabibentry.tds.zip
2012/01/23 | 423265 | install/macros/luatex/latex/luacode.tds.zip
@@ -197158,10 +197180,10 @@
2017/05/25 | 50653 | macros/generic/expex/expex.tex
2017/05/25 | 1673 | macros/generic/expex/README
2017/05/26 | 498764 | macros/generic/expex.zip
-2021/09/21 | 118063 | macros/generic/expkv-cs/expkv-cs.dtx
-2021/09/21 | 460837 | macros/generic/expkv-cs/expkv-cs.pdf
-2021/09/21 | 1297 | macros/generic/expkv-cs/README.md
-2021/09/21 | 474231 | macros/generic/expkv-cs.zip
+2021/11/21 | 117711 | macros/generic/expkv-cs/expkv-cs.dtx
+2021/11/21 | 458679 | macros/generic/expkv-cs/expkv-cs.pdf
+2021/11/21 | 1297 | macros/generic/expkv-cs/README.md
+2021/11/21 | 472422 | macros/generic/expkv-cs.zip
2021/09/21 | 79731 | macros/generic/expkv-def/expkv-def.dtx
2021/09/21 | 410977 | macros/generic/expkv-def/expkv-def.pdf
2021/09/21 | 1269 | macros/generic/expkv-def/README.md
@@ -200602,14 +200624,14 @@
2020/01/13 | 6908 | macros/latex/contrib/apa6/samples/longsample.tex
2020/01/13 | 6249 | macros/latex/contrib/apa6/samples/shortsample.tex
2020/01/13 | 627172 | macros/latex/contrib/apa6.zip
-2021/05/18 | 144274 | macros/latex/contrib/apa7/apa7.dtx
-2021/05/18 | 6535 | macros/latex/contrib/apa7/apa7.ins
-2021/05/18 | 531855 | macros/latex/contrib/apa7/apa7.pdf
-2021/05/18 | 1278 | macros/latex/contrib/apa7/README.txt
+2021/11/21 | 145011 | macros/latex/contrib/apa7/apa7.dtx
+2021/11/21 | 6700 | macros/latex/contrib/apa7/apa7.ins
+2021/11/21 | 555774 | macros/latex/contrib/apa7/apa7.pdf
+2021/11/21 | 1557 | macros/latex/contrib/apa7/README.txt
2020/06/20 | 5068 | macros/latex/contrib/apa7/samples/Figure1.pdf
-2021/05/18 | 196590 | macros/latex/contrib/apa7/samples/longsample.pdf
-2021/05/18 | 65349 | macros/latex/contrib/apa7/samples/shortsample.pdf
-2021/05/18 | 831492 | macros/latex/contrib/apa7.zip
+2021/11/21 | 204050 | macros/latex/contrib/apa7/samples/longsample.pdf
+2021/11/21 | 69708 | macros/latex/contrib/apa7/samples/shortsample.pdf
+2021/11/21 | 853411 | macros/latex/contrib/apa7.zip
2008/12/09 | 58148 | macros/latex/contrib/apa/apa.cls
2008/12/09 | 37023 | macros/latex/contrib/apa/apacls.html
2008/12/23 | 15056 | macros/latex/contrib/apa/apacls.txt
@@ -211522,14 +211544,14 @@
2016/06/14 | 1224 | macros/latex/contrib/graphics-cfg/graphics.cfg
2016/06/14 | 993 | macros/latex/contrib/graphics-cfg/README.md
2016/06/14 | 2015 | macros/latex/contrib/graphics-cfg.zip
-2021/06/01 | 12854 | macros/latex/contrib/graphics-def/dvipdfmx.def
-2021/06/01 | 5895 | macros/latex/contrib/graphics-def/dvips.def
-2021/06/01 | 8783 | macros/latex/contrib/graphics-def/dvisvgm.def
-2021/06/01 | 19010 | macros/latex/contrib/graphics-def/luatex.def
-2021/06/01 | 19103 | macros/latex/contrib/graphics-def/pdftex.def
-2021/06/01 | 489 | macros/latex/contrib/graphics-def/README.md
-2021/06/01 | 15263 | macros/latex/contrib/graphics-def/xetex.def
-2021/06/01 | 25033 | macros/latex/contrib/graphics-def.zip
+2021/11/21 | 12854 | macros/latex/contrib/graphics-def/dvipdfmx.def
+2021/11/21 | 5895 | macros/latex/contrib/graphics-def/dvips.def
+2021/11/21 | 8788 | macros/latex/contrib/graphics-def/dvisvgm.def
+2021/11/21 | 19010 | macros/latex/contrib/graphics-def/luatex.def
+2021/11/21 | 19103 | macros/latex/contrib/graphics-def/pdftex.def
+2021/11/21 | 489 | macros/latex/contrib/graphics-def/README.md
+2021/11/21 | 15263 | macros/latex/contrib/graphics-def/xetex.def
+2021/11/21 | 25033 | macros/latex/contrib/graphics-def.zip
2014/01/10 | 55547 | macros/latex/contrib/graphicxbox/doc/graphicxbox.pdf
2007/12/04 | 241151 | macros/latex/contrib/graphicxbox/examples/graphics/bg_cle_tile.eps
2007/12/14 | 224725 | macros/latex/contrib/graphicxbox/examples/graphics/grandcanyon.eps
@@ -231863,35 +231885,35 @@
2008/03/23 | 150220 | macros/latex/contrib/xargs/xargs.pdf
2008/03/23 | 12403 | macros/latex/contrib/xargs/xargs.sty
2008/03/24 | 216210 | macros/latex/contrib/xargs.zip
-2020/07/19 | 1344 | macros/latex/contrib/xassoccnt/README
-2020/07/19 | 11903 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
-2020/07/19 | 1335 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
-2020/07/19 | 14012 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
-2020/07/19 | 1023 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
-2020/07/19 | 94248 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
-2020/07/19 | 3766 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
-2020/07/19 | 542720 | macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
-2020/07/19 | 117595 | macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
-2020/07/19 | 79453 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
-2020/07/19 | 4264 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
-2020/07/19 | 68361 | macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
-2020/07/19 | 4405 | macros/latex/contrib/xassoccnt/xassoccnt_example.tex
-2020/07/19 | 46906 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
-2020/07/19 | 4744 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
-2020/07/19 | 42917 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
-2020/07/19 | 2753 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
-2020/07/19 | 31635 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
-2020/07/19 | 2080 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
-2020/07/19 | 64628 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
-2020/07/19 | 2441 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
-2020/07/19 | 35598 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
-2020/07/19 | 1790 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
-2020/07/19 | 123719 | macros/latex/contrib/xassoccnt/xassoccnt.sty
-2020/07/19 | 60534 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
-2020/07/19 | 1789 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
-2020/07/19 | 65140 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
-2020/07/19 | 1277 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
-2020/07/19 | 1186386 | macros/latex/contrib/xassoccnt.zip
+2021/11/21 | 1295 | macros/latex/contrib/xassoccnt/README
+2021/11/21 | 11902 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
+2021/11/21 | 1286 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
+2021/11/21 | 14013 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
+2021/11/21 | 974 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
+2021/11/21 | 94302 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
+2021/11/21 | 3717 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
+2021/11/21 | 544244 | macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
+2021/11/21 | 117747 | macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
+2021/11/21 | 79543 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
+2021/11/21 | 4221 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
+2021/11/21 | 68361 | macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
+2021/11/21 | 4356 | macros/latex/contrib/xassoccnt/xassoccnt_example.tex
+2021/11/21 | 46978 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
+2021/11/21 | 4695 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
+2021/11/21 | 42981 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
+2021/11/21 | 2704 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
+2021/11/21 | 31639 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
+2021/11/21 | 2031 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
+2021/11/21 | 64738 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
+2021/11/21 | 2392 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
+2021/11/21 | 35642 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
+2021/11/21 | 1741 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
+2021/11/21 | 123700 | macros/latex/contrib/xassoccnt/xassoccnt.sty
+2021/11/21 | 60545 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
+2021/11/21 | 1740 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
+2021/11/21 | 65241 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
+2021/11/21 | 1228 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
+2021/11/21 | 1187786 | macros/latex/contrib/xassoccnt.zip
2020/01/18 | 212270 | macros/latex/contrib/xbmks/docs/xbmksman.pdf
2020/01/18 | 20392 | macros/latex/contrib/xbmks/docs/xbmksman.tex
2018/07/04 | 109548 | macros/latex/contrib/xbmks/docs/xbmks.pdf
@@ -234033,17 +234055,17 @@
2021/10/22 | 25252 | macros/luatex/latex/datestamp/gfdl-tex.tex
2021/10/22 | 341 | macros/luatex/latex/datestamp/README.txt
2021/10/22 | 143156 | macros/luatex/latex/datestamp.zip
-2021/08/18 | 443607 | macros/luatex/latex/ekdosis/ekdosis.dtx
-2021/08/18 | 11925 | macros/luatex/latex/ekdosis/ekdosis.el
-2021/08/18 | 1874 | macros/luatex/latex/ekdosis/ekdosis.ins
-2021/08/18 | 930575 | macros/luatex/latex/ekdosis/ekdosis.pdf
-2021/08/18 | 3977 | macros/luatex/latex/ekdosis/Makefile
-2021/08/18 | 4266 | macros/luatex/latex/ekdosis/README.md
-2021/08/18 | 18006 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
-2021/08/18 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
-2021/08/18 | 3903 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
-2021/08/18 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
-2021/08/18 | 914203 | macros/luatex/latex/ekdosis.zip
+2021/11/21 | 452991 | macros/luatex/latex/ekdosis/ekdosis.dtx
+2021/11/21 | 12221 | macros/luatex/latex/ekdosis/ekdosis.el
+2021/11/21 | 1874 | macros/luatex/latex/ekdosis/ekdosis.ins
+2021/11/21 | 949399 | macros/luatex/latex/ekdosis/ekdosis.pdf
+2021/11/21 | 3977 | macros/luatex/latex/ekdosis/Makefile
+2021/11/21 | 4219 | macros/luatex/latex/ekdosis/README.md
+2021/11/21 | 18006 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+2021/11/21 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
+2021/11/21 | 3903 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
+2021/11/21 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
+2021/11/21 | 944201 | macros/luatex/latex/ekdosis.zip
2020/05/13 | 175991 | macros/luatex/latex/emojicite/emojicite-doc.pdf
2020/05/13 | 8411 | macros/luatex/latex/emojicite/emojicite-doc.tex
2020/05/13 | 3133 | macros/luatex/latex/emojicite/emojicite.sty
@@ -273253,7 +273275,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
-2021/11/10 | 167109 | support/TeX4ht/source/ChangeLog
+2021/11/20 | 167304 | 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
@@ -273305,7 +273327,7 @@
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/09/15 | 4878 | support/TeX4ht/source/tex4ht-mathjax.tex
+2021/11/20 | 5287 | support/TeX4ht/source/tex4ht-mathjax.tex
2021/05/03 | 102444 | support/TeX4ht/source/tex4ht-mathltx.tex
2021/11/10 | 141738 | support/TeX4ht/source/tex4ht-mathml.tex
2021/05/03 | 8860 | support/TeX4ht/source/tex4ht-mathplayer.tex
@@ -280481,13 +280503,13 @@
2021/03/19 | 447620 | systems/texlive/tlnet/archive/dvipdfmx.amd64-freebsd.r58501.tar.xz
2021/03/19 | 378928 | systems/texlive/tlnet/archive/dvipdfmx.amd64-netbsd.r58497.tar.xz
2021/03/21 | 346964 | systems/texlive/tlnet/archive/dvipdfmx.armhf-linux.r58556.tar.xz
-2021/06/01 | 3129328 | systems/texlive/tlnet/archive/dvipdfmx.doc.r59415.tar.xz
+2021/11/21 | 3129328 | systems/texlive/tlnet/archive/dvipdfmx.doc.r61101.tar.xz
2021/03/19 | 396160 | systems/texlive/tlnet/archive/dvipdfmx.i386-cygwin.r58498.tar.xz
2021/03/19 | 403380 | systems/texlive/tlnet/archive/dvipdfmx.i386-freebsd.r58501.tar.xz
2021/03/20 | 460764 | systems/texlive/tlnet/archive/dvipdfmx.i386-linux.r58535.tar.xz
2021/03/19 | 359920 | systems/texlive/tlnet/archive/dvipdfmx.i386-netbsd.r58497.tar.xz
2021/03/19 | 413492 | systems/texlive/tlnet/archive/dvipdfmx.i386-solaris.r58500.tar.xz
-2021/06/01 | 27128 | systems/texlive/tlnet/archive/dvipdfmx.r59415.tar.xz
+2021/11/21 | 26716 | systems/texlive/tlnet/archive/dvipdfmx.r61101.tar.xz
2021/03/19 | 791336 | systems/texlive/tlnet/archive/dvipdfmx.universal-darwin.r58528.tar.xz
2021/11/18 | 332092 | systems/texlive/tlnet/archive/dvipdfmx.win32.r61082.tar.xz
2021/03/19 | 403400 | systems/texlive/tlnet/archive/dvipdfmx.x86_64-cygwin.r58498.tar.xz
@@ -280585,9 +280607,9 @@
2021/07/19 | 313228 | systems/texlive/tlnet/archive/easing.doc.r59975.tar.xz
2021/07/19 | 2220 | systems/texlive/tlnet/archive/easing.r59975.tar.xz
2021/07/19 | 7876 | systems/texlive/tlnet/archive/easing.source.r59975.tar.xz
-2021/11/18 | 602076 | systems/texlive/tlnet/archive/easybook.doc.r61085.tar.xz
-2021/11/18 | 17552 | systems/texlive/tlnet/archive/easybook.r61085.tar.xz
-2021/11/18 | 17596 | systems/texlive/tlnet/archive/easybook.source.r61085.tar.xz
+2021/11/21 | 601748 | systems/texlive/tlnet/archive/easybook.doc.r61098.tar.xz
+2021/11/21 | 17600 | systems/texlive/tlnet/archive/easybook.r61098.tar.xz
+2021/11/21 | 17668 | systems/texlive/tlnet/archive/easybook.source.r61098.tar.xz
2019/02/28 | 4540 | systems/texlive/tlnet/archive/easy.doc.r19440.tar.xz
2020/09/08 | 175976 | systems/texlive/tlnet/archive/easyfig.doc.r56291.tar.xz
2020/09/08 | 1936 | systems/texlive/tlnet/archive/easyfig.r56291.tar.xz
@@ -281216,8 +281238,8 @@
2020/09/08 | 1112404 | systems/texlive/tlnet/archive/fancytooltips.doc.r56291.tar.xz
2020/09/08 | 7968 | systems/texlive/tlnet/archive/fancytooltips.r56291.tar.xz
2020/09/08 | 16732 | systems/texlive/tlnet/archive/fancytooltips.source.r56291.tar.xz
-2021/10/16 | 148348 | systems/texlive/tlnet/archive/fancyvrb.doc.r60769.tar.xz
-2021/10/16 | 11808 | systems/texlive/tlnet/archive/fancyvrb.r60769.tar.xz
+2021/11/21 | 149292 | systems/texlive/tlnet/archive/fancyvrb.doc.r61099.tar.xz
+2021/11/21 | 11868 | systems/texlive/tlnet/archive/fancyvrb.r61099.tar.xz
2019/02/28 | 12168 | systems/texlive/tlnet/archive/fandol.doc.r37889.tar.xz
2019/02/28 | 21582588 | systems/texlive/tlnet/archive/fandol.r37889.tar.xz
2020/03/04 | 2042296 | systems/texlive/tlnet/archive/fascicules.doc.r54080.tar.xz
@@ -283736,8 +283758,8 @@
2019/02/28 | 14224 | systems/texlive/tlnet/archive/lsc.r15878.tar.xz
2019/02/28 | 1899640 | systems/texlive/tlnet/archive/lshort-bulgarian.doc.r15878.tar.xz
2019/02/28 | 424 | systems/texlive/tlnet/archive/lshort-bulgarian.r15878.tar.xz
-2020/08/04 | 1539324 | systems/texlive/tlnet/archive/lshort-chinese.doc.r56036.tar.xz
-2020/08/04 | 472 | systems/texlive/tlnet/archive/lshort-chinese.r56036.tar.xz
+2021/11/21 | 1561100 | systems/texlive/tlnet/archive/lshort-chinese.doc.r61100.tar.xz
+2021/11/21 | 472 | systems/texlive/tlnet/archive/lshort-chinese.r61100.tar.xz
2020/06/24 | 1644616 | systems/texlive/tlnet/archive/lshort-czech.doc.r55643.tar.xz
2020/06/24 | 384 | systems/texlive/tlnet/archive/lshort-czech.r55643.tar.xz
2019/02/28 | 777012 | systems/texlive/tlnet/archive/lshort-dutch.doc.r15878.tar.xz
@@ -288079,14 +288101,14 @@
2021/02/27 | 109184 | systems/texlive/tlnet/archive/tex4ht.amd64-freebsd.r57941.tar.xz
2021/02/24 | 87364 | systems/texlive/tlnet/archive/tex4ht.amd64-netbsd.r57877.tar.xz
2021/02/27 | 69944 | systems/texlive/tlnet/archive/tex4ht.armhf-linux.r57957.tar.xz
-2021/11/10 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r61013.tar.xz
+2021/11/21 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r61097.tar.xz
2021/03/16 | 51080 | systems/texlive/tlnet/archive/tex4ht.i386-cygwin.r58387.tar.xz
2021/02/27 | 93092 | systems/texlive/tlnet/archive/tex4ht.i386-freebsd.r57961.tar.xz
2021/02/24 | 89116 | systems/texlive/tlnet/archive/tex4ht.i386-linux.r57878.tar.xz
2021/02/24 | 76196 | systems/texlive/tlnet/archive/tex4ht.i386-netbsd.r57877.tar.xz
2021/02/27 | 83896 | systems/texlive/tlnet/archive/tex4ht.i386-solaris.r57938.tar.xz
-2021/11/10 | 920804 | systems/texlive/tlnet/archive/tex4ht.r61013.tar.xz
-2021/11/10 | 1225260 | systems/texlive/tlnet/archive/tex4ht.source.r61013.tar.xz
+2021/11/21 | 920796 | systems/texlive/tlnet/archive/tex4ht.r61097.tar.xz
+2021/11/21 | 1225152 | systems/texlive/tlnet/archive/tex4ht.source.r61097.tar.xz
2021/02/25 | 185088 | systems/texlive/tlnet/archive/tex4ht.universal-darwin.r57908.tar.xz
2021/04/08 | 57760 | systems/texlive/tlnet/archive/tex4ht.win32.r58783.tar.xz
2021/03/16 | 58360 | systems/texlive/tlnet/archive/tex4ht.x86_64-cygwin.r58387.tar.xz
@@ -288321,18 +288343,18 @@
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.amd64-freebsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.amd64-netbsd.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.armhf-linux.r55172.tar.xz
-2021/11/19 | 401264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61088.tar.xz
+2021/11/21 | 401264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61095.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
2020/01/27 | 912 | systems/texlive/tlnet/archive/texlive-scripts-extra.armhf-linux.r53577.tar.xz
-2020/04/15 | 195144 | systems/texlive/tlnet/archive/texlive-scripts-extra.doc.r54744.tar.xz
+2021/11/21 | 195144 | systems/texlive/tlnet/archive/texlive-scripts-extra.doc.r61101.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-cygwin.r53577.tar.xz
2020/01/27 | 920 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-freebsd.r53577.tar.xz
2020/01/27 | 924 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-linux.r53577.tar.xz
2020/01/27 | 912 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-netbsd.r53577.tar.xz
2020/01/27 | 920 | systems/texlive/tlnet/archive/texlive-scripts-extra.i386-solaris.r53577.tar.xz
-2020/04/15 | 23540 | systems/texlive/tlnet/archive/texlive-scripts-extra.r54744.tar.xz
+2021/11/21 | 23540 | systems/texlive/tlnet/archive/texlive-scripts-extra.r61101.tar.xz
2021/02/25 | 900 | systems/texlive/tlnet/archive/texlive-scripts-extra.universal-darwin.r57908.tar.xz
2021/04/08 | 4732 | systems/texlive/tlnet/archive/texlive-scripts-extra.win32.r58783.tar.xz
2020/01/27 | 916 | systems/texlive/tlnet/archive/texlive-scripts-extra.x86_64-cygwin.r53577.tar.xz
@@ -288345,7 +288367,7 @@
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-linux.r55172.tar.xz
2020/05/17 | 592 | systems/texlive/tlnet/archive/texlive-scripts.i386-netbsd.r55172.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.i386-solaris.r55172.tar.xz
-2021/11/19 | 108308 | systems/texlive/tlnet/archive/texlive-scripts.r61088.tar.xz
+2021/11/21 | 108300 | systems/texlive/tlnet/archive/texlive-scripts.r61095.tar.xz
2021/02/25 | 572 | systems/texlive/tlnet/archive/texlive-scripts.universal-darwin.r57908.tar.xz
2021/04/12 | 36308 | systems/texlive/tlnet/archive/texlive-scripts.win32.r58829.tar.xz
2020/05/17 | 588 | systems/texlive/tlnet/archive/texlive-scripts.x86_64-cygwin.r55172.tar.xz
@@ -289757,7 +289779,7 @@
2019/02/28 | 532 | systems/texlive/tlnet/archive/xetexconfig.r45845.tar.xz
2019/02/28 | 992 | systems/texlive/tlnet/archive/xetex-devanagari.doc.r34296.tar.xz
2019/02/28 | 12452 | systems/texlive/tlnet/archive/xetex-devanagari.r34296.tar.xz
-2021/02/28 | 616820 | systems/texlive/tlnet/archive/xetex.doc.r57972.tar.xz
+2021/11/21 | 633108 | systems/texlive/tlnet/archive/xetex.doc.r61101.tar.xz
2019/02/28 | 628 | systems/texlive/tlnet/archive/xetexfontinfo.doc.r15878.tar.xz
2019/02/28 | 2340 | systems/texlive/tlnet/archive/xetexfontinfo.r15878.tar.xz
2021/03/16 | 7003928 | systems/texlive/tlnet/archive/xetex.i386-cygwin.r58387.tar.xz
@@ -289771,7 +289793,7 @@
2021/09/07 | 54356 | systems/texlive/tlnet/archive/xetexko.r60444.tar.xz
2019/02/28 | 932 | systems/texlive/tlnet/archive/xetex-pstricks.doc.r17055.tar.xz
2019/02/28 | 724 | systems/texlive/tlnet/archive/xetex-pstricks.r17055.tar.xz
-2021/02/28 | 6988 | systems/texlive/tlnet/archive/xetex.r57972.tar.xz
+2021/11/21 | 7760 | systems/texlive/tlnet/archive/xetex.r61101.tar.xz
2020/09/08 | 157316 | systems/texlive/tlnet/archive/xetexref.doc.r56291.tar.xz
2020/09/08 | 444 | systems/texlive/tlnet/archive/xetexref.r56291.tar.xz
2019/02/28 | 1204 | systems/texlive/tlnet/archive/xetex-tibetan.doc.r28847.tar.xz
@@ -290093,16 +290115,16 @@
2020/07/18 | 47816 | systems/texlive/tlnet/archive/zztex.doc.r55862.tar.xz
2020/07/18 | 101724 | systems/texlive/tlnet/archive/zztex.r55862.tar.xz
2021/05/02 | 105152 | systems/texlive/tlnet/install-tl
-2021/11/20 | 6810839 | systems/texlive/tlnet/install-tl-unx.tar.gz
-2021/11/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/11/21 | 6810759 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/11/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
2021/04/11 | 4945 | systems/texlive/tlnet/install-tl-windows.bat
-2021/11/20 | 20872238 | systems/texlive/tlnet/install-tl-windows.exe
-2021/11/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/11/20 | 25631191 | systems/texlive/tlnet/install-tl.zip
-2021/11/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/11/21 | 20873329 | systems/texlive/tlnet/install-tl-windows.exe
+2021/11/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/11/21 | 25631180 | systems/texlive/tlnet/install-tl.zip
+2021/11/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
2021/04/01 | 1229 | systems/texlive/tlnet/README.md
2021/04/01 | 0 | systems/texlive/tlnet/TEXLIVE_2021
2021/07/03 | 7181 | systems/texlive/tlnet/tlpkg/gpg/pubring.gpg
@@ -290112,7 +290134,7 @@
2021/07/03 | 1280 | systems/texlive/tlnet/tlpkg/gpg/trustdb.gpg
2021/07/02 | 49348 | systems/texlive/tlnet/tlpkg/installer/config.guess
2010/11/11 | 11651 | systems/texlive/tlnet/tlpkg/installer/COPYING.MinGW-runtime.txt
-2021/11/18 | 7018 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+2021/11/20 | 6972 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2020/04/15 | 223687 | systems/texlive/tlnet/tlpkg/installer/curl/curl-ca-bundle.crt
2020/04/15 | 2606592 | systems/texlive/tlnet/tlpkg/installer/curl/curl.exe
2017/04/16 | 2629 | systems/texlive/tlnet/tlpkg/installer/installer-options.txt
@@ -290154,12 +290176,12 @@
2021/05/16 | 20371 | systems/texlive/tlnet/tlpkg/TeXLive/TLCrypto.pm
2021/05/16 | 5402 | systems/texlive/tlnet/tlpkg/TeXLive/TLDownload.pm
2021/05/16 | 27555 | systems/texlive/tlnet/tlpkg/TeXLive/TLPaper.pm
-2021/11/20 | 16981965 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/11/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/11/21 | 16982320 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/11/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
2021/05/16 | 86511 | systems/texlive/tlnet/tlpkg/TeXLive/TLPDB.pm
-2021/11/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/11/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/11/20 | 2322864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/11/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/11/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/11/21 | 2322632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/05/16 | 58801 | systems/texlive/tlnet/tlpkg/TeXLive/TLPOBJ.pm
2021/05/16 | 42084 | systems/texlive/tlnet/tlpkg/TeXLive/TLPSRC.pm
2021/05/16 | 16103 | systems/texlive/tlnet/tlpkg/TeXLive/TLTREE.pm
@@ -294821,9 +294843,9 @@
2021/07/18 | 313984 | systems/win32/miktex/tm/packages/easing__doc.tar.lzma
2021/07/18 | 8201 | systems/win32/miktex/tm/packages/easing__source.tar.lzma
2021/07/18 | 2391 | systems/win32/miktex/tm/packages/easing.tar.lzma
-2021/11/20 | 584101 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
-2021/11/20 | 39351 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
-2021/11/20 | 16594 | systems/win32/miktex/tm/packages/easybook.tar.lzma
+2021/11/21 | 583733 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
+2021/11/21 | 39324 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
+2021/11/21 | 16372 | systems/win32/miktex/tm/packages/easybook.tar.lzma
2018/03/31 | 183421 | systems/win32/miktex/tm/packages/easyfig.tar.lzma
2020/12/21 | 609763 | systems/win32/miktex/tm/packages/easyfloats.tar.lzma
2017/06/12 | 52618 | systems/win32/miktex/tm/packages/easyformat.tar.lzma
@@ -295100,9 +295122,9 @@
2015/02/28 | 5938051 | systems/win32/miktex/tm/packages/fancyslides.tar.lzma
2016/06/29 | 190364 | systems/win32/miktex/tm/packages/fancytabs.tar.lzma
2012/06/11 | 1136130 | systems/win32/miktex/tm/packages/fancytooltips.tar.lzma
-2021/10/21 | 138948 | systems/win32/miktex/tm/packages/fancyvrb__doc.tar.lzma
-2021/10/21 | 10870 | systems/win32/miktex/tm/packages/fancyvrb__source.tar.lzma
-2021/10/21 | 12052 | systems/win32/miktex/tm/packages/fancyvrb.tar.lzma
+2021/11/21 | 139844 | systems/win32/miktex/tm/packages/fancyvrb__doc.tar.lzma
+2021/11/21 | 10929 | systems/win32/miktex/tm/packages/fancyvrb__source.tar.lzma
+2021/11/21 | 12111 | systems/win32/miktex/tm/packages/fancyvrb.tar.lzma
2015/07/21 | 21599588 | systems/win32/miktex/tm/packages/fandol.tar.lzma
2018/12/20 | 2489193 | systems/win32/miktex/tm/packages/fascicules.tar.lzma
2013/03/01 | 1410180 | systems/win32/miktex/tm/packages/fast-diagram.tar.lzma
@@ -295149,7 +295171,7 @@
2020/10/03 | 318630 | systems/win32/miktex/tm/packages/filehook.tar.lzma
2012/12/04 | 924573 | systems/win32/miktex/tm/packages/fileinfo.tar.lzma
2011/09/21 | 281409 | systems/win32/miktex/tm/packages/filemod.tar.lzma
-2021/11/20 | 628470 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/11/21 | 627451 | 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
@@ -295794,10 +295816,10 @@
2018/11/05 | 875632 | systems/win32/miktex/tm/packages/komacv-rg.tar.lzma
2021/02/15 | 486771 | systems/win32/miktex/tm/packages/komacv.tar.lzma
2012/01/10 | 196289 | systems/win32/miktex/tm/packages/koma-moderncvclassic.tar.lzma
-2021/06/28 | 6128873 | systems/win32/miktex/tm/packages/koma-script__doc.tar.lzma
+2021/11/21 | 6131797 | systems/win32/miktex/tm/packages/koma-script__doc.tar.lzma
2018/04/22 | 563537 | systems/win32/miktex/tm/packages/koma-script-examples.tar.lzma
-2021/06/28 | 7001080 | systems/win32/miktex/tm/packages/koma-script__source.tar.lzma
-2021/06/28 | 136385 | systems/win32/miktex/tm/packages/koma-script.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
2021/10/03 | 441584 | systems/win32/miktex/tm/packages/kotex-oblivoir__doc.tar.lzma
2021/10/03 | 31277 | systems/win32/miktex/tm/packages/kotex-oblivoir__source.tar.lzma
2021/10/03 | 41756 | systems/win32/miktex/tm/packages/kotex-oblivoir.tar.lzma
@@ -296079,7 +296101,8 @@
2014/09/08 | 2067930 | systems/win32/miktex/tm/packages/lshort-spanish.tar.lzma
2004/07/28 | 464778 | systems/win32/miktex/tm/packages/lshort-thai.cab
2004/07/28 | 283085 | systems/win32/miktex/tm/packages/lshort-ukrainian.cab
-2020/08/09 | 1550081 | systems/win32/miktex/tm/packages/lshort-zh-cn.tar.lzma
+2021/11/21 | 98952 | systems/win32/miktex/tm/packages/lshort-zh-cn__source.tar.lzma
+2021/11/21 | 1471880 | systems/win32/miktex/tm/packages/lshort-zh-cn.tar.lzma
2012/05/11 | 375006 | systems/win32/miktex/tm/packages/lstaddons.tar.lzma
2018/07/09 | 276322 | systems/win32/miktex/tm/packages/lstbayes.tar.lzma
2018/12/30 | 59590 | systems/win32/miktex/tm/packages/lstfiracode.tar.lzma
@@ -296590,9 +296613,9 @@
2018/01/12 | 157226 | systems/win32/miktex/tm/packages/miktex-zip-bin-x64.tar.lzma
2021/10/05 | 39429 | systems/win32/miktex/tm/packages/miktex-zlib-bin-2.9.tar.lzma
2021/10/05 | 43382 | systems/win32/miktex/tm/packages/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/11/20 | 252374 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/11/20 | 1386882 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/11/20 | 1287068 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/11/21 | 252445 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/11/21 | 1387464 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/11/21 | 1287224 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
2021/10/05 | 13448 | systems/win32/miktex/tm/packages/miktex-zzip-bin-2.9.tar.lzma
2021/10/05 | 14320 | 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
@@ -296812,192 +296835,192 @@
2018/04/09 | 400132 | systems/win32/miktex/tm/packages/newunicodechar.tar.lzma
2011/09/19 | 101312 | systems/win32/miktex/tm/packages/newvbtm.tar.lzma
2021/03/17 | 232249 | systems/win32/miktex/tm/packages/newverbs.tar.lzma
-2021/11/20 | 628656 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/11/20 | 51131 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/11/20 | 56482 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/11/20 | 972385 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/11/20 | 1075755 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/11/20 | 29084 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/11/20 | 31338 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/11/20 | 29819 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/11/20 | 34660 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/11/20 | 50136 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/11/20 | 57595 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
-2021/11/20 | 83783 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/11/20 | 95611 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/11/20 | 69038 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/11/20 | 76143 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/11/20 | 27179 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
-2021/11/20 | 30809 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/11/20 | 330666 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/11/20 | 392526 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/11/20 | 32671 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/11/20 | 36604 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
-2021/11/20 | 51321 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/11/20 | 56848 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/11/20 | 5003 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
-2021/11/20 | 255221 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/11/20 | 278930 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
-2021/11/20 | 179997 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/11/20 | 195745 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
-2021/11/20 | 54651 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/11/20 | 61817 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/11/20 | 21169 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/11/20 | 23394 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
-2021/11/20 | 461862 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/11/20 | 46491 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/11/20 | 51244 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/11/20 | 285002 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/11/20 | 325079 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
-2021/11/20 | 41236 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
-2021/11/20 | 45297 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
-2021/11/20 | 119960 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
-2021/11/20 | 133874 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
-2021/11/20 | 1283158 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
-2021/11/20 | 1416384 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
-2021/11/20 | 100351 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/11/20 | 112933 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/11/20 | 43043 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/11/20 | 48263 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/11/20 | 25006 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/11/20 | 28177 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/11/20 | 56292 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/11/20 | 62779 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/11/20 | 136324 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/11/20 | 153986 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/11/20 | 73345 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/11/20 | 78137 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/11/20 | 71619 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/11/20 | 80622 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
-2021/11/20 | 258837 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/11/20 | 295416 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
-2021/11/20 | 22030 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
-2021/11/20 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/11/20 | 97505 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/11/20 | 112326 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/11/20 | 64405 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/11/20 | 73156 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/11/20 | 96501 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
-2021/11/20 | 115346 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
-2021/11/20 | 38123 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/11/20 | 42964 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
-2021/11/20 | 483645 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/11/20 | 566097 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/11/20 | 147304 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
-2021/11/20 | 159707 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
-2021/11/20 | 94786 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/11/20 | 109008 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
-2021/11/20 | 16354 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
-2021/11/20 | 17967 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/11/20 | 28287 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/11/20 | 30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/11/20 | 629684 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/11/20 | 681566 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/11/20 | 531949 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
-2021/11/20 | 596619 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/11/20 | 476871 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
-2021/11/20 | 510642 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/11/20 | 94348 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/11/20 | 103393 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
-2021/11/20 | 1686560 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
-2021/11/20 | 2002249 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/11/20 | 67614 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/11/20 | 74235 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
-2021/11/20 | 27400 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/11/20 | 31634 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/11/20 | 7713 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/11/20 | 8761 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
-2021/11/20 | 196720 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/11/20 | 215384 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/11/20 | 250328 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/11/20 | 283968 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/11/20 | 98618 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/11/20 | 103794 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/11/20 | 60688 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/11/20 | 68110 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/11/20 | 124730 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
-2021/11/20 | 136713 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
-2021/11/20 | 179074 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
-2021/11/20 | 197418 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/11/20 | 199588 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/11/20 | 180022 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/11/20 | 67504 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
-2021/11/20 | 76834 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
-2021/11/20 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/11/20 | 35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/11/20 | 37798 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/11/20 | 42695 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/11/20 | 42858 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/11/20 | 46862 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
-2021/11/20 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
-2021/11/20 | 52440 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/11/20 | 194858 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
-2021/11/20 | 206800 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
-2021/11/20 | 35994 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
-2021/11/20 | 40395 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
-2021/11/20 | 750201 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/11/20 | 818524 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
-2021/11/20 | 198083 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/11/20 | 202986 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
-2021/11/20 | 208323 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/11/20 | 243406 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
-2021/11/20 | 78780 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
-2021/11/20 | 87688 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/11/20 | 1170754 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/11/20 | 1302023 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/11/20 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
-2021/11/20 | 23900 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/11/20 | 31530 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/11/20 | 37233 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
-2021/11/20 | 64162 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/11/20 | 72293 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/11/20 | 50354 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/11/20 | 58032 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
-2021/11/20 | 686051 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
-2021/11/20 | 746271 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
-2021/11/20 | 1345607 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/11/20 | 1471002 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/11/20 | 42458 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/11/20 | 51810 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/11/20 | 56563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/11/20 | 60048 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/11/20 | 25222 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/11/20 | 27288 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/11/20 | 16428 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
-2021/11/20 | 18152 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/11/20 | 63716 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/11/20 | 69930 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
-2021/11/20 | 157102 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/11/20 | 170630 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/11/20 | 57421 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/11/20 | 66099 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/11/20 | 100081 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
-2021/11/20 | 107474 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
-2021/11/20 | 2672111 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
-2021/11/20 | 2796591 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/11/20 | 56320 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/11/20 | 62439 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
-2021/11/20 | 33534 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
-2021/11/20 | 37383 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/11/20 | 27693 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/11/20 | 33662 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/11/20 | 66314 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/11/20 | 71079 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/11/20 | 313384 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/11/20 | 347655 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/11/20 | 55538 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/11/20 | 57106 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/11/20 | 590226 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/11/20 | 624499 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/11/20 | 39203 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/11/20 | 43386 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/11/20 | 252510 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/11/20 | 1388495 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/11/20 | 1287159 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/11/20 | 13431 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/11/20 | 14360 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/11/21 | 627596 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/11/21 | 51097 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/11/21 | 56462 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/11/21 | 973112 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/11/21 | 1076111 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/11/21 | 29079 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/11/21 | 31316 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/11/21 | 29822 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/11/21 | 34673 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/11/21 | 50120 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/11/21 | 57589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/11/21 | 83336 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/11/21 | 95262 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/11/21 | 68559 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/11/21 | 76111 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/11/21 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/11/21 | 30805 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/11/21 | 330840 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/11/21 | 392679 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/11/21 | 32558 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/11/21 | 36626 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/11/21 | 51325 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/11/21 | 56788 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/11/21 | 5006 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/11/21 | 255203 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/11/21 | 278969 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/11/21 | 179745 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/11/21 | 195703 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/11/21 | 54598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/11/21 | 61825 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/11/21 | 21170 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/11/21 | 23353 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/11/21 | 461749 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/11/21 | 46526 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/11/21 | 51174 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/11/21 | 284742 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/11/21 | 325227 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/11/21 | 41260 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/11/21 | 45333 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/11/21 | 119742 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/11/21 | 133958 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/11/21 | 1290584 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/11/21 | 1422198 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/11/21 | 100487 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/11/21 | 112898 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/11/21 | 43034 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/11/21 | 48269 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/11/21 | 25012 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/11/21 | 28167 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/11/21 | 56322 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/11/21 | 62744 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/11/21 | 136278 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/11/21 | 153911 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/11/21 | 73348 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/11/21 | 78160 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/11/21 | 71916 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/11/21 | 80766 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/11/21 | 258759 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/11/21 | 295370 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/11/21 | 22035 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/11/21 | 25000 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/11/21 | 97370 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/11/21 | 112596 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/11/21 | 64425 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/11/21 | 73114 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/11/21 | 96306 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/11/21 | 115233 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/11/21 | 38145 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/11/21 | 43000 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/11/21 | 483385 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/11/21 | 566035 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/11/21 | 147416 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/11/21 | 159825 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/11/21 | 94776 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/11/21 | 109074 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/11/21 | 16360 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/11/21 | 17975 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/11/21 | 28345 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/11/21 | 30044 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/11/21 | 629637 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/11/21 | 680815 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/11/21 | 531950 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/11/21 | 597522 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/11/21 | 476834 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/11/21 | 510455 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/11/21 | 94418 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/11/21 | 103389 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/11/21 | 1710500 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/11/21 | 2003280 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/11/21 | 67622 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/11/21 | 74242 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/11/21 | 27424 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/11/21 | 31656 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/11/21 | 7715 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/11/21 | 8764 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/11/21 | 198065 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/11/21 | 217427 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/11/21 | 250654 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/11/21 | 283970 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/11/21 | 98775 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/11/21 | 103993 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/11/21 | 64703 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/11/21 | 73884 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/11/21 | 124757 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/11/21 | 136713 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/11/21 | 179111 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/11/21 | 197411 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/11/21 | 199530 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/11/21 | 180125 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/11/21 | 67459 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/11/21 | 76895 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/11/21 | 31199 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/11/21 | 35074 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/11/21 | 37815 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/11/21 | 42680 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/11/21 | 42838 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/11/21 | 46896 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/11/21 | 45927 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/11/21 | 52389 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/11/21 | 194727 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/11/21 | 207160 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/11/21 | 36291 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/11/21 | 40991 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/11/21 | 748895 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/11/21 | 819185 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/11/21 | 198314 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/11/21 | 202822 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/11/21 | 208023 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/11/21 | 243513 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/11/21 | 78762 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/11/21 | 87678 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/11/21 | 1169820 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/11/21 | 1300866 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/11/21 | 20110 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/11/21 | 23900 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/11/21 | 31547 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/11/21 | 37248 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/11/21 | 64174 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/11/21 | 72228 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/11/21 | 50389 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/11/21 | 57960 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/11/21 | 685901 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
+2021/11/21 | 749264 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
+2021/11/21 | 1346945 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/11/21 | 1470954 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/11/21 | 42417 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/11/21 | 51836 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/11/21 | 56530 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/11/21 | 59973 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/11/21 | 25246 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/11/21 | 27335 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/11/21 | 16447 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/11/21 | 18157 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/11/21 | 63729 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/11/21 | 69939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/11/21 | 155920 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/11/21 | 171174 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/11/21 | 57461 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/11/21 | 66115 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/11/21 | 100072 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
+2021/11/21 | 107430 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/11/21 | 2673326 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/11/21 | 2796564 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/11/21 | 56459 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/11/21 | 62553 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/11/21 | 36698 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/11/21 | 40690 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/11/21 | 27701 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/11/21 | 33652 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/11/21 | 66233 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/11/21 | 71091 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/11/21 | 313227 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/11/21 | 347915 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/11/21 | 55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/11/21 | 57144 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/11/21 | 589729 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/11/21 | 624341 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/11/21 | 39022 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/11/21 | 43353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/11/21 | 252576 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/11/21 | 1387046 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/11/21 | 1286655 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/11/21 | 13458 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/11/21 | 14337 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
2019/03/12 | 1412 | systems/win32/miktex/tm/packages/nextpage.tar.lzma
-2021/11/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/11/21 | 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
@@ -297420,7 +297443,7 @@
2020/10/20 | 342254 | systems/win32/miktex/tm/packages/preview.tar.lzma
2019/06/20 | 375963 | systems/win32/miktex/tm/packages/prftree.tar.lzma
2021/04/23 | 274028 | systems/win32/miktex/tm/packages/principia.tar.lzma
-2021/11/20 | 936 | systems/win32/miktex/tm/packages/pr.ini
+2021/11/21 | 935 | 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
@@ -298873,7 +298896,7 @@
2007/02/12 | 395234 | systems/win32/texshell32/WinTeXShell32.zip
2021/10/01 | 2480 | systems/win32/TLW64/00README.TLW64
2021/10/01 | 61484773 | systems/win32/TLW64/gs9550w64full-gpl.exe
-2021/11/17 | 98307546 | systems/win32/TLW64/tl-win64.zip
+2021/11/21 | 98314104 | systems/win32/TLW64/tl-win64.zip
1996/11/26 | 1822 | systems/win32/tsconfig/readme
1996/11/26 | 30343 | systems/win32/tsconfig/tsconfig.zip
1998/01/20 | 766976 | systems/win32/util/cmdsh110.exe
@@ -299106,7 +299129,7 @@
2004/06/04 | 404 | tds/tds.sed
2004/06/23 | 65418 | tds/tds.tex
2019/05/29 | 304264 | tds.zip
-2021/11/21 | 186 | timestamp
+2021/11/22 | 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 e190189992..eb3cf23962 100644
--- a/FILES.byname.gz
+++ b/FILES.byname.gz
Binary files differ
diff --git a/FILES.last07days b/FILES.last07days
index d29d896b5e..50e2be0b9f 100644
--- a/FILES.last07days
+++ b/FILES.last07days
@@ -1,307 +1,511 @@
-2021/11/20 | 98618 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
-2021/11/20 | 97505 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
-2021/11/20 | 972385 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
-2021/11/20 | 96501 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/11/21 | 99 | indexing/upmendex/source/tests/rule3.ist
+2021/11/21 | 98 | indexing/upmendex/source/version.h
+2021/11/21 | 98952 | systems/win32/miktex/tm/packages/lshort-zh-cn__source.tar.lzma
+2021/11/21 | 98775 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-2.9.tar.lzma
+2021/11/21 | 98314104 | systems/win32/TLW64/tl-win64.zip
+2021/11/21 | 974 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
+2021/11/21 | 97370 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-2.9.tar.lzma
+2021/11/21 | 973112 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-2.9.tar.lzma
+2021/11/21 | 970369 | install/macros/luatex/latex/ekdosis.tds.zip
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-4.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-3.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecB-0.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-2.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-1.ind
+2021/11/21 | 96 | indexing/upmendex/source/tests/pprecA-0.ind
+2021/11/21 | 96306 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-2.9.tar.lzma
+2021/11/21 | 95262 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
+2021/11/21 | 949399 | macros/luatex/latex/ekdosis/ekdosis.pdf
+2021/11/21 | 94776 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
+2021/11/21 | 944201 | macros/luatex/latex/ekdosis.zip
+2021/11/21 | 94418 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
+2021/11/21 | 94302 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
+2021/11/21 | 93 | indexing/upmendex/source/tests/rule2.ist
+2021/11/21 | 93 | indexing/upmendex/source/tests/range3.ist
+2021/11/21 | 935 | systems/win32/miktex/tm/packages/pr.ini
+2021/11/21 | 92 | indexing/upmendex/source/tests/range2.ist
+2021/11/21 | 9227 | indexing/upmendex/source/convert.c
+2021/11/21 | 920796 | systems/texlive/tlnet/archive/tex4ht.r61097.tar.xz
+2021/11/21 | 8788 | macros/latex/contrib/graphics-def/dvisvgm.def
+2021/11/21 | 87678 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
+2021/11/21 | 8764 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
+2021/11/21 | 872 | indexing/upmendex/doc/samples/option/japanese.idx
+2021/11/21 | 853 | macros/luatex/latex/ekdosis/samples/Makefile
+2021/11/21 | 853411 | macros/latex/contrib/apa7.zip
+2021/11/21 | 841 | indexing/upmendex/doc/samples/mdxsty02.ist
+2021/11/21 | 83336 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
+2021/11/21 | 819185 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
+2021/11/21 | 80766 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
+2021/11/21 | 79543 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
+2021/11/21 | 78762 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
+2021/11/21 | 7869 | indexing/upmendex/source/main.c
+2021/11/21 | 78160 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
+2021/11/21 | 7760 | systems/texlive/tlnet/archive/xetex.r61101.tar.xz
+2021/11/21 | 7715 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
+2021/11/21 | 76895 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
+2021/11/21 | 766 | indexing/upmendex/source/tests/uni.ind
+2021/11/21 | 76111 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
+2021/11/21 | 75 | indexing/upmendex/source/tests/rule1.ist
+2021/11/21 | 749 | indexing/upmendex/doc/samples/option/Makefile
+2021/11/21 | 749264 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
+2021/11/21 | 748895 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
+2021/11/21 | 74242 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
+2021/11/21 | 73884 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
+2021/11/21 | 73348 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
+2021/11/21 | 73114 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
+2021/11/21 | 72228 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
+2021/11/21 | 71916 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
+2021/11/21 | 714562 | indexing/upmendex/source/configure
+2021/11/21 | 71091 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
+2021/11/21 | 70 | indexing/upmendex/source/tests/range1.ist
+2021/11/21 | 7012959 | systems/win32/miktex/tm/packages/koma-script__source.tar.lzma
+2021/11/21 | 69939 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/11/21 | 69708 | macros/latex/contrib/apa7/samples/shortsample.pdf
+2021/11/21 | 68 | indexing/upmendex/source/tests/foo.idx
+2021/11/21 | 685901 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
+2021/11/21 | 68559 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
+2021/11/21 | 6851 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1-tei.xml
+2021/11/21 | 68361 | macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
+2021/11/21 | 6810759 | systems/texlive/tlnet/install-tl-unx.tar.gz
+2021/11/21 | 680815 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
+2021/11/21 | 67622 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
+2021/11/21 | 67459 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
+2021/11/21 | 6700 | macros/latex/contrib/apa7/apa7.ins
+2021/11/21 | 66233 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
+2021/11/21 | 66115 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
+2021/11/21 | 65 | indexing/upmendex/doc/samples/alphabet/mdxsty_es1.ist
+2021/11/21 | 65241 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
+2021/11/21 | 64 | indexing/upmendex/source/tests/uni.dict
+2021/11/21 | 64 | indexing/upmendex/source/tests/attr1.ist
+2021/11/21 | 647 | indexing/upmendex/doc/samples/multi.idx
+2021/11/21 | 64738 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
+2021/11/21 | 64703 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
+2021/11/21 | 64425 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
+2021/11/21 | 64174 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
+2021/11/21 | 63729 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
+2021/11/21 | 633108 | systems/texlive/tlnet/archive/xetex.doc.r61101.tar.xz
+2021/11/21 | 629637 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
+2021/11/21 | 627596 | systems/win32/miktex/tm/packages/next/files.csv.lzma
+2021/11/21 | 627451 | systems/win32/miktex/tm/packages/files.csv.lzma
+2021/11/21 | 62744 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
+2021/11/21 | 62553 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
+2021/11/21 | 624341 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
+2021/11/21 | 61825 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
+2021/11/21 | 614 | indexing/upmendex/doc/samples/russian.idx
+2021/11/21 | 6131797 | systems/win32/miktex/tm/packages/koma-script__doc.tar.lzma
+2021/11/21 | 60 | indexing/upmendex/doc/samples/alphabet/mdxsty_es2.ist
+2021/11/21 | 60545 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
+2021/11/21 | 601748 | systems/texlive/tlnet/archive/easybook.doc.r61098.tar.xz
+2021/11/21 | 59973 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
+2021/11/21 | 597522 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
+2021/11/21 | 58 | indexing/upmendex/source/tests/foo.ind
+2021/11/21 | 589729 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
+2021/11/21 | 5895 | macros/latex/contrib/graphics-def/dvips.def
+2021/11/21 | 5842 | indexing/upmendex/source/qsort.c
+2021/11/21 | 583733 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
+2021/11/21 | 5834 | indexing/upmendex/source/kana.h
+2021/11/21 | 57960 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
+2021/11/21 | 57589 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
+2021/11/21 | 57461 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
+2021/11/21 | 57144 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
+2021/11/21 | 56788 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
+2021/11/21 | 566035 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
+2021/11/21 | 56530 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
+2021/11/21 | 56462 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
+2021/11/21 | 56459 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
+2021/11/21 | 56322 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
+2021/11/21 | 555774 | macros/latex/contrib/apa7/apa7.pdf
+2021/11/21 | 55497 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
+2021/11/21 | 54598 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
+2021/11/21 | 544244 | macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
+2021/11/21 | 531950 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/11/21 | 52389 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
+2021/11/21 | 521 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh22.ist
+2021/11/21 | 51836 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
+2021/11/21 | 51325 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
+2021/11/21 | 51174 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
+2021/11/21 | 51097 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
+2021/11/21 | 510455 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
+2021/11/21 | 50389 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
+2021/11/21 | 50120 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
+2021/11/21 | 5006 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
+2021/11/21 | 4922 | indexing/upmendex/source/c-auto.in
+2021/11/21 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+2021/11/21 | 489 | macros/latex/contrib/graphics-def/README.md
+2021/11/21 | 483385 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
+2021/11/21 | 48269 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
+2021/11/21 | 479668 | install/macros/generic/expkv-cs.tds.zip
+2021/11/21 | 476834 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
+2021/11/21 | 473691 | indexing/upmendex.zip
+2021/11/21 | 472 | systems/texlive/tlnet/archive/lshort-chinese.r61100.tar.xz
+2021/11/21 | 472422 | macros/generic/expkv-cs.zip
+2021/11/21 | 46978 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
+2021/11/21 | 4695 | macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
+2021/11/21 | 46896 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
+2021/11/21 | 46885 | indexing/upmendex/source/Makefile.in
+2021/11/21 | 46526 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
+2021/11/21 | 463 | indexing/upmendex/doc/samples/german.idx
+2021/11/21 | 461749 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
+2021/11/21 | 45927 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
+2021/11/21 | 458679 | macros/generic/expkv-cs/expkv-cs.pdf
+2021/11/21 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
+2021/11/21 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
+2021/11/21 | 45333 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
+2021/11/21 | 452991 | macros/luatex/latex/ekdosis/ekdosis.dtx
+2021/11/21 | 4485 | indexing/upmendex/doc/samples/alphabet/alpha_zhr.idx
+2021/11/21 | 4452 | indexing/upmendex/README.md
+2021/11/21 | 44397 | indexing/upmendex/source/aclocal.m4
+2021/11/21 | 43 | indexing/upmendex/doc/samples/alphabet/mdxsty_es.ist
+2021/11/21 | 435 | indexing/upmendex/source/tests/uni.idx
+2021/11/21 | 435 | indexing/upmendex/doc/samples/french.idx
+2021/11/21 | 4356 | macros/latex/contrib/xassoccnt/xassoccnt_example.tex
+2021/11/21 | 43353 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
+2021/11/21 | 43034 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
+2021/11/21 | 43000 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
+2021/11/21 | 42981 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
+2021/11/21 | 42838 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
+2021/11/21 | 42680 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
+2021/11/21 | 42417 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
+2021/11/21 | 4221 | macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
+2021/11/21 | 4219 | macros/luatex/latex/ekdosis/README.md
+2021/11/21 | 417 | indexing/upmendex/source/tests/rule.idx
+2021/11/21 | 412 | indexing/upmendex/source/exhanzi.h
+2021/11/21 | 41260 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
+2021/11/21 | 40991 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
+2021/11/21 | 4093 | indexing/upmendex/source/tests/upmendex.test
+2021/11/21 | 406 | indexing/upmendex/source/kp.h
+2021/11/21 | 40690 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
+2021/11/21 | 4039 | indexing/upmendex/doc/samples/alphabet/alpha_zh.idx
+2021/11/21 | 401264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61095.tar.xz
+2021/11/21 | 400 | indexing/upmendex/source/qsort.h
+2021/11/21 | 3977 | macros/luatex/latex/ekdosis/Makefile
+2021/11/21 | 393 | indexing/upmendex/doc/samples/Makefile
+2021/11/21 | 39324 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
+2021/11/21 | 392679 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
+2021/11/21 | 3903 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.tex
+2021/11/21 | 39022 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
+2021/11/21 | 38 | indexing/upmendex/source/tests/locale2.ist
+2021/11/21 | 38145 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
+2021/11/21 | 37815 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
+2021/11/21 | 37248 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
+2021/11/21 | 3717 | macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
+2021/11/21 | 36698 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
+2021/11/21 | 36626 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
+2021/11/21 | 36291 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
+2021/11/21 | 35642 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
+2021/11/21 | 35074 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
+2021/11/21 | 347915 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
+2021/11/21 | 34673 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
+2021/11/21 | 340 | indexing/upmendex/doc/samples/greek.idx
+2021/11/21 | 337 | indexing/upmendex/source/ac/withenable.ac
+2021/11/21 | 33652 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
+2021/11/21 | 334 | indexing/upmendex/doc/samples/option/mdxsty_rule0.ist
+2021/11/21 | 333 | indexing/upmendex/source/indexsty
+2021/11/21 | 330840 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
+2021/11/21 | 33080 | indexing/upmendex/source/fwrite.c
+2021/11/21 | 3278 | indexing/upmendex/source/tests/range.idx
+2021/11/21 | 32558 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
+2021/11/21 | 325227 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
+2021/11/21 | 31656 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
+2021/11/21 | 31639 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
+2021/11/21 | 31547 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
+2021/11/21 | 313227 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
+2021/11/21 | 31316 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
+2021/11/21 | 3129328 | systems/texlive/tlnet/archive/dvipdfmx.doc.r61101.tar.xz
+2021/11/21 | 31199 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
+2021/11/21 | 30805 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
+2021/11/21 | 30044 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
+2021/11/21 | 29822 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh31.ist
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh21.ist
+2021/11/21 | 295 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh11.ist
+2021/11/21 | 295370 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
+2021/11/21 | 293 | indexing/upmendex/doc/samples/mdxsty01.ist
+2021/11/21 | 29079 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
+2021/11/21 | 286 | indexing/upmendex/doc/samples/option/mdxsty_j02.ist
+2021/11/21 | 284742 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
+2021/11/21 | 283970 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
+2021/11/21 | 28345 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
+2021/11/21 | 28167 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
+2021/11/21 | 279 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh2.ist
+2021/11/21 | 2796564 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
+2021/11/21 | 278 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh1.ist
+2021/11/21 | 278969 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
+2021/11/21 | 27701 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
+2021/11/21 | 27424 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
+2021/11/21 | 27335 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
+2021/11/21 | 272 | indexing/upmendex/source/tests/uni.ist
+2021/11/21 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j01.ist
+2021/11/21 | 271 | indexing/upmendex/doc/samples/option/mdxsty_j00.ist
+2021/11/21 | 27198 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
+2021/11/21 | 2704 | macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
+2021/11/21 | 2673326 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
+2021/11/21 | 26716 | systems/texlive/tlnet/archive/dvipdfmx.r61101.tar.xz
+2021/11/21 | 2652 | indexing/upmendex/source/mendex.h
+2021/11/21 | 261 | indexing/upmendex/doc/samples/alphabet/mdxsty_head2.ist
+2021/11/21 | 260 | indexing/upmendex/doc/samples/mdxsty00.ist
+2021/11/21 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head3.ist
+2021/11/21 | 260 | indexing/upmendex/doc/samples/alphabet/mdxsty_head1.ist
+2021/11/21 | 258759 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
+2021/11/21 | 25631180 | systems/texlive/tlnet/install-tl.zip
+2021/11/21 | 255203 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
+2021/11/21 | 253880 | indexing/upmendex/man/upmendex.man1.pdf
+2021/11/21 | 252576 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
+2021/11/21 | 25246 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
+2021/11/21 | 252445 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
+2021/11/21 | 250654 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
+2021/11/21 | 25033 | macros/latex/contrib/graphics-def.zip
+2021/11/21 | 25012 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
+2021/11/21 | 25000 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
+2021/11/21 | 243513 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
+2021/11/21 | 2392 | macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
+2021/11/21 | 23900 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
+2021/11/21 | 2359 | indexing/upmendex/source/configure.ac
+2021/11/21 | 23540 | systems/texlive/tlnet/archive/texlive-scripts-extra.r61101.tar.xz
+2021/11/21 | 23353 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
+2021/11/21 | 2322632 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+2021/11/21 | 2311 | indexing/upmendex/source/var.h
+2021/11/21 | 22035 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
+2021/11/21 | 217427 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
+2021/11/21 | 2144 | indexing/upmendex/doc/samples/alphabet/alpha_zhz.idx
+2021/11/21 | 213 | indexing/upmendex/source/tests/pprecA.idx
+2021/11/21 | 21189 | indexing/upmendex/source/sort.c
+2021/11/21 | 21170 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
+2021/11/21 | 20873329 | systems/texlive/tlnet/install-tl-windows.exe
+2021/11/21 | 208023 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
+2021/11/21 | 207 | indexing/upmendex/source/tests/pprecB.idx
+2021/11/21 | 207160 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
+2021/11/21 | 204050 | macros/latex/contrib/apa7/samples/longsample.pdf
+2021/11/21 | 2034 | indexing/upmendex/doc/samples/alphabet/alpha_es.idx
+2021/11/21 | 2031 | macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
+2021/11/21 | 202822 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
+2021/11/21 | 20110 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
+2021/11/21 | 2003280 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
+2021/11/21 | 199530 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
+2021/11/21 | 198314 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
+2021/11/21 | 198065 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
+2021/11/21 | 197411 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
+2021/11/21 | 195703 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
+2021/11/21 | 19515 | indexing/upmendex/source/hanzi.h
+2021/11/21 | 195144 | systems/texlive/tlnet/archive/texlive-scripts-extra.doc.r61101.tar.xz
+2021/11/21 | 194727 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
+2021/11/21 | 19390 | indexing/upmendex/man/upmendex.1
+2021/11/21 | 19351 | indexing/upmendex/doc/upmendex.ja.txt
+2021/11/21 | 19103 | macros/latex/contrib/graphics-def/pdftex.def
+2021/11/21 | 19010 | macros/latex/contrib/graphics-def/luatex.def
+2021/11/21 | 1891 | indexing/upmendex/doc/samples/alphabet/alpha_zhp.idx
+2021/11/21 | 1874 | macros/luatex/latex/ekdosis/ekdosis.ins
+2021/11/21 | 182 | indexing/upmendex/source/tests/pprec0.ist
+2021/11/21 | 18157 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh14.ist
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh13.ist
+2021/11/21 | 1807 | indexing/upmendex/doc/samples/alphabet/mdxsty_zh12.ist
+2021/11/21 | 180125 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
+2021/11/21 | 18006 | macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec4.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec3.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec2.ist
+2021/11/21 | 179 | indexing/upmendex/source/tests/pprec1.ist
+2021/11/21 | 17975 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
+2021/11/21 | 179745 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
+2021/11/21 | 179111 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
+2021/11/21 | 17668 | systems/texlive/tlnet/archive/easybook.source.r61098.tar.xz
+2021/11/21 | 17600 | systems/texlive/tlnet/archive/easybook.r61098.tar.xz
+2021/11/21 | 1741 | macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
+2021/11/21 | 1740 | macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
+2021/11/21 | 171174 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
+2021/11/21 | 1710500 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/11/21 | 16 | indexing/upmendex/source/tests/locale1.ist
+2021/11/21 | 16982320 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
+2021/11/21 | 16447 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
+2021/11/21 | 16372 | systems/win32/miktex/tm/packages/easybook.tar.lzma
+2021/11/21 | 16360 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
+2021/11/21 | 159825 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
+2021/11/21 | 158 | indexing/upmendex/source/tests/uni1.ist
+2021/11/21 | 1561100 | systems/texlive/tlnet/archive/lshort-chinese.doc.r61100.tar.xz
+2021/11/21 | 155920 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
+2021/11/21 | 1557 | macros/latex/contrib/apa7/README.txt
+2021/11/21 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
+2021/11/21 | 153911 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
+2021/11/21 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
+2021/11/21 | 15263 | macros/latex/contrib/graphics-def/xetex.def
+2021/11/21 | 149292 | systems/texlive/tlnet/archive/fancyvrb.doc.r61099.tar.xz
+2021/11/21 | 14790 | indexing/upmendex/source/fread.c
+2021/11/21 | 1477 | indexing/upmendex/doc/samples/korean.idx
+2021/11/21 | 147416 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
+2021/11/21 | 1471880 | systems/win32/miktex/tm/packages/lshort-zh-cn.tar.lzma
+2021/11/21 | 1470954 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
+2021/11/21 | 1464 | indexing/upmendex/COPYRIGHT
+2021/11/21 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
+2021/11/21 | 145011 | macros/latex/contrib/apa7/apa7.dtx
+2021/11/21 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+2021/11/21 | 1435 | indexing/upmendex/source/exvar.h
+2021/11/21 | 14337 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
+2021/11/21 | 1422198 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
+2021/11/21 | 14013 | macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
+2021/11/21 | 139 | indexing/upmendex/source/tests/uni2.ist
+2021/11/21 | 139844 | systems/win32/miktex/tm/packages/fancyvrb__doc.tar.lzma
+2021/11/21 | 1387464 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
+2021/11/21 | 1387046 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
+2021/11/21 | 1379 | indexing/upmendex/doc/samples/alphabet/Makefile
+2021/11/21 | 136769 | systems/win32/miktex/tm/packages/koma-script.tar.lzma
+2021/11/21 | 136713 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
+2021/11/21 | 136384 | systems/texlive/tlnet/archive/tex4ht.doc.r61097.tar.xz
+2021/11/21 | 1362 | indexing/upmendex/source/Makefile.am
+2021/11/21 | 136278 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
+2021/11/21 | 1349 | indexing/upmendex/source/exkana.h
+2021/11/21 | 1348 | indexing/upmendex/source/tests/locale1.ind
+2021/11/21 | 1346945 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
+2021/11/21 | 13458 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
+2021/11/21 | 133958 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
+2021/11/21 | 13105 | indexing/upmendex/source/styfile.c
+2021/11/21 | 1300866 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
+2021/11/21 | 1297 | macros/generic/expkv-cs/README.md
+2021/11/21 | 1295 | macros/latex/contrib/xassoccnt/README
+2021/11/21 | 1290584 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
+2021/11/21 | 1287224 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
+2021/11/21 | 1286 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
+2021/11/21 | 1286655 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
+2021/11/21 | 12854 | macros/latex/contrib/graphics-def/dvipdfmx.def
+2021/11/21 | 1274 | indexing/upmendex/source/tests/locale2-rule.ind
+2021/11/21 | 124757 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
+2021/11/21 | 1240 | indexing/upmendex/doc/samples/option/attri1.idx
+2021/11/21 | 123700 | macros/latex/contrib/xassoccnt/xassoccnt.sty
+2021/11/21 | 1231 | indexing/upmendex/doc/samples/mdxsty03.ist
+2021/11/21 | 1228 | macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
+2021/11/21 | 1225152 | systems/texlive/tlnet/archive/tex4ht.source.r61097.tar.xz
+2021/11/21 | 12221 | macros/luatex/latex/ekdosis/ekdosis.el
+2021/11/21 | 12111 | systems/win32/miktex/tm/packages/fancyvrb.tar.lzma
+2021/11/21 | 1200 | indexing/upmendex/source/tests/rule.ind
+2021/11/21 | 1200 | indexing/upmendex/source/tests/attr1.ind
+2021/11/21 | 1200 | indexing/upmendex/doc/samples/alphabet/alpha_zhs.idx
+2021/11/21 | 119742 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
+2021/11/21 | 1190 | indexing/upmendex/source/kp.c
+2021/11/21 | 11902 | macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
+2021/11/21 | 1187786 | macros/latex/contrib/xassoccnt.zip
+2021/11/21 | 11868 | systems/texlive/tlnet/archive/fancyvrb.r61099.tar.xz
+2021/11/21 | 117 | indexing/upmendex/source/tests/rule4.ist
+2021/11/21 | 117747 | macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
+2021/11/21 | 117711 | macros/generic/expkv-cs/expkv-cs.dtx
+2021/11/21 | 1169 | indexing/upmendex/source/tests/range2.ind
+2021/11/21 | 1169820 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
+2021/11/21 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
+2021/11/21 | 115233 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
+2021/11/21 | 112898 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
+2021/11/21 | 112596 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
+2021/11/21 | 10929 | systems/win32/miktex/tm/packages/fancyvrb__source.tar.lzma
+2021/11/21 | 109074 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
+2021/11/21 | 108300 | systems/texlive/tlnet/archive/texlive-scripts.r61095.tar.xz
+2021/11/21 | 10783 | indexing/upmendex/source/ChangeLog
+2021/11/21 | 1077 | indexing/upmendex/source/tests/range3.ind
+2021/11/21 | 1077 | indexing/upmendex/source/tests/range1.ind
+2021/11/21 | 1076111 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
+2021/11/21 | 107430 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
+2021/11/21 | 1054 | indexing/upmendex/source/pageread.c
+2021/11/21 | 103993 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
+2021/11/21 | 103389 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
+2021/11/21 | 100487 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
+2021/11/21 | 100072 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/11/20 | 9565 | info/lshort/chinese/src/lshort-zh-cn-style.sty
-2021/11/20 | 95611 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-x64-2.9.tar.lzma
-2021/11/20 | 94786 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-2.9.tar.lzma
-2021/11/20 | 94348 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-2.9.tar.lzma
-2021/11/20 | 936 | systems/win32/miktex/tm/packages/pr.ini
2021/11/20 | 9050 | systems/win32/miktex/tm/packages/graphics-pln.tar.lzma
2021/11/20 | 890 | systems/win32/miktex/tm/packages/texdimens.tar.lzma
-2021/11/20 | 87688 | systems/win32/miktex/tm/packages/next/miktex-png-bin-x64-2.9.tar.lzma
-2021/11/20 | 8761 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-x64-2.9.tar.lzma
2021/11/20 | 8735 | systems/win32/miktex/tm/packages/hypdoc__source.tar.lzma
2021/11/20 | 8516338 | systems/win32/miktex/tm/packages/oberdiek__doc.tar.lzma
-2021/11/20 | 83783 | systems/win32/miktex/tm/packages/next/miktex-bibtex8bit-bin-2.9.tar.lzma
-2021/11/20 | 818524 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-x64-2.9.tar.lzma
2021/11/20 | 81304 | systems/win32/miktex/tm/packages/hitszthesis__source.tar.lzma
2021/11/20 | 81299 | macros/latex/contrib/easybook/easybook.tex
2021/11/20 | 81052 | systems/win32/miktex/tm/packages/pstricks.tar.lzma
2021/11/20 | 80804 | macros/latex/contrib/easybook/easybook.dtx
-2021/11/20 | 80622 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-x64-2.9.tar.lzma
2021/11/20 | 8036 | info/lshort/chinese/src/chap/app.A.install.tex
2021/11/20 | 7983 | systems/win32/miktex/tm/packages/latex-firstaid-dev__source.tar.lzma
-2021/11/20 | 78780 | systems/win32/miktex/tm/packages/next/miktex-png-bin-2.9.tar.lzma
2021/11/20 | 7855829 | macros/latex/contrib/koma-script.zip
-2021/11/20 | 78137 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-x64-2.9.tar.lzma
-2021/11/20 | 7713 | systems/win32/miktex/tm/packages/next/miktex-md5-bin-2.9.tar.lzma
-2021/11/20 | 76834 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-x64-2.9.tar.lzma
2021/11/20 | 76172 | systems/win32/miktex/tm/packages/utf8add__doc.tar.lzma
-2021/11/20 | 76143 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-x64-2.9.tar.lzma
-2021/11/20 | 750201 | systems/win32/miktex/tm/packages/next/miktex-pdftex-bin-2.9.tar.lzma
-2021/11/20 | 746271 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-x64-2.9.tar.lzma
-2021/11/20 | 74235 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-x64-2.9.tar.lzma
2021/11/20 | 7397 | systems/win32/miktex/tm/packages/mathalpha.tar.lzma
2021/11/20 | 7340648 | systems/win32/miktex/tm/packages/pstricks__doc.tar.lzma
-2021/11/20 | 73345 | systems/win32/miktex/tm/packages/next/miktex-fonts-bin-2.9.tar.lzma
-2021/11/20 | 73156 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-x64-2.9.tar.lzma
-2021/11/20 | 72293 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-x64-2.9.tar.lzma
-2021/11/20 | 71619 | systems/win32/miktex/tm/packages/next/miktex-freeglut-bin-2.9.tar.lzma
-2021/11/20 | 71079 | systems/win32/miktex/tm/packages/next/miktex-web-bin-x64-2.9.tar.lzma
-2021/11/20 | 69930 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-x64-2.9.tar.lzma
+2021/11/20 | 6972 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/11/20 | 691216 | systems/win32/miktex/tm/packages/thubeamer__doc.tar.lzma
-2021/11/20 | 69038 | systems/win32/miktex/tm/packages/next/miktex-bibtex-bin-2.9.tar.lzma
-2021/11/20 | 686051 | systems/win32/miktex/tm/packages/next/miktex-ptex-bin-2.9.tar.lzma
-2021/11/20 | 681566 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-x64-2.9.tar.lzma
-2021/11/20 | 68110 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-x64-2.9.tar.lzma
-2021/11/20 | 6810839 | systems/texlive/tlnet/install-tl-unx.tar.gz
2021/11/20 | 679926 | systems/win32/miktex/tm/packages/latex-base-dev__source.tar.lzma
-2021/11/20 | 67614 | systems/win32/miktex/tm/packages/next/miktex-lzma-bin-2.9.tar.lzma
-2021/11/20 | 67504 | systems/win32/miktex/tm/packages/next/miktex-mpmcli-bin-2.9.tar.lzma
2021/11/20 | 67396 | systems/win32/miktex/tm/packages/latexindent.tar.lzma
-2021/11/20 | 66314 | systems/win32/miktex/tm/packages/next/miktex-web-bin-2.9.tar.lzma
-2021/11/20 | 66099 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-x64-2.9.tar.lzma
-2021/11/20 | 64405 | systems/win32/miktex/tm/packages/next/miktex-graphite2-bin-2.9.tar.lzma
-2021/11/20 | 64162 | systems/win32/miktex/tm/packages/next/miktex-ps2pk-bin-2.9.tar.lzma
-2021/11/20 | 63716 | systems/win32/miktex/tm/packages/next/miktex-tex4ht-bin-2.9.tar.lzma
-2021/11/20 | 629684 | systems/win32/miktex/tm/packages/next/miktex-lcdf-typetools-bin-2.9.tar.lzma
-2021/11/20 | 628656 | systems/win32/miktex/tm/packages/next/files.csv.lzma
-2021/11/20 | 628470 | systems/win32/miktex/tm/packages/files.csv.lzma
-2021/11/20 | 62779 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-x64-2.9.tar.lzma
-2021/11/20 | 624499 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-x64-2.9.tar.lzma
-2021/11/20 | 62439 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-x64-2.9.tar.lzma
2021/11/20 | 62340 | systems/texlive/tlnet/archive/siunitx.r61093.tar.xz
2021/11/20 | 622450 | macros/latex/contrib/easybook.zip
2021/11/20 | 61823 | systems/win32/miktex/tm/packages/siunitx.tar.lzma
-2021/11/20 | 61817 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-x64-2.9.tar.lzma
-2021/11/20 | 60688 | systems/win32/miktex/tm/packages/next/miktex-mkfntmap-bin-2.9.tar.lzma
-2021/11/20 | 60048 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin-x64.tar.lzma
-2021/11/20 | 596619 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-x64-2.9.tar.lzma
-2021/11/20 | 590226 | systems/win32/miktex/tm/packages/next/miktex-yap-bin-2.9.tar.lzma
-2021/11/20 | 584101 | systems/win32/miktex/tm/packages/easybook__doc.tar.lzma
2021/11/20 | 581062 | macros/latex/contrib/easybook/easybook.pdf
-2021/11/20 | 58032 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-x64-2.9.tar.lzma
2021/11/20 | 577324 | systems/win32/miktex/tm/packages/hologo__doc.tar.lzma
-2021/11/20 | 57595 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-x64-2.9.tar.lzma
2021/11/20 | 5752 | systems/win32/miktex/tm/packages/formal-grammar__source.tar.lzma
-2021/11/20 | 57421 | systems/win32/miktex/tm/packages/next/miktex-texify-bin-2.9.tar.lzma
-2021/11/20 | 57106 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin-x64.tar.lzma
-2021/11/20 | 56848 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-x64-2.9.tar.lzma
-2021/11/20 | 566097 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-x64-2.9.tar.lzma
-2021/11/20 | 56563 | systems/win32/miktex/tm/packages/next/miktex-tdsutil-bin.tar.lzma
-2021/11/20 | 56482 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-x64-2.9.tar.lzma
-2021/11/20 | 56320 | systems/win32/miktex/tm/packages/next/miktex-ttf2pk2-bin-2.9.tar.lzma
-2021/11/20 | 56292 | systems/win32/miktex/tm/packages/next/miktex-fmt-bin-2.9.tar.lzma
-2021/11/20 | 55538 | systems/win32/miktex/tm/packages/next/miktex-xml2pmx-bin.tar.lzma
-2021/11/20 | 54651 | systems/win32/miktex/tm/packages/next/miktex-cweb-bin-2.9.tar.lzma
-2021/11/20 | 531949 | systems/win32/miktex/tm/packages/next/miktex-libressl-bin-2.9.tar.lzma
+2021/11/20 | 5287 | support/TeX4ht/source/tex4ht-mathjax.tex
2021/11/20 | 5284146 | systems/win32/miktex/tm/packages/latex-tools-dev__doc.tar.lzma
2021/11/20 | 52520 | systems/win32/miktex/tm/packages/fontools.tar.lzma
-2021/11/20 | 52440 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-x64-2.9.tar.lzma
-2021/11/20 | 51810 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-x64-2.9.tar.lzma
-2021/11/20 | 51321 | systems/win32/miktex/tm/packages/next/miktex-cjkutils-bin-2.9.tar.lzma
-2021/11/20 | 51244 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-x64-2.9.tar.lzma
-2021/11/20 | 51131 | systems/win32/miktex/tm/packages/next/miktex-arctrl-bin-2.9.tar.lzma
-2021/11/20 | 510642 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-x64-2.9.tar.lzma
-2021/11/20 | 50354 | systems/win32/miktex/tm/packages/next/miktex-psutils-bin-2.9.tar.lzma
-2021/11/20 | 50136 | systems/win32/miktex/tm/packages/next/miktex-bibarts-bin-2.9.tar.lzma
-2021/11/20 | 5003 | systems/win32/miktex/tm/packages/next/miktex-config-2.9.tar.lzma
2021/11/20 | 4910 | systems/win32/miktex/tm/packages/bodeplot.tar.lzma
-2021/11/20 | 48 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
-2021/11/20 | 483645 | systems/win32/miktex/tm/packages/next/miktex-harfbuzz-bin-2.9.tar.lzma
-2021/11/20 | 48263 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-x64-2.9.tar.lzma
-2021/11/20 | 476871 | systems/win32/miktex/tm/packages/next/miktex-log4cxx-bin-2.9.tar.lzma
2021/11/20 | 4720 | systems/texlive/tlnet/archive/bodeplot.r61092.tar.xz
2021/11/20 | 47066 | info/lshort/chinese/src/chap/chap.03.elements.tex
-2021/11/20 | 46862 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-x64-2.9.tar.lzma
2021/11/20 | 4655 | info/lshort/chinese/src/chap/biblio.tex
-2021/11/20 | 46491 | systems/win32/miktex/tm/packages/next/miktex-dvicopy-bin-2.9.tar.lzma
-2021/11/20 | 461862 | systems/win32/miktex/tm/packages/next/miktex-doc.tar.lzma
-2021/11/20 | 45936 | systems/win32/miktex/tm/packages/next/miktex-m-tx-bin-2.9.tar.lzma
2021/11/20 | 4572 | systems/win32/miktex/tm/packages/utf8add.tar.lzma
-2021/11/20 | 455 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl.zip.sha512.asc
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl-windows.exe.sha512.asc
-2021/11/20 | 455 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512.asc
-2021/11/20 | 45297 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-x64-2.9.tar.lzma
2021/11/20 | 440690 | systems/win32/miktex/tm/packages/bodeplot__doc.tar.lzma
2021/11/20 | 440328 | systems/texlive/tlnet/archive/bodeplot.doc.r61092.tar.xz
2021/11/20 | 43854 | macros/latex/contrib/fancyvrb/latex/fancyvrb.sty
-2021/11/20 | 43386 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-x64-2.9.tar.lzma
-2021/11/20 | 43043 | systems/win32/miktex/tm/packages/next/miktex-expat-bin-2.9.tar.lzma
-2021/11/20 | 42964 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-x64-2.9.tar.lzma
2021/11/20 | 42890 | systems/win32/miktex/tm/packages/latex-tools-dev.tar.lzma
2021/11/20 | 42878 | systems/win32/miktex/tm/packages/oberdiek.tar.lzma
-2021/11/20 | 42858 | systems/win32/miktex/tm/packages/next/miktex-mtprint-bin-2.9.tar.lzma
-2021/11/20 | 42695 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-x64-2.9.tar.lzma
-2021/11/20 | 42458 | systems/win32/miktex/tm/packages/next/miktex-synctex-bin-2.9.tar.lzma
-2021/11/20 | 41236 | systems/win32/miktex/tm/packages/next/miktex-dvipng-bin-2.9.tar.lzma
2021/11/20 | 4078 | systems/win32/miktex/tm/packages/exesheet.tar.lzma
-2021/11/20 | 40395 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin-x64.tar.lzma
2021/11/20 | 39979 | info/lshort/chinese/src/chap/chap.05.style.tex
2021/11/20 | 3982 | systems/win32/miktex/tm/packages/utf8add__source.tar.lzma
-2021/11/20 | 39351 | systems/win32/miktex/tm/packages/easybook__source.tar.lzma
-2021/11/20 | 392526 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-x64-2.9.tar.lzma
-2021/11/20 | 39203 | systems/win32/miktex/tm/packages/next/miktex-zlib-bin-2.9.tar.lzma
-2021/11/20 | 38123 | systems/win32/miktex/tm/packages/next/miktex-gsf2pk-bin-2.9.tar.lzma
-2021/11/20 | 37798 | systems/win32/miktex/tm/packages/next/miktex-mthelp-bin-2.9.tar.lzma
-2021/11/20 | 37383 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin-x64.tar.lzma
-2021/11/20 | 37233 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-x64-2.9.tar.lzma
2021/11/20 | 3697 | systems/win32/miktex/tm/packages/hypdoc.tar.lzma
2021/11/20 | 36707 | info/lshort/chinese/src/chap/chap.04.math.tex
-2021/11/20 | 36604 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-x64-2.9.tar.lzma
2021/11/20 | 3659 | info/lshort/chinese/src/chap/preface.overview.tex
2021/11/20 | 3603 | systems/win32/miktex/tm/packages/pst-arrow.tar.lzma
-2021/11/20 | 35994 | systems/win32/miktex/tm/packages/next/miktex-patgen-bin.tar.lzma
2021/11/20 | 3512 | systems/win32/miktex/tm/packages/latex-firstaid-dev.tar.lzma
-2021/11/20 | 35063 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-x64-2.9.tar.lzma
-2021/11/20 | 347655 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-x64-2.9.tar.lzma
-2021/11/20 | 34660 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-x64-2.9.tar.lzma
-2021/11/20 | 33662 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-x64-2.9.tar.lzma
-2021/11/20 | 33534 | systems/win32/miktex/tm/packages/next/miktex-upmendex-bin.tar.lzma
2021/11/20 | 33396 | info/lshort/chinese/src/chap/chap.06.spec.tex
-2021/11/20 | 330666 | systems/win32/miktex/tm/packages/next/miktex-cairo-bin-2.9.tar.lzma
-2021/11/20 | 32671 | systems/win32/miktex/tm/packages/next/miktex-chktex-bin-2.9.tar.lzma
-2021/11/20 | 325079 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-x64-2.9.tar.lzma
2021/11/20 | 323074 | systems/win32/miktex/tm/packages/hypdoc__doc.tar.lzma
-2021/11/20 | 31634 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-x64-2.9.tar.lzma
-2021/11/20 | 31530 | systems/win32/miktex/tm/packages/next/miktex-posix-bin-2.9.tar.lzma
-2021/11/20 | 31338 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-x64-2.9.tar.lzma
-2021/11/20 | 313384 | systems/win32/miktex/tm/packages/next/miktex-xetex-bin-2.9.tar.lzma
-2021/11/20 | 31223 | systems/win32/miktex/tm/packages/next/miktex-mspack-bin-2.9.tar.lzma
-2021/11/20 | 30809 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-x64-2.9.tar.lzma
-2021/11/20 | 30057 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-x64-2.9.tar.lzma
-2021/11/20 | 29819 | systems/win32/miktex/tm/packages/next/miktex-axohelp-bin-2.9.tar.lzma
-2021/11/20 | 295416 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-x64-2.9.tar.lzma
2021/11/20 | 29464 | systems/win32/miktex/tm/packages/hitszthesis.tar.lzma
-2021/11/20 | 29084 | systems/win32/miktex/tm/packages/next/miktex-autosp-bin-2.9.tar.lzma
-2021/11/20 | 285002 | systems/win32/miktex/tm/packages/next/miktex-dvipdfmx-bin-2.9.tar.lzma
-2021/11/20 | 283968 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-x64-2.9.tar.lzma
-2021/11/20 | 28287 | systems/win32/miktex/tm/packages/next/miktex-lacheck-bin-2.9.tar.lzma
-2021/11/20 | 28177 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-x64-2.9.tar.lzma
-2021/11/20 | 2796591 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-x64-2.9.tar.lzma
-2021/11/20 | 278930 | systems/win32/miktex/tm/packages/next/miktex-console-bin-x64-2.9.tar.lzma
2021/11/20 | 27737525 | systems/win32/miktex/tm/packages/latex-base-dev__doc.tar.lzma
-2021/11/20 | 27693 | systems/win32/miktex/tm/packages/next/miktex-uriparser-bin-2.9.tar.lzma
-2021/11/20 | 27400 | systems/win32/miktex/tm/packages/next/miktex-makeindex-bin-2.9.tar.lzma
-2021/11/20 | 27288 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-x64-2.9.tar.lzma
-2021/11/20 | 27179 | systems/win32/miktex/tm/packages/next/miktex-bzip2-bin-2.9.tar.lzma
2021/11/20 | 27130 | info/lshort/chinese/src/chap/chap.01.basics.tex
-2021/11/20 | 2672111 | systems/win32/miktex/tm/packages/next/miktex-texworks-bin-2.9.tar.lzma
2021/11/20 | 2665 | systems/win32/miktex/tm/packages/graphics-pln__doc.tar.lzma
-2021/11/20 | 258837 | systems/win32/miktex/tm/packages/next/miktex-freetype2-bin-2.9.tar.lzma
-2021/11/20 | 25631191 | systems/texlive/tlnet/install-tl.zip
-2021/11/20 | 255221 | systems/win32/miktex/tm/packages/next/miktex-console-bin-2.9.tar.lzma
-2021/11/20 | 252510 | systems/win32/miktex/tm/packages/next/miktex-zzdb1-2.9.tar.lzma
-2021/11/20 | 252374 | systems/win32/miktex/tm/packages/miktex-zzdb1-2.9.tar.lzma
-2021/11/20 | 25222 | systems/win32/miktex/tm/packages/next/miktex-teckit-bin-2.9.tar.lzma
-2021/11/20 | 250328 | systems/win32/miktex/tm/packages/next/miktex-metapost-bin-2.9.tar.lzma
-2021/11/20 | 25006 | systems/win32/miktex/tm/packages/next/miktex-findtexmf-bin-2.9.tar.lzma
-2021/11/20 | 24994 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-x64-2.9.tar.lzma
-2021/11/20 | 243406 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-x64-2.9.tar.lzma
2021/11/20 | 2394894 | systems/win32/miktex/tm/packages/latex-amsmath-dev__doc.tar.lzma
-2021/11/20 | 23900 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-x64-2.9.tar.lzma
-2021/11/20 | 23394 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-x64-2.9.tar.lzma
2021/11/20 | 233427 | systems/win32/miktex/tm/packages/latex-firstaid-dev__doc.tar.lzma
-2021/11/20 | 2322864 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
2021/11/20 | 22989 | info/lshort/chinese/src/chap/fdl.tex
2021/11/20 | 228576 | systems/win32/miktex/tm/packages/latex-tools-dev__source.tar.lzma
-2021/11/20 | 22030 | systems/win32/miktex/tm/packages/next/miktex-fribidixetex-bin-2.9.tar.lzma
2021/11/20 | 219704 | systems/win32/miktex/tm/packages/latex-base-dev.tar.lzma
-2021/11/20 | 215384 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-x64-2.9.tar.lzma
-2021/11/20 | 21169 | systems/win32/miktex/tm/packages/next/miktex-devnag-bin-2.9.tar.lzma
-2021/11/20 | 20872238 | systems/texlive/tlnet/install-tl-windows.exe
-2021/11/20 | 208323 | systems/win32/miktex/tm/packages/next/miktex-pmx-bin-2.9.tar.lzma
-2021/11/20 | 206800 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-x64-2.9.tar.lzma
2021/11/20 | 2045049 | systems/win32/miktex/tm/packages/arara__doc.tar.lzma
2021/11/20 | 2042255 | systems/win32/miktex/tm/packages/siunitx__doc.tar.lzma
2021/11/20 | 2038280 | systems/texlive/tlnet/archive/siunitx.doc.r61093.tar.xz
-2021/11/20 | 202986 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-x64-2.9.tar.lzma
2021/11/20 | 2028939 | systems/win32/miktex/tm/packages/latex-graphics-dev__doc.tar.lzma
-2021/11/20 | 20122 | systems/win32/miktex/tm/packages/next/miktex-popt-bin-2.9.tar.lzma
2021/11/20 | 20086 | systems/win32/miktex/tm/packages/hologo__source.tar.lzma
-2021/11/20 | 2002249 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-x64-2.9.tar.lzma
-2021/11/20 | 199588 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-2.9.tar.lzma
-2021/11/20 | 198083 | systems/win32/miktex/tm/packages/next/miktex-pixman-bin-2.9.tar.lzma
-2021/11/20 | 197418 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-x64-2.9.tar.lzma
-2021/11/20 | 196720 | systems/win32/miktex/tm/packages/next/miktex-metafont-bin-2.9.tar.lzma
-2021/11/20 | 195745 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-x64-2.9.tar.lzma
2021/11/20 | 1948 | systems/win32/miktex/tm/packages/formal-grammar.tar.lzma
-2021/11/20 | 194858 | systems/win32/miktex/tm/packages/next/miktex-omegaware-bin-2.9.tar.lzma
2021/11/20 | 193065 | systems/win32/miktex/tm/packages/formal-grammar__doc.tar.lzma
2021/11/20 | 18920 | systems/win32/miktex/tm/packages/texdimens__source.tar.lzma
2021/11/20 | 1891025 | systems/win32/miktex/tm/packages/mathalpha__doc.tar.lzma
-2021/11/20 | 18152 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-x64-2.9.tar.lzma
-2021/11/20 | 180022 | systems/win32/miktex/tm/packages/next/miktex-mpfr-bin-x64-2.9.tar.lzma
-2021/11/20 | 179997 | systems/win32/miktex/tm/packages/next/miktex-curl-bin-2.9.tar.lzma
-2021/11/20 | 17967 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-x64-2.9.tar.lzma
-2021/11/20 | 179074 | systems/win32/miktex/tm/packages/next/miktex-mo-bin-2.9.tar.lzma
2021/11/20 | 178367 | systems/win32/miktex/tm/packages/exesheet__doc.tar.lzma
-2021/11/20 | 170630 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-x64-2.9.tar.lzma
-2021/11/20 | 16981965 | systems/texlive/tlnet/tlpkg/texlive.tlpdb
-2021/11/20 | 1686560 | systems/win32/miktex/tm/packages/next/miktex-luatex-bin-2.9.tar.lzma
+2021/11/20 | 167304 | support/TeX4ht/source/ChangeLog
2021/11/20 | 16728 | systems/win32/miktex/tm/packages/exesheet__source.tar.lzma
-2021/11/20 | 16594 | systems/win32/miktex/tm/packages/easybook.tar.lzma
-2021/11/20 | 16428 | systems/win32/miktex/tm/packages/next/miktex-tex2xindy-bin-2.9.tar.lzma
2021/11/20 | 164112 | macros/latex/contrib/fancyvrb.zip
-2021/11/20 | 16354 | systems/win32/miktex/tm/packages/next/miktex-kpathsea-bin-2.9.tar.lzma
2021/11/20 | 1606418 | systems/win32/miktex/tm/packages/hitszthesis__doc.tar.lzma
-2021/11/20 | 159707 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-x64-2.9.tar.lzma
2021/11/20 | 1589261 | info/lshort/chinese.zip
-2021/11/20 | 157102 | systems/win32/miktex/tm/packages/next/miktex-tex-bin-2.9.tar.lzma
-2021/11/20 | 153 | systems/texlive/tlnet/install-tl-windows.exe.sha512
-2021/11/20 | 153986 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-x64-2.9.tar.lzma
-2021/11/20 | 152 | systems/texlive/tlnet/install-tl-unx.tar.gz.sha512
-2021/11/20 | 147304 | systems/win32/miktex/tm/packages/next/miktex-hunspell-bin-2.9.tar.lzma
2021/11/20 | 1472258 | info/lshort/chinese/lshort-zh-cn.pdf
-2021/11/20 | 1471002 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-x64-2.9.tar.lzma
-2021/11/20 | 145 | systems/texlive/tlnet/install-tl.zip.sha512
2021/11/20 | 14580335 | install/macros/latex/contrib/koma-script.tds.zip
-2021/11/20 | 144 | systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
-2021/11/20 | 14360 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-x64-2.9.tar.lzma
-2021/11/20 | 1416384 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-x64-2.9.tar.lzma
2021/11/20 | 14145 | systems/win32/miktex/tm/packages/bodeplot__source.tar.lzma
2021/11/20 | 1413 | info/lshort/chinese/README.md
-2021/11/20 | 1388495 | systems/win32/miktex/tm/packages/next/miktex-zzdb2-2.9.tar.lzma
-2021/11/20 | 1386882 | systems/win32/miktex/tm/packages/miktex-zzdb2-2.9.tar.lzma
-2021/11/20 | 136713 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-x64-2.9.tar.lzma
2021/11/20 | 13632 | systems/texlive/tlnet/archive/bodeplot.source.r61092.tar.xz
-2021/11/20 | 136324 | systems/win32/miktex/tm/packages/next/miktex-fontconfig-bin-2.9.tar.lzma
-2021/11/20 | 1345607 | systems/win32/miktex/tm/packages/next/miktex-runtime-bin-2.9.tar.lzma
-2021/11/20 | 13431 | systems/win32/miktex/tm/packages/next/miktex-zzip-bin-2.9.tar.lzma
-2021/11/20 | 133874 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-x64-2.9.tar.lzma
2021/11/20 | 132219 | systems/win32/miktex/tm/packages/pst-arrow__doc.tar.lzma
2021/11/20 | 13185 | systems/win32/miktex/tm/packages/thubeamer.tar.lzma
-2021/11/20 | 1302023 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-x64-2.9.tar.lzma
-2021/11/20 | 1287159 | systems/win32/miktex/tm/packages/next/miktex-zzdb3-2.9.tar.lzma
-2021/11/20 | 1287068 | systems/win32/miktex/tm/packages/miktex-zzdb3-2.9.tar.lzma
-2021/11/20 | 1283158 | systems/win32/miktex/tm/packages/next/miktex-dvisvgm-bin-2.9.tar.lzma
2021/11/20 | 127451 | systems/win32/miktex/tm/packages/fontools__doc.tar.lzma
-2021/11/20 | 124730 | systems/win32/miktex/tm/packages/next/miktex-mktex-bin-2.9.tar.lzma
2021/11/20 | 1240 | info/lshort/chinese/README-zh.md
2021/11/20 | 122693 | systems/win32/miktex/tm/packages/thubeamer__source.tar.lzma
-2021/11/20 | 119960 | systems/win32/miktex/tm/packages/next/miktex-dvips-bin-2.9.tar.lzma
2021/11/20 | 117817 | systems/win32/miktex/tm/packages/latexindent__source.tar.lzma
-2021/11/20 | 1170754 | systems/win32/miktex/tm/packages/next/miktex-poppler-bin-2.9.tar.lzma
-2021/11/20 | 1153 | systems/win32/miktex/tm/packages/next/pr.ini
-2021/11/20 | 115346 | systems/win32/miktex/tm/packages/next/miktex-gregorio-bin-x64-2.9.tar.lzma
2021/11/20 | 115201 | systems/win32/miktex/tm/packages/texdimens__doc.tar.lzma
2021/11/20 | 1142 | info/lshort/chinese/src/lshort-zh-cn.tex
2021/11/20 | 114239 | systems/win32/miktex/tm/packages/oberdiek__source.tar.lzma
-2021/11/20 | 112933 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-x64-2.9.tar.lzma
-2021/11/20 | 112326 | systems/win32/miktex/tm/packages/next/miktex-gd-bin-x64-2.9.tar.lzma
-2021/11/20 | 109008 | systems/win32/miktex/tm/packages/next/miktex-jpeg-bin-x64-2.9.tar.lzma
2021/11/20 | 107941 | systems/win32/miktex/tm/packages/siunitx__source.tar.lzma
2021/11/20 | 107808 | systems/texlive/tlnet/archive/siunitx.source.r61093.tar.xz
-2021/11/20 | 1075755 | systems/win32/miktex/tm/packages/next/miktex-asymptote-bin-x64-2.9.tar.lzma
-2021/11/20 | 107474 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-x64-2.9.tar.lzma
2021/11/20 | 10425045 | systems/win32/miktex/tm/packages/arara.tar.lzma
-2021/11/20 | 103794 | systems/win32/miktex/tm/packages/next/miktex-mfware-bin-x64-2.9.tar.lzma
-2021/11/20 | 103393 | systems/win32/miktex/tm/packages/next/miktex-lua53-bin-x64-2.9.tar.lzma
2021/11/20 | 10139 | systems/win32/miktex/tm/packages/hologo.tar.lzma
2021/11/20 | 1012394 | systems/win32/miktex/tm/packages/latexindent__doc.tar.lzma
2021/11/20 | 100785 | systems/win32/miktex/tm/packages/arara__source.tar.lzma
-2021/11/20 | 100351 | systems/win32/miktex/tm/packages/next/miktex-epstopdf-bin-2.9.tar.lzma
-2021/11/20 | 100081 | systems/win32/miktex/tm/packages/next/miktex-texware-bin-2.9.tar.lzma
2021/11/19 | 7156 | systems/texlive/tlnet/archive/mathalpha.r61089.tar.xz
2021/11/19 | 458165 | graphics/pgf/contrib/bodeplot.zip
2021/11/19 | 41100 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.tex
-2021/11/19 | 401264 | systems/texlive/tlnet/archive/texlive-scripts.doc.r61088.tar.xz
2021/11/19 | 1888792 | systems/texlive/tlnet/archive/mathalpha.doc.r61089.tar.xz
2021/11/19 | 1729 | macros/latex/contrib/fancyvrb/Changes
2021/11/19 | 140917 | macros/latex/contrib/fancyvrb/doc/fancyvrb-doc.pdf
-2021/11/19 | 108308 | systems/texlive/tlnet/archive/texlive-scripts.r61088.tar.xz
2021/11/18 | 996 | macros/latex/contrib/siunitx/README.md
2021/11/18 | 98475 | macros/latex/contrib/siunitx/siunitx-unit.dtx
2021/11/18 | 9572 | macros/latex/contrib/siunitx/siunitx-symbol.dtx
@@ -309,10 +513,8 @@
2021/11/18 | 86928 | systems/texlive/tlnet/archive/pstricks.r61084.tar.xz
2021/11/18 | 75632 | graphics/pgf/contrib/bodeplot/bodeplot.dtx
2021/11/18 | 7526604 | systems/texlive/tlnet/archive/pstricks.doc.r61084.tar.xz
-2021/11/18 | 7018 | systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
2021/11/18 | 638365 | macros/latex/contrib/siunitx/siunitx.pdf
2021/11/18 | 61038 | macros/latex/contrib/siunitx/CHANGELOG.md
-2021/11/18 | 602076 | systems/texlive/tlnet/archive/easybook.doc.r61085.tar.xz
2021/11/18 | 58 | systems/mac/mactex/MacTeXtras-20211118.zip.md5
2021/11/18 | 57446 | macros/latex/contrib/mathalpha/tex/mathalpha.sty
2021/11/18 | 50716 | macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -338,8 +540,6 @@
2021/11/18 | 2059096 | systems/texlive/tlnet/archive/arara.doc.r61086.tar.xz
2021/11/18 | 19838 | macros/latex/contrib/siunitx/siunitx.dtx
2021/11/18 | 1892013 | macros/latex/contrib/mathalpha.zip
-2021/11/18 | 17596 | systems/texlive/tlnet/archive/easybook.source.r61085.tar.xz
-2021/11/18 | 17552 | systems/texlive/tlnet/archive/easybook.r61085.tar.xz
2021/11/18 | 1729 | macros/latex/contrib/siunitx/siunitx-binary.cfg
2021/11/18 | 1711 | systems/mac/mactex/Licenses.txt
2021/11/18 | 16705 | macros/latex/contrib/siunitx/siunitx-angle.dtx
@@ -354,7 +554,6 @@
2021/11/18 | 100236 | systems/texlive/tlnet/archive/arara.source.r61086.tar.xz
2021/11/17 | 9916 | systems/texlive/tlnet/archive/hologo.r61078.tar.xz
2021/11/17 | 984 | support/arara/scripts/rules/arara-rule-make.yaml
-2021/11/17 | 98307546 | systems/win32/TLW64/tl-win64.zip
2021/11/17 | 950 | support/arara/scripts/rules/arara-rule-gnuplot.yaml
2021/11/17 | 923 | support/arara/scripts/rules/arara-rule-move.yaml
2021/11/17 | 910 | support/arara/scripts/rules/arara-rule-xindex.yaml
@@ -791,10 +990,3 @@
2021/11/15 | 1053582 | support/latexindent/documentation/latexindent.pdf
2021/11/15 | 10347 | support/latexindent/LatexIndent/Command.pm
2021/11/15 | 1004 | macros/latex/contrib/formal-grammar/README.md
-2021/11/14 | 94552 | systems/win32/miktex/tm/packages/morisawa__doc.tar.lzma
-2021/11/14 | 79408 | systems/texlive/tlnet/archive/dtk.doc.r61047.tar.xz
-2021/11/14 | 4789 | systems/win32/miktex/tm/packages/morisawa__source.tar.lzma
-2021/11/14 | 4325 | macros/latex/contrib/hitszthesis/reference.bib
-2021/11/14 | 16608 | systems/texlive/tlnet/archive/dtk.r61047.tar.xz
-2021/11/14 | 1540 | systems/texlive/tlnet/archive/collection-mathscience.r61046.tar.xz
-2021/11/14 | 10941 | systems/win32/miktex/tm/packages/morisawa.tar.lzma
diff --git a/indexing/upmendex/README.md b/indexing/upmendex/README.md
index 5aec451f1b..89d0c0e4de 100644
--- a/indexing/upmendex/README.md
+++ b/indexing/upmendex/README.md
@@ -1,7 +1,7 @@
upmendex --- Multilingual index processor
==========================================
-2021.08.08 Ver0.58
+2021.11.20 Ver1.00
TANAKA, Takuji
<ttk(at)t-lab.opal.ne.jp>
@@ -19,7 +19,7 @@ upmendex is a multilingual index processor with following features:
* Support Latin (including non-English), Greek, Cyrillic,
Korean Hangul and Chinese Han (Hanzi ideographs) scripts
as well as Japanese Kana.
- * Support Devanagari and Thai scripts (experimental).
+ * Support Devanagari, Thai, Arabic and Hebrew scripts (experimental).
* Support four kinds of sort orders (Pinyin, Radical-Stroke,
Stroke and Zhuyin) for Chinese Han scripts (Hanzi ideographs).
* Apply International Components for Unicode (ICU)[4]
@@ -36,13 +36,13 @@ upmendex is a multilingual index processor with following features:
* man/ :: manuals
### Building upmendex
-The source files are distributed at GitHub[2] and work with TeX Live svn r60191.
+The source files are distributed at GitHub[2] and work with TeX Live svn r61096.
Ref. [TeX Live and Subversion](http://www.tug.org/texlive/svn/)
Tested with ICU 68.2 .
### Status
-Beta version.
+Stable version.
No warranty.
### Copyright
@@ -51,13 +51,13 @@ It is as same as [the BSD 3-Clause License](https://opensource.org/licenses/BSD-
### Supported locales
In ICU collator, default "root" locale covers several lauguages:
-English, French, Germany, Italian, Portuguese and so on.
+English, French, German, Italian, Portuguese and so on.
Much of languages and collation options are supported by
setting into "icu_locale" in style files.
Currently following locales are available:
#### Latin script
- "az", "az@collation=search" (Azerbaijani), "ca", "ca@collation=search" (Catalan),
+ "az", "az@collation=search" (Azerbaijani), "ca@collation=search" (Catalan),
"cs", "cs@collation=search" (Czech), "da", "da@collation=search" (Danish),
"de@collation=phonebook", "de@collation=search", "de-AT@collation=phonebook" (German),
"eo" (Espelanto), "es", "es@collation=traditional", "es@collation=search" (Spanish),
@@ -70,6 +70,10 @@ Currently following locales are available:
"sv", "sv@collation=search", "sv@collation=standard" (Swedish),
"tr" (Turkish), "vi", "vi@collation=traditional" (Vietnamese)
+##### Supported by default "root" collator. Do not need to set locale
+ "ca" (Catalan), "de" (German), "en" (English), "fr" (French), "id" (Indonesian),
+ "it" (Italian), "jv" (Javanese), "ms" (Malay), "nl" (Dutch), "pt" (Portuguese)
+
#### Cyrillic script
"be" (Belarusian), "bg" (Bulgarian), "kk" (Kazakh), "ky" (Kyrgyz),
"mk" (Macedonian), "ru" (Russian), "sr" (Serbian), "uk" (Ukraine)
@@ -89,11 +93,17 @@ Currently following locales are available:
#### Thai script (experimental)
"th" (Thai)
+#### Arabic (experimental)
+ "ar", "ar@collation=compat" (Arabic), "fa" (Persian), "ps" (Pashto), "ur" (Urdu)
+
+#### Hebrew (experimental)
+ "he", "he@collation=search" (Hebrew), "yi" (Yiddish)
+
### References
1. [ASCII Nihongo TeX (Publishing TeX)](https://asciidwango.github.io/ptex/)
ASCII MEDIA WORKS (web site by DWANGO Co., Ltd.)
2. [Source/Document distribution of upmendex --- multilingual index processor @ GitHub](https://github.com/t-tk/upmendex-package)
3. [upTeX, upLaTeX ― unicode version of pTeX, pLaTeX](http://www.t-lab.opal.ne.jp/tex/uptex_en.html)
-4. [International Components for Unicode (ICU)](http://site.icu-project.org/)
+4. [International Components for Unicode (ICU)](https://icu.unicode.org/)
5. [upmendex @ CTAN](https://ctan.org/pkg/upmendex/)
diff --git a/indexing/upmendex/doc/samples/Makefile b/indexing/upmendex/doc/samples/Makefile
index 533ddaf743..ce33305212 100644
--- a/indexing/upmendex/doc/samples/Makefile
+++ b/indexing/upmendex/doc/samples/Makefile
@@ -8,8 +8,8 @@ scripts:
done
styles:
- for num in 00 01 02; do \
- $(UPMENDEX) multi.idx -s mdxsty$$num.ist -o multi_$$num.ind ; \
+ for num in 00 01 02 03; do \
+ $(UPMENDEX) multi.idx -s mdxsty$$num.ist -t multi_$$num.ilg -o multi_$$num.ind ; \
done
compare:
diff --git a/indexing/upmendex/doc/samples/alphabet/alpha_es.idx b/indexing/upmendex/doc/samples/alphabet/alpha_es.idx
index 7c3982df83..1a81aa998b 100644
--- a/indexing/upmendex/doc/samples/alphabet/alpha_es.idx
+++ b/indexing/upmendex/doc/samples/alphabet/alpha_es.idx
@@ -93,3 +93,5 @@
\indexentry{qu}{6004}
\indexentry{qua}{6005}
\indexentry{quz}{6006}
+\indexentry{ª}{501}
+\indexentry{º}{502}
diff --git a/indexing/upmendex/doc/samples/mdxsty01.ist b/indexing/upmendex/doc/samples/mdxsty01.ist
index 56e6a89f0c..24f4f5ff3b 100644
--- a/indexing/upmendex/doc/samples/mdxsty01.ist
+++ b/indexing/upmendex/doc/samples/mdxsty01.ist
@@ -8,5 +8,5 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-character_order "NSTKDJHGCL"
+character_order "NSTKDJHGCLah"
diff --git a/indexing/upmendex/doc/samples/mdxsty02.ist b/indexing/upmendex/doc/samples/mdxsty02.ist
index 03353d85eb..f0536dd863 100644
--- a/indexing/upmendex/doc/samples/mdxsty02.ist
+++ b/indexing/upmendex/doc/samples/mdxsty02.ist
@@ -8,7 +8,7 @@ lethead_flag -1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-character_order "JKHGCLTDSN"
+character_order "JKHGCLTDhaSN"
hangul_head "가나다ë¼ë§ˆë°”사아카"
%% hangul_head "㉠㉡㉢㉣㉤㉥㉦㉧㉨㉩㉪㉫㉬㉭"
diff --git a/indexing/upmendex/doc/samples/mdxsty03.ist b/indexing/upmendex/doc/samples/mdxsty03.ist
new file mode 100644
index 0000000000..8b57069919
--- /dev/null
+++ b/indexing/upmendex/doc/samples/mdxsty03.ist
@@ -0,0 +1,33 @@
+% -*- coding: utf-8 -*-
+
+delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill "
+delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill "
+delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill "
+
+headings_flag 1
+heading_prefix "\n\\centerline{\\bfseries --- "
+heading_suffix " ---}\\par\\nobreak"
+
+character_order "SahHJKDTLCGN"
+symbol_flag 2
+
+script_preamble latin "\n% begin latin"
+script_postamble latin "\n% end latin"
+script_preamble cyrillic "\n% begin cyrillic"
+script_postamble cyrillic "\n% end cyrillic"
+script_preamble greek "\n% begin greek"
+script_postamble greek "\n% end greek"
+script_preamble kana "\n% begin kana"
+script_postamble kana "\n% end kana"
+script_preamble hangul "\n% begin hangul"
+script_postamble hangul "\n% end hangul"
+script_preamble hanzi "\n% begin hanzi"
+script_postamble hanzi "\n% end hanzi"
+script_preamble devanagari "\n% begin devanagari"
+script_postamble devanagari "\n% end devanagari"
+script_preamble thai "\n% begin thai"
+script_postamble thai "\n% end thai"
+script_preamble arabic "\n% begin arabic"
+script_postamble arabic "\n% end arabic"
+script_preamble hebrew "\n% begin hebrew"
+script_postamble hebrew "\n% end hebrew"
diff --git a/indexing/upmendex/doc/samples/multi.idx b/indexing/upmendex/doc/samples/multi.idx
index 8241647256..5567532210 100644
--- a/indexing/upmendex/doc/samples/multi.idx
+++ b/indexing/upmendex/doc/samples/multi.idx
@@ -5,7 +5,10 @@
\indexentry{ã‚‚ã‚ŠãŠã†ãŒã„@森鷗外}{5}
\indexentry{세종대왕@세종대왕(世宗大王)}{6}
\indexentry{王羲之}{7}
-\indexentry{ï¼ï¼‘23456789}{8}
-\indexentry{¥¥¥¥¥}{9}
-\indexentry{พ่อขุนรามคำà¹à¸«à¸‡à¸¡à¸«à¸²à¸£à¸²à¸Š}{10}
-\indexentry{गौतम सिदà¥à¤§à¤¾à¤°à¥à¤¥}{11}
+\indexentry{ï¼ï¼‘ï¼’0¹₂③â¹âž„âžðŸ„ˆâ‘»â’㉈🄋🄌}{8}
+\indexentry{€$$¢¢££¥¥₩₩฿₹}{9}
+\indexentry{☃☎♥⚽☺â˜âœˆðŸ€…ðŸ£ðŸ‘»}{10}
+\indexentry{พ่อขุนรามคำà¹à¸«à¸‡à¸¡à¸«à¸²à¸£à¸²à¸Š}{11}
+\indexentry{गौतम सिदà¥à¤§à¤¾à¤°à¥à¤¥}{12}
+\indexentry{محمد‎}{13}
+\indexentry{×ֱלִיעֶזֶר בֶּן־יְהוּדָה‎}{14}
diff --git a/indexing/upmendex/doc/samples/option/mdxsty_j02.ist b/indexing/upmendex/doc/samples/option/mdxsty_j02.ist
index 3b084ba9d8..b5cac2a050 100644
--- a/indexing/upmendex/doc/samples/option/mdxsty_j02.ist
+++ b/indexing/upmendex/doc/samples/option/mdxsty_j02.ist
@@ -4,9 +4,9 @@ delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill "
delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill "
delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill "
-lethead_flag 1
-lethead_prefix "\n\\centerline{\\bfseries --- "
-lethead_suffix " ---}\\par\\nobreak"
+headings_flag 1
+heading_prefix "\n\\centerline{\\bfseries --- "
+heading_suffix " ---}\\par\\nobreak"
priority 1
letter_head 2
diff --git a/indexing/upmendex/doc/upmendex.ja.txt b/indexing/upmendex/doc/upmendex.ja.txt
index 072a5fe873..22b2ab6230 100644
--- a/indexing/upmendex/doc/upmendex.ja.txt
+++ b/indexing/upmendex/doc/upmendex.ja.txt
@@ -123,7 +123,7 @@ upmendex - 索引整形ツール
preamble <文字列>
"\\begin{theindex}\n"
- 出力ファイルã®æ–‡å­—列。
+ 出力ファイルã®å…ˆé ­ã®æ–‡å­—列。
postamble <文字列>
"\n\n\\end{theindex}\n"
@@ -167,6 +167,10 @@ upmendex - 索引整形ツール
0
lethead_flagã¨åŒã˜ã€‚
+ headings_flag <数値>
+ 0
+ lethead_flagã¨åŒã˜ã€‚
+
kana_head <文字列>
""
ä»®å見出ã—文字。見出ã—文字を文字列ã§æŒ‡å®šã™ã‚‹ã€‚
@@ -283,23 +287,36 @@ upmendex - 索引整形ツール
symhead_positive <文字列>
"Symbols"
- lethead_flag ã¾ãŸã¯ heading_flag ãŒæ­£æ•°ã®å ´åˆã«æ•°å­—・記å·ã®é ­æ–‡å­—ã¨ã—ã¦
+ lethead_flag ã¾ãŸã¯ heading_flag ã¾ãŸã¯ headings_flag ãŒæ­£æ•°ã®å ´åˆã«è¨˜å·ã®é ­æ–‡å­—ã¨ã—ã¦
出力ã™ã‚‹æ–‡å­—列。
symhead_negative <文字列>
"symbols"
- lethead_flag ã¾ãŸã¯ heading_flag ãŒè² æ•°ã®å ´åˆã«æ•°å­—・記å·ã®é ­æ–‡å­—ã¨ã—ã¦
+ lethead_flag ã¾ãŸã¯ heading_flag ã¾ãŸã¯ headings_flag ãŒè² æ•°ã®å ´åˆã«è¨˜å·ã®é ­æ–‡å­—ã¨ã—ã¦
出力ã™ã‚‹æ–‡å­—列。
symbol <文字列>
""
- symbol_flag ãŒ0ã§ãªã„å ´åˆã«ã€æ•°å­—・記å·ã®é ­æ–‡å­—ã¨ã—ã¦å‡ºåŠ›ã™ã‚‹æ–‡å­—列。
+ symbol_flag ãŒ0ã§ãªã„å ´åˆã«ã€è¨˜å·ã®é ­æ–‡å­—ã¨ã—ã¦å‡ºåŠ›ã™ã‚‹æ–‡å­—列。
文字列ãŒå®šç¾©ã•ã‚Œã¦ã„ã‚Œã°ã€symhead_positive ãŠã‚ˆã³ symhead_negative より
優先ã•ã‚Œã‚‹ã€‚((up)mendex専用)
+ numhead_positive <文字列>
+ "Numbers"
+ lethead_flag ã¾ãŸã¯ heading_flag ãŒæ­£æ•°ã‹ã¤ symbol_flag ãŒ2ã®å ´åˆã«æ•°å­—ã®é ­æ–‡å­—ã¨ã—ã¦
+ 出力ã™ã‚‹æ–‡å­—列。
+
+ numhead_negative <文字列>
+ "numbers"
+ lethead_flag ã¾ãŸã¯ heading_flag ãŒè² æ•°ã‹ã¤ symbol_flag ãŒ2ã®å ´åˆã«æ•°å­—ã®é ­æ–‡å­—ã¨ã—ã¦
+ 出力ã™ã‚‹æ–‡å­—列。
+
symbol_flag <数値>
1
- symbol ã®å‡ºåŠ›ãƒ•ãƒ©ã‚°ã€‚0ã®ã¨ã出力ã—ãªã„。((up)mendex専用)
+ symbol ã®å‡ºåŠ›ãƒ•ãƒ©ã‚°ã€‚0ã®ã¨ã見出ã—を出力ã—ãªã„。
+ 1ã®ã¨ã数字を記å·ã®ä¸€éƒ¨ã¨ã—ã¦æ‰±ã„記å·ã®è¦‹å‡ºã—を出力ã™ã‚‹ã€‚
+ 2ã®ã¨ãæ•°å­—ã¨è¨˜å·ã‚’別ã®é›†åˆã«åˆ†é¡žã—æ•°å­—ã¨è¨˜å·ã®è¦‹å‡ºã—を出力ã™ã‚‹ã€‚
+ ((up)mendex専用)
letter_head <数値>
1
@@ -313,14 +330,31 @@ upmendex - 索引整形ツール
((up)mendex専用)
character_order <文字列>
- "SNLGCJKHDT"
+ "SNLGCJKHDTah"
記å·ã€è‹±å­—ã€æ—¥æœ¬èªžã®å„ªå…ˆé †ä½ã€‚'S'ã¯è¨˜å·ã€'N'ã¯æ•°å­—ã€'L'ã¯ãƒ©ãƒ†ãƒ³æ–‡å­—ã€
'G'ã¯ã‚®ãƒªã‚·ãƒ£æ–‡å­—ã€'C'ã¯ã‚­ãƒªãƒ«æ–‡å­—ã€'J'ã¯æ—¥æœ¬èªž(ã‹ãª)ã€'K'ã¯ãƒãƒ³ã‚°ãƒ«ã€
- 'H'ã¯æ¼¢å­—ã€'D'ã¯ãƒ‡ãƒ¼ãƒ´ã‚¡ãƒŠãƒ¼ã‚¬ãƒªãƒ¼ã€'T'ã¯ã‚¿ã‚¤æ–‡å­—を表ã™ã€‚
- upendexã§ã¯ç´¢å¼•é …ç›®ã®åˆ†é¡žã¨ã—ã¦ã€Œæ•°å­—ã€ã¯ã€Œè¨˜å·ã€ã«å«ã‚る仕様ãªã®ã§ã€
+ 'H'ã¯æ¼¢å­—ã€'D'ã¯ãƒ‡ãƒ¼ãƒ´ã‚¡ãƒŠãƒ¼ã‚¬ãƒªãƒ¼ã€'T'ã¯ã‚¿ã‚¤æ–‡å­—ã€
+ 'a'ã¯ã‚¢ãƒ©ãƒ“ア文字ã€'h'ã¯ãƒ˜ãƒ–ライ文字を表ã™ã€‚
+ symbol_flag=1ã®ã¨ãã€ç´¢å¼•é …ç›®ã®åˆ†é¡žã¨ã—ã¦ã€Œæ•°å­—ã€ã¯ã€Œè¨˜å·ã€ã«å«ã‚ã‚‹ã®ã§ã€
'S'ã¨'N'ã¯å¿…ãšéš£ã‚Šåˆã‚ã›ã‚‹ã“ã¨ï¼ˆæ•°å­—ã¨æ•°å­—以外ã®è¨˜å·ã®é †åºå…¥ã‚Œæ›¿ãˆã¯å¯èƒ½ï¼‰ã€‚
(upmendex専用)
+ script_preamble <文字列1> <文字列2>
+ ""
+ å„スクリプトã”ã¨ã®ãƒ–ロックã®å…ˆé ­ã®æ–‡å­—列を文字列2ã«æŒ‡å®šã™ã‚‹ã€‚
+ スクリプトå1個を以下ã®ä¸­ã‹ã‚‰æ–‡å­—列1ã«æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚‰ãªã„:
+ 'latin', 'cyrillic', 'greek', 'kana', 'hangul', 'hanzi',
+ 'devanagari', 'thai', 'arabic', 'hebrew'
+ (upmendex専用)
+
+ script_postamble <文字列1> <文字列2>
+ ""
+ å„スクリプトã”ã¨ã®ãƒ–ロックã®æœ«å°¾ã®æ–‡å­—列を文字列2ã«æŒ‡å®šã™ã‚‹ã€‚
+ スクリプトå1個を以下ã®ä¸­ã‹ã‚‰æ–‡å­—列1ã«æŒ‡å®šã—ãªã‘ã‚Œã°ãªã‚‰ãªã„:
+ 'latin', 'cyrillic', 'greek', 'kana', 'hangul', 'hanzi',
+ 'devanagari', 'thai', 'arabic', 'hebrew'
+ (upmendex専用)
+
icu_locale <文字列>
""
ICU collatorã«ãŠã„ã¦å¾“ã†locale。
@@ -331,20 +365,20 @@ upmendex - 索引整形ツール
""
ICU collatorã«ãŠã„ã¦localeã«ã‚ˆã‚‰ãšã«ç…§åˆé †åºã‚’指定ã™ã‚‹å ´åˆã€
ç…§åˆé †åºã®ãƒ«ãƒ¼ãƒ«ã‚’示ã™æ–‡å­—列。
- ( Ref. http://userguide.icu-project.org/collation/customization
- https://unicode-org.github.io/icu/userguide/collation/customization/
+ ( Ref. https://unicode-org.github.io/icu/userguide/collation/customization/
http://www.unicode.org/reports/tr35/tr35-collation.html#Rules )
UTF-8ã®Unicode文字åŠã³ã€ä»¥ä¸‹ã®ã‚¨ã‚¹ã‚±ãƒ¼ãƒ—文字列ãŒä½¿ç”¨å¯èƒ½ã§ã‚ã‚‹:
\Uhhhhhhhh (16進数[0-9A-Fa-f]ã‚’8æ¡), \uhhhh (16進数を4æ¡),
\xhh (16進数を2æ¡), \x{h...} (16進数を1〜8æ¡), \ooo (8進数[0-7]ã‚’3æ¡)。
+ icu_localeã¨icu_rulesã‚’åŒæ™‚ã«æŒ‡å®šã—ãŸå ´åˆã€icu_localeã§æŒ‡å®šã—ãŸãƒ«ãƒ¼ãƒ«ã®ä¸Šã«
+ icu_rulesã§æŒ‡å®šã—ãŸãƒ«ãƒ¼ãƒ«ã‚’追加ã™ã‚‹ã€‚
空文字列(デフォルト)ã®ã¨ãã¯ã€localeã«ã‚ˆã‚‹ç…§åˆé †åºã®ãƒ«ãƒ¼ãƒ«ã«å¾“ã†ã€‚
(upmendex専用)
icu_attributes <文字列>
""
ICU collatorã®attribute指定。
- ( Ref. http://userguide.icu-project.org/collation/customization#TOC-Default-Options
- https://unicode-org.github.io/icu/userguide/collation/customization/#default-options
+ ( Ref. https://unicode-org.github.io/icu/userguide/collation/customization/#default-options
http://www.unicode.org/reports/tr35/tr35-collation.html#Setting_Options )
以下ã®æ–‡å­—列を解釈ã™ã‚‹:
"alternate:shifted", "alternate:non-ignorable",
@@ -365,7 +399,7 @@ upmendex - 索引整形ツール
カナã«æƒãˆã€æ‹—音ã€æ’¥éŸ³ã€æ¿ç‚¹ã‚’除ã„ãŸèª­ã¿ã‚’付ã‘ãªã‘ã‚Œã°ãªã‚Šã¾ã›ã‚“ã§ã—ãŸ(自動的ã«
æƒãˆã‚‹ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚‚ã‚ã‚‹)。
upmendex ã§ã¯ã‚«ãƒŠã«ã¤ã„ã¦ã¯International Components for Unicode (ICU)ã«ã‚ˆã‚‹
-ソートを行ã„ã¾ã™ã€‚ã¾ãŸæ¼¢å­—ã«ã¤ã„ã¦ã¯è¾žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šå„索引語ã”ã¨
+ソートを行ã„ã¾ã™ã€‚ã¾ãŸæ¼¢å­—ã¨è¨˜å·ã«ã¤ã„ã¦ã¯è¾žæ›¸ãƒ•ã‚¡ã‚¤ãƒ«ã‚’設定ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šå„索引語ã”ã¨
ã«èª­ã¿ã‚’付ã‘る作業をã‹ãªã‚Šè§£æ¶ˆã§ãã¾ã™ã€‚
辞書ファイル㯠<熟語 読ã¿> ã®ãƒªã‚¹ãƒˆã§æ§‹æˆã•ã‚Œã¾ã™ã€‚熟語ã¨èª­ã¿ã®åŒºåˆ‡ã‚Šã¯ã‚¿ãƒ–ã¾
@@ -376,7 +410,7 @@ upmendex - 索引整形ツール
漢字 ã‹ã‚“ã˜
読㿠よã¿
環境 ã‹ã‚“ãょã†
- α アルファ
+ $ ドル
辞書ã«ç™»éŒ²ã™ã‚‹ç†Ÿèªžã¯ã€èª­ã¿æ–¹ãŒ1通りã«ãªã‚‹ã‚ˆã†é€ã‚Šä»®åを付ã‘ã¦ãã ã•ã„。
「表ã€ã€ã€Œæ€§è³ªã€ã®ã‚ˆã†ã«é€ã‚Šä»®åã«ã‚ˆã‚‰ãš2通りã®èª­ã¿æ–¹ãŒã§ãる語ã«ã¤ã„ã¦ã¯ã©ã¡
@@ -445,5 +479,5 @@ upmendex - 索引整形ツール
å‚考
International Components for Unicode (ICU)
-http://site.icu-project.org/
+http://icu.unicode.org/
https://unicode-org.github.io/icu/
diff --git a/indexing/upmendex/man/upmendex.1 b/indexing/upmendex/man/upmendex.1
index b46ab922de..21c89844fa 100644
--- a/indexing/upmendex/man/upmendex.1
+++ b/indexing/upmendex/man/upmendex.1
@@ -53,9 +53,9 @@ and ignore leading and trailing blank(s).
By default, blanks in the index key are retained.
.TP 10
\fB-g\fR
-Make Japanese index head \fIA\fR-line (\fIA, Ka, Sa, ...\fR) of the gojuon table (Japanese
-syllabary). By default, all the characters in the gojuon table
-are used.
+Make Japanese index head \fIA\fR-line (\fIA, Ka, Sa, ...\fR; 10 characters)
+of the \fIgojuon\fR table (Japanese syllabary). By default, all 48 characters
+in the \fIgojuon\fR table are used.
.TP 10
\fB-f\fR
Force to output characters even if the scripts are not supported by \fIupmendex\fR.
@@ -88,6 +88,7 @@ Show summary of options.
.TP 10
\fB--\fR
Arguments after \fB--\fR are not taken as options.
+This is useful when the input file name starts with '-'.
.SH "STYLE FILE"
The style file informs \fIupmendex\fR about the format of the
@@ -106,7 +107,7 @@ A line begun by \'%\' is a comment.
\fBkeyword\fR <string>
"\\\\indexentry"
.RS
-Command with an argument of index entry.
+Command with an argument of index entry which is going to be processed.
.RE
.TP 30
\fBarg_open\fR <char>
@@ -220,7 +221,7 @@ Prefix of heading for newly appeared heading letter.
\fBheading_prefix\fR <string>
""
.RS
-Same as \fBlethead_prefix\fR.
+Same as \fBlethead_prefix\fR. (compatible with makeindex)
.RE
.TP 30
\fBlethead_suffix\fR <string>
@@ -232,7 +233,7 @@ Suffix of heading for newly appeared heading letter.
\fBheading_suffix\fR <string>
""
.RS
-Same as \fBlethead_suffix\fR.
+Same as \fBlethead_suffix\fR. (compatible with makeindex)
.RE
.TP 30
\fBlethead_flag\fR <number>
@@ -246,7 +247,13 @@ lowercase and titlecase.
\fBheading_flag\fR <number>
0
.RS
-Same as \fBlethead_flag\fR.
+Same as \fBlethead_flag\fR. (Note: makeindex uses a different name \fBheadings_flag\fR)
+.RE
+.TP 30
+\fBheadings_flag\fR <number>
+0
+.RS
+Same as \fBlethead_flag\fR. (compatible with makeindex)
.RE
.TP 30
\fBkana_head\fR <string>
@@ -448,31 +455,47 @@ Length of space for indent which inserted to top of folded line.
\fBsymhead_positive\fR <string>
"Symbols"
.RS
-Strings to output as heading letter for numbers and symbols
-when lethead_flag or heading_flag is positive number.
+Strings to output as heading letter for symbols
+when lethead_flag or heading_flag or headings_flag is positive number.
.RE
.TP 30
\fBsymhead_negative\fR <string>
"symbols"
.RS
-Strings to output as heading letter for numbers and symbols
-when lethead_flag or heading_flag is negative number.
+Strings to output as heading letter for symbols
+when lethead_flag or heading_flag or headings_flag is negative number.
.RE
.TP 30
\fBsymbol\fR <string>
""
.RS
-Strings to output as heading letter for numbers and symbols
+Strings to output as heading letter for symbols
when symbol_flag is non zero.
.RE
If specified, the option is prior to symhead_positive and symhead_negative.
(Extended by (up)mendex)
.RE
.TP 30
+\fBnumhead_positive\fR <string>
+"Numbers"
+.RS
+Strings to output as heading letter for numbers
+when lethead_flag or heading_flag or headings_flag is positive number and symbol_flag is 2.
+.RE
+.TP 30
+\fBnumhead_negative\fR <string>
+"numbers"
+.RS
+Strings to output as heading letter for numbers
+when lethead_flag or heading_flag or headings_flag is negative number and symbol_flag is 2.
+.RE
+.TP 30
\fBsymbol_flag\fR <number>
1
.RS
-Flag to output of symbol. If \'0\', do not output.
+Flag to output of symbol. If \'0\', do not output headings for symbols and numbers.
+If \'1\', output symbols and numbers as a group of symbols.
+If \'2\', output symbols and numbers separately.
(Extended by (up)mendex)
.RE
.TP 30
@@ -495,14 +518,34 @@ Japanese sequence and non-Japanese sequence in sorting procedure.
.RE
.TP 30
\fBcharacter_order\fR <string>
-"SNLGCJKHDT"
+"SNLGCJKHDTah"
.RS
Order of scripts and symbols.
-\'S\', \'N\', \'L\', \'G\', \'C\', \'J\', \'K\', \'H\', \'D\' and \'T\' respectively
-denotes symbol, number, Latin, Greek, Cyrillic, Japanese Kana, Korean Hangul, Hanja,
-Devanagari and Thai script.
-Please make sure that \'S\' and \'N\' are next to each other,
-since \fBupmendex\fR considers numbers as a part of symbol.
+\'S\', \'N\', \'L\', \'G\', \'C\', \'J\', \'K\', \'H\', \'D\', \'T\', \'a\' and \'h\'
+respectively denotes symbol, number, Latin, Greek, Cyrillic, Japanese Kana, Korean Hangul, Hanja,
+Devanagari, Thai, Arabic and Hebrew script.
+Please make sure that \'S\' and \'N\' are next to each other if symbol_flag=1,
+since numbers are classified as a part of symbol.
+(Extended by upmendex)
+.RE
+.TP 30
+\fBscript_preamble\fR <string 1> <string 2>
+""
+.RS
+Preamble of script block in output file, specified by string 2.
+One of script names must be specified in the string 1:
+\'latin\', \'cyrillic\', \'greek\', \'kana\', \'hangul\', \'hanzi\', \'devanagari\',
+\'thai\', \'arabic\', or \'hebrew\'.
+(Extended by upmendex)
+.RE
+.TP 30
+\fBscript_postamble\fR <string 1> <string 2>
+""
+.RS
+Postamble of script block in output file, specified by string 2.
+One of script names must be specified in the string 1:
+\'latin\', \'cyrillic\', \'greek\', \'kana\', \'hangul\', \'hanzi\', \'devanagari\',
+\'thai\', \'arabic\', or \'hebrew\'.
(Extended by upmendex)
.RE
.TP 30
@@ -522,11 +565,12 @@ Unicode characters in UTF-8 encoding and following escape sequences are accepted
\fB\\Uhhhhhhhh\fR (8-digit hexadecimal [0-9A-Fa-f]), \fB\\uhhhh\fR (4-digit hexadecimal),
\fB\\xhh\fR (2-digit hexadecimal), \fB\\x{h...}\fR (1..8-digit hexadecimal), and
\fB\\ooo\fR (3-digit octal [0-7]).
+If icu_rules and icu_locale are simultaneously specified, collation rules specified
+by icu_rules are added on collation rules specified by icu_locale.
By default, locale is used.
(Extended by upmendex)
.RE
-Ref. <http://userguide.icu-project.org/collation/customization>,
-<https://unicode-org.github.io/icu/userguide/collation/customization/>,
+Ref. <https://unicode-org.github.io/icu/userguide/collation/customization/>,
<http://www.unicode.org/reports/tr35/tr35-collation.html#Rules>
.RE
.TP 30
@@ -545,8 +589,7 @@ Followings are available:
"numeric-ordering:on", "numeric-ordering:off"
(Extended by upmendex)
.RE
-Ref. <http://userguide.icu-project.org/collation/customization>,
-<https://unicode-org.github.io/icu/userguide/collation/customization/#default-options>,
+Ref. <https://unicode-org.github.io/icu/userguide/collation/customization/#default-options>,
<http://www.unicode.org/reports/tr35/tr35-collation.html#Setting_Options>
.RE
.PP
@@ -559,8 +602,8 @@ of manually specifying a reading for every kanji word.
Japanese kanji words are usually sorted by the syllables of their readings
(\fI\'Yomi\'\fR), which can be represented by kana (Hiragana, Katakana) scripts.
\fIupmendex\fR accepts index words specified in kana expression directly on
-an input file, and also accepts conversion from index words to kana scripts
-by referring to Japanese dictionaries.
+an input file, and also accepts conversion from index words in Kanji or symbols
+to phonogram scripts by referring to Japanese dictionaries.
.RE
.LP
@@ -577,7 +620,7 @@ Examples of internal simplification of syllables are shown below.
.LP
The dictionary file consists of list with <\'index_word\' \'reading\'>.
The index word can be written in any scripts (kanji, kana, etc),
-and the reading must be in Hiragana or Katakana scripts.
+and the reading can be in any phonograms such as Hiragana or Katakana scripts.
The delimiter between the index word and its reading is one or more tab(s) or space(s).
.RE
An example of a Japanese dictionary is shown below.
@@ -590,7 +633,7 @@ An example of a Japanese dictionary is shown below.
.br
環境 ã‹ã‚“ãょã†
.br
-α アルファ
+$ ドル
.RE
.LP
Here, each index word is allowed to have only one Yomi.
@@ -672,7 +715,7 @@ wrong page numbers might be output.
.BR mendex(1).
.br
International Components for Unicode (ICU):
-<http://site.icu-project.org/>,
+<http://icu.unicode.org/>,
<https://unicode-org.github.io/icu/>
.SH AUTHOR
This manual page was written by Takuji Tanaka
diff --git a/indexing/upmendex/man/upmendex.man1.pdf b/indexing/upmendex/man/upmendex.man1.pdf
index a63130ad5e..195a8190ef 100644
--- a/indexing/upmendex/man/upmendex.man1.pdf
+++ b/indexing/upmendex/man/upmendex.man1.pdf
Binary files differ
diff --git a/indexing/upmendex/source/ChangeLog b/indexing/upmendex/source/ChangeLog
index 497e0e6e26..b2b3cd2f1e 100644
--- a/indexing/upmendex/source/ChangeLog
+++ b/indexing/upmendex/source/ChangeLog
@@ -1,3 +1,108 @@
+2021-11-20 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 1.00 Stable version.
+ * configure.ac: Bump version.
+ * {,ex}var.h, fwrite.c, styfile.c:
+ Add options "script_preamble" and "script_postamble"
+ in style file.
+ * sort.c: Add Latin Extended-F and -G.
+ Add U_FORMAT_CHAR to is_type_mark_or_punct().
+ * mendex.h, var.h, convert.c, fwrite.c, sort.c, styfile.c:
+ Supports Arabic, Hebrew scripts (experimental).
+ * upmendex.ja.txt:
+ Update document.
+
+2021-10-24 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 0.60 Beta version.
+ * configure.ac: Bump version.
+ * Makefile.am, convert.c, fwrite.c, sort.c,
+ {,ex}kana.h, ktable.h, mendex.h:
+ Enhance procedure of classifying characters:
+ Newly classifies by character type of
+ General Category in Unicode Script Property.
+ https://github.com/t-tk/upmendex-package/issues/8
+
+2021-09-19 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * fread.c:
+ Modify heuristic detection of page number types.
+ * tests/upmendex.test, tests/range.idx, tests/range[123].ind,
+ tests/pprecB.idx, tests/pprec[34].ist, tests/pprecB-[034].ind:
+ Update tests.
+
+2021-09-18 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * fread.c, fwrite.c, sort.c, mendex.h, {,ex}var.h:
+ Extend levels of page numbers from 3 to 10
+ for compatibility with makeindex.
+ Fix a bug of page ranges with multi-level page numbers.
+ * fread.c:
+ Strict check for "page_precedence" and "page_compositor" in style file.
+ * fwrite.c:
+ Do not break lines before "delim_n".
+ * tests/upmendex.test, tests/range.idx, tests/range[123].{ist,ind},
+ removed tests/rangetwo.*:
+ Update tests.
+
+2021-09-05 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * fwrite.c:
+ Support I-Y ordering in Lithuanian.
+
+2021-09-04 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 0.59 Beta version.
+ * configure.ac: Bump version.
+ * fwrite.c, styfile.c, {,ex}var.h:
+ Support output order of symbols and numbers separately
+ when "symbol_flag" is 2 in style file.
+ * sort.c:
+ Accept combination of "icu_locale" and "icu_rules" in style file.
+ If simultaneously specified, collation rules specified by "icu_rules" are
+ added on collation rules specified by "icu_locale".
+ * tests/upmendex.test, tests/rule.{idx,ind}, tests/locale2.ist,
+ tests/{locale1,attri1,locale2-rule}.ind:
+ Add a new test and update conventional tests.
+
+2021-08-29 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * styfile.c:
+ Strict check for "icu_attributes" in style file.
+ * sort.c:
+ Strict check for "character_order" in style file.
+ * fwrite.c:
+ Fix a bug when "symbol_flag" is 0.
+ * tests/upmendex.test, tests/attr1.{ist,ind},
+ tests/locale1.ind, tests/rule.{idx,ind}:
+ Add a new test and update conventional tests.
+
+2021-08-28 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * styfile.c:
+ Add a alias "headings_flag" of the keyword "heading_flag"
+ in style file for compatibility with makeindex.
+ Warn if specifier in style file is unknown.
+
+2021-08-26 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * sort.c:
+ Initialize a variable.
+ * tests/upmendex.test, tests/locale1.{ist,ind}:
+ Add a new test for "icu_locale".
+
+2021-08-25 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * sort.c:
+ Initialize a string. Check malformed input for "icu_rules".
+ * tests/upmendex.test, tests/rule[34].ist:
+ Add new tests.
+
+2021-08-23 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * tests/upmendex.test, tests/rule[12].ist, tests/rule.{idx,ind}:
+ Add new tests for the keyword "icu_rules" in style file.
+
2021-08-08 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* version 0.58 Beta version.
@@ -90,7 +195,7 @@
2020-05-01 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
- * main.c, version.h, Makefile.{am.in}: Add bug report addresses
+ * main.c, version.h, Makefile.am: Add bug report addresses
on command line help.
* convert.c: Tune buffer sizes to avoid tool warnings.
diff --git a/indexing/upmendex/source/Makefile.am b/indexing/upmendex/source/Makefile.am
index 94bea187b3..451f0df1eb 100644
--- a/indexing/upmendex/source/Makefile.am
+++ b/indexing/upmendex/source/Makefile.am
@@ -1,4 +1,4 @@
-## $Id$
+## $Id: Makefile.am 60856 2021-10-24 05:44:35Z takuji $
## Makefile.am for the TeX Live subdirectory texk/upmendex/
##
## Copyright 2015-2019 Karl Berry <tex-live@tug.org>
@@ -19,7 +19,6 @@ upmendex_SOURCES = \
kana.h \
kp.c \
kp.h \
- ktable.h \
main.c \
mendex.h \
version.h \
diff --git a/indexing/upmendex/source/Makefile.in b/indexing/upmendex/source/Makefile.in
index 11cff850bc..4ecaadee97 100644
--- a/indexing/upmendex/source/Makefile.in
+++ b/indexing/upmendex/source/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -593,7 +593,6 @@ upmendex_SOURCES = \
kana.h \
kp.c \
kp.h \
- ktable.h \
main.c \
mendex.h \
version.h \
diff --git a/indexing/upmendex/source/aclocal.m4 b/indexing/upmendex/source/aclocal.m4
index 284ca6d457..8d45a4e2bc 100644
--- a/indexing/upmendex/source/aclocal.m4
+++ b/indexing/upmendex/source/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.4], [],
+m4_if([$1], [1.16.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -428,6 +428,10 @@ m4_defn([AC_PROG_CC])
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+ [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
diff --git a/indexing/upmendex/source/configure b/indexing/upmendex/source/configure
index f1ffea6fbb..e5aa682d08 100755
--- a/indexing/upmendex/source/configure
+++ b/indexing/upmendex/source/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for upmendex (TeX Live) 0.58.
+# Generated by GNU Autoconf 2.71 for upmendex (TeX Live) 1.00.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -626,8 +626,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='upmendex (TeX Live)'
PACKAGE_TARNAME='upmendex--tex-live-'
-PACKAGE_VERSION='0.58'
-PACKAGE_STRING='upmendex (TeX Live) 0.58'
+PACKAGE_VERSION='1.00'
+PACKAGE_STRING='upmendex (TeX Live) 1.00'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1390,7 +1390,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures upmendex (TeX Live) 0.58 to adapt to many kinds of systems.
+\`configure' configures upmendex (TeX Live) 1.00 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1462,7 +1462,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of upmendex (TeX Live) 0.58:";;
+ short | recursive ) echo "Configuration of upmendex (TeX Live) 1.00:";;
esac
cat <<\_ACEOF
@@ -1587,7 +1587,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-upmendex (TeX Live) configure 0.58
+upmendex (TeX Live) configure 1.00
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2268,7 +2268,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by upmendex (TeX Live) $as_me 0.58, which was
+It was created by upmendex (TeX Live) $as_me 1.00, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8806,7 +8806,7 @@ fi
# Define the identity of the package.
PACKAGE='upmendex--tex-live-'
- VERSION='0.58'
+ VERSION='1.00'
# Some tools Automake needs.
@@ -18942,7 +18942,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-upmendex (TeX Live) config.lt 0.58
+upmendex (TeX Live) config.lt 1.00
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21114,7 +21114,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by upmendex (TeX Live) $as_me 0.58, which was
+This file was extended by upmendex (TeX Live) $as_me 1.00, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21182,7 +21182,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-upmendex (TeX Live) config.status 0.58
+upmendex (TeX Live) config.status 1.00
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/indexing/upmendex/source/configure.ac b/indexing/upmendex/source/configure.ac
index 7af5a44b8c..b21873a1ed 100644
--- a/indexing/upmendex/source/configure.ac
+++ b/indexing/upmendex/source/configure.ac
@@ -1,4 +1,4 @@
-dnl $Id$
+dnl $Id: configure.ac 61096 2021-11-20 09:29:33Z takuji $
dnl Process this file with autoconf to produce a configure script.
dnl
dnl Copyright 2015-2021 Karl Berry <tex-live@tug.org>
@@ -8,8 +8,8 @@ dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
-AC_INIT([upmendex (TeX Live)], [0.58])
-AC_PREREQ([2.63])
+AC_INIT([upmendex (TeX Live)],[1.00])
+AC_PREREQ([2.71])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
diff --git a/indexing/upmendex/source/convert.c b/indexing/upmendex/source/convert.c
index 74d32d7352..a7cae61038 100644
--- a/indexing/upmendex/source/convert.c
+++ b/indexing/upmendex/source/convert.c
@@ -6,7 +6,6 @@
#include "qsort.h"
#include "exkana.h"
-#include "ktable.h"
#include "exvar.h"
#include "kp.h"
@@ -25,8 +24,6 @@ static int dlines=0,elines=0;
static int dicvalread(const char *filename, struct dictionary *dicval, int line);
-#define is_alpha_numeric(a) (((a)>=ALPHATOP && (a)<=ALPHAEND) || (a)==YENSIGN)
-
UChar * u_xstrdup (const UChar *string)
{
return u_strcpy(xmalloc((u_strlen(string)+1)*sizeof(UChar)), string);
@@ -210,76 +207,66 @@ int convert(UChar *buff1, UChar *buff2)
i++;
}
- else if (buff1[i]<0x80) {
+ else if (buff1[i]<0x20 && buff1[i]!='\t') { /* ignore control characters */
+ i++;
+ }
+
+ else if (buff1[i]<0x7F) {
buff2[j]=buff1[i];
i++;
j++;
}
+ else if (buff1[i]<0xA0) { /* ignore control characters */
+ i++;
+ }
+
else if (is_latin(buff3)||is_cyrillic(buff3)||is_greek(buff3)
||is_jpn_kana(buff3)||is_kor_hngl(buff3)||is_zhuyin(buff3)
- ||is_numeric(buff3)||is_devanagari(buff3)||is_thai(buff3)
- ||is_comb_diacritical_mark(buff3)) {
+ ||is_numeric(buff3)==1||is_type_symbol(buff3)==1
+ ||is_devanagari(buff3)||is_thai(buff3)||is_arabic(buff3)||is_hebrew(buff3)
+ ||is_type_mark_or_punct(buff3)) {
buff2[j]=buff3[0];
if (wclen==2) buff2[j+1]=buff3[1];
i+=wclen;
j+=wclen;
}
- else if (buff1[i]>=0x80) {
- if (is_alpha_numeric(buff3[0])) {
-/* alpha-numeric,symbols */
- for (k=0;k<u_strlen(symboltable);k++) {
- if (buff3[0]==symboltable[k]) {
- buff2[j]=k+0x20;
- if ((buff2[j]>='a')&&(buff2[j]<='z')) buff2[j]-=32;
- i++;
- j+=wclen;
- break;
- }
- }
- if (k==u_strlen(symboltable)) {
- i++;
- buff2[j++]=buff3[0];
+ else {
+ for (k=0;k<dlines;k++) {
+/* dictionary table */
+ if (u_strncmp(dictable[k].dic[0],&buff1[i],u_strlen(dictable[k].dic[0]))==0) {
+ u_strncpy(&buff2[j],dictable[k].dic[1],u_strlen(dictable[k].dic[1]));
+ i+=u_strlen(dictable[k].dic[0]);
+ j+=u_strlen(dictable[k].dic[1]);
+ break;
}
}
-
- else {
- for (k=0;k<dlines;k++) {
-/* dictionary table */
- if (u_strncmp(dictable[k].dic[0],&buff1[i],u_strlen(dictable[k].dic[0]))==0) {
- u_strncpy(&buff2[j],dictable[k].dic[1],u_strlen(dictable[k].dic[1]));
+ if ((k==dlines)&&(elines!=0)) {
+/* environment dictionary table */
+ for (k=0;k<elines;k++) {
+ if (u_strncmp(envdic[k].dic[0],&buff1[i],u_strlen(envdic[k].dic[0]))==0) {
+ u_strncpy(&buff2[j],envdic[k].dic[1],u_strlen(envdic[k].dic[1]));
i+=u_strlen(dictable[k].dic[0]);
- j+=u_strlen(dictable[k].dic[1]);
+ j+=u_strlen(envdic[k].dic[1]);
break;
}
}
- if ((k==dlines)&&(elines!=0)) {
-/* environment dictionary table */
- for (k=0;k<elines;k++) {
- if (u_strncmp(envdic[k].dic[0],&buff1[i],u_strlen(envdic[k].dic[0]))==0) {
- u_strncpy(&buff2[j],envdic[k].dic[1],u_strlen(envdic[k].dic[1]));
- i+=u_strlen(dictable[k].dic[0]);
- j+=u_strlen(envdic[k].dic[1]);
- break;
- }
- }
- }
- if (((k==dlines)&&(elines==0))||((k==elines)&&(elines!=0))) {
- if (is_hanzi(buff3) || force==1) {
+ }
+ if (((k==dlines)&&(elines==0))||((k==elines)&&(elines!=0))) {
+ if (is_hanzi(buff3) || is_numeric(buff3) || is_type_symbol(buff3) || force==1) {
/* forced convert */
- buff2[j]=buff3[0];
- if (wclen==2) buff2[j+1]=buff3[1];
- i+=wclen;
- j+=wclen;
- }
- else {
- widechar_to_multibyte(errbuff,BUFFERLEN2,&buff1[i]);
- snprintf(errbuff2,BUFFERLEN3,"\nError: %s is no entry in dictionary file ",errbuff);
- fputs(errbuff2,efp);
- if (efp!=stderr) fputs(errbuff2,stderr);
- return -1;
- }
+ buff2[j]=buff3[0];
+ if (wclen==2) buff2[j+1]=buff3[1];
+ i+=wclen;
+ j+=wclen;
+ }
+ else {
+ widechar_to_multibyte(errbuff,BUFFERLEN2,&buff1[i]);
+ snprintf(errbuff2,BUFFERLEN3,"\nError: %s is no entry in dictionary file ",errbuff);
+ fputs(errbuff2,efp);
+ if (efp!=stderr) fputs(errbuff2,stderr);
+ return -1;
}
}
}
diff --git a/indexing/upmendex/source/exkana.h b/indexing/upmendex/source/exkana.h
index aeb5a18d82..9e4ba1d197 100644
--- a/indexing/upmendex/source/exkana.h
+++ b/indexing/upmendex/source/exkana.h
@@ -4,7 +4,6 @@ extern UChar AIUEO[];
extern UChar *aiueo;
extern UChar kanatable[];
extern UChar extkanatable[];
-extern UChar circkanatable[];
#define SPACE 0x3000 /* 全角スペース */
#define ALPHATOP 0xff01 /* ï¼ */
@@ -18,8 +17,19 @@ extern UChar circkanatable[];
#define EXKANAEND 0x31FF /* ㇿ */
#define CRKANATOP 0x32D0 /* ã‹ */
#define CRKANAEND 0x32FE /* ㋾ */
+#define HANKANATOP 0xFF71 /* ï½± */
+#define HANKANAEND 0xFF9D /* ï¾ */
+#define HANKANAWO 0xFF66 /* ヲ */
+#define HANKANATU 0xFF6F /* ッ */
+#define SQKANATOP 0x3300 /* ㌀ */
+#define SQKANAEND 0x3357 /* ã— */
+#define CRLATNTOP 0x24B6 /* â’¶ */
+#define CRLATNEND 0x24E9 /* â“© */
#define is_katakana(a) ((a)>=KATATOP && (a)<=KATAEND)
#define is_hiragana(a) ((a)>=HIRATOP && (a)<=HIRAEND)
#define is_extkana(a) ((a)>=EXKANATOP && (a)<=EXKANAEND)
#define is_circkana(a) ((a)>=CRKANATOP && (a)<=CRKANAEND)
+#define is_hankana(a) ((a)>=HANKANATOP && (a)<=HANKANAEND || (a)>=HANKANAWO && (a)<=HANKANATU)
+#define is_sqkana(a) ((a)>=SQKANATOP && (a)<=SQKANAEND)
+#define is_circlatin(a) ((a)>=CRLATNTOP && (a)<=CRLATNEND)
diff --git a/indexing/upmendex/source/exvar.h b/indexing/upmendex/source/exvar.h
index 7b061c6655..790f327e27 100644
--- a/indexing/upmendex/source/exvar.h
+++ b/indexing/upmendex/source/exvar.h
@@ -2,7 +2,7 @@ extern FILE *efp;
extern int lines,idxcount,acc,reject;
extern int prange,fsti,lorder,bcomp,force,fpage,gflg,verb,debug;
-extern int warn,scount,pattr[3];
+extern int warn,scount,pattr[];
extern struct index *ind;
@@ -26,7 +26,7 @@ extern int line_max;
extern char indent_space[];
extern int indent_length;
extern int priority;
-extern char symbol[];
+extern char symhead[],numhead[];
extern char symhead_positive[],symhead_negative[];
extern char numhead_positive[],numhead_negative[];
extern int symbol_flag;
@@ -35,6 +35,7 @@ extern UChar atama[],hangul_head[],hanzi_head[],kana_head[];
extern UChar devanagari_head[],thai_head[];
extern char page_compositor[],page_precedence[];
extern char character_order[];
+extern char script_preamble[][STYBUFSIZE],script_postamble[][STYBUFSIZE];
extern char icu_locale[],icu_rules[];
extern int icu_attributes[];
diff --git a/indexing/upmendex/source/fread.c b/indexing/upmendex/source/fread.c
index a336022e11..66d3e0b144 100644
--- a/indexing/upmendex/source/fread.c
+++ b/indexing/upmendex/source/fread.c
@@ -344,7 +344,7 @@ LOOP:
copy_multibyte_char(buff, table, &j, &k);
}
- table[k]='\0';
+ table[k]='\0';
for (k=0;k<=ind[l].num;k++) {
if (strcmp(ind[l].p[k].page,table)==0) {
@@ -356,9 +356,9 @@ LOOP:
ind[l].num++;
if (!((ind[l].num)%16)) ind[l].p=(struct page *)xrealloc(ind[l].p,sizeof(struct page)*((int)((ind[l].num)/16)+1)*16);
- ind[l].p[ind[l].num].page=xstrdup(table);
+ ind[l].p[ind[l].num].page=xstrdup(table);
- ind[l].p[ind[l].num].enc=xstrdup(estr);
+ ind[l].p[ind[l].num].enc=xstrdup(estr);
chkpageattr(&ind[l].p[ind[l].num]);
}
}
@@ -388,15 +388,15 @@ LOOP:
nest++;
if (buff[j]==arg_close) {
if (nest==0) {
- table[k]='\0';
- ind[i].p[0].page=xstrdup(table);
+ table[k]='\0';
+ ind[i].p[0].page=xstrdup(table);
break;
}
else nest--;
}
copy_multibyte_char(buff, table, &j, &k);
}
- ind[l].p[0].enc=xstrdup(estr);
+ ind[l].p[0].enc=xstrdup(estr);
chkpageattr(&ind[i].p[0]);
}
}
@@ -493,25 +493,54 @@ int widechar_to_multibyte(char *mbstr, int32_t size, UChar *wcstr)
static void chkpageattr(struct page *p)
{
- int i,j,cc=0;
+ int i,j,cc=0,cnt,pplen,pclen;
+ char buff[16],*pcpos,*page0;
+ pplen=strlen(page_precedence);
+ pclen=strlen(page_compositor);
for (i=0;i<strlen(p->page);i++) {
- if (strncmp(page_compositor,&p->page[i],strlen(page_compositor))==0) {
+ page0=&p->page[i];
+ if (strncmp(page_compositor,page0,pclen)==0) {
p->attr[cc]=pattr[cc];
cc++;
- i+=strlen(page_compositor)-1;
+ i+=pclen-1;
+ if (cc>=PAGE_COMPOSIT_DEPTH) {
+ if (pclen>0)
+ verb_printf(efp, "\nToo many fields of page number \"%s\".\n", p->page);
+ else
+ verb_printf(efp, "\nIllegular page_comositor specification.\n");
+ exit(253);
+ }
}
else {
-ATTRLOOP:
- if (!((p->page[i]>='0' && p->page[i]<='9') || (p->page[i]>='A' && p->page[i]<='Z') || (p->page[i]>='a' && p->page[i]<='z'))) {
+ cnt=0;
+ if (!((*page0>='0' && *page0<='9') || (*page0>='A' && *page0<='Z') || (*page0>='a' && *page0<='z'))) {
p->attr[cc]= -1;
if (cc<2) p->attr[++cc]= -1;
return;
}
+ pcpos=strstr(page0,page_compositor);
+ j=pcpos ? pcpos-page0 : strlen(page0);
+ if (j>15) {
+ verb_printf(efp, "\nToo long page number string \"%s\".\n", page0);
+ exit(253);
+ }
+ strncpy(buff,page0,j);
+ buff[j]='\0';
+ATTRLOOP:
+ cnt++;
+ if (cnt>pplen) {
+ verb_printf(efp, "\nFailed to find page type for page \"%s\" in page_precedence specification (%s).\n",
+ page0, page_precedence);
+ exit(253);
+ }
+
switch(page_precedence[pattr[cc]]) {
case 'r':
- if (strchr("ivxlcdm",p->page[i])==NULL) {
- if (pattr[cc]<strlen(page_precedence)-1)
+ if (strchr("ivxlcdm",*page0)==NULL ||
+ (strchr("lcdm",*page0) && strchr(page_precedence,'a') && strlen(buff)==1 && pcpos)) {
+ /* heuristic detection as alphabet since L=50, C=100, D=100, M=1000 are quite large */
+ if (pattr[cc]<pplen-1)
pattr[cc]++;
else pattr[cc]=0;
for (j=cc+1;j<3;j++) pattr[j]=0;
@@ -519,8 +548,10 @@ ATTRLOOP:
}
break;
case 'R':
- if (strchr("IVXLCDM",p->page[i])==NULL) {
- if (pattr[cc]<strlen(page_precedence)-1)
+ if (strchr("IVXLCDM",*page0)==NULL ||
+ (strchr("LCDM",*page0) && strchr(page_precedence,'A') && strlen(buff)==1 && pcpos)) {
+ /* heuristic detection as alphabet since L=50, C=100, D=100, M=1000 are quite large */
+ if (pattr[cc]<pplen-1)
pattr[cc]++;
else pattr[cc]=0;
for (j=cc+1;j<3;j++) pattr[j]=0;
@@ -528,8 +559,8 @@ ATTRLOOP:
}
break;
case 'n':
- if (p->page[i]<'0' || p->page[i]>'9') {
- if (pattr[cc]<strlen(page_precedence)-1)
+ if (*page0<'0' || *page0>'9') {
+ if (pattr[cc]<pplen-1)
pattr[cc]++;
else pattr[cc]=0;
for (j=cc+1;j<3;j++) pattr[j]=0;
@@ -537,8 +568,10 @@ ATTRLOOP:
}
break;
case 'a':
- if (p->page[i]<'a' || p->page[i]>'z') {
- if (pattr[cc]<strlen(page_precedence)-1)
+ if (*page0<'a' || *page0>'z' || strlen(buff)>1 ||
+ (strchr("ivx",*page0) && strchr(page_precedence,'r') && !pcpos)) {
+ /* heuristic detection as roman number since I=1, V=5, X=10 are quite small */
+ if (pattr[cc]<pplen-1)
pattr[cc]++;
else pattr[cc]=0;
for (j=cc+1;j<3;j++) pattr[j]=0;
@@ -546,8 +579,10 @@ ATTRLOOP:
}
break;
case 'A':
- if (p->page[i]<'A' || p->page[i]>'Z') {
- if (pattr[cc]<strlen(page_precedence)-1)
+ if (*page0<'A' || *page0>'Z' || strlen(buff)>1 ||
+ (strchr("IVX",*page0) && strchr(page_precedence,'R') && !pcpos)) {
+ /* heuristic detection as roman number since I=1, V=5, X=10 are quite small */
+ if (pattr[cc]<pplen-1)
pattr[cc]++;
else pattr[cc]=0;
for (j=cc+1;j<3;j++) pattr[j]=0;
@@ -555,7 +590,9 @@ ATTRLOOP:
}
break;
default:
- break;
+ verb_printf(efp, "\nUnknown page type '%c' in page_precedence specification (%s).\n",
+ page_precedence[pattr[cc]], page_precedence);
+ exit(253);
}
}
}
diff --git a/indexing/upmendex/source/fwrite.c b/indexing/upmendex/source/fwrite.c
index d1685ede1c..9ce382589e 100644
--- a/indexing/upmendex/source/fwrite.c
+++ b/indexing/upmendex/source/fwrite.c
@@ -13,12 +13,12 @@ int line_length=0;
static void printpage(struct index *ind, FILE *fp, int num, char *lbuff);
static int range_check(struct index ind, int count, char *lbuff);
-static void linecheck(char *lbuff, char *tmpbuff);
+static void linecheck(char *lbuff, char *tmpbuff, int force);
static void crcheck(char *lbuff, FILE *fp);
static void index_normalize(UChar *istr, UChar *ini, int *chset);
static int initial_cmp_char(UChar *ini, UChar ch);
static int init_hanzi_header(void);
-static const UNormalizer2* unormalizer_NFD;
+static const UNormalizer2 *unormalizer_NFD, *unormalizer_NFKD;
static int turkish_i;
#define M_NONE 0
@@ -93,7 +93,7 @@ static void fprint_uchar(FILE *fp, const UChar *a, const int mode, const int len
} else
olen=wclen;
if (olen>INITIALLENGTH) {
- warn_printf(efp, "\nWarning, Too long (%d) header.\n", olen);
+ warn_printf(efp, "\nWarning: Too long (%d) header.\n", olen);
wclen=INITIALLENGTH;
} else
wclen=olen;
@@ -128,7 +128,7 @@ void warn_printf(FILE *fp, const char *format, ...)
vsnprintf(print_buff, sizeof print_buff, format, argptr);
va_end(argptr);
- warn++;
+ warn++;
fputs(print_buff, stderr);
if (fp!=stderr) fputs(print_buff, fp);
}
@@ -146,11 +146,27 @@ void verb_printf(FILE *fp, const char *format, ...)
if (fp!=stderr) fputs(print_buff, fp);
}
+static int pnumconv2(struct page *p)
+{
+ int j,k,cc,pclen;
+
+ pclen=strlen(page_compositor);
+ for (j=k=cc=0;j<strlen(p->page);j++) {
+ if (strncmp(p->page+j,page_compositor,pclen)==0) {
+ j+=pclen;
+ k=j;
+ cc++;
+ continue;
+ }
+ }
+ return pnumconv(p->page+k,p->attr[cc]);
+}
+
/* write ind file */
void indwrite(char *filename, struct index *ind, int pagenum)
{
- int i,j,hpoint=0,tpoint=0,ipoint=0,jpoint=0;
+ int i,j,hpoint=0,tpoint=0,ipoint=0,jpoint=0,block_open=0;
char lbuff[BUFFERLEN],obuff[BUFFERLEN];
UChar datama[256],initial[INITIALLENGTH],initial_prev[INITIALLENGTH];
int chset,chset_prev;
@@ -173,12 +189,34 @@ void indwrite(char *filename, struct index *ind, int pagenum)
fprintf(fp,"%s%d%s",setpage_prefix,pagenum,setpage_suffix);
}
perr=U_ZERO_ERROR;
- unormalizer_NFD=unorm2_getInstance(NULL, "nfc", UNORM2_DECOMPOSE, &perr);
+ unormalizer_NFD =unorm2_getInstance(NULL, "nfc", UNORM2_DECOMPOSE, &perr);
+ unormalizer_NFKD=unorm2_getInstance(NULL, "nfkc", UNORM2_DECOMPOSE, &perr);
+
+ if (strlen(symhead)==0) {
+ if (lethead_flag>0) {
+ strcpy(symhead, symhead_positive);
+ }
+ else if (lethead_flag<0) {
+ strcpy(symhead, symhead_negative);
+ }
+ }
+ {
+ if (lethead_flag>0) {
+ strcpy(numhead, numhead_positive);
+ }
+ else if (lethead_flag<0) {
+ strcpy(numhead, numhead_negative);
+ }
+ }
for (i=line_length=0;i<lines;i++) {
index_normalize(ind[i].dic[0], initial, &chset);
if (i==0) {
- if ((CH_LATIN<=chset&&chset<=CH_GREEK) || chset==CH_HANZI) {
+ if (is_any_script(chset) && strlen(script_preamble[chset])) {
+ fputs(script_preamble[chset],fp);
+ block_open=chset;
+ }
+ if ((CH_LATIN<=chset&&chset<=CH_GREEK) || chset==CH_HANZI || (CH_ARABIC<=chset&&chset<=CH_HEBREW)) {
if (lethead_flag!=0) {
fputs(lethead_prefix,fp);
fprint_uchar(fp,initial,lethead_flag,-1);
@@ -280,16 +318,11 @@ void indwrite(char *filename, struct index *ind, int pagenum)
}
}
else {
- if (lethead_flag!=0) {
- if (symbol_flag && strlen(symbol)) {
- fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
- }
- else if (lethead_flag>0) {
- fprintf(fp,"%s%s%s",lethead_prefix,symhead_positive,lethead_suffix);
- }
- else if (lethead_flag<0) {
- fprintf(fp,"%s%s%s",lethead_prefix,symhead_negative,lethead_suffix);
- }
+ if (lethead_flag!=0 && symbol_flag==2 && chset==CH_NUMERIC) {
+ fprintf(fp,"%s%s%s",lethead_prefix,numhead,lethead_suffix);
+ }
+ if (lethead_flag!=0 && (symbol_flag==1 || (symbol_flag==2 && chset!=CH_NUMERIC))) {
+ fprintf(fp,"%s%s%s",lethead_prefix,symhead,lethead_suffix);
}
widechar_to_multibyte(obuff,BUFFERLEN,ind[i].idx[0]);
SPRINTF(lbuff,"%s%s",item_0,obuff);
@@ -323,7 +356,19 @@ void indwrite(char *filename, struct index *ind, int pagenum)
}
else {
index_normalize(ind[i-1].dic[0], initial_prev, &chset_prev);
- if ((CH_LATIN<=chset&&chset<=CH_GREEK) || chset==CH_HANZI) {
+ if (chset!=chset_prev && is_any_script(chset_prev) && block_open) {
+ if (strlen(script_postamble[chset_prev])) {
+ fputs(script_postamble[chset_prev],fp);
+ }
+ block_open=0;
+ }
+ if (chset!=chset_prev && is_any_script(chset)) {
+ if (strlen(script_preamble[chset])) {
+ fputs(script_preamble[chset],fp);
+ block_open=chset;
+ }
+ }
+ if ((CH_LATIN<=chset&&chset<=CH_GREEK) || chset==CH_HANZI || (CH_ARABIC<=chset&&chset<=CH_HEBREW)) {
if (chset!=chset_prev || ss_comp(initial,initial_prev)) {
fputs(group_skip,fp);
if (lethead_flag!=0) {
@@ -398,18 +443,15 @@ void indwrite(char *filename, struct index *ind, int pagenum)
}
}
else {
- if (CH_LATIN<=chset_prev&&chset_prev<=CH_THAI){
- fputs(group_skip,fp);
- if (lethead_flag!=0 && symbol_flag) {
- if (strlen(symbol)) {
- fprintf(fp,"%s%s%s",lethead_prefix,symbol,lethead_suffix);
- }
- else if (lethead_flag>0) {
- fprintf(fp,"%s%s%s",lethead_prefix,symhead_positive,lethead_suffix);
- }
- else if (lethead_flag<0) {
- fprintf(fp,"%s%s%s",lethead_prefix,symhead_negative,lethead_suffix);
- }
+ if (chset_prev!=chset) {
+ if (is_any_script(chset_prev) || symbol_flag==2)
+ fputs(group_skip,fp);
+ if (lethead_flag!=0 && symbol_flag==2 && chset==CH_NUMERIC) {
+ fprintf(fp,"%s%s%s",lethead_prefix,numhead,lethead_suffix);
+ }
+ if (lethead_flag!=0 && (symbol_flag==1 && is_any_script(chset_prev) ||
+ symbol_flag==2 && chset!=CH_NUMERIC) ) {
+ fprintf(fp,"%s%s%s",lethead_prefix,symhead,lethead_suffix);
}
}
}
@@ -479,6 +521,9 @@ void indwrite(char *filename, struct index *ind, int pagenum)
printpage(ind,fp,i,lbuff);
}
}
+ if (is_any_script(chset) && strlen(script_postamble[chset]) && block_open) {
+ fputs(script_postamble[chset],fp);
+ }
fputs(postamble,fp);
if (fp!=stdout) fclose(fp);
@@ -498,7 +543,9 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff)
for(j=0;j<ind[num].num;j++) {
cc=range_check(ind[num],j,lbuff);
if (cc>j) {
- if (pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0])==pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])) {
+ int epage = pnumconv2(&ind[num].p[cc]);
+ int bpage = pnumconv2(&ind[num].p[j]);
+ if (epage==bpage) {
j=cc-1;
continue;
}
@@ -509,20 +556,18 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff)
if (strlen(ind[num].p[j].enc)>0) {
SPRINTF(buff,"%s%s%s",encap_prefix,ind[num].p[j].enc,encap_infix);
}
- if (strlen(suffix_3p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==2) {
- SAPPENDF(buff,"%s",ind[num].p[j].page);
+ /* print beginning of range */
+ SAPPENDF(buff,"%s",ind[num].p[j].page);
+ if (strlen(suffix_3p)>0 && epage-bpage==2) {
SAPPENDF(buff,"%s",suffix_3p);
}
- else if (strlen(suffix_mp)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))>=2) {
- SAPPENDF(buff,"%s",ind[num].p[j].page);
+ else if (strlen(suffix_mp)>0 && epage-bpage>=2) {
SAPPENDF(buff,"%s",suffix_mp);
}
- else if (strlen(suffix_2p)>0 && (pnumconv(ind[num].p[cc].page,ind[num].p[cc].attr[0])-pnumconv(ind[num].p[j].page,ind[num].p[j].attr[0]))==1) {
- SAPPENDF(buff,"%s",ind[num].p[j].page);
+ else if (strlen(suffix_2p)>0 && epage-bpage==1) {
SAPPENDF(buff,"%s",suffix_2p);
}
else {
- SAPPENDF(buff,"%s",ind[num].p[j].page);
SAPPENDF(buff,"%s",delim_r);
SAPPENDF(buff,"%s",ind[num].p[cc].page);
}
@@ -531,14 +576,14 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff)
if (strlen(ind[num].p[j].enc)>0) {
SAPPENDF(tmpbuff,"%s",encap_suffix);
}
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
j=cc;
if (j==ind[num].num) {
goto PRINT;
}
else {
SAPPENDF(tmpbuff,"%s",delim_n);
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, TRUE);
}
}
else if (strlen(ind[num].p[j].enc)>0) {
@@ -560,19 +605,19 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff)
SAPPENDF(tmpbuff,"%s",ind[num].p[j].page);
SAPPENDF(tmpbuff,"%s",encap_suffix);
SAPPENDF(tmpbuff,"%s",delim_n);
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
}
else {
SAPPENDF(tmpbuff,"%s",ind[num].p[j].page);
SAPPENDF(tmpbuff,"%s",delim_n);
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
}
}
else {
/* no encap */
SAPPENDF(tmpbuff,"%s",ind[num].p[j].page);
SAPPENDF(tmpbuff,"%s",delim_n);
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
}
}
@@ -606,7 +651,7 @@ static void printpage(struct index *ind, FILE *fp, int num, char *lbuff)
else {
SAPPENDF(tmpbuff,"%s",ind[num].p[j].page);
}
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
PRINT:
fputs(lbuff,fp);
@@ -652,7 +697,7 @@ static int range_check(struct index ind, int count, char *lbuff)
if (strlen(ind.p[j].enc)>0) {
SPRINTF(tmpbuff,"%s%s%s%s%s%s",encap_prefix,ind.p[j].enc,encap_infix
,ind.p[j].page,encap_suffix,delim_n);
- linecheck(lbuff,tmpbuff);
+ linecheck(lbuff,tmpbuff, FALSE);
}
}
}
@@ -682,8 +727,8 @@ static int range_check(struct index ind, int count, char *lbuff)
break;
}
}
- cc1=pnumconv(ind.p[i-1].page,ind.p[i-1].attr[0]);
- cc2=pnumconv(ind.p[count].page,ind.p[count].attr[0]);
+ cc1=pnumconv2(&ind.p[i-1]);
+ cc2=pnumconv2(&ind.p[count]);
if (cc1>=cc2+2 || (cc1>=cc2+1 && strlen(suffix_2p)) || force) {
return i-1;
}
@@ -691,9 +736,9 @@ static int range_check(struct index ind, int count, char *lbuff)
}
/* check line length */
-static void linecheck(char *lbuff, char *tmpbuff)
+static void linecheck(char *lbuff, char *tmpbuff, int force)
{
- if (line_length+strlen(tmpbuff)>line_max) {
+ if (line_length+strlen(tmpbuff)>line_max && !force) {
SAPPENDF(lbuff,"\n");
SAPPENDF(lbuff,"%s",indent_space);
SAPPENDF(lbuff,"%s",tmpbuff);
@@ -731,12 +776,20 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
UChar32 c32;
UErrorCode perr;
UCollationResult order;
- static int hanzi_mode=0;
+ UCollationStrength strgth;
+ static int hanzi_mode=0, i_y_mode=0;
ch=istr[0];
*chset=charset(istr);
ini[1]=L'\0';
+ if (is_circkana(ch) || is_hankana(ch) || is_sqkana(ch) || is_circlatin(ch)) { /* ã‹ã‹‘ã‹’.. アイウ.. ㌀ãŒãŒ‚.. */
+ src[0]=ch; src[1]=0x00;
+ perr=U_ZERO_ERROR;
+ unorm2_normalize(unormalizer_NFKD, src, 1, dest, 8, &perr);
+ if (U_SUCCESS(perr))
+ ch=dest[0];
+ }
if (is_hiragana(ch)) {
ch+=KATATOP-HIRATOP; /* hiragana -> katakana */
}
@@ -748,15 +801,15 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
ini[0]=extkanatable[ch-EXKANATOP];
return;
}
- if (is_circkana(ch)) { /* ã‹ã‹‘ã‹’ã‹“ã‹” .. ㋻㋼㋽㋾ */
- ini[0]=circkanatable[ch-CRKANATOP];
- return;
- }
- else if (ch==0x309F) { ini[0]=0x3088; return; } /* HIRAGANA YORI -> よ */
+ if (ch==0x309F) { ini[0]=0x3088; return; } /* HIRAGANA YORI -> よ */
else if (ch==0x30FF) { ini[0]=0x3053; return; } /* KATAKANA KOTO -> ã“ */
else if (is_jpn_kana(istr)==2) {
c32=U16_GET_SUPPLEMENTARY(istr[0],istr[1]);
switch (c32) {
+ case 0x1F200: /* 🈀 */
+ ini[0]=0x307B; break; /* ã» */
+ case 0x1B000: /* 𛀀 */
+ ini[0]=0x3048; break; /* ㈠*/
case 0x1B150: case 0x1B164:
ini[0]=0x3090; break; /* ã‚ */
case 0x1B151: case 0x1B165:
@@ -852,17 +905,29 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
u_strcpy(ini,hz_index[lo-1].idx);
return;
}
- else if (is_devanagari(&ch)||is_thai(&ch)) {
- if (ch==0x929||0x931||0x934||(0x958<=ch&&ch<=0x95F)) {
+ else if (is_devanagari(&ch)||is_thai(&ch)||is_arabic(&ch)||is_hebrew(&ch)) {
+ if (ch==0x929||ch==0x931||ch==0x934||(0x958<=ch&&ch<=0x95F) /* Devanagary */
+ ||(0x622<=ch&&ch<=0x626)||ch==0x6C0||ch==0x6C2||ch==0x6D3 /* Arabic */
+ ||(0xFB50<=ch&&ch<=0xFDFF) /* Arabic Presentation Forms-A */
+ ||(0xFE70<=ch&&ch<=0xFEFF) /* Arabic Presentation Forms-B */
+ ||(0xFB1D<=ch&&ch<=0xFB4F) /* Hebrew presentation forms */
+ ) {
src[0]=ch; src[1]=0x00;
perr=U_ZERO_ERROR;
unorm2_normalize(unormalizer_NFD, src, 1, dest, 8, &perr);
if (U_SUCCESS(perr))
ch=dest[0]; /* without modifier */
}
+ else if (ch==0x5DA||ch==0x5DD||ch==0x05DF||ch==0x5E3||ch==0x05E5) { /* Hebrew letter final */
+ ch++;
+ }
ini[0]=ch;
return;
}
+ if (ch>=0xFF21&&ch<=0xFF3A || ch>=0xFF41&&ch<=0xFF5A) {
+ /* Fullwidth latin letter */
+ ch-=0xFF21-0x0041;
+ }
if (ch==0x049||ch==0x069||ch==0x130||ch==0x131||ch==0x0CE||ch==0x0EE) {
/* check dotted/dotless İ,I,i,ı and Î,î for Turkish */
strX[0] = 0x131; strX[1] = 0x5A; strX[2] = 0x00; /* ıZ */
@@ -874,6 +939,22 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
return;
}
}
+ if (ch==0x059||ch==0x079) {
+ /* check Y versus I for Lithuanian */
+ if (i_y_mode==0) {
+ strgth = ucol_getStrength(icu_collator);
+ ucol_setStrength(icu_collator, UCOL_PRIMARY);
+ strX[0] = 0x059; strX[1] = 0x00; /* Y */
+ strZ[0] = 0x049; strZ[1] = 0x00; /* I */
+ order = ucol_strcoll(icu_collator, strZ, -1, strX, -1);
+ if (order==UCOL_EQUAL) i_y_mode=2; else i_y_mode=1;
+ ucol_setStrength(icu_collator, strgth);
+ }
+ if (i_y_mode==2) {
+ ini[0] = 0x049; /* I */
+ return;
+ }
+ }
if (ch==0x0C6||ch==0x0E6||ch==0x152||ch==0x153||ch==0x132||ch==0x133
||ch==0x0DF||ch==0x1E9E||ch==0x13F||ch==0x140||ch==0x490||ch==0x491) {
strX[0] = u_toupper(ch); strX[1] = 0x00; /* ex. "Æ" "Œ" */
@@ -976,6 +1057,8 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
}
}
}
+ if (ch==0x0AA) ch=L'A';
+ if (ch==0x0BA) ch=L'O';
ini[0]=u_toupper(ch);
return;
}
@@ -1033,7 +1116,7 @@ static int init_hanzi_header(void)
len=u_strlen(pch0);
}
if (len>=INITIALLENGTH) {
- warn_printf(efp, "\nWarning, Too long (%d) hanzi header.\n", len);
+ warn_printf(efp, "\nWarning: Too long (%d) hanzi header.\n", len);
len=INITIALLENGTH-1;
}
u_strncpy(hz_index[k].idx,pch0,len);
diff --git a/indexing/upmendex/source/kana.h b/indexing/upmendex/source/kana.h
index 5c006cb7f3..41307f2cb4 100644
--- a/indexing/upmendex/source/kana.h
+++ b/indexing/upmendex/source/kana.h
@@ -192,56 +192,6 @@ UChar extkanatable[]={
0x308d, /* ã‚ */
0
};
-UChar circkanatable[]={
- 0x3042, /* ã‚ */
- 0x3044, /* ã„ */
- 0x3046, /* ㆠ*/
- 0x3048, /* ㈠*/
- 0x304a, /* ㊠*/
- 0x304b, /* ã‹ */
- 0x304d, /* ã */
- 0x304f, /* ã */
- 0x3051, /* ã‘ */
- 0x3053, /* ã“ */
- 0x3055, /* ã• */
- 0x3057, /* ã— */
- 0x3059, /* ã™ */
- 0x305b, /* ã› */
- 0x305d, /* ã */
- 0x305f, /* 㟠*/
- 0x3061, /* ã¡ */
- 0x3064, /* 㤠*/
- 0x3066, /* 㦠*/
- 0x3068, /* 㨠*/
- 0x306a, /* 㪠*/
- 0x306b, /* ã« */
- 0x306c, /* 㬠*/
- 0x306d, /* ã­ */
- 0x306e, /* ã® */
- 0x306f, /* 㯠*/
- 0x3072, /* ã² */
- 0x3075, /* ãµ */
- 0x3078, /* 㸠*/
- 0x307b, /* ã» */
- 0x307e, /* ã¾ */
- 0x307f, /* ã¿ */
- 0x3080, /* ã‚€ */
- 0x3081, /* ã‚ */
- 0x3082, /* ã‚‚ */
- 0x3084, /* ã‚„ */
- 0x3086, /* ゆ */
- 0x3088, /* よ */
- 0x3089, /* ら */
- 0x308a, /* ã‚Š */
- 0x308b, /* ã‚‹ */
- 0x308c, /* れ */
- 0x308d, /* ã‚ */
- 0x308f, /* ã‚ */
- 0x3090, /* ã‚ */
- 0x3091, /* ã‚‘ */
- 0x3092, /* ã‚’ */
- 0
-};
UChar GANADA[]={
diff --git a/indexing/upmendex/source/ktable.h b/indexing/upmendex/source/ktable.h
deleted file mode 100644
index 9a3a00ef49..0000000000
--- a/indexing/upmendex/source/ktable.h
+++ /dev/null
@@ -1,98 +0,0 @@
-UChar symboltable[]={
- 0x3000, /* スペース */
- 0xff01, /* ï¼ */
- 0xff02, /* †*/
- 0xff03, /* # */
- 0xff04, /* $ */
- 0xff05, /* ï¼… */
- 0xff06, /* & */
- 0xff07, /* ’ */
- 0xff08, /* ( */
- 0xff09, /* ) */
- 0xff0a, /* * */
- 0xff0b, /* + */
- 0xff0c, /* , */
- 0xff0d, /* − */
- 0xff0e, /* . */
- 0xff0f, /* ï¼ */
- 0xff10, /* ï¼ */
- 0xff11, /* 1 */
- 0xff12, /* ï¼’ */
- 0xff13, /* 3 */
- 0xff14, /* ï¼” */
- 0xff15, /* 5 */
- 0xff16, /* ï¼– */
- 0xff17, /* ï¼— */
- 0xff18, /* 8 */
- 0xff19, /* ï¼™ */
- 0xff1a, /* : */
- 0xff1b, /* ï¼› */
- 0xff1c, /* < */
- 0xff1d, /* ï¼ */
- 0xff1e, /* > */
- 0xff1f, /* ? */
- 0xff20, /* ï¼  */
- 0xff21, /* A */
- 0xff22, /* ï¼¢ */
- 0xff23, /* ï¼£ */
- 0xff24, /* D */
- 0xff25, /* ï¼¥ */
- 0xff26, /* F */
- 0xff27, /* G */
- 0xff28, /* H */
- 0xff29, /* I */
- 0xff2a, /* J */
- 0xff2b, /* K */
- 0xff2c, /* L */
- 0xff2d, /* ï¼­ */
- 0xff2e, /* ï¼® */
- 0xff2f, /* O */
- 0xff30, /* ï¼° */
- 0xff31, /* ï¼± */
- 0xff32, /* ï¼² */
- 0xff33, /* ï¼³ */
- 0xff34, /* ï¼´ */
- 0xff35, /* ï¼µ */
- 0xff36, /* V */
- 0xff37, /* ï¼· */
- 0xff38, /* X */
- 0xff39, /* ï¼¹ */
- 0xff3a, /* Z */
- 0xff3b, /* ï¼» */
- 0xffe5, /* ï¿¥ */
- 0xff3d, /* ï¼½ */
- 0xff3e, /* ï¼¾ */
- 0xff3f, /* _ */
- 0xff40, /* ‘ */
- 0xff41, /* ï½ */
- 0xff42, /* b */
- 0xff43, /* c */
- 0xff44, /* d */
- 0xff45, /* ï½… */
- 0xff46, /* f */
- 0xff47, /* g */
- 0xff48, /* h */
- 0xff49, /* i */
- 0xff4a, /* j */
- 0xff4b, /* k */
- 0xff4c, /* l */
- 0xff4d, /* ï½ */
- 0xff4e, /* n */
- 0xff4f, /* ï½ */
- 0xff50, /* ï½ */
- 0xff51, /* q */
- 0xff52, /* ï½’ */
- 0xff53, /* s */
- 0xff54, /* ï½” */
- 0xff55, /* u */
- 0xff56, /* ï½– */
- 0xff57, /* ï½— */
- 0xff58, /* x */
- 0xff59, /* ï½™ */
- 0xff5a, /* z */
- 0xff5b, /* ï½› */
- 0xff5c, /* | */
- 0xff5d, /* ï½ */
- 0xff5f, /* 〜 */
- 0
-};
diff --git a/indexing/upmendex/source/mendex.h b/indexing/upmendex/source/mendex.h
index c6703761fc..091862d61e 100644
--- a/indexing/upmendex/source/mendex.h
+++ b/indexing/upmendex/source/mendex.h
@@ -11,10 +11,12 @@
#include <unicode/uchar.h>
#include <unicode/ucol.h>
+#define PAGE_COMPOSIT_DEPTH 10
+
struct page {
char *page;
char *enc;
- int attr[3];
+ int attr[PAGE_COMPOSIT_DEPTH];
};
struct index {
@@ -47,7 +49,6 @@ int lastpage(const char *filename);
/* sort.c */
void wsort(struct index *ind, int num);
void pagesort(struct index *ind, int num);
-int is_alphanumeric(UChar *c);
int is_latin(UChar *c);
int is_numeric(UChar *c);
int is_jpn_kana(UChar *c);
@@ -58,7 +59,10 @@ int is_cyrillic(UChar *c);
int is_greek(UChar *c);
int is_devanagari(UChar *c);
int is_thai(UChar *c);
-int is_comb_diacritical_mark(UChar *c);
+int is_arabic(UChar *c);
+int is_hebrew(UChar *c);
+int is_type_mark_or_punct(UChar *c);
+int is_type_symbol(UChar *c);
int chkcontinue(struct page *p, int num);
int ss_comp(UChar *s1, UChar *s2);
@@ -71,8 +75,11 @@ int ss_comp(UChar *s1, UChar *s2);
#define CH_HANZI 6
#define CH_DEVANAGARI 7
#define CH_THAI 8
+#define CH_ARABIC 9
+#define CH_HEBREW 10
#define CH_SYMBOL 0x100
#define CH_NUMERIC 0x101
+#define is_any_script(a) ((CH_LATIN<=(a) && (a)<=CH_HEBREW))
/* sort.c */
int charset(UChar *c);
diff --git a/indexing/upmendex/source/sort.c b/indexing/upmendex/source/sort.c
index e3a47c12b7..bcecd765cf 100644
--- a/indexing/upmendex/source/sort.c
+++ b/indexing/upmendex/source/sort.c
@@ -4,7 +4,23 @@
#include "exkana.h"
#include "exvar.h"
-int sym,nmbr,ltn,kana,hngl,hnz,cyr,grk,dvng,thai;
+#define RULEBUFSIZE 29210+STYBUFSIZE
+/*
+ length of collation rule in ICU 68.2
+
+ icu_locale length
+ ja 6410
+ ja@collation=unihan 61
+ ko 12577
+ ko@collation=unihan 51
+ ko@collation=search 782
+ zh (pinin) 26909
+ zh@collation=unihan 82
+ zh@collation=stroke 29208
+ zh@collation=zhuyin 28880
+*/
+
+int sym,nmbr,ltn,kana,hngl,hnz,cyr,grk,dvng,thai,arab,hbrw;
static int wcomp(const void *p, const void *q);
static int pcomp(const void *p, const void *q);
@@ -17,7 +33,9 @@ void wsort(struct index *ind, int num)
{
int i,order;
UErrorCode status;
- UChar rules[STYBUFSIZE];
+ UParseError parse_error;
+ UChar rules[RULEBUFSIZE] = {'\0'};
+ int32_t len;
for (order=1,i=0;;i++) {
switch (character_order[i]) {
@@ -65,7 +83,16 @@ void wsort(struct index *ind, int num)
thai=order++;
break;
+ case 'a':
+ arab=order++;
+ break;
+
+ case 'h':
+ hbrw=order++;
+ break;
+
default:
+ verb_printf(efp,"\nWarning: Illegal input for character_order (%c).",character_order[i]);
break;
}
}
@@ -82,11 +109,28 @@ BREAK:
if (grk==0) grk=order++;
if (dvng==0) dvng=order++;
if (thai==0) thai=order++;
+ if (arab==0) arab=order++;
+ if (hbrw==0) hbrw=order++;
status = U_ZERO_ERROR;
if (strlen(icu_rules)>0) {
+ if (strcmp(icu_locale,"root")!=0) {
+ icu_collator = ucol_open(icu_locale, &status);
+ if (U_FAILURE(status)) {
+ verb_printf(efp, "\n[ICU] Collator creation failed.: %s\n", u_errorName(status));
+ exit(254);
+ }
+ len = ucol_getRulesEx(icu_collator, UCOL_TAILORING_ONLY, rules, RULEBUFSIZE);
+ if (u_strlen(rules)<len) {
+ verb_printf(efp, "\n[ICU] Failed to extract collation rules by locale (%s). Need buffer size %d.\n",
+ icu_locale, len);
+ exit(254);
+ }
+ ucol_close(icu_collator);
+ }
unescape((unsigned char *)icu_rules, rules);
- icu_collator = ucol_openRules(rules, -1, UCOL_OFF, UCOL_TERTIARY, NULL, &status);
+ status = U_ZERO_ERROR;
+ icu_collator = ucol_openRules(rules, -1, UCOL_OFF, UCOL_TERTIARY, &parse_error, &status);
} else
icu_collator = ucol_open(icu_locale, &status);
if (U_FAILURE(status)) {
@@ -94,11 +138,11 @@ BREAK:
exit(254);
}
if (status == U_USING_DEFAULT_WARNING) {
- warn_printf(efp, "\nWarning, [ICU] U_USING_DEFAULT_WARNING for locale %s\n",
+ warn_printf(efp, "\nWarning: [ICU] U_USING_DEFAULT_WARNING for locale %s\n",
icu_locale);
}
if (status == U_USING_FALLBACK_WARNING) {
- warn_printf(efp, "\nWarning, [ICU] U_USING_FALLBACK_WARNING for locale %s\n",
+ warn_printf(efp, "\nWarning: [ICU] U_USING_FALLBACK_WARNING for locale %s\n",
icu_locale);
}
for (i=0;i<UCOL_ATTRIBUTE_COUNT;i++) {
@@ -107,7 +151,7 @@ BREAK:
ucol_setAttribute(icu_collator, i, icu_attributes[i], &status);
}
if (U_FAILURE(status)) {
- warn_printf(efp, "\nWarning, [ICU] Failed to set attribute (%d): %s\n",
+ warn_printf(efp, "\nWarning: [ICU] Failed to set attribute (%d): %s\n",
i, u_errorName(status));
}
}
@@ -214,12 +258,12 @@ void pagesort(struct index *ind, int num)
static int pcomp(const void *p, const void *q)
{
int i,j,cc=0,num1,num2;
- char buff[16];
+ char buff[16],*p0,*p1;
const struct page *page1 = p, *page2 = q;
scount++;
- for (i=0;i<3;i++) {
+ for (i=0;i<PAGE_COMPOSIT_DEPTH;i++) {
if ((page1->attr[i]<0)&&(page2->attr[i]<0)) return 0;
else if ((page1->attr[i]<0)&&(page2->attr[i]>=0)) return -1;
else if ((page2->attr[i]<0)&&(page1->attr[i]>=0)) return 1;
@@ -227,18 +271,18 @@ static int pcomp(const void *p, const void *q)
if (page1->attr[i]>page2->attr[i]) return 1;
if (page1->attr[i]<page2->attr[i]) return -1;
- for (j=cc;j<strlen(page1->page);j++) {
- if (strncmp(&page1->page[j],page_compositor,strlen(page_compositor))==0) break;
- }
- strncpy(buff,&page1->page[cc],j-cc);
- buff[j-cc]='\0';
+ p0=&page1->page[cc];
+ p1=strstr(p0, page_compositor);
+ j=p1 ? p1-p0 : strlen(p0);
+ strncpy(buff,p0,j);
+ buff[j]='\0';
num1=pnumconv(buff,page1->attr[i]);
- for (j=cc;j<strlen(page2->page);j++) {
- if (strncmp(&page2->page[j],page_compositor,strlen(page_compositor))==0) break;
- }
- strncpy(buff,&page2->page[cc],j-cc);
- buff[j-cc]='\0';
+ p0=&page2->page[cc];
+ p1=strstr(p0, page_compositor);
+ j=p1 ? p1-p0 : strlen(p0);
+ strncpy(buff,p0,j);
+ buff[j]='\0';
num2=pnumconv(buff,page2->attr[i]);
if (num1>num2) return 1;
@@ -247,7 +291,8 @@ static int pcomp(const void *p, const void *q)
if (page1->enc[0]=='(' || page2->enc[0]==')') return -1;
if (page1->enc[0]==')' || page2->enc[0]=='(') return 1;
- cc=j+strlen(page_compositor);
+ if (p1) cc+=j+strlen(page_compositor);
+ else return 0;
}
return 0;
@@ -255,13 +300,15 @@ static int pcomp(const void *p, const void *q)
static int ordering(UChar *c)
{
- if (*c<0x80) {
- if (is_latin(c)) return ltn;
- else if (is_numeric(c)) return nmbr;
- else return sym;
+ if (*c<0x20) return sym; /* control */
+ else if (*c<0x7F) {
+ if (is_latin(c)) return ltn;
+ else if (is_numeric(c)) return nmbr;
+ else return sym;
}
+ else if (*c<0xA0) return sym; /* control */
else {
- if (is_latin(c)) return ltn;
+ if (is_latin(c)) return ltn;
else if (is_jpn_kana(c)) return kana;
else if (is_kor_hngl(c)) return hngl;
else if (is_hanzi(c)) return hnz;
@@ -270,20 +317,23 @@ static int ordering(UChar *c)
else if (is_numeric(c)) return nmbr;
else if (is_devanagari(c)) return dvng;
else if (is_thai(c)) return thai;
- else return sym;
+ else if (is_arabic(c)) return arab;
+ else if (is_hebrew(c)) return hbrw;
+ else return sym;
}
}
int charset(UChar *c)
{
- if (*c==0x00) return CH_UNKNOWN;
- else if (*c<0x80) {
- if (is_latin(c)) return CH_LATIN;
- else if (is_numeric(c)) return CH_NUMERIC;
- else return CH_SYMBOL;
+ if (*c<0x20) return CH_UNKNOWN; /* control */
+ else if (*c<0x7F) {
+ if (is_latin(c)) return CH_LATIN;
+ else if (is_numeric(c)) return CH_NUMERIC;
+ else return CH_SYMBOL;
}
+ else if (*c<0xA0) return CH_UNKNOWN; /* control */
else {
- if (is_latin(c)) return CH_LATIN;
+ if (is_latin(c)) return CH_LATIN;
else if (is_jpn_kana(c)) return CH_KANA;
else if (is_kor_hngl(c)) return CH_HANGUL;
else if (is_hanzi(c)) return CH_HANZI;
@@ -292,7 +342,9 @@ int charset(UChar *c)
else if (is_numeric(c)) return CH_NUMERIC;
else if (is_devanagari(c)) return CH_DEVANAGARI;
else if (is_thai(c)) return CH_THAI;
- else return CH_SYMBOL;
+ else if (is_arabic(c)) return CH_ARABIC;
+ else if (is_hebrew(c)) return CH_HEBREW;
+ else return CH_SYMBOL;
}
}
@@ -312,10 +364,10 @@ static int get_charset_juncture(UChar *str)
else l = k-1;
chset_l=charset(&str[l]);
chset_k=charset(&str[k]);
- if (chset0==CH_UNKNOWN && chset_l!=CH_SYMBOL && chset_l!=CH_NUMERIC) {
+ if (chset0==CH_UNKNOWN && is_any_script(chset_l)) {
chset0=chset_l;
}
- if (chset_k!=CH_SYMBOL && chset_k!=CH_NUMERIC) {
+ if (chset0!=CH_UNKNOWN && is_any_script(chset_k)) {
if (chset0!=chset_k) {
len=k;
return len;
@@ -324,10 +376,11 @@ static int get_charset_juncture(UChar *str)
}
}
-static int unescape(const unsigned char *src, UChar *dist)
+static int unescape(const unsigned char *src, UChar *dest)
{
- int i,j,k;
+ int i,j,k,ret;
char tmp[STYBUFSIZE];
+ UErrorCode status;
for (i=j=0;i<STYBUFSIZE;i++) {
if (src[i]=='\0') {
@@ -336,32 +389,37 @@ static int unescape(const unsigned char *src, UChar *dist)
else if (src[i]< 0x80 && (src[i+1]>=0x80 || src[i+1]=='\0')) {
strncpy(tmp,(char *)&src[j],i-j+1);
tmp[i-j+1]='\0';
- k=u_strlen(dist);
- u_unescape(tmp, &dist[k], STYBUFSIZE-k);
+ k=u_strlen(dest);
+ ret=u_unescape(tmp, &dest[k], RULEBUFSIZE-k);
+ if (ret==0) {
+ verb_printf(efp, "\n[ICU] Escape sequence in input seems malformed.\n");
+ exit(254);
+ }
j=i+1;
}
else if (src[i]>=0x80 && (src[i+1]< 0x80 || src[i+1]=='\0')) {
strncpy(tmp,(char *)&src[j],i-j+1);
tmp[i-j+1]='\0';
- k=u_strlen(dist);
- multibyte_to_widechar(&dist[k], STYBUFSIZE-k, tmp);
+ k=u_strlen(dest);
+ status=U_ZERO_ERROR;
+ u_strFromUTF8(&dest[k], RULEBUFSIZE-k, NULL, tmp, -1, &status);
+ if (U_FAILURE(status)) {
+ verb_printf(efp, "\n[ICU] Input string seems malformed.: %s\n", u_errorName(status));
+ exit(254);
+ }
j=i+1;
}
}
return -1;
}
-int is_alphanumeric(UChar *c)
-{
- if (((*c>=L'A')&&(*c<=L'Z'))||((*c>=L'a')&&(*c<=L'z'))||((*c>=L'0')&&(*c<=L'9')))
- return 1;
- else return 0;
-}
-
int is_latin(UChar *c)
{
+ UChar32 c32;
+
if (((*c>=L'A')&&(*c<=L'Z'))||((*c>=L'a')&&(*c<=L'z'))) return 1;
- else if ((*c>=0x00C0)&&(*c<=0x00D6)) return 1; /* Latin-1 Supplement */
+ else if ((*c==0x00AA)||(*c==0x00BA)) return 1; /* Latin-1 Supplement */
+ else if ((*c>=0x00C0)&&(*c<=0x00D6)) return 1;
else if ((*c>=0x00D8)&&(*c<=0x00F6)) return 1;
else if ((*c>=0x00F8)&&(*c<=0x00FF)) return 1;
else if ((*c>=0x0100)&&(*c<=0x024F)) return 1; /* Latin Extended-A,B */
@@ -371,28 +429,63 @@ int is_latin(UChar *c)
else if ((*c>=0xAB30)&&(*c<=0xAB6F)) return 1; /* Latin Extended-E */
else if ((*c>=0x1E00)&&(*c<=0x1EFF)) return 1; /* Latin Extended Additional */
else if ((*c>=0xFB00)&&(*c<=0xFB06)) return 1; /* Latin ligatures */
- else return 0;
+ else if ((*c>=0xFF21)&&(*c<=0xFF3A)) return 1; /* Fullwidth Latin Capital Letter */
+ else if ((*c>=0xFF41)&&(*c<=0xFF5A)) return 1; /* Fullwidth Latin Small Letter */
+ /* Property of followings is "Common, So (other symbol)", but seem to be treated as Latin by ICU collator */
+ else if ((*c>=0x24B6) /* CIRCLED LATIN CAPITAL LETTER */
+ &&(*c<=0x24E9)) return 1; /* CIRCLED LATIN SMALL LETTER */
+
+ if (is_surrogate_pair(c)) {
+ c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
+ if ((c32>=0x10780) && (c32<=0x107BF)) return 2; /* Latin Extended-F */
+ else if ((c32>=0x1DF00) && (c32<=0x1DFFF)) return 2; /* Latin Extended-G */
+ }
+ return 0;
}
int is_numeric(UChar *c)
{
+ UChar32 c32;
+
if ((*c>=L'0')&&(*c<=L'9')) return 1;
- else if ((*c>=0x0966)&&(*c<=0x096F)) return 1; /* Devanagari Digit */
- else if ((*c>=0x0E50)&&(*c<=0x0E59)) return 1; /* Thai Digit */
- else return 0;
+ else if ((*c>=0xFF10)&&(*c<=0xFF19)) return 1; /* Fullwidth Digit */
+ /* followings do not seem to be treated as numbers by ICU collator though charType is U_OTHER_NUMBER */
+ else if ((*c>=0x3192)&&(*c<=0x3195)) return 0; /* IDEOGRAPHIC ANNOTATION ONE MARK..IDEOGRAPHIC ANNOTATION FOUR MARK */
+ else if ((*c>=0x3220)&&(*c<=0x3229)) return 0; /* PARENTHESIZED IDEOGRAPH ONE..PARENTHESIZED IDEOGRAPH TEN */
+ else if ((*c>=0x3280)&&(*c<=0x3289)) return 0; /* CIRCLED IDEOGRAPH ONE..CIRCLED IDEOGRAPH TEN */
+ else if ((*c>=0xA830)&&(*c<=0xA835)) return 0; /* NORTH INDIC FRACTION ONE QUARTER..NORTH INDIC FRACTION THREE SIXTEENTHS */
+
+ if (is_surrogate_pair(c))
+ c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
+ else c32=*c;
+
+ switch (u_charType(c32)) {
+ case U_DECIMAL_DIGIT_NUMBER:
+ return 1;
+ case U_OTHER_NUMBER:
+ return 2;
+ default:
+ return 0;
+ }
}
int is_jpn_kana(UChar *c)
{
UChar32 c32;
- if ((*c>=0x3040)&&(*c<=0x30FF)) return 1; /* Hiragana, Katakana */
+ if (*c==0x30A0) return 0; /* KATAKANA-HIRAGANA DOUBLE HYPHEN */
+ else if (*c==0x30FB) return 0; /* KATAKANA MIDDLE DOT */
+ else if ((*c>=0x3040)&&(*c<=0x30FF)) return 1; /* Hiragana, Katakana */
else if ((*c>=0x31F0)&&(*c<=0x31FF)) return 1; /* Katakana Phonetic Extensions */
else if ((*c>=0x32D0)&&(*c<=0x32FE)) return 1; /* Circled Katakana */
+ else if ((*c>=0xFF66)&&(*c<=0xFF9F)) return 1; /* Halfwidth Katakana */
+ else if ((*c>=0x3300)&&(*c<=0x3357)) return 1; /* Squared Katakana words */
if (is_surrogate_pair(c)) {
c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
if ((c32>=0x1B130) && (c32<=0x1B16F)) return 2; /* Small Kana Extensions */
+ else if ((c32==0x1B000)) return 2; /* KATAKANA LETTER ARCHAIC E */
+ else if ((c32==0x1F200)) return 2; /* SQUARE HIRAGANA HOKA */
}
return 0;
/* ICU 65 does not seem to support
@@ -416,11 +509,11 @@ int is_hanzi(UChar *c)
{
UChar32 c32;
- if ((*c>=0x2E80)&&(*c<=0x2EFF)) return 1; /* CJK Radicals Supplement */
- else if ((*c>=0x2F00)&&(*c<=0x2FDF)) return 1; /* Kangxi Radicals */
+ if ((*c>=0x2E80) /* CJK Radicals Supplement */
+ &&(*c<=0x2FDF)) return 1; /* Kangxi Radicals */
else if ((*c>=0x31C0)&&(*c<=0x31EF)) return 1; /* CJK Strokes */
- else if ((*c>=0x3300)&&(*c<=0x33FF)) return 1; /* CJK Compatibility */
- else if ((*c>=0x3400)&&(*c<=0x4DBF)) return 1; /* CJK Unified Ideographs Extension A */
+ else if ((*c>=0x3300) /* CJK Compatibility */
+ &&(*c<=0x4DBF)) return 1; /* CJK Unified Ideographs Extension A */
else if ((*c>=0x4E00)&&(*c<=0x9FFF)) return 1; /* CJK Unified Ideographs */
else if ((*c>=0xF900)&&(*c<=0xFAFF)) return 1; /* CJK Compatibility Ideographs */
@@ -442,7 +535,9 @@ int is_zhuyin(UChar *c)
int is_cyrillic(UChar *c)
{
- if ((*c>=0x0400)&&(*c<=0x052F)) return 1; /* Cyrillic, Cyrillic Supplement */
+ if ((*c==0x0482)) return 0; /* Cyrillic Thousands Sign */
+ else if ((*c>=0x0400) /* Cyrillic */
+ &&(*c<=0x052F)) return 1; /* Cyrillic Supplement */
else if ((*c>=0x1C80)&&(*c<=0x1C8F)) return 1; /* Cyrillic Extended-C */
else if ((*c>=0x2DE0)&&(*c<=0x2DFF)) return 1; /* Cyrillic Extended-A */
else if ((*c>=0xA640)&&(*c<=0xA69F)) return 1; /* Cyrillic Extended-B */
@@ -451,14 +546,16 @@ int is_cyrillic(UChar *c)
int is_greek(UChar *c)
{
- if ((*c>=0x0370)&&(*c<=0x03FF)) return 1; /* Greek */
+ if ((*c==0x03F6)) return 0; /* Greek Reversed Lunate Epsilon Symbol */
+ else if ((*c>=0x0370)&&(*c<=0x03FF)) return 1; /* Greek */
else if ((*c>=0x1F00)&&(*c<=0x1FFF)) return 1; /* Greek Extended */
else return 0;
}
int is_devanagari(UChar *c)
{
- if ((*c>=0x0966)&&(*c<=0x096F)) return 0; /* Devanagari Digit */
+ if ((*c>=0x0964) /* Generic punctuation for scripts of India */
+ &&(*c<=0x096F)) return 0; /* Devanagari Digit */
else if ((*c>=0x0900)&&(*c<=0x097F)) return 1; /* Devanagari */
else if ((*c>=0xA8E0)&&(*c<=0xA8FF)) return 1; /* Devanagari Extended */
else return 0;
@@ -472,47 +569,132 @@ int is_thai(UChar *c)
else return 0;
}
-int is_comb_diacritical_mark(UChar *c)
+int is_arabic(UChar *c)
+{
+ if ((*c>=0x0600) /* ARABIC NUMBER SIGN..ARABIC SIGN SAMVAT */
+ /* ARABIC NUMBER MARK ABOVE */
+ &&(*c<=0x0608)) return 0; /* ARABIC-INDIC CUBE ROOT..ARABIC RAY */
+ else if ((*c==0x060B)) return 0; /* AFGHANI SIGN */
+ else if ((*c==0x060C)) return 0; /* ARABIC COMMA */
+ else if ((*c>=0x060E)&&(*c<=0x060F)) return 0; /* ARABIC POETIC VERSE SIGN..ARABIC SIGN MISRA */
+ else if ((*c>=0x0660)&&(*c<=0x0669)) return 0; /* ARABIC-INDIC DIGIT ZERO..ARABIC-INDIC DIGIT NINE */
+ else if ((*c==0x061B)) return 0; /* ARABIC SEMICOLON */
+ else if ((*c==0x061C)) return 0; /* ARABIC LETTER MARK */
+ else if ((*c==0x061F)) return 0; /* ARABIC QUESTION MARK */
+ else if ((*c==0x0640)) return 0; /* ARABIC TATWEEL */
+ else if ((*c==0x06DD)) return 0; /* ARABIC END OF AYAH */
+ else if ((*c==0x06DE)) return 0; /* ARABIC START OF RUB EL HIZB */
+ else if ((*c==0x06E9)) return 0; /* ARABIC PLACE OF SAJDAH */
+ else if ((*c>=0x06F0)&&(*c<=0x06F9)) return 0; /* EXTENDED ARABIC-INDIC DIGIT ZERO..EXTENDED ARABIC-INDIC DIGIT NINE */
+ else if ((*c>=0x06FD)&&(*c<=0x06FE)) return 0; /* ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN */
+ else if ((*c==0x08E2)) return 0; /* ARABIC DISPUTED END OF AYAH */
+ else if ((*c>=0x0890)&&(*c<=0x0891)) return 0; /* ARABIC POUND MARK ABOVE..ARABIC PIASTRE MARK ABOVE */
+ else if ((*c>=0xFD40)&&(*c<=0xFD4F)) return 0; /* ARABIC LIGATURE RAHIMAHU ALLAAH..ARABIC LIGATURE RAHIMAHUM ALLAAH */
+ else if ((*c==0xFDCF)) return 0; /* ARABIC LIGATURE SALAAMUHU ALAYNAA */
+ else if ((*c==0xFDFC)) return 0; /* RIAL SIGH */
+ else if ((*c>=0xFDFD)&&(*c<=0xFDFF)) return 0; /* ARABIC LIGATURE BISMILLAH AR-RAHMAN AR-RAHEEM..ARABIC LIGATURE AZZA WA JALL */
+
+ else if ((*c>=0x0600)&&(*c<=0x06FF)) return 1; /* Arabic */
+ else if ((*c>=0x0750)&&(*c<=0x077F)) return 1; /* Arabic Supplement */
+ else if ((*c>=0x0870) /* Arabic Extended-B */
+ &&(*c<=0x08FF)) return 1; /* Arabic Extended-A */
+ else if ((*c>=0xFB50)&&(*c<=0xFDFF)) return 1; /* Arabic Presentation Forms-A */
+ else if ((*c>=0xFE70)&&(*c<=0xFEFF)) return 1; /* Arabic Presentation Forms-B */
+ else return 0;
+}
+
+int is_hebrew(UChar *c)
{
- if ((*c>=0x02B0)&&(*c<=0x02FF)) return 1; /* Spacing Modifier Letters */
- else if ((*c>=0x0300)&&(*c<=0x036F)) return 1; /* Combining Diacritical Marks */
- else if ((*c>=0x1DC0)&&(*c<=0x1DFF)) return 1; /* Combining Diacritical Marks Supplement */
- else if ((*c>=0x1AB0)&&(*c<=0x1AFF)) return 1; /* Combining Diacritical Marks Extended */
- else if ((*c>=0x3099)&&(*c<=0x309A)) return 1; /* Combining Kana Voiced Sound Marks */
+ if ((*c==0xFB29)) return 0; /* Hebrew Letter Alternative Plus Sign */
+ else if ((*c>=0x0590)&&(*c<=0x05FF)) return 1; /* Hebrew */
+ else if ((*c>=0xFB1D)&&(*c<=0xFB4F)) return 1; /* Hebrew presentation forms */
else return 0;
}
+int is_type_mark_or_punct(UChar *c)
+{
+ UChar32 c32;
+
+ if (is_surrogate_pair(c))
+ c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
+ else c32=*c;
+
+ switch (u_charType(c32)) {
+ case U_MODIFIER_LETTER:
+ case U_DASH_PUNCTUATION: case U_START_PUNCTUATION: case U_END_PUNCTUATION:
+ case U_CONNECTOR_PUNCTUATION: case U_OTHER_PUNCTUATION:
+ case U_INITIAL_PUNCTUATION: case U_FINAL_PUNCTUATION:
+ case U_NON_SPACING_MARK: case U_ENCLOSING_MARK: case U_COMBINING_SPACING_MARK:
+ case U_FORMAT_CHAR:
+ return 1;
+ default:
+ return 0;
+ }
+}
+
+int is_type_symbol(UChar *c)
+{
+ UChar32 c32;
+
+ if (is_surrogate_pair(c))
+ c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
+ else c32=*c;
+
+ switch (u_charType(c32)) {
+ case U_MODIFIER_SYMBOL:
+ return 1;
+ case U_MATH_SYMBOL: case U_CURRENCY_SYMBOL:
+ case U_OTHER_SYMBOL:
+ return 2;
+ default:
+ return 0;
+ }
+}
+
int chkcontinue(struct page *p, int num)
{
- int i,j,cc=0,num1,num2;
- char buff[16];
+ int i,j,cc=0,num1,num2,k1,k2;
+ char buff1[16],buff2[16],*p0,*p1;
- for (i=0;i<3;i++) {
+ for (i=0;i<PAGE_COMPOSIT_DEPTH;i++) {
if ((p[num].attr[i]<0)&&(p[num+1].attr[i]<0)) return 1;
else if (p[num].attr[i]!=p[num+1].attr[i]) return 0;
- for (j=cc;j<strlen(p[num].page);j++) {
- if (strncmp(&p[num].page[j],page_compositor,strlen(page_compositor))==0) break;
+ p0=&p[num].page[cc];
+ p1=strstr(p0, page_compositor);
+ if (p1) {
+ j=p1-p0;
+ k1=j;
+ } else {
+ j=strlen(p0);
+ k1=0;
}
- strncpy(buff,&p[num].page[cc],j);
- buff[j]='\0';
- num1=pnumconv(buff,p[num].attr[i]);
-
- for (j=cc;j<strlen(p[num+1].page);j++) {
- if (strncmp(&p[num+1].page[j],page_compositor,strlen(page_compositor))==0) break;
+ strncpy(buff1,p0,j);
+ buff1[j]='\0';
+ num1=pnumconv(buff1,p[num].attr[i]);
+
+ p0=&p[num+1].page[cc];
+ p1=strstr(p0, page_compositor);
+ if (p1) {
+ j=p1-p0;
+ k2=j;
+ } else {
+ j=strlen(p0);
+ k2=0;
}
- strncpy(buff,&p[num+1].page[cc],j);
- buff[j]='\0';
- num2=pnumconv(buff,p[num+1].attr[i]);
-
- if (num1==num2 || num1+1==num2) {
- if (i==2) return 1;
- if ((p[num].attr[i+1]<0)&&(p[num+1].attr[i+1]<0)) return 1;
- else return 0;
+ strncpy(buff2,p0,j);
+ buff2[j]='\0';
+ num2=pnumconv(buff2,p[num+1].attr[i]);
+
+ if (k1>0 || k2>0) {
+ if (k1!=k2) return 0;
+ if (strcmp(buff1,buff2)) return 0;
+ cc+=k1+strlen(page_compositor);
+ continue;
}
- else if (num1!=num2) return 0;
- cc=j+strlen(page_compositor);
+ if (num1==num2 || num1+1==num2) return 1;
+ else return 0;
}
return 1;
diff --git a/indexing/upmendex/source/styfile.c b/indexing/upmendex/source/styfile.c
index 619e4a5625..f029679049 100644
--- a/indexing/upmendex/source/styfile.c
+++ b/indexing/upmendex/source/styfile.c
@@ -76,13 +76,9 @@ void styread(const char *filename)
if (getparam(buff,"symhead_negative",symhead_negative)) continue;
if (getparam(buff,"numhead_positive",numhead_positive)) continue;
if (getparam(buff,"numhead_negative",numhead_negative)) continue;
- cc=scompare(buff,"lethead_flag");
- if (cc!= -1) {
- lethead_flag=atoi(&buff[cc]);
- continue;
- }
- cc=scompare(buff,"heading_flag");
- if (cc!= -1) {
+ if ( (cc=scompare(buff,"lethead_flag")) != -1 ||
+ (cc=scompare(buff,"heading_flag")) != -1 ||
+ (cc=scompare(buff,"headings_flag")) != -1 ) {
lethead_flag=atoi(&buff[cc]);
continue;
}
@@ -121,7 +117,7 @@ void styread(const char *filename)
indent_length=atoi(&buff[cc]);
continue;
}
- if (getparam(buff,"symbol",symbol)) continue;
+ if (getparam(buff,"symbol",symhead)) continue;
cc=scompare(buff,"symbol_flag");
if (cc!= -1) {
symbol_flag=atoi(&buff[cc]);
@@ -164,6 +160,50 @@ void styread(const char *filename)
continue;
}
if (getparam(buff,"icu_attributes", icu_attr_str )) continue;
+
+ cc=scompare(buff,"script_preamble");
+ if (cc!= -1) {
+ strcpy(tmp,buff+strlen("script_preamble"));
+ if (getparam(tmp,"latin", script_preamble[CH_LATIN] )) continue;
+ if (getparam(tmp,"cyrillic", script_preamble[CH_CYRILLIC] )) continue;
+ if (getparam(tmp,"greek", script_preamble[CH_GREEK] )) continue;
+ if (getparam(tmp,"kana", script_preamble[CH_KANA] )) continue;
+ if (getparam(tmp,"hangul", script_preamble[CH_HANGUL] )) continue;
+ if (getparam(tmp,"hanzi", script_preamble[CH_HANZI] )) continue;
+ if (getparam(tmp,"devanagari",script_preamble[CH_DEVANAGARI] )) continue;
+ if (getparam(tmp,"thai", script_preamble[CH_THAI] )) continue;
+ if (getparam(tmp,"arabic", script_preamble[CH_ARABIC] )) continue;
+ if (getparam(tmp,"hebrew", script_preamble[CH_HEBREW] )) continue;
+ if (strlen(tmp)>0) {
+ verb_printf(efp,"\nWarning: Unknown script for specifier \"script_preamble\" (%s).", tmp);
+ }
+ continue;
+ }
+ cc=scompare(buff,"script_postamble");
+ if (cc!= -1) {
+ strcpy(tmp,buff+strlen("script_postamble"));
+ if (getparam(tmp,"latin", script_postamble[CH_LATIN] )) continue;
+ if (getparam(tmp,"cyrillic", script_postamble[CH_CYRILLIC] )) continue;
+ if (getparam(tmp,"greek", script_postamble[CH_GREEK] )) continue;
+ if (getparam(tmp,"kana", script_postamble[CH_KANA] )) continue;
+ if (getparam(tmp,"hangul", script_postamble[CH_HANGUL] )) continue;
+ if (getparam(tmp,"hanzi", script_postamble[CH_HANZI] )) continue;
+ if (getparam(tmp,"devanagari",script_postamble[CH_DEVANAGARI] )) continue;
+ if (getparam(tmp,"thai", script_postamble[CH_THAI] )) continue;
+ if (getparam(tmp,"arabic", script_postamble[CH_ARABIC] )) continue;
+ if (getparam(tmp,"hebrew", script_postamble[CH_HEBREW] )) continue;
+ if (strlen(tmp)>0) {
+ verb_printf(efp,"\nWarning: Unknown script for specifier \"script_postamble\" (%s).", tmp);
+ }
+ continue;
+ }
+
+ cc=strcspn(buff," \t\r\n");
+ if (cc>0) buff[cc]='\0';
+ if (buff[0]=='%' || buff[0]=='\n') continue;
+ if (strlen(buff)>0) {
+ verb_printf(efp,"\nWarning: Unknown specifier (%s).", buff);
+ }
}
fclose(fp);
@@ -316,54 +356,62 @@ static int sstrncmp(const char *s1, const char *s2, size_t len)
void set_icu_attributes(void)
{
int i,attr;
- char *pos, *tmp;
+ char *pos, *head, *tmp;
for (i=0;i<UCOL_ATTRIBUTE_COUNT;i++) icu_attributes[i]=UCOL_DEFAULT;
tmp=icu_attr_str;
- if ((pos=strstr(tmp,"alternate:"))>0) {
+ head=strtok(tmp, " \t\r\n");
+ while (head!=NULL) {
+ pos=head;
+ if (strncmp(pos,"alternate:",10)==0) {
pos+=10; attr=UCOL_ALTERNATE_HANDLING;
- if (strstr(pos,"shifted")) icu_attributes[attr]=UCOL_SHIFTED;
- else if (strstr(pos,"non-ignorable")) icu_attributes[attr]=UCOL_NON_IGNORABLE;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (alternate).");
- }
- if ((pos=strstr(tmp,"strength:"))>0) {
+ if (strcmp(pos,"shifted")==0) icu_attributes[attr]=UCOL_SHIFTED;
+ else if (strcmp(pos,"non-ignorable")==0) icu_attributes[attr]=UCOL_NON_IGNORABLE;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"strength:",9)==0) {
pos+=9; attr=UCOL_STRENGTH;
- if (strstr(pos,"primary")) icu_attributes[attr]=UCOL_PRIMARY;
- else if (strstr(pos,"secondary")) icu_attributes[attr]=UCOL_SECONDARY;
- else if (strstr(pos,"tertiary")) icu_attributes[attr]=UCOL_TERTIARY;
- else if (strstr(pos,"quaternary")) icu_attributes[attr]=UCOL_QUATERNARY;
- else if (strstr(pos,"identical")) icu_attributes[attr]=UCOL_IDENTICAL;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (strength).");
- }
- if ((pos=strstr(tmp,"french-collation:"))>0) {
+ if (strcmp(pos,"primary")==0) icu_attributes[attr]=UCOL_PRIMARY;
+ else if (strcmp(pos,"secondary")==0) icu_attributes[attr]=UCOL_SECONDARY;
+ else if (strcmp(pos,"tertiary")==0) icu_attributes[attr]=UCOL_TERTIARY;
+ else if (strcmp(pos,"quaternary")==0) icu_attributes[attr]=UCOL_QUATERNARY;
+ else if (strcmp(pos,"identical")==0) icu_attributes[attr]=UCOL_IDENTICAL;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"french-collation:",17)==0) {
pos+=17; attr=UCOL_FRENCH_COLLATION;
- if (strstr(pos,"on")) icu_attributes[attr]=UCOL_ON;
- else if (strstr(pos,"off")) icu_attributes[attr]=UCOL_OFF;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (french-collation).");
- }
- if ((pos=strstr(tmp,"case-first:"))>0) {
+ if (strcmp(pos,"on")==0) icu_attributes[attr]=UCOL_ON;
+ else if (strcmp(pos,"off")==0) icu_attributes[attr]=UCOL_OFF;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"case-first:",11)==0) {
pos+=11; attr=UCOL_CASE_FIRST;
- if (strstr(pos,"off")) icu_attributes[attr]=UCOL_OFF;
- else if (strstr(pos,"upper-first")) icu_attributes[attr]=UCOL_UPPER_FIRST;
- else if (strstr(pos,"lower-first")) icu_attributes[attr]=UCOL_LOWER_FIRST;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (case-first).");
- }
- if ((pos=strstr(tmp,"case-level:"))>0) {
+ if (strcmp(pos,"off")==0) icu_attributes[attr]=UCOL_OFF;
+ else if (strcmp(pos,"upper-first")==0) icu_attributes[attr]=UCOL_UPPER_FIRST;
+ else if (strcmp(pos,"lower-first")==0) icu_attributes[attr]=UCOL_LOWER_FIRST;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"case-level:",11)==0) {
pos+=11; attr=UCOL_CASE_LEVEL;
- if (strstr(pos,"on")) icu_attributes[attr]=UCOL_ON;
- else if (strstr(pos,"off")) icu_attributes[attr]=UCOL_OFF;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (case-level).");
- }
- if ((pos=strstr(tmp,"normalization-mode:"))>0) {
+ if (strcmp(pos,"on")==0) icu_attributes[attr]=UCOL_ON;
+ else if (strcmp(pos,"off")==0) icu_attributes[attr]=UCOL_OFF;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"normalization-mode:",19)==0) {
pos+=19; attr=UCOL_NORMALIZATION_MODE;
- if (strstr(pos,"on")) icu_attributes[attr]=UCOL_ON;
- else if (strstr(pos,"off")) icu_attributes[attr]=UCOL_OFF;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (normalization-mode).");
- }
- if ((pos=strstr(tmp,"numeric-ordering:"))>0) {
+ if (strcmp(pos,"on")==0) icu_attributes[attr]=UCOL_ON;
+ else if (strcmp(pos,"off")==0) icu_attributes[attr]=UCOL_OFF;
+ else goto illegal;
+ } else
+ if (strncmp(pos,"numeric-ordering:",17)==0) {
pos+=17; attr=UCOL_NUMERIC_COLLATION;
- if (strstr(pos,"on")) icu_attributes[attr]=UCOL_ON;
- else if (strstr(pos,"off")) icu_attributes[attr]=UCOL_OFF;
- else verb_printf(efp,"\nWarning: Illegal input for icu_attributes (numeric-ordering).");
+ if (strcmp(pos,"on")==0) icu_attributes[attr]=UCOL_ON;
+ else if (strcmp(pos,"off")==0) icu_attributes[attr]=UCOL_OFF;
+ else goto illegal;
+ } else {
+ illegal:
+ verb_printf(efp,"\nWarning: Illegal input for icu_attributes (%s).",head);
+ }
+ head=strtok(NULL, " \t\r\n");
}
}
diff --git a/indexing/upmendex/source/tests/attr1.ind b/indexing/upmendex/source/tests/attr1.ind
new file mode 100644
index 0000000000..6db7b19221
--- /dev/null
+++ b/indexing/upmendex/source/tests/attr1.ind
@@ -0,0 +1,40 @@
+\begin{theindex}
+
+\centerline{\bfseries ◆◆◆ Symbols ◆◆◆}\par\nobreak
+ \item #\leaders\hbox{$\cdot$}\hfill 2000
+ \item $\leaders\hbox{$\cdot$}\hfill 2001
+ \item 2\leaders\hbox{$\cdot$}\hfill 1001
+ \item 10\leaders\hbox{$\cdot$}\hfill 1000
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ A ◆◆◆}\par\nobreak
+ \item A\leaders\hbox{$\cdot$}\hfill 400
+ \item a\leaders\hbox{$\cdot$}\hfill 401
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ B ◆◆◆}\par\nobreak
+ \item B\leaders\hbox{$\cdot$}\hfill 402
+ \item b\leaders\hbox{$\cdot$}\hfill 403
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ C ◆◆◆}\par\nobreak
+ \item C\leaders\hbox{$\cdot$}\hfill 404
+ \item c\leaders\hbox{$\cdot$}\hfill 405
+ \item Ç\leaders\hbox{$\cdot$}\hfill 406
+ \item ç\leaders\hbox{$\cdot$}\hfill 407
+ \item Ch\leaders\hbox{$\cdot$}\hfill 420
+ \item cha\leaders\hbox{$\cdot$}\hfill 421
+ \item cz\leaders\hbox{$\cdot$}\hfill 422
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ U ◆◆◆}\par\nobreak
+ \item U\leaders\hbox{$\cdot$}\hfill 408
+ \item u\leaders\hbox{$\cdot$}\hfill 409
+ \item Ü\leaders\hbox{$\cdot$}\hfill 410
+ \item ü\leaders\hbox{$\cdot$}\hfill 411
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/attr1.ist b/indexing/upmendex/source/tests/attr1.ist
new file mode 100644
index 0000000000..301aff0a6a
--- /dev/null
+++ b/indexing/upmendex/source/tests/attr1.ist
@@ -0,0 +1,2 @@
+icu_attributes "case-first:upper-first
+numeric-ordering:on "
diff --git a/indexing/upmendex/source/tests/locale1.ind b/indexing/upmendex/source/tests/locale1.ind
new file mode 100644
index 0000000000..76bf98f25a
--- /dev/null
+++ b/indexing/upmendex/source/tests/locale1.ind
@@ -0,0 +1,48 @@
+\begin{theindex}
+
+\centerline{\bfseries ◆◆◆ Symbols ◆◆◆}\par\nobreak
+ \item #\leaders\hbox{$\cdot$}\hfill 2000
+ \item $\leaders\hbox{$\cdot$}\hfill 2001
+ \item 10\leaders\hbox{$\cdot$}\hfill 1000
+ \item 2\leaders\hbox{$\cdot$}\hfill 1001
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ A ◆◆◆}\par\nobreak
+ \item a\leaders\hbox{$\cdot$}\hfill 401
+ \item A\leaders\hbox{$\cdot$}\hfill 400
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ B ◆◆◆}\par\nobreak
+ \item b\leaders\hbox{$\cdot$}\hfill 403
+ \item B\leaders\hbox{$\cdot$}\hfill 402
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ C ◆◆◆}\par\nobreak
+ \item c\leaders\hbox{$\cdot$}\hfill 405
+ \item C\leaders\hbox{$\cdot$}\hfill 404
+ \item Ch\leaders\hbox{$\cdot$}\hfill 420
+ \item cha\leaders\hbox{$\cdot$}\hfill 421
+ \item cz\leaders\hbox{$\cdot$}\hfill 422
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ Ç ◆◆◆}\par\nobreak
+ \item ç\leaders\hbox{$\cdot$}\hfill 407
+ \item Ç\leaders\hbox{$\cdot$}\hfill 406
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ U ◆◆◆}\par\nobreak
+ \item u\leaders\hbox{$\cdot$}\hfill 409
+ \item U\leaders\hbox{$\cdot$}\hfill 408
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ Ü ◆◆◆}\par\nobreak
+ \item ü\leaders\hbox{$\cdot$}\hfill 411
+ \item Ü\leaders\hbox{$\cdot$}\hfill 410
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/locale1.ist b/indexing/upmendex/source/tests/locale1.ist
new file mode 100644
index 0000000000..cf9e67da6e
--- /dev/null
+++ b/indexing/upmendex/source/tests/locale1.ist
@@ -0,0 +1 @@
+icu_locale "az"
diff --git a/indexing/upmendex/source/tests/locale2-rule.ind b/indexing/upmendex/source/tests/locale2-rule.ind
new file mode 100644
index 0000000000..4054762ab7
--- /dev/null
+++ b/indexing/upmendex/source/tests/locale2-rule.ind
@@ -0,0 +1,44 @@
+\begin{theindex}
+
+\centerline{\bfseries ◆◆◆ Symbols ◆◆◆}\par\nobreak
+ \item #\leaders\hbox{$\cdot$}\hfill 2000
+ \item $\leaders\hbox{$\cdot$}\hfill 2001
+ \item 10\leaders\hbox{$\cdot$}\hfill 1000
+ \item 2\leaders\hbox{$\cdot$}\hfill 1001
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ A ◆◆◆}\par\nobreak
+ \item a\leaders\hbox{$\cdot$}\hfill 401
+ \item A\leaders\hbox{$\cdot$}\hfill 400
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ C ◆◆◆}\par\nobreak
+ \item C\leaders\hbox{$\cdot$}\hfill 404
+ \item Ç\leaders\hbox{$\cdot$}\hfill 406
+ \item c\leaders\hbox{$\cdot$}\hfill 405
+ \item ç\leaders\hbox{$\cdot$}\hfill 407
+ \item cz\leaders\hbox{$\cdot$}\hfill 422
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ U ◆◆◆}\par\nobreak
+ \item u\leaders\hbox{$\cdot$}\hfill 409
+ \item U\leaders\hbox{$\cdot$}\hfill 408
+ \item ü\leaders\hbox{$\cdot$}\hfill 411
+ \item Ü\leaders\hbox{$\cdot$}\hfill 410
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ B ◆◆◆}\par\nobreak
+ \item b\leaders\hbox{$\cdot$}\hfill 403
+ \item B\leaders\hbox{$\cdot$}\hfill 402
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ CH ◆◆◆}\par\nobreak
+ \item Ch\leaders\hbox{$\cdot$}\hfill 420
+ \item cha\leaders\hbox{$\cdot$}\hfill 421
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/locale2.ist b/indexing/upmendex/source/tests/locale2.ist
new file mode 100644
index 0000000000..89b590a21b
--- /dev/null
+++ b/indexing/upmendex/source/tests/locale2.ist
@@ -0,0 +1 @@
+icu_locale "es@collation=traditional"
diff --git a/indexing/upmendex/source/tests/pprec3.ist b/indexing/upmendex/source/tests/pprec3.ist
new file mode 100644
index 0000000000..b8f33af1dd
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprec3.ist
@@ -0,0 +1,11 @@
+% -*- coding: utf-8 -*-
+
+page_precedence "naA"
+
+delim_0 "[[delim0]]"
+delim_1 "[[delim1]]"
+delim_2 "[[delim2]]"
+delim_r "[[delimr]]"
+suffix_2p "[[sfx 2p]]"
+suffix_3p "[[sfx 3p]]"
+
diff --git a/indexing/upmendex/source/tests/pprec4.ist b/indexing/upmendex/source/tests/pprec4.ist
new file mode 100644
index 0000000000..768fec7642
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprec4.ist
@@ -0,0 +1,11 @@
+% -*- coding: utf-8 -*-
+
+page_precedence "Ana"
+
+delim_0 "[[delim0]]"
+delim_1 "[[delim1]]"
+delim_2 "[[delim2]]"
+delim_r "[[delimr]]"
+suffix_2p "[[sfx 2p]]"
+suffix_3p "[[sfx 3p]]"
+
diff --git a/indexing/upmendex/source/tests/pprecB-0.ind b/indexing/upmendex/source/tests/pprecB-0.ind
new file mode 100644
index 0000000000..1e23d9fb4a
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprecB-0.ind
@@ -0,0 +1,5 @@
+\begin{theindex}
+
+ \item entryA[[delim0]]1[[sfx 3p]], a[[sfx 3p]], A[[sfx 3p]]
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/pprecB-3.ind b/indexing/upmendex/source/tests/pprecB-3.ind
new file mode 100644
index 0000000000..1e23d9fb4a
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprecB-3.ind
@@ -0,0 +1,5 @@
+\begin{theindex}
+
+ \item entryA[[delim0]]1[[sfx 3p]], a[[sfx 3p]], A[[sfx 3p]]
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/pprecB-4.ind b/indexing/upmendex/source/tests/pprecB-4.ind
new file mode 100644
index 0000000000..3943ad4854
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprecB-4.ind
@@ -0,0 +1,5 @@
+\begin{theindex}
+
+ \item entryA[[delim0]]A[[sfx 3p]], 1[[sfx 3p]], a[[sfx 3p]]
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/pprecB.idx b/indexing/upmendex/source/tests/pprecB.idx
new file mode 100644
index 0000000000..a1d8fc31ae
--- /dev/null
+++ b/indexing/upmendex/source/tests/pprecB.idx
@@ -0,0 +1,9 @@
+\indexentry{entryA}{a}
+\indexentry{entryA}{b}
+\indexentry{entryA}{c}
+\indexentry{entryA}{1}
+\indexentry{entryA}{2}
+\indexentry{entryA}{3}
+\indexentry{entryA}{A}
+\indexentry{entryA}{B}
+\indexentry{entryA}{C}
diff --git a/indexing/upmendex/source/tests/range.idx b/indexing/upmendex/source/tests/range.idx
new file mode 100644
index 0000000000..3eccb113aa
--- /dev/null
+++ b/indexing/upmendex/source/tests/range.idx
@@ -0,0 +1,126 @@
+\indexentry{entryA}{1}
+\indexentry{entryA}{2}
+\indexentry{entryA}{iii}
+\indexentry{entryA}{iv}
+\indexentry{entryA}{IX}
+\indexentry{entryA}{X}
+
+\indexentry{entryB}{1}
+\indexentry{entryB}{2}
+\indexentry{entryB}{3}
+\indexentry{entryB}{iii}
+\indexentry{entryB}{iv}
+\indexentry{entryB}{v}
+\indexentry{entryB}{IX}
+\indexentry{entryB}{X}
+\indexentry{entryB}{XI}
+
+\indexentry{entryC}{1}
+\indexentry{entryC}{2}
+\indexentry{entryC}{3}
+\indexentry{entryC}{4}
+\indexentry{entryC|bold}{iii}
+\indexentry{entryC|bold}{iv}
+\indexentry{entryC|bold}{v}
+\indexentry{entryC|bold}{vi}
+\indexentry{entryC}{IX}
+\indexentry{entryC|bold}{X}
+\indexentry{entryC}{XI}
+\indexentry{entryC}{XII}
+
+\indexentry{entryD}{c-1}
+\indexentry{entryD}{c-2}
+\indexentry{entryD}{i-iii}
+\indexentry{entryD}{i-iv}
+\indexentry{entryD}{d-IX}
+\indexentry{entryD}{d-X}
+
+\indexentry{entryE}{c-1}
+\indexentry{entryE}{c-2}
+\indexentry{entryE}{c-3}
+\indexentry{entryE}{i-iii}
+\indexentry{entryE}{i-iv}
+\indexentry{entryE}{i-v}
+\indexentry{entryE}{d-IX}
+\indexentry{entryE}{d-X}
+\indexentry{entryE}{d-XI}
+
+\indexentry{entryF}{C-I}
+\indexentry{entryF}{C-II}
+\indexentry{entryF}{C-III}
+\indexentry{entryF}{C-IV}
+\indexentry{entryF}{V-LIII}
+\indexentry{entryF}{V-LIV}
+\indexentry{entryF}{V-LV}
+\indexentry{entryF}{V-LVI}
+\indexentry{entryF}{D-DI}
+\indexentry{entryF}{D-DII}
+\indexentry{entryF}{D-DIII}
+\indexentry{entryF}{D-DIV}
+
+\indexentry{entryP}{A-a-1-VII-iii}
+\indexentry{entryP}{A-a-2-VII-iii}
+\indexentry{entryP}{A-a-3-VII-iii}
+\indexentry{entryP}{A-a-1-VIII-iii}
+\indexentry{entryP}{A-a-1-IX-iii}
+\indexentry{entryP}{A-a-1-VII-iv}
+\indexentry{entryP}{A-a-1-VII-v}
+
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-10}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-11}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-14}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-15}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-16}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-22}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-23}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-24}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-25}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-i}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-ii}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-iii}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-iv}
+\indexentry{entryQ}{1-2-3-4-5-6-7-8-9-v}
+
+\indexentry{entryA1|(}{1}
+\indexentry{entryA1|)}{2}
+\indexentry{entryA1|(}{iii}
+\indexentry{entryA1|)}{iv}
+\indexentry{entryA1|(}{IX}
+\indexentry{entryA1|)}{X}
+
+\indexentry{entryB1|(}{1}
+\indexentry{entryB1|)}{3}
+\indexentry{entryB1|(}{iii}
+\indexentry{entryB1|)}{v}
+\indexentry{entryB1|(}{IX}
+\indexentry{entryB1|)}{XI}
+
+\indexentry{entryC1|(}{1}
+\indexentry{entryC1|)}{4}
+\indexentry{entryC1|(bold}{iii}
+\indexentry{entryC1|)}{vi}
+\indexentry{entryC1|(}{IX}
+\indexentry{entryC1|bold}{X}
+\indexentry{entryC1|)}{XII}
+
+\indexentry{entryD1|(}{c-1}
+\indexentry{entryD1|)}{c-2}
+\indexentry{entryD1|(}{i-iii}
+\indexentry{entryD1|)}{i-iv}
+\indexentry{entryD1|(}{d-IX}
+\indexentry{entryD1|)}{d-X}
+
+\indexentry{entryE1|(}{c-1}
+\indexentry{entryE1|)}{c-3}
+\indexentry{entryE1|(}{i-iii}
+\indexentry{entryE1|)}{i-v}
+\indexentry{entryE1|(}{d-IX}
+\indexentry{entryE1|)}{d-XI}
+
+\indexentry{entryF1|(}{C-I}
+\indexentry{entryF1|)}{C-IV}
+\indexentry{entryF1|(}{V-LIII}
+\indexentry{entryF1|)}{V-LVI}
+\indexentry{entryF1|(}{D-DI}
+\indexentry{entryF1|bold}{D-DII}
+\indexentry{entryF1|)}{D-DIV}
diff --git a/indexing/upmendex/source/tests/range1.ind b/indexing/upmendex/source/tests/range1.ind
new file mode 100644
index 0000000000..c5f047a55e
--- /dev/null
+++ b/indexing/upmendex/source/tests/range1.ind
@@ -0,0 +1,25 @@
+\begin{theindex}
+
+ \item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryB, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]]
+ \item entryB1, 1[[sfx mp]], iii[[sfx mp]], IX[[sfx mp]]
+ \item entryC, 1[[sfx mp]], \bold{iii[[sfx mp]]}, IX, \bold{X},
+ XI[[sfx 2p]]
+ \item entryC1, 1[[sfx mp]], \bold{iii[[sfx mp]]}, \bold{X},
+ IX[[sfx mp]]
+ \item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryE, c-1[[sfx mp]], d-IX[[sfx mp]], i-iii[[sfx mp]]
+ \item entryE1, c-1[[sfx mp]], d-IX[[sfx mp]], i-iii[[sfx mp]]
+ \item entryF, C-I[[sfx mp]], D-DI[[sfx mp]], V-LIII[[sfx mp]]
+ \item entryF1, C-I[[sfx mp]], \bold{D-DII}, D-DI[[sfx mp]],
+ V-LIII[[sfx mp]]
+ \item entryP, A-a-1-VII-iii[[sfx mp]], A-a-1-VIII-iii, A-a-1-IX-iii,
+ A-a-2-VII-iii, A-a-3-VII-iii
+ \item entryQ, 1-2-3-4-5-6-7-8-9-10[[sfx 2p]],
+ 1-2-3-4-5-6-7-8-9-14[[sfx mp]],
+ 1-2-3-4-5-6-7-8-9-22[[sfx mp]],
+ 1-2-3-4-5-6-7-8-9-i[[sfx mp]]
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/range1.ist b/indexing/upmendex/source/tests/range1.ist
new file mode 100644
index 0000000000..116c2d8713
--- /dev/null
+++ b/indexing/upmendex/source/tests/range1.ist
@@ -0,0 +1,3 @@
+page_precedence "nrRaA"
+suffix_2p "[[sfx 2p]]"
+suffix_mp "[[sfx mp]]"
diff --git a/indexing/upmendex/source/tests/range2.ind b/indexing/upmendex/source/tests/range2.ind
new file mode 100644
index 0000000000..789eb3f75c
--- /dev/null
+++ b/indexing/upmendex/source/tests/range2.ind
@@ -0,0 +1,26 @@
+\begin{theindex}
+
+ \item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryC, 1[[delim r]]4, \bold{iii[[delim r]]vi}, IX, \bold{X},
+ XI[[sfx 2p]]
+ \item entryC1, 1[[delim r]]4, \bold{iii[[delim r]]vi}, \bold{X},
+ IX[[delim r]]XII
+ \item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryE, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
+ \item entryE1, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
+ \item entryF, C-I[[delim r]]C-IV, D-DI[[delim r]]D-DIV,
+ V-LIII[[delim r]]V-LVI
+ \item entryF1, C-I[[delim r]]C-IV, \bold{D-DII}, D-DI[[delim r]]D-DIV,
+ V-LIII[[delim r]]V-LVI
+ \item entryP, A-a-1-VII-iii[[sfx 3p]], A-a-1-VIII-iii, A-a-1-IX-iii,
+ A-a-2-VII-iii, A-a-3-VII-iii
+ \item entryQ, 1-2-3-4-5-6-7-8-9-10[[sfx 2p]],
+ 1-2-3-4-5-6-7-8-9-14[[sfx 3p]],
+ 1-2-3-4-5-6-7-8-9-22[[delim r]]1-2-3-4-5-6-7-8-9-25,
+ 1-2-3-4-5-6-7-8-9-i[[delim r]]1-2-3-4-5-6-7-8-9-v
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/range2.ist b/indexing/upmendex/source/tests/range2.ist
new file mode 100644
index 0000000000..552e5fb674
--- /dev/null
+++ b/indexing/upmendex/source/tests/range2.ist
@@ -0,0 +1,4 @@
+page_precedence "nrRaA"
+delim_r "[[delim r]]"
+suffix_2p "[[sfx 2p]]"
+suffix_3p "[[sfx 3p]]"
diff --git a/indexing/upmendex/source/tests/range3.ind b/indexing/upmendex/source/tests/range3.ind
new file mode 100644
index 0000000000..519730a138
--- /dev/null
+++ b/indexing/upmendex/source/tests/range3.ind
@@ -0,0 +1,25 @@
+\begin{theindex}
+
+ \item entryA, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryA1, 1[[sfx 2p]], iii[[sfx 2p]], IX[[sfx 2p]]
+ \item entryB, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryB1, 1[[sfx 3p]], iii[[sfx 3p]], IX[[sfx 3p]]
+ \item entryC, 1[[sfx mp]], \bold{iii[[sfx mp]]}, IX, \bold{X},
+ XI[[sfx 2p]]
+ \item entryC1, 1[[sfx mp]], \bold{iii[[sfx mp]]}, \bold{X},
+ IX[[sfx mp]]
+ \item entryD, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryD1, c-1[[sfx 2p]], d-IX[[sfx 2p]], i-iii[[sfx 2p]]
+ \item entryE, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
+ \item entryE1, c-1[[sfx 3p]], d-IX[[sfx 3p]], i-iii[[sfx 3p]]
+ \item entryF, C-I[[sfx mp]], D-DI[[sfx mp]], V-LIII[[sfx mp]]
+ \item entryF1, C-I[[sfx mp]], \bold{D-DII}, D-DI[[sfx mp]],
+ V-LIII[[sfx mp]]
+ \item entryP, A-a-1-VII-iii[[sfx 3p]], A-a-1-VIII-iii, A-a-1-IX-iii,
+ A-a-2-VII-iii, A-a-3-VII-iii
+ \item entryQ, 1-2-3-4-5-6-7-8-9-10[[sfx 2p]],
+ 1-2-3-4-5-6-7-8-9-14[[sfx 3p]],
+ 1-2-3-4-5-6-7-8-9-22[[sfx mp]],
+ 1-2-3-4-5-6-7-8-9-i[[sfx mp]]
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/range3.ist b/indexing/upmendex/source/tests/range3.ist
new file mode 100644
index 0000000000..b751471b43
--- /dev/null
+++ b/indexing/upmendex/source/tests/range3.ist
@@ -0,0 +1,4 @@
+page_precedence "nrRaA"
+suffix_2p "[[sfx 2p]]"
+suffix_3p "[[sfx 3p]]"
+suffix_mp "[[sfx mp]]"
diff --git a/indexing/upmendex/source/tests/rangetwo.idx b/indexing/upmendex/source/tests/rangetwo.idx
deleted file mode 100644
index d941f7e831..0000000000
--- a/indexing/upmendex/source/tests/rangetwo.idx
+++ /dev/null
@@ -1,2 +0,0 @@
-\indexentry{entryA}{1}
-\indexentry{entryA}{2}
diff --git a/indexing/upmendex/source/tests/rangetwo.ind b/indexing/upmendex/source/tests/rangetwo.ind
deleted file mode 100644
index 1119d2fa8e..0000000000
--- a/indexing/upmendex/source/tests/rangetwo.ind
+++ /dev/null
@@ -1,5 +0,0 @@
-\begin{theindex}
-
- \item entryA, 1[[sfx2p]]
-
-\end{theindex}
diff --git a/indexing/upmendex/source/tests/rangetwo.ist b/indexing/upmendex/source/tests/rangetwo.ist
deleted file mode 100644
index 3e986c8935..0000000000
--- a/indexing/upmendex/source/tests/rangetwo.ist
+++ /dev/null
@@ -1,2 +0,0 @@
-suffix_2p "[[sfx2p]]"
-
diff --git a/indexing/upmendex/source/tests/rule.idx b/indexing/upmendex/source/tests/rule.idx
new file mode 100644
index 0000000000..783cce9fd4
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule.idx
@@ -0,0 +1,20 @@
+% -*- coding: utf-8 -*-
+\indexentry{A}{400}
+\indexentry{a}{401}
+\indexentry{B}{402}
+\indexentry{b}{403}
+\indexentry{C}{404}
+\indexentry{c}{405}
+\indexentry{Ç}{406}
+\indexentry{ç}{407}
+\indexentry{Ch}{420}
+\indexentry{cha}{421}
+\indexentry{cz}{422}
+\indexentry{U}{408}
+\indexentry{u}{409}
+\indexentry{Ü}{410}
+\indexentry{ü}{411}
+\indexentry{10}{1000}
+\indexentry{2}{1001}
+\indexentry{#}{2000}
+\indexentry{$}{2001}
diff --git a/indexing/upmendex/source/tests/rule.ind b/indexing/upmendex/source/tests/rule.ind
new file mode 100644
index 0000000000..3ac1335e05
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule.ind
@@ -0,0 +1,40 @@
+\begin{theindex}
+
+\centerline{\bfseries ◆◆◆ Symbols ◆◆◆}\par\nobreak
+ \item #\leaders\hbox{$\cdot$}\hfill 2000
+ \item $\leaders\hbox{$\cdot$}\hfill 2001
+ \item 10\leaders\hbox{$\cdot$}\hfill 1000
+ \item 2\leaders\hbox{$\cdot$}\hfill 1001
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ A ◆◆◆}\par\nobreak
+ \item a\leaders\hbox{$\cdot$}\hfill 401
+ \item A\leaders\hbox{$\cdot$}\hfill 400
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ C ◆◆◆}\par\nobreak
+ \item C\leaders\hbox{$\cdot$}\hfill 404
+ \item Ç\leaders\hbox{$\cdot$}\hfill 406
+ \item c\leaders\hbox{$\cdot$}\hfill 405
+ \item ç\leaders\hbox{$\cdot$}\hfill 407
+ \item Ch\leaders\hbox{$\cdot$}\hfill 420
+ \item cha\leaders\hbox{$\cdot$}\hfill 421
+ \item cz\leaders\hbox{$\cdot$}\hfill 422
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ U ◆◆◆}\par\nobreak
+ \item u\leaders\hbox{$\cdot$}\hfill 409
+ \item U\leaders\hbox{$\cdot$}\hfill 408
+ \item ü\leaders\hbox{$\cdot$}\hfill 411
+ \item Ü\leaders\hbox{$\cdot$}\hfill 410
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ B ◆◆◆}\par\nobreak
+ \item b\leaders\hbox{$\cdot$}\hfill 403
+ \item B\leaders\hbox{$\cdot$}\hfill 402
+
+\end{theindex}
diff --git a/indexing/upmendex/source/tests/rule1.ist b/indexing/upmendex/source/tests/rule1.ist
new file mode 100644
index 0000000000..c986e39e96
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule1.ist
@@ -0,0 +1,3 @@
+% -*- coding: utf-8 -*-
+
+icu_rules "&a<<<A<C<<Ç<<c<<ç<u<<U<<ü<<Ü<b<<B"
diff --git a/indexing/upmendex/source/tests/rule2.ist b/indexing/upmendex/source/tests/rule2.ist
new file mode 100644
index 0000000000..a61af0a546
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule2.ist
@@ -0,0 +1,3 @@
+% -*- coding: utf-8 -*-
+
+icu_rules "&a<<<A<C<<\U000000c7<<c<<\u00E7<u<<U<<\x{fc}<<\xDC<b<<B"
diff --git a/indexing/upmendex/source/tests/rule3.ist b/indexing/upmendex/source/tests/rule3.ist
new file mode 100644
index 0000000000..7ab835a801
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule3.ist
@@ -0,0 +1,4 @@
+% -*- coding: latin-1 -*-
+% To test malformed input
+
+icu_rules "&a<<<A<C<<Ç<<c<<ç<u<<U<<ü<<Ü<b<<B"
diff --git a/indexing/upmendex/source/tests/rule4.ist b/indexing/upmendex/source/tests/rule4.ist
new file mode 100644
index 0000000000..0c30dceba2
--- /dev/null
+++ b/indexing/upmendex/source/tests/rule4.ist
@@ -0,0 +1,4 @@
+% -*- coding: utf-8 -*-
+% To test malformed input
+
+icu_rules "&a<<<A<C<<\U000000c7<<c<<\uE7<u<<U<<\x{fc}<<\xDC<b<<B"
diff --git a/indexing/upmendex/source/tests/upmendex.test b/indexing/upmendex/source/tests/upmendex.test
index b64c045af9..84dfbd17be 100755
--- a/indexing/upmendex/source/tests/upmendex.test
+++ b/indexing/upmendex/source/tests/upmendex.test
@@ -1,5 +1,5 @@
#! /bin/sh -vx
-# $Id$
+# $Id: upmendex.test 60549 2021-09-19 08:57:18Z takuji $
# Copyright 2017 Karl Berry <tex-live@tug.org>
# Copyright 2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
@@ -7,7 +7,7 @@
TEXMFCNF=$srcdir/../kpathsea
export TEXMFCNF
-rm -f foo.* uni.* pprec*.* rangetwo.*
+rm -f foo.* uni.* range*.* pprec*.* locale*.* attr*.* rule*.*
./upmendex $srcdir/tests/foo.idx -o foo.ind1 -t foo.ilg1 \
&& diff $srcdir/tests/foo.ind foo.ind1 || exit 1
@@ -28,10 +28,18 @@ cat $srcdir/tests/uni.idx | \
$srcdir/tests/uni.idx -o uni.ind3 -t uni.ilg3 \
&& diff $srcdir/tests/uni.ind uni.ind3 || exit 1
-# test for two-element range suffix_2p
-./upmendex -s $srcdir/tests/rangetwo.ist $srcdir/tests/rangetwo.idx \
- -o rangetwo.ind1 -t rangetwo.ilg \
- && diff $srcdir/tests/rangetwo.ind rangetwo.ind1 || exit 1
+# test for range suffix_2p, suffix_3p, suffix_mp
+./upmendex -s $srcdir/tests/range1.ist $srcdir/tests/range.idx \
+ -o range1.ind1 -t range1.ilg \
+ && diff $srcdir/tests/range1.ind range1.ind1 || exit 1
+
+./upmendex -s $srcdir/tests/range2.ist $srcdir/tests/range.idx \
+ -o range2.ind1 -t range2.ilg \
+ && diff $srcdir/tests/range2.ind range2.ind1 || exit 1
+
+./upmendex -s $srcdir/tests/range3.ist $srcdir/tests/range.idx \
+ -o range3.ind1 -t range3.ilg \
+ && diff $srcdir/tests/range3.ind range3.ind1 || exit 1
# test for page_precedence and suffix_3p
./upmendex -s $srcdir/tests/pprec0.ist $srcdir/tests/pprecA.idx \
@@ -46,3 +54,57 @@ cat $srcdir/tests/uni.idx | \
-o pprecA-2.ind1 -t pprecA-2.ilg \
&& diff $srcdir/tests/pprecA-2.ind pprecA-2.ind1 || exit 1
+./upmendex -s $srcdir/tests/pprec0.ist $srcdir/tests/pprecB.idx \
+ -o pprecB-0.ind1 -t pprecB-0.ilg \
+ && diff $srcdir/tests/pprecB-0.ind pprecB-0.ind1 || exit 1
+
+./upmendex -s $srcdir/tests/pprec3.ist $srcdir/tests/pprecB.idx \
+ -o pprecB-3.ind1 -t pprecB-3.ilg \
+ && diff $srcdir/tests/pprecB-3.ind pprecB-3.ind1 || exit 1
+
+./upmendex -s $srcdir/tests/pprec4.ist $srcdir/tests/pprecB.idx \
+ -o pprecB-4.ind1 -t pprecB-4.ilg \
+ && diff $srcdir/tests/pprecB-4.ind pprecB-4.ind1 || exit 1
+
+# test for icu_locale
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/locale1.ist $srcdir/tests/rule.idx \
+ -o locale1.ind1 -t locale1.ilg \
+ && diff $srcdir/tests/locale1.ind locale1.ind1 || exit 1
+
+# test for icu_attributes
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/attr1.ist $srcdir/tests/rule.idx \
+ -o attr1.ind1 -t attr1.ilg \
+ && diff $srcdir/tests/attr1.ind attr1.ind1 || exit 1
+
+# test for icu_rules
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/rule1.ist $srcdir/tests/rule.idx \
+ -o rule1.ind1 -t rule1.ilg \
+ && diff $srcdir/tests/rule.ind rule1.ind1 || exit 1
+
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/rule2.ist $srcdir/tests/rule.idx \
+ -o rule2.ind1 -t rule2.ilg \
+ && diff $srcdir/tests/rule.ind rule2.ind1 || exit 1
+
+# malformed input
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/rule3.ist $srcdir/tests/rule.idx \
+ -o rule3.ind1 -t rule3.ilg
+if [ $? -eq 254 ]; then
+ echo "Error check: OK"
+else
+ echo "Error check: NG"
+ exit 1
+fi
+
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/rule4.ist $srcdir/tests/rule.idx \
+ -o rule4.ind1 -t rule4.ilg
+if [ $? -eq 254 ]; then
+ echo "Error check: OK"
+else
+ echo "Error check: NG"
+ exit 1
+fi
+
+# test for icu_locale + icu_rules
+./upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/locale2.ist -s $srcdir/tests/rule1.ist $srcdir/tests/rule.idx \
+ -o locale2-rule1.ind1 -t locale2-rule1.ilg \
+ && diff $srcdir/tests/locale2-rule.ind locale2-rule1.ind1 || exit 1
diff --git a/indexing/upmendex/source/var.h b/indexing/upmendex/source/var.h
index 02e2714910..c9275fcc91 100644
--- a/indexing/upmendex/source/var.h
+++ b/indexing/upmendex/source/var.h
@@ -4,7 +4,7 @@ FILE *efp;
int lines,idxcount,acc=0,reject=0;
int prange=1,fsti=0,lorder=0,bcomp=0,force=0,fpage=0,gflg=0,verb=1,debug=0;
-int warn=0,scount=0,pattr[3]={0,0,0};
+int warn=0,scount=0,pattr[PAGE_COMPOSIT_DEPTH]={0};
/* static char roman[]={"ivxlcdm"},Roman[]={"IVXLCDM"}; */
struct index *ind;
@@ -27,7 +27,7 @@ int line_max=72;
char indent_space[STYBUFSIZE]={"\t\t"};
int indent_length=16;
int priority=0;
-char symbol[STYBUFSIZE]={""};
+char symhead[STYBUFSIZE]={""},numhead[STYBUFSIZE]={""};
char symhead_positive[STYBUFSIZE]={"Symbols"},symhead_negative[STYBUFSIZE]={"symbols"};
char numhead_positive[STYBUFSIZE]={"Numbers"},numhead_negative[STYBUFSIZE]={"numbers"};
int symbol_flag=1;
@@ -35,7 +35,8 @@ int letter_head=1;
UChar atama[STYBUFSIZE],hangul_head[STYBUFSIZE],hanzi_head[STYBUFSIZE]={L'\0'},kana_head[STYBUFSIZE]={L'\0'};
UChar devanagari_head[STYBUFSIZE],thai_head[STYBUFSIZE];
char page_compositor[STYBUFSIZE]={"-"},page_precedence[STYBUFSIZE]={"rnaRA"};
-char character_order[STYBUFSIZE]={"SNLGCJKHDT"};
+char character_order[STYBUFSIZE]={"SNLGCJKHDTah"};
+char script_preamble[11][STYBUFSIZE],script_postamble[11][STYBUFSIZE];
char icu_locale[STYBUFSIZE]={"root"},icu_rules[STYBUFSIZE]={""};
int icu_attributes[UCOL_ATTRIBUTE_COUNT];
diff --git a/macros/generic/expkv-cs/README.md b/macros/generic/expkv-cs/README.md
index 648b3b5a59..a04a4c4220 100644
--- a/macros/generic/expkv-cs/README.md
+++ b/macros/generic/expkv-cs/README.md
@@ -1,7 +1,7 @@
-------------------------------------------------------------------------------
# expkv-cs -- define expandable key=val macros using expkv
-Version 2021-09-20 v1.1a
+Version 2021-11-21 v1.1b
Released under the LaTeX Project Public License v1.3c or later
See http://www.latex-project.org/lppl.txt
diff --git a/macros/generic/expkv-cs/expkv-cs.dtx b/macros/generic/expkv-cs/expkv-cs.dtx
index ffb706b221..c975e4931c 100644
--- a/macros/generic/expkv-cs/expkv-cs.dtx
+++ b/macros/generic/expkv-cs/expkv-cs.dtx
@@ -1568,8 +1568,8 @@ and the derived files expkv-cs.pdf
% \begin{macro}{\ekvcVersion,\ekvcDate}
% We're on our first input, so lets store the version and date in a macro.
% \begin{macrocode}
-\def\ekvcVersion{1.1a}
-\def\ekvcDate{2021-09-20}
+\def\ekvcVersion{1.1b}
+\def\ekvcDate{2021-11-21}
% \end{macrocode}
% \end{macro}
%
@@ -1783,7 +1783,7 @@ and the derived files expkv-cs.pdf
% \begin{macro}[internal]
% {
% \ekvc@SetupSplitKeys, \ekvc@SetupSplitKeys@a, \ekvc@SetupSplitKeys@b,
-% \ekvc@SetupSplitKeys@c, \ekvc@SetupSplitKeys@d
+% \ekvc@SetupSplitKeys@c, \ekvc@SetupSplitKeys@d, \ekvc@SetupSplitKeys@e,
% \ekvc@SetupSplitKeys@check@unknown,\ekvc@SetupSplitKeys@unknown
% }
% These macros parse the list of keys and set up the key macros. First we need
@@ -1791,7 +1791,7 @@ and the derived files expkv-cs.pdf
% \begin{macrocode}
\protected\long\def\ekvc@SetupSplitKeys
{%
- \ekvc@keycount=0
+ \ekvc@keycount=\ekv@zero
\let\ekvc@any@long\ekv@empty
\let\ekvc@initials\ekv@empty
\ekvparse\ekvc@SetupSplitKeys@check@unknown\ekvc@SetupSplitKeys@a
@@ -1829,20 +1829,15 @@ and the derived files expkv-cs.pdf
% the value given to the key. Additionally we'll need a sorting macro for each
% key count in use so we set it up with |\ekvc@setup@splitmacro|.
% \begin{macrocode}
-\protected\long\def\ekvc@SetupSplitKeys@d#1#2%
+\protected\def\ekvc@SetupSplitKeys@d
{%
- \begingroup
- \edef\ekvc@tmp
- {%
- \endgroup
- \long\def\ekv@unexpanded{\ekvc@tmp}####1####2%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname}####3%
- {%
- ####2%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname}{####1}%
- }%
+ \begingroup\expandafter\endgroup
+ \expandafter\ekvc@SetupSplitKeys@e
+ \csname ekvc@splitmark@\the\ekvc@keycount\endcsname
+ }
+\protected\long\def\ekvc@SetupSplitKeys@e#1#2#3%
+ {%
+ \long\def\ekvc@tmp##1##2#1##3{##2#1{##1}}%
% \end{macrocode}
% The short variant needs a bit of special treatment. The key macro will be
% short to throw the correct error, but since there might be long macros
@@ -1850,25 +1845,16 @@ and the derived files expkv-cs.pdf
% use a two step approach, first grabbing only the short argument, then
% reordering.
% \begin{macrocode}
- \unless\ifx\ekvc@long\long
- \let\ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(\detokenize{#1})\endcsname\ekvc@tmp}%
- \def\ekv@unexpanded{\ekvc@tmp}####1%
- {%
- \ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(\detokenize{#1})\endcsname}%
- {####1}%
- }%
- \fi
- \def\ekv@unexpanded{\ekvc@initials}%
- {%
- \ekv@unexpanded\expandafter{\ekvc@initials}%
- \ekv@unexpanded\expandafter
- {\csname ekvc@splitmark@\the\ekvc@keycount\endcsname{#2}}%
- }%
- }%
- \ekvc@tmp
- \ekvlet\ekvc@set{#1}\ekvc@tmp
+ \unless\ifx\ekvc@long\long
+ \expandafter\let\csname ekvc@\ekvc@set(#2)\endcsname\ekvc@tmp
+ \edef\ekvc@tmp##1%
+ {%
+ \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#2)\endcsname}%
+ {##1}%
+ }%
+ \fi
+ \ekvlet\ekvc@set{#2}\ekvc@tmp
+ \edef\ekvc@initials{\ekv@unexpanded\expandafter{\ekvc@initials#1{#3}}}%
\ekvc@helpers@needed
{\expandafter\ekvc@setup@splitmacro\expandafter{\the\ekvc@keycount}}%
{}%
@@ -2128,7 +2114,7 @@ and the derived files expkv-cs.pdf
% \begin{macro}[internal]
% {
% \ekvc@SetupHashKeys,\ekvc@SetupHashKeys@a,\ekvc@SetupHashKeys@b,
-% \ekvc@SetupHashKeys@c,\ekvc@SetupHashKeys@d
+% \ekvc@SetupHashKeys@c,\ekvc@SetupHashKeys@d,\ekvc@SetupHashKeys@e,
% \ekvc@SetupHashKeys@check@unknown,\ekvc@SetupHashKeys@unknown
% }
% This should look awfully familiar as well, since it's just the same as for
@@ -2156,44 +2142,35 @@ and the derived files expkv-cs.pdf
{\ekvc@SetupHashKeys@d{#1 #2}}%
}
% \end{macrocode}
+% Again we build the marker, this time instead of a numbered one a named
+% hashmark, inside a group to not actually define the macro used as a marker.
+% \begin{macrocode}
+\protected\long\def\ekvc@SetupHashKeys@d#1%
+ {%
+ \begingroup\expandafter\endgroup
+ \expandafter\ekvc@SetupHashKeys@e\csname ekvc@hashmark@#1\endcsname{#1}%
+ }
+% \end{macrocode}
% Yes, even the defining macro looks awfully familiar. Instead of numbered we
% have named marks. Still the key macros grab everything up to their
% respective mark and reorder the arguments. The same quirk is applied for
% short keys. And instead of the |\ekvc@setup@splitmacro| we use
% |\ekvc@setup@hashmacro|.
% \begin{macrocode}
-\protected\long\def\ekvc@SetupHashKeys@d#1#2%
+\protected\long\def\ekvc@SetupHashKeys@e#1#2#3%
{%
- \begingroup
- \edef\ekvc@tmp
- {%
- \endgroup
- \long\def\ekv@unexpanded{\ekvc@tmp}####1####2%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname}%
- ####3%
- {%
- ####2%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname}%
- {####1}%
- }%
- \unless\ifx\ekvc@long\long
- \let\ekv@unexpanded\expandafter
- {\csname ekvc@\ekvc@set(#1)\endcsname\ekvc@tmp}%
- \def\ekv@unexpanded{\ekvc@tmp}####1%
- {%
- \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#1)\endcsname}%
- {####1}%
- }%
- \fi
- \def\ekv@unexpanded{\ekvc@initials}%
- {%
- \ekv@unexpanded\expandafter{\ekvc@initials}%
- \ekv@unexpanded\expandafter{\csname ekvc@hashmark@#1\endcsname{#2}}%
- }%
- }%
- \ekvc@tmp
- \ekvlet\ekvc@set{#1}\ekvc@tmp
- \ekvc@setup@hashmacro{#1}%
+ \long\def\ekvc@tmp##1##2#1##3{##2#1{##1}}%
+ \unless\ifx\ekvc@long\long
+ \expandafter\let\csname ekvc@\ekvc@set(#2)\endcsname\ekvc@tmp
+ \edef\ekvc@tmp##1%
+ {%
+ \ekv@unexpanded\expandafter{\csname ekvc@\ekvc@set(#2)\endcsname}%
+ {##1}%
+ }%
+ \fi
+ \ekvlet\ekvc@set{#2}\ekvc@tmp
+ \edef\ekvc@initials{\ekv@unexpanded\expandafter{\ekvc@initials#1{#3}}}%
+ \ekvc@setup@hashmacro{#2}%
}
% \end{macrocode}
% \begin{macrocode}
@@ -2479,7 +2456,10 @@ and the derived files expkv-cs.pdf
% \end{macro}
%
% \begin{macro}[internal]
-% {\ekvc@change,\ekvc@change@a,\ekvc@change@b,\ekvc@change@c}
+% {
+% \ekvc@change ,\ekvc@change@a,\ekvc@change@b,
+% \ekvc@change@c,\ekvc@change@d,\ekvc@change@e
+% }
% First we need to see whether the macro is currently |\long|. For this we get
% the meaning and will parse it. |#1| is the macro name in which we want to
% change the defaults.
@@ -2502,11 +2482,12 @@ and the derived files expkv-cs.pdf
\expandafter\ekvc@change@a\expandafter{\detokenize{macro:}}
% \end{macrocode}
% Next we expand the macro once to get its contents (including the current
-% default values with their markers). |#1| is either |\long| or empty, |#2| is
-% the macro.
+% default values with their markers) and place |\ekvc@stop| instead of an
+% argument as a marker for the last step. |#1| is either |\long| or empty,
+% |#2| is the macro.
% \begin{macrocode}
\protected\def\ekvc@change@b#1#2%
- {\expandafter\ekvc@change@c\expandafter{#2{##1}}{#1}#2}
+ {\expandafter\ekvc@change@c\expandafter{#2\ekvc@stop}{#1}#2}
% \end{macrocode}
% Here we place an unbalanced closing brace after the expansion of the macro.
% Then we just parse the \kv-list with |\ekvset|, that will exchange the
@@ -2518,25 +2499,24 @@ and the derived files expkv-cs.pdf
% \begin{macrocode}
\ekv@exparg{\protected\long\def\ekvc@change@c#1#2#3#4}%
{%
- \expandafter\iffalse\expandafter{\expandafter\fi
+ \expandafter\iffalse\expandafter{\expandafter{\expandafter\fi
\ekvset{\string#3}{#4}%
\ekvc@change@d{#2}{#3}%
#1%
- }%
+ }}%
}
% \end{macrocode}
-% The final step needs to put an unbalanced opening brace after |\def|. We do
-% that with the help of a temporary macro which stores everything necessary
-% for |\def| and expand an |\iffalse}\fi| construct to leave a single
-% opening brace. |#1| will be either empty or |\long| and |#2| is the macro.
-% Each of the macros defined with \expkvc\ takes exactly one parameter, so we
-% put that here as |####1|.
+% The final step needs to put an unbalanced opening brace after |\edef|. Also
+% we have to protect everything from further expanding with the exception of
+% the redefined macro's argument, which is why we placed the |\ekvc@stop|
+% earlier. Then we need to also protect the rest of the contents from further
+% expanding using |\unexpanded| with another unbalanced opening brace.
+% |#1| will be either empty or |\long| and |#2| is the macro.
% \begin{macrocode}
\protected\def\ekvc@change@d#1#2%
- {%
- \def\ekvc@tmp{#1\def#2####1}%
- \expandafter\ekvc@tmp\expandafter{\iffalse}\fi
- }
+ {#1\edef#2##1{\expandafter\ekvc@change@e\iffalse}\fi}
+\long\def\ekvc@change@e#1\ekvc@stop
+ {\ekv@unexpanded{#1}##1\ekv@unexpanded\expandafter{\iffalse}\fi}
% \end{macrocode}
% \end{macro}
%
@@ -3018,8 +2998,8 @@ and the derived files expkv-cs.pdf
% \end{macro}
%
% \begin{macro}{\ekvcFlagIf}
-% As already explained, truthiness is defined as a flag's height is odd, so we
-% just branch accordingly here.
+% As already explained, truthiness is defined as a flag's height being odd, so
+% we just branch accordingly here.
% \begin{macrocode}
\def\ekvcFlagIf#1%
{%
diff --git a/macros/generic/expkv-cs/expkv-cs.pdf b/macros/generic/expkv-cs/expkv-cs.pdf
index 130e142fb3..24c83fda2c 100644
--- a/macros/generic/expkv-cs/expkv-cs.pdf
+++ b/macros/generic/expkv-cs/expkv-cs.pdf
Binary files differ
diff --git a/macros/latex/contrib/apa7/README.txt b/macros/latex/contrib/apa7/README.txt
index a80ffcb2ce..ed40d4d6dd 100644
--- a/macros/latex/contrib/apa7/README.txt
+++ b/macros/latex/contrib/apa7/README.txt
@@ -26,3 +26,10 @@ altered the formatting guidelines and therefore rendered existing
formatting solutions inadequate. The apa7 class is an update of
older code from the apa6 class (available from CTAN). The student
manuscript type has been added. See the documentation for details.
+
+----------------------------------------------------------------------
+
+Installation Notes:
+1. Create directory "config" next to the file apa7.ins
+2. Run latex apa7.ins
+3. Move/copy apa7.cls to the directory of your latex install or the directory containing your latex project.
diff --git a/macros/latex/contrib/apa7/apa7.dtx b/macros/latex/contrib/apa7/apa7.dtx
index 27abc04e06..3e572a7393 100644
--- a/macros/latex/contrib/apa7/apa7.dtx
+++ b/macros/latex/contrib/apa7/apa7.dtx
@@ -4,11 +4,11 @@
% %
% CHANGE THESE VALUES WITH EACH NEW RELEASE: %
% %
-%<class>\ProvidesClass{apa7}[2021/05/17 v2.13 APA formatting (7th edition)]
+%<class>\ProvidesClass{apa7}[2021/11/21 v2.14 APA formatting (7th edition)]
% %
%<*internal> %
-\def\apaSevenVersionDate{2021/05/17}
-\def\apaSevenVersionNumber{2.13}
+\def\apaSevenVersionDate{2021/11/21}
+\def\apaSevenVersionNumber{2.14}
% %
% %
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -43,6 +43,13 @@ altered the formatting guidelines and therefore rendered existing
formatting solutions inadequate. The apa7 class is an update of
older code from the apa6 class (available from CTAN). The student
manuscript type has been added. See the documentation for details.
+
+----------------------------------------------------------------------
+
+Installation Notes:
+1. Create directory "config" next to the file apa7.ins
+2. Run latex apa7.ins
+3. Move/copy apa7.cls to the directory of your latex install or the directory containing your latex project.
%</readme>
%<*internal>
\fi
@@ -115,6 +122,7 @@ and the derived files apa7.ins,
APA7greek.txt,
APA7czech.txt,
APA7turkish.txt,
+ APA7spanish.txt,
APA7endfloat.cfg,
Figure1.pdf,
shortsample.tex,
@@ -138,6 +146,7 @@ and the derived files apa7.ins,
\file{./config/APA7greek.txt}{\from{\jobname.dtx}{greek}}
\file{./config/APA7czech.txt}{\from{\jobname.dtx}{czech}}
\file{./config/APA7turkish.txt}{\from{\jobname.dtx}{turkish}}
+ \file{./config/APA7spanish.txt}{\from{\jobname.dtx}{spanish}}
\file{./config/APA7endfloat.cfg}{\from{\jobname.dtx}{APAendfloat}}
}
\usedir{tex/latex/apa7/samples}
@@ -275,6 +284,8 @@ and the derived files apa7.ins,
%
% \changes{v2.13}{2021/05/17}{Fix headers for jou style when journal command is provided. }
%
+% \changes{v2.14}{2021/08/08}{Added Spanish localization. Fixed compatibility with Version 4.0 of flushend.sty. Clarify installation in readme. }
+%
% \begin{abstract}
% The \textit{Publication Manual} of the American Psychological
% Association is widely used in the social sciences. The most
@@ -2789,10 +2800,7 @@ and the derived files apa7.ins,
%========== balance last-page columns =================
-% need the `keeplastbox' option to allow final reference to be
-% properly indented on the final line
-% https://tex.stackexchange.com/questions/198287/reference-and-biography-indentation-issue
-\IfFileExists{flushend.sty}{\RequirePackage[keeplastbox]{flushend}}{}
+\IfFileExists{flushend.sty}{\RequirePackage{flushend}}{}
%========== ftnright and alterations ==================
@@ -3855,6 +3863,22 @@ The detailed results are shown in Table~\ref{tab:DeckedTable}. \lipsum[22]
%\end{macro}
%
%
+%\begin{macro}{APA7spanish.txt}
+% \begin{macrocode}
+%<*spanish>
+\ProvidesFile{APA7spanish.txt}[2021/08/08 v1.00 apa7 configuration for Spanish]
+
+\renewcommand{\lastauthorseparator}{y}% and
+\renewcommand{\acksname}{Nota del Autor}% Author Note
+\renewcommand{\keywordname}{Palabras Claves}% Keywords
+\renewcommand{\notesname}{Notas}% Footnotes
+%Note
+
+%</spanish>
+% \end{macrocode}
+%\end{macro}
+%
+%
%\begin{macro}{APA7endfloat.cfg}
% \begin{macrocode}
%<*APAendfloat>
diff --git a/macros/latex/contrib/apa7/apa7.ins b/macros/latex/contrib/apa7/apa7.ins
index 3b2c1f2ca0..3235d95787 100644
--- a/macros/latex/contrib/apa7/apa7.ins
+++ b/macros/latex/contrib/apa7/apa7.ins
@@ -89,6 +89,7 @@ and the derived files apa7.ins,
APA7greek.txt,
APA7czech.txt,
APA7turkish.txt,
+ APA7spanish.txt,
APA7endfloat.cfg,
Figure1.pdf,
shortsample.tex,
@@ -112,6 +113,7 @@ and the derived files apa7.ins,
\file{./config/APA7greek.txt}{\from{\jobname.dtx}{greek}}
\file{./config/APA7czech.txt}{\from{\jobname.dtx}{czech}}
\file{./config/APA7turkish.txt}{\from{\jobname.dtx}{turkish}}
+ \file{./config/APA7spanish.txt}{\from{\jobname.dtx}{spanish}}
\file{./config/APA7endfloat.cfg}{\from{\jobname.dtx}{APAendfloat}}
}
\usedir{tex/latex/apa7/samples}
@@ -156,6 +158,7 @@ and the derived files apa7.ins,
%% APA7greek.txt,
%% APA7czech.txt,
%% APA7turkish.txt,
+%% APA7spanish.txt,
%% APA7endfloat.cfg,
%% Figure1.pdf,
%% shortsample.tex,
diff --git a/macros/latex/contrib/apa7/apa7.pdf b/macros/latex/contrib/apa7/apa7.pdf
index 593afa5e20..d3e53c5c89 100644
--- a/macros/latex/contrib/apa7/apa7.pdf
+++ b/macros/latex/contrib/apa7/apa7.pdf
Binary files differ
diff --git a/macros/latex/contrib/apa7/samples/longsample.pdf b/macros/latex/contrib/apa7/samples/longsample.pdf
index 2c1ddfa313..3d474216f2 100644
--- a/macros/latex/contrib/apa7/samples/longsample.pdf
+++ b/macros/latex/contrib/apa7/samples/longsample.pdf
Binary files differ
diff --git a/macros/latex/contrib/apa7/samples/shortsample.pdf b/macros/latex/contrib/apa7/samples/shortsample.pdf
index 0fbe41f67c..370ffb18af 100644
--- a/macros/latex/contrib/apa7/samples/shortsample.pdf
+++ b/macros/latex/contrib/apa7/samples/shortsample.pdf
Binary files differ
diff --git a/macros/latex/contrib/graphics-def/README.md b/macros/latex/contrib/graphics-def/README.md
index 1c5915297d..6128dee565 100644
--- a/macros/latex/contrib/graphics-def/README.md
+++ b/macros/latex/contrib/graphics-def/README.md
@@ -1,7 +1,7 @@
LaTeX support for color and graphics
====================================
-Release 2021-06-01
+Release 2021-11-21
This bundle contains the 'engine-dependent' part of support for
color and graphics in LaTeX2e (the code here will also function
diff --git a/macros/latex/contrib/graphics-def/dvisvgm.def b/macros/latex/contrib/graphics-def/dvisvgm.def
index 052981bbe0..4c13e2ae1a 100644
--- a/macros/latex/contrib/graphics-def/dvisvgm.def
+++ b/macros/latex/contrib/graphics-def/dvisvgm.def
@@ -1,6 +1,6 @@
%% dvisvgm.def
%% Copyright 2015 by Till Tantau
-%% Copyright 2016-2020 by Till Tantau and LaTeX3 Project
+%% Copyright 2016-2021 by Till Tantau and LaTeX3 Project
%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -16,7 +16,7 @@
%%
%% https://github.com/latex3/graphics-def/issues
%
-\ProvidesFile{dvisvgm.def}[2020/03/22 v1.2 dvisvgm graphics driver for latex]
+\ProvidesFile{dvisvgm.def}[2021/11/21 v1.3 dvisvgm graphics driver for latex]
% The following is copied from dvips.def:
\def\GPT@space{ }
\def\c@lor@arg#1{%
@@ -89,7 +89,7 @@
\special{dvisvgm:bbox lock}%
}
\let\Gscale@end\Grot@end
-\def\Gin@extensions{.svg,.eps,.png,.jpg,.jpeg}
+\def\Gin@extensions{.svg,.eps,.pdf,.png,.jpg,.jpeg}
\def\Ginclude@pdf#1{\Ginclude@psorpdf{#1}{pdffile}}
\def\Ginclude@eps#1{\let\Gin@page\@empty\Ginclude@psorpdf{#1}{PSfile}}
\def\Ginclude@psorpdf#1#2{%
diff --git a/macros/latex/contrib/xassoccnt/README b/macros/latex/contrib/xassoccnt/README
index eb1a01a37e..9a33d6a7d2 100644
--- a/macros/latex/contrib/xassoccnt/README
+++ b/macros/latex/contrib/xassoccnt/README
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% README file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
@@ -26,7 +26,7 @@ the associated counters as well. This package can be regarded as a supplement
to the totcount package by Vasileios Koutavas (http://www.ctan.org/pkg/totcount), but
can be used without it too.
-As of 2020/07/19 xassoccnt does not supersede the package assoccnt by the same author, however,
-the older package isn't declared obsolete as of 2020/07/19
+As of 2021/11/21 xassoccnt does not supersede the package assoccnt by the same author, however,
+the older package isn't declared obsolete as of 2021/11/21
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt.sty b/macros/latex/contrib/xassoccnt/xassoccnt.sty
index 2150dc6e46..d18feeabc4 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt.sty
+++ b/macros/latex/contrib/xassoccnt/xassoccnt.sty
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Source file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,14 +15,14 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
-\def\xassoccntpackageversion{1.8}
+\def\xassoccntpackageversion{2.0}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{xassoccnt}[2020/07/19 - v\xassoccntpackageversion]
+\ProvidesPackage{xassoccnt}[2021/11/21 - v\xassoccntpackageversion]
\RequirePackage{etoolbox}
\RequirePackage{letltxmacro}
\RequirePackage{xcolor}
@@ -460,28 +460,28 @@
}
-\NewDocumentCommand{\IfPackageLoadedT}{m+m}{%
+\NewDocumentCommand{\CheckIfPackageLoadedT}{m+m}{%
\xassoccnt_package_loaded:nT {#1}{#2}
}
-\NewDocumentCommand{\IfPackageLoadedF}{m+m}{%
+\NewDocumentCommand{\CheckIfPackageLoadedF}{m+m}{%
\xassoccnt_package_loaded:nF {#1}{#2}
}
-\NewDocumentCommand{\IfPackageLoadedTF}{m+m+m}{%
+\NewDocumentCommand{\CheckIfPackageLoadedTF}{m+m+m}{%
\xassoccnt_package_loaded:nTF {#1}{#2}{#3}
}
-\NewDocumentCommand{\IfNotPackageLoadedTF}{m+m+m}{%
+\NewDocumentCommand{\CheckIfNotPackageLoadedTF}{m+m+m}{%
\xassoccnt_package_notloaded:nTF {#1}{#2}{#3}
}
-\NewDocumentCommand{\IfNotPackageLoadedT}{m+m}{%
+\NewDocumentCommand{\CheckIfNotPackageLoadedT}{m+m}{%
\xassoccnt_package_notloaded:nT {#1}{#2}
}
-\NewDocumentCommand{\IfNotPackageLoadedF}{m+m}{%
+\NewDocumentCommand{\CheckIfNotPackageLoadedF}{m+m}{%
\xassoccnt_package_notloaded:nF {#1}{#2}
}
@@ -708,7 +708,7 @@
}{}
\AtEndOfPackage{
- \PackageInfo{xassoccnt}{2020/07/19 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
+ \PackageInfo{xassoccnt}{2021/11/21 - v\xassoccntpackageversion -- stepping counters simultaneously and other features}
\xassoccnt_trackloadedpackages:n{alphalph,calc,cleveref,hyperref}
\@ifpackageloaded{calc}{%
\msg_warning:nnn{xassoccnt}{incompatiblepackagenonfatal}{calc}% Warning
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
index 3f5df833d7..0b940b521d 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
index 91c1062332..59f77aacbf 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_counterformats_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for defining new counter formats file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
index 4b294bdcae..4b8628ad3d 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
index 87e67e83ea..5079189df0 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_counterhierarchy_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for defining new counter hierarchies file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
index 4e75803758..c9759de725 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
index b5338ac8e3..71732b076c 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_coupledcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for coupled counters file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2016 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
index f7ec391d94..2f26195e9a 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_doc.tex b/macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
index 2d89681451..529a718b7a 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_doc.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Documentation file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2015 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
@@ -119,6 +119,8 @@
\@namedef{xassoccntversion1.8}{v1.8 2019-01-01}
+\@namedef{xassoccntversion2.0}{v2.0 2021-11-21}
+
\newcommand{\authorname}{Autor}
@@ -170,13 +172,13 @@
\today \tabularnewline
\tabularnewline
\addtocounter{footnote}{2}
- \authorname: \KVchdocpackageauthor\(^\mathrm{\fnsymbol{footnote}}\)
+ Previous \authorname: \KVchdocpackageauthor\(^\mathrm{\fnsymbol{footnote}}\)
\tabularnewline
\end{tabular}
\end{center}
\end{CHPackageTitleBox}
\renewcommand{\thefootnote}{\fnsymbol{footnote}}%
- \footnotetext{\mymailtoaddress}%
+ \footnotetext{unavailable}%
\end{center}
}
@@ -354,7 +356,7 @@
\newcommand{\mymailtoaddress}{%
- dr.christian.hupfer@gmail.com%
+ %
}
\doparttoc
@@ -370,8 +372,7 @@
\newcounter{foobar}
-
-\newtotcounter{totalpages}%
+\newtotcounter{newtotalpages}%
\newtotcounter{anothertotalpages}%
\newtotcounter{totalproofs}%
@@ -471,7 +472,7 @@ For example, the total number of pages in a document could be achieved by using
\begin{dispExample}%
\regtotcounter{page}
...
-The number of pages in the document is \number\totvalue{page} page(s) -- but in fact it has \total{totalpages} pages.
+The number of pages in the document is \number\totvalue{page} page(s) -- but in fact it has \total{newtotalpages} pages.
\end{dispExample}%
This will work, as long there is no reset of the page counter, as it might happen in the case of \cs{setcounter} or \cs{pagenumbering} being applied in the document. The result is a false page counter total value.
@@ -1500,7 +1501,7 @@ This command is the main macro of the package. It declares the counter names bei
%%%% The association of anothertotalpages in this example just takes place here, so the stepping of the counter will start from here and providing a 'wrong' value.
%%%%
\DeclareAssociatedCounters{page}{totalpages,anothertotalpages}%
-This document has \number\totvalue{totalpages} (note: \number\totvalue{anothertotalpages}) pages.
+This document has \number\totvalue{newtotalpages} (note: \number\totvalue{anothertotalpages}) pages.
\end{dispExample}
\begin{itemize}
@@ -1561,7 +1562,7 @@ This command removes a counter from the existing list for a driver counter, i.e.
\begin{dispExample}
\RemoveAssociatedCounter{page}{anothertotalpages}
-This document has \number\totvalue{totalpages} (beware: \number\totvalue{anothertotalpages}) pages.
+This document has \number\totvalue{newtotalpages} (beware: \number\totvalue{anothertotalpages}) pages.
\end{dispExample}
@@ -1668,7 +1669,7 @@ This macro checks, whether a counter is associated to a particular given driver
\begin{dispExample}
% Remove associated counter first for demonstration purposes
\RemoveAssociatedCounter{page}{anothertotalpages}
-\IsAssociatedToCounter{page}{totalpages}{Yes, totalpages is associated}{No, totalpages is not associated}
+\IsAssociatedToCounter{page}{newtotalpages}{Yes, totalpages is associated}{No, totalpages is not associated}
\IsAssociatedToCounter{page}{anothertotalpages}{Yes, anothertotalpages is associated}{No, anotherpages is not associated}
\end{dispExample}
@@ -1696,7 +1697,7 @@ This commands returns the driver counter to which the counter name of the first
\begin{dispExample}%
-totalpages is associated to the \textcolor{blue}{\textbf{\GetDriverCounter{totalpages}}} counter.
+totalpages is associated to the \textcolor{blue}{\textbf{\GetDriverCounter{newtotalpages}}} counter.
% Try with an undefined counter name
humptydumpty is associated to the \textcolor{blue}{\textbf{\GetDriverCounter{humptydumpty}}} counter.
@@ -1730,7 +1731,7 @@ This commands tests, whether a given counter name is an associated counter and e
\begin{dispExample}
\IsAssociatedCounter{section}{Yes, section is an associated counter}{No, section counter does not have the associated counter properties}
-\IsAssociatedCounter{totalpages}{Yes, totalpages is an associated counter}{No, totalpages counter does not have the associated counter properties}
+\IsAssociatedCounter{newtotalpages}{Yes, totalpages is an associated counter}{No, totalpages counter does not have the associated counter properties}
\end{dispExample}
\end{docCommand}%
@@ -2445,6 +2446,12 @@ write this documentation.
\begin{itemize}[itemsep=15pt]
+\item \CHDocFullVersion{2.0}
+ \begin{itemize}
+ \item Last release due to changes in \LaTeX3-Kernel and switching to unmaintained state.
+ \end{itemize}
+
+
\item \CHDocFullVersion{1.8}
\begin{itemize}
\item Maintenance update due to updates to \CHDocPackage{expl3}.
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
index ddb1e0550a..7b287e9015 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
index bfac214ed8..533f4be7ba 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_driver_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Driver file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2015 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
@@ -31,7 +31,7 @@
\usepackage{cleveref}
-\newcounter{totalpages}
+\newcounter{newtotalpages}
\newtotcounter{totalsections}
\newcounter{othersections}
\newtotcounter{totaltables}
@@ -42,7 +42,7 @@
\AddAssociatedCounters{section}{totalsections}
-\DeclareAssociatedCounters{page}{totalpages}
+\DeclareAssociatedCounters{page}{newtotalpages}
\DeclareAssociatedCounters{table}{totaltables}
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
index a9c04268a1..eac320ba03 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_example.tex
index fb3755b9ce..58654337b3 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2015 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
index 966f4d9917..ee16e3a69e 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
index 6b1bf2d671..0fe542d81d 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_getparentcounter_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for determing the parent counter of a counter and referring to it file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
index 0a2d10633f..afc93533e7 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_label_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
index dc07d862c8..e386b902d4 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_label_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file the the usage of labels with associated counters file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
index 59de023e18..fc127309c7 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
index b42acc9ef9..3bb4259669 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_periodiccounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for periodic counters file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2016 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
index 95b57ffccb..cab34c3eef 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
index 83bca1e8e2..245fef4933 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_resetlist_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for reset list features file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2016 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
index acfc104ff2..03cb52c73a 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
index 55c433ef11..6ec4456c9c 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_resetloop_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for looping through the reset list file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2017 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2017 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
index ee242f2154..4794a97329 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
index c8da874567..19f3815e23 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_suspendedcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for suspended counters file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2016 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2016 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf b/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
index 7790bed21b..87c5345031 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.pdf
Binary files differ
diff --git a/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex b/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
index 56c7443c3a..97d9e9da6d 100644
--- a/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
+++ b/macros/latex/contrib/xassoccnt/xassoccnt_totalcounters_example.tex
@@ -1,9 +1,9 @@
-%% LaTeX package xassoccnt - version 1.8 (2020/07/19 -- 12:38:30)
+%% LaTeX package xassoccnt - version 2.0 (2021/11/21 -- 12:14:58)
%% Example file for total counters file for xassoccnt.sty
%%
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2015 -- 2020 by Dr. Christian Hupfer <dr dot christian dot hupfer at gmail dot com>
+%% Copyright (c) 2015 -- 2021 by Dr. Christian Hupfer <>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -15,7 +15,7 @@
%% version 2005/12/01 or later.
%%
%%
-%% This work has the LPPL maintenance status `author-maintained`
+%% This work has the LPPL maintenance status `unmaintained`
%%
%%
diff --git a/macros/luatex/latex/ekdosis/README.md b/macros/luatex/latex/ekdosis/README.md
index 0fef027f19..ae7e85154f 100644
--- a/macros/luatex/latex/ekdosis/README.md
+++ b/macros/luatex/latex/ekdosis/README.md
@@ -30,12 +30,12 @@ Alessi:
- email: <alessi@robertalessi.net>
-- website: <http://www.robertalessi.net/ekdosis>
+- website: <http://www.ekdosis.org>
- comments, feature requests, bug reports:
- <https://gitlab.com/ralessi/ekdosis/issues>
+ <http://www.ekdosis.org/issues>
-- mailing list, support: <http://www.robertalessi.net/mailman/listinfo/ekdosis> [[mailing list archives](http://www.robertalessi.net/pipermail/ekdosis/)]
+- mailing list, support: <http://www.ekdosis.org/mailman/listinfo/ekdosis> [[mailing list archives](http://www.ekdosis.org/pipermail/ekdosis/)]
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
@@ -98,7 +98,7 @@ instructions on how to install `ekdosis`, please see above.
Comments, Feature Requests, Bug Reports
---------------------------------------
-<https://gitlab.com/ralessi/ekdosis/issues>
+<http://www.ekdosis.org/issues>
Download the Repository
diff --git a/macros/luatex/latex/ekdosis/ekdosis.dtx b/macros/luatex/latex/ekdosis/ekdosis.dtx
index 30b19f07d6..d78a17f4cf 100644
--- a/macros/luatex/latex/ekdosis/ekdosis.dtx
+++ b/macros/luatex/latex/ekdosis/ekdosis.dtx
@@ -61,7 +61,7 @@ along with this program. If not, see
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{ekdosis}
%<*package>
- [2021/08/18 v1.3 Typesetting TEI xml-compliant critical editions]
+ [2021/11/21 v1.4 Typesetting TEI xml-compliant critical editions]
%</package>
%<*driver>
\begin{filecontents}[noheader,overwrite]{bibdata.xml}
@@ -441,8 +441,13 @@ along with this program. If not, see
}
\end{filecontents}
\begin{filecontents}[overwrite]{\jobname-ekd.cfg}
+%% fixfoot:---
+\DeclareFixedFootnote{\seeekdsep}{See below
+ \vpageref{ref:ekdsep-subsep} for more information and
+ \vref{lst:emend-coni-corr}, ll.~23--5 for an illustrative example.}
+%% ekdosis:---
\footnotelayout{m}
-\SetCritSymbols{suppbegin = 〈,suppend = 〉}
+\SetCritSymbols{suppbegin = ⟨,suppend = ⟩}
\EnvtoTEI{ancientgreek}{p}[xml:lang="grc"]
\DeclareApparatus{fontium}[
delim=\hskip0.75em,
@@ -558,14 +563,14 @@ along with this program. If not, see
\defaultfontfeatures{Renderer=Harfbuzz}
\usepackage[latin.classic,greek.ancient,american]{babel}
\babelfont{rm}{Old Standard}
-\babelfont{sf}{NewComputerModernSans10}
-\babelfont{tt}{NewComputerModernMono10}
+\babelfont{sf}{NewCMSans10-Book}
+\babelfont{tt}{NewCMMono10-Book}
\babelfont[greek]{rm}[
Script=Greek,
RawFeature={+ss05;+ss06}
]{Old Standard}
-\babelfont[greek]{sf}[Script=Greek]{NewComputerModernSans10}
-\babelfont[greek]{tt}[Script=Greek]{NewComputerModernMono10}
+\babelfont[greek]{sf}[Script=Greek]{NewCMSans10-Book}
+\babelfont[greek]{tt}[Script=Greek]{NewCMMono10-Book}
\newfontfamily{\junicode}{Junicode}[
Ligatures=TeX,
RawFeature={+hist}]
@@ -575,6 +580,10 @@ along with this program. If not, see
\usepackage[Old Standard]{mathfont}
\usepackage[biblatex=true]{embrac}
\usepackage{chifoot}
+\usepackage{fixfoot}
+\usepackage[nospace,american]{varioref}
+\newcommand\phts{\phantomsection}
+\usepackage{nameref}
\usepackage{arabluatex}
\usepackage[parnotes=roman, teiexport=tidy, poetry=verse]{ekdosis}
\AddxmlBibResource{bibdata.xml}
@@ -628,9 +637,6 @@ along with this program. If not, see
\labelformat{figure}{fig.~#1}
\usepackage[defaultindex=none,citecmd=autocite]{icite}
\bibinput{ekdosis}
-\usepackage[nospace,american]{varioref}
-\newcommand\phts{\phantomsection}
-\usepackage{nameref}
\newcommand\vnref[1]{\vref{#1}, \enquote{\nameref{#1}}}
\usepackage[style=oxnotes-inote,dashed]{biblatex}
\DefineBibliographyStrings{english}{
@@ -805,7 +811,7 @@ along with this program. If not, see
\usepackage{needspace}
\NewDocumentCommand{\captof}{O{listing} m O{}}{%
\bgroup
- \needspace{5\baselineskip}%
+ \nobreak
\vskip 1ex plus 2pt minus 2pt%
\captionof{#1}{#2}%
#3%
@@ -849,7 +855,7 @@ along with this program. If not, see
%</driver>
% \fi
%
-% \CheckSum{2519}
+% \CheckSum{2635}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -927,10 +933,10 @@ along with this program. If not, see
% Alessi:
% \begin{itemize}
% \item email: \mailto[ekdosis package]{Robert Alessi <alessi@roberalessi.net>}
-% \item website: \url{http://www.robertalessi.net/ekdosis}
+% \item website: \url{http://www.ekdosis.org}
% \item development: \url{http://git.robertalessi.net/ekdosis}
% \item comments, feature requests, bug reports:
-% \url{https://gitlab.com/ralessi/ekdosis/issues}
+% \url{http://www.ekdosis.org/issues}
% \end{itemize}
%
% \leavevmode\marginpar{\hfill\texttt{gpl3+}}
@@ -1822,8 +1828,8 @@ yesterday.
% \DescribeOption{type} |type|$=$\meta{type}\phts\label{ref:app-type}
% \hfill\tcboxverb{Default: default}\\
% As will be described below in \vref{sec:multilayer-apparatus},
-% \pkg{ekdosis} initially sets one layer of notes\--- the |default|
-% layer\---in the apparatus criticus. This layer is fit to receive
+% \pkg{ekdosis} initially sets one layer of notes\===the |default|
+% layer\===in the apparatus criticus. This layer is fit to receive
% notes related to variant readings from witnesses and sources used by
% the editor to establish the edition text. Additional layers can be
% defined to receive other kinds of notes, such as references to texts
@@ -1855,8 +1861,8 @@ yesterday.
% apparatus criticus, preceded by the line number where it occurs or a
% broad space when the entry refers to the same line as the preceding
% entry. \phts\label{ref:lem-opts-b}The optional argument of \cs{lem}
-% accepts the following
-% comma-separated list of \enquote{name$=$value} arguments:---\\
+% accepts the following comma-separated list of \enquote{name$=$value}
+% arguments:---\\
% \DescribeOption{wit} |wit|$=$\meta{csv list of
% witnesses}\phts\label{ref:lem-wit}\\
% While a single witness may be recorded as in |wit=A|,
@@ -1864,11 +1870,16 @@ yesterday.
% enclosed in curly braces, like so:
% |wit={A,B,C}|. \phts\label{ref:mss-sep-families}It must be noted
% that witnesses can be grouped by using spaces as separators, like
-% so: \verb*|wit={A,B,C, D,E,F}|. Although any unique identifiers or
-% labels used to \enquote{declare} sources and scholars as described
-% above \vpagerefrange{ref:declare-source}{ref:declare-scholar} can
-% also be used as values of the |wit| optional argument, it is
-% recommended to use |sources| and |resp| to refer to either category
+% so: \verb*|wit={A,B,C, D,E,F}|. \danger In the apparatus criticus in
+% print, it is customary to remind the reader of the manuscript
+% groupings by spaces or commas. \pkg{ekdosis} prints spaces by
+% default, but can be instructed to print any other symbol
+% instead.\footnote{See below \vpageref{ref:familysep} for details.}
+% \danger Although any unique identifiers or labels used to
+% \enquote{declare} sources and scholars as described above
+% \vpagerefrange{ref:declare-source}{ref:declare-scholar} can also be
+% used as values of the |wit| optional argument, it is recommended to
+% use |sources| and |resp| to refer to either category
% respectively as described below.\\
% \DescribeOption{source} |source|$=$\meta{csv list of
% sources}\phts\label{ref:lem-source}\newfeature[v1.1]\\
@@ -1904,15 +1915,12 @@ yesterday.
% if used. |nosep| removes the separator mentioned above. Obviously,
% |nosep| must be used when for some reason no \cs{rdg} command
% follows a \cs{lem} command that has just been used, as shown below
-% in \vref{lst:emend-coni-corr}, l.~7.
-%
-% \needspace{2\baselineskip}
-% \danger \DescribeMacro{\ekdsep} If |nosep| be used so as to insert
-% an explanatory note after the lemma text with the \cs{note} command
-% described below \vpageref{ref:editorial-notes}, then \cs{ekdsep} can
-% be used\---for instance as value of the |post| optional argument of
-% the note\---to put back in the separator. This technique is
-% demonstrated below in \vref{lst:emend-coni-corr}, ll.~23--5.\\
+% in \vref{lst:emend-coni-corr}, l.~7. \danger If |nosep| be used so
+% as to insert an explanatory note after the lemma text with the
+% \cs{note} command described below \vpageref{ref:editorial-notes},
+% then the |sep| optional argument of \cs{note} can be used to put
+% back in the separator. This technique is demonstrated below in
+% \vref{lst:emend-coni-corr}, ll.~23--5.\\
% \DescribeOption{nolem} |nolem|$=$\verb+true|false+\\
% This named argument does not need a value as it defaults to |true|
% if used. |nolem| completely removes the lemma text from the related
@@ -1987,6 +1995,19 @@ yesterday.
% \DescribeOption{post} |post|$=$\meta{words}\\
% \DescribeOption{prewit} |prewit|$=$\meta{words}\\
% \DescribeOption{postwit} |postwit|$=$\meta{words}\\
+% \DescribeOption{subsep} |subsep|$=$\meta{subseparator}\\
+% \newfeature[v1.4] |subsep| inserts a subseparator to be printed
+% \emph{before} the current entry as described below
+% \vpageref{ref:setsubseparator}. This option is supposed to be used
+% when no subseparator is defined, or when one is defined but for some
+% reason a different subseparator is needed for the current
+% entry.\\
+% \DescribeOption{nosubsep} This argument-less option removes the
+% subseparator from the current entry, provided one has been set by
+% means of \cs{SetSubseparator}, \cs{SetApparatus} or
+% \cs{DeclareApparatus}.\footnote{See
+% \vpagerefrange{ref:setsubseparator}{ref:apparatus-settings-e} and
+% \vref{sec:declaring-layers} for details.}
%
% \paragraph{Notes}
% \DescribeMacro{\note}\phts\label{ref:notes-b}\DescribeMacro{\note*}
@@ -2007,6 +2028,10 @@ yesterday.
% |pre| inserts \meta{words} immediately before the note.\\
% \DescribeOption{post} |post|$=$\meta{words}\\
% |post| inserts \meta{words} immediately after the note.\\
+% \DescribeOption{sep} This argument-less option is equivalent to
+% |post=\ekdsep|.\seeekdsep\\
+% \DescribeOption{subsep} This argument-less option is equivalent to
+% |pre=\ekdsubsep|.\seeekdsep\\
%
% \danger Under no circumstances is it permitted to insert this
% command \cs{note} or \cs{note*} inside the argument of \cs{lem} or
@@ -2537,6 +2562,14 @@ friend
% \DescribeOption{gapmark}|gapmark|$=$\meta{symbols}
% \hfill\tcboxverb{Default: ***}\\
% The symbols used to mark lacunae.\\
+% \DescribeOption{keepinapp} |keepinapp|$=$\verb+true|false+
+% \hfill\tcboxverb{Default: false}\\
+% \newfeature[v1.4] This named argument does not need a value as it
+% defaults to |true| if used. By default, the critical symbols used by
+% \cs{supplied}, \cs{surplus} and \cs{sic} described below
+% \vpagerefrange{ref:corr-cmds-b}{ref:corr-cmds-e} are printed in the
+% edition text but removed from the apparatus. |keepinapp| instructs
+% \pkg{ekdosis} to print these symbols in both places.
%
% As an example, what follows sets |[]| for deletions and |...| for
% lacunae:---
@@ -2564,6 +2597,7 @@ friend
% used to perform the test.
%
% \paragraph{Editorial Addition}
+% \phts\label{ref:corr-cmds-b}
% \DescribeMacro{\supplied}\newfeature[v1.1]\cs{supplied}\marg{text}
% is used to mark \meta{text} that is by definition missing from the
% tradition as supplied by the editor or some other scholar. This
@@ -2581,6 +2615,7 @@ friend
% mandatory argument the text deemed by the editor to be readable but
% not understandable. \cs{sic} inserts \meta{text} between cruces
% while \cs{sic*} prints only one crux before \meta{text}.
+% \phts\label{ref:corr-cmds-e}
%
% \paragraph{Lacuna}
% \DescribeMacro{\gap}\newfeature[v1.1] \cs{gap}\marg{csv list of
@@ -2639,7 +2674,7 @@ friend
Πάντων δὲ \app{
\lem[resp=egomute, type=emendation, nosep]{\supplied{τῶν πυÏετῶν}}
- \note[post=\ekdsep]{addidi (\arb{^gamI`a 'l-.hummayAti}
+ \note[sep]{addidi (\arb{^gamI`a 'l-.hummayAti}
\getsiglum{Gal})}
\rdg[nordg, source=Gal]{\arb{al-.hummayAti}}
\rdg[wit=codd, source=edd, alt=om.]{}
@@ -2676,7 +2711,7 @@ friend
%
% Πάντων δὲ \app{
% \lem[resp=egomute, type=emendation, nosep]{\supplied{τῶν πυÏετῶν}}
-% \note[post=\ekdsep]{addidi (\arb{^gamI`a 'l-.hummayAti}
+% \note[sep]{addidi (\arb{^gamI`a 'l-.hummayAti}
% \getsiglum{Gal})}
% \rdg[nordg, source=Gal]{\arb{al-.hummayAti}}
% \rdg[wit=hcodd, source=hedd, alt=om.]{}
@@ -2985,7 +3020,7 @@ friend
% \emph{semicolons}, as shown in red in the listing below at the end
% of lines~1 and 2.
% \begin{enumerate}
-% \item[\dbend] The colon at the end of line~3 closes the whole
+% \item[\dbend] The comma at the end of line~3 closes the whole
% value of |text| and acts as a higher level separator.
% \end{enumerate}
% \item \phts\label{it:lang-subopt} Each name may be followed by a
@@ -3318,6 +3353,20 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \hfill\tcboxverb{Default: not set}\\
% \newfeature[v1.2] |readingstyle| operates in the same way as
% |lemmastyle| but applies to variant readings.\\
+% \DescribeOption{familysep} |familysep|$=$\meta{symbol}\verb+|reset+
+% \phts\label{ref:familysep}\hfill\tcboxverb{Default: not set}\\
+% \newfeature[v1.4] As described above \vpageref{ref:lem-wit},
+% multiple witnesses must be recorded in the |wit| optional argument
+% of the \cs{lem} and \cs{rdg} commands as comma-separated lists of
+% sigla which can be further grouped into families by inserting spaces
+% as separators just after commas at specific places. \pkg{ekdosis}
+% saves and prints these spaces in the apparatus criticus but can be
+% instructed to print any other symbol instead by means of
+% |familysep|. For instance, |familysep={,}| has the separating spaces
+% replaced with commas and |familysep={,\allowbreak}| does the same
+% while further allowing breaks after commas at the end of
+% lines. Finally, |familysep=reset| can be used to restore the default
+% behavior.\\
% \DescribeOption{initialrule} |initialrule|$=$\meta{command}
% \phts\label{ref:initialrule}\hfill\bgroup\footnotesize
% \tcboxverb{Default: \rule{0.4\columnwidth}{0.4pt} (initially not set)}%
@@ -3325,8 +3374,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% between the edition text and all subsequent layers of critical
% notes. Of course, this option only makes sense when multiple-layer
% apparatus criticus are set. Therefore, it has no effect on
-% single-layer apparatus
-% criticus.\\
+% single-layer apparatus criticus.\\
% \DescribeOption{noinitialrule}\hfill\tcboxverb{Default: not set}\\
% This is a no-value option. It removes any previously set
% |initialrule|.
@@ -3386,10 +3434,38 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% right-to-left.
%
% \DescribeMacro{\SetSeparator} \cs{SetSeparator}\marg{separator} is
-% used to change the separator between lemma texts and variants
+% used to change the separator between lemma texts and variant
% readings. By default, the separator is a closing square bracket
% followed by a space (\verb*+] +).
%
+% \DescribeMacro{\SetSubseparator}\label{ref:setsubseparator}
+% \newfeature[v1.4] \cs{SetSubseparator}\marg{subseparator} is used to
+% set or change the \enquote{subseparator} between succeeding variant
+% readings. By default, no subseparator is set.
+%
+% \danger As the subseparator applies to subsequent variant readings
+% only, it is naturally preceded by a breakable space. This space can
+% be removed by \cs{unskip}. As an example, what follows replaces the
+% breakable space with an unbreakable space, then prints a colon as
+% subseparator followed by a space:---
+%
+% \iffalse
+%<*example>
+% \fi
+\begin{minted}[linenos=false]{latex}
+\SetSubseparator{\unskip~: }
+\end{minted}
+% \iffalse
+%</example>
+% \fi
+%
+% \danger \DescribeMacro{\ekdsep} \DescribeMacro{\ekdsubsep}
+% \phts\label{ref:ekdsep-subsep} Once the separator and if applicable
+% the subseparator have been set, they can be accessed by \cs{ekdsep}
+% and \cs{ekdsubsep} respectively. It is therefore advisable to use
+% these commands instead of the mere symbols at whatever place one
+% would have them printed.
+%
% \DescribeMacro{\SetBeginApparatus}
% \cs{SetBeginApparatus}\marg{characters\textbar commands} can be used
% to append \meta{characters} or \meta{commands} at the beginning of
@@ -3452,6 +3528,9 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \DescribeOption{sep} |sep|$=$\meta{command \textbar\ chars}
% \hfill\tcboxverb{Default: ]â£}\\
% The separator between lemma texts and variant readings.\\
+% \DescribeOption{subsep} |subsep|$=$\meta{command \textbar\ chars}
+% \hfill\tcboxverb{Default: not set}\\
+% The \enquote{subseparator} between succeeding variant readings.\\
% \DescribeOption{delim} |delim|$=$\meta{delimiter}
% \hfill\tcboxverb{Default: not set}\\
% The delimiter between entries in the apparatus criticus. As said
@@ -3470,7 +3549,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% between the edition text and the apparatus criticus.\\
% \DescribeOption{norule}\hfill\tcboxverb{Default: not set}\\
% |norule| does not accept any value and is used to remove the
-% line.\phts\label{ref:apparatus-settings-e}\\
+% line.\\
% \DescribeOption{lang} |lang|$=$\meta{languagename}
% \newfeature[v1.2]\phts\label{ref:app-lang-opt}
% \hfill\tcboxverb{Default: not set}\\
@@ -3489,7 +3568,8 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \cs{note}\oarg{options}\marg{text}\===a language different from the
% one that is selected in the edition text. |languagename| can be any
% value accepted by \pkg{babel} or \pkg{polyglossia}.
-%
+% \phts\label{ref:apparatus-settings-e}
+%
% As an example, an apparatus criticus with references to line numbers
% printed in normal font, a colon as a separator between lemma texts
% and variant readings, a broad space as a delimiter between entries
@@ -3578,6 +3658,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \label{sec:layout-layers}
% \DescribeOption{direction}
% \DescribeOption{sep}
+% \DescribeOption{subsep}
% \DescribeOption{delim}
% \DescribeOption{bhook}
% \DescribeOption{ehook}
@@ -3603,7 +3684,7 @@ texts=latin[xml:lang="la"]+\textcolor{red}{;}+
% \iffalse
%<*example>
% \fi
-\begin{minted}{latex}
+\begin{minted}[numbersep=6pt]{latex}
\SetHooks{
refnumstyle=\normalfont,
initialrule=\rule{0.7in}{0.4pt}
@@ -4087,14 +4168,18 @@ argument of the
% instead of |\\|.
% \item |\\*| does the same as |\\| except that it prohibits a page
% break after the line.
-% \item |\\>| is for line breaks within a verse line.
+% \item |\\>| \label{ref:vlinebreak-indent}is for line breaks within a
+% verse line.
+% \item |\\+| \newfeature[v1.4] \label{ref:vlinebreak-noindent}does
+% the same as |\\>| but without indenting the subsequent line which
+% further complies to any already defined indent pattern.
% \end{enumerate}
%
% All of these commands can take a dimension as optional argument,
-% like so: |\\[30pt]|, |\\![30pt]|, |\\*[30pt]| or |\\>[30pt]|. If
-% |\\|, |\\!| or |\\*| be used, a vertical space of the dimension
-% specified is added between lines, whereas |\\>[...]| adds an
-% horizontal space after the line break.
+% like so: |\\[30pt]|, |\\![30pt]|, |\\*[30pt]|, |\\>[30pt]| or
+% |\\+[30pt]|. If |\\|, |\\!|, |\\*| or |\\+| be used, a vertical
+% space of the dimension specified is added between lines, whereas
+% |\\>[...]| adds an horizontal space after the line break.
%
% \DescribeMacro{\vin} \phts\label{ref:verse-vin}\cs{vin} indents a
% verse line by a length which is by default \unit[1.5]{em}. This
@@ -4716,6 +4801,16 @@ substantiall fewell,}
% verse printed in the margin. If used without value, this option is
% equivalent to |vmodulo=5|. |vmodulo=0| prevents the
% numbers from being printed.\\
+% \DescribeOption{vnumbrokenlines}
+% |vnumbrokenlines|$=$\verb+true|false+ %
+% \hfill\tcboxverb{Initially: false}\\
+% \newfeature[v1.4] This named argument does not need a value as it
+% defaults to |true| if used. |vnumbrokenlines| has both parts of lines
+% broken by |\\>| or |\\+|\footnote{See above
+% \vrefrange{ref:vlinebreak-indent}{ref:vlinebreak-noindent} for more
+% information.} numbered with the same number for disambiguation
+% purposes. By default, only the second part of broken lines is
+% numbered.\\
% \DescribeOption{vmargin} |vmargin|$=$\verb+right|left+
% \hfill\tcboxverb{Default: right}\\
% |vmargin| sets the margin in which the verse line numbers are to be
@@ -4726,13 +4821,13 @@ substantiall fewell,}
% numbered continuously, irrespective of whether they are lines of
% prose or poetry text.
%
-%
% \paragraph{Useful Lineation Commands}
% As implied above, pretty much all commands that are provided by the
% \enquote{running} mode of operation of the \pkg{lineno} package will
% work with \pkg{ekdosis}, notably the following:---\\
% \DescribeMacro{\modulolinenumbers} \cs{modulolinenumbers}\oarg{n}
-% can be used to enable modulo line numbering as described above.\\
+% can be used to enable or modify modulo line numbering as described
+% above.\\
% \DescribeMacro{\resetlinenumber} \cs{resetlinenumber}\oarg{n} resets
% the line number to one or to \emph{n} if specified.\\
% \DescribeMacro{\linenumberfont}
@@ -4750,15 +4845,16 @@ substantiall fewell,}
% global option |poetry=verse| as described above in
% \vref{sec:verse-package}, the commands dedicated to line numbering
% that are provided by the \pkg{verse} package can be used.\\
+% \DescribeMacro{\vmodulolinenumbers} \newfeature[v1.4]
+% \cs{vmodulolinenumbers}\oarg{n} can be used to enable or modify
+% verse modulo line numbering as described above.\\
% \DescribeMacro{\resetvlinenumber} \cs{resetvlinenumber}\oarg{n} has
% for lines of verse the same effect as \cs{resetlinenumber} for
% lines of prose text.\\
% \DescribeMacro{\verselinenumfont}
% \cs{verselinenumfont}\marg{commands} can be used to set the font
% used for lines of verse. By default, the definition is
-% |\normalfont\footnotesize|. \danger If the \cls{memoir} class be
-% loaded, this command is replaced with \cs{linenumberfont} described
-% above.\\
+% |\normalfont\footnotesize|.\\
% \DescribeMacro{\vrightskip} The \pkg{verse} package prints the
% numbers at the distance \cs{vrightskip} into the right margin. This
% distance can be redefined by means of \cs{setlength} like so:
@@ -7563,7 +7659,7 @@ Sample text with a \textcolor{red}{word} in red.
\newif\if@pkg@float
\newif\if@pkg@footins
\newif\if@pkg@keyfloat
-\newif\if@pkg@fitfloat
+\newif\if@pkg@fitapp
\newif\if@pkg@ekddivs
\newif\if@parnotesroman
\newif\if@pkg@parnotes
@@ -7573,7 +7669,7 @@ Sample text with a \textcolor{red}{word} in red.
choice layout = {float = {\@pkg@floattrue},
footins = {\@pkg@floatfalse\@pkg@footinstrue},
keyfloat = {\@pkg@floatfalse\@pkg@keyfloattrue},
- fitfloat = {\@pkg@floatfalse\@pkg@fitfloattrue}},
+ fitapp = {\@pkg@floatfalse\@pkg@fitapptrue}},
initial layout = float,
unknown-choice layout = \PackageError{ekdosis}{unknown
layout=#1}{`layout' must be either `float' or `footins'.},
@@ -7632,7 +7728,7 @@ Sample text with a \textcolor{red}{word} in red.
\keyparbox[!b]{#1}{\ekd@insert@apparatus}}}
\ekd@keyparopts{}
\fi
-\if@pkg@fitfloat
+\if@pkg@fitapp
\RequirePackage{tcolorbox}
\tcbuselibrary{fitting,skins}
\fi
@@ -7690,6 +7786,7 @@ Sample text with a \textcolor{red}{word} in red.
store appfontsize = \ekd@appfontsize,
store refnumstyle = \ekd@refnumstyle,
store postrefnum = \ekd@postrefnum,
+ code familysep = \luadirect{ekdosis.setfamilysep(\luastringN{#1})},
store lemmastyle = \ekd@lemmastyle,
store readingstyle = \ekd@readingstyle,
code keyparopts = \if@pkg@keyfloat\ekd@keyparopts{#1}\fi,
@@ -8008,6 +8105,7 @@ Sample text with a \textcolor{red}{word} in red.
nmeta norule = {rule=none},
code delim = \def\delim@val{\unexpanded{#1}},
store sep = \sep@val,
+ store subsep = \subsep@val,
store bhook = \bhook@val,
store ehook = \ehook@val,
store maxentries = \limit@val,
@@ -8042,6 +8140,7 @@ Sample text with a \textcolor{red}{word} in red.
\luastringO{\rule@val},
\luastringO{\delim@val},
\luastringO{\sep@val},
+ \luastringO{\subsep@val},
\luastringO{\bhook@val},
\luastringO{\ehook@val},
\luastringO{\limit@val},
@@ -8181,12 +8280,14 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\newif\ifrtl@app
\edef\ekdsep{] }
+\edef\ekdsubsep{}
\ekvdefinekeys{default@app}{
choice direction = {LR = \rtl@appfalse,
RL = \rtl@apptrue},
unknown-choice direction = \PackageError{ekdosis}{unknown
direction=#1}{`direction' must be either `LR' or `RL'.},
code sep = \edef\ekdsep{#1},
+ code subsep = \edef\ekdsubsep{#1},
store bhook = \ekd@begin@apparatus,
initial bhook = {},
store ehook = \ekd@end@apparatus,
@@ -8232,6 +8333,15 @@ Sample text with a \textcolor{red}{word} in red.
\NewDocumentCommand{\SetSeparator}{m}{\edef\ekdsep{#1}}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\SetSubseparator}
+% \changes{v1.4}{2021/11/21}{New command for subseparators}
+% \cs{SetSubseparator}\marg{sub-separator} allows to change the
+% \enquote{subseparator} between variant readings. By default,
+% no subseparator is set:---
+% \begin{macrocode}
+\NewDocumentCommand{\SetSubseparator}{m}{\edef\ekdsubsep{#1}}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\SetBeginApparatus}
% \cs{SetBeginApparatus}\marg{characters} can be used to append
% characters at the beginning of the apparatus block. By default,
@@ -8352,13 +8462,14 @@ Sample text with a \textcolor{red}{word} in red.
% either in the footnote floating block or in a float of its own,
% depending on the value set in the |layout| global option. As some
% commands need to know whether they are called from inside the
-% apparatus criticus, a conditional is first defined.
+% apparatus criticus, two conditionals are first defined.
% \begin{macrocode}
\newif\ifekd@inside@app
+\newif\ifekd@keepinapp
% \end{macrocode}
% Then \cs{ekd@fitapp} is defined for |layout=fitapp|:---
% \begin{macrocode}
-\if@pkg@fitfloat
+\if@pkg@fitapp
\newtcboxfit{\ekd@fitapp}{%
blankest,
fit basedim = \f@size pt,
@@ -8425,7 +8536,7 @@ Sample text with a \textcolor{red}{word} in red.
\if@pkg@keyfloat
\ekd@insert@keyparapp
\fi
- \if@pkg@fitfloat
+ \if@pkg@fitapp
\ekd@fitapp{\ekd@insert@apparatus}%
\fi
}
@@ -8521,6 +8632,7 @@ Sample text with a \textcolor{red}{word} in red.
\else\if@pkg@poetry@verse\poemlines{#1}\fi\fi,
initial vmodulo = 1,
default vmodulo = 5,
+ bool vnumbrokenlines = \ifnum@brokenline,
bool continuousvnum = \if@continuous@vnum,
choice numbers = {elided = \ekd@elidednumberstrue,
full = \ekd@elidednumbersfalse},
@@ -8552,6 +8664,22 @@ Sample text with a \textcolor{red}{word} in red.
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\vmodulolinenumbers}
+% \changes{v1.4}{2021/11/21}{New command to adjust modulo verse line
+% numbering}
+% \begin{macrocode}
+\NewDocumentCommand{\vmodulolinenumbers}{O{5}}{%
+ \ifekd@memoir@loaded
+ \linenumberfrequency{#1}%
+ \else
+ \if@pkg@poetry@verse
+ \poemlines{#1}%
+ \fi
+ \fi
+ \ignorespaces
+}
+% \end{macrocode}
+% \end{macro}
% Use |\normalfont| for line numbers:---
% \begin{macrocode}
\renewcommand\linenumberfont{\normalfont\footnotesize}
@@ -8593,6 +8721,19 @@ Sample text with a \textcolor{red}{word} in red.
\endgroup}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\ekdpage}
+% \changes{v1.4}{2021/11/21}{prints page marks used internally by
+% \textsf{ekdosis} to generate the apparatus blocks on pages}
+% Instead of absolute page numbers, \pkg{ekdosis} now marks the
+% entries of the apparatus with its own page numbering
+% scheme. \cs{ekdpage} can be used at any point of the document to
+% retrieve and print the current number.
+% \begin{macrocode}
+\NewDocumentCommand{\ekdpage}{}{%
+ \luadirect{tex.sprint(ekdosis.getekdabspg())}%
+}
+% \end{macrocode}
+% \end{macro}
% \cs{current@ref@arg} is used outside \cs{app} by \cs{note}. It takes
% two mandatory arguments: the beginning line label and the ending
% line label\---which are manually inserted---and returns the formatted
@@ -8817,6 +8958,9 @@ Sample text with a \textcolor{red}{word} in red.
code post = \def\ekdlr@post{#1},
code prewit = \def\ekdlr@prewit{#1},
code postwit = \def\ekdlr@postwit{#1},
+ store subsep = \ekdr@subsep,
+ initial subsep = \ekdsubsep,
+ bool nosubsep = \ifekdr@nosubsep,
store type = \ekdlr@type,
bool nordg = \ifekdr@nordg
}
@@ -8987,8 +9131,11 @@ Sample text with a \textcolor{red}{word} in red.
% \cs{rdg}\oarg{options}\marg{variant reading} inserts \meta{variant
% reading} in the second part of the entry, after the lemma text and
% the separator, in the apparatus criticus. This command accepts the
-% optional key-value arguments defined above.
+% optional key-value arguments defined above. This command sets
+% \cs{ifekd@subsq@rdg} to true, which instructs \pkg{ekdosis} that
+% \enquote{subseparators} may be used for subsequent entries.
% \begin{macrocode}
+\newif\ifekd@subsq@rdg
\NewDocumentCommand{\rdg}{O{} m}{%
\bgroup%
\ekvset{rdg}{#1}%
@@ -9005,6 +9152,9 @@ Sample text with a \textcolor{red}{word} in red.
\else%
\ifbool{al@rlmode}{%
\edef\rdg@app{%
+ \ifekd@subsq@rdg
+ \unless\ifekdr@nosubsep\unexpanded\expandafter{\ekdr@subsep}\fi
+ \fi
\ifdefined\ekdlr@alt%
\ifdefined\ekdlr@post%
\space\unexpanded\expandafter{\ekdlr@post}\space\else\fi
@@ -9031,6 +9181,9 @@ Sample text with a \textcolor{red}{word} in red.
}%
{%
\edef\rdg@app{%
+ \ifekd@subsq@rdg
+ \unless\ifekdr@nosubsep\unexpanded\expandafter{\ekdr@subsep}\fi
+ \fi
\ifdefined\ekdlr@alt%
\ifdefined\ekdlr@pre%
\space\unexpanded\expandafter{\ekdlr@pre}\space\else\fi
@@ -9061,13 +9214,14 @@ Sample text with a \textcolor{red}{word} in red.
\space\unexpanded\expandafter{\ekdlr@postwit}\else\fi
}%
}%
- \ifekd@mapps%
+ \ifekd@mapps
\append@app[\ekdan@type]{\rdg@app}%
- \else%
+ \else
\append@app{\rdg@app}%
- \fi%
- \fi%
- \egroup%
+ \fi
+ \fi
+ \egroup
+ \ekd@subsq@rdgtrue
}
% \end{macrocode}
% \end{macro}
@@ -9177,7 +9331,9 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\ekvdefinekeys{ekd@note}{
store pre = \pre@value,
- store post = \post@value
+ store post = \post@value,
+ nmeta sep = {post=\ekdsep},
+ nmeta subsep = {pre=\ekdsubsep}
}
% \end{macrocode}
% The following three commands, \cs{note@app}, \cs{ekd@note} and
@@ -9276,7 +9432,8 @@ Sample text with a \textcolor{red}{word} in red.
initial delend = \ifbool{al@rlmode}{\{}{\}},
initial sicbegin = \dag,
initial sicend = \dag,
- initial gapmark = ***
+ initial gapmark = ***,
+ bool keepinapp = \ifekd@keepinapp
}
% \end{macrocode}
% \begin{macro}{\supplied}
@@ -9286,9 +9443,13 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\NewDocumentCommand{\supplied}{m}{%
\ifekd@inside@app
- #1%
+ \ifekd@keepinapp
+ \suppb@value #1\suppe@value
+ \else
+ #1%
+ \fi
\else
- \suppb@value #1\suppe@value
+ \suppb@value #1\suppe@value
\fi
}
% \end{macrocode}
@@ -9302,9 +9463,13 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\NewDocumentCommand{\surplus}{m}{%
\ifekd@inside@app
- #1%
+ \ifekd@keepinapp
+ \delb@value #1\dele@value
+ \else
+ #1%
+ \fi
\else
- \delb@value #1\dele@value
+ \delb@value #1\dele@value
\fi
}
% \end{macrocode}
@@ -9319,11 +9484,17 @@ Sample text with a \textcolor{red}{word} in red.
% \begin{macrocode}
\NewDocumentCommand{\sic}{s m}{%
\ifekd@inside@app
- #2%
+ \ifekd@keepinapp
+ \IfBooleanTF{#1}
+ {\sicb@value #2}
+ {\sicb@value #2\sice@value}%
+ \else
+ #2%
+ \fi
\else
- \IfBooleanTF{#1}
- {\sicb@value #2}
- {\sicb@value #2\sice@value}%
+ \IfBooleanTF{#1}
+ {\sicb@value #2}
+ {\sicb@value #2\sice@value}%
\fi
}
% \end{macrocode}
@@ -9767,6 +9938,35 @@ Sample text with a \textcolor{red}{word} in red.
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\\+}
+% \changes{v1.4}{2021/11/21}{New macro for poetry}
+% |\\+| comes in addition to the verse commands that are provided by
+% the \pkg{verse} package. |\\+| causes a linebreak within a verse
+% line. In contrast to |\\>|, the subsequent line is not indented and
+% complies to any already defined indent pattern. \cs{@vscentercr}
+% must be redefined accordingly.
+% \begin{macrocode}
+\ifboolexpr{bool {@pkg@poetry@verse} or bool {ekd@memoir@loaded}}
+ {\newcommand{\@vsifplus}[1]{\@ifnextchar +{\@firstoftwo{#1}}}
+ \renewcommand{\@vscentercr}{%
+ \ifhmode \unskip\else \@nolnerr\fi
+ \@vsifgt{\ifnum@brokenline\@vstypelinenum\fi\verselinebreak}{%
+ \@vsifplus{\ifnum@brokenline\@vstypelinenum\fi\stepcounter{vslineno}%
+ \par\@ifstar{\nobreak\@vsxcentercr}{%
+ \@vsifbang{\@ifnextchar[ {\@vsicentercr}{}}{\@vsxcentercr}%
+ }%
+ }{%
+ \@vstypelinenum
+ \incr@vsline%
+ \par\@ifstar{\nobreak\@vsxcentercr}{%
+ \@vsifbang{\@ifnextchar[ {\@vsicentercr}{}}{\@vsxcentercr}%
+ }%
+ }%
+ }%
+ }
+ }{}
+% \end{macrocode}
+% \end{macro}
% A small patch is applied to the \pkg{verse} package, then
% \env{ekdverse} is defined:---
% \begin{macrocode}
@@ -9781,7 +9981,8 @@ Sample text with a \textcolor{red}{word} in red.
code type = \def\type@value{#1},
}
\ifekd@memoir@loaded
- \linenumberfont{\normalfont\footnotesize}
+ \def\vlvnumfont{\normalfont\footnotesize}
+ \def\verselinenumfont#1{\def\vlvnumfont{#1}}
\else
\verselinenumfont{\normalfont\footnotesize}
\fi
@@ -9927,7 +10128,7 @@ local inanchor = lpeg.Cs{ "<anchor" * ((1 - (lpeg.P"<" + lpeg.P">")) + lpeg.V(1)
local inopeningnote = lpeg.Cs{ "<note" * ((1 - (lpeg.P"<" + lpeg.P">")) + lpeg.V(1))^0 * ">" }
local lnbrk = lpeg.Cs("\\\\")
local poemline = lpeg.Cs(lnbrk * spcenc^-1 * lpeg.S("*!")^-1 * bsqbrackets^-1 * spcenc^-1)
-local poemlinebreak = lpeg.Cs(lnbrk * spcenc^-1 * lpeg.P("&gt;") * bsqbrackets^-1 * spcenc^-1)
+local poemlinebreak = lpeg.Cs(lnbrk * spcenc^-1 * (lpeg.P("&gt;") + lpeg.P("+")) * bsqbrackets^-1 * spcenc^-1)
local linegroup = lpeg.Cs{ "<lg" * ((1 - lpeg.S"<>") + lpeg.V(1))^0 * ">" }
local bclinegroup = lpeg.Cs(linegroup + lpeg.P("</lg>"))
local endpoem = lpeg.Cs(lnbrk * lpeg.S("*!") * bsqbrackets^-1) -- not used
@@ -10227,6 +10428,18 @@ function ekdosis.newsource(id, siglum)
return true
end
+local familysep = nil
+
+function ekdosis.setfamilysep(str)
+ if str == "reset"
+ then
+ familysep = nil
+ else
+ familysep = str
+ end
+ return true
+end
+
function ekdosis.getsiglum(str, opt)
str = str..","
str = string.gsub(str, "%s-(%,)", "%1")
@@ -10250,6 +10463,10 @@ function ekdosis.getsiglum(str, opt)
str = string.gsub(str, tempc.."%,", idsRend[i].abbr)
ctrl = string.gsub(ctrl, tempc.."%,", "")
end
+ if familysep ~= nil
+ then
+ str = string.gsub(str, "%s+", familysep)
+ end
end
-- if string.find(ctrl, "[A-Za-z0-9]")
if string.find(ctrl, "%S")
@@ -10289,6 +10506,10 @@ local cmdtotags = {
local texpatttotags = {
{a="\\addentries%s+%[(.-)%]{(.-)}", b=""},
{a="\\addentries%s+{(.-)}", b=""},
+ {a="\\vmodulolinenumbers%s+%[(.-)%]", b=""},
+ {a="\\vmodulolinenumbers%s+", b=""},
+ {a="\\modulolinenumbers%s+%[(.-)%]", b=""},
+ {a="\\modulolinenumbers%s+", b=""},
{a="\\setverselinenums%s+{(.-)}{(.-)}", b=""},
{a="\\resetvlinenumber%s+%[(.-)%]", b=""},
{a="\\resetvlinenumber%s+", b=""},
@@ -10630,6 +10851,9 @@ local function versetotei(str)
end)
str = string.gsub(str, "\\begin%s?%{ekdverse%}(.-)\\end%s?%{ekdverse%}", function(arg)
arg = string.gsub(arg, "\\par%s?", "")
+ arg = string.gsub(arg, "\\begin%s?%{patverse%*?%}", "")
+ arg = string.gsub(arg, "\\end%s?%{patverse%*?%}", "")
+ arg = string.gsub(arg, "\\indentpattern%s?%b{}", "")
return "\\p@rb "..linestotei(string.format("<lg>%s</lg>", arg)).."\\p@ra "
end)
str = string.gsub(str, "\\begin%s?%{verse%}%b[](.-)\\end%s?%{verse%}", function(arg)
@@ -11546,6 +11770,7 @@ function ekdosis.closestream()
end
local cur_abs_pg = 0
+local ekd_abs_pg = 0
local pg_i = nil
local pg_ii = nil
local prevcol = nil
@@ -11559,16 +11784,25 @@ function ekdosis.update_abspg(n) -- not used
end
function ekdosis.storeabspg(n, pg)
+ if tonumber(n) > tonumber(cur_abs_pg)
+ then
+ ekd_abs_pg = ekd_abs_pg + 1
+ end
+ cur_abs_pg = n
+ n = ekd_abs_pg
if pg == "pg_i" then
pg_i = n
elseif pg == "pg_ii" then
pg_ii = n
table.insert(check_resetlineno, curcol.."-"..pg_ii)
end
- cur_abs_pg = n
return true
end
+function ekdosis.getekdabspg()
+ return ekd_abs_pg
+end
+
function ekdosis.checkresetlineno()
if isfound(check_resetlineno, curcol.."-"..pg_i)
then
@@ -11806,6 +12040,7 @@ function ekdosis.newapparatus(teitype,
apprule,
appdelim,
appsep,
+ appsubsep,
appbhook,
appehook,
applimit,
@@ -11822,6 +12057,7 @@ function ekdosis.newapparatus(teitype,
rule = apprule,
delim = appdelim,
sep = appsep,
+ subsep = appsubsep,
bhook = appbhook,
ehook = appehook,
limit = applimit,
@@ -11922,8 +12158,8 @@ function ekdosis.appin(str, teitype)
local f = io.open(tex.jobname.."_tmp.ekd", "a+")
if next(apparatuses) == nil
then
- f:write("<", cur_abs_pg, cur_alignment, curcol, "-0>", str, "</",
- cur_abs_pg, cur_alignment, curcol, "-0>\n")
+ f:write("<", ekd_abs_pg, cur_alignment, curcol, "-0>", str, "</",
+ ekd_abs_pg, cur_alignment, curcol, "-0>\n")
else
for i = 1,#apparatuses
do
@@ -11932,8 +12168,8 @@ function ekdosis.appin(str, teitype)
break
end
end
- f:write("<", cur_abs_pg, cur_alignment, curcol, "-",
- appno, ">", str, "</", cur_abs_pg, cur_alignment, curcol, "-", appno, ">\n")
+ f:write("<", ekd_abs_pg, cur_alignment, curcol, "-",
+ appno, ">", str, "</", ekd_abs_pg, cur_alignment, curcol, "-", appno, ">\n")
end
f:close()
return true
@@ -11951,10 +12187,10 @@ function ekdosis.appout()
table.insert(output, "\\csname ekd@begin@apparatus\\endcsname\\ignorespaces")
-- table.insert(output, "\\noindent ")
for i in string.gmatch(t,
- "<"..cur_abs_pg
+ "<"..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-0>.-</"
- ..cur_abs_pg
+ ..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-0>")
do
@@ -11966,10 +12202,10 @@ function ekdosis.appout()
local n = 1
while apparatuses[n]
do
- if string.match(t, "<"..cur_abs_pg
+ if string.match(t, "<"..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-"..n..">.-</"
- ..cur_abs_pg
+ ..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-"..n..">")
then
@@ -12026,6 +12262,10 @@ function ekdosis.appout()
table.insert(output, "\\edef\\ekdsep{" .. apparatuses[n].sep .. "}")
else
end
+ if apparatuses[n].subsep ~= ""
+ then
+ table.insert(output, "\\edef\\ekdsubsep{" .. apparatuses[n].subsep .. "}")
+ end
if apparatuses[n].bhook ~= ""
then
table.insert(output, apparatuses[n].bhook)
@@ -12033,10 +12273,10 @@ function ekdosis.appout()
table.insert(output, "\\relax")
end
for i in string.gmatch(t,
- "<"..cur_abs_pg
+ "<"..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-"..n..">.-</"
- ..cur_abs_pg
+ ..ekd_abs_pg
..cur_alignment_patt
..curcol.."%-"..n..">")
do
@@ -12056,8 +12296,8 @@ function ekdosis.appout()
end
f:close()
str = table.concat(output)
- str = string.gsub(str, "</"..cur_abs_pg..cur_alignment_patt..curcol.."%-[0-9]>", "")
- str = string.gsub(str, "<"..cur_abs_pg..cur_alignment_patt..curcol.."%-[0-9]>", " ")
+ str = string.gsub(str, "</"..ekd_abs_pg..cur_alignment_patt..curcol.."%-[0-9]>", "")
+ str = string.gsub(str, "<"..ekd_abs_pg..cur_alignment_patt..curcol.."%-[0-9]>", " ")
return str
else
end
@@ -12077,7 +12317,7 @@ end
local curcol_curabspg = {}
function ekdosis.testapparatus()
- if isfound(curcol_curabspg, curcol.."-"..cur_abs_pg)
+ if isfound(curcol_curabspg, curcol.."-"..ekd_abs_pg)
then
if newalignment
then
@@ -12090,7 +12330,7 @@ function ekdosis.testapparatus()
return "\\boolfalse{do@app}"
end
else
- table.insert(curcol_curabspg, curcol.."-"..cur_abs_pg)
+ table.insert(curcol_curabspg, curcol.."-"..ekd_abs_pg)
if next(apparatuses) ~= nil then
reset_bagunits()
end
diff --git a/macros/luatex/latex/ekdosis/ekdosis.el b/macros/luatex/latex/ekdosis/ekdosis.el
index 845c004aef..bac25500a3 100644
--- a/macros/luatex/latex/ekdosis/ekdosis.el
+++ b/macros/luatex/latex/ekdosis/ekdosis.el
@@ -105,6 +105,8 @@
("post")
("prewit")
("postwit")
+ ("subsep")
+ ("nosubsep")
("type")
("nordg" ("true" "false")))
"Local options for rdg macro.")
@@ -116,6 +118,7 @@
("labele")
("sep")
("nosep")
+ ("subsep")
("num")
("nonum")
("pre")
@@ -138,7 +141,8 @@
("delend")
("sicbegin")
("sicend")
- ("gapmark"))
+ ("gapmark")
+ ("keepinapp"))
"List of local options for setcritsymbols macro.")
(defvar LaTeX-ekdosis-sethooks-options
@@ -147,6 +151,7 @@
("postrefnum")
("lemmastyle")
("readingstyle")
+ ("familysep")
("initialrule")
("noinitialrule")
("keyparopts")
@@ -164,6 +169,7 @@
(defvar LaTeX-ekdosis-setapparatus-options
'(("direction" ("LR" "RL"))
("sep")
+ ("subsep")
("delim")
("bhook")
("ehook")
@@ -176,6 +182,7 @@
(defvar LaTeX-ekdosis-declareapparatus-options
'(("direction" ("LR" "RL"))
("sep")
+ ("subsep")
("delim")
("bhook")
("ehook")
@@ -195,6 +202,7 @@
("numbers" ("elided" "full"))
("vlineation" ("page" "document"))
("vmodulo")
+ ("vnumbrokenlines" ("true" "false"))
("vmargin" ("right" "left"))
("continuousvnum"))
"List of local options for setlineation macro.")
@@ -329,6 +337,7 @@
'("SetLTRapp" 0)
'("SetRTLapp" 0)
'("SetSeparator" "separator" 0)
+ '("SetSubseparator" "subseparator" 0)
'("SetBeginApparatus" "chars|commands" 0)
'("SetEndApparatus" "chars" 0)
'("SetUnitDelimiter" "delimiter" 0)
@@ -338,6 +347,8 @@
'("SetApparatus" (TeX-arg-key-val LaTeX-ekdosis-setapparatus-options))
'("footnoteruletrue" 0)
'("footnoterulefalse" 0)
+ '("ekdsep" 0)
+ '("ekdsubsep" 0)
'("SetDefaultApparatus" "apparatus name" 0)
'("DeclareApparatus" "apparatus name"
[ TeX-arg-key-val LaTeX-ekdosis-declareapparatus-options ] 0)
@@ -347,6 +358,7 @@
'("innerlinenumbers" 0)
'("outerlinenumbers" 0)
'("modulolinenumbers" [ "number" ] )
+ '("vmodulolinenumbers" [ "number" ] )
'("resetlinenumber" [ "number" ] )
'("resetvlinenumber" [ "number" ] )
'("verselinenumfont" "commands" 0)
@@ -355,6 +367,7 @@
'("MkBodyDivs" "div1" "div2" "div3" "div4" "div5" "div6" 0)
'("ekddiv" (LaTeX-ekdosis-long-key-val LaTeX-ekdosis-ekddiv-options))
'("FormatDiv" "number" "code before" "code after" 0)
+ '("ekdpage" 0)
'("ekdmark" 0)
'("endmark" 0)
'("ekdprintmark"
diff --git a/macros/luatex/latex/ekdosis/ekdosis.pdf b/macros/luatex/latex/ekdosis/ekdosis.pdf
index de40fcdb68..c0f4350236 100644
--- a/macros/luatex/latex/ekdosis/ekdosis.pdf
+++ b/macros/luatex/latex/ekdosis/ekdosis.pdf
Binary files differ
diff --git a/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf b/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
index 1ca0224762..9162af6e64 100644
--- a/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
+++ b/macros/luatex/latex/ekdosis/samples/Caesar_BG-6-13-1.pdf
Binary files differ
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 6a53f48d2f..1a0fda7884 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,8 @@
+2021-11-19 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-mathjax.tex (mathjax-latex-4ht.4ht): use LaTeX 3 commands in
+ \VerbMath, this enables us to remove dependency on external packages.
+
2021-11-09 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html4.tex (html4.4ht): added CSS declaration that enables table row
diff --git a/support/TeX4ht/source/tex4ht-mathjax.tex b/support/TeX4ht/source/tex4ht-mathjax.tex
index 9bad3b45f8..cb7559b255 100644
--- a/support/TeX4ht/source/tex4ht-mathjax.tex
+++ b/support/TeX4ht/source/tex4ht-mathjax.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-mathjax.tex 979 2021-09-14 17:59:36Z michal_h21 $
+% $Id: tex4ht-mathjax.tex 1012 2021-11-19 09:35:54Z michal_h21 $
% compile: latex tex4ht-mathjax
%
% Copyright 2018-2021 TeX Users Group
@@ -29,8 +29,10 @@
\endinput
>>>
+We don't require additional packages anymore, as everything necessary is included
+in LaTeX kernel now.
+% \RequirePackage{etoolbox,expl3,environ}
\<required packages\><<<
-\RequirePackage{etoolbox,expl3,environ}
>>>
The \verb|\alteqtoks| command saves the used command in HTML. It uses detokenize command
@@ -60,6 +62,8 @@ We still use regula expressions to escape invalid XML characters to entities, so
\regex_replace_all:nnN { \x{26} } { &amp; } \l_tmpa_tl
\regex_replace_all:nnN { \x{3C} } { &lt; } \l_tmpa_tl
\regex_replace_all:nnN { \x{3E} } { &gt; } \l_tmpa_tl
+ % replace \par command with blank lines
+ \regex_replace_all:nnN { \x{5C}par } {\x{A}\x{A}} \l_tmpa_tl
\tl_set:Nx \l_tmpb_tl{ \l_tmpa_tl }
\HCode{\l_tmpb_tl}
}
@@ -90,13 +94,21 @@ environments. They will then keep the LaTeX code unchanged.
#1
\end{#2}}%
}
+>>>
+
+The \verb|\VerbMath| command redefines environments to pass their content
+verbatim to the HTML output.
+
+\<defined commands\><<<
+\ExplSyntaxOn
\newcommand\VerbMath[1]{%
-\ifcsdef{#1}{%
- \RenewEnviron{#1}{%
- \NoFonts\expandafter\VerbMathToks\expandafter{\BODY}{#1}\EndNoFonts%
- }
-}{}%
+ \cs_if_exist:cTF{#1}{
+ \RenewDocumentEnvironment{#1}{+!b}{%
+ \NoFonts\expandafter\VerbMathToks\expandafter{##1}{#1}\EndNoFonts%
+ }{}
+ }{}%
}
+\ExplSyntaxOff
>>>
The \verb|\fixmathjaxtoc| command is used for patching commands which should
diff --git a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
index 5d414d716a..1414148455 100644
--- a/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
+++ b/systems/texlive/tlnet/tlpkg/installer/ctan-mirrors.pl
@@ -49,7 +49,6 @@ $mirrors = {
'Korea' => {
'http://ftp.ktug.org/tex-archive/' => 1,
'https://cran.asia/tex/' => 1,
- 'https://ftp.harukasan.org/CTAN/' => 1,
'https://ftp.kaist.ac.kr/pub/tex-archive/' => 1,
'https://mirror.kakao.com/CTAN/' => 1,
'https://mirror.navercorp.com/CTAN/' => 1,
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb b/systems/texlive/tlnet/tlpkg/texlive.tlpdb
index 8ffcdc3081..fee2997d2b 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/2021
-depend revision/61093
+depend revision/61101
name 00texlive.image
category TLCore
-revision 61078
+revision 61101
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
@@ -4481,7 +4481,7 @@ depend setting_available_architectures:aarch64-linux amd64-freebsd amd64-netbsd
name 00texlive.installer
category TLCore
-revision 61088
+revision 61095
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
@@ -97888,7 +97888,7 @@ catalogue-version 3.19.0
name dvipdfmx
category TLCore
-revision 59415
+revision 61101
shortdesc An extended version of dvipdfm
longdesc Dvipdfmx (formerly dvipdfm-cjk) is a development of dvipdfm
longdesc created to support multi-byte character encodings and large
@@ -97900,14 +97900,15 @@ longdesc features as does pdfTeX. The current version of the package is
longdesc no longer maintained on CTAN as a separate entity; development
longdesc now takes place within the TeX Live framework, and it is no
longdesc longer available as a separate package. For download, support,
-longdesc and other information, please see TeX Live.
+longdesc and other information, please see TeX Live. However, the
+longdesc information on this page is maintained and should be current.
depend dvipdfmx.ARCH
depend glyphlist
postaction script file=tlpkg/tlpostcode/dvipdfmx.pl
-containersize 27128
-containerchecksum 097c76748deacc9cf36f8611781385b578e3af0bdad801976b234deac1bb18cb9a5defab45333ba2761f0bda7184a8faeb79f2777b8c936c02e7764501185ffe
+containersize 26716
+containerchecksum 6dd78f4b5cabb51c3bd9988fa46bf90a5a79b3d3293257a4c563a8a76a5a03eb167ce3ec0d4ce6ed05412a551eb201f2379a50a97ac5355ebe833f7b34cee4b4
doccontainersize 3129328
-doccontainerchecksum f0f3f2978fb8b1176b89db7ad3cda63cd21e0ab46c8c19b76f82fd56a1f559a5379d558294e11fb1c75435031542058ef6d6a1b6f428092c07c15ce2fae768a4
+doccontainerchecksum 00dce9b36eefd1788bbe455b2e5104efd9afc8bd891aeafb2cd9bdee406eeb25ab520e42e614e9d2363eb6a7273232bc3c4805bacd82a22099c5ffc438e852cb
docfiles size=995
texmf-dist/doc/dvipdfm/Makefile
texmf-dist/doc/dvipdfm/dvipdfm.pdf
@@ -97955,7 +97956,7 @@ runfiles size=41
tlpkg/tlpostcode/dvipdfmx.pl
catalogue-alias xdvipdfmx
catalogue-contact-bugs https://lists.tug.org/dvipdfmx
-catalogue-contact-home http://project.ktug.or.kr/dvipdfmx/
+catalogue-contact-home https://tug.org/dvipdfmx/
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/dvipdfm-x/
catalogue-contact-support https://lists.tug.org/dvipdfmx
catalogue-license gpl
@@ -99430,25 +99431,25 @@ catalogue-topics notes editorial
name easybook
category Package
-revision 61085
+revision 61098
shortdesc Typeset Chinese theses or books
relocated 1
longdesc Easybook is a minimalist style template based on the ctexbook
longdesc book document class.
-containersize 17552
-containerchecksum 1918f27cc62ab7446b6e5dfea6cde6d55f17345e35295321b573710eb35246171d0f3eaafa245d29ef5455ca716d739a7ca90c3111392a8c05183865cf6b5f42
-doccontainersize 602076
-doccontainerchecksum 738ff5e026cddcfc0874098118a28435773f0bf1b347a7c42d1beec85325912fd37261d3ad1d9c188a2e4cd108f378d9b2ec599a707d954ccba19a78000c56c1
+containersize 17600
+containerchecksum db7e942f14ceaf9022743c1b9d1d753ae70bc19abf9067028cc928c75e7ccbce5ecce512d4d8965b48dba7ba89a8194bf7fadcb2f9c91cb6f76ed9b3dfb3275f
+doccontainersize 601748
+doccontainerchecksum b6512ffce2b0b7e8c1f913359c1c65c973f9d96f6a4b9fe7dbbcbb81fac7409183fab2edda706e9c662cbe96cef8c534903b4b60f4f0b4c920b20db3df12a20f
docfiles size=163
RELOC/doc/latex/easybook/README.md details="Readme"
RELOC/doc/latex/easybook/easybook.pdf details="Package documentation" language="zh"
RELOC/doc/latex/easybook/easybook.tex
-srccontainersize 17596
-srccontainerchecksum 8a99ad3f4304b7909c9bfaeeeb0390fb235b94d77c8a548195bd5b981f5ba1f306c1efa55608e693c91b76f401dece03363760010fe68f111f8a9b9094529193
+srccontainersize 17668
+srccontainerchecksum 9a5e06d081c13514200309853aeeb639124f042bd0b4daf7f71df1768b27f34e89886dc227901d938423198a23a9a9dc2e0ad412fb4288cfabd0a0c5e0cf77c4
srcfiles size=21
RELOC/source/latex/easybook/easybook.dtx
RELOC/source/latex/easybook/easybook.ins
-runfiles size=22
+runfiles size=21
RELOC/tex/latex/easybook/easybase.sty
RELOC/tex/latex/easybook/easybook.cls
RELOC/tex/latex/easybook/eb-tcolorbox.cfg
@@ -99457,7 +99458,7 @@ catalogue-contact-repository https://gitee.com/texl3/easybook
catalogue-ctan /macros/latex/contrib/easybook
catalogue-license lppl1.3c
catalogue-topics book-pub class chinese expl3
-catalogue-version 1.40R
+catalogue-version 1.40T
name easyfig
category Package
@@ -113498,7 +113499,7 @@ catalogue-version 1.8
name fancyvrb
category Package
-revision 60769
+revision 61099
shortdesc Sophisticated verbatim text
relocated 1
longdesc Flexible handling of verbatim text including: verbatim commands
@@ -113507,11 +113508,11 @@ longdesc parameters; ability to define new customized verbatim
longdesc environments; save and restore verbatim text and environments;
longdesc write and read files in verbatim mode; build "example"
longdesc environments (showing both result and verbatim source).
-containersize 11808
-containerchecksum b065e3aa51c602048c2d8e867777deb5b7424edc3104bf08a2f7c28c2eaa232464e5a2a26bdc2c0b79fa0f02c3cfab0a58e2cd3a0bf7db3412bff92e82fa5e36
-doccontainersize 148348
-doccontainerchecksum 88f77af2cc1cdf572130f82bf1c5e9c4c99b307f0b91f6ad19771cc19c2a6400212872b4974ead4dba2adc29547732ba18925f0017957b49ec326de2e067e92f
-docfiles size=47
+containersize 11868
+containerchecksum f28d42f5a84cfd05c24f869cde508a141d35172b68861fb684a7123b26a8dc4276c8f52bac439c2363b34dd48e57cafab3f28a4a54fb6b196bbab2e88efc674a
+doccontainersize 149292
+doccontainerchecksum fa528cea4d78188d1ee86eef9efc9be8a1d4fa09a4eb73843ebd5241f3bd5ba11e2f05a23e63315160cbb839a2e7df64dbd9968ddf312f6eb02302edf34d3de5
+docfiles size=48
RELOC/doc/latex/fancyvrb/Changes
RELOC/doc/latex/fancyvrb/README details="Readme"
RELOC/doc/latex/fancyvrb/fancyvrb-doc.pdf details="Package documentation"
@@ -113524,7 +113525,7 @@ runfiles size=17
catalogue-ctan /macros/latex/contrib/fancyvrb
catalogue-license lppl1.3
catalogue-topics verbatim macro-demo
-catalogue-version 3.9
+catalogue-version 4.0
name fandol
category Package
@@ -183906,17 +183907,17 @@ catalogue-topics tut-latex bulgarian
name lshort-chinese
category Package
-revision 56036
+revision 61100
catalogue lshort-zh-cn
shortdesc Introduction to LaTeX, in Chinese
relocated 1
longdesc A Chinese edition of the not so short introduction to LaTeX2e,
longdesc with additional information of typesetting Chinese language.
containersize 472
-containerchecksum f78920a3adac063cddd42284e325308cd124d5e0f2f1ca6f92111edec872ad1325b99331615c8643dbc11ec1165ed0b0320c9a8b1e3eda0dabfcf496ae0d47c2
-doccontainersize 1539324
-doccontainerchecksum 0f8950630220afd353d05b2f4d146ded4eb24fc163f19510a3d57ea680fd06a1dff064c35a0afb8625b32741d1ab6543cde20d5269a0914e0dcff7c42bfca327
-docfiles size=455
+containerchecksum 5e87a1c613e57157c77a9401cda424ba0544b1cfd1611e0f763b837ebd172947365a04f8734b2e7d41f84df9ca28500034b3b8f96dbc4d2f8bee59c1f0813938
+doccontainersize 1561100
+doccontainerchecksum ea00f428f8e93067a876de16cc7f8fe09f46398a209f4ec7664f83f605e674558703f05cb4ebb655a29affb3af26615731a284894d37778a5f7fad531fe2bad1
+docfiles size=460
RELOC/doc/latex/lshort-chinese/README-zh.md details="Readme (Chinese)" language="zh"
RELOC/doc/latex/lshort-chinese/README.md details="Readme"
RELOC/doc/latex/lshort-chinese/lshort-zh-cn.pdf details="The document itself" language="zh"
@@ -183949,7 +183950,7 @@ catalogue-contact-repository https://github.com/CTeX-org/lshort-zh-cn
catalogue-ctan /info/lshort/chinese
catalogue-license fdl
catalogue-topics tut-latex chinese-doc
-catalogue-version 6.02
+catalogue-version 6.03
name lshort-czech
category Package
@@ -286935,7 +286936,7 @@ binfiles arch=x86_64-solaris size=1
name tex4ht
category Package
-revision 61013
+revision 61097
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
@@ -286956,10 +286957,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 920804
-containerchecksum cc5f4b54ee89473e93c2139bd1bca229536e071320c5ebc25f54d4e5871abec432e6719efae62bd068379b25e5e7b70799b459409c64daf5b8372ec77e91ced1
+containersize 920796
+containerchecksum aa07c83554ed4c0bb397c813c75ebe2e0dd495d36d254ffe5c05ceb31c764e648a8e7db4cf1adac475416cdf09b74bb43875b88e9163f8070e7b7d9bf3fc59f7
doccontainersize 136384
-doccontainerchecksum 55965d08bdb765be20c5943dee2d4c0ee17af3f29e6dafccdac775a083f76c97b13cceccada47b7c6fd627f03c8f715e7e37a0bb3f148e34767465bbcc8fe507
+doccontainerchecksum 23672166e22cdf9071b26101e19ff14374a06895d6b18597f73262e65b09cfbe8b0f9eddb388d2f6100e71e1f2b642af8109aec3427743170f23a419831c0b09
docfiles size=260
texmf-dist/doc/generic/tex4ht/Makefile
texmf-dist/doc/generic/tex4ht/README details="Readme"
@@ -287031,8 +287032,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 1225260
-srccontainerchecksum 82a0756c566b17cb69c909fd53cb20199ceeb3c2ac9099d6d017e04b6efe63a6e9cc3e0087ad7e657b58eeb66d108f47783ef4ca2e003bcd7a1817ee1434667f
+srccontainersize 1225152
+srccontainerchecksum 362a7d118529a4724b0badec8b19d7f42323a92ec48300ff77101599871c53e67f6c0448c5591ac63b8a06dcba10c5e4959d8b169b6f5973be03cf72edc44e99
srcfiles size=3722
texmf-dist/source/generic/tex4ht/ChangeLog
texmf-dist/source/generic/tex4ht/Makefile
@@ -296862,7 +296863,7 @@ docfiles size=376
name texlive-scripts
category TLCore
-revision 61088
+revision 61095
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.
@@ -296870,10 +296871,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 108308
-containerchecksum 1b6b4c70f479335cb3fad52403a452661b5f2d806e49895c651f3c93ba4ba5cd8a07445bf04b417961ab0e76a99a69aa1cf8209a1745535337321ab723c99967
+containersize 108300
+containerchecksum 180164a16ea9f7a9a3aca9582d17c300daefe58a0c6908011deffea3fd5bcd5b183e596fb000f1c2ade92f6a9064a3b93a594f3c0a0a58d4af57f607e794a9bb
doccontainersize 401264
-doccontainerchecksum 16dd73bfaa36735e8e73fde2ea9fb2bf44b4475970dc78b43b6748e7b374c56afcd349d808a3eeed7757959cf7cbced928388246199c8f563cb9ce625cddceb1
+doccontainerchecksum 425f14a041f8f8868c3dea4b714dc49e6c682da4ede093e0118cc733e6da190c8410b79ba01c12ba237b37e86490c6d479fac2b1a8805cec44c4151106480da1
docfiles size=497
doc.html
texmf-dist/doc/man/man1/fmtutil-sys.1
@@ -296956,16 +296957,16 @@ runfiles size=157
name texlive-scripts-extra
category TLCore
-revision 54744
+revision 61101
shortdesc TeX Live scripts
longdesc Miscellaneous scripts maintained as part of TeX Live, but not
longdesc important for the infrastructure. Thus, this is not part of
longdesc scheme-infraonly or tlcritical, just a normal package.
depend texlive-scripts-extra.ARCH
containersize 23540
-containerchecksum e46691aa10b961d2359359fdf00ebc86a1b881b3d1126c52f3863343d21eba00110cd9500fb03a4a9544a3d8fb443bbdc90aa2f6216b8e62a3edb0acc58e4c75
+containerchecksum af3078fa1914b69fe66374489f117201dc7aeaadb839656892970865afce2e2cefe8d6e04f28447036fca73aabc61e7536da915a05ef798cb6980de2a82794a5
doccontainersize 195144
-doccontainerchecksum 56f9be73e3318ea684c536b90645b572caf437b16339104bcedfb7517c94745a514a8e185033c2338aeccae868a123a5a137b9b07b20d661fa473bde2c28797b
+doccontainerchecksum 275d9ee5d858fad06d63d3cd9b1a4c1c9b8d26a312544fbb3346bb9eb337436a74ebe3bd9ca23dbaa51c582d7d8d0825c8965c6e497a206b63b66abc49e509ba
docfiles size=107
texmf-dist/doc/man/man1/allcm.1
texmf-dist/doc/man/man1/allcm.man1.pdf
@@ -333600,7 +333601,7 @@ catalogue-version 2.1
name xetex
category TLCore
-revision 57972
+revision 61101
shortdesc An extended variant of TeX for use with Unicode sources
longdesc XeTeX is a TeX typesetting engine using Unicode and supporting
longdesc modern font technologies such as OpenType, TrueType or Apple
@@ -333638,28 +333639,34 @@ depend xetexconfig
execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=atbegshi,atveryend,babel,cm,everyshi,firstaid,hyphen-base,l3backend,l3kernel,l3packages,latex,latex-fonts,tex-ini-files,unicode-data,lm
execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex xetex.ini" fmttriggers=cm,hyphen-base,tex-ini-files,unicode-data,etex,plain
postaction script file=tlpkg/tlpostcode/xetex.pl
-containersize 6988
-containerchecksum dd788efc6e03e11e2dd88d8e63ca2153e936194391d49ce422a757ba1937986cb80faafa71860bf55ef5cbab51b53cd0c85c60dadddd92940802ede301cdefd6
-doccontainersize 616820
-doccontainerchecksum 544a36d94bf2094403806d934a7e0d92062c1b5b1d0efbf4316d9319a1ff95a1d8f7a4a961c63e4a3eb66c9c4a24789e239f958132e5a4f08c3764f44772c8aa
-docfiles size=170
+containersize 7760
+containerchecksum 20209bb62beef1eb8c3680c3400afbe18bbd1c2e61a575452ecb208c7b5924f811f5bc06ddf038b8f6e57446cb861ed772dc945679d6cb5464216a6ee5a7f510
+doccontainersize 633108
+doccontainerchecksum fff245a7455659918105c53981be066a77993a411f082ac161119c3848a46826441643ecfe84d91b27e806154d9ac1dad4cb71ceeb1498e7964ac9e0d13d5859
+docfiles size=182
+ texmf-dist/doc/man/man1/xelatex-unsafe.1
+ texmf-dist/doc/man/man1/xelatex-unsafe.man1.pdf
texmf-dist/doc/man/man1/xelatex.1
texmf-dist/doc/man/man1/xelatex.man1.pdf
+ texmf-dist/doc/man/man1/xetex-unsafe.1
+ texmf-dist/doc/man/man1/xetex-unsafe.man1.pdf
texmf-dist/doc/man/man1/xetex.1
texmf-dist/doc/man/man1/xetex.man1.pdf
texmf-dist/doc/xetex/base/NEWS
texmf-dist/doc/xetex/base/README
texmf-dist/doc/xetex/base/XeTeX-notes.pdf details="About XeTeX"
texmf-dist/doc/xetex/base/XeTeX-notes.tex
-runfiles size=6
+runfiles size=8
texmf-dist/fonts/misc/xetex/fontmapping/base/qx-unicode.map
texmf-dist/fonts/misc/xetex/fontmapping/base/qx-unicode.tec
texmf-dist/fonts/misc/xetex/fontmapping/base/tex-text.map
texmf-dist/fonts/misc/xetex/fontmapping/base/tex-text.tec
+ texmf-dist/scripts/texlive-extra/xelatex-unsafe.sh
+ texmf-dist/scripts/texlive-extra/xetex-unsafe.sh
tlpkg/tlpostcode/xetex.pl
catalogue-also luatex
catalogue-contact-announce https://lists.tug.org/xetex-announce
-catalogue-contact-home http://tug.org/xetex
+catalogue-contact-home https://tug.org/xetex
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/xetexdir
catalogue-contact-support https://lists.tug.org/xetex
catalogue-license other-free
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
index 84b9fe7b31..a550f7cd3a 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.md5
@@ -1 +1 @@
-8980bc28a17fb088727ec0e2928c7f81 texlive.tlpdb
+f8f51e97fcaaf58dc3d73a3b03ec34ab texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512 b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
index 12189ce7e6..5acfe6278c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512
@@ -1 +1 @@
-d0badf9c7432c4b419e65c6951ca1023754cf01fff7fd2f7ce6163d5d41eec57aa61dbfd486ae15218857378d72656fdd4a2b859e5a1e953fb3c424b512878a6 texlive.tlpdb
+c18934648b48733e1965b0035aa67e6ca445d908e3759398fcd198c25589003ebb41f0d7637264ebc4cc78169a3765847da3ffcd2831cdebcd2ce635e6ff0aa6 texlive.tlpdb
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.sha512.asc
index 15ee43e38b..8440ee9b02 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-----
-iQEcBAEBCgAGBQJhmEbsAAoJEEzhh34ZQ4xwLVcH/2LPWLhtWTbNGUZ21/07CDA2
-ZosqKW9CWa7jdOw2DxHCiA/uLktwt6HzpzKziKDWt4RvXSyr14O1gUCJDgsEyG3e
-5KfP449ByDZb4ApPnQAsaibaMKifEqid0JbUi2S4kKgb456G4HYMl8a3spG3ohIW
-spR92pXn/sgh7fAajHRxRkEGm//RwPa2ddavu7oPYF0bM1khr7Aoj8FzTzo/I9zy
-AgpfxXUNPGuaakG5sL5rKPNJVbCHGscA6TYDNwEmG57v75DVkei7ye//ksBBnwUn
-8hd/r10vr5CIg8AaqW1OCjL3NuYHSh3LkpaunAzchyjE3WAu1ClDMbggAJ48mxI=
-=SH34
+iQEcBAEBCgAGBQJhmZiwAAoJEEzhh34ZQ4xw+HwH/30EVqqkaNDDiMTrGnE7D/Vg
+QHd0uyEK0rCULLKv/w8zG6d3gNDBO0d8YHWbVjD9KFoGLaw2p1GygumKWTPKAfS4
+Gn3DfPS9k6mhXISkFKUvT7Wp59bgSEH6PhN0t4EuPEsN4YpIslUjyhpnp0GbItvf
+c3jodTNC0nAAfdaxcae0oWJCrnlyDgr8zm+SZbuUGugFiD2M9rAgQntymZW4M8em
+AQ7lK6wGb7IWMaS0fRkv3OUps/RpXRHsgN3c5scTKfECEWJHM0OXMSa1Dlrq0oIJ
+3NHzBsh+G0dgUk1Z9C3RQ6nroN2qrnrZqt02wZbObJ/rQTVOZUyImXk89KSC4y0=
+=9yll
-----END PGP SIGNATURE-----
diff --git a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
index 8fae904a4b..2930fd443c 100644
--- a/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
+++ b/systems/texlive/tlnet/tlpkg/texlive.tlpdb.xz
Binary files differ
diff --git a/systems/win32/miktex/tm/packages/files.csv.lzma b/systems/win32/miktex/tm/packages/files.csv.lzma
index 4238bdc4a1..ca3b7b12af 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 31dc907d8e..828e6cc704 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 cd2b98651d..20c7dba0d8 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=1637443031
+date=1637529346
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=656b3f0e4140c900b7e0d9107f89d0eb
-numpkg=5057
+lstdigest=c89c2eb7796af475a0a23553517ce32b
+numpkg=5058
relstate=next
-version=7994
+version=7995
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: s6VuVrX16BSCBPc1yqPeg0cML8W92PrgfwqQz50pnaajF/g8BI1JhVfdvo2dDrYsg+lC0HQmDdOB4rEQE6rdKq7O5C38vZXbSSUvDNMW2NgxTPOh3yz154ocgKTNryeGiN179B2uRKvoAMDBngn8HrMUr4i0nZbNDFpLK9EmQfq9+KaqeVgY+4Bq0zdReKmWQPJpvQjpTkWBr/4aIvLe5qqmGeA+7mj3rNX5ueD9k7zyp/cV3E61zz8tffYXtQNzm2qfxVMTsRN8VXrM1v89QdKvtjDKMnDxj/ua98bLZKnWN7mQsrd/s0AswwrbtMRCHlAgm8aPA1FZdlRvdKqpMQ==
+;;;; signature/miktex: JFw8oM68ZX3rzHYd8rmwNR4X5hxg05Qkez6Y5mkwONz7Bkk5pBoK5BwozwbbEY0lhAsHp2qYcLp6ueOeJDNjH8a5z06UyqsSx1FTBfBbWdDghGPE9+KfqwuZOWQyT3DE1lYaDjCEaZC7T7zEPfeZYRYpIzTuk0MMkuO5qzLbU5uJnSXicDmLRdC8LwcpozhBNNJgsWWdhk8ZHSekyNBalB2Psh6O4VrKroNjRXh5dxDtzJBm2uQsDKNpGlGSDsXgWhNSjkNlRO4+1XCbUAlPktZVr0rONLCsBX+VUX7F6S5GudKEE5fYYUXT8MxEu2t/N6pTzfa8njeOnK+rjD8Y3w==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/systems/win32/miktex/tm/packages/pr.ini b/systems/win32/miktex/tm/packages/pr.ini
index 576110d03b..a0e4f84483 100644
--- a/systems/win32/miktex/tm/packages/pr.ini
+++ b/systems/win32/miktex/tm/packages/pr.ini
@@ -1,13 +1,13 @@
[repository]
-date=1637442674
-lastupd=arara arara__doc arara__source bodeplot bodeplot__doc bodeplot__source easybook easybook__doc easybook__source exesheet exesheet__doc exesheet__source fontools fontools__doc formal-grammar formal-grammar__doc formal-grammar__source graphics-pln graphics-pln__doc hitszthesis
-lstdigest=a0d9518aad74adc3aaa595b42e25aace
-numpkg=5055
+date=1637529068
+lastupd=easybook easybook__doc easybook__source fancyvrb fancyvrb__doc fancyvrb__source koma-script koma-script__doc koma-script__source lshort-zh-cn lshort-zh-cn__source arara arara__doc arara__source bodeplot bodeplot__doc bodeplot__source exesheet exesheet__doc exesheet__source
+lstdigest=b51995f6eef1cddd72076ba0e6eaac3c
+numpkg=5056
relstate=stable
-version=7994
+version=7995
;;;;This configuration file is signed by a MiKTeX maintainer. The signature follows.
;;;;-----BEGIN MIKTEX SIGNATURE-----
-;;;; signature/miktex: a4IaJFLJf94Zgk80vPNCL4Kc5KBtaZUIy3crERz1nVvkcow0mYKqy85Z1TmJ2gV3yjGLhYAevOFZ38OAdJ+PVt9SiyHrzivec/ThpEHSkiVWfqcOGROvNP7jtq+bsuXz+q4WqdIKH5Wt2Qy0qdPAy6QevCYJ0kMqccTt1n9FPSBD2TA92hKQOySWT4bDZQ/q8B5CTokh5rgMsq97Io6hFDX/JKfq954H2B1zNKi4ubY3wyZosekQGmNSJLYI+FJcR7/+FMuedgbI6Pdkhjiqo3TKU4wnSqCpCcITlMEIgSDPWnZOlqJvkjH7iO4WvzVFFFgRvKdvlXXV5MTgU2hJMQ==
+;;;; signature/miktex: XTpxvabowUueNpWtmZcAC77V4KLiKneL9d03vaHz3LNt8+bN6/ScC06IXEc3DH2khZSyTTroGPRrcoOgV6odyukY9u8hQq/+CVkDKm1+3NWlUqCjFr6WyF06lc2BW1fpcSv61AfcRfHMzx58cL4t/M129a3g5hfhrLFayADF9AlBwvz1iM05iY9VxNE+oerIJXjar0CkxpLcZs2aoe2yZTKbC6CV8qEMzo+AGOO3SY9VoZ8mUIVy1U1D/FbJ+VGoY3UMZR6wCqGzGoa2ofJOx/1BnOpP2ZPuqsbspPr0tCuIwDla7Fhc1zxBY3A/yK4iEwUG/8PLkl0uFsPbp/0hmg==
;;;;-----END MIKTEX SIGNATURE-----
diff --git a/timestamp b/timestamp
index 6d26a4d2fd..45b68958fe 100644
--- a/timestamp
+++ b/timestamp
@@ -2,4 +2,4 @@
# The source CTAN of this site's material:
dante.ctan.org
# The year-month-day-hour-minute of this site's material:
-2021-11-21-02-02
+2021-11-22-02-02