upmendex: v0.57, Add "kana_head" to style file

git-svn-id: svn://tug.org/texlive/trunk@59488 c570f23f-e606-0410-a88d-b1316a301751

18 files changed, 178 insertions, 47 deletions

diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index a907862a2bc..8db4eb24514 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,19 @@
+2021-06-06  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
+
+	* version 0.57  Beta version.
+	* configure.ac: Bump version.
+	* main.c, styfile.c:
+	Accept multiple numbers of style files by option '-s'.
+	* main.c, sort.c, styfile.c, fwrite.c, {,ex}kana.h, {,ex}var.h:
+	Add a keyword "kana_head" to style file.
+	Treat "Circled Katakana" as kana.
+	* tests/upmendex.test, tests/uni[12].ist,
+	tests/rangetwo.{idx,ind,ist}:
+	Add new tests.
+	* upmendex.ja.txt:
+	Update document.
+	Ref. https://github.com/texjporg/tex-jp-build/issues/116
+
 2021-05-19  TANAKA Takuji  <ttk@t-lab.opal.ne.jp>
 
 	* version 0.56  Beta version.
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index 6c6ce883b03..bdad2f6dde9 100755
--- a/Build/source/texk/upmendex/configure
+++ b/Build/source/texk/upmendex/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for upmendex (TeX Live) 0.56.
+# Generated by GNU Autoconf 2.69 for upmendex (TeX Live) 0.57.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='upmendex (TeX Live)'
 PACKAGE_TARNAME='upmendex--tex-live-'
