All but the actual rewrite of 3.5, I think. (date: 2003/03/18 03:38:22)

Author: dbaron

css3-linebox/Overview.src.html

@@ -148,8 +148,7 @@ <h2 class="no-num no-toc" id="Contents">Contents</h2>
 adjustment: the 'line-height' property</a>
 
 <li><a href="#LineStacking"><span class="secno">3.5. </span>Line Stacking: 
-the 'line-box-contain', 'line-stacking-ruby', 'line-stacking-shift' 
-properties, and the 'line-stacking' shorthand property</a>
+the 'line-box-contain' property</a>
 </ul>
 
 <li><a href="#baseline">
@@ -365,7 +364,7 @@ <h3 id="LineBoxWrapping"><span class="secno">3.2. </span>Line Box wrapping</h3>
 containing block), they may vary if available inline-progression space
 is reduced due to <!-- a href="#floats"-->
 floats<!--/a-->. Line boxes in the same inline formatting context may vary in 
-block-progression dimension or not, depending on the line stacking strategy.</p>
+block-progression dimension.</p>
 <p>When the total inline-progression dimension of the inline boxes on a line is less than the 
 inline-progression dimension of 
 the line box containing them, their inline-progression distribution within the line box 
@@ -549,36 +548,34 @@ <h3 id="InlineBoxHeight"><span class="secno">3.4. </span>Line height adjustment:
 </p>
 
 <p>The <span class="index-def" title="leading"><em><a name="x15">leading</a></em></span><span title="leading"> 
-for an inline element 
+for an inline non-replaced element 
 is defined as the d</span>ifference between the block-progression dimension as 
 determined by the 'text-height' property and the computed value 
 of
 <a class="noxref" href="http://www.w3.org/TR/REC-CSS2/visudet.html#propdef-line-height">
 <span class="propinst-line-height">'line-height'</span></a>. Half the leading is 
 called the <span class="index-def" title="half-leading"><em><a name="x16">
-half-leading</a></em></span><span title="half-leading">, each half-leading is 
+half-leading</a></em></span>, each half-leading is 
 located before and after the block-progression dimension of the element. 
-Depending on the value of the 'line-stacking-strategy', the 'line-height' value 
-will specify the </span> <em>exact</em> extended block-progression dimension of each box 
-generated by the element or be ignored. (Except for inline
+The 'line-height' value 
+will specify the <em>exact</em> extended block-progression dimension of each box 
+generated by the element.
+(Depending on the value of 'line-box-contain', the extended block-progression dimension may be ignored.)
+(For inline
 <a href="http://www.w3.org/TR/REC-CSS2/conform.html#replaced-element">replaced</a> 
-elements, where both the block-progression dimension and the extended 
-block-progression dimension of the box is given by the
-<span class="propinst-height">outer edges (i.e. margin edge).)</span> When the line-height value is ignored for an inline 
-element, the extended block-progression dimension is identical to the 
-block-progression dimension. Anonymous inline boxes use the 'text-height' and 
+elements, both the block-progression dimension and the extended 
+block-progression dimension of the box are given by the
+outer edges (i.e. margin edge).)
+Anonymous inline boxes use the 'text-height' and 
 'line-height' property values specified for their parent.</p>
 <p>Depending on the 
 value of the 'line-stacking-strategy', the 'line-height' value may provide a 
 minimum or exact extended block-progression dimension for each generated inline box and 
 the line boxes. How the leading space is distributed between the before-edge and 
 the after-edge of inline elements within the line box depends on their 
-vertical-align property value.</p>
-<p>When applicable, the <b>minimum extended block-progression dimension</b> consists of a minimum 
-ascent above the block's baseline and a 
-minimum descent below it, exactly as if each line box starts with a zero-width 
-(relative) inline box with the blocks' font and line height properties (what T<sub>E</sub>X calls a 
-'strut').</p>
+vertical-align property value.
+<span class="issue">[LDB: I don't understand this paragraph.]</span>
+</p>
 <p>Empty inline elements generate empty inline boxes, but these boxes still have 
 a line height, and thus may influence the line box block-progression dimension, 
 as if the empty box contained an infinitely narrow letter.</p>
@@ -660,11 +657,10 @@ <h3 id="InlineBoxHeight"><span class="secno">3.4. </span>Line height adjustment:
   computed value</a> of the property is this percentage multiplied by the 
   element's computed font size. Negative values are illegal.</dd>
   <dt>none</dt>
-  <dd>The element does not influence the <i>extended block-progression dimension</i> 
-  of the line. The computed value is the specified value ('none'). When set on a 
-  block element where the <a href="#stack-height">stack-height</a> computation 
-  is only based on the value or a multiple of the value of the 'line-height' 
-  property, the 'none' value is ignored and 'normal' is used instead.</dd>
+  <dd>For inline-level elements, the element does not influence the <i>extended
+  block-progression dimension</i> of the line. The computed value is the
+  specified value ('none').  For block-level elements, equivalent to 'normal'
+  (and the computed value is 'normal').</dd>
 </dl>
 <div class="example">
   <p style="DISPLAY: none">Example(s):</p>
@@ -686,10 +682,10 @@ <h3 id="InlineBoxHeight"><span class="secno">3.4. </span>Line height adjustment:
 <a class="noxref" href="http://www.w3.org/TR/REC-CSS2/visudet.html#propdef-line-height">
 <span class="propinst-line-height">'line-height'</span></a> property, even if 
 they are not used directly to determine the extended block-progression dimension of the box: 'em' and 'ex' 
-values are relative to values of 'font-size and percentage values for
+values are relative to values of 'font-size' and percentage values for
 <a class="noxref" href="http://www.w3.org/TR/REC-CSS2/visudet.html#propdef-vertical-align">
 <span class="propinst-vertical-align">'vertical-align'</span></a> are relative 
-to values of the extended block-progression dimension.</p>
+to values of the extended block-progression dimension.  <span class="issue">[LDB: The second part of this sentence is a significant change from CSS2, and also doesn't mauke senes in the context of the sentence.]</span></p>
 
 <p>When the
 <a class="noxref" href="http://www.w3.org/TR/REC-CSS2/visudet.html#propdef-line-height">
@@ -698,14 +694,8 @@ <h3 id="InlineBoxHeight"><span class="secno">3.4. </span>Line height adjustment:
 the rendered glyphs will &quot;bleed&quot; outside the box. If such a box touches the edge 
 of a line box, the rendered glyphs will also &quot;bleed&quot; into the adjacent line box.</p>
 
-<p class="note">Editors' note: The effect of 'line-height: none' on block-level 
-elements needs to be specified (for all the values of 'line-stacking-strategy').</p>
-
 <h3 id="LineStacking"><span class="secno">3.5. </span>Line Stacking: the
- <span class="property"><a href="#line-stacking-strategy">'line-stacking-strategy'</a></span>,
- <span class="property"><a href="#line-stacking-ruby">'line-stacking-ruby'</a></span>, 
- <span class="property"><a href="#line-stacking-shift">'line-stacking-shift'</a></span> properties, and the
- <span class="property"><a href="#line-stacking">'line-stacking'</a></span> shorthand property</h3>
+ <span class="property"><a href="#line-box-contain">'line-box-contain'</a></span> property</h3>
 
 
 <p>Line stacking is the mechanism by which a line box is determined for each