pmpostdir: input a space between two "s

git-svn-id: svn://tug.org/texlive/trunk@44923 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 29 insertions, 25 deletions

diff --git a/Build/source/texk/web2c/pmpostdir/ChangeLog b/Build/source/texk/web2c/pmpostdir/ChangeLog
index f84d7e5223a..626f19955c0 100644
--- a/Build/source/texk/web2c/pmpostdir/ChangeLog
+++ b/Build/source/texk/web2c/pmpostdir/ChangeLog
@@ -1,3 +1,7 @@
+2017-07-30  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* ppsout.ch, pmpost.ch: Force a space between " and ".
+
 2017-04-24  Hironori Kitagawa  <h_kitagawa2001@yahoo.co.jp>
 
 	* pmpxout.ch: p\TeX -> \pTeX.
diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.ch b/Build/source/texk/web2c/pmpostdir/pmpost.ch
index a7add6f26fe..503de8bb9c4 100644
--- a/Build/source/texk/web2c/pmpostdir/pmpost.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmpost.ch
@@ -9,13 +9,13 @@ char kanjioption[16];
 @x
 @d TEX     "tex"
 @y
-@d TEX "e" P_UP "tex"
+@d TEX "e"@= @>P_UP@= @>"tex"
 @z
 
 @x
 #define MPXCOMMAND "makempx"
 @y
-#define MPXCOMMAND P_UP "makempx"
+#define MPXCOMMAND P_UP@= @>"makempx"
 @z
 
 @x
@@ -78,13 +78,13 @@ char kanjioption[16];
 @x
         const char *banner = "% Written by metapost version ";
 @y
-        const char *banner = "% Written by " P_UP "mpost version ";
+        const char *banner = "% Written by "@= @>P_UP@= @>"mpost version ";
 @z
 
 @x
       const char *banner = "% Written by dvitomp version ";
 @y
-      const char *banner = "% Written by " P_UP "dvitomp version ";
+      const char *banner = "% Written by "@= @>P_UP@= @>"dvitomp version ";
 @z
 
 @x
