Skip to content

Commit 43b5cb0

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402456
1 parent 6a0144b commit 43b5cb0

5 files changed

Lines changed: 37 additions & 31 deletions

File tree

css2/colors.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,11 @@ <h2><a name="q2">14.2 The background</a></h2>
105105
class="propinst-background-color">'background-color'</span></a>.
106106
</p>
107107
<p>
108-
The background of the root element becomes the background of the canvas and covers the entire <a href="intro.html#canvas">canvas</a>, anchored at the same point as it would be if it was painted only for the root element itself. The root element does not paint this background again.
108+
The background of the root element becomes the background of the canvas and
109+
covers the entire <a href="intro.html#canvas">canvas</a>, anchored (for
110+
<a href="colors.html#propdef-background-position" class="noxref"><span class="propinst-background-position">'background-position'</span></a>) at
111+
the same point as it would be if it was painted only for the root element
112+
itself. The root element does not paint this background again.
109113
</p>
110114

111115
<p>For HTML documents, however, we recommend that authors specify the
@@ -117,7 +121,8 @@ <h2><a name="q2">14.2 The background</a></h2>
117121
user agents must instead use the computed value of those properties
118122
from that HTML element's first BODY element child when painting
119123
backgrounds for the canvas, and must not paint a background for that
120-
BODY element.
124+
BODY element. Such backgrounds must also be anchored at the same point
125+
as they would be if they were painted only for the root element.
121126
This does not apply to XHTML documents.
122127
</p>
123128
<div class="html-example"><p>

css2/fonts.html

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -545,17 +545,6 @@ <h2>15.7 <a name="font-size-props">Font size</a>: the <a href="fonts.html#propde
545545
<td style="width:11%">xx-large</td>
546546
<td style="width:8%">&nbsp;</td>
547547
</tr>
548-
<tr>
549-
<th>HTML headings</th>
550-
<td>h6</td>
551-
<td>&nbsp;</td>
552-
<td>h5</td>
553-
<td>h4</td>
554-
<td>h3</td>
555-
<td>h2</td>
556-
<td>h1</td>
557-
<td>&nbsp;</td>
558-
</tr>
559548
<tr>
560549
<th>HTML font sizes</th>
561550
<td>1</td>

css2/syndata.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h3>4.1.1 <a name="tokenization">Tokenization</a></h3>
9999
exercising the possibilities of the latest levels of CSS.
100100
</p>
101101
<p>At the lexical level, CSS style sheets consist of a sequence of tokens.
102-
The list of tokens for CSS&nbsp;2.1 is as follows. The definitions use Lex-style
102+
The list of tokens for CSS is as follows. The definitions use Lex-style
103103
regular expressions. Octal codes refer to ISO 10646 (<a href="refs.html#ref-ISO10646" rel="biblioentry" class="noxref"><span class="normref">[ISO10646]</span></a>). As in
104104
Lex, in case of multiple matches, the longest match determines the token.
105105
</p>
@@ -165,6 +165,10 @@ <h3>4.1.1 <a name="tokenization">Tokenization</a></h3>
165165
<p>Below is the core syntax for CSS. The sections that follow describe
166166
how to use it. <a href="grammar.html">Appendix G</a> describes a
167167
more restrictive grammar that is closer to the CSS level 2 language.
168+
Parts of style sheets that can be parsed according to this grammar but
169+
not according to the grammar in Appendix G are among the parts that
170+
will be ignored according to the <a href="#parsing-errors>rules for
171+
handling parsing errors</a>.
168172
</p>
169173
<pre>
170174
stylesheet : [ CDO | CDC | S | statement ]*;

