10 files changed, 104 insertions, 78 deletions
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index 9a830f1..810990f 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -28,18 +28,21 @@ command : dsseso
 dsseso : {IMGSVRApply deso 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy deso}
- | STRING_ {IMGSVRCmdName deso $1}
- | NAME_ STRING_ {IMGSVRCmdName deso $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize deso $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd deso save $2}
- | FRAME_ frame {IMGSVRCmd deso mode $2}
- | SURVEY_ survey {IMGSVRCmd deso survey $2}
+ | STRING_ {ProcessCmdSet deso name $1 "IMGSVRApply deso 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet deso name {}}
+ | NAME_ STRING_ {ProcessCmdSet deso name $2 "IMGSVRApply deso 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 deso width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet deso save $2}
+ | FRAME_ frame {ProcessCmdSet deso mode $2}
+ | SURVEY_ survey {ProcessCmdSet deso survey $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord deso $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord deso $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord deso $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord deso $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 deso x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply deso 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 deso x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply deso 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 deso x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply deso 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 deso x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply deso 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate deso}
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index 5a60544..52bb769 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -23,17 +23,20 @@ command : dsssao
 dsssao : {IMGSVRApply dsao 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dsao}
- | STRING_ {IMGSVRCmdName dsao $1}
- | NAME_ STRING_ {IMGSVRCmdName dsao $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dsao $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dsao save $2}
- | FRAME_ frame {IMGSVRCmd dsao mode $2}
+ | STRING_ {ProcessCmdSet dsao name $1 "IMGSVRApply dsao 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dsao name {}}
+ | NAME_ STRING_ {ProcessCmdSet dsao name $2 "IMGSVRApply dsao 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dsao width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dsao save $2}
+ | FRAME_ frame {ProcessCmdSet dsao mode $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dsao $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dsao $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dsao $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dsao $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dsao x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dsao 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dsao x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dsao 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dsao x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dsao 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dsao x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dsao 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dsao}
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index 6e8467f..53b853b 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -33,18 +33,21 @@ command : dssstsci
 dssstsci : {IMGSVRApply dstsci 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dstsci}
- | STRING_ {IMGSVRCmdName dstsci $1}
- | NAME_ STRING_ {IMGSVRCmdName dstsci $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dstsci $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dstsci save $2}
- | FRAME_ frame {IMGSVRCmd dstsci mode $2}
- | SURVEY_ survey {IMGSVRCmd dstsci survey $2}
+ | STRING_ {ProcessCmdSet dstsci name $1 "IMGSVRApply dstsci 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dstsci name {}}
+ | NAME_ STRING_ {ProcessCmdSet dstsci name $2 "IMGSVRApply dstsci 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dstsci width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dstsci save $2}
+ | FRAME_ frame {ProcessCmdSet dstsci mode $2}
+ | SURVEY_ survey {ProcessCmdSet dstsci survey $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dstsci $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dstsci $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dstsci $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dstsci $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dstsci x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dstsci 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dstsci x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dstsci 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dstsci x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dstsci 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dstsci x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dstsci 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dstsci}
diff --git a/ds9/parsers/imgsvr.fin b/ds9/parsers/imgsvr.fin
index 553edc5..4fc50c4 100644
--- a/ds9/parsers/imgsvr.fin
+++ b/ds9/parsers/imgsvr.fin
@@ -1,3 +1,4 @@
+clear	    {return $CLEAR_}
 close	    {return $CLOSE_}
 coord	    {return $COORD_}
 crosshair   {return $CROSSHAIR_}
diff --git a/ds9/parsers/imgsvr.tin b/ds9/parsers/imgsvr.tin
index 5b8546d..030433d 100644
--- a/ds9/parsers/imgsvr.tin
+++ b/ds9/parsers/imgsvr.tin
@@ -1,3 +1,4 @@
+%token CLEAR_
 %token CLOSE_
 %token COORD_
 %token CROSSHAIR_
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index 7230380..a175acf 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -23,17 +23,20 @@ command : nvss
 nvss : {IMGSVRApply dnvss 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dnvss}
- | STRING_ {IMGSVRCmdName dnvss $1}
- | NAME_ STRING_ {IMGSVRCmdName dnvss $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dnvss $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dnvss save $2}
- | FRAME_ frame {IMGSVRCmd dnvss mode $2}
+ | STRING_ {ProcessCmdSet dnvss name $1 "IMGSVRApply dnvss 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dnvss name {}}
+ | NAME_ STRING_ {ProcessCmdSet dnvss name $2 "IMGSVRApply dnvss 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dnvss width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dnvss save $2}
+ | FRAME_ frame {ProcessCmdSet dnvss mode $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dnvss $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dnvss $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dnvss $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dnvss $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dnvss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dnvss 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dnvss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dnvss 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dnvss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dnvss 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dnvss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dnvss 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dnvss}
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index e44ffe2..fecc723 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -25,19 +25,22 @@ command : skyview
 skyview : {IMGSVRApply dskyview 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dskyview}
- | STRING_ {IMGSVRCmdName dskyview $1}
- | NAME_ STRING_ {IMGSVRCmdName dskyview $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dskyview $2 $3 $4}
- | PIXELS_ numeric numeric {IMGSVRCmdPixels dskyview $2 $3}
- | SAVE_ yesno {IMGSVRCmd dskyview save $2}
- | FRAME_ frame {IMGSVRCmd dskyview mode $2}
- | SURVEY_ STRING_ {IMGSVRCmd dskyview survey $2}
+ | STRING_ {ProcessCmdSet dskyview name $1 "IMGSVRApply dskyview 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dskyview name {}}
+ | NAME_ STRING_ {ProcessCmdSet dskyview name $2 "IMGSVRApply dskyview 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dskyview width $2 height $3 rformat $4 rformat,msg $4}
+ | PIXELS_ numeric numeric {ProcessCmdSet2 dskyview width,pixels $2 height,pixels $3}
+ | SAVE_ yesno {ProcessCmdSet dskyview save $2}
+ | FRAME_ frame {ProcessCmdSet dskyview mode $2}
+ | SURVEY_ STRING_ {ProcessCmdSet dskyview survey $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dskyview $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dskyview $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dskyview $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dskyview $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dskyview x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dskyview 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dskyview x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dskyview 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dskyview x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dskyview 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dskyview x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dskyview 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dskyview}
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index ce02100..5eb6e9d 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -23,18 +23,21 @@ command : twomass
 twomass : {IMGSVRApply dtwomass 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dtwomass}
- | STRING_ {IMGSVRCmdName dtwomass $1}
- | NAME_ STRING_ {IMGSVRCmdName dtwomass $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dtwomass $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dtwomass save $2}
- | FRAME_ frame {IMGSVRCmd dtwomass mode $2}
- | SURVEY_ survey {IMGSVRCmd dtwomass survey $2}
+ | STRING_ {ProcessCmdSet dtwomass name $1 "IMGSVRApply dtwomass 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dtwomass name {}}
+ | NAME_ STRING_ {ProcessCmdSet dtwomass name $2 "IMGSVRApply dtwomass 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dtwomass width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dtwomass save $2}
+ | FRAME_ frame {ProcessCmdSet dtwomass mode $2}
+ | SURVEY_ survey {ProcessCmdSet dtwomass survey $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dtwomass $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dtwomass $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dtwomass $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dtwomass $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dtwomass x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dtwomass 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dtwomass x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dtwomass 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dtwomass x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dtwomass 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dtwomass x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dtwomass 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dtwomass}
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index 3add524..3591f24 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -26,18 +26,21 @@ command : vla
 vla : {IMGSVRApply dvla 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dvla}
- | STRING_ {IMGSVRCmdName dvla $1}
- | NAME_ STRING_ {IMGSVRCmdName dvla $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvla $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dvla save $2}
- | FRAME_ frame {IMGSVRCmd dvla mode $2}
- | SURVEY_ survey {IMGSVRCmd dvla survey $2}
+ | STRING_ {ProcessCmdSet dvla name $1 "IMGSVRApply dvla 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dvla name {}}
+ | NAME_ STRING_ {ProcessCmdSet dvla name $2 "IMGSVRApply dvla 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dvla width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dvla save $2}
+ | FRAME_ frame {ProcessCmdSet dvla mode $2}
+ | SURVEY_ survey {ProcessCmdSet dvla survey $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dvla $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvla $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dvla $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvla $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dvla x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvla 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvla x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvla 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dvla x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvla 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvla x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvla 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dvla}
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index 55708fc..43efc1f 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -23,17 +23,20 @@ command : vlss
 vlss : {IMGSVRApply dvlss 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dvlss}
- | STRING_ {IMGSVRCmdName dvlss $1}
- | NAME_ STRING_ {IMGSVRCmdName dvlss $2}
- | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvlss $2 $3 $4}
- | SAVE_ yesno {IMGSVRCmd dvlss save $2}
- | FRAME_ frame {IMGSVRCmd dvlss mode $2}
+ | STRING_ {ProcessCmdSet dvlss name $1 "IMGSVRApply dvlss 1"}
+ | NAME_ CLEAR_ {ProcessCmdSet dvlss name {}}
+ | NAME_ STRING_ {ProcessCmdSet dvlss name $2 "IMGSVRApply dvlss 1"}
+ | SIZE_ numeric numeric sizeOpt
+   {ProcessCmdSet4 dvlss width $2 height $3 rformat $4 rformat,msg $4}
+ | SAVE_ yesno {ProcessCmdSet dvlss save $2}
+ | FRAME_ frame {ProcessCmdSet dvlss mode $2}
  | UPDATE_ update
 
- | numeric numeric coordOpt {IMGSVRCmdCoord dvlss $1 $2 degrees}
- | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvlss $1 $2 sexagesimal}
- | COORD_ numeric numeric deg {IMGSVRCmdCoord dvlss $2 $3 $4}
- | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvlss $2 $3 $4}
+ | numeric numeric deg {ProcessCmdSet4 dvlss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvlss 1"}
+ | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvlss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvlss 1"}
+ # backward compatibility
+ | COORD_ numeric numeric deg {ProcessCmdSet4 dvlss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvlss 1"}
+ | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvlss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvlss 1"}
  ;
 
 update : FRAME_ {IMGSVRCmdUpdate dvlss}