diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-06-04 12:14:53 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-06-04 12:14:53 +0000 |
| commit | ec110c32bcb154b3b6b7311a3de58222db329729 (patch) | |
| tree | 2ebc5cfd5413ab5333f02cd67966413cb320a07c /src/style-internal.cpp | |
| parent | Port inkscape to librevenge framework for WPG, CDR and VSD imports (diff) | |
| parent | inkscape.pre0 build failures for win32 nsis (diff) | |
| download | inkscape-ec110c32bcb154b3b6b7311a3de58222db329729.tar.gz inkscape-ec110c32bcb154b3b6b7311a3de58222db329729.zip | |
update to trunk (r13407)
(bzr r13398.1.2)
Diffstat (limited to 'src/style-internal.cpp')
| -rw-r--r-- | src/style-internal.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp index b15892128..8b4f3c1cd 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -648,9 +648,6 @@ SPIString::read( gchar const *str ) { if( !str ) return; - // libcroco puts quotes around some strings... remove - gchar *str_unquoted = attribute_unquote(str); - if (!strcmp(str, "inherit")) { set = true; inherit = true; @@ -658,10 +655,18 @@ SPIString::read( gchar const *str ) { } else { set = true; inherit = false; - value = g_strdup(str_unquoted); - } - g_free( str_unquoted ); + // libcroco puts quotes around some strings... remove + Glib::ustring str_unquoted(str); + css_unquote( str_unquoted ); + + // Unquote individual family names, Pango always uses unquoted names. + if( name.compare( "font-family" ) == 0 ) { + css_font_family_unquote( str_unquoted ); + } + + value = g_strdup(str_unquoted.c_str()); + } } |