From: handa <handa>
Date: Tue, 15 Jun 2004 12:21:27 +0000 (+0000)
Subject: (compose_glyph_string): If langauge is specified, call
X-Git-Tag: withdl~81
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ad18852ed36bdbdb65c56f63d1b20dc15cbec74;p=m17n%2Fm17n-lib.git

(compose_glyph_string): If langauge is specified, call
mface__for_chars even if a text is all latin.  Fix condition for
setting non_ascii_found.
---

diff --git a/src/draw.c b/src/draw.c
index 8a4b48e..bdbb259 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -288,7 +288,8 @@ compose_glyph_string (MFrame *frame, MText *mt, int from, int to,
 	  || MGLYPH (last)->type != g_tmp.type)
 	{
 	  g = MGLYPH (last);
-	  if (non_ascii_found && g->type == GLYPH_CHAR)
+	  if ((non_ascii_found || language != Mnil)
+	      && g->type == GLYPH_CHAR)
 	    while (g < gstring->glyphs + gstring->used)
 	      g = mface__for_chars (script, language, charset,
 				    g, gstring->glyphs + gstring->used, size);
@@ -333,7 +334,7 @@ compose_glyph_string (MFrame *frame, MText *mt, int from, int to,
       g_tmp.to = pos;
       g_tmp.rface = rface;
       
-      if (c >= 0x100)
+      if (c >= 0x80)
 	non_ascii_found = 1;
       else if (g_tmp.type == GLYPH_CHAR && (c <= 32 || c == 127))
 	{