Add more charset mappings

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24027 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-11-03 15:19:45 +00:00
parent dced7677cd
commit 1cf3f4c8e2
2 changed files with 42 additions and 0 deletions

View file

@ -2,6 +2,8 @@
* Source/NSString.m: ([stringByAddingPercentEscapesUsingEncoding:]) * Source/NSString.m: ([stringByAddingPercentEscapesUsingEncoding:])
Improved documentation. Improved documentation.
* Source/Additions/GSMime.m: Add more charset mappings for where the
hyphen after the 'iso' has been omitted.
2006-11-02 Richard Frith-Macdonald <rfm@gnu.org> 2006-11-02 Richard Frith-Macdonald <rfm@gnu.org>

View file

@ -3644,12 +3644,16 @@ static NSCharacterSet *tokenSet = nil;
// All the latin1 mappings from IANA // All the latin1 mappings from IANA
NSMapInsert(charsets, (void*)@"iso-8859-1:1987", NSMapInsert(charsets, (void*)@"iso-8859-1:1987",
(void*)NSISOLatin1StringEncoding); (void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-1:1987",
(void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"iso-ir-100", NSMapInsert(charsets, (void*)@"iso-ir-100",
(void*)NSISOLatin1StringEncoding); (void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"iso_8859-1", NSMapInsert(charsets, (void*)@"iso_8859-1",
(void*)NSISOLatin1StringEncoding); (void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-1", NSMapInsert(charsets, (void*)@"iso-8859-1",
(void*)NSISOLatin1StringEncoding); (void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-1",
(void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"latin1", NSMapInsert(charsets, (void*)@"latin1",
(void*)NSISOLatin1StringEncoding); (void*)NSISOLatin1StringEncoding);
NSMapInsert(charsets, (void*)@"l1", NSMapInsert(charsets, (void*)@"l1",
@ -3669,30 +3673,56 @@ static NSCharacterSet *tokenSet = nil;
NSMapInsert(charsets, (void*)@"iso-8859-2", NSMapInsert(charsets, (void*)@"iso-8859-2",
(void*)NSISOLatin2StringEncoding); (void*)NSISOLatin2StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-2",
(void*)NSISOLatin2StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-3", NSMapInsert(charsets, (void*)@"iso-8859-3",
(void*)NSISOLatin3StringEncoding); (void*)NSISOLatin3StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-3",
(void*)NSISOLatin3StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-4", NSMapInsert(charsets, (void*)@"iso-8859-4",
(void*)NSISOLatin4StringEncoding); (void*)NSISOLatin4StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-4",
(void*)NSISOLatin4StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-5", NSMapInsert(charsets, (void*)@"iso-8859-5",
(void*)NSISOCyrillicStringEncoding); (void*)NSISOCyrillicStringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-5",
(void*)NSISOCyrillicStringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-6", NSMapInsert(charsets, (void*)@"iso-8859-6",
(void*)NSISOArabicStringEncoding); (void*)NSISOArabicStringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-6",
(void*)NSISOArabicStringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-7", NSMapInsert(charsets, (void*)@"iso-8859-7",
(void*)NSISOGreekStringEncoding); (void*)NSISOGreekStringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-7",
(void*)NSISOGreekStringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-8", NSMapInsert(charsets, (void*)@"iso-8859-8",
(void*)NSISOHebrewStringEncoding); (void*)NSISOHebrewStringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-8",
(void*)NSISOHebrewStringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-9", NSMapInsert(charsets, (void*)@"iso-8859-9",
(void*)NSISOLatin5StringEncoding); (void*)NSISOLatin5StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-9",
(void*)NSISOLatin5StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-10", NSMapInsert(charsets, (void*)@"iso-8859-10",
(void*)NSISOLatin6StringEncoding); (void*)NSISOLatin6StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-10",
(void*)NSISOLatin6StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-11", NSMapInsert(charsets, (void*)@"iso-8859-11",
(void*)NSISOThaiStringEncoding); (void*)NSISOThaiStringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-11",
(void*)NSISOThaiStringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-13", NSMapInsert(charsets, (void*)@"iso-8859-13",
(void*)NSISOLatin7StringEncoding); (void*)NSISOLatin7StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-13",
(void*)NSISOLatin7StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-14", NSMapInsert(charsets, (void*)@"iso-8859-14",
(void*)NSISOLatin8StringEncoding); (void*)NSISOLatin8StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-14",
(void*)NSISOLatin8StringEncoding);
NSMapInsert(charsets, (void*)@"iso-8859-15", NSMapInsert(charsets, (void*)@"iso-8859-15",
(void*)NSISOLatin9StringEncoding); (void*)NSISOLatin9StringEncoding);
NSMapInsert(charsets, (void*)@"iso8859-15",
(void*)NSISOLatin9StringEncoding);
NSMapInsert(charsets, (void*)@"microsoft-symbol", NSMapInsert(charsets, (void*)@"microsoft-symbol",
(void*)NSSymbolStringEncoding); (void*)NSSymbolStringEncoding);
NSMapInsert(charsets, (void*)@"windows-symbol", NSMapInsert(charsets, (void*)@"windows-symbol",
@ -3719,8 +3749,14 @@ static NSCharacterSet *tokenSet = nil;
(void*)NSWindowsCP1254StringEncoding); (void*)NSWindowsCP1254StringEncoding);
NSMapInsert(charsets, (void*)@"iso-10646-ucs-2", NSMapInsert(charsets, (void*)@"iso-10646-ucs-2",
(void*)NSUnicodeStringEncoding); (void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"iso10646-ucs-2",
(void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"utf-16", NSMapInsert(charsets, (void*)@"utf-16",
(void*)NSUnicodeStringEncoding); (void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"utf16",
(void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"iso-10646-1",
(void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"iso10646-1", NSMapInsert(charsets, (void*)@"iso10646-1",
(void*)NSUnicodeStringEncoding); (void*)NSUnicodeStringEncoding);
NSMapInsert(charsets, (void*)@"big5", NSMapInsert(charsets, (void*)@"big5",
@ -3731,8 +3767,12 @@ static NSCharacterSet *tokenSet = nil;
(void*)NSShiftJISStringEncoding); (void*)NSShiftJISStringEncoding);
NSMapInsert(charsets, (void*)@"utf-7", NSMapInsert(charsets, (void*)@"utf-7",
(void*)NSUTF7StringEncoding); (void*)NSUTF7StringEncoding);
NSMapInsert(charsets, (void*)@"utf7",
(void*)NSUTF7StringEncoding);
NSMapInsert(charsets, (void*)@"utf-8", NSMapInsert(charsets, (void*)@"utf-8",
(void*)NSUTF8StringEncoding); (void*)NSUTF8StringEncoding);
NSMapInsert(charsets, (void*)@"utf8",
(void*)NSUTF8StringEncoding);
NSMapInsert(charsets, (void*)@"apple-roman", NSMapInsert(charsets, (void*)@"apple-roman",
(void*)NSMacOSRomanStringEncoding); (void*)NSMacOSRomanStringEncoding);
NSMapInsert(charsets, (void*)@"koi8-r", NSMapInsert(charsets, (void*)@"koi8-r",