From 41eae39d1d81726f6ab98fe9da621ddf7bc922f0 Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Thu, 2 Oct 2014 09:53:41 +0200 Subject: Fix style string while searching for best face match. Fix typo for 'ultra-condensed' face in fontspec_from_style(). (bzr r13574) --- src/libnrtype/font-lister.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 716f3c80a..6727cdda6 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -796,7 +796,7 @@ std::pair FontLister::new_font_family (Glib::ustri switch (style->font_stretch.computed) { case SP_CSS_FONT_STRETCH_ULTRA_CONDENSED: - fontspec += " extra-condensed"; + fontspec += " ultra-condensed"; break; case SP_CSS_FONT_STRETCH_EXTRA_CONDENSED: @@ -985,7 +985,7 @@ std::pair FontLister::new_font_family (Glib::ustri GList* styles = row[FontList.styles]; for (GList *l=styles; l; l = l->next) { - Glib::ustring fontspec = family + ", " + (char*)l->data; + Glib::ustring fontspec = family + ", " + ((StyleNames *)l->data)->CssName; PangoFontDescription* candidate = pango_font_description_from_string( fontspec.c_str() ); //font_description_dump( candidate ); //std::cout << " " << font_description_better_match( target, best, candidate ) << std::endl; -- cgit v1.2.3