diff --git a/org/w3c/css/parser/analyzer/CssParser.java b/org/w3c/css/parser/analyzer/CssParser.java
index 4160870c..90bbd8ac 100644
--- a/org/w3c/css/parser/analyzer/CssParser.java
+++ b/org/w3c/css/parser/analyzer/CssParser.java
@@ -6144,7 +6144,7 @@ final public void pseudo(CssSelectors s) throws ParseException {
  * @exception ParseException exception during the parse
  */
   final public CssProperty declaration() throws ParseException {String string_property;
-  CssExpression values;
+  CssExpression values = null;
   boolean important = false;
     try {
       string_property = property();
@@ -6162,14 +6162,61 @@ final public void pseudo(CssSelectors s) throws ParseException {
         }
         jj_consume_token(S);
       }
-      values = expr();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PLUS:
+      case MINUS:
+      case AND:
+      case OR:
+      case ONLY:
+      case NOT:
+      case STRING:
+      case IDENT:
+      case HASHIDENT:
+      case HASH:
+      case PROGID:
+      case DIV:
+      case LBRACKET:
+      case RBRACKET:
+      case URL:
+      case RELFONTLENGTH:
+      case RELVIEWLENGTH:
+      case ABSOLUTLENGTH:
+      case FLEX:
+      case ANGLE:
+      case SPL:
+      case ST:
+      case TIME:
+      case FREQ:
+      case RESOLUTION:
+      case DIMEN_9:
+      case DIMEN:
+      case PERCENTAGE:
+      case NUMBER:
+      case IMPORTANT_NOT:
+      case UNICODERANGE:
+      case FUNCTIONCALC:
+      case FUNCTIONMATHN:
+      case FUNCTIONMATH1:
+      case FUNCTIONMATH2:
+      case FUNCTIONROUND:
+      case FUNCTIONCLAMP:
+      case FUNCTIONATTR:
+      case FUNCTIONVAR:
+      case FUNCTION:{
+        values = expr();
+        break;
+        }
+      default:
+        jj_la1[235] = jj_gen;
+        ;
+      }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IMPORTANT_SYM:{
         important = prio();
         break;
         }
       default:
-        jj_la1[235] = jj_gen;
+        jj_la1[236] = jj_gen;
         ;
       }
 try {
@@ -6181,19 +6228,24 @@ final public void pseudo(CssSelectors s) throws ParseException {
             if (incompatible_error) {
                 {if (true) throw new InvalidParamException("notforcss1", "inherit", ac);}
             }
-
-            if (values.getCount() != 0) {
+            if (values == null) {
+                values = new CssExpression();
+            }
+            if (values.getCount() != 0 || string_property.startsWith("--")) {
                 CssProperty p = handleDeclaration(string_property.toLowerCase(),
                                                   values, important);
                 // Did the property recognize all values in the expression ?
 
                 if (!values.end() && ac.getMedium() == null) {
-                        addError(new InvalidParamException("unrecognize", "", ac),
+                   addError(new InvalidParamException("unrecognize", "", ac),
                              values);
                 } else {
                     // ok, return the new property
                     {if ("" != null) return p;}
                 }
+            } else if (values.getCount() == 0) {
+                // old behaviour throw when a property has an empty expression
+                {if (true) throw new ParseException();}
             }
         } catch (InvalidParamException e) {
             incompatible_error = false;
@@ -6237,7 +6289,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[236] = jj_gen;
+        jj_la1[237] = jj_gen;
         break label_157;
       }
       jj_consume_token(S);
@@ -6292,7 +6344,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[237] = jj_gen;
+        jj_la1[238] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6304,7 +6356,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[238] = jj_gen;
+          jj_la1[239] = jj_gen;
           break label_159;
         }
         jj_consume_token(S);
@@ -6325,7 +6377,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[239] = jj_gen;
+        jj_la1[240] = jj_gen;
         break label_158;
       }
     }
@@ -6375,7 +6427,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[240] = jj_gen;
+        jj_la1[241] = jj_gen;
         break label_161;
       }
       jj_consume_token(S);
@@ -6391,7 +6443,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[241] = jj_gen;
+          jj_la1[242] = jj_gen;
           break label_162;
         }
         jj_consume_token(S);
@@ -6418,7 +6470,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[242] = jj_gen;
+        jj_la1[243] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6430,7 +6482,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[243] = jj_gen;
+          jj_la1[244] = jj_gen;
           break label_163;
         }
         jj_consume_token(S);
@@ -6495,7 +6547,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[244] = jj_gen;
+          jj_la1[245] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -6507,7 +6559,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[245] = jj_gen;
+            jj_la1[246] = jj_gen;
             break label_164;
           }
           jj_consume_token(S);
@@ -6521,7 +6573,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[246] = jj_gen;
+            jj_la1[247] = jj_gen;
             break label_165;
           }
           jj_consume_token(S);
@@ -6554,7 +6606,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[247] = jj_gen;
+            jj_la1[248] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -6566,7 +6618,7 @@ final public boolean prio() throws ParseException {
               break;
               }
             default:
-              jj_la1[248] = jj_gen;
+              jj_la1[249] = jj_gen;
               break label_166;
             }
             jj_consume_token(S);
@@ -6575,13 +6627,13 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[249] = jj_gen;
+          jj_la1[250] = jj_gen;
           ;
         }
         break;
         }
       default:
-        jj_la1[250] = jj_gen;
+        jj_la1[251] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6595,7 +6647,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[251] = jj_gen;
+        jj_la1[252] = jj_gen;
         break label_167;
       }
       jj_consume_token(S);
@@ -6679,7 +6731,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[252] = jj_gen;
+        jj_la1[253] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6785,7 +6837,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[253] = jj_gen;
+        jj_la1[254] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -6869,7 +6921,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[254] = jj_gen;
+          jj_la1[255] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -6923,14 +6975,14 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[255] = jj_gen;
+        jj_la1[256] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[256] = jj_gen;
+      jj_la1[257] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -6983,7 +7035,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[257] = jj_gen;
+        jj_la1[258] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -6998,7 +7050,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[258] = jj_gen;
+            jj_la1[259] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -7124,14 +7176,14 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[259] = jj_gen;
+          jj_la1[260] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[260] = jj_gen;
+        jj_la1[261] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7143,7 +7195,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[261] = jj_gen;
+          jj_la1[262] = jj_gen;
           break label_170;
         }
         jj_consume_token(S);
