- From: Elika Etemad via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 20 May 2011 08:32:17 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-writing-modes
In directory hutz:/tmp/cvs-serv5163
Modified Files:
Overview.html Overview.src.html
Log Message:
fixup column-width keyword definitions
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.html,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- Overview.html 20 May 2011 08:06:53 -0000 1.127
+++ Overview.html 20 May 2011 08:32:15 -0000 1.128
@@ -3051,39 +3051,45 @@
<td>‘<a href="#min-content"><code
class=css>min-content</code></a>’ | ‘<a
href="#max-content"><code class=css>max-content</code></a>’ |
- ‘<a href="#fit-content"><code
- class=css>fit-content</code></a>’ | ‘<a
- href="#fill-available"><code class=css>fill-available</code></a>’
+ ‘<a href="#fill-available"><code
+ class=css>fill-available</code></a>’ | ‘<a
+ href="#fit-content"><code class=css>fit-content</code></a>’
<tr>
<th>Initial:
- <td>same as CSS2.1
+ <td>as defined in <a href="#CSS21"
+ rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
<tr>
<th>Applies to:
- <td>same as CSS2.1
+ <td>as defined in <a href="#CSS21"
+ rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
<tr>
<th>Inherited:
- <td>same as CSS2.1
+ <td>as defined in <a href="#CSS21"
+ rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
<tr>
<th>Percentages:
- <td>same as CSS2.1
+ <td>as defined in <a href="#CSS21"
+ rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
<tr>
<th>Media:
- <td>same as CSS2.1
+ <td>as defined in <a href="#CSS21"
+ rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
<tr>
<th>Computed value:
- <td>specified value if keyword specified, else same as CSS2.1
+ <td>specified value if keyword specified, else as defined in <a
+ href="#CSS21" rel=biblioentry>[CSS21]<!--{{!CSS21}}--></a>
</table>
<p>There are four types of automatically-determined sizes in CSS (which are
@@ -3140,11 +3146,11 @@
href="http://www.w3.org/TR/CSS21/visudet.html#float-width">CSS2.1§10.3.5</a>,
and <a href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm">CSS3
Multi-column Layout § 3.4</a>, the <dfn
- id=fit-content-measure>fit-content measure</dfn> is defined as max(<a
- href="#min-content"><i>min-content</i></a>, min(<a
+ id=fit-content-measure>fit-content measure</dfn> is defined as
+ <code>max(<a href="#min-content"><i>min-content</i></a>, min(<a
href="#max-content"><i>max-content</i></a>, <a
- href="#fill-available"><i>fill-available</i></a>)) if the available
- measure is finite, and as the <a
+ href="#fill-available"><i>fill-available</i></a>))</code> if the
+ available measure is finite, and as the <a
href="#max-content"><i>max-content</i></a> measure otherwise. The <dfn
id=fit-content-extent>fit-content extent</dfn> is calculated from the
same expression applied to the block dimension.
@@ -3171,8 +3177,9 @@
<p>The <a href="#min-content"><i>min-content</i></a> and <a
href="#max-content"><i>max-content</i></a> sizes of a multi-column element
- are undefined per [[!CSS3MULTICOL]]. A future specification may define
- them. <!-- Sketchbook area. See
+ are undefined per <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>. A future specification
+ may define them. <!-- Sketchbook area. See
http://lists.w3.org/Archives/Public/www-style/2011Apr/0316.html
http://lists.w3.org/Archives/Public/www-style/2011May/0468.html
@@ -3215,49 +3222,83 @@
<td>‘<a href="#min-content"><code
class=css>min-content</code></a>’ | ‘<a
- href="#max-content"><code class=css>max-content</code></a>’
+ href="#max-content"><code class=css>max-content</code></a>’ |
+ ‘<a href="#fill-available"><code
+ class=css>fill-available</code></a>’ | ‘<a
+ href="#fit-content"><code class=css>fit-content</code></a>’
<tr>
<th>Initial:
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
<tr>
<th>Applies to:
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
<tr>
<th>Inherited:
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
<tr>
<th>Percentages:
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
<tr>
<th>Media:
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in <a href="#CSS3COL"
+ rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
<tr>
<th>Computed value:
- <td>specified value if keyword specified, else same as CSS3 Multi-column
- Layout
+ <td>specified value if keyword specified, else as defined in <a
+ href="#CSS3COL" rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>
</table>
- <p>When used as values for ‘<code
- class=property>column-width</code>’, the ‘<a
- href="#min-content"><code class=css>min-content</code></a>’ and
- ‘<a href="#max-content"><code
- class=css>max-content</code></a>’ keywords indicate that the <a
- href="#min-content"><i>min-content</i></a> and <a
- href="#max-content"><i>max-content</i></a> measures, respectively, of the
- multi-column element's contents are to be the used ‘<code
- class=property>column-width</code>’.
+ <p>When used as values for <a
+ href="http://www.w3.org/TR/css3-multicol/#cw">‘<code
+ class=property>column-width</code>’</a>, the new keywords specify
+ the optimal column width:
+
+ <dl>
+ <dt>‘<a href="#min-content"><code
+ class=css>min-content</code></a>’
+
+ <dd>Specifies the optimal column width as the <a
+ href="#min-content-measure"><i>min-content measure</i></a> of the
+ multi-column element's contents.
+
+ <dt>‘<a href="#max-content"><code
+ class=css>max-content</code></a>’
+
+ <dd>Specifies the optimal column width as the <a
+ href="#max-content-measure"><i>max-content measure</i></a> of the
+ multi-column element's contents.
+
+ <dt>‘<a href="#fill-available"><code
+ class=css>fill-available</code></a>’
+
+ <dd>Specifies the optimal column width as the <a
+ href="#fill-available-measure"><i>fill-available measure</i></a> of the
+ multi-column element.
+
+ <dt>‘<a href="#fit-content"><code
+ class=css>fit-content</code></a>’
+
+ <dd>Specifies the optimal column width as <code>max(<a
+ href="#min-content"><i>min-content</i></a>, min(<a
+ href="#max-content"><i>max-content</i></a>, <a
+ href="#fill-available"><i>fill-available</i></a>))</code>.
+ </dl>
<h2 class=no-num id=references> References</h2>
@@ -3491,17 +3532,18 @@
<tr valign=baseline>
<td><span class=property>‘column-width’</span>
- <td>‘min-content’ | ‘max-content’
+ <td>‘min-content’ | ‘max-content’ |
+ ‘fill-available’ | ‘fit-content’
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in [CSS3COL]
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in [CSS3COL]
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in [CSS3COL]
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in [CSS3COL]
- <td>same as CSS3 Multi-column Layout
+ <td>as defined in [CSS3COL]
<tr valign=baseline>
<td><span class=property>‘width’</span>, <span
@@ -3512,17 +3554,17 @@
class=property>‘max-height’</span>
<td>‘min-content’ | ‘max-content’ |
- ‘fit-content’ | ‘fill-available’
+ ‘fill-available’ | ‘fit-content’
- <td>same as CSS2.1
+ <td>as defined in [CSS21]
- <td>same as CSS2.1
+ <td>as defined in [CSS21]
- <td>same as CSS2.1
+ <td>as defined in [CSS21]
- <td>same as CSS2.1
+ <td>as defined in [CSS21]
- <td>same as CSS2.1
+ <td>as defined in [CSS21]
<tr valign=baseline>
<td><a class=property href="#text-combine0">text-combine</a>
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.src.html,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- Overview.src.html 20 May 2011 08:06:53 -0000 1.133
+++ Overview.src.html 20 May 2011 08:32:15 -0000 1.134
@@ -2262,31 +2262,31 @@
</tr>
<tr>
<th>New Values:</th>
- <td>''min-content'' | ''max-content'' | ''fit-content'' | ''fill-available''</td>
+ <td>''min-content'' | ''max-content'' | ''fill-available'' | ''fit-content''</td>
</tr>
<tr>
<th>Initial:</th>
- <td>same as CSS2.1</td>
+ <td>as defined in [[!CSS21]]</td>
</tr>
<tr>
<th>Applies to:</th>
- <td>same as CSS2.1</td>
+ <td>as defined in [[!CSS21]]</td>
</tr>
<tr>
<th>Inherited:</th>
- <td>same as CSS2.1</td>
+ <td>as defined in [[!CSS21]]</td>
</tr>
<tr>
<th>Percentages:</th>
- <td>same as CSS2.1</td>
+ <td>as defined in [[!CSS21]]</td>
</tr>
<tr>
<th>Media:</th>
- <td>same as CSS2.1</td>
+ <td>as defined in [[!CSS21]]</td>
</tr>
<tr>
<th>Computed value:</th>
- <td>specified value if keyword specified, else same as CSS2.1</td>
+ <td>specified value if keyword specified, else as defined in [[!CSS21]]</td>
</tr>
</tbody>
</table>
@@ -2336,7 +2336,7 @@
and
<a href="http://www.w3.org/TR/css3-multicol/#pseudo-algorithm">CSS3 Multi-column Layout § 3.4</a>,
the <dfn>fit-content measure</dfn> is defined as
- max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))
+ <code>max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))</code>
if the available measure is finite, and as the <i>max-content</i>
measure otherwise. The <dfn>fit-content extent</dfn> is calculated
from the same expression applied to the block dimension.
@@ -2357,7 +2357,7 @@
Intrinsic Sizes in Multi-column Layout</h3>
<p>The <i>min-content</i> and <i>max-content</i> sizes of a multi-column
- element are undefined per [[!CSS3MULTICOL]]. A future specification may
+ element are undefined per [[!CSS3COL]]. A future specification may
define them.
<!-- Sketchbook area. See
@@ -2398,39 +2398,52 @@
</tr>
<tr>
<th>New Values:</th>
- <td>''min-content'' | ''max-content''</td>
+ <td>''min-content'' | ''max-content'' | ''fill-available'' | ''fit-content''</td>
</tr>
<tr>
<th>Initial:</th>
- <td>same as CSS3 Multi-column Layout</td>
+ <td>as defined in [[!CSS3COL]]</td>
</tr>
<tr>
<th>Applies to:</th>
- <td>same as CSS3 Multi-column Layout</td>
+ <td>as defined in [[!CSS3COL]]</td>
</tr>
<tr>
<th>Inherited:</th>
- <td>same as CSS3 Multi-column Layout</td>
+ <td>as defined in [[!CSS3COL]]</td>
</tr>
<tr>
<th>Percentages:</th>
- <td>same as CSS3 Multi-column Layout</td>
+ <td>as defined in [[!CSS3COL]]</td>
</tr>
<tr>
<th>Media:</th>
- <td>same as CSS3 Multi-column Layout</td>
+ <td>as defined in [[!CSS3COL]]</td>
</tr>
<tr>
<th>Computed value:</th>
- <td>specified value if keyword specified, else same as CSS3 Multi-column Layout</td>
+ <td>specified value if keyword specified, else as defined in [[!CSS3COL]]</td>
</tr>
</tbody>
</table>
- <p>When used as values for 'column-width', the ''min-content'' and
- ''max-content'' keywords indicate that the <i>min-content</i> and
- <i>max-content</i> measures, respectively, of the multi-column
- element's contents are to be the used 'column-width'.
+ <p>When used as values for <a href="http://www.w3.org/TR/css3-multicol/#cw">'column-width'</a>,
+ the new keywords specify the optimal column width:
+
+ <dl>
+ <dt>''min-content''
+ <dd>Specifies the optimal column width as the <i>min-content measure</i>
+ of the multi-column element's contents.
+ <dt>''max-content''
+ <dd>Specifies the optimal column width as the <i>max-content measure</i>
+ of the multi-column element's contents.
+ <dt>''fill-available''
+ <dd>Specifies the optimal column width as the <i>fill-available measure</i>
+ of the multi-column element.
+ <dt>''fit-content''
+ <dd>Specifies the optimal column width as
+ <code>max(<i>min-content</i>, min(<i>max-content</i>, <i>fill-available</i>))</code>.
+ </dl>
<h2 class="no-num">
References</h2>
Received on Friday, 20 May 2011 08:32:19 UTC