From a63bae07786972d199ba46f4873f7072397697a1 Mon Sep 17 00:00:00 2001
From: Pavel Horal <pavel.horal@orchitech.cz>
Date: Thu, 9 Mar 2017 13:20:45 +0100
Subject: [PATCH] Fix same element composition. See #17.

---
 pretty-data.js   | 10 +++++-----
 test/test_xml.js |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pretty-data.js b/pretty-data.js
index 6e53132..31ad1b9 100644
--- a/pretty-data.js
+++ b/pretty-data.js
@@ -91,8 +91,12 @@ pp.prototype.xml = function(text) {
 				str += ar[ix];
 				inComment = false; 
 			} else 
+			// <elm/> //
+			if(ar[ix].search(/\/>/) > -1) { 
+				str = !inComment ? str += this.shift[deep]+ar[ix] : str += ar[ix];
+			} else 
 			// <elm></elm> //
-			if( /^<\w/.exec(ar[ix-1]) && /^<\/\w/.exec(ar[ix]) &&
+			if( /^<\w/.exec(ar[ix-1]) && ar[ix-1].search(/\/>/) == -1 && /^<\/\w/.exec(ar[ix]) &&
 				/^<[\w:\-\.\,]+/.exec(ar[ix-1]) == /^<\/[\w:\-\.\,]+/.exec(ar[ix])[0].replace('/','')) { 
 				str += ar[ix];
 				if(!inComment) deep--;
@@ -109,10 +113,6 @@ pp.prototype.xml = function(text) {
 			if(ar[ix].search(/<\//) > -1) { 
 				str = !inComment ? str += this.shift[--deep]+ar[ix] : str += ar[ix];
 			} else 
-			// <elm/> //
-			if(ar[ix].search(/\/>/) > -1 ) { 
-				str = !inComment ? str += this.shift[deep]+ar[ix] : str += ar[ix];
-			} else 
 			// <? xml ... ?> //
 			if(ar[ix].search(/<\?/) > -1) { 
 				str += this.shift[deep]+ar[ix];
diff --git a/test/test_xml.js b/test/test_xml.js
index 7ac1322..532a915 100644
--- a/test/test_xml.js
+++ b/test/test_xml.js
@@ -1,5 +1,5 @@
 	
-var xml = '<?xml version="1.0" encoding="UTF-8" ?>      <!DOCTYPE foo SYSTEM "Foo.dtd"><a>          <b>bbb</b>   <!-- comment --><c/><d><soapenv:Envelope xmlns:soapenv="http://xxx" xmlns:xsd="http://yyy" xmlns:xsi="http://zzz"></soapenv>       </d><e>        <![CDATA[ <z></z> ]]></e><f><g></g></f></a>',
+var xml = '<?xml version="1.0" encoding="UTF-8" ?>      <!DOCTYPE foo SYSTEM "Foo.dtd"><a>          <b>bbb</b>   <!-- comment --><c/><d><soapenv:Envelope xmlns:soapenv="http://xxx" xmlns:xsd="http://yyy" xmlns:xsi="http://zzz"></soapenv>       </d><e>        <![CDATA[ <z></z> ]]></e><f><g><g/></g></f></a>',
     pp_xml  = require('../pretty-data').pd.xml(xml),
     pp_xmlmin_com  = require('../pretty-data').pd.xmlmin(xml,true),
     pp_xmlmin  = require('../pretty-data').pd.xmlmin(xml);