--- ray/src/px/pcompos.c	1991/05/31 10:21:31	1.9
+++ ray/src/px/pcompos.c	1992/08/11 18:40:57	2.10
@@ -14,8 +14,9 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "color.h"
 
+#include  "resolu.h"
 
-#define  MAXFILE	32
+#define  MAXFILE	64
 
 					/* output picture size */
 int  xsiz = 0;
@@ -69,7 +70,6 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	double  atof();
 	int  ncolumns = 0;
 	int  autolabel = 0;
 	int  curcol = 0, curx = 0, cury = 0;
@@ -116,13 +116,15 @@ char  *argv[];
 			goto userr;
 		}
 dofiles:
+	if (ysiz > 0 & ncolumns > 0) {
+		fprintf(stderr, "%s: -a option incompatible with -y\n",
+				progname);
+		quit(1);
+	}
 	for (nfile = 0; an < argc; nfile++) {
 		if (nfile >= MAXFILE)
 			goto toomany;
-		if (autolabel)
-			thislabel = argv[an];
-		else
-			thislabel = NULL;
+		thislabel = NULL;
 		input[nfile].hasmin = input[nfile].hasmax = 0;
 		while (an < argc && (argv[an][0] == '-' || argv[an][0] == '+'))
 			switch (argv[an][1]) {
@@ -146,7 +148,8 @@ dofiles:
 			case 'l':
 				if (strcmp(argv[an], "-l"))
 					goto userr;
-				thislabel = argv[++an];
+				thislabel = argv[an+1];
+				an += 2;
 				break;
 			case '\0':
 				if (argv[an][0] == '-')
@@ -158,14 +161,20 @@ dofiles:
 getfile:
 		if (argc-an < (ncolumns ? 1 : 3))
 			goto userr;
+		if (autolabel && thislabel == NULL)
+			thislabel = argv[an];
 		if (!strcmp(argv[an], "-")) {
 			input[nfile].name = "<stdin>";
 			input[nfile].fp = stdin;
 		} else {
-			input[nfile].name = argv[an];
-			if ((input[nfile].fp = argv[an][0] == '!' ?
-					popen(argv[an]+1, "r") :
-					fopen(argv[an], "r")) == NULL) {
+			if (argv[an][0] == '!') {
+				input[nfile].name = "<Command>";
+				input[nfile].fp = popen(argv[an]+1, "r");
+			} else {
+				input[nfile].name = argv[an];
+				input[nfile].fp = fopen(argv[an], "r");
+			}
+			if (input[nfile].fp == NULL) {
 				perror(argv[an]);
 				quit(1);
 			}
@@ -181,7 +190,7 @@ getfile:
 		}
 						/* get picture size */
 		if (fgetresolu(&input[nfile].xres, &input[nfile].yres,
-				input[nfile].fp) != (YMAJOR|YDECR)) {
+				input[nfile].fp) < 0) {
 			fprintf(stderr, "%s: bad picture size\n",
 					input[nfile].name);
 			quit(1);
@@ -213,6 +222,8 @@ getfile:
 				goto toomany;
 			input[nfile].name = "<Label>";
 			input[nfile].hasmin = input[nfile].hasmax = 0;
+			input[nfile].xres = input[nfile-1].xres;
+			input[nfile].yres = labelht;
 			if ((input[nfile].fp = lblopen(thislabel,
 					&input[nfile].xres,
 					&input[nfile].yres)) == NULL)
@@ -229,7 +240,8 @@ getfile:
 					/* add new header info. */
 	printargs(argc, argv, stdout);
 	fputformat(COLRFMT, stdout);
-	printf("\n-Y %d +X %d\n", ysiz, xsiz);
+	putchar('\n');
+	fprtresolu(xsiz, ysiz, stdout);
 
 	compos();
 	
@@ -332,13 +344,12 @@ int  *xp, *yp;
 	char  com[128];
 	FILE  *fp;
 
-	sprintf(com, "psign -h %d '%.30s' | pfilt -1 -x /2 -y /2",
-			2*labelht, s);
+	sprintf(com, "psign -s -.15 -a 2 -x %d -y %d '%.90s'", *xp, *yp, s);
 	if ((fp = popen(com, "r")) == NULL)
 		return(NULL);
 	if (checkheader(fp, COLRFMT, NULL) < 0)
 		goto err;
-	if (fgetresolu(xp, yp, fp) != (YMAJOR|YDECR))
+	if (fgetresolu(xp, yp, fp) < 0)
 		goto err;
 	return(fp);
 err:
@@ -350,5 +361,11 @@ err:
 quit(code)		/* exit gracefully */
 int  code;
 {
+	int  status;
+
+	if (code == 0)			/* reap any children */
+		while (wait(&status) != -1)
+			if (code == 0)
+				code = status>>8 & 0xff;
 	exit(code);
 }