w3c
diff --git a/‎css2/box.html‎
Lines changed: 3 additions & 3 deletions b/‎css2/box.html‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎css2/css2.html‎
Lines changed: 306 additions & 250 deletions b/‎css2/css2.html‎
Lines changed: 306 additions & 250 deletions
diff --git a/‎css2/diffs-rec/box.html‎
Lines changed: 3 additions & 3 deletions b/‎css2/diffs-rec/box.html‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎css2/diffs-rec/indexlist.html‎
Lines changed: 43 additions & 40 deletions b/‎css2/diffs-rec/indexlist.html‎
Lines changed: 43 additions & 40 deletions
diff --git a/‎css2/diffs-rec/page.html‎
Lines changed: 12 additions & 12 deletions b/‎css2/diffs-rec/page.html‎
Lines changed: 12 additions & 12 deletions
@@ -373,7 +373,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 
 <ul>
 <li>Two or more adjoining vertical margins of <a
-href="visuren.html#block-box">block</a> boxes in the <a
+href="visuren.html#block-box">block-level</a> boxes in the <a
 href="visuren.html#normal-flow">normal flow</a> collapse. The
 resulting margin width is the maximum of the adjoining margin widths.
 In the case of negative margins, the maximum of the absolute values
@@ -436,12 +436,12 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 sibling, unless that sibling has <a
 href="visuren.html#clearance">clearance.</a></p>
 
-<p>The top margin of an in-flow block-level element is adjoining to
+<p>The top margin of an in-flow block box is adjoining to
 its first in-flow block-level child's top margin if the element has no
 top border, no top padding, and the child has no <a
 href="visuren.html#clearance">clearance.</a></p>
 
-<p>The bottom margin of an in-flow block-level element with a 'height'
+<p>The bottom margin of an in-flow block box with a 'height'
 of 'auto' is adjoining to its last in-flow block-level child's bottom
 margin if the element has no bottom padding or border.
 
 
@@ -373,7 +373,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 
 <ul>
 <li>Two or more adjoining vertical margins of <a
-href="visuren.html#block-box">block</a> boxes in the <a
+href="visuren.html#block-box"> <del>block</del><ins>block-level</ins></a> boxes in the <a
 href="visuren.html#normal-flow">normal flow</a> collapse. The
 resulting margin width is the maximum of the adjoining margin widths.
 In the case of negative margins, the  <del>absolute</del>maximum of the <ins>absolute values
@@ -436,12 +436,12 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
 sibling, unless that sibling has</ins> <a
 href="visuren.html#clearance"><ins>clearance.</ins></a></p>
 
-<p><ins>The top margin of an in-flow block-level element is adjoining to
+<p><ins>The top margin of an in-flow block box is adjoining to
 its first in-flow block-level child's top margin if the element has no
 top border, no top padding, and the child has no</ins> <a
 href="visuren.html#clearance"><ins>clearance.</ins></a></p>
 
-<p><ins>The bottom margin of an in-flow block-level element with a 'height'
+<p><ins>The bottom margin of an in-flow block box with a 'height'
 of 'auto' is adjoining to its last in-flow block-level child's bottom
 margin if the element has no bottom padding or border.</ins>
 
 
@@ -154,8 +154,8 @@ <h3>13.2.1 <a name="page-margins">Page margins</a></h3>
 </div>
 
 <p>The <a href="#page-context">page context</a> has no notion of
