From baa52078f68c3c07e4e88447b4808d8bb791332b Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 31 Jan 2013 17:52:48 +0100
Subject: Partial fix to allow change of style when the font-family is a font
 list.

(bzr r12081)
---
 src/libnrtype/FontFactory.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp
index af46d6986..2cf4b8673 100644
--- a/src/libnrtype/FontFactory.cpp
+++ b/src/libnrtype/FontFactory.cpp
@@ -824,7 +824,12 @@ font_instance* font_factory::FaceFromUIStrings(char const *uiFamily, char const
 
     g_assert(uiFamily && uiStyle);
     if (uiFamily && uiStyle) {
-        Glib::ustring uiString = Glib::ustring(uiFamily) + Glib::ustring(uiStyle);
+
+        // If font list, take only first font in list
+        gchar** tokens = g_strsplit( uiFamily, ",", 0 );
+        g_strstrip( tokens[0] );
+
+        Glib::ustring uiString = Glib::ustring(tokens[0]) + Glib::ustring(uiStyle);
 
         UIStringToPangoStringMap::iterator uiToPangoIter = fontStringMap.find(uiString);
 
-- 
cgit v1.2.3