Skip to content

Commit d7911d2

Browse files
bert-githubbert-github
committed
[css2] Generated. Do not edit!
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403188
1 parent d03c0f9 commit d7911d2

24 files changed

+3000
-2462
lines changed

‎css2/cascade.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ <h3>6.1.2 <span class="index-def" title="computed value">
8888
<p>The computed value of URIs that the UA cannot resolve to absolute
8989
URIs is the specified value.
9090

91-
<p>When the specified value is not 'inherit', the computed value of a
91+
<p>The computed value of a
9292
property is determined as specified by the Computed Value line in the
9393
definition of the
9494
property. See the section on <a href="#inheritance">inheritance</a>
@@ -186,10 +186,10 @@ <h3>6.2.1 The <span class="index-def" title="inherit, definition
186186
of"><a name="value-def-inherit">'inherit'</a></span>
187187
value</h3>
188188

189-
<P>Each property may also have a specified value of 'inherit', which
190-
means that, for a given element, the property takes the same computed
189+
<P>Each property may also have a cascaded value of 'inherit', which
190+
means that, for a given element, the property takes the same specified
191191
value as the property for the element's parent. The 'inherit' value
192-
can be used to strengthen inherited values, and it can also be used on
192+
can be used to enforce inheritance of values, and it can also be used on
193193
properties that are not normally inherited.
194194

195195
<p>If the 'inherit' value is set on the root element, the property is

‎css2/changes.html

+121-16
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,9 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
583583
<li class="tocline3"><a href="changes.html#q540" class="tocxref">C.8.46 9.5 Floats</a>
584584
<li class="tocline3"><a href="changes.html#q541" class="tocxref">C.8.47 14.2.1 Background properties: 'background-color', 'background-image', 'background-repeat', 'background-attachment', 'background-position', and 'background'</a>
585585
<li class="tocline3"><a href="changes.html#q542" class="tocxref">C.8.48 9.2.4 The 'display' property</a>
586+
<li class="tocline3"><a href="changes.html#q543" class="tocxref">C.8.49 6.1.2 Computed values</a>
587+
<li class="tocline3"><a href="changes.html#q544" class="tocxref">C.8.50 10.3.2 Inline, replaced elements</a>
588+
<li class="tocline3"><a href="changes.html#q545" class="tocxref">C.8.51 Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear' property</a>
586589
</ul>
587590
</ul>
588591
</div>
@@ -5744,7 +5747,11 @@ <h3 id="t.9.10b"><a name="q437">C.7.48 </a><a
57445747
<p>In this process, <del>non-textual entities such as images</del>
57455748
<ins>replaced elements with 'display: inline' (and replaced elements
57465749
with 'display: run-in', when they generate inline-level boxes)</ins>
5747-
are treated as neutral characters, [&hellip]
5750+
are treated as neutral characters, unless their 'unicode-bidi'
5751+
property has a value other than 'normal', in which case they are
5752+
treated as strong characters in the 'direction' specified for the
5753+
element. <ins>All other atomic inline-level boxes are treated as
5754+
neutral characters always.</ins>
57485755
</blockquote>
57495756

57505757

@@ -7592,6 +7599,7 @@ <h3 id=u.10.4><a name="q522">C.8.28 </a><a
75927599

75937600
<blockquote>
75947601
<p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
7602+
tables, inline tables,
75957603
table cells, table columns, and column groups is undefined.</ins>
75967604
</blockquote>
75977605

@@ -7945,14 +7953,24 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
79457953

79467954
<p>Change in section 9.2.4:
79477955

7956+
<blockquote>
7957+
<table class="propinfo">
7958+
<tr valign=baseline><td><em>Value:</em> <td>inline | block | list-item
7959+
| <del>run-in |</del> inline-block | table | inline-table | inline |
7960+
block | list-item | run-in | inline-block | table | inline-table |
7961+
table-row-group | table-header-group | table-footer-group | table-row
7962+
| table-column-group | table-column | table-cell | table-caption |
7963+
none | inherit
7964+
</table>
7965+
</blockquote>
7966+
7967+
<p>and
7968+
79487969
<blockquote>
79497970
<dl>
7950-
<dt>run-in <dd>This value creates either block or inline boxes,
7951-
depending on context. <del>Properties apply to run-in boxes based on
7952-
their final status (inline-level or block-level).</del> <ins>'Run-in'
7953-
is defined in CSS level&nbsp;3 (see <a href="/TR/css3-box">CSS basic
7954-
box model</a>). It is not required for conformance to
7955-
level&nbsp;2.</ins>
7971+
<dt><del>run-in</del> <dd><del>This value creates either block or inline boxes,
7972+
depending on context. Properties apply to run-in boxes based on
7973+
their final status (inline-level or block-level).</del>
79567974
</dl>
79577975
</blockquote>
79587976

