w3c
diff --git a/‎css-writing-modes/Overview.bs‎
Lines changed: 35 additions & 75 deletions b/‎css-writing-modes/Overview.bs‎
Lines changed: 35 additions & 75 deletions
@@ -1911,15 +1911,14 @@ Auto-sizing in Orthogonal Flows</h4>
 Auto-sizing Block Containers in Orthogonal Flows</h4>
 
   <p>
-    If a box establishing an orthogonal flow is a block container or multi-column element,
-    for the case where the box's <i>block-size</i> or <i>available block-size</i> is
-    <i>definite</i> but the box's <i>inline-size</i> is ''auto'':
+    If a box establishing an <i>orthogonal flow</i> is a block container or multi-column element,
+    for the case where the box's <i>inline-size</i> is ''auto'':
 
   <ol>
     <li>
       If 'column-count' and 'column-width' are both ''auto'',
-      calculate the used 'column-width' as:
-      <code>min(<var>max-content</var>, max(<var>min-content</var>, min(<var>fill-available</var>, <var>fill-fallback</var>)))</code>,
+      calculate the used 'column-width' with the shrink-to-fit formula:
+      <code>min(<var>max-content</var>, max(<var>min-content</var>, <var>constraint</var>))</code>,
       where:
       <dl>
         <dt><var>min-content</var>
@@ -1928,19 +1927,39 @@ Auto-sizing Block Containers in Orthogonal Flows</h4>
         <dt><var>max-content</var>
         <dd>the <a href="http://www.w3.org/TR/css3-sizing/#max-content-measure">max-content inline-size</a> of the box
 
-        <dt><var>fill-available</var>
-        <dd>the <a href="http://www.w3.org/TR/css3-sizing/#terms">fill-available fit</a> into the box's containing block's size in the box's <i>inline axis</i>
-
-        <dt><var>fill-fallback</var>
-        <dd>the <a href="http://www.w3.org/TR/css3-sizing/#terms">fill-available fit</a> into the initial containing block's size in the box's <i>inline axis</i>
+        <dt><var>constraint</var>
+        <dd>the box’s <i>inline-axis</i> <a href="http://www.w3.org/TR/css3-sizing/#terms">fill-available fit</a>
+        into the smaller of
+        <ul>
+          <li>the box’s <i>available inline-size</i>
+          <li>the initial containing block’s <i>inline-size</i>
       </dl>
 
       <p>
         See [[!CSS3-SIZING]] for further details.
 
+      <div class="note">
+        <div class=sidefigure>
+          <img src="auto-multicol.svg" width=200
+            alt="Diagram of automatically triggered multi-column preventing T-shaped documents">
+        </div>
+        This automatically triggers multi-column flow
+        so that overflowing content, instead of continuing off the side of the containing block,
+        is wrapped into columns in the flow direction of the containing block,
+        thus avoiding T-shaped documents.
+        <br style="clear:both;">
+      </div>
+
     <li>
-      If the columns' <i>block-size</i> is <i>indefinite</i>,
-      the <i>fill-available block-size</i> of the box is used.
+      The used column <i>block-size</i> is:
+      the box’s <i>block-size</i> (if that is <i>definite</i>),
+      else the <i>fill-available block-size</i> of the box (if that is <i>definite</i>),
+      else the box’s <i>max-content block-size</i>.
+      <p class="issue">
+        Should we factor in the box’s min-content block-size here,
+        so that e.g. a large image will not overflow the box,
+        but cause the box to overflow the containing block?
+
     <li>
       The used 'column-count' then follows from filling the resulting columns with the box's content.
   </ol>
@@ -1956,18 +1975,6 @@ Auto-sizing Block Containers in Orthogonal Flows</h4>
     (if multiple columns were used)
     or the <i>max-content block-size</i> of the content.
 
-  <div class="note">
-    <div class=sidefigure>
-      <img src="auto-multicol.svg" width=200
-        alt="Diagram of automatically triggered multi-column preventing T-shaped documents">
-    </div>
-    This automatically triggers multi-column flow
-    so that overflowing content, instead of continuing off the side of the containing block,
-    is wrapped into columns in the flow direction of the containing block,
-    thus avoiding T-shaped documents.
-    <br style="clear:both;">
-  </div>
-
   <p>
     If the UA does not support CSS Multi-column Layout [[!CSS3COL]],
     the UA may instead calculate the box's <i>inline-size</i> assuming an infinite <i>block-size</i>,
