Skip to content

Commit 9342647

Browse files
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403195
1 parent 040e653 commit 9342647

12 files changed

+1255
-1240
lines changed

css2/changes.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -5700,8 +5700,8 @@ <h3 id="t.9.10"><a name="q435">C.7.46 </a><a
57005700
<dd>For inline<del>-level</del> elements this creates an override.
57015701
For <del>block-level, table-cell, table-caption, or
57025702
inline-block</del> <ins>block container</ins> elements this creates an
5703-
override for inline-level descendants not within another block-level,
5704-
table-cell, table-caption, or inline-block element. This means that
5703+
override for inline-level descendants not within another block container
5704+
element. This means that
57055705
inside the element, reordering is strictly in sequence according to
57065706
the 'direction' property; the implicit part of the bidirectional
57075707
algorithm is ignored. This corresponds to adding a LRO (U+202D; for
@@ -5900,7 +5900,7 @@ <h3 id="t.10.7"><a name="q445">C.7.56 </a><a
59005900

59015901
<blockquote>
59025902
<p><ins>In CSS&nbsp;2.1, the effect of 'min-height' and 'max-height'
5903-
on table cells, table rows, and row groups is undefined.</ins>
5903+
on tables, inline tables, table cells, table rows, and row groups is undefined.</ins>
59045904
</blockquote>
59055905

59065906

@@ -8139,11 +8139,12 @@ <h3 id=u.10.3.2a><a name="q544">C.8.50 </a><a
81398139
<blockquote>
81408140
<p>If 'height' and 'width' both have computed values of 'auto' and the
81418141
element has an intrinsic ratio but no intrinsic height or width,
8142-
<del>and the containing block's width does not itself depend on the
8142+
<del>and</del> <ins>then the used value of 'width' is
8143+
undefined in CSS&nbsp;2.1. However, it is suggested that, if</ins>
8144+
the containing block's width does not itself depend on the
81438145
replaced element's width, then the used value of 'width' is calculated
81448146
from the constraint equation used for block-level, non-replaced
8145-
elements in normal flow</del> <ins>then the used value of 'width' is
8146-
undefined in CSS&nbsp;2.1</ins>.
8147+
elements in normal flow.
81478148
</blockquote>
81488149

81498150

css2/diffs-rec/changes.html

+15-14
Original file line numberDiff line numberDiff line change
@@ -5700,8 +5700,8 @@ <h3 id="t.9.10"><a name="q435"><ins>C.7.46</ins> </a><a
57005700
<dd><ins>For inline</ins><del><ins>-level</ins></del> <ins>elements this creates an override.
57015701
For</ins> <del><ins>block-level, table-cell, table-caption, or
57025702
inline-block</ins></del> <ins><ins>block container</ins> elements this creates an
5703-
override for inline-level descendants not within another block-level,
5704-
table-cell, table-caption, or inline-block element. This means that
5703+
override for inline-level descendants not within another block container
5704+
element. This means that
57055705
inside the element, reordering is strictly in sequence according to
57065706
the 'direction' property; the implicit part of the bidirectional
57075707
algorithm is ignored. This corresponds to adding a LRO (U+202D; for
@@ -5900,7 +5900,7 @@ <h3 id="t.10.7"><a name="q445"><ins>C.7.56</ins> </a><a
59005900

59015901
<blockquote>
59025902
<p><ins><ins>In CSS&nbsp;2.1, the effect of 'min-height' and 'max-height'
5903-
on table cells, table rows, and row groups is undefined.</ins></ins>
5903+
on tables, inline tables, table cells, table rows, and row groups is undefined.</ins></ins>
59045904
</blockquote>
59055905

59065906

@@ -8119,11 +8119,11 @@ <h3 id=u.6.1.2><a name="q543"><ins>C.8.49</ins> </a><a
81198119
<blockquote>
81208120
<p><ins>Each property may also</ins> have a <del> <del>different meaning when interpreted as</del><ins>specified</ins></del>
81218121
<ins><ins>cascaded</ins> value of 'inherit', which means that, for</ins> a <del>CSS2 style sheet. Most changes are due to implementation experience feeding back into</del><ins>given
8122-
element,</ins> the <del>specification, but there are also some error corrections.</del><ins>property takes</ins> the <del>meaning</del><ins>same</ins> <del><ins>computed</ins></del>
8122+
element,</ins> the <del>specification, but there are</del><ins>property takes the same</ins> <del><ins>computed</ins></del>
81238123
<ins><ins>specified</ins> value as the property for the element's
81248124
parent. The 'inherit' value can be used to</ins> <del><ins>strengthen
8125-
inherited</ins></del> <ins><ins>enforce inheritance</ins> of</ins> <del>"!important" has been changed. In CSS1, "!important" in an author's style sheet took precedence over one in a user style sheet. This has been reversed in CSS2. In CSS2 color values</del><ins>values, and it can
8126-
also be used on properties that</ins> are <del>clipped with regard to the device gamut,</del>not <ins>normally inherited.</ins>
8125+
inherited</ins></del> <ins><ins>enforce inheritance of</ins> values, and it can</ins>
8126+
also <del>some error corrections.</del><ins>be used on properties that are not normally inherited.</ins>
81278127
</blockquote>
81288128

81298129

@@ -8132,18 +8132,19 @@ <h3 id=u.10.3.2a><a name="q544"><ins>C.8.50</ins> </a><a
81328132
href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width"><ins>10.3.2
81338133
Inline, replaced elements</ins></a></h3>
81348134

8135-
<p><ins>Because of lack of implementations, the width of a replaced element</ins>
8136-
with <del>regard to the sRGB gamut as in CSS1. CSS1 simply said that 'margin-right' was ignored</del><ins>an intrinsic ratio but neither intrinsic with nor intrinsic
8135+
<p><ins>Because of lack of implementations,</ins> the <del>meaning</del><ins>width</ins> of <del>"!important" has been changed. In CSS1, "!important" in an author's style sheet took precedence over one in</del>a <del>user style sheet. This has been reversed in CSS2. In CSS2 color values are clipped</del><ins>replaced element</ins>
8136+
with <del>regard to the device gamut, not</del><ins>an intrinsic ratio but neither intrinsic</ins> with <del>regard to the sRGB gamut as in CSS1. CSS1 simply said that 'margin-right' was ignored</del><ins>nor intrinsic
81378137
height is left undefined:</ins>
81388138

81398139
<blockquote>
81408140
<p>If <del>the both 'margin-left'</del><ins>'height'</ins> and 'width' <del>were set. In CSS2</del><ins>both have computed values of 'auto' and</ins> the
8141-
<del>choice between relaxing 'margin-right'</del><ins>element has an intrinsic ratio but no intrinsic height</ins> or <del>'margin-left' depends</del><ins>width,</ins>
8142-
<del><ins>and the containing block's width does not itself depend</ins> on the
8143-
<del>writing direction. In CSS1, several properties (e.g., 'padding') had values referring to</del><ins>replaced element's width, then</ins> the <del>width</del><ins>used value</ins> of <ins>'width' is calculated
8144-
from</ins> the <del>parent element. This was an error;</del><ins>constraint equation used for block-level, non-replaced
8145-
elements in normal flow</ins></del> <ins><ins>then</ins> the <ins>used</ins> value <del>should always refer</del><ins>of 'width' is
8146-
undefined in CSS&nbsp;2.1</ins>.</ins>
8141+
<del>choice between relaxing 'margin-right'</del><ins>element has an intrinsic ratio but no intrinsic height</ins> or <del>'margin-left' depends on</del><ins>width,</ins>
8142+
<del><ins>and</ins></del> <ins><ins>then</ins> the <del>writing direction.</del><ins>used value of 'width' is
8143+
undefined</ins> in <del>CSS1, several properties (e.g., 'padding') had values referring to</del><ins>CSS&nbsp;2.1. However, it is suggested that, if</ins></ins>
8144+
the <ins>containing block's</ins> width <del>of</del><ins>does not itself depend on</ins> the
8145+
<del>parent element. This was an error;</del><ins>replaced element's width, then</ins> the <ins>used</ins> value <del>should always refer</del><ins>of 'width' is calculated
8146+
from the constraint equation used for block-level, non-replaced
8147+
elements in normal flow.</ins>
81478148
</blockquote>
81488149

81498150

css2/diffs-rec/grammar.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ <h2> <del>D.2</del><ins>G.2</ins> <a name="scanner">Lexical scanner</a></h2>
174174
%option case-insensitive
175175

176176
h [0-9a-f]
177-
nonascii [\200-\377]
177+
nonascii <del>[\200-\377]</del><ins>[\240-\377]</ins>
178178
unicode <del>\\{h}{1,6}[ \t\r\n\f]?</del><ins>\\{h}{1,6}(\r\n|[ \t\r\n\f])?</ins>
179179
escape <del>{unicode}|\\[ -~\200-\377]</del><ins>{unicode}|\\[^\r\n\f0-9a-f]</ins>
180180
nmstart <del>[a-z]|{nonascii}|{escape}</del><ins>[_a-z]|{nonascii}|{escape}</ins>

0 commit comments

Comments
 (0)