From 1cf3f4c8e26d34de9e338dddeeea56ad3a536132 Mon Sep 17 00:00:00 2001 From: rfm Date: Fri, 3 Nov 2006 15:19:45 +0000 Subject: [PATCH] Add more charset mappings git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24027 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 2 ++ Source/Additions/GSMime.m | 40 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/ChangeLog b/ChangeLog index d8e92378b..a52ae4461 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * Source/NSString.m: ([stringByAddingPercentEscapesUsingEncoding:]) 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 diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m index 522b1872a..2b8998ed2 100644 --- a/Source/Additions/GSMime.m +++ b/Source/Additions/GSMime.m @@ -3644,12 +3644,16 @@ static NSCharacterSet *tokenSet = nil; // All the latin1 mappings from IANA NSMapInsert(charsets, (void*)@"iso-8859-1:1987", (void*)NSISOLatin1StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-1:1987", + (void*)NSISOLatin1StringEncoding); NSMapInsert(charsets, (void*)@"iso-ir-100", (void*)NSISOLatin1StringEncoding); NSMapInsert(charsets, (void*)@"iso_8859-1", (void*)NSISOLatin1StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-1", (void*)NSISOLatin1StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-1", + (void*)NSISOLatin1StringEncoding); NSMapInsert(charsets, (void*)@"latin1", (void*)NSISOLatin1StringEncoding); NSMapInsert(charsets, (void*)@"l1", @@ -3669,30 +3673,56 @@ static NSCharacterSet *tokenSet = nil; NSMapInsert(charsets, (void*)@"iso-8859-2", (void*)NSISOLatin2StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-2", + (void*)NSISOLatin2StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-3", (void*)NSISOLatin3StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-3", + (void*)NSISOLatin3StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-4", (void*)NSISOLatin4StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-4", + (void*)NSISOLatin4StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-5", (void*)NSISOCyrillicStringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-5", + (void*)NSISOCyrillicStringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-6", (void*)NSISOArabicStringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-6", + (void*)NSISOArabicStringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-7", (void*)NSISOGreekStringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-7", + (void*)NSISOGreekStringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-8", (void*)NSISOHebrewStringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-8", + (void*)NSISOHebrewStringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-9", (void*)NSISOLatin5StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-9", + (void*)NSISOLatin5StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-10", (void*)NSISOLatin6StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-10", + (void*)NSISOLatin6StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-11", (void*)NSISOThaiStringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-11", + (void*)NSISOThaiStringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-13", (void*)NSISOLatin7StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-13", + (void*)NSISOLatin7StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-14", (void*)NSISOLatin8StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-14", + (void*)NSISOLatin8StringEncoding); NSMapInsert(charsets, (void*)@"iso-8859-15", (void*)NSISOLatin9StringEncoding); + NSMapInsert(charsets, (void*)@"iso8859-15", + (void*)NSISOLatin9StringEncoding); NSMapInsert(charsets, (void*)@"microsoft-symbol", (void*)NSSymbolStringEncoding); NSMapInsert(charsets, (void*)@"windows-symbol", @@ -3719,8 +3749,14 @@ static NSCharacterSet *tokenSet = nil; (void*)NSWindowsCP1254StringEncoding); NSMapInsert(charsets, (void*)@"iso-10646-ucs-2", (void*)NSUnicodeStringEncoding); + NSMapInsert(charsets, (void*)@"iso10646-ucs-2", + (void*)NSUnicodeStringEncoding); NSMapInsert(charsets, (void*)@"utf-16", (void*)NSUnicodeStringEncoding); + NSMapInsert(charsets, (void*)@"utf16", + (void*)NSUnicodeStringEncoding); + NSMapInsert(charsets, (void*)@"iso-10646-1", + (void*)NSUnicodeStringEncoding); NSMapInsert(charsets, (void*)@"iso10646-1", (void*)NSUnicodeStringEncoding); NSMapInsert(charsets, (void*)@"big5", @@ -3731,8 +3767,12 @@ static NSCharacterSet *tokenSet = nil; (void*)NSShiftJISStringEncoding); NSMapInsert(charsets, (void*)@"utf-7", (void*)NSUTF7StringEncoding); + NSMapInsert(charsets, (void*)@"utf7", + (void*)NSUTF7StringEncoding); NSMapInsert(charsets, (void*)@"utf-8", (void*)NSUTF8StringEncoding); + NSMapInsert(charsets, (void*)@"utf8", + (void*)NSUTF8StringEncoding); NSMapInsert(charsets, (void*)@"apple-roman", (void*)NSMacOSRomanStringEncoding); NSMapInsert(charsets, (void*)@"koi8-r",