- From: CVS User pjgenste <cvsmail@w3.org>
- Date: Tue, 10 Jun 2014 09:51:00 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/webvtt
In directory roscoe:/tmp/cvs-serv17276
Modified Files:
Overview.html
Log Message:
Sync WebVTT with Git commit b4abad20c8b21f70e396b170cee5fdb25fd3c1ad
--- /sources/public/html5/webvtt/Overview.html 2014/06/10 03:24:18 1.153
+++ /sources/public/html5/webvtt/Overview.html 2014/06/10 09:51:00 1.154
@@ -937,23 +937,33 @@
<a title="text track cue horizontal writing direction" href="#dfn-text-track-cue-horizontal-writing-direction" class="internalDFN">horizontal</a> cues) or bottom
side (otherwise) is aligned at the <a title="text track cue text position" href="#dfn-text-track-cue-text-position" class="internalDFN">text position</a>.</dd>
+ <dt><dfn title="text track cue text position automatic alignment" id="dfn-text-track-cue-text-position-automatic-alignment">Auto alignment</dfn></dt>
+ <dd>The <a title="text track cue box" href="#dfn-text-track-cue-box" class="internalDFN">cue box</a>'s alignment depends on the value of the <a title="text track cue text alignment" href="#dfn-text-track-cue-text-alignment" class="internalDFN">text alignment</a> of the cue.</dd>
+
</dl>
- <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-alignment">default text track cue text position alignment</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>A <a href="#dfn-text-track-cue" class="internalDFN">text track cue</a> has a <dfn id="dfn-default-text-track-cue-text-position-alignment">default text track cue text position alignment</dfn> whose
+ value is that returned by the following algorithm, which is defined in terms of 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</a> or
- <a title="text track cue start alignment" href="#dfn-text-track-cue-start-alignment" class="internalDFN">start</a> aligned cues:
- <a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start</a>.</li>
-
- <li>For <a title="text track cue middle alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle</a> aligned cues:
- <a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle</a>.</li>
-
- <li>For <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> aligned cues:
- <a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end</a>.</li>
+ <li><p>If the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> is set, then return the value of
+ the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</a> and abort these steps. (Otherwise, the <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text
+ track cue text position alignment</a> is the special value <a title="text track cue text position
+ automatic alignment" href="#dfn-text-track-cue-text-position-automatic-alignment" 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 <a title="text
+ track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start</a> 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 <a title="text
+ track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end</a> 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 middle
+ alignment" href="#dfn-text-track-cue-middle-alignment" class="internalDFN">middle</a>, return <a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle</a>
+ and abort these steps.</p></li>
</ol>
@@ -2246,7 +2256,7 @@
<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>
+ <a title="text track cue text position automatic alignment" href="#dfn-text-track-cue-text-position-automatic-alignment" class="internalDFN">auto</a>.</p></li>
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-size" class="internalDFN">text track cue size</a> be 100.</p></li>
@@ -5115,7 +5125,7 @@
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 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 (<a href="#dfn-alignsetting" class="internalDFN">AlignSetting</a> or <a href="#dfn-autokeyword" class="internalDFN">AutoKeyword</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>;
attribute DOMString <a title="VTTCue-text" href="#dfn-vttcue-text" class="internalDFN">text</a>;
@@ -5199,6 +5209,8 @@
<dd><p>The string "<code>middle</code>".</p></dd>
<dt>If it 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>The string "<code>end</code>".</p></dd>
+ <dt>If it is <a title="text track cue text position automatic alignment" href="#dfn-text-track-cue-text-position-automatic-alignment" class="internalDFN">automatic alignment</a></dt>
+ <dd><p>The string "<code>auto</code>".</p></dd>
</dl>
<p>Can be set.</p>
</dd>
@@ -5283,7 +5295,7 @@
<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>
+ <a title="text track cue text position automatic alignment" href="#dfn-text-track-cue-text-position-automatic-alignment" class="internalDFN">auto</a>.</p></li>
<li><p>Let <var>cue</var>'s <a href="#dfn-text-track-cue-size" class="internalDFN">text track cue size</a> be 100.</p></li>
@@ -5413,6 +5425,10 @@
<td><a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">End alignment</a></td>
<td>"<code>end</code>"</td>
</tr>
+ <tr>
+ <td><a title="text track cue text position automatic alignment" href="#dfn-text-track-cue-text-position-automatic-alignment" class="internalDFN">Automatic alignment</a></td>
+ <td>"<code>auto</code>"</td>
+ </tr>
</tbody>
</table>
Received on Tuesday, 10 June 2014 09:51:02 UTC