-PACKAGE_VERSION='0.56'
-PACKAGE_STRING='upmendex (TeX Live) 0.56'
+PACKAGE_VERSION='0.57'
+PACKAGE_STRING='upmendex (TeX Live) 0.57'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1345,7 +1345,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.56 to adapt to many kinds of systems.
+\`configure' configures upmendex (TeX Live) 0.57 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1416,7 +1416,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of upmendex (TeX Live) 0.56:";;
+     short | recursive ) echo "Configuration of upmendex (TeX Live) 0.57:";;
    esac
   cat <<\_ACEOF
 
@@ -1541,7 +1541,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-upmendex (TeX Live) configure 0.56
+upmendex (TeX Live) configure 0.57
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2474,7 +2474,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.56, which was
+It was created by upmendex (TeX Live) $as_me 0.57, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8668,7 +8668,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='upmendex--tex-live-'
- VERSION='0.56'
+ VERSION='0.57'
 
 
 # Some tools Automake needs.
@@ -18197,7 +18197,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-upmendex (TeX Live) config.lt 0.56
+upmendex (TeX Live) config.lt 0.57
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -20337,7 +20337,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.56, which was
+This file was extended by upmendex (TeX Live) $as_me 0.57, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20403,7 +20403,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-upmendex (TeX Live) config.status 0.56
+upmendex (TeX Live) config.status 0.57
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac
index f48f439160b..026e227405a 100644
--- a/Build/source/texk/upmendex/configure.ac
+++ b/Build/source/texk/upmendex/configure.ac
@@ -8,7 +8,7 @@ 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.56])
+AC_INIT([upmendex (TeX Live)], [0.57])
 AC_PREREQ([2.63])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/upmendex/exkana.h b/Build/source/texk/upmendex/exkana.h
index 8deaa6a0ebf..30366b3c41f 100644
--- a/Build/source/texk/upmendex/exkana.h
+++ b/Build/source/texk/upmendex/exkana.h
@@ -4,6 +4,7 @@ extern UChar AIUEO[];
 extern UChar *aiueo;
 extern UChar kanatable[];
 extern UChar extkanatable[];
+extern UChar circkanatable[];
 
 extern UChar GANADA[];
 
@@ -17,7 +18,10 @@ extern UChar GANADA[];
 #define KATAEND  0x30fa    /* ヺ */
 #define EXKANATOP  0x31F0  /* ㇰ */
 #define EXKANAEND  0x31FF  /* ㇿ */
+#define CRKANATOP  0x32D0  /* ㋐ */
+#define CRKANAEND  0x32FE  /* ㋾ */
 
 #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)
diff --git a/Build/source/texk/upmendex/exvar.h b/Build/source/texk/upmendex/exvar.h
index 093a87d8415..7ae15f0f5fe 100644
--- a/Build/source/texk/upmendex/exvar.h
+++ b/Build/source/texk/upmendex/exvar.h
@@ -31,7 +31,7 @@ extern char symhead_positive[],symhead_negative[];
 extern char numhead_positive[],numhead_negative[];
 extern int symbol_flag;
 extern int letter_head;
-extern UChar atama[],tumunja[],hanzi_head[];
+extern UChar atama[],tumunja[],hanzi_head[],kana_head[];
 extern char page_compositor[],page_precedence[];
 extern char character_order[];
 extern char icu_locale[],icu_rules[];
diff --git a/Build/source/texk/upmendex/fwrite.c b/Build/source/texk/upmendex/fwrite.c
index 380e1cbf37a..5308c69109f 100644
--- a/Build/source/texk/upmendex/fwrite.c
+++ b/Build/source/texk/upmendex/fwrite.c
@@ -665,23 +665,27 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
 		ini[0]=kanatable[ch-KATATOP];
 		return;
 	}
-	if (is_extkana(ch)) {
+	if (is_extkana(ch)) {      /* ㇰㇱㇲㇳㇴ .. ㇻㇼㇽㇾㇿ */
 		ini[0]=extkanatable[ch-EXKANATOP];
 		return;
 	}
-	else if (ch==0x309F) { ini[0]=0x30E8; return; }  /* HIRAGANA YORI -> ヨ */
-	else if (ch==0x30FF) { ini[0]=0x30B3; return; }  /* KATAKANA KOTO -> コ */
+	if (is_circkana(ch)) {     /* ㋐㋑㋒㋓㋔ .. ㋻㋼㋽㋾ */
+		ini[0]=circkanatable[ch-CRKANATOP];
+		return;
+	}
+	else 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 0x1B150: case 0x1B164:
-				ini[0]=0x30F0; break;  /* ヰ */
+				ini[0]=0x3090; break;  /* ゐ */
 			case 0x1B151: case 0x1B165:
-				ini[0]=0x30F1; break;  /* ヱ */
+				ini[0]=0x3091; break;  /* ゑ */
 			case 0x1B152: case 0x1B166:
-				ini[0]=0x30F2; break;  /* ヲ */
+				ini[0]=0x3092; break;  /* を */
 			case 0x1B167: default:
-				ini[0]=0x30F3; break;  /* ン */
+				ini[0]=0x3093; break;  /* ん */
 		}
 		return;
 	}
diff --git a/Build/source/texk/upmendex/kana.h b/Build/source/texk/upmendex/kana.h
index 3eedb64d898..3a311573e9d 100644
--- a/Build/source/texk/upmendex/kana.h
+++ b/Build/source/texk/upmendex/kana.h
@@ -192,6 +192,56 @@ 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/Build/source/texk/upmendex/main.c b/Build/source/texk/upmendex/main.c
index 884c64c15ff..f96ae8ff544 100644
--- a/Build/source/texk/upmendex/main.c
+++ b/Build/source/texk/upmendex/main.c
@@ -9,7 +9,7 @@
 
 #include "kp.h"
 
-char *styfile,*idxfile[256],*indfile,*dicfile,*logfile;
+char *styfile[64],*idxfile[256],*indfile,*dicfile,*logfile;
 
 /* default paths */
 #ifndef DEFAULT_INDEXSTYLES
@@ -22,7 +22,7 @@ KpathseaSupportInfo kp_ist,kp_dict;
 
 int main(int argc, char **argv)
 {
-	int i,j,cc=0,startpagenum=-1,ecount=0,chkopt=1;
+	int i,j,k,cc=0,startpagenum=-1,ecount=0,chkopt=1;
 	const char *envbuff;
 	UVersionInfo icuVersion;
 	char icu_version[U_MAX_VERSION_STRING_LENGTH] = "";
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
 
 /*   check options   */
 
-	for (i=1,j=0;i<argc && j<256;i++) {
+	for (i=1,j=k=0;i<argc && j<256;i++) {
 		if ((argv[i][0]=='-')&&(strlen(argv[i])>=2)&&chkopt) {
 			switch (argv[i][1]) {
 			case 'c':
@@ -135,12 +135,17 @@ int main(int argc, char **argv)
 				break;
 
 			case 's':
+				if (k==64) {
+					fprintf (stderr, "Too many style files.\n");
+					exit(255);
+				}
 				if ((argv[i][2]=='\0')&&(i+1<argc)) {
-					styfile=xstrdup(argv[++i]);
+					styfile[k]=xstrdup(argv[++i]);
 				}
 				else {
-					styfile=xstrdup(&argv[i][2]);
+					styfile[k]=xstrdup(&argv[i][2]);
 				}
+				k++;
 				break;
 
 			case 'v':
@@ -190,10 +195,10 @@ int main(int argc, char **argv)
 
 	if (idxcount==0) idxcount=fsti=1;
 
-	if (styfile==NULL) {
+	if (styfile[0]==NULL) {
 		envbuff=kpse_var_value("INDEXDEFAULTSTYLE");
 		if (envbuff!=NULL) {
-			styfile=xstrdup(envbuff);
+			styfile[0]=xstrdup(envbuff);
 		}
 	}
 
@@ -227,12 +232,6 @@ int main(int argc, char **argv)
 		logfile=xstrdup("stderr");
 	}
 
-/*   init hangul tumunja table   */
-	u_strcpy(tumunja,GANADA);
-	if (styfile!=NULL) styread(styfile);
-
-	set_icu_attributes();
-
 	if (strcmp(argv[0],"makeindex")==0) {
 		verb_printf(efp,"This is Not `MAKEINDEX\', But `UPMENDEX\' %s (%s).\n",
 			    VERSION, TL_VERSION);
