diff --git a/dom/locales/en-US/chrome/charsetTitles.properties b/dom/locales/en-US/chrome/charsetTitles.properties index 2a2be45a4a9..be7aff976e2 100644 --- a/dom/locales/en-US/chrome/charsetTitles.properties +++ b/dom/locales/en-US/chrome/charsetTitles.properties @@ -84,7 +84,6 @@ ibm852.title = Central European (IBM-852) ibm855.title = Cyrillic (IBM-855) ibm857.title = Turkish (IBM-857) ibm862.title = Hebrew (IBM-862) -ibm864i.title = Arabic (IBM-864-I) gb18030.title = Chinese Simplified (GB18030) x-mac-arabic.title = Arabic (MacArabic) x-iso-8859-6-8-x.title = Arabic (Langbox ISO-8859-6.8x) diff --git a/intl/locale/src/charsetalias.properties b/intl/locale/src/charsetalias.properties index 782e31390ae..b668b4d6736 100644 --- a/intl/locale/src/charsetalias.properties +++ b/intl/locale/src/charsetalias.properties @@ -69,7 +69,6 @@ ibm855=IBM855 ibm857=IBM857 ibm862=IBM862 ibm864=IBM864 -ibm864i=IBM864i utf-8=UTF-8 utf-7=UTF-7 shift_jis=Shift_JIS @@ -377,13 +376,6 @@ cp864=IBM864 csibm864=IBM864 ibm-864=IBM864 # -# Aliases for IBM864i -# -cp864i=IBM864i -864i=IBM864i -csibm864i=IBM864i -ibm-864i=IBM864i -# # Aliases for T.61-8bit # t.61=T.61-8bit diff --git a/intl/uconv/src/charsetData.properties b/intl/uconv/src/charsetData.properties index 40ceac38a98..9278a29e1b1 100644 --- a/intl/uconv/src/charsetData.properties +++ b/intl/uconv/src/charsetData.properties @@ -33,7 +33,6 @@ t.61-8bit.notForBrowser = true us-ascii.notForBrowser = true iso-8859-6-e.notForBrowser = true iso-8859-6-i.notForBrowser = true -ibm864i.notForBrowser = true iso-8859-8-e.notForBrowser = true # platform charsets that don't appear in web content @@ -63,7 +62,6 @@ x-imap4-modified-utf7.notForOutgoing = true us-ascii.notForOutgoing = true iso-8859-6-e.notForOutgoing = true iso-8859-6-i.notForOutgoing = true -ibm864i.notForOutgoing = true ibm869.notForOutgoing = true ibm1125.notForOutgoing = true ibm1131.notForOutgoing = true @@ -114,7 +112,6 @@ ibm855.LangGroup = x-cyrillic ibm857.LangGroup = tr ibm862.LangGroup = he ibm864.LangGroup = ar -ibm864i.LangGroup = ar ibm866.LangGroup = x-cyrillic ibm869.LangGroup = el ibm1125.LangGroup = x-cyrillic diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 9381857014a..e2bbc986973 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -165,7 +165,6 @@ #include "nsCP857ToUnicode.h" #include "nsCP862ToUnicode.h" #include "nsCP864ToUnicode.h" -#include "nsCP864iToUnicode.h" #ifdef XP_OS2 #include "nsCP869ToUnicode.h" #include "nsCP1125ToUnicode.h" @@ -177,7 +176,6 @@ #include "nsUnicodeToCP857.h" #include "nsUnicodeToCP862.h" #include "nsUnicodeToCP864.h" -#include "nsUnicodeToCP864i.h" #ifdef XP_OS2 #include "nsUnicodeToCP869.h" #include "nsUnicodeToCP1125.h" @@ -310,7 +308,6 @@ NS_UCONV_REG_UNREG("IBM855", NS_CP855TOUNICODE_CID, NS_UNICODETOCP855_CID) NS_UCONV_REG_UNREG("IBM857", NS_CP857TOUNICODE_CID, NS_UNICODETOCP857_CID) NS_UCONV_REG_UNREG("IBM862", NS_CP862TOUNICODE_CID, NS_UNICODETOCP862_CID) NS_UCONV_REG_UNREG("IBM864", NS_CP864TOUNICODE_CID, NS_UNICODETOCP864_CID) -NS_UCONV_REG_UNREG("IBM864i", NS_CP864ITOUNICODE_CID, NS_UNICODETOCP864I_CID) #ifdef XP_OS2 NS_UCONV_REG_UNREG("IBM869", NS_CP869TOUNICODE_CID, NS_UNICODETOCP869_CID) NS_UCONV_REG_UNREG("IBM1125", NS_CP1125TOUNICODE_CID, NS_UNICODETOCP1125_CID) @@ -664,7 +661,6 @@ NS_DEFINE_NAMED_CID(NS_CP855TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP857TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP862TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP864TOUNICODE_CID); -NS_DEFINE_NAMED_CID(NS_CP864ITOUNICODE_CID); #ifdef XP_OS2 NS_DEFINE_NAMED_CID(NS_CP869TOUNICODE_CID); NS_DEFINE_NAMED_CID(NS_CP1125TOUNICODE_CID); @@ -676,7 +672,6 @@ NS_DEFINE_NAMED_CID(NS_UNICODETOCP855_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP857_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP862_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP864_CID); -NS_DEFINE_NAMED_CID(NS_UNICODETOCP864I_CID); #ifdef XP_OS2 NS_DEFINE_NAMED_CID(NS_UNICODETOCP869_CID); NS_DEFINE_NAMED_CID(NS_UNICODETOCP1125_CID); @@ -853,7 +848,6 @@ static const mozilla::Module::CIDEntry kUConvCIDs[] = { { &kNS_CP857TOUNICODE_CID, false, nullptr, nsCP857ToUnicodeConstructor }, { &kNS_CP862TOUNICODE_CID, false, nullptr, nsCP862ToUnicodeConstructor }, { &kNS_CP864TOUNICODE_CID, false, nullptr, nsCP864ToUnicodeConstructor }, - { &kNS_CP864ITOUNICODE_CID, false, nullptr, nsCP864iToUnicodeConstructor }, #ifdef XP_OS2 { &kNS_CP869TOUNICODE_CID, false, nullptr, nsCP869ToUnicodeConstructor }, { &kNS_CP1125TOUNICODE_CID, false, nullptr, nsCP1125ToUnicodeConstructor }, @@ -865,7 +859,6 @@ static const mozilla::Module::CIDEntry kUConvCIDs[] = { { &kNS_UNICODETOCP857_CID, false, nullptr, nsUnicodeToCP857Constructor }, { &kNS_UNICODETOCP862_CID, false, nullptr, nsUnicodeToCP862Constructor }, { &kNS_UNICODETOCP864_CID, false, nullptr, nsUnicodeToCP864Constructor }, - { &kNS_UNICODETOCP864I_CID, false, nullptr, nsUnicodeToCP864iConstructor }, #ifdef XP_OS2 { &kNS_UNICODETOCP869_CID, false, nullptr, nsUnicodeToCP869Constructor }, { &kNS_UNICODETOCP1125_CID, false, nullptr, nsUnicodeToCP1125Constructor }, @@ -1044,7 +1037,6 @@ static const mozilla::Module::ContractIDEntry kUConvContracts[] = { { NS_UNICODEDECODER_CONTRACTID_BASE "IBM857", &kNS_CP857TOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "IBM862", &kNS_CP862TOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "IBM864", &kNS_CP864TOUNICODE_CID }, - { NS_UNICODEDECODER_CONTRACTID_BASE "IBM864i", &kNS_CP864ITOUNICODE_CID }, #ifdef XP_OS2 { NS_UNICODEDECODER_CONTRACTID_BASE "IBM869", &kNS_CP869TOUNICODE_CID }, { NS_UNICODEDECODER_CONTRACTID_BASE "IBM1125", &kNS_CP1125TOUNICODE_CID }, @@ -1056,7 +1048,6 @@ static const mozilla::Module::ContractIDEntry kUConvContracts[] = { { NS_UNICODEENCODER_CONTRACTID_BASE "IBM857", &kNS_UNICODETOCP857_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM862", &kNS_UNICODETOCP862_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM864", &kNS_UNICODETOCP864_CID }, - { NS_UNICODEENCODER_CONTRACTID_BASE "IBM864i", &kNS_UNICODETOCP864I_CID }, #ifdef XP_OS2 { NS_UNICODEENCODER_CONTRACTID_BASE "IBM869", &kNS_UNICODETOCP869_CID }, { NS_UNICODEENCODER_CONTRACTID_BASE "IBM1125", &kNS_UNICODETOCP1125_CID }, diff --git a/intl/uconv/tests/unit/test_bug718500.js b/intl/uconv/tests/unit/test_bug718500.js index ba1ab87c728..4ef95264405 100644 --- a/intl/uconv/tests/unit/test_bug718500.js +++ b/intl/uconv/tests/unit/test_bug718500.js @@ -84,7 +84,6 @@ var encoderList = [ "IBM857", "IBM862", "IBM864", - "IBM864i", "IBM866", "Shift_JIS", "ISO-2022-JP", @@ -170,7 +169,6 @@ var decoderList = [ "IBM857", "IBM862", "IBM864", - "IBM864i", "IBM866", "Shift_JIS", "ISO-2022-JP", diff --git a/intl/uconv/ucvibm/864i.uf b/intl/uconv/ucvibm/864i.uf deleted file mode 100644 index be477ff5f74..00000000000 --- a/intl/uconv/ucvibm/864i.uf +++ /dev/null @@ -1,394 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - * - - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - - * - - * This Original Code has been modified by IBM Corporation. - - * Modifications made by IBM described herein are - - * Copyright (c) International Business Machines - - * Corporation, 1999 - - * - - * Modifications to Mozilla code or documentation - - * identified per MPL Section 3.3 - - * - - * - - */ - - /*======================================================== - - This is a Generated file. Please don't edit it. - - - - The tool which used to generate this file is called fromu. - - If you have any problem of this file. Please contact - - Netscape Client International Team or - - ftang@netscape - - - - Table in Debug form - -Begin of Item 0000 - - Format 0 - - srcBegin = 0000 - - srcEnd = 0006 - - destBegin = 0000 - -End of Item 0000 - - - -Begin of Item 0001 - - Format 0 - - srcBegin = 0008 - - srcEnd = 001F - - destBegin = 0008 - -End of Item 0001 - - - -Begin of Item 0002 - - Format 0 - - srcBegin = 0021 - - srcEnd = 007B - - destBegin = 0021 - -End of Item 0002 - - - -Begin of Item 0003 - - Format 0 - - srcBegin = 0626 - - srcEnd = 0635 - - destBegin = 00C6 - -End of Item 0003 - - - -Begin of Item 0004 - - Format 0 - - srcBegin = 0660 - - srcEnd = 0669 - - destBegin = 00B0 - -End of Item 0004 - - - -Begin of Item 0005 - - Format 2 - - srcBegin = 0020 - - destBegin = 00A6 - -End of Item 0005 - - - -Begin of Item 0006 - - Format 1 - - srcBegin = 007C - - srcEnd = 007F - - mappingOffset = 0000 - - Mapping = - - 00DB 007D 007E 007F - -End of Item 0006 - - - -Begin of Item 0007 - - Format 1 - - srcBegin = 009B - - srcEnd = 009C - - mappingOffset = 0004 - - Mapping = - - 00C0 00A3 - -End of Item 0007 - - - -Begin of Item 0008 - - Format 1 - - srcBegin = 00AB - - srcEnd = 00C5 - - mappingOffset = 0006 - - Mapping = - - 0094 0095 FFFD 0097 0098 FFFD 0084 FFFD - - 0086 0088 FFFD FFFD FFFD FFFD FFFD FFFD - - FFFD FFFD FFFD FFFD 008C 008E 008B 0089 - - 008A 0085 0087 - -End of Item 0008 - - - -Begin of Item 0009 - - Format 1 - - srcBegin = 00D7 - - srcEnd = 00FF - - mappingOffset = 0021 - - Mapping = - - 00DE FFFD 008F 008D FFFD 00DC FFFD FFFD - - FFFD FFFD 0090 FFFD FFFD FFFD FFFD FFFD - - FFFD FFFD FFFD FFFD FFFD 0091 0092 00A7 - - FFFD FFFD 0093 FFFD FFFD FFFD FFFD 00DD - - 0096 0080 0082 0081 0083 FFFD FFFD 00FE - - 00FF - -End of Item 0009 - - - -Begin of Item 000A - - Format 2 - - srcBegin = 060C - - destBegin = 00AC - -End of Item 000A - - - -Begin of Item 000B - - Format 1 - - srcBegin = 061B - - srcEnd = 0624 - - mappingOffset = 004A - - Mapping = - - 00BB FFFD FFFD FFFD 00BF FFFD 00C1 00C2 - - 00C3 00C4 - -End of Item 000B - - - -Begin of Item 000C - - Format 1 - - srcBegin = 0636 - - srcEnd = 0651 - - mappingOffset = 0054 - - Mapping = - - 00EB 00D7 00D8 00EC 00F7 FFFD FFFD FFFD - - FFFD FFFD 00E0 00E1 00F8 00FC 00FB 00EF - - 00F2 00F4 00E8 00F5 00FD FFFD FFFD FFFD - - FFFD FFFD FFFD 00F1 - -End of Item 000C - - - -Begin of Item 000D - - Format 2 - - srcBegin = 200A - - destBegin = 009F - -End of Item 000D - - - -========================================================*/ - -/* Offset=0x0000 ItemOfList */ - - 0x000E, - -/*-------------------------------------------------------*/ - -/* Offset=0x0001 offsetToFormatArray */ - - 0x0004, - -/*-------------------------------------------------------*/ - -/* Offset=0x0002 offsetToMapCellArray */ - - 0x0008, - -/*-------------------------------------------------------*/ - -/* Offset=0x0003 offsetToMappingTable */ - - 0x0032, - -/*-------------------------------------------------------*/ - -/* Offset=0x0004 Start of Format Array */ - -/* Total of Format 0 : 0x0005 */ - -/* Total of Format 1 : 0x0006 */ - -/* Total of Format 2 : 0x0003 */ - -/* Total of Format 3 : 0x0000 */ - - - -0x0000, 0x1120, 0x1211, 0x0021, - -/*-------------------------------------------------------*/ - -/* Offset=0x0008 Start of MapCell Array */ - -/* 0000 */ 0x0000, 0x0006, 0x0000, - -/* 0001 */ 0x0008, 0x001F, 0x0008, - -/* 0002 */ 0x0021, 0x007B, 0x0021, - -/* 0003 */ 0x0626, 0x0635, 0x00C6, - -/* 0004 */ 0x0660, 0x0669, 0x00B0, - -/* 0005 */ 0x0020, 0x0000, 0x00A6, - -/* 0006 */ 0x007C, 0x007F, 0x0000, - -/* 0007 */ 0x009B, 0x009C, 0x0004, - -/* 0008 */ 0x00AB, 0x00C5, 0x0006, - -/* 0009 */ 0x00D7, 0x00FF, 0x0021, - -/* 000A */ 0x060C, 0x0000, 0x00AC, - -/* 000B */ 0x061B, 0x0624, 0x004A, - -/* 000C */ 0x0636, 0x0651, 0x0054, - -/* 000D */ 0x200A, 0x0000, 0x009F, - -/*-------------------------------------------------------*/ - -/* Offset=0x0032 Start of MappingTable */ - - - -/* 0000 */ 0x00DB, 0x007D, 0x007E, 0x007F, 0x00C0, 0x00A3, 0x0094, 0x0095, - -/* 0008 */ 0xFFFD, 0x0097, 0x0098, 0xFFFD, 0x0084, 0xFFFD, 0x0086, 0x0088, - -/* 0010 */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - -/* 0018 */ 0xFFFD, 0xFFFD, 0x008C, 0x008E, 0x008B, 0x0089, 0x008A, 0x0085, - -/* 0020 */ 0x0087, 0x00DE, 0xFFFD, 0x008F, 0x008D, 0xFFFD, 0x00DC, 0xFFFD, - -/* 0028 */ 0xFFFD, 0xFFFD, 0xFFFD, 0x0090, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - -/* 0030 */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x0091, 0x0092, - -/* 0038 */ 0x00A7, 0xFFFD, 0xFFFD, 0x0093, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - -/* 0040 */ 0x00DD, 0x0096, 0x0080, 0x0082, 0x0081, 0x0083, 0xFFFD, 0xFFFD, - -/* 0048 */ 0x00FE, 0x00FF, 0x00BB, 0xFFFD, 0xFFFD, 0xFFFD, 0x00BF, 0xFFFD, - -/* 0050 */ 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00EB, 0x00D7, 0x00D8, 0x00EC, - -/* 0058 */ 0x00F7, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00E0, 0x00E1, - -/* 0060 */ 0x00F8, 0x00FC, 0x00FB, 0x00EF, 0x00F2, 0x00F4, 0x00E8, 0x00F5, - -/* 0068 */ 0x00FD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0x00F1, - -/* End of table Total Length = 0x00A2 * 2 */ - diff --git a/intl/uconv/ucvibm/864i.ut b/intl/uconv/ucvibm/864i.ut deleted file mode 100644 index 3b841ffaf58..00000000000 --- a/intl/uconv/ucvibm/864i.ut +++ /dev/null @@ -1,298 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- - - * - - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - - * - - * This Original Code has been modified by IBM Corporation. - - * Modifications made by IBM described herein are - - * Copyright (c) International Business Machines - - * Corporation, 1999 - - * - - * Modifications to Mozilla code or documentation - - * identified per MPL Section 3.3 - - * - - * - - */ - - /*======================================================== - - This is a Generated file. Please don't edit it. - - - - The tool which used to generate this file is called fromu. - - If you have any problem of this file. Please contact - - Netscape Client International Team or - - ftang@netscape - - - - Table in Debug form - -Begin of Item 0000 - - Format 0 - - srcBegin = 0000 - - srcEnd = 0006 - - destBegin = 0000 - -End of Item 0000 - - - -Begin of Item 0001 - - Format 0 - - srcBegin = 0008 - - srcEnd = 007F - - destBegin = 0008 - -End of Item 0001 - - - -Begin of Item 0002 - - Format 0 - - srcBegin = 00B0 - - srcEnd = 00B9 - - destBegin = 0660 - -End of Item 0002 - - - -Begin of Item 0003 - - Format 0 - - srcBegin = 00C6 - - srcEnd = 00DA - - destBegin = 0626 - -End of Item 0003 - - - -Begin of Item 0004 - - Format 0 - - srcBegin = 00E0 - - srcEnd = 00EA - - destBegin = 0640 - -End of Item 0004 - - - -Begin of Item 0005 - - Format 2 - - srcBegin = 0007 - - destBegin = 0017 - -End of Item 0005 - - - -Begin of Item 0006 - - Format 1 - - srcBegin = 0080 - - srcEnd = 00C5 - - mappingOffset = 0000 - - Mapping = - - 00F8 00FA 00F9 00FB 00B1 00C4 00B3 00C5 - - 00B4 00C2 00C3 00C1 00BF 00DA 00C0 00D9 - - 00E1 00EC 00ED 00F1 00AB 00AC 00F7 00AE - - 00AF 0644 0644 0020 0020 0644 0644 200A - - 0020 0020 0622 009C 0020 0623 0020 00EE - - 0627 0628 062A 062B 060C 062C 062D 062E - - FFFD FFFD FFFD FFFD FFFD FFFD FFFD FFFD - - FFFD FFFD 0641 061B 0633 0634 0635 061F - - 009B 0621 0622 0623 0624 0639 - -End of Item 0006 - - - -Begin of Item 0007 - - Format 1 - - srcBegin = 00DB - - srcEnd = 00DF - - mappingOffset = 0046 - - Mapping = - - 007C 00DC 00F6 00D7 0639 - -End of Item 0007 - - - -Begin of Item 0008 - - Format 1 - - srcBegin = 00EB - - srcEnd = 00FF - - mappingOffset = 004B - - Mapping = - - 0636 0639 063A 063A 0645 0651 0651 0646 - - 0647 0647 0649 064A 063A 0642 0644 0644 - - 0644 0643 064A 00FE 00FF - -End of Item 0008 - - - -========================================================*/ - -/* Offset=0x0000 ItemOfList */ - - 0x0009, - -/*-------------------------------------------------------*/ - -/* Offset=0x0001 offsetToFormatArray */ - - 0x0004, - -/*-------------------------------------------------------*/ - -/* Offset=0x0002 offsetToMapCellArray */ - - 0x0007, - -/*-------------------------------------------------------*/ - -/* Offset=0x0003 offsetToMappingTable */ - - 0x0022, - -/*-------------------------------------------------------*/ - -/* Offset=0x0004 Start of Format Array */ - -/* Total of Format 0 : 0x0005 */ - -/* Total of Format 1 : 0x0003 */ - -/* Total of Format 2 : 0x0001 */ - -/* Total of Format 3 : 0x0000 */ - - - -0x0000, 0x1120, 0x0001, - -/*-------------------------------------------------------*/ - -/* Offset=0x0007 Start of MapCell Array */ - -/* 0000 */ 0x0000, 0x0006, 0x0000, - -/* 0001 */ 0x0008, 0x007F, 0x0008, - -/* 0002 */ 0x00B0, 0x00B9, 0x0660, - -/* 0003 */ 0x00C6, 0x00DA, 0x0626, - -/* 0004 */ 0x00E0, 0x00EA, 0x0640, - -/* 0005 */ 0x0007, 0x0000, 0x0017, - -/* 0006 */ 0x0080, 0x00C5, 0x0000, - -/* 0007 */ 0x00DB, 0x00DF, 0x0046, - -/* 0008 */ 0x00EB, 0x00FF, 0x004B, - -/*-------------------------------------------------------*/ - -/* Offset=0x0022 Start of MappingTable */ - - - -/* 0000 */ 0x00F8, 0x00FA, 0x00F9, 0x00FB, 0x00B1, 0x00C4, 0x00B3, 0x00C5, - -/* 0008 */ 0x00B4, 0x00C2, 0x00C3, 0x00C1, 0x00BF, 0x00DA, 0x00C0, 0x00D9, - -/* 0010 */ 0x00E1, 0x00EC, 0x00ED, 0x00F1, 0x00AB, 0x00AC, 0x00F7, 0x00AE, - -/* 0018 */ 0x00AF, 0x0644, 0x0644, 0x0020, 0x0020, 0x0644, 0x0644, 0x200A, - -/* 0020 */ 0x0020, 0x0020, 0x0622, 0x009C, 0x0020, 0x0623, 0x0020, 0x00EE, - -/* 0028 */ 0x0627, 0x0628, 0x062A, 0x062B, 0x060C, 0x062C, 0x062D, 0x062E, - -/* 0030 */ 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, - -/* 0038 */ 0xFFFD, 0xFFFD, 0x0641, 0x061B, 0x0633, 0x0634, 0x0635, 0x061F, - -/* 0040 */ 0x009B, 0x0621, 0x0622, 0x0623, 0x0624, 0x0639, 0x007C, 0x00DC, - -/* 0048 */ 0x00F6, 0x00D7, 0x0639, 0x0636, 0x0639, 0x063A, 0x063A, 0x0645, - -/* 0050 */ 0x0651, 0x0651, 0x0646, 0x0647, 0x0647, 0x0649, 0x064A, 0x063A, - -/* 0058 */ 0x0642, 0x0644, 0x0644, 0x0644, 0x0643, 0x064A, 0x00FE, 0x00FF, - -/* End of table Total Length = 0x0082 * 2 */ - diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index ac68ed4e55b..32c8c659ebc 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -23,14 +23,12 @@ CPPSRCS = \ nsCP857ToUnicode.cpp \ nsCP862ToUnicode.cpp \ nsCP864ToUnicode.cpp \ - nsCP864iToUnicode.cpp \ nsUnicodeToCP850.cpp \ nsUnicodeToCP852.cpp \ nsUnicodeToCP855.cpp \ nsUnicodeToCP857.cpp \ nsUnicodeToCP862.cpp \ nsUnicodeToCP864.cpp \ - nsUnicodeToCP864i.cpp \ $(NULL) ifeq ($(OS_ARCH),OS2) diff --git a/intl/uconv/ucvibm/nsCP864iToUnicode.cpp b/intl/uconv/ucvibm/nsCP864iToUnicode.cpp deleted file mode 100644 index fe8ed4962f9..00000000000 --- a/intl/uconv/ucvibm/nsCP864iToUnicode.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepage 864i - * - */ - -#include "nsUCConstructors.h" -#include "nsCP864iToUnicode.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] - -static const uint16_t g_utMappingTable[] = { -#include "864i.ut" -}; - -nsresult -nsCP864iToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID, - void **aResult) -{ - return CreateOneByteDecoder((uMappingTable*) &g_utMappingTable, - aOuter, aIID, aResult); -} - - - diff --git a/intl/uconv/ucvibm/nsCP864iToUnicode.h b/intl/uconv/ucvibm/nsCP864iToUnicode.h deleted file mode 100644 index a11a0aac5fd..00000000000 --- a/intl/uconv/ucvibm/nsCP864iToUnicode.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepage 864i - * - */ - -#ifndef nsCP864iToUnicode_h___ -#define nsCP864iToUnicode_h___ - - -#include "nsISupports.h" - -/** - * A character set converter from CP864i to Unicode. - */ -nsresult -nsCP864iToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID, - void **aResult); - -#endif /* nsCP864iToUnicode_h___ */ - diff --git a/intl/uconv/ucvibm/nsUCvIBMCID.h b/intl/uconv/ucvibm/nsUCvIBMCID.h index 6d1d28bb045..5307c1af0cb 100644 --- a/intl/uconv/ucvibm/nsUCvIBMCID.h +++ b/intl/uconv/ucvibm/nsUCvIBMCID.h @@ -83,16 +83,6 @@ // {2D524FDB-AE74-11d3-ABF7-0004ACEEFA51} #define NS_UNICODETOCP864_CID \ { 0x2d524fdb, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}} - -// Class ID for our CP864iToUnicode charset converter -// {2D524FDC-AE74-11d3-ABF7-0004ACEEFA51} -#define NS_CP864ITOUNICODE_CID \ - { 0x2d524fdc, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}} - -// Class ID for our UnicodeToCP864i charset converter -// {2D524FDD-AE74-11d3-ABF7-0004ACEEFA51} -#define NS_UNICODETOCP864I_CID \ - { 0x2d524fdd, 0xae74, 0x11d3, {0xab, 0xf7, 0x0, 0x4, 0xac, 0xee, 0xfa, 0x51}} // Class ID for our CP869ToUnicode charset converter // {2D524FE0-AE74-11d3-ABF7-0004ACEEFA51} diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp b/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp deleted file mode 100644 index 6023e1575e9..00000000000 --- a/intl/uconv/ucvibm/nsUnicodeToCP864i.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepages - 864i - * - */ - -#include "nsUCConstructors.h" -#include "nsUnicodeToCP864i.h" - -//---------------------------------------------------------------------- -// Global functions and data [declaration] -static const uint16_t g_ufMappingTable[] = { -#include "864i.uf" -}; - -nsresult -nsUnicodeToCP864iConstructor(nsISupports *aOuter, REFNSIID aIID, - void **aResult) -{ - return CreateTableEncoder(u1ByteCharset, - (uMappingTable*) &g_ufMappingTable, 1, - aOuter, aIID, aResult); -} - - diff --git a/intl/uconv/ucvibm/nsUnicodeToCP864i.h b/intl/uconv/ucvibm/nsUnicodeToCP864i.h deleted file mode 100644 index d5bd2dd0766..00000000000 --- a/intl/uconv/ucvibm/nsUnicodeToCP864i.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Original Code has been modified by IBM Corporation. - * Modifications made by IBM described herein are - * Copyright (c) International Business Machines - * Corporation, 1999 - * - * Modifications to Mozilla code or documentation - * identified per MPL Section 3.3 - * - * Date Modified by Description of modification - * 12/09/1999 IBM Corp. Support for IBM codepages - 864i - * - */ - -#ifndef nsUnicodeToCP864i_h___ -#define nsUnicodeToCP864i_h___ - -#include "nsISupports.h" - -/** - * A character set converter from Unicode to CP864i. - */ -nsresult -nsUnicodeToCP864iConstructor(nsISupports *aOuter, REFNSIID aIID, - void **aResult); - -#endif /* nsUnicodeToCP864i_h___ */