-fonts, so 'em' and 'ex' units are not allowed. Percentage values on
-the margin properties  <del>are relative to the dimensions of the page box ; for left and right margins, they refer to page box width while for top and bottom margins, they refer to page box height. All other units associated with the respective CSS2 properties are allowed. Due to negative margin values (either on the page box or on elements) or absolute positioning content may end up outside the page box, but this content may be "cut" -- by the user agent, the printer, or ultimately, the paper cutter. 13.2.2 Page size : the 'size' property 'size' Value: &nbsp;&nbsp; &lt;length&gt; {1,2} | auto | portrait | landscape | inherit Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; the page context Inherited: &nbsp;&nbsp; N/A Percentages
B74
: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual , paged This property specifies the size and orientation of a page box. The size of a page box may either be "absolute" (fixed size) or "relative" (scalable, i.e., fitting available sheet sizes). Relative page boxes allow user agents to scale a document and make optimal use of the target size. Three values for the 'size' property create a relative page box: auto The page box will be set to the size and orientation of the target sheet. landscape Overrides the target's orientation. The page box is the same size as the target, and the longer sides are horizontal. portrait Overrides the target's orientation. The page box is the same size as the target, and the shorter sides are horizontal. Example(s): In the following example, the outer edges of the page box will align with the target. The percentage value on the 'margin' property is relative to the target size so if the target sheet dimensions are 21.0cm x 29.7cm (i.e., A4), the margins are 2.10cm and 2.97cm. @page { size: auto; /* auto is the initial value */ margin: 10%; } Length values for the 'size' property create an absolute page box. If only one length value is specified, it sets both the width and height of the page box (i.e., the box is a square). Since the page box is the initial containing block , percentage values are not allowed for the 'size' property. Example(s): For example: @page { size: 8.5in 11in; /* width height */ } The above example set the width of the page box to be 8.5in and the height to be 11in. The page box in this example requires a target sheet size of 8.5&quot;x11&quot; or larger. User agents may allow users to control the transfer of the page box to the sheet (e.g., rotating an absolute page box that's being printed). Rendering page boxes that do not fit a target sheet If a page box does not fit the target sheet dimensions, the user agent may choose to: Rotate the page box 90° if this will make the page box fit. Scale the page to fit the target. The user agent should consult the user before performing these operations. Positioning the page box on the sheet When the page box is smaller than the target size, the user agent is free</del><ins>are relative</ins> to  <del>place</del><ins>the dimensions of</ins> the <a
+fonts, so 'em' and 'ex' units are not allowed.  <del>Percentage values on the margin properties are relative to the dimensions of the page box ; for left and right margins, they refer to page box width while for top and bottom margins, they refer to page box height. All other units associated with the respective CSS2 properties are allowed. Due to negative margin values (either on the page box or on elements) or absolute positioning content may end up outside the page box, but this content may be "cut" -- by the user agent, the printer, or ultimately, the paper cutter. 13.2.2 Page size : the 'size' property 'size' Value: &nbsp;&nbsp; &lt;length&gt; {1,2} | auto | portrait | landscape | inherit Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; the page context Inherited: &nbsp;&nbsp; N/A Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual , paged This property specifies the size and orientation of a page box. The size of a page box may either be "absolute" (fixed size) or "relative" (scalable, i.e., fitting available sheet sizes). Relative page boxes allow user agents to scale a document and make optimal use of the target size. Three values for the 'size' property create a relative page box: auto The page box will be set to the size and orientation of the target sheet. landscape Overrides the target's orientation. The page box is the same size as the target, and the longer sides are horizontal. portrait Overrides the target's orientation. The page box is the same size as the target, and the shorter sides are horizontal. Example(s): In the following example, the outer edges of the page box will align with the target. The percentage value on the 'margin' property is relative to the target size so if the target sheet dimensions are 21.0cm x 29.7cm (i.e., A4), the margins are 2.10cm and 2.97cm. @page { size: auto; /* auto is the initial value */ margin: 10%; } Length values for the 'size' property create an absolute page box. If only one length value is specified, it sets both the width and height of the page box (i.e., the box is a square). Since the page box is the initial containing block , percentage values are not allowed for the 'size' property. Example(s): For example: @page { size: 8.5in 11in; /* width height */ } The above example set the width of the page box to be 8.5in and the height to be 11in. The page box in this example requires a target sheet size of 8.5&quot;x11&quot; or larger. User agents may allow users to control the transfer of the page box to the sheet (e.g., rotating an absolute page box that's being printed). Rendering page boxes that do not fit a target sheet If a page box does not fit the target sheet dimensions, the user agent may choose to: Rotate the page box 90° if this will make the page box fit. Scale the page to fit the target. The user agent should consult the user before performing these operations. Positioning the page box</del><ins>Percentage values</ins> on
+the  <del>sheet When the page box is smaller than the target size, the user agent is free</del><ins>margin properties are relative</ins> to  <del>place</del><ins>the dimensions of</ins> the <a
 href="#page-box">page box</a> <del>anywhere on</del><ins>; for left and right margins, they refer
 to</ins> the  <del>sheet. However, it is recommended that</del><ins>width of</ins> the page box  <del>be centered on the sheet since this will align double-sided pages</del><ins>while for top</ins> and  <del>avoid accidental loss of information that is printed near</del><ins>bottom margins, they
 refer to</ins> the  <del>edge</del><ins>height</ins> of the  <del>sheet. 13.2.3 Crop marks : the 'marks' property 'marks' Value: &nbsp;&nbsp; [ crop || cross ] | none | inherit Initial: &nbsp;&nbsp; none Applies to: &nbsp;&nbsp; page context Inherited: &nbsp;&nbsp; N/A Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual , paged In high-quality printing, marks are often added outside the</del>page box.  <del>This property specifies whether cross marks or crop marks or both should be rendered just outside the page box edge. Crop marks indicate where</del><ins>All other units associated with</ins>
@@ -220,13 +220,13 @@ <h3><ins>13.2.2</ins> <a name="page-selectors"><ins>Page selectors: selecting</i
 
 <P> <del>Whether the first page of a document is :left or :right depends on the major writing direction of the document and is outside the scope of this document. However, to force a :left or :right first page, authors may insert a page break before the first generated box (e.g., in HTML, specify this for the BODY element).</del>Properties specified in a :left  <del>(or :right)</del><ins>or :right</ins> @page rule override
 those specified in an @page rule that has no pseudo-class specified.
-Properties specified in a  <del>:first @page rule override those specified</del><ins>:first @page rule override those specified
-in :left or :right @page rules.</ins>
+Properties specified in a :first @page rule override those specified
+in  <del>:left (or :right) @page rules. Note. Adding declarations</del><ins>:left or :right @page rules.</ins>
 
 <P><ins>Margin declarations on left, right, and first pages may result in
-different</ins> <a href="#page-area"><ins>page area</ins></a> <ins>widths. To simplify
+different</ins> <a href="#page-area"><ins>page area</ins></a> <ins>widths.</ins> To <ins>simplify
 implementations, user agents may use a single page area width
-on left, right, and first pages.</ins> In  <del>:left (or :right) @page rules. Note. Adding declarations to the :left or :right pseudo-class does not influence whether</del><ins>this case,</ins> the  <del>document comes out</del><ins>page area width</ins>
+on left, right, and first pages. In this case,</ins> the  <del>:left or :right pseudo-class does not influence whether the document comes out</del><ins>page area width</ins>
 of the  <del>printer double- or single-sided (which is outside the scope of this specification). Note. Future versions of CSS may include other</del><ins>first</ins> page  <del>pseudo-classes. 13.2.5</del><ins>should be used.</ins>
 
 
@@ -365,9 +365,9 @@ <h3>13.3.1 <a name="page-break-props"><ins>Page</ins> break  <del>before/after e
 class="propinst-page-break-before">'page-break-before'</span></a> property
 of the following element.  When these properties have values other
 than 'auto', the values 'always', 'left', and 'right' take precedence
- <del>over 'avoid'. See the section on allowed page breaks for the exact rules on how these properties may force or suppress a page break. 13.3.2 Using named pages: 'page' 'page' Value: &nbsp;&nbsp; &lt;identifier&gt; | auto Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; block-level elements Inherited: &nbsp;&nbsp; yes Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual , paged The 'page' property can be used to specify a particular type of page where an element should be displayed. Example(s): This example will put all tables on a right-hand side landscape page (named "rotated"): @page rotated {size: landscape} TABLE {page: rotated; page-break-before: right} The 'page' property works as follows: If a block box with inline content has a 'page' property that is different from the preceding block box with inline content, then one or two page breaks are inserted between them, and the boxes after</del><ins>over 'avoid'.</ins>  
+over 'avoid'.  
 
-<p><ins>User Agents must apply these properties to block-level elements
+<p> <del>See the section on allowed page breaks for the exact rules on how these properties may force or suppress a page break. 13.3.2 Using named pages: 'page' 'page' Value: &nbsp;&nbsp; &lt;identifier&gt; | auto Initial: &nbsp;&nbsp; auto Applies to: &nbsp;&nbsp; block-level elements Inherited: &nbsp;&nbsp; yes Percentages: &nbsp;&nbsp; N/A Media: &nbsp;&nbsp; visual , paged The 'page' property can be used to specify a particular type of page where an element should be displayed. Example(s): This example will put all tables on a right-hand side landscape page (named "rotated"): @page rotated {size: landscape} TABLE {page: rotated; page-break-before: right} The 'page' property works as follows: If a block box with inline content has a 'page' property that is different from the preceding block box with inline content, then one or two page breaks are inserted between them, and the boxes after</del><ins>User Agents must apply these properties to block-level elements
 in</ins> the  <del>break are rendered on a page box</del><ins>normal flow</ins> of the  <del>named type. See "Forced</del><ins>root element. User agents may also apply
 these properties to other elements, e.g., 'table-row' elements.</ins>
 
@@ -386,7 +386,7 @@ <h3><ins>13.3.2</ins> <a name="break-inside">Breaks inside elements</a>: <a href
 <table class="propinfo" cellspacing=0 cellpadding=0>
 <tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>2
-<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block-level elements
+<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td> <del>block-level</del><ins>block container</ins> elements
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>yes
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#paged-media-group" class="noxref">paged</a>
@@ -403,7 +403,7 @@ <h3><ins>13.3.2</ins> <a name="break-inside">Breaks inside elements</a>: <a href
 <table class="propinfo" cellspacing=0 cellpadding=0>
 <tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td><a href="syndata.html#value-def-integer" class="noxref"><span class="value-inst-integer">&lt;integer&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
 <tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>2
-<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>block-level elements
+<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td> <del>block-level</del><ins>block container</ins> elements
 <tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>yes
 <tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>N/A
 <tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td><a href="media.html#visual-media-group" class="noxref">visual</a>, <a href="media.html#paged-media-group" class="noxref">paged</a>
@@ -414,9 +414,9 @@ <h3><ins>13.3.2</ins> <a name="break-inside">Breaks inside elements</a>: <a href
 
 
 <P>The <a href="page.html#propdef-orphans" class="noxref"><span class="propinst-orphans">'orphans'</span></a> property
-specifies the minimum number of lines  <del>of</del><ins>in</ins> a  <del>paragraph</del><ins>block element</ins> that must be left
+specifies the minimum number of lines  <del>of</del><ins>in</ins> a  <del>paragraph</del><ins>block container</ins> that must be left
 at the bottom of a page. The <a href="page.html#propdef-widows" class="noxref"><span class="propinst-widows">'widows'</span></a> property specifies the minimum
-number of lines  <del>of</del><ins>in</ins> a  <del>paragraph</del><ins>block element</ins> that must be left at the top of a page.
+number of lines  <del>of</del><ins>in</ins> a  <del>paragraph</del><ins>block container</ins> that must be left at the top of a page.
 Examples of how they are used to control page breaks are given below.
 
 <p><ins>Only positive values are allowed.</ins>