W3C home > Mailing lists > Public > public-html-commits@w3.org > December 2011

html5/webvtt Overview.html,1.5,1.6

From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 06 Dec 2011 00:36:38 +0000
To: public-html-commits@w3.org
Message-Id: <E1RXj1S-00061s-65@lionel-hutz.w3.org>
Update of /sources/public/html5/webvtt
In directory hutz:/tmp/cvs-serv23162

Modified Files:
	Overview.html 
Log Message:
WebVTT signature parsing: should bail with error if the signature line doesn't have a line ending. Also, change some redundant IF statements to assertions. Let me know if these invariants aren't as invariant as I thought. (whatwg r6843)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/webvtt/Overview.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Overview.html	1 Dec 2011 23:00:56 -0000	1.5
+++ Overview.html	6 Dec 2011 00:36:36 -0000	1.6
@@ -121,7 +121,7 @@
   </script><body onload=init()>
 
   <header class=head id=head><hgroup><h1 class="no-num no-toc">WebVTT</h1>
-    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 1 December 2011</h2>
+    <h2 class="no-num no-toc">Living Standard &mdash; Last Updated 6 December 2011</h2>
    </hgroup><dl><dt>Latest version:</dt>
     <dd><a href=http://http://dev.w3.org/html5/webvtt/>http://dev.w3.org/html5/webvtt/</a></dd>
     <dt>Participate:</dt>
@@ -769,12 +769,15 @@
    <var title="">already collected line</var> flag.</li>
 
 
+   <!-- SIGNATURE CHECK -->
+
    <li><p><a href=#collect-a-sequence-of-characters>Collect a sequence of characters</a> that are
    <em>not</em> U+000A LINE FEED (LF) characters. Let <var title="">line</var> be those characters, if any.</li>
 
    <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>
+   long, then abort these steps. The file does not start with the
+   correct <a href=#webvtt-file>WebVTT file</a> signature and was therefore not
+   successfully processed.</li>
 
    <li><p>If <var title="">line</var> is exactly six characters long
    but does not exactly equal "<code title="">WEBVTT</code>", then
@@ -785,14 +788,17 @@
    <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>
+   character, then abort these steps. The file does not start with the
+   correct <a href=#webvtt-file>WebVTT file</a> signature and was therefore not
+   successfully processed.</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>
+   <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then abort these steps. The file does not
+   start with the correct <a href=#webvtt-file>WebVTT file</a> signature and was
+   therefore not successfully processed.</li>
 
-   <li><p>If the character indicated by <var title="">position</var>
-   is a U+000A LINE FEED (LF) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
+
+   <li><p>The character indicated by <var title="">position</var> is a
+   U+000A LINE FEED (LF) character. Advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
 
 
    <li><p><i title="">Header</i>: <a href=#collect-a-sequence-of-characters>Collect a sequence of
@@ -803,8 +809,8 @@
    <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>
 
-   <li><p>If the character indicated by <var title="">position</var>
-   is a U+000A LINE FEED (LF) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
+   <li><p>The character indicated by <var title="">position</var> is a
+   U+000A LINE FEED (LF) character. Advance <var title="">position</var> to the next character in <var title="">input</var>.</li>
 
    <li><p>If <var title="">line</var> contains the three-character
    substring "<code title="">--&gt;</code>" (U+002D HYPHEN-MINUS, U+002D
Received on Tuesday, 6 December 2011 00:36:40 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 6 December 2011 00:36:40 GMT