[css2] Generated. Do not edit!

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

Author: bert-github

css2/css2.html

@@ -13047,13 +13047,19 @@ <h3>12.5.1 <a name="list-style">Lists:</a> the <a href="generate.html#propdef-li
 <dl>
 <dt><strong>outside</strong>
 
-<dd>The marker box is outside the principal block box. CSS&nbsp;2.1
+<dd>If there is no float adjacent to the principal box and
+'text-align' is either 'justify' or has a value such that text is
+aligned on the side of the marker, then the marker box is outside the
+principal box. CSS&nbsp;2.1 recommends that the marker position is the
+same in other cases, too, but does not require it. CSS&nbsp;2.1
 does not specify the precise location of the marker box, but does
 require that for list items whose 'direction' property is 'ltr' the
 marker box be on the left side of the content and for elements whose
 'direction' property is 'rtl' the marker box be on the right side of
-the content. 'overflow' on the element does not clip the marker box. 
-The marker box is fixed with respect to the principal block box's
+the content.
+If the marker is outside the principal box, then 'overflow' on the
+element does not clip the marker box and the marker box is fixed with
+respect to the principal block box's
 border and does not scroll with the principal block box's content.
 The size or contents of the marker box may affect the height of the
 principal block box and/or the height of its first line box, and in
@@ -16917,7 +16923,9 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
 
 <p>The height of a 'table-row' element's box is calculated once the
 user agent has all the cells in the row available: it is the maximum
-of the row's specified <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>
+of the row's computed <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>,
+the computed <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of each
+cell in the row,
 and the minimum height (MIN) required by the cells. A <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height">'height'</span></a> value of 'auto' for a
 'table-row' means the row height used for layout is MIN. MIN depends
@@ -16928,11 +16936,11 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
 values. CSS&nbsp;2.1 does not define the meaning of <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height">'height'</span></a> on row groups.
 
-<p>In CSS&nbsp;2.1, the height of a cell box is the maximum of the
-table cell's <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> property
-and the minimum height required by the content (MIN). A value of
-'auto' for <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> implies that
-the value MIN will be used for layout.
+<p>In CSS&nbsp;2.1, the height of a cell box is the minimum height
+required by the content. The table cell's <a href="visudet.html#propdef-height" class="noxref"><span
+class="propinst-height">'height'</span></a> property can influence the
+height of the row (see above), but it does not increase the height of
+the cell box.
 
 <p>CSS&nbsp;2.1 does not specify how cells that span more than one row
 affect row height calculations except that the sum of the row heights

css2/diffs-rec/generate.html

@@ -1022,7 +1022,9 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
 
 <p>The height of a 'table-row' element's box is calculated once the
 user agent has all the cells in the row available: it is the maximum
-of the row's specified <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a>
+of the row's  <del>specified</del><ins>computed</ins> <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height"><ins>'height'</ins></span></a><ins>,
+the computed</ins> <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> <ins>of each
+cell in the row,</ins>
 and the minimum height (MIN) required by the cells. A <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height">'height'</span></a> value of 'auto' for a
 'table-row' means the  <del>computed</del>row height <ins>used for layout</ins> is MIN. MIN depends
@@ -1033,11 +1035,11 @@ <h3>17.5.3 <a name="height-layout">Table height algorithms</a></h3>
 values. CSS&nbsp;2.1 does not define the meaning of</ins> <a href="visudet.html#propdef-height" class="noxref"><span
 class="propinst-height"><ins>'height'</ins></span></a> <ins>on</ins> row groups.
 
-<p>In  <del>CSS2,</del><ins>CSS&nbsp;2.1,</ins> the height of a cell box is the maximum of the
-table cell's <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> property
-and the minimum height required by the content (MIN). A value of
-'auto' for <a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> implies  <del>a computed</del><ins>that
-the</ins> value  <del>of MIN. CSS2 does not define what percentage values of 'height' refer to when specified</del><ins>MIN will be used</ins> for  <del>table cells. CSS2</del><ins>layout.</ins>
+<p>In  <del>CSS2,</del><ins>CSS&nbsp;2.1,</ins> the height of a cell box is the  <del>maximum of</del><ins>minimum height
+required by the content.</ins> The table cell's <a href="visudet.html#propdef-height" class="noxref"><span
+class="propinst-height">'height'</span></a> property  <del>and</del><ins>can influence</ins> the
+ <del>minimum</del>height  <del>required by</del><ins>of</ins> the  <del>content (MIN). A value</del><ins>row (see above), but it does not increase the height</ins> of
+ <del>'auto' for 'height' implies a computed value of MIN. CSS2 does not define what percentage values of 'height' refer to when specified for table cells. CSS2</del><ins>the cell box.</ins>
 
 <p><ins>CSS&nbsp;2.1</ins> does not specify how cells that span more than <ins>one</ins> row
 affect row height calculations except that the sum of the row heights
