Skip to content

Commit 666a618

Browse files
committed
[css2] Corrected spelling, anchors, mark-up, etc.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401890
1 parent 4b8a021 commit 666a618

18 files changed

Lines changed: 404 additions & 530 deletions

css2/Makefile

Lines changed: 11 additions & 59 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 2.54 2002-07-05 22:19:35 bbos Exp $
3+
# $Id: Makefile,v 2.55 2002-07-08 14:57:49 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -104,14 +104,10 @@ ALLOBJS= $(SPECOBJS) $(INDEXES) $(IMAGES) $(LONGDESCS) $(STYLESHEETS)
104104

105105
PROPSRC= properties/properties.db
106106
PROPSAMPLE= properties/sample.db
107-
DESCSRC= properties/descriptors.db
108107
PROPBLKSDIR= build/properties
109-
DESCBLKSDIR= build/descriptors
110108

111109
# dbase for property name anchors
112110
PROPERTYDB= build/property.db
113-
# dbase for descriptor name anchors
114-
DESCRIPTORDB= build/descriptor.db
115111
# dbase for value types
116112
VALUEDB= build/value.db
117113
# dbase for headings
@@ -123,6 +119,7 @@ SED = sed
123119
#PERL= perl5 -Ibin
124120
PERL= perl
125121
NSGMLS=nsgmls
122+
HTMLDECL = sgml/HTML4.decl
126123
LINKLINT=$(PERL) bin/linklint
127124
SPELL = ispell -l -p
128125
DIFF = diff
@@ -136,7 +133,7 @@ HIPP= $(PERL) ./bin/hipp
136133
HMKDEPEND= $(PERL) ./bin/hmkdep
137134
# make value anchor database
138135
MKANCHDB= $(PERL) ./bin/mkanchdb
139-
# make property and descriptor anchor database
136+
# make property anchor database
140137
MKPANCHDB= $(PERL) ./bin/mkpanchdb
141138
# add heading anchors
142139
ADDHANCH= $(PERL) ./bin/addhanch
@@ -148,8 +145,6 @@ ADDNAVBAR= $(PERL) ./bin/addnavbar
148145
MKIDX= $(PERL) ./bin/mkidx
149146
# make property index
150147
MKPROPIDX= $(PERL) ./bin/mkpropidx
151-
# make descriptor index
152-
MKDESCIDX= $(PERL) ./bin/mkdescidx
153148
# make table of contents and heading database
154149
MKTOC= $(PERL) ./bin/mktoc
155150
# HTML concate utility
@@ -164,8 +159,6 @@ INSAFTER= $(PERL) ./bin/insafter
164159
ADDLINKS= $(PERL) ./bin/addlinks
165160
# extract properties from db.
166161
PEXTR= $(PERL) ./bin/pextr
167-
# extract descriptors from db.
168-
DEXTR= $(PERL) ./bin/dextr
169162
# extract issues from issues db.
170163
ISSUES= bin/issues
171164
# extract issues from errata-issues db.
@@ -178,7 +171,7 @@ CHKSAMPLE= $(PERL) ./bin/chksample
178171
MKREFDB = $(PERL) ./bin/mkrefdb
179172
# check references.
180173
CHKREFS= $(PERL) ./bin/chkrefs
181-
# check property/descriptor defs and instances
174+
# check property defs and instances
182175
CHKPROPS= $(PERL) ./bin/chkprops
183176
# add reference normative/informative class info.
184177
CHKSPACES= $(PERL) ./bin/chkspaces
@@ -237,7 +230,7 @@ LN= ln
237230
#%.html: %.subtoc Project.cfg
238231
%.html: %.subtoc $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) Project.cfg #$(SPECSRCS:.src=.srd)
239232
@echo "=========== making" $@
240-
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
233+
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- value-inst-/value-def- |\
241234
$(ADDIDXANCH) -r $@ $(INDEXDB) - |\
242235
$(ADDMARKUP) - |\
243236
$(ADDLONGDESC) - |\
@@ -252,8 +245,6 @@ LN= ln
252245
$(ADDHANCH) -r $*.html $(HEADINGDB) - $@
253246
$(MKANCHDB) -r $*.html value-def- $(VALUEDB) $@
254247
$(MKANCHDB) -r $*.html propdef- $(VALUEDB) $@
255-
$(MKANCHDB) -r $*.html descdef- $(VALUEDB) $@
256-
$(MKANCHDB) -r $*.html descdef- $(VALUEDB) $@
257248

