Skip to content

Commit 952687d

Browse files
bert-githubbert-github
committed
[css2] Modifications to Makefile.
Added whitespace in between "!" and "important". --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40802
1 parent 40b9d8e commit 952687d

6 files changed

Lines changed: 104 additions & 93 deletions

File tree

‎css2/Makefile‎

Lines changed: 49 additions & 43 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.0 1998-02-02 18:42:55 bbos Exp $
3+
# $Id: Makefile,v 2.1 1998-02-02 23:18:20 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -207,33 +207,45 @@ LN= ln
207207

208208
.SUFFIXES: .src .html .srd .idraw .gif .ps .subtoc
209209

210-
%.subtoc: %.srd # build/headings.db.ok
210+
%.subtoc: %.srd Project.cfg
211211
@echo "=========== making" $@
212212
echo "<div class=\"subtoc\">" >$@
213213
echo "<p><strong>Contents</strong>" >>$@
214214
$(MKTOC) -l 2 -r $*.html $(HEADINGDB) >>$@
215215
echo "</div>" >>$@
216216

217-
%.html: %.subtoc %.srd build/value.db.ok # build/headings.db.ok
217+
%.html: %.subtoc $(SPECSRCS:.src=.srd) Project.cfg
218218
@echo "=========== making" $@
219-
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
219+
$(ADDIDXANCH) -r $@ $(INDEXDB) $*.srd |\
220+
$(ADDLINKS) $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
220221
$(ADDNAVBAR) -r $@ |\
221222
$(INSAFTER) - $*.subtoc /H1 - |\
222223
$(MKCHAIN) -r $@ - $@
223224

224225
%.srd: %.src build/blocks.ok
225226
@echo "=========== making" $@
226227
$(HIPP) $(INCLUDES) $< |\
227-
$(ADDIDXANCH) -r $*.html $(INDEXDB) | \
228-
$(ADDHANCH) -r $*.html $(HEADINGDB) >$@
228+
$(ADDHANCH) -r $*.html $(HEADINGDB) - $@
229+
$(MKANCHDB) -r $*.html value-def- $(VALUEDB) $@
230+
$(MKANCHDB) -r $*.html propdef- $(VALUEDB) $@
231+
$(MKANCHDB) -r $*.html descdef- $(VALUEDB) $@
232+
233+
#%.srd: %.src build/blocks.ok
234+
# @echo "=========== making" $@
235+
# $(HIPP) $(INCLUDES) $< |\
236+
# $(MKANCHDB) -r $@ value-def- $(VALUEDB) |\
237+
# $(MKANCHDB) -r $@ propdef- $(VALUEDB) |\
238+
# $(MKANCHDB) -r $@ descdef- $(VALUEDB) |\
239+
# $(ADDIDXANCH) -r $*.html $(INDEXDB) | \
240+
# $(ADDHANCH) -r $*.html $(HEADINGDB) >$@
229241

230242
.idraw.gif:
231243
$(RM) $@
232244
# $(PSTOPNM) $< | $(PPMQUANT) | $(PPMTOGIF) >$@
233245
$(PSTOPNM) $< | $(PNMTOGIF_PIPE) >$@
234246

235-
all: build/blocks.ok build/value.db.ok $(SPECOBJS) $(INDEXES) \
236-
$(IMAGES) issues.html DOC/TODO.html $(SPECSRCS:.src=.subtoc) # build/headings.db.ok
247+
all: build/blocks.ok $(SPECOBJS) $(INDEXES) \
248+
$(IMAGES) issues.html DOC/TODO.html
237249

238250
install: all css20.tgz
239251
@if [ -z "$(INSTALLDIR)" ]; then\
@@ -298,21 +310,21 @@ $(DESCBLKSDIR)/blocks.ok: $(DESCSRC)
298310
touch $@
299311

300312

301-
build/value.db.ok: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) # $(SPECSRCS:.src=.srd)
302-
@echo "=========== making" $@
303-
$(MKANCHDB) value-def- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
304-
# $(SPECSRCS:.src=.srd)
305-
$(MKANCHDB) propdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
306-
# $(SPECSRCS:.src=.srd)
307-
$(MKANCHDB) descdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
308-
# $(SPECSRCS:.src=.srd)
309-
touch $@
313+
#build/value.db.ok: $(MAINSRCS) $(APPSRCS)
314+
# @echo "=========== making" $@
315+
# $(MKANCHDB) value-def- $(VALUEDB) $(MAINSRCS) $(APPSRCS:.src=.srd)
316+
# # $(SPECSRCS:.src=.srd)
317+
# $(MKANCHDB) propdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
318+
# # $(SPECSRCS:.src=.srd)
319+
# $(MKANCHDB) descdef- $(VALUEDB) $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd)
320+
# # $(SPECSRCS:.src=.srd)
321+
# touch $@
310322

