texlive[64014] Build/source/texk/web2c: metapost, luatex: sync with

[commits+kakuto at tug.org]

Revision: 64014
          http://tug.org/svn/texlive?view=revision&revision=64014
Author:   kakuto
Date:     2022-07-31 22:32:30 +0200 (Sun, 31 Jul 2022)
Log Message:
-----------
metapost, luatex: sync with the upstream

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/luatexdir/ChangeLog
    trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
    trunk/Build/source/texk/web2c/luatexdir/tex/texfileio.c
    trunk/Build/source/texk/web2c/mplibdir/ChangeLog
    trunk/Build/source/texk/web2c/mplibdir/mp.w

Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2022-07-30 23:49:47 UTC (rev 64013)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog	2022-07-31 20:32:30 UTC (rev 64014)
@@ -1,3 +1,6 @@
+2022-07-31  Luigi Scarso <luigi.scarso at gmail.com>
+    * Fixed loading .tex when  --output-directory is enabled
+
 2022-07-30  Luigi Scarso <luigi.scarso at gmail.com>
     * Backtrack replace pointer when successive disc in exceptions  (H.Hagen)
 

Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-07-30 23:49:47 UTC (rev 64013)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h	2022-07-31 20:32:30 UTC (rev 64014)
@@ -1,4 +1,4 @@
 #ifndef luatex_svn_revision_h
 #define luatex_svn_revision_h
-#define luatex_svn_revision 7532
+#define luatex_svn_revision 7534
 #endif

Modified: trunk/Build/source/texk/web2c/luatexdir/tex/texfileio.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/texfileio.c	2022-07-30 23:49:47 UTC (rev 64013)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/texfileio.c	2022-07-31 20:32:30 UTC (rev 64014)
@@ -92,17 +92,12 @@
 static char *find_in_output_directory(const char *s)
 {
     if (output_directory && !kpse_absolute_p(s, false)) {
-        FILE *f_ptr;
         char *ftemp = concat3(output_directory, DIR_SEP_STRING, s);
+	char *ret_val = NULL ;
         /*tex This code is used for input files only. */
-        f_ptr = fopen(ftemp, "rb");
-        if (f_ptr) {
-            fclose(f_ptr);
-            return ftemp;
-        } else {
-            free(ftemp);
-
-        }
+	ret_val = kpse_find_file(ftemp, kpse_tex_format, 1);
+	free(ftemp);
+	return ret_val;
     }
     return NULL;
 }

Modified: trunk/Build/source/texk/web2c/mplibdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2022-07-30 23:49:47 UTC (rev 64013)
+++ trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2022-07-31 20:32:30 UTC (rev 64014)
@@ -1,3 +1,6 @@
+2022-07-31 Luigi Scarso <luigi.scarso at gmail.com>
+    * MetaPost: Working on the file extension (work in progress).
+
 2022-05-28  Akira Kakuto  <kakuto at jcom.zaq.ne.jp>
 
         * mp.w: Typo.

Modified: trunk/Build/source/texk/web2c/mplibdir/mp.w
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/mp.w	2022-07-30 23:49:47 UTC (rev 64013)
+++ trunk/Build/source/texk/web2c/mplibdir/mp.w	2022-07-31 20:32:30 UTC (rev 64014)
@@ -34815,9 +34815,9 @@
 
 @<Use |c| to compute the file extension |s|@>=
 {
-  s = xmalloc (12, 1);
-  mp_snprintf (s, 12, ".%i", (int) c);
-  s[7]='\0';
+  s = xmalloc (13, 1);
+  mp_snprintf (s, 13, ".%i", (int) c);
+  s[13]='\0';
 }