gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add .font package handling again.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14599 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2002-09-28 20:04:55 +00:00
parent d17bd4b4d5
commit 519c1ee986
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2002-09-28 22:04 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ftfont.m: Add .font package handling again.
2002-09-28 17:30 Alexander Malmberg <alexander@malmberg.org> 2002-09-28 17:30 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ftfont.m (load_font_configuration): Handle the * Source/art/ftfont.m (load_font_configuration): Handle the

20
Source/art/ftfont.m
View file

@ -243,6 +243,7 @@ static NSArray *fix_path(NSString *path, NSArray *files)
return nfiles; return nfiles;
} }
/* TODO: handling of .font packages needs to be reworked */
static void add_face(NSString *family, int family_weight, static void add_face(NSString *family, int family_weight,
unsigned int family_traits, NSDictionary *d, NSString *path, unsigned int family_traits, NSDictionary *d, NSString *path,
BOOL from_nfont) BOOL from_nfont)
@ -255,12 +256,6 @@ static void add_face(NSString *family, int family_weight,
NSString *faceName, *rawFaceName; NSString *faceName, *rawFaceName;
if (!from_nfont)
{
NSLog(@".font not back in yet");
return;
}
fontName = [d objectForKey: @"PostScriptName"]; fontName = [d objectForKey: @"PostScriptName"];
if (!fontName) if (!fontName)
{ {
@ -308,6 +303,16 @@ static void add_face(NSString *family, int family_weight,
[NSBundle bundleForClass: fi->isa],nil) copy]; [NSBundle bundleForClass: fi->isa],nil) copy];
fi->faceName = faceName; fi->faceName = faceName;
} }
else if (!from_nfont)
{ /* try to guess something for .font packages */
int dummy;
int split = traits_from_string(family,&dummy,&dummy);
rawFaceName = faceName = [family substringFromIndex: split];
family = [family substringToIndex: split];
faceName = [NSLocalizedStringFromTableInBundle(faceName,nil,
[NSBundle bundleForClass: fi->isa],nil) copy];
fi->faceName = faceName;
}
else else
{ {
NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path); NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path);
@ -496,7 +501,8 @@ static void load_font_configuration(void)
family, family,
[family stringByAppendingPathExtension: @"afm"], [family stringByAppendingPathExtension: @"afm"],
nil], nil],
@"Files", /* TODO */ @"Files",
family,@"PostScriptName",
nil]; nil];
add_face(family, 5, 0, d, font_path, NO); add_face(family, 5, 0, d, font_path, NO);
} }