--- ray/src/common/font.c	1992/09/21 12:02:03	2.5
+++ ray/src/common/font.c	2003/02/25 02:47:21	2.13
@@ -1,13 +1,12 @@
-/* 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.13 2003/02/25 02:47:21 greg Exp $";
 #endif
-
 /*
  * Polygonal font handling routines
  */
 
+#include "copyright.h"
+
 #include "standard.h"
 
 #include "font.h"
@@ -15,10 +14,8 @@ static char SCCSid[] = "$SunId$ LBL";
 #define galloc(nv)	(GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv))
 
 
-extern char  *libpath;			/* list of library directories */
+int	retainfonts = 0;		/* retain loaded fonts? */
 
-extern char  *fgetword();
-
 static FONT	*fontlist = NULL;	/* list of loaded fonts */
 
 
@@ -26,21 +23,21 @@ FONT *
 getfont(fname)				/* return font fname */
 char  *fname;
 {
-	char  buf[16];
 	FILE  *fp;
 	char  *pathname, *err;
 	unsigned  wsum, hsum, ngly;
-	int  gn, ngv;
-	register int  gv;
+	int  gn, ngv, gv;
 	register GLYPH	*g;
 	GORD  *gp;
 	register 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, libpath, R_OK)) == NULL) {
+	if ((pathname = getpath(fname, getlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find font file \"%s\"", fname);
 		error(USER, errmsg);
 	}
@@ -48,16 +45,16 @@ char  *fname;
 	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 (fgetword(buf,sizeof(buf),fp) != NULL) {	/* get each glyph */
-		if (!isint(buf))
+	wsum = hsum = ngly = 0;			/* get each glyph */
+	while ((ngv = fgetval(fp, 'i', (char *)&gn)) != EOF) {
+		if (ngv == 0)
 			goto nonint;
-		gn = atoi(buf);
 		if (gn < 1 || gn > 255) {
 			err = "illegal";
 			goto fonterr;
@@ -66,8 +63,8 @@ char  *fname;
 			err = "duplicate";
 			goto fonterr;
 		}
-		if (fgetword(buf,sizeof(buf),fp) == NULL || !isint(buf) ||
-				(ngv = atoi(buf)) < 0 || ngv > 32000) {
+		if (fgetval(fp, 'i', (char *)&ngv) <= 0 ||
+				ngv < 0 || ngv > 32000) {
 			err = "bad # vertices for";
 			goto fonterr;
 		}
@@ -79,9 +76,8 @@ char  *fname;
 		ngv *= 2;
 		gp = gvlist(g);
 		while (ngv--) {
-			if (fgetword(buf,sizeof(buf),fp) == NULL ||
-					!isint(buf) ||
-					(gv = atoi(buf)) < 0 || gv > 255) {
+			if (fgetval(fp, 'i', (char *)&gv) <= 0 ||
+					gv < 0 || gv > 255) {
 				err = "bad vertex for";
 				goto fonterr;
 			}
@@ -124,6 +120,32 @@ memerr:
 }
 
 
+void
+freefont(fnt)			/* release a font (free all if NULL) */
+FONT *fnt;
+{
+	FONT  head;
+	register FONT  *fl, *f;
+	register int  i;
+					/* check reference count */
+	if (fnt != NULL && (fnt->nref-- > 1 | retainfonts))
+		return;
+	head.next = fontlist;
+	fl = &head;
+	while ((f = fl->next) != NULL)
+		if ((fnt == NULL | fnt == f)) {
+			fl->next = f->next;
+			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;
+	fontlist = head.next;
+}
+
+
 int
 uniftext(sp, tp, f)			/* uniformly space text line */
 register short	*sp;		/* returned character spacing */
@@ -137,7 +159,7 @@ register FONT  *f;		/* font */
 		if (f->fg[*tp++&0xff] == NULL)
 			*sp++ = 0;
 		else
-			linelen += *sp++ = 256;
+			linelen += *sp++ = 255;
 	return(linelen);
 }
 
@@ -152,11 +174,12 @@ int  cis;			/* intercharacter spacing */
 	int  linelen;
 	register GLYPH	*gp;
 
+	linelen = 0;
 	gp = NULL;
 	while (*tp && (gp = f->fg[*tp++&0xff]) == NULL)
 		*sp++ = 0;
 	cis /= 2;
-	linelen = *sp = cis;
+	*sp = cis;
 	while (gp != NULL) {
 		if (gp->nverts) {		/* regular character */
 			linelen += *sp++ += cis - gp->left;
@@ -191,9 +214,9 @@ int  nsi;			/* minimum number of spaces for indent */
 					/* start by squeezing it */
 	squeeztext(sp, tp, f, cis);
 					/* now, realign spacing */
-	len = 0;
-	width = alen = *sp++;
+	width = *sp++;
 	while (*tp) {
+		len = alen = 0;
 		nsp = sp;
 		for (end = tp; *end; end = tab) {
 			tab = end + 1;
@@ -217,8 +240,6 @@ int  nsi;			/* minimum number of spaces for indent */
 			*sp++ += alen;
 			len -= alen;
 		}
-		len = 0;
-		alen = 0;
 		tp = tab;
 	}
 	return(width);