--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/11/05 09:16:30	1.17
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/12/30 04:42:55	1.21
@@ -43,7 +43,7 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/11/05 09:16:30 $
+    $Date: 2006/12/30 04:42:55 $
 
   @Require:
     @@Module:
@@ -52,10 +52,6 @@
       @@@QName: MDOM|TreeCore
       @@@WithFor: ManakaiDOM|ManakaiDOMLatest
     @@Module:
-      @@@WithFor: ManakaiDOM|ManakaiDOM
-    @@Module:
-      @@@WithFor: ManakaiDOM|ManakaiDOMLatest
-    @@Module:
       @@@QName: DISlib|DISMarkup
       @@@WithFor: ManakaiDOM|all
   @DefaultFor: ManakaiDOM|ManakaiDOMLatest
@@ -256,10 +252,7 @@
     @@DISCore:resourceType:
       @@@@: DISLang|Class
       @@@ForCheck: ManakaiDOM|ForClass
-    @@Implement:
-      @@@@: ||ManakaiDOM|ManakaiDOM||ManakaiDOM|ForIF
-      @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOM
+
     @@Implement:
       @@@@: ||ManakaiDOM|ManakaiDOMLatest||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
@@ -293,10 +286,7 @@
     @@DISCore:resourceType:
       @@@@: DISLang|Class
       @@@ForCheck: ManakaiDOM|ForClass
-    @@Implement:
-      @@@@: ||ManakaiDOM|ManakaiDOM||ManakaiDOM|ForIF
-      @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOM
+
     @@Implement:
       @@@@: ||ManakaiDOM|ManakaiDOMLatest||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
@@ -324,10 +314,7 @@
     @@DISCore:resourceType:
       @@@@: DISLang|Class
       @@@ForCheck: ManakaiDOM|ForClass
-    @@Implement:
-      @@@@: ||ManakaiDOM|ManakaiDOM||ManakaiDOM|ForIF
-      @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOM
+
     @@Implement:
       @@@@: ||ManakaiDOM|ManakaiDOMLatest||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
@@ -725,7 +712,6 @@
     @@PerlDef:
       for my $interface (
         <IFName::AtomImplementation>,
-        <IFName::AtomImplementation||ManakaiDOM|ManakaiDOM>,
         <IFName::c|DOMImplementation>,
         <IFName::f|GetFeature>,
       ) {
@@ -738,7 +724,7 @@
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        <Q::fe|Atom> => '1.0',
                      });
 
@@ -748,7 +734,7 @@
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        Core => '3.0',
                        <Q::fe|Atom> => '1.0',
                      });
@@ -759,7 +745,7 @@
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        XML => '3.0',
                        <Q::fe|Atom> => '1.0',
                      });
@@ -795,7 +781,7 @@
           The implementation <kwd:MUST> treate <DOM::null>
           as if an empty string is specified.
     @@Return:
-      @@@Type: AtomFeedDocument
+      @@@Type: AtomDocument
       @@@enDesc:
         The newly created Atom Feed Document.
 
@@ -978,7 +964,7 @@
           The implementation <kwd:MUST> treate <DOM::null>
           as if an empty string is specified.
     @@Return:
-      @@@Type: AtomEntryDocument
+      @@@Type: AtomDocument
       @@@enDesc:
         The newly created Atom Entry Document.
 
@@ -1646,77 +1632,6 @@
       $test->assert_isa ($doc, <IFName::AtomDocument>);
 ##AtomDocument
 
-IFClsDef:
-  @IFQName: AtomFeedDocument
-  @ClsQName: ManakaiFeedEntryDocument
-
-  @domperl:implementedByObjectsOf: Document
-  @domperl:classImplementedByObjectsOf: td|ManakaiDOMDocument
-
-  @f:implements: AtomFeature10
-
-  @enDesc:
-    The <IF::AtomFeedDocument> interface provides convenience
-    methods and attributes for an Atom
-    Feed Document, i.e. representation of an Atom feed.
-
-    If the <Feature::fe|Atom> feature version <FeatureVer::1.0>
-    is supported, a <IF::Document> object whose <A::Document.documentElement>'s
-    element type, if any, is <XE::atom|feed> at least at 
-    the time of creation <kwd:MUST> also
-    implement the <IF::AtomFeedDocument> interface.  Other
-    <IF::Document> objects <kwd:MAY> also implement
-    the <IF::AtomFeedDocument> interface.
-
-  @Test:
-    @@QName: createDocument.AtomFeedDocument.test
-    @@PerlDef:
-      my $impl;
-      __CODE{tc|createImplForTest:: $impl => $impl}__;
-    
-      my $doc = $impl-><M::c|DOMImplementation.createDocument>
-                         (<Q::atom|>, 'feed');
-
-      $test->id ('interface');
-      $test->assert_isa ($doc, <IFName::AtomFeedDocument>);
-##AtomFeedDocument
-
-IFClsDef:
-  @IFQName: AtomEntryDocument
-  @ClsQName: ManakaiAtomEntryDocument
-
-  @domperl:implementedByObjectsOf: Document
-  @domperl:classImplementedByObjectsOf: td|ManakaiDOMDocument
-
-  @f:implements: AtomFeature10
-
-  @enDesc:
-    The <IF::AtomEntryDocument> interface provides convenience
-    methods and attributes for an Atom
-    Entry Document, i.e. exactly one Atom entry, outside
-    of the context of an Atom feed.
-
-    If the <Feature::fe|Atom> feature version <FeatureVer::1.0>
-    is supported, a <IF::Document> object whose <A::Document.documentElement>'s
-    element type, if any, is <XE::atom|entry> at least at
-    the time of the creation <kwd:MUST> also
-    implement the <IF::AtomEntryDocument> interface.  Other
-    <IF::Document> objects <kwd:MAY> also implement
-    the <IF::AtomEntryDocument> interface.
-
-  @Test:
-    @@QName: createDocument.AtomEntryDocument.test
-    @@PerlDef:
-      my $impl;
-      __CODE{tc|createImplForTest:: $impl => $impl}__;
-    
-      my $doc = $impl-><M::c|DOMImplementation.createDocument>
-                         (<Q::atom|>, 'entry');
-
-      $test->id ('interface');
-      $test->assert_isa ($doc, <IFName::AtomEntryDocument>);
-##AtomEntryDocument
-
 AGDef:
   @QName: atomCommonAttributes
   @enFN: common attributes
@@ -1853,7 +1768,6 @@
     @@PerlDef:
       for my $interface (
         <IFName::AtomElement>,
-        <IFName::AtomElement||ManakaiDOM|ManakaiDOM>,
         <IFName::Element>,
         <IFName::Node>,
         <IFName::f|GetFeature>,
@@ -3206,7 +3120,9 @@
         $test->assert_num_equals (actual_value => 0+@$list, expected_value => 0);
 
         $test->id ('parent');
+        my $parent;
         for ($doc-><M::Document.createElementNS> (<Q::atom|>, 'feed')) {
+          $parent = $_;
           $_-><M::Node.appendChild>
                 ($doc-><M::Document.createElementNS> (<Q::atom|>, 'author'));
           $_-><M::Node.appendChild>
@@ -3226,7 +3142,9 @@
         my $el = $doc-><M::Document.createElementNS> (<Q::atom|>, 'entry');
 
         $test->id ('parent');
+        my $parent;
         for ($doc-><M::Document.createElementNS> (<Q::atom|>, 'feed')) {
+          $parent = $_;
           $_-><M::Node.appendChild>
                 ($doc-><M::Document.createElementNS> (<Q::atom|>, 'author'));
           $_-><M::Node.appendChild>