@@ -131,9 +131,9 @@ char kanjioption[16];
 else
   fprintf(stdout, "This is MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @y
-  fprintf(stdout, "This is " P_UP "dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, "This is "@= @>P_UP@= @>"dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 else
-  fprintf(stdout, "This is " P_UP "MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, "This is "@= @>P_UP@= @>"MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @z
 
 @x
@@ -149,17 +149,17 @@ else
 fprintf(stdout,
 "  -ini                      be inimpost, for dumping mem files\n"
 @y
-"Usage: " P_UP "mpost [OPTION] [&MEMNAME] [MPNAME[.mp]] [COMMANDS]\n"
-"       " P_UP "mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
+"Usage: "@= @>P_UP@= @>"mpost [OPTION] [&MEMNAME] [MPNAME[.mp]] [COMMANDS]\n"
+"       "@= @>P_UP@= @>"mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
 "\n"
-"  Run " P_UP "MetaPost on MPNAME, usually creating MPNAME.NNN (and perhaps\n"
+"  Run "@= @>P_UP@= @>"MetaPost on MPNAME, usually creating MPNAME.NNN (and perhaps\n"
 "  MPNAME.tfm), where NNN are the character numbers generated.\n"
-"  Any remaining COMMANDS are processed as " P_UP "MetaPost input,\n"
+"  Any remaining COMMANDS are processed as "@= @>P_UP@= @>"MetaPost input,\n"
 "  after MPNAME is read.\n\n"
-"  With a --dvitomp argument, " P_UP "MetaPost acts as DVI-to-MPX converter only.\n"
-"  Call " P_UP "MetaPost with --dvitomp --help for option explanations.\n\n");
+"  With a --dvitomp argument, "@= @>P_UP@= @>"MetaPost acts as DVI-to-MPX converter only.\n"
+"  Call "@= @>P_UP@= @>"MetaPost with --dvitomp --help for option explanations.\n\n");
 fprintf(stdout,
-"  -ini                      be ini" P_UP "mpost, for dumping mem files\n"
+"  -ini                      be ini"@= @>P_UP@= @>"mpost, for dumping mem files\n"
 @z
 
 @x
@@ -182,17 +182,17 @@ fprintf(stdout,
 else
   fprintf(stdout, "This is MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @y
-  fprintf(stdout, "This is " P_UP "dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, "This is "@= @>P_UP@= @>"dvitomp %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 else
-  fprintf(stdout, "This is " P_UP "MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, "This is "@= @>P_UP@= @>"MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @z
 
 @x
 "Usage: dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
 "       mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
 @y
-"Usage: " P_UP "dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
-"       " P_UP "mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
+"Usage: "@= @>P_UP@= @>"dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
+"       "@= @>P_UP@= @>"mpost --dvitomp DVINAME[.dvi] [MPXNAME[.mpx]]\n"
 @z
 
 @x
@@ -211,9 +211,9 @@ else
 else
   fprintf(stdout, "MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @y
-  fprintf(stdout, P_UP "dvitomp (" P_UP "MetaPost) %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, P_UP@= @>"dvitomp ("@= @>P_UP@= @>"MetaPost) %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 else
-  fprintf(stdout, P_UP "MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
+  fprintf(stdout, P_UP@= @>"MetaPost %s" WEB2CVERSION " (%s)\n", s, kpathsea_version_string);
 @z
 
 @x
@@ -230,7 +230,7 @@ else
 @x
   const char * banner = "This is MetaPost, version ";
 @y
-  const char * banner = "This is " P_UP "MetaPost, version ";
+  const char * banner = "This is "@= @>P_UP@= @>"MetaPost, version ";
 @z
 
 @x
@@ -246,13 +246,13 @@ else
 @x
     if (FILESTRCASEEQ(base, "rmpost")){
 @y
-    if (FILESTRCASEEQ(base, "r" P_UP "mpost")){
+    if (FILESTRCASEEQ(base, "r"@= @>P_UP@= @>"mpost")){
 @z
 
 @x
     if (FILESTRCASEEQ(base, "dvitomp"))
 @y
-    if (FILESTRCASEEQ(base, P_UP "dvitomp"))
+    if (FILESTRCASEEQ(base, P_UP@= @>"dvitomp"))
 @z
 
 @x
@@ -281,11 +281,11 @@ else
 @x
     if (FILESTRCASEEQ(kpse_program_name, "rmpost"))
 @y
-    if (FILESTRCASEEQ(kpse_program_name, "r" P_UP "mpost"))
+    if (FILESTRCASEEQ(kpse_program_name, "r"@= @>P_UP@= @>"mpost"))
 @z
 
 @x
   if(putenv(xstrdup("engine=metapost")))
 @y
-  if(putenv(xstrdup("engine=" P_UP "mpost")))
+  if(putenv(xstrdup("engine="@= @>P_UP@= @>"mpost")))
 @z
diff --git a/Build/source/texk/web2c/pmpostdir/ppsout.ch b/Build/source/texk/web2c/pmpostdir/ppsout.ch
index 87e5c25372c..1353e0b284c 100644
--- a/Build/source/texk/web2c/pmpostdir/ppsout.ch
+++ b/Build/source/texk/web2c/pmpostdir/ppsout.ch
@@ -71,7 +71,7 @@ static void mp_ps_kanji_string_out (MP mp, char *s)
 @x
   mp_ps_print_nl(mp, "%%Creator: MetaPost ");
 @y
-  mp_ps_print_nl(mp, "%%Creator: MetaPost (" P_UP "MetaPost) ");
+  mp_ps_print_nl(mp, "%%Creator: MetaPost ("@= @>P_UP@= @>"MetaPost) ");
 @z
 
 %