@@ -246,6 +245,15 @@ int main(int argc, char **argv)
 
 	initkanatable();
 
+/*   init hangul tumunja table   */
+	u_strcpy(tumunja,GANADA);
+
+	for (k=0;styfile[k]!=NULL;k++) {
+		styread(styfile[k]);
+	}
+
+	set_icu_attributes();
+
 /*   read dictionary   */
 
 	ecount+=dicread(dicfile);
@@ -273,6 +281,7 @@ int main(int argc, char **argv)
 	default:
 		break;
 	}
+	if (u_strlen(kana_head)>0) u_strcpy(atama,kana_head);
 
 /*   read idx file   */
 
diff --git a/Build/source/texk/upmendex/sort.c b/Build/source/texk/upmendex/sort.c
index 15272dc8594..1654355438c 100644
--- a/Build/source/texk/upmendex/sort.c
+++ b/Build/source/texk/upmendex/sort.c
@@ -370,6 +370,7 @@ int is_jpn_kana(UChar *c)
 
 	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 */
 
 	if (is_surrogate_pair(c)) {
 		c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
diff --git a/Build/source/texk/upmendex/styfile.c b/Build/source/texk/upmendex/styfile.c
index 6091f61c46b..b6e35ea3324 100644
--- a/Build/source/texk/upmendex/styfile.c
+++ b/Build/source/texk/upmendex/styfile.c
@@ -49,6 +49,7 @@ void styread(const char *filename)
 		fprintf(stderr,"%s does not exist.\n",filename);
 		exit(0);
 	}
+	verb_printf(efp,"Scanning style file %s.",filename);
 
 	for (i=0;;i++) {
 		if (fgets(buff,4095,fp)==NULL) break;
@@ -131,8 +132,8 @@ void styread(const char *filename)
 			letter_head=atoi(&buff[cc]);
 			continue;
 		}
-		if (getparam(buff,"atama",tmp)) {
-			multibyte_to_widechar(atama,STYBUFSIZE,tmp);
+		if (getparam(buff,"kana_head",tmp)) {
+			multibyte_to_widechar(kana_head,STYBUFSIZE,tmp);
 			continue;
 		}
 		if (getparam(buff,"tumunja",tmp)) {
@@ -157,6 +158,8 @@ void styread(const char *filename)
 		if (getparam(buff,"icu_attributes", icu_attr_str   )) continue;
 	}
 	fclose(fp);
+
+	verb_printf(efp,"...done.\n");
 }
 
 /*   analize string parameter of style file   */
