update parser

2 files changed, 59 insertions, 68 deletions

diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl
index 46daafd..54f0cb8 100644
--- a/ds9/library/lex.fcl
+++ b/ds9/library/lex.fcl
@@ -98,7 +98,7 @@ align  	    {return $::ALIGN_}
 all    	    {return $::ALL_}
 allcols	    {return $::ALLCOLS_}
 allrows	    {return $::ALLROWS_}
-amplifier   {return $::AMPLIFIER_}
+amplifier	    {return $::AMPLIFIER_}
 angle	    {return $::ANGLE_}
 append	    {return $::APPEND_}
 arrow	    {return $::ARROW_}
@@ -106,16 +106,16 @@ arcmin	    {return $::ARCMIN_}
 arcsec	    {return $::ARCSEC_}
 asinh	    {return $::ASINH_}	
 auto	    {return $::AUTO_}
-automatic   {return $::AUTOMATIC_}
+automatic	    {return $::AUTOMATIC_}
 average	    {return $::AVERAGE_}
 axes	    {return $::AXES_}
 axis	    {return $::AXIS_}
-azimuth	    {return $::AZIMUTH_}
-az	    {return $::AZ_}
+azimuth	    {return $::AZ_}
+az		    {return $::AZ_}
 b1950	    {return $::B1950_}
 back	    {return $::BACK_}
-background  {return $::BACKGROUND_}
-bg	    {return $::BACKGROUND_}
+background	    {return $::BG_}
+bg		    {return $::BG_}
 bgcolor	    {return $::BGCOLOR_}
 bin	    {return $::BIN_}
 block	    {return $::BLOCK_}
@@ -123,9 +123,9 @@ blue	    {return $::BLUE_}
 bold	    {return $::BOLD_}
 border	    {return $::BORDER_}
 box	    {return $::BOX_}
-boxcircle   {return $::BOXCIRCLE_}
-broadcast   {return $::BROADCAST_}
-buffersize  {return $::BUFFERSIZE_}
+boxcircle	    {return $::BOXCIRCLE_}
+broadcast	    {return $::BROADCAST_}
+buffersize	    {return $::BUFFERSIZE_}
 cancel	    {return $::CANCEL_}
 catalog	    {return $::CATALOG_}
 cds	    {return $::CDS_}
@@ -135,20 +135,20 @@ circle	    {return $::CIRCLE_}
 clear	    {return $::CLEAR_}
 close	    {return $::CLOSE_}
 color	    {return $::COLOR_}
-colorbar    {return $::COLORBAR_}
-colormap    {return $::COLORMAP_}
+colorbar	    {return $::COLORBAR_}
+colormap	    {return $::COLORMAP_}
 cols	    {return $::COLS_}
 column	    {return $::COLUMN_}
 colsz	    {return $::COLSZ_}
 compass	    {return $::COMPASS_}
-condition   {return $::CONDITION_}
-contrast    {return $::CONTRAST_}
+condition	    {return $::CONDITION_}
+contrast	    {return $::CONTRAST_}
 coord	    {return $::COORD_}
-coordinate  {return $::COORDINATE_}
+coordinate	    {return $::COORDINATE_}
 courier	    {return $::COURIER_}
 crop	    {return $::CROP_}
 cross	    {return $::CROSS_}
-crosshair   {return $::CROSSHAIR_}
+crosshair	    {return $::CROSSHAIR_}
 current	    {return $::CURRENT_}
 csv	    {return $::CSV_}
 datamin	    {return $::DATAMIN_}
@@ -157,14 +157,14 @@ dec	    {return $::DEC_}
 decr	    {return $::DECR_}
 delete	    {return $::DELETE_}
 depth	    {return $::DEPTH_}
-detector    {return $::DETECTOR_}
+detector	    {return $::DETECTOR_}
 degrees	    {return $::DEGREES_}
 diamond	    {return $::DIAMOND_}
-direction   {return $::DIRECTION_}
-ecliptic    {return $::ECLIPTIC_}
+direction	    {return $::DIRECTION_}
+ecliptic	    {return $::ECLIPTIC_}
 edit	    {return $::EDIT_}
-elevation   {return $::ELEVATION_}
-el	    {return $::EL_}
+elevation	    {return $::EL_}
+el		    {return $::EL_}
 ellipse	    {return $::ELLIPSE_}
 error	    {return $::ERROR_}
 examine	    {return $::EXAMINE_}
