summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorLuigi Scarso <luigi.scarso@gmail.com>2021-04-02 07:44:39 +0000
committerLuigi Scarso <luigi.scarso@gmail.com>2021-04-02 07:44:39 +0000
commit8514c648b8628b6a71780073e7589cc4b0798044 (patch)
treea5a58b35bf27f207c7f0b7885a24b74654c70ff5 /Build
parent22ec3adb3bf86566abd014487e7210ab8d75f0af (diff)
Revert the patch in mpx_copy_mpto, it was wrong in tex mode. Added a check if in troff mode.
git-svn-id: svn://tug.org/texlive/trunk@58698 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/mplibdir/mpxout.w2
2 files changed, 4 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index 8085a9db296..1f6949d76aa 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,10 +1,12 @@
+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 --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);