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

Extracted code shared between the two ftfont files into new files.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@25409 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2007-08-22 11:54:13 +00:00
parent 045104c0c1
commit 278a67d682
8 changed files with 667 additions and 1040 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2007-08-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/art/ftfont.m,
* Source/art/ftfont-old.m: Extracted code shared between these two
files into new files.
* Source/art/FTFaceInfo.h,
* Source/art/FTFaceInfo.m,
* Source/art/FTFontEnumerator.h,
* Source/art/FTFontEnumerator.m: New files with extracted code.
* Source/art/GNUmakefile: Add new source files.
2007-08-21 Fred Kiefer <FredKiefer@gmx.de> 2007-08-21 Fred Kiefer <FredKiefer@gmx.de>
* Source/x11/XGServerWindow.m (-_setupRootWindow): Revert last * Source/x11/XGServerWindow.m (-_setupRootWindow): Revert last

64
Source/art/FTFaceInfo.h Normal file
View file

@ -0,0 +1,64 @@
/*
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Author: Alexander Malmberg <alexander@malmberg.org>
This file is part of GNUstep.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef FTFaceInfo_h
#define FTFaceInfo_h
#include <Foundation/NSObject.h>
@class NSString;
@class NSArray;
@interface FTFaceInfo : NSObject
{
@public
NSString *familyName;
/* the following two are localized */
NSString *faceName;
NSString *displayName;
NSArray *files;
struct
{
int pixel_size;
NSArray *files;
} *sizes;
int num_sizes;
int weight;
unsigned int traits;
/*
hinting hints
0: 1 to use the auto-hinter
1: 1 to use hinting
byte 0 and 1 contain hinting hints for un-antialiased and antialiased
rendering, respectively.
16: 0=un-antialiased by default, 1=antialiased by default
*/
unsigned int render_hints_hack;
}
@end
#endif

42
Source/art/FTFaceInfo.m Normal file
View file

@ -0,0 +1,42 @@
/*
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Author: Alexander Malmberg <alexander@malmberg.org>
This file is part of GNUstep.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <Foundation/NSString.h>
#include "FTFaceInfo.h"
@implementation FTFaceInfo
- (NSString *) description
{
return [NSString stringWithFormat: @"<FTFaceInfo %p: '%@' %@ %i %i>",
self, displayName, files, weight, traits];
}
/* FTFaceInfo:s should never be deallocated */
- (void) dealloc
{
NSLog(@"Warning: -dealloc called on %@",self);
GSNOSUPERDEALLOC;
}
@end

35
Source/art/FTFontEnumerator.h Normal file
View file

