summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-03-05 22:24:13 +0000
committerKarl Berry <karl@freefriends.org>2023-03-05 22:24:13 +0000
commitd57dfdf5f841c6607ffc45faafb954b692829260 (patch)
tree620d95d03972b50d8e53cf21502ba1a4f386083e
parente463f04cb58d44bf1d52fe980dd4f2333801cc98 (diff)
split upmendex into its own package (trunk only)
git-svn-id: svn://tug.org/texlive/trunk@66381 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/man/man1/upmendex.16
-rw-r--r--Master/texmf-dist/doc/man/man1/upmendex.man1.pdfbin253880 -> 324932 bytes
-rw-r--r--Master/texmf-dist/doc/support/upmendex/COPYRIGHT (renamed from Master/texmf-dist/doc/upmendex/COPYRIGHT)2
-rw-r--r--Master/texmf-dist/doc/support/upmendex/README.md (renamed from Master/texmf-dist/doc/upmendex/README.md)35
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/Makefile (renamed from Master/texmf-dist/doc/upmendex/samples/Makefile)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/Makefile (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_es.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zh.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zh.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhp.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhp.idx)32
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhr.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhr.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhs.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhs.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhz.idx (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhz.idx)32
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es1.ist5
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es2.ist5
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head1.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head1.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head2.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head2.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head3.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head3.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh1.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh1.ist)1
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh11.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh11.ist)3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh12.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh12.ist)3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh13.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh13.ist)3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh14.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh14.ist)3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh2.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh2.ist)1
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh21.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh21.ist)3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh22.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh22.ist)4
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh31.ist14
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/french.idx (renamed from Master/texmf-dist/doc/upmendex/samples/french.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/german.idx (renamed from Master/texmf-dist/doc/upmendex/samples/german.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/greek.idx (renamed from Master/texmf-dist/doc/upmendex/samples/greek.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/korean.idx (renamed from Master/texmf-dist/doc/upmendex/samples/korean.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/Makefile24
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/city0.tex203
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/city1.tex124
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/haranoaji-uptex.map40
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/mlg0.ist32
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/latex/mlg1.ist19
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/mdxsty00.ist (renamed from Master/texmf-dist/doc/upmendex/samples/mdxsty00.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/mdxsty01.ist (renamed from Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/mdxsty02.ist (renamed from Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/mdxsty03.ist (renamed from Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/multi.idx (renamed from Master/texmf-dist/doc/upmendex/samples/multi.idx)1
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/Makefile25
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/attri1.idx (renamed from Master/texmf-dist/doc/upmendex/samples/option/attri1.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/japanese.idx (renamed from Master/texmf-dist/doc/upmendex/samples/option/japanese.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_attr_default.ist (renamed from Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh31.ist)2
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j00.ist (renamed from Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j00.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j01.ist (renamed from Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j01.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j02.ist (renamed from Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_rule0.ist (renamed from Master/texmf-dist/doc/upmendex/samples/option/mdxsty_rule0.ist)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/option/rule0.ist3
-rw-r--r--Master/texmf-dist/doc/support/upmendex/samples/russian.idx (renamed from Master/texmf-dist/doc/upmendex/samples/russian.idx)0
-rw-r--r--Master/texmf-dist/doc/support/upmendex/upmendex-slide-ctan.pdfbin0 -> 807494 bytes
-rw-r--r--Master/texmf-dist/doc/support/upmendex/upmendex.ja.txt (renamed from Master/texmf-dist/doc/upmendex/upmendex.ja.txt)6
-rw-r--r--Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist4
-rw-r--r--Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist4
-rw-r--r--Master/texmf-dist/doc/upmendex/samples/option/Makefile25
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds13
-rw-r--r--Master/tlpkg/tlpsrc/collection-binextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/upmendex.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/uptex.tlpsrc3
62 files changed, 620 insertions, 65 deletions
diff --git a/Master/texmf-dist/doc/man/man1/upmendex.1 b/Master/texmf-dist/doc/man/man1/upmendex.1
index 21c89844faa..ebf379e4f1e 100644
--- a/Master/texmf-dist/doc/man/man1/upmendex.1
+++ b/Master/texmf-dist/doc/man/man1/upmendex.1
@@ -512,7 +512,7 @@ If \'1\' and \'2\', Katakana and Hiragana is used, respectively.
.RS
Flag of sorting method for index words composed of
Japanese and non-Japanese (ex. Latin scripts).
-If non zero, one space (U+20) is inserted between
+If non zero, one space (U+0020) is inserted between
Japanese sequence and non-Japanese sequence in sorting procedure.
(Extended by (up)mendex)
.RE
@@ -522,8 +522,10 @@ Japanese sequence and non-Japanese sequence in sorting procedure.
.RS
Order of scripts and symbols.
\'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,
+respectively denotes symbol, number, Latin, Greek, Cyrillic, Japanese Kana, Korean Hangul, Hanzi,
Devanagari, Thai, Arabic and Hebrew script.
+\'@\' denotes scripts which are not explicitly designated and the order are
+configured by icu_rules or icu_locale.
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)
diff --git a/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf b/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf
index 195a8190efd..30b8aea3337 100644
--- a/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/upmendex.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/upmendex/COPYRIGHT b/Master/texmf-dist/doc/support/upmendex/COPYRIGHT
index 9136a016327..c978845afc1 100644
--- a/Master/texmf-dist/doc/upmendex/COPYRIGHT
+++ b/Master/texmf-dist/doc/support/upmendex/COPYRIGHT
@@ -1,5 +1,5 @@
Copyright (C) 1995 ASCII Corporation, 2009 ASCII MEDIA WORKS,
- 2015-2021 TANAKA Takuji
+ 2015-2023 TANAKA Takuji
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/upmendex/README.md b/Master/texmf-dist/doc/support/upmendex/README.md
index 89d0c0e4dea..f36923246b0 100644
--- a/Master/texmf-dist/doc/upmendex/README.md
+++ b/Master/texmf-dist/doc/support/upmendex/README.md
@@ -1,7 +1,7 @@
upmendex --- Multilingual index processor
==========================================
-2021.11.20 Ver1.00
+2023.01.11 Ver1.07
TANAKA, Takuji
<ttk(at)t-lab.opal.ne.jp>
@@ -15,7 +15,7 @@ upmendex is a multilingual index processor with following features:
based on mendex version 2.6f by ASCII media works.
* Unicode for internal process and
support UTF-8 encoding for input/output.
- Will work with upLaTeX, XeLaTeX and luaLaTeX.
+ Work with upLaTeX, XeLaTeX and luaLaTeX.
* Support Latin (including non-English), Greek, Cyrillic,
Korean Hangul and Chinese Han (Hanzi ideographs) scripts
as well as Japanese Kana.
@@ -30,16 +30,17 @@ upmendex is a multilingual index processor with following features:
* source/ :: sources
* doc/ :: documents
* doc/samples/ :: samples for test.
- * doc/samples/alphabet :: samples for languages and collation options.
- * doc/samples/option :: samples for ICU attributes/rules options etc.
More samples are distributed at GitHub[2] than at CTAN[5].
+ * doc/samples/alphabet :: samples for languages and collation options.
+ * doc/samples/option :: samples for ICU attributes/rules options etc.
+ * doc/samples/latex :: samples for upLaTeX/pxbabel and XeLaTeX/polyglossia.
* man/ :: manuals
### Building upmendex
-The source files are distributed at GitHub[2] and work with TeX Live svn r61096.
+The source files are distributed at GitHub[2] and work with TeX Live svn r65484.
Ref. [TeX Live and Subversion](http://www.tug.org/texlive/svn/)
-Tested with ICU 68.2 .
+Tested with ICU 72.1 .
### Status
Stable version.
@@ -57,17 +58,20 @@ setting into "icu_locale" in style files.
Currently following locales are available:
#### Latin script
- "az", "az@collation=search" (Azerbaijani), "ca@collation=search" (Catalan),
- "cs", "cs@collation=search" (Czech), "da", "da@collation=search" (Danish),
+ "af" (Afrikaans), "az", "az@collation=search" (Azerbaijani),
+ "bs", "bs@collation=search" (Bosnian),
+ "ca@collation=search" (Catalan), "cs", "cs@collation=search" (Czech),
+ "cy" (Welsh), "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),
- "fi", "fi@collation=search", "fi@collation=traditional" (Finnish),
+ "et" (Estonian), "fi", "fi@collation=search", "fi@collation=traditional" (Finnish),
"fr-CA" (French), "gl", "gl@collation=search" (Galician),
- "hr", "hr@collation=search" (Croatian), "hu" (Hungarian), "lt" (Lithuanian),
+ "hr", "hr@collation=search" (Croatian), "hu" (Hungarian),
+ "is", "is@collation=search" (Icelandic), "lt" (Lithuanian), "lv" (Latvian),
"nb", "nb@collation=search", "nn", "nn@collation=search", "no" (Norwegian),
"pl" (Polish), "ro" (Romanian), "sk", "sk@collation=search" (Slovak),
"sl" (Slovenian), "sq" (Albanian), "sr-Latn", "sr-Latn@collation=search" (Serbian),
- "sv", "sv@collation=search", "sv@collation=standard" (Swedish),
+ "sv", "sv@collation=search", "sv@collation=standard" (Swedish), "tk" (Turkmen),
"tr" (Turkish), "vi", "vi@collation=traditional" (Vietnamese)
##### Supported by default "root" collator. Do not need to set locale
@@ -75,7 +79,7 @@ Currently following locales are available:
"it" (Italian), "jv" (Javanese), "ms" (Malay), "nl" (Dutch), "pt" (Portuguese)
#### Cyrillic script
- "be" (Belarusian), "bg" (Bulgarian), "kk" (Kazakh), "ky" (Kyrgyz),
+ "be" (Belarusian), "bg" (Bulgarian), "bs-Cyrl" (Bosnian), "kk" (Kazakh), "ky" (Kyrgyz),
"mk" (Macedonian), "ru" (Russian), "sr" (Serbian), "uk" (Ukraine)
#### Greek script
@@ -93,10 +97,11 @@ Currently following locales are available:
#### Thai script (experimental)
"th" (Thai)
-#### Arabic (experimental)
- "ar", "ar@collation=compat" (Arabic), "fa" (Persian), "ps" (Pashto), "ur" (Urdu)
+#### Arabic script (experimental)
+ "ar", "ar@collation=compat" (Arabic), "fa" (Persian), "fa-AF" (Dari), "ps" (Pashto),
+ "ug" (Uyghur), "ur" (Urdu)
-#### Hebrew (experimental)
+#### Hebrew script (experimental)
"he", "he@collation=search" (Hebrew), "yi" (Yiddish)
### References
diff --git a/Master/texmf-dist/doc/upmendex/samples/Makefile b/Master/texmf-dist/doc/support/upmendex/samples/Makefile
index ce333052126..ce333052126 100644
--- a/Master/texmf-dist/doc/upmendex/samples/Makefile
+++ b/Master/texmf-dist/doc/support/upmendex/samples/Makefile
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/Makefile
index 120f3f17791..120f3f17791 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/Makefile
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/Makefile
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_es.idx
index 1a81aa998ba..1a81aa998ba 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_es.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_es.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zh.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zh.idx
index 1e7845cb47d..1e7845cb47d 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zh.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zh.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhp.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhp.idx
index d7d537f96ee..026ab4dd73e 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhp.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhp.idx
@@ -84,3 +84,35 @@
\indexentry{善}{251}
\indexentry{懲}{252}
\indexentry{惡}{253}
+\indexentry{重新@重新 (chóng xīn, ㄔㄨㄥˊ ㄒㄧㄣ)}{6000}
+\indexentry{重要@重要 (zhòng yào, ㄓㄨㄥˋ ㄧㄠˋ)}{6001}
+\indexentry{長年@長年 (cháng nián, ㄔㄤˊ ㄋㄧㄢˊ)}{6010}
+\indexentry{長短@長短 (cháng duǎn, ㄔㄤˊ ㄉㄨㄢˇ)}{6011}
+\indexentry{長大@長大 (zhǎng dà, ㄓㄤˇ ㄉㄚˋ)}{6012}
+\indexentry{长年}{6013}
+\indexentry{长短}{6014}
+\indexentry{长大}{6015}
+\indexentry{常年@常年 (cháng nián, ㄔㄤˊ ㄋㄧㄢˊ)}{6016}
+\indexentry{調查@調查 (diào chá, ㄉㄧㄠˋ ㄓㄚ)}{6020}
+\indexentry{調整@調整 (tiáo zhěng, ㄊㄧㄠˊ ㄓㄥˇ)}{6021}
+\indexentry{调查}{6022}
+\indexentry{调整}{6023}
+\indexentry{重}{6100}
+\indexentry{長}{6101}
+\indexentry{长}{6102}
+\indexentry{調}{6103}
+\indexentry{调}{6104}
+\indexentry{常@常 (cháng, ㄔㄤˊ)}{6200}
+\indexentry{腸@腸 (cháng, ㄔㄤˊ)}{6201}
+\indexentry{崇@崇 (chóng, ㄔㄨㄥˊ)}{6202}
+\indexentry{蟲@蟲 (chóng, ㄔㄨㄥˊ)}{6203}
+\indexentry{虫@虫 (chóng, ㄔㄨㄥˊ)}{6204}
+\indexentry{條@條 (tiáo, ㄊㄧㄠˊ)}{6204}
+\indexentry{条@条 (tiáo, ㄊㄧㄠˊ)}{6205}
+\indexentry{仲@仲 (zhòng, ㄓㄨㄥˋ)}{6206}
+\indexentry{衆@衆 (zhòng, ㄓㄨㄥˋ)}{6207}
+\indexentry{众@众 (zhòng, ㄓㄨㄥˋ)}{6208}
+\indexentry{掉@掉 (diào, ㄉㄧㄠˋ)}{6209}
+\indexentry{吊@吊 (diào, ㄉㄧㄠˋ)}{6210}
+\indexentry{弔@弔 (diào, ㄉㄧㄠˋ)}{6211}
+\indexentry{掌@掌 (zhǎng, ㄓㄤˇ)}{6212}
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhr.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhr.idx
index 606df2c52ec..606df2c52ec 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhr.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhr.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhs.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhs.idx
index 990a30acd49..990a30acd49 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhs.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhs.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhz.idx b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhz.idx
index 55ef3df56f4..792eed7e572 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/alpha_zhz.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/alpha_zhz.idx
@@ -95,3 +95,35 @@
\indexentry{喔}{1010}
\indexentry{次}{1014}
\indexentry{促}{1015}
+\indexentry{重新@重新 (chóng xīn, ㄔㄨㄥˊ ㄒㄧㄣ)}{6000}
+\indexentry{重要@重要 (zhòng yào, ㄓㄨㄥˋ ㄧㄠˋ)}{6001}
+\indexentry{長年@長年 (cháng nián, ㄔㄤˊ ㄋㄧㄢˊ)}{6010}
+\indexentry{長短@長短 (cháng duǎn, ㄔㄤˊ ㄉㄨㄢˇ)}{6011}
+\indexentry{長大@長大 (zhǎng dà, ㄓㄤˇ ㄉㄚˋ)}{6012}
+\indexentry{长年}{6013}
+\indexentry{长短}{6014}
+\indexentry{长大}{6015}
+\indexentry{常年@常年 (cháng nián, ㄔㄤˊ ㄋㄧㄢˊ)}{6016}
+\indexentry{調查@調查 (diào chá, ㄉㄧㄠˋ ㄓㄚ)}{6020}
+\indexentry{調整@調整 (tiáo zhěng, ㄊㄧㄠˊ ㄓㄥˇ)}{6021}
+\indexentry{调查}{6022}
+\indexentry{调整}{6023}
+\indexentry{重}{6100}
+\indexentry{長}{6101}
+\indexentry{长}{6102}
+\indexentry{調}{6103}
+\indexentry{调}{6104}
+\indexentry{常@常 (cháng, ㄔㄤˊ)}{6200}
+\indexentry{腸@腸 (cháng, ㄔㄤˊ)}{6201}
+\indexentry{崇@崇 (chóng, ㄔㄨㄥˊ)}{6202}
+\indexentry{蟲@蟲 (chóng, ㄔㄨㄥˊ)}{6203}
+\indexentry{虫@虫 (chóng, ㄔㄨㄥˊ)}{6204}
+\indexentry{條@條 (tiáo, ㄊㄧㄠˊ)}{6204}
+\indexentry{条@条 (tiáo, ㄊㄧㄠˊ)}{6205}
+\indexentry{仲@仲 (zhòng, ㄓㄨㄥˋ)}{6206}
+\indexentry{衆@衆 (zhòng, ㄓㄨㄥˋ)}{6207}
+\indexentry{众@众 (zhòng, ㄓㄨㄥˋ)}{6208}
+\indexentry{掉@掉 (diào, ㄉㄧㄠˋ)}{6209}
+\indexentry{吊@吊 (diào, ㄉㄧㄠˋ)}{6210}
+\indexentry{弔@弔 (diào, ㄉㄧㄠˋ)}{6211}
+\indexentry{掌@掌 (zhǎng, ㄓㄤˇ)}{6212}
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es.ist
index bef3be184ce..bef3be184ce 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es.ist
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es1.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es1.ist
new file mode 100644
index 00000000000..3ff1f401eaf
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es1.ist
@@ -0,0 +1,5 @@
+% -*- coding: utf-8 -*-
+
+%icu_locale "es@collation=traditional"
+icu_locale "es-u-co-trad"
+
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es2.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es2.ist
new file mode 100644
index 00000000000..6af031c9144
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_es2.ist
@@ -0,0 +1,5 @@
+% -*- coding: utf-8 -*-
+
+%icu_locale "es@collation=search"
+icu_locale "es-u-co-search"
+
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head1.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head1.ist
index 06c3eea2d0c..06c3eea2d0c 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head1.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head1.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head2.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head2.ist
index 2d6bac57d80..2d6bac57d80 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head2.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head2.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head3.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head3.ist
index 6b0c7ccd975..6b0c7ccd975 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_head3.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_head3.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh1.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh1.ist
index e52cb7910c3..8ebe0fd5740 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh1.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh1.ist
@@ -9,4 +9,5 @@ lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
icu_locale "zh"
+icu_rules "&常年<<长年<<长短<<長年<<長短 &崇<<重新 &條<<调整<<調整"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh11.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh11.ist
index 4f4661ec8e8..62ef4f2d293 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh11.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh11.ist
@@ -8,5 +8,6 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "zh@collation=unihan"
+%icu_locale "zh@collation=unihan"
+icu_locale "zh-u-co-unihan"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh12.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh12.ist
index f2e8c0aa87a..57dc249c8c5 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh12.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh12.ist
@@ -8,6 +8,7 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "zh@collation=unihan"
+%icu_locale "zh@collation=unihan"
+icu_locale "zh-u-co-unihan"
hanzi_head "一部;丨部;丶部;丿部;乙部;亅部;二部;亠部;人部;儿部;入部;八部;冂部;冖部;冫部;几部;凵部;刀部;力部;勹部;匕部;匚部;匸部;十部;卜部;卩部;厂部;厶部;又部;口部;囗部;土部;士部;夂部;夊部;夕部;大部;女部;子部;宀部;寸部;小部;尢部;尸部;屮部;山部;巛部;工部;己部;巾部;干部;幺部;广部;廴部;廾部;弋部;弓部;彐部;彡部;彳部;心部;戈部;戶部;手部;支部;攴部;文部;斗部;斤部;方部;无部;日部;曰部;月部;木部;欠部;止部;歹部;殳部;毋部;比部;毛部;氏部;气部;水部;火部;爪部;父部;爻部;爿部;片部;牙部;牛部;犬部;玄部;玉部;瓜部;瓦部;甘部;生部;用部;田部;疋部;疒部;癶部;白部;皮部;皿部;目部;矛部;矢部;石部;示部;禸部;禾部;穴部;立部;竹部;米部;糸部;缶部;网部;羊部;羽部;老部;而部;耒部;耳部;聿部;肉部;臣部;自部;至部;臼部;舌部;舛部;舟部;艮部;色部;艸部;虍部;虫部;血部;行部;衣部;襾部;見部;角部;言部;谷部;豆部;豕部;豸部;貝部;赤部;走部;足部;身部;車部;辛部;辰部;辵部;邑部;酉部;釆部;里部;金部;長部;門部;阜部;隶部;隹部;雨部;靑部;非部;面部;革部;韋部;韭部;音部;頁部;風部;飛部;食部;首部;香部;馬部;骨部;高部;髟部;鬥部;鬯部;鬲部;鬼部;魚部;鳥部;鹵部;鹿部;麥部;麻部;黃部;黍部;黑部;黹部;黽部;鼎部;鼓部;鼠部;鼻部;齊部;齒部;龍部;龜部;龠部"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh13.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh13.ist
index 6fce8ee43c0..e0248d63904 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh13.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh13.ist
@@ -8,6 +8,7 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "ja@collation=unihan"
+%icu_locale "ja@collation=unihan"
+icu_locale "ja-u-co-unihan"
hanzi_head "一部;丨部;丶部;丿部;乙部;亅部;二部;亠部;人部;儿部;入部;八部;冂部;冖部;冫部;几部;凵部;刀部;力部;勹部;匕部;匚部;匸部;十部;卜部;卩部;厂部;厶部;又部;口部;囗部;土部;士部;夂部;夊部;夕部;大部;女部;子部;宀部;寸部;小部;尢部;尸部;屮部;山部;巛部;工部;己部;巾部;干部;幺部;广部;廴部;廾部;弋部;弓部;彐部;彡部;彳部;心部;戈部;戸部;手部;支部;攴部;文部;斗部;斤部;方部;无部;日部;曰部;月部;木部;欠部;止部;歹部;殳部;毋部;比部;毛部;氏部;气部;水部;火部;爪部;父部;爻部;爿部;片部;牙部;牛部;犬部;玄部;玉部;瓜部;瓦部;甘部;生部;用部;田部;疋部;疒部;癶部;白部;皮部;皿部;目部;矛部;矢部;石部;示部;禸部;禾部;穴部;立部;竹部;米部;糸部;缶部;网部;羊部;羽部;老部;而部;耒部;耳部;聿部;肉部;臣部;自部;至部;臼部;舌部;舛部;舟部;艮部;色部;艸部;虍部;虫部;血部;行部;衣部;襾部;見部;角部;言部;谷部;豆部;豕部;豸部;貝部;赤部;走部;足部;身部;車部;辛部;辰部;辵部;邑部;酉部;釆部;里部;金部;長部;門部;阜部;隶部;隹部;雨部;靑部;非部;面部;革部;韋部;韭部;音部;頁部;風部;飛部;食部;首部;香部;馬部;骨部;高部;髟部;鬥部;鬯部;鬲部;鬼部;魚部;鳥部;鹵部;鹿部;麥部;麻部;黃部;黍部;黑部;黹部;黽部;鼎部;鼓部;鼠部;鼻部;齊部;齒部;龍部;龜部;龠部"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh14.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh14.ist
index 7e92ed574f7..f54483f7d21 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh14.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh14.ist
@@ -8,6 +8,7 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "ko@collation=unihan"
+%icu_locale "ko@collation=unihan"
+icu_locale "ko-u-co-unihan"
hanzi_head "一部;丨部;丶部;丿部;乙部;亅部;二部;亠部;人部;儿部;入部;八部;冂部;冖部;冫部;几部;凵部;刀部;力部;勹部;匕部;匚部;匸部;十部;卜部;卩部;厂部;厶部;又部;口部;囗部;土部;士部;夂部;夊部;夕部;大部;女部;子部;宀部;寸部;小部;尢部;尸部;屮部;山部;巛部;工部;己部;巾部;干部;幺部;广部;廴部;廾部;弋部;弓部;彐部;彡部;彳部;心部;戈部;戶部;手部;支部;攴部;文部;斗部;斤部;方部;无部;日部;曰部;月部;木部;欠部;止部;歹部;殳部;毋部;比部;毛部;氏部;气部;水部;火部;爪部;父部;爻部;爿部;片部;牙部;牛部;犬部;玄部;玉部;瓜部;瓦部;甘部;生部;用部;田部;疋部;疒部;癶部;白部;皮部;皿部;目部;矛部;矢部;石部;示部;禸部;禾部;穴部;立部;竹部;米部;糸部;缶部;网部;羊部;羽部;老部;而部;耒部;耳部;聿部;肉部;臣部;自部;至部;臼部;舌部;舛部;舟部;艮部;色部;艸部;虍部;虫部;血部;行部;衣部;襾部;見部;角部;言部;谷部;豆部;豕部;豸部;貝部;赤部;走部;足部;身部;車部;辛部;辰部;辵部;邑部;酉部;釆部;里部;金部;長部;門部;阜部;隶部;隹部;雨部;靑部;非部;面部;革部;韋部;韭部;音部;頁部;風部;飛部;食部;首部;香部;馬部;骨部;高部;髟部;鬥部;鬯部;鬲部;鬼部;魚部;鳥部;鹵部;鹿部;麥部;麻部;黃部;黍部;黑部;黹部;黽部;鼎部;鼓部;鼠部;鼻部;齊部;齒部;龍部;龜部;龠部"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh2.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh2.ist
index 359f3b97bde..45ad87e58c2 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh2.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh2.ist
@@ -9,4 +9,5 @@ lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
icu_locale "zh"
+icu_rules "&常年<<长年<<长短<<長年<<長短 &崇<<重新 &條<<调整<<調整"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh21.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh21.ist
index 499dcf9eff3..88ab4469300 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh21.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh21.ist
@@ -8,5 +8,6 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "zh@collation=stroke"
+%icu_locale "zh@collation=stroke"
+icu_locale "zh-u-co-stroke"
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh22.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh22.ist
index 6cc7d3252ca..933fe3d9dfa 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh22.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh22.ist
@@ -8,5 +8,7 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "zh@collation=stroke"
+%icu_locale "zh@collation=stroke"
+icu_locale "zh-u-co-stroke"
hanzi_head "1画;2画;3画;4画;5画;6画;7画;8画;9画;10画;11画;12画;13画;14画;15画;16画;17画;18画;19画;20画;21画;22画;23画;24画;25画;26画;27画;28画;29画;30画;31画;32画;33画;35画;36画;39画;48画"
+
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh31.ist b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh31.ist
new file mode 100644
index 00000000000..77ad0e08efe
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/alphabet/mdxsty_zh31.ist
@@ -0,0 +1,14 @@
+% -*- coding: utf-8 -*-
+
+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"
+
+%icu_locale "zh@collation=zhuyin"
+icu_locale "zh-u-co-zhuyin"
+icu_rules "&常年<<长年<<长短<<長年<<長短 &崇<<重新 &條<<调整<<調整"
+
diff --git a/Master/texmf-dist/doc/upmendex/samples/french.idx b/Master/texmf-dist/doc/support/upmendex/samples/french.idx
index 1e1bcec28d7..1e1bcec28d7 100644
--- a/Master/texmf-dist/doc/upmendex/samples/french.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/french.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/german.idx b/Master/texmf-dist/doc/support/upmendex/samples/german.idx
index 453d9733bde..453d9733bde 100644
--- a/Master/texmf-dist/doc/upmendex/samples/german.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/german.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/greek.idx b/Master/texmf-dist/doc/support/upmendex/samples/greek.idx
index 56bbe423ca1..56bbe423ca1 100644
--- a/Master/texmf-dist/doc/upmendex/samples/greek.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/greek.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/korean.idx b/Master/texmf-dist/doc/support/upmendex/samples/korean.idx
index f46789ca513..f46789ca513 100644
--- a/Master/texmf-dist/doc/upmendex/samples/korean.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/korean.idx
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/Makefile b/Master/texmf-dist/doc/support/upmendex/samples/latex/Makefile
new file mode 100644
index 00000000000..c10ffc0ca39
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/Makefile
@@ -0,0 +1,24 @@
+UPMENDEX = upmendex
+DVIPDFMX = dvipdfmx -f haranoaji-uptex.map
+
+city0.ind:
+ $(UPMENDEX) city0 -s mlg0.ist
+
+city0.pdf:
+ xelatex city0.tex
+ xelatex city0.tex
+ $(UPMENDEX) city0 -s mlg0.ist
+ xelatex city0.tex
+
+city1.ind:
+ $(UPMENDEX) city1 -s mlg1.ist
+
+city1.dvi:
+ uplatex city1.tex
+ uplatex city1.tex
+ $(UPMENDEX) city1 -s mlg1.ist
+ uplatex city1.tex
+
+city1.pdf:
+ $(DVIPDFMX) city1.dvi
+
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/city0.tex b/Master/texmf-dist/doc/support/upmendex/samples/latex/city0.tex
new file mode 100644
index 00000000000..24ccd3dcc62
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/city0.tex
@@ -0,0 +1,203 @@
+%
+% Example of XeLaTeX, polyglossia, Noto fonts and upmendex
+% in Latin, CJK (Chinese, Japanese, Korean), Cyrillic, Greek,
+% Devanagari, Thai, Arabic and Hebrew
+%
+%
+% Copyright (C) 2022 TANAKA Takuji
+% You may freely use, modify and/or distribute this file.
+%
+\documentclass[a4paper]{article}
+
+\usepackage{fontspec}
+\usepackage{polyglossia}
+\usepackage{makeidx}
+\makeindex
+
+\setdefaultlanguage{english}
+\setromanfont{Noto Serif}
+\setmainfont{Noto Serif}
+\newfontfamily\cyrillicfont{Noto Serif}
+\setotherlanguage{russian}
+\newfontfamily\greekfont{Noto Serif}
+\setotherlanguage{greek}
+\newfontfamily\japanesefont{Noto Serif CJK JP}[Language=Japanese,Script=CJK]
+\setotherlanguage{japanese}
+\newfontfamily\koreanfont{Noto Serif CJK KR}[Language=Korean,Script=Hangul]
+\setotherlanguage{korean}
+\newfontfamily\hindifont{Noto Serif Devanagari}[Language=Hindi,Script=Devanagari]
+\setotherlanguage{hindi}
+\newfontfamily\thaifont{Noto Serif Thai}[Language=Thai,Script=Thai]
+\setotherlanguage{thai}
+\newfontfamily\hebrewfont{Noto Serif Hebrew}[Script=Hebrew]
+\setotherlanguage{hebrew}
+\newfontfamily\arabicfont{Noto Naskh Arabic}[Script=Arabic]
+\setotherlanguage{arabic}
+%\newfontfamily\chinesefont{Noto Serif CJK TC}[Script=CJK]
+\newfontfamily\chinesefont{Noto Serif CJK SC}[Script=CJK]
+\setotherlanguage{chinese}
+
+\parindent1em
+\begin{document}
+\section{Latin}
+This is an English text.
+
+upmendex\index{upmendex}.
+Install of upmendex\index{upmendex!Install@Install of ---}.
+Usage of upmendex\index{upmendex!Usage@Usage of ---}.
+Usage of upmendex for beginners\index{upmendex!Usage@Usage of ---!for beginners@--- for beginners}.
+Usage of upmendex for experts\index{upmendex!Usage@Usage of ---!for experts@--- for experts}.
+
+Number: 3.14159265\index{3.14159265}, 2.71828182\index{2.71828182}.
+Symbol: \$\index{\$}, €\index{€}, ¥\index{¥}.
+
+São Paulo\index{São Paulo}.
+Ciudad de México\index{Ciudad de México}.
+New York\index{New York}.
+Buenos Aires\index{Buenos Aires}.
+İstanbul\index{İstanbul}.
+Rio de Janeiro\index{Rio de Janeiro}.
+London\index{London}.
+Manila\index{Manila}.
+Paris\index{Paris}.
+Berlin\index{Berlin}.
+
+\section{CJK}
+\subsection{Japanese (Kana, Kanji)}
+\begin{japanese}
+これは日本語のテキストです。
+
+upmendex\index{upmendex}。
+upmendexのインストール\index{upmendex!のインストール@---\textjapanese{のインストール}}。
+upmendexの使い方\index{upmendex!のつかいかた@---\textjapanese{の使い方}}。
+upmendexの使い方入門編\index{upmendex!のつかいかた@---\textjapanese{の使い方}!にゅうもんへん@---\textjapanese{入門編}}。
+upmendexの使い方応用編\index{upmendex!のつかいかた@---\textjapanese{の使い方}!おうようへん@---\textjapanese{応用編}}。
+
+東京\index{とうきょう@東京}。
+横浜\index{よこはま@横浜}。
+大阪\index{おおさか@大阪}。
+名古屋\index{なごや@名古屋}。
+札幌\index{さっぽろ@札幌}。
+福岡\index{ふくおか@福岡}。
+川崎\index{かわさき@川崎}。
+神戸\index{こうべ@神戸}。
+京都\index{きょうと@京都}。
+さいたま\index{さいたま}。
+\end{japanese}
+
+\subsection{Korean (Hangul, Hanja)}
+\begin{korean}
+이것은 한국어 텍스트입니다.
+
+서울\index{서울}.
+부산(釜山)\index{부산@부산(釜山)}.
+인천(仁川)\index{인천@인천(仁川)}.
+대구(大邱)\index{대구@대구(大邱)}.
+대전(大田)\index{대전@대전(大田)}.
+광주(光州)\index{광주@광주(光州)}.
+울산(蔚山)\index{울산@울산(蔚山)}.
+평양(平壤)\index{평양@평양(平壤)}.
+\end{korean}
+
+\subsection{Chinese (Hanzi)}
+\begin{chinese}
+這是中文文本。
+这是中文文本。
+
+北京\index{北京}。
+上海\index{上海}。
+天津\index{天津}。
+廈門(厦门)\index{廈門(厦门)}。
+深圳\index{深圳}。
+成都\index{成都}。
+杭州\index{杭州}。
+香港\index{香港}。
+臺北\index{臺北}。
+高雄\index{高雄}。
+桃園(桃园)\index{桃園(桃园)}。
+\end{chinese}
+
+\section{Cyrillic}
+\begin{russian}
+Здесь русский текст.
+
+Москва\index{Москва}.
+Санкт-Петербург\index{Санкт-Петербург}.
+Новосибирск\index{Новосибирск}.
+Київ\index{Київ}.
+Одеса\index{Одеса}.
+Харків\index{Харків}.
+София\index{София}.
+Београд\index{Београд}.
+Бишкек\index{Бишкек}.
+Скопје\index{Скопје}.
+Мінск\index{Мінск}.
+Нұр-Сұлтан\index{Нұр-Сұлтан}.
+\end{russian}
+
+\section{Greek}
+\begin{greek}
+Ελληνικό κείμενο εδώ.
+
+Αθήνα\index{Αθήνα}.
+Θεσσαλονίκη\index{Θεσσαλονίκη}.
+Πάτρα\index{Πάτρα}.
+Ηράκλειο\index{Ηράκλειο}.
+Λάρισα\index{Λάρισα}.
+\end{greek}
+
+\section{Devanagari}
+\begin{hindi}
+यह हिन्दी पाठ है।
+
+मुंबई\index{मुंबई}
+दिल्ली\index{दिल्ली}
+कोलकाता\index{कोलकाता}
+कानपुर\index{कानपुर}
+बंगलुरु\index{बंगलुरु}
+\end{hindi}
+
+\section{Thai}
+\begin{thai}
+นี่คือข้อความภาษาไทย
+
+กรุงเทพมหานคร\index{กรุงเทพมหานคร}
+นนทบุรี\index{นนทบุรี}
+นครราชสีมา\index{นครราชสีมา}
+เชียงใหม่\index{เชียงใหม่}
+หาดใหญ่\index{หาดใหญ่}
+\end{thai}
+
+\section{Arabic}
+\begin{Arabic}%% "Arabic", not "arabic"
+
+هذا نص عربي.
+
+دبي\index{دبي}
+أبو ظبي\index{أبو ظبي}
+الشارقة\index{الشارقة}
+تهران\index{تهران}
+مشهد\index{مشهد}
+اصفهان\index{اصفهان}
+
+\end{Arabic}
+
+\section{Hebrew}
+\begin{hebrew}
+
+
+
+זה טקסט בעברית
+
+ירושלים\index{ירושלים}
+תל אביב\index{תל אביב}
+חיפה\index{חיפה}
+ראשון לציון\index{ראשון לציון}
+אשדוד\index{אשדוד}
+
+\end{hebrew}
+
+
+\printindex
+
+\end{document}
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/city1.tex b/Master/texmf-dist/doc/support/upmendex/samples/latex/city1.tex
new file mode 100644
index 00000000000..075edaaaccb
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/city1.tex
@@ -0,0 +1,124 @@
+%
+% Example of upLaTeX, pxbabel, HaranoAji fonts and upmendex
+% in Latin, CJK (Chinese, Japanese, Korean) and Cyrillic
+%
+%
+% Copyright (C) 2022 TANAKA Takuji
+% You may freely use, modify and/or distribute this file.
+%
+\documentclass[a4paper]{ujarticle}
+
+\usepackage[T2A,T1]{fontenc}
+\usepackage{lmodern}
+%\usepackage{tgtermes,tgheros}
+\usepackage[japanese,korean,tchinese,schinese,english]{pxbabel}
+
+\kcatcode`¥=15% U+00:¥ (Latin-1 Supplement)
+\kcatcode`П=15% U+041F:П (Cyrillic)
+\kcatcode`’=15% U+2019:’ (General Punctuation)
+\kcatcode`€=15% U+20AC:€ (Currency Symbols)
+
+\usepackage{makeidx}
+\makeindex
+
+\parindent1em
+\begin{document}
+\section{Latin}
+This is an English text.
+
+upmendex\index{upmendex}.
+Install of upmendex\index{upmendex!Install@Install of ---}.
+Usage of upmendex\index{upmendex!Usage@Usage of ---}.
+Usage of upmendex for beginners\index{upmendex!Usage@Usage of ---!for beginners@--- for beginners}.
+Usage of upmendex for experts\index{upmendex!Usage@Usage of ---!for experts@--- for experts}.
+
+Number: 3.14159265\index{3.14159265}, 2.71828182\index{2.71828182}.
+Symbol: \$\index{\$}, €\index{€}, ¥\index{¥}.
+
+São Paulo\index{São Paulo}.
+Ciudad de México\index{Ciudad de México}.
+New York\index{New York}.
+Buenos Aires\index{Buenos Aires}.
+İstanbul\index{İstanbul}.
+Rio de Janeiro\index{Rio de Janeiro}.
+London\index{London}.
+Manila\index{Manila}.
+Paris\index{Paris}.
+Berlin\index{Berlin}.
+
+\section{CJK}
+\subsection{Japanese (Kana, Kanji)}
+これは日本語のテキストです。
+
+upmendex\index{upmendex}。
+upmendexのインストール\index{upmendex!のインストール@---のインストール}。
+upmendexの使い方\index{upmendex!のつかいかた@---の使い方}。
+upmendexの使い方入門編\index{upmendex!のつかいかた@---の使い方!にゅうもんへん@---入門編}。
+upmendexの使い方応用編\index{upmendex!のつかいかた@---の使い方!おうようへん@---応用編}。
+
+東京\index{とうきょう@東京}。
+横浜\index{よこはま@横浜}。
+大阪\index{おおさか@大阪}。
+名古屋\index{なごや@名古屋}。
+札幌\index{さっぽろ@札幌}。
+福岡\index{ふくおか@福岡}。
+川崎\index{かわさき@川崎}。
+神戸\index{こうべ@神戸}。
+京都\index{きょうと@京都}。
+さいたま\index{さいたま}。
+
+\subsection{Korean (Hangul, Hanja)}
+\begin{otherlanguage}{korean}
+이것은 한국어 텍스트입니다.
+
+서울\index{서울}.
+부산(釜山)\index{부산@부산(釜山)}.
+인천(仁川)\index{인천@인천(仁川)}.
+대구(大邱)\index{대구@대구(大邱)}.
+대전(大田)\index{대전@대전(大田)}.
+광주(光州)\index{광주@광주(光州)}.
+울산(蔚山)\index{울산@울산(蔚山)}.
+평양(平壤)\index{평양@평양(平壤)}.
+\end{otherlanguage}
+
+\subsection{Chinese (Hanzi)}
+\begin{otherlanguage}{tchinese}
+這是中文文本。
+\foreignlanguage{schinese}{这是中文文本。}
+
+北京\index{北京}。
+上海\index{上海}。
+天津\index{天津}。
+廈門\foreignlanguage{schinese}{(厦门)}\index{廈門@廈門\foreignlanguage{schinese}{(厦门)}}。
+深圳\index{深圳}。
+成都\index{成都}。
+杭州\index{杭州}。
+香港\index{香港}。
+臺北\index{臺北}。
+高雄\index{高雄}。
+桃園\foreignlanguage{schinese}{(桃园)}\index{桃園@桃園\foreignlanguage{schinese}{(桃园)}}。
+\end{otherlanguage}
+
+\section{Cyrillic}
+\fontencoding{T2A}\selectfont
+Здесь русский текст.
+
+Москва\index{Москва}.
+Санкт-Петербург\index{Санкт-Петербург}.
+Новосибирск\index{Новосибирск}.
+Київ\index{Київ}.
+Одеса\index{Одеса}.
+Харків\index{Харків}.
+София\index{София}.
+Београд\index{Београд}.
+Бишкек\index{Бишкек}.
+Скопје\index{Скопје}.
+Мінск\index{Мінск}.
+Нұр-Сұлтан\index{Нұр-Сұлтан}.
+
+\selectlanguage{english}
+\fontencoding{T1}\selectfont
+
+\printindex
+
+\end{document}
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/haranoaji-uptex.map b/Master/texmf-dist/doc/support/upmendex/samples/latex/haranoaji-uptex.map
new file mode 100644
index 00000000000..45a8efebf1f
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/haranoaji-uptex.map
@@ -0,0 +1,40 @@
+%
+% dvipdfmx map file for upTeX and HaranoAji fonts
+%
+% Ref.
+% https://github.com/trueroad/HaranoAjiFonts
+% https://github.com/trueroad/HaranoAjiFontsCN
+% https://github.com/trueroad/HaranoAjiFontsTW
+% https://github.com/trueroad/HaranoAjiFontsK1
+%
+% You may freely use, modify and/or distribute this file.
+%
+rml H HaranoAjiMincho-Regular.otf
+rmlv V HaranoAjiMincho-Regular.otf
+gbm H HaranoAjiGothic-Medium.otf
+gbmv V HaranoAjiGothic-Medium.otf
+
+urml UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
+urmlv UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
+ugbm UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
+ugbmv UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-h UniJISup-UTF16-H HaranoAjiMincho-Regular.otf
+uprml-v UniJISup-UTF16-V HaranoAjiMincho-Regular.otf
+upgbm-h UniJISup-UTF16-H HaranoAjiGothic-Medium.otf
+upgbm-v UniJISup-UTF16-V HaranoAjiGothic-Medium.otf
+uprml-hq UniJIS-UCS2-H HaranoAjiMincho-Regular.otf
+upgbm-hq UniJIS-UCS2-H HaranoAjiGothic-Medium.otf
+
+uphysmjm-h UniKS-UTF16-H HaranoAjiMinchoK1-Regular.otf
+uphysmjm-v UniKS-UTF16-V HaranoAjiMinchoK1-Regular.otf
+uphygt-h UniKS-UTF16-H HaranoAjiGothicK1-Medium.otf
+uphygt-v UniKS-UTF16-V HaranoAjiGothicK1-Medium.otf
+upstsl-h UniGB-UTF16-H HaranoAjiMinchoCN-Regular.otf
+upstsl-v UniGB-UTF16-V HaranoAjiMinchoCN-Regular.otf
+upstht-h UniGB-UTF16-H HaranoAjiGothicCN-Medium.otf
+upstht-v UniGB-UTF16-V HaranoAjiGothicCN-Medium.otf
+upmsl-h UniCNS-UTF16-H HaranoAjiMinchoTW-Regular.otf
+upmsl-v UniCNS-UTF16-V HaranoAjiMinchoTW-Regular.otf
+upmhm-h UniCNS-UTF16-H HaranoAjiGothicTW-Medium.otf
+upmhm-v UniCNS-UTF16-V HaranoAjiGothicTW-Medium.otf
+
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg0.ist b/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg0.ist
new file mode 100644
index 00000000000..11e6ca45266
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg0.ist
@@ -0,0 +1,32 @@
+% -*- coding: utf-8 -*-
+
+delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill \\textenglish{"
+delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill \\textenglish{"
+delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill \\textenglish{"
+delim_t "}"
+
+lethead_flag 1
+lethead_prefix "\n\\centerline{\\bfseries \\textenglish{---} "
+lethead_suffix " \\textenglish{---}}\\par\\nobreak"
+
+icu_locale "ja@collation=unihan"
+hanzi_head "一部;丨部;丶部;丿部;乙部;亅部;二部;亠部;人部;儿部;入部;八部;冂部;冖部;冫部;几部;凵部;刀部;力部;勹部;匕部;匚部;匸部;十部;卜部;卩部;厂部;厶部;又部;口部;囗部;土部;士部;夂部;夊部;夕部;大部;女部;子部;宀部;寸部;小部;尢部;尸部;屮部;山部;巛部;工部;己部;巾部;干部;幺部;广部;廴部;廾部;弋部;弓部;彐部;彡部;彳部;心部;戈部;戶部;手部;支部;攴部;文部;斗部;斤部;方部;无部;日部;曰部;月部;木部;欠部;止部;歹部;殳部;毋部;比部;毛部;氏部;气部;水部;火部;爪部;父部;爻部;爿部;片部;牙部;牛部;犬部;玄部;玉部;瓜部;瓦部;甘部;生部;用部;田部;疋部;疒部;癶部;白部;皮部;皿部;目部;矛部;矢部;石部;示部;禸部;禾部;穴部;立部;竹部;米部;糸部;缶部;网部;羊部;羽部;老部;而部;耒部;耳部;聿部;肉部;臣部;自部;至部;臼部;舌部;舛部;舟部;艮部;色部;艸部;虍部;虫部;血部;行部;衣部;襾部;見部;角部;言部;谷部;豆部;豕部;豸部;貝部;赤部;走部;足部;身部;車部;辛部;辰部;辵部;邑部;酉部;釆部;里部;金部;長部;門部;阜部;隶部;隹部;雨部;靑部;非部;面部;革部;韋部;韭部;音部;頁部;風部;飛部;食部;首部;香部;馬部;骨部;高部;髟部;鬥部;鬯部;鬲部;鬼部;魚部;鳥部;鹵部;鹿部;麥部;麻部;黃部;黍部;黑部;黹部;黽部;鼎部;鼓部;鼠部;鼻部;齊部;齒部;龍部;龜部;龠部"
+
+script_preamble hangul "\n\n\\begin{korean}"
+script_postamble hangul "\n\\end{korean}"
+script_preamble kana "\n\n\\begin{japanese}"
+script_postamble kana "\n\\end{japanese}"
+script_preamble hanzi "\n\n\\begin{chinese}"
+script_postamble hanzi "\n\\end{chinese}"
+script_preamble cyrillic "\n\n\\begin{russian}"
+script_postamble cyrillic "\n\\end{russian}"
+script_preamble greek "\n\n\\begin{greek}"
+script_postamble greek "\n\\end{greek}"
+script_preamble devanagari "\n\n\\begin{hindi}"
+script_postamble devanagari "\n\\end{hindi}"
+script_preamble thai "\n\n\\begin{thai}"
+script_postamble thai "\n\\end{thai}"
+script_preamble hebrew "\n\n\\begin{hebrew}"
+script_postamble hebrew "\n\\end{hebrew}"
+script_preamble arabic "\n\n\\begin{Arabic}"
+script_postamble arabic "\n\\end{Arabic}"
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg1.ist b/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg1.ist
new file mode 100644
index 00000000000..308bc882882
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/latex/mlg1.ist
@@ -0,0 +1,19 @@
+% -*- coding: utf-8 -*-
+
+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"
+
+icu_locale "ja@collation=unihan"
+hanzi_head "一部;丨部;丶部;丿部;乙部;亅部;二部;亠部;人部;儿部;入部;八部;冂部;冖部;冫部;几部;凵部;刀部;力部;勹部;匕部;匚部;匸部;十部;卜部;卩部;厂部;厶部;又部;口部;囗部;土部;士部;夂部;夊部;夕部;大部;女部;子部;宀部;寸部;小部;尢部;尸部;屮部;山部;巛部;工部;己部;巾部;干部;幺部;广部;廴部;廾部;弋部;弓部;彐部;彡部;彳部;心部;戈部;戶部;手部;支部;攴部;文部;斗部;斤部;方部;无部;日部;曰部;月部;木部;欠部;止部;歹部;殳部;毋部;比部;毛部;氏部;气部;水部;火部;爪部;父部;爻部;爿部;片部;牙部;牛部;犬部;玄部;玉部;瓜部;瓦部;甘部;生部;用部;田部;疋部;疒部;癶部;白部;皮部;皿部;目部;矛部;矢部;石部;示部;禸部;禾部;穴部;立部;竹部;米部;糸部;缶部;网部;羊部;羽部;老部;而部;耒部;耳部;聿部;肉部;臣部;自部;至部;臼部;舌部;舛部;舟部;艮部;色部;艸部;虍部;虫部;血部;行部;衣部;襾部;見部;角部;言部;谷部;豆部;豕部;豸部;貝部;赤部;走部;足部;身部;車部;辛部;辰部;辵部;邑部;酉部;釆部;里部;金部;長部;門部;阜部;隶部;隹部;雨部;靑部;非部;面部;革部;韋部;韭部;音部;頁部;風部;飛部;食部;首部;香部;馬部;骨部;高部;髟部;鬥部;鬯部;鬲部;鬼部;魚部;鳥部;鹵部;鹿部;麥部;麻部;黃部;黍部;黑部;黹部;黽部;鼎部;鼓部;鼠部;鼻部;齊部;齒部;龍部;龜部;龠部"
+
+script_preamble hangul "\n\n\\begin{otherlanguage}{korean}"
+script_postamble hangul "\n\\end{otherlanguage}"
+script_preamble hanzi "\n\n\\begin{otherlanguage}{tchinese}"
+script_postamble hanzi "\n\\end{otherlanguage}"
+script_preamble cyrillic "\n\n\\fontencoding{T2A}\\selectfont"
+script_postamble cyrillic "\n\\fontencoding{T1}\\selectfont"
diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty00.ist b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty00.ist
index 06c3eea2d0c..06c3eea2d0c 100644
--- a/Master/texmf-dist/doc/upmendex/samples/mdxsty00.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty00.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty01.ist
index 24f4f5ff3be..24f4f5ff3be 100644
--- a/Master/texmf-dist/doc/upmendex/samples/mdxsty01.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty01.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty02.ist
index f0536dd8638..f0536dd8638 100644
--- a/Master/texmf-dist/doc/upmendex/samples/mdxsty02.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty02.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty03.ist
index 8b570699193..8b570699193 100644
--- a/Master/texmf-dist/doc/upmendex/samples/mdxsty03.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/mdxsty03.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/multi.idx b/Master/texmf-dist/doc/support/upmendex/samples/multi.idx
index 55675322109..29753bed433 100644
--- a/Master/texmf-dist/doc/upmendex/samples/multi.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/multi.idx
@@ -8,6 +8,7 @@
\indexentry{0120¹₂③❹➄➏🄈⑻⒐㉈🄋🄌}{8}
\indexentry{€$$¢¢££¥¥₩₩฿₹}{9}
\indexentry{☃☎♥⚽☺☝✈🀅🍣👻}{10}
+\indexentry{⁇⁈⁉¡¿†*§¶}{10}
\indexentry{พ่อขุนรามคำแหงมหาราช}{11}
\indexentry{गौतम सिद्धार्थ}{12}
\indexentry{محمد‎}{13}
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/option/Makefile b/Master/texmf-dist/doc/support/upmendex/samples/option/Makefile
new file mode 100644
index 00000000000..bb25080589b
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/Makefile
@@ -0,0 +1,25 @@
+UPMENDEX = upmendex
+
+#
+# test for icu_rules
+#
+rules:
+ for sty in 0; do \
+ $(UPMENDEX) -s mdxsty_attr_default.ist -s rule$$sty.ist -t rule0_$$sty.ilg -o rule0_$$sty.ind attri1.idx ; \
+ done
+
+#
+# test for Japanese
+#
+jp_u:
+ for sty in 00 01 02; do \
+ $(UPMENDEX) japanese.idx -s mdxsty_j$$sty.ist -d kana.dic -t japanese_$$sty-umdx.ilg -o japanese_$$sty-umdx.ind ; \
+ $(UPMENDEX) japanese.idx -l -s mdxsty_j$$sty.ist -d kana.dic -t japanese_l_$$sty-umdx.ilg -o japanese_l_$$sty-umdx.ind ; \
+ $(UPMENDEX) japanese.idx -c -s mdxsty_j$$sty.ist -d kana.dic -t japanese_c_$$sty-umdx.ilg -o japanese_c_$$sty-umdx.ind ; \
+ $(UPMENDEX) japanese.idx -l -c -s mdxsty_j$$sty.ist -d kana.dic -t japanese_lc_$$sty-umdx.ilg -o japanese_lc_$$sty-umdx.ind ; \
+ $(UPMENDEX) japanese.idx -r -s mdxsty_j$$sty.ist -d kana.dic -t japanese_r_$$sty-umdx.ilg -o japanese_r_$$sty-umdx.ind ; \
+ $(UPMENDEX) japanese.idx -g -s mdxsty_j$$sty.ist -d kana.dic -t japanese_g_$$sty-umdx.ilg -o japanese_g_$$sty-umdx.ind ; \
+ done
+
+clean:
+ rm -f *.ind *.ilg
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx b/Master/texmf-dist/doc/support/upmendex/samples/option/attri1.idx
index 32b12767cb3..32b12767cb3 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/attri1.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/attri1.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/japanese.idx b/Master/texmf-dist/doc/support/upmendex/samples/option/japanese.idx
index f0f6f8ac14a..f0f6f8ac14a 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/japanese.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/japanese.idx
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh31.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_attr_default.ist
index c3584031e7c..f4335634706 100644
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_zh31.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_attr_default.ist
@@ -8,5 +8,5 @@ lethead_flag 1
lethead_prefix "\n\\centerline{\\bfseries --- "
lethead_suffix " ---}\\par\\nobreak"
-icu_locale "zh@collation=zhuyin"
+priority 0
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j00.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j00.ist
index 93ca3f5c151..93ca3f5c151 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j00.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j00.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j01.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j01.ist
index b3b09443012..b3b09443012 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j01.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j01.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j02.ist
index b5cac2a050c..b5cac2a050c 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_j02.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_j02.ist
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_rule0.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_rule0.ist
index 451656ba59d..451656ba59d 100644
--- a/Master/texmf-dist/doc/upmendex/samples/option/mdxsty_rule0.ist
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/mdxsty_rule0.ist
diff --git a/Master/texmf-dist/doc/support/upmendex/samples/option/rule0.ist b/Master/texmf-dist/doc/support/upmendex/samples/option/rule0.ist
new file mode 100644
index 00000000000..4df5c21a46d
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/samples/option/rule0.ist
@@ -0,0 +1,3 @@
+% -*- coding: utf-8 -*-
+
+% icu_rules ""
diff --git a/Master/texmf-dist/doc/upmendex/samples/russian.idx b/Master/texmf-dist/doc/support/upmendex/samples/russian.idx
index 3debb484205..3debb484205 100644
--- a/Master/texmf-dist/doc/upmendex/samples/russian.idx
+++ b/Master/texmf-dist/doc/support/upmendex/samples/russian.idx
diff --git a/Master/texmf-dist/doc/support/upmendex/upmendex-slide-ctan.pdf b/Master/texmf-dist/doc/support/upmendex/upmendex-slide-ctan.pdf
new file mode 100644
index 00000000000..f36cbf70157
--- /dev/null
+++ b/Master/texmf-dist/doc/support/upmendex/upmendex-slide-ctan.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/upmendex/upmendex.ja.txt b/Master/texmf-dist/doc/support/upmendex/upmendex.ja.txt
index 22b2ab6230a..578e71fe29e 100644
--- a/Master/texmf-dist/doc/upmendex/upmendex.ja.txt
+++ b/Master/texmf-dist/doc/support/upmendex/upmendex.ja.txt
@@ -331,10 +331,12 @@ upmendex - 索引整形ツール
character_order <文字列>
"SNLGCJKHDTah"
- 記号、英字、日本語の優先順位。'S'は記号、'N'は数字、'L'はラテン文字、
- 'G'はギリシャ文字、'C'はキリル文字、'J'は日本語(かな)、'K'はハングル、
+ 記号、ラテン文字、日本語(かな)などスクリプトの優先順位。'S'は記号、'N'は数字、
+ 'L'はラテン文字、'G'はギリシャ文字、'C'はキリル文字、'J'は日本語(かな)、'K'はハングル、
'H'は漢字、'D'はデーヴァナーガリー、'T'はタイ文字、
'a'はアラビア文字、'h'はヘブライ文字を表す。
+ '@'はこのパラメータで明示されていないスクリプトを表し
+ icu_rulesまたは icu_locale で設定された優先順位に従う。
symbol_flag=1のとき、索引項目の分類として「数字」は「記号」に含めるので、
'S'と'N'は必ず隣り合わせること(数字と数字以外の記号の順序入れ替えは可能)。
(upmendex専用)
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist
deleted file mode 100644
index 9bd0d7ef14f..00000000000
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es1.ist
+++ /dev/null
@@ -1,4 +0,0 @@
-% -*- coding: utf-8 -*-
-
-icu_locale "es@collation=traditional"
-
diff --git a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist b/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist
deleted file mode 100644
index c71fbd7a7b5..00000000000
--- a/Master/texmf-dist/doc/upmendex/samples/alphabet/mdxsty_es2.ist
+++ /dev/null
@@ -1,4 +0,0 @@
-% -*- coding: utf-8 -*-
-
-icu_locale "es@collation=search"
-
diff --git a/Master/texmf-dist/doc/upmendex/samples/option/Makefile b/Master/texmf-dist/doc/upmendex/samples/option/Makefile
deleted file mode 100644
index f9157d609cc..00000000000
--- a/Master/texmf-dist/doc/upmendex/samples/option/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-UPMENDEX = upmendex
-
-#
-# test for icu_rules
-#
-rules:
- for sty in rule0; do \
- $(UPMENDEX) -f attri1.idx -s mdxsty_$$sty.ist -o attri1_$$sty.ind ; \
- done
-
-#
-# test for Japanese
-#
-jp_u:
- for sty in 00 01 02; do \
- $(UPMENDEX) japanese.idx -s mdxsty_j$$sty.ist -o japanese_$$sty-umdx.ind ; \
- $(UPMENDEX) japanese.idx -l -s mdxsty_j$$sty.ist -o japanese_l_$$sty-umdx.ind ; \
- $(UPMENDEX) japanese.idx -c -s mdxsty_j$$sty.ist -o japanese_c_$$sty-umdx.ind ; \
- $(UPMENDEX) japanese.idx -l -c -s mdxsty_j$$sty.ist -o japanese_lc_$$sty-umdx.ind ; \
- $(UPMENDEX) japanese.idx -r -s mdxsty_j$$sty.ist -o japanese_r_$$sty-umdx.ind ; \
- $(UPMENDEX) japanese.idx -g -s mdxsty_j$$sty.ist -o japanese_g_$$sty-umdx.ind ; \
- done
-
-clean:
- rm -f *.ind *.ilg
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 91eb6abe734..692bfd3e597 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -862,7 +862,7 @@ my @TLP_working = qw(
universa universalis univie-ling unizgklasa
unravel unswcover
uol-physics-report uothesis uowthesis uowthesistitlepage
- upca uplatex upmethodology uppunctlm upquote
+ upca uplatex upmendex upmethodology uppunctlm upquote
uptex-base uptex-fonts upzhkinsoku
uri url urlbst urcls urwchancal usebib ushort uspace uspatent
ut-thesis utexasthesis utf8add utf8mex utfsym uvaletter
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 287929a3305..3c96b9fec3b 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1802,6 +1802,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'unicode-alphabets' => '&POST_onelevel',
'unimath-plain-xetex' => '&POSTunimath_plain_xetex',
'uplatex' => '&POST_preserve_man',
+ 'upmendex' => '&POSTupmendex',
'velthuis' => '&POSTvelthuis',
'webquiz' => '&POST_deref_symlink',
'writeongrid' => '&POST_onelevel',
@@ -4030,7 +4031,7 @@ sub set_dir_defaults {
$guess = "$standarddocfmt for fmt/docfmt/srcfmt";
} elsif ($ctan_dir
- =~ m!/(CTAN|tex-archive)/(support|web|graphics/.*/scripts)/!) {
+ =~ m!/(CTAN|tex-archive)/(indexing|support|web|graphics/.*/scripts)/!) {
$standarddocfmt = $standardsourcefmt = "support";
$guess = "$standarddocfmt for docfmt/srcfmt";
@@ -7521,6 +7522,16 @@ sub POSTunimath_plain_xetex {
&SYSTEM ("$MV doc/* .");
}
+sub POSTupmendex {
+ print "POST$package - redistribute macro and doc files, rm source\n";
+ &SYSTEM ("$RM -r source"); # in our sources
+ #
+ my $mandir = "$DEST/man/man1";
+ &mv_with_mkdir ("man/*" => $mandir);
+ #
+ &SYSTEM ("$MV doc/* .");
+}
+
sub POSTvelthuis {
print "POST$package - redistribute macro and doc files\n";
#
diff --git a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
index 6d6cb4223af..bda4e4c50cf 100644
--- a/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-binextra.tlpsrc
@@ -106,6 +106,7 @@ depend tie
depend tlcockpit
depend tpic2pdftex
depend typeoutfileinfo
+depend upmendex
depend web
depend xindex
depend xindy
diff --git a/Master/tlpkg/tlpsrc/upmendex.tlpsrc b/Master/tlpkg/tlpsrc/upmendex.tlpsrc
new file mode 100644
index 00000000000..ff74759b2e4
--- /dev/null
+++ b/Master/tlpkg/tlpsrc/upmendex.tlpsrc
@@ -0,0 +1,2 @@
+category TLCore
+binpattern f bin/${ARCH}/${PKGNAME}
diff --git a/Master/tlpkg/tlpsrc/uptex.tlpsrc b/Master/tlpkg/tlpsrc/uptex.tlpsrc
index 5b39b7c0c67..a1faf304f18 100644
--- a/Master/tlpkg/tlpsrc/uptex.tlpsrc
+++ b/Master/tlpkg/tlpsrc/uptex.tlpsrc
@@ -21,7 +21,6 @@ binpattern f bin/${ARCH}/r-upmpost
binpattern f bin/${ARCH}/upbibtex
binpattern f bin/${ARCH}/updvitomp
binpattern f bin/${ARCH}/updvitype
-binpattern f bin/${ARCH}/upmendex
binpattern f bin/${ARCH}/upmpost
binpattern f bin/${ARCH}/uppltotf
binpattern f bin/${ARCH}/uptex
@@ -30,11 +29,9 @@ binpattern f bin/${ARCH}/wovp2ovf
docpattern +f texmf-dist/doc/man/man1/euptex.*
docpattern +f texmf-dist/doc/man/man1/upbibtex.*
-docpattern +f texmf-dist/doc/man/man1/upmendex.*
docpattern +f texmf-dist/doc/man/man1/uppltotf.*
docpattern +f texmf-dist/doc/man/man1/uptex.*
docpattern +f texmf-dist/doc/man/man1/uptftopl.*
-docpattern +d texmf-dist/doc/upmendex
# uptex-base excludes:
runpattern +!d texmf-dist/tex/uptex/uptex-base