gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 15:11:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed creation of fontDictionary from [init] method. This now

Browse source 
gets done on demand in [afmDictionary].


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16559 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2003-04-27 15:44:56 +00:00
parent ab61661a4a
commit d945e6d792
1 changed files with 60 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Source/GSFontInfo.m
View file

@ -189,9 +189,6 @@ static GSFontEnumerator *sharedEnumerator = nil;
- init
{
[super init];
ASSIGN(fontDictionary, [NSMutableDictionary dictionaryWithCapacity:25]);
weight = 0;
traits = 0;
mostCompatibleStringEncoding = NSASCIIStringEncoding;
return self;
@ -242,6 +239,66 @@ static GSFontEnumerator *sharedEnumerator = nil;
- (NSDictionary*) afmDictionary
{
if (fontDictionary == nil)
{
NSString *weightString;
fontDictionary = [[NSMutableDictionary alloc] initWithCapacity: 25];
[fontDictionary setObject: fontName forKey: NSAFMFontName];
if (familyName != nil)
{
[fontDictionary setObject: familyName
forKey: NSAFMFamilyName];
}
if (ascender != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: ascender]
forKey: NSAFMAscender];
}
if (descender != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: descender]
forKey: NSAFMDescender];
}
if (xHeight != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: xHeight]
forKey: NSAFMXHeight];
}
if (capHeight != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: capHeight]
forKey: NSAFMCapHeight];
}
if (italicAngle != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: italicAngle]
forKey: NSAFMItalicAngle];
}
if (underlinePosition != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: underlinePosition]
forKey: NSAFMUnderlinePosition];
}
if (underlineThickness != 0.0)
{
[fontDictionary setObject: [NSNumber numberWithFloat: underlineThickness]
forKey: NSAFMUnderlineThickness];
}
weightString = [GSFontInfo stringForWeight: weight];
if (weightString != nil)
{
[fontDictionary setObject: weightString forKey: NSAFMWeight];
}
if (encodingScheme != nil)
{
[fontDictionary setObject: encodingScheme
forKey: NSAFMEncodingScheme];
}
}
return fontDictionary;
}