upmendex: Version 1.10

git-svn-id: svn://tug.org/texlive/trunk/Build/source@72806 c570f23f-e606-0410-a88d-b1316a301751
TeX-Live · Nov 9, 2024 · bbb4256 · bbb4256
1 parent 0c9627a
commit bbb4256
Show file tree

Hide file tree

Showing 29 changed files with 820 additions and 361 deletions.
diff --git a/libs/icu/ChangeLog b/libs/icu/ChangeLog
@@ -8,7 +8,7 @@
 
 2024-10-27  Karl Berry  <[email protected]>
 
-	* Import 76.2.
+	* Import 76.1.
 	(version.ac): update.
 
 2023-12-22  Karl Berry  <[email protected]>

diff --git a/texk/README b/texk/README
@@ -106,7 +106,7 @@ ttf2pk2 - maintained here, by us
 
 ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
 
-upmendex 1.09 - by Takuji Tanaka
+upmendex 1.10 - by Takuji Tanaka
   https://ctan.org/pkg/upmendex
   https://github.com/t-tk/upmendex-package
 

diff --git a/texk/upmendex/ChangeLog b/texk/upmendex/ChangeLog
@@ -1,3 +1,24 @@
+2024-11-09  TANAKA Takuji  <[email protected]>
+
+	* version 1.10  Stable version.
+	* configure.ac: Bump version.
+	* {mendex,var,exvar}.h, fread.c, fwrite.c, sort.c, styfile.c:
+	Support for indices with four sublevels,
+	conventionally two sublevels.
+	Thanks to upll request by Sergei Golovan.
+	https://github.com/t-tk/upmendex-package/pull/9
+	* fread.c: Improve error message when reading index entries.
+	https://github.com/t-tk/upmendex-package/issues/13
+	* sort.c: Extend RULEBUFSIZE to adjust ICU 76.1.
+	Revise to avoid compiler warnings.
+	* convert.c: Tweak comment.
+	* tests/{upmendex,pprec,icu}.test: Split test scripts.
+	* tests/nest.test, tests/nested{,3}.{ist,idx,ind},
+	tests/toodeep.idx: Add new tests for nested depth.
+	* tests/upmendex.test, tests/tort{,W}.idx, tests/ok-tort.ind:
+	Add new tests for error/warning.
+	* Makefile.am: Adjust.
+
 2024-07-06  TANAKA Takuji  <[email protected]>
 
 	* version 1.09  Stable version.

diff --git a/texk/upmendex/Makefile.am b/texk/upmendex/Makefile.am
@@ -52,14 +52,21 @@ EXTRA_DIST += \
 
 ## Tests
 ##
-TESTS = tests/upmendex.test
+TESTS = tests/upmendex.test \
+	tests/pprec.test \
+	tests/nest.test \
+	tests/icu.test
 EXTRA_DIST += $(TESTS)
 
 ## tests/upmendex.test
 EXTRA_DIST += tests/foo.idx tests/foo.ind \
 	tests/uni.idx tests/uni.dict tests/uni.ist \
 	tests/uni1.ist tests/uni2.ist tests/uni.ind \
-	tests/range.idx tests/range2.ist tests/range2.ist tests/range3.ist \
+	tests/tort.idx tests/tortW.idx tests/ok-tort.ind
+DISTCLEANFILES = foo.* uni.*
+## tests/pprec.test
+EXTRA_DIST += tests/range.idx \
+	tests/range1.ist tests/range2.ist tests/range3.ist \
 	tests/range1.ind tests/range2.ind tests/range3.ind \
 	tests/pprec0.ist tests/pprec1.ist tests/pprec2.ist tests/pprec3.ist \
 	tests/pprec4.ist tests/pprec5.ist tests/pprec6.ist tests/pprec7.ist \
@@ -69,7 +76,13 @@ EXTRA_DIST += tests/foo.idx tests/foo.ind \
 	tests/romalpB.idx tests/romalpB-5.ind 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