@@ -179,33 +179,33 @@ filter	    {return $::FILTER_}
 first	    {return $::FIRST_}
 fit	    {return $::FIT_}
 font	    {return $::FONT_}
-fontsize    {return $::FONTSIZE_}
-fontslant   {return $::FONTSLANT_}
-fontweight  {return $::FONTWEIGHT_}
+fontsize	    {return $::FONTSIZE_}
+fontslant	    {return $::FONTSLANT_}
+fontweight	    {return $::FONTWEIGHT_}
 format	    {return $::FORMAT_}
 forward	    {return $::FORWARD_}
 frame	    {return $::FRAME_}
 frameno	    {return $::FRAMENO_}
-function    {return $::FUNCTION_}
+function	    {return $::FUNCTION_}
 gap	    {return $::GAP_}
-galactic    {return $::GALACTIC_}
+galactic	    {return $::GALACTIC_}
 global	    {return $::GLOBAL_}
 green	    {return $::GREEN_}
 grid	    {return $::GRID_}
 header	    {return $::HEADER_}
-helvetica   {return $::HELVETICA_}
+helvetica	    {return $::HELVETICA_}
 hide	    {return $::HIDE_}
-highlite    {return $::HIGHLITE_}
+highlite	    {return $::HIGHLITE_}
 histequ	    {return $::HISTEQU_}
 icrs	    {return $::ICRS_}
 image	    {return $::IMAGE_}
 import	    {return $::IMPORT_}
-in	    {return $::IN_}
+in		    {return $::IN_}
 incr	    {return $::INCR_}
-interval    {return $::INTERVAL_}
+interval	    {return $::INTERVAL_}
 invert	    {return $::INVERT_}
 iraf	    {return $::IRAF_}
-irafalign   {return $::IRAFALIGN_}
+irafalign	    {return $::IRAFALIGN_}
 irafmin	    {return $::IRAFMIN_}
 italic	    {return $::ITALIC_}
 j2000	    {return $::J2000_}
@@ -216,7 +216,7 @@ linear	    {return $::LINEAR_}
 line	    {return $::LINE_}
 load	    {return $::LOAD_}
 local	    {return $::LOCAL_}
-location    {return $::LOCATION_}
+location	    {return $::LOCATION_}
 lock	    {return $::LOCK_}
 log	    {return $::LOG_}
 manual	    {return $::MANUAL_}
@@ -228,24 +228,24 @@ minmax	    {return $::MINMAX_}
 mip	    {return $::MIP_}
 mode	    {return $::MODE_}
 mosaic	    {return $::MOSAIC_}
-mosaicimage {return $::MOSAICIMAGE_}
+mosaicimage    {return $::MOSAICIMAGE_}
 move	    {return $::MOVE_}
-multiframe  {return $::MULTIFRAME_}
+multiframe	    {return $::MULTIFRAME_}
 name	    {return $::NAME_}
-nancolor    {return $::NANCOLOR_}
+nancolor	    {return $::NANCOLOR_}
 next	    {return $::NEXT_}
 new	    {return $::NEW_}
-no	    {return $::NO_}
+no		    {return $::NO_}
 none	    {return $::NONE_}
 normal	    {return $::NORMAL_}
 off	    {return $::OFF_}
-on	    {return $::ON_}
+on		    {return $::ON_}
 open	    {return $::OPEN_}
 order	    {return $::ORDER_}
 out	    {return $::OUT_}
 pan	    {return $::PAN_}
 panto	    {return $::PANTO_}
-physical    {return $::PHYSICAL_}
+physical	    {return $::PHYSICAL_}
 play	    {return $::PLAY_}
 plot	    {return $::PLOT_}
 point	    {return $::POINT_}
@@ -255,7 +255,7 @@ prev	    {return $::PREV_}
 print	    {return $::PRINT_}
 psky	    {return $::PSKY_}
 psystem	    {return $::PSYSTEM_}
-ra	    {return $::RA_}
+ra		    {return $::RA_}
 red	    {return $::RED_}
 region	    {return $::REGION_}
 regions	    {return $::REGIONS_}
