From: handa <handa>
Date: Fri, 15 Jan 2010 12:11:51 +0000 (+0000)
Subject: (xft_driver): Set xft_try_otf.
X-Git-Tag: merge-to-XML~14
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de353cad9ff90795e61972b6e856035eaa1832f0;p=m17n%2Fm17n-lib.git

(xft_driver): Set xft_try_otf.
(xft_try_otf): New function.
---

diff --git a/src/m17n-X.c b/src/m17n-X.c
index f1457be..0fd4b16 100644
--- a/src/m17n-X.c
+++ b/src/m17n-X.c
@@ -1056,6 +1056,8 @@ static int xft_drive_otf (MFLTFont *font, MFLTOtfSpec *spec,
 			  MFLTGlyphString *in, int from, int to,
 			  MFLTGlyphString *out,
 			  MFLTGlyphAdjustment *adjustment);
+static int xft_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
+			MFLTGlyphString *in, int from, int to);
 static int xft_iterate_otf_feature (struct _MFLTFont *font, MFLTOtfSpec *spec,
 				    int from, int to, unsigned char *table);
 
@@ -1063,7 +1065,7 @@ static int xft_iterate_otf_feature (struct _MFLTFont *font, MFLTOtfSpec *spec,
 static MFontDriver xft_driver =
   { NULL, xft_open,
     xft_find_metric, xft_has_char, xft_encode_char, xft_render, NULL, NULL,
-    xft_check_capability, NULL, NULL, xft_check_otf, xft_drive_otf,
+    xft_check_capability, NULL, NULL, xft_check_otf, xft_drive_otf, xft_try_otf,
 #ifdef HAVE_OTF
     xft_iterate_otf_feature
 #endif	/* HAVE_OTF */
@@ -1378,6 +1380,13 @@ xft_drive_otf (MFLTFont *font, MFLTOtfSpec *spec,
   return result;
 }
 
+static int
+xft_try_otf (MFLTFont *font, MFLTOtfSpec *spec,
+	     MFLTGlyphString *in, int from, int to)
+{
+  return xft_drive_otf (font, spec, in, from, to, NULL, NULL);
+}
+
 #ifdef HAVE_OTF
 
 static int