Commit 4b7f335c authored by Adrian Robert's avatar Adrian Robert
Browse files

* nsfont.m (ns_attribute_value): Remove.

	(ns_attribute_fvalue): Incorporate code from ns_attribute_value.
	(ns_has_attribute): Shrink the normal range.
	(ns_findfonts): Don't worry about requested spec in determining
	need for synthItal.
parent a1539cd7
2009-06-14 Adrian Robert <Adrian.B.Robert@gmail.com>
* nsfont.m (ns_attribute_value): Remove.
(ns_attribute_fvalue): Incorporate code from ns_attribute_value.
(ns_has_attribute): Shrink the normal range.
(ns_findfonts): Don't worry about requested spec in determining
need for synthItal.
2009-06-14 Seiji Zenitani <zenitani@mac.com>
 
* xdisp.c [USE_MAC_TOOLBAR]: Remove obsolete definition for Mac Carbon.
......
......@@ -106,21 +106,15 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
}
/* Return NSNumber or nil if attr is not set. */
static NSNumber
*ns_attribute_value (NSFontDescriptor *fdesc, NSString *trait)
{
NSDictionary *tdict = [fdesc objectForKey: NSFontTraitsAttribute];
NSNumber *val = [tdict objectForKey: trait];
return val;
}
/* Return 0 if attr not set, else value (which might also be 0). */
/* Return 0 if attr not set, else value (which might also be 0).
On Leopard 0 gets returned even on descriptors where the attribute
was never set, so there's no way to distinguish between unspecified
and set to not have. Callers should assume 0 means unspecified. */
static float
ns_attribute_fvalue (NSFontDescriptor *fdesc, NSString *trait)
{
NSNumber *val = ns_attribute_value (fdesc, trait);
NSDictionary *tdict = [fdesc objectForKey: NSFontTraitsAttribute];
NSNumber *val = [tdict objectForKey: trait];
return val == nil ? 0.0 : [val floatValue];
}
......@@ -130,7 +124,7 @@ static void ns_glyph_metrics (struct nsfont_info *font_info,
ns_has_attribute (NSFontDescriptor *fdesc, NSString *trait)
{
float v = ns_attribute_fvalue (fdesc, trait);
return v < -0.25 || v > 0.25;
return v < -0.05 || v > 0.05;
}
......@@ -502,9 +496,7 @@ seems to be limited for now (2009/05) to ja, zh, and ko. */
/* Add synthItal member if needed. */
family = [fdesc objectForKey: NSFontFamilyAttribute];
if (family != nil && !foundItal && XINT (Flength (list)) > 0
&& (ns_attribute_value (fdesc, NSFontSlantTrait) == nil
|| ns_has_attribute (fdesc, NSFontSlantTrait)))
if (family != nil && !foundItal && XINT (Flength (list)) > 0)
{
NSFontDescriptor *sDesc = [[[NSFontDescriptor new]
fontDescriptorWithSymbolicTraits: NSFontItalicTrait]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment