Support linenames for grid-template-columns/rows

DEVSIX-8368

Author: vitali-pr

styled-xml-parser/src/main/java/com/itextpdf/styledxmlparser/css/parse/CssDeclarationValueTokenizer.java

@@ -141,6 +141,14 @@ private Token getNextToken() {
                     stringQuote = curChar;
                     inString = true;
                     return new Token(buff.toString(), TokenType.FUNCTION);
+                } else if (curChar == '[') {
+                    stringQuote = 0;
+                    inString = true;
+                    buff.append(curChar);
+                } else if (curChar == ']') {
+                    inString = false;
+                    buff.append(curChar);
+                    return new Token(buff.toString(), TokenType.STRING);
                 } else if (curChar == ',' && !inString && functionDepth == 0) {
                     if (buff.length() == 0) {
                         return new Token(",", TokenType.COMMA);
@@ -149,10 +157,12 @@ private Token getNextToken() {
                         return new Token(buff.toString(), TokenType.UNKNOWN);
                     }
                 } else if (Character.isWhitespace(curChar)) {
-                    if (functionDepth > 0) {
+                    if (functionDepth > 0 || inString) {
                         buff.append(curChar);
                     }
-                    return new Token(buff.toString(), functionDepth > 0 ? TokenType.FUNCTION : TokenType.UNKNOWN);
+                    if (!inString) {
+                        return new Token(buff.toString(), functionDepth > 0 ? TokenType.FUNCTION : TokenType.UNKNOWN);
+                    }
                 } else {
                     buff.append(curChar);
                 }
@@ -179,9 +189,13 @@ private boolean isHexDigit(char c) {
      */
     private void processFunctionToken(Token token, StringBuilder functionBuffer) {
         if (token.isString()) {
-            functionBuffer.append(stringQuote);
+            if (stringQuote != 0) {
+                functionBuffer.append(stringQuote);
+            }
             functionBuffer.append(token.getValue());
-            functionBuffer.append(stringQuote);
+            if (stringQuote != 0) {
+                functionBuffer.append(stringQuote);
+            }
         } else {
             functionBuffer.append(token.getValue());
         }

styled-xml-parser/src/test/java/com/itextpdf/styledxmlparser/css/resolve/CssDeclarationValueTokenizerTest.java

@@ -65,6 +65,39 @@ public void functionTest06() {
         runTest("a('x'), b('x')", Arrays.asList("a('x')", ",", "b('x')"), Arrays.asList(CssDeclarationValueTokenizer.TokenType.FUNCTION, CssDeclarationValueTokenizer.TokenType.COMMA, CssDeclarationValueTokenizer.TokenType.FUNCTION));
     }
 
+    @Test
+    public void stringTest01() {
+        runTest("'a b c'", Arrays.asList("a b c"), Arrays.asList(CssDeclarationValueTokenizer.TokenType.STRING));
+    }
+
+    @Test
+    public void stringTest02() {
+        runTest("\"a b c\"", Arrays.asList("a b c"), Arrays.asList(CssDeclarationValueTokenizer.TokenType.STRING));
+    }
+
+    @Test
+    public void stringTest03() {
+        runTest("[ aa  bb  cc ]", Arrays.asList("[ aa  bb  cc ]"),
+                Arrays.asList(CssDeclarationValueTokenizer.TokenType.STRING));
+    }
+
+    @Test
+    public void stringTest04() {
+        runTest("[aa bb cc] [dd ee] 'ff ff'", Arrays.asList("[aa bb cc]", "[dd ee]", "ff ff"),
+                Arrays.asList(CssDeclarationValueTokenizer.TokenType.STRING,
+                        CssDeclarationValueTokenizer.TokenType.STRING,
+                        CssDeclarationValueTokenizer.TokenType.STRING));
+    }
+
+    @Test
+    public void functionWithSquareBracketsTest04() {
+        runTest("'prefix' repeat(3, [aa bb cc] 2 [dd ee] 3) 'ff ff'",
+                Arrays.asList("prefix", "repeat(3, [aa bb cc] 2 [dd ee] 3)", "ff ff"),
+                Arrays.asList(CssDeclarationValueTokenizer.TokenType.STRING,
+                        CssDeclarationValueTokenizer.TokenType.FUNCTION,
+                        CssDeclarationValueTokenizer.TokenType.STRING));
+    }
+
     private void runTest(String src, List<String> tokenValues, List<CssDeclarationValueTokenizer.TokenType> tokenTypes) {
         CssDeclarationValueTokenizer tokenizer = new CssDeclarationValueTokenizer(src);
         CssDeclarationValueTokenizer.Token token = null;