--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/05/21 08:55:21	1.7
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/05/28 06:34:59	1.8
@@ -43,7 +43,7 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/05/21 08:55:21 $
+    $Date: 2006/05/28 06:34:59 $
 
   @Require:
     @@Module:
@@ -584,12 +584,14 @@
   @QName: AtomFeed
   @mv:id: feed
   @enLN: Feed
+  @mv:contains: feed-prop
   @mv:contains: atom|feed
 
 ModuleDef:
   @QName: AtomEntry
   @mv:id: entry
   @enLN: Entry
+  @mv:contains: entry-prop
   @mv:contains: atom|entry
 
 ModuleDef:
@@ -597,17 +599,22 @@
   @mv:id: props
   @enLN: Properties
   @mv:contains: atom|content
+  @mv:contains: atom|contributor
   @mv:contains: atom|category
   @mv:contains: atom|generator
-  @mv:contains: atom|source
   @mv:contains: atom|link
   @mv:contains: atom|author
   @mv:contains: atom|published
   @mv:contains: atom|updated
+  @mv:contains: atom|icon
   @mv:contains: atom|id
+  @mv:contains: atom|logo
+  @mv:contains: atom|rights
+  @mv:contains: atom|subtitle
+  @mv:contains: atom|summary
   @mv:contains: atom|title
-  @mv:contains: atom|email
-  @mv:contains: atom|uri
+  @mv:contains: source-prop
+  @mv:contains: atom|source
 
 ModuleDef:
   @QName: AtomDatatypes
@@ -620,12 +627,23 @@
   @mv:contains: atomUri
   @mv:contains: atomEmailAddress
 
+  @mv:contains: undefinedAttributes
   @mv:contains: atomCommonAttributes
 
+  @mv:contains: simpleExtensionElements
+  @mv:contains: structuredExtensionElements
+  @mv:contains: extensionElements
+
   @mv:contains: TextAG
   @mv:contains: TextCM
+
+  @mv:contains: atom|name
+  @mv:contains: atom|email
+  @mv:contains: atom|uri
   @mv:contains: PersonAG
+  @mv:contains: person-prop
   @mv:contains: PersonCM
+
   @mv:contains: DateAG
   @mv:contains: DateCM
  
@@ -1584,7 +1602,7 @@
     @@mv:attributeTypeName: xml|lang
     @@mv:attributeValueType: atomLanguageTag
 
-  #undefinedAttribute*
+  @mv:refers: undefinedAttributes
 ##atomCommonAttributes
 
 STDef:
@@ -1633,6 +1651,22 @@
     @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
+  @Name: ECDef
+  @ElementType:
+    dis:ResourceDef
+  @ShadowContent:
+    @@DISCore:resourceType: mv|ElementTypeClass
+    @@For: =ManakaiDOM|ManakaiDOMLatest
+
+ElementTypeBinding:
+  @Name: EMDef
+  @ElementType:
+    dis:ResourceDef
+  @ShadowContent:
+    @@DISCore:resourceType: mv|ElementTypeClassMix
+    @@For: =ManakaiDOM|ManakaiDOMLatest
+
+ElementTypeBinding:
   @Name: STDef
   @ElementType:
     dis:ResourceDef
@@ -1971,6 +2005,14 @@
         }__;
 ##AtomPersonConstruct
 
+ECDef:
+  @QName: person-prop
+  @mv:elementTypeClassName: person-prop
+  @mv:refers: atom|name
+  @mv:refers: atom|uri
+  @mv:refers: atom|email
+  @mv:refers: extensionElements
+
 IFClsConstructDef:
   @IFQName: AtomDateConstruct
   @ClsQName: ManakaiAtomDateConstruct
@@ -2052,6 +2094,23 @@
       }
 ##AtomDateConstruct
 
+ECDef:
+  @QName: feed-prop
+  @mv:elementTypeClassName: feed-prop
+  @mv:refers: atom|author
+  @mv:refers: atom|category
+  @mv:refers: atom|contributor
+  @mv:refers: atom|generator
+  @mv:refers: atom|icon
+  @mv:refers: atom|id
+  @mv:refers: atom|link
+  @mv:refers: atom|logo
+  @mv:refers: atom|rights
+  @mv:refers: atom|subtitle
+  @mv:refers: atom|title
+  @mv:refers: atom|updated
+  @mv:refers: extensionElements
+
 IFClsETDef:
   @IFQName: AtomFeedElement
   @ETQName: atom|feed
@@ -2748,6 +2807,23 @@
                                     (<Q::xml|>, 'lang'));
 ##AtomFeedElement
 
+ECDef:
+  @QName: entry-prop
+  @mv:elementTypeClassName: entry-prop
+  @mv:refers: atom|author
+  @mv:refers: atom|category
+  @mv:refers: atom|content
+  @mv:refers: atom|contributor
+  @mv:refers: atom|id
+  @mv:refers: atom|link
+  @mv:refers: atom|published
+  @mv:refers: atom|rights
+  @mv:refers: atom|source
+  @mv:refers: atom|summary
+  @mv:refers: atom|title
+  @mv:refers: atom|updated
+  @mv:refers: extensionElements
+
 IFClsETDef:
   @IFQName: AtomEntryElement
   @ETQName: atom|entry
