AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add an entry for Cambria-Caladea to the list of metric compatible fonts.

Browse Source 
Caladea is going to be included in Chromium/Chrome OS as a substitute for Cambria. (see https://gerrit.chromium.org/gerrit/#/c/45888/ ).


BUG=chromium:168879
TEST=See the bug and the ChromeOS CL above.

Author: jshin@chromium.org

Reviewed By: reed@google.com

Review URL: https://chromiumcodereview.appspot.com/12879008

git-svn-id: http://skia.googlecode.com/svn/trunk@8251 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-03-20 13:33:33 +00:00
parent b56277efc8
commit c4de776101
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/ports/SkFontConfigInterface_direct.cpp
View File

@ -63,6 +63,7 @@ enum FontEquivClass
MINGLIU,
PMINGLIUHK,
MINGLIUHK,
CAMBRIA,
};
// Match the font name against a whilelist of fonts, returning the equivalence
@ -152,25 +153,29 @@ FontEquivClass GetFontEquivClass(const char* fontname)
{ SIMHEI, "MYingHeiGB18030" },
{ SIMHEI, "MYingHeiB5HK" },
// 新細明體
{ PMINGLIU, "PMingLiU"},
{ PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
{ PMINGLIU, "MSung B5HK"},
// 新細明體
{ PMINGLIU, "PMingLiU"},
{ PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
{ PMINGLIU, "MSung B5HK"},
// 細明體
{ MINGLIU, "MingLiU"},
{ MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
{ MINGLIU, "MSung B5HK"},
// 細明體
{ MINGLIU, "MingLiU"},
{ MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
{ MINGLIU, "MSung B5HK"},
// 新細明體
{ PMINGLIUHK, "PMingLiU_HKSCS"},
{ PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
{ PMINGLIUHK, "MSung B5HK"},
// 新細明體
{ PMINGLIUHK, "PMingLiU_HKSCS"},
{ PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
{ PMINGLIUHK, "MSung B5HK"},
// 細明體
{ MINGLIUHK, "MingLiU_HKSCS"},
{ MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
{ MINGLIUHK, "MSung B5HK"},
// 細明體
{ MINGLIUHK, "MingLiU_HKSCS"},
{ MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
{ MINGLIUHK, "MSung B5HK"},
// Cambria
{ CAMBRIA, "Cambria" },
{ CAMBRIA, "Caladea" },
};
static const size_t kFontCount =