Skip to content

Commit

Permalink
[giow] (0) Avoid discarding the last cue in a file if it's empty, or …
Browse files Browse the repository at this point in the history 
…any empty cue that is only terminated with CR and not CRLF. Also, explicitly allow empty metadata cues.

Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14178

git-svn-id: http://svn.whatwg.org/webapps@6556 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Sep 19, 2011
1 parent 58a7d4d commit 8327792
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
10 changes: 5 additions & 5 deletions complete.html
View file
Expand Up @@ -32455,7 +32455,7 @@ <h6 id=syntax-0><span class=secno>4.8.10.13.2 </span>Syntax</h6>
"<code title="">start</code>" means left-aligned.</p>


<p><dfn id=webvtt-metadata-text>WebVTT metadata text</dfn> consists of any sequence of one
<p><dfn id=webvtt-metadata-text>WebVTT metadata text</dfn> consists of any sequence of zero
or more characters other than U+000A LINE FEED (LF) characters and
U+000D CARRIAGE RETURN (CR) characters, each optionally separated
from the next by a <a href=#webvtt-line-terminator>WebVTT line terminator</a>. (In other
Expand Down Expand Up @@ -32814,14 +32814,14 @@ <h6 id=parsing-0><span class=secno>4.8.10.13.3 </span>Parsing</h6>
string.</li>

<li><p><i>Cue text loop</i>: If <var title="">position</var> is
past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump to the step labeled <i>cue text
processing</i>.</li>
past the end of <var title="">input</var>, then jump to the step
labeled <i>cue text processing</i>.</li>

<li><p>If the character indicated by <var title="">position</var>
is a U+000D CARRIAGE RETURN (CR) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>

<li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump
to the step labeled <i>cue text processing</i>.</li>
<li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then jump to the step labeled <i>cue text
processing</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>
Expand Down
12 changes: 6 additions & 6 deletions index
View file
Expand Up @@ -243,7 +243,7 @@

<header class=head id=head><p><a class=logo href=http://www.whatwg.org/><img alt=WHATWG height=101 src=/images/logo width=101></a></p>
<hgroup><h1 class=allcaps>HTML</h1>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 14 September 2011</h2>
<h2 class="no-num no-toc">Living Standard &mdash; Last Updated 19 September 2011</h2>
</hgroup><dl><dt><strong>Web developer edition</strong></dt>
<dd><strong><a href=http://developers.whatwg.org/>http://developers.whatwg.org/</a></strong></dd>
<dt>Multiple-page version:</dt>
Expand Down Expand Up @@ -32322,7 +32322,7 @@ The General Relativistic Field Equations</pre>
"<code title="">start</code>" means left-aligned.</p>


<p><dfn id=webvtt-metadata-text>WebVTT metadata text</dfn> consists of any sequence of one
<p><dfn id=webvtt-metadata-text>WebVTT metadata text</dfn> consists of any sequence of zero
or more characters other than U+000A LINE FEED (LF) characters and
U+000D CARRIAGE RETURN (CR) characters, each optionally separated
from the next by a <a href=#webvtt-line-terminator>WebVTT line terminator</a>. (In other
Expand Down Expand Up @@ -32681,14 +32681,14 @@ The General Relativistic Field Equations</pre>
string.</li>

<li><p><i>Cue text loop</i>: If <var title="">position</var> is
past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump to the step labeled <i>cue text
processing</i>.</li>
past the end of <var title="">input</var>, then jump to the step
labeled <i>cue text processing</i>.</li>

<li><p>If the character indicated by <var title="">position</var>
is a U+000D CARRIAGE RETURN (CR) character, advance <var title="">position</var> to the next character in <var title="">input</var>.</li>

<li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then discard <var title="">cue</var> and jump
to the step labeled <i>cue text processing</i>.</li>
<li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then jump to the step labeled <i>cue text
processing</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>
Expand Down
11 changes: 5 additions & 6 deletions source
View file
Expand Up @@ -35477,7 +35477,7 @@ The General Relativistic Field Equations</pre>
"<code title="">start</code>" means left-aligned.</p>


<p><dfn>WebVTT metadata text</dfn> consists of any sequence of one
<p><dfn>WebVTT metadata text</dfn> consists of any sequence of zero
or more characters other than U+000A LINE FEED (LF) characters and
U+000D CARRIAGE RETURN (CR) characters, each optionally separated
from the next by a <span>WebVTT line terminator</span>. (In other
Expand Down Expand Up @@ -35902,18 +35902,17 @@ The General Relativistic Field Equations</pre>
string.</p></li>

<li><p><i>Cue text loop</i>: If <var title="">position</var> is
past the end of <var title="">input</var>, then discard <var
title="">cue</var> and jump to the step labeled <i>cue text
processing</i>.</p></li>
past the end of <var title="">input</var>, then jump to the step
labeled <i>cue text processing</i>.</p></li>

<li><p>If the character indicated by <var title="">position</var>
is a U+000D CARRIAGE RETURN (CR) character, advance <var
title="">position</var> to the next character in <var
title="">input</var>.</p></li>

<li><p>If <var title="">position</var> is past the end of <var
title="">input</var>, then discard <var title="">cue</var> and jump
to the step labeled <i>cue text processing</i>.</p></li>
title="">input</var>, then jump to the step labeled <i>cue text
processing</i>.</p></li>

<li><p>If the character indicated by <var title="">position</var>
is a U+000A LINE FEED (LF) character, advance <var
Expand Down

0 comments on commit 8327792

Please sign in to comment.