summaryrefslogtreecommitdiffstats
path: root/ds9/parsers
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-09-24 20:14:22 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-09-24 20:14:22 (GMT)
commita7e6c895772b9f06c10c29946cf34560a5671e03 (patch)
tree06616a780396e360527b7a329a94715670f41ca3 /ds9/parsers
parentddf4f1207d7a299ba642f5226b90e168fa0628b4 (diff)
downloadblt-a7e6c895772b9f06c10c29946cf34560a5671e03.zip
blt-a7e6c895772b9f06c10c29946cf34560a5671e03.tar.gz
blt-a7e6c895772b9f06c10c29946cf34560a5671e03.tar.bz2
PAN: tweak pan parser for backward compatibility
Diffstat (limited to 'ds9/parsers')
-rw-r--r--ds9/parsers/panlex.fcl1
-rw-r--r--ds9/parsers/panparser.tac17
2 files changed, 18 insertions, 0 deletions
diff --git a/ds9/parsers/panlex.fcl b/ds9/parsers/panlex.fcl
index c421217..b569c11 100644
--- a/ds9/parsers/panlex.fcl
+++ b/ds9/parsers/panlex.fcl
@@ -14,6 +14,7 @@ to {return $TO_}
#include coordsys.fin
#include wcssys.fin
#include skyframe.fin
+#include skyformat.fin
#include numeric.fin
#include sexstr.fin
#include string.fin
diff --git a/ds9/parsers/panparser.tac b/ds9/parsers/panparser.tac
index 7d6c812..460b679 100644
--- a/ds9/parsers/panparser.tac
+++ b/ds9/parsers/panparser.tac
@@ -5,6 +5,7 @@
#include coordsys.tin
#include wcssys.tin
#include skyframe.tin
+#include skyformat.tin
#include numeric.tin
#include sexstr.tin
#include string.tin
@@ -38,6 +39,14 @@ pan : OPEN_ {PanZoomDialog}
| SEXSTR_ SEXSTR_ wcssys {Pan $1 $2 $3 fk5}
| SEXSTR_ SEXSTR_ skyframe {Pan $1 $2 wcs $3}
| SEXSTR_ SEXSTR_ wcssys skyframe {Pan $1 $2 $3 $4}
+# backward compatibility
+ | numeric numeric wcssys DEGREES_ {Pan $1 $2 $3 fk5}
+ | numeric numeric skyframe DEGREES_ {Pan $1 $2 wcs $3}
+ | numeric numeric wcssys skyframe DEGREES_ {Pan $1 $2 $3 $4}
+ | SEXSTR_ SEXSTR_ SEXAGESIMAL_ {Pan $1 $2 wcs fk5}
+ | SEXSTR_ SEXSTR_ wcssys SEXAGESIMAL_ {Pan $1 $2 $3 fk5}
+ | SEXSTR_ SEXSTR_ skyframe SEXAGESIMAL_ {Pan $1 $2 wcs $3}
+ | SEXSTR_ SEXSTR_ wcssys skyframe SEXAGESIMAL_ {Pan $1 $2 $3 $4}
;
panto : numeric numeric {PanTo $1 $2 physical fk5}
@@ -49,6 +58,14 @@ panto : numeric numeric {PanTo $1 $2 physical fk5}
| SEXSTR_ SEXSTR_ wcssys {PanTo $1 $2 $3 fk5}
| SEXSTR_ SEXSTR_ skyframe {PanTo $1 $2 wcs $3}
| SEXSTR_ SEXSTR_ wcssys skyframe {PanTo $1 $2 $3 $4}
+# backward compatibility
+ | numeric numeric wcssys DEGREES_ {PanTo $1 $2 $3 fk5}
+ | numeric numeric skyframe DEGREES_ {PanTo $1 $2 wcs $3}
+ | numeric numeric wcssys skyframe DEGREES_ {PanTo $1 $2 $3 $4}
+ | SEXSTR_ SEXSTR_ SEXAGESIMAL_ {PanTo $1 $2 wcs fk5}
+ | SEXSTR_ SEXSTR_ wcssys SEXAGESIMAL_ {PanTo $1 $2 $3 fk5}
+ | SEXSTR_ SEXSTR_ skyframe SEXAGESIMAL_ {PanTo $1 $2 wcs $3}
+ | SEXSTR_ SEXSTR_ wcssys skyframe SEXAGESIMAL_ {PanTo $1 $2 $3 $4}
;
%%