Docstring updated.

(font_id): New function.
(run_flt): Set mflt_font_id and mflt_iterate_otf_feature before
calling mflt_run.

diff --git a/src/draw.c b/src/draw.c
index 332c1e0..f35d058 100644 (file)
--- a/src/draw.c
+++ b/src/draw.c
@@ -262,6 +262,12 @@ reorder_combining_chars (MGlyphString *gstring, int from, int to)
 }
 #endif
 
+static MSymbol
+font_id (MFLTFont *font)
+{
+  return ((MFLTFontForRealized *) font)->rfont->id;
+}
+
 static int
 run_flt (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
 {
@@ -289,6 +295,8 @@ run_flt (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
   font.font.drive_otf = rfont->driver->drive_otf;
   font.font.internal = NULL;
   font.rfont = rfont;
+  mflt_font_id = font_id;
+  mflt_iterate_otf_feature = rfont->driver->iterate_otf_feature;
   for (i = 0; i < 3; i++)
     {
       to = mflt_run (&flt_gstr, from, to, &font.font, flt);
@@ -1969,7 +1977,7 @@ mdraw_text (MFrame *frame, MDrawWindow win, int x, int y,
 
     @return
     ½èÍý¤¬À®¸ù¤·¤¿¾ì¹ç¡¢mdraw_image_text () ¤Ï 0 
-    ¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï -1 ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô #m_errro ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£
+    ¤òÊÖ¤¹¡£¥¨¥é¡¼¤¬¸¡½Ð¤µ¤ì¤¿¾ì¹ç¤Ï -1 ¤òÊÖ¤·¡¢³°ÉôÊÑ¿ô #merror_code ¤Ë¥¨¥é¡¼¥³¡¼¥É¤òÀßÄꤹ¤ë¡£
 
     @latexonly \IPAlabel{mdraw_image_text} @endlatexonly   */