@@ -7984,19 +8002,14 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
79848002

79858003
<p>Replace <a
79868004
href="/TR/2010/WD-CSS2-20101207/visuren.html#run-in">section 9.2.3
7987-
&ldquo;Run-in boxes&rdquo;</a>:
8005+
&ldquo;Run-in boxes&rdquo;</a> by this:
79888006

79898007
<blockquote>
79908008
<p><strong>9.2.3 Run-in boxes</strong>
79918009

7992-
<p><del>A run-in element (or pseudo-element) <var>A</var> behaves as
7993-
follows: [&hellip;] Please consult the section on generated content
7994-
for information about how run-in boxes interact with generated
7995-
content.</del>
7996-
7997-
<p><ins>[This section exists so that the section numbers are the same
7998-
as in previous drafts. Run-in boxes are not part of
7999-
CSS&nbsp;2.1.]</ins>
8010+
<p>[This section exists so that the section numbers are the same as in
8011+
previous drafts. 'Display: run-in' is now defined in CSS level&nbsp;3
8012+
(see <a href="/TR/css3-box">CSS basic box model</a>).]
80008013
</blockquote>
80018014

80028015
<p>Remove 'run-in' from <a
@@ -8085,6 +8098,98 @@ <h3 id=u.9.2.4><a name="q542">C.8.48 </a><a
80858098

80868099

80878100

8101+
<h3 id=u.6.1.2><a name="q543">C.8.49 </a><a
8102+
href="/TR/2010/WD-CSS2-20101207/cascade.html#computed-value">6.1.2
8103+
Computed values</a></h3>
8104+
8105+
<p>Clarify that the keyword 'inherit' means that the specified value
8106+
is the inherited value. The value is <em>not</em> the keyword itself.
8107+
8108+
<blockquote>
8109+
<p><del>When the specified value is not 'inherit',</del> the computed
8110+
value of a property is determined as specified by the Computed Value
8111+
line in the definition of the property. See the section on <a
8112+
href="#inheritance">inheritance</a> for the definition of computed
8113+
values when the specified value is 'inherit'.
8114+
</blockquote>
8115+
8116+
<p>And in <a
8117+
href="/TR/2010/WD-CSS2-20101207/cascade.html#value-def-inherit">6.2.1:</a>
8118+
8119+
<blockquote>
8120+
<p>Each property may also have a <del>specified</del>
8121+
<ins>cascaded</ins> value of 'inherit', which means that, for a given
8122+
element, the property takes the same <del>computed</del>
8123+
<ins>specified</ins> value as the property for the element's
8124+
parent. The 'inherit' value can be used to <del>strengthen
8125+
inherited</del> <ins>enforce inheritance of</ins> values, and it can
8126+
also be used on properties that are not normally inherited.
8127+
</blockquote>
8128+
8129+
8130+
8131+
<h3 id=u.10.3.2a><a name="q544">C.8.50 </a><a
8132+
href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width">10.3.2
8133+
Inline, replaced elements</a></h3>
8134+
8135+
<p>Because of lack of implementations, the width of a replaced element
8136+
with an intrinsic ratio but neither intrinsic with nor intrinsic
8137+
height is left undefined:
8138+
8139+
<blockquote>
8140+
<p>If 'height' and 'width' both have computed values of 'auto' and the
8141+
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
8143+
replaced element's width, then the used value of 'width' is calculated
8144+
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+
</blockquote>
8148+
8149+
8150+
8151+
<h3 id="t.9.5.2d"><a name="q545">C.8.51 </a><a
8152+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
8153+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
8154+
property</a></h3>
8155+
8156+
<p>Because of lack of implementations, also allow 'clear' to work in a
8157+
different way for now:
8158+
8159+
<blockquote>
8160+
<p>Computing the clearance of an element on which 'clear' is set is
8161+
done by first determining the hypothetical position of the element's
8162+
top border edge <del>within its parent block</del>. This position is
8163+
where the actual top border edge would have been if the element had a
8164+
non-zero bottom border and its 'clear' property had been 'none'.
8165+
8166+
<p>If this hypothetical position of the element's top border edge is
8167+
not past the relevant floats, then clearance is introduced, and
8168+
margins collapse according to the rules in 8.3.1.
8169+
8170+
<p>Then the amount of clearance is set to the greater of:
8171+
8172+
<ol>
8173+
<li>The amount necessary to place the border edge of the block even
8174+
with the bottom outer edge of the lowest float that is to be
8175+
cleared.
8176+
8177+
<li>The amount necessary to place the top border edge of the block
8178+
at its hypothetical position.
8179+
</ol>
8180+
8181+
<p><ins>Alternatively, clearance is set exactly to the amount
8182+
necessary to place the border edge of the block even with the bottom
8183+
outer edge of the lowest float that is to be cleared.</ins>
8184+
8185+
<p class="note"><ins><em><strong>Note:</strong> Both behaviors are
8186+
allowed pending evaluation of their compatibility with existing Web
8187+
content. A future CSS specification will require either one or the
8188+
other.</em></ins>
8189+
</blockquote>
8190+
8191+
8192+
80888193
<hr class="navbar">
80898194