311-
cover.srd: build/contents.srb build/minicontents.srb
323+
cover.srd: cover.src build/contents.srb build/minicontents.srb
312324
@echo "=========== making" $@
313-
$(HIPP) $(INCLUDES) $*.src >$@
325+
$(HIPP) $(INCLUDES) $< $@
314326

315-
cover.html: cover.srd
327+
cover.html: cover.srd Project.cfg
316328
@echo "=========== making" $@
317329
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
318330
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
@@ -322,11 +334,11 @@ cover.html: cover.srd
322334
$(ADDNAVBAR) -r $@ |\
323335
$(MKCHAIN) -r $@ - $@
324336

325-
build/contents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.src=.srd) $(INDEXSRCS:.src=.srd)
337+
build/contents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.src=.srd) $(INDEXSRCS:.src=.srd) Project.cfg
326338
@echo "=========== making" $@
327339
$(MKTOC) -h 5 $(HEADINGDB) $@
328340

329-
build/minicontents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.src=.srd) $(INDEXSRCS:.src=.srd)
341+
build/minicontents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.src=.srd) $(INDEXSRCS:.src=.srd) Project.cfg
330342
@echo "=========== making" $@
331343
$(MKTOC) -h 1 $(HEADINGDB) $@
332344

@@ -337,47 +349,41 @@ build/minicontents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.sr
337349

338350

339351
### general index related rules
340-
build/indexlist.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) # $(SPECOBJS)
352+
build/indexlist.srb: $(MAINSRCS) $(APPSRCS)
341353
@echo "=========== making" $@
342354
$(MKIDX) $(INDEXDB) $@
343355

344-
indexlist.srd: build/indexlist.srb indexlist.src
356+
indexlist.html: indexlist.srd Project.cfg
345357
@echo "=========== making" $@
346-
$(HIPP) $(INCLUDES) $*.src |\
347-
$(ADDHANCH) -r $*.html $(HEADINGDB) >$@
348-
349-
indexlist.html: indexlist.srd
350-
@echo "=========== making" $@
351-
$(ADDNAVBAR) -r $@ $*.srd |\
358+
$(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
359+
$(ADDNAVBAR) -r $@ |\
352360
$(MKCHAIN) -r $@ - $@
353361

354-
build/propidx.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) # $(PROPSRC)
362+
build/propidx.srb: $(PROPSRC)
355363
@echo "=========== making" $@
356364
$(MKPROPIDX) -r $@ $@ $(PROPSRC)
357365

358366
propidx.srd: propidx.src build/propidx.srb
359-
@echo "=========== making" $@
360-
$(HIPP) $(INCLUDES) $*.src |\
361-
$(ADDHANCH) -r $*.html $(HEADINGDB) >$@
367+
$(HIPP) $(INCLUDES) $< $@
362368

363-
propidx.html: propidx.srd build/value.db.ok
369+
propidx.html: propidx.srd Project.cfg
364370
@echo "=========== making" $@
365-
$(ADDLINKS) $(VALUEDB) $< propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
371+
$(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
372+
$(ADDLINKS) $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
366373
$(ADDNAVBAR) -r $@ |\
367374
$(MKCHAIN) -r $@ - $@
368375

369-
build/descidx.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) # $(SPECOBJS)
376+
build/descidx.srb: $(MAINSRCS) $(APPSRCS)
370377
@echo "=========== making" $@
371378
$(MKDESCIDX) -r $@ $@ $(DESCSRC)
372379

373-
descidx.srd : descidx.src build/descidx.srb descidx.src build/value.db.ok
374-
@echo "=========== making" $@
375-
$(HIPP) $(INCLUDES) $*.src |\
376-
$(ADDHANCH) -r $*.html $(HEADINGDB) >$@
380+
descidx.srd: descidx.src build/descidx.srb
381+
$(HIPP) $(INCLUDES) $< $@
377382

378-
descidx.html: descidx.srd
383+
descidx.html: descidx.srd Project.cfg
379384
@echo "=========== making" $@
380-
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
385+
$(ADDHANCH) -r $*.html $(HEADINGDB) $*.srd |\
386+
$(ADDLINKS) $(VALUEDB) - propinst-/propdef- descinst-/descdef- value-inst-/value-def- |\
381387
$(ADDNAVBAR) -r $@ |\
382388
$(MKCHAIN) -r $@ - $@
383389

‎css2/Project.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
# value contains spaces.
1111
#
1212
# Bert Bos <bert@w3.org>
13-
# $Id: Project.cfg,v 2.0 1998-02-02 19:15:02 bbos Exp $
13+
# $Id: Project.cfg,v 2.1 1998-02-02 23:18:30 bbos Exp $
1414

1515
@source-extension .src
1616