@@ -263,38 +263,38 @@ refresh	    {return $::REFRESH_}
 replace	    {return $::REPLACE_}
 remove	    {return $::REMOVE_}
 reset	    {return $::RESET_}
-retrieve    {return $::RETRIEVE_}
+retrieve	    {return $::RETRIEVE_}
 return	    {return $::RETURN_}
 rgb	    {return $::RGB_}
 rgbcube	    {return $::RGBCUBE_}
-rgbimage    {return $::RGBIMAGE_}
+rgbimage	    {return $::RGBIMAGE_}
 romain	    {return $::ROMAN_}
 rotate	    {return $::ROTATE_}
 row	    {return $::ROW_}
 samp	    {return $::SAMP_}
 sample	    {return $::SAMPLE_}
 save	    {return $::SAVE_}
-sb	    {return $::SB_}
+sb		    {return $::SB_}
 scale	    {return $::SCALE_}
-scalelimits {return $::SCALELIMITS_}
+scalelimits    {return $::SCALELIMITS_}
 scan	    {return $::SCAN_}
 scope	    {return $::SCOPE_}
 send	    {return $::SEND_}
 server	    {return $::SERVER_}
-sexagesimal {return $::SEXAGESIMAL_}
+sexagesimal    {return $::SEXAGESIMAL_}
 shape	    {return $::SHAPE_}
 show	    {return $::SHOW_}
 sinh	    {return $::SINH_}
 size	    {return $::SIZE_}
 size2	    {return $::SIZE2_}
 sky	    {return $::SKY_}
-skyformat   {return $::SKYFORMAT_}
+skyformat	    {return $::SKYFORMAT_}
 slice	    {return $::SLICE_}
 smooth	    {return $::SMOOTH_}
 sort	    {return $::SORT_}
 squared	    {return $::SQUARED_}
 sqrt	    {return $::SQRT_}
-starbase    {return $::STARBASE_}
+starbase	    {return $::STARBASE_}
 stop	    {return $::STOP_}
 sum	    {return $::SUM_}
 survey	    {return $::SURVEY_}
@@ -304,7 +304,7 @@ tag	    {return $::TAG_}
 text	    {return $::TEXT_}
 times	    {return $::TIMES_}
 threads	    {return $::THREADS_}
-to	    {return $::TO_}
+to		    {return $::TO_}
 true	    {return $::TRUE_}
 tsv	    {return $::TSV_}
 unique	    {return $::UNIQUE_}
@@ -343,10 +343,8 @@ wcsx	    {return $::WCSX_}
 wcsy	    {return $::WCSY_}
 wcsz	    {return $::WCSZ_}
 wfpc2	    {return $::WFP2_}
-x	    {return $::X_}
 xml	    {return $::XML_}
-xy	    {return $::XY_}
-y	    {return $::Y_}
+xy		    {return $::XY_}
 yes	    {return $::YES_}
 zmax	    {return $::ZMAX_}
 zoom	    {return $::ZOOM_}
diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac
index fe18993..cd4f832 100644
--- a/ds9/library/parser.tac
+++ b/ds9/library/parser.tac
@@ -117,10 +117,9 @@ set cvarname {}
 %token AXES_
 %token AXIS_
 %token AZ_
-%token AZIMUTH_
 %token B1950_
 %token BACK_
-%token BACKGROUND_
+%token BG_
 %token BGCOLOR_
 %token BIN_
 %token BLOCK_
@@ -169,7 +168,6 @@ set cvarname {}
 %token ECLIPTIC_
 %token EDIT_
 %token EL_
-%token ELEVATION_
 %token ELLIPSE_
 %token ERROR_
 %token EXAMINE_
@@ -348,10 +346,8 @@ set cvarname {}
 %token WCSY_
 %token WCSZ_
 %token WFPC2_
-%token X_
 %token XML_
 %token XY_
-%token Y_
 %token YES_
 %token ZMAX_
 %token ZOOM_
@@ -604,12 +600,10 @@ mosaicType : IRAF_ {set _ iraf}
  | VIEW_ 3dView
  | VP_ 3dView
  | AZ_ numeric {global threed; set threed(az) $2; 3DViewPoint}
- | AZIMUTH_ numeric {global threed; set threed(az) $2; 3DViewPoint}
  | EL_ numeric {global threed; set threed(el) $2; 3DViewPoint}
