[ViewVC] Diff of: cvs/rxvt-unicode/src/defaultfont.C

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC vs.
Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC

…		…
24	#include "defaultfont.h"	24	#include "defaultfont.h"
25		25
26	#include <cstdlib>	26	#include <cstdlib>
27		27
28	#define DISPLAY r->display->display	28	#define DISPLAY r->display->display
29	#define GC r->TermWin.gc	29	#define TGC r->TermWin.gc
30		30
31	const struct rxvt_fallback_font {	31	const struct rxvt_fallback_font {
32	codeset cs;	32	codeset cs;
33	const char *name;	33	const char *name;
34	} fallback_fonts[] = {	34	} fallback_fonts[] = {
…		…
61	# if XFT	61	# if XFT
62	// prefer xft for complex scripts	62	// prefer xft for complex scripts
63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },	63	{ CS_UNICODE, "xft:Kochi Gothic:antialias=false" },
64	# endif	64	# endif
65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },	65	{ CS_JIS0201_1976_0, "--mincho--r-------c--jisx0201*-0" },
66	{ CS_JIS0208_1983_0, "--mincho--r-------c--jisx0208*-0" },	66	{ CS_JIS0208_1990_0, "--mincho--r-------c--jisx0208*-0" },
67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },	67	{ CS_JIS0212_1990_0, "--mincho--r-------c--jisx0212*-0" },
68	#endif	68	#endif
69		69
70	#if ENCODING_CN \|\| ENCODING_CN_EXT	70	#if ENCODING_CN \|\| ENCODING_CN_EXT
71	# if XFT	71	# if XFT
72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },	72	{ CS_BIG5_EXT, "xft:AR PL Mingti2L Big5" },
73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },	73	{ CS_BIG5_EXT, "xft:AR PL KaitiM Big5" },
74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },	74	{ CS_GB2312_1980_0, "xft:AR PL KaitiM GB" },
75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },	75	{ CS_GB2312_1980_0, "xft:AR PL SungtiL GB" },
76	# endif	76	# endif
77	{ CS_BIG5_EXT, "-----------c--big5-0" },	77	{ CS_BIG5, "-----------c-*-big5-0" },
		78	{ CS_BIG5_PLUS, "-----------c-*-big5p-0" },
		79	{ CS_BIG5_EXT, "-----------c-*-big5.eten-0" },
78	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },	80	{ CS_CNS11643_1992_1, "-----------c--gb2312-0" },
79	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },	81	{ CS_CNS11643_1992_1, "-----------c--cns11643-1" },
80	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },	82	{ CS_CNS11643_1992_2, "-----------c--cns11643-2" },
81	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },	83	{ CS_CNS11643_1992_3, "-----------c--cns11643-3" },
82	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },	84	{ CS_CNS11643_1992_4, "-----------c--cns11643-4" },
…		…
94	{ CS_UNICODE, "xft:FreeMono" },	96	{ CS_UNICODE, "xft:FreeMono" },
95	{ CS_UNICODE, "--unifont---------c--iso10646-1" },	97	{ CS_UNICODE, "--unifont---------c--iso10646-1" },
96	{ CS_UNICODE, "----r-------c--iso10646-1" },	98	{ CS_UNICODE, "----r-------c--iso10646-1" },
97	{ CS_UNICODE, "----r-------m--iso10646-1" },	99	{ CS_UNICODE, "----r-------m--iso10646-1" },
98		100
		101	#if UNICODE_3 && XFT
		102	{ CS_UNICODE, "xft:Code2001" }, // contains many plane-1 characters
		103	#endif
		104
