go.net/html/charset: encoding names

Lookup now returns the canonical name as well as the Encoding.

This will make it easier for users to discover what encoding they
actually have as a return value from functions in this package.
They will also be able to store the name for re-use.

R=nigeltao, mpvl
CC=golang-dev
https://golang.org/cl/30090043

html/charset/charset.go

@@ -0,0 +1,21 @@
+// Package charset provides common text encodings for HTML documents.
+//
+// The mapping from encoding labels to encodings is defined at
+// http://encoding.spec.whatwg.org.
+package charset
+
+import (
+	"strings"
+
+	"code.google.com/p/go.text/encoding"
+)
+
+// Lookup returns the encoding with the specified label, and its canonical
+// name. It returns nil and the empty string if label is not one of the
+// standard encodings for HTML. Matching is case-insensitive and ignores
+// leading and trailing whitespace.
+func Lookup(label string) (e encoding.Encoding, name string) {
+	label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
+	enc := encodings[label]
+	return enc.e, enc.name
+}

html/charset/encoding_test.go → html/charset/charset_test.go

@@ -62,19 +62,16 @@ var testCases = []struct {
 
 func TestDecode(t *testing.T) {
 	for _, tc := range testCases {
-		e := Encoding(tc.otherEncoding)
+		e, _ := Lookup(tc.otherEncoding)
 		if e == nil {
 			t.Errorf("%s: not found", tc.otherEncoding)
 			continue
 		}
-
 		s, err := transformString(e.NewDecoder(), tc.other)
-
 		if err != nil {
 			t.Errorf("%s: decode %q: %v", tc.otherEncoding, tc.other, err)
 			continue
 		}
-
 		if s != tc.utf8 {
 			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.utf8)
 		}
@@ -83,21 +80,33 @@ func TestDecode(t *testing.T) {
 
 func TestEncode(t *testing.T) {
 	for _, tc := range testCases {
-		e := Encoding(tc.otherEncoding)
+		e, _ := Lookup(tc.otherEncoding)
 		if e == nil {
 			t.Errorf("%s: not found", tc.otherEncoding)
 			continue
 		}
-
 		s, err := transformString(e.NewEncoder(), tc.utf8)
-
 		if err != nil {
 			t.Errorf("%s: encode %q: %s", tc.otherEncoding, tc.utf8, err)
 			continue
 		}
-
 		if s != tc.other {
 			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.other)
 		}
 	}
 }
+
+// TestNames verifies that you can pass an encoding's name to Lookup and get
+// the same encoding back (except for "replacement").
+func TestNames(t *testing.T) {
+	for _, e := range encodings {
+		if e.name == "replacement" {
+			continue
+		}
+		_, got := Lookup(e.name)
+		if got != e.name {
+			t.Errorf("got %q, want %q", got, e.name)
+			continue
+		}
+	}
+}

html/charset/encoding.go

@@ -1,51 +0,0 @@
-// Package charset provides common text encodings for HTML documents.
-//
-// The mapping from encoding labels to encodings is defined at
-// http://encoding.spec.whatwg.org.
-package charset
-
-import (
-	"errors"
-	"strings"
-
-	"code.google.com/p/go.text/encoding"
-	"code.google.com/p/go.text/transform"
-)
-
-// Encoding returns the encoding with the specified label, or nil if label is
-// not one of the standard encodings for HTML. Matching is case-insensitive
-// and ignores leading and trailing whitespace.
-func Encoding(label string) encoding.Encoding {
-	label = strings.ToLower(strings.Trim(label, "\t\n\r\f "))
-	return encodings[label]
-}
-
-type utf8Encoding struct{}
-
-func (utf8Encoding) NewDecoder() transform.Transformer {
-	return transform.Nop
-}
-
-func (utf8Encoding) NewEncoder() transform.Transformer {
-	return transform.Nop
-}
-
-var ErrReplacementEncoding = errors.New("charset: ISO-2022-CN and ISO-2022-KR are obsolete encodings for HTML")
-
-type errorTransformer struct {
-	err error
-}
-
-func (t errorTransformer) Transform(dst, src []byte, atEOF bool) (nDst, nSrc int, err error) {
-	return 0, 0, t.err
-}
-
-type replacementEncoding struct{}
-
-func (replacementEncoding) NewDecoder() transform.Transformer {
-	return errorTransformer{ErrReplacementEncoding}
-}
-
-func (replacementEncoding) NewEncoder() transform.Transformer {
-	return transform.Nop
-}

html/charset/gen.go

@@ -55,7 +55,7 @@ func main() {
 	fmt.Println(")")
 	fmt.Println()
 
-	fmt.Println("var encodings = map[string]encoding.Encoding{")
+	fmt.Println("var encodings = map[string]struct{e encoding.Encoding; name string} {")
 	for _, g := range groups {
 		for _, e := range g.Encodings {
 			goName, ok := miscNames[e.Name]
@@ -72,7 +72,7 @@ func main() {
 			}
 
 			for _, label := range e.Labels {
-				fmt.Printf("%q: %s,\n", label, goName)
+				fmt.Printf("%q: {%s, %q},\n", label, goName, e.Name)
 			}
 		}
 	}
@@ -85,7 +85,7 @@ var prefixes = map[string]string{
 }
 
 var miscNames = map[string]string{
-	"utf-8":          "utf8Encoding{}",
+	"utf-8":          "encoding.Nop",
 	"ibm866":         "charmap.CodePage866",
 	"iso-8859-8-i":   "charmap.ISO8859_8",
 	"koi8-r":         "charmap.KOI8R",
@@ -100,7 +100,7 @@ var miscNames = map[string]string{
 	"iso-2022-jp":    "japanese.ISO2022JP",
 	"shift_jis":      "japanese.ShiftJIS",
 	"euc-kr":         "korean.EUCKR",
-	"replacement":    "replacementEncoding{}",
+	"replacement":    "encoding.Replacement",
 	"utf-16be":       "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
 	"utf-16le":       "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
 	"x-user-defined": "charmap.XUserDefined",

html/charset/table.go

@@ -12,221 +12,224 @@ import (
 	"code.google.com/p/go.text/encoding/unicode"
 )
 
-var encodings = map[string]encoding.Encoding{
-	"unicode-1-1-utf-8":   utf8Encoding{},
-	"utf-8":               utf8Encoding{},
-	"utf8":                utf8Encoding{},
-	"866":                 charmap.CodePage866,
-	"cp866":               charmap.CodePage866,
-	"csibm866":            charmap.CodePage866,
-	"ibm866":              charmap.CodePage866,
-	"csisolatin2":         charmap.ISO8859_2,
-	"iso-8859-2":          charmap.ISO8859_2,
-	"iso-ir-101":          charmap.ISO8859_2,
-	"iso8859-2":           charmap.ISO8859_2,
-	"iso88592":            charmap.ISO8859_2,
-	"iso_8859-2":          charmap.ISO8859_2,
-	"iso_8859-2:1987":     charmap.ISO8859_2,
-	"l2":                  charmap.ISO8859_2,
-	"latin2":              charmap.ISO8859_2,
-	"csisolatin3":         charmap.ISO8859_3,
-	"iso-8859-3":          charmap.ISO8859_3,
-	"iso-ir-109":          charmap.ISO8859_3,
-	"iso8859-3":           charmap.ISO8859_3,
-	"iso88593":            charmap.ISO8859_3,
-	"iso_8859-3":          charmap.ISO8859_3,
-	"iso_8859-3:1988":     charmap.ISO8859_3,
-	"l3":                  charmap.ISO8859_3,
-	"latin3":              charmap.ISO8859_3,
-	"csisolatin4":         charmap.ISO8859_4,
-	"iso-8859-4":          charmap.ISO8859_4,
-	"iso-ir-110":          charmap.ISO8859_4,
-	"iso8859-4":           charmap.ISO8859_4,
-	"iso88594":            charmap.ISO8859_4,
-	"iso_8859-4":          charmap.ISO8859_4,
-	"iso_8859-4:1988":     charmap.ISO8859_4,
-	"l4":                  charmap.ISO8859_4,
-	"latin4":              charmap.ISO8859_4,
-	"csisolatincyrillic":  charmap.ISO8859_5,
-	"cyrillic":            charmap.ISO8859_5,
-	"iso-8859-5":          charmap.ISO8859_5,
-	"iso-ir-144":          charmap.ISO8859_5,
-	"iso8859-5":           charmap.ISO8859_5,
-	"iso88595":            charmap.ISO8859_5,
-	"iso_8859-5":          charmap.ISO8859_5,
-	"iso_8859-5:1988":     charmap.ISO8859_5,
-	"arabic":              charmap.ISO8859_6,
-	"asmo-708":            charmap.ISO8859_6,
-	"csiso88596e":         charmap.ISO8859_6,
-	"csiso88596i":         charmap.ISO8859_6,
-	"csisolatinarabic":    charmap.ISO8859_6,
-	"ecma-114":            charmap.ISO8859_6,
-	"iso-8859-6":          charmap.ISO8859_6,
-	"iso-8859-6-e":        charmap.ISO8859_6,
-	"iso-8859-6-i":        charmap.ISO8859_6,
-	"iso-ir-127":          charmap.ISO8859_6,
-	"iso8859-6":           charmap.ISO8859_6,
-	"iso88596":            charmap.ISO8859_6,
-	"iso_8859-6":          charmap.ISO8859_6,
-	"iso_8859-6:1987":     charmap.ISO8859_6,
-	"csisolatingreek":     charmap.ISO8859_7,
-	"ecma-118":            charmap.ISO8859_7,
-	"elot_928":            charmap.ISO8859_7,
-	"greek":               charmap.ISO8859_7,
-	"greek8":              charmap.ISO8859_7,
-	"iso-8859-7":          charmap.ISO8859_7,
-	"iso-ir-126":          charmap.ISO8859_7,
-	"iso8859-7":           charmap.ISO8859_7,
-	"iso88597":            charmap.ISO8859_7,
-	"iso_8859-7":          charmap.ISO8859_7,
-	"iso_8859-7:1987":     charmap.ISO8859_7,
-	"sun_eu_greek":        charmap.ISO8859_7,
-	"csiso88598e":         charmap.ISO8859_8,
-	"csisolatinhebrew":    charmap.ISO8859_8,
-	"hebrew":              charmap.ISO8859_8,
-	"iso-8859-8":          charmap.ISO8859_8,
-	"iso-8859-8-e":        charmap.ISO8859_8,
-	"iso-ir-138":          charmap.ISO8859_8,
-	"iso8859-8":           charmap.ISO8859_8,
-	"iso88598":            charmap.ISO8859_8,
-	"iso_8859-8":          charmap.ISO8859_8,
-	"iso_8859-8:1988":     charmap.ISO8859_8,
-	"visual":              charmap.ISO8859_8,
-	"csiso88598i":         charmap.ISO8859_8,
-	"iso-8859-8-i":        charmap.ISO8859_8,
-	"logical":             charmap.ISO8859_8,
-	"csisolatin6":         charmap.ISO8859_10,
-	"iso-8859-10":         charmap.ISO8859_10,
-	"iso-ir-157":          charmap.ISO8859_10,
-	"iso8859-10":          charmap.ISO8859_10,
-	"iso885910":           charmap.ISO8859_10,
-	"l6":                  charmap.ISO8859_10,
-	"latin6":              charmap.ISO8859_10,
-	"iso-8859-13":         charmap.ISO8859_13,
-	"iso8859-13":          charmap.ISO8859_13,
-	"iso885913":           charmap.ISO8859_13,
-	"iso-8859-14":         charmap.ISO8859_14,
-	"iso8859-14":          charmap.ISO8859_14,
-	"iso885914":           charmap.ISO8859_14,
-	"csisolatin9":         charmap.ISO8859_15,
-	"iso-8859-15":         charmap.ISO8859_15,
-	"iso8859-15":          charmap.ISO8859_15,
-	"iso885915":           charmap.ISO8859_15,
-	"iso_8859-15":         charmap.ISO8859_15,
-	"l9":                  charmap.ISO8859_15,
-	"iso-8859-16":         charmap.ISO8859_16,
-	"cskoi8r":             charmap.KOI8R,
-	"koi":                 charmap.KOI8R,
-	"koi8":                charmap.KOI8R,
-	"koi8-r":              charmap.KOI8R,
-	"koi8_r":              charmap.KOI8R,
-	"koi8-u":              charmap.KOI8U,
-	"csmacintosh":         charmap.Macintosh,
-	"mac":                 charmap.Macintosh,
-	"macintosh":           charmap.Macintosh,
-	"x-mac-roman":         charmap.Macintosh,
-	"dos-874":             charmap.Windows874,
-	"iso-8859-11":         charmap.Windows874,
-	"iso8859-11":          charmap.Windows874,
-	"iso885911":           charmap.Windows874,
-	"tis-620":             charmap.Windows874,
-	"windows-874":         charmap.Windows874,
-	"cp1250":              charmap.Windows1250,
-	"windows-1250":        charmap.Windows1250,
-	"x-cp1250":            charmap.Windows1250,
-	"cp1251":              charmap.Windows1251,
-	"windows-1251":        charmap.Windows1251,
-	"x-cp1251":            charmap.Windows1251,
-	"ansi_x3.4-1968":      charmap.Windows1252,
-	"ascii":               charmap.Windows1252,
-	"cp1252":              charmap.Windows1252,
-	"cp819":               charmap.Windows1252,
-	"csisolatin1":         charmap.Windows1252,
-	"ibm819":              charmap.Windows1252,
-	"iso-8859-1":          charmap.Windows1252,
-	"iso-ir-100":          charmap.Windows1252,
-	"iso8859-1":           charmap.Windows1252,
-	"iso88591":            charmap.Windows1252,
-	"iso_8859-1":          charmap.Windows1252,
-	"iso_8859-1:1987":     charmap.Windows1252,
-	"l1":                  charmap.Windows1252,
-	"latin1":              charmap.Windows1252,
-	"us-ascii":            charmap.Windows1252,
-	"windows-1252":        charmap.Windows1252,
-	"x-cp1252":            charmap.Windows1252,
-	"cp1253":              charmap.Windows1253,
-	"windows-1253":        charmap.Windows1253,
-	"x-cp1253":            charmap.Windows1253,
-	"cp1254":              charmap.Windows1254,
-	"csisolatin5":         charmap.Windows1254,
-	"iso-8859-9":          charmap.Windows1254,
-	"iso-ir-148":          charmap.Windows1254,
-	"iso8859-9":           charmap.Windows1254,
-	"iso88599":            charmap.Windows1254,
-	"iso_8859-9":          charmap.Windows1254,
-	"iso_8859-9:1989":     charmap.Windows1254,
-	"l5":                  charmap.Windows1254,
-	"latin5":              charmap.Windows1254,
-	"windows-1254":        charmap.Windows1254,
-	"x-cp1254":            charmap.Windows1254,
-	"cp1255":              charmap.Windows1255,
-	"windows-1255":        charmap.Windows1255,
-	"x-cp1255":            charmap.Windows1255,
-	"cp1256":              charmap.Windows1256,
-	"windows-1256":        charmap.Windows1256,
-	"x-cp1256":            charmap.Windows1256,
-	"cp1257":              charmap.Windows1257,
-	"windows-1257":        charmap.Windows1257,
-	"x-cp1257":            charmap.Windows1257,
-	"cp1258":              charmap.Windows1258,
-	"windows-1258":        charmap.Windows1258,
-	"x-cp1258":            charmap.Windows1258,
-	"x-mac-cyrillic":      charmap.MacintoshCyrillic,
-	"x-mac-ukrainian":     charmap.MacintoshCyrillic,
-	"chinese":             simplifiedchinese.GBK,
-	"csgb2312":            simplifiedchinese.GBK,
-	"csiso58gb231280":     simplifiedchinese.GBK,
-	"gb2312":              simplifiedchinese.GBK,
-	"gb_2312":             simplifiedchinese.GBK,
-	"gb_2312-80":          simplifiedchinese.GBK,
-	"gbk":                 simplifiedchinese.GBK,
-	"iso-ir-58":           simplifiedchinese.GBK,
-	"x-gbk":               simplifiedchinese.GBK,
-	"gb18030":             simplifiedchinese.GB18030,
-	"hz-gb-2312":          simplifiedchinese.HZGB2312,
-	"big5":                traditionalchinese.Big5,
-	"big5-hkscs":          traditionalchinese.Big5,
-	"cn-big5":             traditionalchinese.Big5,
-	"csbig5":              traditionalchinese.Big5,
-	"x-x-big5":            traditionalchinese.Big5,
-	"cseucpkdfmtjapanese": japanese.EUCJP,
-	"euc-jp":              japanese.EUCJP,
-	"x-euc-jp":            japanese.EUCJP,
-	"csiso2022jp":         japanese.ISO2022JP,
-	"iso-2022-jp":         japanese.ISO2022JP,
-	"csshiftjis":          japanese.ShiftJIS,
-	"ms_kanji":            japanese.ShiftJIS,
-	"shift-jis":           japanese.ShiftJIS,
-	"shift_jis":           japanese.ShiftJIS,
-	"sjis":                japanese.ShiftJIS,
-	"windows-31j":         japanese.ShiftJIS,
-	"x-sjis":              japanese.ShiftJIS,
-	"cseuckr":             korean.EUCKR,
-	"csksc56011987":       korean.EUCKR,
-	"euc-kr":              korean.EUCKR,
-	"iso-ir-149":          korean.EUCKR,
-	"korean":              korean.EUCKR,
-	"ks_c_5601-1987":      korean.EUCKR,
-	"ks_c_5601-1989":      korean.EUCKR,
-	"ksc5601":             korean.EUCKR,
-	"ksc_5601":            korean.EUCKR,
-	"windows-949":         korean.EUCKR,
-	"csiso2022kr":         replacementEncoding{},
-	"iso-2022-kr":         replacementEncoding{},
-	"iso-2022-cn":         replacementEncoding{},
-	"iso-2022-cn-ext":     replacementEncoding{},
-	"utf-16be":            unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM),
-	"utf-16":              unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM),
-	"utf-16le":            unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM),
-	"x-user-defined":      charmap.XUserDefined,
+var encodings = map[string]struct {
+	e    encoding.Encoding
+	name string
+}{
+	"unicode-1-1-utf-8":   {encoding.Nop, "utf-8"},
+	"utf-8":               {encoding.Nop, "utf-8"},
+	"utf8":                {encoding.Nop, "utf-8"},
+	"866":                 {charmap.CodePage866, "ibm866"},
+	"cp866":               {charmap.CodePage866, "ibm866"},
+	"csibm866":            {charmap.CodePage866, "ibm866"},
+	"ibm866":              {charmap.CodePage866, "ibm866"},
+	"csisolatin2":         {charmap.ISO8859_2, "iso-8859-2"},
+	"iso-8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso-ir-101":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso8859-2":           {charmap.ISO8859_2, "iso-8859-2"},
+	"iso88592":            {charmap.ISO8859_2, "iso-8859-2"},
+	"iso_8859-2":          {charmap.ISO8859_2, "iso-8859-2"},
+	"iso_8859-2:1987":     {charmap.ISO8859_2, "iso-8859-2"},
+	"l2":                  {charmap.ISO8859_2, "iso-8859-2"},
+	"latin2":              {charmap.ISO8859_2, "iso-8859-2"},
+	"csisolatin3":         {charmap.ISO8859_3, "iso-8859-3"},
+	"iso-8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso-ir-109":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso8859-3":           {charmap.ISO8859_3, "iso-8859-3"},
+	"iso88593":            {charmap.ISO8859_3, "iso-8859-3"},
+	"iso_8859-3":          {charmap.ISO8859_3, "iso-8859-3"},
+	"iso_8859-3:1988":     {charmap.ISO8859_3, "iso-8859-3"},
+	"l3":                  {charmap.ISO8859_3, "iso-8859-3"},
+	"latin3":              {charmap.ISO8859_3, "iso-8859-3"},
+	"csisolatin4":         {charmap.ISO8859_4, "iso-8859-4"},
+	"iso-8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso-ir-110":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso8859-4":           {charmap.ISO8859_4, "iso-8859-4"},
+	"iso88594":            {charmap.ISO8859_4, "iso-8859-4"},
+	"iso_8859-4":          {charmap.ISO8859_4, "iso-8859-4"},
+	"iso_8859-4:1988":     {charmap.ISO8859_4, "iso-8859-4"},
+	"l4":                  {charmap.ISO8859_4, "iso-8859-4"},
+	"latin4":              {charmap.ISO8859_4, "iso-8859-4"},
+	"csisolatincyrillic":  {charmap.ISO8859_5, "iso-8859-5"},
+	"cyrillic":            {charmap.ISO8859_5, "iso-8859-5"},
+	"iso-8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso-ir-144":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso8859-5":           {charmap.ISO8859_5, "iso-8859-5"},
+	"iso88595":            {charmap.ISO8859_5, "iso-8859-5"},
+	"iso_8859-5":          {charmap.ISO8859_5, "iso-8859-5"},
+	"iso_8859-5:1988":     {charmap.ISO8859_5, "iso-8859-5"},
+	"arabic":              {charmap.ISO8859_6, "iso-8859-6"},
+	"asmo-708":            {charmap.ISO8859_6, "iso-8859-6"},
+	"csiso88596e":         {charmap.ISO8859_6, "iso-8859-6"},
+	"csiso88596i":         {charmap.ISO8859_6, "iso-8859-6"},
+	"csisolatinarabic":    {charmap.ISO8859_6, "iso-8859-6"},
+	"ecma-114":            {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6-e":        {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-8859-6-i":        {charmap.ISO8859_6, "iso-8859-6"},
+	"iso-ir-127":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso8859-6":           {charmap.ISO8859_6, "iso-8859-6"},
+	"iso88596":            {charmap.ISO8859_6, "iso-8859-6"},
+	"iso_8859-6":          {charmap.ISO8859_6, "iso-8859-6"},
+	"iso_8859-6:1987":     {charmap.ISO8859_6, "iso-8859-6"},
+	"csisolatingreek":     {charmap.ISO8859_7, "iso-8859-7"},
+	"ecma-118":            {charmap.ISO8859_7, "iso-8859-7"},
+	"elot_928":            {charmap.ISO8859_7, "iso-8859-7"},
+	"greek":               {charmap.ISO8859_7, "iso-8859-7"},
+	"greek8":              {charmap.ISO8859_7, "iso-8859-7"},
+	"iso-8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso-ir-126":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso8859-7":           {charmap.ISO8859_7, "iso-8859-7"},
+	"iso88597":            {charmap.ISO8859_7, "iso-8859-7"},
+	"iso_8859-7":          {charmap.ISO8859_7, "iso-8859-7"},
+	"iso_8859-7:1987":     {charmap.ISO8859_7, "iso-8859-7"},
+	"sun_eu_greek":        {charmap.ISO8859_7, "iso-8859-7"},
+	"csiso88598e":         {charmap.ISO8859_8, "iso-8859-8"},
+	"csisolatinhebrew":    {charmap.ISO8859_8, "iso-8859-8"},
+	"hebrew":              {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-8859-8-e":        {charmap.ISO8859_8, "iso-8859-8"},
+	"iso-ir-138":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso8859-8":           {charmap.ISO8859_8, "iso-8859-8"},
+	"iso88598":            {charmap.ISO8859_8, "iso-8859-8"},
+	"iso_8859-8":          {charmap.ISO8859_8, "iso-8859-8"},
+	"iso_8859-8:1988":     {charmap.ISO8859_8, "iso-8859-8"},
+	"visual":              {charmap.ISO8859_8, "iso-8859-8"},
+	"csiso88598i":         {charmap.ISO8859_8, "iso-8859-8-i"},
+	"iso-8859-8-i":        {charmap.ISO8859_8, "iso-8859-8-i"},
+	"logical":             {charmap.ISO8859_8, "iso-8859-8-i"},
+	"csisolatin6":         {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-8859-10":         {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-ir-157":          {charmap.ISO8859_10, "iso-8859-10"},
+	"iso8859-10":          {charmap.ISO8859_10, "iso-8859-10"},
+	"iso885910":           {charmap.ISO8859_10, "iso-8859-10"},
+	"l6":                  {charmap.ISO8859_10, "iso-8859-10"},
+	"latin6":              {charmap.ISO8859_10, "iso-8859-10"},
+	"iso-8859-13":         {charmap.ISO8859_13, "iso-8859-13"},
+	"iso8859-13":          {charmap.ISO8859_13, "iso-8859-13"},
+	"iso885913":           {charmap.ISO8859_13, "iso-8859-13"},
+	"iso-8859-14":         {charmap.ISO8859_14, "iso-8859-14"},
+	"iso8859-14":          {charmap.ISO8859_14, "iso-8859-14"},
+	"iso885914":           {charmap.ISO8859_14, "iso-8859-14"},
+	"csisolatin9":         {charmap.ISO8859_15, "iso-8859-15"},
+	"iso-8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
+	"iso8859-15":          {charmap.ISO8859_15, "iso-8859-15"},
+	"iso885915":           {charmap.ISO8859_15, "iso-8859-15"},
+	"iso_8859-15":         {charmap.ISO8859_15, "iso-8859-15"},
+	"l9":                  {charmap.ISO8859_15, "iso-8859-15"},
+	"iso-8859-16":         {charmap.ISO8859_16, "iso-8859-16"},
+	"cskoi8r":             {charmap.KOI8R, "koi8-r"},
+	"koi":                 {charmap.KOI8R, "koi8-r"},
+	"koi8":                {charmap.KOI8R, "koi8-r"},
+	"koi8-r":              {charmap.KOI8R, "koi8-r"},
+	"koi8_r":              {charmap.KOI8R, "koi8-r"},
+	"koi8-u":              {charmap.KOI8U, "koi8-u"},
+	"csmacintosh":         {charmap.Macintosh, "macintosh"},
+	"mac":                 {charmap.Macintosh, "macintosh"},
+	"macintosh":           {charmap.Macintosh, "macintosh"},
+	"x-mac-roman":         {charmap.Macintosh, "macintosh"},
+	"dos-874":             {charmap.Windows874, "windows-874"},
+	"iso-8859-11":         {charmap.Windows874, "windows-874"},
+	"iso8859-11":          {charmap.Windows874, "windows-874"},
+	"iso885911":           {charmap.Windows874, "windows-874"},
+	"tis-620":             {charmap.Windows874, "windows-874"},
+	"windows-874":         {charmap.Windows874, "windows-874"},
+	"cp1250":              {charmap.Windows1250, "windows-1250"},
+	"windows-1250":        {charmap.Windows1250, "windows-1250"},
+	"x-cp1250":            {charmap.Windows1250, "windows-1250"},
+	"cp1251":              {charmap.Windows1251, "windows-1251"},
+	"windows-1251":        {charmap.Windows1251, "windows-1251"},
+	"x-cp1251":            {charmap.Windows1251, "windows-1251"},
+	"ansi_x3.4-1968":      {charmap.Windows1252, "windows-1252"},
+	"ascii":               {charmap.Windows1252, "windows-1252"},
+	"cp1252":              {charmap.Windows1252, "windows-1252"},
+	"cp819":               {charmap.Windows1252, "windows-1252"},
+	"csisolatin1":         {charmap.Windows1252, "windows-1252"},
+	"ibm819":              {charmap.Windows1252, "windows-1252"},
+	"iso-8859-1":          {charmap.Windows1252, "windows-1252"},
+	"iso-ir-100":          {charmap.Windows1252, "windows-1252"},
+	"iso8859-1":           {charmap.Windows1252, "windows-1252"},
+	"iso88591":            {charmap.Windows1252, "windows-1252"},
+	"iso_8859-1":          {charmap.Windows1252, "windows-1252"},
+	"iso_8859-1:1987":     {charmap.Windows1252, "windows-1252"},
+	"l1":                  {charmap.Windows1252, "windows-1252"},
+	"latin1":              {charmap.Windows1252, "windows-1252"},
+	"us-ascii":            {charmap.Windows1252, "windows-1252"},
+	"windows-1252":        {charmap.Windows1252, "windows-1252"},
+	"x-cp1252":            {charmap.Windows1252, "windows-1252"},
+	"cp1253":              {charmap.Windows1253, "windows-1253"},
+	"windows-1253":        {charmap.Windows1253, "windows-1253"},
+	"x-cp1253":            {charmap.Windows1253, "windows-1253"},
+	"cp1254":              {charmap.Windows1254, "windows-1254"},
+	"csisolatin5":         {charmap.Windows1254, "windows-1254"},
+	"iso-8859-9":          {charmap.Windows1254, "windows-1254"},
+	"iso-ir-148":          {charmap.Windows1254, "windows-1254"},
+	"iso8859-9":           {charmap.Windows1254, "windows-1254"},
+	"iso88599":            {charmap.Windows1254, "windows-1254"},
+	"iso_8859-9":          {charmap.Windows1254, "windows-1254"},
+	"iso_8859-9:1989":     {charmap.Windows1254, "windows-1254"},
+	"l5":                  {charmap.Windows1254, "windows-1254"},
+	"latin5":              {charmap.Windows1254, "windows-1254"},
+	"windows-1254":        {charmap.Windows1254, "windows-1254"},
+	"x-cp1254":            {charmap.Windows1254, "windows-1254"},
+	"cp1255":              {charmap.Windows1255, "windows-1255"},
+	"windows-1255":        {charmap.Windows1255, "windows-1255"},
+	"x-cp1255":            {charmap.Windows1255, "windows-1255"},
+	"cp1256":              {charmap.Windows1256, "windows-1256"},
+	"windows-1256":        {charmap.Windows1256, "windows-1256"},
+	"x-cp1256":            {charmap.Windows1256, "windows-1256"},
+	"cp1257":              {charmap.Windows1257, "windows-1257"},
+	"windows-1257":        {charmap.Windows1257, "windows-1257"},
+	"x-cp1257":            {charmap.Windows1257, "windows-1257"},
+	"cp1258":              {charmap.Windows1258, "windows-1258"},
+	"windows-1258":        {charmap.Windows1258, "windows-1258"},
+	"x-cp1258":            {charmap.Windows1258, "windows-1258"},
+	"x-mac-cyrillic":      {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+	"x-mac-ukrainian":     {charmap.MacintoshCyrillic, "x-mac-cyrillic"},
+	"chinese":             {simplifiedchinese.GBK, "gbk"},
+	"csgb2312":            {simplifiedchinese.GBK, "gbk"},
+	"csiso58gb231280":     {simplifiedchinese.GBK, "gbk"},
+	"gb2312":              {simplifiedchinese.GBK, "gbk"},
+	"gb_2312":             {simplifiedchinese.GBK, "gbk"},
+	"gb_2312-80":          {simplifiedchinese.GBK, "gbk"},
+	"gbk":                 {simplifiedchinese.GBK, "gbk"},
+	"iso-ir-58":           {simplifiedchinese.GBK, "gbk"},
+	"x-gbk":               {simplifiedchinese.GBK, "gbk"},
+	"gb18030":             {simplifiedchinese.GB18030, "gb18030"},
+	"hz-gb-2312":          {simplifiedchinese.HZGB2312, "hz-gb-2312"},
+	"big5":                {traditionalchinese.Big5, "big5"},
+	"big5-hkscs":          {traditionalchinese.Big5, "big5"},
+	"cn-big5":             {traditionalchinese.Big5, "big5"},
+	"csbig5":              {traditionalchinese.Big5, "big5"},
+	"x-x-big5":            {traditionalchinese.Big5, "big5"},
+	"cseucpkdfmtjapanese": {japanese.EUCJP, "euc-jp"},
+	"euc-jp":              {japanese.EUCJP, "euc-jp"},
+	"x-euc-jp":            {japanese.EUCJP, "euc-jp"},
+	"csiso2022jp":         {japanese.ISO2022JP, "iso-2022-jp"},
+	"iso-2022-jp":         {japanese.ISO2022JP, "iso-2022-jp"},
+	"csshiftjis":          {japanese.ShiftJIS, "shift_jis"},
+	"ms_kanji":            {japanese.ShiftJIS, "shift_jis"},
+	"shift-jis":           {japanese.ShiftJIS, "shift_jis"},
+	"shift_jis":           {japanese.ShiftJIS, "shift_jis"},
+	"sjis":                {japanese.ShiftJIS, "shift_jis"},
+	"windows-31j":         {japanese.ShiftJIS, "shift_jis"},
+	"x-sjis":              {japanese.ShiftJIS, "shift_jis"},
+	"cseuckr":             {korean.EUCKR, "euc-kr"},
+	"csksc56011987":       {korean.EUCKR, "euc-kr"},
+	"euc-kr":              {korean.EUCKR, "euc-kr"},
+	"iso-ir-149":          {korean.EUCKR, "euc-kr"},
+	"korean":              {korean.EUCKR, "euc-kr"},
+	"ks_c_5601-1987":      {korean.EUCKR, "euc-kr"},
+	"ks_c_5601-1989":      {korean.EUCKR, "euc-kr"},
+	"ksc5601":             {korean.EUCKR, "euc-kr"},
+	"ksc_5601":            {korean.EUCKR, "euc-kr"},
+	"windows-949":         {korean.EUCKR, "euc-kr"},
+	"csiso2022kr":         {encoding.Replacement, "replacement"},
+	"iso-2022-kr":         {encoding.Replacement, "replacement"},
+	"iso-2022-cn":         {encoding.Replacement, "replacement"},
+	"iso-2022-cn-ext":     {encoding.Replacement, "replacement"},
+	"utf-16be":            {unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM), "utf-16be"},
+	"utf-16":              {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+	"utf-16le":            {unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM), "utf-16le"},
+	"x-user-defined":      {charmap.XUserDefined, "x-user-defined"},
 }