fix some formatting and a test

anyxml_test.go

@@ -158,7 +158,7 @@ func TestNilMap(t *testing.T) {
 
 func TestNilValue(t *testing.T) {
 	val := map[string]interface{}{"toplevel": nil}
-	checkval := "<root><toplevel/></root>"
+	checkval := "<root><toplevel><nil></toplevel></root>"
 
 	XmlDefaultEmptyElemSyntax()
 	xmlout, err := AnyXml(val, "root")
@@ -171,7 +171,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	checkval = `   <root>
-     <toplevel/>
+     <toplevel><nil></toplevel>
    </root>`
 	xmlout, err = AnyXmlIndent(val, "   ", "  ", "root")
 	if err != nil {
@@ -183,7 +183,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	XmlGoEmptyElemSyntax()
-	checkval = "<root><toplevel></toplevel></root>"
+	checkval = "<root><toplevel><nil></toplevel></root>"
 	xmlout, err = AnyXml(val, "root")
 	if err != nil {
 		t.Fatal(err)
@@ -194,7 +194,7 @@ func TestNilValue(t *testing.T) {
 	}
 
 	checkval = `   <root>
-     <toplevel></toplevel>
+     <toplevel><nil></toplevel>
    </root>`
 	xmlout, err = AnyXmlIndent(val, "   ", "  ", "root")
 	if err != nil {

xml.go

@@ -57,8 +57,8 @@ var XmlCharsetReader func(charset string, input io.Reader) (io.Reader, error)
 //	      extraneous xml.CharData will be ignored unless io.EOF is reached first.
 //	   3. If CoerceKeysToLower() has been called, then all key values will be lower case.
 //	   4. If CoerceKeysToSnakeCase() has been called, then all key values will be converted to snake case.
-//     5. If DisableTrimWhiteSpace(b bool) has been called, then all values will be trimmed or not. By default
-//        this is true.
+//    5. If DisableTrimWhiteSpace(b bool) has been called, then all values will be trimmed or not. By default
+//       this is true.
 func NewMapXml(xmlVal []byte, cast ...bool) (Map, error) {
 	var r bool
 	if len(cast) == 1 {
@@ -239,7 +239,6 @@ func CoerceKeysToLower(b ...bool) {
 
 // disableTrimWhiteSpace sets if the white space should be removed or not
 var disableTrimWhiteSpace bool
-
 var trimRunes = "\t\r\b\n "
 
 // DisableTrimWhiteSpace set if the white space should be trimmed or not. By default white space is always trimmed. If

xmlseq.go

@@ -338,7 +338,7 @@ func xmlSeqToMapParser(skey string, a []xml.Attr, p *xml.Decoder, r bool) (map[s
 			return n, nil
 		case xml.CharData:
 			// clean up possible noise
-			tt := strings.Trim(string(t.(xml.CharData)), "\t\r\b\n ")
+			tt := strings.Trim(string(t.(xml.CharData)), trimRunes)
 			if skey == "" {
 				// per Adrian (http://www.adrianlungu.com/) catch stray text
 				// in decoder stream -