Index: /trunk/data/tagging-preset.xsd
===================================================================
--- /trunk/data/tagging-preset.xsd	(revision 5156)
+++ /trunk/data/tagging-preset.xsd	(revision 5157)
@@ -88,4 +88,5 @@
 		<attribute name="key" type="string" use="required" />
 		<attribute name="value" type="string" />
+		<attribute name="match" type="string" />
 	</complexType>
 
@@ -115,7 +116,6 @@
 		<attribute name="text_context" type="string" />
 		<attribute name="default" type="string" />
-		<attribute name="delete_if_empty" type="boolean" />
 		<attribute name="use_last_as_default" type="tns:last_default" />
-		<attribute name="required" type="boolean" />
+		<attribute name="match" type="tns:match" />
 
 		<attribute name="type" use="prohibited" />
@@ -140,6 +140,5 @@
 		<attribute name="use_last_as_default" type="tns:last_default" />
 		<attribute name="editable" type="boolean" />
-		<attribute name="delete_if_empty" type="boolean" />
-		<attribute name="required" type="boolean" />
+		<attribute name="match" type="tns:match" />
 
 		<attribute name="type" use="prohibited" />
@@ -161,6 +160,5 @@
 		<attribute name="use_last_as_default" type="tns:last_default" />
 		<attribute name="delimiter" type="string" />
-		<attribute name="delete_if_empty" type="boolean" />
-		<attribute name="required" type="boolean" />
+		<attribute name="match" type="tns:match" />
 
 		<attribute name="type" use="prohibited" />
@@ -177,7 +175,7 @@
 		<attribute name="text_context" type="string" />
 		<attribute name="default" type="tns:check_default" />
-		<attribute name="required" type="boolean" />
 		<attribute name="value_on" type="string" />
 		<attribute name="value_off" type="string" />
+		<attribute name="match" type="tns:match" />
 
 		<attribute name="name" use="prohibited" />
@@ -199,4 +197,13 @@
 			<enumeration value="false" />
 			<enumeration value="force" />
+		</restriction>
+	</simpleType>
+
+	<simpleType name="match">
+		<restriction base="string">
+			<enumeration value="none" />
+			<enumeration value="key" />
+			<enumeration value="key!" />
+			<enumeration value="keyvalue" />
 		</restriction>
 	</simpleType>