(struct font): New member scalable.

(struct font_driver): New arg ALTERANTE_SUBST to otf_gsub.
(font_otf_gsub): Prototype adjusted.

diff --git a/src/font.h b/src/font.h
index 895b8bb3a9e7a0dbf64381c1ed47257761ceaef4..264dd2b815b227eee08259023f028e1ded6955de 100644 (file)
--- a/src/font.h
+++ b/src/font.h
@@ -172,6 +172,9 @@ struct font
   /* 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 @@ struct font_driver
      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 @@ extern Lisp_Object font_otf_capability P_ ((struct font *font));
 /* 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));