Skip to content

Commit b56790e

Browse files
committed
[css2] Modifs from San Jose and restructuring.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%4051
1 parent a421c57 commit b56790e

16 files changed

Lines changed: 600 additions & 442 deletions

css2/DOC/FILES

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
cover.src
22
about.src
33

4-
tutorial.src
5-
cssdesgn.src
4+
intro.src
65

76
convent.src
87
syndata.src
9-
10-
doctree.src
118
selector.src
129
cascade.src
1310
media.src

css2/DOC/TODO.html

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
44
<META NAME="GENERATOR" CONTENT="Mozilla/4.02b7 [en] (X11; I; Linux 2.0.29 i686) [Netscape]">
55
<TITLE>CSS2 TODO List</TITLE>
6-
<!--$Id: TODO.html,v 1.2 1997-09-07 00:39:28 ian Exp $-->
6+
<!--$Id: TODO.html,v 1.3 1997-09-08 03:00:21 ian Exp $-->
77
</HEAD>
88
<BODY>
99

1010
<H1>CSS2 TODO List</H1>
11-
Last Update: $Date: 1997-09-07 00:39:28 $
11+
Last Update: $Date: 1997-09-08 03:00:21 $
1212
<TABLE BORDER CELLSPACING=0 CELLPADDING=0 WIDTH="100%" >
1313
<CAPTION>Unresolved editorial changes</CAPTION>
1414

@@ -246,12 +246,45 @@ <H1>CSS2 TODO List</H1>
246246

247247
<TD>All</TD>
248248

249+
<TD>Ian</TD>
250+
251+
<TD>7 Sep 1997</TD>
252+
253+
<TD></TD>
254+
255+
<TD>No.</TD>
256+
</TR>
257+
258+
<TR>
259+
<TD>12</TD>
260+
261+
<TD>Fix the CSS2 grammar (grammar.src)</TD>
262+
263+
<TD>High</TD>
264+
249265
<TD>All</TD>
250266

267+
<TD>Ian</TD>
268+
251269
<TD>7 Sep 1997</TD>
252270

271+
<TD>No.</TD>
272+
</TR>
273+
274+
<TR>
275+
<TD>13</TD>
276+
277+
<TD>Put font information in right place (i.e., some of
278+
what's in appendix doesn't belong there)</TD>
279+
253280
<TD></TD>
254281

282+
<TD>Ian and Chris</TD>
283+
284+
<TD>Chris</TD>
285+
286+
<TD>25 Aug 1997</TD>
287+
255288
<TD>No.</TD>
256289
</TR>
257290

css2/Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Makefile to generate the CSS2 document based on its "source files"
22
# Arnaud Le Hors - lehors@w3.org
3-
# $Id: Makefile,v 1.15 1997-09-07 00:30:20 ian Exp $
3+
# $Id: Makefile,v 1.16 1997-09-08 02:51:07 ian Exp $
44

55
ROOT = .
66

@@ -12,10 +12,8 @@ $(ROOT)/cover.src
1212

1313
SRCS1 = \
1414
about.src\
15-
tutorial.src\
16-
cssdesgn.src\
15+
intro.src\
1716
convent.src\
18-
doctree.src\
1917
syndata.src\
2018
selector.src\
2119
cascade.src\
@@ -46,10 +44,8 @@ MAINSRCS = $(SRCS1)
4644
MAINOBJS = \
4745
cover.html\
4846
about.html\
49-
tutorial.html\
50-
cssdesgn.html\
47+
intro.html\
5148
convent.html\
52-
doctree.html\
5349
syndata.html\
5450
selector.html\
5551
cascade.html\

css2/about.src

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!DOCTYPE HTML SYSTEM "http://www.w3.org/TR/WD-html40/sgml/HTML4.dtd">
22
<html lang="en">
3-
<!-- $Id: about.src,v 1.4 1997-08-14 23:43:36 bbos Exp $ -->
3+
<!-- $Id: about.src,v 1.5 1997-09-08 02:51:41 ian Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>About the CSS2 Specification</TITLE>
7-
<LINK rel="next" href="tutorial.html">
7+
<LINK rel="next" href="intro.html">
88
<LINK rel="previous" href="cover.html">
99
<LINK rel="STYLESHEET" href="style/default.css" type="text/css">
1010
</HEAD>
@@ -47,9 +47,9 @@ features:
4747
<li>Every reference to an property or value is linked to
4848
its definition in the specification.
4949

50-
<li>Every page will include links to the index, so you will never be
51-
more than two links away from finding the definition of
52-
a property or value.
50+
<li>Every page will include links to the table of contents and to the
51+
index, so readers of the electronic version will never be more than
52+
two links away from finding the definition of a property or value.
5353

5454
</ol>
5555
</ul>
@@ -59,32 +59,27 @@ a property or value.
5959
This specification includes the following sections:
6060

6161
<dl>
62-
<dt><Strong>Section 2: A brief CSS2 tutorial</strong>
63-
<dd>The introduction gives an overview of what can be done with CSS
64-
level 2. It also provides some design tips for developing
65-
good CSS habits.
62+
<dt><Strong>Section 3: An introduction CSS2</strong>
63+
<dd>The introduction begins with a brief tutorial in CSS2. The
64+
following section discusses design principles behind CSS2. Finally, we
65+
provide a list of suggested practice for style sheet authors.
6666
</dd>
6767

68-
<dt><Strong>Section 3: A brief CSS2 tutorial</strong>
69-
<dd>This section explains some of the design rationale behind
70-
CSS2. These are good ideas to keep in mind as you read the
71-
rest of the specification.
72-
</dd>
73-
74-
<dt><strong>Sections 4 - 19: CSS2 reference manual.</strong>
68+
<dt><strong>Sections 4 - 17: CSS2 reference manual.</strong>
7569
<dd>The bulk of the reference manual consists of the CSS language
7670
reference, which describes and defines all CSS properties.
7771

