Changeset 227 for trunk/src

Timestamp:

Oct 15, 2009, 12:39:35 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Added a hack for "Workplace Sans" to make Qt think it supports all scripts (Unicode and codepage ranges in the header indicate that it only supports Latin1 but it's much less than the actual number of scripts which include Greek, Cyrillic and even Japanese, which are supported at least partially).

File:

• trunk/src/gui/text/qfontdatabase_pm.cpp (modified) (2 diffs)

trunk/src/gui/text/qfontdatabase_pm.cpp

@@ -195 +195 @@
             family->fixedPitch = face->face_flags & FT_FACE_FLAG_FIXED_WIDTH;
 
-            if (systems.isEmpty()) {
+            if (systems.isEmpty() || familyName == "Workplace Sans") {
                 // it was hard or impossible to determine the actual writing system
                 // of the font (as in case of OS/2 bitmap and PFB fonts for which it is
                 // usually simply reported that they support standard/system codepages).
                 // Pretend that we support all writing systems to not miss the one.
-                // @todo find a way to detect it properly to make sure these fonts
-                // are not matched for scripts they don't support
+                // Note that "Workplace Sans" TTF by Alex Taylor doesn't provide correct
+                // unicode and codepage ranges in os2_table for some reason but versions
+                // 0.4 and earlier are known to support many popular scripts so hack it.
+                //
+                // @todo find a proper way to detect actual supported scripts to make
+                // sure these fonts are not matched for scripts they don't support
                 for (int ws = 0; ws < QFontDatabase::WritingSystemsCount; ++ws)
                     family->writingSystems[ws] = QtFontFamily::Supported;
@@ -395 +399 @@
         if (!desc.family)
             break;
+        FM_DEBUG("loadPM: ============== matched '%s'", qPrintable(desc.family->name));
         fe = loadEngine(req, desc);
         if (!fe)