Skip to content

Commit a5258ec

Browse files
bert-githubbert-github
committed
[css2] Sync'ed with errata.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403299
1 parent fff2df2 commit a5258ec

File tree

1 file changed

+163
-2
lines changed

1 file changed

+163
-2
lines changed

‎css2/changes.src

Lines changed: 163 additions & 2 deletions
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.174 2013-09-09 17:48:38 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.175 2014-01-17 13:44:30 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Changes</TITLE>
66
<!--script src="http://www.w3c-test.org/css/harness/annotate.js#CSS21_DEV" type="text/javascript" defer></script-->
@@ -8472,7 +8472,168 @@ term
84728472
<!-- Status: edited -->
84738473

84748474

8475-
<!-- Still need to add errata decided between 2012-08-15 and 2013-01-09 -->
8475+
8476+
<li id=s.9.2a class=change>
8477+
<p><span class=updated>[2012-09-19]</span> Modify <a
8478+
href="visuren.html#box-gen" >&ldquo;9.2 Controlling box
8479+
generation&rdquo;</a> and <a
8480+
href="visuren.html#anonymous-block-level" >&ldquo;9.2.1
8481+
Block-level elements and block boxes&rdquo;</a> as follows:
8482+
8483+
<blockquote>
8484+
<h2>Controlling box generation</h2>
8485+
8486+
<p>The following sections describe the types of boxes that may be
8487+
generated in CSS&nbsp;2.1. A box's type affects, in part, its
8488+
behavior in the visual formatting model. The 'display' property,
8489+
described below, specifies a box's type.
8490+
8491+
<p><ins>Certain values of the ''display' property cause an
8492+
element of the source document to generate a <dfn>principal
8493+
box</dfn> that contains descendant boxes and generated content
8494+
and is also the box involved in any positioning scheme. Some
8495+
elements may generate additional boxes in addition to the
8496+
principal box: 'list-item' elements. These additional boxes are
8497+
placed with respect to the principal box.</ins>
8498+
8499+
<h3>9.2.1 Block-level elements and block boxes</h3>
8500+
8501+
<p><del><dfn>Block-level elements</dfn> are those elements of the
8502+
source document that are formatted visually as blocks (e.g.,
8503+
paragraphs). The following values of the 'display' property make
8504+
an element block-level: 'block', 'list-item', and 'table'.</del>
8505+
8506+
<p><ins><dfn>Block-level elements</dfn> &ndash; those elements of
8507+
the source document that are formatted visually as blocks (e.g.,
8508+
paragraphs) &ndash; are elements which generate a block-level
8509+
principal box. Values of the 'display' property that make an
8510+
element block-level include: 'block', 'list-item', and
8511+
'table'. <dfn>Block-level boxes</dfn> are boxes that participate
8512+
in a block formatting context.</ins>
8513+
8514+
<p><del><dfn>Block-level boxes</dfn> are boxes that participate
8515+
in a block formatting context. Each block-level element
8516+
generates a <dfn>principal block-level box</dfn> that contains
8517+
descendant boxes and generated content and is also the box
8518+
involved in any positioning scheme. Some block-level elements
8519+
may generate additional boxes in addition to the principal box:
8520+
'list-item' elements. These additional boxes are placed with
8521+
respect to the principal box.</del>
8522+
8523+
<p><del>Except for table boxes, which are described in a later
8524+
chapter, and replaced elements,</del> <ins>In
8525+
CSS&nbsp;2.1,</ins> a block-level box is also a block container
8526+
box <ins>unless it is a table box or the principal box of a
8527+
replaced element</ins>. A <dfn >block container box</dfn> either
8528+
contains only block-level boxes or establishes an inline
8529+
formatting context and thus contains only inline-level
8530+
boxes. <ins>An element whose principal box is a block container
8531+
box is a <dfn >block container element.</dfn></ins> Values of
8532+
the 'display' property which make a non-replaced element
8533+
generate a block container include 'block', 'list-item' and
8534+
'inline-block'. Not all block container boxes are block-level
8535+
boxes: non-replaced inline blocks and non-replaced table cells
8536+
are block containers but <ins>are</ins> not block-level
8537+
<del>boxes</del>. Block-level boxes that are also block
8538+
containers are called <dfn>block boxes</dfn>.
8539+
8540+
<p>The three terms "block-level box," "block container box," and
8541+
"block box" are sometimes abbreviated as "block" where
8542+
unambiguous.
8543+
</blockquote>
8544+
8545+
<!-- Status: edited -->
8546+
<!-- http://lists.w3.org/Archives/Public/www-style/2012Sep/0041.html -->
8547+
8548+
8549+
8550+
<li id=s.9.2.4a class=change>
8551+
<p><span class=updated>[2012-09-19]</span> Modify <a
8552+
href="visuren.html#display-prop" >&ldquo;9.2.4 The 'display'
8553+
property&rdquo;</a> as follows:
8554+
8555+
<blockquote>
8556+
<dl>
8557+
<dt><strong>block</strong>
8558+
8559+
<dd>This value causes an element to generate a
8560+
<ins>principal</ins> block box.
8561+
8562+
<dt><strong>inline-block</strong>
8563+
8564+
<dd>This value causes an element to generate <del>an</del>
8565+
<ins>a principal</ins> inline-level block container.
8566+
<ins>(</ins>The inside of an inline-block is formatted as a
8567+
block box, and the element itself is formatted as an atomic
8568+
inline-level box.<ins>)</ins>
8569+
8570+
</dl>
8571+
</blockquote>
8572+
8573+
<!-- Status: edited -->
8574+
<!-- http://lists.w3.org/Archives/Public/www-style/2012Sep/0041.html -->
8575+
8576+
8577+
8578+
<li id=s.17.4b class=change>
8579+
<p><span class=updated>[2012-09-19]</span> Modify <a
8580+
href="tables.html#model" >&ldquo;17.4 Tables in the visual
8581+
formatting model&rdquo;</a> as follows:
8582+
8583+
<blockquote>
8584+
<p>In both cases, the table generates a principal block
8585+
<ins>container</ins> box called the <dfn>table wrapper box</dfn>
8586+
that contains the table box itself and any caption boxes (in
8587+
document order). The <dfn>table box</dfn> is a block-level box
8588+
that contains the table's internal table boxes. The caption
8589+
boxes are <ins>principal</ins> block-level boxes that retain
8590+
their own content, padding, margin, and border areas, and are
8591+
rendered as normal block boxes inside the table wrapper
8592+
box. Whether the caption boxes are placed before or after the
8593+
table box is decided by the 'caption-side' property, as
8594+
described below.
8595+
8596+
<p>The table wrapper box is <del>a 'block' box if the table is
8597+
block-level</del> <ins>block-level for 'display: table'</ins>,
8598+
and <del>an 'inline-block' box if the table is
8599+
inline-level</del> <ins>inline-level for 'display:
8600+
inline-table'</ins>. The table wrapper box establishes a block
8601+
formatting context, and the table box establishes a table
8602+
formatting context. The table box (not the table wrapper box) is
8603+
used when doing baseline vertical alignment for an
8604+
'inline-table'. The width of the table wrapper box is the
8605+
border-edge width of the table box inside it, as described by
8606+
section 17.5.2. Percentages on 'width' and 'height' on the table
8607+
are relative to the table wrapper box's containing block, not
8608+
the table wrapper box itself.
8609+
</blockquote>
8610+
8611+
<!-- Status: edited -->
8612+
<!-- http://lists.w3.org/Archives/Public/www-style/2012Sep/0041.html -->
8613+
8614+
8615+
8616+
<li id=s.17.4c class=change>
8617+
<p><span class=updated>[2012-09-19]</span> For compatibility with
8618+
SVG, modify the definition of macro num in <a
8619+
href="syndata.html#tokenization" >&ldquo;4.1.1
8620+
Tokenization&rdquo;</a> as follows:
8621+
8622+
<blockquote>
8623+
<table>
8624+
<tr>
8625+
<td><del>num</del>
8626+
<td><del><code>[-+]?[0-9]+|[-+]?[0-9]*\.[0-9]+</code></del>
8627+
<tr>
8628+
<td><ins>num</ins>
8629+
<td><ins><code>[+-]?([0-9]+|[0-9]*\.[0-9]+)(e[+-]?[0-9]+)?</code></ins>
8630+
</table>
8631+
</blockquote>
8632+
8633+
<!-- Status: edited -->
8634+
<!-- As decided on 2012-08-15 -->
8635+
8636+
84768637

84778638
</ul>
84788639

0 commit comments

Comments
 (0)