Skip to content

Commit 338d3ae

Browse files
committed
[css2] Edits by Hakon
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402283
1 parent 9b2ef33 commit 338d3ae

4 files changed

Lines changed: 46 additions & 21 deletions

File tree

css2/cascade.src

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: cascade.src,v 2.50 2004-12-07 10:10:25 bbos Exp $ -->
3+
<!-- $Id: cascade.src,v 2.51 2005-03-22 14:31:04 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -65,12 +65,14 @@ to depend on whether the property applies to that element.
6565
<h3><span class="index-def" title="used value">
6666
<a name="used-value">Used values</a></span></h3>
6767

68-
<p>Computed values can be relative to each other; for example a width
69-
could be set as a percentage, which is dependent on the containing
70-
block's width. The <dfn id="usedValue">used value</dfn> is the
71-
result of taking the computed value and resolving these dependencies
72-
into a final absolute value used for the actual layout.
73-
68+
<p>Computed values are processed as far as possible without formatting
69+
the document. Some values, however, can only be determined when the
70+
document is being laid out. For example, if the width of an element is
71+
set to be a certain percentage of its containing block, the width
72+
cannot be determined until the width of the containing block has been
73+
determined. The <dfn id="usedValue">used value</dfn> is the result of
74+
taking the computed value and resolving any remaining dependencies
75+
into an absolute value.
7476

7577
<h3><span class="index-def" title="actual value">
7678
<a name="actual-value">Actual values</a></span></h3>
@@ -301,7 +303,7 @@ must apply the following sorting order:</p>
301303
this strategy gives author's style sheets higher weight than those of
302304
the reader. User agents must give the user the ability to turn off the
303305
influence of specific author style sheets, e.g., through a pull-down
304-
menu.
306+
menu. Conformance to UAAG 1.0 checkpoint 4.14 satisfies this condition [[UAAG10]].
305307

306308
<H3><a name="important-rules">!important rules</a></H3>
307309

css2/conform.src

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: conform.src,v 2.60 2005-03-22 14:16:27 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.61 2005-03-22 14:31:04 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
7-
<!-- Changed by Kimberly Blessing, 2004-02-13 -->
7+
88
</HEAD>
99
<BODY>
1010
<H1>Conformance: Requirements and Recommendations</H1>
@@ -327,6 +327,8 @@ allow the user to select which style sheet set the UA should apply.
327327
influence of specific author style sheets. Conformance to UAAG 1.0
328328
checkpoint 4.14 satisfies this condition [[-UUAG]].
329329

330+
<li>The UA must allow the user to turn off the influence of author style sheets.
331+
330332
</ol>
331333

332334
<P>Not every user agent must observe every point, however:</p>
@@ -382,7 +384,7 @@ name="text-css">The text/css content type</a></span></H2>
382384

383385
<p>CSS style sheets that exist in separate files are sent over the
384386
Internet as a sequence of bytes accompanied by encoding
385-
information<!--(see [[HTML40]], chapter 5)-->. The structure of the
387+
information. The structure of the
386388
transmission, termed a <span class="index-def" title="message
387389
entity"><a name="message-entity"><strong>message
388390
entity,</strong></a></span> is defined by RFC 2045 and RFC 2068 (see

css2/sample.src

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: sample.src,v 2.40 2004-12-15 18:17:56 bbos Exp $ -->
3+
<!-- $Id: sample.src,v 2.41 2005-03-22 14:31:04 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Default style sheet for HTML 4.0</TITLE>
@@ -71,8 +71,7 @@ pre, tt, code,
7171
kbd, samp { font-family: monospace }
7272
pre { white-space: pre }
7373
button, textarea,
74-
input, img,
75-
select { display:inline-block; }
74+
input, select { display: inline-block }
7675
big { font-size: 1.17em }
7776
small, sub, sup { font-size: .83em }
7877
sub { vertical-align: sub }

css2/syndata.src

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
22
"http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
33
<html lang="en">
4-
<!-- $Id: syndata.src,v 2.108 2005-03-02 04:41:45 bbos Exp $ -->
4+
<!-- $Id: syndata.src,v 2.109 2005-03-22 14:31:04 bbos Exp $ -->
55
<head>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<title>Syntax and basic data types</title>
@@ -316,9 +316,7 @@ href="#value-def-identifier">identifier</a> (for example, '@import',
316316
</p>
317317
<p> An at-rule consists of everything up to and including the next
318318
semicolon (;) or the next <a href="#block">block,</a> whichever comes
319-
first. A CSS user agent that encounters an unrecognized at-rule must
320-
<span class="index-inst" title="ignore"><a href="#ignore">ignore</a></span>
321-
the whole of the at-rule and continue parsing after it.
319+
first.
322320
</p>
323321

324322
<p>CSS&nbsp;2.1 user agents must <span class="index-inst" title="ignore"><a
@@ -369,7 +367,7 @@ curly brace (}). In between there may be any characters, except that
369367
parentheses ((&nbsp;)), brackets ([&nbsp;]) and braces ({&nbsp;}) must
370368
always occur in
371369
matching pairs and may be nested. Single (') and double quotes (")
372-
<!-- " --> must also occur in matching pairs, and characters between them
370+
must also occur in matching pairs, and characters between them
373371
are parsed as a <span class="index-inst" title="string">string</span>.
374372
See <a href="#tokenization">Tokenization</a> above for the definition
375373
of a string.
@@ -492,7 +490,7 @@ h1 {
492490
href="#value-def-identifier">identifier</a>. Any character may occur
493491
in the value. Parentheses ("(&nbsp;)"), brackets ("[&nbsp;]"),
494492
braces ("{&nbsp;}"), single
495-
quotes (') and double quotes (") <!-- " --> must come in matching
493+
quotes (') and double quotes (") must come in matching
496494
pairs, and semicolons not in strings must be <a
497495
href="#escaped-characters">escaped</a>. Parentheses, brackets, and
498496
braces may be nested. Inside the quotes, characters are parsed as a
@@ -657,11 +655,35 @@ the entire at-rule invalid.
657655
</p>
658656

659657
</li>
658+
659+
<li><li><strong>Unexpected end of style sheet.</strong>
660+
661+
User agents must close all open constructs (blocks, parentheses,
662+
brackets, rules, strings, comments, etc) at the end of the
663+
stylesheet. For example:
664+
665+
<pre class="illegal-example">
666+
@media screen {
667+
p:before { content: 'Hello
668+
</pre>
669+
670+
would be treated the same as:
671+
672+
<pre class="example">
673+
@media screen {
674+
p:before { content: 'Hello'; }
675+
}
676+
</pre>
677+
678+
in a conformant UA.
679+
660680
</ul>
661681

662-
<p>How to handle unparseable and untokenizable stylesheets is
682+
<!--
683+
<p>How to handle unparseable and untokenizable style sheets is
663684
undefined in CSS2.1
664685
</p>
686+
-->
665687

666688
<h2><a name="values">Values</a></h2>
667689

0 commit comments

Comments
 (0)