merging upstream changes

Author: rhauck

css-cascade/Overview.html

@@ -12,7 +12,7 @@ <h1>CSS Cascading and Inheritance Level 3</h1>
 Previous Version: http://www.w3.org/TR/2013/WD-css3-cascade-20130103/
 Previous Version: http://www.w3.org/TR/2005/WD-css3-cascade-20051215/
 Abstract: This CSS module describes how to collate style rules and assign values to all properties on all elements. By way of cascading and inheritance, values are propagated for all properties on all elements.
-Ignored Properties: font-size, border-bottom-width, height, font, font-style, border-top-width, width, break-before, font-weight, red, flex, auto, font-variant, page-break-after, font-family, text-align, default, font-size-adjust, orphans, border-right-width, line-height, border-left-width, list-style-position
+Ignored Properties: font-size, border-bottom-width, height, font, font-style, border-top-width, width, break-before, font-weight, flex, font-variant, page-break-after, font-family, text-align, font-size-adjust, orphans, border-right-width, line-height, border-left-width, list-style-position, unicode-bidi, direction
 Ignored Terms: flex items
 </pre>
 
@@ -192,7 +192,7 @@ <h3 id="all-shorthand">
 			<td><dfn>all</dfn>
 		<tr>
 			<th>Value:
-			<td>initial || inherit
+			<td>initial | inherit | unset
 		<tr>
 			<th>Initial:
 			<td>See individual properties
@@ -217,9 +217,17 @@ <h3 id="all-shorthand">
 	</table>
 
 	<p>
-		The ''all'' property is a <i>shorthand</i> that resets <em title=''>all</em> CSS properties.
+		The ''all'' property is a <i>shorthand</i> that resets <em title=''>all</em> CSS properties
+		except 'direction' and 'unicode-bidi'.
 		It only accepts the <a href="http://www.w3.org/TR/css3-values/#common-keywords">CSS-wide keywords</a>.
 
+	<p class='note'>
+		The excepted properties are actually markup-level features,
+		and <a href="http://www.w3.org/TR/css3-writing-modes/#text-direction">should not be set in the author's style sheet</a>.
+		(They exist as CSS properties only to style document languages not supported by the UA.)
+		Authors should use the appropriate markup, such as HTML's <code>dir</code> attribute, instead.
+		[[!CSS3-WRITING-MODES]]
+
 	<div class='example'>
 		<p>
 			For example, if an author specifies ''all: initial'' on an element
@@ -331,8 +339,8 @@ <h3 id="computed">
 		it is not necessarily the value returned by the <code>getComputedStyle()</code> function.
 
 	<div class="example">
-		A <i>specified value</i> can be either absolute (i.e., not relative to another value, as in 'red' or '2mm')
-		or relative (i.e., relative to another value, as in 'auto', '2em').
+		A <i>specified value</i> can be either absolute (i.e., not relative to another value, as in ''red'' or ''2mm'')
+		or relative (i.e., relative to another value, as in ''auto'', ''2em'').
 		Computing a relative value generally absolutizes it:
 
 		<ul>
@@ -871,20 +879,16 @@ <h4 id="inherit">
 		the <i>inherited value</i> becomes the property's <i title="specified value">specified</i> and <i>computed values</i>.
 
 <h4 id="inherit-initial">
-Erasing All Declarations: the ''initial inherit'' value</h4>
+Erasing All Declarations: the ''unset'' keyword</h4>
 
 	<p>
-		If the <i>cascaded value</i> of a property is both the ''initial'' and ''inherit'' keywords together (in either order),
+		If the <i>cascaded value</i> of a property is the <dfn>''unset''</dfn> keyword,
 		then if it is an inherited property, this is treated as ''inherit'',
 		and if it is not, this is treated as ''initial''.
-		This combination effectively erases all <i>declared values</i> occurring earlier in the <i>cascade</i>,
+		This keyword effectively erases all <i>declared values</i> occurring earlier in the <i>cascade</i>,
 		correctly inheriting or not as appropriate for the property
 		(or all longhands of a <i>shorthand</i>).
 
