--- ray/src/common/font.h	1992/06/16 13:16:49	2.2
+++ ray/src/common/font.h	2021/11/20 00:40:33	2.9
@@ -1,11 +1,14 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: font.h,v 2.9 2021/11/20 00:40:33 greg Exp $ */
 /*
  * Header file for font handling routines
  */
+#ifndef _RAD_FONT_H_
+#define _RAD_FONT_H_
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef unsigned char  GORD;
 
 typedef struct {
@@ -17,9 +20,23 @@ typedef struct {
 #define gvlist(g)	((GORD *)((g)+1))
 
 typedef struct font {
-	GLYPH  *fg[256];		/* font glyphs */
-	char  *name;			/* font file name */
+	char  name[64];			/* font file name */
 	struct font  *next;		/* next font in list */
+	int  nref;			/* number of references */
+	short  mwidth, mheight;		/* mean glyph width and height */
+	GLYPH  *fg[256];		/* font glyphs */
 }  FONT;
 
-extern FONT  *getfont();
+extern int	retainfonts;		/* retain loaded fonts? */
+
+extern FONT  *getfont(char *fname);
+extern void  freefont(FONT *f);
+extern int  uniftext(short *sp, char *tp, FONT *f);
+extern int  squeeztext(short *sp, char *tp, FONT *f, int cis);
+extern int  proptext(short *sp, char *tp, FONT *f, int cis, int nsi);
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* _RAD_FONT_H_ */
+