--- ray/src/px/pcompos.c	1991/05/31 10:21:31	1.9
+++ ray/src/px/pcompos.c	1992/09/08 10:36:22	2.14
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -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;
@@ -32,6 +33,9 @@ int  labelht = 24;			/* label height */
 
 int  checkthresh = 0;			/* check threshold value */
 
+char  Command[] = "<Command>";
+char  Label[] = "<Label>";
+
 char  *progname;
 
 struct {
@@ -69,10 +73,9 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	double  atof();
 	int  ncolumns = 0;
 	int  autolabel = 0;
-	int  curcol = 0, curx = 0, cury = 0;
+	int  curcol = 0, x0 = 0, curx = 0, cury = 0, spacing = 0;
 	char  *thislabel;
 	int  an;
 
@@ -81,10 +84,10 @@ char  *argv[];
 	for (an = 1; an < argc && argv[an][0] == '-'; an++)
 		switch (argv[an][1]) {
 		case 'x':
-			xmax = xsiz = atoi(argv[++an]);
+			xsiz = atoi(argv[++an]);
 			break;
 		case 'y':
-			ymax = ysiz = atoi(argv[++an]);
+			ysiz = atoi(argv[++an]);
 			break;
 		case 'b':
 			setcolr(bgcolr, atof(argv[an+1]),
@@ -95,6 +98,13 @@ char  *argv[];
 		case 'a':
 			ncolumns = atoi(argv[++an]);
 			break;
+		case 's':
+			spacing = atoi(argv[++an]);
+			break;
+		case 'o':
+			curx = x0 = atoi(argv[++an]);
+			cury = atoi(argv[++an]);
+			break;
 		case 'l':
 			switch (argv[an][2]) {
 			case 'a':
@@ -119,10 +129,7 @@ dofiles:
 	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 +153,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 +166,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,20 +195,20 @@ 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);
 		}
 		if (ncolumns > 0) {
 			if (curcol >= ncolumns) {
-				cury = ymax;
-				curx = 0;
+				cury = ymax + spacing;
+				curx = x0;
 				curcol = 0;
 			}
 			input[nfile].xloc = curx;
 			input[nfile].yloc = cury;
-			curx += input[nfile].xres;
+			curx += input[nfile].xres + spacing;
 			curcol++;
 		} else {
 			input[nfile].xloc = atoi(argv[an++]);
@@ -211,8 +225,10 @@ getfile:
 		if (thislabel != NULL) {
 			if (++nfile >= MAXFILE)
 				goto toomany;
-			input[nfile].name = "<Label>";
+			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)
@@ -224,18 +240,24 @@ getfile:
 	}
 	if (xsiz <= 0)
 		xsiz = xmax;
+	else if (xsiz > xmax)
+		xmax = xsiz;
 	if (ysiz <= 0)
 		ysiz = ymax;
+	else if (ysiz > ymax)
+		ymax = ysiz;
 					/* 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();
 	
 	quit(0);
 userr:
-	fprintf(stderr, "Usage: %s [-x xr][-y yr][-b r g b][-a n][-la][-lh h] ",
+	fprintf(stderr,
+	"Usage: %s [-x xr][-y yr][-b r g b][-a n][-s p][-o x0 y0][-la][-lh h] ",
 			progname);
 	fprintf(stderr, "[-t min1][+t max1][-l lab] pic1 x1 y1 ..\n");
 	quit(1);
@@ -332,13 +354,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 +371,12 @@ err:
 quit(code)		/* exit gracefully */
 int  code;
 {
+	register int  i;
+				/* close input files */
+	for (i = 0; i < nfile; i++)
+		if (input[i].name == Command || input[i].name == Label)
+			pclose(input[i].fp);
+		else
+			fclose(input[i].fp);
 	exit(code);
 }