Fixed advance fonts are no longer needed; now handled at render time.

Author: s4y

src/MacVim/MMCoreTextView.m

@@ -133,21 +133,6 @@ - (void)invertBlockFromRow:(int)row column:(int)col numRows:(int)nrows
     return [@"m" sizeWithAttributes:a].width;
 }
 
-NSFont *fontWithFixedAdvanceCascadeList(NSFont *font, CGFloat advance) {
-    NSArray *cascadeList = (NSArray*)CTFontCopyDefaultCascadeListForLanguages((CTFontRef)font, nil);
-    NSMutableArray *fixedWidthCascadeList = [NSMutableArray arrayWithCapacity:cascadeList.count];
-    NSDictionary *fixedAdvanceAttributeDict = @{
-        NSFontFixedAdvanceAttribute: @(advance),
-    };
-    for (NSFontDescriptor* descriptor in cascadeList) {
-        [fixedWidthCascadeList addObject:[descriptor fontDescriptorByAddingAttributes:fixedAdvanceAttributeDict]];
-    }
-    return [NSFont fontWithDescriptor:[font.fontDescriptor fontDescriptorByAddingAttributes:@{
-        NSFontCascadeListAttribute: fixedWidthCascadeList,
-        NSFontFixedAdvanceAttribute: @(advance),
-    }] size:font.pointSize];
-}
-
 typedef struct {
     unsigned color;
     int shape;
@@ -405,7 +390,7 @@ - (void)setFont:(NSFont *)newFont
     cellSize.height = linespace + defaultLineHeightForFont(newFont);
 
     [font release];
-    font = [fontWithFixedAdvanceCascadeList(newFont, cellSize.width) retain];
+    font = [newFont retain];
     fontDescent = ceil(CTFontGetDescent((CTFontRef)font));
 
     [self clearAll];
@@ -422,7 +407,7 @@ - (void)setWideFont:(NSFont *)newFont
         if (font) [self setWideFont:font];
     } else if (newFont != fontWide) {
         [fontWide release];
-        fontWide = [fontWithFixedAdvanceCascadeList(newFont, cellSize.width * 2) retain];
+        fontWide = [newFont retain];
     }
 }