texlive[49616] Build/source/texk/web2c: add missing changes to have

[commits+kakuto at tug.org]

Revision: 49616
          http://tug.org/svn/texlive?view=revision&revision=49616
Author:   kakuto
Date:     2019-01-06 21:53:35 +0100 (Sun, 06 Jan 2019)
Log Message:
-----------
add missing changes to have correct engine name

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/mplibdir/mpost.w
    trunk/Build/source/texk/web2c/pmpostdir/pmpost.ch

Modified: trunk/Build/source/texk/web2c/mplibdir/mpost.w
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/mpost.w	2019-01-06 19:35:42 UTC (rev 49615)
+++ trunk/Build/source/texk/web2c/mplibdir/mpost.w	2019-01-06 20:53:35 UTC (rev 49616)
@@ -1386,9 +1386,12 @@
   options->print_found_names = (int)true;
   {
     const char *base = cleaned_invocation_name(argv[0]);
-    if (FILESTRCASEEQ(base, "rmpost")||FILESTRCASEEQ(base, "r-mpost")){
+    if (FILESTRCASEEQ(base, "rmpost")){
       base++;
       restricted_mode = true;
+    } else if (FILESTRCASEEQ(base, "r-mpost")){
+      base += 2;
+      restricted_mode = true;
     }
     if (FILESTRCASEEQ(base, "dvitomp"))
       dvitomp_only=1;
@@ -1423,8 +1426,10 @@
     kpse_set_program_enabled (kpse_mem_format, MAKE_TEX_FMT_BY_DEFAULT,
                               kpse_src_compile);
     kpse_set_program_name(argv[0], user_progname);
-    if (FILESTRCASEEQ(kpse_program_name, "rmpost")||FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+    if (FILESTRCASEEQ(kpse_program_name, "rmpost"))
       kpse_program_name++;
+    else if (FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+      kpse_program_name += 2;
   }
   @= /*@@=nullpass@@*/ @> 
   if(putenv(xstrdup("engine=metapost")))

Modified: trunk/Build/source/texk/web2c/pmpostdir/pmpost.ch
===================================================================
--- trunk/Build/source/texk/web2c/pmpostdir/pmpost.ch	2019-01-06 19:35:42 UTC (rev 49615)
+++ trunk/Build/source/texk/web2c/pmpostdir/pmpost.ch	2019-01-06 20:53:35 UTC (rev 49616)
@@ -244,12 +244,18 @@
 @z
 
 @x
-    if (FILESTRCASEEQ(base, "rmpost")||FILESTRCASEEQ(base, "r-mpost")){
+    if (FILESTRCASEEQ(base, "rmpost")){
 @y
     if (FILESTRCASEEQ(base, "r"@= @>P_UP@= @>"mpost")){
 @z
 
 @x
+    } else if (FILESTRCASEEQ(base, "r-mpost")){
+ at y
+    } else if (FILESTRCASEEQ(base, "r-"@= @>P_UP@= @>"mpost")){
+ at z
+
+ at x
     if (FILESTRCASEEQ(base, "dvitomp"))
 @y
     if (FILESTRCASEEQ(base, P_UP@= @>"dvitomp"))
@@ -279,12 +285,18 @@
 @z
 
 @x
-    if (FILESTRCASEEQ(kpse_program_name, "rmpost")||FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+    if (FILESTRCASEEQ(kpse_program_name, "rmpost"))
 @y
     if (FILESTRCASEEQ(kpse_program_name, "r"@= @>P_UP@= @>"mpost"))
 @z
 
 @x
+    else if (FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+ at y
+    else if (FILESTRCASEEQ(kpse_program_name, "r-"@= @>P_UP@= @>"mpost"))
+ at z
+
+ at x
   if(putenv(xstrdup("engine=metapost")))
 @y
   if(putenv(xstrdup("engine="@= @>P_UP@= @>"mpost")))