--- messaging/manakai/lib/Message/Markup/Atom.dis	2006/11/04 12:25:14	1.15
+++ messaging/manakai/lib/Message/Markup/Atom.dis	2006/12/30 13:25:34	1.24
@@ -43,22 +43,15 @@
   @DISCore:author: DISCore|Wakaba
   @License: license|Perl+MPL
   @Date:
-    $Date: 2006/11/04 12:25:14 $
+    $Date: 2006/12/30 13:25:34 $
 
   @Require:
     @@Module:
       @@@QName: Markup|common
     @@Module:
       @@@QName: MDOM|TreeCore
-      @@@WithFor: ManakaiDOM|ManakaiDOMLatest
-    @@Module:
-      @@@WithFor: ManakaiDOM|ManakaiDOM
-    @@Module:
-      @@@WithFor: ManakaiDOM|ManakaiDOMLatest
     @@Module:
       @@@QName: DISlib|DISMarkup
-      @@@WithFor: ManakaiDOM|all
-  @DefaultFor: ManakaiDOM|ManakaiDOMLatest
 
 Namespace:
   @atom:
@@ -144,7 +137,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: DISLang|Method
-    @@ForCheck: !=ManakaiDOM|ManakaiDOM
 
 ElementTypeBinding:
   @Name: Param
@@ -166,7 +158,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: DISLang|Attribute
-    @@ForCheck: !=ManakaiDOM|ManakaiDOM
 
 ElementTypeBinding:
   @Name: ATTR
@@ -182,7 +173,6 @@
     @@DISCore:resourceType:
       @@@@: mv|AttributeType
       @@@ForCheck: s|ForML
-    @@ForCheck: !=ManakaiDOM|ManakaiDOM
 
 ElementTypeBinding:
   @Name: Get
@@ -247,7 +237,6 @@
     @@resourceFor: ManakaiDOM|ForIF
     @@resourceFor: ManakaiDOM|ForClass
     @@resourceFor: s|ForML
-    @@For: ManakaiDOM|ManakaiDOM
 
     @@DISCore:resourceType:
       @@@@: DISLang|Interface
@@ -256,14 +245,11 @@
     @@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
+      @@@@: ||+||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOMLatest
+      @@@ForCheck: ManakaiDOM|ForClass
 
     @@s:elementType:
       @@@@: ||+||s|ForML
@@ -284,7 +270,6 @@
       @@@ForCheck: !ManakaiDOM|ForIF !ManakaiDOM|ForClass !s|ForML
     @@resourceFor: ManakaiDOM|ForIF
     @@resourceFor: ManakaiDOM|ForClass
-    @@For: ManakaiDOM|ManakaiDOM
 
     @@DISCore:resourceType:
       @@@@: DISLang|Interface
@@ -293,14 +278,11 @@
     @@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
+      @@@@: ||+||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOMLatest
+      @@@ForCheck: ManakaiDOM|ForClass
 
 ElementTypeBinding:
   @Name: IFClsConstructDef
@@ -315,7 +297,6 @@
     @@resourceFor: ManakaiDOM|ForClass
     @@resourceFor: mv|ForCM
     @@resourceFor: mv|ForAG
-    @@For: ManakaiDOM|ManakaiDOM
 
     @@DISCore:resourceType:
       @@@@: DISLang|Interface
@@ -324,14 +305,11 @@
     @@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
+      @@@@: ||+||ManakaiDOM|ForIF
       @@@ContentType: DISCore|TFPQNames
-      @@@ForCheck: ManakaiDOM|ForClass ManakaiDOM|ManakaiDOMLatest
+      @@@ForCheck: ManakaiDOM|ForClass
 
     @@DISCore:resourceType:
       @@@@: mv|AttributeTypeGroup
@@ -448,51 +426,42 @@
 ResourceDef:
   @QName: Document
   @AliasFor: td|Document
-  @For: ManakaiDOM|DOM
 
 ResourceDef:
   @QName: Element
   @AliasFor: te|Element
-  @For: ManakaiDOM|DOM
 
 ResourceDef:
   @QName: Attr
   @AliasFor: te|Attr
-  @For: ManakaiDOM|DOM
 
 ResourceDef:
   @QName: DOMString
   @AliasFor: DOMMain|DOMString
-  @For: ManakaiDOM|DOM
 
 ResourceDef:
   @QName: DOMURI
   @AliasFor: ManakaiDOM|ManakaiDOMURI
