[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara]

 svtools/source/misc/sampletext.cxx |   19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit bfd2e82881c38a9fc448e92acfaf98174dac19cc
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 13 14:10:17 2014 +0100

    Resolves: fdo#82259 more fonts that lie or have no os/2 table
    
    Seems to be that the default mac fonts are way messy than the MS or Linux ones
    tend to me
    
    Change-Id: Ia0ed6f9fcc650bea9466c4127f6faf7adba72d44

diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index f4f8600..816675a 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -32,11 +32,16 @@ static UScriptCode lcl_getHardCodedScriptNameForFont (const OutputDevice &rDevic
         // but in fact it's a Traditional Chinese font.
         return USCRIPT_TRADITIONAL_HAN;
     }
-    else if (rName == "GungSeo")
+    else if (rName == "GungSeo" || rName == "PCMyungjo" || rName == "PilGi")
     {
-        // "GungSeo" has no OS/2 table, but we know it's a Korean font.
+        // These have no OS/2 tables, but we know they are Korean fonts.
         return USCRIPT_KOREAN;
     }
+    else if (rName == "Hei" || rName == "Kai")
+    {
+        // These have no OS/2 tables, but we know they are Chinese fonts.
+        return USCRIPT_HAN;
+    }
     else if (rName.startsWith("Bangla "))
     {
         // "Bangla Sangam MN" claims it supports MALAYALAM, but it doesn't
@@ -83,6 +88,16 @@ static UScriptCode lcl_getHardCodedScriptNameForFont (const OutputDevice &rDevic
         // TAMIL, but it doesn't
         return USCRIPT_TAMIL;
     }
+    else if (rName == "Hannotate TC" || rName == "HanziPen TC" || rName == "Heiti TC" || rName == "Weibei TC")
+    {
+        // These fonts claim support for ARMENIAN and a bunch of other stuff they doesn't support
+        return USCRIPT_TRADITIONAL_HAN;
+    }
+    else if (rName == "Hannotate SC" || rName == "HanziPen SC" || rName == "Heiti SC" || rName == "Weibei SC")
+    {
+        // These fonts claim support for ARMENIAN and a bunch of other stuff they doesn't support
+        return USCRIPT_SIMPLIFIED_HAN;
+    }
 
     return USCRIPT_INVALID_CODE;
 }