[css3-writing-modes] Fix up multicol handling in ortho flows.

Author: tabatkins

css3-writing-modes/Overview.html

@@ -2761,9 +2761,11 @@ <h3 id=orthogonal-flows><span class=secno>7.3. </span> Orthogonal Flows</h3>
   <h4 id=orthogonal-auto><span class=secno>7.3.1. </span> Auto-sizing in
    Orthogonal Flows</h4>
 
-  <p> If the computed measure of an element establishing an orthogonal flow
-   is ‘<code class=css>auto</code>’, then the used inner measure is
-   calculated as:
+  <p> If the UA does not support CSS Multi-column Layout <a href="#CSS3COL"
+   rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a> and the element is a
+   block container, when the computed measure of the element establishing an
+   orthogonal flow is ‘<code class=css>auto</code>’, then the used inner
+   measure is calculated as:
 
   <p> <code>min(<a href="#max-content"><var>max-content</var></a>, max(<a
    href="#min-content"><var>min-content</var></a>, min(<a
@@ -2805,37 +2807,38 @@ <h4 id=orthogonal-auto><span class=secno>7.3.1. </span> Auto-sizing in
   <h4 id=orthogonal-multicol><span class=secno>7.3.2. </span> Multi-column
    Layout in Orthogonal Flows</h4>
 
-  <p>If the UA supports CSS Multi-column Layout <a href="#CSS3COL"
-   rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a>, then for the case where
-   the element's extent or available extent is defined but the element's
-   measure is ‘<code class=css>auto</code>’:
+  <p> If the UA supports CSS Multi-column Layout <a href="#CSS3COL"
+   rel=biblioentry>[CSS3COL]<!--{{!CSS3COL}}--></a> and the element is a
+   block container or multi-column element, for the case where the element's
+   extent or available extent is <a href="#definite"><i>definite</i></a> but
+   the element's measure is ‘<code class=css>auto</code>’:
 
   <ol>
-   <li>If ‘<code class=property>column-count</code>’ and ‘<code
+   <li> If ‘<code class=property>column-count</code>’ and ‘<code
     class=property>column-width</code>’ are both ‘<code
-    class=css>auto</code>’, a used ‘<code
-    class=property>column-width</code>’ is calculated for the element as
-    the <a href="#fill-available-measure"><i>fill-available measure</i></a>
-    using the minimum of the <i>available measure</i> (when definite) and the
-    <a href="#fallback-measure"><i>fallback available measure</i></a> as the
-    <i>available measure</i>.
-
-   <li>If the columns' extent is not fixed, the <a
+    class=css>auto</code>’, calculate the used ‘<code
+    class=property>column-width</code>’ as the inner measure for ‘<code
+    class=css>auto</code>’-sized elements, as defined above.
+
+   <li> If the columns' extent is <a
+    href="#indefinite"><i>indefinite</i></a>, the <a
     href="#fill-available-extent"><i>fill-available extent</i></a> of the
     element is used.
 
-   <li>The used column-count then follows from filling the resulting columns
-    with the element's content.
+   <li> The used ‘<code class=property>column-count</code>’ then follows
+    from filling the resulting columns with the element's content.
   </ol>
 
-  <p>The used measure of the resulting multi-column element is then
-   calculated: if the content neither wraps nor paginates within the
+  <p> The used measure of the resulting multi-column element is then
+   calculated: if the content neither line-wraps nor fragments within the
    multi-column element, then the used measure is the <a
    href="#max-content-measure"><i>max-content measure</i></a> of the
-   element's contents; else it is calculated from the used column width,
-   column count, and column gap.
+   element's contents; else it is calculated from the used ‘<code
+   class=property>column-width</code>’, ‘<code
+   class=property>column-count</code>’, and ‘<code
+   class=property>column-gap</code>’.
 
-  <p>The used extent of the element is either the used column extent (if
+  <p> The used extent of the element is either the used column extent (if
    multiple columns were used) or the <a
    href="#max-content-extent"><i>max-content extent</i></a> of the content.
 

css3-writing-modes/Overview.src.html

@@ -2005,7 +2005,9 @@ <h4 id="orthogonal-auto">
 Auto-sizing in Orthogonal Flows</h4>
 
   <p>
-    If the computed measure of an element establishing an orthogonal flow is ''auto'', 
+    If the UA does not support CSS Multi-column Layout [[!CSS3COL]]
+    and the element is a block container,
+    when the computed measure of the element establishing an orthogonal flow is ''auto'', 
     then the used inner measure is calculated as:
 
   <p>
@@ -2032,32 +2034,34 @@ <h4 id="orthogonal-auto">
 <h4 id="orthogonal-multicol">
 Multi-column Layout in Orthogonal Flows</h4>
 
-  <p>If the UA supports CSS Multi-column Layout [[!CSS3COL]], then
+  <p>
+    If the UA supports CSS Multi-column Layout [[!CSS3COL]]
+    and the element is a block container or multi-column element,
     for the case where the element's extent or available extent is
-    defined but the element's measure is ''auto'':
+    <i>definite</i> but the element's measure is ''auto'':
 
   <ol>
-    <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>available measure</i> (when definite) and the
-      <i>fallback available measure</i> as the <i>available measure</i>.
-    <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
-      columns with the element's content.
+    <li>
+      If 'column-count' and 'column-width' are both ''auto'', 
+      calculate the used 'column-width' as 
+      the inner measure for ''auto''-sized elements, as defined above.
+    <li>
+      If the columns' extent is <i>indefinite</i>, 
+      the <i>fill-available extent</i> of the element is used.
+    <li>
+      The used 'column-count' then follows from filling the resulting columns with the element's content.
   </ol>
 
-  <p>The used measure of the resulting multi-column element is then
-    calculated:
-    if the content neither wraps nor paginates within the multi-column
-    element, then the used measure is the <i>max-content measure</i>
-    of the element's contents;
-    else it is calculated from the used column width, column count,
-    and column gap.
-  <p>The used extent of the element is either the used column extent
-    (if multiple columns were used) or the <i>max-content extent</i>
-    of the content.
+  <p>
+    The used measure of the resulting multi-column element is then calculated:
+    if the content neither line-wraps nor fragments within the multi-column element,
+    then the used measure is the <i>max-content measure</i> of the element's contents;
+    else it is calculated from the used 'column-width', 'column-count', and 'column-gap'.
+
+  <p>
+    The used extent of the element is either the used column extent
+    (if multiple columns were used) 
+    or the <i>max-content extent</i> of the content.
 
   <p class="note">This should behave the same as the auto-sizing algorithm
     defined in the previous section, except overflowing content, instead of