Skip to content

Commit 17517bf

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

47 files changed

Lines changed: 5677 additions & 5355 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

css2/changes.html

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -941,8 +941,6 @@ <h3 id="c10.3.2"><a name="q68">C.2.61 </a><a href="visudet.html#inline-replaced-
941941
<h3 id="c10.3.3"><a name="q69">C.2.62 </a><a href="visudet.html#blockwidth">Section 10.3.3
942942
Block-level, non-replaced elements in normal flow</a></h3>
943943

944-
<p>Added the vertical scrollbar width to the horizontal constraint equation.</p>
945-
946944
<p>Specified that a computed total of the width, padding, and borders
947945
that is greater than the containing block width causes auto margins to
948946
be treated as zero in the rest of the rules. This avoids 'auto' margins
@@ -972,10 +970,13 @@ <h3 id="c10.3.7"><a name="q73">C.2.66 </a><a href="visudet.html#abs-non-replaced
972970

973971
<p>Defined the static position of an element more precisely.</p>
974972

975-
<p>Added vertical scrollbar width to the horizontal restraint equation.</p>
976-
977973
<p>Rewrote constraint rules.</p>
978974

975+
<p>The 'direction' property of the containing block of the static
976+
position determines which side is clamped to the static position, not
977+
the 'direction' property of the containing block of the absolutely
978+
positioned element.
979+
979980
<h3 id="c10.3.8"><a name="q74">C.2.67 </a><a href="visudet.html#abs-replaced-width">Section 10.3.8
980981
Absolutely positioned, replaced elements</a></h3>
981982

@@ -984,6 +985,11 @@ <h3 id="c10.3.8"><a name="q74">C.2.67 </a><a href="visudet.html#abs-replaced-wid
984985
<p>In rule 2 (formerly rules 2 and 3), referred to new definition of
985986
'static position' in section 10.3.7.</p>
986987

988+
<p>Also in rule 2, the 'direction' property of the containing block of
989+
the static position determines which side is clamped to the static
990+
position, not the 'direction' property of the containing block of the
991+
absolutely positioned element.
992+
987993
<p>In rule 4 (formerly rule 5), prevented 'auto' left and right margins
988994
in resulting in a negative margin on the start edge.</p>
989995

@@ -1063,8 +1069,6 @@ <h3 id="c10.6.4"><a name="q81">C.2.74 </a><a href="visudet.html#abs-non-replaced
10631069

10641070
<p>Defined the static position of an element more precisely.</p>
10651071

1066-
<p>Added vertical scrollbar width to the horizontal restraint equation.</p>
1067-
10681072
<p>Rewrote constraint rules.</p>
10691073

10701074
<h3 id="c10.6.5"><a name="q82">C.2.75 </a><a href="visudet.html#abs-replaced-height">Section 10.6.5

css2/css2.html

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10123,6 +10123,11 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
1012310123
precisely:
1012410124
</p>
1012510125
<ul>
10126+
<li>The <dfn>static-position containing block</dfn> is the containing
10127+
block of a hypothetical box that would have been the first box of the
10128+
element if its 'position' property had been 'static' and its 'float'
10129+
had been 'none'.
10130+
</li>
1012610131
<li>The static position for 'left' is the distance from the left edge
1012710132
of the containing block to the left margin edge of a hypothetical box
1012810133
that would have been the first box of the element if its <a href="visuren.html#propdef-position" class="noxref"><span
@@ -10158,7 +10163,8 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
1015810163

1015910164
<p>If all three of 'left', 'width', and 'right' are 'auto': First set
1016010165
any 'auto' values for 'margin-left' and 'margin-right' to 0. Then, if
10161-
the 'direction' property of the containing block is 'ltr' set 'left'
10166+
the 'direction' property of the element establishing the
10167+
static-position containing block is 'ltr' set 'left'
1016210168
to the <a
1016310169
href="#static-position">static position</a> and apply rule number
1016410170
three below; otherwise, set 'right' to the <a
@@ -10187,7 +10193,8 @@ <h3>10.3.7 <a name="abs-non-replaced-width">Absolutely positioned, non-replaced
1018710193
width is shrink-to-fit. Then solve for 'left'</li>
1018810194

1018910195
<li>'left' and 'right' are 'auto' and 'width' is not 'auto', then if
10190-
the 'direction' property of the containing block is 'ltr' set 'left'
10196+
the 'direction' property of the element establishing the
10197+
static-position containing block is 'ltr' set 'left'
1019110198
to the <a
1019210199
href="#static-position">static position</a>, otherwise set 'right'
1019310200
to the <a href="#static-position">static position</a>. Then solve
@@ -10234,7 +10241,8 @@ <h3>10.3.8 <a name="abs-replaced-width">Absolutely positioned, replaced elements
1023410241
</li>
1023510242
<li>If both <a href="visuren.html#propdef-left" class="noxref"><span class="propinst-left">'left'</span></a> and <a href="visuren.html#propdef-right" class="noxref"><span
1023610243
class="propinst-right">'right'</span></a> have the value 'auto', then if
10237-
'direction' of the containing block is 'ltr', set <a href="visuren.html#propdef-left" class="noxref"><span
10244+
the 'direction' property of the element establishing the
10245+
static-position containing block is 'ltr', set <a href="visuren.html#propdef-left" class="noxref"><span
1023810246
class="propinst-left">'left'</span></a> to
1023910247
the static position; else if 'direction' is 'rtl', set <a href="visuren.html#propdef-right" class="noxref"><span
1024010248
class="propinst-right">'right'</span></a> to the static position.
@@ -11374,7 +11382,7 @@ <h3>11.1.1 <a name="overflow">Overflow</a>: the <a href="visufx.html#propdef-ove
1137411382
In the case of a scrollbar being placed on an edge of the element's
1137511383
box, it should be inserted between the inner border edge and the outer
1137611384
padding edge. Any space taken up by the scrollbars should be taken out
11377-
of(subtracted from the dimensions of) the containing block formed by
11385+
of (subtracted from the dimensions of) the containing block formed by
1137811386
the element with the scrollbars.
1137911387
</p>
1138011388

