--- ray/src/common/font.c	1995/06/30 16:06:40	2.11
+++ ray/src/common/font.c	2021/11/19 21:56:48	2.21
@@ -1,56 +1,62 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: font.c,v 2.21 2021/11/19 21:56:48 greg Exp $";
 #endif
-
 /*
  * Polygonal font handling routines
  */
 
-#include "standard.h"
+#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))
 
 
-extern char  *getlibpath();
+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
+)
 {
 	FILE  *fp;
-	char  *pathname, *err;
+	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))
+		if (!strcmp(f->name, fname)) {
+			f->nref++;
 			return(f);
+		}
 						/* load the font file */
-	if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) {
+	if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find font file \"%s\"", fname);
-		error(USER, errmsg);
+		error(SYSTEM, errmsg);
 	}
 	f = (FONT *)calloc(1, sizeof(FONT));
 	if (f == NULL)
 		goto memerr;
 	f->name = savestr(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;
-	while ((ngv = fgetval(fp, 'i', &gn)) != EOF) {	/* get each glyph */
+	wsum = hsum = ngly = 0;			/* get each glyph */
+	while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
 		if (ngv == 0)
 			goto nonint;
 		if (gn < 1 || gn > 255) {
@@ -61,7 +67,8 @@ char  *fname;
 			err = "duplicate";
 			goto fonterr;
 		}
-		if (fgetval(fp, 'i', &ngv) <= 0 || ngv < 0 || ngv > 32000) {
+		if (fgetval(fp, 'i', (char *)&ngv) <= 0 ||
+				ngv < 0 || ngv > 32000) {
 			err = "bad # vertices for";
 			goto fonterr;
 		}
@@ -73,7 +80,8 @@ char  *fname;
 		ngv *= 2;
 		gp = gvlist(g);
 		while (ngv--) {
-			if (fgetval(fp, 'i', &gv) <= 0 || gv < 0 || gv > 255) {
+			if (fgetval(fp, 'i', (char *)&gv) <= 0 ||
+					gv < 0 || gv > 255) {
 				err = "bad vertex for";
 				goto fonterr;
 			}
@@ -113,26 +121,31 @@ fonterr:
 	error(USER, errmsg);
 memerr:
 	error(SYSTEM, "out of memory in fontglyph");
+	return NULL; /* pro forma return */
 }
 
 
-freefont(fname)			/* free a font (free all if fname==NULL) */
-char  *fname;
+void
+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))
+		return;
 	head.next = fontlist;
 	fl = &head;
 	while ((f = fl->next) != NULL)
-		if (fname == NULL || !strcmp(fname, f->name)) {
+		if ((fnt == NULL) | (fnt == f)) {
 			fl->next = f->next;
 			for (i = 0; i < 256; i++)
 				if (f->fg[i] != NULL)
-					free((char *)f->fg[i]);
+					free((void *)f->fg[i]);
 			freestr(f->name);
-			free((char *)f);
+			free((void *)f);
 		} else
 			fl = f;
 	fontlist = head.next;
@@ -140,10 +153,11 @@ char  *fname;
 
 
 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;
 
@@ -158,14 +172,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;
@@ -193,14 +208,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;
+	char  *end, *tab = NULL;
 	GLYPH  *gp;
 	short  *nsp;
 	int  alen, len, width;