Make metadata content model consistent with specification (#1169).

w3c · Oct 4, 2019 · 41ebedd · 41ebedd
1 parent 7784b1e
commit 41ebedd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/spec/rnc/ttml2-metadata.rnc b/spec/rnc/ttml2-metadata.rnc
@@ -27,7 +27,8 @@ TTAF.External.class =
 
 TTAF.metadata.content.extra = empty
 TTAF.metadata.content =
-  (TTAF.MetadataItems.class |
+  (TTAF.data |
+   TTAF.MetadataItems.class |
    TTAF.External.class |
    TTAF.metadata.content.extra)*
 

diff --git a/spec/xsd/ttml2-metadata.xsd b/spec/xsd/ttml2-metadata.xsd
@@ -6,14 +6,18 @@
   <xs:include schemaLocation="ttml2-core-attribs.xsd"/>
   <xs:import namespace="http://www.w3.org/ns/ttml#metadata"
     schemaLocation="ttml2-metadata-items.xsd"/>
+  <xs:include schemaLocation="ttml2-embedded.xsd"/>
   <xs:attributeGroup name="metadata.attlist">
     <xs:attributeGroup ref="tt:Core.attrib.class"/>
     <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
   </xs:attributeGroup>
   <xs:complexType name="metadata.eltype">
     <xs:sequence>
-      <xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:choice minOccurs="0" maxOccurs="unbounded">
+        <xs:group ref="tt:Data.class"/>
+        <xs:any namespace="##other" processContents="lax"/>
+      </xs:choice>
     </xs:sequence>
     <xs:attributeGroup ref="tt:metadata.attlist"/>
   </xs:complexType>