Merge branch 'master' of https://github.com/w3c/csswg-drafts

svgeesus · svgeesus · commit 04cd6b5f2f2d · 2016-05-11T10:04:26.000-07:00
diff --git a/css-backgrounds-4/Overview.bs b/css-backgrounds-4/Overview.bs
@@ -45,7 +45,7 @@ Background Positioning: the 'background-position' shorthand property</h3>
 	See [[CSS3BG]] for definition.
 
 	<p>Where
-	<pre class=prod><dfn><var>&lt;position&gt;</var></dfn> = [
+	<pre class=prod><dfn>&lt;position&gt;</dfn> = [
 	  [ left | center | right | top | bottom | start | end | <var>&lt;percentage&gt;</var> | <var>&lt;length&gt;</var> ]
 	|
 	  [ left | center | right | x-start | x-end | <var>&lt;percentage&gt;</var> | <var>&lt;length&gt;</var> ]
@@ -126,7 +126,7 @@ Background Positioning Longhands: the 'background-position-x', 'background-posit
 	</pre>
 
 	This property specifies the background position's inline-axis component.
-	An omitted origin keyword is assumed to be ''start''.
+	An omitted origin keyword is assumed to be ''background-position-inline/start''.
 
 	<pre class='propdef'>
 		Name: background-position-block
@@ -140,7 +140,7 @@ Background Positioning Longhands: the 'background-position-x', 'background-posit
 	</pre>
 
 	This property specifies the background position's block-axis component.
-	An omitted origin keyword is assumed to be ''start''.
+	An omitted origin keyword is assumed to be ''background-position-block/start''.
 
 <h2 id="corners">
 Corners</h2>
diff --git a/css-backgrounds-4/Overview.html b/css-backgrounds-4/Overview.html
diff --git a/css-content/Overview.bs b/css-content/Overview.bs
@@ -80,7 +80,7 @@ figure:not([alt]) { content: attr(href, url), contents; }
 
 <pre class='propdef'>
     Name: content
-    Value: [ [ <<uri>> ] ',' ]* [ normal | none | <<content-list>> ] [/ <<string>> ]?
+    Value: [ [ <<image>> | <<url>> ] ',' ]* [ normal | none | <<content-list>> ] [/ <<string>> ]?
     Initial: normal
     Applies To: all elements, ''::marker'',  and page margin boxes.
     Inherited: no
@@ -139,8 +139,6 @@ Content Values and Functions</h2>
     including images, strings, the values of counters, and the text value of elements. 
     In this section we enumerate the possibilities. 
 
-	Issue: write better introduction to this section
-
 
 <h3 id="content-string">
 String</h3>
@@ -429,43 +427,6 @@ would produce:
 
 
 
-
-
-
-
-
-
-<h3 id=content-datetime>
-datetime
-</h3>
-
-
-	<pre class="prod">
-		<dfn>datetime</dfn> = [ date() | time() ];
-	</pre>
-
-	<dl dfn-for="content, <content-list>" dfn-type=value>
-		<dt>datetime
-		<dd>Dates and times can be specified with two functions, 'date()' and 'time()'.
-	</dl>
-
-	Issue: need more details on the separate functions. How are they defined? How are they formatted?
-
-<h3 id="content-document-url">
-document-url
-</h3>
-
-	<dl dfn-for="content, <content-list>" dfn-type=value>
-		<dt><dfn>document-url</dfn>
-		<dd>The URI of the current document. For local files, this may simply be the local file name.
-	</dl>
-
-
-
-
-
-
-
 <h3 id="leaders">
 Leaders</h3>
 
diff --git a/css-scoping/Overview.bs b/css-scoping/Overview.bs
@@ -323,7 +323,7 @@ Informative Explanation of Shadow DOM</h3>
 	at its root.
 	Children of the <a>shadow root</a> are ordinary elements and other nodes.
 	The element hosting the <a>shadow tree</a> is its <a>host</a>,
-	or <dfn export>shadow host</dfn>.
+	or <a>shadow host</a>.
 
 	The elements in a <a>shadow tree</a> are not <a>descendants</a> of the <a>shadow host</a> in general
 	(including for the purposes of Selectors like the <a>descendant combinator</a>).
diff --git a/css-snappoints/Overview.bs b/css-snappoints/Overview.bs
diff --git a/css-snappoints/Overview.html b/css-snappoints/Overview.html
diff --git a/css-step-sizing/Overview.bs b/css-step-sizing/Overview.bs
@@ -349,7 +349,12 @@ or security considerations beyond "implement it correctly".
 Acknowledgments {#acks}
 =======================
 This specification would not have been possible without the help from:
+Takao Baba,
+Chris Eppstein,
+Shinyu Murakami,
 Tsutomu Nanjo,
 Charlie Neely,
+Florian Rivoal,
+Hiroshi Sakakibara,
 Alan Stearns,
 and the CSS Working Group members.
diff --git a/css-step-sizing/Overview.html b/css-step-sizing/Overview.html
@@ -254,7 +254,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="http://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72"> </a> </p>
    <h1 class="p-name no-ref" id="title">CSS Step Sizing</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2016-05-08">8 May 2016</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2016-05-11">11 May 2016</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -620,8 +620,13 @@ <h2 class="heading settled" data-level="4" id="priv-sec"><span class="secno">4.
 or security considerations beyond "implement it correctly".</p>
    <h2 class="heading settled" data-level="5" id="acks"><span class="secno">5. </span><span class="content">Acknowledgments</span><a class="self-link" href="#acks"></a></h2>
     This specification would not have been possible without the help from:
+Takao Baba,
+Chris Eppstein,
+Shinyu Murakami,
 Tsutomu Nanjo,
 Charlie Neely,
+Florian Rivoal,
+Hiroshi Sakakibara,
 Alan Stearns,
 and the CSS Working Group members. 
   </main>
diff --git a/css-step-sizing/examples/snap-height.html b/css-step-sizing/examples/snap-height.html
@@ -94,15 +94,16 @@
   </div>
   <label><input type="checkbox" value="editable">Editable</label>
 </div>
-<div id="example">
+<div id="example" spellcheck="false">
   <h1>Heading</h1>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
   <h2>Heading</h2>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
   <div><img src="1x1-green.png" width="30" height="30"></div>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-  <h2>A long multi-line heading</h2>
+  <h2>A long long multi-line heading</h2>
   <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 </div>
 <script>
 (function () {
diff --git a/selectors/Overview.bs b/selectors/Overview.bs
@@ -2171,6 +2171,31 @@ The Future-element Pseudo-class: '':future''</h3>
 	sibling of a '':current'' element.
 
 
+<h2 id='resource-pseudos'>
+Resource State Pseudos</h2>
+
+	The pseudo-classes in this section apply to elements that represent loaded resources,
+	particularly images/videos,
+	and allow authors to select them based on some quality of their "state".
+
+<h3 id="video-state">
+Video/Audio Play State: the '':playing'' and '':paused'' pseudo-classes</h3>
+
+	The <dfn>:playing</dfn> pseudo-class represents an element
+	representing an audio, video, or similar resource
+	that is capable of being "played" or "paused",
+	when that element is "playing".
+	(This includes both when the element is explicitly playing,
+	and when it's temporarily stopped for some reason not connected to user intent,
+	but will automatically resume when that reason is resolved,
+	such as a "buffering" state.)
+
+	The <dfn>:paused</dfn> pseudo-class represents the same elements,
+	but instead match when the element is <em>not</em> "playing".
+	(This includes both an explicit "paused" state,
+	and other non-playing states like "loaded, hasn't been activated yet", etc.)
+
+
 <h2 id='input-pseudos'>
 The Input Pseudo-classes</h2>
 
