diff --git a/org/w3c/css/parser/analyzer/CssParser.java b/org/w3c/css/parser/analyzer/CssParser.java
index bbdb13b4..dc76d5a3 100644
--- a/org/w3c/css/parser/analyzer/CssParser.java
+++ b/org/w3c/css/parser/analyzer/CssParser.java
@@ -4665,7 +4665,7 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
     throw new Error("Missing return statement in function");
   }
 
-  final public CssSelectors complex_selector(CssSelectors sel) throws ParseException {String comb;
+  final public CssSelectors complex_selector(CssSelectors sel) throws ParseException {String comb = "*none*";
         CssSelectors current;
     try {
       current = compound_selector(sel);
@@ -4713,6 +4713,8 @@ final public CssSelectors subclass_selector(CssSelectors selector) throws ParseE
                                 case "||":
                                         current.addColumnCombinator();
                                         break;
+                                case "*none*":
+                                        break;
                                 default:
                                         current.addDescendantCombinator();
                         }
@@ -9225,27 +9227,33 @@ private boolean jj_3R_299()
     return false;
   }
 
+  private boolean jj_3R_452()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
   private boolean jj_3R_298()
  {
     if (jj_3R_369()) return true;
     return false;
   }
 
-  private boolean jj_3R_297()
+  private boolean jj_3R_451()
  {
-    if (jj_3R_368()) return true;
+    if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_452()
+  private boolean jj_3R_297()
  {
-    if (jj_3R_238()) return true;
+    if (jj_3R_368()) return true;
     return false;
   }
 
-  private boolean jj_3R_451()
+  private boolean jj_3R_450()
  {
-    if (jj_scan_token(STRING)) return true;
+    if (jj_scan_token(DIMEN)) return true;
     return false;
   }
 
@@ -9266,12 +9274,6 @@ private boolean jj_3R_263()
     return false;
   }
 
-  private boolean jj_3R_450()
- {
-    if (jj_scan_token(DIMEN)) return true;
-    return false;
-  }
-
   private boolean jj_3R_449()
  {
     if (jj_scan_token(PERCENTAGE)) return true;
@@ -9699,12 +9701,6 @@ private boolean jj_3R_440()
     return false;
   }
 
-  private boolean jj_3R_363()
- {
-    if (jj_3R_394()) return true;
-    return false;
-  }
-
   private boolean jj_3R_294()
  {
     if (jj_scan_token(FUNCTION)) return true;
@@ -9717,6 +9713,12 @@ private boolean jj_3R_294()
     return false;
   }
 
+  private boolean jj_3R_363()
+ {
+    if (jj_3R_394()) return true;
+    return false;
+  }
+
   private boolean jj_3_4()
  {
     if (jj_3R_224()) return true;
@@ -9819,27 +9821,27 @@ private boolean jj_3_3()
     return false;
   }
 
-  private boolean jj_3R_226()
+  private boolean jj_3R_427()
  {
-    if (jj_3R_254()) return true;
+    if (jj_3R_439()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_440()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_427()
+  private boolean jj_3R_226()
  {
-    if (jj_3R_439()) return true;
+    if (jj_3R_254()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_440()) jj_scanpos = xsp;
     return false;
   }
 
@@ -9880,12 +9882,6 @@ private boolean jj_3R_292()
     return false;
   }
 
-  private boolean jj_3R_253()
- {
-    if (jj_3R_282()) return true;
-    return false;
-  }
-
   private boolean jj_3_27()
  {
     Token xsp;
@@ -9902,12 +9898,6 @@ private boolean jj_3_27()
     return false;
   }
 
-  private boolean jj_3R_436()
- {
-    if (jj_scan_token(COMMA)) return true;
-    return false;
-  }
-
   private boolean jj_3R_291()
  {
     Token xsp;
@@ -9928,6 +9918,18 @@ private boolean jj_3R_291()
     return false;
   }
 
+  private boolean jj_3R_253()
+ {
+    if (jj_3R_282()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_436()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    return false;
+  }
+
   private boolean jj_3R_224()
  {
     Token xsp;
@@ -9963,28 +9965,28 @@ private boolean jj_3R_425()
     return false;
   }
 
-  private boolean jj_3_6()
+  private boolean jj_3R_290()
  {
+    if (jj_scan_token(FUNCTIONHAS)) return true;
+    if (jj_3R_426()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_226()) jj_scanpos = xsp;
-    if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_290()
+  private boolean jj_3_6()
  {
-    if (jj_scan_token(FUNCTIONHAS)) return true;
-    if (jj_3R_426()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_226()) jj_scanpos = xsp;
+    if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
@@ -10076,6 +10078,26 @@ private boolean jj_3R_424()
     return false;
   }
 
+  private boolean jj_3R_288()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(122)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(134)) return true;
+    }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    if (jj_3R_425()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
   private boolean jj_3R_225()
  {
     if (jj_3R_254()) return true;
@@ -10087,23 +10109,19 @@ private boolean jj_3R_225()
     return false;
   }
 
-  private boolean jj_3R_288()
+  private boolean jj_3R_287()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(122)) {
+    if (jj_scan_token(121)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(134)) return true;
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
+    if (jj_scan_token(120)) return true;
     }
-    if (jj_3R_425()) return true;
     while (true) {
       xsp = jj_scanpos;
       if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
+    if (jj_3R_240()) return true;
     return false;
   }
 
@@ -10178,31 +10196,6 @@ private boolean jj_3R_442()
     return false;
   }
 
-  private boolean jj_3R_287()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(121)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(120)) return true;
-    }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
-    if (jj_3R_240()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_433()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_442()) jj_scanpos = xsp;
-    if (jj_3R_238()) return true;
-    return false;
-  }
-
   private boolean jj_3R_261()
  {
     Token xsp;
@@ -10239,6 +10232,21 @@ private boolean jj_3R_275()
     return false;
   }
 
