[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:35:48 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 17fedd7a0177079b5310c6815b5e170d58a8b39c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Apr 9 23:19:01 2003 +0000
Reviewed by Maciej.
- fixed 3223414 -- update text encoding menu and encoding names table
Made changes as suggested by Deborah Goldsmith and Peter Edberg from the International group.
* kwq/mac-encodings.txt:
Moved all Korean character sets that are not explicitly Macintosh from MacKorean to EUC_KR.
Moved Shift JIS character sets that are not explicitly Microsoft from DOSJapanese to ShiftJIS_X0213_00.
Moved cp949 from DOSKorean to EUC_KR (DOSKorean is not implemented in Jaguar).
Moved big5 character sets that are not explicitly Microsoft from DOSChineseTrad to Big5_HKSCS_1999.
Moved all gb2312-80 character sets from GB_2312_80 to GB_18030_2000.
Moved all gbk character sets from GBK_95 to GB_18030_2000.
Moved all euc-cn character sets from EUC_CN to GB_18030_2000.
* kwq/KWQCharsetData.c: Regenerated.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4054 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5bceda8..9d82212 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,24 @@
2003-04-09 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - fixed 3223414 -- update text encoding menu and encoding names table
+
+ Made changes as suggested by Deborah Goldsmith and Peter Edberg from the International group.
+
+ * kwq/mac-encodings.txt:
+ Moved all Korean character sets that are not explicitly Macintosh from MacKorean to EUC_KR.
+ Moved Shift JIS character sets that are not explicitly Microsoft from DOSJapanese to ShiftJIS_X0213_00.
+ Moved cp949 from DOSKorean to EUC_KR (DOSKorean is not implemented in Jaguar).
+ Moved big5 character sets that are not explicitly Microsoft from DOSChineseTrad to Big5_HKSCS_1999.
+ Moved all gb2312-80 character sets from GB_2312_80 to GB_18030_2000.
+ Moved all gbk character sets from GBK_95 to GB_18030_2000.
+ Moved all euc-cn character sets from EUC_CN to GB_18030_2000.
+
+ * kwq/KWQCharsetData.c: Regenerated.
+
+2003-04-09 Darin Adler <darin at apple.com>
+
Reviewed by Richard.
- fixed 3223126 -- REGRESSION: exception BrowserWindow isDescendantOf:]: selector not recognized
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5bceda8..9d82212 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,24 @@
2003-04-09 Darin Adler <darin at apple.com>
+ Reviewed by Maciej.
+
+ - fixed 3223414 -- update text encoding menu and encoding names table
+
+ Made changes as suggested by Deborah Goldsmith and Peter Edberg from the International group.
+
+ * kwq/mac-encodings.txt:
+ Moved all Korean character sets that are not explicitly Macintosh from MacKorean to EUC_KR.
+ Moved Shift JIS character sets that are not explicitly Microsoft from DOSJapanese to ShiftJIS_X0213_00.
+ Moved cp949 from DOSKorean to EUC_KR (DOSKorean is not implemented in Jaguar).
+ Moved big5 character sets that are not explicitly Microsoft from DOSChineseTrad to Big5_HKSCS_1999.
+ Moved all gb2312-80 character sets from GB_2312_80 to GB_18030_2000.
+ Moved all gbk character sets from GBK_95 to GB_18030_2000.
+ Moved all euc-cn character sets from EUC_CN to GB_18030_2000.
+
+ * kwq/KWQCharsetData.c: Regenerated.
+
+2003-04-09 Darin Adler <darin at apple.com>
+
Reviewed by Richard.
- fixed 3223126 -- REGRESSION: exception BrowserWindow isDescendantOf:]: selector not recognized
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 48342f5..8e2b637 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -45,15 +45,6 @@ static const CharsetEntry table[] = {
{ "x-mac-japanese", kCFStringEncodingMacJapanese, NoEncodingFlags },
{ "x-mac-chinesetrad", kCFStringEncodingMacChineseTrad, NoEncodingFlags },
{ "x-mac-trad-chinese", kCFStringEncodingMacChineseTrad, NoEncodingFlags },
- { "csksc56011987", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "iso-ir-149", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "korean", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ks_c_5601", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ks_c_5601-1987", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ks_c_5601-1989", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ks_c_5601_1987", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ksc5601", kCFStringEncodingMacKorean, NoEncodingFlags },
- { "ksc_5601", kCFStringEncodingMacKorean, NoEncodingFlags },
{ "x-mac-korean", kCFStringEncodingMacKorean, NoEncodingFlags },
{ "x-mac-arabic", kCFStringEncodingMacArabic, NoEncodingFlags },
{ "x-mac-hebrew", kCFStringEncodingMacHebrew, NoEncodingFlags },
@@ -214,20 +205,10 @@ static const CharsetEntry table[] = {
{ "tis-620", kCFStringEncodingDOSThai, NoEncodingFlags },
{ "windows-874", kCFStringEncodingDOSThai, NoEncodingFlags },
{ "cp932", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "csshiftjis", kCFStringEncodingDOSJapanese, NoEncodingFlags },
{ "cswindows31j", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "ms_kanji", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "shift-jis", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "shift_jis", kCFStringEncodingDOSJapanese, NoEncodingFlags },
{ "windows-31j", kCFStringEncodingDOSJapanese, NoEncodingFlags },
{ "x-ms-cp932", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "x-sjis", kCFStringEncodingDOSJapanese, NoEncodingFlags },
- { "cp949", kCFStringEncodingDOSKorean, NoEncodingFlags },
- { "big5", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
- { "cn-big5", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
{ "cp950", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
- { "csbig5", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
- { "x-x-big5", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
{ "windows-1250", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
{ "winlatin2", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
{ "x-cp1250", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
@@ -264,15 +245,27 @@ static const CharsetEntry table[] = {
{ "csiso42jisc62261978", kCFStringEncodingJIS_C6226_78, NoEncodingFlags },
{ "iso-ir-42", kCFStringEncodingJIS_C6226_78, NoEncodingFlags },
{ "jis_c6226-1978", kCFStringEncodingJIS_C6226_78, NoEncodingFlags },
- { "chinese", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "csgb231280", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "csiso58gb231280", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "gb2312-80", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "gb231280", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "gb_2312-80", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "iso-ir-58", kCFStringEncodingGB_2312_80, NoEncodingFlags },
- { "x-gbk", kCFStringEncodingGBK_95, NoEncodingFlags },
+ { "csshiftjis", kCFStringEncodingShiftJIS_X0213_00, NoEncodingFlags },
+ { "ms_kanji", kCFStringEncodingShiftJIS_X0213_00, NoEncodingFlags },
+ { "shift-jis", kCFStringEncodingShiftJIS_X0213_00, NoEncodingFlags },
+ { "shift_jis", kCFStringEncodingShiftJIS_X0213_00, NoEncodingFlags },
+ { "x-sjis", kCFStringEncodingShiftJIS_X0213_00, NoEncodingFlags },
+ { "chinese", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "cn-gb", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "cp936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csgb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csgb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csiso58gb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "euc-cn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
{ "gb18030", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gb_2312-80", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "iso-ir-58", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "ms936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "windows-936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "x-euc-cn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "x-gbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
{ "csiso2022jp", kCFStringEncodingISO_2022_JP, NoEncodingFlags },
{ "iso-2022-jp", kCFStringEncodingISO_2022_JP, NoEncodingFlags },
{ "csiso2022jp2", kCFStringEncodingISO_2022_JP_2, NoEncodingFlags },
@@ -288,18 +281,19 @@ static const CharsetEntry table[] = {
{ "extended_unix_code_packed_format_for_japanese", kCFStringEncodingEUC_JP, NoEncodingFlags },
{ "x-euc", kCFStringEncodingEUC_JP, NoEncodingFlags },
{ "x-euc-jp", kCFStringEncodingEUC_JP, NoEncodingFlags },
- { "cn-gb", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "cp936", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "csgb2312", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "euc-cn", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "gb2312", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "gbk", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "ms936", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "windows-936", kCFStringEncodingEUC_CN, NoEncodingFlags },
- { "x-euc-cn", kCFStringEncodingEUC_CN, NoEncodingFlags },
{ "euc-tw", kCFStringEncodingEUC_TW, NoEncodingFlags },
+ { "cp949", kCFStringEncodingEUC_KR, NoEncodingFlags },
{ "cseuckr", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "csksc56011987", kCFStringEncodingEUC_KR, NoEncodingFlags },
{ "euc-kr", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "iso-ir-149", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "korean", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ks_c_5601", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ks_c_5601-1987", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ks_c_5601-1989", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ks_c_5601_1987", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ksc5601", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ksc_5601", kCFStringEncodingEUC_KR, NoEncodingFlags },
{ "cskoi8r", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "koi", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "koi8", kCFStringEncodingKOI8_R, NoEncodingFlags },
@@ -307,7 +301,11 @@ static const CharsetEntry table[] = {
{ "koi8r", kCFStringEncodingKOI8_R, NoEncodingFlags },
{ "x-mac-roman-latin1", kCFStringEncodingMacRomanLatin1, NoEncodingFlags },
{ "hz-gb-2312", kCFStringEncodingHZ_GB_2312, NoEncodingFlags },
+ { "big5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
{ "big5-hkscs", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "cn-big5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "csbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "x-x-big5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
{ "cp037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ "csibm037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ "ebcdic-cp-ca", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index e485844..e225c0d 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -16,7 +16,7 @@ NonLossyASCII
MacJapanese: x-mac-japanese
MacChineseTrad: x-mac-chinesetrad, x-mac-trad-chinese
-MacKorean: ks_c_5601, ks_c_5601-1987, ks_c_5601_1987, ksc5601, x-mac-korean
+MacKorean: x-mac-korean
MacArabic: x-mac-arabic
MacHebrew: x-mac-hebrew
MacGreek: x-mac-greek
@@ -93,10 +93,10 @@ DOSNordic
DOSRussian: cp866
DOSGreek2: ibm869
DOSThai: cp874, dos-874, tis-620, windows-874
-DOSJapanese: cp932, cswindows31j, shift-jis, shift_jis, x-ms-cp932, x-sjis
+DOSJapanese: cp932, cswindows31j, x-ms-cp932
DOSChineseSimplif
-DOSKorean: cp949
-DOSChineseTrad: big5, cn-big5, cp950, x-x-big5
+DOSKorean
+DOSChineseTrad: cp950
WindowsLatin2: windows-1250, winlatin2, x-cp1250
WindowsCyrillic: wincyrillic, windows-1251, x-cp1251
WindowsGreek: windows-1253, wingreek
@@ -112,10 +112,10 @@ JIS_X0208_83: jis_x0208-1983
JIS_X0208_90: jis_x0208-1990
JIS_X0212_90: jis_x0212-1990
JIS_C6226_78: jis_c6226-1978
-ShiftJIS_X0213_00
-GB_2312_80: csgb231280, gb2312-80, gb231280, gb_2312-80
-GBK_95: x-gbk
-GB_18030_2000: gb18030
+ShiftJIS_X0213_00: shift-jis, shift_jis, x-sjis
+GB_2312_80
+GBK_95
+GB_18030_2000: cn-gb, csgb231280, euc-cn, gb18030, gb2312, gb_2312-80, gbk, x-euc-cn, x-gbk
KSC_5601_87
KSC_5601_92_Johab
CNS_11643_92_P1
@@ -131,16 +131,16 @@ ISO_2022_CN_EXT: iso-2022-cn-ext
ISO_2022_KR: iso-2022-kr
EUC_JP: euc-jp, x-euc, x-euc-jp
-EUC_CN: cn-gb, euc-cn, gb2312, gbk, x-euc-cn
+EUC_CN
EUC_TW: euc-tw
-EUC_KR: euc-kr
+EUC_KR: cp949, euc-kr, ks_c_5601, ks_c_5601-1987, ks_c_5601_1987, ksc5601
ShiftJIS
KOI8_R: koi, koi8, koi8-r, koi8r
Big5
MacRomanLatin1: x-mac-roman-latin1
HZ_GB_2312: hz-gb-2312
-Big5_HKSCS_1999: big5-hkscs
+Big5_HKSCS_1999: big5, big5-hkscs, cn-big5, x-x-big5
EBCDIC_US
EBCDIC_CP037: cp037
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list