diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2009-10-05 07:52:20 +0200 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2009-10-05 07:53:00 +0200 |
| commit | a72198f2ec15acbc38f1a64fdff53ee66f5b92f6 (patch) | |
| tree | 11cad2a1a65c5c0626493a4f508c0b314658d44a | |
| parent | Rename root node from "overlays" to "layman" in layman-global.txt format (diff) | |
| download | repositories-xml-format-a72198f2ec15acbc38f1a64fdff53ee66f5b92f6.tar.gz repositories-xml-format-a72198f2ec15acbc38f1a64fdff53ee66f5b92f6.tar.bz2 repositories-xml-format-a72198f2ec15acbc38f1a64fdff53ee66f5b92f6.zip | |
Fix link/description interleave in layman-global.txt format
| -rw-r--r-- | schema/layman-global.dtd | 2 | ||||
| -rw-r--r-- | schema/layman-global.rng | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/schema/layman-global.dtd b/schema/layman-global.dtd index 6530eb5..9c04053 100644 --- a/schema/layman-global.dtd +++ b/schema/layman-global.dtd @@ -8,7 +8,7 @@ <!ATTLIST layman xmlns CDATA #FIXED ''> -<!ELEMENT overlay (link?,description)> +<!ELEMENT overlay ((link,description)|(description,link?))> <!ATTLIST overlay xmlns CDATA #FIXED '' contact CDATA #REQUIRED diff --git a/schema/layman-global.rng b/schema/layman-global.rng index 6894c10..0bfab3d 100644 --- a/schema/layman-global.rng +++ b/schema/layman-global.rng @@ -44,14 +44,16 @@ <value>tar</value> </choice> </attribute> - <optional> - <element name="link"> - <data type="anyURI"/> + <interleave> + <optional> + <element name="link"> + <data type="anyURI"/> + </element> + </optional> + <element name="description"> + <text/> </element> - </optional> - <element name="description"> - <text/> - </element> + </interleave> </element> </zeroOrMore> </element> |