From 784477598cf70a6907b5168c36daecc72f80cd62 Mon Sep 17 00:00:00 2001 From: FredKiefer Date: Tue, 12 Sep 2000 23:15:51 +0000 Subject: [PATCH] [encodingForRegistry:encoding:] added more encodings git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@7491 72102866-910b-0410-8b05-ffd578937521 --- Source/GSFontInfo.m | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/Source/GSFontInfo.m b/Source/GSFontInfo.m index f00fdf825..b5c60b545 100644 --- a/Source/GSFontInfo.m +++ b/Source/GSFontInfo.m @@ -240,10 +240,18 @@ static GSFontEnumerator *sharedEnumerator = nil; return NSISOLatin1StringEncoding; else if ([encoding isEqualToString: @"2"]) return NSISOLatin2StringEncoding; + else if ([encoding isEqualToString: @"3"]) + return NSISOLatin3StringEncoding; + else if ([encoding isEqualToString: @"4"]) + return NSISOLatin4StringEncoding; else if ([encoding isEqualToString: @"5"]) - return NSWindowsCP1251StringEncoding; + return NSCyrillicStringEncoding; + else if ([encoding isEqualToString: @"6"]) + return NSArabicStringEncoding; else if ([encoding isEqualToString: @"7"]) - return NSWindowsCP1253StringEncoding; + return NSGreekStringEncoding; + else if ([encoding isEqualToString: @"8"]) + return NSHebrewStringEncoding; // Other latin encodings are currently not supported } else if ([registry isEqualToString: @"iso10646"]) @@ -271,6 +279,26 @@ static GSFontEnumerator *sharedEnumerator = nil; if ([encoding isEqualToString: @"roman"]) return NSMacOSRomanStringEncoding; } + else if ([registry isEqualToString: @"jisx0201.1976"]) + { + if ([encoding isEqualToString: @"0"]) + return NSShiftJISStringEncoding; + } + else if ([registry isEqualToString: @"iso646.1991"]) + { + if ([encoding isEqualToString: @"irv"]) + return NSASCIIStringEncoding; + } + else if ([registry isEqualToString: @"koi8"]) + { + if ([encoding isEqualToString: @"r"]) + return NSKOI8RStringEncoding; + } + else if ([registry isEqualToString: @"gb2312.1980"]) + { + if ([encoding isEqualToString: @"0"]) + return NSGB2312StringEncoding; + } return NSASCIIStringEncoding; }