summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2018-03-13 08:04:41 +0000
committerTavmjong Bah <tavmjong@free.fr>2018-03-13 08:04:41 +0000
commitb3d48a0aa9d46d896e1ad84e19cdfde30b205a5f (patch)
tree8bd4b86fca5c47c9533e186e5f339b789d83a716 /src
parentUse upward pointing arrow cursor in InkSpinScale (diff)
downloadinkscape-b3d48a0aa9d46d896e1ad84e19cdfde30b205a5f.tar.gz
inkscape-b3d48a0aa9d46d896e1ad84e19cdfde30b205a5f.zip
Pango requires different 'font-variation-settints' string.
Diffstat (limited to 'src')
-rw-r--r--src/style-internal.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/style-internal.cpp b/src/style-internal.cpp
index 84ff75cfa..ba60d06e8 100644
--- a/src/style-internal.cpp
+++ b/src/style-internal.cpp
@@ -577,7 +577,15 @@ SPIFontVariationSettings::write( guint const flags, SPStyleSrc const &style_src_
} else {
Inkscape::CSSOStringStream os;
os << name << ":";
- os << toString();
+
+ for (auto it=axes.begin(); it!=axes.end(); /* nothing */ ){
+ os << "'" << it->first << "' " << it->second;
+ ++it;
+ if (it!=axes.end()) {
+ os << ", ";
+ }
+ }
+
os << important_str();
os << ";";
return os.str();
@@ -630,12 +638,11 @@ SPIFontVariationSettings::toString() const {
Inkscape::CSSOStringStream os;
for (auto it=axes.begin(); it!=axes.end(); ++it){
- os << "'" << it->first << "' " << it->second << ", ";
+ os << it->first << "=" << it->second << ",";
}
std::string string = os.str(); // Glib::ustring doesn't have pop_back()
if (!string.empty()) {
- string.pop_back(); // Delete extra space at end
string.pop_back(); // Delete extra comma at end
}