Skip to content

Commit

Permalink
Merge branch 'master' into issue-0753-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
@skynavga
skynavga committed May 20, 2018
2 parents da64930 + e91b44d commit 1c396d7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 93 deletions.
5 changes: 3 additions & 2 deletions spec/rnc/ttml2-datatypes.rnc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,9 @@ TTAF.MetadataAgentType.datatype =
"other"

TTAF.MetadataItemName.datatype =
xsd:token |
TTAF.URI.datatype
"altText" |
"usesForced" |
xsd:QName

TTAF.MetadataNameType.datatype =
"full" |
Expand Down
111 changes: 22 additions & 89 deletions spec/ttml2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1908,6 +1908,11 @@ there is a default value, it is shown following a colon. Where an
defined in <bibref ref="xsd-2"/>, a hyperlink to its definition
therein is given.</p>
<p>Unqualified attributes are not permitted unless explicitly defined in this specification.</p>
<note role="elaboration"><p>With the exception of <specref ref="element-derivation"/>, the (possibly namespace qualified) name of an attribute
is prefixed with an '<code>@</code>' (COMMERICAL AT) character in order to disambiguate between the attribute and a like-named element type, in which case
the '<code>@</code>' character is not intended to be part of the literal name of the attribute. For example, <code>@ttm:agent</code>
refers to the <loc href="#metadata-attribute-agent">ttm:agent</loc> attribute, while <code>ttm:agent</code> refers to
<loc href="#metadata-vocabulary-agent">ttm:agent</loc> element.</p></note>
<p>An information item depicted with a <phrase role="deprecated">light yellow orange</phrase> background color is deprecated (e.g.,
the <phrase role="deprecated">tiny</phrase> value of the <code>size</code> attribute shown above).
An information item that is <phrase role="deprecated">deprecated</phrase> may but should not appear in a TTML document instance,
Expand Down Expand Up @@ -3425,10 +3430,10 @@ Metadata.class
</td>
<td>
<loc href="#metadata-vocabulary-metadata">metadata</loc> |
<loc href="#metadata-vocabulary-copyright">ttm:agent</loc> |
<loc href="#metadata-vocabulary-agent">ttm:agent</loc> |
<loc href="#metadata-vocabulary-copyright">ttm:copyright</loc> |
<loc href="#metadata-vocabulary-desc">ttm:desc</loc> |
<loc href="#metadata-vocabulary-desc">ttm:item</loc> |
<loc href="#metadata-vocabulary-item">ttm:item</loc> |
<loc href="#metadata-vocabulary-title">ttm:title</loc>
</td>
</tr>
Expand Down Expand Up @@ -14108,8 +14113,8 @@ bottom of the <loc href="#terms-glyph-area">glyph areas</loc>. If a vertical wri
<gitem>
<label><code>outside</code></label>
<def>
<p>Equivalent to <code>before</code> for all but the last affected line area; otherwise, equivalent to <code>after</code>
for the last affected line area.</p>
<p>Equivalent to <code>before</code> for all but the last line area of the last block area generated by
a <loc href="#content-vocabulary-p"><el>p</el></loc> element which contains annotated text; otherwise, equivalent to <code>after</code>.</p>
</def>
</gitem>
</glist>
Expand Down Expand Up @@ -17673,7 +17678,7 @@ styling of content.</p>
<p>Support ability for author to declare whether a referenced
out-of-line animation's timing is relative to its animation container
element's timing or relative to the referring element's timing. For
example, add an <code>@animateTimeContainer</code> attribute optionally used
example, add an <code>animateTimeContainer</code> attribute optionally used
with the newly defined <code>@animate</code> attribute, where value can be
<code>normal</code> (the default value) or <code>self</code>, and where <code>normal</code> means
timing is with respect to the out-of-line animation element's ancestor
Expand Down Expand Up @@ -20731,7 +20736,7 @@ vocabulary defined by <specref ref="metadata"/>:</p>
<item><p><loc href="#metadata-vocabulary-name"><el>ttm:name</el></loc></p></item>
<item><p><loc href="#metadata-vocabulary-actor"><el>ttm:actor</el></loc></p></item>
<item><p><loc href="#metadata-attribute-agent">@<att>ttm:agent</att></loc></p></item>
<item><p><loc href="#metadata-attribute-role">@<att>ttm:role</att></loc></p></item>
<item><p><loc href="#metadata-attribute-role"><att>ttm:role</att></loc></p></item>
</ulist>
<p>A TTML <loc href="#terms-presentation-processor">presentation processor</loc> supports the <code>#metadata</code>
feature if it recognizes and is capable of presenting the information
Expand Down Expand Up @@ -21114,12 +21119,12 @@ for the same vocabulary specified above.</p>
<p>supports the following vocabulary:</p>
<ulist>
<item>
<p>attributes <code>@combine</code>, <code>@designator</code> and <code>@type</code> on
<p>attributes <code>combine</code>, <code>designator</code> and <code>type</code> on
<loc href="#profile-vocabulary-profile"><el>ttp:profile</el></loc>, and</p>
</item>
<item>
<p>attributes <code>@extends</code> and <code>@restricts</code> and attribute value <code>prohibited</code>
on attribute <code>@value</code> on
<p>attributes <code>extends</code> and <code>restricts</code> and attribute value <code>prohibited</code>
on attribute <code>value</code> on
<loc href="#profile-vocabulary-feature"><el>ttp:feature</el></loc> and
<loc href="#profile-vocabulary-extension"><el>ttp:extension</el></loc>.</p>
</item>
Expand Down Expand Up @@ -25052,6 +25057,9 @@ European Broadcasting Union (EBU), March 2015.
<bibl id="ebuttlive" key="EBU-TT-Live">EBU Tech 3370,
<titleref href="https://tech.ebu.ch/publications/tech3370">EBU-TT Part 3 Live Subtitling Applications, Version 1.0</titleref>, European Broadcasting Union (EBU), May 2017.
(See <xspecref href="https://tech.ebu.ch/publications/tech3370">https://tech.ebu.ch/publications/tech3370</xspecref>.)</bibl>
<bibl id="DVBSS" key="DVBSS">ETSI EN 300 743,
<titleref href="http://www.etsi.org/deliver/etsi_en/300700_300799/300743/01.05.01_60/en_300743v010501p.pdf">Digital Video Broadcasting (DVB); Subtitling systems, Version 1.5.1</titleref>, ETSI, January 2014.
(See <xspecref href="http://www.etsi.org/deliver/etsi_en/300700_300799/300743/01.05.01_60/en_300743v010501p.pdf">http://www.etsi.org/deliver/etsi_en/300700_300799/300743/01.05.01_60/en_300743v010501p.pdf (PDF)</xspecref>.)</bibl>
<bibl id="html52" key="HTML 5.2">Steve Faulkner, Arron Eicholz, Travis Leithead, Alex Danilo, and Sangwhan Moon, Eds.,
<titleref href="http://www.w3.org/TR/2017/REC-html52-20171214/">HTML 5.2</titleref>,
W3C Recommendation, 14 December 2017. (See
Expand Down Expand Up @@ -26570,33 +26578,9 @@ as <code>aqua</code>. The named color <code>orange</code> is not supported.</td>
</div4>
<div4 id="derivation-disparity">
<head><loc href="#style-attribute-disparity">tts:disparity</loc></head>
<!--
<ednote>
<edtext>Complete when/if a derivation is available, or specify "none"</edtext>
</ednote>
--><p/>
<table role="common">
<col css="width: 20%;"/>
<col css="width: 80%;"/>
<tbody>
<tr>
<td><phrase role="strong">Reference</phrase></td>
<td>insert ref</td>
</tr>
<tr>
<td><phrase role="strong">Model</phrase></td>
<td>insert model</td>
</tr>
<tr>
<td><phrase role="strong">Values</phrase></td>
<td>insert values</td>
</tr>
<tr>
<td><phrase role="strong">Notes</phrase></td>
<td>insert notes</td>
</tr>
</tbody>
</table>
<p>No derivation, i.e., introduced in this specification.</p>
<note role="elaboration"><p>The computed value of <code>tts:disparity</code> is equivalent to half the
disparity shift value defined in <bibref ref="DVBSS"/>.</p></note>
</div4>
<div4 id="derivation-display">
<head><loc href="#style-attribute-display">tts:display</loc></head>
Expand Down Expand Up @@ -27071,32 +27055,7 @@ as defined by <bibref ref="xsl11"/>, &sect; 4.5, i.e., that a CSS-style line box
</div4>
<div4 id="derivation-luminanceGain">
<head><loc href="#style-attribute-luminanceGain">tts:luminanceGain</loc></head>
<!--
<ednote><edtext>Complete when/if a derivation is available, or specify "none"</edtext></ednote>
-->
<p></p>
<table role="common">
<col css="width: 20%;"/>
<col css="width: 80%;"/>
<tbody>
<tr>
<td><phrase role="strong">Reference</phrase></td>
<td>insert ref</td>
</tr>
<tr>
<td><phrase role="strong">Model</phrase></td>
<td>insert model</td>
</tr>
<tr>
<td><phrase role="strong">Values</phrase></td>
<td>insert values</td>
</tr>
<tr>
<td><phrase role="strong">Notes</phrase></td>
<td>insert notes</td>
</tr>
</tbody>
</table>
<p>No derivation, i.e., introduced in this specification.</p>
</div4>
<div4 id="derivation-opacity">
<head><loc href="#style-attribute-opacity">tts:opacity</loc></head>
Expand Down Expand Up @@ -27347,33 +27306,7 @@ defined in this specification.</td>
</div4>
<div4 id="derivation-rubyReserve">
<head><loc href="#style-attribute-rubyReserve">tts:rubyReserve</loc></head>
<!--
<ednote>
<edtext>Complete when/if a derivation is available, or specify "none"</edtext>
</ednote>
--><p/>
<table role="common">
<col css="width: 20%;"/>
<col css="width: 80%;"/>
<tbody>
<tr>
<td><phrase role="strong">Reference</phrase></td>
<td>insert ref</td>
</tr>
<tr>
<td><phrase role="strong">Model</phrase></td>
<td>insert model</td>
</tr>
<tr>
<td><phrase role="strong">Values</phrase></td>
<td>insert values</td>
</tr>
<tr>
<td><phrase role="strong">Notes</phrase></td>
<td>insert notes</td>
</tr>
</tbody>
</table>
<p>No derivation, i.e., introduced in this specification.</p>
</div4>
<div4 id="derivation-showBackground">
<head><loc href="#style-attribute-showBackground">tts:showBackground</loc></head>
Expand Down
7 changes: 5 additions & 2 deletions spec/xsd/ttml2-datatypes.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,13 @@
<xs:simpleType name="metadataItemName">
<xs:union>
<xs:simpleType>
<xs:restriction base="xs:token"/>
<xs:restriction base="xs:token">
<xs:enumeration value="altText"/>
<xs:enumeration value="usesForced"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType>
<xs:restriction base="xs:anyURI"/>
<xs:restriction base="xs:QName"/>
</xs:simpleType>
</xs:union>
</xs:simpleType>
Expand Down

0 comments on commit 1c396d7

Please sign in to comment.