diff --git a/autotests/reference/highlight.css.ref b/autotests/reference/highlight.css.ref
--- a/autotests/reference/highlight.css.ref
+++ b/autotests/reference/highlight.css.ref
@@ -6,7 +6,7 @@
 <dsNormal></dsNormal><br/>
 <Selector Tag>body</Selector Tag><Normal Text> {</Normal Text><br/>
 <Normal Text>	</Normal Text><Property>font-size</Property><Normal Text>: </Normal Text><Number>15</Number><Unit>pt</Unit><Separator Symbol>;</Separator Symbol><br/>
-<Normal Text>	</Normal Text><Property>font-family</Property><Normal Text>: Verdana, Helvetica, </Normal Text><String>"Bitstream Vera Sans"</String><Normal Text>, </Normal Text><Value>sans-serif</Value><Separator Symbol>;</Separator Symbol><br/>
+<Normal Text>	</Normal Text><Property>font-family</Property><Normal Text>: Verdana</Normal Text><Separator Symbol>,</Separator Symbol><Normal Text> Helvetica</Normal Text><Separator Symbol>,</Separator Symbol><Normal Text> </Normal Text><String>"Bitstream Vera Sans"</String><Separator Symbol>,</Separator Symbol><Normal Text> </Normal Text><Value>sans-serif</Value><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>	</Normal Text><Property>margin-top</Property><Normal Text>: </Normal Text><Number>0</Number><Unit>px</Unit><Separator Symbol>;</Separator Symbol><Normal Text>			</Normal Text><Comment>/* yet another comment */</Comment><br/>
 <Normal Text>	</Normal Text><Property>margin-bottom</Property><Normal Text>: </Normal Text><Number>0</Number><Unit>px</Unit><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>	// this is no comment</Normal Text><Separator Symbol>,</Separator Symbol><Normal Text> it's just broken!</Normal Text><br/>
@@ -187,7 +187,7 @@
 <dsNormal></dsNormal><br/>
 <At Rule>@font-face</At Rule><Normal Text> {</Normal Text><br/>
 <Normal Text>	</Normal Text><Property>font-family</Property><Normal Text>: </Normal Text><String>"Open Sans"</String><Separator Symbol>;</Separator Symbol><br/>
-<Normal Text>	</Normal Text><Property>src</Property><Normal Text>: </Normal Text><Function>url(</Function><String>"/fonts/OpenSans-Regular-webfont.woff2"</String><Function>)</Function><Normal Text> </Normal Text><Function>format(</Function><String>"woff2"</String><Function>)</Function><Normal Text>,</Normal Text><br/>
+<Normal Text>	</Normal Text><Property>src</Property><Normal Text>: </Normal Text><Function>url(</Function><String>"/fonts/OpenSans-Regular-webfont.woff2"</String><Function>)</Function><Normal Text> </Normal Text><Function>format(</Function><String>"woff2"</String><Function>)</Function><Separator Symbol>,</Separator Symbol><br/>
 <Normal Text>	</Normal Text><Function>url(</Function><String>"/fonts/OpenSans-Regular-webfont.woff"</String><Function>)</Function><Normal Text> </Normal Text><Function>format(</Function><String>"woff"</String><Function>)</Function><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>}</Normal Text><br/>
 <dsNormal></dsNormal><br/>
diff --git a/autotests/reference/review128925-1.css.ref b/autotests/reference/review128925-1.css.ref
--- a/autotests/reference/review128925-1.css.ref
+++ b/autotests/reference/review128925-1.css.ref
@@ -23,7 +23,7 @@
 <Comment>/* Properties */</Comment><br/>
 <dsNormal></dsNormal><br/>
 <Selector Tag>html</Selector Tag><Separator Symbol>,</Separator Symbol><Normal Text> </Normal Text><Selector Tag>body</Selector Tag><Normal Text> {</Normal Text><br/>
-<Normal Text>    </Normal Text><Property>font-family</Property><Normal Text>: </Normal Text><String>"Droid Sans"</String><Normal Text>, Arial, </Normal Text><Value>sans-serif</Value><Separator Symbol>;</Separator Symbol><br/>
+<Normal Text>    </Normal Text><Property>font-family</Property><Normal Text>: </Normal Text><String>"Droid Sans"</String><Separator Symbol>,</Separator Symbol><Normal Text> Arial</Normal Text><Separator Symbol>,</Separator Symbol><Normal Text> </Normal Text><Value>sans-serif</Value><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>    </Normal Text><Property>font-size</Property><Normal Text>: </Normal Text><Number>11</Number><Unit>pt</Unit><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>    </Normal Text><Property>line-height</Property><Normal Text>: </Normal Text><Number>1.5</Number><Unit>em</Unit><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>    </Normal Text><Property>max-width</Property><Normal Text>: </Normal Text><Function>calc(</Function><Number>100</Number><Unit>%</Unit><Normal Text> </Normal Text><Operator>-</Operator><Normal Text> </Normal Text><Number>300</Number><Unit>px</Unit><Function>)</Function><Separator Symbol>;</Separator Symbol><br/>
@@ -81,8 +81,8 @@
 <dsNormal></dsNormal><br/>
 <At Rule>@font-face</At Rule><Normal Text> {</Normal Text><br/>
 <Normal Text>    </Normal Text><Property>font-family</Property><Normal Text>: MyHelvetica</Normal Text><Separator Symbol>;</Separator Symbol><br/>
-<Normal Text>    </Normal Text><Property>src</Property><Normal Text>: </Normal Text><Function>local(</Function><String>"Helvetica Neue Bold"</String><Function>)</Function><Normal Text>,</Normal Text><br/>
-<Normal Text>        </Normal Text><Function>local(</Function><String>"HelveticaNeue-Bold"</String><Function>)</Function><Normal Text>,</Normal Text><br/>
+<Normal Text>    </Normal Text><Property>src</Property><Normal Text>: </Normal Text><Function>local(</Function><String>"Helvetica Neue Bold"</String><Function>)</Function><Separator Symbol>,</Separator Symbol><br/>
+<Normal Text>        </Normal Text><Function>local(</Function><String>"HelveticaNeue-Bold"</String><Function>)</Function><Separator Symbol>,</Separator Symbol><br/>
 <Normal Text>        </Normal Text><Function>url(</Function><String>MgOpenModernaBold.ttf</String><Function>)</Function><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>    </Normal Text><Property>font-weight</Property><Normal Text>: </Normal Text><Value>bold</Value><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>}</Normal Text><br/>
diff --git a/autotests/reference/review128925-2.css.ref b/autotests/reference/review128925-2.css.ref
--- a/autotests/reference/review128925-2.css.ref
+++ b/autotests/reference/review128925-2.css.ref
@@ -22,8 +22,8 @@
 <dsNormal></dsNormal><br/>
 <Selector Tag>header</Selector Tag><Comment>/* comment here */</Comment><Selector Class>.active</Selector Class><Normal Text> </Normal Text><Comment>/* comment here */</Comment><Normal Text> {</Normal Text><br/>
 <Normal Text>    </Normal Text><Comment>/* comment here */</Comment><Normal Text> </Normal Text><Property>color</Property><Unknown Property> </Unknown Property><Normal Text>: </Normal Text><Comment>/* comment here */</Comment><Normal Text> </Normal Text><Color>blue</Color><Comment>/* comment here */</Comment><Separator Symbol>;</Separator Symbol><br/>
-<Normal Text>    </Normal Text><Property>font-family</Property><Normal Text>: Arial </Normal Text><Comment>/* comment here */</Comment><Normal Text>,</Normal Text><br/>
-<Normal Text>        </Normal Text><String>"Droid Sans"</String><Normal Text>, </Normal Text><Comment>/* comment here */</Comment><br/>
+<Normal Text>    </Normal Text><Property>font-family</Property><Normal Text>: Arial </Normal Text><Comment>/* comment here */</Comment><Separator Symbol>,</Separator Symbol><br/>
+<Normal Text>        </Normal Text><String>"Droid Sans"</String><Separator Symbol>,</Separator Symbol><Normal Text> </Normal Text><Comment>/* comment here */</Comment><br/>
 <Normal Text>        </Normal Text><Value>sans-serif</Value><Comment>/* comment here */</Comment><Separator Symbol>;</Separator Symbol><br/>
 <Normal Text>}</Normal Text><br/>
 <dsNormal></dsNormal><br/>