@@ -133,10 +133,16 @@ void Document::read(BinaryReader& reader)
 std::string Document::toString() const
 {
 	std::ostringstream oss;
+	oss << "{" << std::endl;
 	for(ElementSet::const_iterator it = _elements.begin(); it != _elements.end(); ++it)
 	{
-		oss << (*it)->name() << " ";
+		if ( it != _elements.begin() )
+		{
+			oss << ", ";
+		}
+		oss << '"' << (*it)->name() << '"' << " : " << (*it)->toString();
 	}
+	oss << "}" << std::endl;
 	return oss.str();
 }
Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,16 @@ void Document::read(BinaryReader& reader)`
`133`	`133`	`std::string Document::toString() const`
`134`	`134`	`{`
`135`	`135`	`std::ostringstream oss;`
	`136`	`+ oss << "{" << std::endl;`
`136`	`137`	`for(ElementSet::const_iterator it = _elements.begin(); it != _elements.end(); ++it)`
`137`	`138`	`{`
`138`		`- oss << (*it)->name() << " ";`
	`139`	`+ if ( it != _elements.begin() )`
	`140`	`+ {`
	`141`	`+ oss << ", ";`
	`142`	`+ }`
	`143`	`+ oss << '"' << (it)->name() << '"' << " : " << (it)->toString();`
`139`	`144`	`}`
	`145`	`+ oss << "}" << std::endl;`
`140`	`146`	`return oss.str();`
`141`	`147`	`}`
`142`	`148`