Merge branch 'master' into build/work000 r76026 #158

Author: t-tk

source/configure

@@ -840,10 +840,7 @@ enable_tex
 enable_tex_synctex
 enable_etex
 enable_etex_synctex
-enable_ptex
-enable_ptex_synctex
 enable_uptex
-enable_uptex_synctex
 enable_euptex
 enable_euptex_synctex
 enable_aleph
@@ -1667,10 +1664,7 @@ Optional Features:
   --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
   --disable-etex-synctex      build e-TeX without SyncTeX support
-  --enable-ptex             compile and install pTeX
-  --disable-ptex-synctex      build pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
-  --disable-uptex-synctex     build upTeX without SyncTeX support
   --disable-euptex          do not compile and install e-upTeX
   --disable-euptex-synctex    build e-upTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
@@ -5808,28 +5802,6 @@ fi
 test "x$enable_web2c:$enable_etex" = xyes:yes && {
   need_zlib=yes
 }
-# Check whether --enable-ptex was given.
-if test ${enable_ptex+y}
-then :
-  enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_ptex=no ;;
-esac
-
-# Check whether --enable-ptex-synctex was given.
-if test ${enable_ptex_synctex+y}
-then :
-  enableval=$enable_ptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-uptex was given.
 if test ${enable_uptex+y}
 then :
@@ -5842,12 +5814,6 @@ case $enable_uptex in #(
     enable_uptex=no ;;
 esac
 
-# Check whether --enable-uptex-synctex was given.
-if test ${enable_uptex_synctex+y}
-then :
-  enableval=$enable_uptex_synctex;
-fi
-
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
   need_zlib=yes

source/texk/README

@@ -110,7 +110,7 @@ ttf2pk2 - maintained here, by us
 
 ttfdump - maintained here, by us, since Taiwan upstream apparently gone.
 
-upmendex 1.20 - by Takuji Tanaka
+upmendex 1.21 - by Takuji Tanaka
   https://ctan.org/pkg/upmendex
   https://github.com/t-tk/upmendex-package
 

source/texk/configure

@@ -783,10 +783,7 @@ enable_tex
 enable_tex_synctex
 enable_etex
 enable_etex_synctex
-enable_ptex
-enable_ptex_synctex
 enable_uptex
-enable_uptex_synctex
 enable_euptex
 enable_euptex_synctex
 enable_aleph
@@ -1585,10 +1582,7 @@ Optional Features:
   --enable-tex-synctex        build TeX with SyncTeX support
   --enable-etex             compile and install e-TeX
   --disable-etex-synctex      build e-TeX without SyncTeX support
-  --enable-ptex             compile and install pTeX
-  --disable-ptex-synctex      build pTeX without SyncTeX support
   --enable-uptex            compile and install upTeX
-  --disable-uptex-synctex     build upTeX without SyncTeX support
   --disable-euptex          do not compile and install e-upTeX
   --disable-euptex-synctex    build e-upTeX without SyncTeX support
   --disable-aleph           do not compile and install Aleph
@@ -4930,28 +4924,6 @@ fi
 test "x$enable_web2c:$enable_etex" = xyes:yes && {
   need_zlib=yes
 }
-# Check whether --enable-ptex was given.
-if test ${enable_ptex+y}
-then :
-  enableval=$enable_ptex;
-fi
-case $enable_ptex in #(
-  yes | no) :
-     ;; #(
-  *) :
-    enable_ptex=no ;;
-esac
-
-# Check whether --enable-ptex-synctex was given.
-if test ${enable_ptex_synctex+y}
-then :
-  enableval=$enable_ptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_ptex" = xyes:yes && {
-  need_ptexenc=yes
-  need_zlib=yes
-}
 # Check whether --enable-uptex was given.
 if test ${enable_uptex+y}
 then :
@@ -4964,12 +4936,6 @@ case $enable_uptex in #(
     enable_uptex=no ;;
 esac
 
