Skip to content

Commit 4b8a021

Browse files
committed
[css2] Replaced GIF with PNG
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401889
1 parent 0bb605a commit 4b8a021

16 files changed

+98
-974
lines changed

css2/Makefile

+14-22
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.53 2002-07-05 19:58:04 bbos Exp $
3+
# $Id: Makefile,v 2.54 2002-07-05 22:19:35 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -95,16 +95,12 @@ indexlist.html
9595
SPECSRCS= $(SRCS0) $(MAINSRCS) $(APPSRCS)
9696
SPECOBJS= $(MAINOBJS) $(APPENDIXES) $(REFS)
9797

98-
UPDATEOBJS = \
99-
translations.html\
100-
errata.html
101-
10298
#IMAGES = images/*.gif images/*.png
103-
IMAGES = images/*.gif images/*.jpg
99+
IMAGES = images/*.png images/*.jpg
104100
LONGDESCS = images/longdesc/*.html
105101
STYLESHEETS= style/*.css
106102

107-
ALLOBJS= $(SPECOBJS) $(INDEXES) $(IMAGES) $(LONGDESCS) $(STYLESHEETS) translations.html
103+
ALLOBJS= $(SPECOBJS) $(INDEXES) $(IMAGES) $(LONGDESCS) $(STYLESHEETS)
108104

109105
PROPSRC= properties/properties.db
110106
PROPSAMPLE= properties/sample.db
@@ -205,7 +201,7 @@ ADDLONGDESC = $(PERL) ./bin/addlongdesc
205201

206202
# utility to generate the PostScript version
207203
#
208-
HTML2PS= $(PERL) -w bin/html2ps -d -f html2psrc2
204+
HTML2PS= $(PERL) bin/html2ps -d -f html2psrc2
209205

210206
# IDRAW -> PS -> GIF tools
211207
#PSTOPNM = ./bin/mypstopnm -r 75
@@ -268,8 +264,8 @@ LN= ln
268264
$(RM) $@
269265
$(PSTOPNM) $< | $(PNMTOPNG_PIPE) >$@
270266

271-
all: build/blocks.ok $(SPECOBJS) $(INDEXES) images/gifs.ok \
272-
$(IMAGES) issues.html errata-issues.html DOC/TODO.html $(UPDATEOBJS)
267+
all: build/blocks.ok $(SPECOBJS) $(INDEXES) images/pngs.ok \
268+
$(IMAGES) issues.html errata-issues.html DOC/TODO.html
273269

274270

275271
#images/links.ok : $(IMAGES)
@@ -301,10 +297,10 @@ install-ps: install css2.ps.gz
301297
install-all: install css2.zip css2.txt
302298
$(CP) css2.zip css2.txt $(INSTALLDIR)
303299

304-
images/gifs.ok: images/*.idraw
300+
images/pngs.ok: images/*.idraw
305301
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.gif; done
306302
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.png; done
307-
touch images/gifs.ok
303+
touch images/pngs.ok
308304

309305
translations.html : translations.src
310306
$(SED) -e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
@@ -316,11 +312,6 @@ errata.html : errata.src
316312
-e 's|_THE_ID_|$(THE_ID)|g' \
317313
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' $< > $@
318314

319-
install_updates: $(UPDATEOBJS)
320-
@if [ ! -d $(UPDATESDIR) ]; then mkdir -p $(UPDATESDIR);fi
321-
$(CP) errata.html $(UPDATESDIR)/$(THE_ID)-errata.html
322-
$(CP) translations.html $(UPDATESDIR)
323-
324315
#### Special section to build PS file and single plain text file
325316

326317
css2.ps ps: all
@@ -350,11 +341,12 @@ css2.txt txt: css2.html
350341
####
351342

352343
css2.tgz: $(ALLOBJS) # images/links.ok
353-
# $(TAR) cf - $(ALLOBJS) `$(LS) -d images/* | $(GREP) -v "\."` | gzip >$@
344+
# $(TAR) cf - $(ALLOBJS) `$(LS) -d images/*.png | $(GREP) -v "\."` | gzip >$@
354345
$(TAR) cf - $(ALLOBJS) | gzip >$@
355346

356347
css2.zip: $(ALLOBJS)
357-
$(ZIP) $@ $(ALLOBJS) `$(LS) -d images/* | $(GREP) -v "\."`
348+
$(ZIP) $@ $(ALLOBJS) images/*.png
349+
# $(ZIP) $@ $(ALLOBJS) `$(LS) -d images/*.png | $(GREP) -v "\."`
358350

359351
#### Section generate property/descriptor tables from property database.
360352

@@ -484,7 +476,7 @@ build/todo.srb: DOC/todo.db
484476

485477
check: checkdoc checkspaces checkprops checkrefs checkspell checksample checklnx checkx
486478

487-
FILES= $(MAINOBJS) $(APPENDIXES) $(REFS) $(INDEXES) $(UPDATEOBJS)
479+
FILES= $(MAINOBJS) $(APPENDIXES) $(REFS) $(INDEXES)
488480

489481
checkdoc: all
490482
-@echo "# Begin checking sgml."
@@ -582,8 +574,8 @@ log:
582574
clean:
583575
$(RM) $(SPECOBJS) $(INDEXES) $(PROPBLKSDIR)/* \
584576
$(SPECOBJS:.html=.srd) $(SPECOBJS:.html=.subtoc) \
585-
$(INDEXES:.html=.srd) $(UPDATEOBJS)\
586-
$(DESCBLKSDIR)/* build/* css2.* linklint images/links.ok images/gifs.ok
577+
$(INDEXES:.html=.srd) \
578+
$(DESCBLKSDIR)/* build/* css2.* linklint images/links.ok images/pngs.ok
587579

588580
realclean: clean
589581

css2/aural.src

+2-2
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.33 2002-07-05 19:58:04 bbos Exp $ -->
5+
<!-- $Id: aural.src,v 2.34 2002-07-05 22:19:35 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Aural style sheets</TITLE>
@@ -749,7 +749,7 @@ attributes have not been specified.</p>
749749

750750
<div class="html-example">
751751
<div class="figure">
752-
<P><img src="images/table1.gif" alt="Image of a table created in MS
752+
<P><img src="images/table1.png" alt="Image of a table created in MS
753753
Word"><p class="caption"> Image of a table with header cells ("San
754754
Jose" and "Seattle") that are not in the same column or row as the
755755
data they apply to.

css2/box.src

+3-3
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: box.src,v 1.23 2002-07-05 13:33:36 bbos Exp $ -->
3+
<!-- $Id: box.src,v 1.24 2002-07-05 22:19:35 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Box model</TITLE>
@@ -32,7 +32,7 @@ diagram shows how these areas relate and the terminology used to refer
3232
to pieces of margin, border, and padding:</P>
3333

3434
<div class="figure">
35-
<P><img src="./images/boxdim.gif"
35+
<P><img src="./images/boxdim.png"
3636
alt="Image illustrating the relationship between content, padding, borders, and margins."></P>
3737
</div>
3838

@@ -142,7 +142,7 @@ margins, padding, and borders of the UL elements and those of its
142142
children LI elements.</P>
143143

144144
<div class="figure">
145-
<P><img src="./images/boxdimeg.gif"
145+
<P><img src="./images/boxdimeg.png"
146146
alt="Image illustrating how parent and child margins, borders,
147147
and padding relate."></p>
148148
</div>

css2/colors.src

+5-5
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: colors.src,v 2.24 2002-07-05 12:50:22 bbos Exp $ -->
3+
<!-- $Id: colors.src,v 2.25 2002-07-05 22:19:35 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Colors and backgrounds</TITLE>
@@ -126,7 +126,7 @@ image, or 'none', when no image is used.
126126

127127
<div class="example"><P>
128128
<PRE>
129-
body { background-image: url("marble.gif") }
129+
body { background-image: url("marble.png") }
130130
p { background-image: none }
131131
</PRE>
132132
</div>
@@ -154,13 +154,13 @@ Values have the following meanings:</p>
154154
<div class="example"><P>
155155
<PRE>
156156
body {
157-
background: white url("pendant.gif");
157+
background: white url("pendant.png");
158158
background-repeat: repeat-y;
159159
background-position: center;
160160
}
161161
</PRE>
162162
<div class="figure">
163-
<p><img src="images/bg-repeat.gif" alt="A centered background image,
163+
<p><img src="images/bg-repeat.png" alt="A centered background image,
164164
with copies repeated up and down the padding and content areas.">
165165

166166
<p class="caption">One copy of the background image is centered, and
@@ -188,7 +188,7 @@ the image is tiled ('background-repeat: repeat'), it may be invisible.
188188
that remains "glued" to the viewport when the element is scrolled.
189189
<PRE>
190190
body {
191-
background: red url("pendant.gif");
191+
background: red url("pendant.png");
192192
background-repeat: repeat-y;
193193
background-attachment: fixed;
194194
}

css2/conform.src

+2-2
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: conform.src,v 2.46 2002-07-05 13:21:27 bbos Exp $ -->
3+
<!-- $Id: conform.src,v 2.47 2002-07-05 22:19:35 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Conformance: requirements and recommendations</TITLE>
@@ -239,7 +239,7 @@ user agent.
239239
<P>This results in the following tree:</P>
240240

241241
<div class="figure">
242-
<P><IMG src="images/doctree.gif" alt="Sample document tree"></p>
242+
<P><IMG src="images/doctree.png" alt="Sample document tree"></p>
243243
</div>
244244

245245
<P>According to the definition of HTML 4.0, "head" elements will be

css2/cover.src

+18-13
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<dd><a lang=nl href="http://www.w3.org/People/Bos/">
3232
Bert Bos</a>
3333
&lt;bert&nbsp;@w3.org&gt;
34-
<dd><a lang=tr href="???">
35-
Tantek &Ccedil;elik</a>
34+
<dd><span lang=tr>
35+
Tantek &Ccedil;elik</span>
3636
&lt;tantekc&nbsp;@microsoft.com&gt;
3737
<dd><span lang=en>
3838
Ian Hickson</span>
@@ -84,23 +84,28 @@
8484

8585
<h2>Abstract</h2>
8686

87-
<p>This specification defines Cascading Style Sheets, level 2 revision
88-
1 (CSS&nbsp;2.1). CSS&nbsp;2.1 is a style sheet language that allows
87+
<p>This specification defines Cascading Style Sheets, level&nbsp;2
88+
revision&nbsp;1 (CSS&nbsp;2.1). CSS&nbsp;2.1 is a style sheet language
89+
that allows
8990
authors and users to attach style (e.g., fonts, spacing, and aural
9091
cues) to structured documents (e.g., HTML documents and XML
9192
applications). By separating the presentation style of documents from
9293
the content of documents, CSS&nbsp;2.1 simplifies Web authoring and
9394
site maintenance.
9495

95-
<P>CSS&nbsp;2.1 builds on CSS2 which builds on CSS1 (see [[CSS1]])
96-
and, with very few exceptions, all valid CSS1 style sheets are valid
97-
CSS&nbsp;2.1 style sheets. CSS&nbsp;2.1 supports media-specific style
98-
sheets so that authors may tailor the presentation of their documents
99-
to visual browsers, aural devices, printers, braille devices, handheld
100-
devices, etc. This specification also supports content positioning,
101-
downloadable fonts, table layout, features for internationalization,
102-
automatic counters and numbering, and some properties related to user
103-
interface.
96+
<P>CSS&nbsp;2.1 builds on CSS2 [[CSS2]] which builds on CSS1 [[CSS1]].
97+
It supports media-specific style sheets so that authors may tailor the
98+
presentation of their documents to visual browsers, aural devices,
99+
printers, braille devices, handheld devices, etc. It also supports
100+
content positioning, table layout, features for internationalization
101+
and some properties related to user interface.
102+
103+
<p>CSS&nbsp;2.1 corrects a few errors in CSS2 (the most important
104+
being a new definition of the height/width of absolutely positioned
105+
elements, more influence for HTML's "style" attribute and a new
106+
calculation of the 'clip' property). But most of all CSS&nbsp;2.1
107+
represents a "snapshot" of CSS usage: it consists of all CSS features
108+
that were implemented interoperably at the date of publication.
104109

105110
<h2>Status of this document</h2>
106111

0 commit comments

Comments
 (0)