Don't intersperse comments with metadata headers.
authorSilvia Pfeiffer
Mon, 17 Jun 2013 14:16:44 +1000
changeset 99 65c8e7918606
parent 98 615257070db4
child 100 57bfbc727b1e
Don't intersperse comments with metadata headers.
Make sure the line separators work to separate different parts of the file.
webvtt/webvtt.html
--- a/webvtt/webvtt.html	Mon Jun 17 14:04:30 2013 +1000
+++ b/webvtt/webvtt.html	Mon Jun 17 14:16:44 2013 +1000
@@ -796,15 +796,13 @@
    <li>One or more <a title="WebVTT line terminator">WebVTT line terminators</a> to
    terminate the line with the file magic and separate it from the rest of the body.</li>
 
-   <li>Zero or more <a title="WebVTT metadata header">WebVTT metadata headers</a> and
-   <a title="WebVTT comment">WebVTT comments</a> separated from each other by two or more
-   <a title="WebVTT line terminator">WebVTT line terminators</a>.</li>
+   <li>Zero or more <a title="WebVTT metadata header">WebVTT metadata headers</a>.</li>
 
    <li>One or more <a title="WebVTT line terminator">WebVTT line terminators</a> to
    terminate the header block and separate the cues from the file header.</li>
 
    <li>Zero or more <a title="WebVTT cue">WebVTT cues</a> and <a title="WebVTT
-   comment">WebVTT comments</a> separated from each other by two or more <a title="WebVTT
+   comment">WebVTT comments</a> separated from each other by one or more <a title="WebVTT
    line terminator">WebVTT line terminators</a>.</li>
 
    <li>Zero or more <a title="WebVTT line terminator">WebVTT line
@@ -825,9 +823,10 @@
   the given order:</p>
 
   <ol>
-    <li>A <a title="WebVTT metadata header name">WebVTT metadata header name</a>.</li>
+    <li>A <a>WebVTT metadata header name</a>.</li>
     <li>A U+003A COLON (colon) character.</li>
-    <li>A <a title="WebVTT metadata header value">WebVTT metadata header value</a>.</li>
+    <li>A <a>WebVTT metadata header value</a>.</li>
+    <li>A <a>WebVTT line terminator</a>.</li>
   </ol>
 
   <p>A <dfn>WebVTT metadata header name</dfn> and
@@ -848,6 +847,7 @@
    <li>Optionally, one or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters followed by a <a>WebVTT cue settings list</a>.</li>
    <li>A <a>WebVTT line terminator</a>.</li>
    <li>The <dfn>cue payload</dfn>: either <a>WebVTT caption cue text</a>, <a>WebVTT chapter title text</a>, or <a>WebVTT metadata text</a>, but it must not contain the substring "<code title="">--></code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN).</li>
+   <li>A <a>WebVTT line terminator</a>.</li>
   </ol>
 
   <p class="note">A <a>WebVTT cue</a> corresponds to one piece
@@ -1023,6 +1023,7 @@
      the substring "<code title="">--></code>" (U+002D HYPHEN-MINUS, U+002D HYPHEN-MINUS, U+003E GREATER-THAN SIGN).
     </ol>
    </li>
+   <li>A <a>WebVTT line terminator</a>.</li>
   </ol>
 
   <p class="note">A <a>WebVTT comment</a> is ignored by the parser.</p>