diff --git a/carriage_return_test.go b/carriage_return_test.go new file mode 100644 index 0000000..8e1265f --- /dev/null +++ b/carriage_return_test.go @@ -0,0 +1,33 @@ +package jsonquery + +import ( + "encoding/xml" + "io" + "strings" + "testing" +) + +func TestOutputXMLPreservesCarriageReturns(t *testing.T) { + doc, err := Parse(strings.NewReader(`{"v":"a\rb\r\nc\td\ne & < >"}`)) + if err != nil { + t.Fatal(err) + } + want := "a\rb\r\nc\td\ne & < >" + var got strings.Builder + d := xml.NewDecoder(strings.NewReader(doc.OutputXML())) + for { + tok, err := d.Token() + if err == io.EOF { + break + } + if err != nil { + t.Fatal(err) + } + if x, ok := tok.(xml.CharData); ok { + got.Write([]byte(x)) + } + } + if got.String() != want { + t.Errorf("decoded text=%q, want%q", got.String(), want) + } +} diff --git a/node.go b/node.go index c6ad66a..475d4d3 100644 --- a/node.go +++ b/node.go @@ -81,8 +81,9 @@ func (n *Node) InnerText() string { } // xmlTextEscaper escapes the characters that are not allowed to appear -// literally in XML character data. -var xmlTextEscaper = strings.NewReplacer("&", "&", "<", "<", ">", ">") +// literally in XML character data. Carriage returns must be references because +// XML parsers otherwise normalize them to line feeds. +var xmlTextEscaper = strings.NewReplacer("&", "&", "<", "<", ">", ">", "\r", " ") func outputXML(b *strings.Builder, n *Node, level int, skip bool) { level++