texlive[64660] Build/source/texk: upmendex: tweak

[commits+takuji at tug.org]

Revision: 64660
          http://tug.org/svn/texlive?view=revision&revision=64660
Author:   takuji
Date:     2022-10-09 02:06:04 +0200 (Sun, 09 Oct 2022)
Log Message:
-----------
upmendex: tweak

Modified Paths:
--------------
    trunk/Build/source/texk/README
    trunk/Build/source/texk/upmendex/ChangeLog
    trunk/Build/source/texk/upmendex/convert.c
    trunk/Build/source/texk/upmendex/main.c

Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README	2022-10-08 23:49:46 UTC (rev 64659)
+++ trunk/Build/source/texk/README	2022-10-09 00:06:04 UTC (rev 64660)
@@ -107,7 +107,7 @@
 
 ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
 
-upmendex 1.01 - by Takuji Tanaka
+upmendex 1.05 - by Takuji Tanaka
   https://ctan.org/pkg/upmendex
   https://github.com/t-tk/upmendex-package
 

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2022-10-08 23:49:46 UTC (rev 64659)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2022-10-09 00:06:04 UTC (rev 64660)
@@ -2,7 +2,7 @@
 
 	* version 1.05  Stable version.
 	* configure.ac: Bump version.
-	* main.c, sort.c, fwrite.c, {,ex}kana.h, mendex.h:
+	* main.c, sort.c, convert.c, fwrite.c, {,ex}kana.h, mendex.h:
 	Support U+1B001 Hiragana Letter Archaic Ye.
 	* fwrite.c:
 	Strict check for dotted/dotless I/i in Turkish.

Modified: trunk/Build/source/texk/upmendex/convert.c
===================================================================
--- trunk/Build/source/texk/upmendex/convert.c	2022-10-08 23:49:46 UTC (rev 64659)
+++ trunk/Build/source/texk/upmendex/convert.c	2022-10-09 00:06:04 UTC (rev 64660)
@@ -46,6 +46,11 @@
 		if (aiueo[i]==0xd82c) {
 			i++;
 			if (aiueo[i]==0xdd1f) aiueo[i]+=3;  /* U+1B11F -> U+1B122 */
+			if (aiueo[i]==0xdd21) {
+				UChar ch[] = {0xd82c, 0xdc01, 0x0};
+				if (is_jpn_kana(ch))
+					AIUEO[i]=0xdc01;    /* U+1B121 -> U+1B001 */
+			}
 		}
 		else
 			aiueo[i]+=KATATOP-HIRATOP; /* hiragana -> katakana */

Modified: trunk/Build/source/texk/upmendex/main.c
===================================================================
--- trunk/Build/source/texk/upmendex/main.c	2022-10-08 23:49:46 UTC (rev 64659)
+++ trunk/Build/source/texk/upmendex/main.c	2022-10-09 00:06:04 UTC (rev 64660)
@@ -241,10 +241,6 @@
 			    VERSION, icu_version, TL_VERSION);
 	}
 
-/*   init kanatable   */
-
-	initkanatable();
-
 /*   init hangul,devanagari,thai *_head table   */
 	u_strcpy(hangul_head,GANADA);
 	u_strcpy(devanagari_head,DVNG_HEAD);
@@ -255,7 +251,12 @@
 	}
 
 	set_icu_attributes();
+	init_icu_collator();
 
+/*   init kanatable   */
+
+	initkanatable();
+
 /*   read dictionary   */
 
 	ecount+=dicread(dicfile);
@@ -284,7 +285,6 @@
 		break;
 	}
 	if (u_strlen(kana_head)==0) u_strcpy(kana_head,atama);
-	init_icu_collator();
 
 /*   read idx file   */