Skip to content

Commit 3a7f9d4

Browse files
committed
[css2] Edited issues 13, 25, 27, 8, 17
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402643
1 parent 10acbf4 commit 3a7f9d4

5 files changed

Lines changed: 52 additions & 46 deletions

File tree

css2/box.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
443443

444444
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span
445445
class="propinst-min-height">'min-height'</span></a> property is zero, and
446-
it has neither vertical borders nor vertical padding, and it has a
446+
it has neither top or bottom borders nor top or bottom padding, and it has a
447447
<a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of either 0 or 'auto',
448448
and it does not contain a line box, and all of its in-flow children's
449449
margins (if any) are adjoining.</p>

css2/conform.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,16 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
150150
<a name="replaced-element">Replaced
151151
element</a></span></strong>
152152

153-
<dd><p>An element that is outside the scope of the CSS formatter, such
154-
as an image, embedded document, or applet. For example, the content of
155-
the HTML IMG element is often replaced by the image that its "src"
156-
attribute designates. Replaced elements often have intrinsic
157-
dimensions: an intrinsic width, an intrinsic height, and an intrinsic
158-
ratio. For example, a bitmap image has an intrinsic width and an
159-
intrinsic height specified in absolute units (from which the intrinsic
160-
ratio can obviously be determined). On the other hand, other documents
161-
may not have any intrinsic dimensions (for example a blank HTML
162-
document).
153+
<dd><p>An element whose content is outside the scope of the CSS
154+
formatting model, such as an image, embedded document, or applet. For
155+
example, the content of the HTML IMG element is often replaced by the
156+
image that its "src" attribute designates. Replaced elements often
157+
have intrinsic dimensions: an intrinsic width, an intrinsic height,
158+
and an intrinsic ratio. For example, a bitmap image has an intrinsic
159+
width and an intrinsic height specified in absolute units (from which
160+
the intrinsic ratio can obviously be determined). On the other hand,
161+
other documents may not have any intrinsic dimensions (for example a
162+
blank HTML document).
163163

164164
<p>User agents may consider a replaced element to not have any
165165
intrinsic dimensions if it is believed that those dimensions could
@@ -218,9 +218,9 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
218218
content</a></span></strong>
219219

220220
<dd>The content of an element after the rendering that applies to it
221-
according to the relevant style sheets has been applied. The rendered
222-
content of a <a href="#replaced-element">replaced element</a> comes
223-
from outside the source document. Rendered content may also be
221+
according to the relevant style sheets has been applied. How a
222+
replaced element's content is rendered is not defined by this
223+
specification. Rendered content may also be
224224
alternate text for an element (e.g., the value of the XHTML "alt"
225225
attribute), and may include items inserted implicitly or explicitly by
226226
the style sheet, such as bullets, numbering, etc.

css2/css2.html

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1955,16 +1955,16 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
19551955
<a name="replaced-element">Replaced
19561956
element</a></span></strong>
19571957

1958-
<dd><p>An element that is outside the scope of the CSS formatter, such
1959-
as an image, embedded document, or applet. For example, the content of
1960-
the HTML IMG element is often replaced by the image that its "src"
1961-
attribute designates. Replaced elements often have intrinsic
1962-
dimensions: an intrinsic width, an intrinsic height, and an intrinsic
1963-
ratio. For example, a bitmap image has an intrinsic width and an
1964-
intrinsic height specified in absolute units (from which the intrinsic
1965-
ratio can obviously be determined). On the other hand, other documents
1966-
may not have any intrinsic dimensions (for example a blank HTML
1967-
document).
1958+
<dd><p>An element whose content is outside the scope of the CSS
1959+
formatting model, such as an image, embedded document, or applet. For
1960+
example, the content of the HTML IMG element is often replaced by the
1961+
image that its "src" attribute designates. Replaced elements often
1962+
have intrinsic dimensions: an intrinsic width, an intrinsic height,
1963+
and an intrinsic ratio. For example, a bitmap image has an intrinsic
1964+
width and an intrinsic height specified in absolute units (from which
1965+
the intrinsic ratio can obviously be determined). On the other hand,
1966+
other documents may not have any intrinsic dimensions (for example a
1967+
blank HTML document).
19681968

19691969
<p>User agents may consider a replaced element to not have any
19701970
intrinsic dimensions if it is believed that those dimensions could
@@ -2023,9 +2023,9 @@ <H2 id=defs><a name="q1">3.1 Definitions</a></H2>
20232023
content</a></span></strong>
20242024