99	{ CS_UNKNOWN, 0 }	105	{ CS_UNKNOWN, 0 }
100	};	106	};
101		107
102	/////////////////////////////////////////////////////////////////////////////	108	/////////////////////////////////////////////////////////////////////////////
103		109
…		…
188	else if (color >= 0)	194	else if (color >= 0)
189	{	195	{
190	#if XFT	196	#if XFT
191	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);	197	XftDrawRect (d, &r->PixColors[color].c, x, y, w, h);
192	#else	198	#else
193	XSetForeground (d.display->display, GC, r->PixColors[color]);	199	XSetForeground (d.display->display, TGC, r->PixColors[color]);
194	XFillRectangle (d.display->display, d, GC, x, y, w, h);	200	XFillRectangle (d.display->display, d, TGC, x, y, w, h);
195	#endif	201	#endif
196	}	202	}
197	}	203	}
198		204
199	static const char *linedraw_cmds[128] = {	205	#include "table/linedraw.h"
200	"1hH", "2hH", "1vV", "2vV",
201	0, 0, 0, 0,
202	0, 0, 0, 0,
203	"1HV", "2H1V", "1H2V", "2HV",
204
205	// 2510
206	"1hV", "2h1V", "1h2V", "2hV",
207	"1Hv", "2H1v", "1H2v", "2Hv",
208	"1hv", "2h1v", "1h2v", "2hv",
209	"1HvV", "2H1vV", "1HV2v", "1Hv2V",
210
211	// 2520
212	"1H2vV", "2Hv1V", "2HV1v", "2HvV",
213	"1hvV", "2h1vV", "1hV2v", "1hv2V",
214	"1h2vV", "2hv1V", "1v2hV", "2hvV",
215	"1hHV", "2h1HV", "2H1hV", "2hH1V",
216
217	// 2530
218	"1hH2V", "2hV1H", "1h2HV", "2hHV",
219	"1hHv", "1vH2h", "1hv2H", "1v2hH",
220	"1hH2v", "1H2hv", "1h2Hv", "2hHv",
221	"1hHvV", "1vVH2h", "1hvV2H", "1vV2hH",
222
223	// 2540
224	"1hHV2v", "1hHv2V", "1hH2vV", "1HV2hv",
225	"1hV2Hv", "1Hv2hV", "1hv2HV", "1V2hHv",
226	"1v2hHV", "1H2hvV", "1h2HvV", "2hHvV",
227	0, 0, 0, 0,
228
229	// 2550
230	0, 0, 0, 0,
231	0, 0, 0, 0,
232	0, 0, 0, 0,
233	0, 0, 0, 0,
234
235	// 2560
236	0, 0, 0, 0,
237	0, 0, 0, 0,
238	0, 0, 0, 0,
239	0, 0, 0, 0,
240
241	// 2570
242	0, "1a", "1b", "1ab",
243	"1h", "1v", "1H", "1V",
244	"2h", "2v", "2H", "2V",
245	"1h2H", "1v2V", "1H2h", "1V2v"
246
247	// to be done
248	};
249		206
250	struct rxvt_font_default : rxvt_font {	207	struct rxvt_font_default : rxvt_font {
		208
251	rxvt_fontprop properties ()	209	rxvt_fontprop properties ()
252	{	210	{
253	rxvt_fontprop p;	211	rxvt_fontprop p;
254		212
255	p.width = p.height = 1;	213	p.width = p.height = 1;
…		…
262	bool load (const rxvt_fontprop &prop)	220	bool load (const rxvt_fontprop &prop)
263	{	221	{
264	width = 1; height = 1;	222	width = 1; height = 1;
265	ascent = 1; descent = 0;	223	ascent = 1; descent = 0;
266		224
		225	set_name (strdup ("built-in pseudofont"));
		226
267	return true;	227	return true;
268	}	228	}
269		229
270	bool has_codepoint (uint32_t unicode)	230	bool has_codepoint (unicode_t unicode)
271	{	231	{
272	if (unicode <= 0x001f)	232	if (unicode <= 0x001f)
273	return true;	233	return true;
		234
274	if (unicode >= 0x0080 && unicode <= 0x009f)	235	if (unicode >= 0x0080 && unicode <= 0x009f)
275	return true;	236	return true;
276		237
277	if (unicode >= 0x2500 && unicode <= 0x257f	238	if (unicode >= 0x2500 && unicode <= 0x259f
278	&& linedraw_cmds[unicode - 0x2500])	239	&& linedraw_offs[unicode - 0x2500] & 15)
		240	return true;
		241
		242	if (IS_COMPOSE (unicode))
279	return true;	243	return true;
280		244
281	switch (unicode)	245	switch (unicode)
282	{	246	{
283	case ZERO_WIDTH_CHAR:	247	case ZERO_WIDTH_CHAR:
…		…
295	void	259	void
296	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,	260	rxvt_font_default::draw (rxvt_drawable &d, int x, int y,
297	const text_t *text, int len,	261	const text_t *text, int len,
298	int fg, int bg)	262	int fg, int bg)
299	{	263	{
		264	return;
300	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	265	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
301		266
302	XSetForeground (d.display->display, GC, r->PixColors[fg]);	267	XSetForeground (d.display->display, TGC, r->PixColors[fg]);
303		268
304	while (len--)	269	while (len--)
305	{	270	{
		271	#if ENABLE_COMBINING
		272	compose_char *cc;
		273	#endif
306	text_t t = *text++;	274	text_t t = *text++;
307		275
308	// is it in our linedrawing table?	276	int W = r->TermWin.fwidth , w = (W - 1) / 2;
309	if (t >= 0x2500 & t <= 0x2580 && linedraw_cmds[t - 0x2500])	277	int H = r->TermWin.fheight, h = (H - 1) / 2;
		278	int x0 = x, x1 = x + w, x2 = x + r->TermWin.fwidth ;
		279	int y0 = y, y1 = y + h, y2 = y + r->TermWin.fheight;
		280
		281	if (0x2500 <= t && t <= 0x259f
		282	&& linedraw_offs[t - 0x2500] & 15)
		283	{
		284	uint16_t offs = linedraw_offs[t - 0x2500];
		285	uint32_t *a = linedraw_command + (offs >> 4);
		286	uint32_t *b = a + (offs & 15);
		287
		288	int x_[16];
		289	int y_[16];
		290
		291	for (int i = 0; i <= 8; i++)
310	{	292	{
311	const char *p = linedraw_cmds[t - 0x2500];	293	x_[i] = x + ((W-1) * i + (i*7/8)) / 8;
		294	y_[i] = y + ((H-1) * i + (i*7/8)) / 8;
		295	}
312		296
313	int x0 = x, x1 = x + r->TermWin.fwidth / 2, x2 = x + r->TermWin.fwidth - 1;	297	x_[10] = x + (W - 1) / 2; x_[9] = x_[10] - 1; x_[11] = x_[10] + 1;
314	int y0 = y, y1 = y + r->TermWin.fheight / 2, y2 = y + r->TermWin.fheight - 1;	298	y_[10] = y + (H - 1) / 2; y_[9] = y_[10] - 1; y_[11] = y_[10] + 1;
315		299
316	XGCValues gcv;	300	XGCValues gcv;
317		301
		302	gcv.cap_style = CapButt;
		303	gcv.line_width = 0;
		304	XChangeGC (d.display->display, TGC, GCLineWidth \| GCCapStyle, &gcv);
		305
318	while (*p)	306	while (a < b)
319	{	307	{
		308	uint32_t command = *a++;
		309
		310	int op = (command >> 24) & 255;
		311	int a = (command >> 20) & 15;
		312	int b = (command >> 16) & 15;
		313	int x1 = x_[(command >> 12) & 15];
		314	int y1 = y_[(command >> 8) & 15];
		315	int x2 = x_[(command >> 4) & 15];
		316	int y2 = y_[(command >> 0) & 15];
		317
320	switch (*p++)	318	switch (op)
321	{	319	{
322	case '1':	320	case 0: // line
323	gcv.line_width = 0;	321	XDrawLine (d.display->display, d, TGC, x1, y1, x2, y2);
324	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);
325	break;	322	break;
326		323
327	case '2':	324	case 1: // rectangle, possibly stippled
		325	if (a)
		326	{
		327	static char bm[] = { 0,0 , 3,1 , 1,2 , 1,0 };
		328
		329	gcv.fill_style = FillStippled;
		330	gcv.stipple = XCreateBitmapFromData (d.display->display, d, bm + a * 2, 2, 2);
		331	gcv.ts_x_origin = x;
		332	gcv.ts_y_origin = y;
		333
		334	XChangeGC (d.display->display, TGC,
		335	GCFillStyle \| GCStipple \| GCTileStipXOrigin \| GCTileStipYOrigin,
		336	&gcv);
		337	}
		338
		339
		340	XFillRectangle (d.display->display, d, TGC, x1, y1, x2 - x1 + 1, y2 - y1 + 1);
		341
		342	if (a)
		343	{
		344	XFreePixmap (d.display->display, gcv.stipple);
328	gcv.line_width = 2;	345	gcv.stipple = 0;
		346	gcv.fill_style = FillSolid;
329	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	347	XChangeGC (d.display->display, TGC, GCFillStyle, &gcv);
		348	}
		349
330	break;	350	break;
331		351	case 2: // arc
332	case 'h': XDrawLine (d.display->display, d, GC, x0, y1, x1, y1); break;	352	XDrawArc (d.display->display, d, TGC,
333	case 'H': XDrawLine (d.display->display, d, GC, x1, y1, x2, y1); break;	353	x1 - W/2, y1 - H/2, W-1, H-1,
334	case 'v': XDrawLine (d.display->display, d, GC, x1, y0, x1, y1); break;	354	(a - 1) * 9064, (b - 1) 90*64);
335	case 'V': XDrawLine (d.display->display, d, GC, x1, y1, x1, y2); break;	355	break;
336	case 'a': XDrawLine (d.display->display, d, GC, x0, y2, x2, y0); break;
337	case 'b': XDrawLine (d.display->display, d, GC, x0, y0, x2, y2); break;
338	}	356	}
339	}	357	}
340		358	}
341	gcv.line_width = 0;	359	#if ENABLE_COMBINING
342	XChangeGC (d.display->display, GC, GCLineWidth, &gcv);	360	else if (IS_COMPOSE (t) && (cc = rxvt_composite[t]))
343	}	361	{
		362	rxvt_font f1 = (fs)[fs->find_font (cc->c1)];
		363	f1->draw (d, x, y, &(t = cc->c1), 1, fg, bg);
		364	if (cc->c2 != NOCHAR)
		365	{
		366	// prefer font of first character, for no good reasons
		367	rxvt_font *f2 = f1->has_codepoint (cc->c2)
		368	? f1
		369	: (*fs)[fs->find_font (cc->c2)];
		370
		371	f2->draw (d, x, y, &(t = cc->c2), 1, fg, -1);
		372	}
		373	}
		374	#endif
344	else	375	else
345	switch (t)	376	switch (t)
346	{	377	{
347	case ZERO_WIDTH_CHAR:	378	case ZERO_WIDTH_CHAR:
348	break;	379	break;
		380
349	default:	381	default:
350	int w = 0;	382	int w = 0;
351	while (len > 0 && *text == NOCHAR)	383	while (len > 0 && *text == NOCHAR)
352	{	384	{
353	++text;	385	++text;
354	--len;	386	--len;
355	w += r->TermWin.fwidth;	387	w += r->TermWin.fwidth;
356	}	388	}
357		389
358	XDrawRectangle (d.display->display, d, GC, x + 2, y + 2,	390	XDrawRectangle (d.display->display, d, TGC, x + 2, y + 2,
359	w + r->TermWin.fwidth - 5, r->TermWin.fheight - 5);	391	w + r->TermWin.fwidth - 4, r->TermWin.fheight - 4);
360	x += w;	392	x += w;
361	}	393	}
362		394
363	x += r->TermWin.fwidth;	395	x += r->TermWin.fwidth;
364	}	396	}
…		…
373		405
374	rxvt_fontprop properties ();	406	rxvt_fontprop properties ();
375		407
376	bool load (const rxvt_fontprop &prop);	408	bool load (const rxvt_fontprop &prop);
377		409
378	bool has_codepoint (uint32_t unicode);	410	bool has_codepoint (unicode_t unicode);
379		411
380	void draw (rxvt_drawable &d, int x, int y,	412	void draw (rxvt_drawable &d, int x, int y,
381	const text_t *text, int len,	413	const text_t *text, int len,
382	int fg, int bg);	414	int fg, int bg);
383		415
…		…
440		472
441	bool	473	bool
442	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)	474	rxvt_font_x11::set_properties (rxvt_fontprop &p, const char *name)
443	{	475	{
444	int slashes = 0;	476	int slashes = 0;
445	const char *comp[12];	477	const char *comp[13];
446		478
447	for (const char c = name; c; c++)	479	for (const char c = name; c; c++)
448	if (*c == '-')	480	if (*c == '-')
449	{	481	{
450	comp[slashes++] = c + 1;	482	comp[slashes++] = c + 1;
…		…
630	f = 0;	662	f = 0;
631	}	663	}
632	}	664	}
633		665
634	bool	666	bool
635	rxvt_font_x11::has_codepoint (uint32_t unicode)	667	rxvt_font_x11::has_codepoint (unicode_t unicode)
636	{	668	{
637	uint32_t ch = FROM_UNICODE (cs, unicode);	669	uint32_t ch = FROM_UNICODE (cs, unicode);
638		670
639	if (ch == NOCHAR)	671	if (ch == NOCHAR)
640	return false;	672	return false;
…		…
702	{	734	{
703	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);	735	const XChar2b *xc = enc_xchar2b (text, len, cs, slow);
704		736
705	if (bg == Color_bg && !slow)	737	if (bg == Color_bg && !slow)
706	{	738	{
707	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	739	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
708	XDrawImageString16 (d.display->display, d, GC, x, y + base, xc, len);	740	XDrawImageString16 (d.display->display, d, TGC, x, y + base, xc, len);
709	}	741	}
710	else	742	else
711	{	743	{
712	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	744	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
713		745
714	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	746	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
715		747
716	if (slow)	748	if (slow)
717	{	749	{
718	do	750	do
719	{	751	{
720	if (xc->byte1 \|\| xc->byte2)	752	if (xc->byte1 \|\| xc->byte2)
721	XDrawString16 (d.display->display, d, GC, x, y + base, xc, 1);	753	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, 1);
722		754
723	x += r->TermWin.fwidth;	755	x += r->TermWin.fwidth;
724	xc++; len--;	756	xc++; len--;
725	}	757	}
726	while (len);	758	while (len);
727	}	759	}
728	else	760	else
729	XDrawString16 (d.display->display, d, GC, x, y + base, xc, len);	761	XDrawString16 (d.display->display, d, TGC, x, y + base, xc, len);
730	}	762	}
731	}	763	}
732	else	764	else
733	{	765	{
734	const char *xc = enc_char (text, len, cs, slow);	766	const char *xc = enc_char (text, len, cs, slow);
735		767
736	if (bg == Color_bg && !slow)	768	if (bg == Color_bg && !slow)
737	{	769	{
738	XChangeGC (d.display->display, GC, GCForeground \| GCBackground \| GCFont, &v);	770	XChangeGC (d.display->display, TGC, GCForeground \| GCBackground \| GCFont, &v);
739	XDrawImageString (d.display->display, d, GC, x, y + base, xc, len);	771	XDrawImageString (d.display->display, d, TGC, x, y + base, xc, len);
740	}	772	}
741	else	773	else
742	{	774	{
743	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);	775	clear_rect (d, x, y, r->TermWin.fwidth * len, r->TermWin.fheight, bg);
744		776
745	XChangeGC (d.display->display, GC, GCForeground \| GCFont, &v);	777	XChangeGC (d.display->display, TGC, GCForeground \| GCFont, &v);
746		778
747	if (slow)	779	if (slow)
748	{	780	{
749	do	781	do
750	{	782	{
751	if (*xc)	783	if (*xc)
752	XDrawString (d.display->display, d, GC, x, y + base, xc, 1);	784	XDrawString (d.display->display, d, TGC, x, y + base, xc, 1);
753		785
754	x += r->TermWin.fwidth;	786	x += r->TermWin.fwidth;
755	xc++; len--;	787	xc++; len--;
756	}	788	}
757	while (len);	789	while (len);
758	}	790	}
759	else	791	else
760	XDrawString (d.display->display, d, GC, x, y + base, xc, len);	792	XDrawString (d.display->display, d, TGC, x, y + base, xc, len);
761	}	793	}
762	}	794	}
763	}	795	}
764		796
765	/////////////////////////////////////////////////////////////////////////////	797	/////////////////////////////////////////////////////////////////////////////
…		…
782		814
783	void draw (rxvt_drawable &d, int x, int y,	815	void draw (rxvt_drawable &d, int x, int y,
784	const text_t *text, int len,	816	const text_t *text, int len,
785	int fg, int bg);	817	int fg, int bg);
786		818
787	bool has_codepoint (uint32_t unicode);	819	bool has_codepoint (unicode_t unicode);
788		820
789	protected:	821	protected:
790	XftFont *f;	822	XftFont *f;
791	};	823	};
792		824
…		…
905		937
906	return true;	938	return true;
907	}	939	}
908		940
909	bool	941	bool
910	rxvt_font_xft::has_codepoint (uint32_t unicode)	942	rxvt_font_xft::has_codepoint (unicode_t unicode)
911	{	943	{
912	return XftCharExists (DISPLAY, f, unicode);	944	return XftCharExists (DISPLAY, f, unicode);
913	}	945	}
914		946
915	void	947	void
…		…
1011	f = new rxvt_font_x11;	1043	f = new rxvt_font_x11;
1012	}	1044	}
1013	else	1045	else
1014	f = new rxvt_font_x11;	1046	f = new rxvt_font_x11;
1015		1047
		1048	f->fs = this;
1016	f->set_term (r);	1049	f->set_term (r);
1017	f->set_name (strdup (name));	1050	f->set_name (strdup (name));
1018		1051
1019	f->cs = cs;	1052	f->cs = cs;
1020	f->loaded = false;	1053	f->loaded = false;
…		…
1117		1150
1118	return true;	1151	return true;
1119	}	1152	}
1120		1153
1121	int	1154	int
1122	rxvt_fontset::find_font (uint32_t unicode)	1155	rxvt_fontset::find_font (unicode_t unicode)
1123	{	1156	{
1124	for (unsigned int i = 0; i < fonts.size (); i++)	1157	for (unsigned int i = 0; i < fonts.size (); i++)
1125	{	1158	{
1126	rxvt_font *f = fonts[i];	1159	rxvt_font *f = fonts[i];
1127		1160

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/defaultfont.C (file contents): Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC vs. Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/defaultfont.C (file contents):
Revision 1.27 by pcg, Wed Mar 3 00:20:33 2004 UTC vs.
Revision 1.45 by pcg, Tue Mar 16 05:51:36 2004 UTC