Theme layout parsing. Work in progress.

svn-id: r33613

1 files changed, 14 insertions, 13 deletions

diff --git a/common/xmlparser.cpp b/common/xmlparser.cpp
index 5ea10f2278..526e6e6fb1 100644
--- a/common/xmlparser.cpp
+++ b/common/xmlparser.cpp
@@ -98,22 +98,23 @@ bool XMLParser::parseActiveKey(bool closed) {
 	ParserNode *key = _activeKey.top();
 	XMLKeyLayout *layout = (_activeKey.size() == 1) ? _XMLkeys : getParentNode(key)->layout;
 	
-	if (layout->children.contains(key->name) == false)
-		return parserError("Unexpected key in the active scope: '%s'.", key->name.c_str());
-		
-	key->layout = layout->children[key->name];
+	if (layout->children.contains(key->name)) {
+		key->layout = layout->children[key->name];
 	
-	Common::StringMap localMap = key->values;
+		Common::StringMap localMap = key->values;
 	
-	for (Common::List<XMLKeyLayout::XMLKeyProperty>::const_iterator i = key->layout->properties.begin(); i != key->layout->properties.end(); ++i) {
-		if (localMap.contains(i->name))
-			localMap.erase(i->name);
-		else if (i->required)
-			return parserError("Missing required property '%s' inside key '%s'", i->name.c_str(), key->name.c_str());
-	}
+		for (Common::List<XMLKeyLayout::XMLKeyProperty>::const_iterator i = key->layout->properties.begin(); i != key->layout->properties.end(); ++i) {
+			if (localMap.contains(i->name))
+				localMap.erase(i->name);
+			else if (i->required)
+				return parserError("Missing required property '%s' inside key '%s'", i->name.c_str(), key->name.c_str());
+		}
 	
-	if (key->layout->anyProps == false && localMap.empty() == false)
-		return parserError("Unhandled property inside key '%s': '%s'", key->name.c_str(), localMap.begin()->_key.c_str());
+		if (key->layout->anyProps == false && localMap.empty() == false)
+			return parserError("Unhandled property inside key '%s': '%s'", key->name.c_str(), localMap.begin()->_key.c_str());
+	} else if (layout->anyKeys == false) {
+		return parserError("Unexpected key in the active scope: '%s'.", key->name.c_str());
+	}
 
 	// check if any of the parents must be ignored.
 	// if a parent is ignored, all children are too.