-DISTCLEANFILES = foo.* uni.* range*.* pprec*.* romalp*.*
+DISTCLEANFILES += range*.* pprec*.* romalp*.*
+## tests/nest.test
+EXTRA_DIST += tests/nested3.ist tests/nested3.ind \
+	tests/nested.ist tests/nested.ind \
+	tests/toodeep.idx
+DISTCLEANFILES += nested*.* toodeep*.*
+## tests/icu.test
 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 \

diff --git a/texk/upmendex/Makefile.in b/texk/upmendex/Makefile.in
@@ -622,8 +622,9 @@ nodist_EXTRA_upmendex_SOURCES = dummy.cxx
 LDADD = $(KPATHSEA_LIBS) $(ICU_LIBS) $(PTHREAD_LIB) $(ICU_LIBS_EXTRA)
 EXTRA_DIST = COPYRIGHT indexsty upmendex.ja.txt $(TESTS) tests/foo.idx \
 	tests/foo.ind tests/uni.idx tests/uni.dict tests/uni.ist \
-	tests/uni1.ist tests/uni2.ist tests/uni.ind tests/range.idx \
-	tests/range2.ist tests/range2.ist tests/range3.ist \
+	tests/uni1.ist tests/uni2.ist tests/uni.ind tests/tort.idx \
+	tests/tortW.idx tests/ok-tort.ind tests/range.idx \
+	tests/range1.ist tests/range2.ist tests/range3.ist \
 	tests/range1.ind tests/range2.ind tests/range3.ind \
 	tests/pprec0.ist tests/pprec1.ist tests/pprec2.ist \
 	tests/pprec3.ist tests/pprec4.ist tests/pprec5.ist \
@@ -634,14 +635,20 @@ EXTRA_DIST = COPYRIGHT indexsty upmendex.ja.txt $(TESTS) tests/foo.idx \
 	tests/romalpA-6.ind tests/romalpB.idx tests/romalpB-5.ind \
 	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/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*.*
+	tests/romalpD-6.ind tests/romalpD-7.ind tests/nested3.ist \
+	tests/nested3.ind tests/nested.ist tests/nested.ind \
+	tests/toodeep.idx 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
+TESTS = tests/upmendex.test \
+	tests/pprec.test \
+	tests/nest.test \
+	tests/icu.test
+
+DISTCLEANFILES = foo.* uni.* range*.* pprec*.* romalp*.* nested*.* \
+	toodeep*.* locale*.* attr*.* rule*.*
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 

diff --git a/texk/upmendex/configure b/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.09.
+# Generated by GNU Autoconf 2.72 for upmendex (TeX Live) 1.10.
 #
 #
 # 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.09'
-PACKAGE_STRING='upmendex (TeX Live) 1.09'
+PACKAGE_VERSION='1.10'
+PACKAGE_STRING='upmendex (TeX Live) 1.10'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1380,7 +1380,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.09 to adapt to many kinds of systems.
+'configure' configures upmendex (TeX Live) 1.10 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1452,7 +1452,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of upmendex (TeX Live) 1.09:";;
+     short | recursive ) echo "Configuration of upmendex (TeX Live) 1.10:";;
    esac
   cat <<\_ACEOF
 
@@ -1578,7 +1578,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-upmendex (TeX Live) configure 1.09
+upmendex (TeX Live) configure 1.10
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2282,7 +2282,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.09, which was
+It was created by upmendex (TeX Live) $as_me 1.10, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -9392,7 +9392,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='upmendex--tex-live-'
- VERSION='1.09'
+ VERSION='1.10'
 
 
 # Some tools Automake needs.
@@ -19772,7 +19772,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <[email protected]>."
 
 lt_cl_version="\
-upmendex (TeX Live) config.lt 1.09
+upmendex (TeX Live) config.lt 1.10
 configured by $0, generated by GNU Autoconf 2.72.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -21991,7 +21991,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.09, which was
