Skip to content

Commit 52fc9b6

Browse files
committed
[css2] Edited issues 6, 8, 17, 21, 24, 31, 37, 39, 40, 41, 43, 45
from http://csswg.inkedblade.net/spec/css2.1 --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402851
1 parent 7c36185 commit 52fc9b6

13 files changed

Lines changed: 66 additions & 47 deletions

File tree

css2/box.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22

33
<html lang="en">
4-
<!-- $Id: box.src,v 1.70 2008-06-25 16:20:34 bbos Exp $ -->
4+
<!-- $Id: box.src,v 1.71 2008-08-18 19:17:48 bbos Exp $ -->
55
<HEAD>
66
<TITLE>Box model</TITLE>
77
</HEAD>
@@ -325,7 +325,7 @@ the parent's.</li>
325325
<li>Otherwise, either the element's parent is not taking part in the
326326
margin collapsing, or only the parent's bottom margin is involved. The
327327
position of the element's top border edge is the same as it would have
328-
been if the element had a non-zero top border.</li></ul>
328+
been if the element had a non-zero bottom border.</li></ul>
329329

330330
<p>An element that has had <a
331331
href="visuren.html#clearance">clearance</a> applied to it never

css2/cascade.src

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.63 2008-06-25 16:20:34 bbos Exp $ -->
3+
<!-- $Id: cascade.src,v 2.64 2008-08-18 19:17:48 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
66
</HEAD>
@@ -180,8 +180,10 @@ http://lists.w3.org/Archives/Member/w3c-css-wg/1998JanMar/0054.html
180180

181181
<P>The <span class="index-def"
182182
title="@import"><dfn>'@import'</dfn></span> rule allows users to
183-
import style rules from other style sheets. Any @import rules must
184-
precede all other rules (except the @charset rule, if present). The
183+
import style rules from other style sheets. In CSS&nbsp;2.1, any
184+
@import rules must precede all other rules (except the @charset rule,
185+
if present). See the <a href="syndata.html#at-rules">section on
186+
parsing</a> for when user agents must ignore @import rules. The
185187
'@import' keyword must be followed by the URI of the style sheet to
186188
include. A string is also allowed; it will be interpreted as if it had
187189
url(...) around it.

css2/changes.src

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.92 2008-07-10 18:22:43 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.93 2008-08-18 19:17:48 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Changes</TITLE>
66
</HEAD>
@@ -371,6 +371,10 @@ bottom margins.</p>
371371

372372
<p>More rigorously <a href="box.html#what-is-adjoining">defined "adjoining" for margin collapsing</a>.</p>
373373

374+
<p>Sixth bullet, second sub-bullet: to find the position of the top
375+
border edge, assume the element has a <em>bottom</em> (rather than
376+
top) border.
377+
374378
<h3 id="c8.4"><a href="box.html#padding-properties">Section 8.4 Padding properties</a></h3>
375379

376380
<p>If the containing block's width depends on an element with percentage
@@ -1827,6 +1831,10 @@ order</a></h3>
18271831
context" to "but any <ins>positioned descendants and<ins> descendants
18281832
which actually create a new stacking context" (3 times).
18291833

1834+
<p>This change also occurred once in <a
1835+
href="visuren.html#floats">section&nbsp;9.5 (Floats)</a> and once in
1836+
section <a href="visuren.html#layers">section&nbsp;9.9 (Layered
1837+
presentation).</a>
18301838

18311839

18321840
<h2><a name="clarifications">Clarifications</a></h2>

css2/page.src

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: page.src,v 2.54 2008-06-25 16:20:35 bbos Exp $ -->
3+
<!-- $Id: page.src,v 2.55 2008-08-18 19:17:48 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Paged media</TITLE>
66
</HEAD>
@@ -51,9 +51,11 @@ includes the boxes laid out on that page. The edges of the first page
5151
area establish the rectangle that is the initial <a
5252
href="visudet.html#containing-block-details">containing block</a> of
5353
the document.
54+
The canvas background is painted within and covers the page area.
5455

5556

5657
<li>The margin area, which surrounds the page area.
58+
The page margin area is transparent.
5759
</ul>
5860

5961
<p>The size of a page box cannot be specified in CSS 2.1.

css2/refs.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,13 @@ <H2><a name="q2">B.2 Informative references</a></H2>
166166
<dt><strong><a name="ref-CSS1" class="informref">[CSS1]</a></strong>
167167
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
168168
17 December 1996, revised 11 January 1999<BR>
169-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
169+
The latest version is available at <a href="http://www.w3.org/TR/CSS1">http://www.w3.org/TR/CSS1</a>
170170

171171
<dt><strong><a name="ref-CSS2" class="informref">[CSS2]</a></strong>
172172
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
173-
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
174-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2/">http://www.w3.org/TR/REC-CSS2/</a>
173+
W. Lie, C. Lilley and I. Jacobs, 12 May 1998 (revised 11 April 2008),<br>
174+
<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">
175+
http://www.w3.org/TR/2008/REC-CSS2-20080411/</a>
175176

176177
<dt><strong><a name="ref-CSS3COLOR" class="informref">[CSS3COLOR]</a></strong>
177178
<dd>"CSS3 Color Module," Tantek &Ccedil;elik, Chris Lilley, 14 May 2003,

