texlive[58698] Build/source/texk/web2c/mplibdir: Revert the patch in

[commits+lscarso at tug.org]

Revision: 58698
          http://tug.org/svn/texlive?view=revision&revision=58698
Author:   lscarso
Date:     2021-04-02 09:44:39 +0200 (Fri, 02 Apr 2021)
Log Message:
-----------
Revert the patch in mpx_copy_mpto, it was wrong in tex mode. Added a check if in troff mode.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/mplibdir/ChangeLog
    trunk/Build/source/texk/web2c/mplibdir/mpxout.w

Modified: trunk/Build/source/texk/web2c/mplibdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2021-04-02 01:34:02 UTC (rev 58697)
+++ trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2021-04-02 07:44:39 UTC (rev 58698)
@@ -1,3 +1,6 @@
+2021-04-02  Luigi Scarso  <luigi.scarso at 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 at tug.org>
     * TL'21.
 
@@ -4,7 +7,6 @@
 2020-12-28  Luigi Scarso  <luigi.scarso at gmail.com>
 	* Temp, fix in mpx_copy_mpto, changed || with && to avoid a wrong final %
 
-
 2020-12-27  Luigi Scarso  <luigi.scarso at gmail.com>
 	* Fixed some typos in manual (thank to 胡亚捷 (Hu Yajie) )
 	* Added the undocumented -T option

Modified: trunk/Build/source/texk/web2c/mplibdir/mpxout.w
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/mpxout.w	2021-04-02 01:34:02 UTC (rev 58697)
+++ trunk/Build/source/texk/web2c/mplibdir/mpxout.w	2021-04-02 07:44:39 UTC (rev 58698)
@@ -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);