summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-07-31 20:32:30 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2022-07-31 20:32:30 +0000
commit777011fda32e002ee464628cc0bb24380db95279 (patch)
tree315f6b8efd8dfa64c515055258779ec6edad2224 /Build/source/texk
parent55d85a71370780217495ab347425b54810cc7d62 (diff)
metapost, luatex: sync with the upstream
git-svn-id: svn://tug.org/texlive/trunk@64014 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog3
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texfileio.c13
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog3
-rw-r--r--Build/source/texk/web2c/mplibdir/mp.w6
5 files changed, 14 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 9454d04d5ab..d0be010ac9c 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,6 @@
+2022-07-31 Luigi Scarso <luigi.scarso@gmail.com>
+ * Fixed loading .tex when --output-directory is enabled
+
2022-07-30 Luigi Scarso <luigi.scarso@gmail.com>
* Backtrack replace pointer when successive disc in exceptions (H.Hagen)
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index 0f1c3154a0a..685c1af6250 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -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
diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.c b/Build/source/texk/web2c/luatexdir/tex/texfileio.c
index 8d8cdc04363..83a76a21f00 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texfileio.c
+++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.c
@@ -92,17 +92,12 @@ int read_file_callback_id[17];
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;
}
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index f45e58b1876..55ab2c8571e 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,6 @@
+2022-07-31 Luigi Scarso <luigi.scarso@gmail.com>
+ * MetaPost: Working on the file extension (work in progress).
+
2022-05-28 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
* mp.w: Typo.
diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w
index f6d8b8415f9..96d7390dcf5 100644
--- a/Build/source/texk/web2c/mplibdir/mp.w
+++ b/Build/source/texk/web2c/mplibdir/mp.w
@@ -34815,9 +34815,9 @@ extreme cases so it may have to be shortened on some systems.
@<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';
}