@ -0,0 +1,35 @@
/*
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Author: Alexander Malmberg <alexander@malmberg.org>
This file is part of GNUstep.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef FTFontEnumerator_h
#define FTFontEnumerator_h
#include <GNUstepGUI/GSFontInfo.h>
@class FTFaceInfo;
@interface FTFontEnumerator : GSFontEnumerator
+ (FTFaceInfo *) fontWithName: (NSString *)name;
@end
#endif

507
Source/art/FTFontEnumerator.m Normal file
View file

@ -0,0 +1,507 @@
/*
Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Author: Alexander Malmberg <alexander@malmberg.org>
This file is part of GNUstep.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <Foundation/NSArray.h>
#include <Foundation/NSBundle.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSDictionary.h>
#include <Foundation/NSFileManager.h>
#include <Foundation/NSObject.h>
#include <Foundation/NSPathUtilities.h>
#include <Foundation/NSSet.h>
#include <Foundation/NSUserDefaults.h>
#include <Foundation/NSValue.h>
#include "FTFontEnumerator.h"
#include "FTFaceInfo.h"
#if 0
/*
This is a list of "standard" face names. It is here so make_strings can pick
it up and generate .strings files with them.
*/
NSLocalizedStringFromTable(@"Book", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Regular", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Roman", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Medium", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demi", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demibold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Heavy", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Oblique", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Oblique", @"nfontFaceNames", @"")
#endif
static NSMutableArray *fcfg_allFontNames;
static NSMutableDictionary *fcfg_allFontFamilies;
static NSMutableDictionary *fcfg_all_fonts;
static NSMutableSet *families_seen, *families_pending;
static BOOL anti_alias_by_default;
static int traits_from_string(NSString *s, unsigned int *traits, unsigned int *weight)
{
static struct
{
NSString *str;
unsigned int trait;
int weight;
} suffix[] = {
/* TODO */
{@"Normal" ,0 ,-1},
{@"Ultralight" ,0 , 1},
{@"Thin" ,0 , 2},
{@"Light" ,0 , 3},
{@"Extralight" ,0 , 3},
{@"Book" ,0 , 4},
{@"Regular" ,0 , 5},
{@"Plain" ,0 , 5},
{@"Display" ,0 , 5},
{@"Roman" ,0 , 5},
{@"Semilight" ,0 , 5},
{@"Medium" ,0 , 6},
{@"Demi" ,0 , 7},
{@"Demibold" ,0 , 7},
{@"Semi" ,0 , 8},
{@"Semibold" ,0 , 8},
{@"Bold" ,NSBoldFontMask , 9},
{@"Extra" ,NSBoldFontMask ,10},
{@"Extrabold" ,NSBoldFontMask ,10},
{@"Heavy" ,NSBoldFontMask ,11},
{@"Heavyface" ,NSBoldFontMask ,11},
{@"Ultrabold" ,NSBoldFontMask ,12},
{@"Black" ,NSBoldFontMask ,12},
{@"Ultra" ,NSBoldFontMask ,13},
{@"Ultrablack" ,NSBoldFontMask ,13},
{@"Fat" ,NSBoldFontMask ,13},
{@"Extrablack" ,NSBoldFontMask ,14},
{@"Obese" ,NSBoldFontMask ,14},
{@"Nord" ,NSBoldFontMask ,14},
{@"Italic" ,NSItalicFontMask ,-1},
{@"Oblique" ,NSItalicFontMask ,-1},
{@"Cond" ,NSCondensedFontMask ,-1},
{@"Condensed" ,NSCondensedFontMask ,-1},
{nil,0,-1}
};
int i;
*traits = 0;
// printf("do '%@'\n", s);
while ([s length] > 0)
{
// printf(" got '%@'\n", s);
if ([s hasSuffix: @"-"] || [s hasSuffix: @" "])
{
// printf(" do -\n");
s = [s substringToIndex: [s length] - 1];
continue;
}
for (i = 0; suffix[i].str; i++)
{
if (![s hasSuffix: suffix[i].str])
continue;
// printf(" found '%@'\n", suffix[i].str);
if (suffix[i].weight != -1)
*weight = suffix[i].weight;
(*traits) |= suffix[i].trait;
s = [s substringToIndex: [s length] - [suffix[i].str length]];
break;
}
if (!suffix[i].str)
break;
}
// printf("end up with '%@'\n", s);
return [s length];
}
static NSArray *fix_path(NSString *path, NSArray *files)
{
int i, c = [files count];
NSMutableArray *nfiles;
if (!files)
return nil;
nfiles = [[NSMutableArray alloc] init];
for (i = 0; i < c; i++)
{
if ([[files objectAtIndex: i] isAbsolutePath])
[nfiles addObject: [files objectAtIndex: i]];
else
[nfiles addObject: [path stringByAppendingPathComponent:
[files objectAtIndex: i]]];
}
return nfiles;
}
/* TODO: handling of .font packages needs to be reworked */
static void add_face(NSString *family, int family_weight,
unsigned int family_traits, NSDictionary *d, NSString *path,
BOOL from_nfont)
{
FTFaceInfo *fi;
unsigned int weight;
unsigned int traits;
NSString *fontName;
NSString *faceName, *rawFaceName;
fontName = [d objectForKey: @"PostScriptName"];
if (!fontName)
{
NSLog(@"Warning: Face in %@ has no PostScriptName!",path);
return;
}
if ([fcfg_allFontNames containsObject: fontName])
return;
fi = [[FTFaceInfo alloc] init];
fi->familyName = [family copy];
if ([d objectForKey: @"LocalizedNames"])
{
NSDictionary *l;
NSArray *lang;
int i;
l = [d objectForKey: @"LocalizedNames"];
lang = [NSUserDefaults userLanguages];
faceName = nil;
rawFaceName = [l objectForKey: @"English"];
for (i = 0; i < [lang count] && !faceName; i++)
{
faceName = [l objectForKey: [lang objectAtIndex: i]];
}
if (!faceName)
faceName = rawFaceName;
if (!faceName)
{
faceName = @"<unknown face>";
NSLog(@"Warning: couldn't find localized face name or fallback for %@",
fontName);
}
}
else if ((faceName = [d objectForKey: @"Name"]))
{
rawFaceName = faceName;
/* TODO: Smarter localization? Parse space separated parts and
translate individually? */
/* TODO: Need to define the strings somewhere, and make sure the
strings files get created. */
faceName = [NSLocalizedStringFromTableInBundle(faceName,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
fi->faceName = faceName;
}
else if (!from_nfont)
{ /* try to guess something for .font packages */
unsigned int dummy;
int split = traits_from_string(family,&dummy,&dummy);
rawFaceName = faceName = [family substringFromIndex: split];
family = [family substringToIndex: split];
faceName = [NSLocalizedStringFromTableInBundle(faceName,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
fi->faceName = faceName;
}
else
{
NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path);
return;
}
fi->displayName = [[family stringByAppendingString: @" "]
stringByAppendingString: faceName];
weight = family_weight;
if (rawFaceName)
traits_from_string(rawFaceName, &traits, &weight);
{
NSDictionary *sizes;
NSEnumerator *e;
NSString *size;
int i;
sizes = [d objectForKey: @"ScreenFonts"];
fi->num_sizes = [sizes count];
if (fi->num_sizes)
{
fi->sizes = malloc(sizeof(fi->sizes[0])*[sizes count]);
e = [sizes keyEnumerator];
i = 0;
while ((size = [e nextObject]))
{
fi->sizes[i].pixel_size = [size intValue];
fi->sizes[i].files = fix_path(path,[sizes objectForKey: size]);
NSDebugLLog(@"ftfont",@"%@ size %i files |%@|",
fontName,fi->sizes[i].pixel_size,fi->sizes[i].files);
i++;
}
}
}
fi->files = fix_path(path,[d objectForKey: @"Files"]);
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
fi->weight = weight;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
traits |= family_traits;
fi->traits = traits;
if ([d objectForKey: @"RenderHints_hack"])
fi->render_hints_hack
= strtol([[d objectForKey: @"RenderHints_hack"] cString], NULL, 0);
else
{
if (anti_alias_by_default)
fi->render_hints_hack = 0x10202;
else
fi->render_hints_hack = 0x00202;
}
NSDebugLLog(@"ftfont", @"adding '%@' '%@'", fontName, fi);
[fcfg_all_fonts setObject: fi forKey: fontName];
[fcfg_allFontNames addObject: fontName];
{
NSArray *a;
NSMutableArray *ma;
a = [NSArray arrayWithObjects:
fontName,
faceName,
[NSNumber numberWithInt: weight],
[NSNumber numberWithUnsignedInt: traits],
nil];
ma = [fcfg_allFontFamilies objectForKey: family];
if (!ma)
{
ma = [[NSMutableArray alloc] init];
[fcfg_allFontFamilies setObject: ma forKey: family];
[ma release];
}
[ma addObject: a];
}
DESTROY(fi);
}
static void load_font_configuration(void)
{
int i, j, k, c;
NSArray *paths;
NSString *path, *font_path;
NSFileManager *fm = [NSFileManager defaultManager];
NSArray *files;
NSDictionary *d;
NSArray *faces;
NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
if ([ud objectForKey: @"GSFontAntiAlias"])
anti_alias_by_default = [ud boolForKey: @"GSFontAntiAlias"];
else
anti_alias_by_default = YES;
fcfg_all_fonts = [[NSMutableDictionary alloc] init];
fcfg_allFontFamilies = [[NSMutableDictionary alloc] init];
fcfg_allFontNames = [[NSMutableArray alloc] init];
families_seen = [[NSMutableSet alloc] init];
families_pending = [[NSMutableSet alloc] init];
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES);
for (i = 0; i < [paths count]; i++)
{
path = [paths objectAtIndex: i];
path = [path stringByAppendingPathComponent: @"Fonts"];
files = [fm directoryContentsAtPath: path];
c = [files count];
for (j = 0; j < c; j++)
{
NSString *family;
NSDictionary *face_info;
NSString *font_info_path;
int weight;
unsigned int traits;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"nfont"])
continue;
family = [font_path stringByDeletingPathExtension];
if ([families_seen member: family])
{
NSDebugLLog(@"ftfont", @"'%@' already seen, skipping", family);
continue;
}
[families_seen addObject: family];
font_path = [path stringByAppendingPathComponent: font_path];
NSDebugLLog(@"ftfont",@"loading %@",font_path);
font_info_path = [font_path stringByAppendingPathComponent: @"FontInfo.plist"];
if (![fm fileExistsAtPath: font_info_path])
continue;
d = [NSDictionary dictionaryWithContentsOfFile: font_info_path];
if (!d)
continue;
if ([d objectForKey: @"Family"])
family = [d objectForKey: @"Family"];
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
else
weight = 5;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
else
traits = 0;
faces = [d objectForKey: @"Faces"];
if (![faces isKindOfClass: [NSArray class]])
{
NSLog(@"Warning: %@ isn't a valid .nfont package, ignoring.",
font_path);
if ([faces isKindOfClass: [NSDictionary class]])
NSLog(@"(it looks like an old-style .nfont package)");
continue;
}
for (k = 0; k < [faces count]; k++)
{
face_info = [faces objectAtIndex: k];
add_face(family, weight, traits, face_info, font_path, YES);
}
}
for (j = 0; j < c; j++)
{
NSString *family;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"font"])
continue;
family = [font_path stringByDeletingPathExtension];
font_path = [path stringByAppendingPathComponent: font_path];
d = [NSDictionary dictionaryWithObjectsAndKeys:
[NSArray arrayWithObjects:
family,
[family stringByAppendingPathExtension: @"afm"],
nil],
@"Files",
family,@"PostScriptName",
nil];
add_face(family, 5, 0, d, font_path, NO);
}
[families_seen unionSet: families_pending];
[families_pending removeAllObjects];
}
NSDebugLLog(@"ftfont", @"got %i fonts in %i families",
[fcfg_allFontNames count], [fcfg_allFontFamilies count]);
if (![fcfg_allFontNames count])
{
NSLog(@"No fonts found!");
exit(1);
}
DESTROY(families_seen);
DESTROY(families_pending);
}
@implementation FTFontEnumerator
+ (FTFaceInfo *) fontWithName: (NSString *)name
{
FTFaceInfo *face;
face = [fcfg_all_fonts objectForKey: name];
if (!face)
{
NSLog (@"Font not found %@", name);
}
return face;
}
- (void) enumerateFontsAndFamilies
{
load_font_configuration();
ASSIGN(allFontNames, fcfg_allFontNames);
ASSIGN(allFontFamilies, fcfg_allFontFamilies);
}
- (NSString *) defaultSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Roman"])
return @"BitstreamVeraSans-Roman";
if ([fcfg_allFontNames containsObject: @"FreeSans"])
return @"FreeSans";
return @"Helvetica";
}
- (NSString *) defaultBoldSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Bold"])
return @"BitstreamVeraSans-Bold";
if ([fcfg_allFontNames containsObject: @"FreeSansBold"])
return @"FreeSansBold";
return @"Helvetica-Bold";
}
- (NSString *) defaultFixedPitchFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSansMono-Roman"])
return @"BitstreamVeraSansMono-Roman";
if ([fcfg_allFontNames containsObject: @"FreeMono"])
return @"FreeMono";
return @"Courier";
}
@end

