From: handa <handa>
Date: Thu, 23 Aug 2007 02:28:35 +0000 (+0000)
Subject: (run_otf): Remove #ifdef HAVE_OTF and #endi.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=a4b1f5e83d8a1d2e9c9993830adc1261f04ed228;p=m17n%2Fm17n-lib.git

(run_otf): Remove #ifdef HAVE_OTF and #endi.
(run_stages): Print separator in encoded string as "|".
---

diff --git a/src/m17n-flt.c b/src/m17n-flt.c
index be14131..d89e6bb 100644
--- a/src/m17n-flt.c
+++ b/src/m17n-flt.c
@@ -1374,7 +1374,6 @@ static int
 run_otf (int depth,
 	 MFLTOtfSpec *otf_spec, int from, int to, FontLayoutContext *ctx)
 {
-#ifdef HAVE_OTF
   MFLTFont *font = ctx->font;
   int from_idx = ctx->out->used;
   MFLTGlyphAdjustment *adjustment;
@@ -1458,7 +1457,6 @@ run_otf (int depth,
 	MFLTGlyph *g = GREF (ctx->out, from_idx);
 	UPDATE_CLUSTER_RANGE (ctx, g);
       }
-#endif
   return to;
 }
 
@@ -1671,6 +1669,7 @@ run_stages (MFLTGlyphString *gstring, int from, int to,
   int orig_from = from, orig_to = to;
   int from_pos, to_pos, len;
   int i, j;
+  MFLTGlyph *g;
 
   from_pos = GREF (ctx->in, from)->from;
   to_pos = GREF (ctx->in, to - 1)->to;
@@ -1722,10 +1721,17 @@ run_stages (MFLTGlyphString *gstring, int from, int to,
 
       if (MDEBUG_FLAG () > 2)
 	{
-	  MDEBUG_PRINT2 ("\n [FLT]   (STAGE %d \"%s\"", stage_idx, ctx->encoded);
+	  MDEBUG_PRINT2 ("\n [FLT]   (STAGE %d \"%s\"", stage_idx,
+			 ctx->encoded);
 	  MDEBUG_PRINT (" (");
 	  for (i = from; i < to; i++)
-	    MDEBUG_PRINT3 ("%*s%04X", (i > 0), "", GREF (ctx->in, i)->code);
+	    {
+	      g = GREF (ctx->in, i);
+	      if (g->c == -1)
+		MDEBUG_PRINT2 ("%*s|", (i > 0), "");
+	      else
+		MDEBUG_PRINT3 ("%*s%04X", (i > 0), "", GREF (ctx->in, i)->code);
+	    }
 	  MDEBUG_PRINT (")");
 	}
       result = run_command (4, INDEX_TO_CMD_ID (0), from, to, ctx);
@@ -1758,7 +1764,6 @@ run_stages (MFLTGlyphString *gstring, int from, int to,
 
   if (ctx->out->used > 0)
     {
-      MFLTGlyph *g;
       int *g_indices;
       int x_ppem = ctx->font->x_ppem << 6, y_ppem = ctx->font->y_ppem << 6;