@@ -1156,23 +1158,23 @@ <h3>17.5.4 <a name="column-alignment">Horizontal alignment in a column</a></h3>
 
 <p>The horizontal alignment of a cell's <ins>inline</ins> content within a cell
 box  <del>is</del><ins>can be</ins> specified  <del>with</del><ins>by</ins> the  <del>'text-align' property. When</del><ins>value of</ins>
-the <a href="text.html#propdef-text-align" class="noxref"><span class="propinst-text-align">'text-align'</span></a> property  <del>for more than one cell in a column is set to a &lt;string&gt; value,</del><ins>on</ins>
-the  <del>content of those cells is aligned along a vertical axis.</del><ins>cell.</ins>
+the <a href="text.html#propdef-text-align" class="noxref"><span class="propinst-text-align">'text-align'</span></a> property <ins>on
+the cell.</ins>
 
 
 
 <h3><ins>17.5.5</ins> <a name="dynamic-effects"><ins>Dynamic row and column effects</ins></a></h3>
 
-<p>The <a href="visufx.html#propdef-visibility" class="noxref"><span class="propinst-visibility"> <del>beginning of</del><ins>'visibility'</ins></span></a> <ins>property
-takes</ins> the  <del>string touches</del><ins>value 'collapse' for row, row group, column, and column
-group elements.</ins> This  <del>axis. Character directionality determines whether</del><ins>value causes</ins> the  <del>string lies</del><ins>entire row or column</ins> to <ins>be
-removed from</ins> the  <del>left</del><ins>display, and the space normally taken up by the row</ins>
-or  <del>right</del><ins>column to be made available for other content. Contents</ins> of <ins>spanned
-rows and columns that intersect</ins> the  <del>axis. Aligning text in this way is only useful if</del><ins>collapsed column or row are
-clipped.</ins> The  <del>text fits on one line.</del><ins>suppression of</ins> the  <del>result is undefined if</del><ins>row or column, however, does not
-otherwise affect</ins> the  <del>cell content spans more than one line. If value</del><ins>layout</ins> of  <del>'text-align' for a</del><ins>the table. This allows dynamic effects
-to remove</ins> table  <del>cell is</del><ins>rows or columns without forcing</ins> a  <del>string but</del><ins>re-layout of</ins> the
- <del>string doesn't occur</del><ins>table</ins> in  <del>the cell content, the end of the cell's content touches the vertical axis of alignment. Note that the strings do not have to be the same for each cell, although they usually are. CSS does not provide a way specify the offset of the vertical alignment axis with respect to the edge of a column box. Example(s): The following style sheet: TD { text-align: "." } TD:before { content: "$" } will cause the column of dollar figures in the following HTML table: &lt;TABLE&gt; &lt;COL width="40"&gt; &lt;TR&gt; &lt;TH&gt;Long distance calls &lt;TR&gt; &lt;TD&gt; 1.30 &lt;TR&gt; &lt;TD&gt; 2.50 &lt;TR&gt; &lt;TD&gt; 10.80 &lt;TR&gt; &lt;TD&gt; 111.01 &lt;TR&gt; &lt;TD&gt; 85. &lt;TR&gt; &lt;TD&gt; 90 &lt;TR&gt; &lt;TD&gt; .05 &lt;TR&gt; &lt;TD&gt; .06 &lt;/TABLE&gt; to align along the decimal point. For fun, we have used the :before pseudo-element to insert a dollar sign before each figure. The table might be rendered as follows: Long distance calls $1.30 $2.50 $10.80 $111.01 $85. $90 $.05 $.06 17.5.5 Dynamic row and column effects The 'visibility' property takes the value 'collapse' for row, row group, column, and column group elements. This value causes the entire row or column to be removed from the display, and the space normally taken up by the row or column to be made available for other content. The suppression of the row or column, however, does not otherwise affect the layout of the table. This allows dynamic effects to remove table rows or columns without forcing a re-layout of the table in order to account for</del><ins>order to account for</ins> the potential change in column
+<p><ins>The</ins> <a href="visufx.html#propdef-visibility" class="noxref"><span class="propinst-visibility"><ins>'visibility'</ins></span></a> <ins>property
+takes the value 'collapse'</ins> for  <del>more than one cell in a</del><ins>row, row group, column, and column
+group elements. This value causes the entire row or</ins> column  <del>is set</del>to  <del>a &lt;string&gt; value,</del><ins>be
+removed from</ins> the  <del>content of those cells is aligned along a vertical axis.</del><ins>display, and the space normally taken up by</ins> the  <del>beginning</del><ins>row
+or column to be made available for other content. Contents</ins> of <ins>spanned
+rows and columns that intersect</ins> the  <del>string touches this axis. Character directionality determines whether</del><ins>collapsed column or row are
+clipped.</ins> The  <del>string lies to</del><ins>suppression of</ins> the  <del>left</del><ins>row</ins> or  <del>right</del><ins>column, however, does not
+otherwise affect the layout</ins> of the  <del>axis. Aligning text in this way is only useful if the text fits on one line. The result is undefined if the cell content spans more than one line. If value of 'text-align' for a table cell is a string but the string doesn't occur in the cell content, the end of the cell's content touches the vertical axis of alignment. Note that the strings do not have to be the same for each cell, although they usually are. CSS does not provide a way specify the offset of the vertical alignment axis with respect to the edge of a column box. Example(s): The following style sheet: TD { text-align: "." } TD:before { content: "$" } will cause the column of dollar figures in the following HTML table: &lt;TABLE&gt; &lt;COL width="40"&gt; &lt;TR&gt; &lt;TH&gt;Long distance calls &lt;TR&gt; &lt;TD&gt; 1.30 &lt;TR&gt; &lt;TD&gt; 2.50 &lt;TR&gt; &lt;TD&gt; 10.80 &lt;TR&gt; &lt;TD&gt; 111.01 &lt;TR&gt; &lt;TD&gt; 85. &lt;TR&gt; &lt;TD&gt; 90 &lt;TR&gt; &lt;TD&gt; .05 &lt;TR&gt; &lt;TD&gt; .06 &lt;/TABLE&gt; to align along the decimal point. For fun, we have used the :before pseudo-element to insert a dollar sign before each figure. The table might be rendered as follows: Long distance calls $1.30 $2.50 $10.80 $111.01 $85. $90 $.05 $.06 17.5.5 Dynamic row and column effects The 'visibility' property takes the value 'collapse' for row, row group, column, and column group elements. This value causes the entire row or column to be removed from the display, and the space normally taken up by the row or column to be made available for other content. The suppression of the row or column, however, does not otherwise affect the layout of the table.</del><ins>table.</ins> This allows dynamic effects
+to remove table rows or columns without forcing a re-layout of the
+table in order to account for the potential change in column
 constraints.
 
 <h2>17.6 <a name="borders">Borders</a></h2>
