Merge pull request #962 from w3c/issue-0961-chunk

Remove xml:base and @condition from chunk (#961).
w3c · Aug 2, 2019 · 5d09f97 · 5d09f97
2 parents d8995c4 + c744df1
commit 5d09f97
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 5 deletions.
diff --git a/spec/rnc/ttml2-embedded.rnc b/spec/rnc/ttml2-embedded.rnc
@@ -57,9 +57,7 @@ TTAF.chunk =
   }
 
 TTAF.chunk.attlist &=
-  TTAF.base.attrib,
   TTAF.id.attrib,
-  TTAF.condition.attrib,
   TTAF.encoding.attrib,
   TTAF.length.attrib
 

diff --git a/spec/ttml2.xml b/spec/ttml2.xml
@@ -7272,10 +7272,8 @@ If no <code>clipEnd</code> attribute is specified, then a value equal to the int
 <td>
 <eg xml:space="preserve">
 &lt;chunk
-  <loc href="#content-attribute-condition">condition</loc> = <loc href="#content-value-condition">&lt;condition&gt;</loc>
   <loc href="#embedded-content-attribute-encoding">encoding</loc> = (<emph>"base16"</emph> | <emph>"base32"</emph> | <emph>"base32hex"</emph> | <emph>"base64"</emph> | <emph>"base64url"</emph>) : base64
   length = <loc href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</loc>
-  <loc href="#content-attribute-xml-base">xml:base</loc> = <loc href="#content-value-uri">&lt;uri&gt;</loc>
   <loc href="#content-attribute-xml-id">xml:id</loc> = ID
   <emph>Content:</emph> #PCDATA
 &lt;/chunk&gt;

diff --git a/spec/xsd/ttml2-embedded.xsd b/spec/xsd/ttml2-embedded.xsd
@@ -27,7 +27,6 @@
   </xs:attributeGroup>
   <xs:attributeGroup name="chunk.attlist">
     <xs:attributeGroup ref="tt:Core.ID.attrib.class"/>
-    <xs:attributeGroup ref="tt:Core.Condition.attrib.class"/>
     <xs:attribute name="encoding" type="ttd:dataEncoding"/>
     <xs:attribute name="length" type="ttd:dataLength"/>
   </xs:attributeGroup>