+This file was extended by upmendex (TeX Live) $as_me 1.10, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22059,7 +22059,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.09
+upmendex (TeX Live) config.status 1.10
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

diff --git a/texk/upmendex/configure.ac b/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.09])
+AC_INIT([upmendex (TeX Live)],[1.10])
 AC_PREREQ([2.71])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

diff --git a/texk/upmendex/convert.c b/texk/upmendex/convert.c
@@ -193,7 +193,7 @@ static int dcomp(const void *bf1, const void *bf2)
 	return 0;
 }
 
-/*   convert to capital-hiragana character   */
+/*   convert to YOMI (reading) or strings of phonograms   */
 int convert(UChar *buff1, UChar *buff2)
 {
 	int i=0,j=0,k;

diff --git a/texk/upmendex/exvar.h b/texk/upmendex/exvar.h
@@ -17,9 +17,9 @@ extern char setpage_prefix[],setpage_suffix[];
 extern char group_skip[];
 extern char lethead_prefix[],lethead_suffix[];
 extern int lethead_flag;
-extern char item_0[],item_1[],item_2[];
-extern char item_01[],item_x1[],item_12[],item_x2[];
-extern char delim_0[],delim_1[],delim_2[],delim_n[],delim_r[],delim_t[];
+extern char item_0[][STYBUFSIZE];
+extern char item_01[][STYBUFSIZE],item_x[][STYBUFSIZE];
+extern char delim_0[][STYBUFSIZE],delim_n[],delim_r[],delim_t[];
 extern char suffix_2p[],suffix_3p[],suffix_mp[];
 extern char encap_prefix[],encap_infix[],encap_suffix[];
 extern int line_max;

diff --git a/texk/upmendex/fread.c b/texk/upmendex/fread.c
@@ -111,7 +111,7 @@ int idxread(char *filename, int start)
 				if (nest==0) {
 					if (buff[j]==level) {
 						esc=0;
-						if (indent>=2) {
+						if (indent>=MAXDEPTH-1) {
 							fprintf(efp,"\nError: Extra `%c\' in %s, line %d.",level,filename,ind[i].lnum);
 							if (efp!=stderr) fprintf(stderr,"\nError: Extra `%c\' in %s, line %d.",level,filename,ind[i].lnum);
 							eflg++;
@@ -150,9 +150,9 @@ int idxread(char *filename, int start)
 						if (buff[j]==encap) {
 							j++;
 							cc=getestr(&buff[j],estr);
-							if (cc<0) {
-								fprintf(efp,"\nBad encap string in %s, line %d.",filename,ind[i].lnum);
-								if (efp!=stderr) fprintf(stderr,"\nBad encap string in %s, line %d.",filename,ind[i].lnum);
+							if (cc<0 || strchr(estr,encap)) {
+								fprintf(efp,"\nError: Bad encap string in %s, line %d.",filename,ind[i].lnum);
+								if (efp!=stderr) fprintf(stderr,"\nError: Bad encap string in %s, line %d.",filename,ind[i].lnum);
 								eflg++;
 								reject++;
 								n++;
@@ -208,6 +208,17 @@ int idxread(char *filename, int start)
 			if (buff[j]!=escape) esc=0;
 			copy_multibyte_char(buff, wbuff, &j, &k);
 		}
+		for (k=0; k<=indent; k++) {
+			if ((u_strlen(ind[i].idx[k])==0 && ind[i].org[k]==NULL) ||
+				 (ind[i].org[k] && u_strlen(ind[i].org[k])==0)) {
+				fprintf(efp,"\nError: Illegal null field in %s, line %d.",filename,ind[i].lnum);
+				if (efp!=stderr) fprintf(stderr,"\nError: Illegal null field in %s, line %d.",filename,ind[i].lnum);
+				eflg++;
+				reject++;
+				n++;
+				goto LOOP;
+			}
+		}
 		ind[i].words=indent+1;
 
 /*   kana-convert   */