diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
20 files changed, 146 insertions, 51 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 440387aed6e..865558bcd7b 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,60 @@ +2009-10-24 Peter Breitenlohner <peb@mppmu.mpg.de> + + * luatex.web: Use kpse_{in,out}_name_ok(), now in Kpathsea, + instead of open{in,out}nameok(). + * luatex.defines: Replace open_{in,out}_name_ok by + kpse_{in,out}_name_ok. + +2009-10-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * image/pdftoepdf.cc: Adapt to poppler-0.12. + + * FIXME: image/epdf.h, utils/utils.h: Multiple prototypes for + pdftex_fail, pdftex_warn, and probably others. + +2009-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/luatex.am: Adapt to new makecpool with one argument. + +2009-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * lua/luainit.c (dump_name, c_job_name, last_source_name, + last_lineno): Drop extern declarations (now in texmfmp.h). + (user_progname): Constify string. + (lua_initialize): Avoid modifying the const_string 'dump_name'. + +2009-09-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * utils/synctex.c (synctex_suffix*): Constify strings. + +2009-09-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * luatangle.ch: Eliminate the unused |end_of_TANGLE| label. + +2009-09-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/libzzip.am: Enable compiler warnings. + * am/liblua51.am, am/libluatex.am, am/luafontforge.am, + am/luamisc.am, am/luasocket.am, am/luatex.am: Prepare compiler + warnings. + +2009-08-20 Peter Breitenlohner <peb@mppmu.mpg.de> + + * lua/lstatslib.c, lua/luainit.c: Drop extern decl of ptexbanner. + * utils/utils.c: #include <kpathsea/version.h> and drop extern + decls. + +2009-08-17 Peter Breitenlohner <peb@mppmu.mpg.de> + + * lua/liolib.c (io_popen): Changed Arg1 of shell_cmd_is_allowed(). + * lua/loslibext.c (os_exec, os_spawn, os_execute): Same. + +2009-08-16 Peter Breitenlohner <peb@mppmu.mpg.de> + + * am/luatangle.am: Adapt to web2c-sh. + * am/luatex.am (luatex_tangle): Use tangle-sh. + Adapt to tangle-sh and web2c-sh. + 2009-06-26 Taco Hoekwater <taco@luatex.org> * lua51/lcoco.c, lua51/lcoco.h: disable the coco patch on diff --git a/Build/source/texk/web2c/luatexdir/am/liblua51.am b/Build/source/texk/web2c/luatexdir/am/liblua51.am index 135f2a802f8..1067e4da432 100644 --- a/Build/source/texk/web2c/luatexdir/am/liblua51.am +++ b/Build/source/texk/web2c/luatexdir/am/liblua51.am @@ -11,6 +11,7 @@ liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 if !MINGW32 liblua51_a_CPPFLAGS += -DLUA_USE_POSIX endif !MINGW32 +liblua51_a_CFLAGS = # $(WARNING_CFLAGS) liblua51_a_SOURCES = \ luatexdir/lua51/lapi.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 3de565a776d..13a2fea4410 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -9,12 +9,12 @@ EXTRA_LIBRARIES += libluatex.a libluatex_a_DEPENDENCIES = libff.a -$(libluatex_a_OBJECTS): libff.a $(nodist_luatex_SOURCES) - libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 libluatex_a_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 libluatex_a_CPPFLAGS += -DpdfTeX +libluatex_a_CFLAGS = # $(WARNING_CFLAGS) +libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) libluatex_a_SOURCES = \ luatexdir/commands.h \ @@ -126,7 +126,8 @@ libluatex_a_SOURCES = \ ## included by luatexdir/font/writettf.c EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c -$(libluatex_a_OBJECTS): libff.a +# We must create libff.a and luatexd.h before building the libluatex_a_OBJECTS +$(libluatex_a_OBJECTS): libff.a luatexd.h luatexdir/luatexextra.h EXTRA_DIST += \ luatexdir/ChangeLog \ diff --git a/Build/source/texk/web2c/luatexdir/am/libzzip.am b/Build/source/texk/web2c/luatexdir/am/libzzip.am index 2b7a5579aac..af3d487a790 100644 --- a/Build/source/texk/web2c/luatexdir/am/libzzip.am +++ b/Build/source/texk/web2c/luatexdir/am/libzzip.am @@ -14,6 +14,7 @@ $(libzzip_a_OBJECTS): liblua51.a libzzip_a_CPPFLAGS = \ $(ZLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/zziplib +libzzip_a_CFLAGS = $(WARNING_CFLAGS) libzzip_a_SOURCES = \ luatexdir/zziplib/zzip/__debug.h \ diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am index 8669cfd3571..8cf02189eda 100644 --- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am +++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am @@ -18,6 +18,7 @@ libff_a_CPPFLAGS = \ -I$(top_srcdir)/luatexdir/lua51 \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/inc \ -I$(top_srcdir)/luatexdir/luafontloader/fontforge/fontforge +libff_a_CFLAGS = # $(WARNING_CFLAGS) libff_a_SOURCES = \ luatexdir/luafontloader/fontforge/Unicode/ArabicForms.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index bc8e46ebd86..c772427c2b1 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -16,6 +16,7 @@ libluamisc_a_CPPFLAGS = \ $(ZLIB_INCLUDES) \ -I$(top_srcdir)/luatexdir/lua51 \ -I$(top_srcdir)/luatexdir/zziplib +libluamisc_a_CFLAGS = # $(WARNING_CFLAGS) libluamisc_a_SOURCES = \ luatexdir/luafilesystem/src/lfs.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luasocket.am b/Build/source/texk/web2c/luatexdir/am/luasocket.am index 1a05d72216d..091bb9e9054 100644 --- a/Build/source/texk/web2c/luatexdir/am/luasocket.am +++ b/Build/source/texk/web2c/luatexdir/am/luasocket.am @@ -7,12 +7,13 @@ ## EXTRA_LIBRARIES += libluasocket.a -libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a +libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) libzzip.a -$(libluasocket_a_OBJECTS): libzzip.a +$(libluasocket_a_OBJECTS): libzzip.a libluasocket_a_CPPFLAGS = \ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51 +libluasocket_a_CFLAGS = # $(WARNING_CFLAGS) libluasocket_a_SOURCES = \ luatexdir/luasocket/src/auxiliar.c \ diff --git a/Build/source/texk/web2c/luatexdir/am/luatangle.am b/Build/source/texk/web2c/luatexdir/am/luatangle.am index ce96d497093..75fa50ca29d 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatangle.am +++ b/Build/source/texk/web2c/luatexdir/am/luatangle.am @@ -12,10 +12,9 @@ EXTRA_PROGRAMS += luatangle nodist_luatangle_SOURCES = luatangle.c luatangle.h luatangle.c luatangle.h: luatangle-web2c -luatangle-web2c: $(web2c_depend) luatangle.p - $(web2c) luatangle - echo timestamp >$@ - touch luatangle.c luatangle.h + @$(web2c) luatangle +luatangle-web2c: luatangle.p $(web2c_depend) + @$(web2c) luatangle EXTRA_DIST += $(luatangle_sources) diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index c7512a30265..dd77a520aa6 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -10,46 +10,47 @@ bin_PROGRAMS += luatex endif LUATEX EXTRA_PROGRAMS += luatex -## Force Automake to use CXXLD for linking +# Force Automake to use CXXLD for linking nodist_EXTRA_luatex_SOURCES = dummy.cxx -luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(buildenv) $(LUATANGLE) +luatex_tangle = WEBINPUTS=$(srcdir)/luatexdir $(SHELL) ./tangle-sh $@ '$(LUATANGLE) --underlines' luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) luatex_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5 luatex_CPPFLAGS += -Iluatexdir -I$(srcdir)/luatexdir -I$(srcdir)/luatexdir/lua51 -I$(srcdir)/mplibdir luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H` +luatex_CFLAGS = # $(WARNING_CFLAGS) +luatex_CXXFLAGS = # $(WARNING_CXXFLAGS) luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a libluasocket.a liblua51.a luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS) -luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a +luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs) -luatex_DEPENDENCIES = $(proglib) libluatex.a +luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a luatex_DEPENDENCIES += $(LIBPNG_DEPEND) $(ZLIB_DEPEND) $(XPDF_DEPEND) luatex_DEPENDENCIES += $(OBSDCOMPAT_DEPEND) libmd5.a libmplib.a +# We must create libluatex.a and libmplib.a before building the etex_OBJECTS. $(luatex_OBJECTS): libluatex.a libmplib.a luatex_c_h = luatexini.c luatex0.c luatexcoerce.h luatexd.h nodist_luatex_SOURCES = $(luatex_c_h) luatex-pool.c luatexextra.c luatexdir/luatexextra.h $(luatex_c_h): luatex-web2c + @$(web2c) luatex luatex-web2c: luatex.p $(web2c_texmf) luatexdir/luatex.defines - $(web2c) luatex - echo timestamp >$@ - touch $(luatex_c_h) + @$(web2c) luatex luatexextra.c: luatexd.h luatexdir/luatexextra.h lib/texmfmp.c sed s/TEX-OR-MF-OR-MP/luatex/ $(srcdir)/lib/texmfmp.c >$@ luatex_sources = luatexdir/luatex.web luatexdir/luatex.ch luatex.p luatex.pool: luatex-tangle -luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) - $(luatex_tangle) --underlines luatex luatex - echo timestamp >$@ - touch luatex.p luatex.pool -luatex-pool.c: luatex.pool $(makecpool_stamp) luatexdir/ptexlib.h luatexd.h - $(makecpool) luatex.pool luatexdir/ptexlib.h >$@ || rm -f $@ -## Extract luatex version + @$(luatex_tangle) luatex luatex +luatex-tangle: luatangle$(EXEEXT) $(luatex_sources) tangle-sh + @$(luatex_tangle) luatex luatex +luatex-pool.c: luatex.pool luatexd.h $(makecpool_stamp) + $(makecpool) luatex >$@ || rm -f $@ +# Extract luatex version luatexdir/luatex.version: luatexdir/luatex.web $(mkdir_p) luatexdir grep '^@d luatex_version_string==' $(srcdir)/luatexdir/luatex.web \ diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc index 0c54786c35f..536c6398cd7 100644 --- a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc +++ b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.cc @@ -666,7 +666,11 @@ static void writeEncodings() } for (r = encodingList; r != NULL; r = n) { n = r->next; +#ifdef POPPLER_VERSION + r->font->decRefCnt(); +#else delete r->font; +#endif delete r; } } @@ -705,7 +709,12 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, Page *page; int rotate; PDFRectangle *pagebox; - float pdf_version_found, pdf_version_wanted, xsize, ysize, xorig, yorig; +#ifdef HAVE_GETPDFMAJORVERSION + int pdf_major_version_found, pdf_minor_version_found; +#else + float pdf_version_found, pdf_version_wanted; +#endif + float xsize, ysize, xorig, yorig; assert(idict != NULL); assert(img_type(idict) == IMG_TYPE_PDF); // initialize @@ -720,6 +729,20 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, // this works only for PDF 1.x -- but since any versions of PDF newer // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will // then have to changed drastically anyway. +#ifdef HAVE_GETPDFMAJORVERSION + pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion(); + pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion(); + if ((pdf_major_version_found > 1) + || (pdf_minor_version_found > minor_pdf_version_wanted)) { + const char *msg = + "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed"; + if (pdf_inclusion_errorlevel > 0) { + pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); + } else { + pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted); + } + } +#else pdf_version_found = pdf_doc->doc->getPDFVersion(); pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1); if (pdf_version_found > pdf_version_wanted + 0.01) { @@ -731,6 +754,7 @@ read_pdf_info(image_dict * idict, integer minor_pdf_version_wanted, pdftex_warn(msg, pdf_version_found, pdf_version_wanted); } } +#endif img_totalpages(idict) = pdf_doc->doc->getCatalog()->getNumPages(); if (img_pagename(idict)) { // get page by name diff --git a/Build/source/texk/web2c/luatexdir/lua/liolib.c b/Build/source/texk/web2c/luatexdir/lua/liolib.c index c91cd5ccefd..28cfced022e 100644 --- a/Build/source/texk/web2c/luatexdir/lua/liolib.c +++ b/Build/source/texk/web2c/luatexdir/lua/liolib.c @@ -190,7 +190,7 @@ static int io_popen(lua_State * L) char *safecmd = NULL; char *cmdname = NULL; int allow = 0; - char *cmd = (char *) luaL_checkstring(L, 1); + const char *cmd = luaL_checkstring(L, 1); const char *mode = luaL_optstring(L, 2, "r"); FILE **pf = newfile(L); @@ -203,7 +203,7 @@ static int io_popen(lua_State * L) if (restrictedshell == 0) allow = 1; else - allow = shell_cmd_is_allowed(&cmd, &safecmd, &cmdname); + allow = shell_cmd_is_allowed(cmd, &safecmd, &cmdname); if (allow == 1) { *pf = lua_popen(L, cmd, mode); diff --git a/Build/source/texk/web2c/luatexdir/lua/loslibext.c b/Build/source/texk/web2c/luatexdir/lua/loslibext.c index 3758fffc0b4..979ed4202a8 100644 --- a/Build/source/texk/web2c/luatexdir/lua/loslibext.c +++ b/Build/source/texk/web2c/luatexdir/lua/loslibext.c @@ -382,7 +382,7 @@ static int os_exec(lua_State * L) if (restrictedshell == 0) allow = 1; else - allow = shell_cmd_is_allowed(&runcmd, &safecmd, &cmdname); + allow = shell_cmd_is_allowed(runcmd, &safecmd, &cmdname); if (allow > 0 && cmdline != NULL && runcmd != NULL) { #if defined(WIN32) && DONT_REALLY_EXIT @@ -461,7 +461,7 @@ static int os_spawn(lua_State * L) if (restrictedshell == 0) allow = 1; else - allow = shell_cmd_is_allowed(&runcmd, &safecmd, &cmdname); + allow = shell_cmd_is_allowed(runcmd, &safecmd, &cmdname); if (allow > 0 && cmdline != NULL && runcmd != NULL) { if (allow == 2) i = spawn_command(safecmd, cmdline, environ); @@ -884,7 +884,7 @@ static int os_execute(lua_State * L) int ret = 1; char *safecmd = NULL; char *cmdname = NULL; - char *cmd = (char *) luaL_optstring(L, 1, NULL); + const char *cmd = luaL_optstring(L, 1, NULL); if (shellenabledp <= 0) { lua_pushnil(L); @@ -895,7 +895,7 @@ static int os_execute(lua_State * L) if (restrictedshell == 0) allow = 1; else - allow = shell_cmd_is_allowed(&cmd, &safecmd, &cmdname); + allow = shell_cmd_is_allowed(cmd, &safecmd, &cmdname); if (allow == 1) { lua_pushinteger(L, system(cmd)); diff --git a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c index 658f9c24be8..efc4a2e8e96 100644 --- a/Build/source/texk/web2c/luatexdir/lua/lstatslib.c +++ b/Build/source/texk/web2c/luatexdir/lua/lstatslib.c @@ -30,7 +30,6 @@ typedef struct statistic { void *value; } statistic; -extern char *ptexbanner; extern void lua_nodelib_push_fast(lua_State * L, halfword n); typedef char *(*charfunc) (void); diff --git a/Build/source/texk/web2c/luatexdir/lua/luainit.c b/Build/source/texk/web2c/luatexdir/lua/luainit.c index 6adee9ee509..2f7f3bc5ccb 100644 --- a/Build/source/texk/web2c/luatexdir/lua/luainit.c +++ b/Build/source/texk/web2c/luatexdir/lua/luainit.c @@ -119,16 +119,10 @@ prepare_cmdline(lua_State * L, char **argv, int argc, int zero_offset) return; } -extern string dump_name; -extern const_string c_job_name; -extern char *last_source_name; -extern int last_lineno; - string input_name = NULL; -static string user_progname = NULL; +static const_string user_progname = NULL; -extern char *ptexbanner; extern int program_name_set; /* in lkpselib.c */ /* for topenin() */ @@ -550,7 +544,9 @@ void lua_initialize(int ac, char **av) get_lua_string("texconfig", "jobname", &input_name); } if (!dump_name) { - get_lua_string("texconfig", "formatname", &dump_name); + string temp; + get_lua_string("texconfig", "formatname", &temp); + dump_name = temp; } if ((lua_only) || ((!input_name) && (!dump_name))) { if (given_file) diff --git a/Build/source/texk/web2c/luatexdir/luatangle.ch b/Build/source/texk/web2c/luatexdir/luatangle.ch index 936e4d62ab4..809af366a69 100644 --- a/Build/source/texk/web2c/luatexdir/luatangle.ch +++ b/Build/source/texk/web2c/luatexdir/luatangle.ch @@ -53,6 +53,16 @@ \def\title{TANGLE changes for C} @z +@x [2] Eliminate the |end_of_TANGLE| label. +@d end_of_TANGLE = 9999 {go here to wrap it up} + +@y +@z +@x +label end_of_TANGLE; {go here to finish} +@y +@z + @x [?] Define and call parse_arguments. procedure initialize; var @<Local variables for initialization@>@/ @@ -375,6 +385,11 @@ print (banner); {print a ``banner line''} print_ln (version_string); @z +@x Eliminate the |end_of_TANGLE| label. +end_of_TANGLE: +@y +@z + @x @<Print the job |history|@>; @y diff --git a/Build/source/texk/web2c/luatexdir/luatangle.test b/Build/source/texk/web2c/luatexdir/luatangle.test index 99f6d090f20..f519174e8b6 100755 --- a/Build/source/texk/web2c/luatexdir/luatangle.test +++ b/Build/source/texk/web2c/luatexdir/luatangle.test @@ -4,7 +4,7 @@ # You may freely use, modify and/or distribute this file. TEXMFCNF=$srcdir/../kpathsea WEBINPUTS=$srcdir/cftests \ - ./luatangle cftest cftest || exit 1 + ./luatangle cftest cftest || exit 1 diff cftest.p $srcdir/cftests/lcftest.p || exit 1 diff --git a/Build/source/texk/web2c/luatexdir/luatex.defines b/Build/source/texk/web2c/luatexdir/luatex.defines index 82d24044977..a36e3847b0f 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.defines +++ b/Build/source/texk/web2c/luatexdir/luatex.defines @@ -595,8 +595,8 @@ @define procedure seconds_and_micros (); @define function ocp_open_in (); -@define function open_in_name_ok (); -@define function open_out_name_ok (); +@define function kpse_in_name_ok (); +@define function kpse_out_name_ok (); @define function w_open_in (); @define function w_open_out (); diff --git a/Build/source/texk/web2c/luatexdir/luatex.web b/Build/source/texk/web2c/luatexdir/luatex.web index 18e95a6f9b7..2a2589f7d07 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.web +++ b/Build/source/texk/web2c/luatexdir/luatex.web @@ -1040,7 +1040,7 @@ begin file_ok:=false; {read failed} end else begin {no read callback} - if openinnameok(stringcast(nameoffile+1)) then begin + if kpse_in_name_ok(stringcast(nameoffile+1)) then begin lua_a_open_in := a_open_in(f,kpsetexformat); name_file_pointer := f; end @@ -1074,7 +1074,7 @@ begin lua_a_open_out := false; end else begin - if openoutnameok(stringcast(nameoffile+1)) then begin + if kpse_out_name_ok(stringcast(nameoffile+1)) then begin lua_a_open_out := a_open_out(f); name_file_pointer := f; end @@ -1102,7 +1102,7 @@ begin lua_b_open_out := false; end else begin - if openoutnameok(stringcast(nameoffile+1)) then begin + if kpse_out_name_ok(stringcast(nameoffile+1)) then begin lua_b_open_out := b_open_out(f); name_file_pointer := f; end diff --git a/Build/source/texk/web2c/luatexdir/utils/synctex.c b/Build/source/texk/web2c/luatexdir/utils/synctex.c index 081e02ef597..cd454ba139b 100644 --- a/Build/source/texk/web2c/luatexdir/utils/synctex.c +++ b/Build/source/texk/web2c/luatexdir/utils/synctex.c @@ -324,9 +324,9 @@ void synctex_abort(void) static inline int synctex_record_preamble(void); static inline int synctex_record_input(integer tag, char *name); -static char *synctex_suffix = ".synctex"; -static char *synctex_suffix_gz = ".gz"; -static char *synctex_suffix_busy = "(busy)"; +static const char *synctex_suffix = ".synctex"; +static const char *synctex_suffix_gz = ".gz"; +static const char *synctex_suffix_busy = "(busy)"; /* synctex_dot_open ensures that the foo.synctex file is open. * In case of problem, it definitely disables synchronization. diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.c b/Build/source/texk/web2c/luatexdir/utils/utils.c index 0ca7441c699..2a397b50a10 100644 --- a/Build/source/texk/web2c/luatexdir/utils/utils.c +++ b/Build/source/texk/web2c/luatexdir/utils/utils.c @@ -33,6 +33,7 @@ #include <kpathsea/c-proto.h> #include <kpathsea/c-stat.h> #include <kpathsea/c-fopen.h> +#include <kpathsea/version.h> #include <string.h> #include <time.h> #include <float.h> /* for DBL_EPSILON */ @@ -62,9 +63,6 @@ str_number last_tex_string; static char print_buf[PRINTF_BUF_SIZE]; static char *jobname_cstr = NULL; static char *job_id_string = NULL; -extern string ptexbanner; /* from web2c/lib/texmfmp.c */ -extern string versionstring; /* from web2c/lib/version.c */ -extern KPSEDLL string kpathsea_version_string; /* from kpathsea/version.c */ size_t last_ptr_index; /* for use with alloc_array */ |