258249
.idraw.gif:
259250
$(RM) $@
@@ -348,9 +339,9 @@ css2.zip: $(ALLOBJS)
348339
$(ZIP) $@ $(ALLOBJS) images/*.png
349340
# $(ZIP) $@ $(ALLOBJS) `$(LS) -d images/*.png | $(GREP) -v "\."`
350341

351-
#### Section generate property/descriptor tables from property database.
342+
#### Section generate property tables from property database.
352343

353-
build/blocks.ok: $(PROPBLKSDIR)/blocks.ok $(DESCBLKSDIR)/blocks.ok
344+
build/blocks.ok: $(PROPBLKSDIR)/blocks.ok
354345
touch $@
355346

356347
$(PROPBLKSDIR)/blocks.ok: $(PROPSRC)
@@ -359,21 +350,6 @@ $(PROPBLKSDIR)/blocks.ok: $(PROPSRC)
359350
$(PEXTR) -n $(PROPSAMPLE) $(PROPBLKSDIR)
360351
touch $@
361352

362-
$(DESCBLKSDIR)/blocks.ok: $(DESCSRC)
363-
@if [ ! -d $(DESCBLKSDIR) ]; then mkdir -p $(DESCBLKSDIR);fi
364-
$(DEXTR) $(DESCSRC) $(DESCBLKSDIR)
365-
touch $@
366-
367-
368-
#build/value.db.ok: $(MAINSRCS) $(APPSRCS)
369-
# @echo "=========== making" $@
370-
# $(MKANCHDB) value-def- $(VALUEDB) $(MAINSRCS) $(APPSRCS:.src=.srd)
371-
# # $(SPECSRCS:.src=.srd)
372-
# $(MKANCHDB) propdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
373-
# # $(SPECSRCS:.src=.srd)
374-
# $(MKANCHDB) descdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
375-
# # $(SPECSRCS:.src=.srd)
376-
# touch $@
377353

378354
cover.srd: cover.src build/contents.srb build/minicontents.srb
379355
@echo "=========== making" $@
@@ -425,27 +401,6 @@ propidx.srd:: build/propidx.srb #propidx.src
425401
# @echo "=========== making" $@
426402
# $(HIPP) $(INCLUDES) $< $@
427403

428-
#propidx.html: propidx.srd Project.cfg
429-
# @echo "=========== making" $@
430-
# $(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
431-
# $(ADDLINKS) -x $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
432-
# $(ADDNAVBAR) -r $@ |\
433-
# $(MKCHAIN) -r $@ - $@
434-
435-
build/descidx.srb: $(MAINSRCS) $(APPSRCS)
436-
@echo "=========== making" $@
437-
$(MKDESCIDX) -r $@ $@ $(DESCSRC)
438-
439-
descidx.srd:: build/descidx.srb #descidx.src
440-
# $(HIPP) $(INCLUDES) $< $@
441-
442-
#descidx.html: descidx.srd Project.cfg
443-
# @echo "=========== making" $@
444-
# $(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
445-
# $(ADDLINKS) -x $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
446-
# $(ADDNAVBAR) -r $@ |\
447-
# $(MKCHAIN) -r $@ - $@
448-
449404
# Issues and todo lists.
450405
issues.html: issues.src build/issues.srb
451406
@echo "=========== making" $@
@@ -482,7 +437,7 @@ checkdoc: all
482437
-@echo "# Begin checking sgml."
483438
@for i in $(FILES) $(LONGDESCS); \
484439
do echo checking $$i...; \
485-
$(NSGMLS) -s -c sgml/HTML4.cat $$i; done;
440+
$(NSGMLS) -s -c sgml/HTML4.cat $(HTMLDECL) $$i; done;
486441
-@echo "# End checking sgml."
487442

488443
### check on the validity references in the document
@@ -524,13 +479,10 @@ checklnx: all
524479

525480
### check property instances
526481

527-
checkprops: $(SPECSRCS) $(PROPSRC) $(DESCSRC)
482+
checkprops: $(SPECSRCS) $(PROPSRC)
528483
-@echo "# Begin checking properties."
529484
-@$(CHKPROPS) $(PROPSRC) propinst $(SPECSRCS)
530485
-@echo "# End checking properties."
531-
-@echo "# Begin checking descriptors."
532-
-@$(CHKPROPS) $(DESCSRC) descinst $(SPECSRCS)
533-
-@echo "# End checking descriptors."
534486

535487
# Check spaces
536488

@@ -551,7 +503,7 @@ build/checkx.out: build/xamples.ok
551503
-@echo Begin checking HTML examples.
552504
-@for i in build/?*xampl*.html ; \
553505
do echo checking $$i...; \
554-
$(NSGMLS) -s -c sgml/HTML4.cat sgml/HTML4.decl $$i >> build/checkx.out 2>&1; \
506+
$(NSGMLS) -s -c sgml/HTML4.cat $(HTMLDECL) $$i >> build/checkx.out 2>&1; \
555507
done;
556508
-@echo Begin checking CSS examples.
557509
$(CHKCSS) build/?*xampl*.css >> build/checkx.out 2>&1
@@ -575,7 +527,7 @@ clean:
575527
$(RM) $(SPECOBJS) $(INDEXES) $(PROPBLKSDIR)/* \
576528
$(SPECOBJS:.html=.srd) $(SPECOBJS:.html=.subtoc) \
577529
$(INDEXES:.html=.srd) \
578-
$(DESCBLKSDIR)/* build/* css2.* linklint images/links.ok images/pngs.ok
530+
build/* css2.* linklint images/links.ok images/pngs.ok
579531

580532
realclean: clean
581533

css2/Project.cfg

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# value contains spaces.
1111
#
1212
# Bert Bos <bert@w3.org>
13-
# $Id: Project.cfg,v 2.8 2002-07-05 19:58:04 bbos Exp $
13+
# $Id: Project.cfg,v 2.9 2002-07-08 14:57:50 bbos Exp $
1414

1515
@source-extension .src
1616

@@ -54,9 +54,9 @@
5454

5555
@format "\Append\ix A." "A.1" "A.1.1" "" "" ""
5656
@chapter aural.html
57-
@chapter sample.html
58-
@chapter changes.html
5957
@chapter refs.html
58+
@chapter changes.html
59+
@chapter sample.html
6060
@chapter propidx.html
6161
@chapter indexlist.html
6262
@chapter grammar.html

css2/about.src

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,53 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: about.src,v 2.36 2002-07-05 19:58:04 bbos Exp $ -->
5+
<!-- $Id: about.src,v 2.37 2002-07-08 14:57:50 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>About the CSS2.1 Specification</TITLE>
99
</HEAD>
1010
<BODY>
11-
<H1 align="center">About the CSS2.1 Specification</H1>
11+
<H1>About the CSS2.1 Specification</H1>
12+
13+
<h2>CSS&nbsp;2.1 vs CSS&nbsp;2</h2>
14+
15+
<p>The CSS community has gained significant experience with the CSS2
16+
specification since it became a recommendation in 1998. Errors in the
17+
CSS2 specification have subsequently been corrected via the
18+
publication of various errata, but there has not yet been an
19+
opportunity for the specification to be changed based on experience
20+
gained.
21+
22+
<p>While many of these issues will be addressed by the upcoming CSS3
23+
specifications, the current state of affairs hinders the
24+
implementation and interoperability of CSS2. The CSS2.1 specification
25+
attempts to address this situation by:
26+
27+
<ul>
28+
<li>Maintaining compatibility with those portions of CSS2 that are
29+
widely accepted and implemented.
30+
31+
<li>Incorporating all published CSS2 errata.
32+
33+
<li>Where implementations overwhelmingly differ from the CSS2
34+
specification, modifying the specification to be in accordance with
35+
generally accepted practice.
36+
37+
<lI>Removing all CSS2 features which, by virtue of not having been
38+
implemented, have been rejected by the CSS community. Thus, compliant
39+
implementations of CSS2.1 need not be burdened with these constraints.
40+
41+
<li>Removing CSS2 features that will be obsoleted by CSS3, thus
42+
encouraging adoption of the proposed CSS3 features in their place.
43+
</ul>
44+
45+
<p>Thus, while it is not the case that a CSS2 stylesheet is
46+
necessarily forwards-compatible with CSS2.1, it is the case that a
47+
stylesheet restricting itself to CSS2.1 features is more likely to
48+
find a compliant user agent today and to preserve forwards
49+
compatibility in the future. While breaking forward compatibility is
50+
not desirable, we believe the advantages to the revisions in CSS2.1
51+
are worthwhile.
1252

1353
<h2>Reading the specification</h2>
1454

@@ -64,13 +104,11 @@ href="conform.html#conformance">conformance</a>.
64104

65105
<dd>Appendixes contain information about <a href="sample.html">a
66106
sample style sheet for HTML 4.0</a>, <a href="changes.html">changes
67-
from CSS1 </a>, <a href="notes.html">implementation and
68-
performance notes</a>,
107+
from CSS1 </a>,
69108
<a href="grammar.html">the grammar of CSS2</a>,
70109
a list of normative and informative <a href="refs.html">references</a>,
71-
and three indexes: one for
72-
<a href="propidx.html">properties</a>, one for
73-
<a href="descidx.html">descriptors</a>, and one
110+
and two indexes: one for
111+
<a href="propidx.html">properties</a> and one
74112
<a href="indexlist.html">general index</a>.
75113
</dl>
76114

@@ -176,7 +214,7 @@ the following modifiers:</p>
176214

177215
<P>The following examples illustrate different value types:
178216

179-
<BLOCKQUOTE>
217+
<BLOCKQUOTE><P>
180218
<EM>Value:</EM> N | NW | NE<BR>
181219
<EM>Value:</EM> [ &lt;length&gt; | thick | thin ]{1,4}<BR>
182220
<EM>Value:</EM> [&lt;family-name&gt; , ]* &lt;family-name&gt;<BR>
@@ -356,7 +394,9 @@ thereof.</p>
356394

357395
<p>No right to create modifications or derivatives of W3C documents is
358396
granted pursuant to this license. However, if additional requirements
359-
(documented in the <a href="IPR-FAQ.html">Copyright FAQ</a>) are satisfied,
397+
(documented in the <a
398+
href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright
399+
FAQ</a>) are satisfied,
360400
the right to create modifications or derivatives is�sometimes granted by the
361401
W3C to individuals complying with those requirements.</p>
362402

css2/aural.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: aural.src,v 2.34 2002-07-05 22:19:35 bbos Exp $ -->
5+
<!-- $Id: aural.src,v 2.35 2002-07-08 14:57:50 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Aural style sheets</TITLE>
@@ -883,10 +883,10 @@ a:visited { voice-family: betty, female }
883883
a:active { voice-family: betty, female; pitch-range: 80; pitch: x-high }
884884
</pre>
885885

886-
<h2><a name="emacsspeak">Emacsspeak</a></h2>
886+
<h2><a name="emacspeak">Emacspeak</a></h2>
887887

888888
<p>For information, here is the list of properties implemented by
889-
Emacsspeak, a speech subsystem for the Emacs editor.
889+
Emacspeak, a speech subsystem for the Emacs editor.
890890

891891
<ul>
892892
<li>voice-family

0 commit comments

Comments
 (0)