Skip to content

Commit 7d039ec

Browse files
committed
[css2] Changes by Håkon:
CONFORM I have added the following text: UAs must allow users to specify a file that contains the user style sheet. UAs that run on devices without any means of writing or specifying files are excempted from this requirement. Additionaly, UAs may offer other means to specify user preferences, for example through a GUI. TABLES I have removed the 'left' and 'right' values on 'caption-side'. GENERATE All remnants of automatic numbering have been removed. Otherwise just editorial changes. MEDIA I have added text to clarify that media types are mutually exclusive. INTRO Minor editorial changes. VISUREN In section 9.10, the text that says non-bidi UAs may ignore this section has been moved forward to give it more attention. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401904
1 parent fe7b74b commit 7d039ec

6 files changed

Lines changed: 52 additions & 109 deletions

File tree

css2/conform.src

Lines changed: 14 additions & 14 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: conform.src,v 2.49 2002-07-25 19:07:36 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.50 2002-07-30 18:17:54 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -50,7 +50,7 @@ inheritance</a>.
5050

5151
<dd>The <span class="index-def" title="valid style
5252
sheet">validity</span> of a style sheet depends on the level of CSS
53-
used for the style sheet. All valid CSS1 style sheets are valid CSS2
53+
used for the style sheet. All valid CSS1 style sheets are valid CSS&nbsp;2.1
5454
style sheets, but some changes from CSS1 mean that
5555
a few CSS1 style sheets will have slightly different semantics in
5656
CSS&nbsp;2.1. Some features in CSS2 are not part of CSS&nbsp;2.1, so not all CSS2
@@ -93,15 +93,15 @@ element</a></span></strong>
9393
<dd>An element for which the CSS formatter knows only the intrinsic
9494
dimensions. In HTML, IMG and OBJECT elements can be replaced elements.
9595
For example, the content of the IMG element is often replaced by the
96-
image that the "src" attribute designates. CSS does not define how the
97-
intrinsic dimensions are found.
96+
image that the "src" attribute designates.
9897

9998
<dt><strong><span class="index-def" title="intrinsic
10099
dimensions"><a name="intrinsic">Intrinsic dimensions</a></span></strong>
101100

102101
<dd>The width and height as defined by the element itself, not imposed
103-
by the surroundings. In CSS&nbsp;2.1 it is assumed that all replaced
104-
elements, and only replaced elements, come with intrinsic dimensions.
102+
by the surroundings. CSS does not define how the intrinsic dimensions
103+
are found. In CSS&nbsp;2.1 it is assumed that all replaced elements,
104+
and only replaced elements, come with intrinsic dimensions.
105105

106106
<dt><strong><span class="index-def" title="attribute"><a
107107
name="attribute">Attribute</a></span></strong>
@@ -305,14 +305,14 @@ the selected one.
305305

306306
<ul>
307307

308-
<li>A user agent that <em>reads</em> style sheets must
309-
respect points 1 - 3.
308+
<li>An application that reads style sheets without rendering any
309+
content (e.g., a CSS&nbsp;2.1 validator) must respect points 1-3.
310310

311311
<li>An authoring tool is only required to output <a
312312
href="#valid-style-sheet">valid style sheets</a>
313313

314314
<li>A user agent that <em>renders</em> a document with associated style
315-
sheets must respect points 1 - 5 and render the document
315+
sheets must respect points 1-5 and render the document
316316
according to the media-specific requirements set forth in this
317317
specification. <a href="cascade.html#actual-value">Values</a>
318318
may be approximated when required by the user agent.
@@ -324,11 +324,11 @@ specification due to the limitations of a particular device (e.g., a
324324
user agent cannot render colors on a monochrome monitor or page) does
325325
not imply non-conformance. </P>
326326

327-
<p>This specification recommends that a user agent allow the user to
328-
specify user style sheets.
329-
330-
<!-- Does the above sentence mean "as style sheets", or can
331-
the functionality be applied through the UA? -IJ -->
327+
<p>UAs must allow users to specify a file that contains the user style
328+
sheet. UAs that run on devices without any means of writing or
329+
specifying files are excempted from this requirement. Additionaly, UAs
330+
may offer other means to specify user preferences, for example through
331+
a GUI.
332332