+  private boolean jj_3R_433()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_442()) jj_scanpos = xsp;
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_274()
+ {
+    if (jj_3R_247()) return true;
+    return false;
+  }
+
   private boolean jj_3R_408()
  {
     Token xsp;
@@ -10265,38 +10273,21 @@ private boolean jj_3R_423()
     return false;
   }
 
-  private boolean jj_3R_274()
- {
-    if (jj_3R_247()) return true;
-    return false;
-  }
-
   private boolean jj_3R_453()
  {
     if (jj_3R_254()) return true;
     return false;
   }
 
-  private boolean jj_3R_227()
- {
-    if (jj_3R_254()) return true;
-    return false;
-  }
-
   private boolean jj_3R_260()
  {
     if (jj_3R_238()) return true;
     return false;
   }
 
-  private boolean jj_3R_445()
+  private boolean jj_3R_227()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_453()) jj_scanpos = xsp;
-    if (jj_scan_token(DIMEN)) return true;
-    xsp = jj_scanpos;
-    if (jj_3_7()) jj_scanpos = xsp;
+    if (jj_3R_254()) return true;
     return false;
   }
 
@@ -10328,27 +10319,25 @@ private boolean jj_3R_244()
     return false;
   }
 
-  private boolean jj_3_9()
+  private boolean jj_3R_445()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_228()) jj_scanpos = xsp;
-    if (jj_scan_token(AN)) return true;
+    if (jj_3R_453()) jj_scanpos = xsp;
+    if (jj_scan_token(DIMEN)) return true;
     xsp = jj_scanpos;
-    if (jj_3_6()) jj_scanpos = xsp;
+    if (jj_3_7()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3_5()
+  private boolean jj_3_9()
  {
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
-    }
     xsp = jj_scanpos;
-    if (jj_3R_225()) jj_scanpos = xsp;
-    if (jj_scan_token(NUMBER)) return true;
+    if (jj_3R_228()) jj_scanpos = xsp;
+    if (jj_scan_token(AN)) return true;
+    xsp = jj_scanpos;
+    if (jj_3_6()) jj_scanpos = xsp;
     return false;
   }
 
@@ -10385,23 +10374,27 @@ private boolean jj_3R_272()
     return false;
   }
 
-  private boolean jj_3R_243()
+  private boolean jj_3_5()
  {
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_272()) { jj_scanpos = xsp; break; }
+      if (jj_scan_token(21)) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(MINUS)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_225()) jj_scanpos = xsp;
+    if (jj_scan_token(NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3_8()
+  private boolean jj_3R_243()
  {
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_227()) jj_scanpos = xsp;
-    if (jj_scan_token(NUMBER)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_272()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(MINUS)) return true;
     return false;
   }
 
@@ -10416,6 +10409,15 @@ private boolean jj_3R_418()
     return false;
   }
 
+  private boolean jj_3_8()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_227()) jj_scanpos = xsp;
+    if (jj_scan_token(NUMBER)) return true;
+    return false;
+  }
+
   private boolean jj_3R_407()
  {
     if (jj_scan_token(COLON)) return true;
@@ -10515,6 +10517,12 @@ private boolean jj_3_25()
     return false;
   }
 
+  private boolean jj_3R_258()
+ {
+    if (jj_3R_238()) return true;
+    return false;
+  }
+
   private boolean jj_3R_283()
  {
     if (jj_scan_token(MINUS)) return true;
@@ -10532,12 +10540,6 @@ 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()
  {
     if (jj_scan_token(FUNCTIONSLOTTED)) return true;
@@ -11791,6 +11793,18 @@ private boolean jj_3R_305()
     return false;
   }
 
+  private boolean jj_3R_304()
+ {
+    if (jj_scan_token(RELFONTLENGTH)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_303()
+ {
+    if (jj_scan_token(PERCENTAGE)) return true;
+    return false;
+  }
+
   private boolean jj_3R_238()
  {
     Token xsp;
@@ -11811,18 +11825,6 @@ private boolean jj_3R_238()
     return false;
   }
 
-  private boolean jj_3R_304()
- {
-    if (jj_scan_token(RELFONTLENGTH)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_303()
- {
-    if (jj_scan_token(PERCENTAGE)) return true;
-    return false;
-  }
-
   private boolean jj_3R_302()
  {
     if (jj_scan_token(NUMBER)) return true;
diff --git a/org/w3c/css/parser/analyzer/CssParser.jj b/org/w3c/css/parser/analyzer/CssParser.jj
index 68e462ed..45caa927 100644
--- a/org/w3c/css/parser/analyzer/CssParser.jj
+++ b/org/w3c/css/parser/analyzer/CssParser.jj
@@ -2292,7 +2292,7 @@ CssSelectors subclass_selector(CssSelectors selector) :
 
 CssSelectors complex_selector(CssSelectors sel) :
 {
-	String comb;
+	String comb = "*none*";
 	CssSelectors current;
 }
 {
@@ -2329,6 +2329,8 @@ CssSelectors complex_selector(CssSelectors sel) :
 				case "||":
 					current.addColumnCombinator();
 					break;
+				case "*none*":
+					break;
 				default:
 					current.addDescendantCombinator();
 			}