-  @For: ManakaiDOM|DOM3
 
 ResourceDef:
   @QName: DOMTimeStamp
   @AliasFor: DOMMain|DOMTimeStamp
-  @For: ManakaiDOM|DOM2
 
 ResourceDef:
   @QName: boolean
-  @AliasFor: idl|boolean||ManakaiDOM|all
+  @AliasFor: idl|boolean
 
 ResourceDef:
   @QName: Node
   @AliasFor: tc|Node
-  @For: ManakaiDOM|ManakaiDOM
 
 ResourceDef:
   @QName: NodeList
   @AliasFor: tc|NodeList
-  @For: ManakaiDOM|ManakaiDOM
 
 ResourceDef:
   @QName: StaticNodeList
   @AliasFor: tc|StaticNodeList
-  @For: ManakaiDOM|ManakaiDOM
 
 ElementTypeBinding:
   @Name: enDesc
@@ -518,7 +487,7 @@
     @@Value:
       @@@@: 1
       @@@ContentType: DISCore|Boolean
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ElementTypeBinding:
   @Name: FalseCase
@@ -530,7 +499,7 @@
     @@Value:
       @@@@: 0
       @@@ContentType: DISCore|Boolean
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ## -- Features
 
@@ -540,7 +509,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: f|Feature
-    @@For: =ManakaiDOM|all
 
 ElementTypeBinding:
   @Name: FeatureVerDef
@@ -561,7 +529,7 @@
   @QName: AtomFeature
   @FeatureVerDef:
     @@QName: AtomFeature10
-    @@Version: 1.0
+    @@f:version: 1.0
     @@f:instanceOf: AtomFeature
     @@f:requires: tx|XMLFeature30
     @@enDesc:
@@ -572,7 +540,7 @@
   @QName: AtomThreadingFeature
   @FeatureVerDef:
     @@QName: AtomThreadingFeature10
-    @@Version: 1.0
+    @@f:version: 1.0
     @@f:instanceOf: AtomThreadingFeature
     @@f:requires: fe|AtomFeature10
     @@enDesc:
@@ -668,7 +636,6 @@
   @QName: AtomQName
   @enLN: Qualified Names
   @mv:id: qname
-  @For: =ManakaiDOM|ManakaiDOMLatest
   @DISCore:resourceType: mv|XMLDTDQNameModule
 
   @mv:contains: Atom
@@ -677,7 +644,6 @@
   @QName: Atom10
   @enLN: Atom 1.0
   @mv:id: atom10
-  @For: =ManakaiDOM|ManakaiDOMLatest
   @DISCore:resourceType: mv|XMLDTDDriver
 
   @mv:refers: Atom
@@ -694,7 +660,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|XMLDTDModuleSet
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: ModuleDef
@@ -702,7 +667,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|XMLDTDModule
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ## -- Implementation
 
@@ -717,7 +681,6 @@
     The <IF::AtomImplementation> interface provides convenience
     methods to create Atom documents.
 
-  @f:provides: AtomFeature10
   @f:implements: AtomFeature10
 
   @Test:
@@ -725,21 +688,19 @@
     @@PerlDef:
       for my $interface (
         <IFName::AtomImplementation>,
-        <IFName::AtomImplementation||ManakaiDOM|ManakaiDOM>,
         <IFName::c|DOMImplementation>,
-        <IFName::urigen|URIImplementation>,
         <IFName::f|GetFeature>,
       ) {
         $test->id ($interface);
         $test->assert_true
-                 (<Class::ManakaiAtomImplementation>->isa ($interface));
+                 (<Class::c|ManakaiDOMImplementation>->isa ($interface));
       }
   @Test:
     @@QName: ImplementationRegistry.AtomImplementation.1.test
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        <Q::fe|Atom> => '1.0',
                      });
 
@@ -749,7 +710,7 @@
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        Core => '3.0',
                        <Q::fe|Atom> => '1.0',
                      });
@@ -760,7 +721,7 @@
     @@PerlDef:
       require Message::Markup::Atom;
       my $impl = $Message::DOM::ImplementationRegistry
