--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/05/28 06:34:59	1.8
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/08/17 12:12:02	1.10
@@ -43,7 +43,7 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/05/28 06:34:59 $
+    $Date: 2006/08/17 12:12:02 $
 
   @Require:
     @@Module:
@@ -76,6 +76,8 @@
     http://suika.fam.cx/~wakaba/archive/2004/dom/main#
   @dx:
     http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/Error/DOMException#
+  @dxm:
+    http://suika.fam.cx/~wakaba/archive/2004/dis/XML#
   @ecore:
     http://suika.fam.cx/~wakaba/archive/2005/manakai/Util/Error/Core/
   @f:
@@ -86,6 +88,8 @@
     http://www.w3.org/1999/xhtml
   @idl:
     http://suika.fam.cx/~wakaba/archive/2004/dis/IDL#
+  @infoset:
+    http://www.w3.org/2001/04/infoset#
   @kwd:
     http://suika.fam.cx/~wakaba/archive/2005/rfc2119/
   @lang:
@@ -579,6 +583,11 @@
   @mv:contains: AtomProperties
   @mv:contains: AtomEntry
   @mv:contains: AtomFeed
+  @mv:contains: AtomQName
+
+  @infoset:namespaceName: 
+    http://www.w3.org/2005/Atom
+  @infoset:prefix: atom
 
 ModuleDef:
   @QName: AtomFeed
@@ -625,9 +634,12 @@
   @mv:contains: atomMediaType
   @mv:contains: atomLanguageTag
   @mv:contains: atomUri
+  @mv:contains: atomUriCM
   @mv:contains: atomEmailAddress
+  @mv:contains: atomEmailAddressCM
 
   @mv:contains: undefinedAttributes
+  @mv:contains: undefinedContent
   @mv:contains: atomCommonAttributes
 
   @mv:contains: simpleExtensionElements
@@ -646,6 +658,15 @@
 
   @mv:contains: DateAG
   @mv:contains: DateCM
+
+ResourceDef:
+  @QName: AtomQName
+  @enLN: Qualified Names
+  @mv:id: qname
+  @For: =ManakaiDOM|ManakaiDOMLatest
+  @DISCore:resourceType: mv|XMLDTDQNameModule
+
+  @mv:contains: Atom
  
 ElementTypeBinding:
   @Name: ModuleSetDef
@@ -1627,12 +1648,20 @@
   @QName: atomUri
   @mv:datatypeEntityName: URI
   #aliasfor text
+STCDef:
+  @QName: atomUriCM
+  @mv:elementContentModelName: URI
+  @cm: (dxm|PCDATA||ManakaiDOM|all)*
 
 STDef:
   @QName: atomEmailAddress
   @mv:datatypeEntityName: EmailAddress
   #subsetOf xsd|string
   #pattern
+STCDef:
+  @QName: atomEmailAddressCM
+  @mv:elementContentModelName: EmailAddress
+  @cm: (dxm|PCDATA||ManakaiDOM|all)*
 
 ElementTypeBinding:
   @Name: AGDef
@@ -1674,6 +1703,14 @@
     @@DISCore:resourceType: mv|XMLDTDDatatypeEntity
     @@For: =ManakaiDOM|ManakaiDOMLatest
 
+ElementTypeBinding:
+  @Name: STCDef
+  @ElementType:
+    dis:ResourceDef
+  @ShadowContent:
+    @@DISCore:resourceType: mv|ElementContentModel
+    @@For: =ManakaiDOM|ManakaiDOMLatest
+
 IFClsDef:
   @IFQName: AtomElement
   @ClsQName: ManakaiAtomElement
@@ -1732,6 +1769,13 @@
     @@ContentType: DISCore|QName
   @ForCheck: =ManakaiDOM|all
 
