- From: CVS User pjgenste <cvsmail@w3.org>
- Date: Mon, 09 Jun 2014 23:06:27 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/webvtt
In directory roscoe:/tmp/cvs-serv5747
Modified Files:
Overview.html
Log Message:
Sync WebVTT with Git commit 5b8f235719c004b8f09ba5de1e54cfada46d6762
--- /sources/public/html5/webvtt/Overview.html 2014/06/09 13:32:09 1.151
+++ /sources/public/html5/webvtt/Overview.html 2014/06/09 23:06:27 1.152
@@ -873,23 +873,38 @@
<dt><dfn title="text track cue text position" id="dfn-text-track-cue-text-position">A text position</dfn></dt>
<dd>
- <p>A number giving the position of the <a title="text track cue box" href="#dfn-text-track-cue-box" class="internalDFN">cue box</a>. If the cue is not within
- a region, the value is to be interpreted as a percentage of the video, as defined by the
- <a title="text track cue writing direction" href="#dfn-text-track-cue-writing-direction" class="internalDFN">writing direction</a>, otherwise to be interpreted
- as a percentage of the region width.</p>
+ <p>The text position defines positioning of the <a title="text track cue box" href="#dfn-text-track-cue-box" class="internalDFN">cue box</a> in the
+ direction defined by the <a title="text track cue writing direction" href="#dfn-text-track-cue-writing-direction" class="internalDFN">writing direction</a>.</p>
- <p>A <a href="#dfn-text-track-cue" class="internalDFN">text track cue</a> has a <dfn id="dfn-default-text-track-cue-text-position">default text track cue text position</dfn> which is defined
- in terms of the value of the <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a>:</p>
+ <p>The text position is either a number giving the position of the <a title="text track cue box" href="#dfn-text-track-cue-box" class="internalDFN">cue
+ box</a> as a percentage value or the special value <dfn title="text track cue automatic text
+ position" id="dfn-text-track-cue-automatic-text-position">auto</dfn>, which means the position is to depend on the <a title="text track cue text
+ alignment" href="#dfn-text-track-cue-text-alignment" class="internalDFN">text alignment</a> of the cue.</p>
+
+ <p>If the cue is not within a region, the percentage value is to be interpreted as a percentage of the
+ video dimensions, otherwise as a percentage of the region dimensions.</p>
+
+ <p>A <a href="#dfn-text-track-cue" class="internalDFN">text track cue</a> has a <dfn id="dfn-text-track-cue-computed-text-position">text track cue computed text position</dfn> whose value is
+ that returned by the following algorithm, which is defined in terms of the other aspects of the
+ cue:</p>
<ol>
- <li>For <a title="text track cue left alignment" href="#dfn-text-track-cue-left-alignment" class="internalDFN">left aligned</a> or
- <a title="text track cue start alignment" href="#dfn-text-track-cue-start-alignment" class="internalDFN">start aligned</a> cues: 0%.</li>
+ <li><p>If the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> is numeric, then return the value of
+ the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> and abort these steps. (Otherwise, the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text
+ position</a> is the special value <a title="text track cue automatic text
+ position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>.)</p></li>
+
+ <li><p>If the <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a> is <a title="text track cue start
+ alignment" href="#dfn-text-track-cue-start-alignment" class="internalDFN">start</a> or <a title="text track cue left alignment" href="#dfn-text-track-cue-left-alignment" class="internalDFN">left</a>, return 0 and abort
+ these steps.</p></li>
+
+ <li><p>If the <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a> is <a title="text track cue end
+ alignment" href="#dfn-text-track-cue-end-alignment" class="internalDFN">end</a> or <a title="text track cue right alignment" href="#dfn-text-track-cue-right-alignment" class="internalDFN">right</a>, return 100 and abort
+ these steps.</p></li>
- <li>For <a title="text track cue middle alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle aligned</a> cues: 50%.</li>
-
- <li>For <a title="text track cue right alignment" href="#dfn-text-track-cue-right-alignment" class="internalDFN">right aligned</a> or
- <a title="text track cue end alignment" href="#dfn-text-track-cue-end-alignment" class="internalDFN">end aligned</a> cues: 100%.</li>
+ <li><p>If the <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a> is <a title="text track cue middle
+ alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle</a>, return 50 and abort these steps.</p></li>
</ol>
@@ -2227,7 +2242,8 @@
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-line-alignment" class="internalDFN">text track cue line alignment</a> be
<a title="text track cue line start alignment" href="#dfn-text-track-cue-line-start-alignment" class="internalDFN">start alignment</a>.</p></li>
- <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be 50.</p></li>
+ <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be
+ <a title="text track cue automatic text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>.</p></li>
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
<a title="text track cue text position alignment" href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">middle alignment</a>.</p></li>
@@ -2564,11 +2580,9 @@
immediately after the first U+003A COLON character (:) in that
string.</p></li>
- <li><p>Let <var>positionSet</var> and <var>positionAlignSet</var>
- be false. (These are required to determine if the position settings need to be adjusted
- for non-middle aligned cue text.)</p></li>
-
- <li>
+ <li><p>Let <var>positionAlignSet</var>
+ be false. (It is required to determine if the position settings need to be adjusted
+ </p></li><li>
<p>Run the appropriate substeps that apply for the value of
<var>name</var>, as follows:</p>
@@ -2714,26 +2728,23 @@
<li><p>If <a href="#dfn-parse-a-percentage-string" class="internalDFN">parse a percentage string</a> from <var>colpos</var> doesn't fail,
let <var>number</var> be the returned <var>percentage</var>, otherwise jump to
- the step labeled <i>next setting</i>.</p></li>
+ the step labeled <i>next setting</i> (<a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>'s value remains
+ the special value <a title="text track cue automatic text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>).</p></li>
- <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be
- <var>number</var> and let <var>positionSet</var> be true.</p></li>
+ <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be <var>number</var>.</p></li>
<li><p>If <var>colalign</var> is a <a href="#dfn-case-sensitive" class="internalDFN">case-sensitive</a> match for the string
- "<code>start</code>", then let <var>cue</var>'s
- <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
+ "<code>start</code>", then let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
<a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start alignment</a>
and let <var>positionAlignSet</var> be true.</p></li>
<li><p>If <var>colalign</var> is a <a href="#dfn-case-sensitive" class="internalDFN">case-sensitive</a> match for the string
- "<code>middle</code>", then let <var>cue</var>'s
- <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
+ "<code>middle</code>", then let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
<a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle alignment</a>
and let <var>positionAlignSet</var> be true.</p></li>
<li><p>If <var>colalign</var> is a <a href="#dfn-case-sensitive" class="internalDFN">case-sensitive</a> match for the string
- "<code>end</code>", then let <var>cue</var>'s
- <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
+ "<code>end</code>", then let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
<a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end alignment</a>
and let <var>positionAlignSet</var> be true.</p></li>
@@ -2794,23 +2805,6 @@
</li>
<li>
- <p>If <var>positionSet</var> is false (i.e. the cue box has not been explicitly
- positioned with a position setting), and <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a>
- is not <a title="text track cue middle alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle alignment</a>, then adjust the
- <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> as follows:</p>
-
- <dl>
- <dt>If <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a> is <a title="text track cue left alignment" href="#dfn-text-track-cue-left-alignment" class="internalDFN">left</a> or
- <a title="text track cue start alignment" href="#dfn-text-track-cue-start-alignment" class="internalDFN">start</a></dt>
- <dd>Let <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be 0%.</dd>
-
- <dt>If <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a> is <a title="text track cue right alignment" href="#dfn-text-track-cue-right-alignment" class="internalDFN">right</a> or
- <a title="text track cue end alignment" href="#dfn-text-track-cue-end-alignment" class="internalDFN">end</a></dt>
- <dd>Let <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be 100%.</dd>
- </dl>
- </li>
-
- <li>
<p>If <var>positionAlignSet</var> is false (i.e. the cue box has not been explicitly
position aligned with a position alignment setting), and <a href="#dfn-text-track-cue-text-alignment" class="internalDFN">text track cue text alignment</a>
is not <a title="text track cue middle alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle alignment</a>, then adjust the
@@ -4059,7 +4053,7 @@
<li><p>If the <i>paragraph embedding level</i> determined in the previous step is even (the <i>paragraph direction</i> is left-to-right), let <var>direction</var> be 'ltr', otherwise, let it be 'rtl'.</p></li>
- <li><p>Let <var>offset</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> multiplied by <var>region</var>'s <a href="#dfn-text-track-region-width" class="internalDFN">text track region width</a> and divided by 100 (i.e. interpret it as a percentage of the region width).</p></li>
+ <li><p>Let <var>offset</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a> multiplied by <var>region</var>'s <a href="#dfn-text-track-region-width" class="internalDFN">text track region width</a> and divided by 100 (i.e. interpret it as a percentage of the region width).</p></li>
<li>
<p>If <var>direction</var> is 'ltr' and 'text-align' is 'start' or 'left', or if <var>direction</var> is 'rtl' and 'text-align' is 'end' or 'left', let <var>left</var> be <var>offset</var> and let <var>right</var> be 'auto'</p>
@@ -4163,16 +4157,16 @@
<dl class="switch">
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start alignment</a>:</dt>
- <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>.</p></dd>
+ <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a>.</p></dd>
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle alignment</a>:</dt>
- <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> minus
+ <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
half of <var>size</var>.</p></dd>
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end alignment</a>:</dt>
- <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> minus
+ <dd><p>Let <var>x-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
<var>size</var>.</p></dd>
</dl>
</dd>
@@ -4184,16 +4178,16 @@
<dl class="switch">
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start alignment</a>:</dt>
- <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>.</p></dd>
+ <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a>.</p></dd>
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle alignment</a>:</dt>
- <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> minus
+ <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
half of <var>size</var>.</p></dd>
<dt>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is
<a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end alignment</a>:</dt>
- <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> minus
+ <dd><p>Let <var>y-position</var> be the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
<var>size</var>.</p></dd>
</dl>
</dd>
@@ -4600,7 +4594,7 @@
<dt>If the <a href="#dfn-text-track-cue-writing-direction" class="internalDFN">text track cue writing direction</a> is <a title="text track cue horizontal writing direction" href="#dfn-text-track-cue-horizontal-writing-direction" class="internalDFN">horizontal</a></dt>
<dd>
<p>Let <var>x</var> be a percentage given by the
- <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>, and let
+ <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a>, and let
<var>y</var> be a percentage given by the <a href="#dfn-text-track-cue-computed-line-position" class="internalDFN">text
track cue computed line position</a>.</p>
</dd>
@@ -4610,15 +4604,15 @@
<p>Let <var>x</var> be a percentage given by the
<a href="#dfn-text-track-cue-computed-line-position" class="internalDFN">text track cue computed line position</a> subtracted from
100, and let <var>y</var> be a percentage given
- by the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>.</p>
+ by the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text track cue computed text position</a>.</p>
</dd>
<dt>If the <a href="#dfn-text-track-cue-writing-direction" class="internalDFN">text track cue writing direction</a> is <a title="text track cue vertical growing right writing direction" href="#dfn-text-track-cue-vertical-growing-right-writing-direction" class="internalDFN">vertical growing right</a></dt>
<dd>
<p>Let <var>x</var> be a percentage given by the
<a href="#dfn-text-track-cue-computed-line-position" class="internalDFN">text track cue computed line position</a>, and let
- <var>y</var> be a percentage given by the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text
- track cue text position</a>.</p>
+ <var>y</var> be a percentage given by the <a href="#dfn-text-track-cue-computed-text-position" class="internalDFN">text
+ track cue computed text position</a>.</p>
</dd>
</dl>
@@ -5120,7 +5114,7 @@
attribute boolean <a title="VTTCue-snapToLines" href="#dfn-vttcue-snaptolines" class="internalDFN">snapToLines</a>;
attribute (double or <a href="#dfn-autokeyword" class="internalDFN">AutoKeyword</a>) <a title="VTTCue-line" href="#dfn-vttcue-line" class="internalDFN">line</a>;
attribute <a href="#dfn-alignsetting" class="internalDFN">AlignSetting</a> <a title="VTTCue-lineAlign" href="#dfn-vttcue-linealign" class="internalDFN">lineAlign</a>;
- attribute double <a title="VTTCue-position" href="#dfn-vttcue-position" class="internalDFN">position</a>;
+ attribute (double or <a href="#dfn-autokeyword" class="internalDFN">AutoKeyword</a>) <a title="VTTCue-position" href="#dfn-vttcue-position" class="internalDFN">position</a>;
attribute <a href="#dfn-alignsetting" class="internalDFN">AlignSetting</a> <a title="VTTCue-positionAlign" href="#dfn-vttcue-positionalign" class="internalDFN">positionAlign</a>;
attribute double <a title="VTTCue-size" href="#dfn-vttcue-size" class="internalDFN">size</a>;
attribute <a href="#dfn-alignsetting" class="internalDFN">AlignSetting</a> <a title="VTTCue-align" href="#dfn-vttcue-align" class="internalDFN">align</a>;
@@ -5189,7 +5183,9 @@
<dt><var>cue</var> . <a title="VTTCue-position" href="#dfn-vttcue-position" class="internalDFN">position</a> [ = <var>value</var> ]</dt>
<dd>
- <p>Returns the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>.</p>
+ <p>Returns the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a>. In the case of the value being
+ <a title="text track cue automatic text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>, the string "<code>auto</code>" is
+ returned.</p>
<p>Can be set.</p>
</dd>
@@ -5283,7 +5279,8 @@
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-line-alignment" class="internalDFN">text track cue line alignment</a> be
<a title="text track cue line start alignment" href="#dfn-text-track-cue-line-start-alignment" class="internalDFN">start alignment</a>.</p></li>
- <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be 50.</p></li>
+ <li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> be
+ <a title="text track cue automatic text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>.</p></li>
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> be
<a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle alignment</a>.</p></li>
@@ -5384,9 +5381,12 @@
<p>The <dfn title="VTTCue-position" id="dfn-vttcue-position"><code>position</code></dfn> attribute, on getting,
must return the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> of the <a href="#dfn-text-track-cue" class="internalDFN">text track cue</a> that
- the <a href="#dfn-vttcue" class="internalDFN"><code>VTTCue</code></a> object represents. On setting, if the new value is negative or
- greater than 100, then an <a href="#dfn-indexsizeerror" class="internalDFN"><code>IndexSizeError</code></a> exception must be thrown. Otherwise, the
- <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> must be set to the new value.</p>
+ the <a href="#dfn-vttcue" class="internalDFN"><code>VTTCue</code></a> object represents. The special value <a title="text track cue automatic
+ text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a> must be represented as the string "<code>auto</code>". On setting, if the
+ new value is negative or greater than 100, then an <a href="#dfn-indexsizeerror" class="internalDFN"><code>IndexSizeError</code></a> exception
+ must be thrown. Otherwise, the <a href="#dfn-text-track-cue-text-position" class="internalDFN">text track cue text position</a> must be set to the new value;
+ if the new value is the string "<code>auto</code>", then it must be interpreted as the special
+ value <a title="text track cue automatic text position" href="#dfn-text-track-cue-automatic-text-position" class="internalDFN">auto</a>.</p>
<p>The <dfn title="VTTCue-positionAlign" id="dfn-vttcue-positionalign"><code>positionAlign</code></dfn> attribute, on getting, must
return the string from the second cell of the row in the table below whose first cell is the
Received on Monday, 9 June 2014 23:06:29 UTC