Skip to content

Commit 8c2c652

Browse files
bert-githubbert-github
committed
[css2] Issues 166, 167, 168, 169, 171, 174, 175, 176, 177, 180, 184, 188, 189, 193, and 200 from http://wiki.csswg.org/spec/css2.1
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403013
1 parent 9402b23 commit 8c2c652

15 files changed

Lines changed: 330 additions & 91 deletions

‎css2/about.src‎

Lines changed: 11 additions & 10 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: about.src,v 2.80 2010-02-11 15:46:53 bbos Exp $ -->
4+
<!-- $Id: about.src,v 2.81 2010-08-06 19:42:21 bbos Exp $ -->
55
<HEAD>
66
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
77
</HEAD>
@@ -146,8 +146,9 @@ information that resembles the following:</p>
146146
<h4><a name="value-defs">Value</a></h4>
147147

148148
<P>This part specifies the set of valid values for the property whose
149-
name is <span class="propinst-property-name">'property-name'</span>. Value
150-
types may be designated in several ways:
149+
name is <span class="propinst-property-name">'property-name'</span>. A property
150+
value can have one or more components. Component value types are designated
151+
in several ways:
151152

152153
<ol>
153154
<li> <a name="syndata.html#keywords">keyword</a> values (e.g., auto,
@@ -182,7 +183,7 @@ the corresponding value definition.
182183
literally, without quotes (e.g., red). The slash (/) and the comma (,)
183184
must also appear literally.
184185

185-
<P>Values may be arranged as follows:</p>
186+
<P>Component values may be arranged into property values as follows:</p>
186187

187188
<ul>
188189
<li>Several juxtaposed words mean that all of them must occur, in the
@@ -191,7 +192,7 @@ given order.
191192
exactly one of them must occur.
192193
<li>A double bar (||) separates
193194
two or more options: one or more of them must occur, in any order.
194-
<li>A double ampersand (&&) separates two or more values all of which
195+
<li>A double ampersand (&&) separates two or more components, all of which
195196
must occur, in any order.
196197
<li>Brackets ([&nbsp;]) are for grouping.
197198
</ul>
@@ -238,10 +239,10 @@ the following modifiers:</p>
238239
<EM>Value:</EM> inset? && [ &lt;length&gt;{2,4} && &lt;color&gt;? ]
239240
</BLOCKQUOTE>
240241

241-
<p>Value types are specified in terms of tokens, as described in <a
242+
<p>Component values are specified in terms of tokens, as described in <a
242243
href="grammar.html#scanner">Appendix G.2</a>. As the grammar allows spaces
243244
between tokens in the components of the <code>expr</code> production,
244-
spaces may appear between tokens in values.
245+
spaces may appear between tokens in property values.
245246

246247
<p class=note>Note: In many cases, spaces will in fact be
247248
<em>required</em> between tokens in order to distinguish them from
@@ -257,7 +258,7 @@ and '2em'.
257258
<P>This part specifies the property's initial value. Please consult
258259
the section on <a href="cascade.html">the cascade</a> for information
259260
about the interaction between style sheet-specified, inherited, and
260-
initial values.
261+
initial property values.
261262

262263

263264
<h4><a name="applies-to">Applies to</a></h4>
@@ -273,14 +274,14 @@ class="propinst-clear">'clear'</span> property only affects block-level elements
273274
from an ancestor element. Please consult the section on <a
274275
href="cascade.html">the cascade</a> for information about the
275276
interaction between style sheet-specified, inherited, and initial
276-
values.
277+
property values.
277278

278279

279280
<h4><a name="percentage-wrt">Percentage values</a></h4>
280281

281282
<p>This part indicates how percentages should be interpreted, if they occur in
282283
the value of the property. If "N/A" appears here, it means that the
283-
property does not accept percentages as values.
284+
property does not accept percentages in its values.
284285

285286
<h4><a name="media-applies">Media groups</a></h4>
286287

‎css2/box.src‎

Lines changed: 7 additions & 7 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.77 2010-05-19 15:07:09 bbos Exp $ -->
4+
<!-- $Id: box.src,v 1.78 2010-08-06 19:42:21 bbos Exp $ -->
55
<HEAD>
66
<TITLE>Box model</TITLE>
77
</HEAD>
@@ -241,7 +241,7 @@ class="propinst-margin-bottom">'margin-bottom'</span>, and <span
241241
class="propinst-margin-left">'margin-left'</span> at the same place in
242242
the style sheet.
243243

244-
<P> If there is only one value, it applies to all
244+
<P> If there is only one component value, it applies to all
245245
sides. If there are two values, the top and bottom margins
246246
are set to the first value and the right and left margins are
247247
set to the second. If there are three values, the top is
@@ -441,7 +441,7 @@ class="propinst-padding-bottom">'padding-bottom'</span>, and <span
441441
class="propinst-padding-left">'padding-left'</span> at the same place
442442
in the style sheet.
443443

444-
<P> If there is only one value, it applies to all
444+
<P> If there is only one component value, it applies to all
445445
sides. If there are two values, the top and bottom paddings
446446
are set to the first value and the right and left paddings are
447447
set to the second. If there are three values, the top is
@@ -537,7 +537,7 @@ and left border of a box.
537537
<span class="propinst-border-left-width">'border-left-width'</span> at
538538
the same place in the style sheet.
539539

540-
<P> If there is only one value, it applies to all
540+
<P> If there is only one component value, it applies to all
541541
sides. If there are two values, the top and bottom borders
542542
are set to the first value and the right and left are
543543
set to the second. If there are three values, the top is
@@ -584,8 +584,8 @@ class="value-inst-color"><strong>&lt;color&gt;</strong></span></span>
584584

585585

586586
<P>The <span class="propinst-border-color">'border-color'</span>
587-
property can have from one to four values, and the values are set on
588-
the different sides as for <span
587+
property can have from one to four component values, and the values
588+
are set on the different sides as for <span
589589
class="propinst-border-width">'border-width'</span>.
590590

591591
<P>If an element's border color is not specified
@@ -674,7 +674,7 @@ interpret 'dotted', 'dashed', 'double', 'groove', 'ridge',
674674

675675
<P> The <span class="propinst-border-style">'border-style'</span>
676676
property sets the style of the four borders. It can have from one to
677-
four values, and the values are set on the different sides as for
677+
four component values, and the values are set on the different sides as for
678678
<span class="propinst-border-width">'border-width'</span> above.
679679

680680
<div class="example"><P>

‎css2/cascade.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: cascade.src,v 2.68 2009-08-06 21:05:30 dbaron Exp $ -->
3+
<!-- $Id: cascade.src,v 2.69 2010-08-06 19:42:21 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
66
</HEAD>
@@ -136,6 +136,11 @@ actual value of <span class="propinst-font-size">'font-size'</span>
136136
for both H1 and EM might be, for example, '12pt'.
137137
</div>
138138

139+
<p class=note>Note that inheritance follows the document tree and is
140+
not intercepted by <a href="visuren.html#box-gen"><span
141+
class=index-inst>anonymous boxes.</span></a>
142+
143+
139144
<h3>The <span class="index-def" title="inherit, definition
140145
of"><a name="value-def-inherit">'inherit'</a></span>
141146
value</h3>

0 commit comments

Comments
 (0)