From 1496976a05b8804135608c7dde9bca5620950c33 Mon Sep 17 00:00:00 2001
From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Mon, 7 Nov 2011 16:24:21 +0100
Subject: Fix localized font family access in OS X
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Font family names listed in QFontDatabase::families() should be
localized names rather than their default (English) names, to be
consistent with behaviors in other Mac apps and previous Qt/Mac
based on ATS.

It should also be possible to verify if a font exists with any
family name, regardless it's localized or not. Say we have font
"Hiragino Mincho Pro", which has a Japanese name called "ヒラギ
ノ明朝 Pro", then

    db.hasFamily(QString::fromUtf8("ヒラギノ明朝 Pro"))

should return true.

Task-number: QTBUG-22372
Reviewed-by: Morten Sorvig
---
 src/gui/text/qfontdatabase.cpp                 |  2 +-
 src/gui/text/qfontdatabase_mac.cpp             | 26 +++++++++++++++++++++++---
 tests/auto/qfontdatabase/tst_qfontdatabase.cpp | 15 +++++++++++++++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 796c455..8d375b8 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1132,7 +1132,7 @@ QT_BEGIN_INCLUDE_NAMESPACE
 #endif
 QT_END_INCLUDE_NAMESPACE
 
-#if !defined(Q_WS_X11)
+#if !defined(Q_WS_X11) && !defined(Q_WS_MAC)
 QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
 {
     return family;
diff --git a/src/gui/text/qfontdatabase_mac.cpp b/src/gui/text/qfontdatabase_mac.cpp
index 9a8e8af..81500c7 100644
--- a/src/gui/text/qfontdatabase_mac.cpp
+++ b/src/gui/text/qfontdatabase_mac.cpp
@@ -104,9 +104,8 @@ if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) {
     const int numFonts = CFArrayGetCount(fonts);
     for(int i = 0; i < numFonts; ++i) {
         CTFontDescriptorRef font = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fonts, i);
-
-        QCFString family_name = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontFamilyNameAttribute);
-        QCFString style_name = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
+        QCFString family_name = (CFStringRef)CTFontDescriptorCopyLocalizedAttribute(font, kCTFontFamilyNameAttribute, NULL);
+        QCFString style_name = (CFStringRef)CTFontDescriptorCopyLocalizedAttribute(font, kCTFontStyleNameAttribute, NULL);
         QtFontFamily *family = db->family(family_name, true);
         for(int ws = 1; ws < QFontDatabase::WritingSystemsCount; ++ws)
             family->writingSystems[ws] = QtFontFamily::Supported;
@@ -489,4 +488,25 @@ bool QFontDatabase::supportsThreadedFontRendering()
     return true;
 }
 
+QString QFontDatabase::resolveFontFamilyAlias(const QString &family)
+{
+    QCFString expectedFamily = QCFString(family);
+
+    QCFType<CFMutableDictionaryRef> attributes = CFDictionaryCreateMutable(NULL, 0,
+        &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    CFDictionaryAddValue(attributes, kCTFontFamilyNameAttribute, expectedFamily);
+    QCFType<CTFontDescriptorRef> descriptor = CTFontDescriptorCreateWithAttributes(attributes);
+
+    QCFType<CFMutableSetRef> mandatoryAttributes = CFSetCreateMutable(NULL, 0, &kCFTypeSetCallBacks);
+    CFSetAddValue(mandatoryAttributes, kCTFontFamilyNameAttribute);
+
+    QCFType<CTFontRef> font = CTFontCreateWithFontDescriptor(descriptor, 0.0, NULL);
+    QCFType<CTFontDescriptorRef> matched = CTFontDescriptorCreateMatchingFontDescriptor(descriptor, mandatoryAttributes);
+    if (!matched)
+        return family;
+
+    QCFString familyName = (CFStringRef) CTFontDescriptorCopyLocalizedAttribute(matched, kCTFontFamilyNameAttribute, NULL);
+    return familyName;
+}
+
 QT_END_NAMESPACE
diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
index 735c7e4..15be776 100644
--- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
@@ -80,6 +80,10 @@ private slots:
 
     void addAppFont_data();
     void addAppFont();
+
+#ifdef Q_WS_MAC
+    void localizedFonts();
+#endif
 };
 
 tst_QFontDatabase::tst_QFontDatabase()
@@ -275,5 +279,16 @@ void tst_QFontDatabase::addAppFont()
     QVERIFY(db.families() == oldFamilies);
 }
 
+#ifdef Q_WS_MAC
+void tst_QFontDatabase::localizedFonts()
+{
+    QFontDatabase db;
+
+    QVERIFY(db.hasFamily(QString::fromUtf8("ヒラギノ明朝 Pro")));
+    QVERIFY(db.hasFamily(QString::fromUtf8("华文宋体")));
+    QVERIFY(!db.hasFamily(QString::fromUtf8("NotValidFont")));
+}
+#endif
+
 QTEST_MAIN(tst_QFontDatabase)
 #include "tst_qfontdatabase.moc"
-- 
cgit v0.12