Skip to content

Commit

Permalink
[ac] (0) Captions - Stage 11.9: Fixing WebSRT syntax bugs zcorpan found
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.whatwg.org/webapps@5120 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Jun 29, 2010
1 parent f54a339 commit fd791db
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 29 deletions.
23 changes: 13 additions & 10 deletions complete.html
Expand Up @@ -26674,7 +26674,7 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<p>A <dfn id=websrt-cue>WebSRT cue</dfn> consists of the following components, in
the given order:</p>

<ol><li>Optionally, a <a href=#websrt-cue-identifier>WebSRT cue identifier</a>.</li>
<ol><li>Optionally, a <a href=#websrt-cue-identifier>WebSRT cue identifier</a> followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li><a href=#websrt-cue-timings>WebSRT cue timings</a>.</li>
<li>Optionally, one or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters followed by <a href=#websrt-cue-settings>WebSRT cue settings</a>.</li>
<li>A <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
Expand All @@ -26699,7 +26699,9 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<ol><!-- we could allow leading and trailing spaces and tabs, and make
the space between the arrow either optional or allow multiple
spaces or tabs --><li>A <a href=#websrt-timestamp>WebSRT timestamp</a> representing the start time
offset of the cue.</li>
offset of the cue. The time represented by this <a href=#websrt-timestamp>WebSRT
timestamp</a> must be greater than the start time offsets of all
previous cues in the file.</li>

<li>A U+0020 SPACE character.</li>

Expand All @@ -26709,7 +26711,9 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<li>A U+0020 SPACE character.</li>

<li>A <a href=#websrt-timestamp>WebSRT timestamp</a> representing the end time
offset of the cue.</li>
offset of the cue. The time represented by this <a href=#websrt-timestamp>WebSRT
timestamp</a> must be greater than the start time offset of the
cue.</li>

</ol><p>A <dfn id=websrt-timestamp>WebSRT timestamp</dfn> representing hour <var title="">hours</var>, minutes <var title="">minutes</var>, seconds
<var title="">seconds</var>, and thousandths of a second <var title="">seconds-frac</var>, consists of the following components,
Expand Down Expand Up @@ -26743,12 +26747,7 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<li>Three characters in the range U+0030 DIGIT ZERO (0) to U+0039
DIGIT NINE (9), representing the thousandths of a second <var title="">seconds-frac</var> as a base ten integer.</li>

</ol><p>Each <a href=#websrt-timestamp>WebSRT timestamp</a> in a <a href=#websrt-file>WebSRT file</a>
must represent a time greater than than all the times represented by
<a href=#websrt-timestamp title="WebSRT timestamp">WebSRT timestamps</a> earlier in
the file.</p>

<p>The <dfn id=websrt-cue-settings>WebSRT cue settings</dfn> part of a <a href=#websrt-cue>WebSRT
</ol><p>The <dfn id=websrt-cue-settings>WebSRT cue settings</dfn> part of a <a href=#websrt-cue>WebSRT
cue</a> consists of zero or more of the following components, in
any order, separated from each other by one or more U+0020 SPACE
characters or U+0009 CHARACTER TABULATION (tab) characters. Each
Expand Down Expand Up @@ -26847,7 +26846,11 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<p>A <dfn id=websrt-cue-timestamp>WebSRT cue timestamp</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), followed by a <a href=#websrt-timestamp>WebSRT timestamp</a>
representing the time that the given point in the cue becomes
active, followed by a U+003E GREATER-THAN SIGN character (&gt;).</p>
active, followed by a U+003E GREATER-THAN SIGN character (&gt;). The
time represented by the <a href=#websrt-timestamp>WebSRT timestamp</a> must be
greater than the times represented by any previous <a href=#websrt-cue-timestamp title="WebSRT cue timestamp">WebSRT cue timestamps</a> in the
cue, as well as greater than the cue's start time offset, and less
than the cue's end time offset.</p>

<p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (&lt;), a U+0069 LATIN SMALL LETTER I
Expand Down
23 changes: 13 additions & 10 deletions index
Expand Up @@ -26601,7 +26601,7 @@ CueEvent
<p>A <dfn id=websrt-cue>WebSRT cue</dfn> consists of the following components, in
the given order:</p>

<ol><li>Optionally, a <a href=#websrt-cue-identifier>WebSRT cue identifier</a>.</li>
<ol><li>Optionally, a <a href=#websrt-cue-identifier>WebSRT cue identifier</a> followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li><a href=#websrt-cue-timings>WebSRT cue timings</a>.</li>
<li>Optionally, one or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters followed by <a href=#websrt-cue-settings>WebSRT cue settings</a>.</li>
<li>A <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
Expand All @@ -26626,7 +26626,9 @@ CueEvent
<ol><!-- we could allow leading and trailing spaces and tabs, and make
the space between the arrow either optional or allow multiple
spaces or tabs --><li>A <a href=#websrt-timestamp>WebSRT timestamp</a> representing the start time
offset of the cue.</li>
offset of the cue. The time represented by this <a href=#websrt-timestamp>WebSRT
timestamp</a> must be greater than the start time offsets of all
previous cues in the file.</li>

<li>A U+0020 SPACE character.</li>

