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

* Source/cairo/CairoFontInfo.m,

Browse source 
* Source/fontconfig/FCFontEnumerator.m: Small cleanup of last pull
request.
This commit is contained in:
fredkiefer 2019-05-19 22:56:48 +02:00
parent 5362c305bc
commit 36283735ab
3 changed files with 36 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2019-05-19 Fred Kiefer <FredKiefer@gmx.de>
* Source/cairo/CairoFontInfo.m,
* Source/fontconfig/FCFontEnumerator.m: Small cleanup of last pull
request.
2019-05-19 Fred Kiefer <FredKiefer@gmx.de> 2019-05-19 Fred Kiefer <FredKiefer@gmx.de>
* .gitignore: Add copied files as they should never be commited. * .gitignore: Add copied files as they should never be commited.

9
Source/cairo/CairoFontInfo.m
View file

@ -119,10 +119,15 @@
if ((subpixel = [ud integerForKey: @"back-art-subpixel-text"])) if ((subpixel = [ud integerForKey: @"back-art-subpixel-text"]))
{ {
cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_SUBPIXEL); cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_SUBPIXEL);
cairo_font_options_set_subpixel_order(options, CAIRO_SUBPIXEL_ORDER_RGB);
if (subpixel == 2) if (subpixel == 2)
cairo_font_options_set_subpixel_order(options, CAIRO_SUBPIXEL_ORDER_BGR); {
cairo_font_options_set_subpixel_order(options, CAIRO_SUBPIXEL_ORDER_BGR);
}
else
{
cairo_font_options_set_subpixel_order(options, CAIRO_SUBPIXEL_ORDER_RGB);
}
} }
_scaled = cairo_scaled_font_create(face, &font_matrix, &ctm, options); _scaled = cairo_scaled_font_create(face, &font_matrix, &ctm, options);

66
Source/fontconfig/FCFontEnumerator.m
View file

@ -167,9 +167,6 @@ static NSArray *faFromFc(FcPattern *pat)
#ifdef FC_POSTSCRIPT_NAME #ifdef FC_POSTSCRIPT_NAME
char *fcname; char *fcname;
#endif #endif
#if 0
FT_Face ftface = NULL;
#endif
if (FcPatternGetInteger(pat, FC_WEIGHT, 0, &weight) != FcResultMatch if (FcPatternGetInteger(pat, FC_WEIGHT, 0, &weight) != FcResultMatch
|| FcPatternGetInteger(pat, FC_SLANT, 0, &slant) != FcResultMatch || FcPatternGetInteger(pat, FC_SLANT, 0, &slant) != FcResultMatch
@ -181,26 +178,6 @@ static NSArray *faFromFc(FcPattern *pat)
if (spacing==FC_MONO || spacing==FC_CHARCELL) if (spacing==FC_MONO || spacing==FC_CHARCELL)
nstraits |= NSFixedPitchFontMask; nstraits |= NSFixedPitchFontMask;
/*
This code will allow us to access TrueType/OpenType font tables from
fontconfig. If we want to implement features like the so-called "OS/2"
table which contains typographic family info ("give me a list of 'script'
fonts with slab serifs") and stuff like the font's correct typographic
line height and its xHeight, this is where we get that info.
For more information, see http://www.microsoft.com/typography/otspec/
*/
#if 0
if (FcPatternGetFTFace (pat, FC_FT_FACE, 0, &ftface) == FcResultMatch)
{
// we got a FreeType face now, mwahaha.
TT_Header *head = FT_Get_Sfnt_Table (ftface, FT_SFNT_HEAD);
TT_OS2 *os2 = FT_Get_Sfnt_Table (ftface, FT_SFNT_OS2);
TT_HoriHeader *hhea = FT_Get_Sfnt_Table (ftface, FT_SFNT_HHEA);
TT_Postscript *post = FT_Get_Sfnt_Table (ftface, FT_SFNT_POST);
}
#endif
name = [NSMutableString stringWithCapacity: 100]; name = [NSMutableString stringWithCapacity: 100];
#ifdef FC_POSTSCRIPT_NAME #ifdef FC_POSTSCRIPT_NAME
if (FcPatternGetString(pat, FC_POSTSCRIPT_NAME, 0, (FcChar8 **)&fcname) == FcResultMatch) if (FcPatternGetString(pat, FC_POSTSCRIPT_NAME, 0, (FcChar8 **)&fcname) == FcResultMatch)
@ -384,24 +361,26 @@ static NSArray *faFromFc(FcPattern *pat)
if ((fontArray = faFromFc(fs->fonts[i]))) if ((fontArray = faFromFc(fs->fonts[i])))
{ {
NSString *familyString;
NSMutableArray *familyArray;
FCFaceInfo *aFont;
NSString *name = [fontArray objectAtIndex: 0]; NSString *name = [fontArray objectAtIndex: 0];
familyString = [NSString stringWithUTF8String: family];
familyArray = [fcxft_allFontFamilies objectForKey: familyString];
if (familyArray == nil)
{
NSDebugLLog(@"NSFont", @"Found font family %@", familyString);
familyArray = [NSMutableArray array];
[fcxft_allFontFamilies setObject: familyArray
forKey: familyString];
}
if (![fcxft_allFontNames containsObject: name]) if (![fcxft_allFontNames containsObject: name])
{ {
NSString *familyString;
NSMutableArray *familyArray;
FCFaceInfo *aFont;
familyString = [NSString stringWithUTF8String: family];
familyArray = [fcxft_allFontFamilies objectForKey: familyString];
if (familyArray == nil)
{
NSDebugLLog(@"NSFont", @"Found font family %@", familyString);
familyArray = [[NSMutableArray alloc] init];
[fcxft_allFontFamilies setObject: familyArray
forKey: familyString];
RELEASE(familyArray);
}
NSDebugLLog(@"NSFont", @"fc enumerator: adding font: %@", name); NSDebugLLog(@"NSFont", @"fc enumerator: adding font: %@", name);
[familyArray addObject: fontArray]; [familyArray addObject: fontArray];
[fcxft_allFontNames addObject: name]; [fcxft_allFontNames addObject: name];
@ -423,13 +402,14 @@ static NSArray *faFromFc(FcPattern *pat)
// Sort font families // Sort font families
{ {
NSComparisonResult (*fontSort) (id, id, void *) = sortFontFacesArray; NSComparisonResult (*fontSort)(id, id, void *) = sortFontFacesArray;
NSEnumerator *e = [allFontFamilies keyEnumerator]; NSEnumerator *e = [allFontFamilies keyEnumerator];
id key; id key;
while ((key = [e nextObject]))
{ while ((key = [e nextObject]))
[[allFontFamilies objectForKey: key] sortUsingFunction:fontSort context:NULL]; {
} [[allFontFamilies objectForKey: key] sortUsingFunction: fontSort context: NULL];
}
} }
} }
@ -491,7 +471,7 @@ static NSArray *faFromFc(FcPattern *pat)
} }
if ([allFontNames containsObject: @"BitstreamVeraSansMono-Roman"]) if ([allFontNames containsObject: @"BitstreamVeraSansMono-Roman"])
{ {
return @"Bitstream Vera Sans Mono"; return @"BitstreamVeraSansMono-Roman";
} }
if ([allFontNames containsObject: @"FreeMono"]) if ([allFontNames containsObject: @"FreeMono"])
{ {