Skip to content

Commit ea41c28

Browse files
bert-githubbert-github
committed
[css2] Did some outstanding edits from issues list
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402120
1 parent 65ac245 commit ea41c28

7 files changed

Lines changed: 44 additions & 17 deletions

File tree

‎css2/box.src‎

Lines changed: 3 additions & 1 deletion
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: box.src,v 1.36 2003-08-11 23:25:00 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.37 2003-08-18 14:19:35 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -747,6 +747,7 @@ relevant.
747747
</div>
748748

749749

750+
<ins cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003JulSep/0280.html">
750751
<h2>The border model for inline elements</h2>
751752

752753
<p>For each line box, UAs must take the inline boxes generated for
@@ -766,6 +767,7 @@ right-most generated box of the first line box in which the element
766767
appears has a right padding, right border and right margin, and the
767768
left-most generated box of the last line box in which the element
768769
appears has a left margin, left border and left padding.
770+
</ins>
769771

770772
</BODY>
771773
</HTML>

‎css2/grammar.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.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: grammar.src,v 2.31 2003-07-14 15:27:12 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.32 2003-08-18 14:19:35 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>
@@ -25,7 +25,7 @@ find anything in the spec that corresponded. -->
2525
<h2>Grammar</h2>
2626

2727
<P> The grammar below is <span class="index-inst"
28-
title="LL(1)">LL(1)</span> (but note that most UA's should not use it
28+
title="LALR(1)">LALR(1)</span> (but note that most UA's should not use it
2929
directly, since it doesn't express the <a
3030
href="syndata.html#parsing-errors">parsing conventions</a>, only the
3131
CSS&nbsp;2.1 syntax). The format of the productions is optimized for human
@@ -117,7 +117,7 @@ term
117117
: unary_operator?
118118
[ NUMBER S* | PERCENTAGE S* | LENGTH S* | EMS S* | EXS S* | ANGLE S* |
119119
TIME S* | FREQ S* | function ]
120-
| STRING S* | IDENT S* | URI S* | <del cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0330.html">UNICODERANGE S* |</del> hexcolor
120+
| STRING S* | IDENT S* | URI S* | hexcolor
121121
;
122122
function
123123
: FUNCTION S* expr ')' S*

‎css2/properties/properties.db‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ table-cell | table-caption | none | inherit;;
162162
no;;
163163
N/A;;
164164
all;;
165-
as specified
165+
see text
166166
*/
167167

168168
/* float;;
@@ -218,7 +218,7 @@ table-cell | table-caption | none | inherit;;
218218
no;;
219219
refer to height of containing block;;
220220
visual;;
221-
the percentage as specified or the absolute length; 'auto' if the property does not apply
221+
the percentage as specified or the absolute length; 0 if the property does not apply
222222
*/
223223
/* bottom;;
224224
<length> | <percentage> | auto | inherit;;
@@ -227,7 +227,7 @@ table-cell | table-caption | none | inherit;;
227227
no;;
228228
refer to height of containing block;;
229229
visual;;
230-
the percentage as specified or the absolute length; 'auto' if the property does not apply
230+
the percentage as specified or the absolute length; 0 if the property does not apply
231231
*/
232232
/* left;;
233233
<length> | <percentage> | auto | inherit;;
@@ -236,7 +236,7 @@ table-cell | table-caption | none | inherit;;
236236
no;;
237237
refer to width of containing block;;
238238
visual;;
239-
the percentage as specified or the absolute length; 'auto' if the property does not apply
239+
the percentage as specified or the absolute length; 0 if the property does not apply
240240
*/
241241
/* right;;
242242
<length> | <percentage> | auto | inherit;;
@@ -245,7 +245,7 @@ table-cell | table-caption | none | inherit;;
245245
no;;
246246
refer to width of containing block;;
247247
visual;;
248-
the percentage as specified or the absolute length; 'auto' if the property does not apply
248+
the percentage as specified or the absolute length; 0 if the property does not apply
249249
*/
250250

251251
/* z-index;;

‎css2/selector.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.0 Transitional//EN'>
22
<html lang="en">
3-
<!-- $Id: selector.src,v 2.71 2003-08-11 23:23:15 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.72 2003-08-18 14:19:35 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -1213,9 +1213,11 @@ letter combinations. In Dutch, for example, if the letter combination
12131213
"ij" appears at the beginning of a word, both letters should be
12141214
considered within the :first-letter pseudo-element.
12151215

1216-
<ins><p>If the letters that would form the first-letter are not in the
1216+
<ins>
1217+
<p>If the letters that would form the first-letter are not in the
12171218
same element, such as "'t" in <code>&lt;p>'&lt;em>t...</code>, the UA
1218-
should not apply the first-letter.</ins>
1219+
should not apply the first-letter.
1220+
</ins>
12191221

12201222
<div class="example"><p>
12211223
<a name="overlapping-example">The following example</a> illustrates

‎css2/syndata.src‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
22
"http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
33
<html lang="en">
4-
<!-- $Id: syndata.src,v 2.84 2003-07-21 14:39:28 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.85 2003-08-18 14:19:35 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Syntax and basic data types</title>
@@ -113,15 +113,16 @@ more restrictive grammar that is closer to the CSS level 2 language.
113113
stylesheet : [ CDO | CDC | S | statement ]*;
114114
statement : ruleset | at-rule;
115115
at-rule : ATKEYWORD S* any* [ block | ';' S* ];
116-
block : '{' S* [ any | block | ATKEYWORD S* | ';' <span class="insproposed">S*</span> ]* '}' S*;
116+
block : '{' S* [ any | block | ATKEYWORD S* | ';' S* ]* '}' S*;
117117
ruleset : selector? '{' S* declaration? [ ';' S* declaration? ]* '}' S*;
118118
selector : any+;
119119
declaration : DELIM? property S* ':' S* value;
120120
property : IDENT;
121121
value : [ any | block | ATKEYWORD S* ]+;
122122
any : [ IDENT | NUMBER | PERCENTAGE | DIMENSION | STRING
123123
| DELIM | URI | HASH | UNICODE-RANGE | INCLUDES
124-
| FUNCTION any* ')' | DASHMATCH | '(' any* ')' | '[' any* ']' ] S*;
124+
| FUNCTION S* any* ')' | DASHMATCH
125+
| '(' S* any* ')' | '[' S* any* ']' ] S*;
125126
</pre>
126127

127128
<p><a name="comment">COMMENT</a> tokens do not occur

‎css2/visudet.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.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visudet.src,v 2.69 2003-07-01 15:42:14 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.70 2003-08-18 14:19:35 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Visual formatting model details</TITLE>
@@ -65,6 +65,11 @@ are the bottom and left content edges of the last box of the ancestor.
6565
containing block.
6666
</ol>
6767

68+
<ins>
69+
<p>In paged media [...] absolutely positioned element may span several
70+
pages [...] containing block may span several pages [...]
71+
</ins>
72+
6873
<div class="example">
6974
<P>With no positioning, the containing blocks (C.B.) in the
7075
following document:</p>

‎css2/visuren.src‎

Lines changed: 18 additions & 1 deletion
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: visuren.src,v 2.98 2003-07-21 14:39:28 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.99 2003-08-18 14:19:35 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
@@ -396,6 +396,23 @@ href="tables.html">tables</a>).
396396
</dd>
397397
</dl>
398398

399+
<ins>
400+
<p>The computed value is the same as the specified value, except for
401+
positioned and floating elements (see <a
402+
href="#dis-pos-flo">Relationships between 'display', 'position', and
403+
'float'</a>) and for the root element. For the root element, the
404+
computed value is as follows:
405+
406+
<table border="1">
407+
<tr><th>Specified value </th><th style="width:30%">Computed value</th></tr>
408+
<tr><td>inline-table </td><td>table</td></tr>
409+
<tr><td>inline, run-in, table-row-group, table-column,
410+
table-column-group, table-header-group, table-footer-group, table-row,
411+
table-cell, table-caption, inline-block </td><td>block</td></tr>
412+
<tr><td>others </td><td>same as specified</td></tr>
413+
</table>
414+
</ins>
415+
399416
<p>Note that although the <a href="about.html#initial-value">initial
400417
value</a> of <span class="propinst-display">'display'</span> is
401418
'inline', rules in the user agent's <a

0 commit comments

Comments
 (0)