Skip to content

Commit 8e16e40

Browse files
fantasaifantasai
committed
[css-sizing] Clean up some terminology. Round 1: min-size -> min-content.
1 parent 54b9d47 commit 8e16e40

2 files changed

Lines changed: 61 additions & 65 deletions

File tree

‎css-sizing/Overview.bs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ Terminology</h2>
8282
either a measurement of its <i>containing block</i> (if that is <i>definite</i>)
8383
or an infinite size (when it is <i>indefinite</i>).
8484
An <i>available size</i> can alternatively be either a
85-
<dfn>min-content constraint</dfn> or
86-
a <dfn>max-content constraint</dfn>.
85+
<i>min-content constraint</i> or
86+
a <i>max-content constraint</i>.
8787

8888
<!--
8989
<p>
@@ -121,7 +121,7 @@ Terminology</h2>
121121
Note: This is called the “available width” in <a href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1§10.3.5</a>
122122
and computed by the rules in <a href="http://www.w3.org/TR/CSS21/visudet.html#blockwidth">CSS2.1§10.3.3</a>.
123123

124-
<dt><dfn title="max-content measure|max-measure|max-content size">max-content measure</dfn>
124+
<dt><dfn title="max-content measure|max-content size">max-content measure</dfn>
125125
<dd>
126126
Roughly, the narrowest <i>measure</i> a box could take while fitting around its contents
127127
if <em>none</em> of the soft wrap opportunities within the box were taken.
@@ -131,7 +131,7 @@ Terminology</h2>
131131
Note: This is called the “preferred width” in <a href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1§10.3.5</a>
132132
and the “maximum cell width” in <a href="http://www.w3.org/TR/CSS21/tables.html#auto-table-layout">CSS2.1§17.5.2.2</a>.
133133

134-
<dt><dfn title="min-content measure|min-measure|min-content size">min-content measure</dfn>
134+
<dt><dfn title="min-content measure|min-content size">min-content measure</dfn>
135135
<dd>
136136
The narrowest <i>measure</i> a box could take
137137
that doesn't lead to inline-dimension overflow
@@ -190,28 +190,28 @@ Terminology</h2>
190190
<p class='issue'>
191191
Same issue as <i>min-content extent</i>.
192192

193-
<dt><dfn title="max-size contribution|max-extent contribution|max-measure contribution">max-size contribution</dfn>
193+
<dt><dfn title="max-content contribution|max-content measure contribution|max-content extent contribution">max-content contribution</dfn>
194194
<dd>
195195
The size that a box contributes to its <i>containing block</i>'s <i>max-content size</i>.
196196

197-
<dt><dfn title="min-size contribution|min-extent contribution|min-measure contribution">min-size contribution</dfn>
197+
<dt><dfn title="min-content contribution|min-content measure contribution|min-content extent contribution">min-content contribution</dfn>
198198
<dd>
199199
The size that a box contributes to its <i>containing block</i>'s <i>min-content size</i>.
200200

201201
<dt><dfn>preferred-size contribution</dfn>
202202
<dd>
203203
If the box's layout mode has a defined <i>preferred-size contribution</i>, that.
204-
Otherwise, the box's <i>max-size contribution</i>.
204+
Otherwise, the box's <i>max-content contribution</i>.
205205

206-
<dt><dfn>max-size constraint</dfn>
206+
<dt><dfn>max-content constraint</dfn>
207207
<dd>
208208
A sizing constraint imposed by the box's <i>containing block</i>
209-
that causes it to produce its <i>max-size contribution</i>.
209+
that causes it to produce its <i>max-content contribution</i>.
210210

211-
<dt><dfn>min-size constraint</dfn>
211+
<dt><dfn>min-content constraint</dfn>
212212
<dd>
213213
A sizing constraint imposed by the box's <i>containing block</i>
214-
that causes it to produce its <i>min-size contribution</i>.
214+
that causes it to produce its <i>min-content contribution</i>.
215215

216216
<dt><dfn>preferred-size constraint</dfn>
217217
<dd>
@@ -357,7 +357,7 @@ Intrinsic Sizes of Non-Replaced Inlines</h3>
357357
<p>
358358
The <i>min-content measure</i> of an inline box
359359
is the length of the largest unbreakable sequence of inline content.
360-
The <i>min-measure contribution</i> of an inline box
360+
The <i>min-content measure contribution</i> of an inline box
361361
is its <i>min-content measure</i>,
362362
plus any inline-axis margin, border, and padding
363363
adjacent to that sequence.
@@ -367,13 +367,13 @@ Intrinsic Sizes of Non-Replaced Inlines</h3>
367367
is the length of the largest sequence of inline content
368368
on a single line
369369
when only forced line breaks are taken.
370-
The <i>max-measure contribution</i> of an inline box
370+
The <i>max-content measure contribution</i> of an inline box
371371
is its <i>max-content measure</i>,
372372
plus any inline-axis margin, border, and padding
373373
adjacent to that sequence.
374374

