From: handa <handa>
Date: Wed, 29 Sep 2004 23:57:50 +0000 (+0000)
Subject: Include <fontconfig/fontconfig.h>.
X-Git-Tag: REL-1-2-0~166
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dd2171ec49e473f44d959725ed2daf44503e22e;p=m17n%2Fm17n-lib.git

Include <fontconfig/fontconfig.h>.
(MFTInfo): New member langset.
(mfont__encoding_list): Extern it.
---

diff --git a/src/font.h b/src/font.h
index cb338f2..5c9f0be 100644
--- a/src/font.h
+++ b/src/font.h
@@ -206,6 +206,10 @@ extern void mfont__flt_fini ();
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+#ifdef HAVE_FONTCONFIG
+#include <fontconfig/fontconfig.h>
+#endif
+
 #ifdef HAVE_OTF
 #include <otf.h>
 #endif /* HAVE_OTF */
@@ -223,6 +227,11 @@ typedef struct
 #ifdef HAVE_OTF
   OTF *otf;
 #endif /* HAVE_OTF */
+#ifdef HAVE_FONTCONFIG
+  FcLangSet *langset;
+#else
+  void *langset;
+#endif
   void *extra_info;		/* Xft uses this member.  */
 } MFTInfo;
 
@@ -284,6 +293,8 @@ extern void mfont__set_spec (MFont *font,
 extern int mfont__parse_name_into_font (char *name, MSymbol format,
 					MFont *font);
 
+extern MPlist *mfont__encoding_list (void);
+
 extern unsigned mfont__flt_encode_char (MSymbol layouter_name, int c);
 
 extern int mfont__flt_run (MGlyphString *gstring, int from, int to,