From ccb4340164449888fff3fbda68538e968bd14097 Mon Sep 17 00:00:00 2001
From: cpsandbox <cpsandbox@gmail.com>
Date: Sun, 8 Jan 2012 23:06:27 -0800
Subject: [PATCH] Update src/font_engine_freetype.cpp

---
 src/font_engine_freetype.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/font_engine_freetype.cpp b/src/font_engine_freetype.cpp
index c8c9d9b3d..5f24437ae 100644
--- a/src/font_engine_freetype.cpp
+++ b/src/font_engine_freetype.cpp
@@ -169,11 +169,18 @@ face_ptr freetype_engine::create_face(std::string const& family_name)
     if (itr != name2file_.end())
     {
         FT_Face face;
-        FT_Error error = FT_New_Face (library_,itr->second.c_str(),0,&face);
-
-        if (!error)
-        {
-            return face_ptr (new font_face(face));
+        // because there may be more than one face per file we have to look for the
+        // face that matches
+        // alternately we could make a map that store the face index
+        for ( int i = 0; face == 0 || i < face->num_faces; i++ ) {
+            FT_Error error = FT_New_Face (library_,itr->second.c_str(),i,&face);
+            if (!error)
+            {
+                std::string name = std::string(face->family_name) + " " + std::string(face->style_name);
+                if ( boost::algorithm::equals(name, family_name ) {
+                    return face_ptr (new font_face(face));
+                }
+            }
         }
     }
     return face_ptr();