17-
@stylesheet style/default.css type/css
17+
@stylesheet style/default.css text/css
1818
@contents "cover.html#toc"
1919

2020
# Additional links. If for navbar, then add a 3rd column

‎css2/bin/Attic/mkanchdb‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,38 @@
44
#
55
# Arnaud Le Hors - lehors@w3.org
66
# Modified by Bert Bos <bert@w3.org>
7-
# $Id: mkanchdb,v 2.0 1998-02-02 18:52:51 bbos Exp $
7+
# $Id: mkanchdb,v 2.1 1998-02-02 23:20:06 bbos Exp $
88

9+
use Getopt::Std;
910
use lib 'bin';
1011
use utils;
1112

1213
$PROG = substr($0, rindex($0, "/") + 1);
13-
$USAGE = "Usage: $PROG prefix dbase file [file...]\n";
14+
$USAGE = "Usage: $PROG [-r realname] prefix dbase [file]\n";
1415

1516

1617
### main
1718

18-
($prefix = $ARGV[0]) || die $USAGE;
19-
shift;
20-
($dbase = $ARGV[0]) || die $USAGE;
21-
shift;
19+
getopts('r:') || die $USAGE;
20+
if ($#ARGV >= 0) {$prefix = $ARGV[0]; shift;} else {die $USAGE;}
21+
if ($#ARGV >= 0) {$dbase = $ARGV[0]; shift;} else {die $USAGE;}
22+
if ($#ARGV >= 0) {$file = $ARGV[0]; shift;} else {$file = '-';}
23+
if ($#ARGV >= 0) {die $USAGE;}
24+
25+
$hfil = defined $opt_r ? $opt_r : $file;
2226

2327
dbmopen(%anchors, $dbase, 0666) || die "$PROG: cannot open database $dbase\n";
2428

25-
foreach $file (@ARGV) {
26-
my $buf = readfile($file); # Read file
27-
$buf =~ s/<!--.*?-->//sgio; # Remove comments
28-
my $hfil = $file; # Change extension
29-
$hfil =~ s/\.sr.$/.html/io;
30-
# Loop over all anchors, store them in database, prefixed with filename
31-
while ($buf =~ /<a\s+[^>]*?name\s*=\s*[\"\']?($prefix[^\s\"\'>]+)[\"\']?.*?>/sio) {
32-
$buf = $';
33-
$anch = "$hfil#$1";
34-
if (($anchors{$1} ne "") && ($anchors{$1} ne $anch)) {
35-
warn "$PROG: duplicated index \"$1\":
29+
my $buf = readfile($file); # Read file
30+
$buf =~ s/<!--.*?-->//sgio; # Remove comments
31+
32+
# Loop over all anchors, store them in database, prefixed with filename
33+
while ($buf =~ /<a\s+[^>]*?name\s*=\s*[\"\']?($prefix[^\s\"\'>]+)[\"\']?.*?>/sio) {
34+
$buf = $';
35+
$anch = "$hfil#$1";
36+
if (($anchors{$1} ne "") && ($anchors{$1} ne $anch)) {
37+
warn "$PROG: duplicated index \"$1\":
3638
\t\"$anchors{$1}\" and \"$anch\"";
37-
}
38-
$anchors{$1} = $anch;
3939
}
40+
$anchors{$1} = $anch;
4041
}

‎css2/bin/mkanchdb‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,38 @@
44
#
55
# Arnaud Le Hors - lehors@w3.org
66
# Modified by Bert Bos <bert@w3.org>
7-
# $Id: mkanchdb,v 2.0 1998-02-02 18:52:51 bbos Exp $
7+
# $Id: mkanchdb,v 2.1 1998-02-02 23:20:06 bbos Exp $
88

9+
use Getopt::Std;
910
use lib 'bin';
1011
use utils;
1112

1213
$PROG = substr($0, rindex($0, "/") + 1);
13-
$USAGE = "Usage: $PROG prefix dbase file [file...]\n";
14+
$USAGE = "Usage: $PROG [-r realname] prefix dbase [file]\n";
1415

1516

1617
### main
1718

18-
($prefix = $ARGV[0]) || die $USAGE;
19-
shift;
20-
($dbase = $ARGV[0]) || die $USAGE;
21-
shift;
19+
getopts('r:') || die $USAGE;
20+
if ($#ARGV >= 0) {$prefix = $ARGV[0]; shift;} else {die $USAGE;}
21+
if ($#ARGV >= 0) {$dbase = $ARGV[0]; shift;} else {die $USAGE;}
22+
if ($#ARGV >= 0) {$file = $ARGV[0]; shift;} else {$file = '-';}
23+
if ($#ARGV >= 0) {die $USAGE;}
24+
25+
$hfil = defined $opt_r ? $opt_r : $file;
2226

2327
dbmopen(%anchors, $dbase, 0666) || die "$PROG: cannot open database $dbase\n";
2428

25-
foreach $file (@ARGV) {
26-
my $buf = readfile($file); # Read file
27-
$buf =~ s/<!--.*?-->//sgio; # Remove comments
28-
my $hfil = $file; # Change extension
29-
$hfil =~ s/\.sr.$/.html/io;
30-
# Loop over all anchors, store them in database, prefixed with filename
31-
while ($buf =~ /<a\s+[^>]*?name\s*=\s*[\"\']?($prefix[^\s\"\'>]+)[\"\']?.*?>/sio) {
32-
$buf = $';
33-
$anch = "$hfil#$1";
34-
if (($anchors{$1} ne "") && ($anchors{$1} ne $anch)) {
35-
warn "$PROG: duplicated index \"$1\":
29+
my $buf = readfile($file); # Read file
30+
$buf =~ s/<!--.*?-->//sgio; # Remove comments
31+
32+
# Loop over all anchors, store them in database, prefixed with filename
33+
while ($buf =~ /<a\s+[^>]*?name\s*=\s*[\"\']?($prefix[^\s\"\'>]+)[\"\']?.*?>/sio) {
34+
$buf = $';
35+
$anch = "$hfil#$1";
36+
if (($anchors{$1} ne "") && ($anchors{$1} ne $anch)) {
37+
warn "$PROG: duplicated index \"$1\":
3638
\t\"$anchors{$1}\" and \"$anch\"";
37-
}
38-
$anchors{$1} = $anch;
3939
}
40+
$anchors{$1} = $anch;
4041
}

‎css2/grammar.src‎

Lines changed: 2 additions & 2 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: grammar.src,v 2.0 1998-02-02 18:45:39 bbos Exp $ -->
3+
<!-- $Id: grammar.src,v 2.1 1998-02-02 23:18:44 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Appendix D: The grammar of CSS2</TITLE>
@@ -194,7 +194,7 @@ range {h}(\?{0,5}|{h}(\?{0,4}|{h}(\?{0,3}|{h}(\?{0,2}|{h}(\??|{h})))))
194194
"@font-face" {return FONT_FACE_SYM;}
195195
"@"{ident} {return ATKEYWORD;}
196196

197-
"!important" {return IMPORTANT_SYM;}
197+
"!"[ \t\r\n\f]*"important" {return IMPORTANT_SYM;}
198198

199199
{num}em {return EMS;}
200200
{num}ex {return EXS;}

‎css2/visuren.src‎

Lines changed: 11 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: visuren.src,v 2.0 1998-02-02 18:51:05 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.1 1998-02-02 23:19:22 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Visual rendering model</TITLE>
@@ -238,9 +238,8 @@ href="cascade.html#default-style-sheet">default style sheet</a>.
238238
box</dfn></a></span> behaves as follows:</p>
239239

240240
<ul>
241-
<li>If a <a href="#block-level">block-level</a> or
242-
<a href="#inline">inline</a> box (that does
243-
not float and is not absolutely positioned)
241+
<li>If a <a href="#block-level">block-level</a> box (that does
242+
not float and is not absolutely positioned)
244243
<a href="#following-box">follows</a> the compact box,
245244
the compact box is formatted like a one-line inline box. If
246245
the resulting <a href="#the-box-width">box width</a> is less
@@ -301,15 +300,15 @@ as possible.
301300
box</dfn></a></span> behaves as follows:</p>
302301

303302
<ul>
304-
<li>If a <a href="#block-level">block-level</a> or <a
305-
href="#inline">inline</a> box (that does not float and is not
303+
<li>If a <a href="#block-level">block-level</a>
304+
box (that does not float and is not
306305
absolutely positioned) <a href="#following-box">follows</a> the run-in
307306
box, the run-in box behaves like an inline child of the block-level
308307
box.
309308
<li>Otherwise, the run-in box behaves like a block-level box.
310309
</ul>
311310

312-
<p>A 'run-in' box, on the other hand, is useful for run-in headers, as
311+
<p>A 'run-in' box is useful for run-in headers, as
313312
in this example:
314313

315314
<div class="html-example">
@@ -331,7 +330,7 @@ follows it.
331330
&lt;/HTML&gt;
332331
</pre>
333332
</div>
334-
333+
make
335334
<p>This example might be rendered as:
336335

337336
<pre>
@@ -340,6 +339,10 @@ paragraph of text that
340339
follows it.
341340
</pre>
342341

342+
<p>The properties of the run-in element are inherited from its
343+
parent in the source tree, not from the block-level box it visually
344+
becomes part of.
345+
343346
<p>Properties apply to run-in and compact boxes based on their
344347
final status (inline or block-level). For example, the <span
345348
class="propinst-white-space">'white-space'</span> property only

0 commit comments

Comments
 (0)