[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsfont.m
From: |
Adrian Robert |
Subject: |
[Emacs-diffs] emacs/src nsfont.m |
Date: |
Mon, 20 Jul 2009 18:14:05 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Adrian Robert <arobert> 09/07/20 18:14:05
Modified files:
src : nsfont.m
Log message:
* 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.
(ns_get_covering_families): Retain scriptToFamilies.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&r1=1.28&r2=1.29
Patches:
Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- nsfont.m 15 Jul 2009 08:24:38 -0000 1.28
+++ nsfont.m 20 Jul 2009 18:14:05 -0000 1.29
@@ -119,15 +119,6 @@
}
-/* Return whether font has attribute set to non-standard value. */
-static BOOL
-ns_has_attribute (NSFontDescriptor *fdesc, NSString *trait)
-{
- float v = ns_attribute_fvalue (fdesc, trait);
- return v < -0.05 || v > 0.05;
-}
-
-
/* Converts FONT_WEIGHT, FONT_SLANT, FONT_WIDTH, plus family and script/lang
to NSFont descriptor. Information under extra only needed for matching. */
#define STYLE_REF 100
@@ -490,7 +481,7 @@
list = Fcons (ns_descriptor_to_entity (desc,
AREF (font_spec, FONT_EXTRA_INDEX),
NULL), list);
- if (ns_has_attribute (desc, NSFontSlantTrait))
+ if (fabs (ns_attribute_fvalue (desc, NSFontSlantTrait)) > 0.05)
foundItal = YES;
}
@@ -666,9 +657,11 @@
synthItal = !NILP (tem) && !strncmp ("synthItal", SDATA (SYMBOL_NAME (tem)),
9);
family = ns_get_family (font_entity);
- if (ns_has_attribute (fontDesc, NSFontWeightTrait))
+ /* Should be > 0.23 as some font descriptors (e.g. Terminus) set to that
+ when setting family in ns_spec_to_descriptor(). */
+ if (ns_attribute_fvalue (fontDesc, NSFontWeightTrait) > 0.50)
traits |= NSBoldFontMask;
- if (ns_has_attribute (fontDesc, NSFontSlantTrait))
+ if (fabs (ns_attribute_fvalue (fontDesc, NSFontSlantTrait) > 0.05))
traits |= NSItalicFontMask;
/* see http://cocoadev.com/forums/comments.php?DiscussionID=74 */