--- a/.hgignore Fri Jun 06 16:23:09 2014 -0700
+++ b/.hgignore Mon Jun 16 20:33:15 2014 -0700
@@ -1,3 +1,4 @@
syntax: glob
*~
*.esc
+Thumbs.db
--- a/ttml-ww-profiles/ttml-ww-profiles.html Fri Jun 06 16:23:09 2014 -0700
+++ b/ttml-ww-profiles/ttml-ww-profiles.html Mon Jun 16 20:33:15 2014 -0700
@@ -217,11 +217,11 @@
</p>
<h1 class="title p-name" id="title" property="dcterms:title">TTML Text and Image Profiles for Internet Media Subtitles and Captions 1.0</h1>
- <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-06-07T06:22:11.000Z" id="w3c-first-public-working-draft-06-june-2014"><abbr title="World Wide Web Consortium">W3C</abbr> First Public Working Draft <time class="dt-published" datetime="2014-06-06">06 June 2014</time></h2>
+ <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-06-17T10:28:18.000Z" id="w3c-first-public-working-draft-17-june-2014"><abbr title="World Wide Web Consortium">W3C</abbr> First Public Working Draft <time class="dt-published" datetime="2014-06-17">17 June 2014</time></h2>
<dl>
<dt>This version:</dt>
- <dd><a class="u-url" href="http://www.w3.org/TR/2014/WD-ttml-imsc1-20140606/">http://www.w3.org/TR/2014/WD-ttml-imsc1-20140606/</a></dd>
+ <dd><a class="u-url" href="http://www.w3.org/TR/2014/WD-ttml-imsc1-20140617/">http://www.w3.org/TR/2014/WD-ttml-imsc1-20140617/</a></dd>
<dt>Latest published version:</dt>
<dd><a href="http://www.w3.org/TR/ttml-imsc1/">http://www.w3.org/TR/ttml-imsc1/</a></dd>
@@ -660,9 +660,6 @@
<code>itts:forcedDisplay</code> is <code>true</code>, regardless of whether the user has explicitly requested display of
subtitle content.</p>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_4"><span>Note</span></div><p class="">The algorithm for selecting subtitle and caption tracks based on user preference and content metadata is
- not specified here.</p></div>
-
<table class="simple">
<colgroup>
<col style="width:25%" span="1">
@@ -707,11 +704,16 @@
</tr>
</tbody>
</table>
-
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_5"><span>Note</span></div><p class="">Although <code>itts:forcedDisplay</code>, like all the TTML style attributes, has no defined semantics on a
+
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_4"><span>Note</span></div><p class="">Although <code>itts:forcedDisplay</code>, like all the TTML style attributes, has no defined semantics on a
<code>br</code> content element, <code>itts:forcedDisplay</code> will apply to a <code>br</code> content element if it is
either defined on an ancestor content element of the <code>br</code> content element or it is applied to a region element
corresponding to a region that the <code>br</code> content element is being flowed into.</p></div>
+
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_5"><span>Note</span></div><p class="">The algorithm for selecting subtitle and caption tracks based on user preference and content metadata is
+ not specified here.</p></div>
+
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_6"><span>Note</span></div><p class="">Future versions of [<cite><a class="bibref" href="#bib-TTML1">TTML1</a></cite>] might introduce more generic mechanisms for conditional display of content elements.</p></div>
</section>
</section>
@@ -739,7 +741,7 @@
</li>
</ol>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_6"><span>Note</span></div><p class="">As specified in [<cite><a class="bibref" href="#bib-TTML1">TTML1</a></cite>], the initial value of <code>tts:opacity</code> is "1.0", the initial
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_7"><span>Note</span></div><p class="">As specified in [<cite><a class="bibref" href="#bib-TTML1">TTML1</a></cite>], the initial value of <code>tts:opacity</code> is "1.0", the initial
value of <code>tts:showBackground</code> is "always", and the initial value of <code>tts:display</code> is
"auto"</p></div>
</section>
@@ -1205,7 +1207,7 @@
</tbody>
</table>
- <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_7"><span>Note</span></div><p class="">As specified in [<cite><a class="bibref" href="#bib-TTML1">TTML1</a></cite>], a <code>#time-offset-with-frames</code> expression is translated to a media time
+ <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_8"><span>Note</span></div><p class="">As specified in [<cite><a class="bibref" href="#bib-TTML1">TTML1</a></cite>], a <code>#time-offset-with-frames</code> expression is translated to a media time
M according to M = 3600 · hours + 60 · minutes + seconds + (frames ÷ (<code>ttp:frameRateMultiplier</code> ·
<code>ttp:frameRate</code>)).</p></div>
</section>
@@ -1387,12 +1389,6 @@
</tr>
<tr>
- <td><code>#image</code></td>
-
- <td><em class="rfc2119" title="SHALL NOT">SHALL NOT</em> be used.</td>
- </tr>
-
- <tr>
<td><code>#length-em</code></td>
<td><em class="rfc2119" title="MAY">MAY</em> be used.</td>
@@ -1678,12 +1674,6 @@
</tr>
<tr>
- <td><code>#image</code></td>
-
- <td><em class="rfc2119" title="SHALL NOT">SHALL NOT</em> be used.</td>
- </tr>
-
- <tr>
<td><code>#length-em</code></td>
<td><em class="rfc2119" title="SHALL NOT">SHALL NOT</em> be used.</td>
@@ -1876,7 +1866,7 @@
P<sub>n-1</sub> at the presentation time of intermediate synchronic document E<sub>n</sub>, making the latter available for
display.</p>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_8"><span>Note</span></div><p class="">It is possible for the contents of Presentation Buffer P<sub>n-1</sub> to never be displayed. This can
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_9"><span>Note</span></div><p class="">It is possible for the contents of Presentation Buffer P<sub>n-1</sub> to never be displayed. This can
happen if Presentation Buffer P<sub>n</sub> is copied twice to Presentation Buffer P<sub>n-1</sub> between two consecutive
video frame boundaries of the related video object.</p></div>
@@ -1909,11 +1899,11 @@
</tbody>
</table>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_9"><span>Note</span></div><p class="">BDraw effectively sets a limit on fillings regions - for example, assuming that the root container is
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_10"><span>Note</span></div><p class="">BDraw effectively sets a limit on fillings regions - for example, assuming that the root container is
ultimately rendered at 1920×1080 resolution, a BDraw of 12 s<sup>-1</sup> would correspond to a fill rate of
1920×1080×12/s=23.7×2<sup>20</sup>pixels s<sup>-1</sup>.</p></div>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_10"><span>Note</span></div><p class="">IPD effectively sets a limit on the complexity of any given intermediate synchronic document.</p></div>
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_11"><span>Note</span></div><p class="">IPD effectively sets a limit on the complexity of any given intermediate synchronic document.</p></div>
</section>
<section id="paint-regions" typeof="bibo:Chapter" resource="#paint-regions" rel="bibo:Chapter">
@@ -1925,7 +1915,7 @@
<p>where CLEAR(E<sub>0</sub>) = 0 and CLEAR(E<sub>n | n > 0</sub>) = 1, i.e. the root container in its entirety.</p>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_11"><span>Note</span></div><p class="">To ensure consistency of the Presentation Buffer, a new intermediate synchronic document requires clearing
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_12"><span>Note</span></div><p class="">To ensure consistency of the Presentation Buffer, a new intermediate synchronic document requires clearing
of the root container.</p></div>
<p>PAINT(E<sub>n</sub>) <em class="rfc2119" title="SHALL">SHALL</em> be the normalized area to be painted for all regions that are used in intermediate synchronic
@@ -2176,7 +2166,7 @@
</tbody>
</table>
- <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_12"><span>Note</span></div><p class="">NRGA(G<sub>i</sub>) does not take into account glyph decorations (e.g. underline), glyph effects (e.g.
+ <div class="note"><div class="note-title" aria-level="4" role="heading" id="h_note_13"><span>Note</span></div><p class="">NRGA(G<sub>i</sub>) does not take into account glyph decorations (e.g. underline), glyph effects (e.g.
outline) or actual glyph aspect ratio. An implementation can determine an actual buffer size needs based on worst-case
glyph size complexity.</p></div>
@@ -2257,10 +2247,10 @@
</tbody>
</table>
- <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_13"><span>Note</span></div><p class="">Implementations can use use fonts other than those specified above. Two fonts with equal metrics can have a
+ <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_14"><span>Note</span></div><p class="">Implementations can use use fonts other than those specified above. Two fonts with equal metrics can have a
different appearance, but flow identically.</p></div>
- <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_14"><span>Note</span></div><p class="">proportionalSansSerif is not used in practice for Hebrew and Arabic captions and subtitles.</p></div>
+ <div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_15"><span>Note</span></div><p class="">proportionalSansSerif is not used in practice for Hebrew and Arabic captions and subtitles.</p></div>
</section>
</section>
@@ -2647,7 +2637,7 @@
<section id="references" class="appendix" typeof="bibo:Chapter" resource="#references" rel="bibo:Chapter"><!--OddPage--><h2 aria-level="1" role="heading" id="h2_references"><span class="secno">C. </span>References</h2><section id="normative-references" typeof="bibo:Chapter" resource="#normative-references" rel="bibo:Chapter"><h3 aria-level="2" role="heading" id="h3_normative-references"><span class="secno">C.1 </span>Normative references</h3><dl class="bibliography" about=""><dt id="bib-CLDR">[CLDR]</dt><dd rel="dcterms:requires">Unicode Consortium. <a href="http://cldr.unicode.org">The Common Locale Data Repository Project</a>
</dd><dt id="bib-MHP">[MHP]</dt><dd rel="dcterms:requires">ETSI TS 101 812 V1.3.1, Digital Video Broadcasting (DVB); Multimedia Home
-</dd><dt id="bib-RFC2119">[RFC2119]</dt><dd rel="dcterms:requires">S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key words for use in RFCs to Indicate Requirement Levels.</cite></a> March 1997. Internet RFC 2119. URL: <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>
+</dd><dt id="bib-RFC2119">[RFC2119]</dt><dd rel="dcterms:requires">S. Bradner. <a href="http://www.ietf.org/rfc/rfc2119.txt"><cite>Key words for use in RFCs to Indicate Requirement Levels</cite></a>. March 1997. Best Current Practice. URL: <a href="http://www.ietf.org/rfc/rfc2119.txt">http://www.ietf.org/rfc/rfc2119.txt</a>
</dd><dt id="bib-ST2052-1">[ST2052-1]</dt><dd rel="dcterms:requires">SMPTE ST 2052-1, Timed Text Format (SMPTE-TT)
</dd><dt id="bib-TTML1">[TTML1]</dt><dd rel="dcterms:requires">Glenn Adams, Ed., <a href="http://www.w3.org/TR/ttml1/"><cite>Timed Text Markup Language 1 (TTML1) (Second Edition)</cite></a>, W3C Recommendation, 24 September 2013. URL: <a href="http://www.w3.org/TR/2013/REC-ttml1-20130924/">http://www.w3.org/TR/2013/REC-ttml1-20130924/</a>
</dd><dt id="bib-UNICODE">[UNICODE]</dt><dd rel="dcterms:requires"><a href="http://www.unicode.org/versions/latest/"><cite>The Unicode Standard</cite></a>. URL: <a href="http://www.unicode.org/versions/latest/">http://www.unicode.org/versions/latest/</a>
--- a/ttml-ww-profiles/ttml-ww-profiles.source.html Fri Jun 06 16:23:09 2014 -0700
+++ b/ttml-ww-profiles/ttml-ww-profiles.source.html Mon Jun 16 20:33:15 2014 -0700
@@ -365,9 +365,6 @@
<code>itts:forcedDisplay</code> is <code>true</code>, regardless of whether the user has explicitly requested display of
subtitle content.</p>
- <p class='note'>The algorithm for selecting subtitle and caption tracks based on user preference and content metadata is
- not specified here.</p>
-
<table class="simple">
<colgroup>
<col style="width:25%" span="1">
@@ -412,11 +409,16 @@
</tr>
</tbody>
</table>
-
+
<p class='note'>Although <code>itts:forcedDisplay</code>, like all the TTML style attributes, has no defined semantics on a
<code>br</code> content element, <code>itts:forcedDisplay</code> will apply to a <code>br</code> content element if it is
either defined on an ancestor content element of the <code>br</code> content element or it is applied to a region element
corresponding to a region that the <code>br</code> content element is being flowed into.</p>
+
+ <p class='note'>The algorithm for selecting subtitle and caption tracks based on user preference and content metadata is
+ not specified here.</p>
+
+ <p class='note'>Future versions of [[!TTML1]] might introduce more generic mechanisms for conditional display of content elements.</p>
</section>
</section>
@@ -1093,12 +1095,6 @@
</tr>
<tr>
- <td><code>#image</code></td>
-
- <td>SHALL NOT be used.</td>
- </tr>
-
- <tr>
<td><code>#length-em</code></td>
<td>MAY be used.</td>
@@ -1384,12 +1380,6 @@
</tr>
<tr>
- <td><code>#image</code></td>
-
- <td>SHALL NOT be used.</td>
- </tr>
-
- <tr>
<td><code>#length-em</code></td>
<td>SHALL NOT be used.</td>