mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
Reinstate removed string encodings.
This commit is contained in:
Richard Frith-Macdonald
parent
e6fc2740a2
commit
81ad2f403b
4 changed files with 280 additions and 263 deletions
|
|
@ -1,3 +1,12 @@
|
|||
2021-01-04 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* Headers/Foundation/NSString.h:
|
||||
* Source/Additions/GSMime.m:
|
||||
* Source/Additions/Unicode.m:
|
||||
Reinstate lost encoding constants (so that software using the
|
||||
gnustep extenstions should work again). Also tidy some indentation
|
||||
issues.
|
||||
|
||||
2021-12-21 Frederik Seiffert <frederik@algoriddim.com>
|
||||
|
||||
* Source/NSOperation.m: fix handling of concurrent NSOperations
|
||||
|
|
|
|||
|
|
@ -156,10 +156,10 @@ typedef NSUInteger NSStringCompareOptions;
|
|||
*
|
||||
* <p>Additional encodings available under GNUstep are:
|
||||
* <code>NSKOI8RStringEncoding, NSISOLatin3StringEncoding,
|
||||
* NSISOLatin4StringEncoding, NSISOLatinCyrillicStringEncoding,
|
||||
* NSISOLatinArabicStringEncoding, NSISOLatinGreekStringEncoding,
|
||||
* NSISOLatinHebrewStringEncoding, NSISOLatin5StringEncoding,
|
||||
* NSISOLatin6StringEncoding, NSISOLatinThaiStringEncoding,
|
||||
* NSISOLatin4StringEncoding, NSISOCyrillicStringEncoding,
|
||||
* NSISOArabicStringEncoding, NSISOGreekStringEncoding,
|
||||
* NSISOHebrewStringEncoding, NSISOLatin5StringEncoding,
|
||||
* NSISOLatin6StringEncoding, NSISOThaiStringEncoding,
|
||||
* NSISOLatin7StringEncoding, NSISOLatin8StringEncoding,
|
||||
* NSISOLatin9StringEncoding, NSChineseEUCStringEncoding, NSUTF7StringEncoding,
|
||||
* NSGSM0338StringEncoding, NSBig5StringEncoding,
|
||||
|
|
@ -289,13 +289,13 @@ typedef enum _NSStringEncoding
|
|||
// NSISOLatin2StringEncoding = 0x80000202, /* ISO 8859-2, defined as 9 */
|
||||
NSISOLatin3StringEncoding = 0x80000203, /* ISO 8859-3 */
|
||||
NSISOLatin4StringEncoding = 0x80000204, /* ISO 8859-4 */
|
||||
NSISOLatinCyrillicStringEncoding = 0x80000205, /* ISO 8859-5 */
|
||||
NSISOLatinArabicStringEncoding = 0x80000206, /* ISO 8859-6, StringEncoding=ASMO 708, StringEncoding=DOS CP 708 */
|
||||
NSISOLatinGreekStringEncoding = 0x80000207, /* ISO 8859-7 */
|
||||
NSISOLatinHebrewStringEncoding = 0x80000208, /* ISO 8859-8 */
|
||||
NSISOCyrillicStringEncoding = 0x80000205, /* ISO 8859-5 */
|
||||
NSISOArabicStringEncoding = 0x80000206, /* ISO 8859-6, StringEncoding=ASMO 708, StringEncoding=DOS CP 708 */
|
||||
NSISOGreekStringEncoding = 0x80000207, /* ISO 8859-7 */
|
||||
NSISOHebrewStringEncoding = 0x80000208, /* ISO 8859-8 */
|
||||
NSISOLatin5StringEncoding = 0x80000209, /* ISO 8859-9 */
|
||||
NSISOLatin6StringEncoding = 0x8000020a, /* ISO 8859-10 */
|
||||
NSISOLatinThaiStringEncoding = 0x8000020b, /* ISO 8859-11 */
|
||||
NSISOThaiStringEncoding = 0x8000020b, /* ISO 8859-11 */
|
||||
// missing 0c
|
||||
NSISOLatin7StringEncoding = 0x8000020d, /* ISO 8859-13 */
|
||||
NSISOLatin8StringEncoding = 0x8000020e, /* ISO 8859-14 */
|
||||
|
|
@ -304,10 +304,15 @@ typedef enum _NSStringEncoding
|
|||
NSISOLatin10StringEncoding = 0x80000210, /* ISO 8859-16 */
|
||||
#endif
|
||||
|
||||
NSISOLatinTurkishStringEncoding = NSISOLatin5StringEncoding,
|
||||
NSISOLatinNordicStringEncoding = NSISOLatin6StringEncoding,
|
||||
NSISOLatinArabicStringEncoding = NSISOArabicStringEncoding,
|
||||
NSISOLatinBalticRimStringEncoding = NSISOLatin7StringEncoding,
|
||||
NSISOLatinCelticStringEncoding = NSISOLatin8StringEncoding,
|
||||
NSISOLatinCyrillicStringEncoding = NSISOCyrillicStringEncoding,
|
||||
NSISOLatinGreekStringEncoding = NSISOGreekStringEncoding,
|
||||
NSISOLatinHebrewStringEncoding = NSISOHebrewStringEncoding,
|
||||
NSISOLatinNordicStringEncoding = NSISOLatin6StringEncoding,
|
||||
NSISOLatinThaiStringEncoding = NSISOThaiStringEncoding,
|
||||
NSISOLatinTurkishStringEncoding = NSISOLatin5StringEncoding,
|
||||
|
||||
/* MS-DOS & Windows encodings begin at 0x400 */
|
||||
NSDOSLatinUSStringEncoding = 0x80000400, /* code page 437 */
|
||||
|
|
|
|||
|
|
@ -5290,21 +5290,21 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
NSMapInsert(charsets, (void*)@"iso8859-4",
|
||||
(void*)NSISOLatin4StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-5",
|
||||
(void*)NSISOLatinCyrillicStringEncoding);
|
||||
(void*)NSISOCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-5",
|
||||
(void*)NSISOLatinCyrillicStringEncoding);
|
||||
(void*)NSISOCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-6",
|
||||
(void*)NSISOLatinArabicStringEncoding);
|
||||
(void*)NSISOArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-6",
|
||||
(void*)NSISOLatinArabicStringEncoding);
|
||||
(void*)NSISOArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-7",
|
||||
(void*)NSISOLatinGreekStringEncoding);
|
||||
(void*)NSISOGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-7",
|
||||
(void*)NSISOLatinGreekStringEncoding);
|
||||
(void*)NSISOGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-8",
|
||||
(void*)NSISOLatinHebrewStringEncoding);
|
||||
(void*)NSISOHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-8",
|
||||
(void*)NSISOLatinHebrewStringEncoding);
|
||||
(void*)NSISOHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-9",
|
||||
(void*)NSISOLatin5StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-9",
|
||||
|
|
@ -5314,9 +5314,9 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
NSMapInsert(charsets, (void*)@"iso8859-10",
|
||||
(void*)NSISOLatin6StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-11",
|
||||
(void*)NSISOLatinThaiStringEncoding);
|
||||
(void*)NSISOThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-11",
|
||||
(void*)NSISOLatinThaiStringEncoding);
|
||||
(void*)NSISOThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso-8859-13",
|
||||
(void*)NSISOLatin7StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"iso8859-13",
|
||||
|
|
@ -5349,121 +5349,121 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
(void*)NSChineseEUCStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"gb2312",
|
||||
(void*)NSChineseEUCStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm437",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp437",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm737",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp737",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm775",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp775",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm850",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp850",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm851",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp851",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm852",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp852",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm855",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp855",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm857",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp857",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm861",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp861",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm862",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp862",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm863",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp863",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm864",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp864",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm865",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp865",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm866",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp866",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm869",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp869",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm874",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp874",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm932",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp932",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm936",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp936",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"gbk",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm949",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp949",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm950",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp950",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1255",
|
||||
(void*)NSWindowsHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1256",
|
||||
(void*)NSWindowsArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1257",
|
||||
(void*)NSWindowsBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1258",
|
||||
(void*)NSWindowsVietnameseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1361",
|
||||
(void*)NSWindowsKoreanJohabStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm437",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp437",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm737",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp737",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm775",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp775",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm850",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp850",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm851",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp851",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm852",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp852",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm855",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp855",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm857",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp857",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm861",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp861",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm862",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp862",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm863",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp863",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm864",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp864",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm865",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp865",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm866",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp866",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm869",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp869",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm874",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp874",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm932",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp932",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm936",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp936",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"gbk",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm949",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp949",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"ibm950",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"cp950",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1255",
|
||||
(void*)NSWindowsHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1256",
|
||||
(void*)NSWindowsArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1257",
|
||||
(void*)NSWindowsBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1258",
|
||||
(void*)NSWindowsVietnameseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"windows-1361",
|
||||
(void*)NSWindowsKoreanJohabStringEncoding);
|
||||
|
||||
/* Also map from GNUstep encoding names.
|
||||
*/
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatinCyrillicStringEncoding",
|
||||
(void*)NSISOLatinCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOCyrillicStringEncoding",
|
||||
(void*)NSISOCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSKOI8RStringEncoding",
|
||||
(void*)NSKOI8RStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin3StringEncoding",
|
||||
(void*)NSISOLatin3StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin4StringEncoding",
|
||||
(void*)NSISOLatin4StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatinArabicStringEncoding",
|
||||
(void*)NSISOLatinArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatinGreekStringEncoding",
|
||||
(void*)NSISOLatinGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatinHebrewStringEncoding",
|
||||
(void*)NSISOLatinHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOArabicStringEncoding",
|
||||
(void*)NSISOArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOGreekStringEncoding",
|
||||
(void*)NSISOGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOHebrewStringEncoding",
|
||||
(void*)NSISOHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin5StringEncoding",
|
||||
(void*)NSISOLatin5StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin6StringEncoding",
|
||||
(void*)NSISOLatin6StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatinThaiStringEncoding",
|
||||
(void*)NSISOLatinThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOThaiStringEncoding",
|
||||
(void*)NSISOThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin7StringEncoding",
|
||||
(void*)NSISOLatin7StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSISOLatin8StringEncoding",
|
||||
|
|
@ -5480,64 +5480,64 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
(void*)NSBig5StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSKoreanEUCStringEncoding",
|
||||
(void*)NSKoreanEUCStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatinUSStringEncoding",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreekStringEncoding",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSBalticRimStringEncoding",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatin1StringEncoding",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreek1StringEncoding",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatin2StringEncoding",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSCyrillicStringEncoding",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSTurkishStringEncoding",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOICortugueseStringEncoding",
|
||||
(void*)NSDOICortugueseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSIcelandicStringEncoding",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSHebrewStringEncoding",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSCanadianFrenchStringEncoding",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSArabicStringEncoding",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSNordicStringEncoding",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSRussianStringEncoding",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreek2StringEncoding",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSThaiStringEncoding",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSJapaneseStringEncoding",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSChineseSimplifStringEncoding",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSKoreanStringEncoding",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSChineseTradStringEncoding",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsHebrewStringEncoding",
|
||||
(void*)NSWindowsHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsArabicStringEncoding",
|
||||
(void*)NSWindowsArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsBalticRimStringEncoding",
|
||||
(void*)NSWindowsBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsVietnameseStringEncoding",
|
||||
(void*)NSWindowsVietnameseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsKoreanJohabStringEncoding",
|
||||
(void*)NSWindowsKoreanJohabStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGB_2312_80StringEncoding",
|
||||
(void*)NSGB_2312_80StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGBK_95StringEncoding",
|
||||
(void*)NSGBK_95StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGB_18030_2000StringEncoding",
|
||||
(void*)NSGB_18030_2000StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatinUSStringEncoding",
|
||||
(void*)NSDOSLatinUSStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreekStringEncoding",
|
||||
(void*)NSDOSGreekStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSBalticRimStringEncoding",
|
||||
(void*)NSDOSBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatin1StringEncoding",
|
||||
(void*)NSDOSLatin1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreek1StringEncoding",
|
||||
(void*)NSDOSGreek1StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSLatin2StringEncoding",
|
||||
(void*)NSDOSLatin2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSCyrillicStringEncoding",
|
||||
(void*)NSDOSCyrillicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSTurkishStringEncoding",
|
||||
(void*)NSDOSTurkishStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOICortugueseStringEncoding",
|
||||
(void*)NSDOICortugueseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSIcelandicStringEncoding",
|
||||
(void*)NSDOSIcelandicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSHebrewStringEncoding",
|
||||
(void*)NSDOSHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSCanadianFrenchStringEncoding",
|
||||
(void*)NSDOSCanadianFrenchStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSArabicStringEncoding",
|
||||
(void*)NSDOSArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSNordicStringEncoding",
|
||||
(void*)NSDOSNordicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSRussianStringEncoding",
|
||||
(void*)NSDOSRussianStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSGreek2StringEncoding",
|
||||
(void*)NSDOSGreek2StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSThaiStringEncoding",
|
||||
(void*)NSDOSThaiStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSJapaneseStringEncoding",
|
||||
(void*)NSDOSJapaneseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSChineseSimplifStringEncoding",
|
||||
(void*)NSDOSChineseSimplifStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSKoreanStringEncoding",
|
||||
(void*)NSDOSKoreanStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSDOSChineseTradStringEncoding",
|
||||
(void*)NSDOSChineseTradStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsHebrewStringEncoding",
|
||||
(void*)NSWindowsHebrewStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsArabicStringEncoding",
|
||||
(void*)NSWindowsArabicStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsBalticRimStringEncoding",
|
||||
(void*)NSWindowsBalticRimStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsVietnameseStringEncoding",
|
||||
(void*)NSWindowsVietnameseStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSWindowsKoreanJohabStringEncoding",
|
||||
(void*)NSWindowsKoreanJohabStringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGB_2312_80StringEncoding",
|
||||
(void*)NSGB_2312_80StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGBK_95StringEncoding",
|
||||
(void*)NSGBK_95StringEncoding);
|
||||
NSMapInsert(charsets, (void*)@"NSGB_18030_2000StringEncoding",
|
||||
(void*)NSGB_18030_2000StringEncoding);
|
||||
#endif
|
||||
}
|
||||
if (encodings == 0)
|
||||
|
|
@ -5584,19 +5584,19 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
(void*)@"iso-8859-3");
|
||||
NSMapInsert(encodings, (void*)NSISOLatin4StringEncoding,
|
||||
(void*)@"iso-8859-4");
|
||||
NSMapInsert(encodings, (void*)NSISOLatinCyrillicStringEncoding,
|
||||
NSMapInsert(encodings, (void*)NSISOCyrillicStringEncoding,
|
||||
(void*)@"iso-8859-5");
|
||||
NSMapInsert(encodings, (void*)NSISOLatinArabicStringEncoding,
|
||||
NSMapInsert(encodings, (void*)NSISOArabicStringEncoding,
|
||||
(void*)@"iso-8859-6");
|
||||
NSMapInsert(encodings, (void*)NSISOLatinGreekStringEncoding,
|
||||
NSMapInsert(encodings, (void*)NSISOGreekStringEncoding,
|
||||
(void*)@"iso-8859-7");
|
||||
NSMapInsert(encodings, (void*)NSISOLatinHebrewStringEncoding,
|
||||
NSMapInsert(encodings, (void*)NSISOHebrewStringEncoding,
|
||||
(void*)@"iso-8859-8");
|
||||
NSMapInsert(encodings, (void*)NSISOLatin5StringEncoding,
|
||||
(void*)@"iso-8859-9");
|
||||
NSMapInsert(encodings, (void*)NSISOLatin6StringEncoding,
|
||||
(void*)@"iso-8859-10");
|
||||
NSMapInsert(encodings, (void*)NSISOLatinThaiStringEncoding,
|
||||
NSMapInsert(encodings, (void*)NSISOThaiStringEncoding,
|
||||
(void*)@"iso-8859-11");
|
||||
NSMapInsert(encodings, (void*)NSISOLatin7StringEncoding,
|
||||
(void*)@"iso-8859-13");
|
||||
|
|
@ -5616,58 +5616,58 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
|
|||
(void*)@"gb2312.1980");
|
||||
NSMapInsert(encodings, (void*)NSKoreanEUCStringEncoding,
|
||||
(void*)@"ksc5601.1987");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatinUSStringEncoding,
|
||||
(void*)@"cp437");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreekStringEncoding,
|
||||
(void*)@"cp737");
|
||||
NSMapInsert(encodings, (void*)NSDOSBalticRimStringEncoding,
|
||||
(void*)@"cp775");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatin1StringEncoding,
|
||||
(void*)@"cp850");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreek1StringEncoding,
|
||||
(void*)@"cp851");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatin2StringEncoding,
|
||||
(void*)@"cp852");
|
||||
NSMapInsert(encodings, (void*)NSDOSCyrillicStringEncoding,
|
||||
(void*)@"cp855");
|
||||
NSMapInsert(encodings, (void*)NSDOSTurkishStringEncoding,
|
||||
(void*)@"cp857");
|
||||
NSMapInsert(encodings, (void*)NSDOSIcelandicStringEncoding,
|
||||
(void*)@"cp861");
|
||||
NSMapInsert(encodings, (void*)NSDOSHebrewStringEncoding,
|
||||
(void*)@"cp862");
|
||||
NSMapInsert(encodings, (void*)NSDOSCanadianFrenchStringEncoding,
|
||||
(void*)@"cp863");
|
||||
NSMapInsert(encodings, (void*)NSDOSArabicStringEncoding,
|
||||
(void*)@"cp864");
|
||||
NSMapInsert(encodings, (void*)NSDOSNordicStringEncoding,
|
||||
(void*)@"cp865");
|
||||
NSMapInsert(encodings, (void*)NSDOSRussianStringEncoding,
|
||||
(void*)@"cp866");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreek2StringEncoding,
|
||||
(void*)@"cp869");
|
||||
NSMapInsert(encodings, (void*)NSDOSThaiStringEncoding,
|
||||
(void*)@"cp874");
|
||||
NSMapInsert(encodings, (void*)NSDOSJapaneseStringEncoding,
|
||||
(void*)@"cp932");
|
||||
NSMapInsert(encodings, (void*)NSDOSChineseSimplifStringEncoding,
|
||||
(void*)@"cp936");
|
||||
NSMapInsert(encodings, (void*)NSDOSKoreanStringEncoding,
|
||||
(void*)@"cp949");
|
||||
NSMapInsert(encodings, (void*)NSDOSChineseTradStringEncoding,
|
||||
(void*)@"cp950");
|
||||
NSMapInsert(encodings, (void*)NSWindowsHebrewStringEncoding,
|
||||
(void*)@"windows-1255");
|
||||
NSMapInsert(encodings, (void*)NSWindowsArabicStringEncoding,
|
||||
(void*)@"windows-1256");
|
||||
NSMapInsert(encodings, (void*)NSWindowsBalticRimStringEncoding,
|
||||
(void*)@"windows-1257");
|
||||
NSMapInsert(encodings, (void*)NSWindowsVietnameseStringEncoding,
|
||||
(void*)@"windows-1258");
|
||||
NSMapInsert(encodings, (void*)NSWindowsKoreanJohabStringEncoding,
|
||||
(void*)@"windows-1361");
|
||||
NSMapInsert(encodings, (void*)NSGB_18030_2000StringEncoding,
|
||||
(void*)@"gb18030");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatinUSStringEncoding,
|
||||
(void*)@"cp437");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreekStringEncoding,
|
||||
(void*)@"cp737");
|
||||
NSMapInsert(encodings, (void*)NSDOSBalticRimStringEncoding,
|
||||
(void*)@"cp775");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatin1StringEncoding,
|
||||
(void*)@"cp850");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreek1StringEncoding,
|
||||
(void*)@"cp851");
|
||||
NSMapInsert(encodings, (void*)NSDOSLatin2StringEncoding,
|
||||
(void*)@"cp852");
|
||||
NSMapInsert(encodings, (void*)NSDOSCyrillicStringEncoding,
|
||||
(void*)@"cp855");
|
||||
NSMapInsert(encodings, (void*)NSDOSTurkishStringEncoding,
|
||||
(void*)@"cp857");
|
||||
NSMapInsert(encodings, (void*)NSDOSIcelandicStringEncoding,
|
||||
(void*)@"cp861");
|
||||
NSMapInsert(encodings, (void*)NSDOSHebrewStringEncoding,
|
||||
(void*)@"cp862");
|
||||
NSMapInsert(encodings, (void*)NSDOSCanadianFrenchStringEncoding,
|
||||
(void*)@"cp863");
|
||||
NSMapInsert(encodings, (void*)NSDOSArabicStringEncoding,
|
||||
(void*)@"cp864");
|
||||
NSMapInsert(encodings, (void*)NSDOSNordicStringEncoding,
|
||||
(void*)@"cp865");
|
||||
NSMapInsert(encodings, (void*)NSDOSRussianStringEncoding,
|
||||
(void*)@"cp866");
|
||||
NSMapInsert(encodings, (void*)NSDOSGreek2StringEncoding,
|
||||
(void*)@"cp869");
|
||||
NSMapInsert(encodings, (void*)NSDOSThaiStringEncoding,
|
||||
(void*)@"cp874");
|
||||
NSMapInsert(encodings, (void*)NSDOSJapaneseStringEncoding,
|
||||
(void*)@"cp932");
|
||||
NSMapInsert(encodings, (void*)NSDOSChineseSimplifStringEncoding,
|
||||
(void*)@"cp936");
|
||||
NSMapInsert(encodings, (void*)NSDOSKoreanStringEncoding,
|
||||
(void*)@"cp949");
|
||||
NSMapInsert(encodings, (void*)NSDOSChineseTradStringEncoding,
|
||||
(void*)@"cp950");
|
||||
NSMapInsert(encodings, (void*)NSWindowsHebrewStringEncoding,
|
||||
(void*)@"windows-1255");
|
||||
NSMapInsert(encodings, (void*)NSWindowsArabicStringEncoding,
|
||||
(void*)@"windows-1256");
|
||||
NSMapInsert(encodings, (void*)NSWindowsBalticRimStringEncoding,
|
||||
(void*)@"windows-1257");
|
||||
NSMapInsert(encodings, (void*)NSWindowsVietnameseStringEncoding,
|
||||
(void*)@"windows-1258");
|
||||
NSMapInsert(encodings, (void*)NSWindowsKoreanJohabStringEncoding,
|
||||
(void*)@"windows-1361");
|
||||
NSMapInsert(encodings, (void*)NSGB_18030_2000StringEncoding,
|
||||
(void*)@"gb18030");
|
||||
#endif
|
||||
}
|
||||
if (headerClass == 0)
|
||||
|
|
|
|||
|
|
@ -222,26 +222,26 @@ static struct _strenc_ str_encoding_table[] = {
|
|||
#endif
|
||||
|
||||
// GNUstep additions
|
||||
{NSISOLatinCyrillicStringEncoding,
|
||||
"NSISOLatinCyrillicStringEncoding","ISO-8859-5",0,1,0},
|
||||
{NSISOCyrillicStringEncoding,
|
||||
"NSISOCyrillicStringEncoding","ISO-8859-5",0,1,0},
|
||||
{NSKOI8RStringEncoding,
|
||||
"NSKOI8RStringEncoding","KOI8-R",0,0,0},
|
||||
{NSISOLatin3StringEncoding,
|
||||
"NSISOLatin3StringEncoding","ISO-8859-3",0,0,0},
|
||||
{NSISOLatin4StringEncoding,
|
||||
"NSISOLatin4StringEncoding","ISO-8859-4",0,0,0},
|
||||
{NSISOLatinArabicStringEncoding,
|
||||
"NSISOLatinArabicStringEncoding","ISO-8859-6",0,0,0},
|
||||
{NSISOLatinGreekStringEncoding,
|
||||
"NSISOLatinGreekStringEncoding","ISO-8859-7",0,0,0},
|
||||
{NSISOLatinHebrewStringEncoding,
|
||||
"NSISOLatinHebrewStringEncoding","ISO-8859-8",0,0,0},
|
||||
{NSISOArabicStringEncoding,
|
||||
"NSISOArabicStringEncoding","ISO-8859-6",0,0,0},
|
||||
{NSISOGreekStringEncoding,
|
||||
"NSISOGreekStringEncoding","ISO-8859-7",0,0,0},
|
||||
{NSISOHebrewStringEncoding,
|
||||
"NSISOHebrewStringEncoding","ISO-8859-8",0,0,0},
|
||||
{NSISOLatin5StringEncoding,
|
||||
"NSISOLatin5StringEncoding","ISO-8859-9",0,0,0},
|
||||
{NSISOLatin6StringEncoding,
|
||||
"NSISOLatin6StringEncoding","ISO-8859-10",0,0,0},
|
||||
{NSISOLatinThaiStringEncoding,
|
||||
"NSISOLatinThaiStringEncoding","ISO-8859-11",1,1,0},
|
||||
{NSISOThaiStringEncoding,
|
||||
"NSISOThaiStringEncoding","ISO-8859-11",1,1,0},
|
||||
{NSISOLatin7StringEncoding,
|
||||
"NSISOLatin7StringEncoding","ISO-8859-13",0,0,0},
|
||||
{NSISOLatin8StringEncoding,
|
||||
|
|
@ -353,9 +353,10 @@ static void GSSetupEncodingTable(void)
|
|||
* We want to store pointers to our string encoding info in a
|
||||
* large table so we can do efficient lookup by encoding value.
|
||||
*/
|
||||
encTableSize = sizeof(str_encoding_table) / sizeof(struct _strenc_);
|
||||
encodingPointerTable = NSCreateMapTable(NSIntegerMapKeyCallBacks, NSNonOwnedPointerMapValueCallBacks, encTableSize);
|
||||
[[NSObject leakAt:&encodingPointerTable] release];
|
||||
encTableSize = sizeof(str_encoding_table) / sizeof(struct _strenc_);
|
||||
encodingPointerTable = NSCreateMapTable(NSIntegerMapKeyCallBacks,
|
||||
NSNonOwnedPointerMapValueCallBacks, encTableSize);
|
||||
RELEASE([NSObject leakAt:&encodingPointerTable]);
|
||||
|
||||
/*
|
||||
* Now set up the pointers at the correct location in the table.
|
||||
|
|
@ -364,13 +365,14 @@ static void GSSetupEncodingTable(void)
|
|||
{
|
||||
struct _strenc_ *entry = &str_encoding_table[i];
|
||||
|
||||
NSMapInsert(encodingPointerTable, (const void *)entry->enc, (const void *)entry);
|
||||
NSMapInsert(encodingPointerTable,
|
||||
(const void *)entry->enc, (const void *)entry);
|
||||
#ifdef HAVE_ICONV
|
||||
if (entry->iconv != 0 && *(entry->iconv) != 0)
|
||||
{
|
||||
iconv_t c;
|
||||
int l;
|
||||
char *lossy;
|
||||
char *lossy;
|
||||
|
||||
/*
|
||||
* See if we can do a lossy conversion.
|
||||
|
|
@ -1394,7 +1396,7 @@ GSToUnicode(unichar **dst, unsigned int *size, const unsigned char *src,
|
|||
table = Next_char_to_uni_table;
|
||||
goto tables;
|
||||
|
||||
case NSISOLatinCyrillicStringEncoding:
|
||||
case NSISOCyrillicStringEncoding:
|
||||
base = Cyrillic_conv_base;
|
||||
table = Cyrillic_char_to_uni_table;
|
||||
goto tables;
|
||||
|
|
@ -1409,7 +1411,7 @@ GSToUnicode(unichar **dst, unsigned int *size, const unsigned char *src,
|
|||
table = Latin9_char_to_uni_table;
|
||||
goto tables;
|
||||
|
||||
case NSISOLatinThaiStringEncoding:
|
||||
case NSISOThaiStringEncoding:
|
||||
base = Thai_conv_base;
|
||||
table = Thai_char_to_uni_table;
|
||||
goto tables;
|
||||
|
|
@ -2416,7 +2418,7 @@ bases:
|
|||
tsize = Next_uni_to_char_table_size;
|
||||
goto tables;
|
||||
|
||||
case NSISOLatinCyrillicStringEncoding:
|
||||
case NSISOCyrillicStringEncoding:
|
||||
base = Cyrillic_conv_base;
|
||||
table = Cyrillic_uni_to_char_table;
|
||||
tsize = Cyrillic_uni_to_char_table_size;
|
||||
|
|
@ -2434,7 +2436,7 @@ bases:
|
|||
tsize = Latin9_uni_to_char_table_size;
|
||||
goto tables;
|
||||
|
||||
case NSISOLatinThaiStringEncoding:
|
||||
case NSISOThaiStringEncoding:
|
||||
base = Thai_conv_base;
|
||||
table = Thai_uni_to_char_table;
|
||||
tsize = Thai_uni_to_char_table_size;
|
||||
|
|
@ -2774,7 +2776,8 @@ GSPrivateAvailableEncodings()
|
|||
pos = 0;
|
||||
for (i = 0; i < encTableSize; i++)
|
||||
{
|
||||
NSStringEncoding encoding = str_encoding_table[i].enc;
|
||||
NSStringEncoding encoding = str_encoding_table[i].enc;
|
||||
|
||||
if (GSPrivateIsEncodingSupported(encoding) == YES)
|
||||
{
|
||||
encodings[pos++] = encoding;
|
||||
|
|
@ -2833,7 +2836,7 @@ GSPrivateCStringEncoding(const char *encoding)
|
|||
/* AIX IRIX OSF/1 Solaris NetBSD */
|
||||
|| strcmp(encoding, "ISO8859-5") == 0
|
||||
|| strcmp(encoding, "iso88595") == 0 /* HP-UX */)
|
||||
enc = NSISOLatinCyrillicStringEncoding;
|
||||
enc = NSISOCyrillicStringEncoding;
|
||||
else if (strcmp(encoding, "KOI8-R") == 0 /* glibc */
|
||||
|| strcmp(encoding, "koi8-r") == 0 /* Solaris */)
|
||||
enc = NSKOI8RStringEncoding;
|
||||
|
|
@ -2846,15 +2849,15 @@ GSPrivateCStringEncoding(const char *encoding)
|
|||
else if (strcmp(encoding, "ISO-8859-6") == 0 /* glibc */
|
||||
|| strcmp(encoding, "ISO8859-6") == 0 /* AIX Solaris */
|
||||
|| strcmp(encoding, "iso88596") == 0 /* HP-UX */)
|
||||
enc = NSISOLatinArabicStringEncoding;
|
||||
enc = NSISOArabicStringEncoding;
|
||||
else if (strcmp(encoding, "ISO-8859-7") == 0 /* glibc */
|
||||
|| strcmp(encoding, "ISO8859-7") == 0 /* AIX IRIX OSF/1 Solaris */
|
||||
|| strcmp(encoding, "iso88597") == 0 /* HP-UX */)
|
||||
enc = NSISOLatinGreekStringEncoding;
|
||||
enc = NSISOGreekStringEncoding;
|
||||
else if (strcmp(encoding, "ISO-8859-8") == 0 /* glibc */
|
||||
|| strcmp(encoding, "ISO8859-8") == 0 /* AIX OSF/1 Solaris */
|
||||
|| strcmp(encoding, "iso88598") == 0 /* HP-UX */)
|
||||
enc = NSISOLatinHebrewStringEncoding;
|
||||
enc = NSISOHebrewStringEncoding;
|
||||
else if (strcmp(encoding, "ISO-8859-9") == 0 /* glibc */
|
||||
|| strcmp(encoding, "ISO8859-9") == 0 /* AIX IRIX OSF/1 Solaris */
|
||||
|| strcmp(encoding, "iso88599") == 0 /* HP-UX */)
|
||||
|
|
@ -2866,7 +2869,7 @@ GSPrivateCStringEncoding(const char *encoding)
|
|||
|| strcmp(encoding, "tis620") == 0 /* HP-UX */
|
||||
|| strcmp(encoding, "TIS620.2533") == 0 /* Solaris */
|
||||
|| strcmp(encoding, "TACTIS") == 0 /* OSF/1 */)
|
||||
enc = NSISOLatinThaiStringEncoding;
|
||||
enc = NSISOThaiStringEncoding;
|
||||
else if (strcmp(encoding, "ISO-8859-13") == 0 /* glibc */
|
||||
|| strcmp(encoding, "ISO8859-13") == 0 /* */
|
||||
|| strcmp(encoding, "IBM-921") == 0 /* AIX */)
|
||||
|
|
|
|||
Loading…
Reference in a new issue