78-
<dt><strong>Section 20 - 23: Appendixes.</strong>
72+
<dt><strong>Section 18 - 22: Appendixes.</strong>
7973

8074
<dd>The appendix contains
8175
information about <a href="sample.html">a sample style sheet for HTML
8276
2.0</a>, <a href="changes.html">changes from CSS1
8377
</a>, <a href="appendix/notes.html">implementation and performance
84-
</a>, and <a href="grammar.html">the grammar of CSS2</a>.
78+
</a>, <a href="grammar.html">the grammar of CSS2</a>, and a list of
79+
normative and informative references.
8580
</dd>
8681

87-
<dt><strong>Section 24: General index.</strong>
82+
<dt><strong>Section 23: General index.</strong>
8883

8984
<dd>The <a href="index.html">general index</a> contains links to key
9085
concepts, property and value definitions, and other useful
@@ -100,7 +95,7 @@ proposals (available at the <a href="http://www.w3.org/">W3C Web
10095
site</a>) to which this proposal is indebted. Especially the proposals
10196
from Robert Raisch, Joe English and Pei Wei were influential.
10297

103-
<P> A number of people have contributed to the development of CSS1. We
98+
<P> A number of people have contributed to the development of CSS2. We
10499
would especially like to thank: Terry Allen, Murray Altheim, Glenn
105100
Adams, Walter Bender, Tim Berners-Lee, Yves Bertot, Scott Bigham,
106101
Steve Byrne, Robert Cailliau, James Clark, Daniel Connolly, Donna

css2/colors.src

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML SYSTEM "http://www.w3.org/TR/WD-html40/sgml/HTML4.dtd">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 1.10 1997-09-07 00:31:08 ian Exp $ -->
3+
<!-- $Id: colors.src,v 1.11 1997-09-08 02:52:07 ian Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Colors and backgrounds</TITLE>
@@ -11,72 +11,6 @@
1111
<BODY>
1212
<H1 align="center"><a name="colors">Colors</a> and <a name="backgrounds">backgrounds</a></H1>
1313

14-
<H2><a name="color-units">Color Units</a></H2>
15-
16-
A <span class="index-def" title="&lt;color&gt;, definition of"><a
17-
name="value-def-color" class="value-def">&lt;color&gt;</a></span>
18-
is a either a keyword or a numerical RGB specification.
19-
20-
<P> The suggested list of keyword color names is: aqua, black, blue,
21-
fuchsia, gray, green, lime, maroon, navy, olive, purple, red, silver,
22-
teal, white, and yellow. These 16 colors are taken from the Windows
23-
VGA palette, and their RGB values are not defined in this
24-
specification.
25-
26-
<PRE>
27-
BODY {color: black; background: white }
28-
H1 { color: maroon }
29-
H2 { color: olive }
30-
</PRE>
31-
<P>
32-
The RGB color model is being used in numerical color specifications. These
33-
examples all specify the same color:
34-
<PRE>
35-
EM { color: #f00 } /* #rgb */
36-
EM { color: #ff0000 } /* #rrggbb */
37-
EM { color: rgb(255,0,0) } /* integer range 0 - 255 */
38-
EM { color: rgb(100%, 0%, 0%) } /* float range 0.0% - 100.0% */
39-
</PRE>
40-
41-
<P> The format of an RGB value in hexadecimal notation is a '#'
42-
immediately followed by either three or six hexadecimal
43-
characters. The three-digit RGB notation (#rgb) is converted into
44-
six-digit form (#rrggbb) by replicating digits, not by adding
45-
zeros. For example, #fb0 expands to #ffbb00. This makes sure that
46-
white (#ffffff) can be specified with the short notation (#fff) and
47-
removes any dependencies on the color depth of the display.
48-
49-
<P> The format of an RGB value in the functional notation is 'rgb('
50-
followed by a comma-separated list of three numerical values (either
51-
three integer values in the range of 0-255, or three percentage values
52-
in the range of 0.0% to 100.0%) followed by ')'. Whitespace characters
53-
are allowed around the numerical values.
54-
55-
<P> Values outside the numerical ranges should be clipped. The three
56-
rules below are therefore equivalent:
57-
58-
<PRE>
59-
EM { color: rgb(255,0,0) } /* integer range 0 - 255 */
60-
EM { color: rgb(300,0,0) } /* clipped to 255 */
61-
EM { color: rgb(110%, 0%, 0%) } /* clipped to 100% */
62-
</PRE>
63-
64-
<P> RGB colors are specified in the sRGB color space
65-
<a rel="biblioentry" href="./refs.html#ref-SRGB">[SRGB]</a>
66-
UAs may vary in the fidelity with which they
67-
represent these colors, but use of sRGB provides an unambiguous and
68-
objectively measurable definition of what the color should be, which
69-
can be related to international standards <a rel="biblioentry" href="./refs.html#ref-COLORIMETRY">[COLORIMETRY]</a>.
70-
71-
<P> UAs may limit their efforts in displaying colors to performing a
72-
gamma-correction on them. sRGB specifies a display gamma of 2.2 under
73-
specified viewing conditions. UAs adjust the colors given in CSS such
74-
that, in combination with an output device's "natural" display gamma,
75-
an effective display gamma of 2.2 is produced. See the section on <a
76-
href="notes.html#gamma-correction">gamma correction</a> for further
77-
details. Note that only colors specified in CSS are affected; e.g.,
78-
images are expected to carry their own color information.
79-
8014
<H2>Color and background properties</H2>
8115

8216
<P> These properties describe the color (often called <EM>foreground

0 commit comments

Comments
 (0)