- From: Ian Hickson via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 06 May 2010 01:01:18 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv9207
Modified Files:
Overview.html
Log Message:
Captions - Stage 9.2: More parser rules for WebSRT. (whatwg r5081)
Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4082
retrieving revision 1.4083
diff -u -d -r1.4082 -r1.4083
--- Overview.html 5 May 2010 21:17:17 -0000 1.4082
+++ Overview.html 6 May 2010 01:01:14 -0000 1.4083
@@ -285,7 +285,7 @@
<h1>HTML5</h1>
<h2 class="no-num no-toc" id="a-vocabulary-and-associated-apis-for-html-and-xhtml">A vocabulary and associated APIs for HTML and XHTML</h2>
- <h2 class="no-num no-toc" id="editor-s-draft-5-may-2010">Editor's Draft 5 May 2010</h2>
+ <h2 class="no-num no-toc" id="editor-s-draft-6-may-2010">Editor's Draft 6 May 2010</h2>
<dl><dt>Latest Published Version:</dt>
<dd><a href="http://www.w3.org/TR/html5/">http://www.w3.org/TR/html5/</a></dd>
<dt>Latest Editor's Draft:</dt>
@@ -392,7 +392,7 @@
specification's progress along the W3C Recommendation
track.
- This specification is the 5 May 2010 Editor's Draft.
+ This specification is the 6 May 2010 Editor's Draft.
</p><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- relationship to other work (required) --><p>The contents of this specification are also part of <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/">a
specification</a> published by the <a href="http://www.whatwg.org/">WHATWG</a>, which is available under a
license that permits reuse of the specification text.</p><!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- required patent boilerplate --><p>This document was produced by a group operating under the <a href="http://www.w3.org/Consortium/Patent-Policy-20040205/">5
@@ -1252,7 +1252,7 @@
<li><a href="#text-html-sandboxed"><span class="secno">12.2 </span><code>text/html-sandboxed</code></a></li>
<li><a href="#application-xhtml-xml"><span class="secno">12.3 </span><code>application/xhtml+xml</code></a></li>
<li><a href="#text-cache-manifest"><span class="secno">12.4 </span><code>text/cache-manifest</code></a></li>
- <li><a href="#text-websrt"><span class="secno">12.5 </span><code>text/websrt</code></a></ol></li>
+ <li><a href="#text-srt"><span class="secno">12.5 </span><code>text/srt</code></a></ol></li>
<li><a class="no-num" href="#index">Index</a>
<ol>
<li><a class="no-num" href="#elements-1">Elements</a></li>
@@ -22830,7 +22830,8 @@
according to the <a href="#websrt-parser-algorithm">WebSRT parser algorithm</a> below. A
<a href="#websrt-parser">WebSRT parser</a>, specifically its conversion and parsing
steps, is typically run asynchronously, with the input byte stream
- being updated incrementally as the resource is downloaded.</p>
+ being updated incrementally as the resource is downloaded; this is
+ called an <dfn id="incremental-websrt-parser">incremental WebSRT parser</dfn>.</p>
<p>When convering the bytes into Unicode characters, bytes or
sequences of bytes that are not valid UTF-8 sequences must be
@@ -22843,22 +22844,57 @@
parsed.</li>
<li><p>Let <var title="">position</var> be a pointer into <var title="">input</var>, initially pointing at the start of the
- string.</li>
+ string. In an <a href="#incremental-websrt-parser">incremental WebSRT parser</a>, when this
+ algorithm (or further algorithms that it uses) moves the <var title="">position</var> pointer, the user agent must wait until
+ appropriate further characters from the byte stream have been added
+ to <var title="">input</var> before moving the pointer, so that the
+ algorithm never reads past the end of the <var title="">input</var>
+ string. Once the byte stream has ended, and all characters have
+ been added to <var title="">input</var>, then the <var title="">position</var> pointer may, when so instructed by the
+ algorithms, be moved past the end of <var title="">input</var>.</li>
+
+ <li><p><i>Cue loop</i>: <a href="#collect-a-sequence-of-characters">Collect a sequence of
+ characters</a> that are either U+000D CARRIAGE RETURN (CR) or
+ U+000A LINE FEED (LF) characters.</li>
+
+ <li><p>Let <var title="">id</var> be the empty string.</li>
<li><p><a href="#collect-a-sequence-of-characters">Collect a sequence of characters</a> that are
- either U+000D CARRIAGE RETURN (CR) or U+000A LINE FEED (LF)
- characters.</li>
+ <em>not</em> U+000D CARRIAGE RETURN (CR) or U+000A LINE FEED (LF)
+ characters. Let <var title="">line</var> be those characters, if
+ any.</li>
+
+ <li><p>If <var title="">line</var> is the empty string, then jump
+ to the step labeled <i>end</i>.</li>
+
+ <li><p>If <var title="">line</var> contains the three-character
+ substring "<code title="">--></code>" (U+002D HYPHEN-MINUS, U+002D
+ HYPHEN-MINUS, U+003E GREATER-THAN SIGN), then jump to the step
+ labeled <i>timing</i> below.</li>
+
+ <li><p>Let <var title="">id</var> be <var title="">line</var>.<p></li>
+
+ <li><p>If <var title="">position</var> is past the end of <var title="">input</var>, then jump to the step labeled
+ <i>end</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 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>
<li><p><a href="#collect-a-sequence-of-characters">Collect a sequence of characters</a> that are
<em>not</em> U+000D CARRIAGE RETURN (CR) or U+000A LINE FEED (LF)
- characters. Let <var title="">line</var> be those
- characters, if any.</li>
+ characters. Let <var title="">line</var> be those characters, if
+ any.</li>
- <li><p>If <var title="">line</var> is the empty string, then the
- file has ended. Abort these steps. The <a href="#websrt-parser">WebSRT parser</a>
- has finished.</li>
+ <li><p>If <var title="">line</var> is the empty string, then jump
+ to the step labeled <i>cue loop</i>.</li>
- <li><p class="XXX">...</li>
+ <li><p><i>Timings</i>: <span class="XXX">...</span></li>
+
+ <li><p><i>End</i>: The file has ended. Abort these steps. The
+ <a href="#websrt-parser">WebSRT parser</a> has finished.</li>
</ol></div><h5 id="user-interface"><span class="secno">4.8.10.12 </span>User interface</h5><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><p>The <dfn id="attr-media-controls" title="attr-media-controls"><code>controls</code></dfn>
attribute is a <a href="#boolean-attribute">boolean attribute</a>. If present, it
@@ -65087,14 +65123,14 @@
<dt>Change controller:</dt>
<dd>WHATWG</dd>
</dl><p>Fragment identifiers have no meaning with
- <code><a href="#text-cache-manifest">text/cache-manifest</a></code> resources.<h3 id="text-websrt"><span class="secno">12.5 </span><dfn><code>text/websrt</code></dfn></h3><p>This registration is for community review and will be submitted
+ <code><a href="#text-cache-manifest">text/cache-manifest</a></code> resources.<h3 id="text-srt"><span class="secno">12.5 </span><dfn><code>text/srt</code></dfn></h3><p>This registration is for community review and will be submitted
to the IESG for review, approval, and registration with IANA.</p><!--
To: ietf-types@iana.org
Subject: Registration of media type text/cues
--><dl><dt>Type name:</dt>
<dd>text</dd>
<dt>Subtype name:</dt>
- <dd>websrt</dd>
+ <dd>srt</dd>
<dt>Required parameters:</dt>
<dd>No parameters</dd>
<dt>Optional parameters:</dt>
@@ -65145,7 +65181,7 @@
<dt>Change controller:</dt>
<dd>WHATWG</dd>
</dl><p>Fragment identifiers have no meaning with
- <code><a href="#text-websrt">text/websrt</a></code> resources.<h2 class="no-num" id="index">Index</h2><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><div class="impl">
+ <code>text/websrt</code> resources.<h2 class="no-num" id="index">Index</h2><p class="XXX annotation"><b>Status: </b><i>Implemented and widely deployed</i><div class="impl">
<p>The following sections only cover conforming elements and features.</p>
Received on Thursday, 6 May 2010 01:01:20 UTC