2
Source/art/GNUmakefile
View file

@ -38,6 +38,8 @@ art_OBJC_FILES = \
ARTGState.m \ ARTGState.m \
blit-main.m \ blit-main.m \
ftfont.m \ ftfont.m \
FTFontEnumerator.m \
FTFaceInfo.m \
image.m \ image.m \
composite.m \ composite.m \
path.m \ path.m \

523
Source/art/ftfont-old.m
View file

@ -40,6 +40,8 @@
#include "gsc/GSGState.h" #include "gsc/GSGState.h"
#include "ftfont.h" #include "ftfont.h"
#include "FTFontEnumerator.h"
#include "FTFaceInfo.h"
#include "blit.h" #include "blit.h"
@ -73,12 +75,6 @@ from the back-art-subpixel-text defaults key
*/ */
static int subpixel_text; static int subpixel_text;
static BOOL anti_alias_by_default;
@class FTFaceInfo;
#define CACHE_SIZE 257 #define CACHE_SIZE 257
@interface FTFontInfo : GSFontInfo <FTFontInfo> @interface FTFontInfo : GSFontInfo <FTFontInfo>
@ -121,512 +117,6 @@ static BOOL anti_alias_by_default;
@end @end
static NSMutableArray *fcfg_allFontNames;
static NSMutableDictionary *fcfg_allFontFamilies;
static NSMutableDictionary *fcfg_all_fonts;
static NSMutableSet *families_seen, *families_pending;
@interface FTFaceInfo : NSObject
{
@public
NSString *familyName;
/* the following two are localized */
NSString *faceName;
NSString *displayName;
NSArray *files;
struct
{
int pixel_size;
NSArray *files;
} *sizes;
int num_sizes;
int weight;
unsigned int traits;
/*
hinting hints
0: 1 to use the auto-hinter
1: 1 to use hinting
byte 0 and 1 contain hinting hints for un-antialiased and antialiased
rendering, respectively.
16: 0=un-antialiased by default, 1=antialiased by default
*/
unsigned int render_hints_hack;
}
@end
@implementation FTFaceInfo
-(NSString *) description
{
return [NSString stringWithFormat: @"<FTFaceInfo %p: '%@' %@ %i %i>",
self, displayName, files, weight, traits];
}
/* FTFaceInfo:s should never be deallocated */
-(void) dealloc
{
NSLog(@"Warning: -dealloc called on %@",self);
}
@end
#if 0
/*
This is a list of "standard" face names. It is here so make_strings can pick
it up and generate .strings files with them.
*/
NSLocalizedStringFromTable(@"Book", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Regular", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Roman", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Medium", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demi", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demibold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Heavy", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Oblique", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Oblique", @"nfontFaceNames", @"")
#endif
static int traits_from_string(NSString *s, unsigned int *traits, unsigned int *weight)
{
static struct
{
NSString *str;
unsigned int trait;
int weight;
} suffix[] = {
/* TODO */
{@"Normal" ,0 ,-1},
{@"Ultralight" ,0 , 1},
{@"Thin" ,0 , 2},
{@"Light" ,0 , 3},
{@"Extralight" ,0 , 3},
{@"Book" ,0 , 4},
{@"Regular" ,0 , 5},
{@"Plain" ,0 , 5},
{@"Display" ,0 , 5},
{@"Roman" ,0 , 5},
{@"Semilight" ,0 , 5},
{@"Medium" ,0 , 6},
{@"Demi" ,0 , 7},
{@"Demibold" ,0 , 7},
{@"Semi" ,0 , 8},
{@"Semibold" ,0 , 8},
{@"Bold" ,NSBoldFontMask , 9},
{@"Extra" ,NSBoldFontMask ,10},
{@"Extrabold" ,NSBoldFontMask ,10},
{@"Heavy" ,NSBoldFontMask ,11},
{@"Heavyface" ,NSBoldFontMask ,11},
{@"Ultrabold" ,NSBoldFontMask ,12},
{@"Black" ,NSBoldFontMask ,12},
{@"Ultra" ,NSBoldFontMask ,13},
{@"Ultrablack" ,NSBoldFontMask ,13},
{@"Fat" ,NSBoldFontMask ,13},
{@"Extrablack" ,NSBoldFontMask ,14},
{@"Obese" ,NSBoldFontMask ,14},
{@"Nord" ,NSBoldFontMask ,14},
{@"Italic" ,NSItalicFontMask ,-1},
{@"Oblique" ,NSItalicFontMask ,-1},
{@"Cond" ,NSCondensedFontMask ,-1},
{@"Condensed" ,NSCondensedFontMask ,-1},
{nil,0,-1}
};
int i;
*traits = 0;
// printf("do '%@'\n", s);
while ([s length] > 0)
{
// printf(" got '%@'\n", s);
if ([s hasSuffix: @"-"] || [s hasSuffix: @" "])
{
// printf(" do -\n");
s = [s substringToIndex: [s length] - 1];
continue;
}
for (i = 0; suffix[i].str; i++)
{
if (![s hasSuffix: suffix[i].str])
continue;
// printf(" found '%@'\n", suffix[i].str);
if (suffix[i].weight != -1)
*weight = suffix[i].weight;
(*traits) |= suffix[i].trait;
s = [s substringToIndex: [s length] - [suffix[i].str length]];
break;
}
if (!suffix[i].str)
break;
}
// printf("end up with '%@'\n", s);
return [s length];
}
static NSArray *fix_path(NSString *path, NSArray *files)
{
int i, c = [files count];
NSMutableArray *nfiles;
if (!files)
return nil;
nfiles = [[NSMutableArray alloc] init];
for (i = 0; i < c; i++)
{
if ([[files objectAtIndex: i] isAbsolutePath])
[nfiles addObject: [files objectAtIndex: i]];
else
[nfiles addObject: [path stringByAppendingPathComponent:
[files objectAtIndex: i]]];
}
return nfiles;
}
/* TODO: handling of .font packages needs to be reworked */
static void add_face(NSString *family, int family_weight,
unsigned int family_traits, NSDictionary *d, NSString *path,
BOOL from_nfont)
{
FTFaceInfo *fi;
int weight;
unsigned int traits;
NSString *fontName;
NSString *faceName, *rawFaceName;
fontName = [d objectForKey: @"PostScriptName"];
if (!fontName)
{
NSLog(@"Warning: Face in %@ has no PostScriptName!",path);
return;
}
if ([fcfg_allFontNames containsObject: fontName])
return;
fi = [[FTFaceInfo alloc] init];
fi->familyName = [family copy];
if ([d objectForKey: @"LocalizedNames"])
{
NSDictionary *l;
NSArray *lang;
int i;
l = [d objectForKey: @"LocalizedNames"];
lang = [NSUserDefaults userLanguages];
faceName = nil;
rawFaceName = [l objectForKey: @"English"];
for (i = 0; i < [lang count] && !faceName; i++)
{
faceName = [l objectForKey: [lang objectAtIndex: i]];
}
if (!faceName)
faceName = rawFaceName;
if (!faceName)
{
faceName = @"<unknown face>";
NSLog(@"Warning: couldn't find localized face name or fallback for %@",
fontName);
}
}
else if ((faceName = [d objectForKey: @"Name"]))
{
rawFaceName = faceName;
/* TODO: Smarter localization? Parse space separated parts and
translate individually? */
/* TODO: Need to define the strings somewhere, and make sure the
strings files get created. */
faceName = [NSLocalizedStringFromTableInBundle(faceName,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
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,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
fi->faceName = faceName;
}
else
{
NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path);
return;
}
fi->displayName = [[family stringByAppendingString: @" "]
stringByAppendingString: faceName];
weight = family_weight;
if (rawFaceName)
traits_from_string(rawFaceName, &traits, &weight);
{
NSDictionary *sizes;
NSEnumerator *e;
NSString *size;
int i;
sizes = [d objectForKey: @"ScreenFonts"];
fi->num_sizes = [sizes count];
if (fi->num_sizes)
{
fi->sizes = malloc(sizeof(fi->sizes[0])*[sizes count]);
e = [sizes keyEnumerator];
i = 0;
while ((size = [e nextObject]))
{
fi->sizes[i].pixel_size = [size intValue];
fi->sizes[i].files = fix_path(path,[sizes objectForKey: size]);
NSDebugLLog(@"ftfont",@"%@ size %i files |%@|\n",
fontName,fi->sizes[i].pixel_size,fi->sizes[i].files);
i++;
}
}
}
fi->files = fix_path(path,[d objectForKey: @"Files"]);
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
fi->weight = weight;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
traits |= family_traits;
fi->traits = traits;
if ([d objectForKey: @"RenderHints_hack"])
fi->render_hints_hack=strtol([[d objectForKey: @"RenderHints_hack"] cString],NULL,0);
else
{
if (anti_alias_by_default)
fi->render_hints_hack=0x10202;
else
fi->render_hints_hack=0x00202;
}
NSDebugLLog(@"ftfont", @"adding '%@' '%@'", fontName, fi);
[fcfg_all_fonts setObject: fi forKey: fontName];
[fcfg_allFontNames addObject: fontName];
{
NSArray *a;
NSMutableArray *ma;
a = [NSArray arrayWithObjects:
fontName,
faceName,
[NSNumber numberWithInt: weight],
[NSNumber numberWithUnsignedInt: traits],
nil];
ma = [fcfg_allFontFamilies objectForKey: family];
if (!ma)
{
ma = [[NSMutableArray alloc] init];
[fcfg_allFontFamilies setObject: ma forKey: family];
[ma release];
}
[ma addObject: a];
}
DESTROY(fi);
}
static void load_font_configuration(void)
{
int i, j, k, c;
NSArray *paths;
NSString *path, *font_path;
NSFileManager *fm = [NSFileManager defaultManager];
NSArray *files;
NSDictionary *d;
NSArray *faces;
fcfg_all_fonts = [[NSMutableDictionary alloc] init];
fcfg_allFontFamilies = [[NSMutableDictionary alloc] init];
fcfg_allFontNames = [[NSMutableArray alloc] init];
families_seen = [[NSMutableSet alloc] init];
families_pending = [[NSMutableSet alloc] init];
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES);
for (i = 0; i < [paths count]; i++)
{
path = [paths objectAtIndex: i];
path = [path stringByAppendingPathComponent: @"Fonts"];
files = [fm directoryContentsAtPath: path];
c = [files count];
for (j = 0; j < c; j++)
{
NSString *family;
NSDictionary *face_info;
NSString *font_info_path;
int weight;
unsigned int traits;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"nfont"])
continue;
family = [font_path stringByDeletingPathExtension];
if ([families_seen member: family])
{
NSDebugLLog(@"ftfont", @"'%@' already seen, skipping", family);
continue;
}
[families_seen addObject: family];
font_path = [path stringByAppendingPathComponent: font_path];
NSDebugLLog(@"ftfont",@"loading %@",font_path);
font_info_path = [font_path stringByAppendingPathComponent: @"FontInfo.plist"];
if (![fm fileExistsAtPath: font_info_path])
continue;
d = [NSDictionary dictionaryWithContentsOfFile: font_info_path];
if (!d)
continue;
if ([d objectForKey: @"Family"])
family = [d objectForKey: @"Family"];
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
else
weight = 5;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
else
traits = 0;
faces = [d objectForKey: @"Faces"];
if (![faces isKindOfClass: [NSArray class]])
{
NSLog(@"Warning: %@ isn't a valid .nfont package, ignoring.",
font_path);
if ([faces isKindOfClass: [NSDictionary class]])
NSLog(@"(it looks like an old-style .nfont package)");
continue;
}
for (k = 0; k < [faces count]; k++)
{
face_info = [faces objectAtIndex: k];
add_face(family, weight, traits, face_info, font_path, YES);
}
}
for (j = 0; j < c; j++)
{
NSString *family;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"font"])
continue;
family = [font_path stringByDeletingPathExtension];
font_path = [path stringByAppendingPathComponent: font_path];
d = [NSDictionary dictionaryWithObjectsAndKeys:
[NSArray arrayWithObjects:
family,
[family stringByAppendingPathExtension: @"afm"],
nil],
@"Files",
family,@"PostScriptName",
nil];
add_face(family, 5, 0, d, font_path, NO);
}
[families_seen unionSet: families_pending];
[families_pending removeAllObjects];
}
NSDebugLLog(@"ftfont", @"got %i fonts in %i families",
[fcfg_allFontNames count], [fcfg_allFontFamilies count]);
if (![fcfg_allFontNames count])
{
NSLog(@"No fonts found!");
exit(1);
}
DESTROY(families_seen);
DESTROY(families_pending);
}
@interface FTFontEnumerator : GSFontEnumerator
@end
@implementation FTFontEnumerator
-(void) enumerateFontsAndFamilies
{
ASSIGN(allFontNames, fcfg_allFontNames);
ASSIGN(allFontFamilies, fcfg_allFontFamilies);
}
-(NSString *) defaultSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Roman"])
return @"BitstreamVeraSans-Roman";
if ([fcfg_allFontNames containsObject: @"FreeSans"])
return @"FreeSans";
return @"Helvetica";
}
-(NSString *) defaultBoldSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Bold"])
return @"BitstreamVeraSans-Bold";
if ([fcfg_allFontNames containsObject: @"FreeSansBold"])
return @"FreeSansBold";
return @"Helvetica-Bold";
}
-(NSString *) defaultFixedPitchFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSansMono-Roman"])
return @"BitstreamVeraSansMono-Roman";
if ([fcfg_allFontNames containsObject: @"FreeMono"])
return @"FreeMono";
return @"Courier";
}
@end
static FT_Library ft_library; static FT_Library ft_library;
static FTC_Manager ftc_manager; static FTC_Manager ftc_manager;
static FTC_ImageCache ftc_imagecache; static FTC_ImageCache ftc_imagecache;
@ -692,7 +182,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
fmatrix[3], fmatrix[4], fmatrix[5], fmatrix[3], fmatrix[4], fmatrix[5],
p_screenFont); p_screenFont);
font_entry = [fcfg_all_fonts objectForKey: name]; font_entry = [FTFontEnumerator fontWithName: name];
if (!font_entry) if (!font_entry)
{ {
[self release]; [self release];
@ -2830,11 +2320,6 @@ static int filters[3][7]=
subpixel_text = [ud integerForKey: @"back-art-subpixel-text"]; subpixel_text = [ud integerForKey: @"back-art-subpixel-text"];
if ([ud objectForKey: @"GSFontAntiAlias"])
anti_alias_by_default = [ud boolForKey: @"GSFontAntiAlias"];
else
anti_alias_by_default = YES;
/* To make it easier to find an optimal (or at least good) filter, /* To make it easier to find an optimal (or at least good) filter,
the filters are configurable (for now). */ the filters are configurable (for now). */
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@ -2875,8 +2360,6 @@ static int filters[3][7]=
} }
} }
} }
load_font_configuration();
} }

