Skip to content

Commit 288a880

Browse files
committed
[CSS2] Scripts accept both name= and id= on input, only generate id=
on output. Replaced the definition of the color property by a reference to css3-color. Replaced some name= by id=. Updated links to editors' draft and to ERCIM. Refer to css-syntax-3 for white space, because there is no text in the syntax chapter anymore. Removed redundant class=example. Regenerated HTML files. Trying a different link checker. Add support for links to properties defined in CSS modules and no longer in CSS2 itself.
1 parent 57c6451 commit 288a880

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2848
-843
lines changed

css2/Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ SED = sed
167167
PERL= perl
168168
NSGMLS=onsgmls
169169
HTMLDECL = sgml/HTML4.decl
170-
LINKLINT=$(PERL) bin/linklint
170+
# LINKLINT=$(PERL) bin/linklint -doc linklint
171+
# LINKLINT=linklint -doc linklint
172+
LINKLINT = bin/checklink --suppress-temp-redirects -q -D 2
171173
# SPELL = ispell -l -p css.dico
172174
SPELL = aspell -H -p css.dico list
173175
DIFF = diff
@@ -241,6 +243,8 @@ RMIMGEXT = $(PERL) ./bin/rmimgext
241243
ADDMARKUP = $(PERL) ./bin/addmarkup
242244
# Add longdesc descriptions to images
243245
ADDLONGDESC = $(PERL) ./bin/addlongdesc
246+
# Add external links to anchor database
247+
MKEXTDB = $(PERL) ./bin/mkextdb
244248

245249
# utility to generate the PostScript version
246250
#
@@ -282,7 +286,7 @@ LN= ln
282286
# at the cost of possibly incorrect xrefs in the other .html files
283287
#
284288
#%.html: %.subtoc Project.cfg
285-
%.html: %.subtoc $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) Project.cfg build/warning build/meta-viewport build/fixup-js #$(SPECSRCS:.src=.srd)
289+
%.html: %.subtoc $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) Project.cfg build/warning build/meta-viewport build/fixup-js #$(SPECSRCS:.src=.srd) $(VALUEDB)
286290
@echo "=========== making" $@
287291
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- value-inst-/value-def- |\
288292
$(ADDIDXANCH) -r $@ $(INDEXDB) - |\
@@ -451,6 +455,10 @@ css2.zip: $(ALLOBJS)
451455

452456
#### Section generate property tables from property database.
453457

458+
$(VALUEDB): Project.cfg
459+
@echo "Initializing external definition links using" $<
460+
$(MKEXTDB) $@ $<
461+
454462
build/blocks.ok: $(PROPBLKSDIR)/blocks.ok
455463
touch $@
456464

@@ -604,7 +612,7 @@ checksample: sample.src $(PROPSRC)
604612
checklnx: all
605613
-@echo "# Begin checking links."
606614
-@$(RM) linklint
607-
$(LINKLINT) -doc linklint $(SPECOBJS)
615+
$(LINKLINT) $(SPECOBJS)
608616
-@echo "# End checking links."
609617

610618
### check property instances

css2/Overview.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ <h2 id="W3C-doctype">W3C Editors' Draft DD MMMMM YYYY</h2>
4949
<dd><a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">
5050
http://www.w3.org/TR/2011/REC-CSS2-20110607/</a>
5151
<dt>Editors' draft:
52-
<dd><a href="http://dev.w3.org/csswg/css2/">
53-
http://dev.w3.org/csswg/css2/</a>
52+
<dd><a href="https://drafts.csswg.org/css2/">
53+
https://drafts.csswg.org/css2/</a>
5454
<dt>Editors:
5555
<dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
5656
Bert Bos</a>
@@ -95,7 +95,7 @@ <h2 id="W3C-doctype">W3C Editors' Draft DD MMMMM YYYY</h2>
9595
title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
9696
href="http://www.csail.mit.edu/" ><abbr title="Massachusetts
9797
Institute of Technology" >MIT</abbr></a>, <a
98-
href="http://www.ercim.eu/" ><abbr title="European Research
98+
href="https://www.ercim.eu/" ><abbr title="European Research
9999
Consortium for Informatics and Mathematics" >ERCIM</abbr></a>, <a
100100
href="http://www.keio.ac.jp/" >Keio</a>, <a
101101
href="http://ev.buaa.edu.cn/" >Beihang</a>). W3C <a
@@ -540,7 +540,7 @@ <h2 id="fulltoc">Full Table of Contents</h2>
540540
</ul>
541541
<li><a href="colors.html" class="tocxref">14 Colors and Backgrounds</a>
542542
<ul class="toc">
543-
<li><a href="colors.html#colors" class="tocxref">14.1 Foreground color: the <span class="propinst-color">'color'</span> property</a>
543+
<li><a href="colors.html#colors" class="tocxref">14.1 Foreground color: the 'color' property</a>
544544
<li><a href="colors.html#background" class="tocxref">14.2 The background</a>
545545
<ul class="toc">
546546
<li><a href="colors.html#background-properties" class="tocxref">14.2.1 Background properties: <span class="propinst-background-color">'background-color'</span>, <span class="propinst-background-image">'background-image'</span>, <span class="propinst-background-repeat">'background-repeat'</span>, <span class="propinst-background-attachment">'background-attachment'</span>, <span class="propinst-background-position">'background-position'</span>, and <span class="propinst-background">'background'</span></a>

