From 390f82f064dca9c540c0e7fb64bee310db0ce482 Mon Sep 17 00:00:00 2001
From: Jeff Teunissen <deek@d2dc.net>
Date: Mon, 9 Nov 2009 05:31:00 -0500
Subject: [PATCH] make displayName work

---
 Source/art/FTFontEnumerator.m | 3 +--
 Source/art/ftfont.m           | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Source/art/FTFontEnumerator.m b/Source/art/FTFontEnumerator.m
index a401411..20774a0 100644
--- a/Source/art/FTFontEnumerator.m
+++ b/Source/art/FTFontEnumerator.m
@@ -245,8 +245,7 @@ static void add_face(NSString *family, int family_weight,
       return;
     }
 
-  fi->displayName = [[family stringByAppendingString: @" "]
-			     stringByAppendingString: faceName];
+  fi->displayName = [[NSString stringWithFormat: @"%@ %@", family, faceName] retain];
 
 
   weight = family_weight;
diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m
index d5e1b73..b692da4 100644
--- a/Source/art/ftfont.m
+++ b/Source/art/ftfont.m
@@ -352,6 +352,11 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib,
   return self;
 }
 
+- (NSString*) displayName
+{
+  return face_info->displayName;
+}
+
 - (void) set
 {
   NSLog(@"ignore -set method of font '%@'", fontName);