-	<p class="issue">
-		It might be appropriate to <a href="http://lists.w3.org/Archives/Public/www-style/2013Jul/0041.html">replace this syntax with a single keyword</a>.
-		But what keyword?
-
 <h2 id="changes">
 Changes</h2>
 
@@ -895,10 +899,12 @@ <h3 id="changes-2013">
 <a href="http://www.w3.org/TR/2013/WD-css3-cascade-20130103/">3 January 2013 Working Draft</a>:
 
 <ul>
-	<li>Dropped the 'default' keyword.
+	<li>Dropped the ''default'' keyword.
+	<li>Added the ''unset'' keyword.
+	<li>Excluded 'unicode-bidi' and 'direction' from the 'all' shorthand.
 	<li>Various clarifications.
 </ul>
 
 <h2 class="no-num" id="acknowledgments">Acknowledgments</h2>
 
-<p>David Baron and Boris Zbarsky contributed to this specification.
+<p>David Baron, Simon Sapin, and Boris Zbarsky contributed to this specification.

css-cascade/Overview.src.html

@@ -68,14 +68,15 @@ <h1>CSS Flexible Box Layout Level 1 Disposition of Comments for 2012-09-18 CR</h
 Response: <a href="http://lists.w3.org/Archives/Public/www-style/2012Dec/0046.html">http://lists.w3.org/Archives/Public/www-style/2012Dec/0046.html</a>
 Closed:   Deferred (most cases possible; maybe add more spacing controls in next level)
 </pre>
-<pre class='open' id='issue-5'>
+<pre class='a' id='issue-5'>
 Issue 5. <a href="#issue-5">#</a>
 Summary:  If percentage height cannot be resolved, is the flex items stretched?
 From:     Ojan Vafai
 Comment:  <a href="http://lists.w3.org/Archives/Public/www-style/2012Oct/0220.html">http://lists.w3.org/Archives/Public/www-style/2012Oct/0220.html</a>
-Response: NEED TO RESPOND, ALSO NEED CSS2.1 ERRATUM
-          <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392">https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392</a>
-Open
+Response: <a href="http://lists.w3.org/Archives/Public/www-style/2013Jul/0505.html">http://lists.w3.org/Archives/Public/www-style/2013Jul/0505.html</a>
+Notes:    <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392">https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392</a>
+          <a href="http://www.w3.org/Style/css2-updates/REC-CSS2-20110607-errata.html#s.10.5a">http://www.w3.org/Style/css2-updates/REC-CSS2-20110607-errata.html#s.10.5a</a>
+Closed:   Accepted
 </pre>
 <pre class='a' id='issue-6'>
 Issue 6. <a href="#issue-6">#</a>

css-flexbox/issues-cr-2012.html

@@ -42,9 +42,10 @@ Issue 5.
 Summary:  If percentage height cannot be resolved, is the flex items stretched?
 From:     Ojan Vafai
 Comment:  http://lists.w3.org/Archives/Public/www-style/2012Oct/0220.html
-Response: NEED TO RESPOND, ALSO NEED CSS2.1 ERRATUM
-          https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392
-Open
+Response: http://lists.w3.org/Archives/Public/www-style/2013Jul/0505.html
+Notes:    https://www.w3.org/Bugs/Public/show_bug.cgi?id=15392
+          http://www.w3.org/Style/css2-updates/REC-CSS2-20110607-errata.html#s.10.5a
+Closed:   Accepted
 ----
 Issue 6.
 Summary:  Clarifications to abspos static position in flex containers

css-flexbox/issues-cr-2012.txt

@@ -11,7 +11,7 @@
    rel=dcterms.rights>
   <meta content="CSS Grid Layout" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-05-08 name=dcterms.date>
+  <meta content=2013-07-22 name=dcterms.date>
   <meta content="Tab Atkins Jr." name=dcterms.creator>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content="Rossen Atanassov" name=dcterms.creator>
@@ -59,11 +59,11 @@
 
    <h1 class=title id=title>CSS Grid Layout</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft, 8 May 2013</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft, 22 July 2013</h2>
 
    <dl>
     <dt>This version:
-     <!-- <dd><a href="http://dev.w3.org/csswg/css3-grid-layout/">http://www.w3.org/TR/2013/WD-css3-grid-layout-20130508/</a> -->
+     <!-- <dd><a href="http://dev.w3.org/csswg/css3-grid-layout/">http://www.w3.org/TR/2013/WD-css3-grid-layout-20130722/</a> -->
 
     <dd><a
      href="http://dev.w3.org/csswg/css3-grid-layout/">http://dev.w3.org/csswg/css3-grid-layout/</a>
@@ -1289,7 +1289,7 @@ <h3 id=track-sizing><span class=secno>5.1. </span> Track Sizing: the ‘<a
     <tr>
      <td>Value:
 
-     <td>none | <a href="#track-list"><var>&lt;track-list></var></a>
+     <td>none | <a href="#lttrack-list"><var>&lt;track-list></var></a>
 
     <tr>
      <td>Initial:
@@ -1344,30 +1344,30 @@ <h3 id=track-sizing><span class=secno>5.1. </span> Track Sizing: the ‘<a
 
   <pre>
 <dfn
-   id=track-list>&lt;track-list></dfn>    = [ <var>&lt;string></var>* [ <a
-   href="#track-size"><var>&lt;track-size></var></a> | <a
-   href="#repeat-function"><var>&lt;repeat-function></var></a> ] ]+ <var>&lt;string></var>*
+   id=lttrack-list>&lt;track-list></dfn>    = [ <var>&lt;string></var>* [ <a
+   href="#lttrack-size"><var>&lt;track-size></var></a> | <a
+   href="#ltrepeat-function"><var>&lt;repeat-function></var></a> ] ]+ <var>&lt;string></var>*
 <dfn
-   id=track-size>&lt;track-size></dfn>    = minmax( <a
-   href="#track-breadth"><var>&lt;track-breadth></var></a> , <a
-   href="#track-breadth"><var>&lt;track-breadth></var></a> ) | auto | <a
-   href="#track-breadth"><var>&lt;track-breadth></var></a>
+   id=lttrack-size>&lt;track-size></dfn>    = minmax( <a
+   href="#lttrack-breadth"><var>&lt;track-breadth></var></a> , <a
+   href="#lttrack-breadth"><var>&lt;track-breadth></var></a> ) | auto | <a
+   href="#lttrack-breadth"><var>&lt;track-breadth></var></a>
 <dfn
-   id=track-breadth>&lt;track-breadth></dfn> = <var>&lt;lenh></var> | <var>&lt;percentage></var> | <a
-   href="#flex"><var>&lt;flex></var></a> | min-content | max-content</pre>
+   id=lttrack-breadth>&lt;track-breadth></dfn> = <var>&lt;length></var> | <var>&lt;percentage></var> | <a
+   href="#ltflex"><var>&lt;flex></var></a> | min-content | max-content</pre>
 
   <p>Where:
 
   <dl>
    <dt><var>&lt;length></var>
 
-   <dd> As defined by CSS3 Values. <a href="#CSS3VAL"
+   <dd> A non-negative length, as defined by CSS3 Values. <a href="#CSS3VAL"
     rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
 
    <dt><var>&lt;percentage></var>
 
-   <dd> As defined by CSS3 Values. <a href="#CSS3VAL"
-    rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
+   <dd> A non-negative percentage, as defined by CSS3 Values. <a
+    href="#CSS3VAL" rel=biblioentry>[CSS3VAL]<!--{{!CSS3VAL}}--></a>
     <var>&lt;percentage></var> values are relative to the measure (logical
     width) of the <a href="#grid-container"><i>grid container</i></a> in
     <i>grid column tracks</i>, and the extent (logical height) of the <a
@@ -1539,7 +1539,7 @@ <h4 id=repeat-notation><span class=secno>5.1.2. </span> Repeating Rows and
   <pre class=prod>
 <dfn
    id=ltrepeat-function>&lt;repeat-function></dfn> = repeat( <var>&lt;positive-integer></var> , [ <var>&lt;string></var>* <a
-   href="#track-size"><var>&lt;track-size></var></a> ]+ <var>&lt;string></var>* )</pre>
+   href="#lttrack-size"><var>&lt;track-size></var></a> ]+ <var>&lt;string></var>* )</pre>
 
   <p> The first argument specifies the number of repetitions. The second
    argument is a <a href="#track-list"><i>track list</i></a>, which is
