Skip to content

Commit 6906d4d

Browse files
committed
[css2] Fonts done.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%4035
1 parent 139af00 commit 6906d4d

33 files changed

Lines changed: 2664 additions & 318 deletions

css2/Attic/conform.src

Lines changed: 2 additions & 2 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: conform.src,v 1.5 1997-08-12 20:10:24 ian Exp $ -->
3+
<!-- $Id: conform.src,v 1.6 1997-08-14 00:37:30 ian Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>CSS2 Conformance</TITLE>
@@ -139,7 +139,7 @@ to:
139139
<PRE>
140140
H1 {color: blue}
141141
</PRE>
142-
/UL>
142+
</UL>
143143

144144
<H3>Statements</H3>
145145
<P> A CSS style sheet, for any version of CSS, consists of a list of

css2/DOC/FILES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
cover.src
22
about.src
33

4-
introtop.src
54
tutorial.src
65
cssdesgn.src
76

@@ -18,6 +17,7 @@ colors.src
1817
fonts.src
1918
text.src
2019
lists.src
20+
tables.src
2121
ui.src
2222

2323
conform.src

css2/Makefile

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Makefile to generate the CSS2 document based on its "source files"
22
# Arnaud Le Hors - lehors@w3.org
3-
# $Id: Makefile,v 1.9 1997-08-11 23:49:32 ian Exp $
3+
# $Id: Makefile,v 1.10 1997-08-14 00:32:48 ian Exp $
44

55
ROOT = .
66

77
# the following files are part of the CSS specification
88
SRCS0 = \
9-
$(ROOT)/cover.src
9+
$(ROOT)/cover.src\
10+
$(ROOT)/cover-short.src
1011

1112
SRCS1 = \
1213
about.src\
13-
introtop.src\
1414
tutorial.src\
1515
cssdesgn.src\
1616
convent.src\
@@ -25,6 +25,7 @@ colors.src\
2525
fonts.src\
2626
text.src\
2727
lists.src\
28+
tables.src\
2829
ui.src\
2930
conform.src \
3031
refs.src
@@ -42,8 +43,8 @@ MAINSRCS = $(SRCS1)
4243

4344
MAINOBJS = \
4445
cover.html\
46+
cover-short.html\
4547
about.html\
46-
introtop.html\
4748
tutorial.html\
4849
cssdesgn.html\
4950
convent.html\
@@ -58,6 +59,7 @@ colors.html\
5859
fonts.html\
5960
text.html\
6061
lists.html\
62+
tables.html\
6163
ui.html\
6264
conform.html\
6365
refs.html
@@ -122,7 +124,7 @@ HTML2PSARGS= -n -D -R
122124
HTML2PS= $(PERL) html2ps
123125

124126
# include paths
125-
INCLUDES= -Ibuild
127+
INCLUDES= -Ibuild -I.
126128

