emacs: src/font.c comparison

(Ffont_shape_gstring): Make glyphs of non-nil adjustment compose a grapheme cluster with the preceding base glyph.

comparison

equal deleted inserted replaced

-:c674ed7591e1
+:629cccd78d85
 (gstring)
 Lisp_Object gstring;
 {
 struct font *font;
 Lisp_Object font_object, n, glyph;
-int i;
+int i, j, from, to;
 if (! composition_gstring_p (gstring))
 signal_error ("Invalid glyph-string: ", gstring);
 if (! NILP (LGSTRING_ID (gstring)))
 return gstring;
 }
 if (i == 3 || XINT (n) == 0)
 return Qnil;
 glyph = LGSTRING_GLYPH (gstring, 0);
-for (i = 1; i < LGSTRING_GLYPH_LEN (gstring); i++)
+from = LGLYPH_FROM (glyph);
+to = LGLYPH_TO (glyph);
+for (i = 1, j = 0; i < LGSTRING_GLYPH_LEN (gstring); i++)
 {
 Lisp_Object this = LGSTRING_GLYPH (gstring, i);
 if (NILP (this))
 	break;
 if (NILP (LGLYPH_ADJUSTMENT (this)))
-	glyph = this;
+	{
+	  if (j < i - 1)
+	    for (; j < i; j++)
+	      {
+		glyph = LGSTRING_GLYPH (gstring, j);
+		LGLYPH_SET_FROM (glyph, from);
+		LGLYPH_SET_TO (glyph, to);
+	      }
+	  from = LGLYPH_FROM (this);
+	  to = LGLYPH_TO (this);
+	  j = i;
+	}
 else
 	{
-	  int from = LGLYPH_FROM (glyph);
+	  if (from > LGLYPH_FROM (this))
-	  int to = LGLYPH_TO (glyph);
+	    from = LGLYPH_FROM (this);
+	  if (to < LGLYPH_TO (this))
-	  LGLYPH_SET_FROM (this, from);
+	    to = LGLYPH_TO (this);
-	  LGLYPH_SET_TO (this, to);
+	}
-	}
+}
-}
+if (j < i - 1)
+for (; j < i; j++)
+{
+	glyph = LGSTRING_GLYPH (gstring, j);
+	LGLYPH_SET_FROM (glyph, from);
+	LGLYPH_SET_TO (glyph, to);
+}
 return composition_gstring_put_cache (gstring, XINT (n));
 }
 #if 0

Mercurial > emacs