XML: keep all spaces inside CDATA, fixes #722

tdewolff · Jul 4, 2024 · d07e07f · d07e07f
1 parent 03662c3
commit d07e07f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/xml/xml.go b/xml/xml.go
@@ -45,7 +45,6 @@ func (o *Minifier) Minify(m *minify.M, w io.Writer, r io.Reader, _ map[string]st
 			if len(t.Text) == 0 {
 				continue
 			} else if text, useText := xml.EscapeCDATAVal(&attrByteBuffer, t.Text); useText {
-				t.TokenType = xml.TextToken
 				t.Data = text
 			}
 		}

diff --git a/xml/xml_test.go b/xml/xml_test.go
@@ -20,7 +20,7 @@ func TestXML(t *testing.T) {
 		{`<A>x</A>`, `<A>x</A>`},
 		{`<a><b>x</b></a>`, `<a><b>x</b></a>`},
 		{"<a><b>x\ny</b></a>", "<a><b>x\ny</b></a>"},
-		{`<a> <![CDATA[ a ]]> </a>`, `<a>a</a>`},
+		{`<a> <![CDATA[ a ]]> </a>`, `<a> a </a>`},
 		{`<a >a</a >`, `<a>a</a>`},
 		{`<?xml  version="1.0" ?>`, `<?xml version="1.0"?>`},
 		{`<x></x>`, `<x/>`},
@@ -75,7 +75,10 @@ func TestXMLKeepWhitespace(t *testing.T) {
 		{`<x> <![CDATA[ x ]]> </x>`, `<x> x </x>`},
 		{`<x> <![CDATA[ <<<<< ]]> </x>`, `<x><![CDATA[ <<<<< ]]></x>`},
 
+		{` <![CDATA[ %d ]]> `, ` %d `},             // #722
 		{`<a><![CDATA[ %d ]]></a>`, `<a> %d </a>`}, // #722
+		{`<a><![CDATA[ %d ]]><b>`, `<a> %d <b>`},   // #722
+		{`<a> %d <b>`, `<a> %d <b>`},               // #722
 	}
 
 	m := minify.New()