X-Git-Url: https://git.sesse.net/?p=xml-template;a=blobdiff_plain;f=c%2B%2B0x%2Fxml-template.cpp;h=f2d2d6b7926dc5c58b1b94fd1b8f6baff261cd9f;hp=3be1407b3b5592d93b6768859135a90dfc26481f;hb=05dd36f104334a09d8eaea594752d49bb68418a8;hpb=e80f2b44f155a6d93d1485657c4cd2008e06f5ad

diff --git a/c++0x/xml-template.cpp b/c++0x/xml-template.cpp
index 3be1407..f2d2d6b 100644
--- a/c++0x/xml-template.cpp
+++ b/c++0x/xml-template.cpp
@@ -26,6 +26,14 @@ void Substitute::process(xmlNode *node, bool clean) {
 				if (strcmp(reinterpret_cast<const char *>(attr->ns->href), "http://template.sesse.net/") == 0 &&
 				    strcmp(reinterpret_cast<const char *>(attr->name), "id") == 0) {
 					id = reinterpret_cast<const char *>(xmlNodeGetContent(attr->children));
+
+					if (clean) {
+						if (attr->prev == NULL) {
+							child->properties = attr->next;
+						} else {
+							attr->prev->next = attr->next;
+						}
+					}
 				}
 			}
 
@@ -53,7 +61,7 @@ void process_file(const string &input_filename,
 	LIBXML_TEST_VERSION
 
 	xmlDocPtr doc = xmlParseFile(input_filename.c_str());
-	root_directive->process(xmlDocGetRootElement(doc), false);
+	root_directive->process(xmlDocGetRootElement(doc), true);
 	xmlSaveFile(output_filename.c_str(), doc);
 
 	xmlCleanupParser();