@@ -2491,67 +2498,20 @@ Full-width Characters</h5>
 
 <h2 class="no-num" id="changes">Changes</h2>
   <h3 class="no-num" id="changes-201311">
-  Changes since the <a href="http://www.w3.org/TR/2013/WD-css-writing-modes-3-20131126/">November
-  2013 CSS Writing Modes Module Level 3 <abbr title="Last Call Working Draft">LCWD</abbr></a></h3>
+  Changes since the <a href="http://www.w3.org/TR/2014/CR-css-writing-modes-3-20140320/">March
   <ul>
-    <li>Changed to use boxes rather than elements where its use is more accurate or appropriate.
-    <li>Increased the maximum level of embedding to 125 to match to Unicode 6.3.
-    <li>Clarified handling of bidi control codes.
-    <li>Clarified <a href="#text-combine-compression">compression rules</a> of 'text-combine-upright'.
+    <li>Fixed orthogonal flows auto-sizing rules to better handle shrink-wrapping.
   </ul>
 
-  <h3 class="no-num" id="changes-201211">
-  Changes since the <a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/">November
-  2012 CSS Writing Modes Module Level 3 <abbr title="Working Draft">WD</abbr></a></h3>
-  <ul>
-    <li>Added back ''digits'' value of 'text-combine-upright' and tightened up rules for compressing text.
-    <li>Defined better analysis of text to be combined.
-    <li>Various fixes/clarifications to orthogonal flows.
-    <li>Updated references to UTR50 and how this specification use its values.
-  </ul>
-
-  <h3 class="no-num" id="changes-201205">
-  Changes since the <a href="http://www.w3.org/TR/2012/WD-css3-writing-modes-20120501/">May
-  2012 CSS Writing Modes Module Level 3 <abbr title="Working Draft">WD</abbr></a></h3>
-
-  <p>Major changes include:</p>
-  <ul>
-    <li>Replaced 'unicode-bidi' value of ''isolate bidi-override'' with single keyword ''isolate-override''.
-    <li>Clarified that bidi isolated content does not affect plaintext heuristics of the containing paragraph.
-    <li>Lots of other clarifications to bidi.
-    <li>Renamed ''mixed-right'' value of 'text-orientation' to ''mixed''.
-    <li>Updated references to UTR50 for orientation of characters in Unicode
-        and improved text defining vertical typesetting rules.
-    <li>Fixed errors and clarified auto-sizing rules for orthogonal flows.
-    <li>Replaced Appendix D with references to the new [[!CSS3-SIZING]] module.
-    <li>Removed 'text-combine-mode' property.
-    <li>Removed all 'text-combine-upright' values except ''none'' and ''all''.
-    <li>Defined effect of 'text-combine-upright' on line-breaking.
-  </ul>
-
-  <h3 class="no-num" id="changes-201109">
-  Changes since the <a href="http://www.w3.org/TR/2011/WD-css3-writing-modes-20110901/">September
-  2011 CSS Writing Modes Module Level 3 <abbr title="Working Draft">WD</abbr></a></h3>
-
-  <p>Major changes include:</p>
-  <ul>
-    <li>Hooked up vertical typesetting details to UTR50.
-    <li>Removed concept of "typographic modes".
-    <li>Altered <a href="#orthogonal-auto">orthogonal sizing</a>
-      to take into account the fill-available size; now the minimum of the
-      fill-available and ICB size is used to resolve ''auto'' sizes.
-    <li>Renamed ''digits'' to ''numeric'' and ''ascii-digits'' to ''digits'' for 'text-combine-upright'.
-    <li>Defined interaction of 'text-combine-upright' and 'text-transform'.
-  </ul>
-
-
 <h2 class="no-num" id="acknowledgements">
 Acknowledgements</h2>
 
 <p>John Daggett, Martin Heijdra, Laurentiu Iancu,
 Yasuo Kida, Tatsuo Kobayashi, Toshi Kobayashi,
 Ken Lunde, Nat McCully, Eric Muller,
 Paul Nelson, Kenzou Onozawa, Dwayne Robinson,
+Simon Sapin
 Michel Suignard, Taro Yamamoto, Steve Zilles</p>
 
 <h2 id="character-properties" class="no-num">Appendix A.