summaryrefslogtreecommitdiff
path: root/Build/source/texk/upmendex
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/upmendex')
-rw-r--r--Build/source/texk/upmendex/ChangeLog11
-rw-r--r--Build/source/texk/upmendex/Makefile.am5
-rw-r--r--Build/source/texk/upmendex/Makefile.in8
-rwxr-xr-xBuild/source/texk/upmendex/configure22
-rw-r--r--Build/source/texk/upmendex/configure.ac2
-rw-r--r--Build/source/texk/upmendex/sort.c7
-rw-r--r--Build/source/texk/upmendex/tests/locale3-rule.ind40
-rw-r--r--Build/source/texk/upmendex/tests/locale3.ist1
-rwxr-xr-xBuild/source/texk/upmendex/tests/upmendex.test5
9 files changed, 82 insertions, 19 deletions
diff --git a/Build/source/texk/upmendex/ChangeLog b/Build/source/texk/upmendex/ChangeLog
index 4e7a61d08c1..af8ab42315a 100644
--- a/Build/source/texk/upmendex/ChangeLog
+++ b/Build/source/texk/upmendex/ChangeLog
@@ -1,3 +1,14 @@
+2023-12-16 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * version 1.08 Stable version.
+ * configure.ac: Bump version.
+ * sort.c: Warn if remaining buffer is small for custom collation rules
+ when "icu_locale" and "icu_rules" are specified in style file.
+ Add CJK Unified Ideograph Extension I in Unicode 15.1.
+ It works with ICU 74.1 or later.
+ * tests/upmendex.test, tests/locale3.ist, tests/locale3-rule.ind,
+ Makefile.am: Update tests.
+
2023-08-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
* tests/upmendex.test:
diff --git a/Build/source/texk/upmendex/Makefile.am b/Build/source/texk/upmendex/Makefile.am
index 3dd956d5301..5522da28663 100644
--- a/Build/source/texk/upmendex/Makefile.am
+++ b/Build/source/texk/upmendex/Makefile.am
@@ -70,7 +70,8 @@ EXTRA_DIST += tests/foo.idx tests/foo.ind \
tests/romalpC.idx tests/romalpC-5.ind \
tests/romalpD.idx tests/romalpD-5.ind tests/romalpD-6.ind tests/romalpD-7.ind
DISTCLEANFILES = foo.* uni.* range*.* pprec*.* romalp*.*
-EXTRA_DIST += tests/locale1.ist tests/locale2.ist tests/rule.idx \
- tests/attr1.ist tests/attr1.ind tests/locale1.ind tests/locale2-rule.ind \
+EXTRA_DIST += tests/locale1.ist tests/locale2.ist tests/locale3.ist tests/rule.idx \
+ tests/attr1.ist tests/attr1.ind tests/locale1.ind \
+ tests/locale2-rule.ind tests/locale3-rule.ind \
tests/rule1.ist tests/rule2.ist tests/rule3.ist tests/rule4.ist rule.ind
DISTCLEANFILES += locale*.* attr*.* rule*.*
diff --git a/Build/source/texk/upmendex/Makefile.in b/Build/source/texk/upmendex/Makefile.in
index ecc50d59aa5..b39bdcf804b 100644
--- a/Build/source/texk/upmendex/Makefile.in
+++ b/Build/source/texk/upmendex/Makefile.in
@@ -624,10 +624,10 @@ EXTRA_DIST = COPYRIGHT indexsty upmendex.ja.txt $(TESTS) tests/foo.idx \
tests/romalpB-6.ind tests/romalpB-7.ind tests/romalpC.idx \
tests/romalpC-5.ind tests/romalpD.idx tests/romalpD-5.ind \
tests/romalpD-6.ind tests/romalpD-7.ind tests/locale1.ist \
- tests/locale2.ist tests/rule.idx tests/attr1.ist \
- tests/attr1.ind tests/locale1.ind tests/locale2-rule.ind \
- tests/rule1.ist tests/rule2.ist tests/rule3.ist \
- tests/rule4.ist rule.ind
+ tests/locale2.ist tests/locale3.ist tests/rule.idx \
+ tests/attr1.ist tests/attr1.ind tests/locale1.ind \
+ tests/locale2-rule.ind tests/locale3-rule.ind tests/rule1.ist \
+ tests/rule2.ist tests/rule3.ist tests/rule4.ist rule.ind
TESTS = tests/upmendex.test
DISTCLEANFILES = foo.* uni.* range*.* pprec*.* romalp*.* locale*.* \
attr*.* rule*.*
diff --git a/Build/source/texk/upmendex/configure b/Build/source/texk/upmendex/configure
index 50d50525824..ff7a33797e7 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.71 for upmendex (TeX Live) 1.07.
+# Generated by GNU Autoconf 2.71 for upmendex (TeX Live) 1.08.
#
#
# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation,
@@ -626,8 +626,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='upmendex (TeX Live)'
PACKAGE_TARNAME='upmendex--tex-live-'
-PACKAGE_VERSION='1.07'
-PACKAGE_STRING='upmendex (TeX Live) 1.07'
+PACKAGE_VERSION='1.08'
+PACKAGE_STRING='upmendex (TeX Live) 1.08'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1391,7 +1391,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.07 to adapt to many kinds of systems.
+\`configure' configures upmendex (TeX Live) 1.08 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1463,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of upmendex (TeX Live) 1.07:";;
+ short | recursive ) echo "Configuration of upmendex (TeX Live) 1.08:";;
esac
cat <<\_ACEOF
@@ -1588,7 +1588,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-upmendex (TeX Live) configure 1.07
+upmendex (TeX Live) configure 1.08
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -2269,7 +2269,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.07, which was
+It was created by upmendex (TeX Live) $as_me 1.08, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -8926,7 +8926,7 @@ fi
# Define the identity of the package.
PACKAGE='upmendex--tex-live-'
- VERSION='1.07'
+ VERSION='1.08'
# Some tools Automake needs.
@@ -19264,7 +19264,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-upmendex (TeX Live) config.lt 1.07
+upmendex (TeX Live) config.lt 1.08
configured by $0, generated by GNU Autoconf 2.71.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21446,7 +21446,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.07, which was
+This file was extended by upmendex (TeX Live) $as_me 1.08, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21514,7 +21514,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.07
+upmendex (TeX Live) config.status 1.08
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/upmendex/configure.ac b/Build/source/texk/upmendex/configure.ac
index 9b5c1511b65..82d837e124c 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.07])
+AC_INIT([upmendex (TeX Live)],[1.08])
AC_PREREQ([2.71])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/upmendex/sort.c b/Build/source/texk/upmendex/sort.c
index 6ba8818156a..eea9e687d01 100644
--- a/Build/source/texk/upmendex/sort.c
+++ b/Build/source/texk/upmendex/sort.c
@@ -52,6 +52,11 @@ void init_icu_collator()
icu_locale, len);
exit(254);
}
+ len = RULEBUFSIZE - u_strlen(rules);
+ if (len<STYBUFSIZE) {
+ warn_printf(efp, "\nWarning: [ICU] Remaining buffer size (%d) is small for custom collation rules with rules by locale (%s).\n",
+ len, icu_locale);
+ }
ucol_close(icu_collator);
}
unescape((unsigned char *)icu_rules, rules);
@@ -547,7 +552,7 @@ int is_hanzi(UChar *c)
if (is_surrogate_pair(c)) {
UChar32 c32;
c32=U16_GET_SUPPLEMENTARY(*c,*(c+1));
- if ((c32>=0x20000) && /* CJK Unified Ideographs Extension B,C,D,E,F */
+ if ((c32>=0x20000) && /* CJK Unified Ideographs Extension B,C,D,E,F,I */
/* CJK Compatibility Ideographs Supplement */
(c32<=0x323AF)) return 2; /* CJK Unified Ideographs Extension G,H */
}
diff --git a/Build/source/texk/upmendex/tests/locale3-rule.ind b/Build/source/texk/upmendex/tests/locale3-rule.ind
new file mode 100644
index 00000000000..3ac1335e052
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/locale3-rule.ind
@@ -0,0 +1,40 @@
+\begin{theindex}
+
+\centerline{\bfseries ◆◆◆ Symbols ◆◆◆}\par\nobreak
+ \item #\leaders\hbox{$\cdot$}\hfill 2000
+ \item $\leaders\hbox{$\cdot$}\hfill 2001
+ \item 10\leaders\hbox{$\cdot$}\hfill 1000
+ \item 2\leaders\hbox{$\cdot$}\hfill 1001
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ A ◆◆◆}\par\nobreak
+ \item a\leaders\hbox{$\cdot$}\hfill 401
+ \item A\leaders\hbox{$\cdot$}\hfill 400
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ C ◆◆◆}\par\nobreak
+ \item C\leaders\hbox{$\cdot$}\hfill 404
+ \item Ç\leaders\hbox{$\cdot$}\hfill 406
+ \item c\leaders\hbox{$\cdot$}\hfill 405
+ \item ç\leaders\hbox{$\cdot$}\hfill 407
+ \item Ch\leaders\hbox{$\cdot$}\hfill 420
+ \item cha\leaders\hbox{$\cdot$}\hfill 421
+ \item cz\leaders\hbox{$\cdot$}\hfill 422
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ U ◆◆◆}\par\nobreak
+ \item u\leaders\hbox{$\cdot$}\hfill 409
+ \item U\leaders\hbox{$\cdot$}\hfill 408
+ \item ü\leaders\hbox{$\cdot$}\hfill 411
+ \item Ü\leaders\hbox{$\cdot$}\hfill 410
+
+ \indexspace
+
+\centerline{\bfseries ◆◆◆ B ◆◆◆}\par\nobreak
+ \item b\leaders\hbox{$\cdot$}\hfill 403
+ \item B\leaders\hbox{$\cdot$}\hfill 402
+
+\end{theindex}
diff --git a/Build/source/texk/upmendex/tests/locale3.ist b/Build/source/texk/upmendex/tests/locale3.ist
new file mode 100644
index 00000000000..946d91b8b3b
--- /dev/null
+++ b/Build/source/texk/upmendex/tests/locale3.ist
@@ -0,0 +1 @@
+icu_locale "zh@collation=stroke"
diff --git a/Build/source/texk/upmendex/tests/upmendex.test b/Build/source/texk/upmendex/tests/upmendex.test
index 8991c4fd282..61caa7053d2 100755
--- a/Build/source/texk/upmendex/tests/upmendex.test
+++ b/Build/source/texk/upmendex/tests/upmendex.test
@@ -1,5 +1,6 @@
#! /bin/sh -vx
# $Id$
+# Copyright 2021-2023 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
# Copyright 2017-2022 Karl Berry <tex-live@tug.org>
# Copyright 2013 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
@@ -127,5 +128,9 @@ $_upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/locale2.ist -s $srcdir/test
-o locale2-rule1.ind1 -t locale2-rule1.ilg \
&& diff $srcdir/tests/locale2-rule.ind locale2-rule1.ind1 || rc=55
+$_upmendex -s $srcdir/tests/uni.ist -s $srcdir/tests/locale3.ist -s $srcdir/tests/rule1.ist $srcdir/tests/rule.idx \
+ -o locale3-rule1.ind1 -t locale3-rule1.ilg \
+ && diff $srcdir/tests/locale3-rule.ind locale3-rule1.ind1 || rc=56
+
exit $rc
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 05:27:37 +0000