Skip to content

Commit 456a4d5

Browse files
committed
[css2] Removed gamma. Added conversion for xfig files.
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401968
1 parent 4aba4af commit 456a4d5

3 files changed

Lines changed: 23 additions & 17 deletions

File tree

css2/Makefile

Lines changed: 13 additions & 5 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.63 2002-11-18 20:36:16 bbos Exp $
3+
# $Id: Makefile,v 2.64 2002-11-18 22:59:56 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -203,10 +203,12 @@ HTML2PS= $(PERL) bin/html2ps -d -f html2psrc2
203203
#PSTOPNM = ./bin/mypstopnm -r 75
204204
PSTOPNM = ./bin/mypstopnm -r 150
205205
#PNMTOGIF_PIPE = ppmquant 256 | ppmtogif
206-
PNMTOGIF_PIPE = pnmscale 0.5 | pnmgamma 1.7 | ppmquant -fs 256 | ppmtogif
206+
#PNMTOGIF_PIPE = pnmscale 0.5 | pnmgamma 1.7 | ppmquant -fs 256 | ppmtogif
207+
PNMTOGIF_PIPE = pnmscale 0.5 | ppmquant -fs 256 | ppmtogif
207208

208209
# idraw -> png
209-
PNMTOPNG_PIPE = pnmscale 0.5 | pnmgamma 1.7 | pnmtopng -gamma 1.7
210+
#PNMTOPNG_PIPE = pnmscale 0.5 | pnmgamma 1.7 | pnmtopng -gamma 1.7
211+
PNMTOPNG_PIPE = pnmscale 0.5 | pnmtopng
210212

211213
# include paths
212214
INCLUDES= -Ibuild -I.
@@ -217,7 +219,7 @@ TAR= tar
217219
ZIP= zip -y
218220
LN= ln
219221

220-
.SUFFIXES: .src .html .srd .idraw .gif .ps .subtoc .png
222+
.SUFFIXES: .src .html .srd .idraw .gif .ps .subtoc .png .fig
221223

222224
%.subtoc: %.srd Project.cfg
223225
@echo "=========== making" $@
@@ -258,6 +260,10 @@ LN= ln
258260
$(RM) $@
259261
$(PSTOPNM) $< | $(PNMTOPNG_PIPE) >$@
260262

263+
.fig.png:
264+
$(RM) $@
265+
fig2dev -L ps $< | $(PSTOPNM) | $(PNMTOPNG_PIPE) >$@
266+
261267
all: build/blocks.ok $(SPECOBJS) $(INDEXES) images/pngs.ok \
262268
$(IMAGES)
263269
# $(IMAGES) issues.html errata-issues.html DOC/TODO.html
@@ -295,9 +301,11 @@ install-pdf: install css2.pdf
295301
install-all: install install-ps install-pdf css2.zip css2.txt
296302
$(CP) css2.zip css2.txt $(INSTALLDIR)
297303

298-
images/pngs.ok: images/*.idraw
304+
images/pngs.ok: images/*.idraw images/*.fig
299305
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.gif; done
300306
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.png; done
307+
-@for f in images/*.fig; do make images/`basename $$f .fig`.gif; done
308+
-@for f in images/*.fig; do make images/`basename $$f .fig`.png; done
301309
touch images/pngs.ok
302310

303311
translations.html : translations.src

css2/bin/mkpropidx

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/local/bin/perl
22
# Index of property names.
33
# Arnaud Le Hors lehors@w3.org/Ian Jacobs ij@w3.org
4-
# $Id: mkpropidx,v 2.9 2002-11-18 20:36:16 bbos Exp $
4+
# $Id: mkpropidx,v 2.10 2002-11-18 22:59:56 bbos Exp $
55
use English;
66

77

@@ -143,10 +143,10 @@ sub format_media {
143143
print OUTPUT "<td>$fmedia\n";
144144
}
145145

146-
sub format_compval {
147-
$compval = cleanup($_[0]);
148-
print OUTPUT "<td>$compval\n";
149-
}
146+
#sub format_compval {
147+
# $compval = cleanup($_[0]);
148+
# print OUTPUT "<td>$compval\n";
149+
#}
150150

151151
sub table_head {
152152
print OUTPUT "<table border=1 align=center>\n";
@@ -155,11 +155,12 @@ sub table_head {
155155
print OUTPUT "<th>Name";
156156
print OUTPUT "<th>Values";
157157
print OUTPUT "<th>Initial value";
158-
print OUTPUT "<th>Applies to <BR> (Default: all)";
158+
print OUTPUT "<th>Applies to<br>(Default: all)";
159159
# print OUTPUT "<th>Inherited? <BR> (Default: no)";
160160
print OUTPUT "<th>Inherited?";
161-
print OUTPUT "<th>Percentages <BR> (Default: N/A)";
162-
print OUTPUT "<th>Media groups<BR>";
161+
print OUTPUT "<th>Percentages<br>(Default: N/A)";
162+
print OUTPUT "<th>Media groups";
163+
#print OUTPUT "<th>Computed value";
163164
print OUTPUT "</thead>";
164165
print OUTPUT "\n";
165166
}
@@ -175,7 +176,7 @@ sub table_body {
175176
format_inh($inh);
176177
format_perc($perc);
177178
format_media($media);
178-
format_compval($compval);
179+
#format_compval($compval);
179180
print OUTPUT "\n";
180181
}
181182
}

css2/properties/properties.db

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
N/A;;
7979
visual;;
8080
absolute length; '0' if the border style is 'none' or 'hidden'
81-
2 2.1
8281
*/
8382
/* border-width;;
8483
<border-width>{1,4} | inherit;;
@@ -419,8 +418,6 @@ table-cell | table-caption | none | inherit;;
419418
refer to the size of the box itself;;
420419
visual;;
421420
for <length> the absolute value, otherwise a percentage
422-
2 2.1
423-
424421
*/
425422
/* background;;
426423
[<'background-color'> || <'background-image'> || <'background-repeat'>

0 commit comments

Comments
 (0)