From 41ebedd53bbdbbfb05ad3d3e0cecbdfc72b56d90 Mon Sep 17 00:00:00 2001
From: Glenn Adams <glenn@skynav.com>
Date: Fri, 4 Oct 2019 11:14:29 +0800
Subject: [PATCH] Make metadata content model consistent with specification
 (#1169).

---
 spec/rnc/ttml2-metadata.rnc | 3 ++-
 spec/xsd/ttml2-metadata.xsd | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/spec/rnc/ttml2-metadata.rnc b/spec/rnc/ttml2-metadata.rnc
index c1899fa23..73dfcfa8d 100644
--- 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
index f632874b6..ba055cd2f 100644
--- a/spec/xsd/ttml2-metadata.xsd
+++ b/spec/xsd/ttml2-metadata.xsd
@@ -6,6 +6,7 @@
   <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"/>
@@ -13,7 +14,10 @@
   </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>