--- ray/src/common/font.c	2003/11/14 17:22:06	2.17
+++ ray/src/common/font.c	2022/02/02 00:03:40	2.26
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: font.c,v 2.17 2003/11/14 17:22:06 schorsch Exp $";
+static const char	RCSid[] = "$Id: font.c,v 2.26 2022/02/02 00:03:40 greg Exp $";
 #endif
 /*
  * Polygonal font handling routines
@@ -7,29 +7,33 @@ static const char	RCSid[] = "$Id: font.c,v 2.17 2003/1
 
 #include "copyright.h"
 
+#include <stdlib.h>
+
+#include "paths.h"
 #include "rtio.h"
 #include "rterror.h"
 #include "font.h"
 
 #define galloc(nv)	(GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
 
-
 int	retainfonts = 0;		/* retain loaded fonts? */
 
 static FONT	*fontlist = NULL;	/* list of loaded fonts */
 
 
 FONT *
-getfont(fname)				/* return font fname */
-char  *fname;
+getfont(			/* return font fname */
+	char  *fname
+)
 {
+	char  embuf[512];
 	FILE  *fp;
 	char  *pathname, *err = NULL;
 	unsigned  wsum, hsum, ngly;
 	int  gn, ngv, gv;
-	register GLYPH	*g;
+	GLYPH	*g;
 	GORD  *gp;
-	register FONT  *f;
+	FONT  *f;
 
 	for (f = fontlist; f != NULL; f = f->next)
 		if (!strcmp(f->name, fname)) {
@@ -38,19 +42,20 @@ char  *fname;
 		}
 						/* load the font file */
 	if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
-		sprintf(errmsg, "cannot find font file \"%s\"", fname);
-		error(USER, errmsg);
+		sprintf(embuf, "cannot find font file \"%s\"\n", fname);
+		eputs(embuf);
+		return(NULL);
 	}
+	if ((fp = fopen(pathname, "r")) == NULL) {
+		sprintf(embuf, "cannot open font file \"%s\"\n", pathname);
+		eputs(embuf);
+		return(NULL);
+	}
 	f = (FONT *)calloc(1, sizeof(FONT));
 	if (f == NULL)
 		goto memerr;
-	f->name = savestr(fname);
+	strcpy(f->name, fname);
 	f->nref = 1;
-	if ((fp = fopen(pathname, "r")) == NULL) {
-		sprintf(errmsg, "cannot open font file \"%s\"",
-				pathname);
-		error(SYSTEM, errmsg);
-	}
 	wsum = hsum = ngly = 0;			/* get each glyph */
 	while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
 		if (ngv == 0)
@@ -68,6 +73,8 @@ char  *fname;
 			err = "bad # vertices for";
 			goto fonterr;
 		}
+		if (ngv > f->maxgv)
+			f->maxgv = ngv;
 		g = galloc(ngv);
 		if (g == NULL)
 			goto memerr;
@@ -109,27 +116,33 @@ char  *fname;
 	f->next = fontlist;
 	return(fontlist = f);
 nonint:
-	sprintf(errmsg, "non-integer in font file \"%s\"", pathname);
-	error(USER, errmsg);
+	sprintf(embuf, "non-integer in font file \"%s\"\n", pathname);
+	eputs(embuf);
+	fclose(fp);
+	return(NULL);
 fonterr:
-	sprintf(errmsg, "%s character (%d) in font file \"%s\"",
+	sprintf(embuf, "%s character (%d) in font file \"%s\"\n",
 			err, gn, pathname);
-	error(USER, errmsg);
+	eputs(embuf);
+	fclose(fp);
+	return(NULL);
 memerr:
-	error(SYSTEM, "out of memory in fontglyph");
-	return NULL; /* pro forma return */
+	eputs("out of memory in getfont()\n");
+	fclose(fp);
+	return(NULL);
 }
 
 
 void
-freefont(fnt)			/* release a font (free all if NULL) */
-FONT *fnt;
+freefont(			/* release a font (free all if NULL) */
+	FONT *fnt
+)
 {
 	FONT  head;
-	register FONT  *fl, *f;
-	register int  i;
+	FONT  *fl, *f;
+	int  i;
 					/* check reference count */
-	if (fnt != NULL && ((fnt->nref-- > 1) | retainfonts))
+	if (fnt != NULL && ((fnt->nref -= (f->nref > 0)) | retainfonts))
 		return;
 	head.next = fontlist;
 	fl = &head;
@@ -139,7 +152,6 @@ FONT *fnt;
 			for (i = 0; i < 256; i++)
 				if (f->fg[i] != NULL)
 					free((void *)f->fg[i]);
-			freestr(f->name);
 			free((void *)f);
 		} else
 			fl = f;
@@ -148,10 +160,11 @@ FONT *fnt;
 
 
 int
-uniftext(sp, tp, f)			/* uniformly space text line */
-register short	*sp;		/* returned character spacing */
-register char  *tp;		/* text line */
-register FONT  *f;		/* font */
+uniftext(			/* uniformly space text line */
+	short	*sp,		/* returned character spacing */
+	char  *tp,		/* text line */
+	FONT  *f		/* font */
+)
 {
 	int  linelen;
 
@@ -166,14 +179,15 @@ register FONT  *f;		/* font */
 
 
 int
-squeeztext(sp, tp, f, cis)		/* squeeze text line */
-short  *sp;			/* returned character spacing */
-char  *tp;			/* text line */
-FONT  *f;			/* font */
-int  cis;			/* intercharacter spacing */
+squeeztext(		/* squeeze text line */
+	short  *sp,			/* returned character spacing */
+	char  *tp,			/* text line */
+	FONT  *f,			/* font */
+	int  cis			/* intercharacter spacing */
+)
 {
 	int  linelen;
-	register GLYPH	*gp;
+	GLYPH	*gp;
 
 	linelen = 0;
 	gp = NULL;
@@ -201,14 +215,15 @@ int  cis;			/* intercharacter spacing */
 
 
 int
-proptext(sp, tp, f, cis, nsi)		/* space line proportionally */
-short  *sp;			/* returned character spacing */
-char  *tp;			/* text line */
-FONT  *f;			/* font */
-int  cis;			/* target intercharacter spacing */
-int  nsi;			/* minimum number of spaces for indent */
+proptext(		/* space line proportionally */
+	short  *sp,			/* returned character spacing */
+	char  *tp,			/* text line */
+	FONT  *f,			/* font */
+	int  cis,			/* target intercharacter spacing */
+	int  nsi			/* minimum number of spaces for indent */
+)
 {
-	register char  *end, *tab = NULL;
+	char  *end, *tab = NULL;
 	GLYPH  *gp;
 	short  *nsp;
 	int  alen, len, width;