Skip to content

Commit 0460969

Browse files
committed
[css2] Edits 62, 120, 142, 143, 144, 147, 148, 151, 153, 154, 157, 158 from issues list
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402408
1 parent ba255b1 commit 0460969

10 files changed

Lines changed: 78 additions & 48 deletions

File tree

css2/about.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: about.src,v 2.69 2006-03-03 17:05:58 bbos Exp $ -->
4+
<!-- $Id: about.src,v 2.70 2006-04-06 21:32:24 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -341,7 +341,7 @@ class="propinst-font-style">'font-style'</span>
341341
take their initial values.</p>
342342
</div>
343343

344-
<h3 id="notes-and-example">Notes and examples</h3>
344+
<h3 id="notes-and-examples">Notes and examples</h3>
345345

346346
<P>All examples that illustrate illegal usage are clearly
347347
marked as "ILLEGAL EXAMPLE".

css2/cascade.src

Lines changed: 3 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.58 2006-03-31 13:34:18 howcome Exp $ -->
3+
<!-- $Id: cascade.src,v 2.59 2006-04-06 21:32:24 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -237,8 +237,8 @@ if it did).
237237
href="conform.html#conformance">Conforming user agents</a> must apply
238238
a <span class="index-def" title="default style sheet"><a
239239
name="default-style-sheet"><dfn>default style sheet</dfn></a></span>
240-
(or behave as if they did) prior to all other style sheets for a
241-
document. A user agent's default style sheet should present the
240+
(or behave as if they did). A user agent's default style sheet should
241+
present the
242242
elements of the document language in ways that satisfy general
243243
presentation expectations for the document language (e.g., for visual
244244
browsers, the EM element in HTML is presented using an italic

css2/changes.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: changes.src,v 2.50 2006-01-24 06:50:24 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.51 2006-04-06 21:32:24 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -14,6 +14,11 @@ CSS2 specification (see [[CSS2]]) and this specification fall into
1414
five groups: known errors, typographical errors, clarifications,
1515
changes and additions. Typographical errors are not listed here.</P>
1616

17+
<p>This chapter is not a complete list of changes. For changes not
18+
listed here, please see the "disposition of comments" document that is
19+
published at the time this specification becomes a Candidate
20+
Recommendation.
21+
1722

1823
<h2><a name="new">Additional property values</a></h2>
1924

css2/colors.src

Lines changed: 21 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: colors.src,v 2.42 2005-10-18 06:52:08 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.43 2006-04-06 21:32:24 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
@@ -146,6 +146,26 @@ p { background-image: none }
146146
</pre>
147147
</div>
148148

149+
<p>Intrinsic dimensions expressed as percentages must be resolved
150+
relative to the dimensions of the rectangle that establishes the
151+
coordinate system for the <span
152+
class="propinst-background-position">'background-position'</span>
153+
property.
154+
</p>
155+
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
156+
the dimensions must be assumed to be the largest dimensions at that
157+
ratio such that neither dimension exceeds the dimensions of the
158+
rectangle that establishes the coordinate system for the <span
159+
class="propinst-background-position">'background-position'</span>
160+
property.
161+
</p>
162+
<p>If the image has no intrinsic ratio either, then the dimensions
163+
must be assumed to be the rectangle that establishes the coordinate
164+
system for the <span
165+
class="propinst-background-position">'background-position'</span>
166+
property.
167+
</p>
168+
149169
<!-- #include src=properties/background-repeat.srb -->
150170

151171
<p>If a background image is specified, this property specifies whether

css2/grammar.src

Lines changed: 6 additions & 5 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: grammar.src,v 2.44 2006-01-24 06:50:24 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.45 2006-04-06 21:32:24 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Grammar of CSS&nbsp;2.1</TITLE>
@@ -41,7 +41,7 @@ used:</P>
4141

4242
<pre>
4343
stylesheet
44-
: [ CHARSET_SYM S* STRING S* ';' ]?
44+
: [ CHARSET_SYM STRING ';' ]?
4545
[S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
4646
[ [ ruleset | media | page ] [S|CDO|CDC]* ]*
4747
;
@@ -157,14 +157,15 @@ string2 \'([^\n\r\f\\']|\\{nl}|{escape})*\'
157157
invalid1 \"([^\n\r\f\\"]|\\{nl}|{escape})*
158158
invalid2 \'([^\n\r\f\\']|\\{nl}|{escape})*
159159