@@ -19953,8 +19961,6 @@ <h3 id="c10.3.2"><a name="q68">C.2.61 </a><a href="visudet.html#inline-replaced-
1995319961
<h3 id="c10.3.3"><a name="q69">C.2.62 </a><a href="visudet.html#blockwidth">Section 10.3.3
1995419962
Block-level, non-replaced elements in normal flow</a></h3>
1995519963

19956-
<p>Added the vertical scrollbar width to the horizontal constraint equation.</p>
19957-
1995819964
<p>Specified that a computed total of the width, padding, and borders
1995919965
that is greater than the containing block width causes auto margins to
1996019966
be treated as zero in the rest of the rules. This avoids 'auto' margins
@@ -19984,10 +19990,13 @@ <h3 id="c10.3.7"><a name="q73">C.2.66 </a><a href="visudet.html#abs-non-replaced
1998419990

1998519991
<p>Defined the static position of an element more precisely.</p>
1998619992

19987-
<p>Added vertical scrollbar width to the horizontal restraint equation.</p>
19988-
1998919993
<p>Rewrote constraint rules.</p>
1999019994

19995+
<p>The 'direction' property of the containing block of the static
19996+
position determines which side is clamped to the static position, not
19997+
the 'direction' property of the containing block of the absolutely
19998+
positioned element.
19999+
1999120000
<h3 id="c10.3.8"><a name="q74">C.2.67 </a><a href="visudet.html#abs-replaced-width">Section 10.3.8
1999220001
Absolutely positioned, replaced elements</a></h3>
1999320002

@@ -19996,6 +20005,11 @@ <h3 id="c10.3.8"><a name="q74">C.2.67 </a><a href="visudet.html#abs-replaced-wid
1999620005
<p>In rule 2 (formerly rules 2 and 3), referred to new definition of
1999720006
'static position' in section 10.3.7.</p>
1999820007

20008+
<p>Also in rule 2, the 'direction' property of the containing block of
20009+
the static position determines which side is clamped to the static
20010+
position, not the 'direction' property of the containing block of the
20011+
absolutely positioned element.
20012+
1999920013
<p>In rule 4 (formerly rule 5), prevented 'auto' left and right margins
2000020014
in resulting in a negative margin on the start edge.</p>
2000120015

@@ -20075,8 +20089,6 @@ <h3 id="c10.6.4"><a name="q81">C.2.74 </a><a href="visudet.html#abs-non-replaced
2007520089

2007620090
<p>Defined the static position of an element more precisely.</p>
2007720091

20078-
<p>Added vertical scrollbar width to the horizontal restraint equation.</p>
20079-
2008020092
<p>Rewrote constraint rules.</p>
2008120093

2008220094
<h3 id="c10.6.5"><a name="q82">C.2.75 </a><a href="visudet.html#abs-replaced-height">Section 10.6.5
@@ -23759,8 +23771,8 @@ <h2>G.2 <a name="scanner">Lexical scanner</a></h2>
2375923771
{num}% {return PERCENTAGE;}
2376023772
{num} {return NUMBER;}
2376123773

23762-
{U}{R}{L}("{w}{string}{w}")" {return URI;}
23763-
{U}{R}{L}("{w}{url}{w}")" {return URI;}
23774+
{U}{R}{L}"("{w}{string}{w}")" {return URI;}
23775+
{U}{R}{L}"("{w}{url}{w}")" {return URI;}
2376423776

2376523777
{ident}"(" {return FUNCTION;}
2376623778

css2/diffs-rec/cascade.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ <H3> <del>Imported</del> <del>style</del> <del>sheets</del> <del>also</del> <del
317317

318318
<LI> <del>The</del> <del>primary</del>Sort <del>of</del> <del>the</del> <del>declarations</del> <del>is</del> <del>by</del> <del>weight</del><ins>according</ins> <ins>to</ins> <ins>importance</ins> <ins>(normal</ins> <ins>or</ins> <ins>important)</ins>
319319
and <del>origin:</del> <del>for</del> <del>normal</del> <del>declarations,</del> <del>author</del> <del>style</del> <del>sheets</del> <del>override</del><ins>origin</ins> <ins>(author,</ins> <ins>user,</ins> <ins>or</ins> user <del>style</del> <del>sheets</del> <del>which</del> <del>override</del> <del>the</del> <del>default</del> <del>style</del> <del>sheet.</del> <del>For</del> <del>"!important"</del> <del>declarations,</del><ins>agent).</ins> <ins>In</ins> <ins>ascending</ins> <ins>order</ins> <ins>of</ins>
320-
<ins>precendence:</ins>
320+
<ins>precedence:</ins>
321321

322322
<ol>
323323
<li>user <del>style</del> <del>sheets</del> <del>override</del><ins>agent</ins> <ins>declarations</ins>

0 commit comments

Comments
 (0)