X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Ffont-flt.c;h=b4fdc694a48d3d7b3b6d159bd41966cc9cf528c7;hb=85d1a83a1c4f25aa8e08b461c54dd52b5f36a6bd;hp=a4d0bcefcac24051896df3876d09d24315d2c1fb;hpb=0b3d6da4b23a4c06d0c32c14d790bab941fe0b3b;p=m17n%2Fm17n-lib.git

diff --git a/src/font-flt.c b/src/font-flt.c
index a4d0bce..b4fdc69 100644
--- a/src/font-flt.c
+++ b/src/font-flt.c
@@ -263,6 +263,17 @@ static MSymbol Mcond, Mrange;
 
 #define GLYPH_CODE_INDEX(code) ((code) - GLYPH_CODE_MIN)
 
+#define UPDATE_CLUSTER_RANGE(ctx, g)		\
+  do {						\
+    if ((ctx)->cluster_begin_idx)		\
+      {						\
+	if (ctx->cluster_begin_pos > (g).pos)	\
+	  ctx->cluster_begin_pos = (g).pos;	\
+	if (ctx->cluster_end_pos < (g).to)	\
+	  ctx->cluster_end_pos = (g).to;	\
+      }						\
+  } while (0);
+
 enum FontLayoutCmdRuleSrcType
   {
     SRC_REGEX,
@@ -314,6 +325,14 @@ enum FontLayoutCmdType
 
 typedef struct
 {
+  MSymbol script;
+  MSymbol langsys;
+  MSymbol gsub_features;
+  MSymbol gpos_features;
+} FontLayoutCmdOTF;
+
+typedef struct
+{
   enum FontLayoutCmdType type;
   union {
     FontLayoutCmdRule rule;
@@ -978,14 +997,6 @@ run_rule (int depth,
   int i;
   int orig_from = from;
 
-  if (ctx->cluster_begin_idx)
-    {
-      if (ctx->cluster_begin_pos > MGLYPH (from)->pos)
-	ctx->cluster_begin_pos = MGLYPH (from)->pos;
-      if (ctx->cluster_end_pos < MGLYPH (to)->pos)
-	ctx->cluster_end_pos = MGLYPH (to)->pos;
-    }
-
   if (rule->src_type == SRC_SEQ)
     {
       int len;
@@ -999,7 +1010,8 @@ run_rule (int depth,
       if (i < len)
 	return 0;
       to = from + len;
-      MDEBUG_PRINT1 (" (SEQ 0x%X", rule->src.seq.codes[0]);
+      MDEBUG_PRINT3 ("\n [FLT] %*s(SEQ 0x%X", depth, "",
+		     rule->src.seq.codes[0]);
     }
   else if (rule->src_type == SRC_RANGE)
     {
@@ -1012,7 +1024,7 @@ run_rule (int depth,
 	return 0;
       ctx->code_offset = head - rule->src.range.from;
       to = from + 1;
-      MDEBUG_PRINT2 (" (RANGE 0x%X-0x%X",
+      MDEBUG_PRINT4 ("\n [FLT] %*s(RANGE 0x%X-0x%X", depth, "",
 		     rule->src.range.from, rule->src.range.to);
     }
   else if (rule->src_type == SRC_REGEX)
@@ -1030,7 +1042,7 @@ run_rule (int depth,
 			NMATCH, pmatch, 0);
       if (result == 0 && pmatch[0].rm_so == 0)
 	{
-	  MDEBUG_PRINT3 (" (REGEX \"%s\" \"%s\" %d",
+	  MDEBUG_PRINT5 ("\n [FLT] %*s(REGEX \"%s\" \"%s\" %d", depth, "",
 			 rule->src.re.pattern,
 			 ctx->encoded + from - ctx->encoded_offset,
 			 pmatch[0].rm_eo);
@@ -1062,7 +1074,7 @@ run_rule (int depth,
       if (from < 0)
 	return 0;
       to = ctx->match_indices[rule->src.match_idx * 2 + 1];
-      MDEBUG_PRINT1 (" (INDEX %d", rule->src.match_idx);
+      MDEBUG_PRINT3 ("\n [FLT] %*s(INDEX %d", depth, "", rule->src.match_idx);
     }
 
   consumed = 0;
@@ -1119,15 +1131,19 @@ run_otf (int depth,
 	 FontLayoutContext *ctx)
 {
 #ifdef HAVE_OTF
-  int gidx = gstring->used;
-  MGlyph *g = MGLYPH (from), *gend = MGLYPH (to);
-
-  for (; g < gend; g++)
-    g->otf_cmd = otf_cmd;
-
-  to = mfont__ft_drive_gsub (gstring, from, to);
-  if (gidx < gstring->used)
-    MGLYPH (gidx)->left_padding = ctx->left_padding;
+  int from_idx = gstring->used;
+
+  MDEBUG_PRINT4 ("\n [FLT] %*s(OTF %s,%s)", depth, "",
+		 (otf_cmd->gsub_features == Mnil ? ""
+		  : MSYMBOL_NAME (otf_cmd->gsub_features)),
+		 (otf_cmd->gpos_features == Mnil ? ""
+		  : MSYMBOL_NAME (otf_cmd->gpos_features)));
+  to = mfont__ft_drive_otf (gstring, from, to,
+			    otf_cmd->script, otf_cmd->langsys,
+			    otf_cmd->gsub_features, otf_cmd->gpos_features);
+  if (ctx->cluster_begin_idx)
+    for (; from_idx < gstring->used; from_idx++)
+      UPDATE_CLUSTER_RANGE (ctx, gstring->glyphs[from_idx]);
 #endif
   return to;
 }
@@ -1150,7 +1166,7 @@ run_command (int depth, int id, MGlyphString *gstring, int from, int to,
 	g = *(MGLYPH (from - 1));
       g.type = GLYPH_CHAR;
       g.code = ctx->code_offset + id;
-      MDEBUG_PRINT1 (" (DIRECT 0x%X", g.code);
+      MDEBUG_PRINT3 ("\n [FLT] %*s(DIRECT 0x%X", depth, "", g.code);
       if (ctx->combining_code)
 	g.combining_code = ctx->combining_code;
       if (ctx->left_padding)
@@ -1165,6 +1181,7 @@ run_command (int depth, int id, MGlyphString *gstring, int from, int to,
 	    g.to = tmp->to;
 	}
       APPEND_GLYPH (gstring, g);
+      UPDATE_CLUSTER_RANGE (ctx, g);
       ctx->code_offset = ctx->combining_code = ctx->left_padding = 0;
       MDEBUG_PRINT (")");
       return (from);
@@ -1208,6 +1225,8 @@ run_command (int depth, int id, MGlyphString *gstring, int from, int to,
 	if (ctx->left_padding)
 	  g.left_padding = ctx->left_padding;
 	APPEND_GLYPH (gstring, g);
+	UPDATE_CLUSTER_RANGE (ctx, g);
+	MDEBUG_PRINT3 ("\n [FLT] %*s(COPY 0x%X)", depth, "", g.code);
 	ctx->code_offset = ctx->combining_code = ctx->left_padding = 0;
 	return (from + 1);
       }
@@ -1215,7 +1234,7 @@ run_command (int depth, int id, MGlyphString *gstring, int from, int to,
     case CMD_ID_CLUSTER_BEGIN:
       if (! ctx->cluster_begin_idx)
 	{
-	  MDEBUG_PRINT1 (" <%d", MGLYPH (from)->pos);
+	  MDEBUG_PRINT3 ("\n [FLT] %*s<%d", depth, "", MGLYPH (from)->pos);
 	  ctx->cluster_begin_idx = gstring->used;
 	  ctx->cluster_begin_pos = MGLYPH (from)->pos;
 	  ctx->cluster_end_pos = MGLYPH (from)->to;
@@ -1380,11 +1399,28 @@ mfont__flt_run (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
       int len = to - from;
       int result;
 
-      MDEBUG_PRINT1 ("\n [FLT]   (STAGE %d", stage_idx);
+      MDEBUG_PRINT2 ("\n [FLT]   (STAGE %d \"%s\"", stage_idx, ctx.encoded);
+      if (mdebug__flag & mdebug_mask
+	  && ctx.encoded_offset < to)
+	{
+	  if (gstring->glyphs[ctx.encoded_offset].type == GLYPH_PAD)
+	    fprintf (stderr, " (|");
+	  else
+	    fprintf (stderr, " (%X", gstring->glyphs[ctx.encoded_offset].code);
+	  for (i = ctx.encoded_offset + 1; i < to; i++)
+	    {
+	      if (gstring->glyphs[i].type == GLYPH_PAD)
+		fprintf (stderr, " |");
+	      else
+		fprintf (stderr, " %X", gstring->glyphs[i].code);
+	    }
+	  fprintf (stderr, ")");
+	}
+
       gidx = gstring->used;
       ctx.stage = stage;
 
-      result = run_command (2, INDEX_TO_CMD_ID (0), gstring,
+      result = run_command (4, INDEX_TO_CMD_ID (0), gstring,
 			    ctx.encoded_offset, to, &ctx);
       MDEBUG_PRINT (")");
       if (result < 0)
@@ -1435,8 +1471,6 @@ mfont__flt_run (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
       ctx.match_indices[1] = to;
     }
 
-  MDEBUG_PRINT (")\n");
-
   if (from == to)
     {
       /* Somehow there's no glyph contributing to characters between
@@ -1497,6 +1531,25 @@ mfont__flt_run (MGlyphString *gstring, int from, int to, MRealizedFace *rface)
 	    latest = glyphs[i];
 	}
     }
+  MDEBUG_PRINT ("\n [FLT]   (RESULT (");
+  if (mdebug__flag & mdebug_mask
+      && ctx.encoded_offset < to)
+    {
+      if (gstring->glyphs[from].type == GLYPH_PAD)
+	fprintf (stderr, "|");
+      else
+	fprintf (stderr, "%X", gstring->glyphs[from].code);
+      for (from++; from < to; from++)
+	{
+	  if (gstring->glyphs[from].type == GLYPH_PAD)
+	    fprintf (stderr, " |");
+	  else
+	    fprintf (stderr, " %X", gstring->glyphs[from].code);
+	}
+      fprintf (stderr, "))");
+    }
+  MDEBUG_PRINT (")\n");
+
   return to;
 }