From 30cc6bbe3e9c17ac8f45ee5083e67f2ded7aa7f7 Mon Sep 17 00:00:00 2001 From: Luigi Scarso <luigi.scarso@gmail.com> Date: Fri, 25 Oct 2019 21:56:53 +0000 Subject: [PATCH] also support {oeps.foo} filenames in openin/out -- tags 1.11.1 --- source/texk/web2c/luatexdir/ChangeLog | 4 ++++ source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- source/texk/web2c/luatexdir/tex/extensions.c | 12 +++++++++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/source/texk/web2c/luatexdir/ChangeLog b/source/texk/web2c/luatexdir/ChangeLog index 25ba382c8..30afe026f 100644 --- a/source/texk/web2c/luatexdir/ChangeLog +++ b/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2019-10-25 Luigi Scarso <luigi.scarso@gmail.com> + * Also support {oeps.foo} filenames in openin/out + + 2019-10-22 Luigi Scarso <luigi.scarso@gmail.com> * *** DROPPED "page_objnum_provider" callback , replaced with "page_order_index" *** diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h index 18305fd20..47770e44e 100644 --- a/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 7208 +#define luatex_svn_revision 7211 diff --git a/source/texk/web2c/luatexdir/tex/extensions.c b/source/texk/web2c/luatexdir/tex/extensions.c index d5914db8a..d24bee13b 100644 --- a/source/texk/web2c/luatexdir/tex/extensions.c +++ b/source/texk/web2c/luatexdir/tex/extensions.c @@ -370,7 +370,17 @@ void do_extension(int immediate) p = tail; new_write_whatsit(open_node_size,1); scan_optional_equals(); - scan_file_name(); + /* scan_file_name(); */ + do { + get_x_token(); + } while ((cur_cmd == spacer_cmd) || (cur_cmd == relax_cmd)); + back_input(); + if (cur_cmd != left_brace_cmd) { + scan_file_name(); + } else { + scan_file_name_toks(); + } + /* */ open_name(tail) = cur_name; open_area(tail) = cur_area; open_ext(tail) = cur_ext; -- GitLab