Mercurial > drafts / changeset

     1.1 --- a/css3-flexbox/Overview.html	Fri Sep 14 16:23:23 2012 -0700
     1.2 +++ b/css3-flexbox/Overview.html	Fri Sep 14 19:15:38 2012 -0700
     1.3 @@ -2041,7 +2041,7 @@
     1.4       <a href="#flex-components">longhand</a> and specifies the <dfn
     1.5       id=flex-basis>flex basis</dfn>: the initial <a href="#main-size"><i>main
     1.6       size</i></a> of the <a href="#flex-item"><i>flex item</i></a>, before
     1.7 -     free space is distributed according to the flex ratios. When omitted
     1.8 +     free space is distributed according to the flex factors. When omitted
     1.9       from the ‘<a href="#flex"><code class=property>flex</code></a>’
    1.10       shorthand, its specified value is the length zero.
    1.11  
    1.12 @@ -2055,7 +2055,7 @@
    1.13       src="images/rel-vs-abs-flex.svg" width=504> <figcaption> A diagram
    1.14       showing the difference between "absolute" flex (starting from a basis of
    1.15       zero) and "relative" flex (starting from a basis of the item's content
    1.16 -     size). The three items have flex ratios of ‘<code
    1.17 +     size). The three items have flex factors of ‘<code
    1.18       class=css>1</code>’, ‘<code class=css>1</code>’, and ‘<code
    1.19       class=css>2</code>’, respectively. </figcaption> </figure>
    1.20  
    1.21 @@ -2083,7 +2083,7 @@
    1.22    <p> A unitless zero that is not already preceded by two flex factors must
    1.23     be interpreted as a flex factor. To avoid misinterpretation or invalid
    1.24     declarations, authors must specify a zero <var>&lt;flex-basis></var>
    1.25 -   component with a unit or precede it by both flex ratios.
    1.26 +   component with a unit or precede it by two flex factors.
    1.27  
    1.28    <h3 id=flex-common><span class=secno>7.2. </span> Common Values of ‘<a
    1.29     href="#flex"><code class=property>flex</code></a>’</h3>
    1.30 @@ -2139,7 +2139,7 @@
    1.31      href="#flex-basis"><i>flex basis</i></a> to zero, resulting in an item
    1.32      that receives the specified proportion of the free space in the flex
    1.33      container. If all items in the flex container use this pattern, their
    1.34 -    sizes will be proportional to the specified flex ratio.
    1.35 +    sizes will be proportional to the specified flex factor.
    1.36    </dl>
    1.37  
    1.38    <p> By default, flex items won't shrink below their minimum content size
    1.39 @@ -3372,7 +3372,7 @@
    1.40    <p> To resolve the flexible lengths of the items within a flex line:
    1.41  
    1.42    <ol>
    1.43 -   <li> <strong>Determine the used flex ratio.</strong> Sum the outer <a
    1.44 +   <li> <strong>Determine the used flex factor.</strong> Sum the outer <a
    1.45      href="#hypothetical-main-size"><i>hypothetical main sizes</i></a> of all
    1.46      items on the line. If the sum is less than the flex container's inner
    1.47      main size, use the <a href="#flex-grow-factor"><i>flex grow
    1.48 @@ -3380,11 +3380,11 @@
    1.49      href="#flex-shrink-factor"><i>flex shrink factor</i></a>.
    1.50  
    1.51     <li> <strong>Size inflexible items.</strong> For any items that have a
    1.52 -    flex ratio of zero, set their used main size to their <a
    1.53 +    flex factor of zero, set their used main size to their <a
    1.54      href="#hypothetical-main-size"><i>hypothetical main size</i></a>.
    1.55  
    1.56     <li> <strong>Check that you can distribute any space.</strong> If all the
    1.57 -    flex items on the line are either frozen or have a flex ratio of zero,
    1.58 +    flex items on the line are either frozen or have a flex factor of zero,
    1.59      exit the algorithm.
    1.60  
    1.61     <li> <strong>Calculate free space.</strong> Sum the outer <a
    1.62 @@ -3393,12 +3393,12 @@
    1.63      is the free space.
    1.64  
    1.65     <li> <strong>Distribute free space proportional to the flex
    1.66 -    ratios.</strong> If the sign of the free space is positive and the
    1.67 +    factors.</strong> If the sign of the free space is positive and the
    1.68      algorithm is using the <a href="#flex-grow-factor"><i>flex grow
    1.69      factor</i></a>, or if the sign of the free space is negative and the
    1.70      algorithm is using the <a href="#flex-shrink-factor"><i>flex shrink
    1.71      factor</i></a>, distribute the free space to each flexible item's main
    1.72 -    size in proportion to the item's flex ratio:
    1.73 +    size in proportion to the item's flex factor:
    1.74      <dl>
    1.75       <dt>If the free space is positive
    1.76  
    1.77 @@ -3414,11 +3414,12 @@
    1.78       <dd> For every item on the line, multiply its <a
    1.79        href="#flex-shrink-factor"><i>flex shrink factor</i></a> by its outer
    1.80        <a href="#flex-base-size"><i>flex base size</i></a>, and note this as
    1.81 -      its <dfn id=flex-shrink-ratio>flex shrink ratio</dfn>. Find the ratio
    1.82 -      of the item's <a href="#flex-shrink-ratio"><i>flex shrink ratio</i></a>
    1.83 -      to the sum of the <a href="#flex-shrink-ratio"><i>flex shrink
    1.84 -      ratios</i></a> of all items on the line. Set the item's main size to
    1.85 -      its <a href="#flex-base-size"><i>flex base size</i></a> minus a
    1.86 +      its <dfn id=scaled-flex-shrink-factor>scaled flex shrink factor</dfn>.
    1.87 +      Find the ratio of the item's <a
    1.88 +      href="#scaled-flex-shrink-factor"><i>scaled flex shrink factor</i></a>
    1.89 +      to the sum of the <a href="#scaled-flex-shrink-factor"><i>scaled flex
    1.90 +      shrink factors</i></a> of all items on the line. Set the item's main
    1.91 +      size to its <a href="#flex-base-size"><i>flex base size</i></a> minus a
    1.92        fraction of the absolute value of the free space proportional to the
    1.93        ratio. <span class=note>Note this may result in a negative inner main
    1.94        size; it will be corrected in the next step.</span>
    1.95 @@ -4390,9 +4391,6 @@
    1.96     <li>flex shrink factor, <a href="#flex-shrink-factor"
    1.97      title="flex shrink factor"><strong>7.1.</strong></a>
    1.98  
    1.99 -   <li>flex shrink ratio, <a href="#flex-shrink-ratio"
   1.100 -    title="flex shrink ratio"><strong>9.7.</strong></a>
   1.101 -
   1.102     <li>‘<a href="#align-content-flex-start"><code
   1.103      class=css>flex-start</code></a>’, <a href="#align-content-flex-start"
   1.104      title="''flex-start''"><strong>8.4.</strong></a>, <a
   1.105 @@ -4473,6 +4471,9 @@
   1.106      class=css>row-reverse</code></a>’, <a href="#flex-flow-row-reverse"
   1.107      title="''row-reverse''"><strong>5.1.</strong></a>
   1.108  
   1.109 +   <li>scaled flex shrink factor, <a href="#scaled-flex-shrink-factor"
   1.110 +    title="scaled flex shrink factor"><strong>9.7.</strong></a>
   1.111 +
   1.112     <li>single-line, <a href="#single-line"
   1.113      title=single-line><strong>6.</strong></a>
   1.114  

     2.1 --- a/css3-flexbox/Overview.src.html	Fri Sep 14 16:23:23 2012 -0700
     2.2 +++ b/css3-flexbox/Overview.src.html	Fri Sep 14 19:15:38 2012 -0700
     2.3 @@ -1522,7 +1522,7 @@
     2.4  				sets the 'flex-basis' <a href="#flex-components">longhand</a>
     2.5  				and specifies the <dfn>flex basis</dfn>:
     2.6  				the initial <i>main size</i> of the <i>flex item</i>,
     2.7 -				before free space is distributed according to the flex ratios.
     2.8 +				before free space is distributed according to the flex factors.
     2.9  				When omitted from the 'flex' shorthand, its specified value is the length zero. 
    2.10  			<p>
    2.11  				If the specified 'flex-basis' is <a href="#flex-basis-auto">''auto''</a>,
    2.12 @@ -1535,7 +1535,7 @@
    2.13  					(starting from a basis of zero)
    2.14  					and "relative" flex
    2.15  					(starting from a basis of the item's content size).
    2.16 -					The three items have flex ratios of ''1'', ''1'', and ''2'', respectively.
    2.17 +					The three items have flex factors of ''1'', ''1'', and ''2'', respectively.
    2.18  				</figcaption>
    2.19  			</figure>
    2.20  
    2.21 @@ -1556,7 +1556,7 @@
    2.22  		must be interpreted as a flex factor.
    2.23  		To avoid misinterpretation or invalid declarations,
    2.24  		authors must specify a zero <var>&lt;flex-basis></var> component
    2.25 -		with a unit or precede it by both flex ratios.
    2.26 +		with a unit or precede it by two flex factors.
    2.27  
    2.28  <h3 id='flex-common'>
    2.29  Common Values of 'flex'</h3>
    2.30 @@ -1602,7 +1602,7 @@
    2.31  			Makes the flex item flexible and sets the <i>flex basis</i> to zero,
    2.32  			resulting in an item that receives the specified proportion of the free space in the flex container.
    2.33  			If all items in the flex container use this pattern,
    2.34 -			their sizes will be proportional to the specified flex ratio.
    2.35 +			their sizes will be proportional to the specified flex factor.
    2.36  	</dl>
    2.37  
    2.38  	<p>
    2.39 @@ -2670,7 +2670,7 @@
    2.40  
    2.41  	<ol>
    2.42  		<li>
    2.43 -			<strong>Determine the used flex ratio.</strong>
    2.44 +			<strong>Determine the used flex factor.</strong>
    2.45  			Sum the outer <i>hypothetical main sizes</i> of all items on the line.
    2.46  			If the sum is less than the flex container's inner main size,
    2.47  			use the <i>flex grow factor</i> for the rest of this algorithm;
    2.48 @@ -2678,14 +2678,14 @@
    2.49  
    2.50  		<li>
    2.51  			<strong>Size inflexible items.</strong>
    2.52 -			For any items that have a flex ratio of zero,
    2.53 +			For any items that have a flex factor of zero,
    2.54  			set their used main size
    2.55  			to their <i>hypothetical main size</i>.
    2.56  
    2.57  		<li>
    2.58  			<strong>Check that you can distribute any space.</strong>
    2.59  			If all the flex items on the line are either frozen
    2.60 -			or have a flex ratio of zero,
    2.61 +			or have a flex factor of zero,
    2.62  			exit the algorithm.
    2.63  
    2.64  		<li>
    2.65 @@ -2695,11 +2695,11 @@
    2.66  			This is the free space.
    2.67  
    2.68  		<li>
    2.69 -			<strong>Distribute free space proportional to the flex ratios.</strong>
    2.70 +			<strong>Distribute free space proportional to the flex factors.</strong>
    2.71  			If the sign of the free space is positive and the algorithm is using the <i>flex grow factor</i>,
    2.72  			or if the sign of the free space is negative and the algorithm is using the <i>flex shrink factor</i>,
    2.73  			distribute the free space to each flexible item's main size 
    2.74 -			in proportion to the item's flex ratio:
    2.75 +			in proportion to the item's flex factor:
    2.76  
    2.77  			<dl>
    2.78  				<dt>If the free space is positive</dt>
    2.79 @@ -2716,9 +2716,9 @@
    2.80  					For every item on the line,
    2.81  					multiply its <i>flex shrink factor</i>
    2.82  					by its outer <i>flex base size</i>,
    2.83 -					and note this as its <dfn>flex shrink ratio</dfn>.
    2.84 -					Find the ratio of the item's <i>flex shrink ratio</i>
    2.85 -					to the sum of the <i>flex shrink ratios</i> of all items on the line.
    2.86 +					and note this as its <dfn>scaled flex shrink factor</dfn>.
    2.87 +					Find the ratio of the item's <i>scaled flex shrink factor</i>
    2.88 +					to the sum of the <i>scaled flex shrink factors</i> of all items on the line.
    2.89  					Set the item's main size
    2.90  					to its <i>flex base size</i>
    2.91  					minus a fraction of the absolute value of the free space