8000 [css2] Issues 10, 21, 22, 34, 38 from http://csswg.inkedblade.net/spe… · w3c/csswg-drafts@92ada0b · GitHub
Skip to content

Commit 92ada0b

Browse files
bert-githubbert-github
committed
[css2] Issues 10, 21, 22, 34, 38 from http://csswg.inkedblade.net/spec/css2.1
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402832
1 parent b26a889 commit 92ada0b

7 files changed

Lines changed: 94 additions & 26 deletions

File tree

‎css2/changes.src‎

Lines changed: 25 additions & 3 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.85 2008-03-05 15:36:14 bbos Exp $ -->
3+
<!-- $Id: changes.src,v 2.86 2008-04-07 18:31:50 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Changes</TITLE>
@@ -930,6 +930,9 @@ expected to return in the CSS3 Lists module.)</p>
930930
Instead, normal parsing rules apply and cause the rule to be
931931
ignored.</p>
932932

933+
<p>The size of list style markers without an intrinsic size is now
934+
defined.
935+
933936
<h3 id="c13.1"><a href="page.html">Chapter 13 Paged media</a></h3>
934937

935938
<p>The 'size', 'marks', and 'page' properties are not part of
@@ -975,6 +978,9 @@ elements.</p>
975978
for 'background-attachment' as 'scroll'. Instead they must ignore
976979
all such declarations as if 'fixed' were an invalid value.</p>
977980

981+
<p>The size of background images without an intrinsic size is now
982+
defined.
983+
978984
<h3 id="c14.3"><a href="colors.html#gamma-correction">Section
979985
14.3 Gamma correction</a></h3>
980986

@@ -1262,6 +1268,11 @@ Border conflict resolution</a></h3>
12621268
<p>Defined in rule 4 what happens when two elements of the same
12631269
type conflict and their borders have the same width and style.</p>
12641270

1271+
<h3 id="c18.1"><a href="ui.html#cursor-props">Section 18.1 Cursors:
1272+
the 'cursor' property</a>
1273+
1274+
<p>The size of cursors without an intrinsic size is now defined.
1275+
12651276
<h3 id="c18.4"><a href="ui.html#dynamic-outlines">Section 18.4
12661277
Dynamic outlines</a></h3>
12671278

@@ -1939,8 +1950,14 @@ Adjacent sibling selectors</a></h3>
19391950
<p>Clarified that text nodes and comments do not affect whether a
19401951
sibling selector matches.
19411952

1942-
<h3 id="r5.8.2"><a href="selector.html#default-attrs">Section 5.8.2 Default
1943-
attribute values in DTDs</a></h3>
1953+
<h3 id="r5.8.1"><a href="selector.html#matching-attrs">Section 5.8.1
1954+
Matching attributes and attribute values</a></h3>
1955+
1956+
<p>Clarified ~= and |= by using the definitions from the Selectors
1957+
module.
1958+
1959+
<h3 id="r5.8.2"><a href="selector.html#default-attrs">Section 5.8.2
1960+
Default attribute values in DTDs</a></h3>
19441961

19451962
<p>Clarified that rules about default attribute values are the same,
19461963
whether the default is specified in a DTD or by other means.
@@ -2084,6 +2101,11 @@ agent should offer a scrolling mechanism" to use "area of the canvas on
20842101
which the document is rendered" instead of "document's initial containing
20852102
block".</p>
20862103

2104+
<h3 id="r9.2.4"><a href="visuren.html#display-prop">9.2.4 The
2105+
'display' property</a></h3>
2106+
2107+
<p>Clarified that 'display: none' also applies to non-visual media.
2108+
20872109
<h3 id="r9.3.1"><a href="visuren.html#choose-position">Section 9.3.1
20882110
Choosing a positioning scheme</a></h3>
20892111

‎css2/colors.src‎

