# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1137053698 0
# Node ID d88b44855af37bad7bcf374084ab9504bb5f95f9
# Parent  7429d61c0c6650a5206ca973ff6996ce2fd4b743
[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 -r 7429d61c0c66 -r d88b44855af3 src/macterm.c
--- a/src/macterm.c	Thu Jan 12 02:39:09 2006 +0000
+++ b/src/macterm.c	Thu Jan 12 08:14:58 2006 +0000
@@ -626,6 +626,7 @@
       static ATSLineLayoutOptions line_layout =
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020
 	kATSLineDisableAllLayoutOperations | kATSLineUseDeviceMetrics
+	| kATSLineUseQDRendering
 #else
 	kATSLineIsDisplayOnly | kATSLineFractDisable
 #endif
@@ -7507,8 +7508,10 @@
       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)),