merge

Author: Peter Linss

css-align/Overview.bs

@@ -630,7 +630,7 @@ Inline/Main-Axis Alignment: the 'justify-self' property</h3>
 	the box's outer edges are aligned within its <a>alignment container</a>
 	<a href="#alignment-values">as described by its alignment value</a>.
 
-	The <dfn value for="justify-self, align-self">auto</dfn> keyword computes to
+	The <dfn value for="justify-self">auto</dfn> keyword computes to
 	itself on absolutely-positioned elements,
 	and to the computed value of 'justify-items' on the parent
 	(minus any ''legacy'' keywords) on all other boxes,
@@ -745,7 +745,14 @@ Block/Cross-Axis Alignment: the 'align-self' property</h3>
 	the box's outer edges are aligned within its <a>alignment container</a>
 	<a href="#alignment-values">as described by its alignment value</a>.
 
-	The ''align-self/auto'' and ''align-self/stretch'' keywords are as defined in [[#justify-self-property]].
+	The <dfn value for="align-self">auto</dfn> keyword computes to
+	itself on absolutely-positioned elements,
+	and to the computed value of 'align-items' on the parent
+	(minus any ''legacy'' keywords) on all other boxes,
+	or ''align-self/start'' if the box has no parent.
+	Its behavior depends on the layout model, as described for 'justify-self'.
+	
+	The ''align-self/stretch'' keyword is as defined in [[#justify-self-property]].
 
 	All other values are as defined in [[#alignment-values]], above.
 

css-align/Overview.html

@@ -606,7 +606,7 @@ <h3 class="heading settled" data-level="5.1" id="justify-self-property"><span cl
    </table>
    <p>Justifies the box within its parent along the inline/row/main axis:
 	the box’s outer edges are aligned within its <a data-link-type="dfn" href="#alignment-container">alignment container</a> <a href="#alignment-values">as described by its alignment value</a>.</p>
-   <p>The <dfn class="css" data-dfn-for="justify-self, align-self" data-dfn-type="value" data-export="" id="valdef-justify-self-auto">auto<a class="self-link" href="#valdef-justify-self-auto"></a></dfn> keyword computes to
+   <p>The <dfn class="css" data-dfn-for="justify-self" data-dfn-type="value" data-export="" id="valdef-justify-self-auto">auto<a class="self-link" href="#valdef-justify-self-auto"></a></dfn> keyword computes to
 	itself on absolutely-positioned elements,
 	and to the computed value of <a class="property" data-link-type="propdesc" href="#propdef-justify-items">justify-items</a> on the parent
 	(minus any <a class="css" data-link-type="maybe" href="#valdef-justify-items-legacy">legacy</a> keywords) on all other boxes,
@@ -698,14 +698,20 @@ <h3 class="heading settled" data-level="5.2" id="align-self-property"><span clas
       <td>visual
      <tr>
       <th>Computed value:
-      <td>specified value, except for <a class="css" data-link-type="maybe" href="#valdef-justify-self-auto">auto</a> (see prose)
+      <td>specified value, except for <a class="css" data-link-type="maybe" href="#valdef-align-self-auto">auto</a> (see prose)
      <tr>
       <th>Animatable:
       <td>no
    </table>
    <p>Aligns the box within its parent along the block/column/cross axis:
 	the box’s outer edges are aligned within its <a data-link-type="dfn" href="#alignment-container">alignment container</a> <a href="#alignment-values">as described by its alignment value</a>.</p>
-   <p>The <a class="css" data-link-type="maybe" href="#valdef-justify-self-auto">auto</a> and <a class="css" data-link-type="maybe" href="https://drafts.csswg.org/css-flexbox-1/#valdef-align-items-stretch">stretch</a> keywords are as defined in <a href="#justify-self-property">§5.1 Inline/Main-Axis Alignment: the justify-self property</a>.</p>
+   <p>The <dfn class="css" data-dfn-for="align-self" data-dfn-type="value" data-export="" id="valdef-align-self-auto">auto<a class="self-link" href="#valdef-align-self-auto"></a></dfn> keyword computes to
+	itself on absolutely-positioned elements,
+	and to the computed value of <a class="property" data-link-type="propdesc" href="#propdef-align-items">align-items</a> on the parent
+	(minus any <a class="css" data-link-type="maybe" href="#valdef-justify-items-legacy">legacy</a> keywords) on all other boxes,
+	or <span class="css">start</span> if the box has no parent.
+	Its behavior depends on the layout model, as described for <a class="property" data-link-type="propdesc" href="#propdef-justify-self">justify-self</a>.</p>
+   <p>The <a class="css" data-link-type="maybe" href="https://drafts.csswg.org/css-flexbox-1/#valdef-align-items-stretch">stretch</a> keyword is as defined in <a href="#justify-self-property">§5.1 Inline/Main-Axis Alignment: the justify-self property</a>.</p>
    <p>All other values are as defined in <a href="#alignment-values">§3 Alignment Values</a>, above.</p>
    <hr>
    <dl>
@@ -731,7 +737,7 @@ <h3 class="heading settled" data-level="5.2" id="align-self-property"><span clas
 			In terms of CSS2.1 formatting <a data-link-type="biblio" href="#biblio-css21">[CSS21]</a>,
 			the rules for "over-constrained" computations in <a href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">section 10.6.4</a> are ignored in favor of alignment as specified here
 			and the used value of the offset properties are not adjusted to correct for the over-constraint.</p>
-     <p>The <a class="css" data-link-type="maybe" href="#valdef-justify-self-auto">auto</a> keyword is equivalent to <a class="css" data-link-type="maybe" href="#valdef-self-position-start">start</a> on replaced absolutely-positioned boxes,
+     <p>The <a class="css" data-link-type="maybe" href="#valdef-align-self-auto">auto</a> keyword is equivalent to <a class="css" data-link-type="maybe" href="#valdef-self-position-start">start</a> on replaced absolutely-positioned boxes,
 			and equivalent to <a class="css" data-link-type="maybe" href="https://drafts.csswg.org/css-flexbox-1/#valdef-align-items-stretch">stretch</a> on all other absolutely-positioned boxes.
 			(This is because CSS 2.1 does not stretch replaced elements to fit into fixed offsets.)</p>
     <dt>Table Cells: 
@@ -1088,7 +1094,8 @@ <h3 class="no-num heading settled" id="index-defined-here"><span class="content"
     auto
     <ul>
      <li><a href="#valdef-justify-content-auto">value for justify-content, align-content</a><span>, in §4</span>
-     <li><a href="#valdef-justify-self-auto">value for justify-self, align-self</a><span>, in §5.1</span>
+     <li><a href="#valdef-justify-self-auto">value for justify-self</a><span>, in §5.1</span>
+     <li><a href="#valdef-align-self-auto">value for align-self</a><span>, in §5.2</span>
      <li><a href="#valdef-justify-items-auto">value for justify-items</a><span>, in §6.1</span>
      <li><a href="#valdef-align-items-auto">value for align-items</a><span>, in §6.2</span>
     </ul>