Start of implementing CSS 3 font variants (access to OpenType features).

(bzr r14115)

5 files changed, 245 insertions, 14 deletions

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 568f0528a..af19360c1 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -419,6 +419,16 @@ static SPStyleProp const props[] = {
     {SP_PROP_FONT_STYLE, "font-style"},
     {SP_PROP_FONT_VARIANT, "font-variant"},
     {SP_PROP_FONT_WEIGHT, "font-weight"},
+
+    /* Font Variants CSS 3 */
+    {SP_PROP_FONT_VARIANT_LIGATURES,  "font-variant-ligatures"},
+    {SP_PROP_FONT_VARIANT_POSITION,   "font-variant-position"},
+    {SP_PROP_FONT_VARIANT_CAPS,       "font-variant-caps"},
+    {SP_PROP_FONT_VARIANT_NUMERIC,    "font-variant-numeric"},
+    {SP_PROP_FONT_VARIANT_ALTERNATES, "font-variant-alternates"},
+    {SP_PROP_FONT_VARIANT_EAST_ASIAN, "font-variant-east-asian"},
+    {SP_PROP_FONT_FEATURE_SETTINGS,   "font-feature-settings"},
+
     /* Text */
     {SP_PROP_TEXT_INDENT, "text-indent"},
     {SP_PROP_TEXT_ALIGN, "text-align"},
@@ -426,6 +436,7 @@ static SPStyleProp const props[] = {
     {SP_PROP_LETTER_SPACING, "letter-spacing"},
     {SP_PROP_WORD_SPACING, "word-spacing"},
     {SP_PROP_TEXT_TRANSFORM, "text-transform"},
+
     /* Text (css3) */
     {SP_PROP_DIRECTION, "direction"},
     {SP_PROP_BLOCK_PROGRESSION, "block-progression"},
@@ -439,16 +450,21 @@ static SPStyleProp const props[] = {
     {SP_PROP_KERNING, "kerning"},
     {SP_PROP_TEXT_ANCHOR, "text-anchor"},
     {SP_PROP_WHITE_SPACE, "white-space"},
+
     /* SVG 2 Text Wrapping */
     {SP_PROP_SHAPE_INSIDE,  "shape-inside"},
     {SP_PROP_SHAPE_OUTSIDE, "shape-outside"},
     {SP_PROP_SHAPE_PADDING, "shape-padding"},
     {SP_PROP_SHAPE_MARGIN,  "shape-margin"},
+
     /* Text Decoration */
-    {SP_PROP_TEXT_DECORATION, "text-decoration"},
-    {SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"},
-    {SP_PROP_TEXT_DECORATION_STYLE,"text-decoration-style"},
-    {SP_PROP_TEXT_DECORATION_COLOR,"text-decoration-color"},
+    {SP_PROP_TEXT_DECORATION,       "text-decoration"},
+    {SP_PROP_TEXT_DECORATION_LINE,  "text-decoration-line"},
+    {SP_PROP_TEXT_DECORATION_STYLE, "text-decoration-style"},
+    {SP_PROP_TEXT_DECORATION_COLOR, "text-decoration-color"},
+    {SP_PROP_TEXT_DECORATION_FILL,  "text-decoration-fill"},
+    {SP_PROP_TEXT_DECORATION_STROKE,"text-decoration-stroke"},
+
     /* Misc */
     {SP_PROP_CLIP, "clip"},
     {SP_PROP_COLOR, "color"},
diff --git a/src/attributes.h b/src/attributes.h
index 91c8868f9..7d6ea70a0 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -424,6 +424,15 @@ enum SPAttributeEnum {
     SP_PROP_FONT_VARIANT,
     SP_PROP_FONT_WEIGHT,
 
+    /* Font Variants CSS 3 */
+    SP_PROP_FONT_VARIANT_LIGATURES,
+    SP_PROP_FONT_VARIANT_POSITION,
+    SP_PROP_FONT_VARIANT_CAPS,
+    SP_PROP_FONT_VARIANT_NUMERIC,
+    SP_PROP_FONT_VARIANT_ALTERNATES,
+    SP_PROP_FONT_VARIANT_EAST_ASIAN,
+    SP_PROP_FONT_FEATURE_SETTINGS,
+
     /* Text Layout */
     SP_PROP_TEXT_INDENT,
     SP_PROP_TEXT_ALIGN,
@@ -446,16 +455,20 @@ enum SPAttributeEnum {
     SP_PROP_TEXT_ANCHOR,
     SP_PROP_WHITE_SPACE,
 
+    /* SVG 2 Text Wrapping */
     SP_PROP_SHAPE_INSIDE,
     SP_PROP_SHAPE_OUTSIDE,
     SP_PROP_SHAPE_PADDING,
     SP_PROP_SHAPE_MARGIN,
     
-    /* Text Decoration */
-    SP_PROP_TEXT_DECORATION,       /* SVG 1 underline etc.( no color or style) OR SVG2 with _LINE, _STYLE, _COLOR values */
-    SP_PROP_TEXT_DECORATION_LINE,  /* SVG 2 underline etc. */
-    SP_PROP_TEXT_DECORATION_STYLE, /* SVG 2 proposed solid [SVG 1], dotted, etc.)*/
-    SP_PROP_TEXT_DECORATION_COLOR, /* SVG 2 proposed same as text [SVG 1], specified*/
+    /* Text Decoration CSS 2/CSS 3 Shorthand */
+    SP_PROP_TEXT_DECORATION,
+    /* Text Decoration CSS 3/SVG 2 */
+    SP_PROP_TEXT_DECORATION_LINE,
+    SP_PROP_TEXT_DECORATION_STYLE,
+    SP_PROP_TEXT_DECORATION_COLOR,
+    SP_PROP_TEXT_DECORATION_FILL,
+    SP_PROP_TEXT_DECORATION_STROKE,
 
     /* Misc */
     SP_PROP_CLIP,
diff --git a/src/style-enums.h b/src/style-enums.h
index f52752018..f235b6699 100644
--- a/src/style-enums.h
+++ b/src/style-enums.h
@@ -72,6 +72,72 @@ enum SPCSSFontStretch {
     SP_CSS_FONT_STRETCH_WIDER
 };
 
+// Can select more than one
+enum SPCSSFontVariantLigatures {
+    SP_CSS_FONT_VARIANT_LIGATURES_NORMAL,
+    SP_CSS_FONT_VARIANT_LIGATURES_NONE,
+    SP_CSS_FONT_VARIANT_LIGATURES_COMMON,
+    SP_CSS_FONT_VARIANT_LIGATURES_NO_COMMON,
+    SP_CSS_FONT_VARIANT_LIGATURES_DISCRETIONARY,
+    SP_CSS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY,
+    SP_CSS_FONT_VARIANT_LIGATURES_HISTORICAL,
+    SP_CSS_FONT_VARIANT_LIGATURES_NO_HISTORICAL,
+    SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL,
+    SP_CSS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL
+};
+
+enum SPCSSFontVariantPosition {
+    SP_CSS_FONT_VARIANT_POSITION_NORMAL,
+    SP_CSS_FONT_VARIANT_POSITION_SUB,
+    SP_CSS_FONT_VARIANT_POSITION_SUPER
+};
+
+enum SPCSSFontVariantCaps {
+    SP_CSS_FONT_VARIANT_CAPS_NORMAL,
+    SP_CSS_FONT_VARIANT_CAPS_SMALL,
+    SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL,
+    SP_CSS_FONT_VARIANT_CAPS_PETITE,
+    SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE,
+    SP_CSS_FONT_VARIANT_CAPS_UNICASE,
+    SP_CSS_FONT_VARIANT_CAPS_TITLING,
+};
+
+enum SPCSSFontVariantNumeric {
+    SP_CSS_FONT_VARIANT_NUMERIC_NORMAL,
+    SP_CSS_FONT_VARIANT_NUMERIC_LINING_NUMS,
+    SP_CSS_FONT_VARIANT_NUMERIC_OLDSTYLE_NUMS,
+    SP_CSS_FONT_VARIANT_NUMERIC_PROPORTIONAL_NUMS,
+    SP_CSS_FONT_VARIANT_NUMERIC_TABULAR_NUMS,
+    SP_CSS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS,
+    SP_CSS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS,
+    SP_CSS_FONT_VARIANT_NUMERIC_ORDINAL,
+    SP_CSS_FONT_VARIANT_NUMERIC_SLASHED_ZERO
+};
+
+enum SPCSSFontVariantAlternates {
+    SP_CSS_FONT_VARIANT_ALTERNATES_NORMAL,
+    SP_CSS_FONT_VARIANT_ALTERNATES_HISTORICAL_FORMS,
+    SP_CSS_FONT_VARIANT_ALTERNATES_STYLISTIC,
+    SP_CSS_FONT_VARIANT_ALTERNATES_STYLESET,
+    SP_CSS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT,
+    SP_CSS_FONT_VARIANT_ALTERNATES_SWASH,
+    SP_CSS_FONT_VARIANT_ALTERNATES_ORNAMENTS,
+    SP_CSS_FONT_VARIANT_ALTERNATES_ANNOTATION
+};
+
+enum SPCSSFontVariantEastAsian {
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS78,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS83,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS90,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS04,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_PROPORTIONAL_WIDTH,
+    SP_CSS_FONT_VARIANT_EAST_ASIAN_RUBY
+};
+
 enum SPCSSTextAlign {
     SP_CSS_TEXT_ALIGN_START,
     SP_CSS_TEXT_ALIGN_END,
@@ -309,6 +375,77 @@ static SPStyleEnum const enum_font_stretch[] = {
     {NULL, -1}
 };
 
+static SPStyleEnum const enum_font_variant_ligatures[] = {
+    {"normal", SP_CSS_FONT_VARIANT_LIGATURES_NORMAL},
+    {"none", SP_CSS_FONT_VARIANT_LIGATURES_NONE},
+    {"common-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_COMMON},
+    {"no-common-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NO_COMMON},
+    {"discretionary-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_DISCRETIONARY},
+    {"no-discretionary-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NO_DISCRETIONARY},
+    {"historical-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_HISTORICAL},
+    {"nohistorical-ligatures", SP_CSS_FONT_VARIANT_LIGATURES_NO_HISTORICAL},
+    {"contextual", SP_CSS_FONT_VARIANT_LIGATURES_CONTEXTUAL},
+    {"no-contextual", SP_CSS_FONT_VARIANT_LIGATURES_NO_CONTEXTUAL},
+    {NULL, -1}
+};
+    
+static SPStyleEnum const enum_font_variant_position[] = {
+    {"normal", SP_CSS_FONT_VARIANT_POSITION_NORMAL},
+    {"sub", SP_CSS_FONT_VARIANT_POSITION_SUB},
+    {"super", SP_CSS_FONT_VARIANT_POSITION_SUPER},
+    {NULL, -1}
+};
+    
+static SPStyleEnum const enum_font_variant_caps[] = {
+    {"normal", SP_CSS_FONT_VARIANT_CAPS_NORMAL},
+    {"small-caps", SP_CSS_FONT_VARIANT_CAPS_SMALL},
+    {"all-small-caps", SP_CSS_FONT_VARIANT_CAPS_ALL_SMALL},
+    {"petite-caps", SP_CSS_FONT_VARIANT_CAPS_PETITE},
+    {"all_petite-caps", SP_CSS_FONT_VARIANT_CAPS_ALL_PETITE},
+    {"unicase", SP_CSS_FONT_VARIANT_CAPS_UNICASE},
+    {"titling", SP_CSS_FONT_VARIANT_CAPS_TITLING},
+    {NULL, -1}
+};
+    
+static SPStyleEnum const enum_font_variant_numeric[] = {
+    {"normal", SP_CSS_FONT_VARIANT_NUMERIC_NORMAL},
+    {"lining-nums", SP_CSS_FONT_VARIANT_NUMERIC_LINING_NUMS},
+    {"oldstyle-nums", SP_CSS_FONT_VARIANT_NUMERIC_OLDSTYLE_NUMS},
+    {"proportional-nums", SP_CSS_FONT_VARIANT_NUMERIC_PROPORTIONAL_NUMS},
+    {"tabular-nums", SP_CSS_FONT_VARIANT_NUMERIC_TABULAR_NUMS},
+    {"diagonal-fractions", SP_CSS_FONT_VARIANT_NUMERIC_DIAGONAL_FRACTIONS},
+    {"stacked-fractions", SP_CSS_FONT_VARIANT_NUMERIC_STACKED_FRACTIONS},
+    {"ordinal", SP_CSS_FONT_VARIANT_NUMERIC_ORDINAL},
+    {"slashed-zero", SP_CSS_FONT_VARIANT_NUMERIC_SLASHED_ZERO},
+    {NULL, -1}
+};
+    
+static SPStyleEnum const enum_font_variant_alternates[] = {
+    {"normal", SP_CSS_FONT_VARIANT_ALTERNATES_NORMAL},
+    {"historical-forms", SP_CSS_FONT_VARIANT_ALTERNATES_HISTORICAL_FORMS},
+    {"stylistic", SP_CSS_FONT_VARIANT_ALTERNATES_STYLISTIC},
+    {"styleset", SP_CSS_FONT_VARIANT_ALTERNATES_STYLESET},
+    {"character_variant", SP_CSS_FONT_VARIANT_ALTERNATES_CHARACTER_VARIANT},
+    {"swash", SP_CSS_FONT_VARIANT_ALTERNATES_SWASH},
+    {"ornaments", SP_CSS_FONT_VARIANT_ALTERNATES_ORNAMENTS},
+    {"annotation", SP_CSS_FONT_VARIANT_ALTERNATES_ANNOTATION},
+    {NULL, -1}
+};
+
+static SPStyleEnum const enum_font_variant_east_asian[] = {
+    {"normal", SP_CSS_FONT_VARIANT_EAST_ASIAN_NORMAL},
+    {"jis78", SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS78},
+    {"jis83", SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS83},
+    {"jis90", SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS90},
+    {"jis04", SP_CSS_FONT_VARIANT_EAST_ASIAN_JIS04},
+    {"simplified", SP_CSS_FONT_VARIANT_EAST_ASIAN_SIMPLIFIED},
+    {"traditional", SP_CSS_FONT_VARIANT_EAST_ASIAN_TRADITIONAL},
+    {"full-width", SP_CSS_FONT_VARIANT_EAST_ASIAN_FULL_WIDTH},
+    {"proportional-width", SP_CSS_FONT_VARIANT_EAST_ASIAN_PROPORTIONAL_WIDTH},
+    {"ruby", SP_CSS_FONT_VARIANT_EAST_ASIAN_RUBY},
+    {NULL, -1}
+};
+
 static SPStyleEnum const enum_text_align[] = {
     {"start", SP_CSS_TEXT_ALIGN_START},
     {"end", SP_CSS_TEXT_ALIGN_END},
diff --git a/src/style.cpp b/src/style.cpp
index fa8aed68e..49a13604b 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -14,7 +14,7 @@
  * Copyright (C) 2001 Ximian, Inc.
  * Copyright (C) 2005 Monash University
  * Copyright (C) 2012 Kris De Gussem
- * Copyright (C) 2014 Tavmjong Bah
+ * Copyright (C) 2014-2015 Tavmjong Bah
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -118,6 +118,15 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) :
     font(),                                                      // SPIFont
     font_specification( "-inkscape-font-specification"       ),  // SPIString
 
+    // Font variants
+    font_variant_ligatures( "font-variant-ligatures",  enum_font_variant_ligatures,  SP_CSS_FONT_VARIANT_LIGATURES_NORMAL  ),
+    font_variant_position(  "font-variant-position",   enum_font_variant_position,   SP_CSS_FONT_VARIANT_POSITION_NORMAL   ),
+    font_variant_caps(      "font-variant-caps",       enum_font_variant_caps,       SP_CSS_FONT_VARIANT_CAPS_NORMAL       ),
+    font_variant_numeric(   "font-variant-numeric",    enum_font_variant_numeric,    SP_CSS_FONT_VARIANT_NUMERIC_NORMAL    ),
+    font_variant_alternates("font-variant-alternates", enum_font_variant_alternates, SP_CSS_FONT_VARIANT_ALTERNATES_NORMAL ),
+    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" ),
+
     // Text related properties
     text_indent(      "text-indent",                     0.0 ),  // SPILength
     text_align(       "text-align",      enum_text_align,      SP_CSS_TEXT_ALIGN_START    ),
@@ -288,6 +297,15 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) :
     _properties.push_back( &font );
     _properties.push_back( &font_specification );
 
+    // Font variants
+    _properties.push_back( &font_variant_ligatures );
+    _properties.push_back( &font_variant_position );
+    _properties.push_back( &font_variant_caps );
+    _properties.push_back( &font_variant_numeric );
+    _properties.push_back( &font_variant_alternates );
+    _properties.push_back( &font_variant_east_asian );
+    _properties.push_back( &font_feature_settings );
+
     _properties.push_back( &text_indent );
     _properties.push_back( &text_align );
 
@@ -374,6 +392,14 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) :
     //     _propmap.insert( std::make_pair( font.name,                  reinterpret_cast<SPIBasePtr>(&SPStyle::font                  ) ) ); 
     //     _propmap.insert( std::make_pair( font_specification.name,    reinterpret_cast<SPIBasePtr>(&SPStyle::font_specification    ) ) ); 
 
+    // font_variant_ligatures );
+    // font_variant_position );
+    // font_variant_caps );
+    // font_variant_numeric );
+    // font_variant_alternates );
+    // font_variant_east_asian );
+    // font_feature_settings );
+
     //     _propmap.insert( std::make_pair( text_indent.name,           reinterpret_cast<SPIBasePtr>(&SPStyle::text_indent           ) ) );
     //     _propmap.insert( std::make_pair( text_align.name,            reinterpret_cast<SPIBasePtr>(&SPStyle::text_align            ) ) );
 
@@ -574,9 +600,9 @@ SPStyle::read( SPObject *object, Inkscape::XML::Node *repr ) {
     // std::cout << " MERGING PRESENTATION ATTRIBUTES" << std::endl;
     for(std::vector<SPIBase*>::size_type i = 0; i != _properties.size(); ++i) {
 
-        // Shorthands are not allowed as presentation properites.
-        // Note: text-decoration is converted to a shorthand in CSS 3 but can still be
-        // read as a non-shorthand so it should not be in this list.
+        // Shorthands are not allowed as presentation properites. Note: text-decoration and
+        // font-variant are converted to shorthands in CSS 3 but can still be read as a
+        // non-shorthand for compatability with older renders, so they should not be in this list.
         // We could add a flag to SPIBase to avoid string comparison.
         if( _properties[i]->name.compare( "font" ) != 0 &&
             _properties[i]->name.compare( "marker" ) != 0 ) {
@@ -694,6 +720,29 @@ SPStyle::readIfUnset( gint id, gchar const *val ) {
             font.readIfUnset( val );
             break;
 
+            /* Font Variants CSS 3 */
+        case SP_PROP_FONT_VARIANT_LIGATURES:
+            font_variant_ligatures.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_VARIANT_POSITION:
+            font_variant_position.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_VARIANT_CAPS:
+            font_variant_caps.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_VARIANT_NUMERIC:
+            font_variant_numeric.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_VARIANT_ALTERNATES:
+            font_variant_alternates.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_VARIANT_EAST_ASIAN:
+            font_variant_east_asian.readIfUnset( val );
+            break;
+        case SP_PROP_FONT_FEATURE_SETTINGS:
+            font_feature_settings.readIfUnset( val );
+            break;
+
             /* Text */
         case SP_PROP_TEXT_INDENT:
             text_indent.readIfUnset( val );
diff --git a/src/style.h b/src/style.h
index ab34476b3..2618662f5 100644
--- a/src/style.h
+++ b/src/style.h
@@ -94,7 +94,7 @@ public:
 
     /** Font style */
     SPIEnum font_style;
-    /** Which substyle of the font */
+    /** Which substyle of the font (CSS 2. CSS 3 redefines as shorthand) */
     SPIEnum font_variant;
     /** Weight of the font */
     SPIEnum font_weight;
@@ -111,6 +111,22 @@ public:
     /** Full font name, as font_factory::ConstructFontSpecification would give, for internal use. */
     SPIString font_specification;
 
+    /* Font variants -------------------- */
+    /** Font variant ligatures */
+    SPIEnum font_variant_ligatures;
+    /** Font variant position (subscript/superscript) */
+    SPIEnum font_variant_position;
+    /** Font variant caps (small caps) */
+    SPIEnum font_variant_caps;
+    /** Font variant numeric (numerical formatting) */
+    SPIEnum font_variant_numeric;
+    /** Font variant alternates (alternates/swatches) */
+    SPIEnum font_variant_alternates;
+    /** Font variant East Asian */
+    SPIEnum font_variant_east_asian;
+    /** Font feature settings (Low level access to TrueType tables) */
+    SPIString font_feature_settings;
+
     /* Text ----------------------------- */
 
     /** First line indent of paragraphs (css2 16.1) */