10 files changed, 21 insertions, 21 deletions

diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl
index 21262da..a962e74 100644
--- a/ds9/library/imgsvr.tcl
+++ b/ds9/library/imgsvr.tcl
@@ -575,12 +575,12 @@ proc IMGSVRCmd {varname which value} {
     set var($which) $value
 }
 
-proc IMGSVRCmdName {varname name} {
+proc IMGSVRCmdName {varname value} {
     upvar #0 $varname var
     global $varname
 
-    set var(name) $name
-    if {$name != {}} {
+    set var(name) $value
+    if {$var(name) != {}} {
 	IMGSVRApply $varname 1
     }
 }
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index 99620b0..fbf7122 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -26,8 +26,8 @@ command : dsseso
 dsseso : {IMGSVRApply deso 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy deso}
- | STRING_ {IMGSVRCmd deso name $1}
- | NAME_ STRING_ {IMGSVRCmd deso name $2}
+ | 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}
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index a620fbe..ab87731 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -21,8 +21,8 @@ command : dsssao
 dsssao : {IMGSVRApply dsao 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dsao}
- | STRING_ {IMGSVRCmd dsao name $1}
- | NAME_ STRING_ {IMGSVRCmd dsao name $2}
+ | 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}
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index 030c01b..f46cf76 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -31,8 +31,8 @@ command : dssstsci
 dssstsci : {IMGSVRApply dstsci 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dstsci}
- | STRING_ {IMGSVRCmd dstsci name $1}
- | NAME_ STRING_ {IMGSVRCmd dstsci name $2}
+ | 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}
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index fe2bdf3..4a7839c 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -21,8 +21,8 @@ command : nvss
 nvss : {IMGSVRApply dnvss 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dnvss}
- | STRING_ {IMGSVRCmd dnvss name $1}
- | NAME_ STRING_ {IMGSVRCmd dnvss name $2}
+ | 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}
diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac
index 98874dd..9131293 100644
--- a/ds9/parsers/plotparser.tac
+++ b/ds9/parsers/plotparser.tac
@@ -337,8 +337,8 @@ fontType : TITLE_ {set _ graph,title}
  | NUMBERS_ {set _ axis,numbers}
  # backward compatibility
  | AXESNUMBERS_ {set _ axis,numbers}
- | LEGEND_ {set _ legend,font; puts a}
- | LEGENDTITLE_ {set _ legend,title; puts b}
+ | LEGEND_ {set _ legend,font}
+ | LEGENDTITLE_ {set _ legend,title}
  ;
 
 title : STRING_ {PlotCmdUpdateGraph graph,title $1}
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index 40aa835..60fc5a2 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -23,8 +23,8 @@ command : skyview
 skyview : {IMGSVRApply dskyview 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dskyview}
- | STRING_ {IMGSVRCmd dskyview name $1}
- | NAME_ STRING_ {IMGSVRCmd dskyview name $2}
+ | 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}
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index 069d013..7ab17e1 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -21,8 +21,8 @@ command : 2mass
 2mass : {IMGSVRApply dtwomass 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dtwomass}
- | STRING_ {IMGSVRCmd dtwomass name $1}
- | NAME_ STRING_ {IMGSVRCmd dtwomass name $2}
+ | 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}
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index fcb5dbf..e8fa127 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -24,8 +24,8 @@ command : vla
 vla : {IMGSVRApply dvla 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dvla}
- | STRING_ {IMGSVRCmd dvla name $1}
- | NAME_ STRING_ {IMGSVRCmd dvla name $2}
+ | 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}
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index e4105ab..fbec5a1 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -21,8 +21,8 @@ command : vlss
 vlss : {IMGSVRApply dvlss 1}
  | OPEN_ {}
  | CLOSE_ {ARDestroy dvlss}
- | STRING_ {IMGSVRCmd dvlss name $1}
- | NAME_ STRING_ {IMGSVRCmd dvlss name $2}
+ | 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}