@@ -3287,6 +3363,16 @@
 ##AtomIdElement
 
 IFClsETDef:
+  @IFQName: AtomIconElement
+  @ETQName: atom|icon
+  @ETRQName: atom|icon
+  @ClsQName: ManakaiAtomIconElement
+
+  @IFISA: AtomElement
+  @ClsISA: ManakaiAtomElement
+##AtomIconElement
+
+IFClsETDef:
   @IFQName: AtomNameElement
   @ETQName: atom|name
   @ETRQName: atom|name
@@ -3317,6 +3403,16 @@
 ##AtomEmailElement
 
 IFClsETDef:
+  @IFQName: AtomLogoElement
+  @ETQName: atom|logo
+  @ETRQName: atom|logo
+  @ClsQName: ManakaiAtomLogoElement
+
+  @IFISA: AtomElement
+  @ClsISA: ManakaiAtomElement
+##AtomLogoElement
+
+IFClsETDef:
   @IFQName: AtomContentElement
   @ETQName: atom|content
   @ETRQName: atom|content
@@ -3573,7 +3669,7 @@
 
   @IFISA: AtomPersonConstruct
   @ClsISA: ManakaiAtomPersonConstruct
-  @mv:contains: PersonAG
+  @mv:refers: PersonAG
   @mv:elementContentModel: PersonCM
 
   @enDesc:
@@ -3703,7 +3799,7 @@
 
   @IFISA: AtomPersonConstruct
   @ClsISA: ManakaiAtomPersonConstruct
-  @mv:contains: PersonAG
+  @mv:refers: PersonAG
   @mv:elementContentModel: PersonCM
 
   @enDesc:
@@ -4065,7 +4161,7 @@
 
   @IFISA: AtomDateConstruct
   @ClsISA: ManakaiAtomDateConstruct
-  @mv:contains: DateAG
+  @mv:refers: DateAG
   @mv:elementContentModel: DateCM
 
   @enDesc:
@@ -4085,7 +4181,7 @@
 
   @IFISA: AtomTextConstruct
   @ClsISA: ManakaiAtomTextConstruct
-  @mv:contains: TextAG
+  @mv:refers: TextAG
   @mv:elementContentModel: TextCM
 
   @enDesc:
@@ -4094,6 +4190,23 @@
     over an entry or feed.
 ##AtomRightsElement
 
+ECDef:
+  @QName: source-prop
+  @mv:elementTypeClassName: source-prop
+  @mv:refers: atom|author
+  @mv:refers: atom|category
+  @mv:refers: atom|contributor
+  @mv:refers: atom|generator
+  @mv:refers: atom|icon
+  @mv:refers: atom|id
+  @mv:refers: atom|link
+  @mv:refers: atom|logo
+  @mv:refers: atom|rights
+  @mv:refers: atom|subtitle
+  @mv:refers: atom|title
+  @mv:refers: atom|updated
+  @mv:refers: extensionElements
+
 IFClsETDef:
   @IFQName: AtomSourceElement
   @ETQName: atom|source
@@ -4312,7 +4425,7 @@
 
   @IFISA: AtomTextConstruct
   @ClsISA: ManakaiAtomTextConstruct
-  @mv:contains: TextAG
+  @mv:refers: TextAG
   @mv:elementContentModel: TextCM
 
   @enDesc:
@@ -4328,7 +4441,7 @@
 
   @IFISA: AtomTextConstruct
   @ClsISA: ManakaiAtomTextConstruct
-  @mv:contains: TextAG
+  @mv:refers: TextAG
   @mv:elementContentModel: TextCM
 
   @enDesc:
@@ -4344,7 +4457,7 @@
 
   @IFISA: AtomTextConstruct
   @ClsISA: ManakaiAtomTextConstruct
-  @mv:contains: TextAG
+  @mv:refers: TextAG
   @mv:elementContentModel: TextCM
 
   @enDesc:
@@ -4360,7 +4473,7 @@
 
   @IFISA: AtomDateConstruct
   @ClsISA: ManakaiAtomDateConstruct
-  @mv:contains: DateAG
+  @mv:refers: DateAG
   @mv:elementContentModel: DateCM
 
   @enDesc:
@@ -4452,3 +4565,25 @@
     @@For: ManakaiDOM|DOM3
     @@For: =ManakaiDOM|all
     @@Type: idl|boolean||ManakaiDOM|all
+
+ECDef:
+  @QName: simpleExtensionElements
+  @mv:elementTypeClassName: simple.extra
+  @DISCore:resourceType: mv|ElementTypeAdditionalClass
+
+ECDef:
+  @QName: structuredExtensionElements
+  @mv:elementTypeClassName: structured.extra
+  @DISCore:resourceType: mv|ElementTypeAdditionalClass
+
+EMDef:
+  @QName: extensionElements
+  @mv:elementTypeClassName: extra
+  @mv:refers: simpleExtensionElements
+  @mv:refers: structuredExtensionElements
+  @DISCore:resourceType: mv|ElementTypeAdditionalClass
+
+AGDef:
+  @QName: undefinedAttributes
+  @mv:attributeTypeGroupName: common.extra
+