X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fface.c;h=931ec39c38ff5cf7b062825d3db2b260bd9d1989;hb=202bb8f7ba8fdf81600faa8bf46f36e994b226d6;hp=32f73824ca03d3ed268291a35d236bb4ad586d5c;hpb=fb77e93ae0cf2fdb477333f60d092979cada77a2;p=m17n%2Fm17n-lib.git

diff --git a/src/face.c b/src/face.c
index 32f7382..931ec39 100644
--- a/src/face.c
+++ b/src/face.c
@@ -607,6 +607,7 @@ mface__realize (MFrame *frame, MFace **faces, int num, int size, MFont *font)
   void **props;
   int i, j;
   MFaceHookFunc func;
+  MFont adjusted;
 
   if (num == 0 && frame->rface && ! font)
     return frame->rface;
@@ -624,7 +625,17 @@ mface__realize (MFrame *frame, MFace **faces, int num, int size, MFont *font)
 	if (font->property[i])
 	  merged_face.property[i] = FONT_PROPERTY (font, i);
       if (font->size)
-	merged_face.property[MFACE_SIZE] = (void *) font->size;
+	{
+	  if (font->size < 0)
+	    {
+	      double pt = - font->size;
+
+	      adjusted = *font;
+	      adjusted.size = pt * frame->dpi / 72.27 + 0.5;
+	      font = &adjusted;
+	    }
+	  merged_face.property[MFACE_SIZE] = (void *) font->size;
+	}
     }
 
   if (! mplist_find_by_value (frame->face->frame_list, frame))
@@ -633,14 +644,22 @@ mface__realize (MFrame *frame, MFace **faces, int num, int size, MFont *font)
     if (! mplist_find_by_value (faces[i]->frame_list, frame))
       mplist_push (faces[i]->frame_list, Mt, frame);
 
-  if (merged_face.property[MFACE_RATIO])
+  if ((int) merged_face.property[MFACE_SIZE] < 0
+      || (int) merged_face.property[MFACE_RATIO] != 100)
     {
-      int font_size = (int) merged_face.property[MFACE_SIZE];
+      double font_size = (int) merged_face.property[MFACE_SIZE];
+      int ifont_size;
 
-      font_size *= (int) merged_face.property[MFACE_RATIO];
-      font_size /= 100;
-      merged_face.property[MFACE_SIZE] = (void *) font_size;
-      merged_face.property[MFACE_RATIO] = 0;
+      if (font_size < 0)
+	font_size = - font_size * frame->dpi / 72.27;
+      if ((int) merged_face.property[MFACE_RATIO] != 100)
+	{
+	  font_size *= (int) merged_face.property[MFACE_RATIO];
+	  font_size /= 100;
+	  merged_face.property[MFACE_RATIO] = 0;
+	}
+      ifont_size = font_size + 0.5;
+      merged_face.property[MFACE_SIZE] = (void *) ifont_size;
     }
 
   merged_face.property[MFACE_FOUNDRY] = Mnil;