+ElementTypeBinding:
+  @Name: cm
+  @ElementType:
+    mv:elementContentModel
+  @ShadowContent:
+    @@ContentType: lang|dcmodel
+
 IFClsConstructDef:
   @IFQName: AtomTextConstruct
   @ClsQName: ManakaiAtomTextConstruct
@@ -1743,6 +1787,17 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    dxm|ANY||ManakaiDOM|all
+  @enImplNote:
+    @@ddid:cm
+    @@@:
+      {TODO::
+        (dxm|PCDATA||ManakaiDOM|all | html|div)*
+      }
+
   @enDesc:
     The <IF::AtomTextConstruct> interface provides convenience
     methods and attributes for <IF::Element> nodes
@@ -1873,6 +1928,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (person-prop+)
+
   @enDesc:
     The <IF::AtomPersonConstruct> interface provides convenience
     methods and attributes for <IF::Element> nodes
@@ -2024,6 +2084,17 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (dxm|PCDATA||ManakaiDOM|all)*
+  @enImplNote:
+    @@ddid: cm
+    @@@:
+      {TODO::
+        xsd|dateTime
+      }
+
   @enDesc:
     The <IF::AtomDateConstruct> interface provides convenience
     methods and attributes for <IF::Element> nodes
@@ -2120,6 +2191,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (feed-prop+, atom|entry*)
+
   @enDesc:
     The <XE::atom|feed> element is the document element 
     of an Atom Feed Document.
@@ -2833,6 +2909,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (entry-prop+)
+
   @enDesc:
     The <XE::atom|entry> element represents an individual
     entry, acting as a container for metadata and data
@@ -3360,6 +3441,10 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  @mv:refers: atomCommonAttributes
+  
+  @cm: atomUriCM
 ##AtomIdElement
 
 IFClsETDef:
@@ -3370,6 +3455,10 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  @mv:refers: atomCommonAttributes
+
+  @cm: atomUriCM
 ##AtomIconElement
 
 IFClsETDef:
@@ -3380,6 +3469,9 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  # no common attribs
+  @cm: TextCM
 ##AtomNameElement
 
 IFClsETDef:
@@ -3390,6 +3482,9 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  # no common attribs
+  @cm: atomUriCM
 ##AtomUriElement
 
 IFClsETDef:
@@ -3400,6 +3495,9 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  # no common attribs
+  @cm: atomEmailAddressCM
 ##AtomEmailElement
 
 IFClsETDef:
@@ -3410,6 +3508,10 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  @mv:refers: atomCommonAttributes
+
+  @cm: atomUriCM
 ##AtomLogoElement
 
 IFClsETDef:
@@ -3421,6 +3523,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    dxm|ANY||ManakaiDOM|all
+
   @enDesc:
     The <XE::atom|content> element either contains or links to
     the content of the entry.
@@ -3686,6 +3793,10 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm: undefinedContent
+
   @enDesc:
     The <XE::atom|category> element conveys information abut
     a category associated with an entry or feed.
@@ -3817,6 +3928,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (dxm|PCDATA||ManakaiDOM|all)*
+
   @enDesc:
     The <XE::atom|generator> element identifies the agent used
     to generate a feed.
@@ -3898,6 +4014,10 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm: undefinedContent
+
   @enDesc:
     The <XE::atom|link> element defines a reference from an entry
     or feed to a Web resource.
@@ -4216,6 +4336,11 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
+  @cm:
+    (source-prop*)
+
   @Attr:
     @@Name: authorElements
     @@enDesc:
@@ -4587,3 +4712,11 @@
   @QName: undefinedAttributes
   @mv:attributeTypeGroupName: common.extra
 
+ResourceDef:
+  @QName: undefinedContent
+  @mv:elementContentModelName: undefined
+  @For: =ManakaiDOM|ManakaiDOMLatest
+  @DISCore:resourceType: mv|ElementContentModel
+  @cm: dxm|ANY||ManakaiDOM|all
+  @enImplNote:
+    (text | anyForeignElement)*