[css-sizing] Change 'fill-available' to 'fill'.

Author: tabatkins

css-sizing/Overview.html

@@ -384,10 +384,9 @@ <h2 id=terms><span class=secno>2. </span> Terminology</h2>
 
    <dd> If the <a href="#available"><i>available</i></a> measure is finite,
     equal to <code>min(<a href="#max-content"><i>max-content</i></a>, max(<a
-    href="#min-content"><i>min-content</i></a>, <a
-    href="#fill-available"><i>fill-available</i></a>))</code>. Otherwise,
-    equal to the <a href="#max-content-measure"><i>max-content
-    measure</i></a>.
+    href="#min-content"><i>min-content</i></a>,
+    <i>fill-available</i>))</code>. Otherwise, equal to the <a
+    href="#max-content-measure"><i>max-content measure</i></a>.
     <p class=note> Note: This is called the <i>shrink-to-fit</i> width in <a
      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">CSS
@@ -461,11 +460,7 @@ <h3 id=width-height-keywords><span class=secno>3.1. </span> New Keywords
     <tr>
      <th>New Values:
 
-     <td>‘<a href="#fill-available"><code
-      class=css>fill-available</code></a>’ | ‘<a
-      href="#max-content"><code class=css>max-content</code></a>’ | ‘<a
-      href="#min-content"><code class=css>min-content</code></a>’ | ‘<a
-      href="#fit-content"><code class=css>fit-content</code></a>’
+     <td>fill | max-content | min-content | fit-content
 
     <tr>
      <th>Initial:
@@ -511,8 +506,7 @@ <h3 id=width-height-keywords><span class=secno>3.1. </span> New Keywords
    above):
 
   <dl>
-   <dt><dfn id=fill-available>‘<code
-    class=css>fill-available</code>’</dfn>
+   <dt><dfn id=fill>‘<code class=css>fill</code>’</dfn>
 
    <dd> Use the <a href="#fill-available-measure"><i>fill-available
     measure</i></a> or <a href="#fill-available-extent"><i>fill-available
@@ -548,9 +542,9 @@ <h3 id=width-height-keywords><span class=secno>3.1. </span> New Keywords
     <p class=issue> Does this value work? Is it needed?
   </dl>
 
-  <p class=issue> Right now all of these except ‘<a
-   href="#fill-available"><code class=css>fill-available</code></a>’ mean
-   the same thing for extents. This may or may not be ideal.
+  <p class=issue> Right now all of these except ‘<a href="#fill"><code
+   class=css>fill</code></a>’ mean the same thing for extents. This may or
+   may not be ideal.
 
   <p class=issue> If the measure is ‘<code class=css>auto</code>’, we
    could have min-content extent imply a max-content measure, and vice versa.
@@ -645,11 +639,7 @@ <h3 id=column-sizing><span class=secno>3.3. </span> Column Sizing Keywords</h3>
     <tr>
      <th>New Values:
 
-     <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="#fill-available"><code
-      class=css>fill-available</code></a>’ | ‘<a
-      href="#fit-content"><code class=css>fit-content</code></a>’
+     <td>fill | max-content | min-content | fit-content
 
     <tr>
      <th>Initial:
@@ -694,31 +684,30 @@ <h3 id=column-sizing><span class=secno>3.3. </span> Column Sizing Keywords</h3>
    optimal column width:
 
   <dl>
-   <dt>‘<a href="#min-content"><code class=css>min-content</code></a>’
+   <dt>‘<a href="#fill"><code class=css>fill</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.
+    href="#fill-available-measure"><i>fill-available measure</i></a> of the
+    multi-column element.
 
    <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>’
+   <dt>‘<a href="#min-content"><code class=css>min-content</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.
+    href="#min-content-measure"><i>min-content measure</i></a> of the
+    multi-column element's contents.
 
    <dt>‘<a href="#fit-content"><code class=css>fit-content</code></a>’
 
    <dd>Specifies the optimal column width as <code>min(<a
     href="#max-content"><i>max-content</i></a>, max(<a
-    href="#min-content"><i>min-content</i></a>, <a
-    href="#fill-available"><i>fill-available</i></a>))</code>.
+    href="#min-content"><i>min-content</i></a>,
+    <i>fill-available</i>))</code>.
   </dl>
 
   <h2 id=intrinsic-sizing><span class=secno>4. </span> Intrinsic Size
@@ -782,10 +771,10 @@ <h3 id=block-intrinsic><span class=secno>4.3. </span> Intrinsic Sizes of
    contribution</i> is that size plus any inline-axis margin, border, and
    padding. Otherwise, if the computed measure of the block is ‘<a
    href="#fit-content"><code class=css>fit-content</code></a>’, ‘<code
-   class=css>auto</code>’, or ‘<a href="#fill-available"><code
-   class=css>fill-available</code></a>’, its <i>min-measure
-   contribution</i> is its <a href="#min-content-measure"><i>min-content
-   measure</i></a> plus any inline-axis margin, border, and padding.
+   class=css>auto</code>’, or ‘<a href="#fill"><code
+   class=css>fill</code></a>’, its <i>min-measure contribution</i> is its
+   <a href="#min-content-measure"><i>min-content measure</i></a> plus any
+   inline-axis margin, border, and padding.
 
   <p> If the computed measure of a <i>block-level box</i> is ‘<a
    href="#min-content"><code class=css>min-content</code></a>’, ‘<a
