From: handa <handa>
Date: Thu, 20 May 2004 06:03:08 +0000 (+0000)
Subject: (enum MFontProperty): Delete MFONT_TYPE.
X-Git-Tag: withdl~207
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1859a982784d5e5cd4ab3b349eae97af5007099f;p=m17n%2Fm17n-lib.git

(enum MFontProperty): Delete MFONT_TYPE.
(mfont__drirver_list): Adjust prototype.
(MFTInfo): Moved here from fron.c.
---

diff --git a/src/font.h b/src/font.h
index 1c64bb9..b21e1e6 100644
--- a/src/font.h
+++ b/src/font.h
@@ -23,7 +23,7 @@
 #ifndef _M17N_FONT_H_
 #define _M17N_FONT_H_
 
-/** Type of font stored in MFont->property[MFONT_TYPE].  */
+/** Type of font.  Now obsolete.  */
 
 enum MFontType
   {
@@ -52,7 +52,6 @@ enum MFontProperty
     MFONT_REGISTRY,
     MFONT_SIZE,
     MFONT_RESY,
-    MFONT_TYPE,
     /* anchor */
     MFONT_PROPERTY_MAX
   };
@@ -189,8 +188,7 @@ struct MFontDriver
 
 #define MFONT_INIT(font) memset ((font), 0, sizeof (MFont))
 
-
-extern MFontDriver *mfont__driver_list[MFONT_TYPE_MAX];
+extern MPlist *mfont__driver_list;
 
 extern MSymbol Mlayouter;
 
@@ -202,6 +200,27 @@ extern void mfont__flt_fini ();
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#ifdef HAVE_OTF
+#include <otf.h>
+#endif /* HAVE_OTF */
+
+typedef struct
+{
+  M17NObject control;
+  MFont font;
+  char *filename;
+  int otf_flag;	/* This font 1: is OTF, 0: may be OTF, -1: is not OTF.  */
+  MPlist *charmap_list;
+  int charmap_index;
+  FT_Face ft_face;
+#ifdef HAVE_OTF
+  OTF *otf;
+#endif /* HAVE_OTF */
+  void *extra_info;		/* Xft uses this member.  */
+} MFTInfo;
+
+extern MFontDriver mfont__ft_driver;
+
 extern int mfont__ft_init ();
 
 extern void mfont__ft_fini ();