[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src w32font.c
From: |
Jason Rumney |
Subject: |
[Emacs-diffs] emacs/src w32font.c |
Date: |
Sun, 23 Nov 2008 15:07:26 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Jason Rumney <jasonr> 08/11/23 15:07:26
Modified files:
src : w32font.c
Log message:
(check_face_name): New function.
(add_font_entity_to_list): Use it to filter out common substituted
fonts.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32font.c?cvsroot=emacs&r1=1.54&r2=1.55
Patches:
Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- w32font.c 2 Aug 2008 21:26:08 -0000 1.54
+++ w32font.c 23 Nov 2008 15:07:25 -0000 1.55
@@ -811,9 +811,7 @@
}
if (!metrics)
- {
GetTextMetricsW (dc, &w32_font->metrics);
- }
w32_font->cached_metrics = NULL;
w32_font->n_cache_blocks = 0;
@@ -1300,6 +1298,40 @@
return 1;
}
+
+static int
+check_face_name (font, full_name)
+ LOGFONT *font;
+ char *full_name;
+{
+ char full_iname[LF_FULLFACESIZE+1];
+
+ /* Just check for names known to cause problems, since the full name
+ can contain expanded abbreviations, prefixed foundry, postfixed
+ style, the latter of which sometimes differs from the style indicated
+ in the shorter name (eg Lt becomes Light or even Extra Light) */
+
+ /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is
+ installed, we run into problems with the Uniscribe backend which tries
+ to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica
+ with Arial's characteristics, since that attempt to use Truetype works
+ some places, but not others. */
+ if (!stricmp (font->lfFaceName, "helvetica"))
+ {
+ strncpy (full_iname, full_name, LF_FULLFACESIZE);
+ full_iname[LF_FULLFACESIZE] = 0;
+ _strlwr (full_iname);
+ return strstr ("helvetica", full_iname);
+ }
+ else if (!stricmp (font->lfFaceName, "times"))
+ /* Since Times is mapped to Times New Roman, a substring
+ match is not sufficient to filter out the bogus match. */
+ return stricmp (full_name, "times");
+
+ return 1;
+}
+
+
/* Callback function for EnumFontFamiliesEx.
* Checks if a font matches everything we are trying to check agaist,
* and if so, adds it to a list. Both the data we are checking against
@@ -1340,7 +1372,11 @@
anywhere within the full name. */
&& (logical_font->elfLogFont.lfOutPrecision != OUT_STRING_PRECIS
|| strstr (logical_font->elfFullName,
- logical_font->elfLogFont.lfFaceName)))
+ logical_font->elfLogFont.lfFaceName))
+ /* Check for well known substitutions that mess things up in the
+ presence of Type-1 fonts of the same name. */
+ && (match_data->pattern.lfFaceName[0]
+ && check_face_name (logical_font, logical_font->elfFullName)))
{
Lisp_Object entity
= w32_enumfont_pattern_entity (match_data->frame, logical_font,
- [Emacs-diffs] emacs/src w32font.c,
Jason Rumney <=