(struct MFontDriver): Delete member close, add members

parse_name and build_name.
(mfont__driver_list): Delete extern.
(mfont__close): Delete extern.

diff --git a/src/font.h b/src/font.h
index b21e1e6..b687642 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -158,16 +158,14 @@ typedef struct
 
 struct MFontDriver
 {
-  /** Return a font best matching with SPEC.  */
+  /** Return a font satisfying REQUEST and best matching with SPEC.
+      For the moment, LIMITTED_SIZE is ignored.  */
   MRealizedFont *(*select) (MFrame *frame, MFont *spec, MFont *request,
                            int limitted_size);
 
   /** Open a font specified by RFONT.  */
   int (*open) (MRealizedFont *rfont);
 
-  /** Close a font specified by RFONT.   */
-  void (*close) (MRealizedFont *rfont);
-
   /** Set metrics of glyphs in GSTRING from FROM to TO.  */
   void (*find_metric) (MRealizedFont *rfont, MGlyphString *gstring,
                       int from, int to);
@@ -182,14 +180,15 @@ struct MFontDriver
   void (*render) (MDrawWindow win, int x, int y,
                  MGlyphString *gstring, MGlyph *from, MGlyph *to,
                  int reverse, MDrawRegion region);
+
+  MFont *(*parse_name) (char *name, MFont *font);
+  char *(*build_name) (MFont *font);
 };
 
 /** Initialize the members of FONT.  */
 
 #define MFONT_INIT(font) memset ((font), 0, sizeof (MFont))
 
-extern MPlist *mfont__driver_list;
-
 extern MSymbol Mlayouter;
 
 extern int mfont__flt_init ();
@@ -209,7 +208,7 @@ typedef struct
   M17NObject control;
   MFont font;
   char *filename;
-  int otf_flag;        /* This font 1: is OTF, 0: may be OTF, -1: is not OTF.  */
+  int otf_flag;        /* This font is OTF (1), may be OTF (0), is not OTF (-1).  */
   MPlist *charmap_list;
   int charmap_index;
   FT_Face ft_face;
@@ -257,8 +256,6 @@ extern MRealizedFont *mfont__select (MFrame *frame, MFont *spec,
 
 extern int mfont__open (MRealizedFont *rfont);
 
-extern void mfont__close (MRealizedFont *rfont);
-
 extern void mfont__get_metric (MGlyphString *gstring, int from, int to);
 
 extern void mfont__set_property (MFont *font, enum MFontProperty key,