care about font-variant-position in the longhand, fixes #397

Author: ylafon

org/w3c/css/properties/css3/CssFontVariant.java

@@ -41,6 +41,7 @@ public class CssFontVariant extends org.w3c.css.properties.css.CssFontVariant {
     CssFontVariantEastAsian asiValue = null;
     CssFontVariantLigatures ligValue = null;
     CssFontVariantNumeric numValue = null;
+    CssFontVariantPosition posValue = null;
 
     /**
      * Creates a new CssFontVariant
@@ -63,6 +64,7 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
         CssExpression capExp = null;
         CssExpression numExp = null;
         CssExpression asiExp = null;
+        CssExpression posExp = null;
 
         while (!expression.end()) {
             val = expression.getValue();
@@ -138,6 +140,13 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
                             asiExp.addValue(id);
                             break;
                         }
+                        if (CssFontVariantPosition.getAllowedValue(id) != null) {
+                            if (posExp == null) {
+                                posExp = new CssExpression();
+                            }
+                            posExp.addValue(id);
+                            break;
+                        }
                         if (CssFontVariantAlternates.getAllowedIdent(id) != null) {
                             if (altExp == null) {
                                 altExp = new CssExpression();
@@ -165,6 +174,7 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
             CssFontVariantEastAsian asiValue = null;
             CssFontVariantLigatures ligValue = null;
             CssFontVariantNumeric numValue = null;
+            CssFontVariantPosition posValue = null;
             ArrayList<CssValue> vlist = new ArrayList<CssValue>(5);
             if (altExp != null) {
                 altValue = new CssFontVariantAlternates(ac, altExp, check);
@@ -182,6 +192,10 @@ public CssFontVariant(ApplContext ac, CssExpression expression, boolean check)
                 ligValue = new CssFontVariantLigatures(ac, ligExp, check);
                 vlist.add(ligValue.value);
             }
+            if (posExp != null) {
+                posValue = new CssFontVariantPosition(ac, posExp, check);
+                vlist.add(posValue.value);
+            }
             if (numExp != null) {
                 numValue = new CssFontVariantNumeric(ac, numExp, check);
                 vlist.add(numValue.value);
@@ -221,6 +235,9 @@ public void addToStyle(ApplContext ac, CssStyle style) {
         if (numValue != null) {
             numValue.addToStyle(ac, style);
         }
+        if (posValue != null) {
+            posValue.addToStyle(ac, style);
+        }
     }
 }