Skip to content

Commit

Permalink
Merge pull request #920 from w3c/issue-0919-isd-extent
Browse files Browse the repository at this point in the history
Add @extent to isd:{sequence,isd} (#919).
  • Loading branch information
skynavga committed Jul 23, 2018
2 parents 4425cb6 + 6d0e713 commit a366d17
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 9 deletions.
2 changes: 2 additions & 0 deletions spec/rnc/ttml2-isd.rnc
Expand Up @@ -30,6 +30,7 @@ TTAF.isd.sequence =
}

TTAF.isd.sequence.attlist &=
attribute extent { string }?,
attribute size { xsd:nonNegativeInteger }?,
attribute version { xsd:nonNegativeInteger }?,
TTAF.base.attrib,
Expand All @@ -55,6 +56,7 @@ TTAF.isd.isd =
TTAF.isd.isd.attlist &=
attribute begin { string },
attribute end { string },
attribute extent { string }?,
attribute version { xsd:nonNegativeInteger }?,
TTAF.base.attrib,
TTAF.id.attrib,
Expand Down
38 changes: 30 additions & 8 deletions spec/ttml2.xml
Expand Up @@ -5773,10 +5773,10 @@ zero or one <el>body</el> element.</p>
implicit duration of the <el>body</el> element of the document, if the <el>body</el> element is present, or zero, if the <el>body</el> element is absent.</p>
<p>If the <loc href="#style-attribute-extent"><att>tts:extent</att></loc> attribute is specified on the <el>tt</el>
element, then it must adhere to <specref ref="style-attribute-extent"/>, in which case it
specifies the spatial extent of the <loc href="#terms-root-container-region">root container region</loc> in
specifies the <termref def="defs-spatial-extent">spatial extent</termref> of the <loc href="#terms-root-container-region">root container region</loc> in
which <loc href="#terms-content-region">content regions</loc> are located and presented. If no <att>tts:extent</att>
attribute is specified, then the spatial extent of the <loc href="#terms-root-container-region">root container region</loc> is
determined by rules specified in <specref ref="root-container-region-semantics"/>.
attribute is specified, then the <termref def="defs-spatial-extent">spatial extent</termref> of the
<loc href="#terms-root-container-region">root container region</loc> is determined by rules specified in <specref ref="root-container-region-semantics"/>.
The origin of the <loc href="#terms-root-container-region">root container region</loc> is determined by the <loc href="#terms-document-processing-context">document processing context</loc>.</p>
<note role="clarification">
<p>In the absence of other requirements, and if a <loc href="#terms-related-media-object">related media object</loc> exists, then it is recommended
Expand Down Expand Up @@ -24350,7 +24350,7 @@ express minimum compliance for transformation processing.</p>
<p>This appendix specifies the semantics for determining essential characteristics of the root container region and its use, including:</p>
<ulist>
<item><p>aspect ratios (display, storage, pixel);</p></item>
<item><p>resolution (spatial extent); and</p></item>
<item><p>resolution (<termref def="defs-spatial-extent">spatial extent</termref>); and</p></item>
<item><p>coordinate space.</p></item>
</ulist>
<div2 id="root-container-region-semantics-aspect-ratios">
Expand Down Expand Up @@ -24486,13 +24486,15 @@ the number of rows signifies the resolution of the root container region on the
former is defined to be the <loc href="#terms-width">width</loc> and the
latter is defined to be the <loc href="#terms-height">height</loc> of the root container region, respectively,
and where the collection of (these two) resolutions along both axes is referred to as the
<emph>collective resolution</emph> (or <emph>spatial extent</emph>) of the root container region.</p>
<termdef id="defs-collective-resolution" term=""><term>collective resolution</term></termdef>, also called the
<termdef id="defs-spatial-extent" term=""><term>spatial extent</term></termdef>, of the root container region.</p>
<p>If the value of the <loc href="#style-attribute-extent">tts:extent</loc> attribute
is specified on the <loc href="#document-structure-vocabulary-tt"><el>tt</el></loc> element and consists of
two pixel-valued <loc href="#style-value-length">&lt;length&gt;</loc> expressions, then these two expressions denote
the <loc href="#terms-width">width</loc> and <loc href="#terms-height">height</loc> of the root container region, and,
consequently, determine its collective resolution;
otherwise, the collective resolution of the root container region is determined (arbitrarily) by the <loc href="#terms-document-processing-context">document
consequently, determine its <termref def="defs-collective-resolution">collective resolution</termref>;
otherwise, the <termref def="defs-collective-resolution">collective resolution</termref> of the root container region is determined (arbitrarily)
by the <loc href="#terms-document-processing-context">document
processing context</loc> in a manner that respects the resolved values of <code>SAR</code> as determined by
<specref ref="root-container-region-semantics-aspect-ratios"/> above.</p>
<note role="elaboration">
Expand Down Expand Up @@ -25068,7 +25070,7 @@ Synchronic Document Sequence</loc> document.</p>
<p>The <el>isd:sequence</el> element accepts as its children zero or more <loc href="#metadata-vocabulary-metadata"><el>ttm:metadata</el></loc> elements,
followed by zero or one <loc href="#profile-vocabulary-profile"><el>ttp:profile</el></loc> element,
followed by zero or more <loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> elements.</p>
<p>Child <el>isd:isd</el> elements must be ordered in accordance to the media time equivalent of their
<p>Children <el>isd:isd</el> elements must be ordered in accordance to the media time equivalent of their
begin time; furthermore, the temporal intervals of any two child <loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> elements must not overlap (in time).</p>
<table id="elt-syntax-isd-sequence" role="syntax">
<caption>XML Representation &ndash; Element Information Item: isd:sequence</caption>
Expand All @@ -25077,6 +25079,7 @@ begin time; furthermore, the temporal intervals of any two child <loc href="#isd
<td>
<eg xml:space="preserve">
&lt;isd:sequence
extent = <loc href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</loc>
size = <loc href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</loc>
version = <loc href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</loc>
<loc href="#content-attribute-xml-base">xml:base</loc> = <loc href="#content-value-uri">&lt;uri&gt;</loc>
Expand All @@ -25090,6 +25093,12 @@ begin time; furthermore, the temporal intervals of any two child <loc href="#isd
</tr>
</tbody>
</table>
<p>If the <att>extent</att> attribute is specified, then it must adhere to the subset of the <loc href="#style-value-extent">&lt;extent&gt;</loc> value
syntax that consists of two pixel-valued <loc href="#style-value-length">&lt;length&gt;</loc> expressions, in which case, the specified value
expresses the <termref def="defs-spatial-extent">spatial extent</termref> of the root container region as defined by
<specref ref="root-container-region-semantics-resolution"/>,
where this <termref def="defs-spatial-extent">spatial extent</termref> applies globally to each each constituent
<loc href="#terms-intermediate-synchronic-document">Intermediate Synchronic Document</loc> represented by a child <el>isd:isd</el> element.</p>
<p>If the <att>size</att> attribute is specified, then it must be a non-negative integer corresponding to the number of
<loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> child elements.
If not specified, then the size must be considered to be <emph>indefinite</emph>, unless and until the
Expand Down Expand Up @@ -25156,6 +25165,7 @@ followed by zero or more <loc href="#isd-vocabulary-region"><el>isd:region</el><
&lt;isd:isd
<loc href="#timing-attribute-begin"><phrase role="reqattr">begin</phrase></loc> = <loc href="#timing-value-time-expression">&lt;time-expression&gt;</loc>
<loc href="#timing-attribute-end"><phrase role="reqattr">end</phrase></loc> = <loc href="#timing-value-time-expression">&lt;time-expression&gt;</loc> | <emph>"indefinite"</emph>
extent = <loc href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</loc>
version = <loc href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</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
Expand Down Expand Up @@ -25186,6 +25196,18 @@ or there is no temporal end point.</p>
<p>Expressed in the terminology of <bibref ref="smil3"/>, the values of these <att>begin</att> and <att>end</att> attributes
correspond to the resolved begin and end times of the <emph>active duration</emph> with respect to the <emph>document begin</emph>.</p>
</note>
<p>If the <att>extent</att> attribute is specified, then it must adhere to the subset of the <loc href="#style-value-extent">&lt;extent&gt;</loc> value
syntax that consists of two pixel-valued <loc href="#style-value-length">&lt;length&gt;</loc> expressions, in which case, the specified value
expresses the <termref def="defs-spatial-extent">spatial extent</termref> of the root container region as defined by
<specref ref="root-container-region-semantics-resolution"/>, where this <termref def="defs-spatial-extent">spatial extent</termref>
applies to the <loc href="#terms-intermediate-synchronic-document">Intermediate Synchronic Document</loc>
represented by this <el>isd:isd</el> element. Furthermore,
if this <loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> element is contained in an
<loc href="#terms-intermediate-synchronic-document-sequence">Intermediate Synchronic Document Sequence</loc> document, then
if the container <loc href="#isd-vocabulary-sequence"><el>isd:sequence</el></loc> element specifies an
<att>extent</att> attribute, then this <loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> element
should not specify an <att>extent</att> attribute, and, if specified, must be equal to the value of the
<att>extent</att> attribute specified on the container <loc href="#isd-vocabulary-sequence"><el>isd:sequence</el></loc> element.</p>
<p>An <loc href="#content-attribute-xml-lang"><att>xml:lang</att></loc> attribute must be specified on the
<loc href="#isd-vocabulary-isd"><el>isd:isd</el></loc> element if it is a standalone <loc href="#terms-intermediate-synchronic-document">Intermediate
Synchronic Document</loc> document; otherwise, it may be specified, and should be specified if the default language of the
Expand Down
2 changes: 1 addition & 1 deletion spec/xsd/ttml2-datatypes.xsd
Expand Up @@ -170,7 +170,7 @@
</xs:simpleType>
<xs:simpleType name="extent">
<xs:annotation>
<xs:documentation>auto | measure measure</xs:documentation>
<xs:documentation>auto | contain | cover | measure measure</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string"/>
</xs:simpleType>
Expand Down
2 changes: 2 additions & 0 deletions spec/xsd/ttml2-isd.xsd
Expand Up @@ -34,6 +34,7 @@
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:attributeGroup>
<xs:attributeGroup name="sequence.attlist">
<xs:attribute name="extent" type="xs:string"/>
<xs:attribute name="size" type="xs:nonNegativeInteger"/>
<xs:attribute name="version" type="xs:nonNegativeInteger"/>
<xs:attribute ref="xml:base"/>
Expand All @@ -53,6 +54,7 @@
<xs:attributeGroup name="isd.attlist">
<xs:attribute name="begin" type="xs:string" use="required"/>
<xs:attribute name="end" type="xs:string" use="required"/>
<xs:attribute name="extent" type="xs:string"/>
<xs:attribute name="version" type="xs:nonNegativeInteger"/>
<xs:attribute ref="xml:base"/>
<xs:attribute ref="xml:id"/>
Expand Down

0 comments on commit a366d17

Please sign in to comment.