# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1154091134 0
# Node ID 80c2d97a494e16ccb38f46b5db4f3980f126ee9e
# Parent  e56a86aa94cc6543523e2d1fd4ad18bf9126aefb
(struct font): New member scalable.
(struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
(font_otf_gsub): Prototype adjusted.

diff -r e56a86aa94cc -r 80c2d97a494e src/font.h
--- a/src/font.h	Fri Jul 28 12:51:10 2006 +0000
+++ b/src/font.h	Fri Jul 28 12:52:14 2006 +0000
@@ -172,6 +172,9 @@
   /* Ascent and descent of the font (in pixels).  */
   int ascent, descent;
 
+  /* 1 iff the font is scalable.  */
+  int scalable;
+
   /* There will be more to this structure, but they are private to a
      font-driver.  */
 };
@@ -401,7 +404,7 @@
      short, return -1.  */
   int (*otf_gsub) P_ ((struct font *font, Lisp_Object gsub_spec,
 		       Lisp_Object gstring_in, int from, int to,
-		       Lisp_Object gstring_out, int idx));
+		       Lisp_Object gstring_out, int idx, int alternate_subst));
 
   /* Optional.
      Drive FONT's OTF GPOS features according to GPOS_SPEC.
@@ -491,7 +494,8 @@
 /* This can be used as `otf_gsub' method of a font-driver.  */
 extern int font_otf_gsub P_ ((struct font *font, Lisp_Object gsub_spec,
 			      Lisp_Object gstring_in, int from, int to,
-			      Lisp_Object gstring_out, int idx));
+			      Lisp_Object gstring_out, int idx,
+			      int alternate_subst));
 /* This can be used as `otf_gpos' method of a font-driver.  */
 extern int font_otf_gpos P_ ((struct font *font, Lisp_Object gpos_spec,
 			      Lisp_Object gstring, int from, int to));