--- a/conformancetest/diff	Mon Mar 12 11:09:06 2012 -0600
+++ b/conformancetest/diff	Mon Mar 12 13:35:46 2012 -0600
@@ -1,27 +1,3 @@
-@@ -2273,19 +2273,19 @@
- 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"bold":[false,false,"",false,true,""]}],
- ["<font color=blue face=monospace><b>foo</b></font>[bar]",
- 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["bold",""]],
--	"<b><font color=\"blue\" face=\"monospace\">foo</font>[bar]</b>",
-+	"<b><font face=\"monospace\" color=\"blue\">foo</font>[bar]</b>",
- 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"div",false,false,"p"],"bold":[false,false,"",false,true,""]}],
- ["<font color=blue face=monospace><b>foo</b></font>[bar]",
- 	[["stylewithcss","true"],["defaultparagraphseparator","p"],["bold",""]],
--	"<b><font color=\"blue\" face=\"monospace\">foo</font>[bar]</b>",
-+	"<b><font face=\"monospace\" color=\"blue\">foo</font>[bar]</b>",
- 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"p",false,false,"p"],"bold":[false,false,"",false,true,""]}],
- ["<font color=blue face=monospace><b>foo</b></font>[bar]",
- 	[["stylewithcss","false"],["defaultparagraphseparator","div"],["bold",""]],
--	"<b><font color=\"blue\" face=\"monospace\">foo</font>[bar]</b>",
-+	"<b><font face=\"monospace\" color=\"blue\">foo</font>[bar]</b>",
- 	{"stylewithcss":[false,true,"",false,false,""],"defaultparagraphseparator":[false,false,"p",false,false,"div"],"bold":[false,false,"",false,true,""]}],
- ["<font color=blue face=monospace><b>foo</b></font>[bar]",
- 	[["stylewithcss","true"],["defaultparagraphseparator","div"],["bold",""]],
--	"<b><font color=\"blue\" face=\"monospace\">foo</font>[bar]</b>",
-+	"<b><font face=\"monospace\" color=\"blue\">foo</font>[bar]</b>",
- 	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"bold":[false,false,"",false,true,""]}],
- ["foo<span style=\"font-weight: normal\"><b>{bar}</b></span>baz",
- 	[["stylewithcss","false"],["defaultparagraphseparator","p"],["bold",""]],
 @@ -3521,19 +3521,19 @@
  	{"stylewithcss":[false,false,"",false,true,""],"defaultparagraphseparator":[false,false,"div",false,false,"div"],"delete":[false,false,"",false,false,""]}],
  ["foo&#x308;&#x327;[]bar",