Skip to content

Commit 645a3da

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402275
1 parent 0b8c4a0 commit 645a3da

6 files changed

Lines changed: 35 additions & 20 deletions

File tree

css2/fonts.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,9 @@ <h2>15.3 <a name="font-family-prop">Font family</a>: the <a href="fonts.html#pro
214214
</dl>
215215

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

css2/syndata.html

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,8 @@ <h3>4.1.5 <span class="index-def" title="at-rule">
376376
<p>CSS&nbsp;2.1 user agents must <span class="index-inst" title="ignore"><a name="x10"
377377
href="#ignore">ignore</a></span> any <a
378378
href="cascade.html#at-import">'@import'</a> rule that occurs inside a <a
379-
href="#block">block</a> or that doesn't precede all rule sets.
379+
href="#block">block</a> or after any valid rule other than an @charset or
380+
an @import rule.
380381
</p>
381382

382383
<div class="illegal-example"><P style="display:none">Illegal example(s):</P><p>
@@ -605,7 +606,11 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
605606
sheet. This specification defines <span class="index-def"
606607
title="ignore"><a name="ignore"><dfn>ignore</dfn></a></span> to mean
607608
that the user agent parses the illegal part (in order to find its
608-
beginning and end), but otherwise acts as if it had not been there.
609+
beginning and end), but otherwise acts as if it had not been there.
610+
CSS2.1 reserves for future versions of CSS all property:value combinations
611+
and @-keywords that do not contain an identifier beginning with dash or
612+
underscore. Implementations must ignore such combinations (other than those
613+
introduced by future versions of CSS).
609614
</p>
610615

611616

@@ -697,6 +702,12 @@ <h2>4.2 <a name="parsing-errors">Rules for handling parsing
697702
<pre class="example">
698703
h1 { color: blue }
699704
</pre>
705+
706+
<p>Something inside an at-rule that is ignored because it is invalid,
707+
such as an invalid declaration within an @media-rule, does not make
708+
the entire at-rule invalid.
709+
</p>
710+
700711
</li>
701712
</ul>
702713

css2/tables.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,10 @@ <h4> <a name="empty-cells">Borders and Backgrounds around empty cells:</a> the <
12281228
class="propinst-visibility">'visibility'</span></a> property set to
12291229
'hidden' are considered to have no visible content. Visible content
12301230
includes "&amp;nbsp;" and other whitespace except ASCII CR ("\0D"), LF
1231-
("\0A"), tab ("\09"), and space ("\20").
1231+
("\0A"), tab ("\09"), and space ("\20"). Cells are empty if they
1232+
contain no in-flow nor floating content other than whitespace that has
1233+
been collapsed away by the <a href="text.html#propdef-white-space" class="noxref"><span
1234+
class="propinst-white-space">'white-space'</span></a> property handling.
12321235

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

css2/text.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,9 +322,8 @@ <h3>16.3.1 <a name="lining-striking-props">Underlining, overlining, striking, an
322322
the text "Help, help!" to be blue, with the blue underlining from
323323
the anonymous inline underneath it, the color being taken from the
324324
blockquote element. The <code>&lt;em&gt;text&lt;/em&gt;</code>
325-
in the em block is not
326-
underlined at all, as it is not contained in the same anonymous
327-
inline element. The final line of text is fuchsia, but the underline
325+
in the em block is also underlined,
326+
as it is in an in-flow block to which the underline is propagated. The final line of text is fuchsia, but the underline
328327
underneath it is still the blue underline from the anonymous inline
329328
element.
330329
</p>

css2/visufx.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ <h2>11.1 <a name="overflow-clipping">Overflow and clipping</a></h2>
8080

8181
<p>Whenever overflow occurs, the <a href="visufx.html#propdef-overflow" class="noxref"><span
8282
class="propinst-overflow">'overflow'</span></a> property specifies
83-
whether a box is clipped to its content box, and if so, whether
83+
whether a box is clipped to its padding edge, and if so, whether
8484
a scrolling mechanism is provided to access any clipped out content.
8585
</p>
8686

@@ -153,8 +153,11 @@ <h3>11.1.1 <a name="overflow">Overflow</a>: the <a href="visufx.html#propdef-ove
153153

154154
<p>
155155
UAs may apply the 'overflow' property set on the root element to
156-
the viewport (instead of the root element). HTML UAs may also apply
157-
the 'overflow' property from the BODY element to the viewport.
156+
the viewport (instead of the root element).
157+
The 'visible' value in this case must be interpreted as 'auto'.
158+
HTML UAs may also apply
159+
the 'overflow' property from the BODY element to the viewport,
160+
if the value on the HTML element is 'visible'
158161
</p>
159162

160163
<p>
@@ -264,9 +267,7 @@ <h3>11.1.2 <a name="clipping">Clipping</a>: the <a href="visufx.html#propdef-cli
264267
region</dfn></span></a> defines what portion of an element's
265268
border box
266269

267-
is visible. By default, the clipping region has the same size and shape
268-
as the element's border box. However, the clipping region may be
269-
modified by the <a href="visufx.html#propdef-clip" class="noxref"><span class="propinst-clip">'clip'</span></a> property.
270+
is visible. By default, the element is not clipped. However, the clipping region may be explicitly set with the <a href="visufx.html#propdef-clip" class="noxref"><span class="propinst-clip">'clip'</span></a> property.
270271
</p>
271272

272273
<div class="propdef">

css2/visuren.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,9 @@ <h1><a name="q0">9 Visual formatting model</a></h1>
9191
</ul>
9292
</div>
9393

94+
95+
Change "If the 'direction' property is 'ltr'" to "If the 'direction' property of the containing block is 'ltr'" in 9.4.3.
96+
9497
<h2><a name="q1">9.1 Introduction to the visual formatting model</a></h2>
9598

9699
<p>This chapter and the next describe the <a name="x0"><span class="index-def"
@@ -640,7 +643,7 @@ <h3>9.3.1 <a name="choose-position">Choosing a positioning scheme:</a> <a href="
640643
In the case of handheld, projection, screen, tty, and tv media types,
641644
the box is fixed with respect to the <a href="#viewport">viewport</a>
642645
and doesn't move when
643-
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>
646+
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>
644647
(in the case of a print-preview, for example). For other media
645648
types, the presentation is undefined.
646649
Authors may wish to specify 'fixed' in a
@@ -1063,10 +1066,8 @@ <h3>9.4.3 <a name="relative-positioning">Relative positioning</a></h3>
10631066
value of 'left'.
10641067
</p>
10651068
<p>If neither 'left' nor 'right' is 'auto', the position is
1066-
over-constrained, and one of them has to be ignored. If the
1067-
'direction' property is 'ltr', the value of 'left' wins and 'right'
1068-
becomes -'left'. If 'direction' is 'rtl', 'right' wins and 'left' is
1069-
ignored.
1069+
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'
1070+
becomes -'left'. If 'direction' of the containing block is 'rtl', 'right' wins and 'left' is ignored.
10701071
</p>
10711072
<div class="example"><P style="display:none">Example(s):</P>
10721073
<p><strong>Example.</strong> The following three rules are equivalent:

0 commit comments

Comments
 (0)