--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/08/16 10:30:03	1.9
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/08/18 12:26:54	1.11
@@ -43,7 +43,7 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/08/16 10:30:03 $
+    $Date: 2006/08/18 12:26:54 $
 
   @Require:
     @@Module:
@@ -55,6 +55,9 @@
       @@@WithFor: ManakaiDOM|ManakaiDOM
     @@Module:
       @@@WithFor: ManakaiDOM|ManakaiDOMLatest
+    @@Module:
+      @@@QName: DISlib|DISMarkup
+      @@@WithFor: ManakaiDOM|all
   @DefaultFor: ManakaiDOM|ManakaiDOMLatest
 
 Namespace:
@@ -64,12 +67,12 @@
     http://suika.fam.cx/~wakaba/archive/2004/8/18/dom-core#
   @cfg:
     http://suika.fam.cx/www/2006/dom-config/
+  @DISlib:
+    http://suika.fam.cx/~wakaba/archive/2004/dis/
   @dis:
     http://suika.fam.cx/~wakaba/archive/2004/8/18/lang#dis--
   @dlp:
     http://suika.fam.cx/~wakaba/archive/2004/dis/Perl#
-  @doc:
-    http://suika.fam.cx/~wakaba/archive/2005/7/tutorial#
   @d:
     http://suika.fam.cx/~wakaba/archive/2004/dom/xdt#
   @DOMMain:
@@ -94,14 +97,10 @@
     http://suika.fam.cx/~wakaba/archive/2004/8/18/lang#
   @license:
     http://suika.fam.cx/~wakaba/archive/2004/8/18/license#
-  @m12n: 
-    http://suika.fam.cx/www/2006/05/m12n/
   @ManakaiDOM:
     http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom#
   @Markup:
     http://suika.fam.cx/~wakaba/archive/2005/manakai/Markup#
-  @mat:
-    http://suika.fam.cx/~wakaba/archive/2005/manakai/Markup/Atom/
   @MDOM:
     http://suika.fam.cx/~wakaba/archive/2004/8/18/manakai-dom#ManakaiDOM.
   @MDOMX:
@@ -573,14 +572,16 @@
 
 ModuleSetDef:
   @QName: Atom
-  @mv:id: atom
-  @mv:vid: 10
   @enLN: Atom
   @mv:version: 1.0
   @mv:contains: AtomDatatypes
   @mv:contains: AtomProperties
   @mv:contains: AtomEntry
   @mv:contains: AtomFeed
+  @mv:contains: AtomQName
+
+  @mv:targetNamespace: atom|
+  @mv:defaultNamespacePrefix: atom
 
 ModuleDef:
   @QName: AtomFeed
@@ -651,6 +652,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
@@ -1771,6 +1781,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     dxm|ANY||ManakaiDOM|all
   @enImplNote:
@@ -1910,6 +1922,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (person-prop+)
 
@@ -2064,6 +2078,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (dxm|PCDATA||ManakaiDOM|all)*
   @enImplNote:
@@ -2169,6 +2185,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (feed-prop+, atom|entry*)
 
@@ -2885,6 +2903,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (entry-prop+)
 
@@ -3415,6 +3435,8 @@
 
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
+
+  @mv:refers: atomCommonAttributes
   
   @cm: atomUriCM
 ##AtomIdElement
@@ -3428,6 +3450,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm: atomUriCM
 ##AtomIconElement
 
@@ -3440,6 +3464,7 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  # no common attribs
   @cm: TextCM
 ##AtomNameElement
 
@@ -3452,6 +3477,7 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  # no common attribs
   @cm: atomUriCM
 ##AtomUriElement
 
@@ -3464,6 +3490,7 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  # no common attribs
   @cm: atomEmailAddressCM
 ##AtomEmailElement
 
@@ -3476,6 +3503,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm: atomUriCM
 ##AtomLogoElement
 
@@ -3488,6 +3517,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     dxm|ANY||ManakaiDOM|all
 
@@ -3756,6 +3787,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm: undefinedContent
 
   @enDesc:
@@ -3889,6 +3922,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (dxm|PCDATA||ManakaiDOM|all)*
 
@@ -3973,6 +4008,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm: undefinedContent
 
   @enDesc:
@@ -4293,6 +4330,8 @@
   @IFISA: AtomElement
   @ClsISA: ManakaiAtomElement
 
+  @mv:refers: atomCommonAttributes
+
   @cm:
     (source-prop*)