- From: CVS User pjgenste <cvsmail@w3.org>
- Date: Tue, 10 Jun 2014 11:12:53 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/webvtt
In directory roscoe:/tmp/cvs-serv21813
Modified Files:
Overview.html
Log Message:
Sync WebVTT with Git commit bfb16dfd234088aa33504f0eff3b4b42439a9249
--- /sources/public/html5/webvtt/Overview.html 2014/06/10 09:51:00 1.154
+++ /sources/public/html5/webvtt/Overview.html 2014/06/10 11:12:53 1.155
@@ -942,7 +942,7 @@
</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> whose
+ <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-alignment">text track cue computed 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>
@@ -1850,7 +1850,7 @@
The positioning is calculated relative to the <a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start</a>,
<a title="text track cue text position middle alignment" href="#dfn-text-track-cue-text-position-middle-alignment" class="internalDFN">middle</a>, or
<a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end</a>
- of the cue box, depending on the <a href="#dfn-default-text-track-cue-text-position-alignment" class="internalDFN">default text track cue text position alignment</a> value, which is
+ of the cue box, depending on the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed text position alignment</a> value, which is
overridden by the <a href="#dfn-webvtt-text-position-cue-setting" class="internalDFN">WebVTT text position cue setting</a> alignment value.</p></div>
<p>A <dfn id="dfn-webvtt-size-cue-setting">WebVTT size cue setting</dfn> consists of the
@@ -2590,9 +2590,7 @@
immediately after the first U+003A COLON character (:) in that
string.</p></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>
+ <li>
<p>Run the appropriate substeps that apply for the value of
<var>name</var>, as follows:</p>
@@ -2728,18 +2726,15 @@
<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
- <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>
+ <a title="text track cue text position start alignment" href="#dfn-text-track-cue-text-position-start-alignment" class="internalDFN">start alignment</a>.</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
- <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>
+ <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>
<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
- <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>
+ <a title="text track cue text position end alignment" href="#dfn-text-track-cue-text-position-end-alignment" class="internalDFN">end alignment</a>.</p></li>
</ol>
@@ -2814,25 +2809,6 @@
</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
- <a href="#dfn-text-track-cue-text-position-alignment" class="internalDFN">text track cue text position alignment</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-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>.</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-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>.</dd>
- </dl>
- </li>
-
</ol>
<p>When this specification says that a user agent is to
@@ -4165,16 +4141,16 @@
<a title="text track cue horizontal writing direction" href="#dfn-text-track-cue-horizontal-writing-direction" class="internalDFN">horizontal</a>:</dt>
<dd>
<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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
<var>size</var>.</p></dd>
@@ -4186,16 +4162,16 @@
or <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>
<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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-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
+ <dt>If the <a href="#dfn-text-track-cue-computed-text-position-alignment" class="internalDFN">text track cue computed 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-computed-text-position" class="internalDFN">text track cue computed text position</a> minus
<var>size</var>.</p></dd>
Received on Tuesday, 10 June 2014 11:12:54 UTC