@@ -1226,16 +1228,16 @@ <h3>17.6.1 <a name="separated-borders">The separated borders model</a></h3>
 
 <p class="note"> <del>specify</del><ins>*) Note: user agents may also apply</ins> the
  <del>distance that separates adjacent cell borders. If one length</del><ins>'border-spacing' property to 'frameset' elements. Which elements are
-'frameset' elements</ins> is  <del>specified, it gives both the horizontal</del><ins>not defined by this specification</ins> and  <del>vertical spacing. If two are specified, the first gives</del><ins>is up to</ins>
-the  <del>horizontal spacing and</del><ins>document language. For example, HTML4 defines a &lt;FRAMESET>
+'frameset' elements</ins> is  <del>specified, it gives both the horizontal</del><ins>not defined by this specification</ins> and  <del>vertical spacing. If two are</del><ins>is up to
+the document language. For example, HTML4 defines a &lt;FRAMESET>
 element, and XHTML 1.0 defines a &lt;frameset> element. The
 'border-spacing' property on a 'frameset' element can be thus used as
 a valid substitute for the non-standard 'framespacing' attribute.</ins>
 
 <p><ins>The lengths specify the distance that separates adjoining cell
 borders. If one length is specified, it gives both the horizontal and
-vertical spacing. If two are specified, the first gives the horizontal
-spacing and</ins> the second the vertical spacing. Lengths may not be
+vertical spacing. If two are</ins> specified, the first gives the horizontal
+spacing and the second the vertical spacing. Lengths may not be
 negative.
 
 <p><ins>The distance between the table border and the borders of the cells
@@ -1369,11 +1371,11 @@ <h3>17.6.2 <a name="collapsing-borders">The collapsing border model</a></h3>
 </blockquote>
 
 <p>Here <var>n</var> is the number of cells in the row,
