[acgiow] (0) Simplify the WebVTT file signature.

git-svn-id: http://svn.whatwg.org/webapps@6168 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 1, 2011 · d81b421 · d81b421
1 parent 60febd7
commit d81b421
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 62 deletions.
diff --git a/complete.html b/complete.html
@@ -31844,8 +31844,7 @@ <h6 id=syntax-0><span class=secno>4.8.10.13.1 </span>Syntax</h6>
 
   <ol><li>An optional U+FEFF BYTE ORDER MARK (BOM) character.</li>
 
-   <li>The string "<code title="">WEBVTT</code>", a single U+0020
-   SPACE character, and the string "<code title="">FILE</code>".</li>
+   <li>The string "<code title="">WEBVTT</code>".</li>
 
    <li>Optionally, either a U+0020 SPACE character or a U+0009
    CHARACTER TABULATION (tab) character followed by any number of
@@ -32242,19 +32241,20 @@ <h6 id=parsing-0><span class=secno>4.8.10.13.2 </span>Parsing</h6>
    characters. Let <var title="">line</var> be those characters, if
    any.</li>
 
-   <li><p>If <var title="">line</var> is less than eleven characters
+   <li><p>If <var title="">line</var> is less than six characters
    long, then abort these steps. The file is not a <a href=#webvtt-file>WebVTT
    file</a>.</li>
 
-   <li><p>If <var title="">line</var> is exactly eleven characters
-   long but does not exactly equal "<code title="">WEBVTT&nbsp;FILE</code>", then abort these steps. The file
-   is not a <a href=#webvtt-file>WebVTT file</a>.</li>
+   <li><p>If <var title="">line</var> is exactly six characters long
+   but does not exactly equal "<code title="">WEBVTT</code>", then
+   abort these steps. The file is not a <a href=#webvtt-file>WebVTT
+   file</a>.</li>
 
-   <li><p>If <var title="">line</var> is more than eleven characters
-   long but the first eleven characters do not exactly equal "<code title="">WEBVTT&nbsp;FILE</code>", or the twelfth character is
-   neither a U+0020 SPACE character nor a U+0009 CHARACTER TABULATION
-   (tab) character, then abort these steps. The file is not a
-   <a href=#webvtt-file>WebVTT file</a>.</li>
+   <li><p>If <var title="">line</var> is more than six characters long
+   but the first six characters do not exactly equal "<code title="">WEBVTT</code>", or the seventh character is neither a
+   U+0020 SPACE character nor a U+0009 CHARACTER TABULATION (tab)
+   character, then abort these steps. The file is not a <a href=#webvtt-file>WebVTT
+   file</a>.</li>
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then jump to the step labeled
    <i>end</i>.</li>
@@ -95737,15 +95737,15 @@ <h3 id=text/vtt><span class=secno>17.6 </span><dfn><code>text/vtt</code></dfn></
     <dl><dt>Magic number(s):</dt>
      <dd>
       <p>WebVTT files all begin with one of the following byte sequences:</p>