Lines changed: 10 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: colors.src,v 2.49 2007-11-13 14:53:27 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.50 2008-04-07 18:31:50 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Colors and backgrounds</title>
@@ -156,6 +156,15 @@ coordinate system for the <span
156156
class="propinst-background-position">'background-position'</span>
157157
property.
158158
</p>
159+
<p>If the image has one of either an intrinsic width or an intrinsic
160+
height and an intrinsic aspect ratio, then the missing dimension is
161+
calculated from the given dimension and the ratio.
162+
</p>
163+
<p> If the image has one of either an intrinsic width or an intrinsic
164+
height and no intrinsic aspect ratio, then the missing dimension is
165+
assumed to be the size of the rectangle that establishes the
166+
coordinate system for the 'background-position' property.
167+
</p>
159168
<p>If the image has no intrinsic dimensions and has an intrinsic ratio
160169
the dimensions must be assumed to be the largest dimensions at that
161170
ratio such that neither dimension exceeds the dimensions of the

‎css2/generate.src‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -843,6 +843,29 @@ marker. When the image is available, it will replace the marker set
843843
with the <span
844844
class="propinst-list-style-type">'list-style-type'</span> marker.
845845

846+
<p>The size of the image is calculated from the following rules:
847+
<ol>
848+
<li>
849+
If the image has an intrinsic width or height, then that intrinsic
850+
width/height becomes the image's used width/height.
851+
<li>
852+
If the image's intrinsic width or height is given as a percentage,
853+
then that percentage is resolved against 1em.
854+
<li>
855+
If the image has no intrinsic ratio and a ratio cannot be calculated
856+
from its width and height, then its intrinsic ratio is assumed to be
857+
1:1.
858+
<li>
859+
If the image has a width but no height, its height is calculated from
860+
the intrinsic ratio.
861+
<li>
862+
If the image's height cannot be resolved from the rules above, then
863+
the image's height is assumed to be 1em.
864+
<li>
865+
If the image has no intrinsic width, then its width is calculated from
866+
the resolved height and the intrinsic ratio.
867+
</ol>
868+
846869
<div class="example"><P>
847870
The following example sets the marker at the beginning of each list
848871
item to be the image "ellipse.png".

‎css2/selector.src‎

Lines changed: 14 additions & 12 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: selector.src,v 2.108 2007-11-13 14:30:56 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.109 2008-04-07 18:31:50 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -335,19 +335,21 @@ matching|="><code>[att=val]</code></span>
335335
<dd>Match when the element's "att" attribute value is exactly "val".
336336
<dt><span class="index-def" title="space-separated
337337
matching|~="><code>[att~=val]</code></span>
338-
<dd>Match when the element's "att" attribute value is a
339-
space-separated list of "words", one of which is exactly "val".
340-
If this selector is used, the words in the value must not contain
341-
spaces (since they are separated by spaces).
338+
<dd>Represents an element with the <code>att</code> attribute whose
339+
value is a whitespace-separated list of words, one of which is exactly
340+
"val". If "val" contains whitespace, it will never represent anything
341+
(since the words are <em>separated</em> by spaces).
342342
<dt><span class="index-def" title="hyphen-separated
343343
matching|&#124;="><code>[att|=val]</code></span>
344-
<dd>Match when the element's "att" attribute value is a
345-
hyphen-separated list of "words", beginning with "val". The match
346-
always starts at the beginning of the attribute value.
347-
This is primarily
348-
intended to allow <span class="index-inst" title="language
349-
code">language subcode</span> matches (e.g., the "lang"
350-
attribute in HTML) as described in RFC 3066 ([[-RFC3066]]).
344+
<dd>Represents an element with the <code>att</code> attribute, its
345+
value either being exactly "val" or beginning with "val" immediately
346+
followed by "-" (U+002D). This is primarily intended to allow <span
347+
class="index-inst" title="language code">language subcode</span>
348+
matches (e.g., the <code>hreflang</code> attribute on the
349+
<code>a</code> element in HTML) as described in RFC 3066
350+
([[-RFC3066]]) or its successor. For <code>lang</code> (or
351+
<code>xml:lang</code>) language subcode matching, please see <a
352+
href="#lang">the <code>:lang</code> pseudo-class</a>.
351353
</dl>
352354

