From: handa <handa>
Date: Wed, 2 Jun 2004 07:18:43 +0000 (+0000)
Subject: (struct MFontDriver): Delete members parse_name and
X-Git-Tag: withdl~125
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a265908caa9ba03ddefa79cc5fad2b4f943cd706;p=m17n%2Fm17n-lib.git

(struct MFontDriver): Delete members parse_name and
build_name.
(mfont__ft_parse_name, mfont__ft_unparse_name): Extern them.
(mfont__parse_name_into_font): Extern it.
---

diff --git a/src/font.h b/src/font.h
index b687642..1782b3a 100644
--- a/src/font.h
+++ b/src/font.h
@@ -180,9 +180,6 @@ 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.  */
@@ -224,6 +221,10 @@ extern int mfont__ft_init ();
 
 extern void mfont__ft_fini ();
 
+extern int mfont__ft_parse_name (char *name, MFont *font);
+
+extern char *mfont__ft_unparse_name (MFont *font);
+
 extern int mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
 				MRealizedFont *rfont,
 				MSymbol script, MSymbol langsys,
@@ -268,6 +269,9 @@ extern void mfont__set_spec (MFont *font,
 			     MSymbol attrs[MFONT_PROPERTY_MAX],
 			     unsigned short size, unsigned short resy);
 
+extern int mfont__parse_name_into_font (char *name, MSymbol format,
+					MFont *font);
+
 extern unsigned mfont__flt_encode_char (MSymbol layouter_name, int c);
 
 extern int mfont__flt_run (MGlyphString *gstring, int from, int to,