@@ -794,10 +783,10 @@ <h3 id=block-intrinsic><span class=secno>4.3. </span> Intrinsic Sizes of
    contribution</i> is that size plus any inline-axis margin, border, and
    padding. Otherwise, if the computed measure of the block is ‘<a
    href="#fit-content"><code class=css>fit-content</code></a>’, ‘<code
-   class=css>auto</code>’, or ‘<a href="#fill-available"><code
-   class=css>fill-available</code></a>’, its <i>max-measure
-   contribution</i> is its <a href="#max-content-measure"><i>max-content
-   measure</i></a> plus any inline-axis margin, border, and padding.
+   class=css>auto</code>’, or ‘<a href="#fill"><code
+   class=css>fill</code></a>’, its <i>max-measure contribution</i> is its
+   <a href="#max-content-measure"><i>max-content measure</i></a> plus any
+   inline-axis margin, border, and padding.
 
   <p> The <a href="#min-content-extent"><i>min-content extent</i></a> and <a
    href="#max-content-extent"><i>max-content extent</i></a> of a <i>block
@@ -902,10 +891,9 @@ <h2 id=extrinsic-sizing><span class=secno>5. </span> Extrinsic Size
     its containing block, else
 
    <li> <code>max(<i>min-measure</i>|0, min(<i>max-measure</i>|infinity,
-    <i>measure</i>|<a
-    href="#fill-available"><i>fill-available</i></a>))</code> where the sizes
-    are inner measures of the element establishing the box's <i>containing
-    block</i>, and where the first value is used if it is <a
+    <i>measure</i>|<i>fill-available</i>))</code> where the sizes are inner
+    measures of the element establishing the box's <i>containing block</i>,
+    and where the first value is used if it is <a
     href="#definite"><i>definite</i></a> and the second value otherwise.
   </ul>
 
@@ -1248,7 +1236,7 @@ <h2 class=no-num id=index> Index</h2>
    <li>fallback size, <a href="#fallback-size"
     title="section 2."><strong>2.</strong></a>
 
-   <li>‘<code class=css>fill-available</code>’, <a href="#fill-available"
+   <li>‘<code class=css>fill</code>’, <a href="#fill"
     title="section 3.1."><strong>3.1.</strong></a>
 
    <li>fill-available extent, <a href="#fill-available-extent"

css-sizing/Overview.src.html

@@ -258,7 +258,7 @@ <h3 id='width-height-keywords'>
 			<td>'width', 'min-width', 'max-width', 'height', 'min-height', 'max-height'
 		<tr>
 			<th>New Values:
-			<td>''fill-available'' | ''max-content'' | ''min-content'' | ''fit-content''
+			<td>fill | max-content | min-content | fit-content
 		<tr>
 			<th>Initial:
 			<td>as defined in [[!CSS21]] and [[!CSS3-FLEXBOX]]
@@ -284,7 +284,7 @@ <h3 id='width-height-keywords'>
 		defined above):
 
 	<dl>
-		<dt><dfn>''fill-available''</dfn>
+		<dt><dfn>''fill''</dfn>
 		<dd>
 			Use the <i>fill-available measure</i> or <i>fill-available extent</i>,
 			as appropriate to the writing mode.
@@ -319,7 +319,7 @@ <h3 id='width-height-keywords'>
 	</dl>
 
 	<p class="issue">
-		Right now all of these except ''fill-available'' mean the same thing
+		Right now all of these except ''fill'' mean the same thing
 		for extents. This may or may not be ideal.
 
 	<p class='issue'>
@@ -384,7 +384,7 @@ <h3 id='column-sizing'>
 			</tr>
 			<tr>
 				<th>New Values:
-				<td>''min-content'' | ''max-content'' | ''fill-available'' | ''fit-content''
+				<td>fill | max-content | min-content | fit-content
 			</tr>
 			<tr>
 				<th>Initial:
@@ -417,17 +417,17 @@ <h3 id='column-sizing'>
 		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>''fill''
+		<dd>Specifies the optimal column width as the <i>fill-available measure</i>
+			of the multi-column element.
 
 		<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>''min-content''
+		<dd>Specifies the optimal column width as the <i>min-content measure</i>
+			of the multi-column element's contents.
 
 		<dt>''fit-content''
 		<dd>Specifies the optimal column width as
@@ -499,7 +499,7 @@ <h3 id='block-intrinsic'>
 		its <i>min-measure contribution</i>
 		is that size
 		plus any inline-axis margin, border, and padding.
-		Otherwise, if the computed measure of the block is ''fit-content'', ''auto'', or ''fill-available'',
+		Otherwise, if the computed measure of the block is ''fit-content'', ''auto'', or ''fill'',
 		its <i>min-measure contribution</i>
 		is its <i>min-content measure</i>
 		plus any inline-axis margin, border, and padding.
@@ -510,7 +510,7 @@ <h3 id='block-intrinsic'>
 		its <i>max-measure contribution</i>
 		is that size
 		plus any inline-axis margin, border, and padding.
-		Otherwise, if the computed measure of the block is ''fit-content'', ''auto'', or ''fill-available'',
+		Otherwise, if the computed measure of the block is ''fit-content'', ''auto'', or ''fill'',
 		its <i>max-measure contribution</i>
 		is its <i>max-content measure</i>
 		plus any inline-axis margin, border, and padding.