-<var><ins>padding-left</ins></var><sub><var><ins>i</ins></var></sub> and
-<var> <del>border-width</del><ins>padding-right</ins></var><sub><var>i</var></sub>  <del>refers</del><ins>refer</ins> to the  <del>border between cells i and</del><ins>left
-(resp., right) padding of cell</ins> <var><ins>i</ins></var><ins>, and</ins>
-<var><ins>border-width</ins></var><sub><var><ins>i</ins></var></sub> <ins>refers to the border
-between cells</ins> <var><ins>i</ins></var> <ins>and</ins> <var>i</var> + 1.
+<var><ins>padding-left</ins></var><sub><var><ins>i</ins></var></sub> <ins>and</ins>
+<var><ins>padding-right</ins></var><sub><var><ins>i</ins></var></sub> <ins>refer to the left
+(resp., right) padding of cell</ins> <var><ins>i</ins></var><ins>,</ins> and
+<var>border-width</var><sub><var>i</var></sub> refers to the border
+between cells <var>i</var> and <var>i</var> + 1.
 
 <p> <del>Note only</del><ins>UAs must compute an initial left and right border width for the
 table by examining the first and last cells in the first row of the
@@ -1508,12 +1510,12 @@ <h4><ins>17.6.2.1</ins> <a name="border-conflict-resolution">Border conflict res
 </div>
 
 <div class="example"><P style="display:none">Example(s):</P>
-<p> <del>The next</del><ins>Here is an</ins> example  <del>shows a table with horizontal rules between the rows. The top border</del>of  <del>the table is set to 'hidden' to suppress the top border of the first row. This implements the "rules" attribute of HTML 4.0 (rules="rows"). TABLE[rules=rows] TR { border-top: solid } TABLE[rules=rows] { border-collapse: collapse; border-top: hidden } &nbsp;&nbsp;&nbsp; [D] Table with horizontal rules between the rows. In this case the same effect can also be achieved without setting a 'hidden' border on TABLE, by addressing the first row separately. Which method is preferred is a matter of taste. TR:first-child { border-top: none } TR { border-top: solid } Example(s): Here is another example of hidden collapsing borders: &nbsp;&nbsp;&nbsp; [D]</del><ins>hidden collapsing borders:</ins>
+<p> <del>The next example shows a table with horizontal rules between the rows. The top border of the table</del><ins>Here</ins> is  <del>set to 'hidden' to suppress the top border of the first row. This implements the "rules" attribute</del><ins>an example</ins> of  <del>HTML 4.0 (rules="rows"). TABLE[rules=rows] TR { border-top: solid } TABLE[rules=rows] { border-collapse: collapse; border-top:</del>hidden  <del>} &nbsp;&nbsp;&nbsp; [D] Table with horizontal rules between the rows. In this case the same effect can also be achieved without setting a 'hidden' border on TABLE, by addressing the first row separately. Which method is preferred is a matter of taste. TR:first-child { border-top: none } TR { border-top: solid } Example(s): Here is another example of hidden collapsing borders:</del><ins>collapsing borders:</ins>
 
 <div class="figure">
   <p><img src="images/CSStbl3.png" width="57" height="48" alt="Table
-  with two omitted borders"><SPAN class="dlink"><ins>&nbsp;&nbsp;&nbsp;</ins><A name="img-CSStbl3" href="images/longdesc/CSStbl3-desc.html" title="Long description of example illustrating hidden internal
-borders"><ins>[D]</ins></A></SPAN>
+  with two omitted borders"><SPAN class="dlink">&nbsp;&nbsp;&nbsp;<A name="img-CSStbl3" href="images/longdesc/CSStbl3-desc.html" title="Long description of example illustrating hidden internal
+borders">[D]</A></SPAN>
 
   <p class="caption"> Table with two omitted internal borders.
 </div>

css2/diffs-rec/tables.html

@@ -1046,13 +1046,19 @@ <h3>12.5.1 <a name="list-style">Lists:</a> the <a href="generate.html#propdef-li
 <dl>
 <dt><strong>outside</strong>
 
-<dd>The marker box is outside the principal block box. CSS&nbsp;2.1
+<dd><ins>If there is no float adjacent to the principal box and
+'text-align' is either 'justify' or has a value such that text is
+aligned on the side of the marker, then</ins> the marker box is outside the
+principal  <del>block</del>box. CSS&nbsp;2.1 <ins>recommends that the marker position is the
+same in other cases, too, but does not require it. CSS&nbsp;2.1</ins>
 does not specify the precise location of the marker box, but does
 require that for list items whose 'direction' property is 'ltr' the
 marker box be on the left side of the content and for elements whose
 'direction' property is 'rtl' the marker box be on the right side of
-the content. 'overflow' on the element does not clip the marker box. 
-The marker box is fixed with respect to the principal block box's
+the content.
+<ins>If the marker is outside the principal box, then</ins> 'overflow' on the
+element does not clip the marker  <del>box.</del><ins>box and</ins> the marker box is fixed with
+respect to the principal block box's
 border and does not scroll with the principal block box's content.
 The size or contents of the marker box may affect the height of the
 principal block box and/or the height of its first line box, and in