8000 [CSS22] Replaced occurrences of "CSS 2.1" with "CSS 2.2". Converted a… · w3c/csswg-drafts@955261b · GitHub
Skip to content

Commit 955261b

Browse files
bert-githubbert-github
committed
[CSS22] Replaced occurrences of "CSS 2.1" with "CSS 2.2". Converted all files to UTF-8. Made internal links work in the PDF version. Added support for FPWD to Makefile. Added page numbers to the PDF version. Updated copyright statement. Updated status section, including new W3C Process version (2014).
1 parent e736860 commit 955261b

104 files changed

Lines changed: 760 additions & 883 deletions

File tree

Some content is hidden

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

‎css2/DOC/CONVENTIONS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ Document HEAD
278278
<html lang="en">
279279
<!-- $Id: CONVENTIONS,v 1.15 1998-05-05 18:01:10 bbos Exp $ -->
280280
<HEAD>
281-
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
281+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
282282
<TITLE>CSS2 Specification</TITLE>
283283
<!-- *Don't* put next, prev, and stylesheet links, they are automatic -->
284284
</HEAD>

‎css2/DOC/TODO.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<HTML>
22
<HEAD>
3-
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
3+
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=utf-8">
44
<TITLE>CSS2 TODO List</TITLE>
55
<!--$Id: TODO.src,v 1.3 1997-09-30 18:36:55 bbos Exp $-->
66
<STYLE>

‎css2/Makefile‎

Lines changed: 44 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,33 @@
55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
77
#THE_YEAR = YYYY
8-
THE_YEAR = 2014
8+
THE_YEAR = 2015
99
#THE_MONTH = MM
10-
THE_MONTH = 09
10+
THE_MONTH = 06
1111
#THE_MONTHNAME = MMMMM
12-
THE_MONTHNAME = September
12+
THE_MONTHNAME = June
1313
#THE_DAY = DD
14-
THE_DAY = 25
15-
THE_STATUS = ED
16-
#THE_STATUS = REC
17-
THE_STATUSNAME = Editors Draft
18-
#THE_STATUSNAME = Recommendation
19-
20-
PREV_YEAR = 2011
14+
THE_DAY = 02
15+
THE_STATUS = FPWD
16+
#THE_STATUS = ED
17+
THE_STATUSNAME = First Public Working Draft
18+
#THE_STATUSNAME = Editors' Draft
19+
THE_STYLE = WD
20+
#THE_STYLE = ED
21+
22+
PREV_YEAR = 2015
2123
PREV_MONTH = 06
22-
PREV_DAY = 07
23-
PREV_STATUS = REC
24-
PREV_NAME = CSS2
24+
PREV_DAY = 02
25+
PREV_STATUS = WD
26+
PREV_NAME = CSS22
27+
28+
PERMANENT_NAME = CSS22
2529

26-
PERMANENT_NAME = CSS2
30+
# A very visible warning after the first H1 on every page (or at the
31+
# location of the _THE_WARNING_ placeholder on some pages). Leave
32+
# empty if none is needed. (Escape any & as \&.)
33+
#
34+
THE_WARNING =
2735

2836
# WEBROOT = /afs/w3.org/WWW
2937
WEBROOT = $(HOME)/WWW
@@ -35,7 +43,7 @@ THE_UPDATE_DIR = http://www.w3.org$(UPDATES)
3543
UPDATESDIR= $(WEBROOT)$(UPDATES)
3644
TR_DIR = $(WEBROOT)/TR
3745
THE_DATE = $(THE_DAY) $(THE_MONTHNAME) $(THE_YEAR)
38-
THE_ID = $(THE_STATUS)-$(PERMANENT_NAME)-$(THE_YEAR)$(THE_MONTH)$(THE_DAY)
46+
THE_ID = $(THE_STYLE)-$(PERMANENT_NAME)-$(THE_YEAR)$(THE_MONTH)$(THE_DAY)
3947
PREV_DATE = $(PREV_YEAR)$(PREV_MONTH)$(PREV_DAY)
4048
THE_PREVIOUS_VERSION = http://www.w3.org/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
4149
THE_LOC = $(THE_YEAR)/$(THE_ID)
@@ -262,21 +270,24 @@ LN= ln
262270
# at the cost of possibly incorrect xrefs in the other .html files
263271
#
264272
#%.html: %.subtoc Project.cfg
265-
%.html: %.subtoc $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) Project.cfg #$(SPECSRCS:.src=.srd)
273+
%.html: %.subtoc $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) Project.cfg build/warning #$(SPECSRCS:.src=.srd)
266274
@echo "=========== making" $@
267275
$(ADDLINKS) $(VALUEDB) $*.srd propinst-/propdef- value-inst-/value-def- |\
268276
$(ADDIDXANCH) -r $@ $(INDEXDB) - |\
269277
$(ADDMARKUP) - |\
270278
$(ADDLONGDESC) - |\
271279
$(ADDNAVBAR) -r $@ |\
280+
$(INSAFTER) - build/warning /H1 - |\
272281
$(INSAFTER) - $*.subtoc /H1 - |\
273282
$(MKCHAIN) -r $@ - |\
274283
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
275284
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
276285
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
277286
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
278287
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
288+
-e 's|_THE_STYLE_|$(THE_STYLE)|g' \
279289
-e 's|_THE_DATE_|$(THE_DATE)|g' \
290+
-e 's|_THE_WARNING_|$(THE_WARNING)|g' \
280291
-e 's|_THE_ID_|$(THE_ID)|g' \
281292
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
282293

