Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apple fonttools fixes #13

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions AppKit/NSFontDescriptor.m
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ this software and associated documentation files (the "Software"), to deal in
NSString *const NSFontWidthTrait = @"NSFontWidthTrait";
NSString *const NSFontSlantTrait = @"NSFontSlantTrait";

NSString *const NSFontFeatureSelectorIdentifierKey = @"NSFontFeatureSelectorIdentifier";
NSString *const NSFontFeatureTypeIdentifierKey = @"NSFontFeatureTypeIdentifierKey";

const NSFontWeight NSFontWeightThin = 0xbfe3333340000000;
const NSFontWeight NSFontWeightLight = 0xbfd99999a0000000;
const NSFontWeight NSFontWeightUltraLight = 0xbfe99999a0000000;
Expand Down
9 changes: 9 additions & 0 deletions CoreGraphics/CGFont.m
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ this software and associated documentation files (the "Software"), to deal in
#import <CoreGraphics/CGFont.h>
#import <Onyx2D/O2Font.h>

const CFStringRef kCGFontNameKeyCopyright = CFSTR("CGFontNameKeyCopyright");
const CFStringRef kCGFontNameKeyFontFamily = CFSTR("CGFontNameKeyFontFamily");
const CFStringRef kCGFontNameKeyFontSubfamily = CFSTR("CGFontNameKeyFontSubfamily");
const CFStringRef kCGFontNameKeyFullName = CFSTR("CGFontNameKeyFullName");
const CFStringRef kCGFontNameKeyPostScriptName = CFSTR("CGFontNameKeyPostScriptName");
const CFStringRef kCGFontNameKeyPreferredFamily = CFSTR("CGFontNameKeyPreferredFamily");
const CFStringRef kCGFontNameKeyPreferredSubfamily = CFSTR("CGFontNameKeyPreferredSubfamily");
const CFStringRef kCGFontNameKeyVersion = CFSTR("CGFontNameKeyPreferredSubfamily");

CGFontRef CGFontCreateWithFontName(CFStringRef name) {
return O2FontCreateWithFontName((NSString *) name);
}
Expand Down
5 changes: 5 additions & 0 deletions CoreText/constants.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,8 @@ const CFStringRef kCTKernAttributeName = CFSTR("CTKernAttributeName");
const CFStringRef kCTLanguageAttributeName = CFSTR("CTLanguageAttributeName");
const CFStringRef kCTTypesetterOptionForcedEmbeddingLevel = CFSTR("CTTypesetterOptionForcedEmbeddingLevel");
const CFStringRef kCTVerticalFormsAttributeName = CFSTR("CTVerticalFormsAttributeName");
const CFStringRef kCTFontFullNameKey = CFSTR("CTFontFullName");
const CFStringRef kCTFontStyleNameKey = CFSTR("CTFontStyleName");
const CFStringRef kCTFontUniqueNameKey = CFSTR("CTFontUniqueName");
const CFStringRef kCTFontVersionNameKey = CFSTR("CTFontVersionName");
const CFStringRef kCTFontFeaturesAttribute = CFSTR("CTFontFeaturesAttribute");