From 9da79730078c820443940832ad84b13b8dcb3105 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Mon, 16 Jan 2017 14:14:47 +0700
Subject: Re-generate RNG schema, update files that use it.

---
 data/schemata/interface_definition.rng | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'data/schemata')

diff --git a/data/schemata/interface_definition.rng b/data/schemata/interface_definition.rng
index 596b4d9..8aa3ed5 100644
--- a/data/schemata/interface_definition.rng
+++ b/data/schemata/interface_definition.rng
@@ -74,11 +74,6 @@
         <optional>
           <ref name="properties"/>
         </optional>
-        <optional>
-          <element name="keepChildOrder">
-            <empty/>
-          </element>
-        </optional>
         <ref name="children"/>
       </interleave>
     </element>
@@ -131,6 +126,9 @@
         <optional>
           <ref name="constraint"/>
         </optional>
+        <zeroOrMore>
+          <ref name="valueHelp"/>
+        </zeroOrMore>
         <optional>
           <element name="constraintErrorMessage">
             <text/>
@@ -159,9 +157,14 @@
             <empty/>
           </element>
         </optional>
-        <zeroOrMore>
-          <ref name="valueHelp"/>
-        </zeroOrMore>
+        <optional>
+          <!-- These are meaningful only for tag nodes -->
+          <group>
+            <element name="keepChildOrder">
+              <empty/>
+            </element>
+          </group>
+        </optional>
       </interleave>
     </element>
   </define>
@@ -197,8 +200,10 @@
   <define name="validator">
     <element name="validator">
       <interleave>
-        <attribute name="argument"/>
         <attribute name="name"/>
+        <optional>
+          <attribute name="argument"/>
+        </optional>
       </interleave>
       <empty/>
     </element>
-- 
cgit v1.2.3