-                   ->get_implementation ({
+                   ->get_dom_implementation ({
                        XML => '3.0',
                        <Q::fe|Atom> => '1.0',
                      });
@@ -796,7 +757,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.
 
@@ -979,7 +940,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.
 
@@ -1647,77 +1608,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
@@ -1761,7 +1651,7 @@
 STCDef:
   @QName: atomUriCM
   @mv:elementContentModelName: URI
-  @cm: (dxm|PCDATA||ManakaiDOM|all)*
+  @cm: (dxm|PCDATA)*
 
 STDef:
   @QName: atomEmailAddress
@@ -1771,7 +1661,7 @@
 STCDef:
   @QName: atomEmailAddressCM
   @mv:elementContentModelName: EmailAddress
-  @cm: (dxm|PCDATA||ManakaiDOM|all)*
+  @cm: (dxm|PCDATA)*
 
 ElementTypeBinding:
   @Name: AGDef
@@ -1779,7 +1669,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|AttributeTypeGroup
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: ATDef
@@ -1787,7 +1676,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|AttributeType
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: ECDef
@@ -1795,7 +1683,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|ElementTypeClass
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: EMDef
@@ -1803,7 +1690,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|ElementTypeClassMix
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: STDef
@@ -1811,7 +1697,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|XMLDTDDatatypeEntity
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 ElementTypeBinding:
   @Name: STCDef
@@ -1819,7 +1704,6 @@
     dis:ResourceDef
   @ShadowContent:
     @@DISCore:resourceType: mv|ElementContentModel
-    @@For: =ManakaiDOM|ManakaiDOMLatest
 
 IFClsDef:
   @IFQName: AtomElement
@@ -1829,7 +1713,7 @@
   @ClsISA: te|ManakaiDOMElement
    
   @f:implements: AtomFeature10
-  @s:elementType: AnyAtomElement||ManakaiDOM|all
+  @s:elementType: AnyAtomElement
 
   @enDesc:
     The <IF::AtomElement> interface provides convenience
@@ -1854,7 +1738,6 @@
     @@PerlDef:
       for my $interface (
         <IFName::AtomElement>,
-        <IFName::AtomElement||ManakaiDOM|ManakaiDOM>,
         <IFName::Element>,
         <IFName::Node>,
         <IFName::f|GetFeature>,
@@ -1902,12 +1785,12 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    dxm|ANY||ManakaiDOM|all
+    dxm|ANY
   @enImplNote:
     @@ddid:cm
     @@@:
       {TODO::
-        (dxm|PCDATA||ManakaiDOM|all | html|div)*
+        (dxm|PCDATA | html|div)*
       }
 
   @enDesc:
@@ -2201,7 +2084,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    (dxm|PCDATA||ManakaiDOM|all)*
+    (dxm|PCDATA)*
   @enImplNote:
     @@ddid: cm
     @@@:
@@ -3207,7 +3090,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>
@@ -3227,7 +3112,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>
@@ -3660,7 +3547,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    dxm|ANY||ManakaiDOM|all
+    dxm|ANY
 
   @enDesc:
     The <XE::atom|content> element either contains or links to
@@ -4071,7 +3958,7 @@
   @mv:refers: atomCommonAttributes
 
   @cm:
-    (dxm|PCDATA||ManakaiDOM|all)*
+    (dxm|PCDATA)*
 
   @enDesc:
     The <XE::atom|generator> element identifies the agent used
@@ -4917,7 +4804,6 @@
 ResourceDef:
   @QName: CFG
   @AliasFor: c|DOMConfiguration
-  @For: ManakaiDOM|DOM3
 
 ElementTypeBinding:
   @Name: boolCParam
@@ -4926,13 +4812,9 @@
   @ShadowContent:
     @@DISCore:resourceType:
       @@@@: c|DOMConfigurationParameter
-      @@@For: ManakaiDOM|DOM
     @@DISCore:resourceType:
       @@@@: DISCore|Property
-      @@@For: =ManakaiDOM|all
-    @@For: ManakaiDOM|DOM3
-    @@For: =ManakaiDOM|all
-    @@Type: idl|boolean||ManakaiDOM|all
+    @@Type: idl|boolean
 
 ECDef:
   @QName: simpleExtensionElements
@@ -4958,9 +4840,8 @@
 ResourceDef:
   @QName: undefinedContent
   @mv:elementContentModelName: undefined
-  @For: =ManakaiDOM|ManakaiDOMLatest
   @DISCore:resourceType: mv|ElementContentModel
-  @cm: dxm|ANY||ManakaiDOM|all
+  @cm: dxm|ANY
   @enImplNote:
     (text | anyForeignElement)*
 
@@ -5283,7 +5164,7 @@
       as to the total number of replies contained by the
       linked resource.  The value is advisory and
       may not accurately reflect the actual number of replies.
-    @@Type: idl|long||ManakaiDOM|all
+    @@Type: idl|long
     @@Get:
       @@@PerlDef:
         __CODE{getReflectAttrNonNegativeIntegerValue::