-# Check whether --enable-uptex-synctex was given.
-if test ${enable_uptex_synctex+y}
-then :
-  enableval=$enable_uptex_synctex;
-fi
-
 test "x$enable_web2c:$enable_uptex" = xyes:yes && {
   need_ptexenc=yes
   need_zlib=yes

source/texk/mendexk/ChangeLog

@@ -1,3 +1,20 @@
+2025-08-11  TANAKA Takuji  <[email protected]>
+
+	* configure.ac, version.h:
+	Version 3.9 [11-Aug-2025].
+	* fwrite.c: Fix bug on page range.
+	Thanks to @pejsek02468.
+	https://github.com/t-tk/upmendex-package/issues/15
+	* fread.c, convert.c:
+	Avoid segmentation fault about page_compositor and page_precedence.
+	Thanks to Lemures Lemniscati.
+	https://okumuralab.org/tex/mod/forum/discuss.php?d=3976#p24754
+	https://github.com/texjporg/tex-jp-build/issues/181
+	* tests/pprec.test, tests/range.idx,
+	tests/range4.ist, tests/range{1,2,3,4}.ind:
+	Add tests for page range.
+	* Makefile.am: Adjust.
+
 2025-03-07  Karl Berry  <[email protected]>
 
 	* TL'25 release.

source/texk/mendexk/Makefile.am

@@ -67,8 +67,8 @@ EXTRA_DIST += tests/foo.idx tests/foo.ind \
 DISTCLEANFILES = foo.* uni.* tort*.*
 ## 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/range1.ist tests/range2.ist tests/range3.ist tests/range4.ist \
+	tests/range1.ind tests/range2.ind tests/range3.ind tests/range4.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 \
 	tests/pprecA.idx tests/pprecA-0.ind tests/pprecA-1.ind tests/pprecA-2.ind \

source/texk/mendexk/Makefile.in

@@ -598,21 +598,22 @@ EXTRA_DIST = COPYRIGHT COPYRIGHT.ja ChangeLog.ja indexsty \
 	tests/uni1.ist tests/uni2.ist tests/uni.ind tests/tort.idx \
 	tests/tortW.idx tests/head1.ist tests/ok-tort.ind \
 	tests/ok-tort2.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 tests/pprec6.ist \
-	tests/pprec7.ist tests/pprecA.idx tests/pprecA-0.ind \
-	tests/pprecA-1.ind tests/pprecA-2.ind tests/pprecB.idx \
-	tests/pprecB-0.ind tests/pprecB-3.ind tests/pprecB-4.ind \
-	tests/romalpA.idx tests/romalpA-5.ind 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/nested3.ist tests/nested3.ind \
-	tests/toodeep.idx tests/sjis.ist tests/euc.ist tests/jis.ist \
-	tests/enc-e.idx tests/enc-j.idx tests/enc-s.idx \
-	tests/enc-u.idx tests/enc-x.ind tests/enc.dic
+	tests/range2.ist tests/range3.ist tests/range4.ist \
+	tests/range1.ind tests/range2.ind tests/range3.ind \
+	tests/range4.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 \
+	tests/pprecA.idx tests/pprecA-0.ind tests/pprecA-1.ind \
+	tests/pprecA-2.ind tests/pprecB.idx tests/pprecB-0.ind \
+	tests/pprecB-3.ind tests/pprecB-4.ind tests/romalpA.idx \
+	tests/romalpA-5.ind 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/nested3.ist tests/nested3.ind tests/toodeep.idx \
+	tests/sjis.ist tests/euc.ist tests/jis.ist tests/enc-e.idx \
+	tests/enc-j.idx tests/enc-s.idx tests/enc-u.idx \
+	tests/enc-x.ind tests/enc.dic
 TESTS = tests/mendex.test \
 	tests/pprec.test \
 	tests/nest.test \

source/texk/mendexk/configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for mendex (TeX Live) 3.8.
+# Generated by GNU Autoconf 2.72 for mendex (TeX Live) 3.9.
 #
 #
 # Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
@@ -611,8 +611,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mendex (TeX Live)'
 PACKAGE_TARNAME='mendex--tex-live-'
-PACKAGE_VERSION='3.8'
-PACKAGE_STRING='mendex (TeX Live) 3.8'
+PACKAGE_VERSION='3.9'
+PACKAGE_STRING='mendex (TeX Live) 3.9'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1366,7 +1366,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 mendex (TeX Live) 3.8 to adapt to many kinds of systems.
+'configure' configures mendex (TeX Live) 3.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1438,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mendex (TeX Live) 3.8:";;
+     short | recursive ) echo "Configuration of mendex (TeX Live) 3.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1560,7 +1560,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mendex (TeX Live) configure 3.8
+mendex (TeX Live) configure 3.9
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2102,7 +2102,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 mendex (TeX Live) $as_me 3.8, which was
+It was created by mendex (TeX Live) $as_me 3.9, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -9001,7 +9001,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mendex--tex-live-'
- VERSION='3.8'
+ VERSION='3.9'
 
 
 # Some tools Automake needs.