Expand All @@ -26636,7 +26638,9 @@ CueEvent
<li>A U+0020 SPACE character.</li>

<li>A <a href=#websrt-timestamp>WebSRT timestamp</a> representing the end time
offset of the cue.</li>
offset of the cue. The time represented by this <a href=#websrt-timestamp>WebSRT
timestamp</a> must be greater than the start time offset of the
cue.</li>

</ol><p>A <dfn id=websrt-timestamp>WebSRT timestamp</dfn> representing hour <var title="">hours</var>, minutes <var title="">minutes</var>, seconds
<var title="">seconds</var>, and thousandths of a second <var title="">seconds-frac</var>, consists of the following components,
Expand Down Expand Up @@ -26670,12 +26674,7 @@ CueEvent
<li>Three characters in the range U+0030 DIGIT ZERO (0) to U+0039
DIGIT NINE (9), representing the thousandths of a second <var title="">seconds-frac</var> as a base ten integer.</li>

</ol><p>Each <a href=#websrt-timestamp>WebSRT timestamp</a> in a <a href=#websrt-file>WebSRT file</a>
must represent a time greater than than all the times represented by
<a href=#websrt-timestamp title="WebSRT timestamp">WebSRT timestamps</a> earlier in
the file.</p>

<p>The <dfn id=websrt-cue-settings>WebSRT cue settings</dfn> part of a <a href=#websrt-cue>WebSRT
</ol><p>The <dfn id=websrt-cue-settings>WebSRT cue settings</dfn> part of a <a href=#websrt-cue>WebSRT
cue</a> consists of zero or more of the following components, in
any order, separated from each other by one or more U+0020 SPACE
characters or U+0009 CHARACTER TABULATION (tab) characters. Each
Expand Down Expand Up @@ -26774,7 +26773,11 @@ CueEvent
<p>A <dfn id=websrt-cue-timestamp>WebSRT cue timestamp</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), followed by a <a href=#websrt-timestamp>WebSRT timestamp</a>
representing the time that the given point in the cue becomes
active, followed by a U+003E GREATER-THAN SIGN character (&gt;).</p>
active, followed by a U+003E GREATER-THAN SIGN character (&gt;). The
time represented by the <a href=#websrt-timestamp>WebSRT timestamp</a> must be
greater than the times represented by any previous <a href=#websrt-cue-timestamp title="WebSRT cue timestamp">WebSRT cue timestamps</a> in the
cue, as well as greater than the cue's start time offset, and less
than the cue's end time offset.</p>

<p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (&lt;), a U+0069 LATIN SMALL LETTER I
Expand Down
22 changes: 13 additions & 9 deletions source
Expand Up @@ -28875,7 +28875,7 @@ CueEvent
the given order:</p>

<ol>
<li>Optionally, a <span>WebSRT cue identifier</span>.</li>
<li>Optionally, a <span>WebSRT cue identifier</span> followed by a <span>WebSRT line terminator</span>.</li>
<li><span>WebSRT cue timings</span>.</li>
<li>Optionally, one or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters followed by <span>WebSRT cue settings</span>.</li>
<li>A <span>WebSRT line terminator</span>.</li>
Expand Down Expand Up @@ -28909,7 +28909,9 @@ CueEvent
spaces or tabs -->

<li>A <span>WebSRT timestamp</span> representing the start time
offset of the cue.</li>
offset of the cue. The time represented by this <span>WebSRT
timestamp</span> must be greater than the start time offsets of all
previous cues in the file.</li>

<li>A U+0020 SPACE character.</li>

Expand All @@ -28919,7 +28921,9 @@ CueEvent
<li>A U+0020 SPACE character.</li>

<li>A <span>WebSRT timestamp</span> representing the end time
offset of the cue.</li>
offset of the cue. The time represented by this <span>WebSRT
timestamp</span> must be greater than the start time offset of the
cue.</li>

</ol>

Expand Down Expand Up @@ -28968,11 +28972,6 @@ CueEvent

</ol>

<p>Each <span>WebSRT timestamp</span> in a <span>WebSRT file</span>
must represent a time greater than than all the times represented by
<span title="WebSRT timestamp">WebSRT timestamps</span> earlier in
the file.</p>

<p>The <dfn>WebSRT cue settings</dfn> part of a <span>WebSRT
cue</span> consists of zero or more of the following components, in
any order, separated from each other by one or more U+0020 SPACE
Expand Down Expand Up @@ -29104,7 +29103,12 @@ CueEvent
<p>A <dfn>WebSRT cue timestamp</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), followed by a <span>WebSRT timestamp</span>
representing the time that the given point in the cue becomes
active, followed by a U+003E GREATER-THAN SIGN character (>).</p>
active, followed by a U+003E GREATER-THAN SIGN character (>). The
time represented by the <span>WebSRT timestamp</span> must be
greater than the times represented by any previous <span
title="WebSRT cue timestamp">WebSRT cue timestamps</span> in the
cue, as well as greater than the cue's start time offset, and less
than the cue's end time offset.</p>

<p>A <dfn>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (&lt;), a U+0069 LATIN SMALL LETTER I
Expand Down

0 comments on commit fd791db

Please sign in to comment.