Merge branch 'master' of somweyr.de:ousia

Conflicts:
	application/src/core/model/Document.cpp
	application/src/core/model/Domain.cpp

1 files changed, 19 insertions, 10 deletions

diff --git a/src/core/XML.cpp b/src/core/XML.cpp
index 038cb86..7f03b35 100644
--- a/src/core/XML.cpp
+++ b/src/core/XML.cpp
@@ -4,12 +4,16 @@
 namespace ousia {
 namespace xml {
 
-void Node::serialize(std::ostream& out){
+void Node::serialize(std::ostream &out, const std::string &doctype)
+{
 	out << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+	if (doctype != "") {
+		out << doctype << "\n";
+	}
 	doSerialize(out, 0);
 }
 
-void Element::doSerialize(std::ostream& out, unsigned int tabdepth)
+void Element::doSerialize(std::ostream &out, unsigned int tabdepth)
 {
 	for (unsigned int t = 0; t < tabdepth; t++) {
 		out << '\t';
@@ -18,17 +22,22 @@ void Element::doSerialize(std::ostream& out, unsigned int tabdepth)
 	for (auto &a : attributes) {
 		out << ' ' << a.first << "=\"" << a.second << '\"';
 	}
-	out << ">\n";
-	for (auto &n : children) {
-		n->doSerialize(out, tabdepth + 1);
-	}
-	for (unsigned int t = 0; t < tabdepth; t++) {
-		out << '\t';
+	// if we have no children, we close the tag immediately.
+	if (children.size() == 0) {
+		out << "/>\n";
+	} else {
+		out << ">\n";
+		for (auto &n : children) {
+			n->doSerialize(out, tabdepth + 1);
+		}
+		for (unsigned int t = 0; t < tabdepth; t++) {
+			out << '\t';
+		}
+		out << "</" << name << ">\n";
 	}
-	out << "</" << name << ">\n";
 }
 
-void Text::doSerialize(std::ostream& out, unsigned int tabdepth)
+void Text::doSerialize(std::ostream &out, unsigned int tabdepth)
 {
 	for (unsigned int t = 0; t < tabdepth; t++) {
 		out << '\t';