127129
RM= rm -fr
128130
CP= cp
@@ -199,14 +201,22 @@ index.html: build/index.srb
199201
build/index.srb: $(SPECOBJS)
200202
$(MKIDX) $@ build/index/*
201203

202-
cover.html: cover.src build/contents.srb
204+
cover.html: cover.src cover-info.src build/contents.srb
205+
$(HIPP) $(INCLUDES) $< - | \
206+
$(ADDNAVBAR) -bottom -hr -next -r $@ - $@ "Go to the table of contents" "#toc"
207+
208+
cover-short.html: cover-short.src cover-info.src build/contents-short.srb
203209
$(HIPP) $(INCLUDES) $< - | \
204210
$(ADDNAVBAR) -bottom -hr -next -r $@ - $@ "Go to the table of contents" "#toc"
205211

206212
build/contents.srb: $(MAINSRCS) $(INDEXSRCS) $(APPSRCS)
207-
$(MKTOC) $@ $(HEADINGDB) $(MAINSRCS) $(APPSRCS) $(INDEXSRCS)
213+
$(MKTOC) 5 $@ $(HEADINGDB) $(MAINSRCS) $(APPSRCS) $(INDEXSRCS)
208214
$(HEADINGDB): build/contents.srb
209215

216+
build/contents-short.srb: $(MAINSRCS) $(INDEXSRCS) $(APPSRCS)
217+
$(MKTOC) 4 $@ $(HEADINGDB) $(MAINSRCS) $(APPSRCS) $(INDEXSRCS)
218+
219+
210220
# simpler rules for special pages
211221
index.html: index.src
212222
$(HIPP) $(INCLUDES) $< - | \

css2/about.src

Lines changed: 98 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,104 @@
11
<!DOCTYPE HTML SYSTEM "http://www.w3.org/TR/WD-html40/sgml/HTML4.dtd">
22
<html lang="en">
3-
<!-- $Id: about.src,v 1.2 1997-07-31 15:37:31 ijacobs Exp $ -->
3+
<!-- $Id: about.src,v 1.3 1997-08-14 00:33: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="introtop.html">
7+
<LINK rel="next" href="tutorial.html">
88
<LINK rel="previous" href="cover.html">
99
<LINK rel="STYLESHEET" href="style/default.css" type="text/css">
1010
</HEAD>
1111
<BODY>
1212
<H1 align="center">About the CSS2 Specification</H1>
13+
14+
<P>This document has been written with two types of readers in mind:
15+
CSS authors and CSS implementors. We hope the specification will
16+
provide authors with the tools they need to write efficient,
17+
attractive, and accessible documents, without overexposing them to
18+
CSS's implementation details. Implementors, however, should find all
19+
they need to build user agents that interpret CSS correctly.
20+
21+
<P>The specification has been written with two modes of presentation
22+
in mind: electronic and printed. Although the two presentations will
23+
no doubt be similar, readers will find some differences. For example,
24+
links will not work in the printed version (obviously), and page
25+
numbers will not appear in the electronic version. In case of a
26+
discrepancy, the electronic version is considered the authoritative
27+
version of the document.
28+
29+
<h2>How to read the specification</h2>
30+
31+
<p>The specification may be approached in several ways:
32+
33+
<ul>
34+
<li><P><strong>Read from beginning to end.</strong> The specification
35+
begins with a general presentation of CSS and becomes more and more
36+
technical and specific towards the end. This is reflected in the
37+
specification's main table of contents, which presents topical
38+
information, and the indexes, which present lower level information in
39+
alphabetical order.</P>
40+
41+
<li><strong>Quick access to information.</strong> In order to get
42+
information about syntax and semantics as quickly as possible, the
43+
electronic version of the specification includes the following
44+
features:
45+
46+
<ol>
47+
<li>Every reference to an property or value is linked to
48+
its definition in the specification.
49+
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.
53+
54+
</ol>
55+
</ul>
56+
57+
58+
<h2>How the specification is organized</h2>
59+
This specification includes the following sections:
60+
61+
<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.
66+
</dd>
67+
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>
75+
<dd>The bulk of the reference manual consists of the CSS language
76+
reference, which describes and defines all CSS properties.
77+
78+
<dt><strong>Section 20 - 23: Appendixes.</strong>
79+
80+
<dd>The appendix contains
81+
information about <a href="sample.html">a sample style sheet for HTML
82+
2.0</a>, <a href="changes.html">changes from CSS1
83+
</a>, <a href="appendix/notes.html">implementation and performance
84+
</a>, and <a href="grammar.html">the grammar of CSS2</a>.
85+
</dd>
86+
87+
<dt><strong>Section 24: General index.</strong>
88+
89+
<dd>The <a href="index.html">general index</a> contains links to key
90+
concepts, property and value definitions, and other useful
91+
information.
92+
</dd>
93+
94+
</dl>
95+
1396
<H2>Acknowledgments</H2>
14-
<P>During the short life of HTML, there have
15-
been several <A HREF = "http://www.w3.org/hypertext/WWW/Style/">style
16-
sheet proposals</A> to which this proposal is indebted. Especially the
17-
proposals from Robert Raisch, Joe English and Pei Wei were
18-
influential.
97+
98+
<P>During the short life of HTML, there have been several style sheet
99+
proposals (available at the <a href="http://www.w3.org/">W3C Web site)
100+
to which this proposal is indebted. Especially the proposals from
101+
Robert Raisch, Joe English and Pei Wei were influential.
19102

20103
<P> A number of people have contributed to the development of CSS1. We
21104
would especially like to thank: Terry Allen, Murray Altheim, Glenn
@@ -33,6 +116,14 @@ Jon Smirl, Charles Peyton Taylor, Ir&egrave;ne Vatton, Daniel
33116
Veillard, Mandira Virmani, Greg Watkins, Mike Wexler, Lydja Williams,
34117
Brian Wilson, Chris Wilson, Lauren Wood and Stephen Zilles.
35118

119+
<p>Besides the authors, the following people have contributed in
120+
various ways to the sections pertaining to fonts: Alex Beamon, Apple;
121+
Ashok Saxena, Adobe; Ben Bauermeister, HP; Bert Bos, W3C; Dave
122+
Raggett, W3C/HP; David Goldsmith, Apple; Ed Tecot, Microsoft, Erik van
123+
Blokland, LettError; Fran&ccedil;ois Yergeau, Alis; Gavin Nicol, Inso;
124+
Herbert van Zijl, Elsevier; Lee Quinn, SoftQuad; Martin D&uuml;rst,
125+
Universit&auml;t Z&uuml;rich; Misha Wolf, Reuters; Paul Haeberli, SGI.
126+
36127
<P> Three people deserve special mentioning: Dave Raggett (for his
37128
encouragement and work on HTML3), Chris Lilley (for his continued
38129
contributions, especially in the area of colors and fonts) and Steven

css2/bin/Attic/mktoc

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
# 1. Some header - and its related comment
66
#
77
# Arnaud Le Hors - lehors@w3.org
8-
# $Id: mktoc,v 1.6 1997-08-06 14:03:04 ijacobs Exp $
8+
# $Id: mktoc,v 1.7 1997-08-14 00:58:09 ian Exp $
99

1010
$PROGNAME = substr($0, rindex($0, "/") + 1);
1111

1212
if ($#ARGV < 2) {
13-
print STDERR "Usage: $PROGNAME toc tocdb src1 src2 ...\n";
13+
print STDERR "Usage: $PROGNAME depth toc tocdb src1 src2 ...\n";
1414
exit 1;
1515
} else {
16+
$tocdepth = $ARGV[0];
17+
shift;
1618
$tocf = $ARGV[0];
1719
shift;
1820
$tocdb = $ARGV[0];
@@ -102,23 +104,25 @@ foreach $file (@ARGV) {
102104
$rel = "";
103105
}
104106
$txt = cleanup($t);
105-
if ($h == 1) {
106-
print OUTPUT
107-
"<P><a href=\"$url\"$rel><strong>$num $txt</strong></a>\n";
108-
} elsif ($h == 2) {
109-
print OUTPUT "<BR><a href=\"$url\"$rel>$num $txt</a>\n";
110-
} elsif ($h == 3) {
111-
print OUTPUT
112-
"<BR>&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$num $txt</a>\n";
113-
} else {
114-
print OUTPUT
115-
"<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$txt</a>\n";
116-
}
117-
#Print comment about section contents.
118-
if ($3) {
119-
print OUTPUT " <em>-$3</em>";
107+
if ($h lt $tocdepth) {
108+
if ($h == 1) {
109+
print OUTPUT
110+
"<P><a href=\"$url\"$rel><strong>$num $txt</strong></a>\n";
111+
} elsif ($h == 2) {
112+
print OUTPUT "<BR><a href=\"$url\"$rel>$num $txt</a>\n";
113+
} elsif ($h == 3) {
114+
print OUTPUT
115+
"<BR>&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$num $txt</a>\n";
116+
} else {
117+
print OUTPUT
118+
"<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$txt</a>\n";
119+
}
120+
#Print comment about section contents.
121+
if ($3) {
122+
print OUTPUT " <em>-$3</em>";
123+
}
124+
# dbase format: file;headingtext;h;hnum
120125
}
121-
# dbase format: file;headingtext;h;hnum
122126
print DBASE "$file;$t;$h;$num\n";
123127
$_ = $';
124128
}

css2/bin/mktoc

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@
55
# 1. Some header - and its related comment
66
#
77
# Arnaud Le Hors - lehors@w3.org
8-
# $Id: mktoc,v 1.6 1997-08-06 14:03:04 ijacobs Exp $
8+
# $Id: mktoc,v 1.7 1997-08-14 00:58:09 ian Exp $
99

1010
$PROGNAME = substr($0, rindex($0, "/") + 1);
1111

1212
if ($#ARGV < 2) {
13-
print STDERR "Usage: $PROGNAME toc tocdb src1 src2 ...\n";
13+
print STDERR "Usage: $PROGNAME depth toc tocdb src1 src2 ...\n";
1414
exit 1;
1515
} else {
16+
$tocdepth = $ARGV[0];
17+
shift;
1618
$tocf = $ARGV[0];
1719
shift;
1820
$tocdb = $ARGV[0];
@@ -102,23 +104,25 @@ foreach $file (@ARGV) {
102104
$rel = "";
103105
}
104106
$txt = cleanup($t);
105-
if ($h == 1) {
106-
print OUTPUT
107-
"<P><a href=\"$url\"$rel><strong>$num $txt</strong></a>\n";
108-
} elsif ($h == 2) {
109-
print OUTPUT "<BR><a href=\"$url\"$rel>$num $txt</a>\n";
110-
} elsif ($h == 3) {
111-
print OUTPUT
112-
"<BR>&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$num $txt</a>\n";
113-
} else {
114-
print OUTPUT
115-
"<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$txt</a>\n";
116-
}
117-
#Print comment about section contents.
118-
if ($3) {
119-
print OUTPUT " <em>-$3</em>";
107+
if ($h lt $tocdepth) {
108+
if ($h == 1) {
109+
print OUTPUT
110+
"<P><a href=\"$url\"$rel><strong>$num $txt</strong></a>\n";
111+
} elsif ($h == 2) {
112+
print OUTPUT "<BR><a href=\"$url\"$rel>$num $txt</a>\n";
113+
} elsif ($h == 3) {
114+
print OUTPUT
115+
"<BR>&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$num $txt</a>\n";
116+
} else {
117+
print OUTPUT
118+
"<BR>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"$url\"$rel>$txt</a>\n";
119+
}
120+
#Print comment about section contents.
121+
if ($3) {
122+
print OUTPUT " <em>-$3</em>";
123+
}
124+
# dbase format: file;headingtext;h;hnum
120125
}
121-
# dbase format: file;headingtext;h;hnum
122126
print DBASE "$file;$t;$h;$num\n";
123127
$_ = $';
124128
}

css2/cascade.src

Lines changed: 2 additions & 2 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: cascade.src,v 1.7 1997-08-12 20:06:46 ian Exp $ -->
3+
<!-- $Id: cascade.src,v 1.8 1997-08-14 00:34:32 ian Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Cascade</TITLE>
@@ -144,7 +144,7 @@ In HTML, a selector's specificity is calculated as follows:
144144
<li>(a) count the number of "id" attributes in the selector
145145
<li>(b) count the number of "class" attributes in the selector
146146
<li>(c) count the number of element names in the selector
147-
<ul>
147+
</ul>
148148

149149
<P>Concatenating the three numbers (in a number system with a large
150150
base) gives the specificity.

css2/changes.src

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</HEAD>
88
<BODY>
99
<H1 align="center">Appendix B: Changes from CSS1</H1>
10+
<em>To be written...</em>
1011
</BODY>
1112
</HTML>
1213

0 commit comments

Comments
 (0)