diff --git a/ios/Text/FontData.h b/ios/Text/FontData.h index ec8acc9b..4658026b 100644 --- a/ios/Text/FontData.h +++ b/ios/Text/FontData.h @@ -14,10 +14,8 @@ NSString * fontSize_; NSString *fontFamily; enum FontStyle fontStyle; - NSString * fontStyle_; NSDictionary * fontData; enum FontWeight fontWeight; - NSString * fontWeight_; NSString *fontFeatureSettings; enum FontVariantLigatures fontVariantLigatures; enum TextAnchor textAnchor; diff --git a/ios/Text/FontWeight.m b/ios/Text/FontWeight.m index 3a1e6d76..3bf1d5a5 100644 --- a/ios/Text/FontWeight.m +++ b/ios/Text/FontWeight.m @@ -9,7 +9,7 @@ enum FontWeight FontWeightFromString( NSString* s ) { const NSUInteger l = sizeof(FontWeightStrings) / sizeof(NSString*); for (NSUInteger i = 0; i < l; i++) { - if ([s isEqualToString:FontWeightStrings[i]]) { + if ([[s capitalizedString] isEqualToString:FontWeightStrings[i]]) { return i; } } diff --git a/ios/Text/GlyphContext.m b/ios/Text/GlyphContext.m index 55c16fa5..ebb3cbda 100644 --- a/ios/Text/GlyphContext.m +++ b/ios/Text/GlyphContext.m @@ -82,8 +82,9 @@ { NSString *fontFamily = topFont_->fontFamily; NSNumber * fontSize = [NSNumber numberWithDouble:topFont_->fontSize]; - NSString * fontWeight = topFont_->fontWeight_; - NSString * fontStyle = topFont_->fontStyle_; + + NSString * fontWeight = [FontWeightToString(topFont_->fontWeight) lowercaseString]; + NSString * fontStyle = FontStyleStrings[topFont_->fontStyle]; BOOL fontFamilyFound = NO; NSArray *supportedFontFamilyNames = [UIFont familyNames];