Skip to content

Commit 0b8c4a0

Browse files
committed
[css2] Tantek's edits
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402274
1 parent cfd3d6d commit 0b8c4a0

6 files changed

Lines changed: 45 additions & 30 deletions

File tree

css2/fonts.src

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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: fonts.src,v 2.78 2004-04-01 13:01:21 bbos Exp $ -->
4+
<!-- $Id: fonts.src,v 2.79 2005-03-02 03:18:35 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Fonts</title>
88
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9-
<!-- Changed by: Tantek Celik, 2004-03-29 -->
9+
<!-- Changed by: Tantek Celik, 2005-02-28 -->
1010
<style type="text/css">
1111
#AutoNumber2 td { text-align:center }
1212
</style>
@@ -169,9 +169,9 @@ as a last alternative. Generic font family names are keywords and must NOT be q
169169
</dl>
170170

171171
<p>If an unquoted font family name contains
172-
parentheses, brackets, and/or braces, they must still be either balanced or
173-
escaped per CSS grammar rules. Similarly, quote marks, semicolons,
174-
exclamation marks and commas within unquoted font family names must be escaped.
172+
parentheses, brackets, and/or braces, they must still be
173+
escaped per CSS grammar rules. Similarly, quotation marks (both single and double), semicolons,
174+
exclamation marks, commas, and leading slashes within unquoted font family names must be escaped.
175175
Font names containing any such characters or whitespace should be quoted:
176176
</p>
177177

css2/syndata.src

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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.106 2004-12-14 20:12:29 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.107 2005-03-02 03:18: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>
88
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
9-
<!-- Changed by: Tantek Celik, 2004-02-17 -->
9+
<!-- Changed by: Tantek Celik, 2005-02-28 -->
1010
<style type="text/css">
1111
span.colorsquare { float:left; width:5em; height:3em; text-align:center; padding:1.2em 0 .8em }
1212
span.colorname { font-weight:bold }
@@ -324,7 +324,8 @@ the whole of the at-rule and continue parsing after it.
324324
<p>CSS&nbsp;2.1 user agents must <span class="index-inst" title="ignore"><a
325325
href="#ignore">ignore</a></span> any <a
326326
href="cascade.html#at-import">'@import'</a> rule that occurs inside a <a
327-
href="#block">block</a> or that doesn't precede all rule sets.
327+
href="#block">block</a> or after any valid rule other than an @charset or
328+
an @import rule.
328329
</p>
329330

330331
<div class="illegal-example"><p>
@@ -553,7 +554,11 @@ errors</a></h2>
553554
sheet. This specification defines <span class="index-def"
554555
title="ignore"><a name="ignore"><dfn>ignore</dfn></a></span> to mean
555556
that the user agent parses the illegal part (in order to find its
556-
beginning and end), but otherwise acts as if it had not been there.
557+
beginning and end), but otherwise acts as if it had not been there.
558+
CSS2.1 reserves for future versions of CSS all property:value combinations
559+
and @-keywords that do not contain an identifier beginning with dash or
560+
underscore. Implementations must ignore such combinations (other than those
561+
introduced by future versions of CSS).
557562
</p>
558563
<!-- How are "beginning" and "end" defined? -IJ -->
559564

@@ -645,6 +650,12 @@ to:</p>
645650
<pre class="example">
646651
h1 { color: blue }
647652
</pre>
653+
654+
<p>Something inside an at-rule that is ignored because it is invalid,
655+
such as an invalid declaration within an @media-rule, does not make
656+
the entire at-rule invalid.
657+
</p>
658+
648659
</li>
649660
</ul>
650661

css2/tables.src

Lines changed: 5 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: tables.src,v 2.78 2004-12-14 20:12:29 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.79 2005-03-02 03:18:35 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -1093,7 +1093,10 @@ content. Empty cells and cells with the <span
10931093
class="propinst-visibility">'visibility'</span> property set to
10941094
'hidden' are considered to have no visible content. Visible content
10951095
includes "&amp;nbsp;" and other whitespace except ASCII CR ("\0D"), LF
1096-
("\0A"), tab ("\09"), and space ("\20").
1096+
("\0A"), tab ("\09"), and space ("\20"). Cells are empty if they
1097+
contain no in-flow nor floating content other than whitespace that has
1098+
been collapsed away by the <span
1099+
class="propinst-white-space">'white-space'</span> property handling.
10971100

10981101
<p>When this property has the value 'show', borders and backgrounds
10991102
are drawn around/behind empty cells (like normal cells).