20252025
<dd>The content of an element after the rendering that applies to it
2026-
according to the relevant style sheets has been applied. The rendered
2027-
content of a <a href="#replaced-element">replaced element</a> comes
2028-
from outside the source document. Rendered content may also be
2026+
according to the relevant style sheets has been applied. How a
2027+
replaced element's content is rendered is not defined by this
2028+
specification. Rendered content may also be
20292029
alternate text for an element (e.g., the value of the XHTML "alt"
20302030
attribute), and may include items inserted implicitly or explicitly by
20312031
the style sheet, such as bullets, numbering, etc.
@@ -3048,7 +3048,7 @@ <h3><a name="q15">4.3.1 Integers and real numbers</a></h3>
30483048
be an &lt;integer&gt;, or it can be zero or more digits followed by a
30493049
dot (.) followed by one or more digits. Both integers and real numbers
30503050
may be preceded by a "-" or "+" to indicate the sign.
3051-
</p>
3051+
-0 is equivalent to 0 and is not a negative number.</p>
30523052

30533053
<p>Note that many properties that allow an integer or real number as a
30543054
value actually restrict the value to some range, often to a
@@ -3475,7 +3475,8 @@ <h3>4.3.6 <a name="color-units">Colors</a></h3>
34753475
details. Note that only colors specified in CSS are affected; e.g.,
34763476
images are expected to carry their own color information.
34773477
</p>
3478-
<p>Values outside the device gamut should be clipped: the red, green,
3478+
<p>Values outside the device gamut should be clipped or
3479+
mapped into the gamut when the gamut is known: the red, green,
34793480
and blue values must be changed to fall within the range supported by
34803481
the device. Users agents may perform higher quality mapping of colors
34813482
from one gamut to another. For a typical CRT monitor, whose device
@@ -3495,10 +3496,9 @@ <h3>4.3.6 <a name="color-units">Colors</a></h3>
34953496
(inside the device gamut), while other colors inside the 0..255 sRGB
34963497
range will be outside the device gamut and will thus be mapped.
34973498
</p>
3498-
<div class=note><p><em><strong>Note.</strong> It is thus not possible
3499-
to simply clip all colors to the range 0..255. Clipping (or mapping)
3500-
must be done to the actual device gamut, which may be larger or
3501-
smaller than 0..255.</em>
3499+
<div class=note><p><em><strong>Note.</strong> Mapping or clipping of
3500+
color values should be done to the actual device gamut if known (which
3501+
may be larger or smaller than 0..255).</em>
35023502
</div>
35033503

35043504
<h3>4.3.7 <a name="strings">Strings</a></h3>
@@ -6389,7 +6389,7 @@ <H3>8.3.1 <a name="collapsing-margins">Collapsing margins</a></H3>
63896389

63906390
<p>An element's own margins are adjoining if the <a href="visudet.html#propdef-min-height" class="noxref"><span
63916391
class="propinst-min-height">'min-height'</span></a> property is zero, and
6392-
it has neither vertical borders nor vertical padding, and it has a
6392+
it has neither top or bottom borders nor top or bottom padding, and it has a
63936393
<a href="visudet.html#propdef-height" class="noxref"><span class="propinst-height">'height'</span></a> of either 0 or 'auto',
63946394
and it does not contain a line box, and all of its in-flow children's
63956395
margins (if any) are adjoining.</p>
@@ -12964,11 +12964,11 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
1296412964
box so that the next page is formatted as a right page.</dd>
1296512965
</dl>
1296612966

12967-
<P>Whether the first page of a document is :left or :right depends on
12967+
<p>Whether the first page of a document is :left or :right depends on
1296812968
the major writing direction of the document. A conforming user agent
1296912969
may interpret the values 'left' and 'right' as 'always'.
1297012970

12971-
<P>A potential page break location is typically under the influence
12971+
<p>A potential page break location is typically under the influence
1297212972
of the parent element's <a href="page.html#propdef-page-break-inside" class="noxref"><span
1297312973
class="propinst-page-break-inside">'page-break-inside'</span></a>
1297412974
property, the <a href="page.html#propdef-page-break-after" class="noxref"><span
@@ -12979,10 +12979,13 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
1297912979
than 'auto', the values 'always', 'left', and 'right' take precedence
1298012980
over 'avoid'.
1298112981

