From: handa Date: Tue, 16 Mar 2004 01:23:54 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: REL-1-0-1~14 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49710cb3227e453a73f915dd6c54c2efa038a1a9;p=m17n%2Fm17n-lib.git *** empty log message *** --- diff --git a/src/ChangeLog b/src/ChangeLog index 5c12920..3d4c598 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2004-03-16 Kenichi Handa + + * draw.c (compose_glyph_string): Don't handle + ignore_formatting_char here. Include formatting characters in the + range processed by a FTL. + (layout_glyph_string): Handle ignore_formatting_char here. + 2004-03-12 Kenichi Handa * input-gui.c (win_create_ic): Enable bidi in status control. diff --git a/src/font-flt.c b/src/font-flt.c index 4104920..b93c5c4 100644 --- a/src/font-flt.c +++ b/src/font-flt.c @@ -226,8 +226,6 @@ static int mdebug_mask = MDEBUG_FONT_FLT; MSymbol Mlayouter; -static MSymbol McatCf; - static MPlist *flt_list; /* Command ID: @@ -1220,7 +1218,6 @@ mfont__flt_init (void) Mcond = msymbol ("cond"); Mrange = msymbol ("range"); Mlayouter = msymbol ("layouter"); - McatCf = msymbol ("Cf"); flt_list = mplist (); return 0; } @@ -1312,22 +1309,6 @@ mfont__flt_run (MGlyphString *gstring, int from, int to, ctx.encoded[i] = (int) MGLYPH (gidx)->code; MGLYPH (gidx)->code = (unsigned) MGLYPH (gidx)->c; } - for (; MGLYPH (to)->type != GLYPH_ANCHOR; to++, i++) - { - MGlyph *g = MGLYPH (to); - unsigned code; - - if (g->category != McatCf - && g->rface->rfont && g->rface->rfont->layouter != Mnil - && g->rface->rfont->layouter != layouter_name) - break; - code = mfont__encode_char (g->rface->rfont, g->c); - if (code == MCHAR_INVALID_CODE) - break; - g->code = g->c; - ctx.encoded[i] = (int) code; - } - ctx.encoded[i++] = '\0'; match_indices[0] = from;