@@ -16109,7 +16109,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <[email protected]>."
 
 lt_cl_version="\
-mendex (TeX Live) config.lt 3.8
+mendex (TeX Live) config.lt 3.9
 configured by $0, generated by GNU Autoconf 2.72.
 
 Copyright (C) 2024 Free Software Foundation, Inc.
@@ -17143,10 +17143,6 @@ ${top_builddir}/../kpathsea/paths.h:
 	cd ${top_builddir}/../kpathsea && $(MAKE) $(AM_MAKEFLAGS) rebuild'
 fi
 
-
-
-
-
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libkpathsea supports debugging" >&5
 printf %s "checking if libkpathsea supports debugging... " >&6; }
 if test ${kpse_cv_kpse_debug+y}
@@ -17214,10 +17210,6 @@ $(PTEXENC_DEPEND): ${top_srcdir}/../ptexenc/*.c ${top_srcdir}/../ptexenc/ptexenc
 fi
 
 
-
-
-
-
 ac_config_files="$ac_config_files Makefile"
 
 
@@ -17769,7 +17761,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 mendex (TeX Live) $as_me 3.8, which was
+This file was extended by mendex (TeX Live) $as_me 3.9, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17837,7 +17829,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="\\
-mendex (TeX Live) config.status 3.8
+mendex (TeX Live) config.status 3.9
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

source/texk/mendexk/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([mendex (TeX Live)], [3.8])
+AC_INIT([mendex (TeX Live)], [3.9])
 AC_PREREQ([2.71])
 AC_CONFIG_SRCDIR([main.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

source/texk/mendexk/convert.c

@@ -369,6 +369,7 @@ int pnumconv(char *page, int attr)
 {
 	int i,cc=0;
 
+	if (attr<0) return 0;  /* inappropriate page type */
 	switch (page_precedence[attr]) {
 	case 'a':
 		cc=page[0]-'a'+1;

source/texk/mendexk/fread.c

@@ -77,7 +77,7 @@ int idxread(char *filename, int start)
 		}
 		indent=wflg=k=nest=esc=quo=0;
 
-/*   analize words   */
+/*   analyze words   */
 
 		for (;;j++,k++) {
 			if (buff[j]=='\n' || buff[j]=='\0') {
@@ -501,8 +501,7 @@ static void chkpageattr(struct page *p)
 		else {
 			cnt=0;
 			if (!((*page0>='0' && *page0<='9') || (*page0>='A' && *page0<='Z') || (*page0>='a' && *page0<='z'))) {
-				p->attr[cc]= -1;
-				if (cc<2) p->attr[++cc]= -1;
+				for (j=cc;j<PAGE_COMPOSIT_DEPTH;j++) p->attr[j]=-1;
 				return;
 			}
 			pcpos=strstr(page0,page_compositor);
@@ -588,7 +587,7 @@ static void chkpageattr(struct page *p)
 		}
 	}
 	p->attr[cc]=pattr[cc];
-	if (cc<2) p->attr[++cc]= -1;
+	for (j=cc+1;j<PAGE_COMPOSIT_DEPTH;j++) p->attr[j]=-1;
 }
 
 char *mfgets(char *buf, int size, FILE *fp)