[css2] Applied edits for issue 60

bert-github · bert-github · commit 80e8f9e3437c · 2010-07-07T12:34:06.000Z
http://wiki.csswg.org/spec/css2.1#issue-60 modified by http://www.w3.org/mid/201007071429.43371.bert@w3.org --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402988
diff --git a/css2/visuren.src b/css2/visuren.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: visuren.src,v 2.158 2010-05-12 15:27:05 bbos Exp $ -->
+<!-- $Id: visuren.src,v 2.159 2010-07-07 12:34:06 bbos Exp $ -->
 <head>
 <title>Visual formatting model</title>
 <meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -290,7 +290,7 @@ follows:
   <li>Let <var>B</var> be the first of <var>A</var>'s following <a
   href="conform.html#sibling">siblings</a> that is neither floating
   nor <a href="visuren.html#absolutely-positioned">absolutely
-  positioned nor has 'display: none'. If <var>B</var> exists and has a
+  positioned</a> nor has 'display: none'. If <var>B</var> exists and has a
   specified value for 'display' of 'block' or 'list-item' and is not
   <a href="conform.html#replaced-element">replaced,</a> then
   <var>A</var> is rendered as an 'inline' element at the start of
@@ -1876,25 +1876,28 @@ class="propinst-z-index">'z-index'</span> property</h3>
 
 <p>For a positioned box, the <span
 class="propinst-z-index">'z-index'</span> property specifies:
-</p>
+
 <ol>
-<li>The stack level of the box in the current stacking context.</li>
-<li>Whether the box establishes a local stacking context.</li>
+  <li>The stack level of the box in the current stacking context.
+
+  <li>Whether the box establishes a stacking context.
 </ol>
 
-<p>Values have the following meanings:</p>
+<p>Values have the following meanings:
 
 <dl>
-<dt><span class="index-inst" title="&lt;integer&gt;"><span
-class="value-inst-integer"><strong>&lt;integer&gt;</strong></span></span></dt>
-<dd>This integer is the stack level of the generated box
-in the current stacking context. The box 
-also establishes a local stacking context in which its stack
-level is '0'.</dd>
-<dt><strong>auto</strong></dt>
-<dd>The stack level of the generated box in the current stacking
-context is the same as its parent's box. The
-box does not establish a new local stacking context.</dd>
+  <dt><span class="index-inst" title="&lt;integer&gt;"><span
+  class="value-inst-integer"><strong>&lt;integer&gt;</strong></span></span>
+
+  <dd>This integer is the stack level of the generated box in the
+  current stacking context. The box also establishes a new stacking
+  context.
+
+  <dt><strong>auto</strong>
+
+  <dd>The stack level of the generated box in the current stacking
+  context is '0'. The box does not establish a new stacking context
+  unless it is the root element.
 </dl>
 
 <p><em>In this section, the expression "in front of" 
@@ -1914,11 +1917,12 @@ the point of view of its parent stacking context; boxes in other
 stacking contexts may not come between any of its boxes.
 </p>
 <p>Each box belongs to one <span class="index-def" title="stacking
-context"><dfn>stacking context</dfn></span>. Each box in a given
-stacking context has an integer <span class="index-def" title="stack
-level"><a name="stack-level"><dfn>stack level</dfn></a></span>, which
-is its position on the z-axis relative to other boxes in the same
-stacking context.  Boxes with greater stack levels are always formatted
+context"><dfn>stacking context</dfn></span>. Each positioned box in a
+given stacking context has an integer <span class="index-def"
+title="stack level"><a name="stack-level"><dfn>stack
+level</dfn></a></span>, which is its position on the z-axis relative
+other stack levels within the same stacking context. Boxes with
+greater stack levels are always formatted
 in front of boxes with lower stack levels.  Boxes may have negative
 stack levels.  Boxes with the same stack level in a stacking context
 are stacked back-to-front according to document tree order.
@@ -1934,33 +1938,41 @@ introduce stacking contexts, for example '<a
 href="http://www.w3.org/TR/css3-color/#transparency">opacity</a>'
 [[-CSS3COLOR]].
 </p>
-<p>
-Each stacking context consists of the following
-stacking levels (from back to front):
-</p>
+
+<p>Within each stacking context, the following layers are painted in
+back-to-front order.
+
 <ol>
-<li>the background and borders of the element forming the stacking context.</li>
-<li>the stacking contexts of descendants with negative stack
-     levels.</li>
-<li>a stacking level containing in-flow non-inline-level
-     non-positioned descendants.</li>
-<li>a stacking level for non-positioned floats and their contents.</li>
-<li>a stacking level for in-flow inline-level non-positioned descendants.</li>
-<li>a stacking level for positioned descendants with 'z-index:
-     auto', and any descendant stacking contexts with 'z-index: 0'.</li>
-<li>the stacking contexts of descendants with positive stack levels.</li>
+  <li>the background and borders of the element forming the stacking
+  context.
+
+  <li>the child stacking contexts with negative stack levels (most
+  negative first).
+
+  <li>the in-flow, non-inline-level, non-positioned descendants.
+
+  <li>the floating descendants.
+
+  <li>the in-flow, inline-level, non-positioned descendants, including
+  inline tables and inline blocks.
+
+  <li>the stacking contexts with stack level 0, and the positioned
+  descendants with 'z-index: auto'.
+
+  <li>the child stacking contexts with positive stack levels (least
+  positive first).
 </ol>
-<p>
-For a more thorough explanation of the stacking order, please see <a href="zindex.html">Appendix E</a>.
-</p>
-<p>
-The contents of inline blocks and inline tables are stacked as if
-they generated new stacking contexts, except that any positioned
-elements and any elements that
-actually create new stacking contexts take part in the parent
-stacking context. They are then painted atomically in the inline
-stacking level.
-</p>
+
+<p>Positioned elements with 'z-index: auto' (in layer&nbsp;6), floats
+(layer&nbsp;4), inline blocks (layer&nbsp;5), and inline tables
+(layer&nbsp;5), are painted as if those elements generated new
+stacking contexts, except that their positioned descendants and any
+child stacking contexts take part in the current stacking context.
+
+<p>This painting order is applied recursively to each stacking
+context. This description of stacking context painting order
+constitutes an overview of the detailed normative definition in
+<a href="zindex.html">Appendix&nbsp;E.</a>
 
 <div class="html-example">
 <p>In the following example, the stack levels of
diff --git a/css2/zindex.src b/css2/zindex.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: zindex.src,v 2.18 2008-06-25 16:20:36 bbos Exp $ -->
+<!-- $Id: zindex.src,v 2.19 2010-07-07 12:32:20 bbos Exp $ -->
 <HEAD>
 <TITLE>Elaborate description of Stacking Contexts</TITLE>
 </HEAD>
@@ -53,8 +53,9 @@ z-index:  canvas  -1	0    1	  2
     and contains the root element. Initially, the viewport is anchored
     with its top left corner at the canvas origin.
 
-    <p>The stacking order for an element generating a stacking context
-    (see the 'z-index' property) is:
+    <p>The painting order for the descendants of an element generating
+    a stacking context (see the <span
+    class="propinst-z-index">'z-index'</span> property) is:
 
     <ol class=stack>
       <li>
