summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-07-06 01:51:47 +0000
committerTakuji Tanaka <ttk@t-lab.opal.ne.jp>2024-07-06 01:51:47 +0000
commitd6f77c7b2409ad3df9702059bb485137271b9dc6 (patch)
treecf852df27bfcc35f425985e345c0ec57f1be2b44
parent91658e1ed5a1940699d6da55e48941fd8f8eb446 (diff)
[upmendex] Improve heading of Ö,ö,Ő,ő,Ü,ü,Ű,ű in Hungarian
git-svn-id: svn://tug.org/texlive/trunk@71719 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/upmendex/ChangeLog9
-rwxr-xr-xBuild/source/texk/upmendex/configure22
-rw-r--r--Build/source/texk/upmendex/configure.ac2
-rw-r--r--Build/source/texk/upmendex/fwrite.c40
4 files changed, 59 insertions, 14 deletions
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index e0f393401a5..915386bdba0 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,12 @@
+2024-07-06 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 1.09 Stable version.
+ * configure.ac: Bump version.
+ * fwrite.c:
+ Improve heading of Ö,ö,Ő,ő,Ü,ü,Ű,ű in Hungarian.
+ Thanks to @hair-splitter for the report.
+ https://github.com/t-tk/upmendex-package/issues/10
+
2024-03-10 Karl Berry <karl@tug.org>
* TL'24 release.
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index 136902fe013..4bf75bcd968 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.72 for upmendex (TeX Live) 1.08.
+# Generated by GNU Autoconf 2.72 for upmendex (TeX Live) 1.09.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
@@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='upmendex (TeX Live)'
PACKAGE_TARNAME='upmendex--tex-live-'
-PACKAGE_VERSION='1.08'
-PACKAGE_STRING='upmendex (TeX Live) 1.08'
+PACKAGE_VERSION='1.09'
+PACKAGE_STRING='upmendex (TeX Live) 1.09'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1378,7 +1378,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) 1.08 to adapt to many kinds of systems.
+'configure' configures upmendex (TeX Live) 1.09 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1450,7 +1450,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of upmendex (TeX Live) 1.08:";;
+ short | recursive ) echo "Configuration of upmendex (TeX Live) 1.09:";;
esac
cat <<\_ACEOF
@@ -1576,7 +1576,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-upmendex (TeX Live) configure 1.08
+upmendex (TeX Live) configure 1.09
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2280,7 +2280,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 1.08, which was
+It was created by upmendex (TeX Live) $as_me 1.09, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -9209,7 +9209,7 @@ fi
# Define the identity of the package.
PACKAGE='upmendex--tex-live-'
- VERSION='1.08'
+ VERSION='1.09'
# Some tools Automake needs.
@@ -19626,7 +19626,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-upmendex (TeX Live) config.lt 1.08
+upmendex (TeX Live) config.lt 1.09
configured by $0, generated by GNU Autoconf 2.72.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21833,7 +21833,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 1.08, which was
+This file was extended by upmendex (TeX Live) $as_me 1.09, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21901,7 +21901,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 1.08
+upmendex (TeX Live) config.status 1.09
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac
index 82d837e124c..f894413d41d 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)],[1.08])
+AC_INIT([upmendex (TeX Live)],[1.09])
AC_PREREQ([2.71])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/upmendex/fwrite.c b/Build/source/texk/upmendex/fwrite.c
index a0077199ab6..ed528406da6 100644
--- a/Build/source/texk/upmendex/fwrite.c
+++ b/Build/source/texk/upmendex/fwrite.c
@@ -787,9 +787,9 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
UChar ch,src[2],dest[8],strX[4],strY[4],strZ[4];
UChar32 c32;
UErrorCode perr;
- UCollationResult order;
+ UCollationResult order,order1;
UCollationStrength strgth;
- static int i_y_mode=0;
+ static int i_y_mode=0,o_o_mode=0,u_u_mode=0;
ch=istr[0];
*chset=charset(istr);
@@ -1012,6 +1012,42 @@ static void index_normalize(UChar *istr, UChar *ini, int *chset)
return;
}
}
+ if (ch==0x0D6||ch==0x0F6||ch==0x150||ch==0x151) {
+ /* check Ö,ö versus Ő,ő for Hungarian */
+ if (o_o_mode==0) {
+ strgth = ucol_getStrength(icu_collator);
+ ucol_setStrength(icu_collator, UCOL_PRIMARY);
+ strX[0] = 0x0D6; strX[1] = 0x00; /* Ö */
+ strY[0] = 0x150; strY[1] = 0x00; /* Ő */
+ strZ[0] = 0x04F; strZ[1] = 0x00; /* O */
+ order = ucol_strcoll(icu_collator, strY, -1, strX, -1);
+ order1 = ucol_strcoll(icu_collator, strZ, -1, strX, -1);
+ o_o_mode = (order==UCOL_EQUAL && order1!=UCOL_EQUAL) ? 2 : 1;
+ ucol_setStrength(icu_collator, strgth);
+ }
+ if (o_o_mode==2) {
+ ini[0] = 0x0D6; /* Ö */
+ return;
+ }
+ }
+ if (ch==0x0DC||ch==0x0FC||ch==0x170||ch==0x171) {
+ /* check Ü,ü versus Ű,ű for Hungarian */
+ if (u_u_mode==0) {
+ strgth = ucol_getStrength(icu_collator);
+ ucol_setStrength(icu_collator, UCOL_PRIMARY);
+ strX[0] = 0x0DC; strX[1] = 0x00; /* Ü */
+ strY[0] = 0x170; strY[1] = 0x00; /* Ű */
+ strZ[0] = 0x055; strZ[1] = 0x00; /* U */
+ order = ucol_strcoll(icu_collator, strY, -1, strX, -1);
+ order1 = ucol_strcoll(icu_collator, strZ, -1, strX, -1);
+ u_u_mode = (order==UCOL_EQUAL && order1!=UCOL_EQUAL) ? 2 : 1;
+ ucol_setStrength(icu_collator, strgth);
+ }
+ if (u_u_mode==2) {
+ ini[0] = 0x0DC; /* Ü */
+ return;
+ }
+ }
if (ch==0x0C6||ch==0x0E6||ch==0x152||ch==0x153||ch==0x132||ch==0x133
||ch==0x0DF||ch==0x1E9E||ch==0x13F||ch==0x140||ch==0x149||ch==0x490||ch==0x491) {
strX[0] = u_toupper(ch); strX[1] = 0x00; /* ex. "Æ" "Œ" */