Skip to content

Commit 15600a5

Browse files
bert-githubbert-github
committed
[css2] Edits by Ian Hickson.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402105
1 parent 233cc4b commit 15600a5

9 files changed

Lines changed: 454 additions & 315 deletions

File tree

‎css2/about.src‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.52 2003-04-29 15:47:01 bbos Exp $ -->
5+
<!-- $Id: about.src,v 2.53 2003-07-01 15:42:14 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -355,13 +355,24 @@ the long description is denoted by a "[D]" to the right of the image.
355355
href="http://www.w3.org/TR/REC-CSS2/about.html#q15">acknowledgments
356356
section of CSS2</a> for the people that contributed to CSS2.
357357

358-
<p>Fantasai for clarifications related to backgrounds on table
359-
elements (17.5.1 and 17.6.1) and other ambiguities.
358+
<p>We would like to thank the following people who, through their
359+
input and feedback on the www-style mailing list, have helped us with
360+
the creation of this specification: Andrew Clover, Bernd Mielke, C.
361+
Bottelier, Christian Roth, Christoph P&auml;per, Claus F&auml;rber,
362+
Coises, Craig Saila, Darren Ferguson, Dylan Schiemann, Etan Wexler,
363+
George Lund, James Craig, Jan Eirik Olufsen, Jan Roland Eriksson,
364+
Joris Huizer, Joshua Prowse, Kai Lahmann, Kevin Smith, Lachlan Cannon,
365+
Lars Knoll, Lars Knoll, Lauri Raittila, Mark Gallagher, Michael Day,
366+
Peter Sheerin, Peter Sheerin, Rijk van Geijtenbeek, Robin Berjon,
367+
Scott Montgomery, Shelby Moore, Stuart Ballard, Tom Gilder, Vadim
368+
Plessky, and the Open eBook Publication Structure Working Group
369+
Editors. We would also like to thank Glenn Adams and Susan Lesch, who
370+
helped proofread this document.</p>
371+
372+
<p>In addition, we would like to extend special thanks to fantasai,
373+
Ada Chan, and Boris Zbarsky, who have both contributed significant
374+
time to CSS2.1.</p>
360375

361-
<p>Kevin Smith for pointing out a mistake in the "Applies to" line for
362-
'float'.
363-
364-
<p>...
365376

366377
<H2><a name="copyright">Copyright Notice</a></H2>
367378

‎css2/box.src‎

Lines changed: 55 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: box.src,v 1.34 2003-06-05 17:33:32 bbos Exp $ -->
3+
<!-- $Id: box.src,v 1.35 2003-07-01 15:42:14 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Box model</TITLE>
@@ -163,7 +163,7 @@ LI boxes <a href="#collapsing-margins">collapse.</a>
163163
effect is apparent in the second illustration.
164164

165165
<li>The margins of the LI boxes are transparent &mdash; margins are always
166-
transparent &mdash; so the background color (green) of the UL padding and
166+
transparent &mdash; so the background color (yellow) of the UL padding and
167167
content areas shines through them.
168168

