From: handa <handa>
Date: Fri, 12 Mar 2004 07:59:15 +0000 (+0000)
Subject: (visual_order): Avoid re-ordering only combining glyphs.
X-Git-Tag: REL-1-0-1~22
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=6ad63ea72028be13da609c7c22d8c6ffe4814159;p=m17n%2Fm17n-lib.git

(visual_order): Avoid re-ordering only combining glyphs.
---

diff --git a/src/draw.c b/src/draw.c
index 5012bd1..4faffe9 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -127,8 +127,7 @@ visual_order (MGlyphString *gstring)
 	levels[size] = 0;
       idx[size] = GLYPH_INDEX (g);
       logical[size++] = g++->c;
-      while (g->type != GLYPH_ANCHOR
-	     && g->combining_code)
+      while (g->type != GLYPH_ANCHOR && g->combining_code)
 	g++;
     }
 
@@ -185,8 +184,7 @@ visual_order (MGlyphString *gstring)
 #endif /* not HAVE_FRIBIDI */
       *(MGLYPH (gidx)) = glyphs[k];
       for (gidx++, k++;
-	   (k < gstring->used - 1
-	    && glyphs[k].combining_code);
+	   k < gstring->used - 1 && glyphs[k].combining_code;
 	   gidx++, k++)
 	{
 	  glyphs[k].bidi_level = levels[j];