author | Jingning Ji <jingning.ji@oracle.com> |
Thu, 22 Sep 2016 16:33:05 -0700 | |
changeset 7117 | f7dc231928a9 |
parent 6914 | 0c9c2d460328 |
permissions | -rw-r--r-- |
6914
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
1 |
Patch migrated from Desktop, where it was listed as: |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
2 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
3 |
pango-03-solaris-cjk-font-table.diff |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
4 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
5 |
This fixes the following CR. |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
6 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
7 |
15431111 - SUNBT6617438 [vermillion] Latin font should not be used for ASCII when monospace |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
8 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
9 |
This patch comes from in-house and this is Solaris specific patch because |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
10 |
the array depends which fonts we install. |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
11 |
Here is the copy from the description of the original CR. |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
12 |
--- |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
13 |
Created By: [email protected] |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
14 |
The problem is that when pango receives ASCII 'a', Japanese fonts won't be |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
15 |
choosed because PangoScriptForLang array does not have PANGO_SCRIPT_LATIN in |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
16 |
"ja". |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
17 |
However Our Japanese fonts include some scripts besides Japanese. |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
18 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
19 |
My suggestion is to maintain pango-script-lang-table.h in Sun since the array |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
20 |
depends which fonts we install. |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
21 |
--- |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
22 |
|
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
23 |
--- pango-1.38.0/pango/pango-script-lang-table.h.orig 2015-04-30 18:56:44.000000000 +0000 |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
24 |
+++ pango-1.38.0/pango/pango-script-lang-table.h 2016-08-31 13:02:31.501883298 +0000 |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
25 |
@@ -105,7 +105,7 @@ |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
26 |
{ "is", { PANGO_SCRIPT_LATIN/*70*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
27 |
{ "it", { PANGO_SCRIPT_LATIN/*72*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
28 |
{ "iu", { PANGO_SCRIPT_CANADIAN_ABORIGINAL/*161*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
29 |
- { "ja", { PANGO_SCRIPT_HAN/*2134*/, PANGO_SCRIPT_KATAKANA/*88*/, PANGO_SCRIPT_HIRAGANA/*85*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
30 |
+ { "ja", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*2134*/, PANGO_SCRIPT_KATAKANA/*88*/, PANGO_SCRIPT_HIRAGANA/*85*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
31 |
{ "jv", { PANGO_SCRIPT_LATIN/*56*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
32 |
{ "ka", { PANGO_SCRIPT_GEORGIAN/*33*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
33 |
{ "kaa", { PANGO_SCRIPT_CYRILLIC/*78*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
34 |
@@ -116,7 +116,7 @@ |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
35 |
{ "kl", { PANGO_SCRIPT_LATIN/*81*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
36 |
{ "km", { PANGO_SCRIPT_KHMER/*63*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
37 |
{ "kn", { PANGO_SCRIPT_KANNADA/*70*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
38 |
- { "ko", { PANGO_SCRIPT_HANGUL/*2442*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
39 |
+ { "ko", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_HANGUL/*2442*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
40 |
{ "kok", { PANGO_SCRIPT_DEVANAGARI/*68*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
41 |
{ "kr", { PANGO_SCRIPT_LATIN/*56*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
42 |
{ "ks", { PANGO_SCRIPT_ARABIC/*33*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
43 |
@@ -250,10 +250,10 @@ |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
44 |
{ "yi", { PANGO_SCRIPT_HEBREW/*27*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
45 |
{ "yo", { PANGO_SCRIPT_LATIN/*114*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
46 |
{ "za", { PANGO_SCRIPT_LATIN/*52*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
47 |
- { "zh-cn", { PANGO_SCRIPT_HAN/*6763*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
48 |
- { "zh-hk", { PANGO_SCRIPT_HAN/*1083*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
49 |
- { "zh-mo", { PANGO_SCRIPT_HAN/*1083*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
50 |
- { "zh-sg", { PANGO_SCRIPT_HAN/*6763*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
51 |
- { "zh-tw", { PANGO_SCRIPT_HAN/*13063*/ } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
52 |
+ { "zh-cn", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*6763*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
53 |
+ { "zh-hk", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*1083*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
54 |
+ { "zh-mo", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*1083*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
55 |
+ { "zh-sg", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*6763*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
56 |
+ { "zh-tw", { PANGO_SCRIPT_LATIN, PANGO_SCRIPT_GREEK, PANGO_SCRIPT_CYRILLIC, PANGO_SCRIPT_HAN/*13063*/, PANGO_SCRIPT_KATAKANA, PANGO_SCRIPT_HIRAGANA } }, |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
57 |
{ "zu", { PANGO_SCRIPT_LATIN/*52*/ } } |
0c9c2d460328
24576350 Latin font should not be used for ASCII when monospace with CJK fonts
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
58 |
}; |