@@ -310,6 +321,8 @@ all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
310321
$(IMAGES)
311322
# $(IMAGES) issues.html errata-issues.html DOC/TODO.html
312323

324+
build/warning:
325+
echo "_THE_WARNING_" >$@
313326

314327
#images/links.ok : $(IMAGES)
315328
# -@(cd images; for i in *.gif; do $(LN) -s $$i "`basename $$i .gif`" 2>//dev/null; done)
@@ -335,10 +348,10 @@ $(INSTALLDIR)/.htaccess:
335348
mkdir -p $(INSTALLDIR)
336349
echo "DirectoryIndex cover.html" >$@
337350
echo "<Files ~ \"\.html\">" >>$@
338-
echo "ForceType 'text/html; charset=iso-8859-1'" >>$@
351+
echo "ForceType 'text/html; charset=utf-8'" >>$@
339352
echo "</Files>" >>$@
340353
echo "<Files ~ \"\.txt\">" >>$@
341-
echo "ForceType 'text/plain; charset=iso-8859-1'" >>$@
354+
echo "ForceType 'text/plain; charset=utf-8'" >>$@
342355
echo "</Files>" >>$@
343356

344357
link: install
@@ -376,12 +389,13 @@ errata.html : errata.src
376389

377390
extras: css2.tgz
378391

379-
# The sources are in ISO-8859-1, make them ASCII to avoid encoding problems
380-
%.pdf: %.html style/default.css; asc2xml < $< | xml2asc | prince -o $@ -
392+
%.pdf: %.html style/default.css; prince -o $@ $<
381393
%.ps: %.pdf; $(PDF2PS) $< $@
382394

383-
css2.pdf: $(SPECOBJS:.html=.pdf)
384-
pdftk $+ cat output $@
395+
# css2.pdf: $(SPECOBJS:.html=.pdf)
396+
# pdftk $+ cat output $@
397+
# css2.pdf: css2.html
398+
# prince -o $@ $<
385399

386400
# css2.ps: build/blocks.ok $(SPECOBJS) images/pngs.ok $(IMAGES)
387401
# # Because of memory limitations in html2ps, use the
@@ -453,7 +467,10 @@ cover.html: cover.srd Project.cfg
453467
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
454468
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
455469
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
470+
-e 's|_THE_STYLE_|$(THE_STYLE)|g' \
456471
-e 's|_THE_DATE_|$(THE_DATE)|g' \
472+
-e 's|_THE_WARNING_|$(THE_WARNING)|g' \
473+
-e 's|_THE_YEAR_|$(THE_YEAR)|g' \
457474
-e 's|_THE_ID_|$(THE_ID)|g' \
458475
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
459476

@@ -478,16 +495,20 @@ indexlist.srd:: build/indexlist.srb #indexlist.src build/blocks.ok
478495
# @echo "=========== making" $@
479496
# $(CP) $< $@
480497

481-
indexlist.html: indexlist.srd build/indexlist.srb Project.cfg
498+
indexlist.html: indexlist.srd build/indexlist.srb Project.cfg build/warning
482499
@echo "=========== making" $@
483500
$(ADDNAVBAR) -r $@ $< |\
501+
$(INSAFTER) - build/warning /H1 - |\
484502
$(MKCHAIN) -r $@ - |\
485503
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
486504
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
487505
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
488506
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
489507
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
508+
-e 's|_THE_STYLE_|$(THE_STYLE)|g' \
490509
-e 's|_THE_DATE_|$(THE_DATE)|g' \
510+
-e 's|_THE_WARNING_|$(THE_WARNING)|g' \
511+
-e 's|_THE_YEAR_|$(THE_YEAR)|g' \
491512
-e 's|_THE_ID_|$(THE_ID)|g' \
492513
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
493514

‎css2/Project.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
@source-extension .src
1616

1717
@stylesheet style/default.css text/css
18-
@stylesheet http://www.w3.org/StyleSheets/TR/W3C-_THE_STATUS_.css text/css
18+
@stylesheet http://www.w3.org/StyleSheets/TR/W3C-_THE_STYLE_.css text/css
1919
@contents "cover.html#minitoc"
2020

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

0 commit comments

Comments
 (0)