css2/Overview.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
<dd><a href="http://www.w3.org/TR/2011/REC-CSS2-20110607/">
3333
http://www.w3.org/TR/2011/REC-CSS2-20110607/</a>
3434
<dt>Editors' draft:
35-
<dd><a href="http://dev.w3.org/csswg/css2/">
36-
http://dev.w3.org/csswg/css2/</a>
35+
<dd><a href="https://drafts.csswg.org/css2/">
36+
https://drafts.csswg.org/css2/</a>
3737
<dt>Editors:
3838
<dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
3939
Bert Bos</a>
@@ -78,7 +78,7 @@
7878
title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
7979
href="http://www.csail.mit.edu/" ><abbr title="Massachusetts
8080
Institute of Technology" >MIT</abbr></a>, <a
81-
href="http://www.ercim.eu/" ><abbr title="European Research
81+
href="https://www.ercim.eu/" ><abbr title="European Research
8282
Consortium for Informatics and Mathematics" >ERCIM</abbr></a>, <a
8383
href="http://www.keio.ac.jp/" >Keio</a>, <a
8484
href="http://ev.buaa.edu.cn/" >Beihang</a>). W3C <a

css2/Project.cfg

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,19 @@
6464
@chapter grammar.html
6565
@chapter leftblank.html
6666
@chapter indexlist.html
67+
68+
# External links for definitions. E.g.,
69+
# @def value-def-length https://www.w3.org/TR/css3-values/#length-value
70+
# means the definition "value-def-length" can be found at the given URL
71+
72+
@def value-def-length https://www.w3.org/TR/css3-values/#length-value
73+
@def value-def-color https://www.w3.org/TR/css3-color/#valuea-def-color
74+
@def value-def-uri https://www.w3.org/TR/css3-values/#url-value
75+
@def value-def-percentage https://www.w3.org/TR/css3-values/#percentage-value
76+
@def value-def-string https://www.w3.org/TR/css3-values/#string-value
77+
@def value-def-identifier https://www.w3.org/TR/css3-values/#typedef-ident
78+
@def value-def-integer https://www.w3.org/TR/css3-values/#integer-value
79+
@def value-def-number https://www.w3.org/TR/css3-values/#number-value
80+
81+
@def propdef-color https://www.w3.org/TR/css3-color/#color0
82+

css2/about.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</div>
2727
<hr class="navbar">
2828

29-
<H1><a name="q0">1 About the CSS&nbsp;2 Specification</a></H1>
29+
<H1 id="q0">1 About the CSS&nbsp;2 Specification</H1>
3030
<div id="toc" class="subtoc">
3131
<p><strong>Contents</strong>
3232
<ul class="toc">
@@ -191,7 +191,7 @@ <H3>1.4.2 <a name="property-defs">CSS property definitions</a></H3>
191191
<tbody>
192192
<tr>
193193
<th>Name:
194-
<td><a name="x0"><span class="index-def" title="'property-name'"><dfn id="propdef-property-name">property-name</dfn></span></a><tr><th>Value:<td>legal values &amp; syntax
194+
<td><span class="index-def" title="'property-name'"><dfn id="propdef-property-name">property-name</dfn></span><tr><th>Value:<td>legal values &amp; syntax
195195
<tr><th>Initial:<td>initial value
196196
<tr><th>Applies to:<td>elements this property applies to
197197
<tr><th>Inherited:<td>whether the property is inherited
@@ -355,8 +355,8 @@ <h4>1.4.2.7 <a name="computed-defs">Computed value</a></h4>
355355

356356
<H3>1.4.3 <a name="shorthand">Shorthand properties</a></H3>
357357

358-
<p>Some properties are <a name="x1"><span class="index-def" title="shorthand
359-
property"><dfn>shorthand properties</dfn></span></a>, meaning that they allow
358+
<p>Some properties are <span class="index-def" title="shorthand
359+
property" id="x1"><dfn>shorthand properties</dfn></span>, meaning that they allow
360360
authors to specify the values of several properties with a single
361361
property.
362362

0 commit comments

Comments
 (0)