Skip to content

Commit 62f4a8f

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

19 files changed

+1537
-833
lines changed

css2/changes.html

+165
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,10 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
593593
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
594594
</ul>
595595
<li class="tocline2"><a href="changes.html#q550" class="tocxref">C.9 Changes since the Recommendation of 7 June 2011</a>
596+
<li class="tocline2"><a href="changes.html#q551" class="tocxref">C.10 Controlling box generation</a>
597+
<ul class="toc">
598+
<li class="tocline3"><a href="changes.html#q552" class="tocxref">C.10.1 9.2.1 Block-level elements and block boxes</a>
599+
</ul>
596600
</ul>
597601
</div>
598602
<P><em>This appendix is informative, not normative.</em></P>
@@ -8989,6 +8993,167 @@ <H2 id=since-20110607><a name="q550">C.9 Changes since the Recommendation of 7 J
89898993

89908994

89918995

8996+
<li id=s.9.2a class=change>
8997+
<p><span class=updated>[2012-09-19]</span> Modify <a
8998+
href="visuren.html#box-gen" >&ldquo;9.2 Controlling box
8999+
generation&rdquo;</a> and <a
9000+
href="visuren.html#anonymous-block-level" >&ldquo;9.2.1
9001+
Block-level elements and block boxes&rdquo;</a> as follows:
9002+
9003+
<blockquote>
9004+
<h2><a name="q551">C.10 Controlling box generation</a></h2>
9005+
9006+
<p>The following sections describe the types of boxes that may be
9007+
generated in CSS&nbsp;2.1. A box's type affects, in part, its
9008+
behavior in the visual formatting model. The 'display' property,
9009+
described below, specifies a box's type.
9010+
9011+
<p><ins>Certain values of the ''display' property cause an
9012+
element of the source document to generate a <dfn>principal
9013+
box</dfn> that contains descendant boxes and generated content
9014+
and is also the box involved in any positioning scheme. Some
9015+
elements may generate additional boxes in addition to the
9016+
principal box: 'list-item' elements. These additional boxes are
9017+
placed with respect to the principal box.</ins>
9018+
9019+
<h3><a name="q552">C.10.1 9.2.1 Block-level elements and block boxes</a></h3>
9020+
9021+
<p><del><dfn>Block-level elements</dfn> are those elements of the
9022+
source document that are formatted visually as blocks (e.g.,
9023+
paragraphs). The following values of the 'display' property make
9024+
an element block-level: 'block', 'list-item', and 'table'.</del>
9025+
9026+
<p><ins><dfn>Block-level elements</dfn> &ndash; those elements of
9027+
the source document that are formatted visually as blocks (e.g.,
9028+
paragraphs) &ndash; are elements which generate a block-level
9029+
principal box. Values of the 'display' property that make an
9030+
element block-level include: 'block', 'list-item', and
9031+
'table'. <dfn>Block-level boxes</dfn> are boxes that participate
9032+
in a block formatting context.</ins>
9033+
9034+
<p><del><dfn>Block-level boxes</dfn> are boxes that participate
9035+
in a block formatting context. Each block-level element
9036+
generates a <dfn>principal block-level box</dfn> that contains
9037+
descendant boxes and generated content and is also the box
9038+
involved in any positioning scheme. Some block-level elements
9039+
may generate additional boxes in addition to the principal box:
9040+
'list-item' elements. These additional boxes are placed with
9041+
respect to the principal box.</del>
9042+
9043+
<p><del>Except for table boxes, which are described in a later
9044+
chapter, and replaced elements,</del> <ins>In
9045+
CSS&nbsp;2.1,</ins> a block-level box is also a block container
9046+
box <ins>unless it is a table box or the principal box of a
9047+
replaced element</ins>. A <dfn >block container box</dfn> either
9048+
contains only block-level boxes or establishes an inline
9049+
formatting context and thus contains only inline-level
9050+
boxes. <ins>An element whose principal box is a block container
9051+
box is a <dfn >block container element.</dfn></ins> Values of
9052+
the 'display' property which make a non-replaced element
9053+
generate a block container include 'block', 'list-item' and
9054+
'inline-block'. Not all block container boxes are block-level
9055+
boxes: non-replaced inline blocks and non-replaced table cells
9056+
are block containers but <ins>are</ins> not block-level
9057+
<del>boxes</del>. Block-level boxes that are also block
9058+
containers are called <dfn>block boxes</dfn>.
9059+
9060+
<p>The three terms "block-level box," "block container box," and
9061+
"block box" are sometimes abbreviated as "block" where
9062+
unambiguous.
9063+
</blockquote>
9064+
9065+
9066+
9067+
9068+
9069+
9070+
<li id=s.9.2.4a class=change>
9071+
<p><span class=updated>[2012-09-19]</span> Modify <a
9072+
href="visuren.html#display-prop" >&ldquo;9.2.4 The 'display'
9073+
property&rdquo;</a> as follows:
9074+
9075+
<blockquote>
9076+
<dl>
9077+
<dt><strong>block</strong>
9078+
9079+
<dd>This value causes an element to generate a
9080+
<ins>principal</ins> block box.
9081+
9082+
<dt><strong>inline-block</strong>
9083+
9084+
<dd>This value causes an element to generate <del>an</del>
9085+
<ins>a principal</ins> inline-level block container.
9086+
<ins>(</ins>The inside of an inline-block is formatted as a
9087+
block box, and the element itself is formatted as an atomic
9088+
inline-level box.<ins>)</ins>
9089+
9090+
</dl>
9091+
</blockquote>
9092+
9093+
9094+
9095+
9096+
9097+
9098+
<li id=s.17.4b class=change>
9099+
<p><span class=updated>[2012-09-19]</span> Modify <a
9100+
href="tables.html#model" >&ldquo;17.4 Tables in the visual
9101+
formatting model&rdquo;</a> as follows:
9102+
9103+
<blockquote>
9104+
<p>In both cases, the table generates a principal block
9105+
<ins>container</ins> box called the <dfn>table wrapper box</dfn>
9106+
that contains the table box itself and any caption boxes (in
9107+
document order). The <dfn>table box</dfn> is a block-level box
9108+
that contains the table's internal table boxes. The caption
9109+
boxes are <ins>principal</ins> block-level boxes that retain
9110+
their own content, padding, margin, and border areas, and are
9111+
rendered as normal block boxes inside the table wrapper
9112+
box. Whether the caption boxes are placed before or after the
9113+
table box is decided by the 'caption-side' property, as
9114+
described below.
9115+
9116+
<p>The table wrapper box is <del>a 'block' box if the table is
9117+
block-level</del> <ins>block-level for 'display: table'</ins>,
9118+
and <del>an 'inline-block' box if the table is
9119+
inline-level</del> <ins>inline-level for 'display:
9120+
inline-table'</ins>. The table wrapper box establishes a block
9121+
formatting context, and the table box establishes a table
9122+
formatting context. The table box (not the table wrapper box) is
9123+
used when doing baseline vertical alignment for an
9124+
'inline-table'. The width of the table wrapper box is the
9125+
border-edge width of the table box inside it, as described by
9126+
section 17.5.2. Percentages on 'width' and 'height' on the table
9127+
are relative to the table wrapper box's containing block, not
9128+
the table wrapper box itself.
9129+
</blockquote>
9130+
9131+
9132+
9133+
9134+
9135+
9136+
<li id=s.4.1.1d class=change>
9137+
<p><span class=updated>[2012-09-19]</span> For compatibility with
9138+
SVG, modify the definition of macro num in <a
9139+
href="syndata.html#tokenization" >&ldquo;4.1.1
9140+
Tokenization&rdquo;</a> as follows:
9141+
9142+
<blockquote>
9143+
<table>
9144+
<tr>
9145+
<td><del>num</del>
9146+
<td><del><code>[-+]?[0-9]+|[-+]?[0-9]*\.[0-9]+</code></del>
9147+
<tr>
9148+
<td><ins>num</ins>
9149+
<td><ins><code>[+-]?([0-9]+|[0-9]*\.[0-9]+)(e[+-]?[0-9]+)?</code></ins>
9150+
</table>
9151+
</blockquote>
9152+
9153+
9154+
9155+
9156+
89929157

89939158
</ul>
89949159

css2/cover.html

+4
Original file line numberDiff line numberDiff line change
@@ -1207,6 +1207,10 @@ <h2><a name="toc">Full Table of Contents</a></h2>
12071207
<li class="tocline3"><a href="changes.html#q549" class="tocxref">C.8.55 10.6.3 Block-level non-replaced elements in normal flow when 'overflow' computes to 'visible'</a>
12081208
</ul>
12091209
<li class="tocline2"><a href="changes.html#q550" class="tocxref">C.9 Changes since the Recommendation of 7 June 2011</a>
1210+
<li class="tocline2"><a href="changes.html#q551" class="tocxref">C.10 Controlling box generation</a>
1211+
<ul class="toc">
1212+
<li class="tocline3"><a href="changes.html#q552" class="tocxref">C.10.1 9.2.1 Block-level elements and block boxes</a>
1213+
</ul>
12101214
</ul>
12111215
<li class="tocline1"><a href="sample.html" class="tocxref">Appendix D. Default style sheet for HTML 4</a>
12121216
<li class="tocline1"><a href="zindex.html" class="tocxref">Appendix E. Elaborate description of Stacking Contexts</a>

0 commit comments

Comments
 (0)