169169
<li>The second LI element specifies a dashed border (the
@@ -298,23 +298,62 @@ href="visuren.html#absolutely-positioned">absolutely</a>
298298
positioned boxes do not collapse (not even with their
299299
in-flow children).
300300

301-
<ins>
302-
<!-- suggested in http://lists.w3.org/Archives/Member/w3c-css-wg/2002OctDec/0022.html -->
303-
<li>If the top and bottom margins of a box are adjacent, then it is
304-
possible for margins to collapse <em>through</em> it. In this case,
305-
the top of the box is defined to be where it would have been if the
306-
box's margins had not been adjacent.
301+
<li id="collapsed-through">
302+
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0446.html">
303+
If the top and bottom margins of a box are adjacent, then it is
304+
possible for margins to collapse through it. In this case, the
305+
position of the element depends on its relationship with the other
306+
elements whose margins are being collapsed.
307+
<ul><li>If the element's margins are collapsed with its parent's top
308+
margin, the top border edge of the box is defined to be the same as
309+
the parent's.</li>
310+
<li>Otherwise, either the element's parent is not taking part in the
311+
margin collapsing, or only the parent's bottom margin is involved. The
312+
position of the element's top border edge is the same as it would have
313+
been if the element had a non-zero top border.</li></ul>
314+
<p>Note that the positions of elements that have been collapsed
315+
through have no effect on the positions of the other elements with
316+
whose margins they are being collapsed; the top border edge position
317+
is only required for laying out descendants of these
318+
elements.</p>
307319
</ins>
320+
</li>
321+
308322
</ul>
309323

324+
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0455.html">
325+
<div id="what-is-adjacent">
326+
327+
<p>The bottom margin of an in-flow block-level element is always
328+
adjacent to the top margin of its next in-flow block-level
329+
sibling.</p>
330+
331+
<p>The top margin of an in-flow block-level element is adjacent to its
332+
first in-flow block-level child's top margin if the element has no top
333+
border and no top padding.</p>
334+
335+
<p>The bottom margin of an in-flow block-level element with a <span
336+
class="propinst-height">'height'</span> of 'auto' and <span
337+
class="propinst-min-height">'min-height'</span> less than the
338+
element's used height is adjacent to its last in-flow block-level
339+
child's bottom margin if the element has no bottom padding or
340+
border.</p>
341+
342+
<p>An element's own margins are adjacent if the <span
343+
class="propinst-min-height">'min-height'</span> property is zero, and
344+
it has neither vertical borders nor vertical padding, and it has a
345+
<span class="propinst-height">'height'</span> of either 0 or 'auto',
346+
and it does not contains a line box, and all of its in-flow children's
347+
margins (if any) are adjacent.</p>
348+
310349
<p>Collapsing is based on the <em>computed value</em> of <span
311350
class="propinst-padding">'padding'</span>, <span
312-
class="propinst-margin">'margin'</span>, <span
313-
class="propinst-border">'border'</span> and <span
314-
class="propinst-height">'height'</span>: content is empty if its
315-
height is zero, padding and border are absent if their width is zero,
316-
and the collapsed margin is calculated over the computed value of the
317-
various margins.
351+
class="propinst-margin">'margin'</span>, and <span
352+
class="propinst-border">'border'</span>. The collapsed margin is
353+
calculated over the computed value of the various margins.</p>
354+
355+
</div>
356+
</ins>
318357

319358
<P>Please
320359
consult the <a href="#mpb-examples">examples of margin, padding, and
@@ -687,9 +726,9 @@ important.
687726
Consider this example:
688727
<PRE>
689728
blockquote {
690-
border-color: red;
729+
border: solid red;
691730
border-left: double;
692-
color: black
731+
color: black;
693732
}
694733
</PRE>
695734

‎css2/cover.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ href="http://www.w3.org/TR/">http://www.w3.org/TR</a>.</p>
222222
<!-- Keep this comment at the end of the file
223223
Local variables:
224224
mode: sgml
225-
sgml-declaration:"~/SGML/HTML4.decl"
225+
sgml-declaration:"~/SGML/HTML4.dcl"
226226
sgml-default-doctype-name:"html"
227227
sgml-minimize-attributes:t
228228
sgml-nofill-elements:("pre" "style" "br")

‎css2/grammar.src‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: grammar.src,v 2.29 2003-01-15 18:29:44 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.30 2003-07-01 15:42:14 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Appendix: grammar of CSS&nbsp;2.1</TITLE>
@@ -114,7 +114,7 @@ term
114114
: unary_operator?
115115
[ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
116116
TIME S* | FREQ S* | function ]
117-
| STRING S* | IDENT S* | URI S* | UNICODERANGE S* | hexcolor
117+
| STRING S* | IDENT S* | URI S* | <del cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0330.html">UNICODERANGE S* |</del> hexcolor
118118
;
119119
function
120120
: FUNCTION S* expr ')' S*
@@ -211,8 +211,10 @@ range \?{1,6}|{h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
211211
"url("{w}{url}{w}")" {return URI;}
212212
{ident}"(" {return FUNCTION;}
213213

214+
<del cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0330.html">
214215
U\+{range} {return UNICODERANGE;}
215216
U\+{h}{1,6}-{h}{1,6} {return UNICODERANGE;}
217+
</del>
216218

217219
. {return *yytext;}
218220
</pre>

0 commit comments

Comments
 (0)