333333

334334
<h2>Error conditions</h2>

css2/generate.src

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@
77
<body>
88
<h1 align="center">
99
<a name="generated-text">Generated</a> <span class="index-def"
10-
title="generated content">content</span>, automatic <span
11-
class="index-def" title="automatic numbering">numbering</span>,
12-
and lists</h1>
10+
title="generated content">content</span> and lists</h1>
1311

14-
<p>In some cases, authors may want user agents to render content
15-
that does not come from the <a href="conform.html#doctree">document
12+
<p>In some cases, authors may want user agents to render content that
13+
does not come from the <a href="conform.html#doctree">document
1614
tree</a>. One familiar example of this is a numbered list; the author
17-
does not want to list the numbers explicitly, he or she wants the
18-
user agent to generate them automatically. Similarly, authors
19-
may want the user agent to insert the word
20-
"Figure" before the caption of a figure, or "Chapter 7" before the
21-
seventh chapter title. For audio or braille in particular, user agents
22-
should be able to insert these strings.
15+
does not want to list the numbers explicitly, he or she wants the user
16+
agent to generate them automatically. Similarly, authors may want the
17+
user agent to insert the word "Figure" before the caption of a figure.
2318

2419
<p>In CSS 2.1, content may be generated by several mechanisms:</p>
2520

@@ -77,7 +72,7 @@ from the element in the document tree to which they are attached.</p>
7772
<div class=example>
7873

7974
<p>For example, the following rules insert an open quote mark before every
80-
"q" element. The color of the quote mark will be red, but the font will
75+
Q element. The color of the quote mark will be red, but the font will
8176
be the same as the font of the rest of the Q element:</p>
8277

8378
<pre>
@@ -191,13 +186,6 @@ attribute values for other elements than the subject of the selector.
191186
controls whether the content is placed in a block or inline
192187
box.
193188

194-
<P>Authors should put <span class="propinst-content">'content'</span>
195-
declarations in <span class="index-inst" title="@media"><a
196-
href="media.html#at-media-rule">@media</a></span> rules when
197-
the content is media-sensitive. For instance, literal
198-
text may be used for any media group, but images only
199-
apply to the visual and bitmap media groups.
200-
201189
<div class="example">
202190
<p>The rule below inserts the text of the HTML "alt" attribute before the
203191
image. If the image is not displayed, the reader will still see the

css2/intro.src

Lines changed: 6 additions & 6 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: intro.src,v 2.38 2002-07-25 19:07:37 bbos Exp $ -->
3+
<!-- $Id: intro.src,v 2.39 2002-07-30 18:17:54 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Introduction to CSS&nbsp;2.1</TITLE>
@@ -125,7 +125,7 @@ but the second rule overrides the inherited value. In CSS there are
125125
often such conflicts between different values, and this specification
126126
describes how to resolve them.
127127

128-
<P>CSS&nbsp;2.1 has more than 100 different properties, including <span
128+
<P>CSS&nbsp;2.1 has more than 90 different properties, including <span
129129
class="propinst-color">'color'</span>. Let's look at some of the
130130
others:
131131

@@ -205,9 +205,9 @@ ARTICLE, HEADLINE, AUTHOR, PARA { display: block }
205205

206206
<P>The first rule declares INSTRUMENT to be inline and the second
207207
rule, with its comma-separated list of selectors, declares all the
208-
other elements to be block-level. XML is case-sensitive, so a selector
209-
written in lowercase (e.g. 'instrument') is different from uppercase
210-
(e.g. 'INSTRUMENT').
208+
other elements to be block-level. Element names in XML are
209+
case-sensitive, so a selector written in lowercase (e.g. 'instrument')
210+
is different from uppercase (e.g. 'INSTRUMENT').
211211