-      <ul class=brief><li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 20
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 09
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 20
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 09
-      </ul><p class=note>(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT&nbsp;FILE</code>", and finally a space, tab, or line break.)
+      <ul class=brief><li> EF BB BF 57 45 42 56 54 54 0A
+       <li> EF BB BF 57 45 42 56 54 54 0D
+       <li> EF BB BF 57 45 42 56 54 54 20
+       <li> EF BB BF 57 45 42 56 54 54 09
+       <li>          57 45 42 56 54 54 0A
+       <li>          57 45 42 56 54 54 0D
+       <li>          57 45 42 56 54 54 20
+       <li>          57 45 42 56 54 54 09
+      </ul><p class=note>(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT</code>", and finally a space, tab, or line break.)
      </dd>
      <dt>File extension(s):</dt>
      <dd>"<code title="">vtt</code>"</dd>

diff --git a/index b/index
@@ -31833,8 +31833,7 @@ interface <dfn id=texttrackcue>TextTrackCue</dfn> {
 
   <ol><li>An optional U+FEFF BYTE ORDER MARK (BOM) character.</li>
 
-   <li>The string "<code title="">WEBVTT</code>", a single U+0020
-   SPACE character, and the string "<code title="">FILE</code>".</li>
+   <li>The string "<code title="">WEBVTT</code>".</li>
 
    <li>Optionally, either a U+0020 SPACE character or a U+0009
    CHARACTER TABULATION (tab) character followed by any number of
@@ -32231,19 +32230,20 @@ interface <dfn id=texttrackcue>TextTrackCue</dfn> {
    characters. Let <var title="">line</var> be those characters, if
    any.</li>
 
-   <li><p>If <var title="">line</var> is less than eleven characters
+   <li><p>If <var title="">line</var> is less than six characters
    long, then abort these steps. The file is not a <a href=#webvtt-file>WebVTT
    file</a>.</li>
 
-   <li><p>If <var title="">line</var> is exactly eleven characters
-   long but does not exactly equal "<code title="">WEBVTT&nbsp;FILE</code>", then abort these steps. The file
-   is not a <a href=#webvtt-file>WebVTT file</a>.</li>
+   <li><p>If <var title="">line</var> is exactly six characters long
+   but does not exactly equal "<code title="">WEBVTT</code>", then
+   abort these steps. The file is not a <a href=#webvtt-file>WebVTT
+   file</a>.</li>
 
-   <li><p>If <var title="">line</var> is more than eleven characters
-   long but the first eleven characters do not exactly equal "<code title="">WEBVTT&nbsp;FILE</code>", or the twelfth character is
-   neither a U+0020 SPACE character nor a U+0009 CHARACTER TABULATION
-   (tab) character, then abort these steps. The file is not a
-   <a href=#webvtt-file>WebVTT file</a>.</li>
+   <li><p>If <var title="">line</var> is more than six characters long
+   but the first six characters do not exactly equal "<code title="">WEBVTT</code>", or the seventh character is neither a
+   U+0020 SPACE character nor a U+0009 CHARACTER TABULATION (tab)
+   character, then abort these steps. The file is not a <a href=#webvtt-file>WebVTT
+   file</a>.</li>
 
    <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then jump to the step labeled
    <i>end</i>.</li>
@@ -91484,15 +91484,15 @@ interface <a href=#htmldocument>HTMLDocument</a> {
     <dl><dt>Magic number(s):</dt>
      <dd>
       <p>WebVTT files all begin with one of the following byte sequences:</p>
-      <ul class=brief><li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 20
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 09
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 20
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 09
-      </ul><p class=note>(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT&nbsp;FILE</code>", and finally a space, tab, or line break.)
+      <ul class=brief><li> EF BB BF 57 45 42 56 54 54 0A
+       <li> EF BB BF 57 45 42 56 54 54 0D
+       <li> EF BB BF 57 45 42 56 54 54 20
+       <li> EF BB BF 57 45 42 56 54 54 09
+       <li>          57 45 42 56 54 54 0A
+       <li>          57 45 42 56 54 54 0D
+       <li>          57 45 42 56 54 54 20
+       <li>          57 45 42 56 54 54 09
+      </ul><p class=note>(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT</code>", and finally a space, tab, or line break.)
      </dd>
      <dt>File extension(s):</dt>
      <dd>"<code title="">vtt</code>"</dd>

diff --git a/source b/source
@@ -34954,8 +34954,7 @@ interface <dfn>TextTrackCue</dfn> {
 
    <li>An optional U+FEFF BYTE ORDER MARK (BOM) character.</li>
 
-   <li>The string "<code title="">WEBVTT</code>", a single U+0020
-   SPACE character, and the string "<code title="">FILE</code>".</li>
+   <li>The string "<code title="">WEBVTT</code>".</li>
 
    <li>Optionally, either a U+0020 SPACE character or a U+0009
    CHARACTER TABULATION (tab) character followed by any number of
@@ -35459,21 +35458,21 @@ interface <dfn>TextTrackCue</dfn> {
    characters. Let <var title="">line</var> be those characters, if
    any.</p></li>
 
-   <li><p>If <var title="">line</var> is less than eleven characters
+   <li><p>If <var title="">line</var> is less than six characters
    long, then abort these steps. The file is not a <span>WebVTT
    file</span>.</p></li>
 
-   <li><p>If <var title="">line</var> is exactly eleven characters
-   long but does not exactly equal "<code
-   title="">WEBVTT&nbsp;FILE</code>", then abort these steps. The file
-   is not a <span>WebVTT file</span>.</p></li>
+   <li><p>If <var title="">line</var> is exactly six characters long
+   but does not exactly equal "<code title="">WEBVTT</code>", then
+   abort these steps. The file is not a <span>WebVTT
+   file</span>.</p></li>
 
-   <li><p>If <var title="">line</var> is more than eleven characters
-   long but the first eleven characters do not exactly equal "<code
-   title="">WEBVTT&nbsp;FILE</code>", or the twelfth character is
-   neither a U+0020 SPACE character nor a U+0009 CHARACTER TABULATION
-   (tab) character, then abort these steps. The file is not a
-   <span>WebVTT file</span>.</p></li>
+   <li><p>If <var title="">line</var> is more than six characters long
+   but the first six characters do not exactly equal "<code
+   title="">WEBVTT</code>", or the seventh character is neither a
+   U+0020 SPACE character nor a U+0009 CHARACTER TABULATION (tab)
+   character, then abort these steps. The file is not a <span>WebVTT
+   file</span>.</p></li>
 
    <li><p>If <var title="">position</var> is past the end of <var
    title="">input</var>, then jump to the step labeled
@@ -108889,16 +108888,16 @@ interface <span>HTMLDocument</span> {
      <dd>
       <p>WebVTT files all begin with one of the following byte sequences:</p>
       <ul class="brief">
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 20
-       <li> EF BB BF 57 45 42 56 54 54 20 46 49 4C 45 09
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0A
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 0D
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 20
-       <li>          57 45 42 56 54 54 20 46 49 4C 45 09
+       <li> EF BB BF 57 45 42 56 54 54 0A
+       <li> EF BB BF 57 45 42 56 54 54 0D
+       <li> EF BB BF 57 45 42 56 54 54 20
+       <li> EF BB BF 57 45 42 56 54 54 09
+       <li>          57 45 42 56 54 54 0A
+       <li>          57 45 42 56 54 54 0D
+       <li>          57 45 42 56 54 54 20
+       <li>          57 45 42 56 54 54 09
       </ul>
-      <p class="note">(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT&nbsp;FILE</code>", and finally a space, tab, or line break.)
+      <p class="note">(An optional UTF-8 BOM, the ASCII string "<code title="">WEBVTT</code>", and finally a space, tab, or line break.)
      </dd>
      <dt>File extension(s):</dt>
      <dd>"<code title="">vtt</code>"</dd>