File fix-chinese-font-detection.diff of Package qt3

Overview Repositories Revisions Requests Users Attributes Meta

File fix-chinese-font-detection.diff of Package qt3 (Revision e731b54dce8446406d2cc548ce64c2f4)

Currently displaying revision e731b54dce8446406d2cc548ce64c2f4 , Show latest

--- src/kernel/qfontdatabase.cpp.sav	2005-11-02 13:57:12.000000000 +0100
+++ src/kernel/qfontdatabase.cpp	2005-11-02 13:59:38.000000000 +0100
@@ -452,148 +452,150 @@ QtFontFamily *QFontDatabasePrivate::fami
 
 
 #if defined(Q_WS_X11) || defined(Q_WS_WIN)
-static const unsigned short sample_chars[QFont::LastPrivateScript] =
+static const unsigned short sample_chars[QFont::LastPrivateScript][14] =
 {
     // European Alphabetic Scripts
     // Latin,
-    0x0041,
+    { 0x0041, 0 },
     // Greek,
-    0x0391,
+    { 0x0391, 0 },
     // Cyrillic,
-    0x0410,
+    { 0x0410, 0 },
     // Armenian,
-    0x0540,
+    { 0x0540, 0 },
     // Georgian,
-    0x10d0,
+    { 0x10d0, 0 },
     // Runic,
-    0x16a0,
+    { 0x16a0, 0 },
     // Ogham,
-    0x1680,
+    { 0x1680, 0 },
     // SpacingModifiers,
-    0x02c6,
+    { 0x02c6, 0 },
     // CombiningMarks,
-    0x0300,
+    { 0x0300, 0 },
 
     // Middle Eastern Scripts
     // Hebrew,
-    0x05d0,
+    { 0x05d0, 0 },
     // Arabic,
-    0x0630,
+    { 0x0630, 0 },
     // Syriac,
-    0x0710,
+    { 0x0710, 0 },
     // Thaana,
-    0x0780,
+    { 0x0780, 0 },
 
     // South and Southeast Asian Scripts
     // Devanagari,
-    0x0910,
+    { 0x0910, 0 },
     // Bengali,
-    0x0990,
+    { 0x0990, 0 },
     // Gurmukhi,
-    0x0a10,
+    { 0x0a10, 0 },
     // Gujarati,
-    0x0a90,
+    { 0x0a90, 0 },
     // Oriya,
-    0x0b10,
+    { 0x0b10, 0 },
     // Tamil,
-    0x0b90,
+    { 0x0b90, 0 },
     // Telugu,
-    0x0c10,
+    { 0x0c10, 0 },
     // Kannada,
-    0x0c90,
+    { 0x0c90, 0 },
     // Malayalam,
-    0x0d10,
+    { 0x0d10, 0 },
     // Sinhala,
-    0x0d90,
+    { 0x0d90, 0 },
     // Thai,
-    0x0e10,
+    { 0x0e10, 0 },
     // Lao,
-    0x0e81,
+    { 0x0e81, 0 },
     // Tibetan,
-    0x0f00,
+    { 0x0f00, 0 },
     // Myanmar,
-    0x1000,
+    { 0x1000, 0 },
     // Khmer,
-    0x1780,
+    { 0x1780, 0 },
 
     // East Asian Scripts
     // Han,
-    0x4e00,
+    { 0x4e00, 0 },
     // Hiragana,
-    0x3050,
+    { 0x3050, 0x4e00, 0x25EF, 0x3012, 0x3013, 0x30FB, 0x30FC, 0x5CE0, 0xFF66, 0 },
     // Katakana,
-    0x30b0,
+    { 0x30b0, 0x4e00, 0x25EF, 0x3012, 0x3013, 0x30FB, 0x30FC, 0x5CE0, 0xFF66, 0 },
     // Hangul,
-    0xac00,
+    { 0xac00, 0 },
     // Bopomofo,
-    0x3110,
+    { 0x3110, 0 },
     // Yi,
-    0xa000,
+    { 0xa000, 0 },
 
     // Additional Scripts
     // Ethiopic,
-    0x1200,
+    { 0x1200, 0 },
     // Cherokee,
-    0x13a0,
+    { 0x13a0, 0 },
     // CanadianAboriginal,
-    0x1410,
+    { 0x1410, 0 },
     // Mongolian,
-    0x1800,
+    { 0x1800, 0 },
 
     // Symbols
     // CurrencySymbols,
-    0x20aa,
+    { 0x20aa, 0 },
     // LetterlikeSymbols,
-    0x2103,
+    { 0x2103, 0 },
     // NumberForms,
-    0x2160,
+    { 0x2160, 0 },
     // MathematicalOperators,
-    0x222b,
+    { 0x222b, 0 },
     // TechnicalSymbols,
-    0x2312,
+    { 0x2312, 0 },
     // GeometricSymbols,
-    0x2500,
+    { 0x2500, 0 },
     // MiscellaneousSymbols,
-    0x2640,
+    { 0x2640, 0 },
     // EnclosedAndSquare,
-    0x2460,
+    { 0x2460, 0 },
     // Braille,
-    0x2800,
+    { 0x2800, 0 },
 
     // Unicode,
-    0xfffd,
+    { 0xfffd, 0 },
 
     // some scripts added in Unicode 3.2
     // Tagalog,
-    0x1700,
+    { 0x1700, 0 },
     // Hanunoo,
-    0x1720,
+    { 0x1720, 0 },
     // Buhid,
-    0x1740,
+    { 0x1740, 0 },
     // Tagbanwa,
-    0x1770,
+    { 0x1770, 0 },
 
     // KatakanaHalfWidth
-    0xff65,
+    { 0xff65, 0 },
 
     // Limbu
-    0x1901,
+    { 0x1901, 0 },
     // TaiLe
-    0x1950,
+    { 0x1950, 0 },
 
     // NScripts
-    0x0000,
+    { 0x0000, 0 },
     // NoScript
-    0x0000,
+    { 0x0000, 0 },
 
     // Han_Japanese
-    0x4e00,
-    // Han_SimplifiedChinese,
-    0x4e00,
-    // Han_TraditionalChinese,
-    0x4e00,
+    { 0x4e00, 0x25EF, 0x3012, 0x3013, 0x30FB, 0x5CE0, 0xFF66, 0 },
+    // Han_SimplifiedChinese, 0x3400 is optional
+    { 0x4e00, 0x201C, 0x3002, 0x6237, 0x9555, 0xFFE5, 0 },
+    // Han_TraditionalChinese, 0xF6B1 is optional
+    // OR Han_HongkongChinese, 0x3435, 0xE000, 0xF6B1 are optional
+    { 0x4e00, 0x201C, 0x3002, 0x6236, 0x9F98, 0xFFE5, 0 },
     // Han_Korean
-    0x4e00
+    { 0x4e00, 0 },
+    // Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5
 };
 
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
@@ -604,23 +606,29 @@ static inline bool requiresOpenType(QFon
 }
 #endif
 