523
Source/art/ftfont.m
View file

@ -52,6 +52,8 @@
#include "gsc/GSGState.h" #include "gsc/GSGState.h"
#include "ftfont.h" #include "ftfont.h"
#include "FTFontEnumerator.h"
#include "FTFaceInfo.h"
#include "blit.h" #include "blit.h"
@ -82,10 +84,6 @@ from the back-art-subpixel-text defaults key
static int subpixel_text; static int subpixel_text;
static BOOL anti_alias_by_default;
@class FTFaceInfo;
#define CACHE_SIZE 257 #define CACHE_SIZE 257
@ -126,514 +124,6 @@ static BOOL anti_alias_by_default;
@end @end
static NSMutableArray *fcfg_allFontNames;
static NSMutableDictionary *fcfg_allFontFamilies;
static NSMutableDictionary *fcfg_all_fonts;
static NSMutableSet *families_seen, *families_pending;
@interface FTFaceInfo : NSObject
{
@public
NSString *familyName;
/* the following two are localized */
NSString *faceName;
NSString *displayName;
NSArray *files;
struct
{
int pixel_size;
NSArray *files;
} *sizes;
int num_sizes;
int weight;
unsigned int traits;
/*
hinting hints
0: 1 to use the auto-hinter
1: 1 to use hinting
byte 0 and 1 contain hinting hints for un-antialiased and antialiased
rendering, respectively.
16: 0=un-antialiased by default, 1=antialiased by default
*/
unsigned int render_hints_hack;
}
@end
@implementation FTFaceInfo
- (NSString *) description
{
return [NSString stringWithFormat: @"<FTFaceInfo %p: '%@' %@ %i %i>",
self, displayName, files, weight, traits];
}
/* FTFaceInfo:s should never be deallocated */
- (void) dealloc
{
NSLog(@"Warning: -dealloc called on %@",self);
GSNOSUPERDEALLOC;
}
@end
#if 0
/*
This is a list of "standard" face names. It is here so make_strings can pick
it up and generate .strings files with them.
*/
NSLocalizedStringFromTable(@"Book", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Regular", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Roman", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Medium", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demi", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Demibold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Heavy", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Oblique", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Italic", @"nfontFaceNames", @"")
NSLocalizedStringFromTable(@"Bold Oblique", @"nfontFaceNames", @"")
#endif
static int traits_from_string(NSString *s, unsigned int *traits, unsigned int *weight)
{
static struct
{
NSString *str;
unsigned int trait;
int weight;
} suffix[] = {
/* TODO */
{@"Normal" ,0 ,-1},
{@"Ultralight" ,0 , 1},
{@"Thin" ,0 , 2},
{@"Light" ,0 , 3},
{@"Extralight" ,0 , 3},
{@"Book" ,0 , 4},
{@"Regular" ,0 , 5},
{@"Plain" ,0 , 5},
{@"Display" ,0 , 5},
{@"Roman" ,0 , 5},
{@"Semilight" ,0 , 5},
{@"Medium" ,0 , 6},
{@"Demi" ,0 , 7},
{@"Demibold" ,0 , 7},
{@"Semi" ,0 , 8},
{@"Semibold" ,0 , 8},
{@"Bold" ,NSBoldFontMask , 9},
{@"Extra" ,NSBoldFontMask ,10},
{@"Extrabold" ,NSBoldFontMask ,10},
{@"Heavy" ,NSBoldFontMask ,11},
{@"Heavyface" ,NSBoldFontMask ,11},
{@"Ultrabold" ,NSBoldFontMask ,12},
{@"Black" ,NSBoldFontMask ,12},
{@"Ultra" ,NSBoldFontMask ,13},
{@"Ultrablack" ,NSBoldFontMask ,13},
{@"Fat" ,NSBoldFontMask ,13},
{@"Extrablack" ,NSBoldFontMask ,14},
{@"Obese" ,NSBoldFontMask ,14},
{@"Nord" ,NSBoldFontMask ,14},
{@"Italic" ,NSItalicFontMask ,-1},
{@"Oblique" ,NSItalicFontMask ,-1},
{@"Cond" ,NSCondensedFontMask ,-1},
{@"Condensed" ,NSCondensedFontMask ,-1},
{nil,0,-1}
};
int i;
*traits = 0;
// printf("do '%@'\n", s);
while ([s length] > 0)
{
// printf(" got '%@'\n", s);
if ([s hasSuffix: @"-"] || [s hasSuffix: @" "])
{
// printf(" do -\n");
s = [s substringToIndex: [s length] - 1];
continue;
}
for (i = 0; suffix[i].str; i++)
{
if (![s hasSuffix: suffix[i].str])
continue;
// printf(" found '%@'\n", suffix[i].str);
if (suffix[i].weight != -1)
*weight = suffix[i].weight;
(*traits) |= suffix[i].trait;
s = [s substringToIndex: [s length] - [suffix[i].str length]];
break;
}
if (!suffix[i].str)
break;
}
// printf("end up with '%@'\n", s);
return [s length];
}
static NSArray *fix_path(NSString *path, NSArray *files)
{
int i, c = [files count];
NSMutableArray *nfiles;
if (!files)
return nil;
nfiles = [[NSMutableArray alloc] init];
for (i = 0; i < c; i++)
{
if ([[files objectAtIndex: i] isAbsolutePath])
[nfiles addObject: [files objectAtIndex: i]];
else
[nfiles addObject: [path stringByAppendingPathComponent:
[files objectAtIndex: i]]];
}
return nfiles;
}
/* TODO: handling of .font packages needs to be reworked */
static void add_face(NSString *family, int family_weight,
unsigned int family_traits, NSDictionary *d, NSString *path,
BOOL from_nfont)
{
FTFaceInfo *fi;
unsigned int weight;
unsigned int traits;
NSString *fontName;
NSString *faceName, *rawFaceName;
fontName = [d objectForKey: @"PostScriptName"];
if (!fontName)
{
NSLog(@"Warning: Face in %@ has no PostScriptName!",path);
return;
}
if ([fcfg_allFontNames containsObject: fontName])
return;
fi = [[FTFaceInfo alloc] init];
fi->familyName = [family copy];
if ([d objectForKey: @"LocalizedNames"])
{
NSDictionary *l;
NSArray *lang;
int i;
l = [d objectForKey: @"LocalizedNames"];
lang = [NSUserDefaults userLanguages];
faceName = nil;
rawFaceName = [l objectForKey: @"English"];
for (i = 0; i < [lang count] && !faceName; i++)
{
faceName = [l objectForKey: [lang objectAtIndex: i]];
}
if (!faceName)
faceName = rawFaceName;
if (!faceName)
{
faceName = @"<unknown face>";
NSLog(@"Warning: couldn't find localized face name or fallback for %@",
fontName);
}
}
else if ((faceName = [d objectForKey: @"Name"]))
{
rawFaceName = faceName;
/* TODO: Smarter localization? Parse space separated parts and
translate individually? */
/* TODO: Need to define the strings somewhere, and make sure the
strings files get created. */
faceName = [NSLocalizedStringFromTableInBundle(faceName,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
fi->faceName = faceName;
}
else if (!from_nfont)
{ /* try to guess something for .font packages */
unsigned int dummy;
int split = traits_from_string(family,&dummy,&dummy);
rawFaceName = faceName = [family substringFromIndex: split];
family = [family substringToIndex: split];
faceName = [NSLocalizedStringFromTableInBundle(faceName,@"nfontFaceNames",
[NSBundle bundleForClass: [fi class]],nil) copy];
fi->faceName = faceName;
}
else
{
NSLog(@"Warning: Can't find name for face %@ in %@!",fontName,path);
return;
}
fi->displayName = [[family stringByAppendingString: @" "]
stringByAppendingString: faceName];
weight = family_weight;
if (rawFaceName)
traits_from_string(rawFaceName, &traits, &weight);
{
NSDictionary *sizes;
NSEnumerator *e;
NSString *size;
int i;
sizes = [d objectForKey: @"ScreenFonts"];
fi->num_sizes = [sizes count];
if (fi->num_sizes)
{
fi->sizes = malloc(sizeof(fi->sizes[0])*[sizes count]);
e = [sizes keyEnumerator];
i = 0;
while ((size = [e nextObject]))
{
fi->sizes[i].pixel_size = [size intValue];
fi->sizes[i].files = fix_path(path,[sizes objectForKey: size]);
NSDebugLLog(@"ftfont",@"%@ size %i files |%@|",
fontName,fi->sizes[i].pixel_size,fi->sizes[i].files);
i++;
}
}
}
fi->files = fix_path(path,[d objectForKey: @"Files"]);
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
fi->weight = weight;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
traits |= family_traits;
fi->traits = traits;
if ([d objectForKey: @"RenderHints_hack"])
fi->render_hints_hack
= strtol([[d objectForKey: @"RenderHints_hack"] cString], NULL, 0);
else
{
if (anti_alias_by_default)
fi->render_hints_hack = 0x10202;
else
fi->render_hints_hack = 0x00202;
}
NSDebugLLog(@"ftfont", @"adding '%@' '%@'", fontName, fi);
[fcfg_all_fonts setObject: fi forKey: fontName];
[fcfg_allFontNames addObject: fontName];
{
NSArray *a;
NSMutableArray *ma;
a = [NSArray arrayWithObjects:
fontName,
faceName,
[NSNumber numberWithInt: weight],
[NSNumber numberWithUnsignedInt: traits],
nil];
ma = [fcfg_allFontFamilies objectForKey: family];
if (!ma)
{
ma = [[NSMutableArray alloc] init];
[fcfg_allFontFamilies setObject: ma forKey: family];
[ma release];
}
[ma addObject: a];
}
DESTROY(fi);
}
static void load_font_configuration(void)
{
int i, j, k, c;
NSArray *paths;
NSString *path, *font_path;
NSFileManager *fm = [NSFileManager defaultManager];
NSArray *files;
NSDictionary *d;
NSArray *faces;
fcfg_all_fonts = [[NSMutableDictionary alloc] init];
fcfg_allFontFamilies = [[NSMutableDictionary alloc] init];
fcfg_allFontNames = [[NSMutableArray alloc] init];
families_seen = [[NSMutableSet alloc] init];
families_pending = [[NSMutableSet alloc] init];
paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSAllDomainsMask, YES);
for (i = 0; i < [paths count]; i++)
{
path = [paths objectAtIndex: i];
path = [path stringByAppendingPathComponent: @"Fonts"];
files = [fm directoryContentsAtPath: path];
c = [files count];
for (j = 0; j < c; j++)
{
NSString *family;
NSDictionary *face_info;
NSString *font_info_path;
int weight;
unsigned int traits;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"nfont"])
continue;
family = [font_path stringByDeletingPathExtension];
if ([families_seen member: family])
{
NSDebugLLog(@"ftfont", @"'%@' already seen, skipping", family);
continue;
}
[families_seen addObject: family];
font_path = [path stringByAppendingPathComponent: font_path];
NSDebugLLog(@"ftfont",@"loading %@",font_path);
font_info_path = [font_path stringByAppendingPathComponent: @"FontInfo.plist"];
if (![fm fileExistsAtPath: font_info_path])
continue;
d = [NSDictionary dictionaryWithContentsOfFile: font_info_path];
if (!d)
continue;
if ([d objectForKey: @"Family"])
family = [d objectForKey: @"Family"];
if ([d objectForKey: @"Weight"])
weight = [[d objectForKey: @"Weight"] intValue];
else
weight = 5;
if ([d objectForKey: @"Traits"])
traits = [[d objectForKey: @"Traits"] intValue];
else
traits = 0;
faces = [d objectForKey: @"Faces"];
if (![faces isKindOfClass: [NSArray class]])
{
NSLog(@"Warning: %@ isn't a valid .nfont package, ignoring.",
font_path);
if ([faces isKindOfClass: [NSDictionary class]])
NSLog(@"(it looks like an old-style .nfont package)");
continue;
}
for (k = 0; k < [faces count]; k++)
{
face_info = [faces objectAtIndex: k];
add_face(family, weight, traits, face_info, font_path, YES);
}
}
for (j = 0; j < c; j++)
{
NSString *family;
font_path = [files objectAtIndex: j];
if (![[font_path pathExtension] isEqual: @"font"])
continue;
family = [font_path stringByDeletingPathExtension];
font_path = [path stringByAppendingPathComponent: font_path];
d = [NSDictionary dictionaryWithObjectsAndKeys:
[NSArray arrayWithObjects:
family,
[family stringByAppendingPathExtension: @"afm"],
nil],
@"Files",
family,@"PostScriptName",
nil];
add_face(family, 5, 0, d, font_path, NO);
}
[families_seen unionSet: families_pending];
[families_pending removeAllObjects];
}
NSDebugLLog(@"ftfont", @"got %i fonts in %i families",
[fcfg_allFontNames count], [fcfg_allFontFamilies count]);
if (![fcfg_allFontNames count])
{
NSLog(@"No fonts found!");
exit(1);
}
DESTROY(families_seen);
DESTROY(families_pending);
}
@interface FTFontEnumerator : GSFontEnumerator
@end
@implementation FTFontEnumerator
- (void) enumerateFontsAndFamilies
{
ASSIGN(allFontNames, fcfg_allFontNames);
ASSIGN(allFontFamilies, fcfg_allFontFamilies);
}
- (NSString *) defaultSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Roman"])
return @"BitstreamVeraSans-Roman";
if ([fcfg_allFontNames containsObject: @"FreeSans"])
return @"FreeSans";
return @"Helvetica";
}
- (NSString *) defaultBoldSystemFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSans-Bold"])
return @"BitstreamVeraSans-Bold";
if ([fcfg_allFontNames containsObject: @"FreeSansBold"])
return @"FreeSansBold";
return @"Helvetica-Bold";
}
- (NSString *) defaultFixedPitchFontName
{
if ([fcfg_allFontNames containsObject: @"BitstreamVeraSansMono-Roman"])
return @"BitstreamVeraSansMono-Roman";
if ([fcfg_allFontNames containsObject: @"FreeMono"])
return @"FreeMono";
return @"Courier";
}
@end
static FT_Library ft_library; static FT_Library ft_library;
static FTC_Manager ftc_manager; static FTC_Manager ftc_manager;
static FTC_ImageCache ftc_imagecache; static FTC_ImageCache ftc_imagecache;
@ -696,7 +186,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
fmatrix[3], fmatrix[4], fmatrix[5], fmatrix[3], fmatrix[4], fmatrix[5],
p_screenFont); p_screenFont);
font_entry = [fcfg_all_fonts objectForKey: name]; font_entry = [FTFontEnumerator fontWithName: name];
if (!font_entry) if (!font_entry)
{ {
[self release]; [self release];
@ -2720,11 +2210,6 @@ static int filters[3][7]=
subpixel_text = [ud integerForKey: @"back-art-subpixel-text"]; subpixel_text = [ud integerForKey: @"back-art-subpixel-text"];
if ([ud objectForKey: @"GSFontAntiAlias"])
anti_alias_by_default = [ud boolForKey: @"GSFontAntiAlias"];
else
anti_alias_by_default = YES;
/* To make it easier to find an optimal (or at least good) filter, /* To make it easier to find an optimal (or at least good) filter,
the filters are configurable (for now). */ the filters are configurable (for now). */
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
@ -2765,8 +2250,6 @@ static int filters[3][7]=
} }
} }
} }
load_font_configuration();
} }