Reviewed by Darin.

        Added UTF-8 BOMs to css2.1 tests.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6312


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@11884 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 714f248..67f7ecb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,464 @@
+2006-01-05  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        Added UTF-8 BOMs to css2.1 tests.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6312
+
+        * css2.1/t040109-c17-comments-00-b.html:
+        * css2.1/t040109-c17-comments-01-b.html:
+        * css2.1/t0402-c71-fwd-parsing-00-f.html:
+        * css2.1/t0402-c71-fwd-parsing-01-f.html:
+        * css2.1/t0402-c71-fwd-parsing-02-f.html:
+        * css2.1/t0402-c71-fwd-parsing-03-f.html:
+        * css2.1/t0402-c71-fwd-parsing-04-f.html:
+        * css2.1/t040302-c61-ex-len-00-b-a-expected.checksum:
+        * css2.1/t040302-c61-ex-len-00-b-a-expected.png:
+        * css2.1/t040302-c61-ex-len-00-b-a-expected.txt:
+        * css2.1/t040302-c61-ex-len-00-b-a.html:
+        * css2.1/t040302-c61-phys-len-00-b.html:
+        * css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum:
+        * css2.1/t040302-c61-rel-len-00-b-ag-expected.png:
+        * css2.1/t040302-c61-rel-len-00-b-ag-expected.txt:
+        * css2.1/t040302-c61-rel-len-00-b-ag.html:
+        * css2.1/t040303-c62-percent-00-b-ag.html:
+        * css2.1/t040304-c64-uri-00-a-g.html:
+        * css2.1/t040306-c63-color-00-b-ag.html:
+        * css2.1/t050201-c12-grouping-00-b.html:
+        * css2.1/t0505-c16-descendant-00-e.html:
+        * css2.1/t0505-c16-descendant-01-e.html:
+        * css2.1/t0505-c16-descendant-02-e.html:
+        * css2.1/t050803-c14-classes-00-e.html:
+        * css2.1/t0509-c15-ids-00-a.html:
+        * css2.1/t0509-c15-ids-01-e.html:
+        * css2.1/t0510-c25-pseudo-elmnt-00-c.html:
+        * css2.1/t0511-c21-pseud-anch-00-e-i.html:
+        * css2.1/t0511-c21-pseud-link-00-e.html:
+        * css2.1/t0511-c21-pseud-link-01-e.html:
+        * css2.1/t0511-c21-pseud-link-02-e.html:
+        * css2.1/t0511-c21-pseud-link-03-e.html:
+        * css2.1/t051103-c21-activ-ln-00-e-i.html:
+        * css2.1/t051103-c21-focus-ln-00-e-i.html:
+        * css2.1/t051103-c21-hover-ln-00-e-i.html:
+        * css2.1/t051201-c23-first-line-00-b.html:
+        * css2.1/t051202-c24-first-lttr-00-b.html:
+        * css2.1/t051202-c26-psudo-nest-00-c.html:
+        * css2.1/t0602-c13-inh-underlin-00-e.html:
+        * css2.1/t0602-c13-inheritance-00-e.html:
+        * css2.1/t0603-c11-import-00-b.html:
+        * css2.1/t060401-c32-cascading-00-b.html:
+        * css2.1/t060402-c31-important-00-b.html:
+        * css2.1/t060403-c21-pseu-cls-00-e-i.html:
+        * css2.1/t060403-c21-pseu-id-00-e-i.html:
+        * css2.1/t0801-c412-hz-box-00-b-a.html:
+        * css2.1/t0803-c5501-imrgn-t-00-b-ag.html:
+        * css2.1/t0803-c5501-mrgn-t-00-b-a.html:
+        * css2.1/t0803-c5502-imrgn-r-00-b-ag.html:
+        * css2.1/t0803-c5502-imrgn-r-01-b-ag.html:
+        * css2.1/t0803-c5502-imrgn-r-02-b-a.html:
+        * css2.1/t0803-c5502-imrgn-r-03-b-a.html:
+        * css2.1/t0803-c5502-imrgn-r-04-b-ag.html:
+        * css2.1/t0803-c5502-imrgn-r-05-b-ag.html:
+        * css2.1/t0803-c5502-imrgn-r-06-b-ag.html:
+        * css2.1/t0803-c5502-mrgn-r-00-c-ag.html:
+        * css2.1/t0803-c5502-mrgn-r-01-c-a.html:
+        * css2.1/t0803-c5502-mrgn-r-02-c.html:
+        * css2.1/t0803-c5502-mrgn-r-03-c.html:
+        * css2.1/t0803-c5503-imrgn-b-00-b-a.html:
+        * css2.1/t0803-c5503-mrgn-b-00-b-a.html:
+        * css2.1/t0803-c5504-imrgn-l-00-b-ag.html:
+        * css2.1/t0803-c5504-imrgn-l-01-b-ag.html:
+        * css2.1/t0803-c5504-imrgn-l-02-b-ag.html:
+        * css2.1/t0803-c5504-imrgn-l-03-b-a.html:
+        * css2.1/t0803-c5504-imrgn-l-04-b-ag.html:
+        * css2.1/t0803-c5504-imrgn-l-05-b-ag.html:
+        * css2.1/t0803-c5504-imrgn-l-06-b-ag.html:
+        * css2.1/t0803-c5504-mrgn-l-00-c-ag.html:
+        * css2.1/t0803-c5504-mrgn-l-01-c-a.html:
+        * css2.1/t0803-c5504-mrgn-l-02-c-expected.checksum:
+        * css2.1/t0803-c5504-mrgn-l-02-c-expected.png:
+        * css2.1/t0803-c5504-mrgn-l-02-c-expected.txt:
+        * css2.1/t0803-c5504-mrgn-l-02-c.html:
+        * css2.1/t0803-c5504-mrgn-l-03-c.html:
+        * css2.1/t0803-c5505-imrgn-00-a-ag.html:
+        * css2.1/t0803-c5505-mrgn-00-b-ag.html:
+        * css2.1/t0803-c5505-mrgn-01-e-a.html:
+        * css2.1/t0803-c5505-mrgn-02-c-expected.checksum:
+        * css2.1/t0803-c5505-mrgn-02-c-expected.png:
+        * css2.1/t0803-c5505-mrgn-02-c-expected.txt:
+        * css2.1/t0803-c5505-mrgn-02-c.html:
+        * css2.1/t0803-c5505-mrgn-03-c-ag.html:
+        * css2.1/t080301-c411-vt-mrgn-00-b.html:
+        * css2.1/t0804-c5506-ipadn-t-00-b-a.html:
+        * css2.1/t0804-c5506-ipadn-t-01-b-a.html:
+        * css2.1/t0804-c5506-ipadn-t-02-b-a.html:
+        * css2.1/t0804-c5506-padn-t-00-b-a.html:
+        * css2.1/t0804-c5507-ipadn-r-00-b-ag.html:
+        * css2.1/t0804-c5507-ipadn-r-01-b-ag.html:
+        * css2.1/t0804-c5507-ipadn-r-02-b-ag.html:
+        * css2.1/t0804-c5507-ipadn-r-03-b-a.html:
+        * css2.1/t0804-c5507-ipadn-r-04-b-ag.html:
+        * css2.1/t0804-c5507-padn-r-00-c-ag.html:
+        * css2.1/t0804-c5507-padn-r-01-c-a.html:
+        * css2.1/t0804-c5507-padn-r-02-f.html:
+        * css2.1/t0804-c5507-padn-r-03-f.html:
+        * css2.1/t0804-c5508-ipadn-b-00-b-a.html:
+        * css2.1/t0804-c5508-ipadn-b-01-f-a.html:
+        * css2.1/t0804-c5508-ipadn-b-02-b-a.html:
+        * css2.1/t0804-c5508-ipadn-b-03-b-a.html:
+        * css2.1/t0804-c5509-ipadn-l-00-b-ag.html:
+        * css2.1/t0804-c5509-ipadn-l-01-b-ag.html:
+        * css2.1/t0804-c5509-ipadn-l-02-b-ag.html:
+        * css2.1/t0804-c5509-ipadn-l-03-b-a.html:
+        * css2.1/t0804-c5509-ipadn-l-04-f-ag.html:
+        * css2.1/t0804-c5509-padn-l-00-b-ag.html:
+        * css2.1/t0804-c5509-padn-l-01-b-a.html:
+        * css2.1/t0804-c5509-padn-l-02-f.html:
+        * css2.1/t0804-c5509-padn-l-03-f-g.html:
+        * css2.1/t0804-c5510-ipadn-00-b-ag.html:
+        * css2.1/t0804-c5510-padn-00-b-ag.html:
+        * css2.1/t0804-c5510-padn-01-e-a.html:
+        * css2.1/t0804-c5510-padn-02-f.html:
+        * css2.1/t0805-c5511-brdr-tw-00-b.html:
+        * css2.1/t0805-c5511-brdr-tw-01-b-g.html:
+        * css2.1/t0805-c5511-brdr-tw-02-b-expected.checksum:
+        * css2.1/t0805-c5511-brdr-tw-02-b-expected.png:
+        * css2.1/t0805-c5511-brdr-tw-02-b-expected.txt:
+        * css2.1/t0805-c5511-brdr-tw-02-b.html:
+        * css2.1/t0805-c5511-brdr-tw-03-b.html:
+        * css2.1/t0805-c5511-ibrdr-tw-00-a-expected.checksum:
+        * css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png:
+        * css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt:
+        * css2.1/t0805-c5511-ibrdr-tw-00-a.html:
+        * css2.1/t0805-c5512-brdr-rw-00-b.html:
+        * css2.1/t0805-c5512-brdr-rw-01-b-g.html:
+        * css2.1/t0805-c5512-brdr-rw-02-b-expected.checksum:
+        * css2.1/t0805-c5512-brdr-rw-02-b-expected.png:
+        * css2.1/t0805-c5512-brdr-rw-02-b-expected.txt:
+        * css2.1/t0805-c5512-brdr-rw-02-b.html:
+        * css2.1/t0805-c5512-brdr-rw-03-b.html:
+        * css2.1/t0805-c5512-ibrdr-rw-00-a-expected.checksum:
+        * css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png:
+        * css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt:
+        * css2.1/t0805-c5512-ibrdr-rw-00-a.html:
+        * css2.1/t0805-c5513-brdr-bw-00-b.html:
+        * css2.1/t0805-c5513-brdr-bw-01-b-g.html:
+        * css2.1/t0805-c5513-brdr-bw-02-b-expected.checksum:
+        * css2.1/t0805-c5513-brdr-bw-02-b-expected.png:
+        * css2.1/t0805-c5513-brdr-bw-02-b-expected.txt:
+        * css2.1/t0805-c5513-brdr-bw-02-b.html:
+        * css2.1/t0805-c5513-brdr-bw-03-b.html:
+        * css2.1/t0805-c5513-ibrdr-bw-00-a-expected.checksum:
+        * css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png:
+        * css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt:
+        * css2.1/t0805-c5513-ibrdr-bw-00-a.html:
+        * css2.1/t0805-c5514-brdr-lw-00-b.html:
+        * css2.1/t0805-c5514-brdr-lw-01-b-g.html:
+        * css2.1/t0805-c5514-brdr-lw-02-b-expected.checksum:
+        * css2.1/t0805-c5514-brdr-lw-02-b-expected.png:
+        * css2.1/t0805-c5514-brdr-lw-02-b-expected.txt:
+        * css2.1/t0805-c5514-brdr-lw-02-b.html:
+        * css2.1/t0805-c5514-brdr-lw-03-b.html:
+        * css2.1/t0805-c5514-ibrdr-lw-00-a-expected.checksum:
+        * css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png:
+        * css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt:
+        * css2.1/t0805-c5514-ibrdr-lw-00-a.html:
+        * css2.1/t0805-c5515-brdr-w-00-a.html:
+        * css2.1/t0805-c5515-brdr-w-01-b-g.html:
+        * css2.1/t0805-c5515-brdr-w-02-b-expected.checksum:
+        * css2.1/t0805-c5515-brdr-w-02-b-expected.png:
+        * css2.1/t0805-c5515-brdr-w-02-b-expected.txt:
+        * css2.1/t0805-c5515-brdr-w-02-b.html:
+        * css2.1/t0805-c5515-ibrdr-00-b-expected.checksum:
+        * css2.1/t0805-c5515-ibrdr-00-b-expected.png:
+        * css2.1/t0805-c5515-ibrdr-00-b-expected.txt:
+        * css2.1/t0805-c5515-ibrdr-00-b.html:
+        * css2.1/t0805-c5516-brdr-c-00-a.html:
+        * css2.1/t0805-c5516-ibrdr-c-00-a.html:
+        * css2.1/t0805-c5517-brdr-s-00-c.html:
+        * css2.1/t0805-c5517-ibrdr-s-00-a.html:
+        * css2.1/t0805-c5518-brdr-t-00-a.html:
+        * css2.1/t0805-c5518-brdr-t-01-e-expected.checksum:
+        * css2.1/t0805-c5518-brdr-t-01-e-expected.png:
+        * css2.1/t0805-c5518-brdr-t-01-e-expected.txt:
+        * css2.1/t0805-c5518-brdr-t-01-e.html:
+        * css2.1/t0805-c5518-ibrdr-t-00-a.html:
+        * css2.1/t0805-c5519-brdr-r-00-a-expected.checksum:
+        * css2.1/t0805-c5519-brdr-r-00-a-expected.png:
+        * css2.1/t0805-c5519-brdr-r-00-a-expected.txt:
+        * css2.1/t0805-c5519-brdr-r-00-a.html:
+        * css2.1/t0805-c5519-brdr-r-01-e-expected.checksum:
+        * css2.1/t0805-c5519-brdr-r-01-e-expected.png:
+        * css2.1/t0805-c5519-brdr-r-01-e-expected.txt:
+        * css2.1/t0805-c5519-brdr-r-01-e.html:
+        * css2.1/t0805-c5519-brdr-r-02-e.html:
+        * css2.1/t0805-c5519-ibrdr-r-00-a.html:
+        * css2.1/t0805-c5520-brdr-b-00-a.html:
+        * css2.1/t0805-c5520-brdr-b-01-e-expected.checksum:
+        * css2.1/t0805-c5520-brdr-b-01-e-expected.png:
+        * css2.1/t0805-c5520-brdr-b-01-e-expected.txt:
+        * css2.1/t0805-c5520-brdr-b-01-e.html:
+        * css2.1/t0805-c5520-ibrdr-b-00-a.html:
+        * css2.1/t0805-c5521-brdr-l-00-a-expected.checksum:
+        * css2.1/t0805-c5521-brdr-l-00-a-expected.png:
+        * css2.1/t0805-c5521-brdr-l-00-a-expected.txt:
+        * css2.1/t0805-c5521-brdr-l-00-a.html:
+        * css2.1/t0805-c5521-brdr-l-01-e-expected.checksum:
+        * css2.1/t0805-c5521-brdr-l-01-e-expected.png:
+        * css2.1/t0805-c5521-brdr-l-01-e-expected.txt:
+        * css2.1/t0805-c5521-brdr-l-01-e.html:
+        * css2.1/t0805-c5521-brdr-l-02-e.html:
+        * css2.1/t0805-c5521-ibrdr-l-00-a-expected.checksum:
+        * css2.1/t0805-c5521-ibrdr-l-00-a-expected.png:
+        * css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt:
+        * css2.1/t0805-c5521-ibrdr-l-00-a.html:
+        * css2.1/t0805-c5522-brdr-00-b.html:
+        * css2.1/t0805-c5522-brdr-01-b-g.html:
+        * css2.1/t0805-c5522-brdr-02-e.html:
+        * css2.1/t0805-c5522-ibrdr-00-a.html:
+        * css2.1/t09-c5526c-display-00-e.html:
+        * css2.1/t090402-c42-ibx-pad-00-d-ag.html:
+        * css2.1/t0905-c414-flt-00-d-expected.checksum:
+        * css2.1/t0905-c414-flt-00-d-expected.png:
+        * css2.1/t0905-c414-flt-00-d-expected.txt:
+        * css2.1/t0905-c414-flt-00-d.html:
+        * css2.1/t0905-c414-flt-01-d-g.html:
+        * css2.1/t0905-c414-flt-02-c-expected.checksum:
+        * css2.1/t0905-c414-flt-02-c-expected.png:
+        * css2.1/t0905-c414-flt-02-c-expected.txt:
+        * css2.1/t0905-c414-flt-02-c.html:
+        * css2.1/t0905-c414-flt-03-c-expected.checksum:
+        * css2.1/t0905-c414-flt-03-c-expected.png:
+        * css2.1/t0905-c414-flt-03-c-expected.txt:
+        * css2.1/t0905-c414-flt-03-c.html:
+        * css2.1/t0905-c414-flt-04-c-expected.checksum:
+        * css2.1/t0905-c414-flt-04-c-expected.png:
+        * css2.1/t0905-c414-flt-04-c-expected.txt:
+        * css2.1/t0905-c414-flt-04-c.html:
+        * css2.1/t0905-c414-flt-fit-00-d-expected.checksum:
+        * css2.1/t0905-c414-flt-fit-00-d-expected.png:
+        * css2.1/t0905-c414-flt-fit-00-d-expected.txt:
+        * css2.1/t0905-c414-flt-fit-00-d.html:
+        * css2.1/t0905-c414-flt-fit-01-d-g-expected.checksum:
+        * css2.1/t0905-c414-flt-fit-01-d-g-expected.png:
+        * css2.1/t0905-c414-flt-fit-01-d-g-expected.txt:
+        * css2.1/t0905-c414-flt-fit-01-d-g.html:
+        * css2.1/t0905-c414-flt-wrap-00-e.html:
+        * css2.1/t0905-c414-flt-wrap-01-d-g.html:
+        * css2.1/t0905-c5525-fltblck-00-d-ag-expected.checksum:
+        * css2.1/t0905-c5525-fltblck-00-d-ag-expected.png:
+        * css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt:
+        * css2.1/t0905-c5525-fltblck-00-d-ag.html:
+        * css2.1/t0905-c5525-fltblck-01-d-expected.checksum:
+        * css2.1/t0905-c5525-fltblck-01-d-expected.png:
+        * css2.1/t0905-c5525-fltblck-01-d-expected.txt:
+        * css2.1/t0905-c5525-fltblck-01-d.html:
+        * css2.1/t0905-c5525-fltclr-00-c-ag.html:
+        * css2.1/t0905-c5525-fltcont-00-d-g-expected.checksum:
+        * css2.1/t0905-c5525-fltcont-00-d-g-expected.png:
+        * css2.1/t0905-c5525-fltcont-00-d-g-expected.txt:
+        * css2.1/t0905-c5525-fltcont-00-d-g.html:
+        * css2.1/t0905-c5525-flthw-00-c-g-expected.checksum:
+        * css2.1/t0905-c5525-flthw-00-c-g-expected.png:
+        * css2.1/t0905-c5525-flthw-00-c-g-expected.txt:
+        * css2.1/t0905-c5525-flthw-00-c-g.html:
+        * css2.1/t0905-c5525-fltinln-00-c-ag.html:
+        * css2.1/t0905-c5525-fltmrgn-00-c-ag.html:
+        * css2.1/t0905-c5525-fltmult-00-d-g-expected.checksum:
+        * css2.1/t0905-c5525-fltmult-00-d-g-expected.png:
+        * css2.1/t0905-c5525-fltmult-00-d-g-expected.txt:
+        * css2.1/t0905-c5525-fltmult-00-d-g.html:
+        * css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum:
+        * css2.1/t0905-c5525-fltwidth-00-c-g-expected.png:
+        * css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt:
+        * css2.1/t0905-c5525-fltwidth-00-c-g.html:
+        * css2.1/t0905-c5525-fltwidth-01-c-g.html:
+        * css2.1/t0905-c5525-fltwidth-02-c-g-expected.checksum:
+        * css2.1/t0905-c5525-fltwidth-02-c-g-expected.png:
+        * css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt:
+        * css2.1/t0905-c5525-fltwidth-02-c-g.html:
+        * css2.1/t0905-c5525-fltwidth-03-c-g-expected.checksum:
+        * css2.1/t0905-c5525-fltwidth-03-c-g-expected.png:
+        * css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt:
+        * css2.1/t0905-c5525-fltwidth-03-c-g.html:
+        * css2.1/t0905-c5525-fltwrap-00-b-expected.checksum:
+        * css2.1/t0905-c5525-fltwrap-00-b-expected.png:
+        * css2.1/t0905-c5525-fltwrap-00-b-expected.txt:
+        * css2.1/t0905-c5525-fltwrap-00-b.html:
+        * css2.1/t090501-c414-flt-00-d.html:
+        * css2.1/t090501-c414-flt-01-b-expected.checksum:
+        * css2.1/t090501-c414-flt-01-b-expected.png:
+        * css2.1/t090501-c414-flt-01-b-expected.txt:
+        * css2.1/t090501-c414-flt-01-b.html:
+        * css2.1/t090501-c414-flt-02-d-g.html:
+        * css2.1/t090501-c414-flt-03-b-g-expected.checksum:
+        * css2.1/t090501-c414-flt-03-b-g-expected.png:
+        * css2.1/t090501-c414-flt-03-b-g-expected.txt:
+        * css2.1/t090501-c414-flt-03-b-g.html:
+        * css2.1/t090501-c414-flt-ln-00-d.html:
+        * css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum:
+        * css2.1/t090501-c414-flt-ln-01-d-g-expected.png:
+        * css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
+        * css2.1/t090501-c414-flt-ln-01-d-g.html:
+        * css2.1/t090501-c414-flt-ln-02-d.html:
+        * css2.1/t090501-c414-flt-ln-03-d.html:
+        * css2.1/t090501-c5525-flt-l-00-b-g-expected.checksum:
+        * css2.1/t090501-c5525-flt-l-00-b-g-expected.png:
+        * css2.1/t090501-c5525-flt-l-00-b-g-expected.txt:
+        * css2.1/t090501-c5525-flt-l-00-b-g.html:
+        * css2.1/t090501-c5525-flt-r-00-b-g-expected.checksum:
+        * css2.1/t090501-c5525-flt-r-00-b-g-expected.png:
+        * css2.1/t090501-c5525-flt-r-00-b-g-expected.txt:
+        * css2.1/t090501-c5525-flt-r-00-b-g.html:
+        * css2.1/t1002-c5523-width-00-b-g.html:
+        * css2.1/t1002-c5523-width-01-b-g.html:
+        * css2.1/t1002-c5523-width-02-b-g.html:
+        * css2.1/t100303-c412-blockw-00-d-ag.html:
+        * css2.1/t100304-c43-rpl-bbx-00-d-g.html:
+        * css2.1/t100304-c43-rpl-bbx-01-d-g-expected.checksum:
+        * css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png:
+        * css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt:
+        * css2.1/t100304-c43-rpl-bbx-01-d-g.html:
+        * css2.1/t1004-c43-rpl-bbx-00-d-ag.html:
+        * css2.1/t1004-c43-rpl-ibx-00-d-ag.html:
+        * css2.1/t1004-c5524-width-00-b-g.html:
+        * css2.1/t1005-c5524-width-00-b-g.html:
+        * css2.1/t1005-c5524-width-01-b-g.html:
+        * css2.1/t1008-c44-ln-box-00-d-ag.html:
+        * css2.1/t1008-c44-ln-box-01-d-ag.html:
+        * css2.1/t1008-c44-ln-box-02-d-ag.html:
+        * css2.1/t1008-c44-ln-box-03-d-ag.html:
+        * css2.1/t100801-c42-ibx-ht-00-d-a.html:
+        * css2.1/t100801-c544-valgn-00-a-ag.html:
+        * css2.1/t100801-c544-valgn-01-d-ag.html:
+        * css2.1/t100801-c544-valgn-02-d-agi-expected.checksum:
+        * css2.1/t100801-c544-valgn-02-d-agi-expected.png:
+        * css2.1/t100801-c544-valgn-02-d-agi.html:
+        * css2.1/t100801-c544-valgn-03-d-agi-expected.checksum:
+        * css2.1/t100801-c544-valgn-03-d-agi-expected.png:
+        * css2.1/t100801-c544-valgn-03-d-agi-expected.txt:
+        * css2.1/t100801-c544-valgn-03-d-agi.html:
+        * css2.1/t100801-c544-valgn-04-d-agi.html:
+        * css2.1/t100801-c548-leadin-00-d-a.html:
+        * css2.1/t100801-c548-ln-ht-00-c-a.html:
+        * css2.1/t100801-c548-ln-ht-01-b-ag.html:
+        * css2.1/t100801-c548-ln-ht-02-b-ag.html:
+        * css2.1/t100801-c548-ln-ht-03-d-ag.html:
+        * css2.1/t100801-c548-ln-ht-04-d-ag.html:
+        * css2.1/t1205-c561-list-displ-00-b.html:
+        * css2.1/t1205-c563-list-type-00-b-expected.checksum:
+        * css2.1/t1205-c563-list-type-00-b-expected.png:
+        * css2.1/t1205-c563-list-type-00-b-expected.txt:
+        * css2.1/t1205-c563-list-type-00-b.html:
+        * css2.1/t1205-c563-list-type-01-b.html:
+        * css2.1/t1205-c564-list-img-00-b-g.html:
+        * css2.1/t1205-c565-list-pos-00-b.html:
+        * css2.1/t1205-c566-list-stl-00-e-ag.html:
+        * css2.1/t1205-c566-list-stl-01-c-g-expected.checksum:
+        * css2.1/t1205-c566-list-stl-01-c-g-expected.png:
+        * css2.1/t1205-c566-list-stl-01-c-g-expected.txt:
+        * css2.1/t1205-c566-list-stl-01-c-g.html:
+        * css2.1/t1401-c531-color-00-a.html:
+        * css2.1/t1402-c45-bg-canvas-00-b.html:
+        * css2.1/t140201-c532-bgcolor-00-a.html:
+        * css2.1/t140201-c532-bgcolor-01-b.html:
+        * css2.1/t140201-c533-bgimage-00-a.html:
+        * css2.1/t140201-c533-bgimage-01-b-g.html:
+        * css2.1/t140201-c534-bgre-00-b-ag-expected.checksum:
+        * css2.1/t140201-c534-bgre-00-b-ag-expected.png:
+        * css2.1/t140201-c534-bgre-00-b-ag-expected.txt:
+        * css2.1/t140201-c534-bgre-00-b-ag.html:
+        * css2.1/t140201-c534-bgre-01-b-ag-expected.checksum:
+        * css2.1/t140201-c534-bgre-01-b-ag-expected.png:
+        * css2.1/t140201-c534-bgre-01-b-ag-expected.txt:
+        * css2.1/t140201-c534-bgre-01-b-ag.html:
+        * css2.1/t140201-c534-bgreps-00-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-00-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-00-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-00-c-ag.html:
+        * css2.1/t140201-c534-bgreps-01-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-01-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-01-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-01-c-ag.html:
+        * css2.1/t140201-c534-bgreps-02-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-02-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-02-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-02-c-ag.html:
+        * css2.1/t140201-c534-bgreps-03-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-03-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-03-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-03-c-ag.html:
+        * css2.1/t140201-c534-bgreps-04-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-04-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-04-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-04-c-ag.html:
+        * css2.1/t140201-c534-bgreps-05-c-ag-expected.checksum:
+        * css2.1/t140201-c534-bgreps-05-c-ag-expected.png:
+        * css2.1/t140201-c534-bgreps-05-c-ag-expected.txt:
+        * css2.1/t140201-c534-bgreps-05-c-ag.html:
+        * css2.1/t140201-c535-bg-fixd-00-b-g.html:
+        * css2.1/t140201-c536-bgpos-00-b-ag-expected.checksum:
+        * css2.1/t140201-c536-bgpos-00-b-ag-expected.png:
+        * css2.1/t140201-c536-bgpos-00-b-ag-expected.txt:
+        * css2.1/t140201-c536-bgpos-00-b-ag.html:
+        * css2.1/t140201-c536-bgpos-01-b-ag-expected.txt:
+        * css2.1/t140201-c536-bgpos-01-b-ag.html:
+        * css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum:
+        * css2.1/t140201-c537-bgfxps-00-c-ag-expected.png:
+        * css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt:
+        * css2.1/t140201-c537-bgfxps-00-c-ag.html:
+        * css2.1/t1503-c522-font-family-00-b.html:
+        * css2.1/t1504-c523-font-style-00-b.html:
+        * css2.1/t1504-c543-txt-decor-00-d-g-expected.checksum:
+        * css2.1/t1504-c543-txt-decor-00-d-g-expected.png:
+        * css2.1/t1504-c543-txt-decor-00-d-g-expected.txt:
+        * css2.1/t1504-c543-txt-decor-00-d-g.html:
+        * css2.1/t1505-c524-font-var-00-b.html:
+        * css2.1/t1506-c525-font-wt-00-b.html:
+        * css2.1/t1507-c526-font-sz-00-b.html:
+        * css2.1/t1507-c526-font-sz-01-b-a.html:
+        * css2.1/t1507-c526-font-sz-02-b-a.html:
+        * css2.1/t1507-c526-font-sz-03-f-a.html:
+        * css2.1/t1508-c527-font-00-b.html:
+        * css2.1/t1508-c527-font-01-b.html:
+        * css2.1/t1508-c527-font-02-b.html:
+        * css2.1/t1508-c527-font-03-b.html:
+        * css2.1/t1508-c527-font-04-b.html:
+        * css2.1/t1508-c527-font-05-b.html:
+        * css2.1/t1508-c527-font-06-b.html:
+        * css2.1/t1508-c527-font-07-b.html:
+        * css2.1/t1508-c527-font-08-b.html:
+        * css2.1/t1508-c527-font-09-b.html:
+        * css2.1/t1508-c527-font-10-c.html:
+        * css2.1/t1601-c547-indent-00-b-a-expected.checksum:
+        * css2.1/t1601-c547-indent-00-b-a-expected.png:
+        * css2.1/t1601-c547-indent-00-b-a-expected.txt:
+        * css2.1/t1601-c547-indent-00-b-a.html:
+        * css2.1/t1601-c547-indent-01-d.html:
+        * css2.1/t1602-c43-center-00-d-ag.html:
+        * css2.1/t1602-c546-txt-align-00-b.html:
+        * css2.1/t1604-c541-word-sp-00-b-a-expected.checksum:
+        * css2.1/t1604-c541-word-sp-00-b-a-expected.png:
+        * css2.1/t1604-c541-word-sp-00-b-a-expected.txt:
+        * css2.1/t1604-c541-word-sp-00-b-a.html:
+        * css2.1/t1604-c541-word-sp-01-b-a-expected.checksum:
+        * css2.1/t1604-c541-word-sp-01-b-a-expected.png:
+        * css2.1/t1604-c541-word-sp-01-b-a-expected.txt:
+        * css2.1/t1604-c541-word-sp-01-b-a.html:
+        * css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum:
+        * css2.1/t1604-c542-letter-sp-00-b-a-expected.png:
+        * css2.1/t1604-c542-letter-sp-00-b-a-expected.txt:
+        * css2.1/t1604-c542-letter-sp-00-b-a.html:
+        * css2.1/t1604-c542-letter-sp-01-b-a-expected.checksum:
+        * css2.1/t1604-c542-letter-sp-01-b-a-expected.png:
+        * css2.1/t1604-c542-letter-sp-01-b-a-expected.txt:
+        * css2.1/t1604-c542-letter-sp-01-b-a.html:
+        * css2.1/t1605-c545-txttrans-00-b-ag-expected.checksum:
+        * css2.1/t1605-c545-txttrans-00-b-ag-expected.png:
+        * css2.1/t1605-c545-txttrans-00-b-ag-expected.txt:
+        * css2.1/t1605-c545-txttrans-00-b-ag.html:
+        * css2.1/t1606-c562-white-sp-00-b-ag.html:
+
 2006-01-04  Darin Adler  <darin@apple.com>
 
         - added a missing test result
