diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2015-06-22 10:10:30 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2015-06-22 10:10:30 +0000 |
| commit | dac19399d5e265506e00ea73d2e20fa3c17799a5 (patch) | |
| tree | 902ec682516673b049e22c578e2ebb24aa2b3a6f /src/style.cpp | |
| parent | Render font variants (ligatures, postions, caps, numerics). (diff) | |
| download | inkscape-dac19399d5e265506e00ea73d2e20fa3c17799a5.tar.gz inkscape-dac19399d5e265506e00ea73d2e20fa3c17799a5.zip | |
Enable rendering of 'font-feature-settings' and 'font-variant-east-asian'.
Requires Pango version equal or greater than 1.37.1.
(bzr r14207)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/src/style.cpp b/src/style.cpp index e7316525b..d8402e08a 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -1195,17 +1195,13 @@ SPStyle::getFontFeatureString() { std::string feature_string; - if ( font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_COMMON ) - feature_string += "liga, clig, "; - else + if ( !(font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_COMMON) ) feature_string += "liga 0, clig 0, "; if ( font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_DISCRETIONARY ) feature_string += "dlig, "; if ( font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_HISTORICAL ) feature_string += "hlig, "; - if ( font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL ) - feature_string += "calt, "; - else + if ( !(font_variant_ligatures.value & SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL) ) feature_string += "calt 0, "; if ( font_variant_position.value & SP_CSS_FONT_VARIANT_POSITION_SUB ) @@ -1243,8 +1239,38 @@ SPStyle::getFontFeatureString() { if ( font_variant_numeric.value & SP_CSS_FONT_VARIANT_NUMERIC_SLASHED_ZERO ) feature_string += "zero, "; - feature_string.erase( feature_string.size() - 1 ); - feature_string.erase( feature_string.size() - 1 ); + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS78 ) + feature_string += "jp78, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS83 ) + feature_string += "jp83, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS90 ) + feature_string += "jp90, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS04 ) + feature_string += "jp04, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED ) + feature_string += "smpl, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL ) + feature_string += "trad, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH ) + feature_string += "fwid, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_PROPORTIONAL_WIDTH ) + feature_string += "pwid, "; + if( font_variant_east_asian.value & SP_CSS_FONT_VARIANT_EAST_ASIAN_RUBY ) + feature_string += "ruby, "; + + if ( strcmp( font_feature_settings.value, "normal") ) { + // We do no sanity checking... + feature_string += font_feature_settings.value; + feature_string += ", "; + } + + if (feature_string.empty()) { + feature_string = "normal"; + } else { + // Remove last ", " + feature_string.erase( feature_string.size() - 1 ); + feature_string.erase( feature_string.size() - 1 ); + } return feature_string; } |