Merge
authorGlenn Adams <glenn@skynav.com>
Thu, 07 May 2015 08:25:58 -0600
changeset 924 3556401a69da
parent 923 05c346c166ba (current diff)
parent 920 69387b985df8 (diff)
child 925 2f15fa8705d9
Merge
ttml2/spec/ednotes.xlsx
ttml2/spec/ttml2.xml
--- a/ttml2/spec/ttml2.xml	Thu May 07 08:21:48 2015 -0600
+++ b/ttml2/spec/ttml2.xml	Thu May 07 08:25:58 2015 -0600
@@ -8571,7 +8571,8 @@
 <ednote>
 <name>Semantics of contain and cover</name>
 <date>2015-01-05</date>
-<edtext>Define semantics of new <code>contain</code> and <code>cover</code> values. Exclude these values from use with an <el>image</el> element.</edtext>
+<edtext>Define semantics of new <code>contain</code> and <code>cover</code> values. Exclude these values from use with an <el>image</el> element.
+Enlarge usage of extent on root (tt) element to permit use of <code>contain</code> and <code>cover</code>.</edtext>
 </ednote>
 <p>The extent of the <loc href="#terms-root-container-region">root container region</loc> is determined either by a
 <att>tts:extent</att> specified on the <el>tt</el> element, if
--- a/ttml2/spec/xsd/ttml2-animation.xsd	Thu May 07 08:21:48 2015 -0600
+++ b/ttml2/spec/xsd/ttml2-animation.xsd	Thu May 07 08:25:58 2015 -0600
@@ -9,6 +9,7 @@
   <xs:include schemaLocation="ttml2-core-attribs.xsd"/>
   <xs:include schemaLocation="ttml2-timing-attribs.xsd"/>
   <xs:include schemaLocation="ttml2-metadata.xsd"/>
+  <xs:include schemaLocation="ttml2-styling.xsd"/>
   <xs:import namespace="http://www.w3.org/ns/ttml#styling"
     schemaLocation="ttml2-styling-attribs.xsd"/>
   <xs:import namespace="http://www.w3.org/ns/ttml#datatype"