Skip to content

Commit f0fc355

Browse files
fantasaifantasai
committed
fixup column-width keyword definitions
1 parent ad20bb8 commit f0fc355

2 files changed

Lines changed: 119 additions & 64 deletions

File tree

‎css3-writing-modes/Overview.html‎

Lines changed: 86 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -3051,39 +3051,45 @@ <h2 class=no-num id=intrinsic-sizing>Appendix D: Intrinsic Dimensions</h2>
30513051
<td>&lsquo;<a href="#min-content"><code
30523052
class=css>min-content</code></a>&rsquo; | &lsquo;<a
30533053
href="#max-content"><code class=css>max-content</code></a>&rsquo; |
3054-
&lsquo;<a href="#fit-content"><code
3055-
class=css>fit-content</code></a>&rsquo; | &lsquo;<a
3056-
href="#fill-available"><code class=css>fill-available</code></a>&rsquo;
3054+
&lsquo;<a href="#fill-available"><code
3055+
class=css>fill-available</code></a>&rsquo; | &lsquo;<a
3056+
href="#fit-content"><code class=css>fit-content</code></a>&rsquo;
30573057

30583058
<tr>
30593059
<th>Initial:
30603060

3061-
<td>same as CSS2.1
3061+
<td>as defined in <a href="#CSS21"
3062+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30623063

30633064
<tr>
30643065
<th>Applies to:
30653066

3066-
<td>same as CSS2.1
3067+
<td>as defined in <a href="#CSS21"
3068+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30673069

30683070
<tr>
30693071
<th>Inherited:
30703072

3071-
<td>same as CSS2.1
3073+
<td>as defined in <a href="#CSS21"
3074+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30723075

30733076
<tr>
30743077
<th>Percentages:
30753078

3076-
<td>same as CSS2.1
3079+
<td>as defined in <a href="#CSS21"
3080+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30773081

30783082
<tr>
30793083
<th>Media:
30803084

3081-
<td>same as CSS2.1
3085+
<td>as defined in <a href="#CSS21"
3086+
rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30823087

30833088
<tr>
30843089
<th>Computed&#160;value:
30853090

3086-
<td>specified value if keyword specified, else same as CSS2.1
3091+
<td>specified value if keyword specified, else as defined in <a
3092+
href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
30873093
</table>
30883094

