summaryrefslogtreecommitdiff
path: root/data/schemata
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2017-01-16 14:14:47 +0700
committerDaniil Baturin <daniil@baturin.org>2017-01-16 14:14:47 +0700
commit9da79730078c820443940832ad84b13b8dcb3105 (patch)
tree1e39e5071ce092c53babd48feac38bb080d46651 /data/schemata
parentc5b71d39b3945572f4c09b1f50ba6b232e399b9a (diff)
downloadvyconf-9da79730078c820443940832ad84b13b8dcb3105.tar.gz
vyconf-9da79730078c820443940832ad84b13b8dcb3105.zip
Re-generate RNG schema, update files that use it.
Diffstat (limited to 'data/schemata')
-rw-r--r--data/schemata/interface_definition.rng23
1 files changed, 14 insertions, 9 deletions
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>