[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:46:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit ae1c633d738ca17310bce14e56dfce7eb0e8f2fd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jul 2 22:53:33 2003 +0000
Rolled out accidentally-checked-in changes.
* kwq/KWQCharsetData.c:
* kwq/KWQCharsets.mm:
* kwq/KWQTextArea.mm:
* kwq/mac-encodings.txt:
* kwq/make-charset-table.pl:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4582 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a613002..690c5d5 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2003-07-02 Darin Adler <darin at apple.com>
+ Rolled out accidentally-checked-in changes.
+
+ * kwq/KWQCharsetData.c:
+ * kwq/KWQCharsets.mm:
+ * kwq/KWQTextArea.mm:
+ * kwq/mac-encodings.txt:
+ * kwq/make-charset-table.pl:
+
+2003-07-02 Darin Adler <darin at apple.com>
+
Reviewed by Ken.
- fixed 3299715 -- unrepro nil-deref in KHTMLPart::xmlDocImpl handling timer
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a613002..690c5d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2003-07-02 Darin Adler <darin at apple.com>
+ Rolled out accidentally-checked-in changes.
+
+ * kwq/KWQCharsetData.c:
+ * kwq/KWQCharsets.mm:
+ * kwq/KWQTextArea.mm:
+ * kwq/mac-encodings.txt:
+ * kwq/make-charset-table.pl:
+
+2003-07-02 Darin Adler <darin at apple.com>
+
Reviewed by Ken.
- fixed 3299715 -- unrepro nil-deref in KHTMLPart::xmlDocImpl handling timer
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 80eda86..3dd5a88 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -1,300 +1,299 @@
static const CharsetEntry table[] = {
- { "macintosh", kTextEncodingMacRoman, NoEncodingFlags },
- { "csmacintosh", kTextEncodingMacRoman, NoEncodingFlags },
- { "mac", kTextEncodingMacRoman, NoEncodingFlags },
- { "xmacroman", kTextEncodingMacRoman, NoEncodingFlags },
- { "windows-1252", kTextEncodingWindowsLatin1, NoEncodingFlags },
- { "winlatin1", kTextEncodingWindowsLatin1, NoEncodingFlags },
- { "xansi", kTextEncodingWindowsLatin1, NoEncodingFlags },
- { "ISO-8859-1", kTextEncodingISOLatin1, NoEncodingFlags },
- { "88591", kTextEncodingISOLatin1, NoEncodingFlags },
- { "cp819", kTextEncodingISOLatin1, NoEncodingFlags },
- { "csisolatin1", kTextEncodingISOLatin1, NoEncodingFlags },
- { "ibm819", kTextEncodingISOLatin1, NoEncodingFlags },
- { "iso885911987", kTextEncodingISOLatin1, NoEncodingFlags },
- { "isoir100", kTextEncodingISOLatin1, NoEncodingFlags },
- { "l1", kTextEncodingISOLatin1, NoEncodingFlags },
- { "latin1", kTextEncodingISOLatin1, NoEncodingFlags },
- { "x-nextstep", kTextEncodingNextStepLatin, NoEncodingFlags },
- { "US-ASCII", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "ansix341968", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "ansix341986", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "ascii", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "cp367", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "csascii", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "ibm367", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "iso646irv1991", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "iso646us", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "isoir6", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "isoir6us", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "us", kTextEncodingUS_ASCII, NoEncodingFlags },
- { "ISO-10646-UCS-2", kTextEncodingUnicodeDefault, NoEncodingFlags },
- { "csunicode", kTextEncodingUnicodeDefault, NoEncodingFlags },
- { "ucs2", kTextEncodingUnicodeDefault, NoEncodingFlags },
- { "unicode", kTextEncodingUnicodeDefault, NoEncodingFlags },
- { "utf16", kTextEncodingUnicodeDefault, NoEncodingFlags },
- { "UTF-16BE", kTextEncodingUnicodeDefault, BigEndian },
- { "unicodefeff", kTextEncodingUnicodeDefault, BigEndian },
- { "UTF-16LE", kTextEncodingUnicodeDefault, LittleEndian },
- { "unicodefffe", kTextEncodingUnicodeDefault, LittleEndian },
- { "UTF-8", kTextEncodingUTF8, NoEncodingFlags },
- { "unicode11utf8", kTextEncodingUTF8, NoEncodingFlags },
- { "unicode20utf8", kTextEncodingUTF8, NoEncodingFlags },
- { "xunicode20utf8", kTextEncodingUTF8, NoEncodingFlags },
- { "x-mac-japanese", kTextEncodingMacJapanese, IsJapanese },
- { "x-mac-chinesetrad", kTextEncodingMacChineseTrad, NoEncodingFlags },
- { "xmactradchinese", kTextEncodingMacChineseTrad, NoEncodingFlags },
- { "x-mac-korean", kTextEncodingMacKorean, NoEncodingFlags },
- { "x-mac-arabic", kTextEncodingMacArabic, NoEncodingFlags },
- { "x-mac-hebrew", kTextEncodingMacHebrew, NoEncodingFlags },
- { "x-mac-greek", kTextEncodingMacGreek, NoEncodingFlags },
- { "x-mac-cyrillic", kTextEncodingMacCyrillic, NoEncodingFlags },
- { "x-mac-devanagari", kTextEncodingMacDevanagari, NoEncodingFlags },
- { "x-mac-gurmukhi", kTextEncodingMacGurmukhi, NoEncodingFlags },
- { "x-mac-gujarati", kTextEncodingMacGujarati, NoEncodingFlags },
- { "x-mac-thai", kTextEncodingMacThai, NoEncodingFlags },
- { "x-mac-chinesesimp", kTextEncodingMacChineseSimp, NoEncodingFlags },
- { "xmacsimpchinese", kTextEncodingMacChineseSimp, NoEncodingFlags },
- { "x-mac-tibetan", kTextEncodingMacTibetan, NoEncodingFlags },
- { "x-mac-centraleurroman", kTextEncodingMacCentralEurRoman, NoEncodingFlags },
- { "xmacce", kTextEncodingMacCentralEurRoman, NoEncodingFlags },
- { "x-mac-symbol", kTextEncodingMacSymbol, NoEncodingFlags },
- { "x-mac-dingbats", kTextEncodingMacDingbats, NoEncodingFlags },
- { "x-mac-turkish", kTextEncodingMacTurkish, NoEncodingFlags },
- { "x-mac-croatian", kTextEncodingMacCroatian, NoEncodingFlags },
- { "x-mac-icelandic", kTextEncodingMacIcelandic, NoEncodingFlags },
- { "x-mac-romanian", kTextEncodingMacRomanian, NoEncodingFlags },
- { "x-mac-farsi", kTextEncodingMacFarsi, NoEncodingFlags },
- { "x-mac-ukrainian", kTextEncodingMacUkrainian, NoEncodingFlags },
- { "x-mac-vt100", kTextEncodingMacVT100, NoEncodingFlags },
- { "ISO-8859-2", kTextEncodingISOLatin2, NoEncodingFlags },
- { "csisolatin2", kTextEncodingISOLatin2, NoEncodingFlags },
- { "iso885921987", kTextEncodingISOLatin2, NoEncodingFlags },
- { "isoir101", kTextEncodingISOLatin2, NoEncodingFlags },
- { "l2", kTextEncodingISOLatin2, NoEncodingFlags },
- { "latin2", kTextEncodingISOLatin2, NoEncodingFlags },
- { "ISO-8859-3", kTextEncodingISOLatin3, NoEncodingFlags },
- { "csisolatin3", kTextEncodingISOLatin3, NoEncodingFlags },
- { "iso885931988", kTextEncodingISOLatin3, NoEncodingFlags },
- { "isoir109", kTextEncodingISOLatin3, NoEncodingFlags },
- { "l3", kTextEncodingISOLatin3, NoEncodingFlags },
- { "latin3", kTextEncodingISOLatin3, NoEncodingFlags },
- { "ISO-8859-4", kTextEncodingISOLatin4, NoEncodingFlags },
- { "csisolatin4", kTextEncodingISOLatin4, NoEncodingFlags },
- { "iso885941988", kTextEncodingISOLatin4, NoEncodingFlags },
- { "isoir110", kTextEncodingISOLatin4, NoEncodingFlags },
- { "l4", kTextEncodingISOLatin4, NoEncodingFlags },
- { "latin4", kTextEncodingISOLatin4, NoEncodingFlags },
- { "ISO-8859-5", kTextEncodingISOLatinCyrillic, NoEncodingFlags },
- { "csisolatincyrillic", kTextEncodingISOLatinCyrillic, NoEncodingFlags },
- { "cyrillic", kTextEncodingISOLatinCyrillic, NoEncodingFlags },
- { "iso885951988", kTextEncodingISOLatinCyrillic, NoEncodingFlags },
- { "isoir144", kTextEncodingISOLatinCyrillic, NoEncodingFlags },
- { "ISO-8859-6", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "arabic", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "asmo708", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "csisolatinarabic", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "ecma114", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "iso885961987", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "isoir127", kTextEncodingISOLatinArabic, NoEncodingFlags },
- { "ISO-8859-7", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "csisolatingreek", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "ecma118", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "elot928", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "greek", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "greek8", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "iso885971987", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "isoir126", kTextEncodingISOLatinGreek, NoEncodingFlags },
- { "ISO-8859-8-I", kTextEncodingISOLatinHebrew, NoEncodingFlags },
- { "csiso88598i", kTextEncodingISOLatinHebrew, NoEncodingFlags },
- { "logical", kTextEncodingISOLatinHebrew, NoEncodingFlags },
- { "ISO-8859-8-E", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "csiso88598e", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "csisolatinhebrew", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "dos862", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "hebrew", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "iso88598", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "iso885981988", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "isoir138", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "visual", kTextEncodingISOLatinHebrew, VisualOrdering },
- { "ISO-8859-9", kTextEncodingISOLatin5, NoEncodingFlags },
- { "csisolatin5", kTextEncodingISOLatin5, NoEncodingFlags },
- { "iso885991989", kTextEncodingISOLatin5, NoEncodingFlags },
- { "isoir148", kTextEncodingISOLatin5, NoEncodingFlags },
- { "l5", kTextEncodingISOLatin5, NoEncodingFlags },
- { "latin5", kTextEncodingISOLatin5, NoEncodingFlags },
- { "ISO-8859-10", kTextEncodingISOLatin6, NoEncodingFlags },
- { "csisolatin6", kTextEncodingISOLatin6, NoEncodingFlags },
- { "iso8859101992", kTextEncodingISOLatin6, NoEncodingFlags },
- { "isoir157", kTextEncodingISOLatin6, NoEncodingFlags },
- { "l6", kTextEncodingISOLatin6, NoEncodingFlags },
- { "latin6", kTextEncodingISOLatin6, NoEncodingFlags },
- { "ISO-8859-11", kTextEncodingISOLatinThai, NoEncodingFlags },
- { "ISO-8859-13", kTextEncodingISOLatin7, NoEncodingFlags },
- { "ISO-8859-14", kTextEncodingISOLatin8, NoEncodingFlags },
- { "iso8859141998", kTextEncodingISOLatin8, NoEncodingFlags },
- { "isoceltic", kTextEncodingISOLatin8, NoEncodingFlags },
- { "isoir199", kTextEncodingISOLatin8, NoEncodingFlags },
- { "l8", kTextEncodingISOLatin8, NoEncodingFlags },
- { "latin8", kTextEncodingISOLatin8, NoEncodingFlags },
- { "ISO-8859-15", kTextEncodingISOLatin9, NoEncodingFlags },
- { "csisolatin9", kTextEncodingISOLatin9, NoEncodingFlags },
- { "l9", kTextEncodingISOLatin9, NoEncodingFlags },
- { "latin9", kTextEncodingISOLatin9, NoEncodingFlags },
- { "cp437", kTextEncodingDOSLatinUS, NoEncodingFlags },
- { "437", kTextEncodingDOSLatinUS, NoEncodingFlags },
- { "cspc8codepage437", kTextEncodingDOSLatinUS, NoEncodingFlags },
- { "ibm437", kTextEncodingDOSLatinUS, NoEncodingFlags },
- { "cp737", kTextEncodingDOSGreek, NoEncodingFlags },
- { "ibm737", kTextEncodingDOSGreek, NoEncodingFlags },
- { "cp500", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "cp775", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "csibm500", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "cspc775baltic", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "ebcdiccpbe", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "ebcdiccpch", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "ibm500", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "ibm775", kTextEncodingDOSBalticRim, NoEncodingFlags },
- { "cp850", kTextEncodingDOSLatin1, NoEncodingFlags },
- { "850", kTextEncodingDOSLatin1, NoEncodingFlags },
- { "cspc850multilingual", kTextEncodingDOSLatin1, NoEncodingFlags },
- { "ibm850", kTextEncodingDOSLatin1, NoEncodingFlags },
- { "cp852", kTextEncodingDOSLatin2, NoEncodingFlags },
- { "852", kTextEncodingDOSLatin2, NoEncodingFlags },
- { "cspcp852", kTextEncodingDOSLatin2, NoEncodingFlags },
- { "ibm852", kTextEncodingDOSLatin2, NoEncodingFlags },
- { "cp857", kTextEncodingDOSTurkish, NoEncodingFlags },
- { "857", kTextEncodingDOSTurkish, NoEncodingFlags },
- { "csibm857", kTextEncodingDOSTurkish, NoEncodingFlags },
- { "ibm857", kTextEncodingDOSTurkish, NoEncodingFlags },
- { "cp861", kTextEncodingDOSIcelandic, NoEncodingFlags },
- { "861", kTextEncodingDOSIcelandic, NoEncodingFlags },
- { "cpis", kTextEncodingDOSIcelandic, NoEncodingFlags },
- { "csibm861", kTextEncodingDOSIcelandic, NoEncodingFlags },
- { "ibm861", kTextEncodingDOSIcelandic, NoEncodingFlags },
- { "cp864", kTextEncodingDOSArabic, NoEncodingFlags },
- { "csibm864", kTextEncodingDOSArabic, NoEncodingFlags },
- { "dos720", kTextEncodingDOSArabic, NoEncodingFlags },
- { "ibm864", kTextEncodingDOSArabic, NoEncodingFlags },
- { "cp866", kTextEncodingDOSRussian, NoEncodingFlags },
- { "866", kTextEncodingDOSRussian, NoEncodingFlags },
- { "csibm866", kTextEncodingDOSRussian, NoEncodingFlags },
- { "ibm866", kTextEncodingDOSRussian, NoEncodingFlags },
- { "cp869", kTextEncodingDOSGreek2, NoEncodingFlags },
- { "869", kTextEncodingDOSGreek2, NoEncodingFlags },
- { "cpgr", kTextEncodingDOSGreek2, NoEncodingFlags },
- { "csibm869", kTextEncodingDOSGreek2, NoEncodingFlags },
- { "ibm869", kTextEncodingDOSGreek2, NoEncodingFlags },
- { "cp874", kTextEncodingDOSThai, NoEncodingFlags },
- { "dos874", kTextEncodingDOSThai, NoEncodingFlags },
- { "tis620", kTextEncodingDOSThai, NoEncodingFlags },
- { "windows874", kTextEncodingDOSThai, NoEncodingFlags },
- { "cp932", kTextEncodingDOSJapanese, IsJapanese },
- { "cswindows31j", kTextEncodingDOSJapanese, IsJapanese },
- { "windows31j", kTextEncodingDOSJapanese, IsJapanese },
- { "xmscp932", kTextEncodingDOSJapanese, IsJapanese },
- { "cp950", kTextEncodingDOSChineseTrad, NoEncodingFlags },
- { "windows-1250", kTextEncodingWindowsLatin2, NoEncodingFlags },
- { "winlatin2", kTextEncodingWindowsLatin2, NoEncodingFlags },
- { "xcp1250", kTextEncodingWindowsLatin2, NoEncodingFlags },
- { "windows-1251", kTextEncodingWindowsCyrillic, NoEncodingFlags },
- { "wincyrillic", kTextEncodingWindowsCyrillic, NoEncodingFlags },
- { "xcp1251", kTextEncodingWindowsCyrillic, NoEncodingFlags },
- { "windows-1253", kTextEncodingWindowsGreek, NoEncodingFlags },
- { "wingreek", kTextEncodingWindowsGreek, NoEncodingFlags },
- { "windows-1254", kTextEncodingWindowsLatin5, NoEncodingFlags },
- { "winturkish", kTextEncodingWindowsLatin5, NoEncodingFlags },
- { "windows-1255", kTextEncodingWindowsHebrew, NoEncodingFlags },
- { "winhebrew", kTextEncodingWindowsHebrew, NoEncodingFlags },
- { "windows-1256", kTextEncodingWindowsArabic, NoEncodingFlags },
- { "cp1256", kTextEncodingWindowsArabic, NoEncodingFlags },
- { "winarabic", kTextEncodingWindowsArabic, NoEncodingFlags },
- { "windows-1257", kTextEncodingWindowsBalticRim, NoEncodingFlags },
- { "winbaltic", kTextEncodingWindowsBalticRim, NoEncodingFlags },
- { "johab", kTextEncodingWindowsKoreanJohab, NoEncodingFlags },
- { "windows-1258", kTextEncodingWindowsVietnamese, NoEncodingFlags },
- { "winvietnamese", kTextEncodingWindowsVietnamese, NoEncodingFlags },
- { "JIS_X0201", kTextEncodingJIS_X0201_76, IsJapanese },
- { "cshalfwidthkatakana", kTextEncodingJIS_X0201_76, IsJapanese },
- { "x0201", kTextEncodingJIS_X0201_76, IsJapanese },
- { "JIS_X0208-1983", kTextEncodingJIS_X0208_83, IsJapanese },
- { "csiso87jisx0208", kTextEncodingJIS_X0208_83, IsJapanese },
- { "isoir87", kTextEncodingJIS_X0208_83, IsJapanese },
- { "jisc62261983", kTextEncodingJIS_X0208_83, IsJapanese },
- { "x0208", kTextEncodingJIS_X0208_83, IsJapanese },
- { "JIS_X0208-1990", kTextEncodingJIS_X0208_90, IsJapanese },
- { "JIS_X0212-1990", kTextEncodingJIS_X0212_90, IsJapanese },
- { "csiso159jisx02121990", kTextEncodingJIS_X0212_90, IsJapanese },
- { "isoir159", kTextEncodingJIS_X0212_90, IsJapanese },
- { "x0212", kTextEncodingJIS_X0212_90, IsJapanese },
- { "JIS_C6226-1978", kTextEncodingJIS_C6226_78, IsJapanese },
- { "csiso42jisc62261978", kTextEncodingJIS_C6226_78, IsJapanese },
- { "isoir42", kTextEncodingJIS_C6226_78, IsJapanese },
- { "Shift_JIS", kTextEncodingShiftJIS_X0213_00, IsJapanese },
- { "csshiftjis", kTextEncodingShiftJIS_X0213_00, IsJapanese },
- { "mskanji", kTextEncodingShiftJIS_X0213_00, IsJapanese },
- { "sjis", kTextEncodingShiftJIS_X0213_00, IsJapanese },
- { "xsjis", kTextEncodingShiftJIS_X0213_00, IsJapanese },
- { "GB18030", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "chinese", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "cngb", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "cp936", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "csgb2312", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "csgb231280", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "csiso58gb231280", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "euccn", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "gb2312", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "gb231280", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "gbk", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "isoir58", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "ms936", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "windows936", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "xeuccn", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "xgbk", kTextEncodingGB_18030_2000, NoEncodingFlags },
- { "ISO-2022-JP", kTextEncodingISO_2022_JP, IsJapanese },
- { "csiso2022jp", kTextEncodingISO_2022_JP, IsJapanese },
- { "jis7", kTextEncodingISO_2022_JP, IsJapanese },
- { "ISO-2022-JP-2", kTextEncodingISO_2022_JP_2, IsJapanese },
- { "csiso2022jp2", kTextEncodingISO_2022_JP_2, IsJapanese },
- { "ISO-2022-JP-1", kTextEncodingISO_2022_JP_1, IsJapanese },
- { "ISO-2022-JP-3", kTextEncodingISO_2022_JP_3, IsJapanese },
- { "ISO-2022-CN", kTextEncodingISO_2022_CN, NoEncodingFlags },
- { "ISO-2022-CN-EXT", kTextEncodingISO_2022_CN_EXT, NoEncodingFlags },
- { "ISO-2022-KR", kTextEncodingISO_2022_KR, NoEncodingFlags },
- { "csiso2022kr", kTextEncodingISO_2022_KR, NoEncodingFlags },
- { "EUC-JP", kTextEncodingEUC_JP, IsJapanese },
- { "cseucpkdfmtjapanese", kTextEncodingEUC_JP, IsJapanese },
- { "extendedunixcodepackedformatforjapanese", kTextEncodingEUC_JP, IsJapanese },
- { "xeuc", kTextEncodingEUC_JP, IsJapanese },
- { "xeucjp", kTextEncodingEUC_JP, IsJapanese },
- { "EUC-TW", kTextEncodingEUC_TW, NoEncodingFlags },
- { "EUC-KR", kTextEncodingEUC_KR, NoEncodingFlags },
- { "cp949", kTextEncodingEUC_KR, NoEncodingFlags },
- { "cseuckr", kTextEncodingEUC_KR, NoEncodingFlags },
- { "csksc56011987", kTextEncodingEUC_KR, NoEncodingFlags },
- { "isoir149", kTextEncodingEUC_KR, NoEncodingFlags },
- { "korean", kTextEncodingEUC_KR, NoEncodingFlags },
- { "ksc5601", kTextEncodingEUC_KR, NoEncodingFlags },
- { "ksc56011987", kTextEncodingEUC_KR, NoEncodingFlags },
- { "ksc56011989", kTextEncodingEUC_KR, NoEncodingFlags },
- { "KOI8-R", kTextEncodingKOI8_R, NoEncodingFlags },
- { "cskoi8r", kTextEncodingKOI8_R, NoEncodingFlags },
- { "koi", kTextEncodingKOI8_R, NoEncodingFlags },
- { "koi8", kTextEncodingKOI8_R, NoEncodingFlags },
- { "x-mac-roman-latin1", kTextEncodingMacRomanLatin1, NoEncodingFlags },
- { "HZ-GB-2312", kTextEncodingHZ_GB_2312, NoEncodingFlags },
- { "Big5", kTextEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "big5hkscs", kTextEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "cnbig5", kTextEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "csbig5", kTextEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "xxbig5", kTextEncodingBig5_HKSCS_1999, NoEncodingFlags },
- { "KOI8-U", kTextEncodingKOI8_U, NoEncodingFlags },
- { "cp037", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "csibm037", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "ebcdiccpca", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "ebcdiccpnl", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "ebcdiccpus", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "ebcdiccpwt", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
- { "ibm037", kTextEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "macintosh", kCFStringEncodingMacRoman, NoEncodingFlags },
+ { "csmacintosh", kCFStringEncodingMacRoman, NoEncodingFlags },
+ { "mac", kCFStringEncodingMacRoman, NoEncodingFlags },
+ { "xmacroman", kCFStringEncodingMacRoman, NoEncodingFlags },
+ { "windows-1252", kCFStringEncodingWindowsLatin1, NoEncodingFlags },
+ { "winlatin1", kCFStringEncodingWindowsLatin1, NoEncodingFlags },
+ { "xansi", kCFStringEncodingWindowsLatin1, NoEncodingFlags },
+ { "ISO-8859-1", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "88591", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "cp819", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "csisolatin1", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "ibm819", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "iso885911987", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "isoir100", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "l1", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "latin1", kCFStringEncodingISOLatin1, NoEncodingFlags },
+ { "x-nextstep", kCFStringEncodingNextStepLatin, NoEncodingFlags },
+ { "US-ASCII", kCFStringEncodingASCII, NoEncodingFlags },
+ { "ansix341968", kCFStringEncodingASCII, NoEncodingFlags },
+ { "ansix341986", kCFStringEncodingASCII, NoEncodingFlags },
+ { "ascii", kCFStringEncodingASCII, NoEncodingFlags },
+ { "cp367", kCFStringEncodingASCII, NoEncodingFlags },
+ { "csascii", kCFStringEncodingASCII, NoEncodingFlags },
+ { "ibm367", kCFStringEncodingASCII, NoEncodingFlags },
+ { "iso646irv1991", kCFStringEncodingASCII, NoEncodingFlags },
+ { "iso646us", kCFStringEncodingASCII, NoEncodingFlags },
+ { "isoir6", kCFStringEncodingASCII, NoEncodingFlags },
+ { "isoir6us", kCFStringEncodingASCII, NoEncodingFlags },
+ { "us", kCFStringEncodingASCII, NoEncodingFlags },
+ { "ISO-10646-UCS-2", kCFStringEncodingUnicode, NoEncodingFlags },
+ { "csunicode", kCFStringEncodingUnicode, NoEncodingFlags },
+ { "ucs2", kCFStringEncodingUnicode, NoEncodingFlags },
+ { "unicode", kCFStringEncodingUnicode, NoEncodingFlags },
+ { "utf16", kCFStringEncodingUnicode, NoEncodingFlags },
+ { "UTF-16BE", kCFStringEncodingUnicode, BigEndian },
+ { "unicodefeff", kCFStringEncodingUnicode, BigEndian },
+ { "UTF-16LE", kCFStringEncodingUnicode, LittleEndian },
+ { "unicodefffe", kCFStringEncodingUnicode, LittleEndian },
+ { "UTF-8", kCFStringEncodingUTF8, NoEncodingFlags },
+ { "unicode11utf8", kCFStringEncodingUTF8, NoEncodingFlags },
+ { "unicode20utf8", kCFStringEncodingUTF8, NoEncodingFlags },
+ { "xunicode20utf8", kCFStringEncodingUTF8, NoEncodingFlags },
+ { "x-mac-japanese", kCFStringEncodingMacJapanese, IsJapanese },
+ { "x-mac-chinesetrad", kCFStringEncodingMacChineseTrad, NoEncodingFlags },
+ { "xmactradchinese", kCFStringEncodingMacChineseTrad, NoEncodingFlags },
+ { "x-mac-korean", kCFStringEncodingMacKorean, NoEncodingFlags },
+ { "x-mac-arabic", kCFStringEncodingMacArabic, NoEncodingFlags },
+ { "x-mac-hebrew", kCFStringEncodingMacHebrew, NoEncodingFlags },
+ { "x-mac-greek", kCFStringEncodingMacGreek, NoEncodingFlags },
+ { "x-mac-cyrillic", kCFStringEncodingMacCyrillic, NoEncodingFlags },
+ { "x-mac-devanagari", kCFStringEncodingMacDevanagari, NoEncodingFlags },
+ { "x-mac-gurmukhi", kCFStringEncodingMacGurmukhi, NoEncodingFlags },
+ { "x-mac-gujarati", kCFStringEncodingMacGujarati, NoEncodingFlags },
+ { "x-mac-thai", kCFStringEncodingMacThai, NoEncodingFlags },
+ { "x-mac-chinesesimp", kCFStringEncodingMacChineseSimp, NoEncodingFlags },
+ { "xmacsimpchinese", kCFStringEncodingMacChineseSimp, NoEncodingFlags },
+ { "x-mac-tibetan", kCFStringEncodingMacTibetan, NoEncodingFlags },
+ { "x-mac-centraleurroman", kCFStringEncodingMacCentralEurRoman, NoEncodingFlags },
+ { "xmacce", kCFStringEncodingMacCentralEurRoman, NoEncodingFlags },
+ { "x-mac-symbol", kCFStringEncodingMacSymbol, NoEncodingFlags },
+ { "x-mac-dingbats", kCFStringEncodingMacDingbats, NoEncodingFlags },
+ { "x-mac-turkish", kCFStringEncodingMacTurkish, NoEncodingFlags },
+ { "x-mac-croatian", kCFStringEncodingMacCroatian, NoEncodingFlags },
+ { "x-mac-icelandic", kCFStringEncodingMacIcelandic, NoEncodingFlags },
+ { "x-mac-romanian", kCFStringEncodingMacRomanian, NoEncodingFlags },
+ { "x-mac-farsi", kCFStringEncodingMacFarsi, NoEncodingFlags },
+ { "x-mac-ukrainian", kCFStringEncodingMacUkrainian, NoEncodingFlags },
+ { "x-mac-vt100", kCFStringEncodingMacVT100, NoEncodingFlags },
+ { "ISO-8859-2", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "csisolatin2", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "iso885921987", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "isoir101", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "l2", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "latin2", kCFStringEncodingISOLatin2, NoEncodingFlags },
+ { "ISO-8859-3", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "csisolatin3", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "iso885931988", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "isoir109", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "l3", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "latin3", kCFStringEncodingISOLatin3, NoEncodingFlags },
+ { "ISO-8859-4", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "csisolatin4", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "iso885941988", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "isoir110", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "l4", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "latin4", kCFStringEncodingISOLatin4, NoEncodingFlags },
+ { "ISO-8859-5", kCFStringEncodingISOLatinCyrillic, NoEncodingFlags },
+ { "csisolatincyrillic", kCFStringEncodingISOLatinCyrillic, NoEncodingFlags },
+ { "cyrillic", kCFStringEncodingISOLatinCyrillic, NoEncodingFlags },
+ { "iso885951988", kCFStringEncodingISOLatinCyrillic, NoEncodingFlags },
+ { "isoir144", kCFStringEncodingISOLatinCyrillic, NoEncodingFlags },
+ { "ISO-8859-6", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "arabic", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "asmo708", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "csisolatinarabic", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "ecma114", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "iso885961987", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "isoir127", kCFStringEncodingISOLatinArabic, NoEncodingFlags },
+ { "ISO-8859-7", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "csisolatingreek", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "ecma118", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "elot928", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "greek", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "greek8", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "iso885971987", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "isoir126", kCFStringEncodingISOLatinGreek, NoEncodingFlags },
+ { "ISO-8859-8-I", kCFStringEncodingISOLatinHebrew, NoEncodingFlags },
+ { "csiso88598i", kCFStringEncodingISOLatinHebrew, NoEncodingFlags },
+ { "logical", kCFStringEncodingISOLatinHebrew, NoEncodingFlags },
+ { "ISO-8859-8-E", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "csiso88598e", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "csisolatinhebrew", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "dos862", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "hebrew", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "iso88598", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "iso885981988", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "isoir138", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "visual", kCFStringEncodingISOLatinHebrew, VisualOrdering },
+ { "ISO-8859-9", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "csisolatin5", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "iso885991989", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "isoir148", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "l5", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "latin5", kCFStringEncodingISOLatin5, NoEncodingFlags },
+ { "ISO-8859-10", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "csisolatin6", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "iso8859101992", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "isoir157", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "l6", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "latin6", kCFStringEncodingISOLatin6, NoEncodingFlags },
+ { "ISO-8859-11", kCFStringEncodingISOLatinThai, NoEncodingFlags },
+ { "ISO-8859-13", kCFStringEncodingISOLatin7, NoEncodingFlags },
+ { "ISO-8859-14", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "iso8859141998", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "isoceltic", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "isoir199", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "l8", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "latin8", kCFStringEncodingISOLatin8, NoEncodingFlags },
+ { "ISO-8859-15", kCFStringEncodingISOLatin9, NoEncodingFlags },
+ { "csisolatin9", kCFStringEncodingISOLatin9, NoEncodingFlags },
+ { "l9", kCFStringEncodingISOLatin9, NoEncodingFlags },
+ { "latin9", kCFStringEncodingISOLatin9, NoEncodingFlags },
+ { "cp437", kCFStringEncodingDOSLatinUS, NoEncodingFlags },
+ { "437", kCFStringEncodingDOSLatinUS, NoEncodingFlags },
+ { "cspc8codepage437", kCFStringEncodingDOSLatinUS, NoEncodingFlags },
+ { "ibm437", kCFStringEncodingDOSLatinUS, NoEncodingFlags },
+ { "cp737", kCFStringEncodingDOSGreek, NoEncodingFlags },
+ { "ibm737", kCFStringEncodingDOSGreek, NoEncodingFlags },
+ { "cp500", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "cp775", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "csibm500", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "cspc775baltic", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "ebcdiccpbe", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "ebcdiccpch", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "ibm500", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "ibm775", kCFStringEncodingDOSBalticRim, NoEncodingFlags },
+ { "cp850", kCFStringEncodingDOSLatin1, NoEncodingFlags },
+ { "850", kCFStringEncodingDOSLatin1, NoEncodingFlags },
+ { "cspc850multilingual", kCFStringEncodingDOSLatin1, NoEncodingFlags },
+ { "ibm850", kCFStringEncodingDOSLatin1, NoEncodingFlags },
+ { "cp852", kCFStringEncodingDOSLatin2, NoEncodingFlags },
+ { "852", kCFStringEncodingDOSLatin2, NoEncodingFlags },
+ { "cspcp852", kCFStringEncodingDOSLatin2, NoEncodingFlags },
+ { "ibm852", kCFStringEncodingDOSLatin2, NoEncodingFlags },
+ { "cp857", kCFStringEncodingDOSTurkish, NoEncodingFlags },
+ { "857", kCFStringEncodingDOSTurkish, NoEncodingFlags },
+ { "csibm857", kCFStringEncodingDOSTurkish, NoEncodingFlags },
+ { "ibm857", kCFStringEncodingDOSTurkish, NoEncodingFlags },
+ { "cp861", kCFStringEncodingDOSIcelandic, NoEncodingFlags },
+ { "861", kCFStringEncodingDOSIcelandic, NoEncodingFlags },
+ { "cpis", kCFStringEncodingDOSIcelandic, NoEncodingFlags },
+ { "csibm861", kCFStringEncodingDOSIcelandic, NoEncodingFlags },
+ { "ibm861", kCFStringEncodingDOSIcelandic, NoEncodingFlags },
+ { "cp864", kCFStringEncodingDOSArabic, NoEncodingFlags },
+ { "csibm864", kCFStringEncodingDOSArabic, NoEncodingFlags },
+ { "dos720", kCFStringEncodingDOSArabic, NoEncodingFlags },
+ { "ibm864", kCFStringEncodingDOSArabic, NoEncodingFlags },
+ { "cp866", kCFStringEncodingDOSRussian, NoEncodingFlags },
+ { "866", kCFStringEncodingDOSRussian, NoEncodingFlags },
+ { "csibm866", kCFStringEncodingDOSRussian, NoEncodingFlags },
+ { "ibm866", kCFStringEncodingDOSRussian, NoEncodingFlags },
+ { "cp869", kCFStringEncodingDOSGreek2, NoEncodingFlags },
+ { "869", kCFStringEncodingDOSGreek2, NoEncodingFlags },
+ { "cpgr", kCFStringEncodingDOSGreek2, NoEncodingFlags },
+ { "csibm869", kCFStringEncodingDOSGreek2, NoEncodingFlags },
+ { "ibm869", kCFStringEncodingDOSGreek2, NoEncodingFlags },
+ { "cp874", kCFStringEncodingDOSThai, NoEncodingFlags },
+ { "dos874", kCFStringEncodingDOSThai, NoEncodingFlags },
+ { "tis620", kCFStringEncodingDOSThai, NoEncodingFlags },
+ { "windows874", kCFStringEncodingDOSThai, NoEncodingFlags },
+ { "cp932", kCFStringEncodingDOSJapanese, IsJapanese },
+ { "cswindows31j", kCFStringEncodingDOSJapanese, IsJapanese },
+ { "windows31j", kCFStringEncodingDOSJapanese, IsJapanese },
+ { "xmscp932", kCFStringEncodingDOSJapanese, IsJapanese },
+ { "cp950", kCFStringEncodingDOSChineseTrad, NoEncodingFlags },
+ { "windows-1250", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
+ { "winlatin2", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
+ { "xcp1250", kCFStringEncodingWindowsLatin2, NoEncodingFlags },
+ { "windows-1251", kCFStringEncodingWindowsCyrillic, NoEncodingFlags },
+ { "wincyrillic", kCFStringEncodingWindowsCyrillic, NoEncodingFlags },
+ { "xcp1251", kCFStringEncodingWindowsCyrillic, NoEncodingFlags },
+ { "windows-1253", kCFStringEncodingWindowsGreek, NoEncodingFlags },
+ { "wingreek", kCFStringEncodingWindowsGreek, NoEncodingFlags },
+ { "windows-1254", kCFStringEncodingWindowsLatin5, NoEncodingFlags },
+ { "winturkish", kCFStringEncodingWindowsLatin5, NoEncodingFlags },
+ { "windows-1255", kCFStringEncodingWindowsHebrew, NoEncodingFlags },
+ { "winhebrew", kCFStringEncodingWindowsHebrew, NoEncodingFlags },
+ { "windows-1256", kCFStringEncodingWindowsArabic, NoEncodingFlags },
+ { "cp1256", kCFStringEncodingWindowsArabic, NoEncodingFlags },
+ { "winarabic", kCFStringEncodingWindowsArabic, NoEncodingFlags },
+ { "windows-1257", kCFStringEncodingWindowsBalticRim, NoEncodingFlags },
+ { "winbaltic", kCFStringEncodingWindowsBalticRim, NoEncodingFlags },
+ { "johab", kCFStringEncodingWindowsKoreanJohab, NoEncodingFlags },
+ { "windows-1258", kCFStringEncodingWindowsVietnamese, NoEncodingFlags },
+ { "winvietnamese", kCFStringEncodingWindowsVietnamese, NoEncodingFlags },
+ { "JIS_X0201", kCFStringEncodingJIS_X0201_76, IsJapanese },
+ { "cshalfwidthkatakana", kCFStringEncodingJIS_X0201_76, IsJapanese },
+ { "x0201", kCFStringEncodingJIS_X0201_76, IsJapanese },
+ { "JIS_X0208-1983", kCFStringEncodingJIS_X0208_83, IsJapanese },
+ { "csiso87jisx0208", kCFStringEncodingJIS_X0208_83, IsJapanese },
+ { "isoir87", kCFStringEncodingJIS_X0208_83, IsJapanese },
+ { "jisc62261983", kCFStringEncodingJIS_X0208_83, IsJapanese },
+ { "x0208", kCFStringEncodingJIS_X0208_83, IsJapanese },
+ { "JIS_X0208-1990", kCFStringEncodingJIS_X0208_90, IsJapanese },
+ { "JIS_X0212-1990", kCFStringEncodingJIS_X0212_90, IsJapanese },
+ { "csiso159jisx02121990", kCFStringEncodingJIS_X0212_90, IsJapanese },
+ { "isoir159", kCFStringEncodingJIS_X0212_90, IsJapanese },
+ { "x0212", kCFStringEncodingJIS_X0212_90, IsJapanese },
+ { "JIS_C6226-1978", kCFStringEncodingJIS_C6226_78, IsJapanese },
+ { "csiso42jisc62261978", kCFStringEncodingJIS_C6226_78, IsJapanese },
+ { "isoir42", kCFStringEncodingJIS_C6226_78, IsJapanese },
+ { "Shift_JIS", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+ { "csshiftjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+ { "mskanji", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+ { "sjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+ { "xsjis", kCFStringEncodingShiftJIS_X0213_00, IsJapanese },
+ { "GB18030", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "chinese", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "cngb", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "cp936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csgb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csgb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "csiso58gb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "euccn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gb2312", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gb231280", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "gbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "isoir58", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "ms936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "windows936", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "xeuccn", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "xgbk", kCFStringEncodingGB_18030_2000, NoEncodingFlags },
+ { "ISO-2022-JP", kCFStringEncodingISO_2022_JP, IsJapanese },
+ { "csiso2022jp", kCFStringEncodingISO_2022_JP, IsJapanese },
+ { "jis7", kCFStringEncodingISO_2022_JP, IsJapanese },
+ { "ISO-2022-JP-2", kCFStringEncodingISO_2022_JP_2, IsJapanese },
+ { "csiso2022jp2", kCFStringEncodingISO_2022_JP_2, IsJapanese },
+ { "ISO-2022-JP-1", kCFStringEncodingISO_2022_JP_1, IsJapanese },
+ { "ISO-2022-JP-3", kCFStringEncodingISO_2022_JP_3, IsJapanese },
+ { "ISO-2022-CN", kCFStringEncodingISO_2022_CN, NoEncodingFlags },
+ { "ISO-2022-CN-EXT", kCFStringEncodingISO_2022_CN_EXT, NoEncodingFlags },
+ { "ISO-2022-KR", kCFStringEncodingISO_2022_KR, NoEncodingFlags },
+ { "csiso2022kr", kCFStringEncodingISO_2022_KR, NoEncodingFlags },
+ { "EUC-JP", kCFStringEncodingEUC_JP, IsJapanese },
+ { "cseucpkdfmtjapanese", kCFStringEncodingEUC_JP, IsJapanese },
+ { "extendedunixcodepackedformatforjapanese", kCFStringEncodingEUC_JP, IsJapanese },
+ { "xeuc", kCFStringEncodingEUC_JP, IsJapanese },
+ { "xeucjp", kCFStringEncodingEUC_JP, IsJapanese },
+ { "EUC-TW", kCFStringEncodingEUC_TW, NoEncodingFlags },
+ { "EUC-KR", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "cp949", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "cseuckr", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "csksc56011987", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "isoir149", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "korean", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ksc5601", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ksc56011987", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "ksc56011989", kCFStringEncodingEUC_KR, NoEncodingFlags },
+ { "KOI8-R", kCFStringEncodingKOI8_R, NoEncodingFlags },
+ { "cskoi8r", kCFStringEncodingKOI8_R, NoEncodingFlags },
+ { "koi", kCFStringEncodingKOI8_R, NoEncodingFlags },
+ { "koi8", kCFStringEncodingKOI8_R, NoEncodingFlags },
+ { "x-mac-roman-latin1", kCFStringEncodingMacRomanLatin1, NoEncodingFlags },
+ { "HZ-GB-2312", kCFStringEncodingHZ_GB_2312, NoEncodingFlags },
+ { "Big5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "big5hkscs", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "cnbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "csbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "xxbig5", kCFStringEncodingBig5_HKSCS_1999, NoEncodingFlags },
+ { "cp037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "csibm037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "ebcdiccpca", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "ebcdiccpnl", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "ebcdiccpus", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "ebcdiccpwt", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
+ { "ibm037", kCFStringEncodingEBCDIC_CP037, NoEncodingFlags },
{ 0, kCFStringEncodingInvalidId, NoEncodingFlags }
};
diff --git a/WebCore/kwq/KWQCharsets.mm b/WebCore/kwq/KWQCharsets.mm
index 7a90832..d1206e2 100644
--- a/WebCore/kwq/KWQCharsets.mm
+++ b/WebCore/kwq/KWQCharsets.mm
@@ -31,11 +31,6 @@ struct CharsetEntry {
KWQEncodingFlags flags;
};
-enum {
- kTextEncodingUTF8 = kCFStringEncodingUTF8,
- kTextEncodingISOLatinThai = kCFStringEncodingISOLatinThai
-};
-
/* The following autogenerated file includes the charset data. */
#include "KWQCharsetData.c"
diff --git a/WebCore/kwq/KWQTextArea.mm b/WebCore/kwq/KWQTextArea.mm
index 3125f91..4449387 100644
--- a/WebCore/kwq/KWQTextArea.mm
+++ b/WebCore/kwq/KWQTextArea.mm
@@ -87,8 +87,6 @@ const float LargeNumberForText = 1.0e7;
[textView setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
- [textView setSelectable:YES]; // must do this explicitly so setEditable:NO does not make it NO
-
[textView setDelegate:self];
[self setDocumentView:textView];
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index 99cf7c8..f85f4ad 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -7,10 +7,10 @@ MacRoman: macintosh, xmacroman
WindowsLatin1: windows-1252, winlatin1, xansi
ISOLatin1: ISO-8859-1, 88591
NextStepLatin: x-nextstep
-US_ASCII: US-ASCII, isoir6us
-UnicodeDefault: ISO-10646-UCS-2, ucs2, unicode, utf16
-UnicodeDefault, BigEndian: UTF-16BE, unicodefeff
-UnicodeDefault, LittleEndian: UTF-16LE, unicodefffe
+ASCII: US-ASCII, isoir6us
+Unicode: ISO-10646-UCS-2, ucs2, unicode, utf16
+Unicode, BigEndian: UTF-16BE, unicodefeff
+Unicode, LittleEndian: UTF-16LE, unicodefffe
UTF8: UTF-8, unicode11utf8, unicode20utf8, xunicode20utf8
NonLossyASCII
@@ -93,7 +93,7 @@ DOSNordic
DOSRussian: cp866
DOSGreek2: cp869
DOSThai: cp874, dos874, tis620, windows874
-DOSJapanese, IsJapanese: cp932, cswindows31j, shiftjis, sjis, xmscp932, xsjis
+DOSJapanese, IsJapanese: cp932, cswindows31j, xmscp932
DOSChineseSimplif
DOSKorean
DOSChineseTrad: cp950
@@ -112,7 +112,7 @@ JIS_X0208_83, IsJapanese: JIS_X0208-1983
JIS_X0208_90, IsJapanese: JIS_X0208-1990
JIS_X0212_90, IsJapanese: JIS_X0212-1990
JIS_C6226_78, IsJapanese: JIS_C6226-1978
-ShiftJIS_X0213_00, IsJapanese
+ShiftJIS_X0213_00, IsJapanese: Shift_JIS, sjis, xsjis
GB_2312_80
GBK_95
GB_18030_2000: GB18030, cngb, csgb231280, euccn, gb2312, gb231280, gbk, xeuccn, xgbk
@@ -141,7 +141,6 @@ Big5
MacRomanLatin1: x-mac-roman-latin1
HZ_GB_2312: HZ-GB-2312
Big5_HKSCS_1999: Big5, big5hkscs, cnbig5, xxbig5
-KOI8_U: KOI8-U
EBCDIC_US
EBCDIC_CP037: cp037
diff --git a/WebCore/kwq/make-charset-table.pl b/WebCore/kwq/make-charset-table.pl
index 2361bec..ca4b0c6 100755
--- a/WebCore/kwq/make-charset-table.pl
+++ b/WebCore/kwq/make-charset-table.pl
@@ -25,7 +25,7 @@ sub emit_line
error "$name shows up twice in output" if $namesWritten{$name};
$namesWritten{$name} = 1;
- $output .= " { \"$name\", kTextEncoding$encoding, $flags },\n";
+ $output .= " { \"$name\", kCFStringEncoding$encoding, $flags },\n";
}
sub process_mac_encodings
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list