@@ -2717,14 +2717,14 @@ <h3 id=algo-terms><span class=secno>8.1. </span> Definition of Terms for
    <dt><dfn id=MaxTrackSizingFunction-definition>MaxTrackSizingFunction</dfn>
 
    <dd> One of the <a
-    href="#track-breadth"><var>&lt;track-breadth></var></a> sizing
+    href="#lttrack-breadth"><var>&lt;track-breadth></var></a> sizing
     functions assigned as the maximum breadth of a <a
     href="#grid-track"><i>Grid track</i></a>.
 
    <dt><dfn id=MinTrackSizingFunction-definition>MinTrackSizingFunction</dfn>
 
    <dd> One of the <a
-    href="#track-breadth"><var>&lt;track-breadth></var></a> sizing
+    href="#lttrack-breadth"><var>&lt;track-breadth></var></a> sizing
     functions assigned as the minimum breadth of a <a
     href="#grid-track"><i>Grid track</i></a>.
 
@@ -3688,11 +3688,11 @@ <h3 class=no-num id=normative-references> Normative references</h3>
 
    <dt id=CSS3-ALIGN>[CSS3-ALIGN]
 
-   <dd>Elika J. Etemad. <a
-    href="http://www.w3.org/TR/2012/WD-css3-align-20120612/"><cite>CSS Box
-    Alignment Module Level 3.</cite></a> 12 June 2012. W3C Working Draft.
+   <dd>Elika J. Etemad; Tab Atkins Jr. <a
+    href="http://www.w3.org/TR/2013/WD-css3-align-20130514/"><cite>CSS Box
+    Alignment Module Level 3.</cite></a> 14 May 2013. W3C Working Draft.
     (Work in progress.) URL: <a
-    href="http://www.w3.org/TR/2012/WD-css3-align-20120612/">http://www.w3.org/TR/2012/WD-css3-align-20120612/</a>
+    href="http://www.w3.org/TR/2013/WD-css3-align-20130514/">http://www.w3.org/TR/2013/WD-css3-align-20130514/</a>
    </dd>
    <!---->
 
@@ -3719,10 +3719,10 @@ <h3 class=no-num id=normative-references> Normative references</h3>
    <dt id=CSS3VAL>[CSS3VAL]
 
    <dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a
-    href="http://www.w3.org/TR/2012/CR-css3-values-20120828/"><cite>CSS
-    Values and Units Module Level 3.</cite></a> 28 August 2012. W3C Candidate
+    href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS
+    Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate
     Recommendation. (Work in progress.) URL: <a
-    href="http://www.w3.org/TR/2012/CR-css3-values-20120828/">http://www.w3.org/TR/2012/CR-css3-values-20120828/</a>
+    href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a>
    </dd>
    <!---->
 
@@ -3989,16 +3989,16 @@ <h2 class=no-num id=index> Index</h2>
       title="section 10.4."><strong>10.4.</strong></a>
     </ul>
 
-   <li>&lt;track-breadth>, <a href="#track-breadth"
+   <li>&lt;track-breadth>, <a href="#lttrack-breadth"
     title="section 5.1."><strong>5.1.</strong></a>
 
-   <li>&lt;track-list>, <a href="#track-list"
+   <li>&lt;track-list>, <a href="#lttrack-list"
     title="section 5.1."><strong>5.1.</strong></a>
 
    <li>track list, <a href="#track-list"
     title="section 5.1."><strong>5.1.</strong></a>
 
-   <li>&lt;track-size>, <a href="#track-size"
+   <li>&lt;track-size>, <a href="#lttrack-size"
     title="section 5.1."><strong>5.1.</strong></a>
   </ul>
   <!--end-index-->

css-grid/Overview.html

