(compose_glyph_string): When the script `inherited' and

[m17n/m17n-lib.git] / src / draw.c

diff --git a/src/draw.c b/src/draw.c
index 83c1e22..f5b23cf 100644 (file)
--- a/src/draw.c
+++ b/src/draw.c
@@ -1,5 +1,5 @@
 /* draw.c -- drawing module.
 /* draw.c -- drawing module.

-   Copyright (C) 2003, 2004, 2005, 2006, 2007
+   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010

      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H15PRO112
 

@@ -274,6 +274,7 @@ run_flt (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
   font.rfont = rfont;
   mflt_font_id = font_id;
   mflt_iterate_otf_feature = rfont->driver->iterate_otf_feature;
   font.rfont = rfont;
   mflt_font_id = font_id;
   mflt_iterate_otf_feature = rfont->driver->iterate_otf_feature;

+  mflt_try_otf = rfont->driver->try_otf;

   for (i = 0; i < 3; i++)
     {
       to = mflt_run (&flt_gstr, from, to, &font.font, flt);
   for (i = 0; i < 3; i++)
     {
       to = mflt_run (&flt_gstr, from, to, &font.font, flt);

@@ -482,6 +483,8 @@ compose_glyph_string (MFrame *frame, MText *mt, int from, int to,
                    break;
                  }
            }
                    break;
                  }
            }

+         if (this_script == Minherited || this_script == Mcommon)
+           this_script = (MSymbol) mchar_get_prop (c, Mblock);

        }
 
       pos = g->g.from;
        }
 
       pos = g->g.from;

@@ -545,7 +548,6 @@ compose_glyph_string (MFrame *frame, MText *mt, int from, int to,
 
              for (g++;
                   (g->type == GLYPH_CHAR
 
              for (g++;
                   (g->type == GLYPH_CHAR

-                   && g->g.from != gstring->control.cursor_pos

                    && g->rface->layouter == this->rface->layouter
                    && (g->rface->rfont == this->rface->rfont
                        || (g->category == GLYPH_CATEGORY_FORMATTER
                    && g->rface->layouter == this->rface->layouter
                    && (g->rface->rfont == this->rface->rfont
                        || (g->category == GLYPH_CATEGORY_FORMATTER

@@ -1759,6 +1761,8 @@ mdraw__init ()
   M_kinsoku_bol = msymbol ("kb");
   M_kinsoku_eol = msymbol ("ke");
 
   M_kinsoku_bol = msymbol ("kb");
   M_kinsoku_eol = msymbol ("ke");
 

+  mflt_enable_new_feature = 1;
+

   return 0;
 }
 
   return 0;
 }