[ttml11] restore Metadata.class children to style element (issue 202)
authorGlenn Adams <glenn@skynav.com>
Wed, 10 Jul 2013 16:56:28 -0600
changeset 442 1732b1109063
parent 441 db8685084429
child 443 780d9656e95c
[ttml11] restore Metadata.class children to style element (issue 202)
ttml11/spec/rnc/schema.zip
ttml11/spec/rnc/ttml11-styling.rnc
ttml11/spec/ttml11.xml
ttml11/spec/xsd/schema.zip
ttml11/spec/xsd/ttml11-styling.xsd
Binary file ttml11/spec/rnc/schema.zip has changed
--- a/ttml11/spec/rnc/ttml11-styling.rnc	Wed Jul 10 16:43:42 2013 -0600
+++ b/ttml11/spec/rnc/ttml11-styling.rnc	Wed Jul 10 16:56:28 2013 -0600
@@ -37,7 +37,8 @@
 
 TTAF.styling.style.content.extra = empty
 TTAF.styling.style.content =
-  (TTAF.styling.style.content.extra)*
+  (TTAF.Metadata.class*,
+   TTAF.styling.style.content.extra*)
 
 # style definitions class
 TTAF.styling.defs.extra = empty
--- a/ttml11/spec/ttml11.xml	Wed Jul 10 16:43:42 2013 -0600
+++ b/ttml11/spec/ttml11.xml	Wed Jul 10 16:56:28 2013 -0600
@@ -3436,7 +3436,7 @@
   <loc href="#content-attribute-space">xml:space</loc> = (<emph>default</emph>|<emph>preserve</emph>)
   {<emph>any attribute in TT Style namespace</emph>}
   {<emph>any attribute not in default or any TT namespace</emph>}&gt;
- <emph>Content:</emph> EMPTY
+  <emph>Content:</emph> <loc href="#element-vocab-group-table">Metadata.class</loc>*
 &lt;/style&gt;
 </eg>
 </td>
Binary file ttml11/spec/xsd/schema.zip has changed
--- a/ttml11/spec/xsd/ttml11-styling.xsd	Wed Jul 10 16:43:42 2013 -0600
+++ b/ttml11/spec/xsd/ttml11-styling.xsd	Wed Jul 10 16:56:28 2013 -0600
@@ -29,6 +29,9 @@
     <xs:attributeGroup ref="tt:styling.attlist"/>
   </xs:complexType>
   <xs:complexType name="style.eltype">
+    <xs:sequence>
+      <xs:group ref="tt:Metadata.class" minOccurs="0" maxOccurs="unbounded"/>
+    </xs:sequence>
     <xs:attributeGroup ref="tt:style.attlist"/>
   </xs:complexType>
   <xs:element name="styling" type="tt:styling.eltype"/>