Skip to content

Commit

Permalink
tweaks based on feedback from atom folk to help feed autodiscovery; c…
Browse files Browse the repository at this point in the history 
…orrect links to 'space character'; add dfn for doctype

git-svn-id: http://svn.whatwg.org/webapps@375 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
@Hixie
Hixie committed Nov 29, 2006
1 parent 1f3ba2c commit 0013a03
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 58 deletions.
69 changes: 40 additions & 29 deletions index
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<h1 id=web-applications>Web Applications 1.0</h1>

<h2 class="no-num no-toc" id=working>Working Draft &mdash; 28 November
<h2 class="no-num no-toc" id=working>Working Draft &mdash; 29 November
2006</h2>

<p>You can take part in this work. <a
Expand Down Expand Up @@ -15723,7 +15723,7 @@ mpt says:
href="#a0">a</a></code>, and <code><a href="#area0">area</a></code>
elements. For <code><a href="#link0">link</a></code> elements, if the
<code title=attr-link-rel><a href="#rel">rel</a></code> attribute does not
also contains the keyword <code title=rel-stylesheet><a
also contain the keyword <code title=rel-stylesheet><a
href="#stylesheet0">stylesheet</a></code>, it creates a <a
href="#hyperlink0" title="hyperlink link">hyperlink</a>; but if it
<em>does</em> also contains the keyword <code title=rel-stylesheet><a
Expand Down Expand Up @@ -15914,6 +15914,12 @@ mpt says:
document; otherwise, the feed is just a syndication feed, not necessarily
associated with a particular Web page.

<p>The first <code><a href="#link0">link</a></code>, <code><a
href="#a0">a</a></code>, or <code><a href="#area0">area</a></code> element
in the document (in tree order) that creates a hyperlink with the link
type <code title=rel-feed><a href="#feed0">feed</a></code> must be treated
as the default syndication feed for the purposes of feed autodiscovery.