- | ELEVATION_ numeric {global threed; set threed(el) $2; 3DViewPoint}
  | SCALE_ numeric {global threed; set threed(scale) $2; 3DScale}
  | METHOD_ 3dMethod {global threed; set threed(method) $2; 3DRenderMethod}
- | BACKGROUND_ 3dBackground {global threed; set threed(background) $2; 3DBackground}
+ | BG_ 3dBackground {global threed; set threed(background) $2; 3DBackground}
  | BORDER_ 3dBorder
  | HIGHLITE_ 3dHighlite
  | COMPASS_ 3dCompass
@@ -625,8 +619,8 @@ mosaicType : IRAF_ {set _ iraf}
  ;
 
 3dBackground : NONE_ {set _ none}
- | AZIMUTH_ {set _ azimuth}
- | ELEVATION_ {set _ elevation}
+ | AZ_ {set _ azimuth}
+ | EL_ {set _ elevation}
  ;
 
 3dHighlite : yesno {global threed; set threed(highlite) $1; 3DHighlite}
@@ -730,8 +724,7 @@ catLoadReader : XML_ {set _ VOTRead}
  | TSV_ {set _ TSVRead}
  ;
 
-cat :
- | ALLCOLS_ {global cvarname; global $cvarname; set ${cvarname}(allcols) 1}
+cat : ALLCOLS_ {global cvarname; global $cvarname; set ${cvarname}(allcols) 1}
  | ALLROWS_ {global cvarname; global $cvarname; set ${cvarname}(allrows) 1}
  | CANCEL_ {global cvarname; ARCancel $cvarname}
  | CLEAR_ {global cvarname; CATOff $cvarname}
@@ -766,9 +759,9 @@ cat :
  | SYMBOL_ int {global cvarname; global $cvarname; set ${cvarname}(row) $2} catSymbol
  | SYSTEM_ wcssys {global cvarname; global $cvarname; set ${cvarname}(system) $1; CoordMenuButtonCmd $cvarname system sky [list CATWCSMenuUpdate $cvarname]}
  | UPDATE_ {global cvarname; CATUpdate $cvarname}
- | X_ STRING_ {global cvarname; global $cvarname; set ${cvarname}(colx) $2; CATGenerate $cvarname}
+ | 'x' STRING_ {global cvarname; global $cvarname; set ${cvarname}(colx) $2; CATGenerate $cvarname}
  | RA_ STRING_ {global cvarname; global $cvarname; set ${cvarname}(colx) $2; CATGenerate $cvarname}
- | Y_ STRING_ {global cvarname; global $cvarname; set ${cvarname}(coly) $2; CATGenerate $cvarname}
+ | 'y' STRING_ {global cvarname; global $cvarname; set ${cvarname}(coly) $2; CATGenerate $cvarname}
  | DEC_ STRING_ {global cvarname; global $cvarname; set ${cvarname}(coly) $2; CATGenerate $cvarname}
  ;
 
@@ -847,7 +840,7 @@ catSymbolShape : POINT_ {set _ "circle point"}
  | BOX_ POINT_ {set _ "box point"}
  | DIAMOND_ POINT_ {set _ "diamond point"}
  | CROSS_ POINT_ {set _ "cross point"}
- | X_ POINT_ {set _ "x point"}
+ | 'x' POINT_ {set _ "x point"}
  | ARROW_ POINT_ {set _ "arrow point"}
  | BOXCIRCLE_ POINT_ {set _ "boxcircle point"}
  | CIRCLE_ {set _ circle}
@@ -1083,8 +1076,8 @@ orient : orientation {global current; set current(orient) $1; ChangeOrient}
  ;
 
 orientation : NONE_ {set _ none}
- | X_ {set _ x}
- | Y_ {set _ y}
+ | 'x' {set _ x}
+ | 'y' {set _ y}
  | XY_ {set _ xy}
  ;
 
@@ -1282,8 +1275,8 @@ tileGridMode : AUTOMATIC_ {set _ automatic}
  | MANUAL_ {set _ manual}
  ;
 
-tileGridDir : X_ {set _ x}
- | Y_ {set _ y}
+tileGridDir : 'x' {set _ x}
+ | 'y' {set _ y}
  ;
 
 wcs : OPEN_ {WCSDialog}