From 3003ccd72ce708cd97b7f06abbd235589afa8cfe Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 3 Apr 2018 14:31:45 +0200 Subject: Unset 'font-variation-settings' if not used. --- src/libnrtype/font-lister.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index e363ac7f8..3c4e159fd 100644 --- a/src/libnrtype/font-lister.cpp +++ b/src/libnrtype/font-lister.cpp @@ -766,9 +766,9 @@ void FontLister::fill_css(SPCSSAttr *css, Glib::ustring fontspec) // Convert Pango variations string to CSS format const char* str = pango_font_description_get_variations(desc); - if (str) { + std::string variations; - std::string variations; + if (str) { std::vector tokens = Glib::Regex::split_simple(",", str); @@ -788,7 +788,12 @@ void FontLister::fill_css(SPCSSAttr *css, Glib::ustring fontspec) variations.pop_back(); variations.pop_back(); } + } + + if (!variations.empty()) { sp_repr_css_set_property(css, "font-variation-settings", variations.c_str()); + } else { + sp_repr_css_unset_property(css, "font-variation-settings" ); } #endif } -- cgit v1.2.3