Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve confusion between default and implicit (#590). #652

Merged
merged 6 commits into from
Jun 7, 2018
Merged

Resolve confusion between default and implicit (#590). #652

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3a6e55c
Resolve confusion between default and implicit (#590).
skynavga Feb 12, 2018
0d770c5
Merge branch 'master' into issue-0590-default-vs-implicit
skynavga May 31, 2018
ad4ac88
Address comments (https://github.com/w3c/ttml2/pull/652#pullrequestre…
skynavga Jun 5, 2018
1a7f761
Merge branch 'master' into issue-0590-default-vs-implicit
skynavga Jun 6, 2018
2820761
Tweak to trigger travis.
skynavga Jun 6, 2018
ed84506
Merge branch 'master' into issue-0590-default-vs-implicit
skynavga Jun 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak to trigger travis.
  • Loading branch information
@skynavga
skynavga committed Jun 6, 2018
commit 2820761dc1df1ac187eb0154f81bd9b473605435
4 changes: 2 additions & 2 deletions spec/ttml2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17350,8 +17350,8 @@ by <bibref ref="smil3"/>, &sect;5.4.3,
while taking into account any overriding semantics defined by this specification.</p>
<note role="clarification">
<p>As defined by <bibref ref="smil3"/>, &sect;5.4.3,
if no <att>begin</att> attribute is explicitly specified on a <loc href="#terms-timed-element">timed element</loc>, then the default value of the attribute
is determined by the nearest time container ancestor; however, in TTML, that ancestor is either
if no <att>begin</att> attribute is explicitly specified on a <loc href="#terms-timed-element">timed element</loc>,
then the default value of the attribute is determined by the nearest time container ancestor; however, in TTML, that ancestor is either
a parallel time container or a sequential time container, both of which apply a default value of <code>0s</code>.</p>
</note>
</div3>
Expand Down