From e97abf1bf192eb002a12d31655365978c9659041 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Sun, 5 Apr 2009 16:33:29 +0000
Subject: [PATCH] added support for definition lists

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2983 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep.dtd | 14 +++++++++-----
 xep.xsd | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/xep.dtd b/xep.dtd
index b2a6ab41..2edc2907 100644
--- a/xep.dtd
+++ b/xep.dtd
@@ -65,23 +65,23 @@ THE SOFTWARE.
 <!ELEMENT date (#PCDATA)* >
 <!ELEMENT initials (#PCDATA)* >
 <!ELEMENT remark ( p | ul )* >
-<!ELEMENT section1 ( div | p | section2 | example | code | ul | ol | table )* >
+<!ELEMENT section1 ( div | p | section2 | example | code | ul | ol | dl | table )* >
 <!ATTLIST section1
           topic CDATA '' 
           anchor CDATA '' >
-<!ELEMENT section2 ( div | p | section3 | example | code | ul | ol | table )* >
+<!ELEMENT section2 ( div | p | section3 | example | code | ul | ol | dl | table )* >
 <!ATTLIST section2
           topic CDATA '' 
           anchor CDATA '' >
-<!ELEMENT section3 ( div | p | section4 | example | code | ul | ol | table )* >
+<!ELEMENT section3 ( div | p | section4 | example | code | ul | ol | dl | table )* >
 <!ATTLIST section3
           topic CDATA '' 
           anchor CDATA '' >
-<!ELEMENT section4 ( div | p | example | code | ul | ol | table )* >
+<!ELEMENT section4 ( div | p | example | code | ul | ol | dl | table )* >
 <!ATTLIST section4
           topic CDATA '' 
           anchor CDATA '' >
-<!ELEMENT div ( div | p | example | code | ul | ol | table )* >
+<!ELEMENT div ( div | p | example | code | ul | ol | dl | table )* >
 <!ATTLIST div 
           class CDATA ''
           style CDATA '' >
@@ -103,6 +103,10 @@ THE SOFTWARE.
 <!ATTLIST li 
           class CDATA '' 
           style CDATA '' >
+<!ELEMENT dl (di+) >
+<!ELEMENT di ( dt, dd ) >
+<!ELEMENT dt (#PCDATA)* >
+<!ELEMENT dd (#PCDATA | p | link | note | tt | em | strong | span)* >
 <!ELEMENT img EMPTY>
 <!ATTLIST img src CDATA '' >
 <!ELEMENT link (#PCDATA)* >
diff --git a/xep.xsd b/xep.xsd
index a3f11709..535915d8 100644
--- a/xep.xsd
+++ b/xep.xsd
@@ -192,6 +192,7 @@ THE SOFTWARE.
       <xs:choice maxOccurs='unbounded'>
         <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='dl' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
@@ -209,6 +210,7 @@ THE SOFTWARE.
       <xs:choice maxOccurs='unbounded'>
         <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='dl' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
@@ -226,6 +228,7 @@ THE SOFTWARE.
       <xs:choice maxOccurs='unbounded'>
         <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='dl' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
@@ -243,6 +246,7 @@ THE SOFTWARE.
       <xs:choice maxOccurs='unbounded'>
         <xs:element ref='code' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='div' minOccurs='0' maxOccurs='unbounded'/>
+        <xs:element ref='dl' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='example' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='ol' minOccurs='0' maxOccurs='unbounded'/>
         <xs:element ref='p' minOccurs='0' maxOccurs='unbounded'/>
@@ -294,6 +298,27 @@ THE SOFTWARE.
 
   <xs:element name='li' type='markup'/>
 
+  <xs:element name='dl'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='di' minOccurs='1' maxOccurs='unbounded'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='di'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='dt' minOccurs='1' maxOccurs='1'/>
+        <xs:element ref='dd' minOccurs='1' maxOccurs='1'/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='dt' type='xs:string'/>
+
+  <xs:element name='dd' type='markup'/>
+
   <xs:element name='img'>
     <xs:complexType>
       <xs:simpleContent>