From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Thu, 12 Jan 2006 08:14:58 +0000 (+0000)
Subject: [USE_ATSUI] (atsu_get_text_layout_with_text_ptr)
X-Git-Tag: emacs-pretest-22.0.90~4788
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e16e7992b7b5dbab6ce07695010b897551a64e9;p=emacs.git

[USE_ATSUI] (atsu_get_text_layout_with_text_ptr)
[MAC_OS_X_VERSION_MAX_ALLOWED >= 1020]: Specify	kATSLineUseQDRendering.
(XLoadQueryFont) [USE_ATSUI]: Display diacritical marks in
decomposed form.
---

diff --git a/src/macterm.c b/src/macterm.c
index 1adbad9ddd7..b620bf1f683 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -626,6 +626,7 @@ atsu_get_text_layout_with_text_ptr (text, text_length, style, text_layout)
       static ATSLineLayoutOptions line_layout =
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
 	kATSLineDisableAllLayoutOperations | kATSLineUseDeviceMetrics
+	| kATSLineUseQDRendering
 #else
 	kATSLineIsDisplayOnly | kATSLineFractDisable
 #endif
@@ -7507,8 +7508,10 @@ XLoadQueryFont (Display *dpy, char *fontname)
       static Boolean bold_p, italic_p;
       ATSUAttributeValuePtr values[] = {&font_id, &size_fixed,
 					&bold_p, &italic_p};
-      ATSUFontFeatureType types[] = {kAllTypographicFeaturesType};
-      ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector};
+      ATSUFontFeatureType types[] = {kAllTypographicFeaturesType,
+				     kDiacriticsType};
+      ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector,
+					     kDecomposeDiacriticsSelector};
       Lisp_Object font_id_cons;
 
       font_id_cons = Fgethash (make_unibyte_string (family, strlen (family)),