[css2] Edits to bring up-to-date with visuren and visudet, uniform value description lists

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40644

Author: ianbjacobs

css2/generate.src

@@ -11,19 +11,25 @@
 <h1 align="center">
 <a name="generated-text">Generated content and automatic numbering</a></h1>
 
-<p>[Note: no system for automatic numbering has been agreed upon yet]
-
-<p>For a readable display of a document, it may sometimes be necessary
-for the user agent to render text or images that are not part of the
-source document. For example, the user agent may insert the word
+<p>In some cases, authors may want user agents to display content
+that does not come from the <a href="conform.html#doctree">document
+tree</a>. One familiar example of this is a numbered list; the author
+does not want to list the numbers explicitly, he or she wants the
+user agent to generate them automatically. Similarly, authors
+may want the user agent to insert the word
 "Figure" before the caption of a figure, or "Chapter 7" before the
 seventh chapter title. For audio or braille in particular, user agents
 should be able to insert these strings.
 
-<p>The inserted content can consist of fixed strings (e.g., "Figure"),
-fixed images (such as an icon: <img id="caution-img" src="images/caution.gif"
-alt="caution icon">), or counters that automatically
-increment. Combinations are also possible ("Chapter 7").
+<p>In CSS2, inserted content can consist of combinations
+of the following:</p>
+
+<ul>
+<li>fixed strings (e.g., "Figure"),</li>
+<li>fixed images (such as an icon: <img id="caution-img"
+src="images/caution.gif" alt="caution icon">),</li>
+<li>counters that are automatically incremented.</li>
+</ul>
 
 <P>Below we describe the mechanisms CSS2 offers
 for specifying generated content.
@@ -42,8 +48,8 @@ inheritable properties from the element to which they are
 attached.</p>
 
 <div class=example>
-<p>For example, the following style rule inserts a quote before and
-after every Q element. The color of the quote will be red, but the
+<p>For example, the following rule inserts a double quote mark 
+before and after every Q element. The color of the quote will be red, but the
 font will be the same as the font of the rest of the Q element:</p>
 
 <pre>
@@ -54,18 +60,17 @@ Q:before, Q:after {
 </pre>
 </div>
 
-<p>Non-inherited properties have their <a
-href="cascade.html#initial-value">initial value</a>, except for the
-<span class="propinst-display">'display'</span> property, which, by
-default, will have the value 'inline' in a :before or :after
-pseudo-element, whereas its normal initial value is 'block'.</p>
+<p>In a :before or :after pseudo-element declaration, non-inherited
+properties take their <a href="cascade.html#initial-value">initial
+value</a>.</p>
 
 <div class=example>
-<p>Because of this, the quote in the previous example is inserted as
-an inline box, and not above (or below) the content of the Q. The next
-example explicitly sets the <span
-class="propinst-display">'display'</span> property to 'block', so that
-the inserted text becomes a block:</p>
+<p>Because the initial value of the <span
+class="propinst-display">'display'</span> property is 'inline', the
+quote in the previous example is inserted as an inline box, and not
+above (or below) the content of the Q. The next example explicitly
+sets the <span class="propinst-display">'display'</span> property to
+'block', so that the inserted text becomes a block:</p>
 
 <pre>
 BODY:after {
@@ -85,15 +90,17 @@ parts are laid out as inline boxes inside the element.</p>
 
 <P>The values have the following meanings:</p>
 
-<ul>
-<li><span class="index-def" title="&lt;string&gt;, definition of"><a
-name="value-def-string">&lt;string&gt;</a></span>: ???
-<li><span class="index-def" title="&lt;counter&gt;, definition of"><a
-name="value-def-counter">&lt;counter&gt;</a></span>: ???
-</ul>
+<dl>
+<dt><span class="index-def" title="&lt;string&gt;, definition of"><a
+name="value-def-string"><strong>&lt;string&gt;</strong></a></span>
+<dd>??
+<dt><span class="index-def" title="&lt;counter&gt;, definition of"><a
+name="value-def-counter"><strong>&lt;counter&gt;</strong></a></span>
+<dd>??
+</dl>
 
 <div class=note>
-<p><em><strong>Note.</strong> In a future level of CSS, the <span
+<p><em><strong>Note.</strong> In future levels of CSS, the <span
 class="propinst-content">'content'</span> property may accept
 additional values, allowing it to vary the style of the generated
 content, but in CSS2 the content of the :before or :after
@@ -105,7 +112,7 @@ pseudo-element is all in one style.
 "�"} doesn't work. How about Q:fr-fr:before {content: "�"} ? or @lang
 fr-fr {Q:before{content: "�"}} ?]</p>
 
-<h2>Automatic counters</h2>
+<h2>Automatic counters and numbering</h2>
 
 <P><em>This is a placeholder.</em>
 

