--- ray/src/common/font.h	1992/06/16 13:16:49	2.2
+++ ray/src/common/font.h	2003/02/25 02:47:21	2.5
@@ -1,11 +1,10 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
-/* SCCSid "$SunId$ LBL" */
-
+/* RCSid $Id: font.h,v 2.5 2003/02/25 02:47:21 greg Exp $ */
 /*
  * Header file for font handling routines
  */
 
+#include "copyright.h"
+
 typedef unsigned char  GORD;
 
 typedef struct {
@@ -17,9 +16,29 @@ 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 */
 	struct font  *next;		/* next font in list */
 }  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);
+
+#endif