353355
<p>Attribute values must be identifiers or strings. The

‎css2/ui.src‎

Lines changed: 9 additions & 3 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: ui.src,v 2.41 2007-11-13 14:53:28 bbos Exp $ -->
3+
<!-- $Id: ui.src,v 2.42 2008-04-07 18:31:50 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>User interface</title>
@@ -75,8 +75,14 @@ the first cursor of a list of cursors, it should attempt
7575
to handle the second, etc. If the user agent cannot handle
7676
any user-defined cursor, it must use the generic cursor
7777
at the end of the list.
78-
</dd>
79-
</dl>
78+
Intrinsic sizes for cursors are calculated as for <a
79+
href="colors.html#background-properties">background images,</a> except
80+
that a UA-defined rectangle is used in place of the rectangle that
81+
establishes the coordinate system for the 'background-image' property.
82+
This UA-defined rectangle should be based on the size of a typical
83+
cursor on the UA's operating system. If the resulting cursor size does
84+
not fit within this rectangle, the UA may proportionally scale the
85+
resulting cursor down until it fits within the rectangle.</dd> </dl>
8086

8187
<div class="example">
8288
<pre><code class="css">

‎css2/visudet.src‎

Lines changed: 6 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: visudet.src,v 2.125 2008-03-05 15:36:29 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.126 2008-04-07 18:31:50 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -550,6 +550,9 @@ the following rules:
550550
<li>The used value of <span class="propinst-width">'width'</span> is
551551
determined as for <a href="#inline-replaced-width">inline replaced
552552
elements</a>.
553+
If <span class="propinst-margin-left">'margin-left'</span> or <span
554+
class="propinst-margin-right">'margin-right'</span> is specified as
555+
'auto' its used value is determined by the rules below.
553556
</li>
554557
<li>If both <span class="propinst-left">'left'</span> and <span
555558
class="propinst-right">'right'</span> have the value 'auto', then if
@@ -1079,7 +1082,8 @@ sequence of substitutions is now:
10791082
<li>The used value of <span
10801083
class="propinst-height">'height'</span> is determined as for <a
10811084
href="#inline-replaced-height">inline replaced elements</a>.
1082-
</li>
1085+
If 'margin-top' or 'margin-bottom' is specified as 'auto' its used
1086+
value is determined by the rules below.</li>
10831087
<li>If both <span class="propinst-top">'top'</span> and <span
10841088
class="propinst-bottom">'bottom'</span> have the value 'auto', replace
10851089
<span class="propinst-top">'top'</span> with the element's <a

‎css2/visuren.src‎

Lines changed: 7 additions & 5 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: visuren.src,v 2.140 2007-11-13 14:53:28 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.141 2008-04-07 18:31:50 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
@@ -374,11 +374,13 @@ lists and examples of list formatting, please consult the section on
374374
<dt><strong>none</strong></dt>
375375

376376
<dd><span class="index-def" title="'none'::as display value">This
377-
value</span> causes an element to generate <b>no</b> boxes in the <a
377+
value</span> causes an element to <em>not appear</em> in the <a
378378
href="intro.html#formatting-structure">formatting structure</a> (i.e.,
379-
the element has no effect on layout). Descendant elements do not
380-
generate any boxes either; this behavior <strong>cannot</strong> be
381-
overridden by setting the <span
379+
<em>in visual media</em> the element <em>generates no boxes</em> and
380+
has no effect on layout). Descendant elements do not generate any
381+
boxes either; <em>the element and its content are removed from the
382+
formatting structure entirely.</em> This behavior
383+
<strong>cannot</strong> be overridden by setting the <span
382384
class="propinst-display">'display'</span> property on the descendants.
383385

384386
<p>Please note that a display of 'none' does not create an invisible

0 commit comments

Comments
 (0)