encoding/xml: fix htmlAutoClose and its generating script

Thanks Mitică for reporting this.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/7308081

diff --git a/src/pkg/encoding/xml/xml.go b/src/pkg/encoding/xml/xml.go
index decb2bec65047091bcafe7e47002c540e914766f..3e004306a1f3499046bf67fec138a73366f4d30d 100644 (file)
--- a/src/pkg/encoding/xml/xml.go
+++ b/src/pkg/encoding/xml/xml.go
@@ -1692,7 +1692,7 @@ var HTMLAutoClose = htmlAutoClose
 var htmlAutoClose = []string{
        /*
                hget http://www.w3.org/TR/html4/loose.dtd |
-               9 sed -n 's/<!ELEMENT (.*) - O EMPTY.+/ "\1",/p' | tr A-Z a-z
+               9 sed -n 's/<!ELEMENT ([^ ]*) +- O EMPTY.+/     "\1",/p' | tr A-Z a-z
        */
        "basefont",
        "br",
@@ -1702,7 +1702,7 @@ var htmlAutoClose = []string{
        "param",
        "hr",
        "input",
-       "col     ",
+       "col",
        "frame",
        "isindex",
        "base",