(run_stages): Fix previous change.

(mflt_run): Cancel previous change.

diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index 03753a5..9f6eeb6 100644 (file)
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -2271,7 +2271,8 @@ run_stages (MFLTGlyphString *gstring, int from, int to,
          MFLTGlyph *g = GREF (ctx->in, i);
          char enc;
 
-         if (GET_COMBINED (g) || prev_category != ctx->stage->category)
+         if (GET_COMBINED (g)
+             || (prev_category && prev_category != ctx->stage->category))
            enc = (GET_ENCODED (g)
                   ? (g->c > 0 ? (int) mchartable_lookup (table, g->c) : 1)
                   : g->code
@@ -2961,7 +2962,6 @@ mflt_run (MFLTGlyphString *gstring, int from, int to,
       if (flt->need_config && font_id != Mnil)
        flt = configure_flt (flt, font, font_id);
 
-#if 0
       for (; this_to < to; this_to++)
        {
          char enc;
@@ -2971,7 +2971,6 @@ mflt_run (MFLTGlyphString *gstring, int from, int to,
            break;
          SET_CATEGORY_CODE (g, enc);
        }
-#endif
 
       if (MDEBUG_FLAG ())
        {