diff --git a/LayoutTests/css2.1/t040109-c17-comments-00-b.html b/LayoutTests/css2.1/t040109-c17-comments-00-b.html
index 9721740..04e085a 100644
--- a/LayoutTests/css2.1/t040109-c17-comments-00-b.html
+++ b/LayoutTests/css2.1/t040109-c17-comments-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Comments</title>
diff --git a/LayoutTests/css2.1/t040109-c17-comments-01-b.html b/LayoutTests/css2.1/t040109-c17-comments-01-b.html
index ac72714..4fc041b 100644
--- a/LayoutTests/css2.1/t040109-c17-comments-01-b.html
+++ b/LayoutTests/css2.1/t040109-c17-comments-01-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Comments</title>
diff --git a/LayoutTests/css2.1/t0402-c71-fwd-parsing-00-f.html b/LayoutTests/css2.1/t0402-c71-fwd-parsing-00-f.html
index e72b1cf..46491f93 100644
--- a/LayoutTests/css2.1/t0402-c71-fwd-parsing-00-f.html
+++ b/LayoutTests/css2.1/t0402-c71-fwd-parsing-00-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Forward-Compatible Parsing</title>
diff --git a/LayoutTests/css2.1/t0402-c71-fwd-parsing-01-f.html b/LayoutTests/css2.1/t0402-c71-fwd-parsing-01-f.html
index 21ee9f5..a4b8e50 100644
--- a/LayoutTests/css2.1/t0402-c71-fwd-parsing-01-f.html
+++ b/LayoutTests/css2.1/t0402-c71-fwd-parsing-01-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Forward-Compatible Parsing</title>
diff --git a/LayoutTests/css2.1/t0402-c71-fwd-parsing-02-f.html b/LayoutTests/css2.1/t0402-c71-fwd-parsing-02-f.html
index feea878..b35f5ca 100644
--- a/LayoutTests/css2.1/t0402-c71-fwd-parsing-02-f.html
+++ b/LayoutTests/css2.1/t0402-c71-fwd-parsing-02-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Forward-Compatible Parsing</title>
diff --git a/LayoutTests/css2.1/t0402-c71-fwd-parsing-03-f.html b/LayoutTests/css2.1/t0402-c71-fwd-parsing-03-f.html
index 56f610a..758703b 100644
--- a/LayoutTests/css2.1/t0402-c71-fwd-parsing-03-f.html
+++ b/LayoutTests/css2.1/t0402-c71-fwd-parsing-03-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Forward-Compatible Parsing</title>
diff --git a/LayoutTests/css2.1/t0402-c71-fwd-parsing-04-f.html b/LayoutTests/css2.1/t0402-c71-fwd-parsing-04-f.html
index 1fff19b..d6768d7 100644
--- a/LayoutTests/css2.1/t0402-c71-fwd-parsing-04-f.html
+++ b/LayoutTests/css2.1/t0402-c71-fwd-parsing-04-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Forward-Compatible Parsing</title>
diff --git a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum
index 653cc5b..7abc24f 100644
--- a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.checksum
@@ -1 +1 @@
-aa49348f71d9b061d03f2f7e7aa0e695
\ No newline at end of file
+6ef99d98082577c39cff1e6cc842bf6d
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png
index da7c744..107d8c0 100644
--- a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png
+++ b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
index 7c51a14..df34e8b 100644
--- a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
+++ b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a-expected.txt
@@ -6,12 +6,12 @@
       RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {TEXT} at (0,0) size 327x18
           text run at (0,0) width 327: "The two blocks below should have the same height."