12982-
<P>User Agents must apply these properties to block-level elements
12982+
<p>User Agents must apply these properties to block-level elements
1298312983
in the normal flow of the root element. User agents may also apply
1298412984
these properties to other elements, e.g., 'table-row' elements.
1298512985

12986+
<p>When a page break splits a box, the box's margins, borders, and
12987+
padding have no visual effect where the split occurs.
12988+
1298612989

1298712990
<h3>13.3.2 <a name="break-inside">Breaks inside elements</a>: <a href="page.html#propdef-orphans" class="noxref"><span
1298812991
class="propinst-orphans">'orphans'</span></a>, <a href="page.html#propdef-widows" class="noxref"><span

css2/page.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,11 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
356356
box so that the next page is formatted as a right page.</dd>
357357
</dl>
358358

359-
<P>Whether the first page of a document is :left or :right depends on
359+
<p>Whether the first page of a document is :left or :right depends on
360360
the major writing direction of the document. A conforming user agent
361361
may interpret the values 'left' and 'right' as 'always'.
362362

363-
<P>A potential page break location is typically under the influence
363+
<p>A potential page break location is typically under the influence
364364
of the parent element's <a href="page.html#propdef-page-break-inside" class="noxref"><span
365365
class="propinst-page-break-inside">'page-break-inside'</span></a>
366366
property, the <a href="page.html#propdef-page-break-after" class="noxref"><span
@@ -371,10 +371,13 @@ <h3>13.3.1 <a name="page-break-props">Page break properties</a>: <a href="page.h
371371
than 'auto', the values 'always', 'left', and 'right' take precedence
372372
over 'avoid'.
373373

374-
<P>User Agents must apply these properties to block-level elements
374+
<p>User Agents must apply these properties to block-level elements
375375
in the normal flow of the root element. User agents may also apply
376376
these properties to other elements, e.g., 'table-row' elements.
377377

378+
<p>When a page break splits a box, the box's margins, borders, and
379+
padding have no visual effect where the split occurs.
380+
378381

379382
<h3>13.3.2 <a name="break-inside">Breaks inside elements</a>: <a href="page.html#propdef-orphans" class="noxref"><span
380383
class="propinst-orphans">'orphans'</span></a>, <a href="page.html#propdef-widows" class="noxref"><span

css2/syndata.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ <h3><a name="q15">4.3.1 Integers and real numbers</a></h3>
808808
be an &lt;integer&gt;, or it can be zero or more digits followed by a
809809
dot (.) followed by one or more digits. Both integers and real numbers
810810
may be preceded by a "-" or "+" to indicate the sign.
811-
</p>
811+
-0 is equivalent to 0 and is not a negative number.</p>
812812

813813
<p>Note that many properties that allow an integer or real number as a
814814
value actually restrict the value to some range, often to a
@@ -1235,7 +1235,8 @@ <h3>4.3.6 <a name="color-units">Colors</a></h3>
12351235
details. Note that only colors specified in CSS are affected; e.g.,
12361236
images are expected to carry their own color information.
12371237
</p>
1238-
<p>Values outside the device gamut should be clipped: the red, green,
1238+
<p>Values outside the device gamut should be clipped or
1239+
mapped into the gamut when the gamut is known: the red, green,
12391240
and blue values must be changed to fall within the range supported by
12401241
the device. Users agents may perform higher quality mapping of colors
12411242
from one gamut to another. For a typical CRT monitor, whose device
@@ -1255,10 +1256,9 @@ <h3>4.3.6 <a name="color-units">Colors</a></h3>
12551256
(inside the device gamut), while other colors inside the 0..255 sRGB
12561257
range will be outside the device gamut and will thus be mapped.
12571258
</p>
1258-
<div class=note><p><em><strong>Note.</strong> It is thus not possible
1259-
to simply clip all colors to the range 0..255. Clipping (or mapping)
1260-
must be done to the actual device gamut, which may be larger or
1261-
smaller than 0..255.</em>
1259+
<div class=note><p><em><strong>Note.</strong> Mapping or clipping of
1260+
color values should be done to the actual device gamut if known (which
1261+
may be larger or smaller than 0..255).</em>
12621262
</div>
12631263

12641264
<h3>4.3.7 <a name="strings">Strings</a></h3>

0 commit comments

Comments
 (0)