30893095
<p>There are four types of automatically-determined sizes in CSS (which are
@@ -3140,11 +3146,11 @@ <h2 class=no-num id=intrinsic-sizing>Appendix D: Intrinsic Dimensions</h2>
31403146
href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1&sect;10.3.5</a>,
31413147
and <a href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm">CSS3
31423148
Multi-column Layout &sect; 3.4</a>, the <dfn
3143-
id=fit-content-measure>fit-content measure</dfn> is defined as max(<a
3144-
href="#min-content"><i>min-content</i></a>, min(<a
3149+
id=fit-content-measure>fit-content measure</dfn> is defined as
3150+
<code>max(<a href="#min-content"><i>min-content</i></a>, min(<a
31453151
href="#max-content"><i>max-content</i></a>, <a
3146-
href="#fill-available"><i>fill-available</i></a>)) if the available
3147-
measure is finite, and as the <a
3152+
href="#fill-available"><i>fill-available</i></a>))</code> if the
3153+
available measure is finite, and as the <a
31483154
href="#max-content"><i>max-content</i></a> measure otherwise. The <dfn
31493155
id=fit-content-extent>fit-content extent</dfn> is calculated from the
31503156
same expression applied to the block dimension.
@@ -3171,8 +3177,9 @@ <h3 id=multicol-intrinsic><span class=secno>9.1. </span> Intrinsic Sizes in
31713177

31723178
<p>The <a href="#min-content"><i>min-content</i></a> and <a
31733179
href="#max-content"><i>max-content</i></a> sizes of a multi-column element
3174-
are undefined per [[!CSS3MULTICOL]]. A future specification may define
3175-
them. <!-- Sketchbook area. See
3180+
are undefined per <a href="#CSS3COL"
3181+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>. A future specification
3182+
may define them. <!-- Sketchbook area. See
31763183
http://lists.w3.org/Archives/Public/www-style/2011Apr/0316.html
31773184
http://lists.w3.org/Archives/Public/www-style/2011May/0468.html
31783185
@@ -3215,49 +3222,83 @@ <h4 id="multicol-intrinsic-columns">
32153222

32163223
<td>&lsquo;<a href="#min-content"><code
32173224
class=css>min-content</code></a>&rsquo; | &lsquo;<a
3218-
href="#max-content"><code class=css>max-content</code></a>&rsquo;
3225+
href="#max-content"><code class=css>max-content</code></a>&rsquo; |
3226+
&lsquo;<a href="#fill-available"><code
3227+
class=css>fill-available</code></a>&rsquo; | &lsquo;<a
3228+
href="#fit-content"><code class=css>fit-content</code></a>&rsquo;
32193229

32203230
<tr>
32213231
<th>Initial:
32223232

3223-
<td>same as CSS3 Multi-column Layout
3233+
<td>as defined in <a href="#CSS3COL"
3234+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32243235

32253236
<tr>
32263237
<th>Applies to:
32273238

3228-
<td>same as CSS3 Multi-column Layout
3239+
<td>as defined in <a href="#CSS3COL"
3240+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32293241

32303242
<tr>
32313243
<th>Inherited:
32323244

3233-
<td>same as CSS3 Multi-column Layout
3245+
<td>as defined in <a href="#CSS3COL"
3246+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32343247

32353248
<tr>
32363249
<th>Percentages:
32373250

3238-
<td>same as CSS3 Multi-column Layout
3251+
<td>as defined in <a href="#CSS3COL"
3252+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32393253

32403254
<tr>
32413255
<th>Media:
32423256

3243-
<td>same as CSS3 Multi-column Layout
3257+
<td>as defined in <a href="#CSS3COL"
3258+
rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32443259

32453260
<tr>
32463261
<th>Computed&#160;value:
32473262

3248-
<td>specified value if keyword specified, else same as CSS3 Multi-column
3249-
Layout
3263+
<td>specified value if keyword specified, else as defined in <a
3264+
href="#CSS3COL" rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
32503265
</table>
32513266

3252-
<p>When used as values for &lsquo;<code
3253-
class=property>column-width</code>&rsquo;, the &lsquo;<a
3254-
href="#min-content"><code class=css>min-content</code></a>&rsquo; and
3255-
&lsquo;<a href="#max-content"><code
3256-
class=css>max-content</code></a>&rsquo; keywords indicate that the <a
3257-
href="#min-content"><i>min-content</i></a> and <a
3258-
href="#max-content"><i>max-content</i></a> measures, respectively, of the
3259-
multi-column element's contents are to be the used &lsquo;<code
3260-
class=property>column-width</code>&rsquo;.
3267+
<p>When used as values for <a
3268+
href="http://www.w3.org/TR/css3-multicol/#cw">&lsquo;<code
3269+
class=property>column-width</code>&rsquo;</a>, the new keywords specify
3270+
the optimal column width:
3271+
3272+
<dl>
3273+
<dt>&lsquo;<a href="#min-content"><code
3274+
class=css>min-content</code></a>&rsquo;
3275+
3276+
<dd>Specifies the optimal column width as the <a
3277+
href="#min-content-measure"><i>min-content measure</i></a> of the
3278+
multi-column element's contents.
3279+
3280+
<dt>&lsquo;<a href="#max-content"><code
3281+
class=css>max-content</code></a>&rsquo;
3282+
3283+
<dd>Specifies the optimal column width as the <a
3284+
href="#max-content-measure"><i>max-content measure</i></a> of the
3285+
multi-column element's contents.
3286+
3287+
<dt>&lsquo;<a href="#fill-available"><code
3288+
class=css>fill-available</code></a>&rsquo;
3289+
3290+
<dd>Specifies the optimal column width as the <a
3291+
href="#fill-available-measure"><i>fill-available measure</i></a> of the
3292+
multi-column element.
3293+
3294+
<dt>&lsquo;<a href="#fit-content"><code
3295+
class=css>fit-content</code></a>&rsquo;
3296+
3297+
<dd>Specifies the optimal column width as <code>max(<a
3298+
href="#min-content"><i>min-content</i></a>, min(<a
3299+
href="#max-content"><i>max-content</i></a>, <a
3300+
href="#fill-available"><i>fill-available</i></a>))</code>.
3301+
</dl>
32613302

32623303
<h2 class=no-num id=references> References</h2>
32633304

@@ -3491,17 +3532,18 @@ <h2 class=no-num id=property-index> Property Index</h2>
34913532
<tr valign=baseline>
34923533
<td><span class=property>&lsquo;column-width&rsquo;</span>
34933534

3494-
<td>&lsquo;min-content&rsquo; | &lsquo;max-content&rsquo;
3535+
<td>&lsquo;min-content&rsquo; | &lsquo;max-content&rsquo; |
3536+
&lsquo;fill-available&rsquo; | &lsquo;fit-content&rsquo;
34953537

3496-
<td>same as CSS3 Multi-column Layout
3538+
<td>as defined in [CSS3COL]
34973539

3498-
<td>same as CSS3 Multi-column Layout
3540+
<td>as defined in [CSS3COL]
34993541

3500-
<td>same as CSS3 Multi-column Layout
3542+
<td>as defined in [CSS3COL]
35013543

3502-
<td>same as CSS3 Multi-column Layout
3544+
<td>as defined in [CSS3COL]
35033545

3504-
<td>same as CSS3 Multi-column Layout
3546+
<td>as defined in [CSS3COL]
35053547

35063548
<tr valign=baseline>
35073549
<td><span class=property>&lsquo;width&rsquo;</span>, <span
@@ -3512,17 +3554,17 @@ <h2 class=no-num id=property-index> Property Index</h2>
35123554
class=property>&lsquo;max-height&rsquo;</span>
35133555

35143556
<td>&lsquo;min-content&rsquo; | &lsquo;max-content&rsquo; |
3515-
&lsquo;fit-content&rsquo; | &lsquo;fill-available&rsquo;
3557+
&lsquo;fill-available&rsquo; | &lsquo;fit-content&rsquo;
35163558

3517-
<td>same as CSS2.1
3559+
<td>as defined in [CSS21]
35183560

3519-
<td>same as CSS2.1
3561+
<td>as defined in [CSS21]
35203562

3521-
<td>same as CSS2.1
3563+
<td>as defined in [CSS21]
35223564

3523-
<td>same as CSS2.1
3565+
<td>as defined in [CSS21]
35243566

3525-
<td>same as CSS2.1
3567+
<td>as defined in [CSS21]
35263568

35273569
<tr valign=baseline>
35283570
<td><a class=property href="#text-combine0">text-combine</a>

‎css3-writing-modes/Overview.src.html‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,31 +2262,31 @@ <h2 id="intrinsic-sizing" class="no-num">Appendix D:
22622262
</tr>
22632263
<tr>
22642264
<th>New Values:</th>
2265-
<td>''min-content'' | ''max-content'' | ''fit-content'' | ''fill-available''</td>
2265+
<td>''min-content'' | ''max-content'' | ''fill-available'' | ''fit-content''</td>
22662266
</tr>
22672267
<tr>
22682268
<th>Initial:</th>
2269-
<td>same as CSS2.1</td>
2269+
<td>as defined in [[!CSS21]]</td>
22702270
</tr>
22712271
<tr>
22722272
<th>Applies to:</th>
2273-
<td>same as CSS2.1</td>
2273+
<td>as defined in [[!CSS21]]</td>
22742274
</tr>
22752275
<tr>
22762276
<th>Inherited:</th>
2277-
<td>same as CSS2.1</td>
2277+
<td>as defined in [[!CSS21]]</td>
22782278
</tr>
22792279
<tr>
22802280
<th>Percentages:</th>
2281-
<td>same as CSS2.1</td>
2281+
<td>as defined in [[!CSS21]]</td>
22822282
</tr>
22832283
<tr>
22842284
<th>Media:</th>
2285-
<td>same as CSS2.1</td>
2285+
<td>as defined in [[!CSS21]]</td>
22862286
</tr>
22872287
<tr>
22882288
<th>Computed&#160;value:</th>
2289-
<td>specified value if keyword specified, else same as CSS2.1</td>
2289+
<td>specified value if keyword specified, else as defined in [[!CSS21]]</td>
22902290
</tr>
22912291
</tbody>
22922292
</table>
@@ -2336,7 +2336,7 @@ <h2 id="intrinsic-sizing" class="no-num">Appendix D:
23362336
and
23372337
<a href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm">CSS3 Multi-column Layout &sect; 3.4</a>,
23382338
the <dfn>fit-content measure</dfn> is defined as
2339-
max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))
2339+
<code>max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))</code>
23402340
if the available measure is finite, and as the <i>max-content</i>
23412341
measure otherwise. The <dfn>fit-content extent</dfn> is calculated
23422342
from the same expression applied to the block dimension.
@@ -2357,7 +2357,7 @@ <h3 id="multicol-intrinsic">
23572357
Intrinsic Sizes in Multi-column Layout</h3>
23582358