375375
<p>
376-
The <i>min-content extent</i>, <i>max-content extent</i>, <i>min-extent contribution</i>, and <i>max-extent contribution</i> of an inline box
376+
The <i>min-content extent</i>, <i>max-content extent</i>, <i>min-content extent contribution</i>, and <i>max-content extent contribution</i> of an inline box
377377
are the distance from the head edge of the first line box
378378
to the foot edge of the last line box
379379
on which the inline appears.
@@ -383,32 +383,32 @@ Intrinsic Sizes of Non-Replaced Blocks</h3>
383383

384384
<p>
385385
The <i>min-content measure</i> of a <i>block container box</i>
386-
is the largest <i>min-measure contribution</i>
386+
is the largest <i>min-content measure contribution</i>
387387
of its in-flow or floated children.
388388

389389
<p>
390390
The <i>max-content measure</i> of a <i>block container box</i>
391391
is the measure of the box after layout,
392-
if all children are sized under a <i>max-size constraint</i>.
392+
if all children are sized under a <i>max-content constraint</i>.
393393
<p>
394394
If the computed measure of a <i>block-level box</i>
395395
is ''width/min-content'', ''width/max-content'', or a <i>definite size</i>,
396-
its <i>min-measure contribution</i>
396+
its <i>min-content measure contribution</i>
397397
is that size
398398
plus any inline-axis margin, border, and padding.
399399
Otherwise, if the computed measure of the block is ''width/fit-content'', ''width/auto'', or ''width/fill'',
400-
its <i>min-measure contribution</i>
400+
its <i>min-content measure contribution</i>
401401
is its <i>min-content measure</i>
402402
plus any inline-axis margin, border, and padding.
403403

404404
<p>
405405
If the computed measure of a <i>block-level box</i>
406406
is ''width/min-content'', ''width/max-content'', or a <i>definite size</i>,
407-
its <i>max-measure contribution</i>
407+
its <i>max-content measure contribution</i>
408408
is that size
409409
plus any inline-axis margin, border, and padding.
410410
Otherwise, if the computed measure of the block is ''width/fit-content'', ''width/auto'', or ''width/fill'',
411-
its <i>max-measure contribution</i>
411+
its <i>max-content measure contribution</i>
412412
is its <i>max-content measure</i>
413413
plus any inline-axis margin, border, and padding.
414414

@@ -422,7 +422,7 @@ Intrinsic Sizes of Non-Replaced Blocks</h3>
422422
and analogously for vertical writing modes.
423423

424424
<p>
425-
The <i>min-extent contribution</i> and <i>max-extent contribution</i> of a <i>block-level box</i>
425+
The <i>min-content extent contribution</i> and <i>max-content extent contribution</i> of a <i>block-level box</i>
426426
is the extent of the block after layout,
427427
plus any block-axis margin, border, and padding.
428428

@@ -443,12 +443,12 @@ Intrinsic Sizes in Multi-column Layout</h3>
443443
with a computed 'column-width' not ''auto''
444444
is the smaller of
445445
its 'column-width'
446-
and the largest <i>min-measure contribution</i> of its contents.
446+
and the largest <i>min-content measure contribution</i> of its contents.
447447

448448
<p>
449449
The <i>min-content measure</i> of a multi-column element
450450
with a computed 'column-width' of ''auto''
451-
is the largest <i>min-measure contribution</i> of its contents
451+
is the largest <i>min-content measure contribution</i> of its contents
452452
multiplied by its 'column-count'
453453
(treating ''auto'' as ''1'').
454454

@@ -459,7 +459,7 @@ Intrinsic Sizes in Multi-column Layout</h3>
459459
is its 'column-count'
460460
multiplied by the larger of
461461
its 'column-width' (treating ''auto'' as 0)
462-
and the largest <i>max-measure contribution</i> of its contents.
462+
and the largest <i>max-content measure contribution</i> of its contents.
463463

464464
<p>
465465
The <i>max-content measure</i> of a multi-column element
@@ -532,7 +532,7 @@ Extrinsic Size Determination</h2>
532532
<li>
533533
If the box is the root or is absolutely-positioned, the measure of its containing block, else
534534
<li>
535-
<code>max(<i>min-measure</i>|0, min(<i>max-measure</i>|infinity, <i>measure</i>|<i>fill-available measure</i>))</code>
535+
<code>max(<i>min-content measure</i>|0, min(<i>max-content measure</i>|infinity, <i>measure</i>|<i>fill-available measure</i>))</code>
536536
where the sizes are inner measures of the element establishing the box's <i>containing block</i>,
537537
and where the first value is used if it is <i>definite</i> and the second value otherwise.
538538
</ul>

0 commit comments

Comments
 (0)