Use 'glyphs' rather than 'text' as a value for 'line-box-contain', and include 'glyphs' in the dl of the property values, based on discussion on www-style today between me and hyatt.

Author: dbaron

css3-linebox/Overview.html

@@ -31,11 +31,11 @@
 
    <h1 id=css3-module>CSS3 module: line</h1>
 
-   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 23 February 2008</h2>
+   <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 16 March 2011</h2>
 
    <dl>
     <dt>This version:
-     <!--<dd><a href="http://www.w3.org/TR/2008/ED-css3-linebox-20080223/">http://www.w3.org/TR/2008/ED-css3-linebox-20080223/</a></dd>-->
+     <!--<dd><a href="http://www.w3.org/TR/2011/ED-css3-linebox-20110316/">http://www.w3.org/TR/2011/ED-css3-linebox-20110316/</a></dd>-->
 
 
     <dd>[no permanent URL]
@@ -79,7 +79,7 @@ <h2 class="no-num no-toc" id=w3c-working>Editor's Draft 23 February 2008</h2>
    <!--begin-copyright-->
    <p class=copyright><a
     href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
-    rel=license>Copyright</a> &copy; 2008 <a
+    rel=license>Copyright</a> &copy; 2011 <a
     href="http://www.w3.org/"><acronym title="World Wide Web
     Consortium">W3C</acronym></a><sup>&reg;</sup> (<a
     href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute
@@ -907,8 +907,8 @@ <h4 id=LineStacking><span class=secno>3.4.2. </span>Line Stacking: the
     <tr>
      <td><em>Value:</em>
 
-     <td>[ block || inline || font || text || replaced || inline-box ] | none
-      | inherit | initial
+     <td>[ block || inline || font || glyphs || replaced || inline-box ] |
+      none | inherit | initial
 
     <tr>
      <td><em>Initial:</em>
@@ -974,6 +974,11 @@ <h4 id=LineStacking><span class=secno>3.4.2. </span>Line Stacking: the
     class=property>all-space-treatment</code>&rsquo; properties. <span
     class=issue>[LDB: This isn't quite right. What about zwnj, etc.?</span>
 
+   <dt>glyphs
+
+   <dd>The block progression dimension of all the glyph bounding boxes of
+    glyphs in the line box must fit within the line box.
+
    <dt>replaced
 
    <dd>The margin box of all <span title="replaced element"><a
@@ -1056,7 +1061,7 @@ <h4 id=LineStacking><span class=secno>3.4.2. </span>Line Stacking: the
     is not automatically restricted to replaced elements.]</span>
 
    <li>For each box that has <span class=css>&lsquo;<code
-    class=property>text</code>&rsquo;</span> in <span
+    class=property>glyphs</code>&rsquo;</span> in <span
     class=property>&lsquo;<a href="#line-box-contain"><code
     class=property>line-box-contain</code></a>&rsquo;</span>, the top of the
     line box must be at least as high as the top of each glyph in the box
@@ -4182,8 +4187,8 @@ <h2 id=properties><span class=secno>6. </span>Properties index</h2>
     <tr valign=baseline>
      <td><a class=property href="#line-box-contain">line-box-contain</a>
 
-     <td>[ block || inline || font || text || replaced || inline-box ] | none
-      | inherit | initial
+     <td>[ block || inline || font || glyphs || replaced || inline-box ] |
+      none | inherit | initial
 
      <td>block inline replaced
 

css3-linebox/Overview.src.html

@@ -566,7 +566,7 @@ <h4 id="LineStacking">Line Stacking: the
 <tr>
 <td><em>Value:</em>
 
-<td>[ block || inline || font || text || replaced || inline-box ] | none |
+<td>[ block || inline || font || glyphs || replaced || inline-box ] | none |
 inherit | initial
 
 <tr>
@@ -625,6 +625,11 @@ <h4 id="LineStacking">Line Stacking: the
 class="issue">[LDB: This isn't quite right.  What about zwnj,
 etc.?</span>
 
+<dt>glyphs
+
+<dd>The block progression dimension of all the glyph bounding boxes of
+glyphs  in the line box must fit within the line box.</dd>
+
 <dt>replaced
 
 <dd>The margin box of all <span title="replaced element"><a
@@ -691,7 +696,7 @@ <h4 id="LineStacking">Line Stacking: the
 does the job, except that it is not automatically restricted to replaced
 elements.]</span>
 
-<li>For each box that has <span class="css">'text'</span> in <span
+<li>For each box that has <span class="css">'glyphs'</span> in <span
 class="property">'line-box-contain'</span>,
 the top of the line box must be at least as high as the top of each glyph in
 the box (excluding those in child elements). The bottom of the line box must