Skip to content

Commit b850d95

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

1 file changed

Lines changed: 117 additions & 1 deletion

File tree

‎css2/changes.src‎

Lines changed: 117 additions & 1 deletion
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.123 2010-10-05 19:34:37 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.124 2010-10-13 15:38:26 bbos Exp $ -->
44
<HEAD>
55
<TITLE>Changes</TITLE>
66
</HEAD>
@@ -4909,6 +4909,65 @@ property</a></h3>
49094909
introduces clearance above an element if necessary; and that clearance
49104910
may have zero height.
49114911

4912+
<!--========================== issue 157 ==========================-->
4913+
4914+
<h3 id="t.9.5.2a"><a
4915+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
4916+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
4917+
property</a></h3>
4918+
4919+
<p><span class=date>[2010-10-13]</span> Added an example of
4920+
calculating clearance from two collapsing margins M1 and M2 and the
4921+
height H of a float.
4922+
4923+
<!--========================== issue 158 ==========================-->
4924+
4925+
<h3 id="t.9.5.2b"><a
4926+
href="/TR/2009/CR-CSS2-20090908/visuren.html#flow-control">
4927+
Section&nbsp;9.5.2 Controlling flow next to floats: the 'clear'
4928+
property</a></h3>
4929+
4930+
<p><span class=date>[2010-10-13]</span> Clarify the language:
4931+
4932+
<blockquote>
4933+
<p>Computing the clearance of an element on which 'clear' is set is
4934+
done by first determining the hypothetical position of the element's
4935+
top border edge within its parent block. <del>This position is
4936+
determined after the top margin of the element has been collapsed with
4937+
previous adjacent margins (including the top margin of the parent
4938+
block).</del> <ins>This position is the same as the where the actual
4939+
top border edge would have been if the element had a non-zero top
4940+
border and its 'clear' property had been 'none'.</ins>
4941+
4942+
<p>If this hypothetical position of the element's top border edge is
4943+
not past the relevant floats, then clearance <del>must be</del>
4944+
<ins>is introduced, and margins collapse according to the rules
4945+
in 8.3.1.</ins>
4946+
4947+
<p><ins>Then the amount of clearance is</ins> set to the greater of:
4948+
4949+
<ol>
4950+
<li>The amount necessary to place the border edge of the block even
4951+
with the bottom outer edge of the lowest float that is to be cleared.
4952+
4953+
<li><del>The amount necessary to make the sum of the following equal
4954+
to the distance to which these margins collapsed when the hypothetical
4955+
position was calculated:</del>
4956+
4957+
<ul>
4958+
<li><del>the margins collapsing above the clearance</del>
4959+
<li><del>the clearance itself</del>
4960+
<li><del>if the block's own margins collapse together: the block's top
4961+
margin</del>
4962+
<li><del>if the block's own margins do not collapse together: the
4963+
margins collapsing below the clearance</del>
4964+
</ul>
4965+
4966+
<p><ins>The amount necessary to place the top border
4967+
edge of the block at its hypothetical position.</ins>
4968+
</ol>
4969+
</blockquote>
4970+
49124971
<!--========================== issue 69 ===========================-->
49134972

49144973
<h3 id="t.9.6.1"><a
@@ -5594,6 +5653,63 @@ Section&nbsp;15.6 Font boldness: the 'font-weight' property</a></h3>
55945653
'bolder' and 'lighter' no longer depends on both the inherited weight
55955654
and the actually used font, but only on the inherited weight.
55965655

5656+
<!--========================== issue 156 ==========================-->
5657+
5658+
<h3 id="t.15.6q"><a
5659+
href="/TR/2009/CR-CSS2-20090908/fonts.html#font-boldness">
5660+
Section&nbsp;15.6 Font boldness: the 'font-weight' property</a></h3>
5661+
5662+
<p><span class=date>[2010-10-13]</span> Clarify the algorithm for
5663+
mapping CSS font weight values to the actual weights of a font and
5664+
make it normative:
5665+
5666+
<blockquote>
5667+
<p>The association of other weights within a family to the numerical
5668+
weight values is intended only to preserve the ordering of darkness
5669+
within that family. However, the following heuristics tell how the
5670+
assignment is done in typical cases:
5671+
5672+
<ul>
5673+
<li>If the font family already uses a numerical scale with nine values
5674+
(like e.g., <em>OpenType</em> does), the font weights should be mapped
5675+
directly.
5676+
5677+
<li>If there is both a face labeled <em>Medium</em> and one labeled
5678+
<em>Book, Regular, Roman</em> or <em>Normal,</em> then the
5679+
<em>Medium</em> is normally assigned to the '500'.
5680+
5681+
<li>The font labeled "Bold" will often correspond to the weight value '700'.
5682+
</ul>
5683+
5684+
<p><ins>Once the font family's weights are mapped onto the CSS scale,
5685+
missing weights are selected as follows:</ins>
5686+
5687+
<ul>
5688+
<li><del>If there are fewer then 9 weights in the family, the default
5689+
algorithm for filling the "holes" is as follows. If '500' is
5690+
unassigned, it will be assigned the same font as '400'. If any of the
5691+
values '600', '700', '800' or '900' remains unassigned, they are
5692+
assigned to the same face as the next darker assigned keyword, if any,
5693+
or the next lighter one otherwise. If any of '300', '200' or '100'
5694+
remains unassigned, it is assigned to the next lighter assigned
5695+
keyword, if any, or the next darker otherwise.</del>
5696+
5697+
<li><ins>If the desired weight is less than 400, weights below the desired
5698+
weight are checked in descending order followed by weights above the
5699+
desired weight in ascending order until a match is found.</ins>
5700+
5701+
<li><ins>If the desired weight is greater than 500, weights above desired
5702+
weight are checked in ascending order followed by weights below the
5703+
desired weight in descending order until a match is found.</ins>
5704+
5705+
<li><ins>If the desired weight is 400, 500 is checked first and then the
5706+
rule for desired weights less than 400 is used.</ins>
5707+
5708+
<li><ins>If the desired weight is 500, 400 is checked first and then the
5709+
rule for desired weights less than 400 is used.</ins>
5710+
</ul>
5711+
</blockquote>
5712+
55975713
<!--========================== issue 189 ==========================-->
55985714

55995715
<h3 id="t.15.7"><a

0 commit comments

Comments
 (0)