80908195
<div class="navbar">

‎css2/changes.src

+119-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: changes.src,v 2.152 2011-03-25 00:05:00 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.153 2011-03-25 21:10:33 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Changes</TITLE>
66
</HEAD>
@@ -5164,7 +5164,11 @@ entities&rdquo;:
51645164
<p>In this process, <del>non-textual entities such as images</del>
51655165
<ins>replaced elements with 'display: inline' (and replaced elements
51665166
with 'display: run-in', when they generate inline-level boxes)</ins>
5167-
are treated as neutral characters, [&hellip]
5167+
are treated as neutral characters, unless their 'unicode-bidi'
5168+
property has a value other than 'normal', in which case they are
5169+
treated as strong characters in the 'direction' specified for the
5170+
element. <ins>All other atomic inline-level boxes are treated as
5171+
neutral characters always.</ins>
51685172
</blockquote>
51695173

51705174
<!--========================== issue 120 ==========================-->
@@ -7081,6 +7085,7 @@ Minimum and maximum widths: 'min-width' and 'max-width'</a></h3>
70817085

70827086
<blockquote>
70837087
<p><ins>In CSS&nbsp;2.1, the effect of 'min-width' and 'max-width' on
7088+
tables, inline tables,
70847089
table cells, table columns, and column groups is undefined.</ins>
70857090
</blockquote>
70867091

@@ -7434,14 +7439,24 @@ feature.
74347439

74357440
<p>Change in section 9.2.4:
74367441

7442+
<blockquote>
7443+
<table class="propinfo">
7444+
<tr valign=baseline><td><em>Value:</em> <td>inline | block | list-item
7445+
| <del>run-in |</del> inline-block | table | inline-table | inline |
7446+
block | list-item | run-in | inline-block | table | inline-table |
7447+
table-row-group | table-header-group | table-footer-group | table-row
7448+
| table-column-group | table-column | table-cell | table-caption |
7449+
none | inherit
7450+
</table>
7451+
</blockquote>
7452+
7453+
<p>and
7454+
74377455
<blockquote>
74387456
<dl>
7439-
<dt>run-in <dd>This value creates either block or inline boxes,
7440-
depending on context. <del>Properties apply to run-in boxes based on
7441-
their final status (inline-level or block-level).</del> <ins>'Run-in'
7442-
is defined in CSS level&nbsp;3 (see <a href="/TR/css3-box">CSS basic
7443-
box model</a>). It is not required for conformance to
7444-
level&nbsp;2.</ins>
7457+
<dt><del>run-in</del> <dd><del>This value creates either block or inline boxes,
7458+
depending on context. Properties apply to run-in boxes based on
7459+
their final status (inline-level or block-level).</del>
74457460
</dl>
74467461
</blockquote>
74477462

@@ -7473,19 +7488,14 @@ boxes.</del>
74737488

74747489
<p>Replace <a
74757490
href="/TR/2010/WD-CSS2-20101207/visuren.html#run-in">section 9.2.3
7476-
&ldquo;Run-in boxes&rdquo;</a>:
7491+
&ldquo;Run-in boxes&rdquo;</a> by this:
74777492

74787493
<blockquote>
74797494
<p><strong>9.2.3 Run-in boxes</strong>
74807495

7481-
<p><del>A run-in element (or pseudo-element) <var>A</var> behaves as
7482-
follows: [&hellip;] Please consult the section on generated content
7483-
for information about how run-in boxes interact with generated
7484-
content.</del>
7485-
7486-
<p><ins>[This section exists so that the section numbers are the same
7487-
as in previous drafts. Run-in boxes are not part of
7488-
CSS&nbsp;2.1.]</ins>
7496+
<p>[This section exists so that the section numbers are the same as in
7497+
previous drafts. 'Display: run-in' is now defined in CSS level&nbsp;3
7498+
(see <a href="/TR/css3-box">CSS basic box model</a>).]
74897499
</blockquote>
74907500

