X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Fhp2ps%2FMain.c;h=947ff46731da8870d9c7036b6b90130de36a90a7;hb=c04a5fe3e2867d59ce9757069fdd20c06c326724;hp=3b5efed51ba2e1c54d3a13e312c74b30669a3759;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/utils/hp2ps/Main.c b/utils/hp2ps/Main.c
index 3b5efed..947ff46 100644
--- a/utils/hp2ps/Main.c
+++ b/utils/hp2ps/Main.c
@@ -17,7 +17,7 @@
 #include "Utilities.h"
 
 boolish pflag = 0;	/* read auxiliary file			*/
-boolish eflag = 0;	/* scaled EPSF 				*/ 
+boolish eflag = 0;	/* scaled EPSF 				*/
 boolish dflag = 0;	/* sort by standard deviation		*/
 int     iflag = 0;	/* sort by identifier (3-way flag)      */
 boolish gflag = 0;	/* output suitable for previewer	*/
@@ -29,6 +29,7 @@ boolish tflag = 0;	/* ignored threshold specified          */
 boolish cflag = 0;      /* colour output                        */
 
 boolish filter;		/* true when running as a filter	*/
+boolish multipageflag = 0;  /* true when the output should be 2 pages - key and profile */ 
 
 static floatish WidthInPoints PROTO((char *));		  /* forward */
 static FILE *Fp PROTO((char *, char **, char *, char *)); /* forward */
@@ -107,9 +108,13 @@ char* argv[];
 	    case 'm':
 		mflag++;
 		TWENTY = atoi(*argv + 1);
-		if (TWENTY > DEFAULT_TWENTY)
-		    Usage(*argv-1);
+		// only 20 keys fit on a page
+		if (TWENTY > DEFAULT_TWENTY) 
+		   multipageflag++;
 		goto nextarg;
+	    case 'M':
+	        multipageflag++;
+                goto nextarg;
 	    case 't':
 		tflag++;
 		THRESHOLD_PERCENT = (floatish) atof(*argv + 1);
@@ -140,8 +145,11 @@ nextarg: ;
     if (!filter) {
 	pathName = copystring(argv[0]);
 	DropSuffix(pathName, ".hp");
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+	DropSuffix(pathName, ".exe");
+#endif
 	baseName = copystring(Basename(pathName));
-
+        
         hpfp  = Fp(pathName, &hpfile, ".hp", "r"); 
 	psfp  = Fp(baseName, &psfile, ".ps", "w"); 
 
@@ -161,7 +169,8 @@ nextarg: ;
 
     if (pflag) Reorder();    /* ReOrders on aux file */
 
-    if (TWENTY) TopTwenty(); /* Selects top twenty (mflag) */
+    /* Selects top bands (mflag) - can be more than 20 now */
+    if (TWENTY != 0) TopTwenty(); 
 
     Dimensions();