212212
<P>One proposal for linking a style sheet to an XML document is to use
213213
a processing instruction:
@@ -254,7 +254,7 @@ ARTICLE, HEADLINE, AUTHOR, PARA { margin: 0.5em }
254254
</div>
255255

256256
<P>Adding more rules to the style sheet will allow you to further
257-
improve the presentation of the document.
257+
describe the presentation of the document.
258258

259259

260260
<H2><a name="processing-model">The CSS&nbsp;2.1 processing model</a></H2>

css2/media.src

Lines changed: 15 additions & 12 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: media.src,v 2.25 2002-07-25 19:07:37 bbos Exp $ -->
3+
<!-- $Id: media.src,v 2.26 2002-07-30 18:17:54 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Media types</TITLE>
@@ -10,7 +10,7 @@
1010

1111
<H2>Introduction to media types</H2>
1212

13-
One of the most important features of style sheets is that they
13+
<P>One of the most important features of style sheets is that they
1414
specify how a document is to be presented on different media: on the
1515
screen, on paper, with a speech synthesizer, with a braille device,
1616
etc.
@@ -22,13 +22,11 @@ only applies to paged media). On occasion, however, style sheets for
2222
different media types may share a property, but require different
2323
values for that property. For example, the <span
2424
class="propinst-font-size">'font-size'</span> property is useful both
25-
for screen and print media. However, the two media are different
26-
enough to require different values for the common property; a document
27-
will typically need a larger font on a computer screen than on paper.
28-
Experience also shows that sans-serif fonts are easier to read on
29-
screen, while fonts with serifs are easier to read on paper. For these
30-
reasons, it is necessary to express that a style sheet -- or a section
31-
of a style sheet -- applies to certain media types.
25+
for screen and print media. The two media types are different enough
26+
to require different values for the common property; a document will
27+
typically need a larger font on a computer screen than on paper.
28+
Therefore, it is necessary to express that a style sheet, or a
29+
section of a style sheet, applies to certain media types.
3230

3331
<H2>Specifying media-dependent style sheets</H2>
3432
<P>There are currently two ways to specify media dependencies for
@@ -112,9 +110,6 @@ properties that apply to that media type.
112110

113111
-->
114112

115-
<P>Media types are mutually exclusive in the sense that a user agent
116-
can not support more than one media type simultaneously.
117-
118113
<P>The names chosen for CSS media types reflect target devices for
119114
which the relevant properties make sense. The names of media types are
120115
normative. In the following list of CSS media types, the parenthetical
@@ -167,12 +162,20 @@ resolution, color, limited-scrollability screens, sound available).
167162

168163
<P>Media type names are case-insensitive.
169164

165+
<P>Media types are mutually exclusive in the sense that a user agent
166+
can only support one media type when rendering a document. However,
167+
user agents may have differente modes which support different media
168+
types.
169+
170+
170171
<!--
171172
<P>Due to rapidly changing technologies, CSS2 does not specify a
172173
definitive list of media types that may be values for <span
173174
class="index-inst" title="@media">@media</span>.
174175
-->
175176

177+
178+
176179
<div class="note"><P>
177180
<em><strong>Note.</strong>
178181
Future versions of CSS may extend this list. Authors

css2/tables.src

Lines changed: 2 additions & 51 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: tables.src,v 2.52 2002-07-25 19:07:37 bbos Exp $ -->
3+
<!-- $Id: tables.src,v 2.53 2002-07-30 18:17:54 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
66
<title>Tables</title>
@@ -473,10 +473,6 @@ respect to the table box. Values have the following meanings:</p>
473473
<dd>Positions the caption box above the table box.
474474
<dt><strong>bottom</strong>
475475
<dd>Positions the caption box below the table box.
476-
<dt><strong>left</strong>
477-
<dd>Positions the caption box to the left of the table box.
478-
<dt><strong>right</strong>
479-
<dd>Positions the caption box to the right of the table box.
480476
</dl>
481477

482478
<p>Captions above or below a 'table' element are formatted very much as
@@ -489,21 +485,10 @@ not considered to be a block box for the purposes of any
489485
block box for width calculations; the width is computed with respect
490486
to the width of the table box's containing block.
491487