css2/text.src

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
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: text.src,v 2.44 2004-04-01 13:01:22 bbos Exp $ -->
4+
<!-- $Id: text.src,v 2.45 2005-03-02 03:18:35 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Text</title>
88
<meta http-equiv="Content-Style-Type" content="text/css">
99
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
10-
<!-- Changed by: Tantek Celik, 2004-03-29 -->
10+
<!-- Changed by: Tantek Celik, 2005-02-28 -->
1111
<style type="text/css">
1212
.current,.proposed,span.delcurrent { background:#feb }
1313
ins.proposed,span.insproposed { background:#bfb }
@@ -242,9 +242,8 @@ anonymous inline element that surrounds the span element, causing
242242
the text "Help, help!" to be blue, with the blue underlining from
243243
the anonymous inline underneath it, the color being taken from the
244244
blockquote element. The <code>&lt;em&gt;text&lt;/em&gt;</code>
245-
in the em block is not
246-
underlined at all, as it is not contained in the same anonymous
247-
inline element. The final line of text is fuchsia, but the underline
245+
in the em block is also underlined,
246+
as it is in an in-flow block to which the underline is propagated. The final line of text is fuchsia, but the underline
248247
underneath it is still the blue underline from the anonymous inline
249248
element.
250249
</p>

css2/visufx.src

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
55
<title>Visual effects</title>
66
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
7-
<!-- Changed by: Tantek Celik, 2004-02-04 -->
7+
<!-- Changed by: Tantek Celik, 2005-02-28 -->
88
<style type="text/css">
99
.current,.proposed,span.delcurrent { background:#feb }
1010
ins.proposed,span.insproposed { background:#bfb }
@@ -52,7 +52,7 @@ to be positioned partly outside the box.
5252

5353
<p>Whenever overflow occurs, the <span
5454
class="propinst-overflow">'overflow'</span> property specifies
55-
whether a box is clipped to its content box, and if so, whether
55+
whether a box is clipped to its padding edge, and if so, whether
5656
a scrolling mechanism is provided to access any clipped out content.
5757
</p>
5858

@@ -110,8 +110,11 @@ native operating environment.
110110

111111
<p>
112112
UAs may apply the 'overflow' property set on the root element to
113-
the viewport (instead of the root element). HTML UAs may also apply
114-
the 'overflow' property from the BODY element to the viewport.
113+
the viewport (instead of the root element).
114+
The 'visible' value in this case must be interpreted as 'auto'.
115+
HTML UAs may also apply
116+
the 'overflow' property from the BODY element to the viewport,
117+
if the value on the HTML element is 'visible'
115118
</p>
116119

117120
<p>
@@ -228,9 +231,7 @@ region</dfn></span> defines what portion of an element's
228231
border box
229232
<!--<a
230233
href="conform.html#rendered-content">rendered content</a>-->
231-
is visible. By default, the clipping region has the same size and shape
232-
as the element's border box. However, the clipping region may be
233-
modified by the <span class="propinst-clip">'clip'</span> property.
234+
is visible. By default, the element is not clipped. However, the clipping region may be explicitly set with the <span class="propinst-clip">'clip'</span> property.
234235
</p>
235236

236237
<!-- #include src=properties/clip.srb -->

css2/visuren.src

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visuren.src,v 2.114 2004-08-06 19:22:29 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.115 2005-03-02 03:18:35 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
77
<meta name="editor" lang="tr" content="Tantek &Ccedil;elik">
8-
<!-- Changed by: Tantek Celik, 2004-02-17 -->
8+
<!-- Changed by: Tantek Celik, 2005-02-28 -->
99
<style type="text/css">
1010
.current,.proposed,span.delcurrent { background:#feb }
1111
ins.proposed,span.insproposed,li.insproposed { background:#bfb }
@@ -18,6 +18,9 @@ body>del,body>ins {display:block}
1818
<body>
1919
<h1>Visual formatting model</h1>
2020

21+
22+
Change "If the 'direction' property is 'ltr'" to "If the 'direction' property of the containing block is 'ltr'" in 9.4.3.
23+
2124
<h2>Introduction to the visual formatting model</h2>
2225

2326
<p>This chapter and the next describe the <span class="index-def"
@@ -539,7 +542,7 @@ As with the 'absolute' model, the box's margins do not collapse with any other m
539542
In the case of handheld, projection, screen, tty, and tv media types,
540543
the box is fixed with respect to the <a href="#viewport">viewport</a>
541544
and doesn't move when
542-
scrolled. In the case of the print media type, the box is rendered on every page, and is fixed with respect to the page, even if the page is seen through a <a href="#viewport">viewport</a>
545+
scrolled. In the case of the print media type, the box is rendered on every page, and is fixed with respect to the page box, even if the page is seen through a <a href="#viewport">viewport</a>
543546
(in the case of a print-preview, for example). For other media
544547
types, the presentation is undefined.
545548
Authors may wish to specify 'fixed' in a
@@ -883,10 +886,8 @@ position).
883886
value of 'left'.
884887
</p>
885888
<p>If neither 'left' nor 'right' is 'auto', the position is
886-
over-constrained, and one of them has to be ignored. If the
887-
'direction' property is 'ltr', the value of 'left' wins and 'right'
888-
becomes -'left'. If 'direction' is 'rtl', 'right' wins and 'left' is
889-
ignored.
889+
over-constrained, and one of them has to be ignored. If the 'direction' property of the containing block is 'ltr, the value of 'left' wins and 'right'
890+
becomes -'left'. If 'direction' of the containing block is 'rtl', 'right' wins and 'left' is ignored.
890891
</p>
891892
<div class="example">
892893
<p><strong>Example.</strong> The following three rules are equivalent:

0 commit comments

Comments
 (0)