css2/text.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ <h2>16.2 <a name="alignment-prop">Alignment:</a> the <a href="text.html#propdef-
166166
how the inline boxes within each line box align with respect to the line
167167
box's left and right sides; alignment is not with respect to the <a
168168
href="visuren.html#viewport">viewport</a>. In the case of 'justify',
169-
the UA may stretch the inline boxes in addition to adjusting their
170-
positions. (See also <a href="text.html#propdef-letter-spacing" class="noxref"><span
169+
this property specifies that the inline boxes are to be made flush
170+
with both sides of the block. (See also <a href="text.html#propdef-letter-spacing" class="noxref"><span
171171
class="propinst-letter-spacing">'letter-spacing'</span></a> and <a href="text.html#propdef-word-spacing" class="noxref"><span
172172
class="propinst-word-spacing">'word-spacing'</span></a>.)
173173
</p>
@@ -619,6 +619,8 @@ <h3 id="white-space-model"><a name="q8">16.6.1 The 'white-space' processing mode
619619
<li>If a space (U+0020) at the end of a line has 'white-space' set to
620620
'normal', 'nowrap', or 'pre-line', it is also removed.
621621
</li>
622+
<li>If spaces (U+0020) or tabs (U+0009) at the end of a line have
623+
'white-space' set to 'pre-wrap', UAs may visually collapse them.
622624
</ol>
623625

624626
<div class="note"><p>

css2/visuren.html

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,9 @@ <h2>9.4 <a name="normal-flow">Normal flow</a></h2>
851851
</p>
852852
<h3 id="block-formatting"><a name="q15">9.4.1 Block formatting contexts</a></h3>
853853

854-
<p>Floats, absolutely positioned elements, inline-blocks, table-cells, and elements with 'overflow' other than 'visible' establish new block formatting contexts.</p>
854+
<p>Floats, absolutely positioned elements, inline-blocks, table-cells,
855+
table-captions, and elements with 'overflow' other than 'visible'
856+
establish new block formatting contexts.</p>
855857

856858
<p>In a block formatting context, boxes are laid out one after the
857859
other, vertically, beginning at the top of a containing block. The
@@ -918,8 +920,9 @@ <h3>9.4.2 <a name="inline-formatting">Inline formatting context</a></h3>
918920
width of the line box containing them, their horizontal distribution
919921
within the line box is determined by the <a href="text.html#propdef-text-align" class="noxref"><span
920922
class="propinst-text-align">'text-align'</span></a> property. If that
921-
property has the value 'justify', the user agent may stretch the
922-
inline boxes as well.
923+
property has the value 'justify', the user agent may stretch spaces
924+
and words in inline boxes (except for inline-table and inline-block
925+
boxes) as well.
923926
</p>
924927

925928
<p>
@@ -1041,9 +1044,10 @@ <h3>9.4.3 <a name="relative-positioning">Relative positioning</a></h3>
10411044
given a position as if B1 were not offset and B2 is not re-positioned
10421045
after B1's offset is applied. This implies that relative positioning
10431046
may cause boxes to overlap.
1044-
However, if relative positioning causes an 'overflow:auto' box to have
1045-
overflow, the UA must allow the user to access this content, which,
1046-
through the creation of scrollbars, may affect layout.
1047+
However, if relative positioning causes an 'overflow:auto' or
1048+
'overflow:scroll' box to have
1049+
overflow, the UA must allow the user to access this content (at its offset
1050+
position), which, through the creation of scrollbars, may affect layout.
10471051
</p>
10481052
<p>A relatively positioned box keeps its normal flow size, including
10491053
line breaks and the space originally reserved for it. The section on
@@ -2158,7 +2162,9 @@ <h2>9.10 <a name="direction">Text direction:</a>
21582162
not support bidirectional text may ignore the <a href="visuren.html#propdef-direction" class="noxref"><span
21592163
class="propinst-direction">'direction'</span></a> and <a href="visuren.html#propdef-unicode-bidi" class="noxref"><span
21602164
class="propinst-unicode-bidi">'unicode-bidi'</span></a> properties
2161-
described in this section.
2165+
described in this section. This exception includes UAs that render
2166+
right-to-left characters simply because a font on the system contains them
2167+
but do not support the concept of right-to-left text direction.
21622168

21632169
<p>The characters in certain scripts are written from right to
21642170
left. In some documents, in particular those written with the Arabic
@@ -2178,14 +2184,14 @@ <h2>9.10 <a name="direction">Text direction:</a>
21782184
authors to specify how the elements and attributes of a document
21792185
language map to this algorithm.
21802186
</p>
2181-
<p>
2182-
If the rendered content contains right-to-left characters, and if the user
2183-
agent displays these characters in right-to-left order, the user
2184-
agent must apply the bidirectional algorithm.
2185-
(UAs that render right-to-left characters simply because a font on
2186-
the system contains them but do not support the concept of
2187-
right-to-left text direction are exempt from this requirement.)
2188-
</p>
2187+
<p>User agents that support bidirectional text must apply the Unicode
2188+
bidirectional algorithm to every sequence of inline boxes uninterrupted
2189+
by a forced line break or block boundary. This sequence forms the
2190+
"paragraph" unit in the bidirectional algorithm. The paragraph embedding
2191+
level is set according to the value of the <a href="visuren.html#propdef-direction" class="noxref"><span
2192+
class="propinst-direction">'direction'</span></a> property of the containing
2193+
block rather than by the heuristic given in steps P2 and P3 of the Unicode
2194+
algorithm.</p>
21892195
<p>Because the directionality of a text depends on the structure and
21902196
semantics of the document language, these properties should in most
21912197
cases be used only by designers of document type descriptions (DTDs),

0 commit comments

Comments
 (0)