[css2] Make line-height match implementations for values other than normal

Closes w3c#1801

Author: frivoal

css2/visudet.html

@@ -1419,20 +1419,21 @@ <h3>10.8.1 <a name="leading">Leading and half-leading</a></h3>
 href="#strut">strut</a> (an invisible glyph of zero width) with the
 <var>A</var> and <var>D</var> of the element's first available font.
 
-<p>Still for each glyph, determine the leading <var>L</var> to add,
+<p>When the value of the <a href="" class="noxref"><span class="propinst-line-heigh">'line-height'</span></a> property
+is something other than 'normal',
+determine the leading <var>L</var> to add,
 where <var>L</var> = <a href="visudet.html#propdef-line-height" class="noxref"><span
-class="propinst-line-height">'line-height'</span></a> - <var>AD</var>. Half
-the leading is added above <var>A</var> and the other half below
-<var>D</var>, giving the glyph and its leading a total height above
+class="propinst-line-height">'line-height'</span></a> - <var>AD</var> of the first available font.
+Half the leading is added above <var>A</var> and the other half below
+<var>D</var>, giving a total height above
 the baseline of <var>A'</var> = <var>A</var> + <var>L</var>/2 and a
 total depth of <var>D'</var> = <var>D</var> + <var>L</var>/2.
+Glyphs from fonts other than the first available font
+do not impact the height or baseline of the inline box.
 
 <p class=note><strong>Note.</strong> <var>L</var> may be negative.
 
-<p id="inline-box-height">The height of the inline box encloses all
-glyphs and their half-leading on each side and is thus exactly
-'line-height'. Boxes of
-child elements do not influence this height.
+<p id="inline-box-height">Boxes of child elements do not influence this height.
 
 <p>Although margins, borders, and padding of non-replaced elements do
 not enter into the line box calculation, they are still rendered

css2/visudet.src

@@ -1323,20 +1323,21 @@ contains no glyphs at all, it is considered to contain a <a
 href="#strut">strut</a> (an invisible glyph of zero width) with the
 <var>A</var> and <var>D</var> of the element's first available font.
 
-<p>Still for each glyph, determine the leading <var>L</var> to add,
+<p>When the value of the <span class="propinst-line-heigh">'line-height'</span> property
+is something other than 'normal',
+determine the leading <var>L</var> to add,
 where <var>L</var> = <span
-class="propinst-line-height">'line-height'</span> - <var>AD</var>. Half
-the leading is added above <var>A</var> and the other half below
-<var>D</var>, giving the glyph and its leading a total height above
+class="propinst-line-height">'line-height'</span> - <var>AD</var> of the first available font.
+Half the leading is added above <var>A</var> and the other half below
+<var>D</var>, giving a total height above
 the baseline of <var>A'</var> = <var>A</var> + <var>L</var>/2 and a
 total depth of <var>D'</var> = <var>D</var> + <var>L</var>/2.
+Glyphs from fonts other than the first available font
+do not impact the height or baseline of the inline box.
 
 <p class=note><strong>Note.</strong> <var>L</var> may be negative.
 
-<p id="inline-box-height">The height of the inline box encloses all
-glyphs and their half-leading on each side and is thus exactly
-'line-height'. Boxes of
-child elements do not influence this height.
+<p id="inline-box-height">Boxes of child elements do not influence this height.
 
 <p>Although margins, borders, and padding of non-replaced elements do
 not enter into the line box calculation, they are still rendered