--- messaging/manakai/lib/Message/Markup/Atom.dis 2006/05/21 08:55:21 1.7 +++ 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/21 08:55:21 $ + $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,17 +583,24 @@ @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 @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 +608,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 @@ -618,16 +634,39 @@ @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 + @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 + +ResourceDef: + @QName: AtomQName + @enLN: Qualified Names + @mv:id: qname + @For: =ManakaiDOM|ManakaiDOMLatest + @DISCore:resourceType: mv|XMLDTDQNameModule + + @mv:contains: Atom ElementTypeBinding: @Name: ModuleSetDef @@ -1584,7 +1623,7 @@ @@mv:attributeTypeName: xml|lang @@mv:attributeValueType: atomLanguageTag - #undefinedAttribute* + @mv:refers: undefinedAttributes ##atomCommonAttributes STDef: @@ -1609,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 @@ -1633,6 +1680,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 @@ -1640,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 @@ -1698,6 +1769,13 @@ @@ContentType: DISCore|QName @ForCheck: =ManakaiDOM|all +ElementTypeBinding: + @Name: cm + @ElementType: + mv:elementContentModel + @ShadowContent: + @@ContentType: lang|dcmodel + IFClsConstructDef: @IFQName: AtomTextConstruct @ClsQName: ManakaiAtomTextConstruct @@ -1709,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 interface provides convenience methods and attributes for nodes @@ -1839,6 +1928,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (person-prop+) + @enDesc: The interface provides convenience methods and attributes for nodes @@ -1971,6 +2065,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 @@ -1982,6 +2084,17 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (dxm|PCDATA||ManakaiDOM|all)* + @enImplNote: + @@ddid: cm + @@@: + {TODO:: + xsd|dateTime + } + @enDesc: The interface provides convenience methods and attributes for nodes @@ -2052,6 +2165,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 @@ -2061,6 +2191,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (feed-prop+, atom|entry*) + @enDesc: The element is the document element of an Atom Feed Document. @@ -2748,6 +2883,23 @@ (, '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 @@ -2757,6 +2909,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (entry-prop+) + @enDesc: The element represents an individual entry, acting as a container for metadata and data @@ -3284,9 +3441,27 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + + @mv:refers: atomCommonAttributes + + @cm: atomUriCM ##AtomIdElement IFClsETDef: + @IFQName: AtomIconElement + @ETQName: atom|icon + @ETRQName: atom|icon + @ClsQName: ManakaiAtomIconElement + + @IFISA: AtomElement + @ClsISA: ManakaiAtomElement + + @mv:refers: atomCommonAttributes + + @cm: atomUriCM +##AtomIconElement + +IFClsETDef: @IFQName: AtomNameElement @ETQName: atom|name @ETRQName: atom|name @@ -3294,6 +3469,9 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + + # no common attribs + @cm: TextCM ##AtomNameElement IFClsETDef: @@ -3304,6 +3482,9 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + + # no common attribs + @cm: atomUriCM ##AtomUriElement IFClsETDef: @@ -3314,9 +3495,26 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + + # no common attribs + @cm: atomEmailAddressCM ##AtomEmailElement IFClsETDef: + @IFQName: AtomLogoElement + @ETQName: atom|logo + @ETRQName: atom|logo + @ClsQName: ManakaiAtomLogoElement + + @IFISA: AtomElement + @ClsISA: ManakaiAtomElement + + @mv:refers: atomCommonAttributes + + @cm: atomUriCM +##AtomLogoElement + +IFClsETDef: @IFQName: AtomContentElement @ETQName: atom|content @ETRQName: atom|content @@ -3325,6 +3523,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + dxm|ANY||ManakaiDOM|all + @enDesc: The element either contains or links to the content of the entry. @@ -3573,7 +3776,7 @@ @IFISA: AtomPersonConstruct @ClsISA: ManakaiAtomPersonConstruct - @mv:contains: PersonAG + @mv:refers: PersonAG @mv:elementContentModel: PersonCM @enDesc: @@ -3590,6 +3793,10 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: undefinedContent + @enDesc: The element conveys information abut a category associated with an entry or feed. @@ -3703,7 +3910,7 @@ @IFISA: AtomPersonConstruct @ClsISA: ManakaiAtomPersonConstruct - @mv:contains: PersonAG + @mv:refers: PersonAG @mv:elementContentModel: PersonCM @enDesc: @@ -3721,6 +3928,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (dxm|PCDATA||ManakaiDOM|all)* + @enDesc: The element identifies the agent used to generate a feed. @@ -3802,6 +4014,10 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: undefinedContent + @enDesc: The element defines a reference from an entry or feed to a Web resource. @@ -4065,7 +4281,7 @@ @IFISA: AtomDateConstruct @ClsISA: ManakaiAtomDateConstruct - @mv:contains: DateAG + @mv:refers: DateAG @mv:elementContentModel: DateCM @enDesc: @@ -4085,7 +4301,7 @@ @IFISA: AtomTextConstruct @ClsISA: ManakaiAtomTextConstruct - @mv:contains: TextAG + @mv:refers: TextAG @mv:elementContentModel: TextCM @enDesc: @@ -4094,6 +4310,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 @@ -4103,6 +4336,11 @@ @IFISA: AtomElement @ClsISA: ManakaiAtomElement + @mv:refers: atomCommonAttributes + + @cm: + (source-prop*) + @Attr: @@Name: authorElements @@enDesc: @@ -4312,7 +4550,7 @@ @IFISA: AtomTextConstruct @ClsISA: ManakaiAtomTextConstruct - @mv:contains: TextAG + @mv:refers: TextAG @mv:elementContentModel: TextCM @enDesc: @@ -4328,7 +4566,7 @@ @IFISA: AtomTextConstruct @ClsISA: ManakaiAtomTextConstruct - @mv:contains: TextAG + @mv:refers: TextAG @mv:elementContentModel: TextCM @enDesc: @@ -4344,7 +4582,7 @@ @IFISA: AtomTextConstruct @ClsISA: ManakaiAtomTextConstruct - @mv:contains: TextAG + @mv:refers: TextAG @mv:elementContentModel: TextCM @enDesc: @@ -4360,7 +4598,7 @@ @IFISA: AtomDateConstruct @ClsISA: ManakaiAtomDateConstruct - @mv:contains: DateAG + @mv:refers: DateAG @mv:elementContentModel: DateCM @enDesc: @@ -4452,3 +4690,33 @@ @@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 + +ResourceDef: + @QName: undefinedContent + @mv:elementContentModelName: undefined + @For: =ManakaiDOM|ManakaiDOMLatest + @DISCore:resourceType: mv|ElementContentModel + @cm: dxm|ANY||ManakaiDOM|all + @enImplNote: + (text | anyForeignElement)*