@@ -220,23 +220,9 @@ Alignment Keywords</h2>
220220<h3 id='positional-values'>
221221Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self-end'', ''flex-start'', ''flex-end'', ''left'', and ''right'' keywords</h3>
222222
223- The positional alignment keywords specify a position for an <a>alignment subject</a>
223+ The <dfn> positional alignment</dfn> keywords specify a position for an <a>alignment subject</a>
224224 with respect to its <a>alignment container</a> .
225225
226- The <<self-position>> set of values is used by 'justify-self' and 'align-self'
227- to align the box within its <a>alignment container</a> ,
228- and also by 'justify-items' and 'align-items'
229- (to specify default values for 'justify-self' and 'align-self' ).
230- The <<content-position>> set of values is used by 'justify-content' and 'align-content'
231- to align the box's contents within itself.
232-
233- <pre class='prod'>
234- <dfn><self-position></dfn> = center | start | end | self-start | self-end |
235- flex-start | flex-end | left | right;
236- <dfn><content-position></dfn> = center | start | end | flex-start | flex-end | left | right;
237- </pre>
238-
239-
240226 Values have the following meanings:
241227
242228 <dl dfn-type="value">
@@ -282,6 +268,29 @@ Positional Alignment: the ''center'', ''start'', ''end'', ''self-start'', ''self
282268 this value behaves as ''start'' .
283269 </dl>
284270
271+ Two grammar terms are used to denote this collection of values:
272+
273+ <dl>
274+ <dt> <<self-position>>
275+ <dd>
276+ This set is used by 'justify-self' and 'align-self'
277+ to align the box within its <a>alignment container</a> ,
278+ and also by 'justify-items' and 'align-items'
279+ (to specify default values for 'justify-self' and 'align-self' ).
280+ <pre class='prod'>
281+ <dfn><self-position></dfn> = center | start | end | self-start | self-end |
282+ flex-start | flex-end | left | right;
283+ </pre>
284+ <dt> <<content-position>>
285+ <dd>
286+ This set is used by 'justify-content' and 'align-content'
287+ to align the box's contents within itself.
288+
289+ <pre class='prod'>
290+ <dfn><content-position></dfn> = center | start | end | flex-start | flex-end | left | right;
291+ </pre>
292+ </dl>
293+
285294 <p class='issue'>
286295 Add example images.
287296
@@ -302,13 +311,7 @@ Baseline Alignment: the ''baseline'' and ''last-baseline'' keywords</h3>
302311 it and the other participants in its <a>baseline-sharing group</a>
303312 are fallback-aligned insofar as possible while preserving their <a>baseline alignment</a> .
304313
305- The baseline alignment keywords are:
306-
307- <pre class='prod'>
308- <dfn><baseline-position></dfn> = baseline | last-baseline
309- </pre>
310-
311- and are defined below:
314+ Values have the following meanings:
312315
313316 <dl dfn-type=value dfn-for="justify-content, justify-self, justify-items, align-content, align-self, align-items, <baseline-position> ">
314317 <dt> <dfn>baseline</dfn>
@@ -338,6 +341,12 @@ Baseline Alignment: the ''baseline'' and ''last-baseline'' keywords</h3>
338341 Issue: Should this ''end'' fallback be ''safe'' or ''unsafe'' ?
339342 </dl>
340343
344+ The baseline alignment keywords are represented with the <<baseline-position>> grammar term:
345+
346+ <pre class='prod'>
347+ <dfn><baseline-position></dfn> = baseline | last-baseline
348+ </pre>
349+
341350 These values give a box a <dfn export>baseline alignment preference</dfn> :
342351 either “first” or “last”, respectively.
343352
@@ -369,16 +378,14 @@ Baseline Alignment: the ''baseline'' and ''last-baseline'' keywords</h3>
369378<h3 id='distribution-values'>
370379Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between'', ''space-around'', and ''space-evenly'' keywords</h3>
371380
372- The distribution values are used by 'justify-content' and 'align-content'
373- to distribute the <a>alignment subjects</a>
374- evenly between the start and end edges of the <a>alignment container</a> .
381+ The <dfn>distributed alignment</dfn> values are used by 'justify-content' and 'align-content'
382+ to disperse the <a>alignment subjects</a>
383+ between the start and end edges of the <a>alignment container</a> .
375384 When the <a>alignment subjects</a> cannot be distributed in this way,
376385 they behave as their <a>fallback alignment</a> .
377386 Each distribution value has an associated <<content-position>> as a <a>fallback alignment</a> ,
378387 but one can alternatively be explicitly specified in the property.
379388
380- <pre class='prod'> <dfn><content-distribution></dfn> = space-between | space-around | space-evenly | stretch</pre>
381-
382389 <dl dfn-type="value" dfn-for="align-content, justify-content, <content-distribution> ">
383390 <dt> <dfn>space-between</dfn>
384391 <dd>
@@ -422,6 +429,10 @@ Distributed Alignment: the ''<content-distribution>/stretch'', ''space-between''
422429 <span class='note'> (For layout modes other than flex layout, ''flex-start'' is identical to ''start'' .)</span>
423430 </dl>
424431
432+ These values are represented with the <<content-distribution>> grammar term:
433+
434+ <pre class='prod'><dfn><content-distribution></dfn> = space-between | space-around | space-evenly | stretch</pre>
435+
425436 <p class='issue'>
426437 Add even more example images.
427438
0 commit comments