texlive[74134] Build/source/texk/upmendex: upmendex: Use

[commits+takuji at tug.org]

Revision: 74134
          https://tug.org/svn/texlive?view=revision&revision=74134
Author:   takuji
Date:     2025-02-19 16:05:00 +0100 (Wed, 19 Feb 2025)
Log Message:
-----------
upmendex: Use kpse_find_file to find style files

Modified Paths:
--------------
    trunk/Build/source/texk/upmendex/ChangeLog
    trunk/Build/source/texk/upmendex/convert.c
    trunk/Build/source/texk/upmendex/kp.c
    trunk/Build/source/texk/upmendex/kp.h
    trunk/Build/source/texk/upmendex/styfile.c
    trunk/Build/source/texk/upmendex/tests/upmendex.test

Modified: trunk/Build/source/texk/upmendex/ChangeLog
===================================================================
--- trunk/Build/source/texk/upmendex/ChangeLog	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/ChangeLog	2025-02-19 15:05:00 UTC (rev 74134)
@@ -1,3 +1,11 @@
+2025-02-19  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
+
+	* convert.c, kp.{c,h}, styfile.c:
+	Use kpse_find_file to find style files.
+	Thanks to Yukimasa Morimi.
+	* tests/upmendex.test: Add tests.
+	https://github.com/texjporg/tex-jp-build/issues/175
+
 2025-02-10  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* version 1.11  Stable version.

Modified: trunk/Build/source/texk/upmendex/convert.c
===================================================================
--- trunk/Build/source/texk/upmendex/convert.c	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/convert.c	2025-02-19 15:05:00 UTC (rev 74134)
@@ -68,7 +68,7 @@
 	FILE *fp;
 
 	if (filename!=NULL) {
-		filename = KP_find_file(&kp_dict,filename);
+		filename = KP_find_dict_file(filename);
 		if(kpse_in_name_ok(filename))
 			fp=fopen(filename,"rb");
 		else
@@ -95,7 +95,7 @@
 ENV:
 	envfile=kpse_var_value("INDEXDEFAULTDICTIONARY");
 	if ((envfile!=NULL)&&(strlen(envfile)!=0)) {
-		envfile = KP_find_file(&kp_dict,envfile);
+		envfile = KP_find_dict_file(envfile);
 		if(kpse_in_name_ok(envfile))
 			fp=fopen(envfile,"rb");
 		else

Modified: trunk/Build/source/texk/upmendex/kp.c
===================================================================
--- trunk/Build/source/texk/upmendex/kp.c	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/kp.c	2025-02-19 15:05:00 UTC (rev 74134)
@@ -3,6 +3,7 @@
 #include "mendex.h"
 #include <kpathsea/expand.h>
 #include <kpathsea/pathsearch.h>
+#include <kpathsea/tex-file.h>
 
 #include "kp.h"
 
@@ -46,3 +47,14 @@
   }
   return ret ? ret : name;
 }
+
+const char *KP_find_ist_file(const char *name)
+{
+  char *ret = kpse_find_file(name, kpse_ist_format, 1);
+  return ret ? ret : name;
+}
+
+const char *KP_find_dict_file(const char *name)
+{
+  return KP_find_file(&kp_dict, name);
+}

Modified: trunk/Build/source/texk/upmendex/kp.h
===================================================================
--- trunk/Build/source/texk/upmendex/kp.h	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/kp.h	2025-02-19 15:05:00 UTC (rev 74134)
@@ -11,4 +11,6 @@
 
 extern void KP_entry_filetype(KpathseaSupportInfo *);
 extern const char *KP_find_file(KpathseaSupportInfo *, const char *);
+extern const char *KP_find_ist_file(const char *);
+extern const char *KP_find_dict_file(const char *);
 #endif /* ! KSUPPORT_H_INCLUDED */

Modified: trunk/Build/source/texk/upmendex/styfile.c
===================================================================
--- trunk/Build/source/texk/upmendex/styfile.c	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/styfile.c	2025-02-19 15:05:00 UTC (rev 74134)
@@ -40,7 +40,7 @@
 	int i,j,q,cc;
 	char buff[4096],tmp[4096];
 
-	filename = KP_find_file(&kp_ist,filename);
+	filename = KP_find_ist_file(filename);
 	if(kpse_in_name_ok(filename))
 		fp=fopen(filename,"rb");
 	else

Modified: trunk/Build/source/texk/upmendex/tests/upmendex.test
===================================================================
--- trunk/Build/source/texk/upmendex/tests/upmendex.test	2025-02-19 15:04:55 UTC (rev 74133)
+++ trunk/Build/source/texk/upmendex/tests/upmendex.test	2025-02-19 15:05:00 UTC (rev 74134)
@@ -34,6 +34,20 @@
 	$srcdir/tests/uni.idx -o uni.ind3 -t uni.ilg3 \
 	&& diff $srcdir/tests/uni.ind uni.ind3 || rc=5
 
+INDEXSTYLE=$srcdir/tests
+export INDEXSTYLE
+
+$_upmendex -d $srcdir/tests/uni.dict -s uni.ist \
+	$srcdir/tests/uni.idx -o uni.ind4 -t uni.ilg4 \
+	&& diff $srcdir/tests/uni.ind uni.ind4 || rc=6
+
+INDEXDICTIONARY=$srcdir/tests
+export INDEXDICTIONARY
+
+$_upmendex -d uni.dict -s uni.ist \
+	$srcdir/tests/uni.idx -o uni.ind5 -t uni.ilg5 \
+	&& diff $srcdir/tests/uni.ind uni.ind5 || rc=7
+
 $_upmendex $srcdir/tests/tort.idx -o tort.ind1 -t tort.ilg1 \
 	&& rc=20
 #$_upmendex $srcdir/tests/tort.idx -o tort.ind1 -t tort.ilg1 \