merge

Author: fantasai

biblio.ref

@@ -1128,12 +1128,13 @@
 %U http://www.w3.org/TR/2012/CR-css3-speech-20120320/
 
 %L CSS3SYN
-%T CSS3 module: Syntax
-%A L. David Baron
+%T CSS Syntax Module
+%A Tab Atkins Jr.
+%A Simon Sapin
 %S W3C Working Draft
 %O (Work in progress.)
-%D 13 August 2003
-%U http://www.w3.org/TR/2003/WD-css3-syntax-20030813
+%D 5 November 2013
+%U http://www.w3.org/TR/2013/WD-css-syntax-3-20131105/
 
 %L CSS3TBL
 %A Bert Bos
@@ -5592,7 +5593,7 @@
 %L UNICODE
 %A The Unicode Consortium
 %T The Unicode Standard
-%D 2012
+%D 2013
 %O Defined by: The Unicode Standard, Version 6.3.0, (Mountain View, CA: The Unicode Consortium, 2013. ISBN 978-1-936213-08-5), as updated from time to time by the publication of new versions
 %U http://www.unicode.org/standard/versions/enumeratedversions.html
 

css-align/Overview.html

@@ -11,7 +11,7 @@
 
   <meta content="CSS Box Alignment Module Level 3" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2013-12-13 name=dcterms.date>
+  <meta content=2014-02-04 name=dcterms.date>
   <meta content="Elika J. Etemad" name=dcterms.creator>
   <meta content="Tab Atkins Jr." name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
@@ -36,11 +36,11 @@
 
    <h1>CSS Box Alignment Module Level 3</h1>
 
-   <h2 class="no-num no-toc">Editor's Draft 13 December 2013</h2>
+   <h2 class="no-num no-toc">Editor's Draft 4 February 2014</h2>
 
    <dl>
     <dt>This version:
-     <!--<dd><a href="http://dev.w3.org/csswg/css-align/">http://www.w3.org/TR/2013/WD-css-align-20131213/</a>-->
+     <!--<dd><a href="http://dev.w3.org/csswg/css-align/">http://www.w3.org/TR/2014/WD-css-align-20140204/</a>-->
 
     <dd><a
      href="http://dev.w3.org/csswg/css-align/">http://dev.w3.org/csswg/css-align</a>
@@ -87,7 +87,7 @@ <h2 class="no-num no-toc">Editor's Draft 13 December 2013</h2>
    <!--begin-copyright-->
    <p class=copyright><a
     href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
-    rel=license>Copyright</a> © 2013 <a href="http://www.w3.org/"><abbr
+    rel=license>Copyright</a> © 2014 <a href="http://www.w3.org/"><abbr
     title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a
     href="http://www.csail.mit.edu/"><abbr
     title="Massachusetts Institute of Technology">MIT</abbr></a>, <a
@@ -560,15 +560,19 @@ <h3 id=positional-values><span class=secno>3.1. </span> Positional
     to be flush with the edge of the <a
     href="#alignment-container"><i>alignment container</i></a> corresponding
     to the <a href="#alignment-subject"><i>alignment subject</i></a>’s
-    start side.
+    start side. If the <a>writing modes</a> of the <a>alignment subject</a>
+    and the <a>alignment container</a> are <a>orthogonal</a>, this value
+    computes to ‘<a href="#start"><code class=css>start</code></a>’.
 
    <dt><dfn id=self-end>‘<code class=css>self-end</code>’</dfn>
 
    <dd>Aligns the <a href="#alignment-subject"><i>alignment subject</i></a>
     to be flush with the edge of the <a
     href="#alignment-container"><i>alignment container</i></a> corresponding
     to the <a href="#alignment-subject"><i>alignment subject</i></a>’s end
-    side.
+    side. If the <a>writing modes</a> of the <a>alignment subject</a> and the
+    <a>alignment container</a> are <a>orthogonal</a>, this value computes to
+    ‘<a href="#end"><code class=css>end</code></a>’.
 
    <dt><dfn id=flex-start>‘<code class=css>flex-start</code>’</dfn>
 
@@ -578,7 +582,7 @@ <h3 id=positional-values><span class=secno>3.1. </span> Positional
     be flush with the edge of the <a href="#alignment-container"><i>alignment
     container</i></a> corresponding to the <i>flex container</i>’s
     main-start or cross-start side, as appropriate. When used in layout modes
-    other than Flexbox, this is equivalent to ‘<a href="#start"><code
+    other than Flexbox, this value computes to ‘<a href="#start"><code
     class=css>start</code></a>’.
 
    <dt><dfn id=flex-end>‘<code class=css>flex-end</code>’</dfn>
@@ -588,8 +592,8 @@ <h3 id=positional-values><span class=secno>3.1. </span> Positional
     the edge of the <a href="#alignment-container"><i>alignment
     container</i></a> corresponding to the <i>flex container</i>’s main-end
     or cross-end side, as appropriate. When used in layout modes other than
-    Flexbox, this is equivalent to ‘<a href="#start"><code
-    class=css>start</code></a>’.
+    Flexbox, this value computes to ‘<a href="#end"><code
+    class=css>end</code></a>’.
 
    <dt><dfn id=left>‘<code class=css>left</code>’</dfn>
 
