Merge branch 'master' into white-space-dfn-cleanup

Author: fantasai

README.markdown

@@ -17,3 +17,4 @@ contributing using Mercurial is also possible.
 Also see the related repositories:
 * [fxtf-drafts github repository](https://github.com/w3c/fxtf-drafts/) - [fxtf mercurial repository](https://hg.fxtf.org/drafts/) - [FX Task Force generated specification index](https://drafts.fxtf.org/)
 * [css-houdini-drafts github repository](https://github.com/w3c/css-houdini-drafts/) - [css-houdini mercurial repository](https://hg.css-houdini.org/drafts/) - [CSS-TAG Houdini Task Force generated specification index](https://drafts.css-houdini.org/)
+

css-align-3/Overview.bs

@@ -115,11 +115,12 @@ Module interactions</h3>
 	or <code>::first-letter</code> pseudo-elements.
 
 <h3 id="values">
-Values</h3>
+Value Definitions</h3>
 
-	This specification follows the <a href="https://www.w3.org/TR/CSS21/about.html#property-defs">CSS property definition conventions</a> from [[!CSS2]].
-	Value types not defined in this specification are defined in CSS Values & Units [[!CSS-VALUES-3]].
-	Other CSS modules may expand the definitions of these value types.
+	This specification follows the <a href="https://www.w3.org/TR/CSS2/about.html#property-defs">CSS property definition conventions</a> from [[!CSS2]]
+	using the <a href="https://www.w3.org/TR/css-values-3/#value-defs">value definition syntax</a> from [[!CSS-VALUES-3]].
+	Value types not defined in this specification are defined in CSS Values &amp; Units [[!CSS-VALUES-3]].
+	Combination with other CSS modules may expand the definitions of these value types.
 
 	In addition to the property-specific values listed in their definitions,
 	all properties defined in this specification
@@ -614,7 +615,9 @@ Baseline Alignment: the ''baseline'' keyword and ''first''/''last'' modifiers</h
 			of its [=baseline-sharing group=].
 			See [[#align-by-baseline]] for more details.
 
-			The <a>fallback alignment</a> for ''first baseline'' is ''start''.
+			The <a>fallback alignment</a> for ''first baseline'' is
+			''safe self-start'' (for [=self-alignment=])
+			or ''safe start'' (for [=content-distribution=]).
 
 		<dt><dfn lt="last baseline | last">last baseline</dfn>
 		<dd>
@@ -624,7 +627,9 @@ Baseline Alignment: the ''baseline'' keyword and ''first''/''last'' modifiers</h
 			of its [=baseline-sharing group=].̣
 			See [[#align-by-baseline]] for more details.
 
-			The <a>fallback alignment</a> for ''last baseline'' is ''safe end''.
+			The <a>fallback alignment</a> for ''last baseline'' is
+			''safe self-end'' (for [=self-alignment=])
+			or ''safe end'' (for [=content-distribution=]).
 	</dl>
 
 	When specified for 'align-content',
@@ -1340,7 +1345,7 @@ Inline-Axis (or Main-Axis) Alignment: the 'justify-self' property</h3>
 			<th>Other Details
 			<td>
 				In terms of CSS2.1 block-level formatting [[!CSS2]],
-				the rules for “over-constrained” computations in <a href="https://www.w3.org/TR/CSS21/visudet.html#blockwidth">section 10.3.3</a>
+				the rules for “over-constrained” computations in <a href="https://www.w3.org/TR/CSS2/visudet.html#blockwidth">section 10.3.3</a>
 				are ignored in favor of alignment as specified here
 				and the used value of the margin properties are therefore not adjusted to correct for the over-constraint.
 
@@ -1397,12 +1402,12 @@ Inline-Axis (or Main-Axis) Alignment: the 'justify-self' property</h3>
 			<th>Other Details
 			<td>
 				In terms of CSS2.1 formatting [[!CSS2]],
-				the rules for “over-constrained” computations in <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">section 10.3.7</a>
+				the rules for “over-constrained” computations in <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">section 10.3.7</a>
 				are ignored in favor of alignment as specified here,
 				and the used value of the inset properties are not adjusted to correct for the over-constraint.
 
 				Values other than ''justify-self/stretch'' or ''justify-self/normal''
-				cause <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">non-replaced absolutely-positioned boxes</a>
+				cause <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">non-replaced absolutely-positioned boxes</a>
 				to use <a>fit-content sizing</a> for calculating ''width/auto'' sizes
 				in the affected axis.
 
@@ -1411,7 +1416,7 @@ Inline-Axis (or Main-Axis) Alignment: the 'justify-self' property</h3>
 				just as non-replaced ones do.
 
 				Note: If only one inset property is ''top/auto'',
-				the computations in <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">CSS2 section 10.3.7</a>
+				the computations in <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">CSS2 section 10.3.7</a>
 				fully determine its size and position,
 				and 'justify-self' has no effect.
 				(If both are ''top/auto'',
@@ -1565,12 +1570,12 @@ Block-Axis (or Cross-Axis) Alignment: the 'align-self' property</h3>
 			<th>Other Details
 			<td>
 				In terms of CSS2.1 formatting [[!CSS2]],
-				the rules for "over-constrained" computations in <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">section 10.6.4</a>
+				the rules for "over-constrained" computations in <a href="https://www.w3.org/TR/CSS2/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 inset properties are not adjusted to correct for the over-constraint.
 
 				Values other than ''justify-self/stretch'' or ''justify-self/normal''
-				cause <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">non-replaced absolutely-positioned boxes</a>
+				cause <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-height">non-replaced absolutely-positioned boxes</a>
 				to use <a>fit-content sizing</a> for calculating ''height/auto'' sizes
 				in the affected axis.
 
@@ -1579,7 +1584,7 @@ Block-Axis (or Cross-Axis) Alignment: the 'align-self' property</h3>
 				just as non-replaced ones do.
 
 				Note: If only one inset property is ''top/auto'',
-				the computations in <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">CSS2 section 10.6.4</a>
+				the computations in <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-height">CSS2 section 10.6.4</a>
 				fully determine its size and position,
 				and 'align-self' has no effect.
 				(If both are ''top/auto'',
@@ -1706,7 +1711,7 @@ Effects on Sizing of Absolutely Positioned Boxes with Static-Position Insets</h3
 	the <a>available space</a> for calculating the <a>inline size</a>
 	is also affected by alignment.
 
-	In [[CSS2]], this is keyed off of the the 'direction' property
+	Note: In [[CSS2]], the [=available space=] is keyed off of the the 'direction' property
 	of the <a>static-position containing block</a>.
 	(See <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>
 	and <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-replaced-width">CSS2&sect;10.3.8</a>.)
@@ -1715,20 +1720,29 @@ Effects on Sizing of Absolutely Positioned Boxes with Static-Position Insets</h3
 	to the corresponding edge of the <a>static position rectangle</a>
 	and the other to the corresponding edge of the <a>containing block</a>
 	(i.e. set the inset to zero).
-
 	Just as the <a>self-alignment properties</a>
-	replace the <a>containing block</a>’s 'direction' for placement,
-	they also replace this lookup for sizing.
+	replace the <a>containing block</a>’s 'direction' lookup for placement,
+	they also replace this lookup for sizing,
+	as specified here.
+
 	Thus,
 	when interpreting the rules in
 	<a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>
 	and <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-replaced-width">CSS2&sect;10.3.8</a>,
 	wherever the 'direction' property of the <a>static-position containing block</a> is referenced,
 	instead reference the value of the 'align-self' or 'justify-self' property
 	(whichever is defined to apply to the relevant axis),
-	treating ''justify-content/normal'' as ''start''
+	treating left-equivalent alignment as defined for ''ltr''
+	and right-equivalent alignment as defined for ''rtl''.
+	Treat ''justify-self/normal'' as ''start''
 	and any <a>distributed alignment</a> value as its <a>fallback alignment</a>.
 
+	In the case of ''justify-self/center'' alignment,
+	the [=available space=] for the box is
+	double the distance between the center of the [=static position rectangle=]
+	and the closest edge of the [=containing block=]
+	in the relevant axis.
+
 	<figure>
 		<img src="images/place-content-abspos.svg" width=480 height=330
 		     alt="Start alignment sizes into the space between
@@ -1741,7 +1755,8 @@ Effects on Sizing of Absolutely Positioned Boxes with Static-Position Insets</h3
 			Instead of always sizing
 			within the available space between
 			the <a>inline-start</a> <a>static position</a>
-			and the <a>inline-end</a> <a>containing block</a> edge,
+			and the <a>inline-end</a> <a>containing block</a> edge
+			as specified in [[CSS2]],
 			an absolutely-positioned element with ''left/auto'' insets
 			will be sized with reference to
 			the <a>static position rectangle</a>’s edge(s)
@@ -1771,6 +1786,10 @@ Effects on Sizing of Absolutely Positioned Boxes with Static-Position Insets</h3
 	with <a>stretch-fit sizing</a> (consuming all of the <a>available space</a>).
 	This is an independent effect from the available space adjustment here.
 
+	Note: This only affect how [=available space=] is calculated
+	for sizing the absolutely-positioned box;
+	its alignment is as specified in previous sections.
+
 <!--
                   ████ ████████ ████████ ██     ██  ██████
  ██   ██           ██     ██    ██       ███   ███ ██    ██
@@ -2291,19 +2310,19 @@ Appendix A: Static Position Terminology</h2>
 		are defined in [[CSS2]] Chapter 10.
 		The <a>static position rectangle</a> is a zero-thickness rectangle spanning between
 		the inline-axis sides of the box’s <a>static-position containing block</a>
-		(see <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>);
+		(see <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>);
 		and positioned at its <a>block-start</a> <a>static position</a>
-		(see <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">CSS2&sect;10.6.4).
+		(see <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-height">CSS2&sect;10.6.4</a>).
 
 		<dt>Inline Layout
 		<dd>
-		The <a>static positions</a> of a <a>inline-level box</a>
+		The <a>static positions</a> of an <a>inline-level box</a>
 		are defined in [[CSS2]] Chapter 10.
 		The <a>static position rectangle</a> is a zero-thickness rectangle spanning between
 		the <a>line-over</a>/<a>line-under</a> sides of the <a>line box</a>
 		that would have contained its “hypothetical box”
-		(see <a href="https://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>);
-		and positioned at its <a>inline-start</a> <a>static position</a>
+		(see <a href="https://www.w3.org/TR/CSS2/visudet.html#abs-non-replaced-width">CSS2&sect;10.3.7</a>);
+		and positioned at its <a>inline-start</a> <a>static position</a>.
 
 		<dt>Flex Layout
 		<dd>
@@ -2318,7 +2337,7 @@ Appendix A: Static Position Terminology</h2>
 		However, if that <a>grid container</a> also establishes
 		the box’s actual <a>containing block</a>,
 		then the <a>grid area</a> specified by the <a>grid-placement properties</a>
-		instead establishes its <a>static position rectangle</a>.
+		establishes its <a>static position rectangle</a> instead.
 		See the <a href="https://www.w3.org/TR/css-grid-1/#static-position">static position of a grid container child</a> in [[!CSS-GRID-1]].
 	</dl>
 

css-align-3/images/place-content-abspos.svg

@@ -82,12 +82,13 @@ Introduction</h2>
 	end values, and whether or not the animation should be running or paused.
 	An animation can also delay its start time.
 
-<h2 id="values">
-Values</h2>
+<h3 id="values">
+Value Definitions</h3>
 
-	This specification follows the <a href="https://www.w3.org/TR/CSS21/about.html#property-defs">CSS property definition conventions</a> from [[!CSS2]].
-	Value types not defined in this specification are defined in CSS Values & Units [[!CSS-VALUES-3]].
-	Other CSS modules may expand the definitions of these value types.
+	This specification follows the <a href="https://www.w3.org/TR/CSS2/about.html#property-defs">CSS property definition conventions</a> from [[!CSS2]]
+	using the <a href="https://www.w3.org/TR/css-values-3/#value-defs">value definition syntax</a> from [[!CSS-VALUES-3]].
+	Value types not defined in this specification are defined in CSS Values &amp; Units [[!CSS-VALUES-3]].
+	Combination with other CSS modules may expand the definitions of these value types.
 
 	In addition to the property-specific values listed in their definitions,
 	all properties defined in this specification