From dd6020cfa95fdd8a9ff7dc354403fe9525d3705b Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Sun, 9 Oct 2022 00:06:04 +0000 Subject: upmendex: tweak git-svn-id: svn://tug.org/texlive/trunk@64660 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/README | 2 +- Build/source/texk/upmendex/ChangeLog | 2 +- Build/source/texk/upmendex/convert.c | 5 +++++ Build/source/texk/upmendex/main.c | 10 +++++----- 4 files changed, 12 insertions(+), 7 deletions(-) (limited to 'Build/source') diff --git a/Build/source/texk/README b/Build/source/texk/README index 5894f768fe1..325c2300360 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -107,7 +107,7 @@ ttf2pk2 - maintained here, by us 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 diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog index dbf8d8a6d8e..0d5f6c41b61 100644 --- a/Build/source/texk/upmendex/ChangeLog +++ b/Build/source/texk/upmendex/ChangeLog @@ -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. diff --git a/Build/source/texk/upmendex/convert.c b/Build/source/texk/upmendex/convert.c index 67b6623236e..2760059a063 100644 --- a/Build/source/texk/upmendex/convert.c +++ b/Build/source/texk/upmendex/convert.c @@ -46,6 +46,11 @@ void initkanatable(void) 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 */ diff --git a/Build/source/texk/upmendex/main.c b/Build/source/texk/upmendex/main.c index 47242352009..c94280ff933 100644 --- a/Build/source/texk/upmendex/main.c +++ b/Build/source/texk/upmendex/main.c @@ -241,10 +241,6 @@ int main(int argc, char **argv) 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,6 +251,11 @@ int main(int argc, char **argv) } set_icu_attributes(); + init_icu_collator(); + +/* init kanatable */ + + initkanatable(); /* read dictionary */ @@ -284,7 +285,6 @@ int main(int argc, char **argv) break; } if (u_strlen(kana_head)==0) u_strcpy(kana_head,atama); - init_icu_collator(); /* read idx file */ -- cgit v1.2.3