From: handa <handa>
Date: Thu, 5 Aug 2004 08:27:08 +0000 (+0000)
Subject: (mfont__ft_drive_otf): Support positioning_type 6.
X-Git-Tag: REL-1-1-0~38
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cd88d982b67764d289bb926d685d4f6c03add038;p=m17n%2Fm17n-lib.git

(mfont__ft_drive_otf): Support positioning_type 6.
---

diff --git a/src/font-ft.c b/src/font-ft.c
index 349b895..4f8e113 100644
--- a/src/font-ft.c
+++ b/src/font-ft.c
@@ -1030,7 +1030,7 @@ mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
     {
       int u;
       int size10, size;
-      MGlyph *prev = NULL;
+      MGlyph *base = NULL, *mark = NULL;
 
       if (OTF_drive_gpos (otf, &otf_gstring, script_name, language_name,
 			  gpos_feature_names) < 0)
@@ -1043,6 +1043,8 @@ mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
       for (i = 0, otfg = otf_gstring.glyphs, g = MGLYPH (gidx);
 	   i < otf_gstring.used; i++, otfg++, g++)
 	{
+	  MGlyph *prev;
+
 	  if (! otfg->glyph_id)
 	    continue;
 	  switch (otfg->positioning_type)
@@ -1071,8 +1073,16 @@ mfont__ft_drive_otf (MGlyphString *gstring, int from, int to,
 	      /* Not yet supported.  */
 	      break;
 	    case 4: case 5:
-	      if (! prev)
+	      if (! base)
+		break;
+	      prev = base;
+	      goto label_adjust_anchor;
+	    case 6:
+	      if (! mark)
 		break;
+	      prev = mark;
+
+	    label_adjust_anchor:
 	      {
 		int base_x, base_y, mark_x, mark_y;