Skip to content
Permalink
Browse files

sync with experimental 7038

git-svn-id: https://serveur-svn.lri.fr/svn/modhel/luatex/trunk@7039 0b2b3880-5936-4365-a048-eb17d2e5a6bf
  • Loading branch information...
luigiScarso committed Jan 19, 2019
1 parent fa9b1bc commit db10e585f662630461e96938de1043a4c5ca2852
@@ -1,3 +1,11 @@
==============================================================
LuaTeX 1.09.2 2019-01-19
==============================================================

This is a transitional release to LuaTeX 1.10 for TeX Live 2019



==============================================================
LuaTeX 1.09 2018-10-23
==============================================================
@@ -37,6 +37,7 @@
# include <stdio.h>
# include <string.h>
# include <kpathsea/c-ctype.h>
# include <kpathsea/simpletypes.h>
# include <sys/stat.h>
# include <dirent.h>

@@ -50,7 +51,7 @@ typedef enum { FE_FAIL, FE_RETURN_NULL } file_error_mode;

/* the following code is extremly ugly but needed for including web2c/config.h */

typedef const char *const_string; /* including kpathsea/types.h doesn't work on some systems */
/*typedef const char *const_string;*/ /* including kpathsea/types.h doesn't work on some systems */

# define KPATHSEA_CONFIG_H /* avoid including other kpathsea header files */

@@ -2,7 +2,7 @@
luainit.w
Copyright 2006-2018 Taco Hoekwater <taco@@luatex.org>
Copyright 2006-2019 Taco Hoekwater <taco@@luatex.org>
This file is part of LuaTeX.
@@ -425,7 +425,7 @@ static void parse_options(int ac, char **av)
"the terms of the GNU General Public License, version 2 or (at your option)\n"
"any later version. For more information about these matters, see the file\n"
"named COPYING and the LuaTeX source.\n\n"
"LuaTeX is Copyright 2018 Taco Hoekwater and the LuaTeX Team.\n");
"LuaTeX is Copyright 2019 Taco Hoekwater and the LuaTeX Team.\n");
/* *INDENT-ON* */
uexit(0);
} else if (ARGUMENT_IS("credits")) {
@@ -926,8 +926,11 @@ void lua_initialize(int ac, char **av)
#if defined(WIN32) || defined(__MINGW32__) || defined(__CYGWIN__)
mk_suffixlist();
#endif
/*tex Must be initialized before options are parsed. */
/*tex Must be initialized before options are parsed and might get adapted by config table. */
interactionoption = 4;
filelineerrorstylep = false;
haltonerrorp = false;
tracefilenames = 1;
dump_name = NULL;
/*tex
In the next option 0 means ``disable Synchronize TeXnology''. The
@@ -1075,22 +1078,23 @@ void lua_initialize(int ac, char **av)
}
kpse_init = -1;
get_lua_boolean("texconfig", "kpse_init", &kpse_init);

if (kpse_init != 0) {
/*tex re-enable loading of texmf.cnf values, see luatex.ch */
luainit = 0;
init_kpse();
kpse_init = 1;
}
/*tex |prohibit_file_trace| (boolean) */
tracefilenames = 1;
get_lua_boolean("texconfig", "trace_file_names", &tracefilenames);
/*tex |file_line_error| */
filelineerrorstylep = false;
get_lua_boolean("texconfig", "file_line_error", &filelineerrorstylep);
/*tex |halt_on_error| */
haltonerrorp = false;
get_lua_boolean("texconfig", "halt_on_error", &haltonerrorp);
/*tex |interactionoption| */
get_lua_number("texconfig", "interaction", &interactionoption);
if ((interactionoption < 0) || (interactionoption > 4)) {
interactionoption = 4;
}
/*tex |restrictedshell| */
v1 = NULL;
get_lua_string("texconfig", "shell_escape", &v1);
@@ -2,7 +2,7 @@
mplibstuff.w
Copyright 2017 LuaTeX team <bugs@@luatex.org>
Copyright 2019 LuaTeX team <bugs@@luatex.org>
This file is part of LuaTeX.
@@ -3,12 +3,11 @@
#define PP_CONF_H

//#include "utilarm.h" // keep in sync
#if defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm || defined __ARM_ARCH ||defined __aarch64__ ||( defined(__sun) && defined(__SVR4))
# define ARM_COMPLIANT 1
#else
# define ARM_COMPLIANT 0
#endif

#if defined __arm__ || defined __ARM__ || defined ARM || defined __ARM || defined __arm || defined __ARM_ARCH ||defined __aarch64__ ||( defined(__sun) && defined(__SVR4))
# define ARM_COMPLIANT 1
#else
# define ARM_COMPLIANT 0
#endif

/*
Aux flags:
@@ -81,4 +80,4 @@ Aux flags:

#define PPSIZEF PPUINTF

#endif
#endif

0 comments on commit db10e58

Please sign in to comment.
You can’t perform that action at this time.