update ds9 parsers

3 files changed, 22 insertions, 10 deletions

diff --git a/ds9/library/crop.tcl b/ds9/library/crop.tcl
index faf686c..34348c6 100644
--- a/ds9/library/crop.tcl
+++ b/ds9/library/crop.tcl
@@ -410,8 +410,7 @@ proc ProcessCropCmd {varname iname} {
 	}
 	lock {
 	    incr i
-	    set crop(lock) [lindex $var $i]
-	    LockCropCurrent
+	    CropCmdLock [lindex $var $i]
 	}
 	open {CropDialog}
 	close {CropDestroyDialog}
@@ -442,7 +441,14 @@ proc ProcessCropCmd {varname iname} {
 	    $current(frame) crop center $x $y $sys $sky $w $h $sys $dformat
 	}
     }
-    }
+}
+}
+
+proc CropCmdLock {sys} {
+    global crop
+
+    set crop(lock) sys
+    LockCropCurrent
 }
 
 proc ProcessSendCropCmd {proc id param} {
diff --git a/ds9/library/crosshair.tcl b/ds9/library/crosshair.tcl
index e737940..6b76b04 100644
--- a/ds9/library/crosshair.tcl
+++ b/ds9/library/crosshair.tcl
@@ -278,8 +278,7 @@ proc ProcessCrosshairCmd {varname iname} {
 	}
 	lock {
 	    incr i
-	    set crosshair(lock) [lindex $var $i]
-	    LockCrosshairCurrent
+	    CrosshairCmdLock [lindex $var $i]
 	}
 	default {
 	    set x [lindex $var [expr $i+0]]
@@ -299,6 +298,7 @@ proc ProcessCrosshairCmd {varname iname} {
 
 proc CrosshairCmdLock {sys} {
     global crosshair
+
     set crosshair(lock) $sys
     LockCrosshairCurrent
 }
diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac
index bf5026b..366f26c 100644
--- a/ds9/parsers/cropparser.tac
+++ b/ds9/parsers/cropparser.tac
@@ -30,11 +30,8 @@ command : crop
 
 crop : OPEN_ {CropDialog}
  | CLOSE_ {CropDestroyDialog}
- | MATCH_ coordsys
- | MATCH_ wcssys
- | LOCK_ coordsys
- | LOCK_ wcssys
- | LOCK_ NONE_
+ | MATCH_ match {MatchCropCurrent $2}
+ | LOCK_ lock {CropCmdLock $2}
  | RESET_ {CropReset}
  | 3D_ 3d
 
@@ -57,6 +54,15 @@ crop : OPEN_ {CropDialog}
  | SEXSTR_ SEXSTR_ numeric numeric wcssys skyframe skyformat {global current; $current(frame) crop center $1 $2 $5 $6 $3 $4 $5 $7}
  ;
 
+match : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ ;
+
+lock : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ | NONE_ {set _ none}
+ ;
+
 3d : numeric numeric {global current; $current(frame) crop 3d $1 $2 image}
  | numeric numeric coordsys {global current; $current(frame) crop 3d $1 $2 $3}
  | numeric numeric wcssys {global current; $current(frame) crop 3d $1 $2 $3}