diff options
| author | Daniil Baturin <daniil@baturin.org> | 2017-01-16 14:14:47 +0700 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2017-01-16 14:14:47 +0700 |
| commit | 9da79730078c820443940832ad84b13b8dcb3105 (patch) | |
| tree | 1e39e5071ce092c53babd48feac38bb080d46651 | |
| parent | c5b71d39b3945572f4c09b1f50ba6b232e399b9a (diff) | |
| download | vyconf-9da79730078c820443940832ad84b13b8dcb3105.tar.gz vyconf-9da79730078c820443940832ad84b13b8dcb3105.zip | |
Re-generate RNG schema, update files that use it.
| -rw-r--r-- | data/schemata/interface_definition.rng | 23 | ||||
| -rw-r--r-- | test/data/interface_definition_sample.xml | 2 |
2 files changed, 15 insertions, 10 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> diff --git a/test/data/interface_definition_sample.xml b/test/data/interface_definition_sample.xml index 292231e..c5458ff 100644 --- a/test/data/interface_definition_sample.xml +++ b/test/data/interface_definition_sample.xml @@ -5,8 +5,8 @@ <node name="login" owner="login"> <children> <tagNode name="user"> - <keepChildOrder/> <properties> + <keepChildOrder/> <help>User name</help> <constraint> <regex>[a-zA-Z][a-zA-Z0-9\-]+</regex> |