@@ -7214,7 +7266,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[262] = jj_gen;
+        jj_la1[263] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7226,7 +7278,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[263] = jj_gen;
+          jj_la1[264] = jj_gen;
           break label_171;
         }
         jj_consume_token(S);
@@ -7234,7 +7286,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[264] = jj_gen;
+      jj_la1[265] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -7259,7 +7311,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[265] = jj_gen;
+      jj_la1[266] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -7279,7 +7331,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[266] = jj_gen;
+        jj_la1[267] = jj_gen;
         break label_172;
       }
       jj_consume_token(S);
@@ -7294,7 +7346,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[267] = jj_gen;
+        jj_la1[268] = jj_gen;
         break label_173;
       }
       jj_consume_token(S);
@@ -7307,7 +7359,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[268] = jj_gen;
+        jj_la1[269] = jj_gen;
         break label_174;
       }
       jj_consume_token(COMMA);
@@ -7319,7 +7371,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[269] = jj_gen;
+          jj_la1[270] = jj_gen;
           break label_175;
         }
         jj_consume_token(S);
@@ -7334,7 +7386,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[270] = jj_gen;
+          jj_la1[271] = jj_gen;
           break label_176;
         }
         jj_consume_token(S);
@@ -7359,7 +7411,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[271] = jj_gen;
+        jj_la1[272] = jj_gen;
         break label_177;
       }
       jj_consume_token(S);
@@ -7395,7 +7447,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[272] = jj_gen;
+        jj_la1[273] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7408,7 +7460,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[273] = jj_gen;
+        jj_la1[274] = jj_gen;
         break label_178;
       }
       jj_consume_token(S);
@@ -7421,7 +7473,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[274] = jj_gen;
+        jj_la1[275] = jj_gen;
         break label_179;
       }
       jj_consume_token(COMMA);
@@ -7433,7 +7485,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[275] = jj_gen;
+          jj_la1[276] = jj_gen;
           break label_180;
         }
         jj_consume_token(S);
@@ -7448,7 +7500,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[276] = jj_gen;
+          jj_la1[277] = jj_gen;
           break label_181;
         }
         jj_consume_token(S);
@@ -7472,7 +7524,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[277] = jj_gen;
+        jj_la1[278] = jj_gen;
         break label_182;
       }
       jj_consume_token(S);
@@ -7487,7 +7539,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[278] = jj_gen;
+        jj_la1[279] = jj_gen;
         break label_183;
       }
       jj_consume_token(S);
@@ -7510,7 +7562,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[279] = jj_gen;
+        jj_la1[280] = jj_gen;
         break label_184;
       }
       jj_consume_token(S);
@@ -7525,7 +7577,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[280] = jj_gen;
+        jj_la1[281] = jj_gen;
         break label_185;
       }
       jj_consume_token(S);
@@ -7541,7 +7593,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[281] = jj_gen;
+          jj_la1[282] = jj_gen;
           break label_186;
         }
         jj_consume_token(S);
@@ -7556,7 +7608,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[282] = jj_gen;
+          jj_la1[283] = jj_gen;
           break label_187;
         }
         jj_consume_token(S);
@@ -7564,7 +7616,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[283] = jj_gen;
+      jj_la1[284] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -7585,7 +7637,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[284] = jj_gen;
+        jj_la1[285] = jj_gen;
         break label_188;
       }
       jj_consume_token(S);
@@ -7599,7 +7651,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[285] = jj_gen;
+        jj_la1[286] = jj_gen;
         break label_189;
       }
       jj_consume_token(S);
@@ -7613,7 +7665,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[286] = jj_gen;
+        jj_la1[287] = jj_gen;
         break label_190;
       }
       jj_consume_token(S);
@@ -7627,7 +7679,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[287] = jj_gen;
+        jj_la1[288] = jj_gen;
         break label_191;
       }
       jj_consume_token(S);
@@ -7641,7 +7693,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[288] = jj_gen;
+        jj_la1[289] = jj_gen;
         break label_192;
       }
       jj_consume_token(S);
@@ -7655,7 +7707,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[289] = jj_gen;
+        jj_la1[290] = jj_gen;
         break label_193;
       }
       jj_consume_token(S);
@@ -7682,7 +7734,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[290] = jj_gen;
+        jj_la1[291] = jj_gen;
         break label_194;
       }
       jj_consume_token(S);
@@ -7696,7 +7748,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[291] = jj_gen;
+        jj_la1[292] = jj_gen;
         break label_195;
       }
       jj_consume_token(S);
@@ -7755,7 +7807,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[292] = jj_gen;
+            jj_la1[293] = jj_gen;
             break label_197;
           }
           jj_consume_token(S);
@@ -7765,7 +7817,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[293] = jj_gen;
+        jj_la1[294] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7781,7 +7833,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[294] = jj_gen;
+          jj_la1[295] = jj_gen;
           break label_198;
         }
       }
@@ -7827,7 +7879,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[295] = jj_gen;
+          jj_la1[296] = jj_gen;
           break label_200;
         }
         jj_consume_token(S);
@@ -7843,7 +7895,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[296] = jj_gen;
+            jj_la1[297] = jj_gen;
             break label_201;
           }
           jj_consume_token(S);
@@ -7861,7 +7913,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[297] = jj_gen;
+            jj_la1[298] = jj_gen;
             break label_202;
           }
           jj_consume_token(S);
@@ -7883,14 +7935,14 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[298] = jj_gen;
+          jj_la1[299] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[299] = jj_gen;
+        jj_la1[300] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7925,7 +7977,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[300] = jj_gen;
+        jj_la1[301] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -7938,7 +7990,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[301] = jj_gen;
+        jj_la1[302] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -7955,7 +8007,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[302] = jj_gen;
+          jj_la1[303] = jj_gen;
           break label_203;
         }
         jj_consume_token(S);
@@ -7969,7 +8021,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[303] = jj_gen;
+          jj_la1[304] = jj_gen;
           break label_204;
         }
         jj_consume_token(S);
@@ -7979,7 +8031,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[304] = jj_gen;
+      jj_la1[305] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -8018,7 +8070,7 @@ final public boolean prio() throws ParseException {
             break;
             }
           default:
-            jj_la1[305] = jj_gen;
+            jj_la1[306] = jj_gen;
             break label_206;
           }
           jj_consume_token(S);
@@ -8028,7 +8080,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[306] = jj_gen;
+        jj_la1[307] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8044,7 +8096,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[307] = jj_gen;
+          jj_la1[308] = jj_gen;
           break label_207;
         }
       }
@@ -8086,7 +8138,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[308] = jj_gen;
+          jj_la1[309] = jj_gen;
           break label_209;
         }
         jj_consume_token(S);
@@ -8101,7 +8153,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[309] = jj_gen;
+        jj_la1[310] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8113,7 +8165,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[310] = jj_gen;
+          jj_la1[311] = jj_gen;
           break label_210;
         }
         jj_consume_token(S);
@@ -8155,7 +8207,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[311] = jj_gen;
+        jj_la1[312] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -8171,7 +8223,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[312] = jj_gen;
+          jj_la1[313] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -8219,7 +8271,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[313] = jj_gen;
+        jj_la1[314] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8235,7 +8287,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[314] = jj_gen;
+          jj_la1[315] = jj_gen;
           break label_211;
         }
         jj_consume_token(S);
@@ -8249,7 +8301,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[315] = jj_gen;
+          jj_la1[316] = jj_gen;
           break label_212;
         }
         jj_consume_token(S);
@@ -8282,7 +8334,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[316] = jj_gen;
+      jj_la1[317] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -8302,7 +8354,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[317] = jj_gen;
+        jj_la1[318] = jj_gen;
         break label_213;
       }
       jj_consume_token(S);
@@ -8316,7 +8368,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[318] = jj_gen;
+        jj_la1[319] = jj_gen;
         break label_214;
       }
       jj_consume_token(S);
@@ -8344,7 +8396,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[319] = jj_gen;
+        jj_la1[320] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8357,7 +8409,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[320] = jj_gen;
+          jj_la1[321] = jj_gen;
           break label_215;
         }
         jj_consume_token(S);
@@ -8365,7 +8417,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[321] = jj_gen;
+      jj_la1[322] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -8380,7 +8432,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[322] = jj_gen;
+          jj_la1[323] = jj_gen;
           break label_216;
         }
         jj_consume_token(S);
@@ -8389,7 +8441,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[323] = jj_gen;
+      jj_la1[324] = jj_gen;
       ;
     }
     jj_consume_token(RPAREN);
@@ -8412,7 +8464,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[324] = jj_gen;
+        jj_la1[325] = jj_gen;
         break label_217;
       }
       jj_consume_token(S);
@@ -8427,7 +8479,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[325] = jj_gen;
+        jj_la1[326] = jj_gen;
         break label_218;
       }
       jj_consume_token(COMMA);
@@ -8439,7 +8491,7 @@ final public boolean prio() throws ParseException {
           break;
           }
         default:
-          jj_la1[326] = jj_gen;
+          jj_la1[327] = jj_gen;
           break label_219;
         }
         jj_consume_token(S);
@@ -8472,7 +8524,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[327] = jj_gen;
+        jj_la1[328] = jj_gen;
         break label_220;
       }
       jj_consume_token(S);
@@ -8500,7 +8552,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[328] = jj_gen;
+        jj_la1[329] = jj_gen;
         break label_221;
       }
       jj_consume_token(S);
@@ -8551,7 +8603,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[329] = jj_gen;
+        jj_la1[330] = jj_gen;
         ;
       }
       jj_consume_token(RPAREN);
@@ -8639,7 +8691,7 @@ final public boolean prio() throws ParseException {
         break;
         }
       default:
-        jj_la1[330] = jj_gen;
+        jj_la1[331] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -8671,7 +8723,7 @@ final public boolean prio() throws ParseException {
       break;
       }
     default:
-      jj_la1[331] = jj_gen;
+      jj_la1[332] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -9142,6 +9194,17 @@ private boolean jj_3R_300()
     return false;
   }
 