css2/refs.src

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: refs.src,v 2.50 2008-06-25 16:20:35 bbos Exp $ -->
3+
<!-- $Id: refs.src,v 2.51 2008-08-18 19:17:49 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Bibliography</TITLE>
66
</HEAD>
@@ -142,12 +142,13 @@ http://www.iana.org/assignments/character-sets</A>. </DD>
142142
<dt><strong><a name="ref-CSS1" class="informref">[CSS1]</a></strong>
143143
<dd>"Cascading Style Sheets, level 1", H. W. Lie and B. Bos,
144144
17 December 1996, revised 11 January 1999<BR>
145-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS1">http://www.w3.org/TR/REC-CSS1</a>
145+
The latest version is available at <a href="http://www.w3.org/TR/CSS1">http://www.w3.org/TR/CSS1</a>
146146

147147
<dt><strong><a name="ref-CSS2" class="informref">[CSS2]</a></strong>
148148
<dd>"Cascading Style Sheets, level 2, CSS2 Specification", B. Bos, H.
149-
W. Lie, C. Lilley and I. Jacobs, 12 May 1998,<br>
150-
The latest version is available at <a href="http://www.w3.org/TR/REC-CSS2/">http://www.w3.org/TR/REC-CSS2/</a>
149+
W. Lie, C. Lilley and I. Jacobs, 12 May 1998 (revised 11 April 2008),<br>
150+
<a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">
151+
http://www.w3.org/TR/2008/REC-CSS2-20080411/</a>
151152

152153
<dt><strong><a name="ref-CSS3COLOR" class="informref">[CSS3COLOR]</a></strong>
153154
<dd>"CSS3 Color Module," Tantek &Ccedil;elik, Chris Lilley, 14 May 2003,

css2/sample.src

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: sample.src,v 2.46 2008-06-25 16:20:35 bbos Exp $ -->
3+
<!-- $Id: sample.src,v 2.47 2008-08-18 19:17:49 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Default style sheet for HTML 4</TITLE>
66
<!-- Changed by Kimberly Blessing, 2004-02-13 -->
@@ -87,8 +87,7 @@ ol { list-style-type: decimal }
8787
ol ul, ul ol,
8888
ul ul, ol ol { margin-top: 0; margin-bottom: 0 }
8989
u, ins { text-decoration: underline }
90-
br:before { content: "\A" }
91-
:before, :after { white-space: pre-line }
90+
br:before { content: "\A"; white-space: pre-line }
9291
center { text-align: center }
9392
:link, :visited { text-decoration: underline }
9493
:focus { outline: thin dotted invert }

css2/syndata.src

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: syndata.src,v 2.158 2008-06-25 16:20:35 bbos Exp $ -->
3+
<!-- $Id: syndata.src,v 2.159 2008-08-18 19:17:49 bbos Exp $ -->
44
<head>
55
<title>Syntax and basic data types</title>
66
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
@@ -636,7 +636,12 @@ img { }
636636
<p>A user agent conforming to a future CSS specification may accept one or
637637
more of the other rules as well.</p>
638638
</li>
639-
<li><strong>Malformed declarations.</strong> User agents must handle unexpected tokens encountered while parsing a declaration by reading until the end of the declaration, while observing the rules for matching pairs of (), [], {}, "", and '', and correctly handling escapes. For example, a malformed declaration may be missing a property, colon (:) or value. The following are all equivalent:
639+
<li><strong>Malformed declarations.</strong> User agents must handle
640+
unexpected tokens encountered while parsing a statement by reading
641+
until the end of the statement, while observing the rules for matching
642+
pairs of (), [], {}, "", and '', and correctly handling escapes. For
643+
example, a malformed statement may be missing a property, colon (:) or
644+
value. The following are all equivalent:
640645

641646

642647
<pre class="example"><code>

css2/tables.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,11 @@ <h3>17.2.1 <a name="anonymous-boxes">Anonymous table objects</a></h3>
371371
'table-column', 'table-column-group', and 'table-caption', including
372372
any anonymous 'table-row' boxes generated by rule&nbsp;1.
373373

374+
<li>If a child T of a 'table', 'inline-table', 'table-row-group',
375+
'table-header-group', 'table-footer-group', or 'table-row' box is an
376+
anonymous inline box that contains only white space, then it is
377+
treated as if it has 'display: none'.
378+
374379
<li>If a child T of a 'table' box (or 'inline-table') P is not a
375380
'table-row-group', 'table-header-group', 'table-footer-group',
376381
'table-caption', 'table-column', 'table-column-group' or 'table-row'

css2/tables.src

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: tables.src,v 2.105 2008-06-25 16:20:35 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.106 2008-08-18 19:17:49 bbos Exp $ -->
44
<head>
55
<title>Tables</title>
66
</head>
@@ -315,6 +315,11 @@ boxes in visual table layout) according to the following rules:
315315
'table-column', 'table-column-group', and 'table-caption', including
316316
any anonymous 'table-row' boxes generated by rule&nbsp;1.
317317

318+
<li>If a child T of a 'table', 'inline-table', 'table-row-group',
319+
'table-header-group', 'table-footer-group', or 'table-row' box is an
320+
anonymous inline box that contains only white space, then it is
321+
treated as if it has 'display: none'.
322+
318323
<li>If a child T of a 'table' box (or 'inline-table') P is not a
319324
'table-row-group', 'table-header-group', 'table-footer-group',
320325
'table-caption', 'table-column', 'table-column-group' or 'table-row'

0 commit comments

Comments
 (0)