commit 012da2a5335219c3181304e310edeb482b342de0
author Matt Smith <ma314smith@users.noreply.github.com> Mon Dec 12 21:08:00 2016 -0500
committer Brett Vickers <beevik@users.noreply.github.com> Thu Dec 15 20:23:03 2016 -0800
tree 1af5326829fddc9d490aaae028420fe1a3c276bc
parent 4f15d3589b69008698d6f39383ac6f83cc7ef096

update canonical string replacers

etree.go

diff --git a/etree.go b/etree.go
index 218c633..fb09323 100644
--- a/etree.go
+++ b/etree.go
@@ -696,12 +696,16 @@
 	"&", "&",
 	"<", "&lt;",
 	">", "&gt;",
+	"\r", "&#xD;",
 )
 
 var xmlReplacerCanonicalAttrVal = strings.NewReplacer(
 	"&", "&amp;",
 	"<", "&lt;",
 	`"`, "&quot;",
+	"\t", "&#x9;",
+	"\n", "&#xA;",
+	"\r", "&#xD;",
 )
 
 // writeTo serializes the attribute to the writer.

etree_test.go

diff --git a/etree_test.go b/etree_test.go
index e206e3b..d8b4d3f 100644
--- a/etree_test.go
+++ b/etree_test.go
@@ -173,11 +173,11 @@
 
 	jon := people.CreateElement("Person")
 	jon.CreateAttr("name", "Jon O'Reilly")
-	jon.SetText("<'\">&")
+	jon.SetText("\r<'\">&")
 
 	sally := people.CreateElement("Person")
 	sally.CreateAttr("name", "Sally")
-	sally.CreateAttr("escape", "<'\">&")
+	sally.CreateAttr("escape", "\r\n\t<'\">&")
 
 	doc.Indent(2)
 	s, err := doc.WriteToString()
@@ -188,8 +188,8 @@
 	expected := BOM + `<?xml-stylesheet type="text/xsl" href="style.xsl"?>
 <People>
   <!--These are all known people-->
-  <Person name="Jon O'Reilly">&lt;'"&gt;&amp;</Person>
-  <Person name="Sally" escape="&lt;'&quot;>&amp;"></Person>
+  <Person name="Jon O'Reilly">&#xD;&lt;'"&gt;&amp;</Person>
+  <Person name="Sally" escape="&#xD;&#xA;&#x9;&lt;'&quot;>&amp;"></Person>
 </People>
 `
 	checkEq(t, s, expected)