492-
<p>For a caption that is on the left or right side of a table box, on
493-
the other hand, a value other than 'auto' for <span
494-
class="propinst-width">'width'</span> sets the width explicitly, but
495-
'auto' tells the user agent to chose a "reasonable width". This may
496-
vary between "the narrowest possible box" to "a single line", so we
497-
recommend that users do not specify 'auto' for left and right caption
498-
widths.
499488

500489
<P>To align caption content horizontally within the caption box, use
501490
the <span class="propinst-text-align">'text-align'</span>
502-
property. For vertical alignment of a left or right caption box with
503-
respect to the table box, use the <span
504-
class="propinst-vertical-align">'vertical-align'</span> property. The
505-
only meaningful values in this case are 'top', 'middle', and
506-
'bottom'. All other values are treated the same as 'top'.
491+
property.
507492

508493
<div class="example">
509494
<p>In this example, the <span
@@ -518,40 +503,6 @@ caption { caption-side: bottom;
518503
</PRE>
519504
</div>
520505

521-
<div class="example">
522-
<p>The following example shows how to put a caption in the left
523-
margin. The table itself is centered, by setting its left and right
524-
margins to 'auto', and the whole box with table and caption is shifted
525-
into the left margin by the same amount as the width of the caption.
526-
527-
<pre>
528-
body {
529-
margin-left: 8em
530-
}
531-
table {
532-
margin-left: auto;
533-
margin-right: auto
534-
}
535-
caption {
536-
caption-side: left;
537-
margin-left: -8em;
538-
width: 8em;
539-
text-align: right;
540-
vertical-align: bottom
541-
}
542-
</pre>
543-
544-
<p>Assuming the width of the table is less than the available width,
545-
the formatting will be similar to this:
546-
547-
<div class="figure">
548-
<p><img src="images/left-caption.png" alt="A centered table with a
549-
caption in the left margin of the page"><p class="caption"> Diagram
550-
showing a centered table with the caption extending into the left
551-
margin, as a result of a negative 'margin-left' property.
552-
553-
</div><!-- figure -->
554-
</div><!-- example -->
555506

556507
<h2>Visual layout of table contents</h2>
557508

css2/visuren.src

Lines changed: 8 additions & 7 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: visuren.src,v 2.84 2002-07-25 19:07:37 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.85 2002-07-30 18:17:54 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
@@ -1704,6 +1704,12 @@ and <span class="propinst-unicode-bidi">'unicode-bidi'</span>
17041704
properties
17051705
</h2>
17061706

1707+
<a href="conform.html#conformance">Conforming</a> user agents that do
1708+
not support bidirectional text may ignore the <span
1709+
class="propinst-direction">'direction'</span> and <span
1710+
class="propinst-unicode-bidi">'unicode-bidi'</span> properties
1711+
described in this section.
1712+
17071713
<p>The characters in certain scripts are written from right to
17081714
left. In some documents, in particular those written with the Arabic
17091715
or Hebrew script, and in some mixed-language contexts, text in a
@@ -1742,12 +1748,7 @@ in a user agent if that user agent transliterates Yiddish (usually
17421748
written with Hebrew letters) to Latin letters at the user's request.
17431749

17441750
<p>The HTML 4.0 specification ([HTML40], section 8.2) defines
1745-
bidirectionality behavior for HTML elements. <a
1746-
href="conform.html#conformance">Conforming</a> user agents that
1747-
do not support bidirectional text may ignore the <span
1748-
class="propinst-direction">'direction'</span> and <span
1749-
class="propinst-unicode-bidi">'unicode-bidi'</span> properties in
1750-
author and user style sheets. The style sheet
1751+
bidirectionality behavior for HTML elements. The style sheet
17511752
rules that would achieve the bidi behavior specified in [[HTML40]] are
17521753
given in <a href="sample.html#bidi">the sample style sheet</a>. The
17531754
HTML 4.0 specification also contains more information on

0 commit comments

Comments
 (0)