texlive[69144] Build/source/texk/upmendex: upmendex: ver 1.08,

commits+takuji at tug.org commits+takuji at tug.org
Sat Dec 16 07:51:51 CET 2023 

Revision: 69144
          https://tug.org/svn/texlive?view=revision&revision=69144
Author:   takuji
Date:     2023-12-16 07:51:51 +0100 (Sat, 16 Dec 2023)
Log Message:
-----------
upmendex: ver 1.08, support Unicode 15.1

Modified Paths:
--------------
    trunk/Build/source/texk/upmendex/ChangeLog
    trunk/Build/source/texk/upmendex/Makefile.am
    trunk/Build/source/texk/upmendex/Makefile.in
    trunk/Build/source/texk/upmendex/configure
    trunk/Build/source/texk/upmendex/configure.ac
    trunk/Build/source/texk/upmendex/sort.c
    trunk/Build/source/texk/upmendex/tests/upmendex.test

Added Paths:
-----------
    trunk/Build/source/texk/upmendex/tests/locale3-rule.ind
    trunk/Build/source/texk/upmendex/tests/locale3.ist

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2023-12-16 06:51:51 UTC (rev 69144)
@@ -1,3 +1,14 @@
+2023-12-16  TANAKA Takuji  <ttk at 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 at t-lab.opal.ne.jp>
 
 	* tests/upmendex.test:

Modified: trunk/Build/source/texk/upmendex/Makefile.am
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.am	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/Makefile.am	2023-12-16 06:51:51 UTC (rev 69144)
@@ -70,7 +70,8 @@
 	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*.*

Modified: trunk/Build/source/texk/upmendex/Makefile.in
===================================================================
--- trunk/Build/source/texk/upmendex/Makefile.in	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/Makefile.in	2023-12-16 06:51:51 UTC (rev 69144)
@@ -624,10 +624,10 @@
 	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*.*

Modified: trunk/Build/source/texk/upmendex/configure
===================================================================
--- trunk/Build/source/texk/upmendex/configure	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/configure	2023-12-16 06:51:51 UTC (rev 69144)
@@ -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 @@
 # 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 @@
   # 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 @@
 
 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 @@
 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 @@
 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 @@
 
 # Define the identity of the package.
  PACKAGE='upmendex--tex-live-'
- VERSION='1.07'
+ VERSION='1.08'
 
 
 # Some tools Automake needs.
@@ -19264,7 +19264,7 @@
 Report bugs to <bug-libtool at 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 @@
 # 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 @@
 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\\"
 

Modified: trunk/Build/source/texk/upmendex/configure.ac
===================================================================
--- trunk/Build/source/texk/upmendex/configure.ac	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/configure.ac	2023-12-16 06:51:51 UTC (rev 69144)
@@ -8,7 +8,7 @@
 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])

Modified: trunk/Build/source/texk/upmendex/sort.c
===================================================================
--- trunk/Build/source/texk/upmendex/sort.c	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/sort.c	2023-12-16 06:51:51 UTC (rev 69144)
@@ -52,6 +52,11 @@
 					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 @@
 	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 */
 	}

Added: trunk/Build/source/texk/upmendex/tests/locale3-rule.ind
===================================================================
--- trunk/Build/source/texk/upmendex/tests/locale3-rule.ind	                        (rev 0)
+++ trunk/Build/source/texk/upmendex/tests/locale3-rule.ind	2023-12-16 06:51:51 UTC (rev 69144)
@@ -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}

Added: trunk/Build/source/texk/upmendex/tests/locale3.ist
===================================================================
--- trunk/Build/source/texk/upmendex/tests/locale3.ist	                        (rev 0)
+++ trunk/Build/source/texk/upmendex/tests/locale3.ist	2023-12-16 06:51:51 UTC (rev 69144)
@@ -0,0 +1 @@
+icu_locale "zh at collation=stroke"

Modified: trunk/Build/source/texk/upmendex/tests/upmendex.test
===================================================================
--- trunk/Build/source/texk/upmendex/tests/upmendex.test	2023-12-16 00:43:17 UTC (rev 69143)
+++ trunk/Build/source/texk/upmendex/tests/upmendex.test	2023-12-16 06:51:51 UTC (rev 69144)
@@ -1,5 +1,6 @@
 #! /bin/sh -vx
 # $Id$
+# Copyright 2021-2023 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
 # Copyright 2017-2022 Karl Berry <tex-live at tug.org>
 # Copyright 2013 Peter Breitenlohner <tex-live at tug.org>
 # You may freely use, modify and/or distribute this file.
@@ -127,5 +128,9 @@
 	-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

More information about the tex-live-commits mailing list.