- From: Elika Etemad via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 15 Oct 2011 02:07:36 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-writing-modes
In directory hutz:/tmp/cvs-serv20819
Modified Files:
Overview.html Overview.src.html
Log Message:
Clarify modified shrink-to-fit calculation with math notation
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.html,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- Overview.html 15 Oct 2011 01:59:04 -0000 1.215
+++ Overview.html 15 Oct 2011 02:07:33 -0000 1.216
@@ -2434,8 +2434,8 @@
the <a href="#available-measure"><i>available measure</i></a> to be
indefinite. In such cases a percentage of the containing block measure
cannot be defined, and inline-axis computations cannot be resolved. In
- these cases, the initial containing block's size is used as a <a
- href="#fallback-measure"><i>fallback measure</i></a> in place of the <a
+ these cases, the initial containing block's size is used as a
+ <i>fallback</i> variable in place of the <a
href="#available-measure"><i>available measure</i></a> for calculations
that require a definite available measure.
@@ -2447,10 +2447,16 @@
calculated as the <a href="#fit-content"><i>fit-content</i></a>
(shrink-to-fit) size using the minimum of the <a
href="#fill-available-measure"><i>fill-available measure</i></a> (when
- defined) and the <a href="#fallback-measure"><i>fallback measure</i></a>
- as the <a href="#fill-available-measure"><var>fill-available
- measure</var></a> in the <a href="#fit-content"><i>fit-content</i></a>
- calculation.
+ definite) and the <a href="#fallback-measure"><i>fallback measure</i></a>
+ as the <a href="#fill-available"><var>fill-available</var></a> variable in
+ the <a href="#fit-content"><i>fit-content</i></a> calculation. In other
+ words, the calculation becomes <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>, <a
+ href="#fallback-measure"><i>fallback<i></i></i></a>))</code> (where <a
+ href="#fill-available"><i>fill-available</i></a> is dropped when
+ indefinite).
<h4 id=orthogonal-multicol><span class=secno>7.3.2. </span> Multi-column
Layout in Orthogonal Flows</h4>
@@ -2468,10 +2474,10 @@
as the <a href="#fill-available-measure"><i>fill-available
measure</i></a> using the minimum of the <a
href="#fill-available-measure"><i>fill-available measure</i></a> (when
- defined) and the <a href="#fallback-measure"><i>fallback measure</i></a>
+ definite) and the <a href="#fallback-measure"><i>fallback measure</i></a>
as the <a href="#fill-available-measure"><var>fill-available
measure</var></a> in the <a href="#fit-content"><i>fit-content</i></a>
- calculation.
+ calculation, as <a href="#orthogonal-auto">above</a>.
<li>If the columns' extent is not fixed, the <a
href="#fill-available-extent"><i>fill-available extent</i></a> of the
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-writing-modes/Overview.src.html,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- Overview.src.html 15 Oct 2011 01:59:04 -0000 1.225
+++ Overview.src.html 15 Oct 2011 02:07:34 -0000 1.226
@@ -1767,7 +1767,7 @@
measure</i> to be indefinite. In such cases a percentage of the
containing block measure cannot be defined, and inline-axis
computations cannot be resolved. In these cases, the initial
- containing block's size is used as a <i>fallback measure</i>
+ containing block's size is used as a <i>fallback</i> variable
in place of the <i>available measure</i> for calculations that
require a definite available measure.
@@ -1777,9 +1777,12 @@
<p>If the computed measure of an element establishing an orthogonal
flow is ''auto'', then the used measure is calculated as the
<i>fit-content</i> (shrink-to-fit) size using the minimum of the
- <i>fill-available measure</i> (when defined) and the <i>fallback measure</i>
- as the <var>fill-available measure</var> in the <i>fit-content</i>
- calculation.
+ <i>fill-available measure</i> (when definite) and the
+ <i>fallback measure</i> as the <var>fill-available</var> variable
+ in the <i>fit-content</i> calculation. In other words, the
+ calculation becomes
+ <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>, <a href="#fallback-measure"><i>fallback<i></a>))</code>
+ (where <i>fill-available</i> is dropped when indefinite).
<h4 id="orthogonal-multicol">
Multi-column Layout in Orthogonal Flows</h4>
@@ -1792,9 +1795,10 @@
<li>If 'column-count' and 'column-width' are both ''auto'', a
used 'column-width' is calculated for the element as the
<i>fill-available measure</i> using the minimum of the
- <i>fill-available measure</i> (when defined) and the <i>fallback measure</i>
- as the <var>fill-available measure</var> in the <i>fit-content</i>
- calculation.
+ <i>fill-available measure</i> (when definite) and the
+ <i>fallback measure</i> as the <var>fill-available measure</var>
+ in the <i>fit-content</i> calculation,
+ as <a href="#orthogonal-auto">above</a>.
<li>If the columns' extent is not fixed, the <i>fill-available
extent</i> of the element is used.
<li>The used column-count then follows from filling the resulting
Received on Saturday, 15 October 2011 02:07:37 UTC