23592359
<p>The <i>min-content</i> and <i>max-content</i> sizes of a multi-column
2360-
element are undefined per [[!CSS3MULTICOL]]. A future specification may
2360+
element are undefined per [[!CSS3COL]]. A future specification may
23612361
define them.
23622362

23632363
<!-- Sketchbook area. See
@@ -2398,39 +2398,52 @@ <h4 id="multicol-intrinsic-columns">
23982398
</tr>
23992399
<tr>
24002400
<th>New Values:</th>
2401-
<td>''min-content'' | ''max-content''</td>
2401+
<td>''min-content'' | ''max-content'' | ''fill-available'' | ''fit-content''</td>
24022402
</tr>
24032403
<tr>
24042404
<th>Initial:</th>
2405-
<td>same as CSS3 Multi-column Layout</td>
2405+
<td>as defined in [[!CSS3COL]]</td>
24062406
</tr>
24072407
<tr>
24082408
<th>Applies to:</th>
2409-
<td>same as CSS3 Multi-column Layout</td>
2409+
<td>as defined in [[!CSS3COL]]</td>
24102410
</tr>
24112411
<tr>
24122412
<th>Inherited:</th>
2413-
<td>same as CSS3 Multi-column Layout</td>
2413+
<td>as defined in [[!CSS3COL]]</td>
24142414
</tr>
24152415
<tr>
24162416
<th>Percentages:</th>
2417-
<td>same as CSS3 Multi-column Layout</td>
2417+
<td>as defined in [[!CSS3COL]]</td>
24182418
</tr>
24192419
<tr>
24202420
<th>Media:</th>
2421-
<td>same as CSS3 Multi-column Layout</td>
2421+
<td>as defined in [[!CSS3COL]]</td>
24222422
</tr>
24232423
<tr>
24242424
<th>Computed&#160;value:</th>
2425-
<td>specified value if keyword specified, else same as CSS3 Multi-column Layout</td>
2425+
<td>specified value if keyword specified, else as defined in [[!CSS3COL]]</td>
24262426
</tr>
24272427
</tbody>
24282428
</table>
24292429

2430-
<p>When used as values for 'column-width', the ''min-content'' and
2431-
''max-content'' keywords indicate that the <i>min-content</i> and
2432-
<i>max-content</i> measures, respectively, of the multi-column
2433-
element's contents are to be the used 'column-width'.
2430+
<p>When used as values for <a href="http://www.w3.org/TR/css3-multicol/#cw">'column-width'</a>,
2431+
the new keywords specify the optimal column width:
2432+
2433+
<dl>
2434+
<dt>''min-content''
2435+
<dd>Specifies the optimal column width as the <i>min-content measure</i>
2436+
of the multi-column element's contents.
2437+
<dt>''max-content''
2438+
<dd>Specifies the optimal column width as the <i>max-content measure</i>
2439+
of the multi-column element's contents.
2440+
<dt>''fill-available''
2441+
<dd>Specifies the optimal column width as the <i>fill-available measure</i>
2442+
of the multi-column element.
2443+
<dt>''fit-content''
2444+
<dd>Specifies the optimal column width as
2445+
<code>max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))</code>.
2446+
</dl>
24342447

24352448
<h2 class="no-num">
24362449
References</h2>

0 commit comments

Comments
 (0)