@@ -975,11 +975,11 @@ <h3 id='track-sizing'>
 	<dl>
 		<dt><var>&lt;length></var>
 		<dd>
-			As defined by CSS3 Values. [[!CSS3VAL]]
+			A non-negative length, as defined by CSS3 Values. [[!CSS3VAL]]
 
 		<dt><var>&lt;percentage></var>
 		<dd>
-			As defined by CSS3 Values. [[!CSS3VAL]]
+			A non-negative percentage, as defined by CSS3 Values. [[!CSS3VAL]]
 			<var>&lt;percentage></var> values are relative to the measure (logical width) of the <i>grid container</i> in <i>grid column tracks</i>,
 			and the extent (logical height) of the <i>grid container</i> in <i>grid row tracks</i>.
 			If the measure or extent of the <i>grid container</i> is an <a href="http://www.w3.org/TR/css3-sizing/#indefinite-size">indefinite size</a>,

css-grid/Overview.src.html

@@ -11,17 +11,23 @@
    rel=dcterms.rights>
   <meta content="CSS Multi-column Layout Module" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-06-27 name=dcterms.date>
+  <meta content=2013-07-22 name=dcterms.date>
   <meta content="Håkon Wium Lie" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/css3-multicol/"
    name=dcterms.identifier>
   <link href="../default.css" rel=stylesheet type="text/css">
   <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
    type="text/css">
+<<<<<<< local
    <script defer=defer
       src="http://test.csswg.org/harness/annotate.js#css-multicol-1_dev"
       type="text/javascript"></script>
+=======
+  <script defer=defer
+   src="http://test.csswg.org/harness/annotate.js#CSS3-MULTICOL_DEV"
+   type="text/javascript"></script>
+>>>>>>> other
   <style type="text/css">
 .cols { width: 500px; height: 200px; background: #fff; position: relative; border: solid 5px blue; margin: 0.5em 2em 1em 0; font: bold 14px/19px Arial, sans-serif }
 .cols p { padding: 3px; margin: 0 }
@@ -42,13 +48,13 @@
 
    <h1>CSS Multi-column Layout Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 27 June 2013</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 22 July 2013</h2>
 
    <dl>
     <dt>This version:
 
     <dd>
-     <!--<a href="http://www.w3.org/TR/2013/CR-css3-multicol-20130627">http://dev.w3.org/csswg/css3-multicol/</a>-->
+     <!--<a href="http://www.w3.org/TR/2013/CR-css3-multicol-20130722">http://dev.w3.org/csswg/css3-multicol/</a>-->
      <a
      href="http://dev.w3.org/csswg/css3-multicol/">http://dev.w3.org/csswg/css3-multicol/</a>
 
@@ -74,11 +80,12 @@ <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 27 June 2013</h2>
     <dt>Editors:
 
     <dd>Håkon Wium Lie, Opera Software, howcome@opera.com
-        
+
     <dt>Test Suite:
 
-        <dd><a
-         href="http://test.csswg.org/suites/css3-multicol/nightly-unstable/">http://test.csswg.org/suites/css3-multicol/nightly-unstable/</a>
+    <dd><a
+     href="http://test.csswg.org/suites/css3-multicol/nightly-unstable/">
+     http://test.csswg.org/suites/css3-multicol/nightly-unstable/</a>
    </dl>
    <!--begin-copyright-->
    <p class=copyright><a
@@ -1409,7 +1416,7 @@ <h3 id=column-rule><span class=secno>4.5. </span>‘<a
 
   <div class=example>
    <p>If a tall image is moved to a column on the next page to find room for
-    it, its natural column may be left empty. If so, the column is is still
+    it, its natural column may be left empty. If so, the column is still
     considered to have content for the purpose of deciding if the column rule
     should be drawn.
   </div>

css-multicol/Overview.html

@@ -1103,7 +1103,7 @@ <h3>'column-rule'</h3>
 
 <div class=example>
 <p>If a tall image is moved to a column on the next page to find room
-for it, its natural column may be left empty. If so, the column is is
+for it, its natural column may be left empty. If so, the column is 
 still considered to have content for the purpose of deciding if the
 column rule should be drawn.
 </div>