+  private boolean jj_3R_279()
+ {
+    if (jj_3R_240()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_19()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_299()
  {
     if (jj_3R_370()) return true;
@@ -9160,6 +9223,18 @@ private boolean jj_3R_297()
     return false;
   }
 
+  private boolean jj_3R_450()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_449()
+ {
+    if (jj_scan_token(STRING)) return true;
+    return false;
+  }
+
   private boolean jj_3R_263()
  {
     Token xsp;
@@ -9177,29 +9252,6 @@ private boolean jj_3R_263()
     return false;
   }
 
-  private boolean jj_3R_279()
- {
-    if (jj_3R_240()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_19()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_450()
- {
-    if (jj_3R_238()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_449()
- {
-    if (jj_scan_token(STRING)) return true;
-    return false;
-  }
-
   private boolean jj_3R_448()
  {
     if (jj_scan_token(DIMEN)) return true;
@@ -9397,12 +9449,6 @@ private boolean jj_3R_455()
     return false;
   }
 
-  private boolean jj_3R_362()
- {
-    if (jj_3R_393()) return true;
-    return false;
-  }
-
   private boolean jj_3R_384()
  {
     Token xsp;
@@ -9414,6 +9460,12 @@ private boolean jj_3R_384()
     return false;
   }
 
+  private boolean jj_3R_362()
+ {
+    if (jj_3R_393()) return true;
+    return false;
+  }
+
   private boolean jj_3R_374()
  {
     if (jj_scan_token(FUNCTIONATTR)) return true;
@@ -9435,12 +9487,6 @@ private boolean jj_3R_374()
     return false;
   }
 
-  private boolean jj_3R_430()
- {
-    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
-    return false;
-  }
-
   private boolean jj_3R_359()
  {
     if (jj_3R_360()) return true;
@@ -9453,6 +9499,12 @@ private boolean jj_3R_358()
     return false;
   }
 
+  private boolean jj_3R_430()
+ {
+    if (true) { jj_la = 0; jj_scanpos = jj_lastpos; return false;}
+    return false;
+  }
+
   private boolean jj_3R_357()
  {
     if (jj_3R_373()) return true;
@@ -9518,35 +9570,12 @@ private boolean jj_3R_388()
     return false;
   }
 
-  private boolean jj_3R_368()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_395()) {
-    jj_scanpos = xsp;
-    if (jj_3R_396()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_395()
- {
-    if (jj_scan_token(HASHIDENT)) return true;
-    return false;
-  }
-
   private boolean jj_3R_387()
  {
     if (jj_scan_token(RELVIEWLENGTH)) return true;
     return false;
   }
 
-  private boolean jj_3R_439()
- {
-    if (jj_3R_238()) return true;
-    return false;
-  }
-
   private boolean jj_3R_383()
  {
     if (jj_3R_254()) return true;
@@ -9599,6 +9628,23 @@ private boolean jj_3R_353()
     return false;
   }
 
+  private boolean jj_3R_368()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_395()) {
+    jj_scanpos = xsp;
+    if (jj_3R_396()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_395()
+ {
+    if (jj_scan_token(HASHIDENT)) return true;
+    return false;
+  }
+
   private boolean jj_3R_273()
  {
     Token xsp;
@@ -9625,6 +9671,12 @@ private boolean jj_3R_273()
     return false;
   }
 
+  private boolean jj_3R_439()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
   private boolean jj_3R_363()
  {
     if (jj_3R_394()) return true;
@@ -9665,6 +9717,12 @@ private boolean jj_3R_282()
     return false;
   }
 
+  private boolean jj_3R_276()
+ {
+    if (jj_scan_token(S)) return true;
+    return false;
+  }
+
   private boolean jj_3R_429()
  {
     if (jj_3R_438()) return true;
@@ -9676,9 +9734,14 @@ private boolean jj_3R_429()
     return false;
   }
 
-  private boolean jj_3R_276()
+  private boolean jj_3R_246()
  {
-    if (jj_scan_token(S)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_276()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
@@ -9702,23 +9765,6 @@ private boolean jj_3R_293()
     return false;
   }
 
-  private boolean jj_3R_246()
- {
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_276()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(MINUS)) return true;
-    return false;
-  }
-
-  private boolean jj_3_3()
- {
-    if (jj_3R_223()) return true;
-    return false;
-  }
-
   private boolean jj_3_28()
  {
     Token xsp;
@@ -9739,6 +9785,12 @@ private boolean jj_3_28()
     return false;
   }
 
+  private boolean jj_3_3()
+ {
+    if (jj_3R_223()) return true;
+    return false;
+  }
+
   private boolean jj_3R_226()
  {
     if (jj_3R_254()) return true;
@@ -9807,6 +9859,22 @@ private boolean jj_3R_436()
     return false;
   }
 
+  private boolean jj_3_27()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(28)) {
+    jj_scanpos = xsp;
+    if (jj_3R_246()) return true;
+    }
+    if (jj_scan_token(21)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_291()
  {
     Token xsp;
@@ -9851,22 +9919,6 @@ private boolean jj_3R_252()
     return false;
   }
 
-  private boolean jj_3_27()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(28)) {
-    jj_scanpos = xsp;
-    if (jj_3R_246()) return true;
-    }
-    if (jj_scan_token(21)) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   private boolean jj_3R_425()
  {
     if (jj_3R_435()) return true;
@@ -9932,6 +9984,18 @@ private boolean jj_3R_289()
     return false;
   }
 
+  private boolean jj_3R_361()
+ {
+    if (jj_3R_254()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_278()
+ {
+    if (jj_scan_token(LPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_424()
  {
     Token xsp;
@@ -9950,9 +10014,27 @@ private boolean jj_3R_424()
     return false;
   }
 
-  private boolean jj_3R_361()
+  private boolean jj_3R_277()
  {
-    if (jj_3R_254()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_361()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(75)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(41)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_247()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_277()) {
+    jj_scanpos = xsp;
+    if (jj_3R_278()) return true;
+    }
     return false;
   }
 
@@ -9967,12 +10049,6 @@ private boolean jj_3R_225()
     return false;
   }
 
-  private boolean jj_3R_278()
- {
-    if (jj_scan_token(LPAREN)) return true;
-    return false;
-  }
-
   private boolean jj_3R_288()
  {
     Token xsp;
@@ -9993,30 +10069,6 @@ private boolean jj_3R_288()
     return false;
   }
 
-  private boolean jj_3R_277()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_361()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(75)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(41)) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_247()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_277()) {
-    jj_scanpos = xsp;
-    if (jj_3R_278()) return true;
-    }
-    return false;
-  }
-
   private boolean jj_3R_228()
  {
     if (jj_3R_254()) return true;
@@ -10169,21 +10221,27 @@ private boolean jj_3R_261()
     return false;
   }
 
-  private boolean jj_3R_451()
+  private boolean jj_3R_275()
  {
-    if (jj_3R_254()) return true;
+    if (jj_3R_360()) return true;
     return false;
   }
 
-  private boolean jj_3R_227()
+  private boolean jj_3R_274()
+ {
+    if (jj_3R_247()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_451()
  {
     if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3R_275()
+  private boolean jj_3R_227()
  {
-    if (jj_3R_360()) return true;
+    if (jj_3R_254()) return true;
     return false;
   }
 
@@ -10204,9 +10262,31 @@ private boolean jj_3R_260()
     return false;
   }
 
-  private boolean jj_3R_274()
+  private boolean jj_3R_245()
  {
-    if (jj_3R_247()) return true;
+    if (jj_scan_token(DIV)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_274()) {
+    jj_scanpos = xsp;
+    if (jj_3R_275()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_244()
+ {
+    if (jj_scan_token(ANY)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_273()) return true;
     return false;
   }
 
@@ -10234,31 +10314,18 @@ private boolean jj_3_5()
     return false;
   }
 
-  private boolean jj_3R_245()
+  private boolean jj_3_26()
  {
-    if (jj_scan_token(DIV)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_274()) {
+    if (jj_3R_244()) {
     jj_scanpos = xsp;
-    if (jj_3R_275()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_244()
- {
-    if (jj_scan_token(ANY)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    if (jj_3R_245()) return true;
     }
-    if (jj_3R_273()) return true;
     return false;
   }
 
@@ -10274,6 +10341,12 @@ private boolean jj_3R_232()
     return false;
   }
 
+  private boolean jj_3R_272()
+ {
+    if (jj_scan_token(S)) return true;
+    return false;
+  }
+
   private boolean jj_3_8()
  {
     Token xsp;
@@ -10283,18 +10356,14 @@ private boolean jj_3_8()
     return false;
   }
 
-  private boolean jj_3_26()
+  private boolean jj_3R_243()
  {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_244()) {
-    jj_scanpos = xsp;
-    if (jj_3R_245()) return true;
+      if (jj_3R_272()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
@@ -10304,20 +10373,14 @@ private boolean jj_3R_407()
     return false;
   }
 
-  private boolean jj_3R_272()
- {
-    if (jj_scan_token(S)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_243()
+  private boolean jj_3R_418()
  {
+    if (jj_3R_273()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_272()) { jj_scanpos = xsp; break; }
+      if (jj_3_26()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
@@ -10347,17 +10410,6 @@ private boolean jj_3R_442()
     return false;
   }
 
-  private boolean jj_3R_418()
- {
-    if (jj_3R_273()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_26()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   private boolean jj_3R_393()
  {
     if (jj_scan_token(LPAREN)) return true;
@@ -10426,37 +10478,37 @@ private boolean jj_3R_254()
     return false;
   }
 
-  private boolean jj_3R_258()
- {
-    if (jj_3R_238()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_259()
+  private boolean jj_3_25()
  {
-    if (jj_scan_token(FUNCTIONSLOTTED)) return true;
     Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(28)) {
+    jj_scanpos = xsp;
+    if (jj_3R_243()) return true;
+    }
+    if (jj_scan_token(21)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_3R_230()) return true;
     return false;
   }
 
-  private boolean jj_3_25()
+  private boolean jj_3R_258()
  {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_259()
+ {
+    if (jj_scan_token(FUNCTIONSLOTTED)) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(28)) {
-    jj_scanpos = xsp;
-    if (jj_3R_243()) return true;
-    }
-    if (jj_scan_token(21)) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_230()) return true;
     return false;
   }
 
@@ -10478,6 +10530,17 @@ private boolean jj_3R_366()
     return false;
   }
 
+  private boolean jj_3R_400()
+ {
+    if (jj_3R_418()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_25()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_286()
  {
     Token xsp;
@@ -10545,17 +10608,6 @@ private boolean jj_3R_285()
     return false;
   }
 
-  private boolean jj_3R_400()
- {
-    if (jj_3R_418()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_25()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
   private boolean jj_3R_255()
  {
     Token xsp;
@@ -10798,6 +10850,12 @@ private boolean jj_3R_422()
     return false;
   }
 
+  private boolean jj_3R_402()
+ {
+    if (jj_3R_420()) return true;
+    return false;
+  }
+
   private boolean jj_3_18()
  {
     Token xsp;
@@ -10819,12 +10877,6 @@ private boolean jj_3_17()
     return false;
   }
 
-  private boolean jj_3R_402()
- {
-    if (jj_3R_420()) return true;
-    return false;
-  }
-
   private boolean jj_3R_417()
  {
     if (jj_scan_token(STRING)) return true;
@@ -10843,6 +10895,27 @@ private boolean jj_3R_415()
     return false;
   }
 
+  private boolean jj_3R_421()
+ {
+    if (jj_scan_token(FUNCTIONMATHN)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_400()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_453()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(RPAREN)) return true;
+    return false;
+  }
+
   private boolean jj_3R_414()
  {
     if (jj_scan_token(SUFFIXMATCH)) return true;
@@ -10886,64 +10959,22 @@ private boolean jj_3R_399()
     if (jj_3R_413()) {
     jj_scanpos = xsp;
     if (jj_3R_414()) {
-    jj_scanpos = xsp;
-    if (jj_3R_415()) return true;
-    }
-    }
-    }
-    }
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_416()) {
-    jj_scanpos = xsp;
-    if (jj_3R_417()) return true;
-    }
-    return false;
-  }
-
-  private boolean jj_3R_421()
- {
-    if (jj_scan_token(FUNCTIONMATHN)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_400()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_453()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(RPAREN)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_370()
- {
-    if (jj_scan_token(LBRACKET)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    jj_scanpos = xsp;
+    if (jj_3R_415()) return true;
+    }
+    }
+    }
+    }
     }
-    xsp = jj_scanpos;
-    if (jj_3_17()) jj_scanpos = xsp;
-    if (jj_3R_238()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
     xsp = jj_scanpos;
-    if (jj_3R_399()) jj_scanpos = xsp;
-    if (jj_scan_token(RBRACKET)) return true;
+    if (jj_3R_416()) {
+    jj_scanpos = xsp;
+    if (jj_3R_417()) return true;
+    }
     return false;
   }
 
@@ -10970,6 +11001,27 @@ private boolean jj_3R_372()
     return false;
   }
 
+  private boolean jj_3R_370()
+ {
+    if (jj_scan_token(LBRACKET)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3_17()) jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_399()) jj_scanpos = xsp;
+    if (jj_scan_token(RBRACKET)) return true;
+    return false;
+  }
+
   private boolean jj_3R_352()
  {
     if (jj_scan_token(UNICODERANGE)) return true;
@@ -10982,15 +11034,15 @@ private boolean jj_3R_351()
     return false;
   }
 
-  private boolean jj_3R_264()
+  private boolean jj_3R_350()
  {
-    if (jj_3R_232()) return true;
+    if (jj_3R_376()) return true;
     return false;
   }
 
-  private boolean jj_3R_350()
+  private boolean jj_3R_264()
  {
-    if (jj_3R_376()) return true;
+    if (jj_3R_232()) return true;
     return false;
   }
 
@@ -11006,23 +11058,6 @@ private boolean jj_3R_295()
     return false;
   }
 
-  private boolean jj_3R_265()
- {
-    if (jj_3R_238()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_236()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_265()) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(55)) return true;
-    }
-    return false;
-  }
-
   private boolean jj_3R_348()
  {
     if (jj_scan_token(STRING)) return true;
@@ -11077,6 +11112,23 @@ private boolean jj_3R_380()
     return false;
   }
 
+  private boolean jj_3R_265()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_236()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_265()) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(55)) return true;
+    }
+    return false;
+  }
+
   private boolean jj_3R_379()
  {
     if (jj_3R_375()) return true;
@@ -11100,6 +11152,12 @@ private boolean jj_3R_347()
     return false;
   }
 
+  private boolean jj_3R_346()
+ {
+    if (jj_scan_token(DIMEN_9)) return true;
+    return false;
+  }
+
   private boolean jj_3_16()
  {
     Token xsp;
@@ -11109,12 +11167,6 @@ private boolean jj_3_16()
     return false;
   }
 
-  private boolean jj_3R_346()
- {
-    if (jj_scan_token(DIMEN_9)) return true;
-    return false;
-  }
-
   private boolean jj_3R_262()
  {
     Token xsp;
@@ -11199,6 +11251,30 @@ private boolean jj_3R_338()
     return false;
   }
 
+  private boolean jj_3R_337()
+ {
+    if (jj_scan_token(FLEX)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_336()
+ {
+    if (jj_scan_token(ABSOLUTLENGTH)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_335()
+ {
+    if (jj_scan_token(RELVIEWLENGTH)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_334()
+ {
+    if (jj_scan_token(RELFONTLENGTH)) return true;
+    return false;
+  }
+
   private boolean jj_3R_409()
  {
     Token xsp;
@@ -11228,30 +11304,6 @@ private boolean jj_3R_409()
     return false;
   }
 
-  private boolean jj_3R_337()
- {
-    if (jj_scan_token(FLEX)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_336()
- {
-    if (jj_scan_token(ABSOLUTLENGTH)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_335()
- {
-    if (jj_scan_token(RELVIEWLENGTH)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_334()
- {
-    if (jj_scan_token(RELFONTLENGTH)) return true;
-    return false;
-  }
-
   private boolean jj_3R_333()
  {
     if (jj_scan_token(PERCENTAGE)) return true;
@@ -11270,12 +11322,6 @@ private boolean jj_3R_378()
     return false;
   }
 
-  private boolean jj_3_12()
- {
-    if (jj_3R_232()) return true;
-    return false;
-  }
-
   private boolean jj_3R_332()
  {
     Token xsp;
@@ -11293,6 +11339,12 @@ private boolean jj_3R_331()
     return false;
   }
 
+  private boolean jj_3_12()
+ {
+    if (jj_3R_232()) return true;
+    return false;
+  }
+
   private boolean jj_3R_270()
  {
     Token xsp;
@@ -11472,12 +11524,6 @@ private boolean jj_3R_320()
     return false;
   }
 
-  private boolean jj_3_11()
- {
-    if (jj_3R_231()) return true;
-    return false;
-  }
-
   private boolean jj_3R_319()
  {
     if (jj_3R_372()) return true;
@@ -11534,21 +11580,27 @@ private boolean jj_3R_269()
     return false;
   }
 
-  private boolean jj_3R_398()
+  private boolean jj_3_11()
  {
-    if (jj_3R_409()) return true;
+    if (jj_3R_231()) return true;
     return false;
   }
 
-  private boolean jj_3R_233()
+  private boolean jj_3R_317()
  {
-    if (jj_3R_262()) return true;
+    if (jj_scan_token(DIMEN_9)) return true;
     return false;
   }
 
-  private boolean jj_3R_317()
+  private boolean jj_3R_398()
  {
-    if (jj_scan_token(DIMEN_9)) return true;
+    if (jj_3R_409()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_233()
+ {
+    if (jj_3R_262()) return true;
     return false;
   }
 
@@ -11576,6 +11628,12 @@ private boolean jj_3R_397()
     return false;
   }
 
+  private boolean jj_3R_315()
+ {
+    if (jj_scan_token(PROGID)) return true;
+    return false;
+  }
+
   private boolean jj_3_14()
  {
     if (jj_3R_231()) return true;
@@ -11593,12 +11651,6 @@ private boolean jj_3R_257()
     return false;
   }
 
-  private boolean jj_3R_315()
- {
-    if (jj_scan_token(PROGID)) return true;
-    return false;
-  }
-
   private boolean jj_3R_256()
  {
     if (jj_3R_262()) return true;
@@ -11659,26 +11711,6 @@ private boolean jj_3R_312()
     return false;
   }
 
-  private boolean jj_3R_238()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(41)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(35)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(36)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(38)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) return true;
-    }
-    }
-    }
-    }
-    return false;
-  }
-
   private boolean jj_3R_311()
  {
     if (jj_scan_token(RESOLUTION)) return true;
@@ -11709,6 +11741,26 @@ private boolean jj_3R_307()
     return false;
   }
 
+  private boolean jj_3R_238()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(41)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(35)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(36)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(38)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(37)) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
   private boolean jj_3R_306()
  {
     if (jj_scan_token(ABSOLUTLENGTH)) return true;
@@ -11901,15 +11953,6 @@ private boolean jj_3R_251()
     return false;
   }
 
-  private boolean jj_3_10()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_229()) jj_scanpos = xsp;
-    if (jj_3R_230()) return true;
-    return false;
-  }
-
   private boolean jj_3R_223()
  {
     if (jj_scan_token(LPAREN)) return true;
@@ -11927,14 +11970,12 @@ private boolean jj_3R_223()
     return false;
   }
 
-  private boolean jj_3R_435()
+  private boolean jj_3_10()
  {
-    if (jj_3R_230()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_10()) { jj_scanpos = xsp; break; }
-    }
+    xsp = jj_scanpos;
+    if (jj_3R_229()) jj_scanpos = xsp;
+    if (jj_3R_230()) return true;
     return false;
   }
 
@@ -11945,6 +11986,17 @@ private boolean jj_3_19()
     return false;
   }
 
+  private boolean jj_3R_435()
+ {
+    if (jj_3R_230()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_10()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   /** Generated Token Manager. */
   public CssParserTokenManager token_source;
   SimpleCharStream jj_input_stream;
@@ -11956,7 +12008,7 @@ private boolean jj_3_19()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[332];
+  final private int[] jj_la1 = new int[333];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -11970,19 +12022,19 @@ private boolean jj_3_19()
       jj_la1_init_4();
    }
    private static void jj_la1_init_0() {
-      jj_la1_0 = new int[] {0x0,0x0,0x0,0x1a00000,0x1a00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x1800000,0x1800000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x50000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x50000000,0x200000,0x200000,0x50200000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x200000,0x0,0x30000000,0x50000000,0x50000000,0x50000000,0x200000,0x0,0x200000,0x50000000,0x0,0x200000,0x0,0x200000,0x200000,0x50000000,0x0,0x200000,0x50000000,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x50200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x6000000,0x200000,0x0,0x200000,0x200000,0x6000000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x200000,0x30000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x30000000,0x200000,0x30000000,0x0,0x0,0x0,0x30000000,0x30000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x30200000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x30200000,0x200000,0x200000,0x0,0x200000,0x30000000,0x0,0x0,0x200000,0x200000,0x30000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x0,0x0,};
+      jj_la1_0 = new int[] {0x0,0x0,0x0,0x1a00000,0x1a00000,0x0,0x0,0x0,0x200000,0x200000,0x0,0x0,0x1800000,0x1800000,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x200000,0x0,0x0,0x0,0x0,0x200000,0x50000000,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x0,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x0,0x0,0x0,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x50000000,0x200000,0x200000,0x50200000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x30000000,0x200000,0x200000,0x30000000,0x30000000,0x200000,0x0,0x30000000,0x50000000,0x50000000,0x50000000,0x200000,0x0,0x200000,0x50000000,0x0,0x200000,0x0,0x200000,0x200000,0x50000000,0x0,0x200000,0x50000000,0x200000,0x200000,0x200000,0x0,0x0,0x0,0x0,0x0,0x0,0x50200000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x6000000,0x200000,0x0,0x200000,0x200000,0x6000000,0x200000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x0,0x0,0x0,0x200000,0x0,0x0,0x200000,0x30000000,0x0,0x200000,0x30000000,0x200000,0x30000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x200000,0x200000,0xc0000000,0x200000,0xc0000000,0x30000000,0x200000,0x30000000,0x0,0x0,0x0,0x30000000,0x30000000,0x0,0x0,0x0,0x200000,0x0,0x200000,0x30000000,0x0,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x0,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x200000,0x30200000,0x200000,0x200000,0x200000,0x200000,0x30000000,0x0,0x30000000,0x0,0x200000,0x200000,0x30000000,0x200000,0x30200000,0x200000,0x200000,0x0,0x200000,0x30000000,0x0,0x0,0x200000,0x200000,0x30000000,0x200000,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x0,0x200000,0x200000,0x200000,0x30000000,0x0,0x0,};
    }
    private static void jj_la1_init_1() {
-      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0xe9a00e78,0x0,0x0,0x0,0x0,0x0,0x278,0x10000080,0x0,0x0,0x0,0x10000080,0x0,0x4000260,0x0,0x0,0x4000260,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x1,0x0,0x60,0x0,0x60,0x0,0x0,0x8,0x260,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0x8,0x0,0x4000040,0x0,0x0,0x4000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0xff4267b,0x0,0x4000000,0x0,0x278,0x0,0x0,0x0,0x0,0x8000278,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x8000278,0x0,0x1,0x0,0x8000000,0x8000000,0x8000278,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0x0,0x278,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x6,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0xef40003,0xef40003,0xef4227b,0x0,0x1000400,0x0,0xff4267b,0x1,0x0,0x1,0x0,0x0,0xff4267b,0x80000,0x0,0xff4267b,0x0,0x0,0x0,0xe9200c00,0xe9200c00,0xe9200c00,0xe9200c00,0xe9a00e78,0xe9200c00,0x6,0x800278,0xe9200c00,0x0,0x8000000,0x800278,0xe1000000,0xe0000000,0x800278,0x800278,0x800278,0x0,0x800278,0x800278,0x0,0x78000,0x0,0x2f8,0x0,0x0,0x78000,0x0,0x0,0x278,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x278,0x0,0x0,0x0,0x278,0x0,0x0,0x278,0xc00,0x0,0x0,0x8000000,0x0,0x0,0x0,0x2f8,0x0,0x2f8,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x40000,0x0,0x40000,0xf0000ef8,0x0,0x0,0xe0001000,0x600000,0x10700ef8,0xf0701ef8,0x0,0x0,0x0,0xe0000000,0x0,0x10000ef8,0x0,0xf0000ef8,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xe4000200,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000200,0x900000,0x0,0x200,0x0,0x0,0x4000200,0x0,0x0,0x0,0x0,0x900000,0x0,0x0,0x200,0xe0000200,0x0,0x0,0xe4000200,0x0,0x0,0x278,0x0,0x278,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0xf0701ef8,0x278,0xc00,};
+      jj_la1_1 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0xe9a00e78,0x0,0x0,0x0,0x0,0x0,0x278,0x10000080,0x0,0x0,0x0,0x10000080,0x0,0x4000260,0x0,0x0,0x4000260,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x1,0x0,0x60,0x0,0x60,0x0,0x0,0x8,0x260,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0x8,0x0,0x4000040,0x0,0x0,0x4000000,0x0,0x0,0x0,0x8000000,0x0,0x0,0x0,0xe9a00e78,0xe9a00e78,0x0,0x0,0x0,0x8,0x0,0x10,0x18,0x18,0x4000040,0x0,0xff4267b,0x0,0x4000000,0x0,0x278,0x0,0x0,0x0,0x0,0x8000278,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000000,0x8000000,0x8000278,0x0,0x1,0x0,0x8000000,0x8000000,0x8000278,0x0,0x0,0x0,0x278,0x0,0x0,0x0,0x0,0x278,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x6,0x0,0x0,0x6,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x0,0xef40003,0xef40003,0xef4227b,0x0,0x1000400,0x0,0xff4267b,0x1,0x0,0x1,0x0,0x0,0xff4267b,0x80000,0x0,0xff4267b,0x0,0x0,0x0,0xe9200c00,0xe9200c00,0xe9200c00,0xe9200c00,0xe9a00e78,0xe9200c00,0x6,0x800278,0xe9200c00,0x0,0x8000000,0x800278,0xe1000000,0xe0000000,0x800278,0x800278,0x800278,0x0,0x800278,0x800278,0x0,0x78000,0x0,0x2f8,0x0,0x0,0x78000,0x0,0x0,0x278,0x8000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x278,0x278,0x0,0x0,0x0,0x278,0x0,0x0,0x278,0xc00,0x0,0x0,0x8000000,0x0,0xf0701ef8,0x0,0x0,0x2f8,0x0,0x2f8,0x0,0x0,0x40000,0x0,0x40000,0x0,0x0,0x40000,0x0,0x40000,0xf0000ef8,0x0,0x0,0xe0001000,0x600000,0x10700ef8,0xf0701ef8,0x0,0x0,0x0,0xe0000000,0x0,0x10000ef8,0x0,0xf0000ef8,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xe4000200,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000200,0x900000,0x0,0x200,0x0,0x0,0x4000200,0x0,0x0,0x0,0x0,0x900000,0x0,0x0,0x200,0xe0000200,0x0,0x0,0xe4000200,0x0,0x0,0x278,0x0,0x278,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0xf0701ef8,0x278,0xc00,};
    }
    private static void jj_la1_init_2() {
-      jj_la1_2 = new int[] {0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffe0000,0xfffe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4272,0x4272,0x4272,0x4272,0x4272,0x272,0x0,0x0,0x272,0x4000,0x0,0x4000,0x272,0x272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x1000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x800,0x0,0x2f7f,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0xc33,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,};
+      jj_la1_2 = new int[] {0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x14272,0x14272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xfffe0000,0xfffe0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x400,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x200,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4272,0x4272,0x4272,0x4272,0x4272,0x272,0x0,0x0,0x272,0x4000,0x0,0x4000,0x272,0x272,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0xa80,0x0,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x2f7f,0x1000,0x0,0xe00,0x0,0xe00,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x0,0x2f7f,0x0,0x800,0x0,0x2f7f,0x0,0x0,0x0,0x2f7f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x800,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800,0xc33,0x0,0x0,0xc33,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2f7f,0x0,0x0,};
    }
    private static void jj_la1_init_3() {
-      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x3000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdf000000,0xdf000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,};
+      jj_la1_3 = new int[] {0x0,0x0,0x0,0x0,0x0,0x2,0x4,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3ef8,0x3ef8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x1,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20000000,0x0,0x3000000,0x0,0x4000000,0x0,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdf000000,0xdf000000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,};
    }
    private static void jj_la1_init_4() {
-      jj_la1_4 = new int[] {0x30000,0x30000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x3fc0000,0x3fc0000,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x2000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x807f,0x807f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5000000,0x0,0x5000000,0x0,0x0,0x5000000,0x0,0x5000000,0x9f80,0x0,0x0,0x0,0x0,0xff80,0xff80,0x0,0x0,0x9f80,0x9f80,0x0,0x0,0x0,0x9f80,0xf00,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x100000,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80,0x0,0x0,};
+      jj_la1_4 = new int[] {0x30000,0x30000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x3fc0000,0x3fc0000,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x3fc0000,0x0,0x0,0x3fc0000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000000,0x0,0x0,0x2000000,0x0,0x0,0x0,0x2000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x40,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x33,0x0,0x0,0x0,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x0,0x807f,0x807f,0x0,0x0,0x0,0x0,0x0,0xff80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x5000000,0x0,0x5000000,0x0,0x0,0x5000000,0x0,0x5000000,0x9f80,0x0,0x0,0x0,0x0,0xff80,0xff80,0x0,0x0,0x9f80,0x9f80,0x0,0x0,0x0,0x9f80,0xf00,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7f80,0x0,0x0,0x100000,0x0,0x100000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xff80,0x0,0x0,};
    }
   final private JJCalls[] jj_2_rtns = new JJCalls[29];
   private boolean jj_rescan = false;
@@ -11999,7 +12051,7 @@ public CssParser(java.io.InputStream stream, String encoding) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12014,7 +12066,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12025,7 +12077,7 @@ public CssParser(java.io.Reader stream) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12036,7 +12088,7 @@ public void ReInit(java.io.Reader stream) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12046,7 +12098,7 @@ public CssParser(CssParserTokenManager tm) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12056,7 +12108,7 @@ public void ReInit(CssParserTokenManager tm) {
     token = new Token();
     jj_ntk = -1;
     jj_gen = 0;
-    for (int i = 0; i < 332; i++) jj_la1[i] = -1;
+    for (int i = 0; i < 333; i++) jj_la1[i] = -1;
     for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -12174,7 +12226,7 @@ public ParseException generateParseException() {
       la1tokens[jj_kind] = true;
       jj_kind = -1;
     }
-    for (int i = 0; i < 332; i++) {
+    for (int i = 0; i < 333; i++) {
       if (jj_la1[i] == jj_gen) {
         for (int j = 0; j < 32; j++) {
           if ((jj_la1_0[i] & (1<<j)) != 0) {
diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj
index 80024897..4fd4d2f7 100644
--- a/org/w3c/css/parser/analyzer/CssParser.jj
+++ b/org/w3c/css/parser/analyzer/CssParser.jj
@@ -2956,13 +2956,13 @@ try {
  */
 CssProperty declaration() :
 { String string_property;
-  CssExpression values;
+  CssExpression values = null;
   boolean important = false;
 }
 {
 try {
      string_property=property() <COLON> ( <S> )* 
-      values=expr() ( important=prio() )?
+      ( values=expr() )? ( important=prio() )?
     {
 	try {
             if (string_property == null) {
@@ -2973,20 +2973,25 @@ try {
 	    if (incompatible_error) {
 		throw new InvalidParamException("notforcss1", "inherit", ac);
 	    }
-
-	    if (values.getCount() != 0) {
+	    if (values == null) {
+		values = new CssExpression();
+	    }
+	    if (values.getCount() != 0 || string_property.startsWith("--")) {
 		CssProperty p = handleDeclaration(string_property.toLowerCase(),
 						  values, important);
 		// Did the property recognize all values in the expression ?
 
 		if (!values.end() && ac.getMedium() == null) {
-		        addError(new InvalidParamException("unrecognize", "", ac),
+		   addError(new InvalidParamException("unrecognize", "", ac),
 			     values);
 		} else {
-		    // ok, return the new property
-		    return p;
+                    // ok, return the new property
+                    return p;
 		}
-	    }
+            } else if (values.getCount() == 0) {
+                // old behaviour throw when a property has an empty expression
+                throw new ParseException();
+            }
 	} catch (InvalidParamException e) {
             incompatible_error = false;
             if (e instanceof WarningParamException) {
diff --git a/org/w3c/css/values/CssVariableDefinition.java b/org/w3c/css/values/CssVariableDefinition.java
index 08caf3e6..93a26c32 100644
--- a/org/w3c/css/values/CssVariableDefinition.java
+++ b/org/w3c/css/values/CssVariableDefinition.java
@@ -42,7 +42,11 @@ public CssVariableDefinition() {
      * @param exp the <EM>CssExpression</EM>
      */
     public CssVariableDefinition(CssExpression exp) {
-        expression = exp;
+        if (exp.getCount() > 0) {
+            expression = exp;
+        } else {
+            unparsable_value = "";
+        }
     }
 
     /**