Skip to content

Commit

Permalink
[a] (0) WebSRT: Allow newlines between tags. Also, typo fix.
Browse files Browse the repository at this point in the history 
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=10059

git-svn-id: http://svn.whatwg.org/webapps@5533 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Sep 28, 2010
1 parent 02ef61a commit 964eb8a
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 52 deletions.
44 changes: 26 additions & 18 deletions complete.html
View file
Expand Up @@ -28630,9 +28630,11 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
does not start or end with a <a href=#websrt-line-terminator>WebSRT line
terminator</a>.)</p>

<p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of one or more of the
following components, in any order, each optionally separated from
the next by a <a href=#websrt-line-terminator>WebSRT line terminator</a>:</p>
<p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of one or more <a href=#websrt-cue-components>WebSRT
cue components</a>, in any order, each optionally separated from
the next by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>

<p>The <dfn id=websrt-cue-components>WebSRT cue components</dfn> are:</p>

<ul><li>A <a href=#websrt-cue-text-span>WebSRT cue text span</a>, representing the text of the cue.</li>
<li>A <a href=#websrt-cue-amp-escape>WebSRT cue amp escape</a>, representing a "&amp;" character in the text of the cue.</li>
Expand All @@ -28641,7 +28643,12 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<li>A <a href=#websrt-cue-italics-span>WebSRT cue italics span</a>.</li>
<li>A <a href=#websrt-cue-bold-span>WebSRT cue bold span</a>.</li>
<li>A <a href=#websrt-cue-ruby-span>WebSRT cue ruby span</a>.</li>
</ul><p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
</ul><p><dfn id=websrt-cue-internal-text>WebSRT cue internal text</dfn> consists of an optional
<a href=#websrt-line-terminator>WebSRT line terminator</a>, followed by zero or more
<a href=#websrt-cue-components>WebSRT cue components</a>, in any order, each optionally
followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>

<p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
characters other than U+000A LINE FEED (LF) characters, U+000D
CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters (&amp;),
and U+003C LESS-THAN SIGN characters (&lt;).</p>
Expand Down Expand Up @@ -28669,30 +28676,31 @@ <h6 id=syntax-0><span class=secno>4.8.10.11.1 </span>Syntax</h6>
<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
character, and a U+003E GREATER-THAN SIGN character (&gt;), then
<a href=#websrt-cue-text>WebSRT cue text</a> representing the italicized text, and
finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS
character (/), a U+0069 LATIN SMALL LETTER I character, and a U+003E
GREATER-THAN SIGN character (&gt;).</p>
<a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing the italicized
text, and finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F
SOLIDUS character (/), a U+0069 LATIN SMALL LETTER I character, and
a U+003E GREATER-THAN SIGN character (&gt;).</p>

<p>A <dfn id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), a U+0062 LATIN SMALL LETTER B character, and
a U+003E GREATER-THAN SIGN character (&gt;), then <a href=#websrt-cue-text>WebSRT cue
text</a> representing the bolded text, and finally a U+003C
LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character (/), a
U+0062 LATIN SMALL LETTER B character, and a U+003E GREATER-THAN
SIGN character (&gt;).</p>
a U+003E GREATER-THAN SIGN character (&gt;), then <a href=#websrt-cue-internal-text>WebSRT cue
internal text</a> representing the bolded text, and finally a
U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character
(/), a U+0062 LATIN SMALL LETTER B character, and a U+003E
GREATER-THAN SIGN character (&gt;).</p>

<p>A <dfn id=websrt-cue-ruby-span>WebSRT cue ruby span</dfn> consists of the following
components, in the order given:</p>

<ol><li>The string "<code title="">&lt;ruby&gt;</code>".</li>
<li>One or more occurances of the following group of components, in the order given:
<ol><li><a href=#websrt-cue-text>WebSRT cue text</a>, representing the ruby base.</li>
<li>One or more occurrences of the following group of components, in the order given:
<ol><li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby base.</li>
<li>The string "<code title="">&lt;rt&gt;</code>".</li>
<li><a href=#websrt-cue-text>WebSRT cue text</a>, representing the ruby text component of th ruby annotation.</li>
<li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby text component of th ruby annotation.</li>
<li>The string "<code title="">&lt;/rt&gt;</code>".</li>
</ol></li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters.</li>
<li>Optioonally, a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters, each optionally followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li>The string "<code title="">&lt;/ruby&gt;</code>".</li>
</ol><div class=impl>

Expand Down Expand Up @@ -41337,7 +41345,7 @@ <h6 id=radio-button-state><span class=secno>4.10.7.1.17 </span><dfn title=attr-i
<div class=impl>

<p>When any of the following phenomena occur, if the element's <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state is true after
the occurance, the <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state of all the other
the occurrence, the <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state of all the other
elements in the same <i><a href=#radio-button-group>radio button group</a></i> must be set to
false:</p>

