--- ray/src/px/psign.c	1992/06/18 16:14:43	2.7
+++ ray/src/px/psign.c	1992/07/07 18:24:34	2.10
@@ -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";
@@ -66,7 +66,6 @@ int  nlines, maxline;			/* text dimensions */
 int  maxwidth;				/* maximum line width (dvi) */
 
 extern char  *getenv();
-extern char  *malloc(), *calloc();
 
 
 main(argc, argv)
@@ -110,8 +109,15 @@ char  *argv[];
 				goto unkopt;
 			}
 			break;
+		case 'x':			/* x resolution */
+			xsiz = atoi(argv[++an])*SSS;
+			break;
+		case 'y':
+			ysiz = atoi(argv[++an])*SSS;
+			break;
 		case 'h':			/* height of characters */
 			cheight = atoi(argv[++an])*SSS;
+			xsiz = xsiz = 0;
 			break;
 		case 'a':			/* aspect ratio */
 			aspect = atof(argv[++an]);
@@ -152,22 +158,56 @@ unkopt:
 
 makemap()			/* create the bit map */
 {
-	cwidth = cheight/aspect + 0.5;
+	double  pictaspect;
+	
 	if (direct == 'r' || direct == 'l') {
-		xsiz = (long)maxwidth*cwidth >> 8;
-		ysiz = nlines*cheight;
+		if (xsiz == 0 || ysiz == 0) {
+			cwidth = cheight/aspect + 0.5;
+			xsiz = (long)maxwidth*cwidth >> 8;
+			ysiz = nlines*cheight;
+		} else if (aspect > FTINY) {
+			pictaspect = 256*nlines*aspect/maxwidth;
+			if (pictaspect*xsiz < ysiz)
+				ysiz = pictaspect*xsiz + 0.5;
+			else
+				xsiz = ysiz/pictaspect + 0.5;
+			cheight = ysiz/nlines;
+			cwidth = cheight/aspect + 0.5;
+		} else {
+			pictaspect = (double)ysiz/xsiz;
+			aspect = pictaspect*maxwidth/(256*nlines);
+			cheight = ysiz/nlines;
+			cwidth = cheight/aspect + 0.5;
+		}
 	} else {			/* reverse orientation */
-		xsiz = nlines*cheight;
-		ysiz = (long)maxwidth*cwidth >> 8;
+		if (xsiz == 0 || ysiz == 0) {
+			cwidth = cheight/aspect + 0.5;
+			xsiz = nlines*cheight;
+			ysiz = (long)maxwidth*cwidth >> 8;
+		} else if (aspect > FTINY) {
+			pictaspect = maxwidth/(256*nlines*aspect);
+			if (pictaspect*xsiz < ysiz)
+				ysiz = pictaspect*xsiz + 0.5;
+			else
+				xsiz = ysiz/pictaspect + 0.5;
+			cheight = xsiz/nlines;
+			cwidth = cheight/aspect + 0.5;
+		} else {
+			pictaspect = (double)ysiz/xsiz;
+			aspect = maxwidth/(256*nlines*pictaspect);
+			cheight = xsiz/nlines;
+			cwidth = cheight/aspect + 0.5;
+		}
 	}
 	if (xsiz % SSS)
 		xsiz += SSS - xsiz%SSS;
 	if (ysiz % SSS)
 		ysiz += SSS - ysiz%SSS;
 	xdim = (xsiz+7)/8;
-	ourbitmap = (BYTE *)calloc(ysiz, xdim);
+	ourbitmap = (BYTE *)bmalloc(ysiz*xdim);
 	if (ourbitmap == NULL)
 		error(SYSTEM, "Out of memory in makemap");
+	bzero((char *)ourbitmap, ysiz*xdim);
 }