<p class=note>The <code title=rel-feed><a href="#feed0">feed</a></code>
keyword is implied by the <code title=rel-alternate><a
href="#alternate0">alternate</a></code> link type in certain cases (q.v.).
Expand Down Expand Up @@ -24473,9 +24479,9 @@ function receiver(e) {

<h5 id=the-doctype><span class=secno>9.1.1.1. </span>The DOCTYPE</h5>

<p>A DOCTYPE is a header that must be present before any <a href="#text1"
title=syntax-text>text</a>, <a href="#character0"
title=syntax-entities>entities</a> and <a href="#tags"
<p>A <dfn id=doctype title=syntax-doctype>DOCTYPE</dfn> is a header that
must be present before any <a href="#text1" title=syntax-text>text</a>, <a
href="#character0" title=syntax-entities>entities</a> and <a href="#tags"
title=syntax-tags>tags</a> in an HTML document. (<a href="#comments0"
title=syntax-comments>Comments</a> may appear before the DOCTYPE.) There
must be exactly one DOCTYPE per document.
Expand Down Expand Up @@ -24514,7 +24520,8 @@ function receiver(e) {
<li>A U+0045 LATIN CAPITAL LETTER E or U+0065 LATIN SMALL LETTER E
character.

<li>One or more <span>space characters</span>.
<li>One or more <a href="#space" title="space character">space
characters</a>.

<li>A U+0048 LATIN CAPITAL LETTER H or U+0068 LATIN SMALL LETTER H
character.
Expand All @@ -24528,7 +24535,8 @@ function receiver(e) {
<li>A U+004C LATIN CAPITAL LETTER L or U+006C LATIN SMALL LETTER L
character.

<li>Zero or more <span>space characters</span>.
<li>Zero or more <a href="#space" title="space character">space
characters</a>.

<li>A U+003E GREATER-THAN SIGN (<code>&gt;</code>) character.
</ol>
Expand Down Expand Up @@ -24601,10 +24609,11 @@ function receiver(e) {
<li>Following the tag name, the start tag may have a number of attributes,
the <a href="#attributes1" title=syntax-attributes>syntax for which</a>
is described below. Attributes must be separated from each other and from
the tag name by one or more <span>space characters</span>.
the tag name by one or more <a href="#space" title="space
character">space characters</a>.

<li>After the attributes, there may be one or more <span>space
characters</span>.
<li>After the attributes, there may be one or more <a href="#space"
title="space character">space characters</a>.

<li>Finally, start tags must be closed by a U+003E GREATER-THAN SIGN
(<code>&gt;</code>) character.
Expand All @@ -24625,8 +24634,8 @@ function receiver(e) {
<li>The next few characters of an end tag must be the element's <a
href="#tag-name" title=syntax-tag-name>tag name</a>.

<li>After the tag name, there may be one or more <span>space
characters</span>.
<li>After the tag name, there may be one or more <a href="#space"
title="space character">space characters</a>.

<li>Finally, end tags must be closed by a U+003E GREATER-THAN SIGN
(<code>&gt;</code>) character.
Expand Down Expand Up @@ -25481,7 +25490,7 @@ function receiver(e) {
<p>Otherwise if the next seven chacacters are a
<span>case-insensitive</span><!-- XXX xref, ascii only --> match for the
word "DOCTYPE", then consume those characters and switch to the <a
href="#doctype">DOCTYPE state</a>.</p>
href="#doctype0">DOCTYPE state</a>.</p>

<p>Otherwise, is is a <a href="#parse">parse error</a>. Switch to the <a
href="#bogus">bogus comment state</a>. The next character that is
Expand Down Expand Up @@ -25574,7 +25583,7 @@ function receiver(e) {
to the <a href="#comment">comment state</a>.
</dl>

<dt><dfn id=doctype>DOCTYPE state</dfn>
<dt><dfn id=doctype0>DOCTYPE state</dfn>

<dd>
<p>Consume the <a href="#next-input">next input character</a>:</p>
Expand Down Expand Up @@ -25623,7 +25632,7 @@ function receiver(e) {
<dd>Create a new DOCTYPE token. Set the token's name name to the
uppercase version of the current input character (subtract 0x0020 from
the character's codepoint), and mark it as being in error. Switch to
the <a href="#doctype0">DOCTYPE name state</a>.
the <a href="#doctype1">DOCTYPE name state</a>.

<dt>U+003E GREATER-THAN SIGN (&gt;)

Expand All @@ -25641,10 +25650,10 @@ function receiver(e) {

<dd>Create a new DOCTYPE token. Set the token's name name to the current
input character, and mark it as being in error. Switch to the <a
href="#doctype0">DOCTYPE name state</a>.
href="#doctype1">DOCTYPE name state</a>.
</dl>

<dt><dfn id=doctype0>DOCTYPE name state</dfn>
<dt><dfn id=doctype1>DOCTYPE name state</dfn>

<dd>
<p>Consume the <a href="#next-input">next input character</a>:</p>
Expand Down Expand Up @@ -25672,7 +25681,7 @@ function receiver(e) {

<dd>Append the uppercase version of the current input character
(subtract 0x0020 from the character's codepoint) to the current DOCTYPE
token's name. Stay in the <a href="#doctype0">DOCTYPE name state</a>.
token's name. Stay in the <a href="#doctype1">DOCTYPE name state</a>.

<dt>EOF

Expand All @@ -25683,7 +25692,7 @@ function receiver(e) {
<dt>Anything else

<dd>Append the current input character to the current DOCTYPE token's
name. Stay in the <a href="#doctype0">DOCTYPE name state</a>.
name. Stay in the <a href="#doctype1">DOCTYPE name state</a>.
</dl>

<p>If the name of the DOCTYPE token is exactly the four letters "HTML",
Expand Down Expand Up @@ -30741,16 +30750,18 @@ interface <dfn id=timeouthandler>TimeoutHandler</dfn> {
Featherstone, Daniel Peng, David Flanagan, Dimitri Glazkov, dolphinling,
Doron Rosenberg, Eira Monstad, Erik Arvidsson, fantasai, Franck 'Shift'
Qu&eacute;lain, Henri Sivonen, Henrik Lied, H&aring;kon Wium Lie, Ignacio
Javier, James Graham, James Perrett, Jan-Klaas Kollhof, Jasper
Bryant-Greene, Jens Bannmann, J. King, Joel Spolsky, Johnny Stenback,
Jonathan Worent, Jon Perlow, Jukka K. Korpela, Kai Hendry, Kornel
Lesinski, Lachlan Hunt, Larry Page, Laurens Holst,
Logan<!-- on moz irc -->, Lenny Domnitser, L&eacute;onard Bouchet, Maciej
Stachowiak, Malcolm Rowe, Mark Nottingham, Mark Schenk, Martijn Wargers,
Martin Honnen, Matthew Mastracci, Matthew Raymond, Matthew Thomas, Mattias
Waldau, Max Romantschuk, Michael A. Nachbaur, Michael Gratton, Michael
'Ratt' Iannarelli, Mihai &#x015E;ucan<!-- from ROBO Design -->, Mike
Shaver, Mikko Rantalainen, Neil Deakin, Olav Junker Kj&aelig;r, Rimantas
Javier, James Graham, James M Snell, James Perrett, Jan-Klaas Kollhof,
Jasper Bryant-Greene, Jens Bannmann, J. King, Joel Spolsky, Johnny
Stenback, Jonathan Worent, Jon Perlow, Jukka K. Korpela, Kai Hendry,
Kornel Lesinski, Lachlan Hunt, Larry Page, Laurens Holst, Logan<!--
on moz irc -->,
Lenny Domnitser, L&eacute;onard Bouchet, Maciej Stachowiak, Malcolm Rowe,
Mark Nottingham, Mark Schenk, Martijn Wargers, Martin Honnen, Matthew
Mastracci, Matthew Raymond, Matthew Thomas, Mattias Waldau, Max
Romantschuk, Michael A. Nachbaur, Michael Gratton, Michael 'Ratt'
Iannarelli, Mihai &#x015E;ucan<!--
from ROBO Design -->, Mike Shaver,
Mikko Rantalainen, Neil Deakin, Olav Junker Kj&aelig;r, Rimantas
Liubertas, Robert O'Callahan, Roman Ivanov, S. Mike Dierken, Shadow2531,
Shaun Inman, Simon Pieters, Stephen Ma, Steven Garrity, Stewart Brodie,
Stuart Parmenter, Tantek &Ccedil;elik, Thomas O'Connor, Tim Altman,
Expand Down
64 changes: 35 additions & 29 deletions source
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13768,9 +13768,9 @@ mpt says:
<p>The <code title="rel-alternate">alternate</code> keyword may be
used with <code>link</code>, <code>a</code>, and <code>area</code>
elements. For <code>link</code> elements, if the <code
title="attr-link-rel">rel</code> attribute does not also contains
the keyword <code title="rel-stylesheet">stylesheet</code>, it
creates a <span title="hyperlink link">hyperlink</span>; but if it
title="attr-link-rel">rel</code> attribute does not also contain the
keyword <code title="rel-stylesheet">stylesheet</code>, it creates a
<span title="hyperlink link">hyperlink</span>; but if it
<em>does</em> also contains the keyword <code
title="rel-stylesheet">stylesheet</code>, the <code
title="rel-alternate">alternate</code> keyword instead modifies the
Expand Down Expand Up @@ -13945,6 +13945,12 @@ mpt says:
otherwise, the feed is just a syndication feed, not necessarily
associated with a particular Web page.</p>

<p>The first <code>link</code>, <code>a</code>, or <code>area</code>
element in the document (in tree order) that creates a hyperlink
with the link type <code title="rel-feed">feed</code> must be
treated as the default syndication feed for the purposes of feed
autodiscovery.</p>

<p class="note">The <code title="rel-feed">feed</code> keyword is
implied by the <code title="rel-alternate">alternate</code> link
type in certain cases (q.v.).</p>
Expand Down Expand Up @@ -22696,8 +22702,8 @@ function receiver(e) {

<h5>The DOCTYPE</h5>

<p>A DOCTYPE is a header that must be present before any <span
title="syntax-text">text</span>, <span
<p>A <dfn title="syntax-doctype">DOCTYPE</dfn> is a header that must
be present before any <span title="syntax-text">text</span>, <span
title="syntax-entities">entities</span> and <span
title="syntax-tags">tags</span> in an HTML document. (<span
title="syntax-comments">Comments</span> may appear before the
Expand All @@ -22722,12 +22728,12 @@ function receiver(e) {
<li>A U+0059 LATIN CAPITAL LETTER Y or U+0079 LATIN SMALL LETTER Y character.</li>
<li>A U+0050 LATIN CAPITAL LETTER P or U+0070 LATIN SMALL LETTER P character.</li>
<li>A U+0045 LATIN CAPITAL LETTER E or U+0065 LATIN SMALL LETTER E character.</li>
<li>One or more <span>space characters</span>.</li>
<li>One or more <span title="space character">space characters</span>.</li>
<li>A U+0048 LATIN CAPITAL LETTER H or U+0068 LATIN SMALL LETTER H character.</li>
<li>A U+0054 LATIN CAPITAL LETTER T or U+0074 LATIN SMALL LETTER T character.</li>
<li>A U+004D LATIN CAPITAL LETTER M or U+006D LATIN SMALL LETTER M character.</li>
<li>A U+004C LATIN CAPITAL LETTER L or U+006C LATIN SMALL LETTER L character.</li>
<li>Zero or more <span>space characters</span>.</li>
<li>Zero or more <span title="space character">space characters</span>.</li>
<li>A U+003E GREATER-THAN SIGN (<code>&gt;</code>) character.</li>
</ol>

Expand Down Expand Up @@ -22800,11 +22806,11 @@ function receiver(e) {
<li>Following the tag name, the start tag may have a number of
attributes, the <span title="syntax-attributes">syntax for
which</span> is described below. Attributes must be separated from
each other and from the tag name by one or more <span>space
characters</span>.</li>
each other and from the tag name by one or more <span title="space
character">space characters</span>.</li>

<li>After the attributes, there may be one or more <span>space
characters</span>.</li>
<li>After the attributes, there may be one or more <span
title="space character">space characters</span>.</li>

<li>Finally, start tags must be closed by a U+003E GREATER-THAN
SIGN (<code>&gt;</code>) character.</li>
Expand All @@ -22827,8 +22833,8 @@ function receiver(e) {
<li>The next few characters of an end tag must be the element's
<span title="syntax-tag-name">tag name</span>.</li>

<li>After the tag name, there may be one or more <span>space
characters</span>.</li>
<li>After the tag name, there may be one or more <span title="space
character">space characters</span>.</li>

<li>Finally, end tags must be closed by a U+003E GREATER-THAN
SIGN (<code>&gt;</code>) character.</li>
Expand Down Expand Up @@ -28035,22 +28041,22 @@ interface <dfn>TimeoutHandler</dfn> {
Dimitri Glazkov, dolphinling, Doron Rosenberg, Eira Monstad, Erik
Arvidsson, fantasai, Franck 'Shift' Qu&eacute;lain, Henri Sivonen,
Henrik Lied, H&aring;kon Wium Lie, Ignacio Javier, James Graham,
James Perrett, Jan-Klaas Kollhof, Jasper Bryant-Greene, Jens
Bannmann, J. King, Joel Spolsky, Johnny Stenback, Jonathan Worent,
Jon Perlow, Jukka K. Korpela, Kai Hendry, Kornel Lesinski, Lachlan
Hunt, Larry Page, Laurens Holst, Logan<!-- on moz irc -->, Lenny
Domnitser, L&eacute;onard Bouchet, Maciej Stachowiak, Malcolm Rowe,
Mark Nottingham, Mark Schenk, Martijn Wargers, Martin Honnen,
Matthew Mastracci, Matthew Raymond, Matthew Thomas, Mattias Waldau,
Max Romantschuk, Michael A. Nachbaur, Michael Gratton, Michael
'Ratt' Iannarelli, Mihai &#x015E;ucan<!-- from ROBO Design -->, Mike
Shaver, Mikko Rantalainen, Neil Deakin, Olav Junker Kj&aelig;r,
Rimantas Liubertas, Robert O'Callahan, Roman Ivanov, S. Mike
Dierken, Shadow2531, Shaun Inman, Simon Pieters, Stephen Ma, Steven
Garrity, Stewart Brodie, Stuart Parmenter, Tantek &Ccedil;elik,
Thomas O'Connor, Tim Altman, Vladimir Vuki&#x0107;evi&#x0107;, and
everyone on the WHATWG mailing list for their useful and substantial
comments.</p>
James M Snell, James Perrett, Jan-Klaas Kollhof, Jasper
Bryant-Greene, Jens Bannmann, J. King, Joel Spolsky, Johnny
Stenback, Jonathan Worent, Jon Perlow, Jukka K. Korpela, Kai Hendry,
Kornel Lesinski, Lachlan Hunt, Larry Page, Laurens Holst, Logan<!--
on moz irc -->, Lenny Domnitser, L&eacute;onard Bouchet, Maciej
Stachowiak, Malcolm Rowe, Mark Nottingham, Mark Schenk, Martijn
Wargers, Martin Honnen, Matthew Mastracci, Matthew Raymond, Matthew
Thomas, Mattias Waldau, Max Romantschuk, Michael A. Nachbaur,
Michael Gratton, Michael 'Ratt' Iannarelli, Mihai &#x015E;ucan<!--
from ROBO Design -->, Mike Shaver, Mikko Rantalainen, Neil Deakin,
Olav Junker Kj&aelig;r, Rimantas Liubertas, Robert O'Callahan, Roman
Ivanov, S. Mike Dierken, Shadow2531, Shaun Inman, Simon Pieters,
Stephen Ma, Steven Garrity, Stewart Brodie, Stuart Parmenter, Tantek
&Ccedil;elik, Thomas O'Connor, Tim Altman, Vladimir
Vuki&#x0107;evi&#x0107;, and everyone on the WHATWG mailing list for
their useful and substantial comments.</p>

<p>Special thanks to Richard Williamson for creating the first
implementation of <code>canvas</code> in Safari, from which the
Expand Down

0 comments on commit 0013a03

Please sign in to comment.