[Emacs-diffs] emacs/src ChangeLog nsfont.m [EMACS_23_1_RC]

[Adrian Robert]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_23_1_RC
Changes by:     Adrian Robert <arobert> 09/07/14 16:13:07

Modified files:
        src            : ChangeLog nsfont.m 

Log message:
        * nsfont.m (ns_has_attribute): Remove.  (ns_findfonts, nsfont_open): 
Use ns_attribute_fvalue() instead.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.7586.2.23&r2=1.7586.2.24
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&only_with_tag=EMACS_23_1_RC&r1=1.26&r2=1.26.2.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7586.2.23
retrieving revision 1.7586.2.24
diff -u -b -r1.7586.2.23 -r1.7586.2.24
--- ChangeLog   13 Jul 2009 04:03:45 -0000      1.7586.2.23
+++ ChangeLog   14 Jul 2009 16:13:03 -0000      1.7586.2.24
@@ -1,3 +1,8 @@
+2009-07-14  Adrian Robert  <address@hidden>
+
+       * nsfont.m (ns_has_attribute): Remove.
+       (ns_findfonts, nsfont_open): Use ns_attribute_fvalue() instead.
+
 2009-07-13  Kenichi Handa  <address@hidden>
 
        * chartab.c (sub_char_table_ref_and_range): Fix the range check

Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -b -r1.26 -r1.26.2.1
--- nsfont.m    15 Jun 2009 04:34:52 -0000      1.26
+++ nsfont.m    14 Jul 2009 16:13:07 -0000      1.26.2.1
@@ -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 */