From: handa <handa>
Date: Mon, 13 Sep 2004 01:53:52 +0000 (+0000)
Subject: (Mlatin): Don't make it static.
X-Git-Tag: REL-1-2-0~199
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d24fde838b38fbbc12ae1fcf0c08301315a96787;p=m17n%2Fm17n-lib.git

(Mlatin): Don't make it static.
(mface__realize): Be sure to set work_gstring.frame.
(mface__for_chars): Likewise.
---

diff --git a/src/face.c b/src/face.c
index db35b68..fcab975 100644
--- a/src/face.c
+++ b/src/face.c
@@ -102,7 +102,7 @@
 
 static M17NObjectArray face_table;
 
-static MSymbol Mlatin;
+MSymbol Mlatin;
 
 static MSymbol M_face_prop_index;
 
@@ -659,6 +659,7 @@ mface__realize (MFrame *frame, MFace **faces, int num,
     {
       rface->rfont = rfont;
       g.otf_encoded = 0;
+      work_gstring.frame = frame;
       work_gstring.glyphs[0] = g;
       work_gstring.glyphs[0].rface = rface;
       work_gstring.glyphs[1].code = MCHAR_INVALID_CODE;
@@ -744,6 +745,7 @@ mface__for_chars (MSymbol script, MSymbol language, MSymbol charset,
   rface = new;
   rface->rfont = rfont;
   rface->non_ascii_list = NULL;
+  work_gstring.frame = rface->frame;
   work_gstring.glyphs[0].code = MCHAR_INVALID_CODE;
   work_gstring.glyphs[0].rface = rface;
   mfont__get_metric (&work_gstring, 0, 1);