DRs 10-0022 and DR 10-0024

[MURATA Makoto]

First, this issue applies to not only oleObj elements
but also control elements.

>Murata-san, if there's a way we can do this better in RNG, >then we should think about incorporating it there.


Yes.  I propose to change three definitions in transitional
pml.rnc as follows:

p_AG_Ole =
  attribute name { xsd:string }?,

  ## default value: false
  attribute showAsIcon { xsd:boolean }?,
  r_id?,
  attribute imgW { a_ST_PositiveCoordinate32 }?,
  attribute imgH { a_ST_PositiveCoordinate32 }?

p_CT_OleObject =
  p_AG_Ole,
  attribute progId { xsd:string }?,
  (element embed { p_CT_OleObjectEmbed }
   | element link { p_CT_OleObjectLink }),
  (element pic { p_CT_Picture } |  attribute spid { a_ST_ShapeID })

p_CT_Control =
  p_AG_Ole,
  element extLst { p_CT_ExtensionList }?,
  (element pic { p_CT_Picture } |  attribute spid { a_ST_ShapeID })



Accordingly, I would like to change three definitions on transitinoal
pml.xsd as follows:

  <xsd:attributeGroup name="AG_Ole">
    <xsd:attribute name="name" type="xsd:string" use="optional" default=""/>
    <xsd:attribute name="showAsIcon" type="xsd:boolean" use="optional"
default="false"/>
    <xsd:attribute ref="r:id" use="optional"/>
    <xsd:attribute name="imgW" type="a:ST_PositiveCoordinate32" use="optional"/>
    <xsd:attribute name="imgH" type="a:ST_PositiveCoordinate32" use="optional"/>
  </xsd:attributeGroup>


  <xsd:complexType name="CT_OleObject">
    <xsd:sequence>
      <xsd:choice minOccurs="1" maxOccurs="1">
        <xsd:element name="embed" type="CT_OleObjectEmbed"/>
        <xsd:element name="link" type="CT_OleObjectLink"/>
      </xsd:choice>
      <xsd:element name="pic" type="CT_Picture" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_Ole"/>
    <xsd:attribute name="spid" type="a:ST_ShapeID" use="optional"/>
    <xsd:attribute name="progId" type="xsd:string" use="optional"/>
  </xsd:complexType>


  <xsd:complexType name="CT_Control">
    <xsd:sequence>
      <xsd:element name="extLst" type="CT_ExtensionList" minOccurs="0"
maxOccurs="1"/>
      <xsd:element name="pic" type="CT_Picture" minOccurs="0" maxOccurs="1"/>
    </xsd:sequence>
    <xsd:attributeGroup ref="AG_Ole"/>
    <xsd:attribute name="spid" type="a:ST_ShapeID" use="optional"/>
  </xsd:complexType>

-- 
Cheers,
Makoto<EB2M-MRT at asahi-net.or.jp>