160+
comment \/\*[^*]*\*+([^/*][^*]*\*+)*\/
160161
ident -?{nmstart}{nmchar}*
161162
name {nmchar}+
162163
num [0-9]+|[0-9]*"."[0-9]+
163164
string {string1}|{string2}
164165
invalid {invalid1}|{invalid2}
165166
url ([!#$%&amp;*-~]|{nonascii}|{escape})*
166167
s [ \t\r\n\f]
167-
w {s}*
168+
w ({s}|{comment})*
168169
nl \n|\r\n|\r|\f
169170

170171
A a|\\0{0,4}(41|61)(\r\n|[ \t\r\n\f])?
@@ -186,7 +187,7 @@ Z z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
186187

187188
%%
188189

189-
{s}+ {return S;}
190+
{s} {return S;}
190191

191192
\/\*[^*]*\*+([^/*][^*]*\*+)*\/ /* ignore comments */
192193
{s}+\/\*[^*]*\*+([^/*][^*]*\*+)*\/ {unput(' '); /*replace by space*/}
@@ -211,7 +212,7 @@ Z z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
211212
"@import" {return IMPORT_SYM;}
212213
"@page" {return PAGE_SYM;}
213214
"@media" {return MEDIA_SYM;}
214-
"@charset" {return CHARSET_SYM;}
215+
"@charset " {return CHARSET_SYM;}
215216

216217
"!"{w}"important" {return IMPORTANT_SYM;}
217218

css2/images/tbl-empty.png

158 Bytes
Loading

css2/properties/properties.db

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<margin-width> | inherit;;
2626
0;;
2727
all elements except elements with table display
28-
types other than table and inline-table;;
28+
types other than table-caption, table and inline-table;;
2929
no;;
3030
refer to width of containing block;;
3131
visual;;
@@ -36,7 +36,7 @@
3636
<margin-width> | inherit;;
3737
0;;
3838
all elements except elements with table display
39-
types other than table and inline-table;;
39+
types other than table-caption, table and inline-table;;
4040
no;;
4141
refer to width of containing block;;
4242
visual;;
@@ -47,7 +47,7 @@
4747
<margin-width>{1,4} | inherit;;
4848
see individual properties;;
4949
all elements except elements with table display
50-
types other than table and inline-table;;
50+
types other than table-caption, table and inline-table;;
5151
no;;
5252
refer to width of containing block;;
5353
visual;;
@@ -57,8 +57,7 @@
5757
/* padding-top padding-right padding-bottom padding-left;;
5858
<padding-width> | inherit;;
5959
0;;
60-
all elements except elements with table display
61-
types other than table, inline-table, and table-cell;;
60+
all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column;;
6261
no;;
6362
refer to width of containing block;;
6463
visual;;
@@ -67,8 +66,7 @@
6766
/* padding;;
6867
<padding-width>{1,4} | inherit;;
6968
see individual properties;;
70-
all elements except elements with table display
71-
types other than table, inline-table, and table-cell;;
69+
all elements except table-row-group, table-header-group, table-footer-group, table-row, table-column-group and table-column;;
7270
no;;
7371
refer to width of containing block;;
7472
visual;;

css2/syndata.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: syndata.src,v 2.117 2006-02-02 00:21:51 bbos Exp $ -->
3+
<!-- $Id: syndata.src,v 2.118 2006-04-06 21:32:24 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Syntax and basic data types</title>
@@ -160,7 +160,7 @@ red
160160
"red"
161161
</pre>
162162

163-
is not. (It is a <a href="#strings">string</a>.) Other illegal examples:
163+
<p>is not. (It is a <a href="#strings">string</a>.) Other illegal examples:
164164

165165
<div class="illegal-example">
166166
<pre><code>
@@ -269,7 +269,7 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
269269
stand for the ISO 10646 ([[ISO10646]])
270270
character with that number, which must not be zero.
271271
(It is undefined in CSS&nbsp;2.1 what happens if a style sheet
272-
<em>does</em> contain a zero.)
272+
<em>does</em> contain a character with Unicode codepoint zero.)
273273
If a character in the range [0-9a-fA-F] follows the hexadecimal number,
274274
the end of the number needs to be made clear. There are two ways
275275
to do that:
@@ -287,7 +287,8 @@ href="#parsing-errors">rules for handling parsing errors</a>. However, because t
287287
escaped or doubled.
288288
</p>
289289
</li>
290-
<li>Backslash escapes are always considered to be part of an <a
290+
<li class=note>Note: Backslash escapes, where allowed, are always
291+
considered to be part of an <a
291292
href="#value-def-identifier">identifier</a> or a string (i.e.,
292293
"\7B" is not punctuation, even though "{" is, and "\32" is allowed
293294
at the start of a class name, even though "2" is not).

css2/tables.src

Lines changed: 27 additions & 22 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: tables.src,v 2.93 2006-01-24 06:50:24 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.94 2006-04-06 21:32:24 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -635,16 +635,16 @@ background.
635635
extends from the top of the cells in the top row to the bottom of
636636
the cells on the bottom row and from the left edge of its leftmost
637637
column to the right edge of its rightmost column. The background
638-
extends to cover the full area of all cells that originate in the
639-
column group, but this extension does not affect background image
640-
positioning.
638+
covers exactly the full area of all cells that originate in the
639+
column group, even if they span outside the column group, but this
640+
difference in area does not affect background image positioning.
641641

642642
<li>On top of the column groups are the areas representing the
643643
column boxes. Each column is as tall as the column groups and as
644644
wide as a normal (single-column-spanning) cell in the column. The
645-
background extends to cover the full area of all cells that
646-
originate in the column, even if they span outside the column, but
647-
this extension does not affect background image positioning.
645+
background covers exactly the full area of all cells that originate
646+
in the column, even if they span outside the column, but this
647+
difference in area does not affect background image positioning.
648648

649649
<li>Next is the layer containing the row groups. Each row group
650650
extends from the top left corner of its topmost cell in the first
@@ -653,14 +653,17 @@ background.
653653

654654
<li>The next to last layer contains the rows. Each row is as wide as
655655
the row groups and as tall as a normal (single-row-spanning) cell in
656-
the row. As with columns, the background extends to cover the full
656+
the row. As with columns, the background covers exactly the full
657657
area of all cells that originate in the row, even if they span
658-
outside the row, but this extension does not affect background
659-
image positioning.
658+
outside the row, but this difference in area does not affect
659+
background image positioning.
660660

661661
<li>The topmost layer contains the cells themselves. As the figure
662662
shows, although all rows contain the same number of cells, not every
663-
cell may have specified content. If the value of their <span
663+
cell may have specified content.
664+
In the <a href="#separated-borders">separated borders model</a>
665+
(<span class="propinst-border-collapse">'border-collapse'</span> is
666+
'separate'), if the value of their <span
664667
class="propinst-empty-cells">'empty-cells'</span> property is 'hide'
665668
these "empty" cells are transparent through the cell, row, row
666669
group, column and column group backgrounds, letting the table
@@ -672,31 +675,33 @@ occupied by an element or pseudo-element. Missing cells are rendered
672675
as if an anonymous table-cell box occupied their position in the grid.
673676

674677
<div class="html-example">
675-
<p>In the following example, the first row contains four cells, but
676-
the second row contains no cells, and thus the table background shines
677-
through, except where a cell from the first row spans into this row.
678-
The following HTML code and style rules.
678+
<p>In the following example, the first row contains four non-empty
679+
cells, but the second row contains only one non-empty cell, and thus
680+
the table background shines through, except where a cell from the
681+
first row spans into this row. The following HTML code and style rules
679682

680683
<pre>
681684
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"&gt;
682685
&lt;HTML&gt;
683686
&lt;HEAD&gt;
684687
&lt;TITLE&gt;Table example&lt;/TITLE&gt;
685688
&lt;STYLE type="text/css"&gt;
686-
TABLE { background: #ff0; border: solid black;
687-
empty-cells: hide }
688-
TD { background: red; border: solid black }
689+
TABLE { background: #ff0; border: solid black;
690+
empty-cells: hide }
691+
TR.top { background: red }
692+
TD { border: solid black }
689693
&lt;/STYLE&gt;
690694
&lt;/HEAD&gt;
691695
&lt;BODY&gt;
692696
&lt;TABLE&gt;
693-
&lt;TR&gt;
697+
&lt;TR CLASS="top"&gt;
694698
&lt;TD&gt; 1
695699
&lt;TD rowspan="2"&gt; 2
696700
&lt;TD&gt; 3
697701
&lt;TD&gt; 4
698-
&lt;/TR&gt;
699-
&lt;TR&gt;&lt;TD&gt;&lt;/TD&gt;&lt;/TR&gt;
702+
&lt;TR&gt;
703+
&lt;TD&gt; 5
704+
&lt;TD&gt;
700705
&lt;/TABLE&gt;
701706
&lt;/BODY&gt;
702707
&lt;/HTML&gt;
@@ -708,7 +713,7 @@ The following HTML code and style rules.
708713
<p><img src="images/tbl-empty.png" alt="Table with three empty cells
709714
in bottom row">
710715

711-
<p class="caption">Table with three empty cells in the bottom row.
716+
<p class="caption">Table with empty cells in the bottom row.
712717
</div>
713718
</div>
714719

css2/text.src

Lines changed: 3 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: text.src,v 2.49 2005-09-13 19:16:22 bbos Exp $ -->
3+
<!-- $Id: text.src,v 2.50 2006-04-06 21:32:24 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Text</title>
@@ -158,7 +158,7 @@ positioned descendants, nor to the contents of 'inline-table' and
158158
'inline-block' descendants.
159159
</p><p>
160160
If an element contains no text (ignoring white space in elements
161-
that have 'white-space' set to 'normal', 'pre-line', or 'no-wrap'),
161+
that have 'white-space' set to 'normal', 'pre-line', or 'nowrap'),
162162
user agents must refrain from rendering text decorations on the
163163
element. For example, elements containing only images and collapsed
164164
white space will not be underlined.
@@ -436,7 +436,7 @@ there:
436436
<li>
437437
Each tab (U+0009), carriage return (U+000D), or space (U+0020)
438438
character surrounding a linefeed (U+000A) character is removed if
439-
'white-space' is set to 'normal', 'no-wrap', or 'pre-line'.
439+
'white-space' is set to 'normal', 'nowrap', or 'pre-line'.
440440
</li>
441441
<li>If 'white-space' is set to 'pre' or 'pre-wrap', any sequence of
442442
spaces (U+0020) unbroken by an element boundary is treated as a

0 commit comments

Comments
 (0)