Expand Down
44 changes: 26 additions & 18 deletions index
View file
Expand Up @@ -28610,9 +28610,11 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
does not start or end with a <a href=#websrt-line-terminator>WebSRT line
terminator</a>.)</p>

<p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of one or more of the
following components, in any order, each optionally separated from
the next by a <a href=#websrt-line-terminator>WebSRT line terminator</a>:</p>
<p><dfn id=websrt-cue-text>WebSRT cue text</dfn> consists of one or more <a href=#websrt-cue-components>WebSRT
cue components</a>, in any order, each optionally separated from
the next by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>

<p>The <dfn id=websrt-cue-components>WebSRT cue components</dfn> are:</p>

<ul><li>A <a href=#websrt-cue-text-span>WebSRT cue text span</a>, representing the text of the cue.</li>
<li>A <a href=#websrt-cue-amp-escape>WebSRT cue amp escape</a>, representing a "&amp;" character in the text of the cue.</li>
Expand All @@ -28621,7 +28623,12 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
<li>A <a href=#websrt-cue-italics-span>WebSRT cue italics span</a>.</li>
<li>A <a href=#websrt-cue-bold-span>WebSRT cue bold span</a>.</li>
<li>A <a href=#websrt-cue-ruby-span>WebSRT cue ruby span</a>.</li>
</ul><p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
</ul><p><dfn id=websrt-cue-internal-text>WebSRT cue internal text</dfn> consists of an optional
<a href=#websrt-line-terminator>WebSRT line terminator</a>, followed by zero or more
<a href=#websrt-cue-components>WebSRT cue components</a>, in any order, each optionally
followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</p>

<p>A <dfn id=websrt-cue-text-span>WebSRT cue text span</dfn> consists of one or more
characters other than U+000A LINE FEED (LF) characters, U+000D
CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters (&amp;),
and U+003C LESS-THAN SIGN characters (&lt;).</p>
Expand Down Expand Up @@ -28649,30 +28656,31 @@ interface <dfn id=timedtrackcue>TimedTrackCue</dfn> {
<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
character, and a U+003E GREATER-THAN SIGN character (&gt;), then
<a href=#websrt-cue-text>WebSRT cue text</a> representing the italicized text, and
finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS
character (/), a U+0069 LATIN SMALL LETTER I character, and a U+003E
GREATER-THAN SIGN character (&gt;).</p>
<a href=#websrt-cue-internal-text>WebSRT cue internal text</a> representing the italicized
text, and finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F
SOLIDUS character (/), a U+0069 LATIN SMALL LETTER I character, and
a U+003E GREATER-THAN SIGN character (&gt;).</p>

<p>A <dfn id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), a U+0062 LATIN SMALL LETTER B character, and
a U+003E GREATER-THAN SIGN character (&gt;), then <a href=#websrt-cue-text>WebSRT cue
text</a> representing the bolded text, and finally a U+003C
LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character (/), a
U+0062 LATIN SMALL LETTER B character, and a U+003E GREATER-THAN
SIGN character (&gt;).</p>
a U+003E GREATER-THAN SIGN character (&gt;), then <a href=#websrt-cue-internal-text>WebSRT cue
internal text</a> representing the bolded text, and finally a
U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character
(/), a U+0062 LATIN SMALL LETTER B character, and a U+003E
GREATER-THAN SIGN character (&gt;).</p>

<p>A <dfn id=websrt-cue-ruby-span>WebSRT cue ruby span</dfn> consists of the following
components, in the order given:</p>

<ol><li>The string "<code title="">&lt;ruby&gt;</code>".</li>
<li>One or more occurances of the following group of components, in the order given:
<ol><li><a href=#websrt-cue-text>WebSRT cue text</a>, representing the ruby base.</li>
<li>One or more occurrences of the following group of components, in the order given:
<ol><li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby base.</li>
<li>The string "<code title="">&lt;rt&gt;</code>".</li>
<li><a href=#websrt-cue-text>WebSRT cue text</a>, representing the ruby text component of th ruby annotation.</li>
<li><a href=#websrt-cue-internal-text>WebSRT cue internal text</a>, representing the ruby text component of th ruby annotation.</li>
<li>The string "<code title="">&lt;/rt&gt;</code>".</li>
</ol></li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters.</li>
<li>Optioonally, a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters, each optionally followed by a <a href=#websrt-line-terminator>WebSRT line terminator</a>.</li>
<li>The string "<code title="">&lt;/ruby&gt;</code>".</li>
</ol><div class=impl>

Expand Down Expand Up @@ -41317,7 +41325,7 @@ interface <dfn id=htmlformelement>HTMLFormElement</dfn> : <a href=#htmlelement>H
<div class=impl>

