--- ray/src/cv/lamp.tab	1991/09/05 14:11:42	1.1
+++ ray/src/cv/lamp.tab	2003/02/22 02:07:23	2.3
@@ -1,5 +1,5 @@
 #
-# SCCSid "$SunId$ LBL"
+# SCCSid "@(#)lamp.tab 2.2 7/5/94 LBL"
 #
 #	Created by Greg Ward	05Dec90
 #
@@ -53,11 +53,11 @@
 /diffuse\>.*\<HID\>/			(high pressure sodium)
 /frosted\>.*\<HID\>/			(diffuse HID)
 /HPS/					(high pressure sodium)
-/LPS/					(low pressure sodium)
-/[EP]AR/				(incandescent)
+/\<LPS/					(low pressure sodium)
+/\<[EP]AR\>/				(incandescent)
 /ER30/					(incandescent)
-/\<D65/					.313 .329 1
-/MH/					(metal halide)
-/clear HID\>/				(high pressure sodium)
-/HID/					(clear HID)
-/\<white\>/				(D65)
+/\<D65WHITE\>/				.313 .329 1
+/\<WHITE\>/				.3333 .3333 1
+/\<MH\>/				(metal halide)
+/\<clear HID\>/				(high pressure sodium)
+/\<HID\>/				(clear HID)