texlive[71262] Build/source/texk/web2c/luatexdir: Luatex 1.18.2.
commits+lscarso at tug.org
commits+lscarso at tug.org
Tue May 14 11:14:44 CEST 2024
Revision: 71262
https://tug.org/svn/texlive?view=revision&revision=71262
Author: lscarso
Date: 2024-05-14 11:14:44 +0200 (Tue, 14 May 2024)
Log Message:
-----------
Luatex 1.18.2. Omitprocset and ptexprefix (force _ instead of . as separator) (H.Hagen).
Modified Paths:
--------------
trunk/Build/source/texk/web2c/luatexdir/ChangeLog
trunk/Build/source/texk/web2c/luatexdir/image/epdf.h
trunk/Build/source/texk/web2c/luatexdir/image/pdftoepdf.c
trunk/Build/source/texk/web2c/luatexdir/image/writeimg.c
trunk/Build/source/texk/web2c/luatexdir/image/writeimg.h
trunk/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
trunk/Build/source/texk/web2c/luatexdir/luatex.c
trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.c
trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.h
trunk/Build/source/texk/web2c/luatexdir/pdf/pdflink.c
trunk/Build/source/texk/web2c/luatexdir/pdf/pdflistout.c
trunk/Build/source/texk/web2c/luatexdir/pdf/pdftables.h
trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c
Modified: trunk/Build/source/texk/web2c/luatexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/ChangeLog 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/ChangeLog 2024-05-14 09:14:44 UTC (rev 71262)
@@ -1,9 +1,15 @@
-2024-04-28 Luigi Scarso <luigi.scarso at gmail.com>
-
- * am/luaharfbuzz.am (libluajitharfbuzz_a_CPPFLAGS),
- * am/luamisc.am (libluajitmisc_a_CPPFLAGS):
- * am/luasocket.am (libluajitsocket_a_CPPFLAGS): add $(LUAJIT_DEFINES).
+2024-05-13 Luigi Scarso <luigi.scarso at gmail.com>
+ * Omitprocset and ptexprefix (force _ instead of . as separator) (H.Hagen)
+ * Bump to version 1.18.2
+
+2024-03-25 Luigi Scarso <luigi.scarso at gmail.com>
+ * Fixed synctex message on a math node with no zero glue
+
+2024-03-20 Luigi Scarso <luigi.scarso at gmail.com>
+ * Fixed wrong initialization of startup_filename (thanks to Wang Weixuan).
+
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: trunk/Build/source/texk/web2c/luatexdir/image/epdf.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/image/epdf.h 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/image/epdf.h 2024-05-14 09:14:44 UTC (rev 71262)
@@ -101,6 +101,8 @@
extern void pdf_dict_add_name(PDF, const char *key, const char *val);
extern void pdf_dict_add_streaminfo(PDF);
+extern const char *pdf_pdf_prefix_str(const char *a, const char *b);
+
/* Conflict with pdfgen.h */
/*# define pdf_out(pdf, A) do { pdf_room(pdf, 1); *(pdf->buf->p++) = A; } while (0)*/
/*# define pdf_quick_out(pdf,A) *(pdf->buf->p++)=(unsigned char)(A) */
Modified: trunk/Build/source/texk/web2c/luatexdir/image/pdftoepdf.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/image/pdftoepdf.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/image/pdftoepdf.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -822,15 +822,12 @@
*/
pdf_dict_add_img_filename(pdf, idict);
if ((suppress_optional_info & 4) == 0) {
- pdf_dict_add_int(pdf, "PTEX.PageNumber", (int) img_pagenum(idict));
+ pdf_dict_add_int(pdf, pdf_pdf_prefix_str("PTEX_PageNumber", "PTEX.PageNumber"), (int) img_pagenum(idict));
}
if ((suppress_optional_info & 8) == 0) {
infoDict = ppdoc_info(pdfe);
if (infoDict != NULL) {
- /* todo : check this
- pdf_dict_add_ref(pdf, "PTEX.InfoDict", addInObj(pdf, pdf_doc, infoDict));
- */
- pdf_add_name(pdf, "PTEX.InfoDict");
+ pdf_add_name(pdf,pdf_pdf_prefix_str("PTEX_InfoDict", "PTEX.InfoDict"));
copyDict(pdf, pdf_doc, infoDict);
}
}
Modified: trunk/Build/source/texk/web2c/luatexdir/image/writeimg.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/image/writeimg.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/image/writeimg.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -735,7 +735,7 @@
p = img_filepath(idict);
}
/*tex write additional information */
- pdf_add_name(pdf, "PTEX.FileName");
+ pdf_add_name(pdf, pdf_pdf_prefix_str("PTEX_FileName", "PTEX.InfoDict"));
pdf_printf(pdf, " (%s)", convertStringToPDFString(p, strlen(p)));
}
}
Modified: trunk/Build/source/texk/web2c/luatexdir/image/writeimg.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/image/writeimg.h 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/image/writeimg.h 2024-05-14 09:14:44 UTC (rev 71262)
@@ -28,6 +28,8 @@
typedef image_dict *idict_entry;
extern idict_entry *idict_array;
+extern const char *pdf_pdf_prefix_str(const char *a, const char *b);
+
void new_img_pdfstream_struct(image_dict *);
image *new_image(void);
image_dict *new_image_dict(void);
Modified: trunk/Build/source/texk/web2c/luatexdir/lua/lpdflib.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/lua/lpdflib.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/lua/lpdflib.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -17,7 +17,6 @@
You should have received a copy of the GNU General Public License along
with LuaTeX; if not, see <http://www.gnu.org/licenses/>. */
-
#include "ptexlib.h"
#include "lua/luatex-api.h"
#include "pdf/pdftables.h"
@@ -826,6 +825,18 @@
return 1 ;
}
+static int getpdfomitprocset(lua_State * L)
+{
+ lua_pushinteger(L, (pdf_omit_procset));
+ return 1 ;
+}
+
+static int getpdfptexprefix(lua_State * L)
+{
+ lua_pushinteger(L, (pdf_ptex_prefix));
+ return 1 ;
+}
+
static int setpdfgentounicode(lua_State * L)
{
/* ensures that glyph_unicode_tree is not null */
@@ -868,6 +879,22 @@
return 0 ;
}
+static int setpdfomitprocset(lua_State * L)
+{
+ if (lua_type(L, 1) == LUA_TNUMBER) {
+ set_pdf_omit_procset(lua_tointeger(L, 1));
+ }
+ return 0 ;
+}
+
+static int setpdfptexprefix(lua_State * L)
+{
+ if (lua_type(L, 1) == LUA_TNUMBER) {
+ set_pdf_ptex_prefix(lua_tointeger(L, 1));
+ }
+ return 0 ;
+}
+
/* for tracing purposes when no pages are flushed */
static int setforcefile(lua_State * L)
@@ -1382,6 +1409,8 @@
{ "getomitcharset", getpdfomitcharset },
{ "getomitinfo", getpdfomitinfodict },
{ "getomitmediabox", getpdfomitmediabox },
+ { "getomitprocset", getpdfomitprocset },
+ { "getptexprefix", getpdfptexprefix },
{ "setinclusionerrorlevel", setpdfinclusionerrorlevel },
{ "setignoreunknownimages", setpdfignoreunknownimages },
{ "setgentounicode", setpdfgentounicode },
@@ -1389,6 +1418,8 @@
{ "setomitcharset", setpdfomitcharset },
{ "setomitinfo", setpdfomitinfodict },
{ "setomitmediabox", setpdfomitmediabox },
+ { "setomitprocset", setpdfomitprocset },
+ { "setptexprefix", setpdfptexprefix },
{ "setforcefile", setforcefile },
{ "mapfile", l_mapfile },
{ "mapline", l_mapline },
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -33,8 +33,8 @@
*/
int luatex_version = 118;
-int luatex_revision = '1';
-const char *luatex_version_string = "1.18.1";
+int luatex_revision = '2';
+const char *luatex_version_string = "1.18.2";
const char *engine_name = my_name;
#include <kpathsea/c-ctype.h>
Modified: trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/luatex_svnversion.h 2024-05-14 09:14:44 UTC (rev 71262)
@@ -1,4 +1,4 @@
#ifndef luatex_svn_revision_h
#define luatex_svn_revision_h
-#define luatex_svn_revision 7616
+#define luatex_svn_revision 7620
#endif
Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -2020,7 +2020,7 @@
pdf_end_dict(pdf);
}
/*tex Generate |ProcSet| in version 1.*/
- if (pdf->major_version == 1) {
+ if (pdf->major_version == 1 && ! pdf_omit_procset) {
pdf_add_name(pdf, "ProcSet");
pdf_begin_array(pdf);
if ((procset & PROCSET_PDF) != 0)
@@ -2130,6 +2130,11 @@
return true;
}
+const char* pdf_pdf_prefix_str(const char *a, const char *b)
+{
+ return (pdf_ptex_prefix ? a : b);
+}
+
static int pdf_print_info(PDF pdf, int luatexversion, str_number luatexrevision)
{
boolean creator_given = false;
@@ -2195,7 +2200,7 @@
pdf_dict_add_name(pdf, "Trapped", "False");
}
if ((pdf_suppress_optional_info & 1) == 0) {
- pdf_dict_add_string(pdf, "PTEX.FullBanner", luatex_banner);
+ pdf_dict_add_string(pdf, pdf_pdf_prefix_str("PTEX_FullBanner", "PTEX.FullBanner"), luatex_banner);
}
pdf_end_dict(pdf);
pdf_end_obj(pdf);
Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.h 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdfgen.h 2024-05-14 09:14:44 UTC (rev 71262)
@@ -251,5 +251,8 @@
extern void check_o_mode(PDF pdf, const char *s, int o_mode, boolean errorflag);
extern void ensure_output_file_open(PDF pdf, const char *ext);
+/* PTEX prefix */
+extern const char *pdf_pdf_prefix_str(const char *a, const char *b);
+
#endif
Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdflink.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdflink.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdflink.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -122,7 +122,7 @@
pdf_ann_left(q) = pos.h;
if (pdf_ann_left(q) > pdf_ann_right(q)) {
halfword r = pdf_ann_right(q);
- halfword l = pdf_ann_left(q);
+ /* halfword l = pdf_ann_left(q); */
pdf_ann_right(q) = pos.h - r;
pdf_ann_left(q) = pos.h;
}
Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdflistout.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdflistout.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdflistout.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -498,6 +498,7 @@
break;
} else {
/*tex Fall through |mathskip|. */
+ /* No break; we have to go on to glue_node case.*/
}
/*tex End |mathskip| code. */
case glue_node:
@@ -812,8 +813,12 @@
MOVE_PAST:
cur.h += rule.wd;
if (synctex) {
- synch_pos_with_cur(pdf->posstruct, refpos, cur);
+ synch_pos_with_cur(pdf->posstruct, refpos, cur);
+ if( type(p) == math_node && !glue_is_zero(p) ) {
+ normal_warning("listout","synctex doesn't support math node with not zero glue");
+ } else {
synctexhorizontalruleorglue(p, this_box);
+ }
}
NEXTP:
p = vlink(p);
Modified: trunk/Build/source/texk/web2c/luatexdir/pdf/pdftables.h
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/pdf/pdftables.h 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/pdf/pdftables.h 2024-05-14 09:14:44 UTC (rev 71262)
@@ -144,6 +144,8 @@
c_pdf_omit_infodict,
c_pdf_omit_mediabox,
c_pdf_linking,
+ c_pdf_omit_procset,
+ c_pdf_ptex_prefix,
} pdf_backend_counters ;
typedef enum {
@@ -197,6 +199,8 @@
# define pdf_omit_mediabox get_tex_extension_count_register(c_pdf_omit_mediabox)
# define pdf_recompress get_tex_extension_count_register(c_pdf_recompress)
# define pdf_linking get_tex_extension_count_register(c_pdf_linking)
+# define pdf_omit_procset get_tex_extension_count_register(c_pdf_omit_procset)
+# define pdf_ptex_prefix get_tex_extension_count_register(c_pdf_ptex_prefix)
# define pdf_h_origin get_tex_extension_dimen_register(d_pdf_h_origin)
# define pdf_v_origin get_tex_extension_dimen_register(d_pdf_v_origin)
@@ -224,6 +228,8 @@
# define set_pdf_gen_tounicode(i) set_tex_extension_count_register(c_pdf_gen_tounicode,i)
# define set_pdf_recompress(i) set_tex_extension_count_register(c_pdf_recompress,i)
# define set_pdf_linking(i) set_tex_extension_count_register(c_pdf_linking,i)
+# define set_pdf_omit_procset(i) set_tex_extension_count_register(c_pdf_omit_procset,i)
+# define set_pdf_ptex_prefix(i) set_tex_extension_count_register(c_pdf_ptex_prefix,i)
# define set_pdf_decimal_digits(i) set_tex_extension_count_register(c_pdf_decimal_digits,i)
# define set_pdf_pk_resolution(i) set_tex_extension_count_register(c_pdf_pk_resolution,i)
Modified: trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c
===================================================================
--- trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c 2024-05-14 00:13:23 UTC (rev 71261)
+++ trunk/Build/source/texk/web2c/luatexdir/tex/textoken.c 2024-05-14 09:14:44 UTC (rev 71262)
@@ -2624,6 +2624,8 @@
else if (scan_keyword("omitinfodict")) { do_variable_backend_int(c_pdf_omit_infodict); }
else if (scan_keyword("omitmediabox")) { do_variable_backend_int(c_pdf_omit_mediabox); }
else if (scan_keyword("linking")) { do_variable_backend_int(c_pdf_linking); }
+ else if (scan_keyword("omitprocset")) { do_variable_backend_int(c_pdf_omit_procset); }
+ else if (scan_keyword("ptexprefix")) { do_variable_backend_int(c_pdf_ptex_prefix); }
else if (scan_keyword("horigin")) { do_variable_backend_dimen(d_pdf_h_origin); }
else if (scan_keyword("vorigin")) { do_variable_backend_dimen(d_pdf_v_origin); }
More information about the tex-live-commits
mailing list.