@@ -598,7 +602,8 @@ <h3 id=positional-values><span class=secno>3.1. </span> Positional
     container</i></a>’s <a
     href="http://www.w3.org/TR/css3-writing-modes/#line-left">line-left</a>
     edge. If the property's axis is not parallel with the inline axis, this
-    is equivalent to ‘<a href="#start"><code class=css>start</code></a>’.
+    value computes to ‘<a href="#start"><code
+    class=css>start</code></a>’.
 
    <dt><dfn id=right>‘<code class=css>right</code>’</dfn>
 
@@ -607,7 +612,8 @@ <h3 id=positional-values><span class=secno>3.1. </span> Positional
     container</i></a>’s <a
     href="http://www.w3.org/TR/css3-writing-modes/#line-right">line-right</a>
     edge. If the property's axis is not parallel with the inline axis, this
-    is equivalent to ‘<a href="#start"><code class=css>start</code></a>’.
+    value computes to ‘<a href="#start"><code
+    class=css>start</code></a>’.
   </dl>
 
   <p class=issue>Add example images.

css-align/Overview.src.html

@@ -269,34 +269,38 @@ <h3 id='positional-values'>
     <dt><dfn>''self-start''</dfn>
     <dd>Aligns the <i>alignment subject</i> to be flush with the edge of the <i>alignment container</i>
       corresponding to the <i>alignment subject</i>’s start side.
+      If the <a>writing modes</a> of the <a>alignment subject</a> and the <a>alignment container</a> are <a>orthogonal</a>,
+      this value computes to ''start''.
 
     <dt><dfn>''self-end''</dfn>
     <dd>Aligns the <i>alignment subject</i> to be flush with the edge of the <i>alignment container</i>
       corresponding to the <i>alignment subject</i>’s end side.
+      If the <a>writing modes</a> of the <a>alignment subject</a> and the <a>alignment container</a> are <a>orthogonal</a>,
+      this value computes to ''end''.
 
     <dt><dfn>''flex-start''</dfn>
     <dd><strong>Only used in flex layout.</strong> [[!CSS3-FLEXBOX]]
       Aligns the <i>alignment subject</i> to be flush with the edge of the <i>alignment container</i>
       corresponding to the <i>flex container</i>’s main-start or cross-start side, as appropriate.
       When used in layout modes other than Flexbox,
-      this is equivalent to ''start''.
+      this value computes to ''start''.
 
     <dt><dfn>''flex-end''</dfn>
     <dd><strong>Only used in flex layout.</strong>
       Aligns the <i>alignment subject</i> to be flush with the edge of the <i>alignment container</i>
       corresponding to the <i>flex container</i>’s main-end or cross-end side, as appropriate.
       When used in layout modes other than Flexbox,
-      this is equivalent to ''start''.
+      this value computes to ''end''.
 
     <dt><dfn>''left''</dfn>
     <dd>Aligns the <i>alignment subject</i> to be flush with the <i>alignment container</i>’s <a href="http://www.w3.org/TR/css3-writing-modes/#line-left">line-left</a> edge.
       If the property's axis is not parallel with the inline axis,
-      this is equivalent to ''start''.
+      this value computes to ''start''.
 
     <dt><dfn>''right''</dfn>
     <dd>Aligns the <i>alignment subject</i> to be flush with the <i>alignment container</i>’s <a href="http://www.w3.org/TR/css3-writing-modes/#line-right">line-right</a> edge.
       If the property's axis is not parallel with the inline axis,
-      this is equivalent to ''start''.
+      this value computes to ''start''.
   </dl>
 
   <p class='issue'>Add example images.

css-animations/Overview.html

@@ -10,7 +10,7 @@
 
   <meta content="CSS Animations" name=dcterms.title>
   <meta content=text name=dcterms.type>
-  <meta content=2014-01-22 name=dcterms.date>
+  <meta content=2014-01-29 name=dcterms.date>
   <meta content="L. David Baron" name=dcterms.creator>
   <meta content=W3C name=dcterms.publisher>
   <meta content="http://dev.w3.org/csswg/css3-animations/"
@@ -33,7 +33,7 @@
 
    <h1>CSS Animations</h1>
 
-   <h2 class="no-num no-toc">Editor's Draft 22 January 2014</h2>
+   <h2 class="no-num no-toc">Editor's Draft 29 January 2014</h2>
 
    <dl>
     <dt>This version:
@@ -349,7 +349,7 @@ <h2 id=animations><span class=secno>3. </span> Animations</h2>
    level for CSS Animations) that will produce the correct computed value for
    the current state of the animation. As defined in <a
    href="#ref-CSS3CASCADE">[CSS3CASCADE]<!--{{CSS3CASCADE}}--></a>,
-   animations override all normal rules, but are overriden by !important
+   animations override all normal rules, but are overridden by !important
    rules.
 
   <p> If at one point in time there are multiple animations specifying

css-animations/Overview.src.html

@@ -146,7 +146,7 @@ <h2 id="animations">
 		that will produce the correct computed value for
 		the current state of the animation.
 		As defined in [[CSS3CASCADE]],
-		animations override all normal rules, but are overriden by 
+		animations override all normal rules, but are overridden by 
 		!important rules.
 
 	<p>