-// returns a sample unicode character for the specified script
-static QChar sampleCharacter(QFont::Script script)
-{
-    return QChar(sample_chars[script]);
-}
-
 static inline bool canRender( QFontEngine *fe, QFont::Script script )
 {
     if ( !fe ) return FALSE;
 
-    QChar sample = sampleCharacter(script);
-    bool hasChar = fe->canRender( &sample, 1 );
+    bool hasChar = true;
+    int i = 0;
+
+    if ( ! sample_chars[script][0] )
+        hasChar = false;
 
+    while ( sample_chars[script][i] ){
+        QChar sample(sample_chars[script][i]);
+        if ( ! fe->canRender( &sample, 1  ) )
+        {
+             hasChar = false;
 #ifdef FONT_MATCH_DEBUG
-    if (hasChar)
+	FM_DEBUG("    font has NOT char 0x%04x", sample.unicode() );
+        } else {
 	FM_DEBUG("    font has char 0x%04x", sample.unicode() );
 #endif
+        }
+        i++;
+    }
 #if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
     if (hasChar && requiresOpenType(script)) {
 	QOpenType *ot = fe->openType();
@@ -942,14 +950,14 @@ QFontDatabase::findFont( QFont::Script s
     parseFontName( request.family, foundry_name, family_name );
 
 #ifdef Q_WS_X11
-    if (family_name.isEmpty() && script == QFont::Han) {
+    if (script == QFont::Han) {
 	// modify script according to locale
 	static QFont::Script defaultHan = QFont::UnknownScript;
 	if (defaultHan == QFont::UnknownScript) {
 	    QCString locale = setlocale(LC_ALL, NULL);
 	    if (locale.contains("ko"))
 		defaultHan = QFont::Han_Korean;
-	    else if (locale.contains("zh_TW"))
+	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
 		defaultHan = QFont::Han_TraditionalChinese;
 	    else if (locale.contains("zh"))
 		defaultHan = QFont::Han_SimplifiedChinese;
@@ -1155,8 +1163,8 @@ QFontDatabase::findFont( QFont::Script s
 
     if ( fe ) {
 	if ( script != QFont::Unicode && !canRender( fe, script ) ) {
-	    FM_DEBUG( "  WARN: font loaded cannot render sample 0x%04x",
-		      sampleCharacter(script).unicode() );
+	    FM_DEBUG( "  WARN: font loaded cannot render a sample char" );
+
 	    delete fe;
             fe = 0;
 	} else if ( fp ) {
--- src/kernel/qfontdatabase_x11.cpp.sav	2005-11-02 13:59:04.000000000 +0100
+++ src/kernel/qfontdatabase_x11.cpp	2005-11-02 14:02:20.000000000 +0100
@@ -903,10 +903,17 @@ static void loadXft()
 	FcResult res = FcPatternGetCharSet(fonts->fonts[i], FC_CHARSET, 0, &charset);
 	if (res == FcResultMatch && FcCharSetCount(charset) > 1) {
 	    for (int i = 0; i < QFont::LastPrivateScript; ++i) {
-		QChar ch = sampleCharacter((QFont::Script) i);
-
-		if (ch.unicode() != 0 &&
-		    FcCharSetHasChar(charset, ch.unicode())) {
+		bool supported=false;
+		for ( int j=0; sample_chars[i][j]; j++ ){
+		    supported=true;
+		    QChar ch(sample_chars[i][j]);
+		    if (ch.unicode() == 0 ||
+		        !FcCharSetHasChar(charset, ch.unicode())) {
+		        supported=false;
+		        break;
+		    }
+		}
+		if ( supported ){
 		    family->scripts[i] = QtFontFamily::Supported;
 		} else {
 		    family->scripts[i] |= QtFontFamily::UnSupported_Xft;
@@ -1179,9 +1186,18 @@ static inline void checkXftCoverage( QtF
 		family->scripts[QFont::UnknownScript] = QtFontFamily::Supported;
 	    } else {
 		for ( int i = 0; i < QFont::LastPrivateScript; ++i ) {
-		    QChar ch = sampleCharacter( (QFont::Script)i );
-		    if ( ch.unicode() != 0 &&
-			 getGlyphIndex( unicode_table, format, ch.unicode() ) ) {
+		    
+		    bool supported=false;
+		    for ( int j=0; sample_chars[i][j]; j++ ){
+		        supported=true;
+		        QChar ch(sample_chars[i][j]);
+		        if (ch.unicode() == 0 ||
+			    !getGlyphIndex( unicode_table, format, ch.unicode() ) ) {
+		            supported=false;
+		            break;
+		        }
+		    }
+		    if ( supported ){
 			// qDebug("font can render script %d",  i );
 			family->scripts[i] = QtFontFamily::Supported;
 		    } else {
@@ -1211,8 +1227,17 @@ static inline void checkXftCoverage( QtF
     if ( error ) return;
 
     for ( int i = 0; i < QFont::LastPrivateScript; ++i ) {
-	QChar ch = sampleCharacter( (QFont::Script)i );
-	if ( ch.unicode() != 0 && FT_Get_Char_Index ( face, ch.unicode() ) ) {
+        bool supported=false;
+        for ( int j=0; sample_chars[i][j]; j++ ){
+            supported=true;
+            QChar ch(sample_chars[i][j]);
+            if (ch.unicode() == 0 ||
+ 	       !FT_Get_Char_Index ( face, ch.unicode() ) ) {
+                supported=false;
+                break;
+            }
+        }
+        if ( supported ){
 	    FD_DEBUG("font can render char %04x, %04x script %d '%s'",
 		     ch.unicode(), FT_Get_Char_Index ( face, ch.unicode() ),
 		     i, QFontDatabase::scriptName( (QFont::Script)i ).latin1() );
@@ -1522,11 +1547,20 @@ QFontEngine *loadEngine( QFont::Script s
 #  ifdef QT_XFT2
 	if (!symbol && script != QFont::Unicode) {
 	    FcCharSet *cs = FcCharSetCreate();
-	    QChar sample = sampleCharacter(script);
-	    FcCharSetAddChar(cs, sample.unicode());
+	    for ( int j=0; sample_chars[script][j]; j++ )
+	        FcCharSetAddChar(cs, sample_chars[script][j]);
 	    if (script == QFont::Latin)
 		// add Euro character
 		FcCharSetAddChar(cs, 0x20ac);
+	    if (script == QFont::Han_SimplifiedChinese)
+		FcCharSetAddChar(cs, 0x3400);
+	    if (script == QFont::Han_TraditionalChinese){
+		FcCharSetAddChar(cs, 0x3435);
+		FcCharSetAddChar(cs, 0xE000);
+		FcCharSetAddChar(cs, 0xF6B1);
+	    }
+	    if (script == QFont::MiscellaneousSymbols)
+		FcCharSetAddChar(cs, 0x2714);
 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
 	    FcCharSetDestroy(cs);
 	}
@@ -1563,8 +1597,8 @@ QFontEngine *loadEngine( QFont::Script s
 	    if (res == FcResultMatch && QString::fromUtf8((char *)f) != family->rawName) {
 		FcPatternDel(pattern, FC_CHARSET);
 		FcCharSet *cs = FcCharSetCreate();
-		QChar sample = sampleCharacter(script);
-		FcCharSetAddChar(cs, sample.unicode());
+		for ( int j=0; sample_chars[script][j]; j++ )
+		  FcCharSetAddChar(cs, sample_chars[script][j]);
 		FcPatternAddCharSet(pattern, FC_CHARSET, cs);
 		FcCharSetDestroy(cs);
 		result = XftFontMatch( QPaintDevice::x11AppDisplay(), fp->screen, pattern, &res );
@@ -1778,11 +1812,20 @@ static QFontEngine *loadFontConfigFont(c
 
     if (script != QFont::Unicode) {
         FcCharSet *cs = FcCharSetCreate();
-        QChar sample = sampleCharacter(script);
-        FcCharSetAddChar(cs, sample.unicode());
+	for ( int j=0; sample_chars[script][j]; j++ )
+	    FcCharSetAddChar(cs, sample_chars[script][j]);
         if (script == QFont::Latin)
             // add Euro character
             FcCharSetAddChar(cs, 0x20ac);
+	if (script == QFont::Han_SimplifiedChinese)
+	    FcCharSetAddChar(cs, 0x3400);
+	if (script == QFont::Han_TraditionalChinese) {
+	    FcCharSetAddChar(cs, 0x3435);
+	    FcCharSetAddChar(cs, 0xE000);
+	    FcCharSetAddChar(cs, 0xF6B1);
+	}
+	if (script == QFont::MiscellaneousSymbols)
+	    FcCharSetAddChar(cs, 0x2714);
         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
         FcCharSetDestroy(cs);
     }
@@ -1822,7 +1865,6 @@ static QFontEngine *loadFontConfigFont(c
         }
 #endif
 
-        int ch = sampleCharacter(script).unicode();
         double size_value = request.pixelSize;
         if ( size_value > MAXFONTSIZE_XFT )
     	    size_value = MAXFONTSIZE_XFT;
@@ -1835,7 +1877,13 @@ static QFontEngine *loadFontConfigFont(c
 	    FcResult res = FcPatternGetCharSet(font, FC_CHARSET, 0, &cs);
 	    if (res != FcResultMatch)
 	        continue;
-	    if (!FcCharSetHasChar(cs, ch))
+	    bool do_break=true;
+	    for ( int j=0; sample_chars[script][j]; j++ ){
+	        do_break=false;
+	        if (!FcCharSetHasChar(cs, sample_chars[script][j]))
+		    do_break=true;
+            }
+	    if ( do_break )
 	        continue;
 	    FcBool scalable;
 	    res = FcPatternGetBool(font, FC_SCALABLE, 0, &scalable);
@@ -1874,10 +1922,11 @@ static QFontEngine *loadFontConfigFont(c
 	        fe->setScale( scale );
 	        fe->fontDef = request;
 	        if ( script != QFont::Unicode && !canRender(fe, script) ) {
-		    FM_DEBUG( "  WARN: font loaded cannot render sample 0x%04x", ch );
+		    FM_DEBUG( "  WARN: font loaded cannot render samples" );
 		    delete fe;
 		    fe = 0;
-	        }
+	        }else
+		    FM_DEBUG( "  USE: %s", fe->fontDef.family.latin1() );
 	    }
 	    if (fe) {
                 QFontEngineXft *xft = (QFontEngineXft *)fe;

Places

File fix-chinese-font-detection.diff of Package qt3 (Revision e731b54dce8446406d2cc548ce64c2f4)

Places