-      RenderTable {TABLE} at (80,34) size 142x52
+      RenderTable {TABLE} at (80,34) size 102x52
         RenderTableSection {TBODY} at (0,0) size 0x52
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 88x48 [r=0 c=0 rs=1 cs=1]
-              RenderBlock {DIV} at (4,4) size 80x40 [color=#000080]
-                RenderText {TEXT} at (0,0) size 80x40
-                  text run at (0,0) width 80: "\x{C3}\x{2030}"
-            RenderTableCell {TD} at (92,2) size 48x48 [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (2,2) size 48x48 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (4,4) size 40x40 [color=#000080]
+                RenderText {TEXT} at (0,0) size 40x40
+                  text run at (0,0) width 40: "\x{C9}"
+            RenderTableCell {TD} at (52,2) size 48x48 [r=0 c=1 rs=1 cs=1]
               RenderBlock {DIV} at (4,4) size 40x40 [border: (40px solid #000080) none]
diff --git a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a.html b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a.html
index a068cbe..19748f5 100644
--- a/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a.html
+++ b/LayoutTests/css2.1/t040302-c61-ex-len-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Length Units</title>
diff --git a/LayoutTests/css2.1/t040302-c61-phys-len-00-b.html b/LayoutTests/css2.1/t040302-c61-phys-len-00-b.html
index 2ff8ce2..5169f32 100644
--- a/LayoutTests/css2.1/t040302-c61-phys-len-00-b.html
+++ b/LayoutTests/css2.1/t040302-c61-phys-len-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Length Units</title>
diff --git a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum
index 998f6ce..c1e21a6 100644
--- a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum
+++ b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.checksum
@@ -1 +1 @@
-7064b7879f0f094d3f8bf885505de274
\ No newline at end of file
+56987757b4095cd1e8db7365e1cb52c0
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png
index fcffd7f..6309349 100644
--- a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png
+++ b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
index dc7c44d..00e88bc 100644
--- a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag-expected.txt
@@ -8,8 +8,8 @@
           text run at (0,0) width 324: "There should be a solid vertical bar of green below."
       RenderBlock {DIV} at (0,34) size 784x60
         RenderBlock {DIV} at (0,0) size 784x15
-          RenderText {TEXT} at (0,0) size 105x15
-            text run at (0,0) width 105: "\x{C2} \x{C2} \x{C2} X"
+          RenderText {TEXT} at (0,0) size 60x15
+            text run at (0,0) width 60: "   X"
         RenderBlock {DIV} at (45,15) size 739x15
           RenderText {TEXT} at (0,0) size 15x15
             text run at (0,0) width 15: "X"
diff --git a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag.html b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag.html
index eaaf1f6..eb08715 100644
--- a/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag.html
+++ b/LayoutTests/css2.1/t040302-c61-rel-len-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Length Units</title>
diff --git a/LayoutTests/css2.1/t040303-c62-percent-00-b-ag.html b/LayoutTests/css2.1/t040303-c62-percent-00-b-ag.html
index 396ad06..9f57f12 100644
--- a/LayoutTests/css2.1/t040303-c62-percent-00-b-ag.html
+++ b/LayoutTests/css2.1/t040303-c62-percent-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Percentage Units</title>
diff --git a/LayoutTests/css2.1/t040304-c64-uri-00-a-g.html b/LayoutTests/css2.1/t040304-c64-uri-00-a-g.html
index 0fa98b7..255942c 100644
--- a/LayoutTests/css2.1/t040304-c64-uri-00-a-g.html
+++ b/LayoutTests/css2.1/t040304-c64-uri-00-a-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: URLs</title>
diff --git a/LayoutTests/css2.1/t040306-c63-color-00-b-ag.html b/LayoutTests/css2.1/t040306-c63-color-00-b-ag.html
index d827a08..9c0b943 100644
--- a/LayoutTests/css2.1/t040306-c63-color-00-b-ag.html
+++ b/LayoutTests/css2.1/t040306-c63-color-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Color Units</title>
diff --git a/LayoutTests/css2.1/t050201-c12-grouping-00-b.html b/LayoutTests/css2.1/t050201-c12-grouping-00-b.html
index c2684d4..3aec163 100644
--- a/LayoutTests/css2.1/t050201-c12-grouping-00-b.html
+++ b/LayoutTests/css2.1/t050201-c12-grouping-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Grouping</title>
diff --git a/LayoutTests/css2.1/t0505-c16-descendant-00-e.html b/LayoutTests/css2.1/t0505-c16-descendant-00-e.html
index 57e0919..62371f3 100644
--- a/LayoutTests/css2.1/t0505-c16-descendant-00-e.html
+++ b/LayoutTests/css2.1/t0505-c16-descendant-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Descendant selectors (Contextual selectors)</title>
diff --git a/LayoutTests/css2.1/t0505-c16-descendant-01-e.html b/LayoutTests/css2.1/t0505-c16-descendant-01-e.html
index 0d9d3e0..b6c8f9a 100644
--- a/LayoutTests/css2.1/t0505-c16-descendant-01-e.html
+++ b/LayoutTests/css2.1/t0505-c16-descendant-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Contextual selectors</title>
diff --git a/LayoutTests/css2.1/t0505-c16-descendant-02-e.html b/LayoutTests/css2.1/t0505-c16-descendant-02-e.html
index 97da714..d695ab3 100644
--- a/LayoutTests/css2.1/t0505-c16-descendant-02-e.html
+++ b/LayoutTests/css2.1/t0505-c16-descendant-02-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Contextual selectors</title>
diff --git a/LayoutTests/css2.1/t050803-c14-classes-00-e.html b/LayoutTests/css2.1/t050803-c14-classes-00-e.html
index d3604eb..f434e1f 100644
--- a/LayoutTests/css2.1/t050803-c14-classes-00-e.html
+++ b/LayoutTests/css2.1/t050803-c14-classes-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Class as selector</title>
diff --git a/LayoutTests/css2.1/t0509-c15-ids-00-a.html b/LayoutTests/css2.1/t0509-c15-ids-00-a.html
index c89c1f5..0e03dcf 100644
--- a/LayoutTests/css2.1/t0509-c15-ids-00-a.html
+++ b/LayoutTests/css2.1/t0509-c15-ids-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: ID as selector</title>
diff --git a/LayoutTests/css2.1/t0509-c15-ids-01-e.html b/LayoutTests/css2.1/t0509-c15-ids-01-e.html
index e1a9209..c8cbef1 100644
--- a/LayoutTests/css2.1/t0509-c15-ids-01-e.html
+++ b/LayoutTests/css2.1/t0509-c15-ids-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: ID as selector</title>
diff --git a/LayoutTests/css2.1/t0510-c25-pseudo-elmnt-00-c.html b/LayoutTests/css2.1/t0510-c25-pseudo-elmnt-00-c.html
index 5d240ec..c2100ae 100644
--- a/LayoutTests/css2.1/t0510-c25-pseudo-elmnt-00-c.html
+++ b/LayoutTests/css2.1/t0510-c25-pseudo-elmnt-00-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Pseudo-elements in Selectors</title>
diff --git a/LayoutTests/css2.1/t0511-c21-pseud-anch-00-e-i.html b/LayoutTests/css2.1/t0511-c21-pseud-anch-00-e-i.html
index 5441607..a2d06f3 100644
--- a/LayoutTests/css2.1/t0511-c21-pseud-anch-00-e-i.html
+++ b/LayoutTests/css2.1/t0511-c21-pseud-anch-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t0511-c21-pseud-link-00-e.html b/LayoutTests/css2.1/t0511-c21-pseud-link-00-e.html
index bb213de..d9478a3 100644
--- a/LayoutTests/css2.1/t0511-c21-pseud-link-00-e.html
+++ b/LayoutTests/css2.1/t0511-c21-pseud-link-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t0511-c21-pseud-link-01-e.html b/LayoutTests/css2.1/t0511-c21-pseud-link-01-e.html
index 836b910..e4dc6db 100644
--- a/LayoutTests/css2.1/t0511-c21-pseud-link-01-e.html
+++ b/LayoutTests/css2.1/t0511-c21-pseud-link-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t0511-c21-pseud-link-02-e.html b/LayoutTests/css2.1/t0511-c21-pseud-link-02-e.html
index cd3a1e8..d96bd7a 100644
--- a/LayoutTests/css2.1/t0511-c21-pseud-link-02-e.html
+++ b/LayoutTests/css2.1/t0511-c21-pseud-link-02-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t0511-c21-pseud-link-03-e.html b/LayoutTests/css2.1/t0511-c21-pseud-link-03-e.html
index b04fad7..d153c6e 100644
--- a/LayoutTests/css2.1/t0511-c21-pseud-link-03-e.html
+++ b/LayoutTests/css2.1/t0511-c21-pseud-link-03-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t051103-c21-activ-ln-00-e-i.html b/LayoutTests/css2.1/t051103-c21-activ-ln-00-e-i.html
index 64f2293..acce0a0 100644
--- a/LayoutTests/css2.1/t051103-c21-activ-ln-00-e-i.html
+++ b/LayoutTests/css2.1/t051103-c21-activ-ln-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t051103-c21-focus-ln-00-e-i.html b/LayoutTests/css2.1/t051103-c21-focus-ln-00-e-i.html
index 62d80b8..2b366e7 100644
--- a/LayoutTests/css2.1/t051103-c21-focus-ln-00-e-i.html
+++ b/LayoutTests/css2.1/t051103-c21-focus-ln-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t051103-c21-hover-ln-00-e-i.html b/LayoutTests/css2.1/t051103-c21-hover-ln-00-e-i.html
index 7572699..246a0d7 100644
--- a/LayoutTests/css2.1/t051103-c21-hover-ln-00-e-i.html
+++ b/LayoutTests/css2.1/t051103-c21-hover-ln-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t051201-c23-first-line-00-b.html b/LayoutTests/css2.1/t051201-c23-first-line-00-b.html
index 2181b7f..c00b297 100644
--- a/LayoutTests/css2.1/t051201-c23-first-line-00-b.html
+++ b/LayoutTests/css2.1/t051201-c23-first-line-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: first-line</title>
diff --git a/LayoutTests/css2.1/t051202-c24-first-lttr-00-b.html b/LayoutTests/css2.1/t051202-c24-first-lttr-00-b.html
index 9b4b2d6..f560003 100644
--- a/LayoutTests/css2.1/t051202-c24-first-lttr-00-b.html
+++ b/LayoutTests/css2.1/t051202-c24-first-lttr-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: first-letter</title>
diff --git a/LayoutTests/css2.1/t051202-c26-psudo-nest-00-c.html b/LayoutTests/css2.1/t051202-c26-psudo-nest-00-c.html
index c48c4eb..da44bbe 100644
--- a/LayoutTests/css2.1/t051202-c26-psudo-nest-00-c.html
+++ b/LayoutTests/css2.1/t051202-c26-psudo-nest-00-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Multiple Pseudo-Elements</title>
diff --git a/LayoutTests/css2.1/t0602-c13-inh-underlin-00-e.html b/LayoutTests/css2.1/t0602-c13-inh-underlin-00-e.html
index 1ad1412..9fa4d50 100644
--- a/LayoutTests/css2.1/t0602-c13-inh-underlin-00-e.html
+++ b/LayoutTests/css2.1/t0602-c13-inh-underlin-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Inheritance</title>
diff --git a/LayoutTests/css2.1/t0602-c13-inheritance-00-e.html b/LayoutTests/css2.1/t0602-c13-inheritance-00-e.html
index fbdabd6..068f852 100644
--- a/LayoutTests/css2.1/t0602-c13-inheritance-00-e.html
+++ b/LayoutTests/css2.1/t0602-c13-inheritance-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Inheritance</title>
diff --git a/LayoutTests/css2.1/t0603-c11-import-00-b.html b/LayoutTests/css2.1/t0603-c11-import-00-b.html
index 87306c2..2658830 100644
--- a/LayoutTests/css2.1/t0603-c11-import-00-b.html
+++ b/LayoutTests/css2.1/t0603-c11-import-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Basic Containment</title>
diff --git a/LayoutTests/css2.1/t060401-c32-cascading-00-b.html b/LayoutTests/css2.1/t060401-c32-cascading-00-b.html
index 5cde8ae..746742c 100644
--- a/LayoutTests/css2.1/t060401-c32-cascading-00-b.html
+++ b/LayoutTests/css2.1/t060401-c32-cascading-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Cascading Order</title>
diff --git a/LayoutTests/css2.1/t060402-c31-important-00-b.html b/LayoutTests/css2.1/t060402-c31-important-00-b.html
index a10e327..b0b5e7f 100644
--- a/LayoutTests/css2.1/t060402-c31-important-00-b.html
+++ b/LayoutTests/css2.1/t060402-c31-important-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: important</title>
diff --git a/LayoutTests/css2.1/t060403-c21-pseu-cls-00-e-i.html b/LayoutTests/css2.1/t060403-c21-pseu-cls-00-e-i.html
index bf00df5..49e6b29 100644
--- a/LayoutTests/css2.1/t060403-c21-pseu-cls-00-e-i.html
+++ b/LayoutTests/css2.1/t060403-c21-pseu-cls-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t060403-c21-pseu-id-00-e-i.html b/LayoutTests/css2.1/t060403-c21-pseu-id-00-e-i.html
index 1331666..5edeace 100644
--- a/LayoutTests/css2.1/t060403-c21-pseu-id-00-e-i.html
+++ b/LayoutTests/css2.1/t060403-c21-pseu-id-00-e-i.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: anchor</title>
diff --git a/LayoutTests/css2.1/t0801-c412-hz-box-00-b-a.html b/LayoutTests/css2.1/t0801-c412-hz-box-00-b-a.html
index d996ce1..34d477e 100644
--- a/LayoutTests/css2.1/t0801-c412-hz-box-00-b-a.html
+++ b/LayoutTests/css2.1/t0801-c412-hz-box-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Horizontal Formatting</title>
diff --git a/LayoutTests/css2.1/t0803-c5501-imrgn-t-00-b-ag.html b/LayoutTests/css2.1/t0803-c5501-imrgn-t-00-b-ag.html
index a447e76..62fa509 100644
--- a/LayoutTests/css2.1/t0803-c5501-imrgn-t-00-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5501-imrgn-t-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-top</title>
diff --git a/LayoutTests/css2.1/t0803-c5501-mrgn-t-00-b-a.html b/LayoutTests/css2.1/t0803-c5501-mrgn-t-00-b-a.html
index 8cc7cb9..4399cc7 100644
--- a/LayoutTests/css2.1/t0803-c5501-mrgn-t-00-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5501-mrgn-t-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-top</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-00-b-ag.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-00-b-ag.html
index 61ee103..5b43353 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-00-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-01-b-ag.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-01-b-ag.html
index a48e49e..d133298 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-01-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-02-b-a.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-02-b-a.html
index 1e28226..777792e 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-02-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-02-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-03-b-a.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-03-b-a.html
index 879507e..2c2066e 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-03-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-03-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-04-b-ag.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-04-b-ag.html
index 63c1982..97226e8 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-04-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-04-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-05-b-ag.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-05-b-ag.html
index f019192..5dcde72 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-05-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-05-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-imrgn-r-06-b-ag.html b/LayoutTests/css2.1/t0803-c5502-imrgn-r-06-b-ag.html
index 94a767a..71bb201 100644
--- a/LayoutTests/css2.1/t0803-c5502-imrgn-r-06-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-imrgn-r-06-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-mrgn-r-00-c-ag.html b/LayoutTests/css2.1/t0803-c5502-mrgn-r-00-c-ag.html
index 1c9b617..c918625 100644
--- a/LayoutTests/css2.1/t0803-c5502-mrgn-r-00-c-ag.html
+++ b/LayoutTests/css2.1/t0803-c5502-mrgn-r-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-mrgn-r-01-c-a.html b/LayoutTests/css2.1/t0803-c5502-mrgn-r-01-c-a.html
index 2d7fae7..8088bef 100644
--- a/LayoutTests/css2.1/t0803-c5502-mrgn-r-01-c-a.html
+++ b/LayoutTests/css2.1/t0803-c5502-mrgn-r-01-c-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html b/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html
index fccfecb..56cf1b9 100644
--- a/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html
+++ b/LayoutTests/css2.1/t0803-c5502-mrgn-r-02-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5502-mrgn-r-03-c.html b/LayoutTests/css2.1/t0803-c5502-mrgn-r-03-c.html
index 78b55fb..1d7f042 100644
--- a/LayoutTests/css2.1/t0803-c5502-mrgn-r-03-c.html
+++ b/LayoutTests/css2.1/t0803-c5502-mrgn-r-03-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-right</title>
diff --git a/LayoutTests/css2.1/t0803-c5503-imrgn-b-00-b-a.html b/LayoutTests/css2.1/t0803-c5503-imrgn-b-00-b-a.html
index a2da9f3..75d4871 100644
--- a/LayoutTests/css2.1/t0803-c5503-imrgn-b-00-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5503-imrgn-b-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-bottom</title>
diff --git a/LayoutTests/css2.1/t0803-c5503-mrgn-b-00-b-a.html b/LayoutTests/css2.1/t0803-c5503-mrgn-b-00-b-a.html
index 3c3dbb0..5374d46 100644
--- a/LayoutTests/css2.1/t0803-c5503-mrgn-b-00-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5503-mrgn-b-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-bottom</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-00-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-00-b-ag.html
index 6d1a1bb..6d34f34 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-00-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-01-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-01-b-ag.html
index 6c32d81..8d667c8 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-01-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-02-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-02-b-ag.html
index b465c4c..5b8eb30 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-02-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-02-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-03-b-a.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-03-b-a.html
index 6774c79..f15808b 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-03-b-a.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-03-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-04-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-04-b-ag.html
index 63fe328..5d6e981 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-04-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-04-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-05-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-05-b-ag.html
index 28c1f03..cd8dab5 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-05-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-05-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-imrgn-l-06-b-ag.html b/LayoutTests/css2.1/t0803-c5504-imrgn-l-06-b-ag.html
index 15c04dd..810bca9 100644
--- a/LayoutTests/css2.1/t0803-c5504-imrgn-l-06-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-imrgn-l-06-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-00-c-ag.html b/LayoutTests/css2.1/t0803-c5504-mrgn-l-00-c-ag.html
index 40c0ca1..20b2e0e 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-00-c-ag.html
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-01-c-a.html b/LayoutTests/css2.1/t0803-c5504-mrgn-l-01-c-a.html
index 04d8db4..a4cb531 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-01-c-a.html
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-01-c-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.checksum b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.checksum
index cbc887c..f20010e 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.checksum
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.checksum
@@ -1 +1 @@
-cf8905f1f3951bec50c7f13af86dff9e
\ No newline at end of file
+661b825fbf419adb0c4a6eb8ca2153f7
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.png b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.png
index d5636a32..ab6252e 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.png
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
index 1b01072..4039628 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c-expected.txt
@@ -4,5 +4,5 @@
   RenderBlock {HTML} at (0,0) size 800x66
     RenderBody {BODY} at (8,24) size 784x18
       RenderBlock {P} at (-10,0) size 794x18 [color=#000080]
-        RenderText {TEXT} at (0,0) size 318x18
-          text run at (0,0) width 318: "\x{C2} \x{C2} This page should have a horizontal scroll bar."
+        RenderText {TEXT} at (0,0) size 294x18
+          text run at (0,0) width 294: "  This page should have a horizontal scroll bar."
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c.html b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c.html
index 1033370..028b042 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c.html
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-02-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5504-mrgn-l-03-c.html b/LayoutTests/css2.1/t0803-c5504-mrgn-l-03-c.html
index 273c165..ca9a4da 100644
--- a/LayoutTests/css2.1/t0803-c5504-mrgn-l-03-c.html
+++ b/LayoutTests/css2.1/t0803-c5504-mrgn-l-03-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin-left</title>
diff --git a/LayoutTests/css2.1/t0803-c5505-imrgn-00-a-ag.html b/LayoutTests/css2.1/t0803-c5505-imrgn-00-a-ag.html
index 6e69637..27bc1cc 100644
--- a/LayoutTests/css2.1/t0803-c5505-imrgn-00-a-ag.html
+++ b/LayoutTests/css2.1/t0803-c5505-imrgn-00-a-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin</title>
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-00-b-ag.html b/LayoutTests/css2.1/t0803-c5505-mrgn-00-b-ag.html
index f996775..23646f3 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-00-b-ag.html
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin</title>
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-01-e-a.html b/LayoutTests/css2.1/t0803-c5505-mrgn-01-e-a.html
index 044102f..d861363 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-01-e-a.html
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-01-e-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin</title>
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
index 0ae782c..e0287f3 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.checksum
@@ -1 +1 @@
-339c986aa819bd018c2e5dedd57ccc4f
\ No newline at end of file
+becff1519804b29a07d1bcc526c03d30
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
index 58df94b..a228e54 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
index 1d8f241..fed1192 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c-expected.txt
@@ -5,5 +5,5 @@
     RenderBody {BODY} at (8,-2) size 784x36
       RenderBlock {P} at (-10,0) size 804x36 [color=#000080]
         RenderBR {BR} at (0,0) size 0x18
-        RenderText {TEXT} at (0,18) size 318x18
-          text run at (0,18) width 318: "\x{C2} \x{C2} This page should have a horizontal scroll bar."
+        RenderText {TEXT} at (0,18) size 294x18
+          text run at (0,18) width 294: "  This page should have a horizontal scroll bar."
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html
index 179078e..e87d976 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-02-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin</title>
diff --git a/LayoutTests/css2.1/t0803-c5505-mrgn-03-c-ag.html b/LayoutTests/css2.1/t0803-c5505-mrgn-03-c-ag.html
index fd1895d..4d0381a 100644
--- a/LayoutTests/css2.1/t0803-c5505-mrgn-03-c-ag.html
+++ b/LayoutTests/css2.1/t0803-c5505-mrgn-03-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: margin</title>
diff --git a/LayoutTests/css2.1/t080301-c411-vt-mrgn-00-b.html b/LayoutTests/css2.1/t080301-c411-vt-mrgn-00-b.html
index 7c14c7b..797e6f1 100644
--- a/LayoutTests/css2.1/t080301-c411-vt-mrgn-00-b.html
+++ b/LayoutTests/css2.1/t080301-c411-vt-mrgn-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Vertical Formatting</title>
diff --git a/LayoutTests/css2.1/t0804-c5506-ipadn-t-00-b-a.html b/LayoutTests/css2.1/t0804-c5506-ipadn-t-00-b-a.html
index 97e993c..98cfdff 100644
--- a/LayoutTests/css2.1/t0804-c5506-ipadn-t-00-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5506-ipadn-t-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-top</title>
diff --git a/LayoutTests/css2.1/t0804-c5506-ipadn-t-01-b-a.html b/LayoutTests/css2.1/t0804-c5506-ipadn-t-01-b-a.html
index 1646041..c4138c9 100644
--- a/LayoutTests/css2.1/t0804-c5506-ipadn-t-01-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5506-ipadn-t-01-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-top</title>
diff --git a/LayoutTests/css2.1/t0804-c5506-ipadn-t-02-b-a.html b/LayoutTests/css2.1/t0804-c5506-ipadn-t-02-b-a.html
index d2eedaa..3542994 100644
--- a/LayoutTests/css2.1/t0804-c5506-ipadn-t-02-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5506-ipadn-t-02-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-top</title>
diff --git a/LayoutTests/css2.1/t0804-c5506-padn-t-00-b-a.html b/LayoutTests/css2.1/t0804-c5506-padn-t-00-b-a.html
index 9860de6..e5aed4a 100644
--- a/LayoutTests/css2.1/t0804-c5506-padn-t-00-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5506-padn-t-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-top</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-ipadn-r-00-b-ag.html b/LayoutTests/css2.1/t0804-c5507-ipadn-r-00-b-ag.html
index 792418b..f3f8844 100644
--- a/LayoutTests/css2.1/t0804-c5507-ipadn-r-00-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5507-ipadn-r-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-ipadn-r-01-b-ag.html b/LayoutTests/css2.1/t0804-c5507-ipadn-r-01-b-ag.html
index de5c492..4b1766f 100644
--- a/LayoutTests/css2.1/t0804-c5507-ipadn-r-01-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5507-ipadn-r-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-ipadn-r-02-b-ag.html b/LayoutTests/css2.1/t0804-c5507-ipadn-r-02-b-ag.html
index 1341e2f..5fc8e8c 100644
--- a/LayoutTests/css2.1/t0804-c5507-ipadn-r-02-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5507-ipadn-r-02-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-ipadn-r-03-b-a.html b/LayoutTests/css2.1/t0804-c5507-ipadn-r-03-b-a.html
index bf60b8f..2f33bcb 100644
--- a/LayoutTests/css2.1/t0804-c5507-ipadn-r-03-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5507-ipadn-r-03-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-ipadn-r-04-b-ag.html b/LayoutTests/css2.1/t0804-c5507-ipadn-r-04-b-ag.html
index 512f122d..79fec62 100644
--- a/LayoutTests/css2.1/t0804-c5507-ipadn-r-04-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5507-ipadn-r-04-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-padn-r-00-c-ag.html b/LayoutTests/css2.1/t0804-c5507-padn-r-00-c-ag.html
index 18b24eb..8e83c06 100644
--- a/LayoutTests/css2.1/t0804-c5507-padn-r-00-c-ag.html
+++ b/LayoutTests/css2.1/t0804-c5507-padn-r-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-padn-r-01-c-a.html b/LayoutTests/css2.1/t0804-c5507-padn-r-01-c-a.html
index 8096b25..41b930b 100644
--- a/LayoutTests/css2.1/t0804-c5507-padn-r-01-c-a.html
+++ b/LayoutTests/css2.1/t0804-c5507-padn-r-01-c-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-padn-r-02-f.html b/LayoutTests/css2.1/t0804-c5507-padn-r-02-f.html
index 6eb213b..4e0c62f 100644
--- a/LayoutTests/css2.1/t0804-c5507-padn-r-02-f.html
+++ b/LayoutTests/css2.1/t0804-c5507-padn-r-02-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5507-padn-r-03-f.html b/LayoutTests/css2.1/t0804-c5507-padn-r-03-f.html
index f456ac9..9973d16 100644
--- a/LayoutTests/css2.1/t0804-c5507-padn-r-03-f.html
+++ b/LayoutTests/css2.1/t0804-c5507-padn-r-03-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-right</title>
diff --git a/LayoutTests/css2.1/t0804-c5508-ipadn-b-00-b-a.html b/LayoutTests/css2.1/t0804-c5508-ipadn-b-00-b-a.html
index a4481b90..07c0406 100644
--- a/LayoutTests/css2.1/t0804-c5508-ipadn-b-00-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5508-ipadn-b-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-bottom</title>
diff --git a/LayoutTests/css2.1/t0804-c5508-ipadn-b-01-f-a.html b/LayoutTests/css2.1/t0804-c5508-ipadn-b-01-f-a.html
index eedb4f0..244c095 100644
--- a/LayoutTests/css2.1/t0804-c5508-ipadn-b-01-f-a.html
+++ b/LayoutTests/css2.1/t0804-c5508-ipadn-b-01-f-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-bottom</title>
diff --git a/LayoutTests/css2.1/t0804-c5508-ipadn-b-02-b-a.html b/LayoutTests/css2.1/t0804-c5508-ipadn-b-02-b-a.html
index a177a8e..80692cb 100644
--- a/LayoutTests/css2.1/t0804-c5508-ipadn-b-02-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5508-ipadn-b-02-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-bottom</title>
diff --git a/LayoutTests/css2.1/t0804-c5508-ipadn-b-03-b-a.html b/LayoutTests/css2.1/t0804-c5508-ipadn-b-03-b-a.html
index e2a3a85..0d97414 100644
--- a/LayoutTests/css2.1/t0804-c5508-ipadn-b-03-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5508-ipadn-b-03-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-bottom</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-ipadn-l-00-b-ag.html b/LayoutTests/css2.1/t0804-c5509-ipadn-l-00-b-ag.html
index 5217c63..ec95357 100644
--- a/LayoutTests/css2.1/t0804-c5509-ipadn-l-00-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5509-ipadn-l-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-ipadn-l-01-b-ag.html b/LayoutTests/css2.1/t0804-c5509-ipadn-l-01-b-ag.html
index 17c7f1b..cebeae1 100644
--- a/LayoutTests/css2.1/t0804-c5509-ipadn-l-01-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5509-ipadn-l-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-ipadn-l-02-b-ag.html b/LayoutTests/css2.1/t0804-c5509-ipadn-l-02-b-ag.html
index 0214536..9da17bc 100644
--- a/LayoutTests/css2.1/t0804-c5509-ipadn-l-02-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5509-ipadn-l-02-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-ipadn-l-03-b-a.html b/LayoutTests/css2.1/t0804-c5509-ipadn-l-03-b-a.html
index d26b9a6..476644b 100644
--- a/LayoutTests/css2.1/t0804-c5509-ipadn-l-03-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5509-ipadn-l-03-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-ipadn-l-04-f-ag.html b/LayoutTests/css2.1/t0804-c5509-ipadn-l-04-f-ag.html
index 2dba037..69ae59e 100644
--- a/LayoutTests/css2.1/t0804-c5509-ipadn-l-04-f-ag.html
+++ b/LayoutTests/css2.1/t0804-c5509-ipadn-l-04-f-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-padn-l-00-b-ag.html b/LayoutTests/css2.1/t0804-c5509-padn-l-00-b-ag.html
index 908f1ef..c0175e7 100644
--- a/LayoutTests/css2.1/t0804-c5509-padn-l-00-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5509-padn-l-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-padn-l-01-b-a.html b/LayoutTests/css2.1/t0804-c5509-padn-l-01-b-a.html
index a5f7d79..2e81dd9 100644
--- a/LayoutTests/css2.1/t0804-c5509-padn-l-01-b-a.html
+++ b/LayoutTests/css2.1/t0804-c5509-padn-l-01-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-padn-l-02-f.html b/LayoutTests/css2.1/t0804-c5509-padn-l-02-f.html
index 0721966..28d141d 100644
--- a/LayoutTests/css2.1/t0804-c5509-padn-l-02-f.html
+++ b/LayoutTests/css2.1/t0804-c5509-padn-l-02-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5509-padn-l-03-f-g.html b/LayoutTests/css2.1/t0804-c5509-padn-l-03-f-g.html
index 9fc74c5..db4e517 100644
--- a/LayoutTests/css2.1/t0804-c5509-padn-l-03-f-g.html
+++ b/LayoutTests/css2.1/t0804-c5509-padn-l-03-f-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding-left</title>
diff --git a/LayoutTests/css2.1/t0804-c5510-ipadn-00-b-ag.html b/LayoutTests/css2.1/t0804-c5510-ipadn-00-b-ag.html
index b8fab13..b20e105 100644
--- a/LayoutTests/css2.1/t0804-c5510-ipadn-00-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5510-ipadn-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding</title>
diff --git a/LayoutTests/css2.1/t0804-c5510-padn-00-b-ag.html b/LayoutTests/css2.1/t0804-c5510-padn-00-b-ag.html
index fc6d193..bf935ea 100644
--- a/LayoutTests/css2.1/t0804-c5510-padn-00-b-ag.html
+++ b/LayoutTests/css2.1/t0804-c5510-padn-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding</title>
diff --git a/LayoutTests/css2.1/t0804-c5510-padn-01-e-a.html b/LayoutTests/css2.1/t0804-c5510-padn-01-e-a.html
index 8840442..0ac18c4 100644
--- a/LayoutTests/css2.1/t0804-c5510-padn-01-e-a.html
+++ b/LayoutTests/css2.1/t0804-c5510-padn-01-e-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding</title>
diff --git a/LayoutTests/css2.1/t0804-c5510-padn-02-f.html b/LayoutTests/css2.1/t0804-c5510-padn-02-f.html
index adac38c..6263d00 100644
--- a/LayoutTests/css2.1/t0804-c5510-padn-02-f.html
+++ b/LayoutTests/css2.1/t0804-c5510-padn-02-f.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: padding</title>
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-00-b.html b/LayoutTests/css2.1/t0805-c5511-brdr-tw-00-b.html
index 2c780b3..5547687 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-01-b-g.html b/LayoutTests/css2.1/t0805-c5511-brdr-tw-01-b-g.html
index 52a2cb2..e932771 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.checksum b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.checksum
index fa879ed..9ac5ec5 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.checksum
@@ -1 +1 @@
-58c013de8bf685e00e1502dada29272a
\ No newline at end of file
+eb664b5bce37cb4923b61a78b69928b4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.png b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.png
index d251a81..d46486d 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
index 4e28537..3e4eb21 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b-expected.txt
@@ -7,5 +7,5 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page:"
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b.html b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b.html
index a9b5612..7edc169 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b.html
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5511-brdr-tw-03-b.html b/LayoutTests/css2.1/t0805-c5511-brdr-tw-03-b.html
index 90616b5..4c27774 100644
--- a/LayoutTests/css2.1/t0805-c5511-brdr-tw-03-b.html
+++ b/LayoutTests/css2.1/t0805-c5511-brdr-tw-03-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.checksum
index 05082a6..9a35724 100644
--- a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.checksum
@@ -1 +1 @@
-756212ef5eec98992e276554c6ca7054
\ No newline at end of file
+aeea787dbc6f434a5cf02ac46b0ae0c8
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png
index 7947616..2b3d07c 100644
--- a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
index a96eab9..aeda74d 100644
--- a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a-expected.txt
@@ -11,7 +11,7 @@
       RenderBlock {P} at (0,34) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be no red on this line. "
-        RenderInline {SPAN} at (0,0) size 48x18 [color=#FF0000]
-          RenderText {TEXT} at (227,0) size 48x18
-            text run at (227,0) width 48: "\x{C2} \x{C2} \x{C2} "
+        RenderInline {SPAN} at (0,0) size 12x18 [color=#FF0000]
+          RenderText {TEXT} at (227,0) size 12x18
+            text run at (227,0) width 12: "   "
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a.html b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a.html
index c717616..cda7284 100644
--- a/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5511-ibrdr-tw-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-00-b.html b/LayoutTests/css2.1/t0805-c5512-brdr-rw-00-b.html
index 69d6be5..ce4e9c5 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-01-b-g.html b/LayoutTests/css2.1/t0805-c5512-brdr-rw-01-b-g.html
index d78c6d4..105ca77 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.checksum b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.checksum
index fa879ed..9ac5ec5 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.checksum
@@ -1 +1 @@
-58c013de8bf685e00e1502dada29272a
\ No newline at end of file
+eb664b5bce37cb4923b61a78b69928b4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.png b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.png
index d251a81..d46486d 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
index 4e28537..3e4eb21 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b-expected.txt
@@ -7,5 +7,5 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page:"
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b.html b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b.html
index a80fc20..ef596b2 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b.html
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5512-brdr-rw-03-b.html b/LayoutTests/css2.1/t0805-c5512-brdr-rw-03-b.html
index 46b7622..ad17802 100644
--- a/LayoutTests/css2.1/t0805-c5512-brdr-rw-03-b.html
+++ b/LayoutTests/css2.1/t0805-c5512-brdr-rw-03-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.checksum
index 1bb6f9e..543dd2f 100644
--- a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.checksum
@@ -1 +1 @@
-ad1d797e17ae7d212d7cc8d226ca70a0
\ No newline at end of file
+fe8c41e28b1c5660e4ad1de80f16754c
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png
index 07176c0..e7bdba8 100644
--- a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
index a4c0190..e90dfb3 100644
--- a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a-expected.txt
@@ -11,7 +11,7 @@
       RenderBlock {P} at (0,34) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be no red on this line. "
-        RenderInline {SPAN} at (0,0) size 48x18 [color=#FF0000]
-          RenderText {TEXT} at (227,0) size 48x18
-            text run at (227,0) width 48: "\x{C2} \x{C2} \x{C2} "
+        RenderInline {SPAN} at (0,0) size 12x18 [color=#FF0000]
+          RenderText {TEXT} at (227,0) size 12x18
+            text run at (227,0) width 12: "   "
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a.html b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a.html
index 6ad99ff..c95708e 100644
--- a/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5512-ibrdr-rw-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-00-b.html b/LayoutTests/css2.1/t0805-c5513-brdr-bw-00-b.html
index 05c1e91..ee0acc4 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-01-b-g.html b/LayoutTests/css2.1/t0805-c5513-brdr-bw-01-b-g.html
index 02cca94..cf4a34e 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.checksum b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.checksum
index fa879ed..9ac5ec5 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.checksum
@@ -1 +1 @@
-58c013de8bf685e00e1502dada29272a
\ No newline at end of file
+eb664b5bce37cb4923b61a78b69928b4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.png b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.png
index d251a81..d46486d 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
index 4e28537..3e4eb21 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b-expected.txt
@@ -7,5 +7,5 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page:"
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b.html b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b.html
index 27c3df5..48f9539 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b.html
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5513-brdr-bw-03-b.html b/LayoutTests/css2.1/t0805-c5513-brdr-bw-03-b.html
index aae424e..cb68873 100644
--- a/LayoutTests/css2.1/t0805-c5513-brdr-bw-03-b.html
+++ b/LayoutTests/css2.1/t0805-c5513-brdr-bw-03-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.checksum
index 638676b..152c4bb 100644
--- a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.checksum
@@ -1 +1 @@
-73d4eb3d3c2196967b8000b5bade5486
\ No newline at end of file
+d9bd65f125315dfb01a2b5d49d28cf7d
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png
index f712913..e2d1b2e 100644
--- a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
index 60a5a90..f46756d 100644
--- a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a-expected.txt
@@ -11,7 +11,7 @@
       RenderBlock {P} at (0,34) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be no red on this line. "
-        RenderInline {SPAN} at (0,0) size 48x18 [color=#FF0000]
-          RenderText {TEXT} at (227,0) size 48x18
-            text run at (227,0) width 48: "\x{C2} \x{C2} \x{C2} "
+        RenderInline {SPAN} at (0,0) size 12x18 [color=#FF0000]
+          RenderText {TEXT} at (227,0) size 12x18
+            text run at (227,0) width 12: "   "
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a.html b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a.html
index 516efc2..9c28727 100644
--- a/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5513-ibrdr-bw-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-00-b.html b/LayoutTests/css2.1/t0805-c5514-brdr-lw-00-b.html
index a52bd45..059c774 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-01-b-g.html b/LayoutTests/css2.1/t0805-c5514-brdr-lw-01-b-g.html
index ac587f4..3d51a69 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.checksum b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.checksum
index fa879ed..9ac5ec5 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.checksum
@@ -1 +1 @@
-58c013de8bf685e00e1502dada29272a
\ No newline at end of file
+eb664b5bce37cb4923b61a78b69928b4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.png b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.png
index d251a81..d46486d 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
index 4e28537..3e4eb21 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b-expected.txt
@@ -7,5 +7,5 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page:"
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b.html b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b.html
index eae844c..6cf541a 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b.html
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5514-brdr-lw-03-b.html b/LayoutTests/css2.1/t0805-c5514-brdr-lw-03-b.html
index dd2441a..427441a 100644
--- a/LayoutTests/css2.1/t0805-c5514-brdr-lw-03-b.html
+++ b/LayoutTests/css2.1/t0805-c5514-brdr-lw-03-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.checksum
index 73b7ffa..52ab808 100644
--- a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.checksum
@@ -1 +1 @@
-f864befa4241c3eee417d1281a59f2d9
\ No newline at end of file
+05f74d0b69743e3e7d3cc923c8ec8771
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png
index 0c7222a..a8e71d7 100644
--- a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
index 957a5d5..21f5e36 100644
--- a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a-expected.txt
@@ -11,7 +11,7 @@
       RenderBlock {P} at (0,34) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be no red on this line. "
-        RenderInline {SPAN} at (0,0) size 48x18 [color=#FF0000]
-          RenderText {TEXT} at (227,0) size 48x18
-            text run at (227,0) width 48: "\x{C2} \x{C2} \x{C2} "
+        RenderInline {SPAN} at (0,0) size 12x18 [color=#FF0000]
+          RenderText {TEXT} at (227,0) size 12x18
+            text run at (227,0) width 12: "   "
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a.html b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a.html
index 4d4eae2..a53ab6c 100644
--- a/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5514-ibrdr-lw-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-00-a.html b/LayoutTests/css2.1/t0805-c5515-brdr-w-00-a.html
index b352ec3..27f2623 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-01-b-g.html b/LayoutTests/css2.1/t0805-c5515-brdr-w-01-b-g.html
index 47b5576..f4b06cd 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.checksum b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.checksum
index d172973..9ac5ec5 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.checksum
@@ -1 +1 @@
-9ce1faf6233fc9a99914e7a9164a14b4
\ No newline at end of file
+eb664b5bce37cb4923b61a78b69928b4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.png b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.png
index 92047af..d46486d 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.txt b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
index c41a29d..ef052ae 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b-expected.txt
@@ -7,8 +7,8 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page:"
       RenderBlock {P} at (0,34) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
       RenderBlock {P} at (0,68) size 784x18 [color=#FF0000]
-        RenderText {TEXT} at (0,0) size 16x18
-          text run at (0,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (0,0) size 4x18
+          text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b.html b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b.html
index 4ef8cfc..e0edc37 100644
--- a/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b.html
+++ b/LayoutTests/css2.1/t0805-c5515-brdr-w-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.checksum b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.checksum
index d4565d9..8416ddb9e 100644
--- a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.checksum
@@ -1 +1 @@
-e801722a4c1d08f4862bd358adf77148
\ No newline at end of file
+4f6a9e606f5468cea6c682c40aa35c11
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.png b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.png
index 5b6bc62..7b4222a 100644
--- a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.png
+++ b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.txt b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
index 6bf79fe..9b7efd0 100644
--- a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b-expected.txt
@@ -11,7 +11,7 @@
       RenderBlock {P} at (0,34) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be no red on this line. "
-        RenderInline {SPAN} at (0,0) size 48x18 [color=#FF0000]
-          RenderText {TEXT} at (227,0) size 48x18
-            text run at (227,0) width 48: "\x{C2} \x{C2} \x{C2} "
+        RenderInline {SPAN} at (0,0) size 12x18 [color=#FF0000]
+          RenderText {TEXT} at (227,0) size 12x18
+            text run at (227,0) width 12: "   "
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b.html b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b.html
index 16633e1..97683a7 100644
--- a/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5515-ibrdr-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-width</title>
diff --git a/LayoutTests/css2.1/t0805-c5516-brdr-c-00-a.html b/LayoutTests/css2.1/t0805-c5516-brdr-c-00-a.html
index 9aa5833..4bba6c7 100644
--- a/LayoutTests/css2.1/t0805-c5516-brdr-c-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5516-brdr-c-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-color</title>
diff --git a/LayoutTests/css2.1/t0805-c5516-ibrdr-c-00-a.html b/LayoutTests/css2.1/t0805-c5516-ibrdr-c-00-a.html
index f593838..18c366e 100644
--- a/LayoutTests/css2.1/t0805-c5516-ibrdr-c-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5516-ibrdr-c-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-color</title>
diff --git a/LayoutTests/css2.1/t0805-c5517-brdr-s-00-c.html b/LayoutTests/css2.1/t0805-c5517-brdr-s-00-c.html
index 87ea6a9..1344be3 100644
--- a/LayoutTests/css2.1/t0805-c5517-brdr-s-00-c.html
+++ b/LayoutTests/css2.1/t0805-c5517-brdr-s-00-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-style</title>
diff --git a/LayoutTests/css2.1/t0805-c5517-ibrdr-s-00-a.html b/LayoutTests/css2.1/t0805-c5517-ibrdr-s-00-a.html
index 1a287dc..1c9289c 100644
--- a/LayoutTests/css2.1/t0805-c5517-ibrdr-s-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5517-ibrdr-s-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-style</title>
diff --git a/LayoutTests/css2.1/t0805-c5518-brdr-t-00-a.html b/LayoutTests/css2.1/t0805-c5518-brdr-t-00-a.html
index 042c99f..ad5b119 100644
--- a/LayoutTests/css2.1/t0805-c5518-brdr-t-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5518-brdr-t-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top</title>
diff --git a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.checksum b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.checksum
index 99c70d2..cccdb6a 100644
--- a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.checksum
@@ -1 +1 @@
-166d7ff16040cdd0454a07e244fec0cc
\ No newline at end of file
+67fd3e6713f1db0b321ed5a37929e8d9
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.png b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.png
index 4634d01..03c8a7e 100644
--- a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.png
+++ b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
index fbbc64b..3e591a9 100644
--- a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e-expected.txt
@@ -6,38 +6,38 @@
       RenderBlock {P} at (0,0) size 784x36
         RenderText {TEXT} at (0,0) size 483x18
           text run at (0,0) width 483: "There should be a solid blue line directly over every occurance of the word \""
-        RenderInline {SPAN} at (0,0) size 70x20 [border: (2px solid #0000FF) none]
-          RenderText {TEXT} at (483,0) size 70x18
-            text run at (483,0) width 70: "HERE \x{E2}\x{2021}\x{A7}"
-        RenderText {TEXT} at (553,0) size 766x36
-          text run at (553,0) width 213: "\". (So there should be 8 blue lines"
-          text run at (0,18) width 85: "on this page.)"
-      RenderTable {TABLE} at (0,52) size 156x76
+        RenderInline {SPAN} at (0,0) size 63x20 [border: (2px solid #0000FF) none]
+          RenderText {TEXT} at (483,0) size 63x18
+            text run at (483,0) width 63: "HERE \x{21E7}"
+        RenderText {TEXT} at (546,0) size 779x36
+          text run at (546,0) width 233: "\". (So there should be 8 blue lines on"
+          text run at (0,18) width 65: "this page.)"
+      RenderTable {TABLE} at (0,52) size 142x76
         RenderTableSection {TBODY} at (0,0) size 0x76
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 152x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
-              RenderText {TEXT} at (41,3) size 70x18
-                text run at (41,3) width 70: "HERE \x{E2}\x{2021}\x{A7}"
+            RenderTableCell {TD} at (2,2) size 138x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+              RenderText {TEXT} at (37,3) size 63x18
+                text run at (37,3) width 63: "HERE \x{21E7}"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,39) size 72x22 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
-              RenderText {TEXT} at (1,3) size 70x18
-                text run at (1,3) width 70: "HERE \x{E2}\x{2021}\x{A7}"
-            RenderTableCell {TD} at (76,26) size 78x48 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderBlock (anonymous) at (1,3) size 76x18
-                RenderText {TEXT} at (3,0) size 70x18
-                  text run at (3,0) width 70: "HERE \x{E2}\x{2021}\x{A7}"
-              RenderTable {TABLE} at (1,21) size 76x26
+            RenderTableCell {TD} at (2,39) size 65x22 [border: (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (1,3) size 63x18
+                text run at (1,3) width 63: "HERE \x{21E7}"
+            RenderTableCell {TD} at (69,26) size 71x48 [border: (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (1,3) size 69x18
+                RenderText {TEXT} at (3,0) size 63x18
+                  text run at (3,0) width 63: "HERE \x{21E7}"
+              RenderTable {TABLE} at (1,21) size 69x26
                 RenderTableSection {TBODY} at (0,0) size 0x26
                   RenderTableRow {TR} at (0,0) size 0x0
-                    RenderTableCell {TD} at (2,2) size 72x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
-                      RenderText {TEXT} at (1,3) size 70x18
-                        text run at (1,3) width 70: "HERE \x{E2}\x{2021}\x{A7}"
+                    RenderTableCell {TD} at (2,2) size 65x22 [border: (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+                      RenderText {TEXT} at (1,3) size 63x18
+                        text run at (1,3) width 63: "HERE \x{21E7}"
       RenderBlock {UL} at (0,144) size 784x114
         RenderListItem {LI} at (40,0) size 744x74 [border: (2px solid #0000FF) none]
           RenderBlock (anonymous) at (0,2) size 744x18
             RenderListMarker at (0,0) size 0x14
-            RenderText {TEXT} at (0,0) size 70x18
-              text run at (0,0) width 70: "HERE \x{E2}\x{2021}\x{A7}"
+            RenderText {TEXT} at (0,0) size 63x18
+              text run at (0,0) width 63: "HERE \x{21E7}"
           RenderBlock {UL} at (0,20) size 744x54
             RenderListItem {LI} at (40,0) size 704x18
               RenderListMarker at (0,0) size 0x14
@@ -53,9 +53,9 @@
                 text run at (0,0) width 75: "dummy text"
         RenderListItem {LI} at (40,74) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (0,2) size 0x14
-          RenderText {TEXT} at (0,2) size 70x18
-            text run at (0,2) width 70: "HERE \x{E2}\x{2021}\x{A7}"
+          RenderText {TEXT} at (0,2) size 63x18
+            text run at (0,2) width 63: "HERE \x{21E7}"
         RenderListItem {LI} at (40,94) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (0,2) size 0x14
-          RenderText {TEXT} at (0,2) size 70x18
-            text run at (0,2) width 70: "HERE \x{E2}\x{2021}\x{A7}"
+          RenderText {TEXT} at (0,2) size 63x18
+            text run at (0,2) width 63: "HERE \x{21E7}"
diff --git a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e.html b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e.html
index b9e3d5b..7c92cd1 100644
--- a/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e.html
+++ b/LayoutTests/css2.1/t0805-c5518-brdr-t-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top</title>
diff --git a/LayoutTests/css2.1/t0805-c5518-ibrdr-t-00-a.html b/LayoutTests/css2.1/t0805-c5518-ibrdr-t-00-a.html
index 04c68a7..354b548 100644
--- a/LayoutTests/css2.1/t0805-c5518-ibrdr-t-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5518-ibrdr-t-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-top</title>
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.checksum
index d149aca..0e53195 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.checksum
@@ -1 +1 @@
-9970191f7c2b40693041498cedb7443b
\ No newline at end of file
+732db647a912ae727db5ba20111abda6
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.png b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.png
index 4fa7a69..acd6e4a 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
index c88015b..747999f 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x228
     RenderBody {BODY} at (8,16) size 784x196
       RenderBlock {P} at (0,0) size 764x90 [color=#0000FF] [border: (10px double #0000FF) none]
-        RenderText {TEXT} at (0,0) size 370x18
-          text run at (0,0) width 370: "This paragraph should have two blue lines on its right. \x{E2}\x{2021}\x{A8} "
+        RenderText {TEXT} at (0,0) size 366x18
+          text run at (0,0) width 366: "This paragraph should have two blue lines on its right. \x{21E8} "
         RenderInline {SPAN} at (0,0) size 734x90 [color=#C0C0C0]
-          RenderText {TEXT} at (370,0) size 734x90
-            text run at (370,0) width 364: "dummy text dummy text dummy text dummy text dummy"
+          RenderText {TEXT} at (366,0) size 734x90
+            text run at (366,0) width 364: "dummy text dummy text dummy text dummy text dummy"
             text run at (0,18) width 79: "text dummy "
             text run at (79,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (553,18) width 181: "text dummy text dummy text"
@@ -20,17 +20,18 @@
             text run at (0,72) width 154: "dummy text dummy text"
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {P} at (0,106) size 764x90 [color=#0000FF] [border: (1px solid #0000FF) none]
-        RenderText {TEXT} at (0,0) size 375x18
-          text run at (0,0) width 375: "This paragraph should have a thin blue line on its right. \x{E2}\x{2021}\x{A8} "
-        RenderInline {SPAN} at (0,0) size 759x90 [color=#C0C0C0]
-          RenderText {TEXT} at (375,0) size 759x90
-            text run at (375,0) width 364: "dummy text dummy text dummy text dummy text dummy"
-            text run at (0,18) width 79: "text dummy "
-            text run at (79,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (553,18) width 181: "text dummy text dummy text"
-            text run at (0,36) width 289: "dummy text dummy text dummy text dummy "
-            text run at (289,36) width 470: "text dummy text dummy text dummy text dummy text dummy text dummy"
-            text run at (0,54) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
-            text run at (474,54) width 260: "text dummy text dummy text dummy text"
-            text run at (0,72) width 75: "dummy text"
+        RenderText {TEXT} at (0,0) size 371x18
+          text run at (0,0) width 371: "This paragraph should have a thin blue line on its right. \x{21E8} "
+        RenderInline {SPAN} at (0,0) size 762x90 [color=#C0C0C0]
+          RenderText {TEXT} at (371,0) size 762x90
+            text run at (371,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
+            text run at (0,18) width 52: "dummy "
+            text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (526,18) width 233: "text dummy text dummy text dummy"
+            text run at (0,36) width 237: "text dummy text dummy text dummy "
+            text run at (237,36) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (711,36) width 23: "text"
+            text run at (0,54) width 447: "dummy text dummy text dummy text dummy text dummy text dummy "
+            text run at (447,54) width 312: "text dummy text dummy text dummy text dummy"
+            text run at (0,72) width 23: "text"
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a.html b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a.html
index 68b77de..d7141bf 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right</title>
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.checksum b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.checksum
index 696528d..93f7d213 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.checksum
@@ -1 +1 @@
-33d3f891965e1782575c6665e4f82f24
\ No newline at end of file
+8c97561cbdc55dcc4b119ca0896585fb
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.png b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.png
index cd34578..7f966eb 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.png
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.txt b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.txt
index f1cfefa..fb04952 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e-expected.txt
@@ -6,31 +6,31 @@
       RenderBlock {P} at (0,0) size 784x37
         RenderText {TEXT} at (0,15) size 489x18
           text run at (0,15) width 489: "There should be a solid blue line to the right of every occurance of the word \""
-        RenderInline {SPAN} at (0,0) size 173x37 [border: (2px solid #0000FF) none]
-          RenderText {TEXT} at (489,0) size 171x37
-            text run at (489,0) width 171: "THERE \x{E2}\x{17E}\x{2122}"
-        RenderText {TEXT} at (662,15) size 11x18
-          text run at (662,15) width 11: "\"."
-      RenderTable {TABLE} at (0,53) size 364x127
+        RenderInline {SPAN} at (0,0) size 144x37 [border: (2px solid #0000FF) none]
+          RenderText {TEXT} at (489,0) size 142x37
+            text run at (489,0) width 142: "THERE \x{2799}"
+        RenderText {TEXT} at (633,15) size 11x18
+          text run at (633,15) width 11: "\"."
+      RenderTable {TABLE} at (0,53) size 306x127
         RenderTableSection {TBODY} at (0,0) size 0x127
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 360x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
-              RenderText {TEXT} at (186,1) size 171x37
-                text run at (186,1) width 171: "THERE \x{E2}\x{17E}\x{2122}"
+            RenderTableCell {TD} at (2,2) size 302x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+              RenderText {TEXT} at (157,1) size 142x37
+                text run at (157,1) width 142: "THERE \x{2799}"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,64) size 175x39 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
-              RenderText {TEXT} at (1,1) size 171x37
-                text run at (1,1) width 171: "THERE \x{E2}\x{17E}\x{2122}"
-            RenderTableCell {TD} at (179,43) size 183x82 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderBlock (anonymous) at (1,1) size 179x37
-                RenderText {TEXT} at (28,0) size 151x37
-                  text run at (28,0) width 151: "THERE \x{E2}\x{17E}\x{2DC}"
-              RenderTable {TABLE} at (1,38) size 179x43
+            RenderTableCell {TD} at (2,64) size 146x39 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (1,1) size 142x37
+                text run at (1,1) width 142: "THERE \x{2799}"
+            RenderTableCell {TD} at (150,43) size 154x82 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (1,1) size 150x37
+                RenderText {TEXT} at (14,0) size 136x37
+                  text run at (14,0) width 136: "THERE \x{2798}"
+              RenderTable {TABLE} at (1,38) size 150x43
                 RenderTableSection {TBODY} at (0,0) size 0x43
                   RenderTableRow {TR} at (0,0) size 0x0
-                    RenderTableCell {TD} at (2,2) size 175x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
-                      RenderText {TEXT} at (1,1) size 171x37
-                        text run at (1,1) width 171: "THERE \x{E2}\x{17E}\x{2122}"
+                    RenderTableCell {TD} at (2,2) size 146x39 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+                      RenderText {TEXT} at (1,1) size 142x37
+                        text run at (1,1) width 142: "THERE \x{2799}"
       RenderBlock {P} at (0,196) size 784x18
         RenderText {TEXT} at (0,0) size 337x18
           text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total."
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e.html b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e.html
index 87c83cc..16e3300 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e.html
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right</title>
diff --git a/LayoutTests/css2.1/t0805-c5519-brdr-r-02-e.html b/LayoutTests/css2.1/t0805-c5519-brdr-r-02-e.html
index e176525..e652ae8 100644
--- a/LayoutTests/css2.1/t0805-c5519-brdr-r-02-e.html
+++ b/LayoutTests/css2.1/t0805-c5519-brdr-r-02-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right</title>
diff --git a/LayoutTests/css2.1/t0805-c5519-ibrdr-r-00-a.html b/LayoutTests/css2.1/t0805-c5519-ibrdr-r-00-a.html
index 5e65153..3d59bb2 100644
--- a/LayoutTests/css2.1/t0805-c5519-ibrdr-r-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5519-ibrdr-r-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-right</title>
diff --git a/LayoutTests/css2.1/t0805-c5520-brdr-b-00-a.html b/LayoutTests/css2.1/t0805-c5520-brdr-b-00-a.html
index d06401a..8ca86cf 100644
--- a/LayoutTests/css2.1/t0805-c5520-brdr-b-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5520-brdr-b-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom</title>
diff --git a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.checksum b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.checksum
index db6f528..ebe1b54 100644
--- a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.checksum
@@ -1 +1 @@
-ded8387603d5cc855c7d573e6d09e554
\ No newline at end of file
+32c3b5a0d9a03bb972b8c3a764a329b3
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.png b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.png
index c30db97..c607975 100644
--- a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.png
+++ b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
index 38c54d4..f8b1f98 100644
--- a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e-expected.txt
@@ -6,32 +6,32 @@
       RenderBlock {P} at (0,0) size 784x36
         RenderText {TEXT} at (0,0) size 491x18
           text run at (0,0) width 491: "There should be a solid blue line directly under every occurance of the word \""
-        RenderInline {SPAN} at (0,0) size 74x20 [border: (2px solid #0000FF) none]
-          RenderText {TEXT} at (491,0) size 74x18
-            text run at (491,0) width 74: "HERE \x{E2}\x{2021}\x{A9}"
-        RenderText {TEXT} at (565,0) size 778x36
-          text run at (565,0) width 213: "\". (So there should be 8 blue lines"
+        RenderInline {SPAN} at (0,0) size 63x20 [border: (2px solid #0000FF) none]
+          RenderText {TEXT} at (491,0) size 63x18
+            text run at (491,0) width 63: "HERE \x{21E9}"
+        RenderText {TEXT} at (554,0) size 767x36
+          text run at (554,0) width 213: "\". (So there should be 8 blue lines"
           text run at (0,18) width 85: "on this page.)"
-      RenderTable {TABLE} at (0,52) size 164x76
+      RenderTable {TABLE} at (0,52) size 142x76
         RenderTableSection {TBODY} at (0,0) size 0x76
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 160x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
-              RenderText {TEXT} at (43,1) size 74x18
-                text run at (43,1) width 74: "HERE \x{E2}\x{2021}\x{A9}"
+            RenderTableCell {TD} at (2,2) size 138x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=2]
+              RenderText {TEXT} at (37,1) size 63x18
+                text run at (37,1) width 63: "HERE \x{21E9}"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,39) size 76x22 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
-              RenderText {TEXT} at (1,1) size 74x18
-                text run at (1,1) width 74: "HERE \x{E2}\x{2021}\x{A9}"
-            RenderTableCell {TD} at (80,26) size 82x48 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
-              RenderTable {TABLE} at (1,1) size 80x26
+            RenderTableCell {TD} at (2,39) size 65x22 [border: none (2px solid #0000FF) none] [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (1,1) size 63x18
+                text run at (1,1) width 63: "HERE \x{21E9}"
+            RenderTableCell {TD} at (69,26) size 71x48 [border: none (2px solid #0000FF) none] [r=1 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (1,1) size 69x26
                 RenderTableSection {TBODY} at (0,0) size 0x26
                   RenderTableRow {TR} at (0,0) size 0x0
-                    RenderTableCell {TD} at (2,2) size 76x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
-                      RenderText {TEXT} at (1,1) size 74x18
-                        text run at (1,1) width 74: "HERE \x{E2}\x{2021}\x{A9}"
-              RenderBlock (anonymous) at (1,27) size 80x18
-                RenderText {TEXT} at (3,0) size 74x18
-                  text run at (3,0) width 74: "HERE \x{E2}\x{2021}\x{A9}"
+                    RenderTableCell {TD} at (2,2) size 65x22 [border: none (2px solid #0000FF) none] [r=0 c=0 rs=1 cs=1]
+                      RenderText {TEXT} at (1,1) size 63x18
+                        text run at (1,1) width 63: "HERE \x{21E9}"
+              RenderBlock (anonymous) at (1,27) size 69x18
+                RenderText {TEXT} at (3,0) size 63x18
+                  text run at (3,0) width 63: "HERE \x{21E9}"
       RenderBlock {UL} at (0,144) size 784x114
         RenderListItem {LI} at (40,0) size 744x74 [border: (2px solid #0000FF) none]
           RenderBlock {UL} at (0,0) size 744x54
@@ -49,13 +49,13 @@
               RenderText {TEXT} at (0,0) size 75x18
                 text run at (0,0) width 75: "dummy text"
           RenderBlock (anonymous) at (0,54) size 744x18
-            RenderText {TEXT} at (0,0) size 74x18
-              text run at (0,0) width 74: "HERE \x{E2}\x{2021}\x{A9}"
+            RenderText {TEXT} at (0,0) size 63x18
+              text run at (0,0) width 63: "HERE \x{21E9}"
         RenderListItem {LI} at (40,74) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (0,0) size 0x14
-          RenderText {TEXT} at (0,0) size 74x18
-            text run at (0,0) width 74: "HERE \x{E2}\x{2021}\x{A9}"
+          RenderText {TEXT} at (0,0) size 63x18
+            text run at (0,0) width 63: "HERE \x{21E9}"
         RenderListItem {LI} at (40,94) size 744x20 [border: (2px solid #0000FF) none]
           RenderListMarker at (0,0) size 0x14
-          RenderText {TEXT} at (0,0) size 74x18
-            text run at (0,0) width 74: "HERE \x{E2}\x{2021}\x{A9}"
+          RenderText {TEXT} at (0,0) size 63x18
+            text run at (0,0) width 63: "HERE \x{21E9}"
diff --git a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e.html b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e.html
index da92de4..480068a 100644
--- a/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e.html
+++ b/LayoutTests/css2.1/t0805-c5520-brdr-b-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom</title>
diff --git a/LayoutTests/css2.1/t0805-c5520-ibrdr-b-00-a.html b/LayoutTests/css2.1/t0805-c5520-ibrdr-b-00-a.html
index 27d422c..be64951 100644
--- a/LayoutTests/css2.1/t0805-c5520-ibrdr-b-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5520-ibrdr-b-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-bottom</title>
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.checksum
index c217c96..49f8d90 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.checksum
@@ -1 +1 @@
-ec586a6e440ba70c83a0b681df5b7847
\ No newline at end of file
+1b795cfa3cd45d1319f6211b734f2b4a
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.png b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.png
index 0c23d92..554276b 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
index 00b70a9..63a4c19 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a-expected.txt
@@ -4,11 +4,11 @@
   RenderBlock {HTML} at (0,0) size 800x228
     RenderBody {BODY} at (8,16) size 784x196
       RenderBlock {P} at (20,0) size 764x90 [color=#0000FF] [border: (10px double #0000FF)]
-        RenderText {TEXT} at (10,0) size 359x18
-          text run at (10,0) width 359: "\x{E2}\x{2021}\x{A6} This paragraph should have two blue lines on its left. "
-        RenderInline {SPAN} at (0,0) size 750x90 [color=#C0C0C0]
-          RenderText {TEXT} at (369,0) size 750x90
-            text run at (369,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
+        RenderText {TEXT} at (10,0) size 357x18
+          text run at (10,0) width 357: "\x{21E6} This paragraph should have two blue lines on its left. "
+        RenderInline {SPAN} at (0,0) size 748x90 [color=#C0C0C0]
+          RenderText {TEXT} at (367,0) size 748x90
+            text run at (367,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
             text run at (10,18) width 52: "dummy "
             text run at (62,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (536,18) width 181: "text dummy text dummy text"
@@ -20,11 +20,11 @@
             text run at (10,72) width 154: "dummy text dummy text"
         RenderText {TEXT} at (0,0) size 0x0
       RenderBlock {P} at (20,106) size 764x90 [color=#0000FF] [border: (1px solid #0000FF)]
-        RenderText {TEXT} at (1,0) size 364x18
-          text run at (1,0) width 364: "\x{E2}\x{2021}\x{A6} This paragraph should have a thin blue line on its left. "
+        RenderText {TEXT} at (1,0) size 362x18
+          text run at (1,0) width 362: "\x{21E6} This paragraph should have a thin blue line on its left. "
         RenderInline {SPAN} at (0,0) size 759x90 [color=#C0C0C0]
-          RenderText {TEXT} at (365,0) size 759x90
-            text run at (365,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          RenderText {TEXT} at (363,0) size 759x90
+            text run at (363,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
             text run at (1,18) width 52: "dummy "
             text run at (53,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (527,18) width 233: "text dummy text dummy text dummy"
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a.html b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a.html
index 87b929b..0af5720 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left</title>
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.checksum b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.checksum
index 724c190..1906fe2 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.checksum
@@ -1 +1 @@
-55be2fdeee7f0db54e8bcac0927424eb
\ No newline at end of file
+4327f20cdf0cf05d0cfffa1b70e78c54
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.png b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.png
index 97c6854..d0b8943 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.png
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.txt b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.txt
index 8e85a3d..0fcc945 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e-expected.txt
@@ -6,31 +6,31 @@
       RenderBlock {P} at (0,0) size 784x37
         RenderText {TEXT} at (0,15) size 480x18
           text run at (0,15) width 480: "There should be a solid blue line to the left of every occurance of the word \""
-        RenderInline {SPAN} at (0,0) size 142x37 [border: (2px solid #0000FF)]
-          RenderText {TEXT} at (482,0) size 140x37
-            text run at (482,0) width 140: "\x{E2}\x{2021}\x{A6}THERE"
-        RenderText {TEXT} at (622,15) size 11x18
-          text run at (622,15) width 11: "\"."
-      RenderTable {TABLE} at (0,53) size 302x127
+        RenderInline {SPAN} at (0,0) size 138x37 [border: (2px solid #0000FF)]
+          RenderText {TEXT} at (482,0) size 136x37
+            text run at (482,0) width 136: "\x{21E6}THERE"
+        RenderText {TEXT} at (618,15) size 11x18
+          text run at (618,15) width 11: "\"."
+      RenderTable {TABLE} at (0,53) size 294x127
         RenderTableSection {TBODY} at (0,0) size 0x127
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,2) size 298x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2]
-              RenderText {TEXT} at (3,1) size 140x37
-                text run at (3,1) width 140: "\x{E2}\x{2021}\x{A6}THERE"
+            RenderTableCell {TD} at (2,2) size 290x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2]
+              RenderText {TEXT} at (3,1) size 136x37
+                text run at (3,1) width 136: "\x{21E6}THERE"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (2,64) size 144x39 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
-              RenderText {TEXT} at (3,1) size 140x37
-                text run at (3,1) width 140: "\x{E2}\x{2021}\x{A6}THERE"
-            RenderTableCell {TD} at (148,43) size 152x82 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1]
-              RenderBlock (anonymous) at (3,1) size 148x37
-                RenderText {TEXT} at (0,0) size 140x37
-                  text run at (0,0) width 140: "\x{E2}\x{2021}\x{A6}THERE"
-              RenderTable {TABLE} at (3,38) size 148x43
+            RenderTableCell {TD} at (2,64) size 140x39 [border: none (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
+              RenderText {TEXT} at (3,1) size 136x37
+                text run at (3,1) width 136: "\x{21E6}THERE"
+            RenderTableCell {TD} at (144,43) size 148x82 [border: none (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (3,1) size 144x37
+                RenderText {TEXT} at (0,0) size 136x37
+                  text run at (0,0) width 136: "\x{21E6}THERE"
+              RenderTable {TABLE} at (3,38) size 144x43
                 RenderTableSection {TBODY} at (0,0) size 0x43
                   RenderTableRow {TR} at (0,0) size 0x0
-                    RenderTableCell {TD} at (2,2) size 144x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
-                      RenderText {TEXT} at (3,1) size 140x37
-                        text run at (3,1) width 140: "\x{E2}\x{2021}\x{A6}THERE"
+                    RenderTableCell {TD} at (2,2) size 140x39 [border: none (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
+                      RenderText {TEXT} at (3,1) size 136x37
+                        text run at (3,1) width 136: "\x{21E6}THERE"
       RenderBlock {P} at (0,196) size 784x18
         RenderText {TEXT} at (0,0) size 337x18
           text run at (0,0) width 337: "There should be 3 short lines and 2 long lines in total."
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e.html b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e.html
index 3a780a7..f9eb16c 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e.html
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-01-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left</title>
diff --git a/LayoutTests/css2.1/t0805-c5521-brdr-l-02-e.html b/LayoutTests/css2.1/t0805-c5521-brdr-l-02-e.html
index 7b7642f..eb6b89a 100644
--- a/LayoutTests/css2.1/t0805-c5521-brdr-l-02-e.html
+++ b/LayoutTests/css2.1/t0805-c5521-brdr-l-02-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left</title>
diff --git a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.checksum b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.checksum
index c3fcca3..c0bfed5 100644
--- a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.checksum
+++ b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.checksum
@@ -1 +1 @@
-4c1b9c71e7798039bcaee3489b607ef8
\ No newline at end of file
+8bd361fa20fc03399051f52a61de5cc6
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png
index cc44c43..a8558eb 100644
--- a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png
+++ b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
index 06ba238..97b9f4e 100644
--- a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
+++ b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a-expected.txt
@@ -15,12 +15,12 @@
           text run at (659,18) width 75: "dummy text"
           text run at (0,36) width 395: "dummy text dummy text dummy text dummy text dummy text "
         RenderInline {SPAN} at (0,0) size 759x54 [color=#0000FF] [border: (10px double #0000FF)]
-          RenderText {TEXT} at (405,36) size 177x18
-            text run at (405,36) width 177: "\x{E2}\x{2021}\x{A6} two blue lines to the left "
+          RenderText {TEXT} at (405,36) size 175x18
+            text run at (405,36) width 175: "\x{21E6} two blue lines to the left "
           RenderInline {SPAN} at (0,0) size 759x54 [color=#C0C0C0]
-            RenderText {TEXT} at (582,36) size 759x54
-              text run at (582,36) width 52: "dummy "
-              text run at (634,36) width 102: "text dummy text"
+            RenderText {TEXT} at (580,36) size 759x54
+              text run at (580,36) width 52: "dummy "
+              text run at (632,36) width 102: "text dummy text"
               text run at (0,54) width 368: "dummy text dummy text dummy text dummy text dummy "
               text run at (368,54) width 391: "text dummy text dummy text dummy text dummy text dummy"
               text run at (0,72) width 23: "text"
@@ -38,12 +38,12 @@
           text run at (79,126) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
           text run at (553,126) width 206: "dummy text dummy text dummy"
           text run at (0,144) width 185: "text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 199x18 [color=#0000FF] [border: (1px solid #0000FF)]
-          RenderText {TEXT} at (186,144) size 198x18
-            text run at (186,144) width 198: "\x{E2}\x{2021}\x{A6} one thin blue line to the left "
-        RenderText {TEXT} at (384,144) size 775x90
-          text run at (384,144) width 52: "dummy "
-          text run at (436,144) width 339: "text dummy text dummy text dummy text dummy text"
+        RenderInline {SPAN} at (0,0) size 197x18 [color=#0000FF] [border: (1px solid #0000FF)]
+          RenderText {TEXT} at (186,144) size 196x18
+            text run at (186,144) width 196: "\x{21E6} one thin blue line to the left "
+        RenderText {TEXT} at (382,144) size 773x90
+          text run at (382,144) width 52: "dummy "
+          text run at (434,144) width 339: "text dummy text dummy text dummy text dummy text"
           text run at (0,162) width 131: "dummy text dummy "
           text run at (131,162) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
           text run at (605,162) width 154: "text dummy text dummy"
diff --git a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a.html b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a.html
index cb5f53b..e19be9f 100644
--- a/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5521-ibrdr-l-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border-left</title>
diff --git a/LayoutTests/css2.1/t0805-c5522-brdr-00-b.html b/LayoutTests/css2.1/t0805-c5522-brdr-00-b.html
index 9cac701..6fabc41 100644
--- a/LayoutTests/css2.1/t0805-c5522-brdr-00-b.html
+++ b/LayoutTests/css2.1/t0805-c5522-brdr-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border</title>
diff --git a/LayoutTests/css2.1/t0805-c5522-brdr-01-b-g.html b/LayoutTests/css2.1/t0805-c5522-brdr-01-b-g.html
index c1ce79b..8cb0dc3 100644
--- a/LayoutTests/css2.1/t0805-c5522-brdr-01-b-g.html
+++ b/LayoutTests/css2.1/t0805-c5522-brdr-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border</title>
diff --git a/LayoutTests/css2.1/t0805-c5522-brdr-02-e.html b/LayoutTests/css2.1/t0805-c5522-brdr-02-e.html
index ab02923..2b7def2 100644
--- a/LayoutTests/css2.1/t0805-c5522-brdr-02-e.html
+++ b/LayoutTests/css2.1/t0805-c5522-brdr-02-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border</title>
diff --git a/LayoutTests/css2.1/t0805-c5522-ibrdr-00-a.html b/LayoutTests/css2.1/t0805-c5522-ibrdr-00-a.html
index cf91801..349b164 100644
--- a/LayoutTests/css2.1/t0805-c5522-ibrdr-00-a.html
+++ b/LayoutTests/css2.1/t0805-c5522-ibrdr-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: border</title>
diff --git a/LayoutTests/css2.1/t09-c5526c-display-00-e.html b/LayoutTests/css2.1/t09-c5526c-display-00-e.html
index 1e29665..127665e 100644
--- a/LayoutTests/css2.1/t09-c5526c-display-00-e.html
+++ b/LayoutTests/css2.1/t09-c5526c-display-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: display/box/float/clear test</title>
diff --git a/LayoutTests/css2.1/t090402-c42-ibx-pad-00-d-ag.html b/LayoutTests/css2.1/t090402-c42-ibx-pad-00-d-ag.html
index 4f3a82a..34572b2 100644
--- a/LayoutTests/css2.1/t090402-c42-ibx-pad-00-d-ag.html
+++ b/LayoutTests/css2.1/t090402-c42-ibx-pad-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Inline Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.checksum
index 5e424fb..6b5c64b 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.checksum
@@ -1 +1 @@
-fcee13561580bca4d229f35de30607f6
\ No newline at end of file
+c8a1342793937f1eb66a3271cb613dc4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.png b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.png
index 7059983..f75e0fa 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt
index 6dbb271..d6bb148 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt
@@ -8,16 +8,16 @@
           text run at (0,0) width 404: "The two patterns below should be identical, with no red present."
       RenderBlock {DIV} at (0,34) size 784x68
         RenderBlock {DIV} at (16,16) size 160x18 [color=#FFFF00] [bgcolor=#000080]
-          RenderText {TEXT} at (0,0) size 40x18
-            text run at (0,0) width 40: "\x{C2} \x{E2}\x{2DC}\x{AE}"
+          RenderText {TEXT} at (0,0) size 16x18
+            text run at (0,0) width 16: " \x{262E}"
         RenderBlock {DIV} at (96,34) size 160x18 [color=#FFFF00] [bgcolor=#000080]
-          RenderText {TEXT} at (120,0) size 40x18
-            text run at (120,0) width 40: "\x{E2}\x{2DC}\x{AE}\x{C2} "
+          RenderText {TEXT} at (144,0) size 16x18
+            text run at (144,0) width 16: "\x{262E} "
       RenderBlock {DIV} at (16,118) size 240x0
         RenderBlock {DIV} at (0,0) size 240x0 [bgcolor=#FF0000]
           RenderBlock (floating) {P} at (0,0) size 160x18 [color=#FFFF00] [bgcolor=#000080]
-            RenderText {TEXT} at (0,0) size 40x18
-              text run at (0,0) width 40: "\x{C2} \x{E2}\x{2DC}\x{AE}"
+            RenderText {TEXT} at (0,0) size 16x18
+              text run at (0,0) width 16: " \x{262E}"
           RenderBlock (floating) {P} at (80,18) size 160x18 [color=#FFFF00] [bgcolor=#000080]
-            RenderText {TEXT} at (120,0) size 40x18
-              text run at (120,0) width 40: "\x{E2}\x{2DC}\x{AE}\x{C2} "
+            RenderText {TEXT} at (144,0) size 16x18
+              text run at (144,0) width 16: "\x{262E} "
diff --git a/LayoutTests/css2.1/t0905-c414-flt-00-d.html b/LayoutTests/css2.1/t0905-c414-flt-00-d.html
index a619efc..696bb0c 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-00-d.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-00-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-01-d-g.html b/LayoutTests/css2.1/t0905-c414-flt-01-d-g.html
index 42fd322..286a945 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-01-d-g.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-01-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.checksum
index 1078d92..24ef235 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.checksum
@@ -1 +1 @@
-62764df0841d217b1982b5a9e9dbd9d5
\ No newline at end of file
+7c6528396649d26d917a55d2a40b0f16
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.png b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.png
index 12b5bd4..37c9632 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
index d175653..1603b96 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
@@ -12,32 +12,32 @@
           text run at (408,18) width 71: "alignment.)"
       RenderBlock {DIV} at (16,52) size 320x0
         RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 1"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 1"
         RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 45x18
-            text run at (7,7) width 45: "\x{E2}\x{2021}\x{A6} B 2"
+          RenderText {TEXT} at (7,7) size 43x18
+            text run at (7,7) width 43: "\x{21E6} B 2"
         RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 3"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 4 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 5"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 6 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 8 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 8 \x{21E8}"
         RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 7"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 9"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 9"
         RenderBlock (floating) {P} at (138,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 53x18
-            text run at (7,7) width 53: "\x{E2}\x{2021}\x{A6} B 10"
+          RenderText {TEXT} at (7,7) size 51x18
+            text run at (7,7) width 51: "\x{21E6} B 10"
diff --git a/LayoutTests/css2.1/t0905-c414-flt-02-c.html b/LayoutTests/css2.1/t0905-c414-flt-02-c.html
index 71f3f11..65c5158 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-02-c.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-02-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.checksum
index b04568d..dc66454 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.checksum
@@ -1 +1 @@
-be5617b5963263f157a7b1140299049a
\ No newline at end of file
+20125bf49c8b2b8e356f1e54f7c39579
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.png b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.png
index 09d18f6..54d4bee 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
index 41d5f25..41cf38a 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
@@ -12,32 +12,32 @@
           text run at (457,18) width 118: "correct alignment.)"
       RenderBlock {DIV} at (16,52) size 320x0
         RenderBlock (floating) {P} at (190,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 2 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 2 \x{21E8}"
         RenderBlock (floating) {P} at (56,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (71,7) size 48x18
-            text run at (71,7) width 48: "A 1 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (75,7) size 44x18
+            text run at (75,7) width 44: "A 1 \x{21E8}"
         RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 4 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 3"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 6 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 5"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 7"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (190,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 8 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 8 \x{21E8}"
         RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (64,7) size 55x18
-            text run at (64,7) width 55: "B 10 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (68,7) size 51x18
+            text run at (68,7) width 51: "B 10 \x{21E8}"
         RenderBlock (floating) {P} at (56,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (71,7) size 48x18
-            text run at (71,7) width 48: "A 9 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (75,7) size 44x18
+            text run at (75,7) width 44: "A 9 \x{21E8}"
diff --git a/LayoutTests/css2.1/t0905-c414-flt-03-c.html b/LayoutTests/css2.1/t0905-c414-flt-03-c.html
index 27db2db..1985e31 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-03-c.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-03-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.checksum
index 6246989..aec880b 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.checksum
@@ -1 +1 @@
-f6d9c83b034b58c40f64ddabe9134736
\ No newline at end of file
+8231e6595bcb35ce60fc0cac16c8eef7
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.png b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.png
index 82f3c04..f449631 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
index 9fd0156..ca71d27 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
@@ -12,44 +12,44 @@
           text run at (408,18) width 71: "alignment.)"
       RenderBlock {DIV} at (16,52) size 320x0
         RenderBlock (floating) {P} at (4,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 1"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 1"
         RenderBlock (floating) {P} at (138,4) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 45x18
-            text run at (7,7) width 45: "\x{E2}\x{2021}\x{A6} B 2"
+          RenderText {TEXT} at (7,7) size 43x18
+            text run at (7,7) width 43: "\x{21E6} B 2"
         RenderBlock (floating) {P} at (4,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 3"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 3"
         RenderBlock (floating) {P} at (190,44) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 4 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 4 \x{21E8}"
         RenderBlock (floating) {P} at (4,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 5"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 5"
         RenderBlock (floating) {P} at (190,84) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (72,7) size 47x18
-            text run at (72,7) width 47: "B 6 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (76,7) size 43x18
+            text run at (76,7) width 43: "B 6 \x{21E8}"
         RenderBlock (floating) {P} at (4,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 7"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 7"
         RenderBlock (floating) {P} at (138,124) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 45x18
-            text run at (7,7) width 45: "\x{E2}\x{2021}\x{A6} B 8"
+          RenderText {TEXT} at (7,7) size 43x18
+            text run at (7,7) width 43: "\x{21E6} B 8"
         RenderBlock (floating) {P} at (4,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 46x18
-            text run at (7,7) width 46: "\x{E2}\x{2021}\x{A6} A 9"
+          RenderText {TEXT} at (7,7) size 44x18
+            text run at (7,7) width 44: "\x{21E6} A 9"
         RenderBlock (floating) {P} at (190,164) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (64,7) size 55x18
-            text run at (64,7) width 55: "B 10 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (68,7) size 51x18
+            text run at (68,7) width 51: "B 10 \x{21E8}"
         RenderBlock (floating) {P} at (4,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 54x18
-            text run at (7,7) width 54: "\x{E2}\x{2021}\x{A6} A 11"
+          RenderText {TEXT} at (7,7) size 52x18
+            text run at (7,7) width 52: "\x{21E6} A 11"
         RenderBlock (floating) {P} at (190,204) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (64,7) size 55x18
-            text run at (64,7) width 55: "B 12 \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (68,7) size 51x18
+            text run at (68,7) width 51: "B 12 \x{21E8}"
         RenderBlock (floating) {P} at (4,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 54x18
-            text run at (7,7) width 54: "\x{E2}\x{2021}\x{A6} A 13"
+          RenderText {TEXT} at (7,7) size 52x18
+            text run at (7,7) width 52: "\x{21E6} A 13"
         RenderBlock (floating) {P} at (138,244) size 126x32 [color=#FFFFFF] [bgcolor=#000080] [border: (3px solid #0000FF)]
-          RenderText {TEXT} at (7,7) size 53x18
-            text run at (7,7) width 53: "\x{E2}\x{2021}\x{A6} B 14"
+          RenderText {TEXT} at (7,7) size 51x18
+            text run at (7,7) width 51: "\x{21E6} B 14"
diff --git a/LayoutTests/css2.1/t0905-c414-flt-04-c.html b/LayoutTests/css2.1/t0905-c414-flt-04-c.html
index 88a1817..1789d1c 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-04-c.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-04-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.checksum
index 0c282b3..0cc8422 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.checksum
@@ -1 +1 @@
-738d5f9081035e57d6b86d4443477b65
\ No newline at end of file
+bad227349345656c6b272719bb750a19
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.png b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.png
index 23d3c73..5b27390 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.txt
index a99d5a2..d628616 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d-expected.txt
@@ -1,12 +1,12 @@
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x152
-  RenderBlock {HTML} at (0,0) size 800x152
-    RenderBody {BODY} at (8,16) size 784x126
+layer at (0,0) size 800x134
+  RenderBlock {HTML} at (0,0) size 800x134
+    RenderBody {BODY} at (8,16) size 784x108
       RenderBlock {P} at (0,0) size 784x18 [color=#000080]
         RenderText {TEXT} at (0,0) size 681x18
           text run at (0,0) width 681: "There should be five numbers, in numerical order, below: on the first line 1, 2 and 3, on the second, 4 and 5."
-      RenderBlock {DIV} at (10,34) size 262x92 [color=#000080] [border: (3px solid #0000FF)]
+      RenderBlock {DIV} at (10,34) size 262x74 [color=#000080] [border: (3px solid #0000FF)]
         RenderBlock (floating) {P} at (19,19) size 80x18
           RenderText {TEXT} at (0,0) size 8x18
             text run at (0,0) width 8: "1"
@@ -16,6 +16,6 @@
         RenderBlock (floating) {P} at (19,37) size 80x18
           RenderText {TEXT} at (0,0) size 8x18
             text run at (0,0) width 8: "4"
-        RenderText {TEXT} at (179,19) size 328x54
+        RenderText {TEXT} at (179,19) size 88x36
           text run at (179,19) width 8: "3"
-          text run at (19,55) width 328: "5\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          text run at (99,37) width 88: "5                    "
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d.html b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d.html
index ef19c7d..fe69f14 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-00-d.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-00-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.checksum b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.checksum
index 93fa380..ee2b698 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.checksum
@@ -1 +1 @@
-429c070c5a4536e0893bc3cec2482f95
\ No newline at end of file
+b300868f66fddb5160751ca712b49c18
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.png b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.png
index 08ba8ac..0269cad 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
index f85ebf1..43b0b98 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x270
     RenderBody {BODY} at (8,16) size 784x244
       RenderBlock {P} at (0,0) size 784x18 [color=#000080]
-        RenderText {TEXT} at (0,0) size 774x18
-          text run at (0,0) width 774: "There should be a complete unbroken drawing of a yin-yang (\x{E2}\x{2DC}\x{AF}) symbol below, slightly on the left (\x{E2}\x{2021}\x{A6}) inside a blue box."
+        RenderText {TEXT} at (0,0) size 771x18
+          text run at (0,0) width 771: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below, slightly on the left (\x{21E6}) inside a blue box."
       RenderBlock {DIV} at (10,34) size 260x210 [border: (5px solid #0000FF)]
         RenderBlock (floating) {P} at (5,5) size 100x100 [color=#000080]
           RenderImage {IMG} at (0,0) size 100x100
diff --git a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g.html b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g.html
index 4471761..256897e 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-fit-01-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-wrap-00-e.html b/LayoutTests/css2.1/t0905-c414-flt-wrap-00-e.html
index b493909..badb247 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-wrap-00-e.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-wrap-00-e.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g.html b/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g.html
index d745253..686d992 100644
--- a/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g.html
+++ b/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.checksum
index 85e2ab0..683ce5b 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.checksum
@@ -1 +1 @@
-36d7aeb16ccad524c10f8b3f127a22da
\ No newline at end of file
+d3db38ba217a64243c6002687b0a3223
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png
index 6fff969..a775d8b 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
index d21a850..c8196fa 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x184
     RenderBody {BODY} at (8,8) size 784x168
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {TEXT} at (0,0) size 318x18
-          text run at (0,0) width 318: "There should be a green box to the to the right. \x{E2}\x{17E}\x{2DC}"
+        RenderText {TEXT} at (0,0) size 311x18
+          text run at (0,0) width 311: "There should be a green box to the to the right. \x{2798}"
       RenderBlock {DIV} at (0,18) size 784x150 [bgcolor=#FFFFFF]
         RenderBlock (floating) {P} at (458,10) size 316x91 [color=#008000] [border: (3px solid #008000)]
           RenderText {TEXT} at (8,8) size 300x75
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag.html b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag.html
index bc2ae04..6f376ba 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.checksum
index b63a03e..bb96956 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.checksum
@@ -1 +1 @@
-4c8a37e36dfc41c1509a194c076844f4
\ No newline at end of file
+5066d245a97cb41bc59a31e6692eea4e
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.png b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.png
index a9ef933..f70c104 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
index 3342d77..c6ae5d9 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d-expected.txt
@@ -11,5 +11,5 @@
               text run at (0,18) width 81: "and spill out "
               text run at (81,18) width 171: "onto the blue area below it."
         RenderBlock {P} at (3,3) size 778x18
-          RenderText {TEXT} at (0,0) size 263x18
-            text run at (0,0) width 263: "You should see a teal box to the right. \x{E2}\x{2021}\x{A8}"
+          RenderText {TEXT} at (0,0) size 259x18
+            text run at (0,0) width 259: "You should see a teal box to the right. \x{21E8}"
diff --git a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d.html b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d.html
index f4cb8e3..549adf1 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltblck-01-d.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltblck-01-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltclr-00-c-ag.html b/LayoutTests/css2.1/t0905-c5525-fltclr-00-c-ag.html
index 28ccd79..d2a7251 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltclr-00-c-ag.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltclr-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: clear</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.checksum
index 551e532..d2716d8 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.checksum
@@ -1 +1 @@
-1f5a8931df2e64f97249d1cc05ce5e84
\ No newline at end of file
+242a7c7cbae0b05149232712cf2de56d
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.png b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.png
index 7e792d7..237a39a 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
index 0774a7a..b5c3904 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
@@ -12,14 +12,14 @@
               text run at (94,18) width 200: "tightly squeezed in between the"
               text run at (0,36) width 193: "edge of the teal box and the "
               text run at (193,36) width 101: "outside edge of"
-              text run at (0,54) width 117: "the blue block. \x{E2}\x{2021}\x{A8}"
+              text run at (0,54) width 113: "the blue block. \x{21E8}"
         RenderBlock {P} at (0,0) size 588x252
           RenderText {TEXT} at (0,0) size 277x36
             text run at (0,0) width 277: "Inside this blue block on the right there"
-            text run at (0,18) width 160: "should be a teal box. \x{E2}\x{2021}\x{A8} "
+            text run at (0,18) width 159: "should be a teal box. \x{21E8} "
           RenderInline {SPAN} at (0,0) size 588x234 [color=#000080]
-            RenderText {TEXT} at (160,18) size 588x234
-              text run at (160,18) width 117: "FAIL FAIL FAIL"
+            RenderText {TEXT} at (159,18) size 588x234
+              text run at (159,18) width 118: "FAIL FAIL FAIL"
               text run at (0,36) width 277: "FAIL FAIL FAIL FAIL FAIL FAIL FAIL"
               text run at (0,54) width 80: "FAIL FAIL "
               text run at (80,54) width 197: "FAIL FAIL FAIL FAIL FAIL"
diff --git a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g.html b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g.html
index 62e7b41..95b312d 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.checksum
index 9bb2a82..5137d3f 100644
--- a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.checksum
@@ -1 +1 @@
-50c5afe4b9d5e083c7e727da77fdf521
\ No newline at end of file
+9f856e9f3b7926a7aebc3c60e959578d
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.png b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.png
index 0f9e26c..0aa0e32 100644
--- a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
index 97e2ec1..23754d0 100644
--- a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 800x258
     RenderBody {BODY} at (8,16) size 784x234
       RenderBlock {P} at (0,0) size 784x18
-        RenderText {TEXT} at (0,0) size 510x18
-          text run at (0,0) width 510: "There should be a complete unbroken drawing of a yin-yang (\x{E2}\x{2DC}\x{AF}) symbol below."
+        RenderText {TEXT} at (0,0) size 509x18
+          text run at (0,0) width 509: "There should be a complete unbroken drawing of a yin-yang (\x{262F}) symbol below."
       RenderBlock {DIV} at (0,34) size 784x200
         RenderBlock (floating) {DIV} at (0,0) size 100x100
         RenderBlock (floating) {DIV} at (0,100) size 100x100
diff --git a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g.html b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g.html
index f0f4270..48d6d77 100644
--- a/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-flthw-00-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: clear</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltinln-00-c-ag.html b/LayoutTests/css2.1/t0905-c5525-fltinln-00-c-ag.html
index d5251c5..de3fc6f 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltinln-00-c-ag.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltinln-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltmrgn-00-c-ag.html b/LayoutTests/css2.1/t0905-c5525-fltmrgn-00-c-ag.html
index 4a75271..deb401d 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltmrgn-00-c-ag.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltmrgn-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.checksum
index 494d16f..8d5b33e 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.checksum
@@ -1 +1 @@
-2dfc441349dc5e904649d5c4a068dd4f
\ No newline at end of file
+06c7487f2814a1c146d2f56fb8065500
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.png b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.png
index ca63f02..2e1082c 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
index 843e4cb..09d7e5a 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g-expected.txt
@@ -24,51 +24,51 @@
           RenderText {TEXT} at (10,0) size 39x18
             text run at (10,0) width 39: "Green"
       RenderBlock {DIV} at (0,184) size 784x18
-        RenderTable {TABLE} at (0,0) size 240x18
+        RenderTable {TABLE} at (0,0) size 154x18
           RenderTableSection {TBODY} at (0,0) size 0x18
             RenderTableRow {TR} at (0,0) size 0x0
-              RenderTableCell {TD} at (0,0) size 16x18 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (16,0) size 16x18 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (32,0) size 16x18 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (48,0) size 16x18 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (64,0) size 16x18 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (80,0) size 16x18 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (96,0) size 16x18 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (112,0) size 16x18 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (128,0) size 16x18 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (144,0) size 16x18 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (160,0) size 16x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (176,0) size 16x18 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (192,0) size 16x18 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (208,0) size 16x18 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
-              RenderTableCell {TD} at (224,0) size 16x18 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1]
-                RenderText {TEXT} at (0,0) size 16x18
-                  text run at (0,0) width 16: "\x{C2} "
+              RenderTableCell {TD} at (0,0) size 6x18 [bgcolor=#000000] [r=0 c=0 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (6,0) size 18x18 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (24,0) size 7x18 [bgcolor=#000000] [r=0 c=2 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (31,0) size 7x18 [bgcolor=#FFFFFF] [r=0 c=3 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (38,0) size 7x18 [bgcolor=#000000] [r=0 c=4 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (45,0) size 19x18 [bgcolor=#0000FF] [r=0 c=5 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (64,0) size 7x18 [bgcolor=#000000] [r=0 c=6 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (71,0) size 7x18 [bgcolor=#FFFFFF] [r=0 c=7 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (78,0) size 7x18 [bgcolor=#000000] [r=0 c=8 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (85,0) size 20x18 [bgcolor=#FF0000] [r=0 c=9 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (105,0) size 7x18 [bgcolor=#000000] [r=0 c=10 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (112,0) size 7x18 [bgcolor=#FFFFFF] [r=0 c=11 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (119,0) size 7x18 [bgcolor=#000000] [r=0 c=12 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (126,0) size 21x18 [bgcolor=#008000] [r=0 c=13 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
+              RenderTableCell {TD} at (147,0) size 7x18 [bgcolor=#000000] [r=0 c=14 rs=1 cs=1]
+                RenderText {TEXT} at (0,0) size 4x18
+                  text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g.html b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g.html
index 97d0162..939be3d 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltmult-00-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
index f51079b..e7b8c9a 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.checksum
@@ -1 +1 @@
-d87a2db0006caf55dfeb380e7eb37d2e
\ No newline at end of file
+f947a75b405e280080180313cf38c5b2
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png
index bfecb51..fe73b35 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
index fe53c1d..b59becc 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g-expected.txt
@@ -4,8 +4,8 @@
   RenderBlock {HTML} at (0,0) size 785x781
     RenderBody {BODY} at (8,32) size 769x717
       RenderBlock {P} at (32,0) size 705x111 [color=#000080]
-        RenderText {TEXT} at (0,0) size 700x111
-          text run at (0,0) width 700: "\x{E2}\x{2021}\x{A9} The following blue box should be exactly half the"
+        RenderText {TEXT} at (0,0) size 678x111
+          text run at (0,0) width 678: "\x{21E9} The following blue box should be exactly half the"
           text run at (0,37) width 81: "width "
           text run at (81,37) width 560: "of the viewport, on the left of the 50% ruler"
           text run at (0,74) width 74: "mark."
@@ -102,4 +102,4 @@
       RenderBlock {P} at (32,643) size 705x74 [color=#000080]
         RenderText {TEXT} at (19,0) size 686x74
           text run at (19,0) width 686: "The above gray text should flow around the blue box."
-          text run at (659,37) width 46: "\x{E2}\x{2021}\x{A7}"
+          text run at (673,37) width 32: "\x{21E7}"
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g.html b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g.html
index a307ce7..8779d12 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-00-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-01-c-g.html b/LayoutTests/css2.1/t0905-c5525-fltwidth-01-c-g.html
index dbe95b2..feeea45 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-01-c-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-01-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.checksum
index 5683385..93b0e80 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.checksum
@@ -1 +1 @@
-8adde043c48278a59195684bf4438eb9
\ No newline at end of file
+bb2a18686623129fcbabc6b821a3e4ff
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png
index 654156a..f35f8e5 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
index e2909b9..86deb18 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
@@ -7,6 +7,6 @@
         RenderBlock (floating) {P} at (0,0) size 392x46
           RenderText {TEXT} at (0,0) size 352x46
             text run at (0,0) width 352: "There should be a green square to the right,"
-            text run at (0,23) width 321: "roughly in the middle, horizontally. \x{E2}\x{2021}\x{A8}"
+            text run at (0,23) width 315: "roughly in the middle, horizontally. \x{21E8}"
         RenderImage {IMG} at (392,0) size 15x15 [color=#FF0000]
         RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g.html b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g.html
index a3bd697..cc8eb22 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.checksum
index 51ba14a..70596a4 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.checksum
@@ -1 +1 @@
-1c1bc6f6c24794b53d85883cda099375
\ No newline at end of file
+cd2c0ac36946c2c3cdc9cef458977c06
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png
index 87dda26..c6328e9 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
index 538432b..f4496af 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
@@ -7,9 +7,9 @@
         RenderBlock {DIV} at (0,0) size 784x18
           RenderBlock (floating) {P} at (392,0) size 392x36
             RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
-            RenderText {TEXT} at (15,0) size 364x36
+            RenderText {TEXT} at (15,0) size 362x36
               text run at (15,0) width 4: " "
-              text run at (19,0) width 345: "\x{E2}\x{2021}\x{A6} There should be a green square at the top left of the"
+              text run at (19,0) width 343: "\x{21E6} There should be a green square at the top left of the"
               text run at (0,18) width 56: "window."
           RenderImage {IMG} at (0,0) size 15x15 [color=#FF0000]
           RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g.html b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g.html
index efa84e5..ad6f711 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.checksum b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.checksum
index a4845ef..805f8db 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.checksum
+++ b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.checksum
@@ -1 +1 @@
-5d232d4ac6c14199ad76e050c39fa1ef
\ No newline at end of file
+d6a052e35984dfe45570302b8b3b603f
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.png b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.png
index d37ab14..099c8af 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.png
+++ b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
index 3e79271c..c183384 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
+++ b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b-expected.txt
@@ -6,7 +6,7 @@
       RenderBlock (floating) {DIV} at (0,0) size 196x275 [color=#FFFFFF] [bgcolor=#000080]
         RenderBlock {P} at (0,0) size 196x275
           RenderText {TEXT} at (0,0) size 185x275
-            text run at (0,0) width 152: "\x{E2}\x{2021}\x{A6} This"
+            text run at (0,0) width 145: "\x{21E6} This"
             text run at (0,55) width 166: "blue box"
             text run at (0,110) width 185: "should be"
             text run at (0,165) width 118: "on the"
@@ -18,11 +18,11 @@
             text run at (0,55) width 72: "box"
             text run at (0,110) width 185: "should be"
             text run at (0,165) width 118: "on the"
-            text run at (0,220) width 175: "right. \x{E2}\x{2021}\x{A8}"
+            text run at (0,220) width 162: "right. \x{21E8}"
       RenderBlock {P} at (0,0) size 784x275
         RenderText {TEXT} at (196,0) size 365x275
           text run at (196,0) width 365: "This text should be"
           text run at (196,55) width 335: "in between a blue"
-          text run at (196,110) width 332: "box on the \x{E2}\x{2021}\x{A6}left"
+          text run at (196,110) width 325: "box on the \x{21E6}left"
           text run at (196,165) width 326: "and a teal box on"
-          text run at (196,220) width 233: "the right\x{E2}\x{2021}\x{A8}."
+          text run at (196,220) width 220: "the right\x{21E8}."
diff --git a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b.html b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b.html
index defe3fb..6c35c05 100644
--- a/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b.html
+++ b/LayoutTests/css2.1/t0905-c5525-fltwrap-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-00-d.html b/LayoutTests/css2.1/t090501-c414-flt-00-d.html
index 6929d58..4c7b6ff 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-00-d.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-00-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.checksum b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.checksum
index e60db89..f23ac69 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.checksum
+++ b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.checksum
@@ -1 +1 @@
-40bb997bb3dce33e31aba80160a2f59b
\ No newline at end of file
+3e834d9087582aa9f2889942eb71a812
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.png b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.png
index 56251b6..5079b15 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.png
+++ b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
index 958966e..20f1ef0 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
+++ b/LayoutTests/css2.1/t090501-c414-flt-01-b-expected.txt
@@ -10,11 +10,11 @@
         RenderBlock {DIV} at (16,0) size 752x70 [color=#00FFFF] [bgcolor=#008080]
           RenderBlock (floating) {P} at (8,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
             RenderText {TEXT} at (8,8) size 132x36
-              text run at (8,8) width 120: "\x{E2}\x{2021}\x{A6} This blue block"
+              text run at (8,8) width 118: "\x{21E6} This blue block"
               text run at (8,26) width 132: "should be on the left."
           RenderBlock (floating) {P} at (568,8) size 176x52 [color=#FFFFFF] [bgcolor=#000080] [border: (4px solid #0000FF)]
             RenderText {TEXT} at (8,8) size 141x36
-              text run at (8,8) width 122: "\x{E2}\x{2021}\x{A8} This blue block"
+              text run at (8,8) width 118: "\x{21E8} This blue block"
               text run at (8,26) width 141: "should be on the right."
           RenderText {TEXT} at (184,8) size 384x54
             text run at (184,8) width 384: "Teal rectangle. Teal rectangle. Teal rectangle. Teal rectangle."
diff --git a/LayoutTests/css2.1/t090501-c414-flt-01-b.html b/LayoutTests/css2.1/t090501-c414-flt-01-b.html
index fc1993d..637fb25 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-01-b.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-01-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-02-d-g.html b/LayoutTests/css2.1/t090501-c414-flt-02-d-g.html
index 827c14cb..5e51ddd 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-02-d-g.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-02-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.checksum b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.checksum
index 6a2f015..9067393 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.checksum
+++ b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.checksum
@@ -1 +1 @@
-af76cab54906ec0f71f896eae0bf9ae0
\ No newline at end of file
+c21912126266377ffe1616c046db1f4e
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.png b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.png
index d3317c0..4f92786 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.png
+++ b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
index 6187573..a41218e 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
+++ b/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
@@ -4,15 +4,15 @@
   RenderBlock {HTML} at (0,0) size 800x155
     RenderBody {BODY} at (8,16) size 784x123
       RenderBlock {P} at (0,0) size 784x37 [color=#000080]
-        RenderText {TEXT} at (0,1) size 401x18
+        RenderText {TEXT} at (0,1) size 399x18
           text run at (0,1) width 246: "In the following test, the purple square "
-          text run at (246,1) width 155: "should be on the left (\x{E2}\x{2021}\x{A6}"
-        RenderImage {IMG} at (401,0) size 19x19
-        RenderText {TEXT} at (420,1) size 215x18
-          text run at (420,1) width 215: "), and the teal square on the right ("
-        RenderImage {IMG} at (635,0) size 19x19
-        RenderText {TEXT} at (654,1) size 750x36
-          text run at (654,1) width 96: "\x{E2}\x{2021}\x{A8}) of the blue"
+          text run at (246,1) width 153: "should be on the left (\x{21E6}"
+        RenderImage {IMG} at (399,0) size 19x19
+        RenderText {TEXT} at (418,1) size 215x18
+          text run at (418,1) width 215: "), and the teal square on the right ("
+        RenderImage {IMG} at (633,0) size 19x19
+        RenderText {TEXT} at (652,1) size 744x36
+          text run at (652,1) width 92: "\x{21E8}) of the blue"
           text run at (0,19) width 61: "rectangle."
       RenderBlock {DIV} at (0,53) size 784x70
         RenderBlock {DIV} at (16,0) size 752x70 [color=#0000FF] [bgcolor=#000080]
diff --git a/LayoutTests/css2.1/t090501-c414-flt-03-b-g.html b/LayoutTests/css2.1/t090501-c414-flt-03-b-g.html
index 736174e..6f35c78 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-03-b-g.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-03-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-00-d.html b/LayoutTests/css2.1/t090501-c414-flt-ln-00-d.html
index 5b7c533..fe8cc9d 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-00-d.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-00-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum
index 917e26a..bfbce11 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.checksum
@@ -1 +1 @@
-110539f38a13328ccc2dfcc1e24ba35d
\ No newline at end of file
+8f0daa4791fd372fb29aac111544948a
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png
index 125e88b..8d8d0d3 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
index 11a9b00..4415c71 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt
@@ -15,23 +15,23 @@
       RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
         RenderText {TEXT} at (133,22) size 474x20
           text run at (133,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 24x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
-          RenderText {TEXT} at (610,22) size 18x20
-            text run at (610,22) width 18: "\x{E2}\x{2021}\x{A6}"
-        RenderText {TEXT} at (631,22) size 4x20
-          text run at (631,22) width 4: " "
+        RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
+          RenderText {TEXT} at (610,22) size 16x20
+            text run at (610,22) width 16: "\x{21E6}"
+        RenderText {TEXT} at (629,22) size 4x20
+          text run at (629,22) width 4: " "
         RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000]
-        RenderText {TEXT} at (635,22) size 577x40
-          text run at (635,22) width 75: "dummy text"
+        RenderText {TEXT} at (633,22) size 575x40
+          text run at (633,22) width 75: "dummy text"
           text run at (133,42) width 395: "dummy text dummy text dummy text dummy text dummy text "
-        RenderInline {SPAN} at (0,0) size 26x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
-          RenderText {TEXT} at (531,42) size 20x20
-            text run at (531,42) width 20: "\x{E2}\x{2021}\x{A8}"
-        RenderText {TEXT} at (554,42) size 4x20
-          text run at (554,42) width 4: " "
+        RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
+          RenderText {TEXT} at (531,42) size 16x20
+            text run at (531,42) width 16: "\x{21E8}"
+        RenderText {TEXT} at (550,42) size 4x20
+          text run at (550,42) width 4: " "
         RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000]
-        RenderText {TEXT} at (558,42) size 707x320
-          text run at (558,42) width 48: "dummy"
+        RenderText {TEXT} at (554,42) size 707x320
+          text run at (554,42) width 48: "dummy"
           text run at (133,62) width 422: "text dummy text dummy text dummy text dummy text dummy text "
           text run at (555,62) width 48: "dummy"
           text run at (133,82) width 422: "text dummy text dummy text dummy text dummy text dummy text "
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g.html b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g.html
index cb8081d..b090961 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-01-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-02-d.html b/LayoutTests/css2.1/t090501-c414-flt-ln-02-d.html
index a7e3aee..37484ee 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-02-d.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-02-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c414-flt-ln-03-d.html b/LayoutTests/css2.1/t090501-c414-flt-ln-03-d.html
index 0bdcdd5..ed26ced 100644
--- a/LayoutTests/css2.1/t090501-c414-flt-ln-03-d.html
+++ b/LayoutTests/css2.1/t090501-c414-flt-ln-03-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.checksum b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.checksum
index 03f7f2b..eea133f 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.checksum
+++ b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.checksum
@@ -1 +1 @@
-846b627cc66313bd44b45f5c075964bd
\ No newline at end of file
+bb06a817d8aee5d7906fcc8447f2fb14
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.png b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.png
index f2410e6..9f53939 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.png
+++ b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
index c6fdf2d..dc5a857 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
+++ b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g-expected.txt
@@ -5,11 +5,11 @@
     RenderBody {BODY} at (8,16) size 784x252
       RenderBlock {P} at (0,0) size 784x252 [color=#000080]
         RenderImage {IMG} at (0,0) size 50x50
-        RenderText {TEXT} at (50,0) size 330x18
-          text run at (50,0) width 330: "\x{E2}\x{2021}\x{A6} This text should flow around the box on the left. "
-        RenderInline {SPAN} at (0,0) size 771x252 [color=#C0C0C0]
-          RenderText {TEXT} at (380,0) size 771x252
-            text run at (380,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
+        RenderText {TEXT} at (50,0) size 328x18
+          text run at (50,0) width 328: "\x{21E6} This text should flow around the box on the left. "
+        RenderInline {SPAN} at (0,0) size 769x252 [color=#C0C0C0]
+          RenderText {TEXT} at (378,0) size 769x252
+            text run at (378,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
             text run at (50,18) width 52: "dummy "
             text run at (102,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (576,18) width 181: "text dummy text dummy text"
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g.html b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g.html
index 911613b..987000d 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g.html
+++ b/LayoutTests/css2.1/t090501-c5525-flt-l-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Floating Elements</title>
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.checksum b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.checksum
index 517bcee..9af2d53 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.checksum
+++ b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.checksum
@@ -1 +1 @@
-a481c56aba3163b90f70ad5465ab8e63
\ No newline at end of file
+90f862e31ea71d7fe2fd8c3d3cbc4035
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.png b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.png
index 897f0a4..98bdb04 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.png
+++ b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
index a61afc9..24dab32 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
+++ b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g-expected.txt
@@ -5,11 +5,11 @@
     RenderBody {BODY} at (8,16) size 784x252
       RenderBlock {P} at (0,0) size 784x252 [color=#000080]
         RenderImage {IMG} at (734,0) size 50x50
-        RenderText {TEXT} at (0,0) size 341x18
-          text run at (0,0) width 341: "This text should flow around the box on the right. \x{E2}\x{2021}\x{A8} "
+        RenderText {TEXT} at (0,0) size 337x18
+          text run at (0,0) width 337: "This text should flow around the box on the right. \x{21E8} "
         RenderInline {SPAN} at (0,0) size 759x252 [color=#C0C0C0]
-          RenderText {TEXT} at (341,0) size 759x252
-            text run at (341,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
+          RenderText {TEXT} at (337,0) size 759x252
+            text run at (337,0) width 391: "dummy text dummy text dummy text dummy text dummy text"
             text run at (0,18) width 52: "dummy "
             text run at (52,18) width 474: "text dummy text dummy text dummy text dummy text dummy text dummy "
             text run at (526,18) width 181: "text dummy text dummy text"
diff --git a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g.html b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g.html
index 1edc1e5..750f58d 100644
--- a/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g.html
+++ b/LayoutTests/css2.1/t090501-c5525-flt-r-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: float</title>
diff --git a/LayoutTests/css2.1/t1002-c5523-width-00-b-g.html b/LayoutTests/css2.1/t1002-c5523-width-00-b-g.html
index 28f0065..c645911 100644
--- a/LayoutTests/css2.1/t1002-c5523-width-00-b-g.html
+++ b/LayoutTests/css2.1/t1002-c5523-width-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: width</title>
diff --git a/LayoutTests/css2.1/t1002-c5523-width-01-b-g.html b/LayoutTests/css2.1/t1002-c5523-width-01-b-g.html
index ae28ccd8..8f18c5a 100644
--- a/LayoutTests/css2.1/t1002-c5523-width-01-b-g.html
+++ b/LayoutTests/css2.1/t1002-c5523-width-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: width</title>
diff --git a/LayoutTests/css2.1/t1002-c5523-width-02-b-g.html b/LayoutTests/css2.1/t1002-c5523-width-02-b-g.html
index 75b81e7..2609b0e 100644
--- a/LayoutTests/css2.1/t1002-c5523-width-02-b-g.html
+++ b/LayoutTests/css2.1/t1002-c5523-width-02-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: width</title>
diff --git a/LayoutTests/css2.1/t100303-c412-blockw-00-d-ag.html b/LayoutTests/css2.1/t100303-c412-blockw-00-d-ag.html
index 73982d0..80e24db 100644
--- a/LayoutTests/css2.1/t100303-c412-blockw-00-d-ag.html
+++ b/LayoutTests/css2.1/t100303-c412-blockw-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Horizontal Formatting</title>
diff --git a/LayoutTests/css2.1/t100304-c43-rpl-bbx-00-d-g.html b/LayoutTests/css2.1/t100304-c43-rpl-bbx-00-d-g.html
index 400a1ed..8a31f44 100644
--- a/LayoutTests/css2.1/t100304-c43-rpl-bbx-00-d-g.html
+++ b/LayoutTests/css2.1/t100304-c43-rpl-bbx-00-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Replaced Elements</title>
diff --git a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.checksum b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.checksum
index 7417b50..0cc726a 100644
--- a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.checksum
@@ -1 +1 @@
-f60282127dbb62e0f7623bc81f8887ab
\ No newline at end of file
+8800955bd534bb7168915cd5b83088c4
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png
index 9425f27..6c035f1 100644
--- a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png
+++ b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
index 6a24eb1..3282c70 100644
--- a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
+++ b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g-expected.txt
@@ -7,6 +7,6 @@
         RenderText {TEXT} at (0,0) size 769x36
           text run at (0,0) width 396: "Below this paragraph there should be a big teal square half the "
           text run at (396,0) width 373: "width of the window, aligned flush with the right hand side"
-          text run at (0,18) width 34: "(\x{E2}\x{2021}\x{A8})."
+          text run at (0,18) width 30: "(\x{21E8})."
       RenderBlock {P} at (0,52) size 784x392 [color=#000080]
         RenderImage {IMG} at (392,0) size 392x392
diff --git a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g.html b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g.html
index 37680cd..fa04a03 100644
--- a/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g.html
+++ b/LayoutTests/css2.1/t100304-c43-rpl-bbx-01-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Replaced Elements</title>
diff --git a/LayoutTests/css2.1/t1004-c43-rpl-bbx-00-d-ag.html b/LayoutTests/css2.1/t1004-c43-rpl-bbx-00-d-ag.html
index 6be45eb..6bb3f8b 100644
--- a/LayoutTests/css2.1/t1004-c43-rpl-bbx-00-d-ag.html
+++ b/LayoutTests/css2.1/t1004-c43-rpl-bbx-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Replaced Elements</title>
diff --git a/LayoutTests/css2.1/t1004-c43-rpl-ibx-00-d-ag.html b/LayoutTests/css2.1/t1004-c43-rpl-ibx-00-d-ag.html
index 14617cb..256dbc8 100644
--- a/LayoutTests/css2.1/t1004-c43-rpl-ibx-00-d-ag.html
+++ b/LayoutTests/css2.1/t1004-c43-rpl-ibx-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Replaced Elements</title>
diff --git a/LayoutTests/css2.1/t1004-c5524-width-00-b-g.html b/LayoutTests/css2.1/t1004-c5524-width-00-b-g.html
index cfef7d3..4aa8f62 100644
--- a/LayoutTests/css2.1/t1004-c5524-width-00-b-g.html
+++ b/LayoutTests/css2.1/t1004-c5524-width-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: height</title>
diff --git a/LayoutTests/css2.1/t1005-c5524-width-00-b-g.html b/LayoutTests/css2.1/t1005-c5524-width-00-b-g.html
index 6ce15d3..ea9c5b2 100644
--- a/LayoutTests/css2.1/t1005-c5524-width-00-b-g.html
+++ b/LayoutTests/css2.1/t1005-c5524-width-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: height</title>
diff --git a/LayoutTests/css2.1/t1005-c5524-width-01-b-g.html b/LayoutTests/css2.1/t1005-c5524-width-01-b-g.html
index 8d89a47..3c1a829 100644
--- a/LayoutTests/css2.1/t1005-c5524-width-01-b-g.html
+++ b/LayoutTests/css2.1/t1005-c5524-width-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: height</title>
diff --git a/LayoutTests/css2.1/t1008-c44-ln-box-00-d-ag.html b/LayoutTests/css2.1/t1008-c44-ln-box-00-d-ag.html
index 7c5b392..36b53e4 100644
--- a/LayoutTests/css2.1/t1008-c44-ln-box-00-d-ag.html
+++ b/LayoutTests/css2.1/t1008-c44-ln-box-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: The Height of Lines</title>
diff --git a/LayoutTests/css2.1/t1008-c44-ln-box-01-d-ag.html b/LayoutTests/css2.1/t1008-c44-ln-box-01-d-ag.html
index c08da78..97c2e21 100644
--- a/LayoutTests/css2.1/t1008-c44-ln-box-01-d-ag.html
+++ b/LayoutTests/css2.1/t1008-c44-ln-box-01-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: The Height of Lines</title>
diff --git a/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html b/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html
index 01c7d30..ff1265f 100644
--- a/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html
+++ b/LayoutTests/css2.1/t1008-c44-ln-box-02-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: The Height of Lines</title>
diff --git a/LayoutTests/css2.1/t1008-c44-ln-box-03-d-ag.html b/LayoutTests/css2.1/t1008-c44-ln-box-03-d-ag.html
index d552a05..e23618b 100644
--- a/LayoutTests/css2.1/t1008-c44-ln-box-03-d-ag.html
+++ b/LayoutTests/css2.1/t1008-c44-ln-box-03-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: The Height of Lines</title>
diff --git a/LayoutTests/css2.1/t100801-c42-ibx-ht-00-d-a.html b/LayoutTests/css2.1/t100801-c42-ibx-ht-00-d-a.html
index 15a60d1..833adc0 100644
--- a/LayoutTests/css2.1/t100801-c42-ibx-ht-00-d-a.html
+++ b/LayoutTests/css2.1/t100801-c42-ibx-ht-00-d-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Inline Elements</title>
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-00-a-ag.html b/LayoutTests/css2.1/t100801-c544-valgn-00-a-ag.html
index 5f96e53..fafa249 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-00-a-ag.html
+++ b/LayoutTests/css2.1/t100801-c544-valgn-00-a-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: vertical-align</title>
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html b/LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html
index 3454a8a..d459cef 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html
+++ b/LayoutTests/css2.1/t100801-c544-valgn-01-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: vertical-align</title>
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.checksum b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.checksum
index fe10aaa..1cece9d 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.checksum
+++ b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.checksum
@@ -1 +1 @@
-b336e3058ca3533cbe353ac3989b9ac7
\ No newline at end of file
+e754c35fb21f899b6443307e940c189f
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.png b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.png
index 6ec741c..2781e13 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.png
+++ b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi.html b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi.html
index 38c1a03..bdf3abe 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi.html
+++ b/LayoutTests/css2.1/t100801-c544-valgn-02-d-agi.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: vertical-align</title>
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.checksum b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.checksum
index 981618d..50f422e 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.checksum
+++ b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.checksum
@@ -1 +1 @@
-a4a9befe162f37c12387704776c4e274
\ No newline at end of file
+51313f66ad2b86e86fcc982cf9e6f4d3
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.png b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.png
index 7fafb9b..2b01f1d 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.png
+++ b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.txt b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
index 3cc8f8e..8ed7fdb 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
+++ b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi-expected.txt
@@ -10,72 +10,72 @@
           text run at (0,18) width 83: "alignment as "
           text run at (83,18) width 204: "other blue rectangles on the line."
       RenderBlock {P} at (15,52) size 754x234 [color=#0000FF] [bgcolor=#FFFFFF] [border: (1px solid #C0C0C0)]
-        RenderText {TEXT} at (8,35) size 105x15
-          text run at (8,35) width 105: "\x{C3}\x{2030}\x{C3}\x{2030}\x{C3}\x{2030} "
-        RenderImage {IMG} at (113,25) size 30x30
-        RenderText {TEXT} at (143,35) size 15x15
-          text run at (143,35) width 15: " "
+        RenderText {TEXT} at (8,35) size 60x15
+          text run at (8,35) width 60: "\x{C9}\x{C9}\x{C9} "
+        RenderImage {IMG} at (68,25) size 30x30
+        RenderText {TEXT} at (98,35) size 15x15
+          text run at (98,35) width 15: " "
         RenderInline {SPAN} at (0,0) size 114x38 [color=#C0C0C0]
-          RenderText {TEXT} at (158,17) size 114x38
-            text run at (158,17) width 114: "xxx"
-        RenderText {TEXT} at (272,35) size 15x15
-          text run at (272,35) width 15: " "
-        RenderImage {IMG} at (287,15) size 50x50
-        RenderText {TEXT} at (337,35) size 120x15
-          text run at (337,35) width 15: " "
-          text run at (352,35) width 105: "\x{C3}\x{2030}\x{C3}\x{2030}\x{C3}\x{2030} "
-        RenderImage {IMG} at (457,35) size 10x10
-        RenderText {TEXT} at (467,35) size 15x15
-          text run at (467,35) width 15: " "
+          RenderText {TEXT} at (113,17) size 114x38
+            text run at (113,17) width 114: "xxx"
+        RenderText {TEXT} at (227,35) size 15x15
+          text run at (227,35) width 15: " "
+        RenderImage {IMG} at (242,15) size 50x50
+        RenderText {TEXT} at (292,35) size 75x15
+          text run at (292,35) width 15: " "
+          text run at (307,35) width 60: "\x{C9}\x{C9}\x{C9} "
+        RenderImage {IMG} at (367,35) size 10x10
+        RenderText {TEXT} at (377,35) size 15x15
+          text run at (377,35) width 15: " "
         RenderInline {SMALL} at (0,0) size 30x10 [color=#C0C0C0]
-          RenderText {TEXT} at (482,39) size 30x10
-            text run at (482,39) width 30: "xxx"
-        RenderText {TEXT} at (512,35) size 15x15
-          text run at (512,35) width 15: " "
-        RenderImage {IMG} at (527,30) size 20x20
-        RenderText {TEXT} at (547,35) size 120x15
-          text run at (547,35) width 15: " "
-          text run at (562,35) width 105: "\x{C3}\x{2030}\x{C3}\x{2030}\x{C3}\x{2030} "
-        RenderImage {IMG} at (667,8) size 65x65
-        RenderText {TEXT} at (8,106) size 105x15
-          text run at (8,106) width 105: "\x{C3}\x{2030}\x{C3}\x{2030}\x{C3}\x{2030} "
-        RenderImage {IMG} at (113,94) size 35x35
-        RenderText {TEXT} at (148,106) size 15x15
-          text run at (148,106) width 15: " "
-        RenderInline {SPAN} at (0,0) size 90x30 [color=#C0C0C0]
-          RenderText {TEXT} at (163,94) size 90x30
-            text run at (163,94) width 90: "xxx"
-        RenderText {TEXT} at (253,106) size 15x15
-          text run at (253,106) width 15: " "
-        RenderImage {IMG} at (268,86) size 50x50
-        RenderText {TEXT} at (318,106) size 15x15
-          text run at (318,106) width 15: " "
-        RenderInline {SPAN} at (0,0) size 352x23 [color=#C0C0C0]
-          RenderText {TEXT} at (333,100) size 92x23
-            text run at (333,100) width 92: "xxx "
-          RenderInline {SPAN} at (0,0) size 168x56
-            RenderText {TEXT} at (425,73) size 168x56
-              text run at (425,73) width 168: "xxx"
-          RenderText {TEXT} at (593,100) size 92x23
-            text run at (593,100) width 92: " xxx"
+          RenderText {TEXT} at (392,39) size 30x10
+            text run at (392,39) width 30: "xxx"
+        RenderText {TEXT} at (422,35) size 15x15
+          text run at (422,35) width 15: " "
+        RenderImage {IMG} at (437,30) size 20x20
+        RenderText {TEXT} at (457,35) size 75x15
+          text run at (457,35) width 15: " "
+          text run at (472,35) width 60: "\x{C9}\x{C9}\x{C9} "
+        RenderImage {IMG} at (532,8) size 65x65
+        RenderText {TEXT} at (597,35) size 75x15
+          text run at (597,35) width 15: " "
+          text run at (612,35) width 60: "\x{C9}\x{C9}\x{C9} "
+        RenderImage {IMG} at (672,23) size 35x35
         RenderText {TEXT} at (0,0) size 0x0
-        RenderImage {IMG} at (8,156) size 50x50
-        RenderText {TEXT} at (58,176) size 15x15
-          text run at (58,176) width 15: " "
+        RenderInline {SPAN} at (0,0) size 90x30 [color=#C0C0C0]
+          RenderText {TEXT} at (8,94) size 90x30
+            text run at (8,94) width 90: "xxx"
+        RenderText {TEXT} at (98,106) size 15x15
+          text run at (98,106) width 15: " "
+        RenderImage {IMG} at (113,86) size 50x50
+        RenderText {TEXT} at (163,106) size 15x15
+          text run at (163,106) width 15: " "
+        RenderInline {SPAN} at (0,0) size 352x23 [color=#C0C0C0]
+          RenderText {TEXT} at (178,100) size 92x23
+            text run at (178,100) width 92: "xxx "
+          RenderInline {SPAN} at (0,0) size 168x56
+            RenderText {TEXT} at (270,73) size 168x56
+              text run at (270,73) width 168: "xxx"
+          RenderText {TEXT} at (438,100) size 92x23
+            text run at (438,100) width 92: " xxx"
+        RenderText {TEXT} at (530,106) size 15x15
+          text run at (530,106) width 15: " "
+        RenderImage {IMG} at (545,86) size 50x50
+        RenderText {TEXT} at (595,106) size 15x15
+          text run at (595,106) width 15: " "
         RenderInline {SMALL} at (0,0) size 30x10 [color=#C0C0C0]
-          RenderText {TEXT} at (73,180) size 30x10
-            text run at (73,180) width 30: "xxx"
-        RenderText {TEXT} at (103,176) size 15x15
-          text run at (103,176) width 15: " "
-        RenderImage {IMG} at (118,174) size 15x15
-        RenderText {TEXT} at (133,176) size 15x15
-          text run at (133,176) width 15: " "
+          RenderText {TEXT} at (610,110) size 30x10
+            text run at (610,110) width 30: "xxx"
+        RenderText {TEXT} at (640,106) size 15x15
+          text run at (640,106) width 15: " "
+        RenderImage {IMG} at (655,104) size 15x15
+        RenderText {TEXT} at (670,106) size 15x15
+          text run at (670,106) width 15: " "
         RenderInline {BIG} at (0,0) size 60x20 [color=#C0C0C0]
-          RenderText {TEXT} at (148,172) size 60x20
-            text run at (148,172) width 60: "xxx"
-        RenderText {TEXT} at (208,176) size 15x15
-          text run at (208,176) width 15: " "
-        RenderImage {IMG} at (223,136) size 90x90
-        RenderText {TEXT} at (313,176) size 105x15
-          text run at (313,176) width 15: " "
-          text run at (328,176) width 90: "\x{C3}\x{2030}\x{C3}\x{2030}\x{C3}\x{2030}"
+          RenderText {TEXT} at (685,102) size 60x20
+            text run at (685,102) width 60: "xxx"
+        RenderText {TEXT} at (0,0) size 0x0
+        RenderImage {IMG} at (8,136) size 90x90
+        RenderText {TEXT} at (98,176) size 60x15
+          text run at (98,176) width 15: " "
+          text run at (113,176) width 45: "\x{C9}\x{C9}\x{C9}"
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi.html b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi.html
index 991ff54..f62d1ec 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi.html
+++ b/LayoutTests/css2.1/t100801-c544-valgn-03-d-agi.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: vertical-align</title>
diff --git a/LayoutTests/css2.1/t100801-c544-valgn-04-d-agi.html b/LayoutTests/css2.1/t100801-c544-valgn-04-d-agi.html
index 0c98a71..b428d44 100644
--- a/LayoutTests/css2.1/t100801-c544-valgn-04-d-agi.html
+++ b/LayoutTests/css2.1/t100801-c544-valgn-04-d-agi.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: vertical-align</title>
diff --git a/LayoutTests/css2.1/t100801-c548-leadin-00-d-a.html b/LayoutTests/css2.1/t100801-c548-leadin-00-d-a.html
index e7df21f..dc88068 100644
--- a/LayoutTests/css2.1/t100801-c548-leadin-00-d-a.html
+++ b/LayoutTests/css2.1/t100801-c548-leadin-00-d-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t100801-c548-ln-ht-00-c-a.html b/LayoutTests/css2.1/t100801-c548-ln-ht-00-c-a.html
index e74a53a..4259508 100644
--- a/LayoutTests/css2.1/t100801-c548-ln-ht-00-c-a.html
+++ b/LayoutTests/css2.1/t100801-c548-ln-ht-00-c-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t100801-c548-ln-ht-01-b-ag.html b/LayoutTests/css2.1/t100801-c548-ln-ht-01-b-ag.html
index 25ee443..3e5fd8a 100644
--- a/LayoutTests/css2.1/t100801-c548-ln-ht-01-b-ag.html
+++ b/LayoutTests/css2.1/t100801-c548-ln-ht-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html b/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html
index 00f960f..146f7e6 100644
--- a/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html
+++ b/LayoutTests/css2.1/t100801-c548-ln-ht-02-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t100801-c548-ln-ht-03-d-ag.html b/LayoutTests/css2.1/t100801-c548-ln-ht-03-d-ag.html
index d1cc442..f8cdf94 100644
--- a/LayoutTests/css2.1/t100801-c548-ln-ht-03-d-ag.html
+++ b/LayoutTests/css2.1/t100801-c548-ln-ht-03-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag.html b/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag.html
index 6df0566..dbec9e7 100644
--- a/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag.html
+++ b/LayoutTests/css2.1/t100801-c548-ln-ht-04-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: line-height</title>
diff --git a/LayoutTests/css2.1/t1205-c561-list-displ-00-b.html b/LayoutTests/css2.1/t1205-c561-list-displ-00-b.html
index 820ea8c..6a9cee2 100644
--- a/LayoutTests/css2.1/t1205-c561-list-displ-00-b.html
+++ b/LayoutTests/css2.1/t1205-c561-list-displ-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: display</title>
diff --git a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.checksum b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.checksum
index c437c89..da6d206 100644
--- a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.checksum
+++ b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.checksum
@@ -1 +1 @@
-26e4ba6261b00e8c68865bc2dbd419fd
\ No newline at end of file
+62fc3d62dc895019ad041926eca21168
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.png b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.png
index 68b0411..03b6f82 100644
--- a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.png
+++ b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.txt b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.txt
index 0ea2191..aa7b0c4 100644
--- a/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.txt
+++ b/LayoutTests/css2.1/t1205-c563-list-type-00-b-expected.txt
@@ -47,11 +47,11 @@
             text run at (0,0) width 41: "square"
       RenderBlock {UL} at (0,244) size 784x54 [color=#FF0000]
         RenderListItem {LI} at (40,0) size 744x18
-          RenderText {TEXT} at (0,0) size 16x18
-            text run at (0,0) width 16: "\x{C2} "
+          RenderText {TEXT} at (0,0) size 4x18
+            text run at (0,0) width 4: " "
         RenderListItem {LI} at (40,18) size 744x18
-          RenderText {TEXT} at (0,0) size 16x18
-            text run at (0,0) width 16: "\x{C2} "
+          RenderText {TEXT} at (0,0) size 4x18
+            text run at (0,0) width 4: " "
         RenderListItem {LI} at (40,36) size 744x18
-          RenderText {TEXT} at (0,0) size 16x18
-            text run at (0,0) width 16: "\x{C2} "
+          RenderText {TEXT} at (0,0) size 4x18
+            text run at (0,0) width 4: " "
diff --git a/LayoutTests/css2.1/t1205-c563-list-type-00-b.html b/LayoutTests/css2.1/t1205-c563-list-type-00-b.html
index 99524a3..df59275 100644
--- a/LayoutTests/css2.1/t1205-c563-list-type-00-b.html
+++ b/LayoutTests/css2.1/t1205-c563-list-type-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style-type</title>
diff --git a/LayoutTests/css2.1/t1205-c563-list-type-01-b.html b/LayoutTests/css2.1/t1205-c563-list-type-01-b.html
index 3a6abdd..0866bb3 100644
--- a/LayoutTests/css2.1/t1205-c563-list-type-01-b.html
+++ b/LayoutTests/css2.1/t1205-c563-list-type-01-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style-type</title>
diff --git a/LayoutTests/css2.1/t1205-c564-list-img-00-b-g.html b/LayoutTests/css2.1/t1205-c564-list-img-00-b-g.html
index 7280ae4..5c17699 100644
--- a/LayoutTests/css2.1/t1205-c564-list-img-00-b-g.html
+++ b/LayoutTests/css2.1/t1205-c564-list-img-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style-image</title>
diff --git a/LayoutTests/css2.1/t1205-c565-list-pos-00-b.html b/LayoutTests/css2.1/t1205-c565-list-pos-00-b.html
index 70b4251..f84aea0 100644
--- a/LayoutTests/css2.1/t1205-c565-list-pos-00-b.html
+++ b/LayoutTests/css2.1/t1205-c565-list-pos-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style-position</title>
diff --git a/LayoutTests/css2.1/t1205-c566-list-stl-00-e-ag.html b/LayoutTests/css2.1/t1205-c566-list-stl-00-e-ag.html
index 0ed989c..18b57de 100644
--- a/LayoutTests/css2.1/t1205-c566-list-stl-00-e-ag.html
+++ b/LayoutTests/css2.1/t1205-c566-list-stl-00-e-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style</title>
diff --git a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.checksum b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.checksum
index b8940b6..fe5a837 100644
--- a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.checksum
+++ b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.checksum
@@ -1 +1 @@
-0fee9e2fd04c0b31597efeff386c2674
\ No newline at end of file
+37d97c60f4caefcdf5aa79f2df522373
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.png b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.png
index 3d7da17..7cb1d26 100644
--- a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.png
+++ b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
index 5c8cec1..c95428d 100644
--- a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
+++ b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g-expected.txt
@@ -9,6 +9,6 @@
           RenderImage {IMG} at (15,0) size 15x15
           RenderText {TEXT} at (30,1) size 4x0
             text run at (30,1) width 4: " "
-          RenderInline {SPAN} at (0,0) size 361x18 [color=#000000]
-            RenderText {TEXT} at (34,1) size 361x0
-              text run at (34,1) width 361: "\x{E2}\x{2021}\x{A6} There should be a green square to the left, and no red."
+          RenderInline {SPAN} at (0,0) size 359x18 [color=#000000]
+            RenderText {TEXT} at (34,1) size 359x0
+              text run at (34,1) width 359: "\x{21E6} There should be a green square to the left, and no red."
diff --git a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g.html b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g.html
index 300c37f..49dff9e 100644
--- a/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g.html
+++ b/LayoutTests/css2.1/t1205-c566-list-stl-01-c-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: list-style</title>
diff --git a/LayoutTests/css2.1/t1401-c531-color-00-a.html b/LayoutTests/css2.1/t1401-c531-color-00-a.html
index 9790de4..ed9a09a 100644
--- a/LayoutTests/css2.1/t1401-c531-color-00-a.html
+++ b/LayoutTests/css2.1/t1401-c531-color-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: color</title>
diff --git a/LayoutTests/css2.1/t1402-c45-bg-canvas-00-b.html b/LayoutTests/css2.1/t1402-c45-bg-canvas-00-b.html
index c936ed7..e0589a2 100644
--- a/LayoutTests/css2.1/t1402-c45-bg-canvas-00-b.html
+++ b/LayoutTests/css2.1/t1402-c45-bg-canvas-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: The Canvas</title>
diff --git a/LayoutTests/css2.1/t140201-c532-bgcolor-00-a.html b/LayoutTests/css2.1/t140201-c532-bgcolor-00-a.html
index 0f2e0e7..26ecb91 100644
--- a/LayoutTests/css2.1/t140201-c532-bgcolor-00-a.html
+++ b/LayoutTests/css2.1/t140201-c532-bgcolor-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-color</title>
diff --git a/LayoutTests/css2.1/t140201-c532-bgcolor-01-b.html b/LayoutTests/css2.1/t140201-c532-bgcolor-01-b.html
index cc57990..f5c8c79 100644
--- a/LayoutTests/css2.1/t140201-c532-bgcolor-01-b.html
+++ b/LayoutTests/css2.1/t140201-c532-bgcolor-01-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-color</title>
diff --git a/LayoutTests/css2.1/t140201-c533-bgimage-00-a.html b/LayoutTests/css2.1/t140201-c533-bgimage-00-a.html
index 28b66d1..b6cd153 100644
--- a/LayoutTests/css2.1/t140201-c533-bgimage-00-a.html
+++ b/LayoutTests/css2.1/t140201-c533-bgimage-00-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-image</title>
diff --git a/LayoutTests/css2.1/t140201-c533-bgimage-01-b-g.html b/LayoutTests/css2.1/t140201-c533-bgimage-01-b-g.html
index c03f692..f041cf5 100644
--- a/LayoutTests/css2.1/t140201-c533-bgimage-01-b-g.html
+++ b/LayoutTests/css2.1/t140201-c533-bgimage-01-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-image</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.checksum
index 97d9193..57c9fde 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.checksum
@@ -1 +1 @@
-d479439b5d6d82ff0b13f8fe46107d75
\ No newline at end of file
+8bb06240f239a3aff8ad21b952198c5f
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.png
index 1db9f81..2940e4e 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
index c16ca86..d1eac13 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag-expected.txt
@@ -8,22 +8,22 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 150x75
-          RenderText {TEXT} at (0,0) size 165x75
-            text run at (0,0) width 165: "\x{C2} xxxxxxxxx"
-            text run at (0,15) width 165: "\x{C2} xxxxxxxxx"
-            text run at (0,30) width 165: "\x{C2} xxxxxxxxx"
-            text run at (0,45) width 165: "\x{C2} xxxxxxxxx"
-            text run at (0,60) width 165: "\x{C2} xxxxxxxxx"
+          RenderText {TEXT} at (0,0) size 150x75
+            text run at (0,0) width 150: " xxxxxxxxx"
+            text run at (0,15) width 150: " xxxxxxxxx"
+            text run at (0,30) width 150: " xxxxxxxxx"
+            text run at (0,45) width 150: " xxxxxxxxx"
+            text run at (0,60) width 150: " xxxxxxxxx"
         RenderBlock {DIV} at (3,78) size 150x75
-          RenderText {TEXT} at (0,0) size 300x75
-            text run at (0,0) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          RenderText {TEXT} at (0,0) size 150x75
+            text run at (0,0) width 150: "          "
             text run at (0,15) width 150: "xxxxxxxxxx"
             text run at (0,30) width 150: "xxxxxxxxxx"
             text run at (0,45) width 150: "xxxxxxxxxx"
             text run at (0,60) width 150: "xxxxxxxxxx"
         RenderBlock {DIV} at (3,153) size 150x75
-          RenderText {TEXT} at (0,0) size 165x75
-            text run at (0,0) width 165: "\x{C2} xxxxxxxxx"
+          RenderText {TEXT} at (0,0) size 150x75
+            text run at (0,0) width 150: " xxxxxxxxx"
             text run at (0,15) width 150: "xxxxxxxxxx"
             text run at (0,30) width 150: "xxxxxxxxxx"
             text run at (0,45) width 150: "xxxxxxxxxx"
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag.html b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag.html
index 2157eee..67035f3 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgre-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.checksum
index 3f72256..57c9fde 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.checksum
@@ -1 +1 @@
-96a8005b9abc49965ee06c190fa0669d
\ No newline at end of file
+8bb06240f239a3aff8ad21b952198c5f
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.png
index 1137f5e..2940e4e 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
index 75b8ce3..a04919a 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag-expected.txt
@@ -8,23 +8,23 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 156x231 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 150x75
-          RenderText {TEXT} at (0,0) size 285x75
-            text run at (0,0) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,15) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,30) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,45) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,60) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          RenderText {TEXT} at (0,0) size 150x75
+            text run at (0,0) width 150: "z         "
+            text run at (0,15) width 150: "z         "
+            text run at (0,30) width 150: "z         "
+            text run at (0,45) width 150: "z         "
+            text run at (0,60) width 150: "z         "
         RenderBlock {DIV} at (3,78) size 150x75
-          RenderText {TEXT} at (0,0) size 300x75
+          RenderText {TEXT} at (0,0) size 150x75
             text run at (0,0) width 150: "zzzzzzzzzz"
-            text run at (0,15) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,30) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,45) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,60) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+            text run at (0,15) width 150: "          "
+            text run at (0,30) width 150: "          "
+            text run at (0,45) width 150: "          "
+            text run at (0,60) width 150: "          "
         RenderBlock {DIV} at (3,153) size 150x75
-          RenderText {TEXT} at (0,0) size 300x75
-            text run at (0,0) width 285: "z\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,15) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,30) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,45) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,60) width 300: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          RenderText {TEXT} at (0,0) size 150x75
+            text run at (0,0) width 150: "z         "
+            text run at (0,15) width 150: "          "
+            text run at (0,30) width 150: "          "
+            text run at (0,45) width 150: "          "
+            text run at (0,60) width 150: "          "
diff --git a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag.html b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag.html
index d7ea443..a7b7d3d 100644
--- a/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgre-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.checksum
index 665b071..e4e7413 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.checksum
@@ -1 +1 @@
-ce8a9f2e9fa54b814371db7003e077bf
\ No newline at end of file
+e61f13763b199200581f5a8af323a19b
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.png
index 40ff203..c030283 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
index 6f8d6a6..a40b792 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 182x70
-            text run at (0,0) width 182: "xxxx\x{C2} x\x{C2} xxxx"
-            text run at (0,14) width 182: "xxxx\x{C2} x\x{C2} xxxx"
-            text run at (0,28) width 168: "xxxxx\x{C2} xxxxx"
-            text run at (0,42) width 182: "xxxx\x{C2} x\x{C2} xxxx"
-            text run at (0,56) width 182: "xxxx\x{C2} x\x{C2} xxxx"
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: "xxxx x xxxx"
+            text run at (0,14) width 154: "xxxx x xxxx"
+            text run at (0,28) width 154: "xxxxx xxxxx"
+            text run at (0,42) width 154: "xxxx x xxxx"
+            text run at (0,56) width 154: "xxxx x xxxx"
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag.html
index 2e942f8..d90aa9f 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.checksum
index b85b582..8a25c1e 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.checksum
@@ -1 +1 @@
-6786677422ea2e2044f0bd231144847e
\ No newline at end of file
+a02b98b270e18f1fd291079406a4882c
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.png
index 7bb45b9..f9f1bec 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
index 0e02650..a12e5cc 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#008000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 294x70
-            text run at (0,0) width 294: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,14) width 294: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,28) width 280: "\x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,42) width 294: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-            text run at (0,56) width 294: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: "     x     "
+            text run at (0,14) width 154: "     x     "
+            text run at (0,28) width 154: "    x x    "
+            text run at (0,42) width 154: "     x     "
+            text run at (0,56) width 154: "     x     "
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag.html
index b6a7051..8230786 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-01-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.checksum
index bf6f3ef..b0768af 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.checksum
@@ -1 +1 @@
-0d8fa1425c90386fca9cf27e7f300d50
\ No newline at end of file
+362adde4e3faeb29efac6a5e4cca0460
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.png
index 1658c71..882d3bc 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
index b5cc7580..876ca01 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 266x70
-            text run at (0,0) width 266: "\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} "
-            text run at (0,14) width 266: "\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} "
-            text run at (0,28) width 196: "__\x{C2} __\x{C2} __\x{C2} __"
-            text run at (0,42) width 266: "\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} "
-            text run at (0,56) width 266: "\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} _\x{C2} \x{C2} "
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: "  _  _  _  "
+            text run at (0,14) width 154: "  _  _  _  "
+            text run at (0,28) width 154: "__ __ __ __"
+            text run at (0,42) width 154: "  _  _  _  "
+            text run at (0,56) width 154: "  _  _  _  "
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag.html
index 20a6811..968c90b 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-02-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.checksum
index f14fb87..025379e 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.checksum
@@ -1 +1 @@
-9a8a0648669277eae9fa9560fae7606b
\ No newline at end of file
+74ea5fe5e92f4f1eaeb5efe6a7a3fbce
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.png
index 68ce131..094e51f 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
index d3cc73f..d9b2510 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 266x70
-            text run at (0,0) width 266: "\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} "
-            text run at (0,14) width 196: "rr\x{C2} rr\x{C2} rr\x{C2} rr"
-            text run at (0,28) width 266: "\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} "
-            text run at (0,42) width 266: "\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} "
-            text run at (0,56) width 196: "rr\x{C2} rr\x{C2} rr\x{C2} rr"
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: "  r  r  r  "
+            text run at (0,14) width 154: "rr rr rr rr"
+            text run at (0,28) width 154: "  r  r  r  "
+            text run at (0,42) width 154: "  r  r  r  "
+            text run at (0,56) width 154: "rr rr rr rr"
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag.html
index 061ca70..38222c8 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-03-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.checksum
index 990c708..3ed3f63 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.checksum
@@ -1 +1 @@
-e597b5c1053be786130ea6d9506ed6bd
\ No newline at end of file
+6ec85046a58382c7eff060a814083b06
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.png
index b253df6..adccce9 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
index 880aaa2..0a53596 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 252x70
-            text run at (0,0) width 252: "\x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r"
-            text run at (0,14) width 210: "r\x{C2} rr\x{C2} rr\x{C2} rr\x{C2} "
-            text run at (0,28) width 252: "\x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r"
-            text run at (0,42) width 252: "\x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r"
-            text run at (0,56) width 210: "r\x{C2} rr\x{C2} rr\x{C2} rr\x{C2} "
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: " r  r  r  r"
+            text run at (0,14) width 154: "r rr rr rr "
+            text run at (0,28) width 154: " r  r  r  r"
+            text run at (0,42) width 154: " r  r  r  r"
+            text run at (0,56) width 154: "r rr rr rr "
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag.html
index 20051ce..a9edd28 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-04-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.checksum
index 7b501d8..07037e3 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.checksum
@@ -1 +1 @@
-a24863a574a1b77433a914dae79bf089
\ No newline at end of file
+ce7db0c695797f8586aa3a63d85b3815
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.png b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.png
index 1b8aeff..220e3d4 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
index 911d38e..14d3186 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag-expected.txt
@@ -8,9 +8,9 @@
           text run at (0,0) width 238: "There should be a green block below."
       RenderBlock {DIV} at (0,34) size 160x76 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
         RenderBlock {DIV} at (3,3) size 154x70
-          RenderText {TEXT} at (0,0) size 252x70
-            text run at (0,0) width 210: "\x{C2} rr\x{C2} rr\x{C2} rr\x{C2} r"
-            text run at (0,14) width 252: "r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} "
-            text run at (0,28) width 252: "r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} "
-            text run at (0,42) width 210: "\x{C2} rr\x{C2} rr\x{C2} rr\x{C2} r"
-            text run at (0,56) width 252: "r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} \x{C2} r\x{C2} "
+          RenderText {TEXT} at (0,0) size 154x70
+            text run at (0,0) width 154: " rr rr rr r"
+            text run at (0,14) width 154: "r  r  r  r "
+            text run at (0,28) width 154: "r  r  r  r "
+            text run at (0,42) width 154: " rr rr rr r"
+            text run at (0,56) width 154: "r  r  r  r "
diff --git a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag.html b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag.html
index 04c0d43..6d247c0 100644
--- a/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c534-bgreps-05-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-repeat</title>
diff --git a/LayoutTests/css2.1/t140201-c535-bg-fixd-00-b-g.html b/LayoutTests/css2.1/t140201-c535-bg-fixd-00-b-g.html
index c7aa9c4..1b0a2ac 100644
--- a/LayoutTests/css2.1/t140201-c535-bg-fixd-00-b-g.html
+++ b/LayoutTests/css2.1/t140201-c535-bg-fixd-00-b-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-attachment</title>
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.checksum b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.checksum
index be200b2..8976556 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.checksum
@@ -1 +1 @@
-34cd2e88f53baa1a39271c1aec4675e4
\ No newline at end of file
+c544e108d283849e41d49f7c21042d9b
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.png b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.png
index b1a6fde..5a1c390 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
index f6bc671..8614425 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag-expected.txt
@@ -10,23 +10,23 @@
         RenderText {TEXT} at (0,0) size 487x18
           text run at (0,0) width 487: "There should be no red on this page (look in the upper right hand corner too)."
       RenderBlock {DIV} at (0,65) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "     X     "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
       RenderBlock {DIV} at (0,140) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "     X     "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
       RenderBlock {DIV} at (0,215) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "           "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "          X"
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag.html b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag.html
index 4238b2f..f7e02a3 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag.html
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-position</title>
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt b/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
index c7f0ef8..c361496 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag-expected.txt
@@ -7,30 +7,30 @@
         RenderText {TEXT} at (0,0) size 230x18
           text run at (0,0) width 230: "There should be no red on this page."
       RenderBlock {DIV} at (0,34) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "           "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "          X"
       RenderBlock {DIV} at (0,109) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 315: "X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "X          "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
       RenderBlock {DIV} at (0,184) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} "
-          text run at (0,30) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "        X  "
+          text run at (0,30) width 165: "           "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
       RenderBlock {DIV} at (0,259) size 165x75 [color=#FFFFFF]
-        RenderText {TEXT} at (0,0) size 330x75
-          text run at (0,0) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 315: "\x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "           "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "  X        "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
diff --git a/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag.html b/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag.html
index 1e138b7..d985df0 100644
--- a/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag.html
+++ b/LayoutTests/css2.1/t140201-c536-bgpos-01-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background-position</title>
diff --git a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
index cc941f7..2c5aec1 100644
--- a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
+++ b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.checksum
@@ -1 +1 @@
-3b184eed6d271c62b2738ab2c7a3fdc3
\ No newline at end of file
+385d22d5c6d00304e1d3ed5840ffde1a
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png
index 6ec6ff9..3059698 100644
--- a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png
+++ b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
index f39e1e1..a61b0e4 100644
--- a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
+++ b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag-expected.txt
@@ -19,26 +19,26 @@
           text run at (0,18) width 24: "red "
           text run at (24,18) width 179: "below, just a block of green."
       RenderBlock {DIV} at (30,154) size 165x75 [color=#008000] [bgcolor=#008000]
-        RenderText {TEXT} at (0,0) size 315x75
-          text run at (0,0) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
-          text run at (0,15) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
-          text run at (0,30) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
-          text run at (0,45) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
-          text run at (0,60) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X"
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "          X"
+          text run at (0,15) width 165: "          X"
+          text run at (0,30) width 165: "          X"
+          text run at (0,45) width 165: "          X"
+          text run at (0,60) width 165: "          X"
       RenderBlock {DIV} at (30,229) size 165x75 [color=#008000] [bgcolor=#008000]
-        RenderText {TEXT} at (0,0) size 315x75
-          text run at (0,0) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,15) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 315: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} X\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+        RenderText {TEXT} at (0,0) size 165x75
+          text run at (0,0) width 165: "     X     "
+          text run at (0,15) width 165: "     X     "
+          text run at (0,30) width 165: "     X     "
+          text run at (0,45) width 165: "     X     "
+          text run at (0,60) width 165: "     X     "
       RenderBlock {DIV} at (30,304) size 165x75 [color=#008000] [bgcolor=#008000]
-        RenderText {TEXT} at (0,0) size 330x75
+        RenderText {TEXT} at (0,0) size 165x75
           text run at (0,0) width 165: "XXXXXXXXXXX"
-          text run at (0,15) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,30) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,45) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
-          text run at (0,60) width 330: "\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} "
+          text run at (0,15) width 165: "           "
+          text run at (0,30) width 165: "           "
+          text run at (0,45) width 165: "           "
+          text run at (0,60) width 165: "           "
       RenderBlock {P} at (0,395) size 769x18 [color=#C0C0C0]
         RenderText {TEXT} at (0,0) size 83x18
           text run at (0,0) width 83: "Dummy text."
diff --git a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag.html b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag.html
index 845b427..c877eae 100644
--- a/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag.html
+++ b/LayoutTests/css2.1/t140201-c537-bgfxps-00-c-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: background</title>
diff --git a/LayoutTests/css2.1/t1503-c522-font-family-00-b.html b/LayoutTests/css2.1/t1503-c522-font-family-00-b.html
index d34fe04..5ff04a5 100644
--- a/LayoutTests/css2.1/t1503-c522-font-family-00-b.html
+++ b/LayoutTests/css2.1/t1503-c522-font-family-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-family</title>
diff --git a/LayoutTests/css2.1/t1504-c523-font-style-00-b.html b/LayoutTests/css2.1/t1504-c523-font-style-00-b.html
index 893a978..4d2f102 100644
--- a/LayoutTests/css2.1/t1504-c523-font-style-00-b.html
+++ b/LayoutTests/css2.1/t1504-c523-font-style-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-style</title>
diff --git a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.checksum b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.checksum
index 269f272..729ab83 100644
--- a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.checksum
+++ b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.checksum
@@ -1 +1 @@
-db5f9e532e60dc4ac6eeedcf3e856a42
\ No newline at end of file
+608e5c01a6725db754c8ff9ab3c981cd
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.png b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.png
index 1de3bc8..70d4075 100644
--- a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.png
+++ b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
index b0413f3..82db72e 100644
--- a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
+++ b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g-expected.txt
@@ -35,14 +35,14 @@
         RenderInline {STRONG} at (0,0) size 4x18 [color=#FF0000]
           RenderText {TEXT} at (285,0) size 4x18
             text run at (285,0) width 4: " "
-        RenderText {TEXT} at (289,0) size 16x18
-          text run at (289,0) width 16: "\x{C2} "
+        RenderText {TEXT} at (289,0) size 4x18
+          text run at (289,0) width 4: " "
       RenderBlock {P} at (0,272) size 784x19 [color=#000080]
         RenderText {TEXT} at (0,1) size 285x18
           text run at (0,1) width 285: "There should be no red at the end of this line."
         RenderImage {IMG} at (285,0) size 15x15
-        RenderText {TEXT} at (300,1) size 16x18
-          text run at (300,1) width 16: "\x{C2} "
+        RenderText {TEXT} at (300,1) size 4x18
+          text run at (300,1) width 4: " "
       RenderBlock {P} at (0,307) size 784x21 [color=#000080]
         RenderText {TEXT} at (0,3) size 202x18
           text run at (0,3) width 202: "This sentence and all its images "
diff --git a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g.html b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g.html
index c26e40b..aa865e3 100644
--- a/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g.html
+++ b/LayoutTests/css2.1/t1504-c543-txt-decor-00-d-g.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: text-decoration</title>
diff --git a/LayoutTests/css2.1/t1505-c524-font-var-00-b.html b/LayoutTests/css2.1/t1505-c524-font-var-00-b.html
index f47dc64..0137098 100644
--- a/LayoutTests/css2.1/t1505-c524-font-var-00-b.html
+++ b/LayoutTests/css2.1/t1505-c524-font-var-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-variant</title>
diff --git a/LayoutTests/css2.1/t1506-c525-font-wt-00-b.html b/LayoutTests/css2.1/t1506-c525-font-wt-00-b.html
index 82859cc..4598c85 100644
--- a/LayoutTests/css2.1/t1506-c525-font-wt-00-b.html
+++ b/LayoutTests/css2.1/t1506-c525-font-wt-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-weight</title>
diff --git a/LayoutTests/css2.1/t1507-c526-font-sz-00-b.html b/LayoutTests/css2.1/t1507-c526-font-sz-00-b.html
index b0739da..c9d9eea 100644
--- a/LayoutTests/css2.1/t1507-c526-font-sz-00-b.html
+++ b/LayoutTests/css2.1/t1507-c526-font-sz-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-size</title>
diff --git a/LayoutTests/css2.1/t1507-c526-font-sz-01-b-a.html b/LayoutTests/css2.1/t1507-c526-font-sz-01-b-a.html
index 68bb678..219f4e5 100644
--- a/LayoutTests/css2.1/t1507-c526-font-sz-01-b-a.html
+++ b/LayoutTests/css2.1/t1507-c526-font-sz-01-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-size</title>
diff --git a/LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html b/LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html
index 0174670..0851b33 100644
--- a/LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html
+++ b/LayoutTests/css2.1/t1507-c526-font-sz-02-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-size</title>
diff --git a/LayoutTests/css2.1/t1507-c526-font-sz-03-f-a.html b/LayoutTests/css2.1/t1507-c526-font-sz-03-f-a.html
index 90c5cf25..b1888cb 100644
--- a/LayoutTests/css2.1/t1507-c526-font-sz-03-f-a.html
+++ b/LayoutTests/css2.1/t1507-c526-font-sz-03-f-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font-size</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-00-b.html b/LayoutTests/css2.1/t1508-c527-font-00-b.html
index e04b2f0..6df00b9 100644
--- a/LayoutTests/css2.1/t1508-c527-font-00-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-01-b.html b/LayoutTests/css2.1/t1508-c527-font-01-b.html
index 1f0a066..0b93261 100644
--- a/LayoutTests/css2.1/t1508-c527-font-01-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-01-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-02-b.html b/LayoutTests/css2.1/t1508-c527-font-02-b.html
index c59f80d..bc7c5e2 100644
--- a/LayoutTests/css2.1/t1508-c527-font-02-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-02-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-03-b.html b/LayoutTests/css2.1/t1508-c527-font-03-b.html
index 03a85b6..0bbb114 100644
--- a/LayoutTests/css2.1/t1508-c527-font-03-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-03-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-04-b.html b/LayoutTests/css2.1/t1508-c527-font-04-b.html
index 3361d6d..4ce7116 100644
--- a/LayoutTests/css2.1/t1508-c527-font-04-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-04-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-05-b.html b/LayoutTests/css2.1/t1508-c527-font-05-b.html
index 8d476ec..e75a6a6 100644
--- a/LayoutTests/css2.1/t1508-c527-font-05-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-05-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-06-b.html b/LayoutTests/css2.1/t1508-c527-font-06-b.html
index 141a554..14faab5 100644
--- a/LayoutTests/css2.1/t1508-c527-font-06-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-06-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-07-b.html b/LayoutTests/css2.1/t1508-c527-font-07-b.html
index bb13d15..99e949c 100644
--- a/LayoutTests/css2.1/t1508-c527-font-07-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-07-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-08-b.html b/LayoutTests/css2.1/t1508-c527-font-08-b.html
index 83ad076..9382b04 100644
--- a/LayoutTests/css2.1/t1508-c527-font-08-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-08-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-09-b.html b/LayoutTests/css2.1/t1508-c527-font-09-b.html
index 0beda58..7e07c34 100644
--- a/LayoutTests/css2.1/t1508-c527-font-09-b.html
+++ b/LayoutTests/css2.1/t1508-c527-font-09-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1508-c527-font-10-c.html b/LayoutTests/css2.1/t1508-c527-font-10-c.html
index a377fa2..03a12cd 100644
--- a/LayoutTests/css2.1/t1508-c527-font-10-c.html
+++ b/LayoutTests/css2.1/t1508-c527-font-10-c.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: font</title>
diff --git a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
index fc8dee0..51c5631 100644
--- a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.checksum
@@ -1 +1 @@
-bb12a4d23f4a563771adeb8766714f08
\ No newline at end of file
+17bb364c789336f43169e1b8994efc7e
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
index f547b60..b021b65 100644
--- a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
+++ b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
index deffc0f..46631c6 100644
--- a/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
+++ b/LayoutTests/css2.1/t1601-c547-indent-00-b-a-expected.txt
@@ -7,8 +7,8 @@
         RenderText {TEXT} at (0,0) size 380x18
           text run at (0,0) width 380: "There should be a tall solid unbroken column of blue below."
       RenderBlock {DIV} at (0,34) size 432x24 [color=#0000FF]
-        RenderText {TEXT} at (0,0) size 72x24
-          text run at (0,0) width 72: "\x{C2} x"
+        RenderText {TEXT} at (0,0) size 48x24
+          text run at (0,0) width 48: " x"
       RenderBlock {DIV} at (0,58) size 432x24 [color=#0000FF]
         RenderText {TEXT} at (24,0) size 24x24
           text run at (24,0) width 24: "x"
@@ -34,5 +34,5 @@
         RenderText {TEXT} at (24,0) size 24x24
           text run at (24,0) width 24: "x"
       RenderBlock {DIV} at (0,250) size 432x24 [color=#0000FF]
-        RenderText {TEXT} at (0,0) size 72x24
-          text run at (0,0) width 72: "\x{C2} x"
+        RenderText {TEXT} at (0,0) size 48x24
+          text run at (0,0) width 48: " x"
diff --git a/LayoutTests/css2.1/t1601-c547-indent-00-b-a.html b/LayoutTests/css2.1/t1601-c547-indent-00-b-a.html
index 88672a3..724d9ec 100644
--- a/LayoutTests/css2.1/t1601-c547-indent-00-b-a.html
+++ b/LayoutTests/css2.1/t1601-c547-indent-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: text-indent</title>
diff --git a/LayoutTests/css2.1/t1601-c547-indent-01-d.html b/LayoutTests/css2.1/t1601-c547-indent-01-d.html
index 339bd21..92baf66 100644
--- a/LayoutTests/css2.1/t1601-c547-indent-01-d.html
+++ b/LayoutTests/css2.1/t1601-c547-indent-01-d.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: text-indent</title>
diff --git a/LayoutTests/css2.1/t1602-c43-center-00-d-ag.html b/LayoutTests/css2.1/t1602-c43-center-00-d-ag.html
index 203703e..c3ff792 100644
--- a/LayoutTests/css2.1/t1602-c43-center-00-d-ag.html
+++ b/LayoutTests/css2.1/t1602-c43-center-00-d-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: Replaced Elements</title>
diff --git a/LayoutTests/css2.1/t1602-c546-txt-align-00-b.html b/LayoutTests/css2.1/t1602-c546-txt-align-00-b.html
index 6e3be8f..986160d 100644
--- a/LayoutTests/css2.1/t1602-c546-txt-align-00-b.html
+++ b/LayoutTests/css2.1/t1602-c546-txt-align-00-b.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: text-align</title>
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum
index 4f4d890..3825de6 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.checksum
@@ -1 +1 @@
-cc02dfba840fc68992b182a12d10a47e
\ No newline at end of file
+b7091b8832e94b4a1884296177c5d711
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png
index f255717..e5a2f22 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
index f3dbe10..4daddcf 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a-expected.txt
@@ -7,14 +7,14 @@
         RenderText {TEXT} at (0,0) size 708x18
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
       RenderBlock {DIV} at (0,34) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 528x24
-          text run at (0,0) width 528: "x\x{C2} \x{C2} xx\x{C2} \x{C2} xxx\x{C2} \x{C2} xxxx"
+        RenderText {TEXT} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
       RenderBlock {DIV} at (0,58) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 528x24
-          text run at (0,0) width 528: "x\x{C2} \x{C2} xx\x{C2} \x{C2} xxx\x{C2} \x{C2} xxxx"
+        RenderText {TEXT} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
       RenderBlock {DIV} at (0,82) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 528x24
-          text run at (0,0) width 528: "x\x{C2} \x{C2} xx\x{C2} \x{C2} xxx\x{C2} \x{C2} xxxx"
+        RenderText {TEXT} at (0,0) size 384x24
+          text run at (0,0) width 384: "x  xx  xxx  xxxx"
       RenderBlock {DIV} at (0,106) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {TEXT} at (0,0) size 384x24
           text run at (0,0) width 384: "x xx xxx xxxx"
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html
index e52f07f..2899747 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: word-spacing</title>
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.checksum b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.checksum
index 5983dfa..a7b0a94 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.checksum
@@ -1 +1 @@
-74aa2fe058687637633d0b3e117fc54b
\ No newline at end of file
+ea10368af0f94e6c96da7caf8e9490c8
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.png b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.png
index 01b430e..8329166 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.png
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.txt b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
index 9fbdcd6..686e7ef 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a-expected.txt
@@ -1,20 +1,20 @@
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x226
-  RenderBlock {HTML} at (0,0) size 800x226
-    RenderBody {BODY} at (8,16) size 784x202
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x178
       RenderBlock {P} at (0,0) size 784x18
         RenderText {TEXT} at (0,0) size 708x18
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
       RenderBlock {DIV} at (48,34) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 384x24
-          text run at (0,0) width 384: "x\x{C2} \x{C2} x\x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 264x24
+          text run at (0,0) width 264: "x  x  xx xx"
       RenderBlock {DIV} at (48,58) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 384x24
-          text run at (0,0) width 384: "x\x{C2} \x{C2} x\x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 264x24
+          text run at (0,0) width 264: "x  x  xx xx"
       RenderBlock {DIV} at (48,82) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 384x24
-          text run at (0,0) width 384: "x\x{C2} \x{C2} x\x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 264x24
+          text run at (0,0) width 264: "x  x  xx xx"
       RenderBlock {DIV} at (48,106) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {TEXT} at (0,0) size 144x24
           text run at (0,0) width 144: "x x "
@@ -22,10 +22,9 @@
           RenderText {TEXT} at (144,0) size 120x24
             text run at (144,0) width 120: "xx xx"
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (48,130) size 288x48 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 240x48
-          text run at (0,0) width 240: "x\x{C2}  x \x{C2} xx"
-          text run at (0,24) width 48: "xx"
-      RenderBlock {DIV} at (48,178) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 336x24
-          text run at (0,0) width 336: "x\x{C2}  \x{C2} x\x{C2} \x{C2}  xx\x{C2}  xx"
+      RenderBlock {DIV} at (48,130) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {TEXT} at (0,0) size 264x24
+          text run at (0,0) width 264: "x  x  xx xx"
+      RenderBlock {DIV} at (48,154) size 288x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {TEXT} at (0,0) size 264x24
+          text run at (0,0) width 264: "x   x   xx  xx"
diff --git a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a.html b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a.html
index e05d0e4..8fcbcc5 100644
--- a/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a.html
+++ b/LayoutTests/css2.1/t1604-c541-word-sp-01-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: word-spacing</title>
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum
index 0163cac..f933cf0 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.checksum
@@ -1 +1 @@
-3b67b23c425336e8968a8c98540c281b
\ No newline at end of file
+deadb29161311c34b7efcf7a899e33ed
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png
index 420a661..42663c5 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
index 4c9d840..00af100 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a-expected.txt
@@ -7,14 +7,14 @@
         RenderText {TEXT} at (0,0) size 708x18
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
       RenderBlock {DIV} at (0,34) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 576x24
-          text run at (0,0) width 576: "x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x"
+        RenderText {TEXT} at (0,0) size 360x24
+          text run at (0,0) width 360: "x x   x x   x x"
       RenderBlock {DIV} at (0,58) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 576x24
-          text run at (0,0) width 576: "x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x"
+        RenderText {TEXT} at (0,0) size 360x24
+          text run at (0,0) width 360: "x x   x x   x x"
       RenderBlock {DIV} at (0,82) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 576x24
-          text run at (0,0) width 576: "x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x"
+        RenderText {TEXT} at (0,0) size 360x24
+          text run at (0,0) width 360: "x x   x x   x x"
       RenderBlock {DIV} at (0,106) size 432x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {TEXT} at (0,0) size 384x24
           text run at (0,0) width 384: "xx xx xx"
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html
index 29d236c..20fc497 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-00-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: letter-spacing</title>
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.checksum b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.checksum
index 8ac67b0..7ec1c41 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.checksum
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.checksum
@@ -1 +1 @@
-4e28614dff436ed25e564255d8ad29e9
\ No newline at end of file
+f856d70f3ccde71f08782dab7e716f5d
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.png b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.png
index 206f8f1..96c8c73 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.png
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
index d3ac1be..564ba51 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a-expected.txt
@@ -1,20 +1,20 @@
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x226
-  RenderBlock {HTML} at (0,0) size 800x226
-    RenderBody {BODY} at (8,16) size 784x202
+layer at (0,0) size 800x202
+  RenderBlock {HTML} at (0,0) size 800x202
+    RenderBody {BODY} at (8,16) size 784x178
       RenderBlock {P} at (0,0) size 784x18
         RenderText {TEXT} at (0,0) size 708x18
           text run at (0,0) width 708: "There should be a stripy pattern of yellow and aqua below (each vertical stripe should be straight and unbroken)."
       RenderBlock {DIV} at (48,34) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 480x24
-          text run at (0,0) width 480: "x\x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 312x24
+          text run at (0,0) width 312: "x  x    xx xx"
       RenderBlock {DIV} at (48,58) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 480x24
-          text run at (0,0) width 480: "x\x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 312x24
+          text run at (0,0) width 312: "x  x    xx xx"
       RenderBlock {DIV} at (48,82) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 480x24
-          text run at (0,0) width 480: "x\x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} xx\x{C2} xx"
+        RenderText {TEXT} at (0,0) size 312x24
+          text run at (0,0) width 312: "x  x    xx xx"
       RenderBlock {DIV} at (48,106) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
         RenderText {TEXT} at (0,0) size 216x24
           text run at (0,0) width 216: "xx "
@@ -22,10 +22,9 @@
           RenderText {TEXT} at (216,0) size 120x24
             text run at (216,0) width 120: "xx xx"
         RenderText {TEXT} at (0,0) size 0x0
-      RenderBlock {DIV} at (48,130) size 360x48 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 312x48
-          text run at (0,0) width 312: "x \x{C2} x\x{C2}  \x{C2}  xx"
-          text run at (0,24) width 48: "xx"
-      RenderBlock {DIV} at (48,178) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
-        RenderText {TEXT} at (0,0) size 528x24
-          text run at (0,0) width 528: "x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} \x{C2} x\x{C2} x\x{C2} \x{C2} \x{C2} x\x{C2} x"
+      RenderBlock {DIV} at (48,130) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {TEXT} at (0,0) size 312x24
+          text run at (0,0) width 312: "x  x    xx xx"
+      RenderBlock {DIV} at (48,154) size 360x24 [color=#00FFFF] [bgcolor=#FFFF00]
+        RenderText {TEXT} at (0,0) size 300x24
+          text run at (0,0) width 300: "x     x         x x   x x"
diff --git a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a.html b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a.html
index 3d70c01..ab9ea2b 100644
--- a/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a.html
+++ b/LayoutTests/css2.1/t1604-c542-letter-sp-01-b-a.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: letter-spacing</title>
diff --git a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.checksum b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.checksum
index b2be696..681ee41 100644
--- a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.checksum
+++ b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.checksum
@@ -1 +1 @@
-f775fd15e93f429d2c87f731e162299f
\ No newline at end of file
+19f62f24997a9703a86874af17aa2e29
\ No newline at end of file
diff --git a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.png b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.png
index 57f0f4a..f83527f 100644
--- a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.png
+++ b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.png
Binary files differ
diff --git a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
index 61bd313..83113e6 100644
--- a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
+++ b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag-expected.txt
@@ -1,184 +1,169 @@
 layer at (0,0) size 800x600
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x240
-  RenderBlock {HTML} at (0,0) size 800x240
-    RenderBody {BODY} at (8,8) size 784x224
+layer at (0,0) size 800x190
+  RenderBlock {HTML} at (0,0) size 800x190
+    RenderBody {BODY} at (8,8) size 784x174
       RenderBlock {P} at (0,0) size 784x18
         RenderText {TEXT} at (0,0) size 227x18
           text run at (0,0) width 227: "There should be a green box below."
-      RenderBlock {DIV} at (0,18) size 326x206 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
-        RenderBlock {P} at (3,3) size 320x40
-          RenderText {TEXT} at (0,0) size 240x10
-            text run at (0,0) width 240: "Xx xx x. (x.x. XX) x\x{C2} x "
+      RenderBlock {DIV} at (0,18) size 326x156 [color=#008000] [bgcolor=#FF0000] [border: (3px solid #000000)]
+        RenderBlock {P} at (3,3) size 320x30
+          RenderText {TEXT} at (0,0) size 230x10
+            text run at (0,0) width 230: "Xx xx x. (x.x. XX) x x "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (240,0) size 20x10
-              text run at (240,0) width 20: "Xx"
-          RenderText {TEXT} at (260,0) size 30x10
-            text run at (260,0) width 30: "xxx"
+            RenderText {TEXT} at (230,0) size 20x10
+              text run at (230,0) width 20: "Xx"
+          RenderText {TEXT} at (250,0) size 40x10
+            text run at (250,0) width 40: "xxx "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (0,10) size 30x10
-              text run at (0,10) width 30: "xxx"
-          RenderText {TEXT} at (30,10) size 240x10
-            text run at (30,10) width 10: " "
-            text run at (40,10) width 230: "Pp pp p. (p.p. PP) p\x{C2} p"
+            RenderText {TEXT} at (290,0) size 30x10
+              text run at (290,0) width 30: "xxx"
+          RenderText {TEXT} at (0,10) size 230x10
+            text run at (0,10) width 230: "Pp pp p. (p.p. PP) p p "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (0,20) size 20x10
-              text run at (0,20) width 20: "Pp"
-          RenderText {TEXT} at (20,20) size 40x10
-            text run at (20,20) width 40: "ppp "
+            RenderText {TEXT} at (230,10) size 20x10
+              text run at (230,10) width 20: "Pp"
+          RenderText {TEXT} at (250,10) size 40x10
+            text run at (250,10) width 40: "ppp "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (60,20) size 30x10
-              text run at (60,20) width 30: "ppp"
-          RenderText {TEXT} at (90,20) size 310x20
-            text run at (90,20) width 10: " "
-            text run at (100,20) width 210: "\x{C3}\x{2030}\x{C3}\x{A9} \x{C3}\x{A9}\x{C3}\x{A9} \x{C3}\x{A9}. (\x{C3}\x{A9}.\x{C3}\x{A9}."
-            text run at (0,30) width 130: "\x{C3}\x{2030}\x{C3}\x{2030}) \x{C3}\x{A9}\x{C2} \x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 40x10
-            RenderText {TEXT} at (130,30) size 40x10
-              text run at (130,30) width 40: "\x{C3}\x{A9}\x{C3}\x{A9}"
-          RenderText {TEXT} at (170,30) size 70x10
-            text run at (170,30) width 70: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 60x10
-            RenderText {TEXT} at (240,30) size 60x10
-              text run at (240,30) width 60: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9}"
+            RenderText {TEXT} at (290,10) size 30x10
+              text run at (290,10) width 30: "ppp"
+          RenderText {TEXT} at (0,20) size 230x10
+            text run at (0,20) width 230: "\x{C9}\x{E9} \x{E9}\x{E9} \x{E9}. (\x{E9}.\x{E9}. \x{C9}\x{C9}) \x{E9} \x{E9} "
+          RenderInline {SPAN} at (0,0) size 20x10
+            RenderText {TEXT} at (230,20) size 20x10
+              text run at (230,20) width 20: "\x{C9}\x{E9}"
+          RenderText {TEXT} at (250,20) size 40x10
+            text run at (250,20) width 40: "\x{E9}\x{E9}\x{E9} "
+          RenderInline {SPAN} at (0,0) size 30x10
+            RenderText {TEXT} at (290,20) size 30x10
+              text run at (290,20) width 30: "\x{E9}\x{E9}\x{E9}"
           RenderText {TEXT} at (0,0) size 0x0
-        RenderBlock {P} at (3,43) size 320x40
-          RenderText {TEXT} at (0,0) size 240x10
-            text run at (0,0) width 240: "Xx xx x. (x.x. XX) x\x{C2} x "
+        RenderBlock {P} at (3,33) size 320x30
+          RenderText {TEXT} at (0,0) size 230x10
+            text run at (0,0) width 230: "Xx xx x. (x.x. XX) x x "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (240,0) size 20x10
-              text run at (240,0) width 20: "Xx"
-          RenderText {TEXT} at (260,0) size 30x10
-            text run at (260,0) width 30: "xxx"
+            RenderText {TEXT} at (230,0) size 20x10
+              text run at (230,0) width 20: "Xx"
+          RenderText {TEXT} at (250,0) size 40x10
+            text run at (250,0) width 40: "xxx "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (0,10) size 30x10
-              text run at (0,10) width 30: "xxx"
-          RenderText {TEXT} at (30,10) size 240x10
-            text run at (30,10) width 10: " "
-            text run at (40,10) width 230: "Pp pp p. (p.p. PP) p\x{C2} p"
+            RenderText {TEXT} at (290,0) size 30x10
+              text run at (290,0) width 30: "xxx"
+          RenderText {TEXT} at (0,10) size 230x10
+            text run at (0,10) width 230: "Pp pp p. (p.p. PP) p p "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (0,20) size 20x10
-              text run at (0,20) width 20: "Pp"
-          RenderText {TEXT} at (20,20) size 40x10
-            text run at (20,20) width 40: "ppp "
+            RenderText {TEXT} at (230,10) size 20x10
+              text run at (230,10) width 20: "Pp"
+          RenderText {TEXT} at (250,10) size 40x10
+            text run at (250,10) width 40: "ppp "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (60,20) size 30x10
-              text run at (60,20) width 30: "ppp"
-          RenderText {TEXT} at (90,20) size 310x20
-            text run at (90,20) width 10: " "
-            text run at (100,20) width 210: "\x{C3}\x{2030}\x{C3}\x{A9} \x{C3}\x{A9}\x{C3}\x{A9} \x{C3}\x{A9}. (\x{C3}\x{A9}.\x{C3}\x{A9}."
-            text run at (0,30) width 130: "\x{C3}\x{2030}\x{C3}\x{2030}) \x{C3}\x{A9}\x{C2} \x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 40x10
-            RenderText {TEXT} at (130,30) size 40x10
-              text run at (130,30) width 40: "\x{C3}\x{A9}\x{C3}\x{A9}"
-          RenderText {TEXT} at (170,30) size 70x10
-            text run at (170,30) width 70: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 60x10
-            RenderText {TEXT} at (240,30) size 60x10
-              text run at (240,30) width 60: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9}"
+            RenderText {TEXT} at (290,10) size 30x10
+              text run at (290,10) width 30: "ppp"
+          RenderText {TEXT} at (0,20) size 230x10
+            text run at (0,20) width 230: "\x{C9}\x{E9} \x{E9}\x{E9} \x{E9}. (\x{E9}.\x{E9}. \x{C9}\x{C9}) \x{E9} \x{E9} "
+          RenderInline {SPAN} at (0,0) size 20x10
+            RenderText {TEXT} at (230,20) size 20x10
+              text run at (230,20) width 20: "\x{C9}\x{E9}"
+          RenderText {TEXT} at (250,20) size 40x10
+            text run at (250,20) width 40: "\x{E9}\x{E9}\x{E9} "
+          RenderInline {SPAN} at (0,0) size 30x10
+            RenderText {TEXT} at (290,20) size 30x10
+              text run at (290,20) width 30: "\x{E9}\x{E9}\x{E9}"
           RenderText {TEXT} at (0,0) size 0x0
-        RenderBlock {P} at (3,83) size 320x40
-          RenderText {TEXT} at (0,0) size 240x10
-            text run at (0,0) width 240: "Xx Xx X. (X.x. XX) X\x{C2} x "
+        RenderBlock {P} at (3,63) size 320x30
+          RenderText {TEXT} at (0,0) size 230x10
+            text run at (0,0) width 230: "Xx Xx X. (X.x. XX) X x "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (240,0) size 20x10
-              text run at (240,0) width 20: "Xx"
-          RenderText {TEXT} at (260,0) size 30x10
-            text run at (260,0) width 30: "Xxx"
+            RenderText {TEXT} at (230,0) size 20x10
+              text run at (230,0) width 20: "Xx"
+          RenderText {TEXT} at (250,0) size 40x10
+            text run at (250,0) width 40: "Xxx "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (0,10) size 30x10
-              text run at (0,10) width 30: "xxx"
-          RenderText {TEXT} at (30,10) size 240x10
-            text run at (30,10) width 10: " "
-            text run at (40,10) width 230: "Pp Pp P. (P.p. PP) P\x{C2} p"
+            RenderText {TEXT} at (290,0) size 30x10
+              text run at (290,0) width 30: "xxx"
+          RenderText {TEXT} at (0,10) size 230x10
+            text run at (0,10) width 230: "Pp Pp P. (P.p. PP) P p "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (0,20) size 20x10
-              text run at (0,20) width 20: "Pp"
-          RenderText {TEXT} at (20,20) size 40x10
-            text run at (20,20) width 40: "Ppp "
+            RenderText {TEXT} at (230,10) size 20x10
+              text run at (230,10) width 20: "Pp"
+          RenderText {TEXT} at (250,10) size 40x10
+            text run at (250,10) width 40: "Ppp "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (60,20) size 30x10
-              text run at (60,20) width 30: "ppp"
-          RenderText {TEXT} at (90,20) size 310x20
-            text run at (90,20) width 10: " "
-            text run at (100,20) width 210: "\x{C3}\x{2030}\x{C3}\x{A9} \x{C3}\x{A9}\x{C3}\x{A9} \x{C3}\x{A9}. (\x{C3}\x{A9}.\x{C3}\x{A9}."
-            text run at (0,30) width 130: "\x{C3}\x{2030}\x{C3}\x{2030}) \x{C3}\x{A9}\x{C2} \x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 40x10
-            RenderText {TEXT} at (130,30) size 40x10
-              text run at (130,30) width 40: "\x{C3}\x{A9}\x{C3}\x{A9}"
-          RenderText {TEXT} at (170,30) size 70x10
-            text run at (170,30) width 70: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 60x10
-            RenderText {TEXT} at (240,30) size 60x10
-              text run at (240,30) width 60: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9}"
+            RenderText {TEXT} at (290,10) size 30x10
+              text run at (290,10) width 30: "ppp"
+          RenderText {TEXT} at (0,20) size 230x10
+            text run at (0,20) width 230: "\x{C9}\x{E9} \x{C9}\x{E9} \x{C9}. (\x{C9}.\x{E9}. \x{C9}\x{C9}) \x{C9} \x{E9} "
+          RenderInline {SPAN} at (0,0) size 20x10
+            RenderText {TEXT} at (230,20) size 20x10
+              text run at (230,20) width 20: "\x{C9}\x{E9}"
+          RenderText {TEXT} at (250,20) size 40x10
+            text run at (250,20) width 40: "\x{C9}\x{E9}\x{E9} "
+          RenderInline {SPAN} at (0,0) size 30x10
+            RenderText {TEXT} at (290,20) size 30x10
+              text run at (290,20) width 30: "\x{E9}\x{E9}\x{E9}"
           RenderText {TEXT} at (0,0) size 0x0
-        RenderBlock {P} at (3,123) size 320x40
-          RenderText {TEXT} at (0,0) size 240x10
-            text run at (0,0) width 240: "XX XX X. (X.X. XX) X\x{C2} X "
+        RenderBlock {P} at (3,93) size 320x30
+          RenderText {TEXT} at (0,0) size 230x10
+            text run at (0,0) width 230: "XX XX X. (X.X. XX) X X "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (240,0) size 20x10
-              text run at (240,0) width 20: "Xx"
-          RenderText {TEXT} at (260,0) size 30x10
-            text run at (260,0) width 30: "XXX"
+            RenderText {TEXT} at (230,0) size 20x10
+              text run at (230,0) width 20: "Xx"
+          RenderText {TEXT} at (250,0) size 40x10
+            text run at (250,0) width 40: "XXX "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (0,10) size 30x10
-              text run at (0,10) width 30: "xxx"
-          RenderText {TEXT} at (30,10) size 240x10
-            text run at (30,10) width 10: " "
-            text run at (40,10) width 230: "PP PP P. (P.P. PP) P\x{C2} P"
+            RenderText {TEXT} at (290,0) size 30x10
+              text run at (290,0) width 30: "xxx"
+          RenderText {TEXT} at (0,10) size 230x10
+            text run at (0,10) width 230: "PP PP P. (P.P. PP) P P "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (0,20) size 20x10
-              text run at (0,20) width 20: "Pp"
-          RenderText {TEXT} at (20,20) size 40x10
-            text run at (20,20) width 40: "PPP "
+            RenderText {TEXT} at (230,10) size 20x10
+              text run at (230,10) width 20: "Pp"
+          RenderText {TEXT} at (250,10) size 40x10
+            text run at (250,10) width 40: "PPP "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (60,20) size 30x10
-              text run at (60,20) width 30: "ppp"
-          RenderText {TEXT} at (90,20) size 310x20
-            text run at (90,20) width 10: " "
-            text run at (100,20) width 210: "\x{C3}\x{2030}\x{C3}\x{A9} \x{C3}\x{A9}\x{C3}\x{A9} \x{C3}\x{A9}. (\x{C3}\x{A9}.\x{C3}\x{A9}."
-            text run at (0,30) width 130: "\x{C3}\x{2030}\x{C3}\x{2030}) \x{C3}\x{A9}\x{C2} \x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 40x10
-            RenderText {TEXT} at (130,30) size 40x10
-              text run at (130,30) width 40: "\x{C3}\x{A9}\x{C3}\x{A9}"
-          RenderText {TEXT} at (170,30) size 70x10
-            text run at (170,30) width 70: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 60x10
-            RenderText {TEXT} at (240,30) size 60x10
-              text run at (240,30) width 60: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9}"
+            RenderText {TEXT} at (290,10) size 30x10
+              text run at (290,10) width 30: "ppp"
+          RenderText {TEXT} at (0,20) size 230x10
+            text run at (0,20) width 230: "\x{C9}\x{C9} \x{C9}\x{C9} \x{C9}. (\x{C9}.\x{C9}. \x{C9}\x{C9}) \x{C9} \x{C9} "
+          RenderInline {SPAN} at (0,0) size 20x10
+            RenderText {TEXT} at (230,20) size 20x10
+              text run at (230,20) width 20: "\x{C9}\x{E9}"
+          RenderText {TEXT} at (250,20) size 40x10
+            text run at (250,20) width 40: "\x{C9}\x{C9}\x{C9} "
+          RenderInline {SPAN} at (0,0) size 30x10
+            RenderText {TEXT} at (290,20) size 30x10
+              text run at (290,20) width 30: "\x{E9}\x{E9}\x{E9}"
           RenderText {TEXT} at (0,0) size 0x0
-        RenderBlock {P} at (3,163) size 320x40
-          RenderText {TEXT} at (0,0) size 240x10
-            text run at (0,0) width 240: "xx xx x. (x.x. xx) x\x{E2} x "
+        RenderBlock {P} at (3,123) size 320x30
+          RenderText {TEXT} at (0,0) size 230x10
+            text run at (0,0) width 230: "xx xx x. (x.x. xx) x x "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (240,0) size 20x10
-              text run at (240,0) width 20: "Xx"
-          RenderText {TEXT} at (260,0) size 30x10
-            text run at (260,0) width 30: "xxx"
+            RenderText {TEXT} at (230,0) size 20x10
+              text run at (230,0) width 20: "Xx"
+          RenderText {TEXT} at (250,0) size 40x10
+            text run at (250,0) width 40: "xxx "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (0,10) size 30x10
-              text run at (0,10) width 30: "xxx"
-          RenderText {TEXT} at (30,10) size 240x10
-            text run at (30,10) width 10: " "
-            text run at (40,10) width 230: "pp pp p. (p.p. pp) p\x{E2} p"
+            RenderText {TEXT} at (290,0) size 30x10
+              text run at (290,0) width 30: "xxx"
+          RenderText {TEXT} at (0,10) size 230x10
+            text run at (0,10) width 230: "pp pp p. (p.p. pp) p p "
           RenderInline {SPAN} at (0,0) size 20x10
-            RenderText {TEXT} at (0,20) size 20x10
-              text run at (0,20) width 20: "Pp"
-          RenderText {TEXT} at (20,20) size 40x10
-            text run at (20,20) width 40: "ppp "
+            RenderText {TEXT} at (230,10) size 20x10
+              text run at (230,10) width 20: "Pp"
+          RenderText {TEXT} at (250,10) size 40x10
+            text run at (250,10) width 40: "ppp "
           RenderInline {SPAN} at (0,0) size 30x10
-            RenderText {TEXT} at (60,20) size 30x10
-              text run at (60,20) width 30: "ppp"
-          RenderText {TEXT} at (90,20) size 310x20
-            text run at (90,20) width 10: " "
-            text run at (100,20) width 210: "\x{E3}\x{2030}\x{E3}\x{A9} \x{E3}\x{A9}\x{E3}\x{A9} \x{E3}\x{A9}. (\x{E3}\x{A9}.\x{E3}\x{A9}."
-            text run at (0,30) width 130: "\x{E3}\x{2030}\x{E3}\x{2030}) \x{E3}\x{A9}\x{E2} \x{E3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 40x10
-            RenderText {TEXT} at (130,30) size 40x10
-              text run at (130,30) width 40: "\x{C3}\x{A9}\x{C3}\x{A9}"
-          RenderText {TEXT} at (170,30) size 70x10
-            text run at (170,30) width 70: "\x{E3}\x{A9}\x{E3}\x{A9}\x{E3}\x{A9} "
-          RenderInline {SPAN} at (0,0) size 60x10
-            RenderText {TEXT} at (240,30) size 60x10
-              text run at (240,30) width 60: "\x{C3}\x{A9}\x{C3}\x{A9}\x{C3}\x{A9}"
+            RenderText {TEXT} at (290,10) size 30x10
+              text run at (290,10) width 30: "ppp"
+          RenderText {TEXT} at (0,20) size 230x10
+            text run at (0,20) width 230: "\x{E9}\x{E9} \x{E9}\x{E9} \x{E9}. (\x{E9}.\x{E9}. \x{E9}\x{E9}) \x{E9} \x{E9} "
+          RenderInline {SPAN} at (0,0) size 20x10
+            RenderText {TEXT} at (230,20) size 20x10
+              text run at (230,20) width 20: "\x{C9}\x{E9}"
+          RenderText {TEXT} at (250,20) size 40x10
+            text run at (250,20) width 40: "\x{E9}\x{E9}\x{E9} "
+          RenderInline {SPAN} at (0,0) size 30x10
+            RenderText {TEXT} at (290,20) size 30x10
+              text run at (290,20) width 30: "\x{E9}\x{E9}\x{E9}"
           RenderText {TEXT} at (0,0) size 0x0
diff --git a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html
index 6be371f..46b30a5 100644
--- a/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html
+++ b/LayoutTests/css2.1/t1605-c545-txttrans-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: text-transform</title>
diff --git a/LayoutTests/css2.1/t1606-c562-white-sp-00-b-ag.html b/LayoutTests/css2.1/t1606-c562-white-sp-00-b-ag.html
index 6aa2a0a..67ef1e0 100644
--- a/LayoutTests/css2.1/t1606-c562-white-sp-00-b-ag.html
+++ b/LayoutTests/css2.1/t1606-c562-white-sp-00-b-ag.html
@@ -1,4 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
  <head>
   <title>CSS 2.1 Test Suite: white-space</title>