aboutsummaryrefslogtreecommitdiffstats
path: root/src/macfont.m
diff options
context:
space:
mode:
Diffstat (limited to 'src/macfont.m')
-rw-r--r--src/macfont.m24
1 files changed, 9 insertions, 15 deletions
diff --git a/src/macfont.m b/src/macfont.m
index fb28dc85d0f..f569934128f 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -40,9 +40,6 @@ Original author: YAMAMOTO Mitsuharu
40 40
41static struct font_driver macfont_driver; 41static struct font_driver macfont_driver;
42 42
43/* Core Text, for Mac OS X. */
44static Lisp_Object Qmac_ct;
45
46static double mac_ctfont_get_advance_width_for_glyph (CTFontRef, CGGlyph); 43static double mac_ctfont_get_advance_width_for_glyph (CTFontRef, CGGlyph);
47static CGRect mac_ctfont_get_bounding_rect_for_glyph (CTFontRef, CGGlyph); 44static CGRect mac_ctfont_get_bounding_rect_for_glyph (CTFontRef, CGGlyph);
48static CFArrayRef mac_ctfont_create_available_families (void); 45static CFArrayRef mac_ctfont_create_available_families (void);
@@ -69,18 +66,6 @@ static CGGlyph mac_ctfont_get_glyph_for_cid (CTFontRef,
69 CGFontIndex); 66 CGFontIndex);
70#endif 67#endif
71 68
72/* The font property key specifying the font design destination. The
73 value is an unsigned integer code: 0 for WYSIWYG, and 1 for Video
74 text. (See the documentation of X Logical Font Description
75 Conventions.) In the Mac font driver, 1 means the screen font is
76 used for calculating some glyph metrics. You can see the
77 difference with Monaco 8pt or 9pt, for example. */
78static Lisp_Object QCdestination;
79
80/* The boolean-valued font property key specifying the use of
81 leading. */
82static Lisp_Object QCminspace;
83
84struct macfont_metrics; 69struct macfont_metrics;
85 70
86/* The actual structure for Mac font that can be cast to struct font. */ 71/* The actual structure for Mac font that can be cast to struct font. */
@@ -3927,10 +3912,19 @@ syms_of_macfont (void)
3927{ 3912{
3928 static struct font_driver mac_font_driver; 3913 static struct font_driver mac_font_driver;
3929 3914
3915 /* Core Text, for Mac OS X. */
3930 DEFSYM (Qmac_ct, "mac-ct"); 3916 DEFSYM (Qmac_ct, "mac-ct");
3931 macfont_driver.type = Qmac_ct; 3917 macfont_driver.type = Qmac_ct;
3932 register_font_driver (&macfont_driver, NULL); 3918 register_font_driver (&macfont_driver, NULL);
3933 3919
3920 /* The font property key specifying the font design destination. The
3921 value is an unsigned integer code: 0 for WYSIWYG, and 1 for Video
3922 text. (See the documentation of X Logical Font Description
3923 Conventions.) In the Mac font driver, 1 means the screen font is
3924 used for calculating some glyph metrics. You can see the
3925 difference with Monaco 8pt or 9pt, for example. */
3934 DEFSYM (QCdestination, ":destination"); 3926 DEFSYM (QCdestination, ":destination");
3927
3928 /* The boolean-valued font property key specifying the use of leading. */
3935 DEFSYM (QCminspace, ":minspace"); 3929 DEFSYM (QCminspace, ":minspace");
3936} 3930}