--- a/conformancetest/data.js	Mon Apr 23 06:46:34 2012 -0600
+++ b/conformancetest/data.js	Mon Apr 23 06:48:12 2012 -0600
@@ -10325,7 +10325,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","1"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","1"]],
@@ -10333,7 +10333,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","1"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","0"]],
@@ -10341,7 +10341,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","0"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","0"]],
@@ -10349,7 +10349,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","0"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","-5"]],
@@ -10357,7 +10357,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","-5"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","-5"]],
@@ -10365,7 +10365,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","-5"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","6"]],
@@ -10485,7 +10485,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize"," 1 "]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize"," 1 "]],
@@ -10493,7 +10493,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize"," 1 "]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","1."]],
@@ -10517,7 +10517,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","1.0"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","1.0"]],
@@ -10525,7 +10525,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","1.0"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","1.0e2"]],
@@ -10533,7 +10533,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","1.0e2"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","1.0e2"]],
@@ -10541,7 +10541,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","1.0e2"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","1.1"]],
@@ -10549,7 +10549,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","1.1"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","1.1"]],
@@ -10557,7 +10557,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","1.1"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","1.9"]],
@@ -10565,7 +10565,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","1.9"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","1.9"]],
@@ -10573,7 +10573,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","1.9"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","+0"]],
@@ -10661,7 +10661,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","-9"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","-9"]],
@@ -10669,7 +10669,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","-9"]],
-	"foo<span style=\"font-size:xx-small\">[bar]</span>baz",
+	"foo<span style=\"font-size:x-small\">[bar]</span>baz",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"3",false,false,"1"]}],
 ["foo[bar]baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize",""]],
@@ -10917,7 +10917,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<font size=4>foo<font size=1>b[a]r</font>baz</font>",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","4"]],
-	"<font size=\"4\">foo<span style=\"font-size:xx-small\">b</span>[a]<span style=\"font-size:xx-small\">r</span>baz</font>",
+	"<font size=\"4\">foo<span style=\"font-size:x-small\">b</span>[a]<span style=\"font-size:x-small\">r</span>baz</font>",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<font size=4>foo<font size=1>b[a]r</font>baz</font>",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","4"]],
@@ -10925,7 +10925,7 @@
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<font size=4>foo<font size=1>b[a]r</font>baz</font>",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","4"]],
-	"<font size=\"4\">foo<span style=\"font-size:xx-small\">b</span>[a]<span style=\"font-size:xx-small\">r</span>baz</font>",
+	"<font size=\"4\">foo<span style=\"font-size:x-small\">b</span>[a]<span style=\"font-size:x-small\">r</span>baz</font>",
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["foo<span style=\"font-size: xx-small\">[bar]</span>baz",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","4"]],
@@ -11025,7 +11025,7 @@
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"4",false,false,"4"]}],
 ["<span style=\"font-size: large\">foo<span style=\"font-size: xx-small\">b[a]r</span>baz</span>",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","4"]],
-	"<span style=\"font-size:large\">foo<font size=\"1\">b</font>[a]<font size=\"1\">r</font>baz</span>",
+	"<span style=\"font-size:large\">foo<span style=\"font-size:xx-small\">b</span>[a]<span style=\"font-size:xx-small\">r</span>baz</span>",
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<span style=\"font-size: large\">foo<span style=\"font-size: xx-small\">b[a]r</span>baz</span>",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","4"]],
@@ -11033,7 +11033,7 @@
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<span style=\"font-size: large\">foo<span style=\"font-size: xx-small\">b[a]r</span>baz</span>",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","4"]],
-	"<span style=\"font-size:large\">foo<font size=\"1\">b</font>[a]<font size=\"1\">r</font>baz</span>",
+	"<span style=\"font-size:large\">foo<span style=\"font-size:xx-small\">b</span>[a]<span style=\"font-size:xx-small\">r</span>baz</span>",
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"1",false,false,"4"]}],
 ["<span style=\"font-size: large\">foo<span style=\"font-size: xx-small\">b[a]r</span>baz</span>",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","4"]],
@@ -11137,7 +11137,7 @@
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"fontsize":[false,false,"6",false,false,"4"]}],
 ["<p style=\"font-size: xx-small\">foo[bar]baz</p>",
 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["fontsize","3"]],
-	"<p><font size=\"1\">foo</font>[bar]<font size=\"1\">baz</font></p>",
+	"<p><span style=\"font-size:xx-small\">foo</span>[bar]<span style=\"font-size:xx-small\">baz</span></p>",
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"fontsize":[false,false,"1",false,false,"3"]}],
 ["<p style=\"font-size: xx-small\">foo[bar]baz</p>",
 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["fontsize","3"]],
@@ -11145,7 +11145,7 @@
 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"fontsize":[false,false,"1",false,false,"3"]}],
 ["<p style=\"font-size: xx-small\">foo[bar]baz</p>",
 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["fontsize","3"]],
-	"<p><font size=\"1\">foo</font>[bar]<font size=\"1\">baz</font></p>",
+	"<p><span style=\"font-size:xx-small\">foo</span>[bar]<span style=\"font-size:xx-small\">baz</span></p>",
 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"fontsize":[false,false,"1",false,false,"3"]}],
 ["<p style=\"font-size: xx-small\">foo[bar]baz</p>",
 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["fontsize","3"]],