From a4a4aad8f0f09d5c1a58209ceee4cb611a6e9970 Mon Sep 17 00:00:00 2001 From: Luigi Scarso Date: Fri, 31 Mar 2017 13:27:09 +0000 Subject: luatex 1.0.4 and metapost 2.0rc1 git-svn-id: svn://tug.org/texlive/trunk@43654 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/NEWS | 9 +++++++++ Build/source/texk/web2c/luatexdir/am/luamisc.am | 15 ++------------- Build/source/texk/web2c/luatexdir/lua/ltexlib.c | 7 +++++-- Build/source/texk/web2c/luatexdir/luatex.c | 2 +- Build/source/texk/web2c/mplibdir/ChangeLog | 9 +++++++++ Build/source/texk/web2c/mplibdir/mp.w | 4 ++-- 6 files changed, 28 insertions(+), 18 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS index 3bd279cfccf..eacbe3cd34d 100644 --- a/Build/source/texk/web2c/luatexdir/NEWS +++ b/Build/source/texk/web2c/luatexdir/NEWS @@ -1,6 +1,15 @@ This file is in the public domain. +============================================================== +LuaTeX Release 1.0.4 was released 2017033109 +============================================================== + +Several small fixes. This version will go on texlive. + + + + ============================================================== LuaTeX Release 1.0.3 was released 2017021514 ============================================================== diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am index 07bf9bc8acc..11ee175c1a1 100644 --- a/Build/source/texk/web2c/luatexdir/am/luamisc.am +++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am @@ -1,10 +1,10 @@ ## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc -## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode) +## (luafilesystem, luamd5, luapeg, luazip, luazlib and slnunicode) ## ## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. -## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, +## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, ## and slnunicode) EXTRA_LIBRARIES += libluamisc.a libluajitmisc.a @@ -33,16 +33,6 @@ libluamisc_sources = \ luatexdir/luamd5/md5_lua.c \ luatexdir/luapeg/lpeg.c \ luatexdir/luapeg/lpeg.h \ - luatexdir/luaprofiler/clocks.c \ - luatexdir/luaprofiler/clocks.h \ - luatexdir/luaprofiler/core_profiler.c \ - luatexdir/luaprofiler/core_profiler.h \ - luatexdir/luaprofiler/function_meter.c \ - luatexdir/luaprofiler/function_meter.h \ - luatexdir/luaprofiler/luaprofiler.h \ - luatexdir/luaprofiler/stack.c \ - luatexdir/luaprofiler/stack.h \ - luatexdir/luaprofiler/lua50_profiler.c \ luatexdir/luazip/src/luazip.c \ luatexdir/luazip/src/luazip.h \ luatexdir/luazlib/lgzip.c \ @@ -71,7 +61,6 @@ EXTRA_DIST += \ luatexdir/luamd5/md5.html \ luatexdir/luamd5/md5.lua \ luatexdir/luamd5/md5tests.lua \ - luatexdir/luaprofiler/Makefile \ luatexdir/luazip/Makefile \ luatexdir/luazip/README \ luatexdir/luazip/config \ diff --git a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c index a38b608e40f..b5a110657f4 100644 --- a/Build/source/texk/web2c/luatexdir/lua/ltexlib.c +++ b/Build/source/texk/web2c/luatexdir/lua/ltexlib.c @@ -1775,6 +1775,7 @@ static int do_convert(lua_State * L, int cur_code) static int do_scan_internal(lua_State * L, int cur_cmd1, int cur_code, int values) { int texstr; + int retval = 1 ; char *str = NULL; int save_cur_val, save_cur_val_level; save_cur_val = cur_val; @@ -1790,13 +1791,15 @@ static int do_scan_internal(lua_State * L, int cur_cmd1, int cur_code, int value case mu_val_level: if (values == 0) { lua_pushinteger(L,width(cur_val)); + flush_node(cur_val); } else if (values == 1) { lua_pushinteger(L,width(cur_val)); lua_pushinteger(L,stretch(cur_val)); lua_pushinteger(L,shrink(cur_val)); lua_pushinteger(L,stretch_order(cur_val)); lua_pushinteger(L,shrink_order(cur_val)); - return 5; + flush_node(cur_val); + retval = 5; } else { lua_nodelib_push_fast(L, cur_val); } @@ -1815,7 +1818,7 @@ static int do_scan_internal(lua_State * L, int cur_cmd1, int cur_code, int value } cur_val = save_cur_val; cur_val_level = save_cur_val_level; - return 1; + return retval; } static int do_lastitem(lua_State * L, int cur_code) diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index 7706c6e98b3..3eba56679b8 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -30,7 +30,7 @@ int luatex_version = 100; /* \.{\\luatexversion} */ int luatex_revision = '4'; /* \.{\\luatexrevision} */ -int luatex_date_info = 2017021514; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/ +int luatex_date_info = 2017033109; /* the compile date is now hardwired :YEAR MONTH DAY HOUR*/ const char *luatex_version_string = "1.0.4"; const char *engine_name = my_name; /* the name of this engine */ diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 476aff894ed..3ea30728310 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,3 +1,12 @@ +2017-03-31 Luigi Scarso + * fixed the value header_last to be sure + to store always the latest position. + * Bump to version 2.0rc1. It's a release candidate for + testing latest patches and eventually new primitives + (to be discussed at 2017 BachoTeX/TUG meeting). + As the version is always a number, the current version is 2.000 + (a way to say 2.0rc1). + 2017-02-13 Luigi Scarso new primitive boundingpath diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w index 4d48514a1d7..929b012c21b 100644 --- a/Build/source/texk/web2c/mplibdir/mp.w +++ b/Build/source/texk/web2c/mplibdir/mp.w @@ -73,12 +73,12 @@ undergoes any modifications, so that it will be clear which version of @^extensions to \MP@> @^system dependencies@> -@d default_banner "This is MetaPost, Version 1.9991" /* printed when \MP\ starts */ +@d default_banner "This is MetaPost, Version 2.000" /* printed when \MP\ starts */ @d true 1 @d false 0 @= -#define metapost_version "1.9991" +#define metapost_version "2.000" @ The external library header for \MP\ is |mplib.h|. It contains a few typedefs and the header defintions for the externally used -- cgit v1.2.3