74917501
<p>Remove 'run-in' from <a
@@ -7572,6 +7582,98 @@ inserted just inside their associated element.
75727582

75737583
<p>and also from the subsequent example.
75747584

7585+
<!--========================== issue 259 ==========================-->
7586+
7587+
<h3 id=u.6.1.2><a
7588+
href="/TR/2010/WD-CSS2-20101207/cascade.html#computed-value">6.1.2
7589+
Computed values</a></h3>
7590+
7591+
<p>Clarify that the keyword 'inherit' means that the specified value
7592+
is the inherited value. The value is <em>not</em> the keyword itself.
7593+
7594+
<blockquote>
7595+
<p><del>When the specified value is not 'inherit',</del> the computed
7596+
value of a property is determined as specified by the Computed Value
7597+
line in the definition of the property. See the section on <a
7598+
href="#inheritance">inheritance</a> for the definition of computed
7599+
values when the specified value is 'inherit'.
7600+
</blockquote>
7601+
7602+
<p>And in <a
7603+
href="/TR/2010/WD-CSS2-20101207/cascade.html#value-def-inherit">6.2.1:</a>
7604+
7605+
<blockquote>
7606+
<p>Each property may also have a <del>specified</del>
7607+
<ins>cascaded</ins> value of 'inherit', which means that, for a given
7608+
element, the property takes the same <del>computed</del>
7609+
<ins>specified</ins> value as the property for the element's
7610+
parent. The 'inherit' value can be used to <del>strengthen
7611+
inherited</del> <ins>enforce inheritance of</ins> values, and it can
7612+
also be used on properties that are not normally inherited.
7613+
</blockquote>
7614+
7615+
<!--========================== issue 283 ==========================-->
7616+
7617+
<h3 id=u.10.3.2a><a
7618+
href="/TR/2010/WD-CSS2-20101207/visudet.html#inline-replaced-width">10.3.2
7619+
Inline, replaced elements</a></h3>
7620+
7621+
<p>Because of lack of implementations, the width of a replaced element
7622+
with an intrinsic ratio but neither intrinsic with nor intrinsic
7623+
height is left undefined:
7624+
7625+
<blockquote>
7626+
<p>If 'height' and 'width' both have computed values of 'auto' and the
7627+
element has an intrinsic ratio but no intrinsic height or width,
7628+
<del>and the containing block's width does not itself depend on the
7629+
replaced element's width, then the used value of 'width' is calculated
7630+
from the constraint equation used for block-level, non-replaced
7631+
elements in normal flow</del> <ins>then the used value of 'width' is
7632+
undefined in CSS&nbsp;2.1</ins>.
7633+
</blockquote>
7634+
7635+
<!--========================== issue 285 ==========================-->
7636+
7637+
<h3 id="t.9.5.2d"><a
7638+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
7639+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
7640+
property</a></h3>
7641+
7642+
<p>Because of lack of implementations, also allow 'clear' to work in a
7643+
different way for now:
7644+
7645+
<blockquote>
7646+
<p>Computing the clearance of an element on which 'clear' is set is
7647+
done by first determining the hypothetical position of the element's
7648+
top border edge <del>within its parent block</del>. This position is
7649+
where the actual top border edge would have been if the element had a
7650+
non-zero bottom border and its 'clear' property had been 'none'.
7651+
7652+
<p>If this hypothetical position of the element's top border edge is
7653+
not past the relevant floats, then clearance is introduced, and
7654+
margins collapse according to the rules in 8.3.1.
7655+
7656+
<p>Then the amount of clearance is set to the greater of:
7657+
7658+
<ol>
7659+
<li>The amount necessary to place the border edge of the block even
7660+
with the bottom outer edge of the lowest float that is to be
7661+
cleared.
7662+
7663+
<li>The amount necessary to place the top border edge of the block
7664+
at its hypothetical position.
7665+
</ol>
7666+
7667+
<p><ins>Alternatively, clearance is set exactly to the amount
7668+
necessary to place the border edge of the block even with the bottom
7669+
outer edge of the lowest float that is to be cleared.</ins>
7670+
7671+
<p class="note"><ins><em><strong>Note:</strong> Both behaviors are
7672+
allowed pending evaluation of their compatibility with existing Web
7673+
content. A future CSS specification will require either one or the
7674+
other.</em></ins>
7675+
</blockquote>
7676+
75757677

75767678

75777679
</BODY>

0 commit comments

Comments
 (0)