Restore region binding, add onScreen to div

w3c · Dec 3, 2024 · ff2d5ca · ff2d5ca
1 parent d05ca6f
commit ff2d5ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/xml-schemas/ttml2-content.xsd b/xml-schemas/ttml2-content.xsd
@@ -25,27 +25,31 @@
     <xs:attributeGroup ref="tt:Core.attrib.class"/>
     <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attributeGroup ref="tt:TimedContainer.attrib.class"/>
+    <xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
     <xs:attributeGroup ref="tt:Styled.attrib.class"/>
     <xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="div.attlist">
     <xs:attributeGroup ref="tt:Core.attrib.class"/>
     <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attributeGroup ref="tt:TimedContainer.attrib.class"/>
+    <xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
     <xs:attributeGroup ref="tt:Styled.attrib.class"/>
     <xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="p.attlist">
     <xs:attributeGroup ref="tt:Core.attrib.class"/>
     <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attributeGroup ref="tt:TimedContainer.attrib.class"/>
+    <xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
     <xs:attributeGroup ref="tt:Styled.attrib.class"/>
     <xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
   </xs:attributeGroup>
   <xs:attributeGroup name="span.attlist">
     <xs:attributeGroup ref="tt:Core.attrib.class"/>
     <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attributeGroup ref="tt:TimedContainer.attrib.class"/>
+    <xs:attributeGroup ref="tt:RegionBinding.attrib.class"/>
     <xs:attributeGroup ref="tt:Styled.attrib.class"/>
     <xs:attributeGroup ref="ttm:Metadata.attrib.class"/>
     <xs:attributeGroup ref="xlink:simpleAttrs"/>
@@ -82,6 +86,7 @@
         </xs:sequence>
         <xs:attribute ref="xml:id" use="required"/>
         <xs:attribute ref="daptm:langSrc"/>
+        <xs:attribute ref="daptm:onScreen"/>
         <xs:attribute ref="daptm:represents"/>
       </xs:restriction>
     </xs:complexContent>

diff --git a/xml-schemas/ttml2-layout.xsd b/xml-schemas/ttml2-layout.xsd
@@ -8,6 +8,7 @@
   <xs:include schemaLocation="ttml2-timing-attribs.xsd"/>
   <xs:include schemaLocation="ttml2-metadata.xsd"/>
   <xs:include schemaLocation="ttml2-animation.xsd"/>
+  <xs:include schemaLocation="ttml2-layout.xsd"/>
   <xs:include schemaLocation="ttml2-styling.xsd"/>
   <xs:import namespace="http://www.w3.org/ns/ttml#styling"
     schemaLocation="ttml2-styling-attribs.xsd"/>