texlive[49847] Build/source/texk/web2c/mplibdir: More typographic

[commits+ascherer at tug.org]

Revision: 49847
          http://tug.org/svn/texlive?view=revision&revision=49847
Author:   ascherer
Date:     2019-01-28 16:33:48 +0100 (Mon, 28 Jan 2019)
Log Message:
-----------
More typographic improvements for 'mpost.w'.

Format additional local types correctly.
Try to improve the indentation of 'main'.

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

Modified: trunk/Build/source/texk/web2c/mplibdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2019-01-28 10:31:05 UTC (rev 49846)
+++ trunk/Build/source/texk/web2c/mplibdir/ChangeLog	2019-01-28 15:33:48 UTC (rev 49847)
@@ -1,4 +1,4 @@
-2019-01-27  Andreas Scherer  <https://ascherer.github.io>
+2019-01-28  Andreas Scherer  <https://ascherer.github.io>
 	* mpost.w: TeXnical nitpicking.
 
 

Modified: trunk/Build/source/texk/web2c/mplibdir/mpost.w
===================================================================
--- trunk/Build/source/texk/web2c/mplibdir/mpost.w	2019-01-28 10:31:05 UTC (rev 49846)
+++ trunk/Build/source/texk/web2c/mplibdir/mpost.w	2019-01-28 15:33:48 UTC (rev 49847)
@@ -14,10 +14,18 @@
 \def\[#1]{#1.}
 \pdfoutput=1
 
+ at s line normal
+
+ at s MP int
+ at s MPX int
+ at s MP_options int
 @s boolean int
+ at s const_string int
+ at s mpx_options int
 @s option int
 @s string int
- at s line normal
+ at s timeb int
+ at s timeval int
 
 @*\MP\ executable.
 
@@ -24,8 +32,7 @@
 Now that all of \MP\ is a library, a separate program is needed to 
 have our customary command-line interface. 
 
-@ First, here are the \CEE/ includes. \.{avl.h} is needed because of an
-|avl_allocator| that is defined in \.{mplib.h}.
+@ First, here are the \CEE/ includes.
 
 @d true 1
 @d false 0
@@ -60,8 +67,8 @@
 string output_directory;     /* Defaults to |NULL|.  */
 static boolean restricted_mode = false;
 
-@<getopt structures@>;
-@<Declarations@>;
+@<Structures for |getopt|@>@;
+@<Declarations@>@;
 
 @ Allocating a bit of memory, with error detection:
 
@@ -810,9 +817,8 @@
 if (!nokpse)
   options->open_file = mpost_open_file;
 
-@  
-@<getopt structures@>=
-#define ARGUMENT_IS(a) STREQ (mpost_options[optionid].name, a)
+@ @d ARGUMENT_IS(a) STREQ (mpost_options[optionid].name, a)
+@<Structures for |getopt|@>=
 
 /* SunOS cc can't initialize automatic structs, so make this static.  */
 static struct option mpost_options[]
@@ -957,9 +963,8 @@
   options->ini_version = (int)ini_version_test;
 }
 
-@  
-@<getopt structures@>=
-#define option_is(a) STREQ (dvitomp_options[optionid].name, a)
+@ @d option_is(a) STREQ (dvitomp_options[optionid].name, a)
+@<Structures for |getopt|@>=
 
 /* SunOS cc can't initialize automatic structs, so make this static.  */
 static struct option dvitomp_options[]
@@ -973,7 +978,7 @@
 
 
 @ 
-@<Read and set dvitomp command line options@>=
+@<Read and set \.{dvitomp} command line options@>=
 {
   int g;   /* `|getopt|' return code.  */
   int optionid;
@@ -1392,7 +1397,8 @@
 #else
 main (int argc, char **argv)
 #endif
-{ /* |start_here| */
+@;
+{ @t\1@> /* |start_here| */
   int k; /* index into buffer */
   int history; /* the exit status */
   MP mp; /* a metapost instance */
@@ -1414,7 +1420,7 @@
       dvitomp_only=1;
   }
   if (dvitomp_only) {
-    @<Read and set dvitomp command line options@>;
+    @<Read and set \.{dvitomp} command line options@>;
   } else {
     @<Read and set command line options@>;
   }
@@ -1479,6 +1485,7 @@
 	exit(history);
   else
      exit(0);
+ at t\8@>
 }
 
 @* Index.