Fix border and background shorthand parsing

DEVSIX-7028

Author: dmitry.radchuk

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/resolve/shorthand/impl/AbstractBorderShorthandResolver.java

@@ -43,6 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.styledxmlparser.css.resolve.shorthand.impl;
 
 import com.itextpdf.commons.utils.MessageFormatUtil;
+import com.itextpdf.styledxmlparser.css.util.CssUtils;
 import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
 import com.itextpdf.styledxmlparser.css.CommonCssConstants;
 import com.itextpdf.styledxmlparser.css.CssDeclaration;
@@ -94,7 +95,7 @@ public List<CssDeclaration> resolveShorthand(String shorthandExpression) {
                     new CssDeclaration(colorPropName, shorthandExpression));
         }
 
-        String[] props = shorthandExpression.split("\\s+");
+        List<String> props = CssUtils.extractShorthandProperties(shorthandExpression).get(0);
 
         String borderColorValue = null;
         String borderStyleValue = null;

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/resolve/shorthand/impl/AbstractBoxShorthandResolver.java

@@ -43,6 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.styledxmlparser.css.resolve.shorthand.impl;
 
 import com.itextpdf.commons.utils.MessageFormatUtil;
+import com.itextpdf.styledxmlparser.css.util.CssUtils;
 import com.itextpdf.styledxmlparser.logs.StyledXmlParserLogMessageConstant;
 import com.itextpdf.styledxmlparser.css.CommonCssConstants;
 import com.itextpdf.styledxmlparser.css.CssDeclaration;
@@ -90,17 +91,17 @@ public abstract class AbstractBoxShorthandResolver implements IShorthandResolver
      */
     @Override
     public List<CssDeclaration> resolveShorthand(String shorthandExpression) {
-        String[] props = shorthandExpression.split("\\s+");
+        List<String> props = CssUtils.extractShorthandProperties(shorthandExpression).get(0);
         List<CssDeclaration> resolvedDecl = new ArrayList<>();
         String topProperty = MessageFormatUtil.format(_0_TOP_1, getPrefix(), getPostfix());
         String rightProperty = MessageFormatUtil.format(_0_RIGHT_1, getPrefix(), getPostfix());
         String bottomProperty = MessageFormatUtil.format(_0_BOTTOM_1, getPrefix(), getPostfix());
         String leftProperty = MessageFormatUtil.format(_0_LEFT_1, getPrefix(), getPostfix());
-        if (props.length == 1) {
-            resolvedDecl.add(new CssDeclaration(topProperty, props[0]));
-            resolvedDecl.add(new CssDeclaration(rightProperty, props[0]));
-            resolvedDecl.add(new CssDeclaration(bottomProperty, props[0]));
-            resolvedDecl.add(new CssDeclaration(leftProperty, props[0]));
+        if (props.size() == 1) {
+            resolvedDecl.add(new CssDeclaration(topProperty, props.get(0)));
+            resolvedDecl.add(new CssDeclaration(rightProperty, props.get(0)));
+            resolvedDecl.add(new CssDeclaration(bottomProperty, props.get(0)));
+            resolvedDecl.add(new CssDeclaration(leftProperty, props.get(0)));
         } else {
             for (String prop : props) {
                 if (CommonCssConstants.INHERIT.equals(prop) || CommonCssConstants.INITIAL.equals(prop)) {
@@ -111,21 +112,21 @@ public List<CssDeclaration> resolveShorthand(String shorthandExpression) {
                     return Collections.<CssDeclaration>emptyList();
                 }
             }
-            if (props.length == 2) {
-                resolvedDecl.add(new CssDeclaration(topProperty, props[0]));
-                resolvedDecl.add(new CssDeclaration(rightProperty, props[1]));
-                resolvedDecl.add(new CssDeclaration(bottomProperty, props[0]));
-                resolvedDecl.add(new CssDeclaration(leftProperty, props[1]));
-            } else if (props.length == 3) {
-                resolvedDecl.add(new CssDeclaration(topProperty, props[0]));
-                resolvedDecl.add(new CssDeclaration(rightProperty, props[1]));
-                resolvedDecl.add(new CssDeclaration(bottomProperty, props[2]));
-                resolvedDecl.add(new CssDeclaration(leftProperty, props[1]));
-            } else if (props.length == 4) {
-                resolvedDecl.add(new CssDeclaration(topProperty, props[0]));
-                resolvedDecl.add(new CssDeclaration(rightProperty, props[1]));
-                resolvedDecl.add(new CssDeclaration(bottomProperty, props[2]));
-                resolvedDecl.add(new CssDeclaration(leftProperty, props[3]));
+            if (props.size() == 2) {
+                resolvedDecl.add(new CssDeclaration(topProperty, props.get(0)));
+                resolvedDecl.add(new CssDeclaration(rightProperty, props.get(1)));
+                resolvedDecl.add(new CssDeclaration(bottomProperty, props.get(0)));
+                resolvedDecl.add(new CssDeclaration(leftProperty, props.get(1)));
+            } else if (props.size() == 3) {
+                resolvedDecl.add(new CssDeclaration(topProperty, props.get(0)));
+                resolvedDecl.add(new CssDeclaration(rightProperty, props.get(1)));
+                resolvedDecl.add(new CssDeclaration(bottomProperty, props.get(2)));
+                resolvedDecl.add(new CssDeclaration(leftProperty, props.get(1)));
+            } else if (props.size() == 4) {
+                resolvedDecl.add(new CssDeclaration(topProperty, props.get(0)));
+                resolvedDecl.add(new CssDeclaration(rightProperty, props.get(1)));
+                resolvedDecl.add(new CssDeclaration(bottomProperty, props.get(2)));
+                resolvedDecl.add(new CssDeclaration(leftProperty, props.get(3)));
             }
         }
         return resolvedDecl;

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/resolve/shorthand/impl/BackgroundShorthandResolver.java

@@ -233,7 +233,8 @@ private static boolean processAllSpecifiedProperties(List<String> props,
         boolean propertyProcessedCorrectly = true;
         for (final String value : props) {
             final int slashCharInd = value.indexOf('/');
-            if (slashCharInd > 0 && slashCharInd < value.length() - 1 && !slashEncountered && !value.contains("url(")) {
+            if (slashCharInd > 0 && slashCharInd < value.length() - 1 && !slashEncountered && !value.contains("url(")
+                    && !value.contains("device-cmyk(")) {
                 slashEncountered = true;
                 propertyProcessedCorrectly = processValueWithSlash(value, slashCharInd, resolvedProps, usedTypes);
             } else {