--- ray/src/common/font.h	2003/02/25 02:47:21	2.5
+++ ray/src/common/font.h	2022/02/02 00:01:48	2.10
@@ -1,9 +1,13 @@
-/* RCSid $Id: font.h,v 2.5 2003/02/25 02:47:21 greg Exp $ */
+/* RCSid $Id: font.h,v 2.10 2022/02/02 00:01:48 greg Exp $ */
 /*
  * Header file for font handling routines
  */
+#ifndef _RAD_FONT_H_
+#define _RAD_FONT_H_
 
-#include "copyright.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 typedef unsigned char  GORD;
 
@@ -16,29 +20,24 @@ typedef struct {
 #define gvlist(g)	((GORD *)((g)+1))
 
 typedef struct font {
-	int  nref;			/* number of references */
-	GLYPH  *fg[256];		/* font glyphs */
-	short  mwidth, mheight;		/* mean glyph width and height */
-	char  *name;			/* font file name */
+	char  name[64];			/* font file name */
 	struct font  *next;		/* next font in list */
+	unsigned short  nref;		/* number of references */
+	short  mwidth, mheight;		/* mean glyph width and height */
+	short  maxgv;			/* max # glyph vertices */
+	GLYPH  *fg[256];		/* font glyphs */
 }  FONT;
 
 extern int	retainfonts;		/* retain loaded fonts? */
 
-#ifdef NOPROTO
-
-extern FONT  *getfont();
-extern void  freefont();
-extern int  uniftext();
-extern int  squeeztext();
-extern int  proptext();
-
-#else
-
 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_ */
+