<p>When any of the following phenomena occur, if the element's <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state is true after
the occurance, the <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state of all the other
the occurrence, the <a href=#concept-fe-checked title=concept-fe-checked>checkedness</a> state of all the other
elements in the same <i><a href=#radio-button-group>radio button group</a></i> must be set to
false:</p>

Expand Down
40 changes: 24 additions & 16 deletions source
View file
Expand Up @@ -31204,9 +31204,11 @@ interface <dfn>TimedTrackCue</dfn> {
does not start or end with a <span>WebSRT line
terminator</span>.)</p>

<p><dfn>WebSRT cue text</dfn> consists of one or more of the
following components, in any order, each optionally separated from
the next by a <span>WebSRT line terminator</span>:</p>
<p><dfn>WebSRT cue text</dfn> consists of one or more <span>WebSRT
cue components</span>, in any order, each optionally separated from
the next by a <span>WebSRT line terminator</span>.</p>

<p>The <dfn>WebSRT cue components</dfn> are:</p>

<ul>
<li>A <span>WebSRT cue text span</span>, representing the text of the cue.</li>
Expand All @@ -31218,6 +31220,11 @@ interface <dfn>TimedTrackCue</dfn> {
<li>A <span>WebSRT cue ruby span</span>.</li>
</ul>

<p><dfn>WebSRT cue internal text</dfn> consists of an optional
<span>WebSRT line terminator</span>, followed by zero or more
<span>WebSRT cue components</span>, in any order, each optionally
followed by a <span>WebSRT line terminator</span>.</p>

<p>A <dfn>WebSRT cue text span</dfn> consists of one or more
characters other than U+000A LINE FEED (LF) characters, U+000D
CARRIAGE RETURN (CR) characters, U+0026 AMPERSAND characters (&amp;),
Expand Down Expand Up @@ -31247,33 +31254,34 @@ interface <dfn>TimedTrackCue</dfn> {
<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
character, and a U+003E GREATER-THAN SIGN character (>), then
<span>WebSRT cue text</span> representing the italicized text, and
finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS
character (/), a U+0069 LATIN SMALL LETTER I character, and a U+003E
GREATER-THAN SIGN character (>).</p>
<span>WebSRT cue internal text</span> representing the italicized
text, and finally a U+003C LESS-THAN SIGN character (&lt;), a U+002F
SOLIDUS character (/), a U+0069 LATIN SMALL LETTER I character, and
a U+003E GREATER-THAN SIGN character (>).</p>

<p>A <dfn>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
SIGN character (&lt;), a U+0062 LATIN SMALL LETTER B character, and
a U+003E GREATER-THAN SIGN character (>), then <span>WebSRT cue
text</span> representing the bolded text, and finally a U+003C
LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character (/), a
U+0062 LATIN SMALL LETTER B character, and a U+003E GREATER-THAN
SIGN character (>).</p>
internal text</span> representing the bolded text, and finally a
U+003C LESS-THAN SIGN character (&lt;), a U+002F SOLIDUS character
(/), a U+0062 LATIN SMALL LETTER B character, and a U+003E
GREATER-THAN SIGN character (>).</p>

<p>A <dfn>WebSRT cue ruby span</dfn> consists of the following
components, in the order given:</p>

<ol>
<li>The string "<code title="">&lt;ruby&gt;</code>".</li>
<li>One or more occurances of the following group of components, in the order given:
<li>One or more occurrences of the following group of components, in the order given:
<ol>
<li><span>WebSRT cue text</span>, representing the ruby base.</li>
<li><span>WebSRT cue internal text</span>, representing the ruby base.</li>
<li>The string "<code title="">&lt;rt&gt;</code>".</li>
<li><span>WebSRT cue text</span>, representing the ruby text component of th ruby annotation.</li>
<li><span>WebSRT cue internal text</span>, representing the ruby text component of th ruby annotation.</li>
<li>The string "<code title="">&lt;/rt&gt;</code>".</li>
</ol>
</li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters.</li>
<li>Optioonally, a <span>WebSRT line terminator</span>.</li>
<li>Zero or more U+0020 SPACE characters or U+0009 CHARACTER TABULATION (tab) characters, each optionally followed by a <span>WebSRT line terminator</span>.</li>
<li>The string "<code title="">&lt;/ruby&gt;</code>".</li>
</ol>

Expand Down Expand Up @@ -46095,7 +46103,7 @@ interface <dfn>HTMLFormElement</dfn> : <span>HTMLElement</span> {

<p>When any of the following phenomena occur, if the element's <span
title="concept-fe-checked">checkedness</span> state is true after
the occurance, the <span
the occurrence, the <span
title="concept-fe-checked">checkedness</span> state of all the other
elements in the same <i>radio button group</i> must be set to
false:</p>
Expand Down

0 comments on commit 964eb8a

Please sign in to comment.