From b6faa1817bf2bffd5998a488a91385c4550adbd5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Apr 2021 01:03:52 +0000 Subject: branch2021: mpost 2.01/luatex 1.13.2 btex space fix git-svn-id: svn://tug.org/texlive/branches/branch2021@58914 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/luatexdir/ChangeLog | 9 +++++++++ Build/source/texk/web2c/luatexdir/NEWS | 19 +++++++++++++++++++ Build/source/texk/web2c/luatexdir/luatex.c | 4 ++-- Build/source/texk/web2c/luatexdir/luatex_svnversion.h | 2 +- Build/source/texk/web2c/mplibdir/ChangeLog | 7 ++++++- Build/source/texk/web2c/mplibdir/am/libmplib.am | 2 +- Build/source/texk/web2c/mplibdir/am/mplib.am | 2 +- Build/source/texk/web2c/mplibdir/mp.w | 4 ++-- Build/source/texk/web2c/mplibdir/mpxout.w | 2 +- 9 files changed, 42 insertions(+), 9 deletions(-) diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index e1b905d8147..2cfba66d219 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,12 @@ +2021-04-10 Luigi Scarso + * LuaTeX version 1.13.2 with MetaPost 2.01. + The version change in MetaPost + is due solely to the bug fix in btex .. etex + +2021-04-02 Luigi Scarso + * LuaTeX version 1.13.1, + The version change is due solely to the bug fix in btex .. etex + 2021-03-23 Karl Berry * TL'21. diff --git a/Build/source/texk/web2c/luatexdir/NEWS b/Build/source/texk/web2c/luatexdir/NEWS index 42f85aeb511..2b39dd75db5 100644 --- a/Build/source/texk/web2c/luatexdir/NEWS +++ b/Build/source/texk/web2c/luatexdir/NEWS @@ -1,3 +1,22 @@ +============================================================== +LuaTeX 1.13.2 2021-04-10 +============================================================== + +MetaPost 2.01 (to mark the patch on the unwanted space in +btex etex). + + + +============================================================== +LuaTeX 1.13.1 2021-04-02 +============================================================== + +Fixed an unwanted space in btex etex in metapost, introduced +after a patch for troff. + + + + ============================================================== LuaTeX 1.13.0 2021-03-12 ============================================================== diff --git a/Build/source/texk/web2c/luatexdir/luatex.c b/Build/source/texk/web2c/luatexdir/luatex.c index d7414ef3fd9..32be034a474 100644 --- a/Build/source/texk/web2c/luatexdir/luatex.c +++ b/Build/source/texk/web2c/luatexdir/luatex.c @@ -33,8 +33,8 @@ */ int luatex_version = 113; -int luatex_revision = '0'; -const char *luatex_version_string = "1.13.0"; +int luatex_revision = '2'; +const char *luatex_version_string = "1.13.2"; const char *engine_name = my_name; #include diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h index 221a98b0b4e..05a5731b53d 100644 --- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h +++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h @@ -1 +1 @@ -#define luatex_svn_revision 7418 +#define luatex_svn_revision 7430 diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog index 8085a9db296..3a421c77907 100644 --- a/Build/source/texk/web2c/mplibdir/ChangeLog +++ b/Build/source/texk/web2c/mplibdir/ChangeLog @@ -1,10 +1,15 @@ +2021-04-10 Luigi Scarso + * Metapost version 2.01 (needed to mark the patch mpx_copy_mpto). + +2021-04-02 Luigi Scarso + * Revert the patch in mpx_copy_mpto, it was wrong in tex mode. Added a check if in troff mode. + 2021-03-23 Karl Berry * TL'21. 2020-12-28 Luigi Scarso * Temp, fix in mpx_copy_mpto, changed || with && to avoid a wrong final % - 2020-12-27 Luigi Scarso * Fixed some typos in manual (thank to 胡亚捷 (Hu Yajie) ) * Added the undocumented -T option diff --git a/Build/source/texk/web2c/mplibdir/am/libmplib.am b/Build/source/texk/web2c/mplibdir/am/libmplib.am index 4b0fc7fd59f..24245f5785e 100644 --- a/Build/source/texk/web2c/mplibdir/am/libmplib.am +++ b/Build/source/texk/web2c/mplibdir/am/libmplib.am @@ -1,6 +1,6 @@ ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib. ## -## Copyright (C) 2015-2020 Luigi Scarso +## Copyright (C) 2015-2021 Luigi Scarso ## Copyright (C) 2009-2014 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am index a8b0da6ee26..0cfdec7ac31 100644 --- a/Build/source/texk/web2c/mplibdir/am/mplib.am +++ b/Build/source/texk/web2c/mplibdir/am/mplib.am @@ -1,6 +1,6 @@ ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost. ## -## Copyright 2017-2018 Luigi Scarso +## Copyright 2017-2021 Luigi Scarso ## Copyright 2009-2015 Peter Breitenlohner ## You may freely use, modify and/or distribute this file. diff --git a/Build/source/texk/web2c/mplibdir/mp.w b/Build/source/texk/web2c/mplibdir/mp.w index dcbd01b31ea..2a28640c215 100644 --- a/Build/source/texk/web2c/mplibdir/mp.w +++ b/Build/source/texk/web2c/mplibdir/mp.w @@ -71,12 +71,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 2.00" /* printed when \MP\ starts */ +@d default_banner "This is MetaPost, Version 2.01" /* printed when \MP\ starts */ @d true 1 @d false 0 @= -#define metapost_version "2.00" +#define metapost_version "2.01" @ The external library header for \MP\ is |mplib.h|. It contains a few typedefs and the header defintions for the externally used diff --git a/Build/source/texk/web2c/mplibdir/mpxout.w b/Build/source/texk/web2c/mplibdir/mpxout.w index f08645a28f0..96a1f3d776e 100644 --- a/Build/source/texk/web2c/mplibdir/mpxout.w +++ b/Build/source/texk/web2c/mplibdir/mpxout.w @@ -564,7 +564,7 @@ static void mpx_copy_mpto (MPX mpx, FILE *outfile, int textype) { if (textype == B_TEX) { /* put no |%| at end if it's only 1 line total, starting with |%|; * this covers the special case |%&format| in a single line. */ - if (t != s && *t != '%') + if ((t != s || *t != '%') && mpx->mode == mpx_tex_mode) fprintf(outfile,"%%"); } free(res); -- cgit v1.2.3