Skip to content
This repository has been archived by the owner on Jul 30, 2019. It is now read-only.

Commit

Permalink
Integrate to get in sync with whatwg (#567)
Browse files Browse the repository at this point in the history
* Linking term 'attribute selector'

* Fixing build break for bad link

* Simplify styling for details element along with the explanation

* Linking term 'used value'

* Add 'picture' to the venn diagram image

* Editorial - Fix linking for style terms

* Use new term 'child text content' and define term

* Formatting and whitespace issues

* Make label-less empty option okay for datalist child

* Adding clarity about 'body-ok' rel keywords

* Formatting changes only

* More auto-linking and formatting

* Move statement for 'rel' synonyms to make it more visible

* Adding acknowledgements

* Remove styles defined by Fullscreen from dialog::backdrop

* Correct linking for property values
  • Loading branch information
arronei authored and Alex Danilo committed Aug 30, 2016
1 parent f738599 commit 19a670d
Show file tree
Hide file tree
Showing 18 changed files with 321 additions and 267 deletions.
3 changes: 3 additions & 0 deletions images/content-venn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions sections/acknowledgements.include
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
and the <{source/sizes}> attribute. Special thanks to Bruce Lawson for originally suggesting,
Edward O'Connor and Ian Hickson for writing the original srcset specification, and Adrian Bateman
for providing the group with guidance. Contributions also from: David Newton, Ilya Grigorik,
John Schoenick, and Leon de Rijke.
John Schoenick, and Leon de Rijke.

With apologies to people who have undeservedly not been named, thanks to

<h3 id="acknowledgements5.2">People who have contributed to this version of HTML</h3>
<p class="note">to do</p>

<h3 id="acknowledgements-previous">People who have contributed to previous versions of HTML</h3>


Aankhen,
Aaron Boodman,
Aaron Leventhal,
Expand Down Expand Up @@ -151,6 +151,7 @@
Bruce D'Arcus,
Bruce Lawson,
Bruce Miller,
Bugs Nash,
C. Williams,
Cameron McCormack,
Cameron Zemek,
Expand Down Expand Up @@ -727,7 +728,7 @@
Silver Ghost, <!-- see bug 19614 -->
Silvia Pfeiffer,
Šime Vidas, <!-- again in 5.1 -->
Simo Sutela,
Simo Sutela,
Simon Montagu,
Simon Spiegel,
skeww, <!-- on reddit -->
Expand Down Expand Up @@ -764,6 +765,7 @@
T. J. Crowder,
Tab Atkins-Bittner,
Taiju Tsuiki,
Takayoshi Kochi,
Takeshi Kurosawa,
Takeshi Yoshino,
<span lang="tr">Tantek Çelik</span>,
Expand Down
2 changes: 1 addition & 1 deletion sections/changes.include
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<dt>This was removed from HTML 5.1 for lack of implementation, and may be removed from HTML 5.2 if not implemented.</dt>
<dt><{input/inputmode}></dt>
<dd>This was removed from HTML 5.1 for lack of implementation, and may be removed from HTML 5.2 if not implemented.</dd>
<dt><{keygen}> has been removed</dt>
<dt><code>keygen</code> has been removed</dt>
<dd>As per Working Group decision, since it is likely to be removed soon from at least one of the two remaining
implementations.</dd>
<dt><a href="https://github.com/w3c/html/pull/469">Modules, for scripts</a></dt>
Expand Down
30 changes: 15 additions & 15 deletions sections/dom.include
Original file line number Diff line number Diff line change
Expand Up @@ -322,12 +322,12 @@
<div class="impl">
The <dfn attribute for="Document"><code>title</code></dfn> attribute must, on getting, run the following algorithm:

1. If the <a>root element</a> is an <{svg}> element in the <a>SVG namespace</a>, then
let <var>value</var> be a concatenation of the data of all the child <code>Text</code> nodes
of the first <a element for="svg"><code>title</code></a> element in the <a>SVG namespace</a> that is a child of the
<a>root element</a>. [[!SVG]]
2. Otherwise, let <var>value</var> be a concatenation of the data of all the child
<code>Text</code> nodes of the <a element for="html"><code>title</code></a> element, in <a>tree order</a>, or
1. If the <a>root element</a> is an <{svg}> element in the <a>SVG namespace</a>, then let
<var>value</var> be the <a>child text content</a> of the first
<a element for="svg"><code>title</code></a> element in the <a>SVG namespace</a> that is a
child of the <a>root element</a>. [[!SVG]]
2. Otherwise, let <var>value</var> be the <a>child text content</a> of the
<a element for="html"><code>title</code></a> element, in <a>tree order</a>, or
the empty string if the <a element for="html"><code>title</code></a> element is null.
3. <a>Strip and collapse whitespace</a> in <var>value</var>.
4. Return <var>value</var>.
Expand Down Expand Up @@ -2231,7 +2231,7 @@

<div class="impl">
The classes that an <a>HTML element</a> has assigned to it consists of all the classes returned
when the value of the <code>class</code> attribute is <a lt="split a string on spaces">split on spaces</a>. (Duplicates are
when the value of the <{global/class}> attribute is <a lt="split a string on spaces">split on spaces</a>. (Duplicates are
ignored.)
</div>

Expand All @@ -2256,18 +2256,18 @@

<h5 id="the-style-attribute">The <dfn element-attr for="global"><code>style</code></dfn> attribute</h5>

All <a>html elements</a> may have the <code>style</code> content attribute set. This is a
<a>CSS styling attribute</a> as defined by the CSS Styling Attribute Syntax specification.
All <a>html elements</a> may have the <{global/style}> content attribute set. This is a
<a>style attribute</a> as defined by the <cite>CSS Style Attributes</cite> specification.
[[!CSS-STYLE-ATTR]]

In user agents that support CSS, the attribute's value must be parsed when the attribute is
added or has its value changed, according to the rules given for <a>CSS styling attributes</a>.
added or has its value changed, according to the rules given for <a>style attributes</a>.
[[!CSS-STYLE-ATTR]]

However, if the
<a>Should element's inline behavior be blocked by Content Security Policy?</a> algorithm returns
"<code>Blocked</code>" when executed upon the
attribute's element and "<code>style attribute</code>", then the style
attribute's element and "<a>style attribute</a>", then the style
rules defined in the attribute's value must not be applied to the element. [[!CSP3]]

Documents that use <{global/style}> attributes on any of their elements must still be
Expand Down Expand Up @@ -2380,15 +2380,15 @@

<div class="impl">
The <dfn attribute for="HTMLElement"><code>dataset</code></dfn> IDL attribute provides convenient
accessors for all the <code>data-*</code> attributes on an element. On
accessors for all the <{global/data-*}> attributes on an element. On
getting, the {{HTMLElement/dataset}} IDL attribute must return a
<code>DOMStringMap</code> object, associated with the following algorithms, which expose these
attributes on their element:

: The algorithm for getting the list of name-value pairs
:: 1. Let <var>list</var> be an empty list of name-value pairs.
2. For each content attribute on the element whose first five characters are the string
"<code>data-</code>" and whose remaining characters (if any) do not include any
"<{global/data-}>" and whose remaining characters (if any) do not include any
<a>uppercase ASCII letters</a>, in the order that those attributes are listed in the
element's <a lt="element attribute">attribute list</a>, add a name-value pair to <var>list</var> whose name is
the attribute's name with the first five characters removed and whose value is the
Expand All @@ -2408,7 +2408,7 @@
4. For each <a>uppercase ASCII letter</a> in <var>name</var>, insert a U+002D HYPHEN-MINUS
character (-) before the character and replace the character with the same character
<a>converted to ASCII lowercase</a>.
5. Insert the string <code>data-</code> at the front of <var>name</var>.
5. Insert the string <{global/data-}> at the front of <var>name</var>.
6. Set the value of the attribute with the name <var>name</var>, to the value
<var>value</var>, replacing any previous value if the attribute already existed. If
<code>setAttribute()</code> would have thrown an exception when setting an attribute
Expand All @@ -2419,7 +2419,7 @@
2. For each <a>uppercase ASCII letter</a> in <var>name</var>, insert a U+002D HYPHEN-MINUS
character (-) before the character and replace the character with the same character
<a>converted to ASCII lowercase</a>.
3. Insert the string <code>data-</code> at the front of <var>name</var>.
3. Insert the string <{global/data-}> at the front of <var>name</var>.
4. Remove the attribute with the name <var>name</var>, if such an attribute exists. Do
nothing otherwise.

Expand Down
19 changes: 11 additions & 8 deletions sections/infrastructure.include
Original file line number Diff line number Diff line change
Expand Up @@ -179,17 +179,17 @@
When an attribute value, {{Text}} node, or string is described as <dfn>empty</dfn>, it means that the length of the text is zero (i.e., not even containing spaces or
<a>control characters</a>).

An element's <dfn>child text content</dfn> is the concatenation of the <a>data</a> of all the
{{Text}} nodes that are children of the element (ignoring any other nodes such as comments or
elements), in <a>tree order</a>.

A <a for="Node" lt="insert">node <var>A</var> is
inserted</a> into a node <var>B</var> when the
<a>insertion steps</a> are invoked with <var>A</var> as the argument and <var>A</var>'s new parent
is <var>B</var>. Similarly, a <dfn>node <var>A</var> is removed</dfn> from a node <var>B</var>
when the <a>removing steps</a> are invoked with <var>A</var> as the <var>removedNode</var>
argument and <var>B</var> as the <var>oldParent</var> argument.

An element's <dfn>child text content</dfn> is the concatenation of the <a>data</a> of all the
{{Text}} nodes that are children of the element (ignoring any other nodes such as comments or
elements), in <a>tree order</a>.

<h4 id="scripting">Scripting</h4>

The construction "a <code>Foo</code> object", where <code>Foo</code> is actually an interface,
Expand Down Expand Up @@ -1137,12 +1137,12 @@
* <dfn>replaced element</dfn>
* <dfn>intrinsic dimensions</dfn>

The term <dfn lt="named color|named colors">named color</dfn> is defined in the CSS Color specification. [[!CSS3COLOR]]
The term <dfn>named color</dfn> is defined in the CSS Color specification. [[!CSS3COLOR]]

The terms <dfn for="css">intrinsic width</dfn> and <dfn for="css">intrinsic height</dfn> refer to the width
dimension and the height dimension, respectively, of <a>intrinsic dimensions</a>.

The term <dfn>provides a paint source</dfn> is used as defined in the
The term <dfn>paint source</dfn> is used as defined in the
<cite>CSS Image Values and Replaced Content</cite> specification to define the interaction of
certain HTML elements with the CSS 'element()' function. [[!CSS3-IMAGES]]

Expand Down Expand Up @@ -1200,9 +1200,12 @@
The feature <<length>> is defined in the <cite>CSS Values and Units</cite>
specification. [[!CSS-VALUES]]

The term <a>CSS styling attribute</a> is defined in the <cite>CSS Style Attributes</cite>
The term <a>style attribute</a> is defined in the <cite>CSS Style Attributes</cite>
specification. [[!CSS-STYLE-ATTR]]

The term <a>used value</a> is defined in the <cite>CSS Cascading and Inheritance</cite>
specification. [[!CSS-CASCADE-3]]

The <code>CanvasRenderingContext2D</code> object's use of fonts depends on the features
described in the CSS <cite>Fonts</cite> and <cite>Font Loading</cite> specifications,
including in particular <a interface><code>FontFace</code></a> objects and the
Expand Down Expand Up @@ -3489,7 +3492,7 @@
If the user agent can determine the actual length of the resource being <a>fetched</a> for an
instance of this algorithm, and if that length is finite, then that length is the file's
<dfn>size</dfn>. Otherwise, the subject of the algorithm (that is, the resource being fetched)
has no known <a>size</a>. (For example, the HTTP <code>Content-Length</code> header might
has no known <a>size</a>. (For example, the HTTP <a><code>Content-Length</code></a> header might
provide this information.)

The user agent must also keep track of the <dfn>number of bytes downloaded</dfn> for each
Expand Down
Loading

0 comments on commit 19a670d

Please sign in to comment.