--- ray/src/px/psign.c	1992/06/22 13:59:53	2.8
+++ ray/src/px/psign.c	1992/09/08 10:35:08	2.12
@@ -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";
@@ -16,19 +16,14 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "font.h"
 
+#include  "paths.h"
+
 #ifndef  SSS
 #define  SSS			3	/* super-sample size */
 #endif
 
 #define  MAXLINE		512	/* longest allowable line */
 
-#ifndef  DEFPATH
-#define  DEFPATH		":/usr/local/lib/ray"
-#endif
-#ifndef  ULIBVAR
-#define  ULIBVAR		"RAYPATH"
-#endif
-
 char  *fontfile = "helvet.fnt";		/* our font file */
 
 COLOR  bgcolor = WHTCOLOR;		/* background color */
@@ -65,9 +60,7 @@ LINE  *ourtext;				/* our text */
 int  nlines, maxline;			/* text dimensions */
 int  maxwidth;				/* maximum line width (dvi) */
 
-extern char  *getenv();
 
-
 main(argc, argv)
 int  argc;
 char  *argv[];
@@ -109,6 +102,12 @@ 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;
 			break;
@@ -151,13 +150,54 @@ 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) {
+			cwidth = cheight/aspect + 0.5;
+			xsiz = (long)maxwidth*cwidth >> 8;
+			ysiz = nlines*cheight;
+		} else if (aspect > FTINY) {
+			if (ysiz <= 0)
+				ysiz = cheight*nlines;
+			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 {
+			if (ysiz <= 0)
+				ysiz = cheight*nlines;
+			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 (ysiz <= 0) {
+			cwidth = cheight/aspect + 0.5;
+			xsiz = nlines*cheight;
+			ysiz = (long)maxwidth*cwidth >> 8;
+		} else if (aspect > FTINY) {
+			if (xsiz <= 0)
+				xsiz = cheight*nlines;
+			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 {
+			if (xsiz <= 0)
+				xsiz = cheight*nlines;
+			pictaspect = (double)ysiz/xsiz;
+			aspect = maxwidth/(256*nlines*pictaspect);
+			cheight = xsiz/nlines;
+			cwidth = cheight/aspect + 0.5;
+		}
 	}
 	if (xsiz % SSS)
 		xsiz += SSS - xsiz%SSS;