summaryrefslogtreecommitdiffstats
path: root/source/t/texlive/patches/fixes-210420.patch
blob: 345b479e944919f6252033593b8f191f2840eee7 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
diff -ru texlive-20210324-source/texk/web2c/luatexdir/ChangeLog source/texk/web2c/luatexdir/ChangeLog
--- texlive-20210324-source/texk/web2c/luatexdir/ChangeLog	2021-03-23 18:33:25.000000000 +0100
+++ source/texk/web2c/luatexdir/ChangeLog	2021-04-19 07:46:56.693445474 +0200
@@ -1,3 +1,12 @@
+2021-04-10 Luigi Scarso <luigi.scarso@gmail.com>
+    * 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 <luigi.scarso@gmail.com>
+    * LuaTeX version 1.13.1,  
+      The version change is due solely to the bug fix in btex .. etex 
+
 2021-03-23 Karl Berry <karl@tug.org>
     * TL'21.
 
diff -ru texlive-20210324-source/texk/web2c/luatexdir/NEWS source/texk/web2c/luatexdir/NEWS
--- texlive-20210324-source/texk/web2c/luatexdir/NEWS	2021-03-12 23:55:21.000000000 +0100
+++ source/texk/web2c/luatexdir/NEWS	2021-04-19 07:46:56.695445474 +0200
@@ -1,4 +1,23 @@
 ==============================================================
+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 -ru texlive-20210324-source/texk/web2c/luatexdir/luatex.c source/texk/web2c/luatexdir/luatex.c
--- texlive-20210324-source/texk/web2c/luatexdir/luatex.c	2021-02-25 20:15:40.000000000 +0100
+++ source/texk/web2c/luatexdir/luatex.c	2021-04-19 07:46:59.292445512 +0200
@@ -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 <kpathsea/c-ctype.h>
diff -ru texlive-20210324-source/texk/web2c/luatexdir/luatex_svnversion.h source/texk/web2c/luatexdir/luatex_svnversion.h
--- texlive-20210324-source/texk/web2c/luatexdir/luatex_svnversion.h	2021-03-16 22:21:41.000000000 +0100
+++ source/texk/web2c/luatexdir/luatex_svnversion.h	2021-04-19 07:46:59.293445512 +0200
@@ -1 +1 @@
-#define luatex_svn_revision 7418
+#define luatex_svn_revision 7430
diff -ru texlive-20210324-source/texk/web2c/mplibdir/ChangeLog source/texk/web2c/mplibdir/ChangeLog
--- texlive-20210324-source/texk/web2c/mplibdir/ChangeLog	2021-03-23 18:33:25.000000000 +0100
+++ source/texk/web2c/mplibdir/ChangeLog	2021-04-19 07:47:01.823445550 +0200
@@ -1,10 +1,15 @@
+2021-04-10  Luigi Scarso  <luigi.scarso@gmail.com>
+	* Metapost version 2.01 (needed to mark the patch mpx_copy_mpto).
+
+2021-04-02  Luigi Scarso  <luigi.scarso@gmail.com>
+	* 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 <karl@tug.org>
     * TL'21.
 
 2020-12-28  Luigi Scarso  <luigi.scarso@gmail.com>
 	* Temp, fix in mpx_copy_mpto, changed || with && to avoid a wrong final %
 
-
 2020-12-27  Luigi Scarso  <luigi.scarso@gmail.com>
 	* Fixed some typos in manual (thank to 胡亚捷 (Hu Yajie) )
 	* Added the undocumented -T option
diff -ru texlive-20210324-source/texk/web2c/mplibdir/am/libmplib.am source/texk/web2c/mplibdir/am/libmplib.am
--- texlive-20210324-source/texk/web2c/mplibdir/am/libmplib.am	2021-02-25 20:15:51.000000000 +0100
+++ source/texk/web2c/mplibdir/am/libmplib.am	2021-04-19 07:47:01.824445550 +0200
@@ -1,6 +1,6 @@
 ## texk/web2c/mplibdir/am/libmplib.am: Makefile fragment for libmplib.
 ##
-## Copyright (C) 2015-2020 Luigi Scarso <tex-live@tug.org>
+## Copyright (C) 2015-2021 Luigi Scarso <tex-live@tug.org>
 ## Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
diff -ru texlive-20210324-source/texk/web2c/mplibdir/am/mplib.am source/texk/web2c/mplibdir/am/mplib.am
--- texlive-20210324-source/texk/web2c/mplibdir/am/mplib.am	2021-02-25 20:15:51.000000000 +0100
+++ source/texk/web2c/mplibdir/am/mplib.am	2021-04-19 07:47:01.826445550 +0200
@@ -1,6 +1,6 @@
 ## texk/web2c/mplibdir/am/mplib.am: Makefile fragment for MetaPost.
 ##
-## Copyright 2017-2018 Luigi Scarso <tex-live@tug.org>
+## Copyright 2017-2021 Luigi Scarso <tex-live@tug.org>
 ## Copyright 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 
diff -ru texlive-20210324-source/texk/web2c/mplibdir/mp.w source/texk/web2c/mplibdir/mp.w
--- texlive-20210324-source/texk/web2c/mplibdir/mp.w	2021-02-25 20:15:52.000000000 +0100
+++ source/texk/web2c/mplibdir/mp.w	2021-04-19 07:47:01.967445552 +0200
@@ -71,12 +71,12 @@
 @^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
 
 @<Metapost version header@>=
-#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 -ru texlive-20210324-source/texk/web2c/mplibdir/mpxout.w source/texk/web2c/mplibdir/mpxout.w
--- texlive-20210324-source/texk/web2c/mplibdir/mpxout.w	2021-02-25 20:15:52.000000000 +0100
+++ source/texk/web2c/mplibdir/mpxout.w	2021-04-19 07:47:01.979445552 +0200
@@ -564,7 +564,7 @@
     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);
diff -ru texlive-20210324-source/texk/web2c/pmpostdir/pmp.ch source/texk/web2c/pmpostdir/pmp.ch
--- texlive-20210324-source/texk/web2c/pmpostdir/pmp.ch	2021-02-25 20:16:12.000000000 +0100
+++ source/texk/web2c/pmpostdir/pmp.ch	2021-04-20 07:00:12.086686937 +0200
@@ -13,19 +13,19 @@
 %
 
 @x
-@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 */
 @y
 @z
 
 @x
-#define metapost_version "2.00"
+#define metapost_version "2.01"
 @y
 #ifdef UPMP
 #define P_UP "up"
-#define metapost_version "2.00-0.04-u1.27"
+#define metapost_version "2.01-0.04-u1.27"
 #else
 #define P_UP "p"
-#define metapost_version "2.00-0.04"
+#define metapost_version "2.01-0.04"
 #endif
 #define default_banner "This is " P_UP "MetaPost, Version " metapost_version /* printed when \MP\ starts */
 @z