[html5] r5533 - [a] (0) WebSRT: Allow newlines between tags. Also, typo fix. Fixing http://www.w [...]
whatwg at whatwg.org
whatwg at whatwg.org
Tue Sep 28 14:52:29 PDT 2010
Author: ianh
Date: 2010-09-28 14:52:28 -0700 (Tue, 28 Sep 2010)
New Revision: 5533
Modified:
complete.html
index
source
Log:
[a] (0) WebSRT: Allow newlines between tags. Also, typo fix.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=10059
Modified: complete.html
===================================================================
--- complete.html 2010-09-28 21:31:07 UTC (rev 5532)
+++ complete.html 2010-09-28 21:52:28 UTC (rev 5533)
@@ -28630,10 +28630,12 @@
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 "&" character in the text of the cue.</li>
<li>A <a href=#websrt-cue-lt-escape>WebSRT cue lt escape</a>, representing a "<" character in the text of the cue.</li>
@@ -28641,7 +28643,12 @@
<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 (&),
and U+003C LESS-THAN SIGN characters (<).</p>
@@ -28669,30 +28676,31 @@
<p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (<), a U+0069 LATIN SMALL LETTER I
character, and a U+003E GREATER-THAN SIGN character (>), then
- <a href=#websrt-cue-text>WebSRT cue text</a> representing the italicized text, and
- finally a U+003C LESS-THAN SIGN character (<), a U+002F SOLIDUS
- character (/), a U+0069 LATIN SMALL LETTER I character, and a U+003E
- GREATER-THAN SIGN character (>).</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 (<), 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 id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
SIGN character (<), a U+0062 LATIN SMALL LETTER B character, and
- a U+003E GREATER-THAN SIGN character (>), then <a href=#websrt-cue-text>WebSRT cue
- text</a> representing the bolded text, and finally a U+003C
- LESS-THAN SIGN character (<), a U+002F SOLIDUS character (/), a
- U+0062 LATIN SMALL LETTER B character, and a U+003E GREATER-THAN
- SIGN character (>).</p>
+ a U+003E GREATER-THAN SIGN character (>), 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 (<), 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 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=""><ruby></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=""><rt></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=""></rt></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=""></ruby></code>".</li>
</ol><div class=impl>
@@ -41337,7 +41345,7 @@
<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>
Modified: index
===================================================================
--- index 2010-09-28 21:31:07 UTC (rev 5532)
+++ index 2010-09-28 21:52:28 UTC (rev 5533)
@@ -28610,10 +28610,12 @@
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 "&" character in the text of the cue.</li>
<li>A <a href=#websrt-cue-lt-escape>WebSRT cue lt escape</a>, representing a "<" character in the text of the cue.</li>
@@ -28621,7 +28623,12 @@
<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 (&),
and U+003C LESS-THAN SIGN characters (<).</p>
@@ -28649,30 +28656,31 @@
<p>A <dfn id=websrt-cue-italics-span>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (<), a U+0069 LATIN SMALL LETTER I
character, and a U+003E GREATER-THAN SIGN character (>), then
- <a href=#websrt-cue-text>WebSRT cue text</a> representing the italicized text, and
- finally a U+003C LESS-THAN SIGN character (<), a U+002F SOLIDUS
- character (/), a U+0069 LATIN SMALL LETTER I character, and a U+003E
- GREATER-THAN SIGN character (>).</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 (<), 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 id=websrt-cue-bold-span>WebSRT cue bold span</dfn> consists of a U+003C LESS-THAN
SIGN character (<), a U+0062 LATIN SMALL LETTER B character, and
- a U+003E GREATER-THAN SIGN character (>), then <a href=#websrt-cue-text>WebSRT cue
- text</a> representing the bolded text, and finally a U+003C
- LESS-THAN SIGN character (<), a U+002F SOLIDUS character (/), a
- U+0062 LATIN SMALL LETTER B character, and a U+003E GREATER-THAN
- SIGN character (>).</p>
+ a U+003E GREATER-THAN SIGN character (>), 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 (<), 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 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=""><ruby></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=""><rt></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=""></rt></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=""></ruby></code>".</li>
</ol><div class=impl>
@@ -41317,7 +41325,7 @@
<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>
Modified: source
===================================================================
--- source 2010-09-28 21:31:07 UTC (rev 5532)
+++ source 2010-09-28 21:52:28 UTC (rev 5533)
@@ -31204,10 +31204,12 @@
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>
<li>A <span>WebSRT cue amp escape</span>, representing a "&" character in the text of the cue.</li>
@@ -31218,6 +31220,11 @@
<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 (&),
@@ -31247,33 +31254,34 @@
<p>A <dfn>WebSRT cue italics span</dfn> consists of a U+003C
LESS-THAN SIGN character (<), 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 (<), 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 (<), 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 (<), 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 (<), 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 (<), 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=""><ruby></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=""><rt></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=""></rt></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=""></ruby></code>".</li>
</ol>
@@ -46095,7 +46103,7 @@
<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>
More information about the Commit-Watchers
mailing list