diff --git a/Build/source/texk/upmendex/tests/rangetwo.idx b/Build/source/texk/upmendex/tests/rangetwo.idx
new file mode 100644
index 00000000000..d941f7e8315
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/rangetwo.idx
@@ -0,0 +1,2 @@
+\indexentry{entryA}{1}
+\indexentry{entryA}{2}
diff --git a/Build/source/texk/upmendex/tests/rangetwo.ind b/Build/source/texk/upmendex/tests/rangetwo.ind
new file mode 100644
index 00000000000..1119d2fa8e9
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/rangetwo.ind
@@ -0,0 +1,5 @@
+\begin{theindex}
+
+  \item entryA, 1[[sfx2p]]
+
+\end{theindex}
diff --git a/Build/source/texk/upmendex/tests/rangetwo.ist b/Build/source/texk/upmendex/tests/rangetwo.ist
new file mode 100644
index 00000000000..3e986c8935d
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/rangetwo.ist
@@ -0,0 +1,2 @@
+suffix_2p "[[sfx2p]]"
+
diff --git a/Build/source/texk/upmendex/tests/uni1.ist b/Build/source/texk/upmendex/tests/uni1.ist
new file mode 100644
index 00000000000..8e733435cac
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/uni1.ist
@@ -0,0 +1,6 @@
+% -*- coding: utf-8 -*-
+
+delim_0 "\\leaders\\hbox{$\\cdot$}\\hfill "
+delim_1 "\\leaders\\hbox{$\\cdot$}\\hfill "
+delim_2 "\\leaders\\hbox{$\\cdot$}\\hfill "
+
diff --git a/Build/source/texk/upmendex/tests/uni2.ist b/Build/source/texk/upmendex/tests/uni2.ist
new file mode 100644
index 00000000000..5e1492fde69
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/uni2.ist
@@ -0,0 +1,6 @@
+% -*- coding: utf-8 -*-
+
+lethead_flag 1
+lethead_prefix "\n\\centerline{\\bfseries ◆◆◆ "
+lethead_suffix  " ◆◆◆}\\par\\nobreak"
+
diff --git a/Build/source/texk/upmendex/tests/upmendex.test b/Build/source/texk/upmendex/tests/upmendex.test
index 70ff2fac217..b64c045af95 100755
--- a/Build/source/texk/upmendex/tests/upmendex.test
+++ b/Build/source/texk/upmendex/tests/upmendex.test
@@ -7,7 +7,7 @@
 TEXMFCNF=$srcdir/../kpathsea
 export TEXMFCNF
 
-rm -f foo.* uni.* pprec*.*
+rm -f foo.* uni.* pprec*.* rangetwo.*
 
 ./upmendex $srcdir/tests/foo.idx -o foo.ind1 -t foo.ilg1 \
 	&& diff $srcdir/tests/foo.ind foo.ind1 || exit 1
@@ -24,13 +24,25 @@ cat $srcdir/tests/uni.idx | \
 	>uni.ind2 2>uni.ilg2 \
 	&& diff $srcdir/tests/uni.ind uni.ind2 || exit 1
 
-# test for page_precedence
-./upmendex -s $srcdir/tests/pprec0.ist $srcdir/tests/pprecA.idx -o pprecA-0.ind1 -t pprecA-0.ilg \
+./upmendex -d $srcdir/tests/uni.dict -s $srcdir/tests/uni1.ist -s $srcdir/tests/uni2.ist \
+	$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 page_precedence and suffix_3p
+./upmendex -s $srcdir/tests/pprec0.ist $srcdir/tests/pprecA.idx \
+	-o pprecA-0.ind1 -t pprecA-0.ilg \
 	&& diff $srcdir/tests/pprecA-0.ind pprecA-0.ind1 || exit 1
 
-./upmendex -s $srcdir/tests/pprec1.ist $srcdir/tests/pprecA.idx -o pprecA-1.ind1 -t pprecA-1.ilg \
+./upmendex -s $srcdir/tests/pprec1.ist $srcdir/tests/pprecA.idx \
+	-o pprecA-1.ind1 -t pprecA-1.ilg \
 	&& diff $srcdir/tests/pprecA-1.ind pprecA-1.ind1 || exit 1
 
-./upmendex -s $srcdir/tests/pprec2.ist $srcdir/tests/pprecA.idx -o pprecA-2.ind1 -t pprecA-2.ilg \
+./upmendex -s $srcdir/tests/pprec2.ist $srcdir/tests/pprecA.idx \
+	-o pprecA-2.ind1 -t pprecA-2.ilg \
 	&& diff $srcdir/tests/pprecA-2.ind pprecA-2.ind1 || exit 1
 
