1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix writingSystems determination by code page range bits

Browse Source 
Do exactly what windows font database does to determine
writingSystems in case of non-truetype fonts.

Task-number: QTBUG-13585

Change-Id: I4a1a48d74c36e403c31f20847cf80295d89a34bc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-12-17 09:49:40 +02:00 committed by The Qt Project
parent dbf3c559da
commit 4b2c73b476
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gui/text/qplatformfontdatabase.cpp
View File

@ -459,10 +459,20 @@ static const ushort requiredUnicodeBits[QFontDatabase::WritingSystemsCount][2] =
}; };
enum { enum {
Latin1CsbBit = 0,
CentralEuropeCsbBit = 1,
TurkishCsbBit = 4,
BalticCsbBit = 7,
CyrillicCsbBit = 2,
GreekCsbBit = 3,
HebrewCsbBit = 5,
ArabicCsbBit = 6,
VietnameseCsbBit = 8,
SimplifiedChineseCsbBit = 18, SimplifiedChineseCsbBit = 18,
TraditionalChineseCsbBit = 20, TraditionalChineseCsbBit = 20,
JapaneseCsbBit = 17, JapaneseCsbBit = 17,
KoreanCsbBit = 21 KoreanCsbBit = 19,
KoreanJohabCsbBit = 21
}; };
/*! /*!
@ -492,6 +502,36 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q
} }
} }
} }
if (codePageRange[0] & ((1 << Latin1CsbBit) | (1 << CentralEuropeCsbBit) | (1 << TurkishCsbBit) | (1 << BalticCsbBit))) {
writingSystems.setSupported(QFontDatabase::Latin);
hasScript = true;
//qDebug("font %s supports Latin", familyName.latin1());
}
if (codePageRange[0] & (1 << CyrillicCsbBit)) {
writingSystems.setSupported(QFontDatabase::Cyrillic);
hasScript = true;
//qDebug("font %s supports Cyrillic", familyName.latin1());
}
if (codePageRange[0] & (1 << GreekCsbBit)) {
writingSystems.setSupported(QFontDatabase::Greek);
hasScript = true;
//qDebug("font %s supports Greek", familyName.latin1());
}
if (codePageRange[0] & (1 << HebrewCsbBit)) {
writingSystems.setSupported(QFontDatabase::Hebrew);
hasScript = true;
//qDebug("font %s supports Hebrew", familyName.latin1());
}
if (codePageRange[0] & (1 << ArabicCsbBit)) {
writingSystems.setSupported(QFontDatabase::Arabic);
hasScript = true;
//qDebug("font %s supports Arabic", familyName.latin1());
}
if (codePageRange[0] & (1 << VietnameseCsbBit)) {
writingSystems.setSupported(QFontDatabase::Vietnamese);
hasScript = true;
//qDebug("font %s supports Vietnamese", familyName.latin1());
}
if (codePageRange[0] & (1 << SimplifiedChineseCsbBit)) { if (codePageRange[0] & (1 << SimplifiedChineseCsbBit)) {
writingSystems.setSupported(QFontDatabase::SimplifiedChinese); writingSystems.setSupported(QFontDatabase::SimplifiedChinese);
hasScript = true; hasScript = true;
@ -507,7 +547,7 @@ QSupportedWritingSystems QPlatformFontDatabase::writingSystemsFromTrueTypeBits(q
hasScript = true; hasScript = true;
//qDebug("font %s supports Japanese", familyName.latin1()); //qDebug("font %s supports Japanese", familyName.latin1());
} }
if (codePageRange[0] & (1 << KoreanCsbBit)) { if (codePageRange[0] & ((1 << KoreanCsbBit) | (1 << KoreanJohabCsbBit))) {
writingSystems.setSupported(QFontDatabase::Korean); writingSystems.setSupported(QFontDatabase::Korean);
hasScript = true; hasScript = true;
//qDebug("font %s supports Korean", familyName.latin1()); //qDebug("font %s supports Korean", familyName.latin1());

3
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
View File

@ -627,7 +627,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe
case EASTEUROPE_CHARSET: case EASTEUROPE_CHARSET:
case BALTIC_CHARSET: case BALTIC_CHARSET:
case TURKISH_CHARSET: case TURKISH_CHARSET:
case OEM_CHARSET:
return QFontDatabase::Latin; return QFontDatabase::Latin;
case GREEK_CHARSET: case GREEK_CHARSET:
return QFontDatabase::Greek; return QFontDatabase::Greek;
@ -652,8 +651,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe
return QFontDatabase::Vietnamese; return QFontDatabase::Vietnamese;
case SYMBOL_CHARSET: case SYMBOL_CHARSET:
return QFontDatabase::Symbol; return QFontDatabase::Symbol;
// ### case MAC_CHARSET:
// ### case DEFAULT_CHARSET:
default: default:
break; break;
} }

3
src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp
View File

@ -81,7 +81,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe
case EASTEUROPE_CHARSET: case EASTEUROPE_CHARSET:
case BALTIC_CHARSET: case BALTIC_CHARSET:
case TURKISH_CHARSET: case TURKISH_CHARSET:
case OEM_CHARSET:
return QFontDatabase::Latin; return QFontDatabase::Latin;
case GREEK_CHARSET: case GREEK_CHARSET:
return QFontDatabase::Greek; return QFontDatabase::Greek;
@ -106,8 +105,6 @@ static inline QFontDatabase::WritingSystem writingSystemFromCharSet(uchar charSe
return QFontDatabase::Vietnamese; return QFontDatabase::Vietnamese;
case SYMBOL_CHARSET: case SYMBOL_CHARSET:
return QFontDatabase::Symbol; return QFontDatabase::Symbol;
// ### case MAC_CHARSET:
// ### case DEFAULT_CHARSET:
default: default:
break; break;
} }