css2/lists.src

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: lists.src,v 1.16 1998-01-14 17:46:34 ijacobs Exp $ -->
+<!-- $Id: lists.src,v 1.17 1998-01-15 17:09:28 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Lists</TITLE>
@@ -30,17 +30,24 @@ it's possible to specify different marker types depending on the depth
 of embedded lists.
 </ul>
 
-<P>Elements with a <span class="propinst-display">'display'</span>
-property value of 'list-item' are formatted visually like other block-level elements, only each list item is preceded by a marker. The type
-of marker and its placement is determined by the <a
-href="#list-props">list properties</a> described below.
+<P>An element with a <span class="propinst-display">'display'</span>
+property value of 'list-item' generates two boxes: a <a
+href="visuren.html#block-level">block-level</a> box that contains its
+content and an inline box that contains a marker. Only the content box
+is involved with positioning (e.g, in the <a
+href="visuren.html#normal-flow">normal flow</a>). The position of the
+marker box (see the <span
+class="propinst-list-style-position">'list-style-position'</span>
+property) does not affect the position of the content box.  CSS
+properties allow authors to specify the marker type (image, glyph, or
+number) and its position with respect to the content box (outside the
+content or at the beginning of content).
 
 <div class="html-example"><P>
-The following rule applies to list item (LI) elements in HTML. The
-<span class="propinst-display">'display'</span> property declares
-the presentation of the LI element to be a "list-item", and the <span
-class="propinst-list-style">'list-style'</span> property means that no
-marker will appear next to list items:
+The declaration in the following HTML program causes LI elements to
+generated 'list-item' boxes. The <span
+class="propinst-list-style">'list-style'</span> value 'none' suppresses
+preceding markers.
 
 <PRE>
 &lt;HTML&gt;
@@ -64,8 +71,8 @@ marker will appear next to list items:
 <P><img src="./images/list-none.gif" alt="A list with no markers."></p>
 
 <P>The illustration shows the relationship between the current left
-margin and the margins and padding of the list element (UL) and the
-list items (LI). (The lines delimiting the margins and padding are not
+margin and the margins and padding of the list (UL) box and the list
+item (LI) boxes. (The lines delimiting the margins and padding are not
 rendered).
 
 <P>If we change the <span
@@ -76,8 +83,9 @@ LI { display: list-item; list-style: square }
 </PRE>
 
 <P> each list item will be preceded by a small square. However, the
-placement of the square does not affect the block formatting of the
-list item content:</P>
+placement of the square does not affect the <a
+href="visuren.html#block-formatting">block formatting</a> of the list
+item box:</P>
 
 <p><img src="./images/list-square.gif" alt="A list with square markers."></p>
 </div>
@@ -103,12 +111,12 @@ and <span class="propinst-list-style">'list-style'</span>
 
 <!-- #include src=properties/list-style-type.srb -->
 
-<P> This property is used to determine the appearance of the 
-list item marker if <span
-class="propinst-list-style-image">'list-style-image'</span> is 'none'
-or if the image pointed to by the URI cannot be displayed.
+<P> This property specifies appearance of the list item marker if
+<span class="propinst-list-style-image">'list-style-image'</span> has
+the value 'none' or if the image pointed to by the URI cannot be
+displayed.
 
-<P>The possible values have the following meanings:
+<P>Values have the following meanings:</p>
 <dl>
 <dt><strong>disc</strong>
 <dd>A disc (exact presentation is UA-dependent)
@@ -161,7 +169,7 @@ iii This is the third item.
 <!-- #include src=properties/list-style-image.srb -->
 
 <P> This property sets the image that will be used as the list item
-marker. When the image is available it will replace the marker set
+marker. When the image is available, it will replace the marker set
 with the <span
 class="propinst-list-style-type">'list-style-type'</span> marker.
 
@@ -177,24 +185,19 @@ item to be the image "ellipse.png".
 
 <!-- #include src=properties/list-style-position.srb -->
 
-<P> The value of <span
-class="propinst-list-style-position">'list-style-position'</span>
-determines how the list item marker is drawn with regard to the
-content. 
+<P> This property specifies the position of the marker
+box with respect to line item content box. Values have the
+following meanings:</p>
 
 <dl>
 <dt><strong>outside</strong>
 <dd>The list item marker is outside the box that is generated for the
 list item. 
 <dt><strong>inside</strong>
-<dd>The list item marker is the first part of the box that is generated for the
-list item. The list item's contents flow after the marker.
+<dd>The list item marker is the first inline box generated for the
+list item. The list item's contents flow after the marker box.
 </dl>
 
-<P>In either case, the placement of the marker does not affect
-the relationship between the list item's box and the pertinent margin
-(depending on script direction).
-
 <div class="html-example"><P>
 For example:
 
@@ -308,7 +311,7 @@ UL elements to LI elements. This is the recommended way to
 specify list style information.
 
 <div class="example"><P>
-<P>  A URI value can be combined with any other value, as in:
+<P>  A URI value may be combined with any other value, as in:
 
 <PRE>
   UL { list-style: url(http://png.com/ellipse.png) disc }