[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/w32font.c,v
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] Changes to emacs/src/w32font.c,v |
Date: |
Sat, 01 Mar 2008 23:03:58 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Jason Rumney <jasonr> 08/03/01 23:03:57
Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- w32font.c 1 Mar 2008 21:19:56 -0000 1.11
+++ w32font.c 1 Mar 2008 23:03:57 -0000 1.12
@@ -1553,11 +1553,20 @@
char *name;
int nbytes;
{
- int len;
+ int len, height, outline;
char *p;
Lisp_Object antialiasing, weight = Qnil;
- len = strlen (font->lfFaceName) + 21; /* :pixelsize=SIZE */
+ len = strlen (font->lfFaceName);
+
+ outline = EQ (AREF (font_obj, FONT_FOUNDRY_INDEX), Qoutline);
+
+ /* Represent size of scalable fonts by point size. But use pixelsize for
+ raster fonts to indicate that they are exactly that size. */
+ if (outline)
+ len += 11; /* -SIZE */
+ else
+ len = strlen (font->lfFaceName) + 21;
if (font->lfItalic)
len += 7; /* :italic */
@@ -1579,10 +1588,20 @@
p = name;
p += sprintf (p, "%s", font->lfFaceName);
- if (font->lfHeight)
- p += sprintf (p, ":pixelsize=%d", eabs (font->lfHeight));
- else if (pixel_size > 0)
- p += sprintf (p, ":pixelsize=%d", pixel_size);
+ height = font->lfHeight ? eabs (font->lfHeight) : pixel_size;
+
+ if (height > 0)
+ {
+ if (outline)
+ {
+ float pointsize = height * 72.0 / one_w32_display_info.resy;
+ /* Round to nearest half point. */
+ pointsize = round (pointsize * 2) / 2;
+ p += sprintf (p, "-%1.1f", pointsize);
+ }
+ else
+ p += sprintf (p, ":pixelsize=%d", height);
+ }
if (font->lfItalic)
p += sprintf (p, ":italic");
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/01
- [Emacs-diffs] Changes to emacs/src/w32font.c,v,
Jason Rumney <=
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/02
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/02
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Juanma Barranquero, 2008/03/02
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/04
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/06
- [Emacs-diffs] Changes to emacs/src/w32font.c,v, Jason Rumney, 2008/03/10