diff --git a/Build/source/texk/upmendex/upmendex.ja.txt b/Build/source/texk/upmendex/upmendex.ja.txt
index 14809d9bf50..286156f4591 100644
--- a/Build/source/texk/upmendex/upmendex.ja.txt
+++ b/Build/source/texk/upmendex/upmendex.ja.txt
@@ -33,7 +33,7 @@ upmendex - 索引整形ツール
            します。また、前後のブランクは削除されます。
 
    -g      日本語の頭文字の区切りを "あかさた・・・わ" にします。指定しないと
-           "あいうえ・・・わをん" になります。
+           "あいうえ・・・わゐゑをん" になります。
 
    -f      upmendexが未対応のスクリプト(言語)も強制的に出力するモードです。
 
@@ -58,15 +58,16 @@ upmendex - 索引整形ツール
 
    --help  オプションの要約を表示します。
 
-   --      以降はオプション文字列と解釈しません。
+   --      以降はオプション文字列と解釈しません。これは，ファイル名の先頭の文字が
+           '-' であるファイルを扱う場合に有用です。
 
 
 スタイルファイル
 
   スタイルファイルは makeindex のものと上位互換です。 形式は
 <スタイルパラメータ 引数> のリストで構成されます。パラメータの順序は自由です。
+また`%'以降はコメントと見なされます。
   以下にスタイルパラメータの一覧を示します。
-  `%'以降はコメントと見なされます。
 
 入力ファイルスタイルパラメータ
    keyword  <文字列>
@@ -158,13 +159,20 @@ upmendex - 索引整形ツール
 
    lethead_flag  <数値>
       0
-      頭文字の出力のフラグ。0のとき出力しない。1のときは英字を大文字で、
-      -1のときは小文字で、2のときはタイトルケースで出力する。
+      頭文字の出力のフラグ。0のとき出力しない。1のときはラテン文字・
+      ギリシャ文字・キリル文字を大文字で、-1のときは小文字で、
+      2のときはタイトルケースで出力する。
 
    heading_flag  <数値>
       0
       lethead_flagと同じ。
 
+   kana_head  <文字列>
+      ""
+      仮名見出し文字。見出し文字を文字列で指定する。
+      デフォルトでは、letter_head とコマンドラインオプション '-g'
+      の設定に従う。(upmendex専用)
+
    tumunja  <文字列>
       "ㄱㄴㄷㄹㅁㅂㅅㅇㅈㅊㅋㅌㅍㅎ"
       ハングル見出し文字。見出し文字を文字列で指定する。(upmendex専用)
@@ -317,6 +325,7 @@ upmendex - 索引整形ツール
       ICU collatorにおいてlocaleによらずに照合順序を指定する場合、
       照合順序のルールを示す文字列。
       ( Ref. http://userguide.icu-project.org/collation/customization
+             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桁),
@@ -327,7 +336,8 @@ upmendex - 索引整形ツール
    icu_attributes  <文字列>
       ""
       ICU collatorのattribute指定。
-      ( Ref. http://userguide.icu-project.org/collation/customization
+      ( Ref. http://userguide.icu-project.org/collation/customization#TOC-Default-Options
+             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",
@@ -428,3 +438,4 @@ upmendex - 索引整形ツール
 
 International Components for Unicode (ICU)
 http://site.icu-project.org/
+https://unicode-org.github.io/icu/
diff --git a/Build/source/texk/upmendex/var.h b/Build/source/texk/upmendex/var.h
index 679ebae301d..fe566480142 100644
--- a/Build/source/texk/upmendex/var.h
+++ b/Build/source/texk/upmendex/var.h
@@ -32,7 +32,7 @@ char symhead_positive[STYBUFSIZE]={"Symbols"},symhead_negative[STYBUFSIZE]={"sym
 char numhead_positive[STYBUFSIZE]={"Numbers"},numhead_negative[STYBUFSIZE]={"numbers"};
 int symbol_flag=1;
 int letter_head=1;
-UChar atama[STYBUFSIZE],tumunja[STYBUFSIZE],hanzi_head[STYBUFSIZE]={L'\0'};
+UChar atama[STYBUFSIZE],tumunja[STYBUFSIZE],hanzi_head[STYBUFSIZE]={L'\0'},kana_head[STYBUFSIZE]={L'\0'};
 char page_compositor[STYBUFSIZE]={"-"},page_precedence[STYBUFSIZE]={"rnaRA"};
 char character_order[STYBUFSIZE]={"SNLGCJKH"};
 char icu_locale[STYBUFSIZE]={"root"},icu_rules[STYBUFSIZE]={""};