diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-06-24 17:50:36 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-06-24 17:50:36 +0000 |
| commit | d71265c629a103d8c821fe85ccf71bd9c93baf47 (patch) | |
| tree | c01fe4543cd48f64a8ca4b60e01e1bb5040922d9 /src/style.cpp | |
| parent | Working with powerclip and powermask (diff) | |
| parent | Merge branch 'ui-files-for-ui-xml' (diff) | |
| download | inkscape-d71265c629a103d8c821fe85ccf71bd9c93baf47.tar.gz inkscape-d71265c629a103d8c821fe85ccf71bd9c93baf47.zip | |
Updating to master
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/style.cpp b/src/style.cpp index 0b0358bb2..ca0eed6f7 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -115,6 +115,9 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : font_variant_east_asian("font-variant-east-asian", enum_font_variant_east_asian, SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL ), font_feature_settings( "font-feature-settings", "normal" ), + // Variable Fonts + font_variation_settings( "font-variation-settings" ), // SPIFontVariationSettings + // Text related properties text_indent( "text-indent", 0.0 ), // SPILength text_align( "text-align", enum_text_align, SP_CSS_TEXT_ALIGN_START ), @@ -298,6 +301,9 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : _properties.push_back( &font_variant_east_asian ); _properties.push_back( &font_feature_settings ); + // Variable Fonts + _properties.push_back( &font_variation_settings ); + _properties.push_back( &text_indent ); _properties.push_back( &text_align ); @@ -741,6 +747,10 @@ SPStyle::readIfUnset( gint id, gchar const *val, SPStyleSrc const &source ) { font_feature_settings.readIfUnset( val, source ); break; + case SP_PROP_FONT_VARIATION_SETTINGS: + font_variation_settings.readIfUnset( val, source ); + break; + /* Text */ case SP_PROP_TEXT_INDENT: text_indent.readIfUnset( val, source ); |
