From a72198f2ec15acbc38f1a64fdff53ee66f5b92f6 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 5 Oct 2009 07:52:20 +0200
Subject: Fix link/description interleave in layman-global.txt format

---
 schema/layman-global.dtd |  2 +-
 schema/layman-global.rng | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'schema')

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>
-- 
cgit v1.2.3-65-gdbad