add support for MacOS darkmode

53 files changed, 1322 insertions, 1319 deletions

diff --git a/tksao/colorbar/cbgrid.C b/tksao/colorbar/cbgrid.C
index bbf1b64..6e206ce 100644
--- a/tksao/colorbar/cbgrid.C
+++ b/tksao/colorbar/cbgrid.C
@@ -78,7 +78,7 @@ int CBGrid::render()
   return doit(X11);
 }
 
-int CBGrid::ps(Widget::PSColorSpace mode, int x, int y)
+int CBGrid::ps(PSColorSpace mode, int x, int y)
 {
   matrix_ =  Translate(x,y);
   mode_ = mode;
diff --git a/tksao/colorbar/cbgrid.h b/tksao/colorbar/cbgrid.h
index 57fe867..8a935bc 100644
--- a/tksao/colorbar/cbgrid.h
+++ b/tksao/colorbar/cbgrid.h
@@ -9,7 +9,7 @@
 
 #include "grid2dbase.h"
 #include "vector.h"
-#include "widget.h"
+#include "util.h"
 
 class CBGrid : public Grid2dBase {
  private:
@@ -22,7 +22,7 @@ class CBGrid : public Grid2dBase {
   CBGrid(Widget*, int, double*);
 
   int render();
-  int ps(Widget::PSColorSpace, int, int);
+  int ps(PSColorSpace, int, int);
 #ifdef MAC_OSX_TK
   int macosx(int, int);
 #endif
diff --git a/tksao/colorbar/parser.C b/tksao/colorbar/parser.C
index deb2241..73ec7f2 100644
--- a/tksao/colorbar/parser.C
+++ b/tksao/colorbar/parser.C
@@ -1897,7 +1897,7 @@ yyreduce:
 
   case 76:
 #line 210 "colorbar/parser.Y"
-    {cb->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;}
+    {cb->psColorSpaceCmd((PSColorSpace)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 77:
@@ -1912,22 +1912,22 @@ yyreduce:
 
   case 79:
 #line 215 "colorbar/parser.Y"
-    {(yyval.integer) = Widget::BW;;}
+    {(yyval.integer) = BW;;}
     break;
 
   case 80:
 #line 216 "colorbar/parser.Y"
-    {(yyval.integer) = Widget::GRAY;;}
+    {(yyval.integer) = GRAY;;}
     break;
 
   case 81:
 #line 217 "colorbar/parser.Y"
-    {(yyval.integer) = Widget::RGB;;}
+    {(yyval.integer) = RGB;;}
     break;
 
   case 82:
 #line 218 "colorbar/parser.Y"
-    {(yyval.integer) = Widget::CMYK;;}
+    {(yyval.integer) = CMYK;;}
     break;
 
   case 85:
diff --git a/tksao/colorbar/parser.Y b/tksao/colorbar/parser.Y
index 117d324..c268f41 100644
--- a/tksao/colorbar/parser.Y
+++ b/tksao/colorbar/parser.Y
@@ -207,15 +207,15 @@ map	: STRING {cb->mapCmd($1);}
 	;
 
 postscript : COLORSPACE_ pscolorspace 
-	  {cb->psColorSpaceCmd((Widget::PSColorSpace)$2);}
+        {cb->psColorSpaceCmd((PSColorSpace)$2);}
 	| LEVEL_ INT {cb->psLevelCmd($2);}
 	| RESOLUTION_ INT {cb->psResolutionCmd($2);}
 	;
 
-pscolorspace : BW_ {$$ = Widget::BW;}
-	| GRAY_ {$$ = Widget::GRAY;}
-	| RGB_ {$$ = Widget::RGB;}
-	| CMYK_ {$$ = Widget::CMYK;}
+pscolorspace : BW_ {$$ = BW;}
+	| GRAY_ {$$ = GRAY;}
+	| RGB_ {$$ = RGB;}
+	| CMYK_ {$$ = CMYK;}
 	;
 
 tag	: DELETE_ tagdelete
diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index 6ff3baf..15fb4c3 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -426,7 +426,7 @@ public:
   void psCrosshair(PSColorSpace);
   virtual void psGraphics(PSColorSpace) {}
   void psImage(ostream&, Filter&, int, int, float);
-  void psMarkers(List<Marker>*, Widget::PSColorSpace);
+  void psMarkers(List<Marker>*, PSColorSpace);
   Matrix psMatrix(float scale, int width, int height);
   void pushMatrices(FitsImage*, Matrix&);
   void pushMagnifierMatrices(FitsImage*);
diff --git a/tksao/frame/basebox.C b/tksao/frame/basebox.C
index b3eebb1..3e51de3 100644
--- a/tksao/frame/basebox.C
+++ b/tksao/frame/basebox.C
@@ -62,7 +62,7 @@ void BaseBox::renderXDraw(Drawable drawable, GC lgc, XPoint* pp,
   XDrawLines(display, drawable, lgc, pp, numPoints_, CoordModeOrigin);
 }
 
-void BaseBox::renderPS(Widget::PSColorSpace mode)
+void BaseBox::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
diff --git a/tksao/frame/basebox.h b/tksao/frame/basebox.h
index e7c2d56..9d04205 100644
--- a/tksao/frame/basebox.h
+++ b/tksao/frame/basebox.h
@@ -29,7 +29,7 @@ protected:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
   virtual void renderXDraw(Drawable, GC, XPoint*, RenderMode);
 
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
   virtual void renderPSDraw(int);
   void renderPSFillDraw(int);
 
diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C
index 6a9d25e..8de3b41 100644
--- a/tksao/frame/baseellipse.C
+++ b/tksao/frame/baseellipse.C
@@ -384,7 +384,7 @@ void BaseEllipse::renderXInclude(Drawable drawable,
 
 // renderPS
 
-void BaseEllipse::renderPS(Widget::PSColorSpace mode) {
+void BaseEllipse::renderPS(PSColorSpace mode) {
   Vector r = annuli_[numAnnuli_-1];
   Vector z = parent->zoom();
 
@@ -413,7 +413,7 @@ void BaseEllipse::renderPSFill()
   Tcl_AppendResult(parent->interp, str.str().c_str(), NULL);
 }
 
-void BaseEllipse::renderPSCircle(Widget::PSColorSpace mode)
+void BaseEllipse::renderPSCircle(PSColorSpace mode)
 {
   renderPSGC(mode);
 
@@ -457,7 +457,7 @@ void BaseEllipse::renderPSCircle(Widget::PSColorSpace mode)
   }
 }
 
-void BaseEllipse::renderPSEllipse(Widget::PSColorSpace mode)
+void BaseEllipse::renderPSEllipse(PSColorSpace mode)
 {
   renderPSGC(mode);
 
@@ -547,7 +547,7 @@ void BaseEllipse::renderPSEllipseArc(double a1, double a2, Vector& rr)
   Tcl_AppendResult(parent->interp, str.str().c_str(), NULL);
 }
 
-void BaseEllipse::renderPSInclude(Widget::PSColorSpace mode)
+void BaseEllipse::renderPSInclude(PSColorSpace mode)
 {
   if (!(properties & INCLUDE)) {
     double theta = degToRad(45);
diff --git a/tksao/frame/baseellipse.h b/tksao/frame/baseellipse.h
index 2ebd46a..29287d4 100644
--- a/tksao/frame/baseellipse.h
+++ b/tksao/frame/baseellipse.h
@@ -28,11 +28,11 @@ class BaseEllipse : public BaseMarker {
 			 double, double, Vector&);
   void renderXInclude(Drawable, Coord::InternalSystem, RenderMode);
 
-  void renderPSCircle(Widget::PSColorSpace);
-  void renderPSEllipse(Widget::PSColorSpace);
+  void renderPSCircle(PSColorSpace);
+  void renderPSEllipse(PSColorSpace);
   void renderPSEllipsePrep(double, double, double, double, Vector&);
   void renderPSEllipseArc(double, double, Vector&);
-  void renderPSInclude(Widget::PSColorSpace);
+  void renderPSInclude(PSColorSpace);
 
 #ifdef MAC_OSX_TK
   void renderMACOSXCircle();
@@ -57,7 +57,7 @@ class BaseEllipse : public BaseMarker {
   virtual void renderXBezierDraw(Drawable, GC, RenderMode);
   void renderXBezierDashDraw(Drawable, GC);
 
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
   virtual void renderPSDraw();
   void renderPSFill();
 
diff --git a/tksao/frame/baseline.h b/tksao/frame/baseline.h
index ac69bf5..8f9bd58 100644
--- a/tksao/frame/baseline.h
+++ b/tksao/frame/baseline.h
@@ -14,7 +14,7 @@ protected:
 
   void renderXInclude(Drawable, Coord::InternalSystem, RenderMode) {}
 
-  void renderPSInclude(Widget::PSColorSpace) {}
+  void renderPSInclude(PSColorSpace) {}
 
 #ifdef MAC_OSX_TK
   void renderMACOSXInclude() {}
diff --git a/tksao/frame/basepolygon.h b/tksao/frame/basepolygon.h
index 9200523..9702f61 100644
--- a/tksao/frame/basepolygon.h
+++ b/tksao/frame/basepolygon.h
@@ -14,7 +14,7 @@ class BasePolygon : public Marker {
 
  protected:
   virtual void renderX(Drawable, Coord::InternalSystem, RenderMode) =0;
-  virtual void renderPS(Widget::PSColorSpace) =0;
+  virtual void renderPS(PSColorSpace) =0;
 #ifdef MAC_OSX_TK
   virtual void renderMACOSX() =0;
 #endif
diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C
index 9828193..c8bdf21 100644
--- a/tksao/frame/bpanda.C
+++ b/tksao/frame/bpanda.C
@@ -95,7 +95,7 @@ void Bpanda::renderX(Drawable drawable, Coord::InternalSystem sys,
   }
 }
 
-void Bpanda::renderPS(Widget::PSColorSpace mode)
+void Bpanda::renderPS(PSColorSpace mode)
 {
   BaseBox::renderPS(mode);
 
diff --git a/tksao/frame/bpanda.h b/tksao/frame/bpanda.h
index 581e035..3df9168 100644
--- a/tksao/frame/bpanda.h
+++ b/tksao/frame/bpanda.h
@@ -10,7 +10,7 @@
 class Bpanda : public BaseBox {
  private:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C
index da6b3e5..0bb2b97 100644
--- a/tksao/frame/compass.C
+++ b/tksao/frame/compass.C
@@ -130,7 +130,7 @@ GC Compass::renderXGC(RenderMode mode)
   return gc;
 }
 
-void Compass::renderPS(Widget::PSColorSpace mode)
+void Compass::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
@@ -248,7 +248,7 @@ void Compass::renderPS(Widget::PSColorSpace mode)
   }
 }
 
-void Compass::renderPSGC(Widget::PSColorSpace mode)
+void Compass::renderPSGC(PSColorSpace mode)
 {
   parent->renderPSColor(mode, parent->getXColor(colorName));
   renderPSLineNoDash();
diff --git a/tksao/frame/compass.h b/tksao/frame/compass.h
index b750f62..54e8c5f 100644
--- a/tksao/frame/compass.h
+++ b/tksao/frame/compass.h
@@ -28,9 +28,9 @@ private:
   void renderXInclude(Drawable, Coord::InternalSystem, RenderMode) {}
   GC renderXGC(RenderMode);
 
-  void renderPS(Widget::PSColorSpace);
-  void renderPSInclude(Widget::PSColorSpace) {}
-  void renderPSGC(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
+  void renderPSInclude(PSColorSpace) {}
+  void renderPSGC(PSColorSpace);
 
 #ifdef MAC_OSX_TK
   void renderMACOSX();
diff --git a/tksao/frame/composite.C b/tksao/frame/composite.C
index e72da8a..2407115 100644
--- a/tksao/frame/composite.C
+++ b/tksao/frame/composite.C
@@ -52,7 +52,7 @@ void Composite::x11(Drawable drawable, Coord::InternalSystem sys,
   }
 }
 
-void Composite::ps(Widget::PSColorSpace mode, int tt)
+void Composite::ps(PSColorSpace mode, int tt)
 {
   if (tt)
     renderPSText(mode);
diff --git a/tksao/frame/composite.h b/tksao/frame/composite.h
index 8476d71..3b6df5d 100644
--- a/tksao/frame/composite.h
+++ b/tksao/frame/composite.h
@@ -14,7 +14,7 @@ class Composite : public Marker {
   int global;
 
   void renderX(Drawable, Coord::InternalSystem, RenderMode) {}
-  void renderPS(Widget::PSColorSpace mode) {}
+  void renderPS(PSColorSpace mode) {}
 #ifdef MAC_OSX_TK
   void renderMACOSX() {}
 #endif
@@ -37,7 +37,7 @@ public:
   Marker* dup() {return new Composite(*this);}
 
   void x11(Drawable, Coord::InternalSystem, int, HandleMode);
-  void ps(Widget::PSColorSpace,int);
+  void ps(PSColorSpace,int);
 #ifdef MAC_OSX_TK
   void macosx(int);
 #endif
diff --git a/tksao/frame/context.C b/tksao/frame/context.C
index 1632d28..e2edae1 100644
--- a/tksao/frame/context.C
+++ b/tksao/frame/context.C
@@ -607,7 +607,7 @@ void Context::contourLoadAux(istream& str,
   }
 }
 
-void Context::contourPS(Widget::PSColorSpace cs)
+void Context::contourPS(PSColorSpace cs)
 {
   if (!cfits)
     return;
diff --git a/tksao/frame/context.h b/tksao/frame/context.h
index e7fe647..fc67bfc 100644
--- a/tksao/frame/context.h
+++ b/tksao/frame/context.h
@@ -144,7 +144,7 @@ class Context {
   void contourLoadAux(istream&, const char*, int, int);
   void contourLoadAux(istream&, Coord::CoordSystem, Coord::SkyFrame, 
 		      const char*, int, int);
-  void contourPS(Widget::PSColorSpace cs);
+  void contourPS(PSColorSpace cs);
   void contourX11(Pixmap, Coord::InternalSystem, const BBox&);
 #ifdef MAC_OSX_TK
   void contourMacOSX();
diff --git a/tksao/frame/contour.C b/tksao/frame/contour.C
index 33239d8..952bc1a 100644
--- a/tksao/frame/contour.C
+++ b/tksao/frame/contour.C
@@ -90,7 +90,7 @@ void ContourLevel::render(Pixmap pmap, Coord::InternalSystem sys,
   }
 }
 
-void ContourLevel::ps(Widget::PSColorSpace mode)
+void ContourLevel::ps(PSColorSpace mode)
 {
   if (lcontour_.head()) {
     do
@@ -205,7 +205,7 @@ void Contour::render(Pixmap pmap, Coord::InternalSystem sys, const BBox& bbox)
   }
 }
 
-void Contour::ps(Widget::PSColorSpace mode)
+void Contour::ps(PSColorSpace mode)
 {
   if (!lvertex_.head())
     return;
@@ -213,16 +213,16 @@ void Contour::ps(Widget::PSColorSpace mode)
   ostringstream str;
 
   switch (mode) {
-  case Widget::BW:
-  case Widget::GRAY:
+  case BW:
+  case GRAY:
     psColorGray(base_->getXColor(parent_->colorName_), str);
     str << " setgray";
     break;
-  case Widget::RGB:
+  case RGB:
     psColorRGB(base_->getXColor(parent_->colorName_), str);
     str << " setrgbcolor";
     break;
-  case Widget::CMYK:
+  case CMYK:
     psColorCMYK(base_->getXColor(parent_->colorName_), str);
     str << " setcmykcolor";
     break;
diff --git a/tksao/frame/contour.h b/tksao/frame/contour.h
index 39f09ba..50d8eda 100644
--- a/tksao/frame/contour.h
+++ b/tksao/frame/contour.h
@@ -9,7 +9,6 @@
 #include "vector3d.h"
 #include "list.h"
 #include "coord.h"
-#include "widget.h"
 
 class FitsImage;
 class Base;
@@ -43,7 +42,7 @@ class ContourLevel {
 
   void list(ostream& str, FitsImage*, Coord::CoordSystem, Coord::SkyFrame);
   void render(Pixmap, Coord::InternalSystem, const BBox&);
-  void ps(Widget::PSColorSpace);
+  void ps(PSColorSpace);
   void updateCoords(const Matrix&);
 #ifdef MAC_OSX_TK
   void macosx();
@@ -84,7 +83,7 @@ class Contour {
 
   void list(ostream& str, FitsImage*, Coord::CoordSystem, Coord::SkyFrame);
   void render(Pixmap, Coord::InternalSystem, const BBox&);
-  void ps(Widget::PSColorSpace);
+  void ps(PSColorSpace);
   void updateCoords(const Matrix&);
 #ifdef MAC_OSX_TK
   void macosx();
diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C
index b57868e..2d9fcda 100644
--- a/tksao/frame/cpanda.C
+++ b/tksao/frame/cpanda.C
@@ -97,7 +97,7 @@ void Cpanda::renderX(Drawable drawable, Coord::InternalSystem sys,
   }
 }
 
-void Cpanda::renderPS(Widget::PSColorSpace mode)
+void Cpanda::renderPS(PSColorSpace mode)
 {
   BaseEllipse::renderPS(mode);
 
diff --git a/tksao/frame/cpanda.h b/tksao/frame/cpanda.h
index adfe7ff..c88a915 100644
--- a/tksao/frame/cpanda.h
+++ b/tksao/frame/cpanda.h
@@ -10,7 +10,7 @@
 class Cpanda : public BaseEllipse {
  private:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C
index f223503..980a3f8 100644
--- a/tksao/frame/epanda.C
+++ b/tksao/frame/epanda.C
@@ -95,7 +95,7 @@ void Epanda::renderX(Drawable drawable, Coord::InternalSystem sys,
   }
 }
 
-void Epanda::renderPS(Widget::PSColorSpace mode)
+void Epanda::renderPS(PSColorSpace mode)
 {
   BaseEllipse::renderPS(mode);
 
diff --git a/tksao/frame/epanda.h b/tksao/frame/epanda.h
index 4134273..5f9fb28 100644
--- a/tksao/frame/epanda.h
+++ b/tksao/frame/epanda.h
@@ -10,7 +10,7 @@
 class Epanda : public BaseEllipse {
  private:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C
index 8903036..8971139 100644
--- a/tksao/frame/frmarker.C
+++ b/tksao/frame/frmarker.C
@@ -6122,7 +6122,7 @@ void Base::parseMarker(MarkerFormat fm, istream& str)
   }
 }
 
-void Base::psMarkers(List<Marker>* ml, Widget::PSColorSpace mode)
+void Base::psMarkers(List<Marker>* ml, PSColorSpace mode)
 {
   // render from back to front
   // bbox is in canvas coords
diff --git a/tksao/frame/grid.h b/tksao/frame/grid.h
index e6d521e..971b8ec 100644
--- a/tksao/frame/grid.h
+++ b/tksao/frame/grid.h
@@ -6,7 +6,7 @@
 #define __grid_h__
 
 #include "coord.h"
-#include "widget.h"
+#include "util.h"
 
 class Grid {
  public:
@@ -27,7 +27,7 @@ class Grid {
   virtual const char* option() =0;
 
   virtual void x11() =0;
-  virtual void ps(Widget::PSColorSpace) =0;
+  virtual void ps(PSColorSpace) =0;
 #ifdef MAC_OSX_TK
   virtual void macosx() =0;
 #endif
diff --git a/tksao/frame/grid25d.h b/tksao/frame/grid25d.h
index 3255393..8e76bff 100644
--- a/tksao/frame/grid25d.h
+++ b/tksao/frame/grid25d.h
@@ -23,7 +23,7 @@ class Grid25d : public Grid, public Grid25dBase {
   const char* option() {return GridBase::option();}
 
   void x11() {doit(X11);}
-  void ps(Widget::PSColorSpace mode) {mode_=mode; doit(PS);}
+  void ps(PSColorSpace mode) {mode_=mode; doit(PS);}
 #ifdef MAC_OSX_TK
   void macosx() {doit(MACOSX);}
 #endif
diff --git a/tksao/frame/grid2d.h b/tksao/frame/grid2d.h
index 5b4b15e..d5fba35 100644
--- a/tksao/frame/grid2d.h
+++ b/tksao/frame/grid2d.h
@@ -23,7 +23,7 @@ class Grid2d : public Grid, public Grid2dBase {
   const char* option() {return GridBase::option();}
 
   void x11() {doit(X11);}
-  void ps(Widget::PSColorSpace mode) {mode_=mode; doit(PS);}
+  void ps(PSColorSpace mode) {mode_=mode; doit(PS);}
 #ifdef MAC_OSX_TK
   void macosx() {doit(MACOSX);}
 #endif
diff --git a/tksao/frame/grid3d.h b/tksao/frame/grid3d.h
index 9e10cac..7c60602 100644
--- a/tksao/frame/grid3d.h
+++ b/tksao/frame/grid3d.h
@@ -23,7 +23,7 @@ class Grid3d : public Grid, public Grid3dBase {
   const char* option() {return GridBase::option();}
 
   void x11() {doit(X11);}
-  void ps(Widget::PSColorSpace mode) {mode_=mode; doit(PS);}
+  void ps(PSColorSpace mode) {mode_=mode; doit(PS);}
 #ifdef MAC_OSX_TK
   void macosx() {doit(MACOSX);}
 #endif
diff --git a/tksao/frame/line.C b/tksao/frame/line.C
index 7092d3c..aed9fdb 100644
--- a/tksao/frame/line.C
+++ b/tksao/frame/line.C
@@ -64,7 +64,7 @@ void Line::renderX(Drawable drawable, Coord::InternalSystem sys, RenderMode mode
   XDrawLine(display, drawable, lgc, aa[0], aa[1], bb[0], bb[1]);
 }
 
-void Line::renderPS(Widget::PSColorSpace mode)
+void Line::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
diff --git a/tksao/frame/line.h b/tksao/frame/line.h
index c749b39..65ee761 100644
--- a/tksao/frame/line.h
+++ b/tksao/frame/line.h
@@ -14,7 +14,7 @@ protected:
 
 protected:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C
index 9683413..b0cf6e0 100644
--- a/tksao/frame/marker.C
+++ b/tksao/frame/marker.C
@@ -374,7 +374,7 @@ void Marker::renderXLineNoDash(GC lgc)
   XSetLineAttributes(display, lgc, ww, LineSolid, CapButt, JoinMiter);
 }
 
-void Marker::ps(Widget::PSColorSpace mode, int tt)
+void Marker::ps(PSColorSpace mode, int tt)
 {
   if (tt)
     renderPSText(mode);
@@ -383,7 +383,7 @@ void Marker::ps(Widget::PSColorSpace mode, int tt)
   renderPSInclude(mode);
 }
 
-void Marker::renderPSInclude(Widget::PSColorSpace mode)
+void Marker::renderPSInclude(PSColorSpace mode)
 {
   if (!(properties & INCLUDE)) {
     parent->renderPSColor(mode, parent->getXColor("red"));
@@ -401,10 +401,10 @@ void Marker::renderPSInclude(Widget::PSColorSpace mode)
   }
 }
 
-void Marker::renderPSText(Widget::PSColorSpace mode)
+void Marker::renderPSText(PSColorSpace mode)
 {
   if (text && *text && psfont_) {
-    parent->renderPSColor((Widget::PSColorSpace)mode, parent->getXColor(colorName));
+    parent->renderPSColor(mode, parent->getXColor(colorName));
 
     ostringstream str;
 
@@ -445,10 +445,10 @@ void Marker::renderPSArrow(const Vector& p1, const Vector& p2,
   delete [] vv;
 }
 
-void Marker::renderPSGC(Widget::PSColorSpace mode)
+void Marker::renderPSGC(PSColorSpace mode)
 {
   // set width, color, dash
-  parent->renderPSColor((Widget::PSColorSpace)mode, parent->getXColor(colorName));
+  parent->renderPSColor(mode, parent->getXColor(colorName));
   if ((properties & SOURCE) && !(properties & DASH))
     renderPSLineNoDash();
   else
diff --git a/tksao/frame/marker.h b/tksao/frame/marker.h
index c00b091..e86ff0f 100644
--- a/tksao/frame/marker.h
+++ b/tksao/frame/marker.h
@@ -14,7 +14,7 @@
 #include "tag.h"
 #include "coord.h"
 #include "xml.h"
-#include "widget.h"
+#include "util.h"
 
 #define POINTSIZE 11
 
@@ -118,11 +118,11 @@ protected:
   virtual void renderXLineDash(GC);
   void renderXLineNoDash(GC);
 
-  virtual void renderPS(Widget::PSColorSpace mode) =0;
-  virtual void renderPSInclude(Widget::PSColorSpace);
-  virtual void renderPSText(Widget::PSColorSpace);
+  virtual void renderPS(PSColorSpace mode) =0;
+  virtual void renderPSInclude(PSColorSpace);
+  virtual void renderPSText(PSColorSpace);
   void renderPSArrow(const Vector&, const Vector&, Coord::InternalSystem);
-  virtual void renderPSGC(Widget::PSColorSpace);
+  virtual void renderPSGC(PSColorSpace);
   virtual void renderPSLineDash();
   void renderPSLineNoDash();
   void renderPSColor(int, XColor*);
@@ -212,7 +212,7 @@ protected:
   virtual Vector bckMap(const Vector&, Coord::InternalSystem);
 
   virtual void x11(Drawable, Coord::InternalSystem, int, HandleMode);
-  virtual void ps(Widget::PSColorSpace,int);
+  virtual void ps(PSColorSpace,int);
 #ifdef MAC_OSX_TK
   virtual void macosx(int);
 #endif
diff --git a/tksao/frame/parser.C b/tksao/frame/parser.C
index d59039d..fe9942a 100644
--- a/tksao/frame/parser.C
+++ b/tksao/frame/parser.C
@@ -785,6 +785,7 @@
 #include "fitsimage.h"
 #include "fitsmask.h"
 #include "marker.h"
+#include "util.h"
 
 #undef yyFlexLexer
 #define yyFlexLexer frFlexLexer
@@ -835,7 +836,7 @@ static void setProps(unsigned short* props, unsigned short prop, int value);
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 52 "frame/parser.Y"
+#line 53 "frame/parser.Y"
 {
 #define FRBUFSIZE 4096
   char chr;
@@ -847,7 +848,7 @@ typedef union YYSTYPE
   int dash[2];
 }
 /* Line 193 of yacc.c.  */
-#line 851 "frame/parser.C"
+#line 852 "frame/parser.C"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -860,7 +861,7 @@ typedef union YYSTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 864 "frame/parser.C"
+#line 865 "frame/parser.C"
 
 #ifdef short
 # undef short
@@ -1767,132 +1768,132 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   456,   456,   457,   458,   459,   460,   461,   462,   463,
-     464,   465,   466,   467,   468,   469,   470,   471,   472,   473,
-     474,   475,   476,   477,   478,   479,   480,   481,   482,   483,
-     484,   485,   486,   487,   488,   489,   490,   491,   492,   493,
-     494,   495,   496,   497,   498,   499,   500,   501,   502,   503,
-     504,   505,   506,   507,   508,   511,   512,   515,   516,   517,
-     518,   519,   520,   521,   522,   523,   524,   525,   526,   529,
-     531,   532,   533,   534,   536,   537,   538,   539,   542,   543,
-     544,   545,   546,   549,   550,   553,   554,   555,   558,   561,
-     564,   567,   579,   586,   593,   601,   602,   603,   604,   605,
-     608,   609,   610,   611,   612,   613,   614,   615,   616,   617,
-     618,   619,   620,   621,   622,   623,   624,   625,   626,   627,
-     628,   629,   630,   631,   632,   633,   634,   635,   638,   639,
-     642,   643,   644,   645,   646,   647,   650,   651,   652,   653,
-     654,   655,   656,   657,   660,   661,   662,   663,   664,   667,
-     668,   669,   670,   671,   672,   673,   674,   677,   678,   679,
-     682,   683,   684,   685,   688,   689,   690,   693,   694,   695,
-     698,   699,   700,   703,   704,   705,   706,   707,   708,   709,
-     710,   713,   714,   717,   718,   719,   720,   721,   722,   725,
-     726,   727,   730,   731,   732,   733,   734,   735,   738,   739,
-     740,   741,   742,   743,   744,   745,   746,   750,   751,   754,
-     755,   758,   759,   762,   763,   767,   768,   769,   770,   771,
-     772,   773,   774,   777,   778,   781,   782,   783,   785,   787,
-     788,   789,   791,   795,   796,   799,   800,   802,   805,   807,
-     813,   814,   815,   818,   819,   820,   823,   824,   825,   826,
-     827,   828,   829,   835,   836,   839,   840,   841,   842,   843,
-     846,   847,   848,   851,   852,   857,   862,   869,   871,   873,
-     874,   875,   878,   880,   883,   884,   887,   888,   889,   890,
-     891,   894,   896,   898,   903,   908,   911,   912,   915,   916,
-     917,   924,   925,   926,   927,   930,   931,   934,   935,   938,
-     939,   942,   944,   948,   949,   952,   954,   955,   956,   957,
-     960,   961,   963,   964,   965,   968,   970,   972,   973,   975,
-     977,   979,   981,   985,   988,   989,   990,   993,   996,   997,
-     998,   999,  1000,  1001,  1002,  1003,  1004,  1005,  1006,  1007,
-    1008,  1009,  1010,  1011,  1012,  1013,  1014,  1016,  1017,  1018,
-    1019,  1020,  1021,  1022,  1023,  1024,  1025,  1027,  1028,  1029,
-    1030,  1031,  1032,  1033,  1035,  1037,  1038,  1041,  1042,  1043,
-    1044,  1045,  1046,  1047,  1048,  1051,  1052,  1053,  1056,  1059,
-    1060,  1062,  1064,  1065,  1066,  1067,  1068,  1069,  1076,  1077,
-    1080,  1081,  1082,  1085,  1086,  1089,  1092,  1093,  1095,  1099,
-    1100,  1101,  1104,  1108,  1110,  1111,  1112,  1113,  1114,  1115,
-    1116,  1117,  1118,  1121,  1122,  1123,  1126,  1127,  1130,  1132,
-    1140,  1142,  1144,  1148,  1149,  1151,  1154,  1157,  1158,  1162,
-    1164,  1167,  1172,  1173,  1174,  1178,  1179,  1180,  1183,  1184,
-    1185,  1188,  1189,  1191,  1192,  1193,  1194,  1195,  1196,  1197,
-    1198,  1199,  1200,  1202,  1203,  1206,  1207,  1210,  1211,  1212,
-    1213,  1216,  1217,  1220,  1222,  1225,  1229,  1230,  1231,  1233,
-    1235,  1239,  1240,  1241,  1244,  1245,  1246,  1247,  1248,  1249,
-    1252,  1255,  1256,  1257,  1260,  1261,  1262,  1263,  1264,  1265,
-    1268,  1269,  1270,  1271,  1272,  1273,  1274,  1277,  1278,  1281,
-    1282,  1285,  1286,  1289,  1290,  1293,  1294,  1295,  1298,  1299,
-    1302,  1303,  1306,  1309,  1317,  1318,  1321,  1322,  1323,  1324,
-    1325,  1326,  1327,  1328,  1329,  1330,  1331,  1332,  1333,  1334,
-    1335,  1336,  1337,  1340,  1343,  1344,  1347,  1348,  1349,  1350,
-    1353,  1354,  1355,  1356,  1359,  1360,  1361,  1362,  1363,  1364,
-    1367,  1368,  1369,  1370,  1371,  1372,  1374,  1375,  1380,  1381,
-    1384,  1386,  1388,  1391,  1392,  1393,  1394,  1395,  1396,  1399,
-    1401,  1403,  1405,  1406,  1408,  1410,  1412,  1414,  1416,  1419,
-    1420,  1421,  1422,  1423,  1424,  1426,  1427,  1428,  1431,  1434,
-    1436,  1438,  1440,  1442,  1444,  1446,  1448,  1451,  1453,  1455,
-    1457,  1458,  1459,  1460,  1461,  1464,  1465,  1466,  1467,  1468,
-    1469,  1470,  1472,  1474,  1475,  1476,  1479,  1480,  1481,  1482,
-    1483,  1484,  1486,  1487,  1488,  1491,  1492,  1493,  1494,  1495,
-    1498,  1501,  1504,  1507,  1510,  1513,  1516,  1519,  1522,  1527,
-    1530,  1533,  1536,  1539,  1542,  1545,  1548,  1551,  1554,  1557,
-    1562,  1565,  1568,  1571,  1574,  1577,  1580,  1583,  1586,  1591,
-    1593,  1595,  1597,  1599,  1601,  1606,  1608,  1610,  1614,  1617,
-    1620,  1623,  1626,  1629,  1632,  1635,  1638,  1641,  1644,  1649,
-    1650,  1651,  1652,  1653,  1654,  1655,  1657,  1659,  1660,  1661,
-    1664,  1665,  1666,  1667,  1668,  1669,  1671,  1672,  1673,  1676,
-    1678,  1680,  1681,  1683,  1685,  1689,  1690,  1693,  1694,  1695,
-    1698,  1705,  1706,  1707,  1708,  1709,  1710,  1711,  1714,  1722,
-    1723,  1724,  1725,  1727,  1729,  1730,  1730,  1731,  1732,  1733,
-    1734,  1735,  1736,  1738,  1739,  1741,  1744,  1747,  1748,  1749,
-    1752,  1755,  1758,  1759,  1763,  1766,  1769,  1772,  1776,  1781,
-    1786,  1788,  1789,  1791,  1792,  1794,  1796,  1798,  1800,  1801,
-    1803,  1805,  1809,  1814,  1816,  1818,  1820,  1822,  1824,  1826,
-    1828,  1830,  1832,  1834,  1837,  1838,  1840,  1842,  1843,  1845,
-    1847,  1848,  1849,  1851,  1853,  1854,  1855,  1857,  1858,  1859,
-    1862,  1866,  1869,  1872,  1876,  1881,  1887,  1888,  1889,  1891,
-    1892,  1896,  1898,  1899,  1900,  1903,  1906,  1909,  1911,  1913,
-    1914,  1919,  1922,  1923,  1924,  1927,  1931,  1932,  1934,  1935,
-    1936,  1938,  1939,  1941,  1942,  1947,  1949,  1950,  1952,  1953,
-    1954,  1955,  1956,  1957,  1959,  1961,  1963,  1964,  1966,  1967,
-    1969,  1971,  1972,  1973,  1974,  1975,  1976,  1977,  1978,  1979,
-    1980,  1981,  1983,  1985,  1986,  1987,  1988,  1990,  1991,  1992,
-    1993,  1994,  1996,  1997,  1998,  1999,  2000,  2001,  2004,  2005,
-    2006,  2007,  2008,  2009,  2010,  2011,  2012,  2013,  2014,  2015,
-    2016,  2017,  2018,  2019,  2020,  2021,  2022,  2023,  2024,  2027,
-    2028,  2029,  2030,  2031,  2032,  2040,  2047,  2056,  2065,  2072,
-    2079,  2087,  2095,  2102,  2107,  2112,  2117,  2122,  2127,  2132,
-    2138,  2148,  2158,  2168,  2175,  2185,  2195,  2204,  2216,  2229,
-    2234,  2237,  2239,  2241,  2246,  2250,  2253,  2255,  2257,  2260,
-    2261,  2262,  2263,  2264,  2265,  2266,  2269,  2270,  2271,  2272,
-    2273,  2274,  2276,  2278,  2280,  2282,  2284,  2286,  2289,  2290,
-    2291,  2292,  2294,  2297,  2298,  2300,  2302,  2303,  2304,  2306,
-    2309,  2312,  2313,  2315,  2316,  2317,  2318,  2320,  2321,  2322,
-    2323,  2324,  2326,  2328,  2329,  2331,  2334,  2335,  2336,  2338,
-    2340,  2341,  2342,  2343,  2345,  2348,  2352,  2353,  2354,  2355,
-    2358,  2361,  2363,  2364,  2365,  2366,  2368,  2371,  2372,  2374,
-    2375,  2376,  2377,  2378,  2380,  2381,  2383,  2386,  2387,  2388,
-    2389,  2390,  2392,  2394,  2395,  2396,  2397,  2399,  2401,  2402,
-    2403,  2404,  2405,  2406,  2408,  2409,  2411,  2414,  2415,  2416,
-    2417,  2420,  2421,  2424,  2425,  2428,  2429,  2432,  2445,  2446,
-    2450,  2451,  2455,  2458,  2463,  2470,  2472,  2475,  2477,  2480,
-    2484,  2485,  2486,  2487,  2488,  2489,  2490,  2494,  2495,  2498,
-    2499,  2500,  2501,  2502,  2503,  2504,  2505,  2508,  2509,  2510,
-    2511,  2512,  2513,  2514,  2515,  2516,  2517,  2518,  2521,  2522,
-    2525,  2526,  2526,  2529,  2530,  2531,  2532,  2535,  2536,  2539,
-    2540,  2543,  2547,  2548,  2548,  2551,  2552,  2555,  2558,  2562,
-    2563,  2564,  2565,  2566,  2567,  2568,  2574,  2575,  2576,  2577,
-    2580,  2582,  2583,  2588,  2590,  2591,  2592,  2593,  2596,  2597,
-    2602,  2606,  2607,  2608,  2611,  2612,  2617,  2618,  2621,  2623,
-    2624,  2625,  2630,  2632,  2638,  2639,  2640,  2641,  2644,  2645,
-    2648,  2650,  2652,  2653,  2656,  2658,  2659,  2660,  2663,  2664,
-    2667,  2668,  2669,  2672,  2673,  2674,  2677,  2678,  2679,  2680,
-    2681,  2684,  2685,  2686,  2689,  2690,  2691,  2692,  2693,  2696,
-    2698,  2700,  2702,  2705,  2707,  2709,  2712,  2713,  2714,  2715,
-    2716,  2717,  2718,  2719,  2720,  2723,  2724,  2725,  2728,  2729,
-    2730,  2733,  2734,  2735,  2738,  2739,  2740,  2743,  2744,  2745,
-    2746,  2749,  2750,  2751,  2754,  2755,  2756,  2759,  2760,  2761,
-    2764,  2765,  2766,  2769,  2771,  2773,  2777,  2781,  2783,  2788,
-    2791,  2792,  2793,  2794,  2797,  2798,  2800,  2801,  2803,  2806,
-    2807,  2808,  2811,  2812,  2815,  2817,  2818,  2819,  2820,  2823,
-    2824,  2825,  2828,  2829,  2830,  2833,  2834,  2839,  2843,  2850,
-    2851,  2853,  2858,  2860,  2863,  2864,  2865,  2866,  2868,  2873
+       0,   457,   457,   458,   459,   460,   461,   462,   463,   464,
+     465,   466,   467,   468,   469,   470,   471,   472,   473,   474,
+     475,   476,   477,   478,   479,   480,   481,   482,   483,   484,
+     485,   486,   487,   488,   489,   490,   491,   492,   493,   494,
+     495,   496,   497,   498,   499,   500,   501,   502,   503,   504,
+     505,   506,   507,   508,   509,   512,   513,   516,   517,   518,
+     519,   520,   521,   522,   523,   524,   525,   526,   527,   530,
+     532,   533,   534,   535,   537,   538,   539,   540,   543,   544,
+     545,   546,   547,   550,   551,   554,   555,   556,   559,   562,
+     565,   568,   580,   587,   594,   602,   603,   604,   605,   606,
+     609,   610,   611,   612,   613,   614,   615,   616,   617,   618,
+     619,   620,   621,   622,   623,   624,   625,   626,   627,   628,
+     629,   630,   631,   632,   633,   634,   635,   636,   639,   640,
+     643,   644,   645,   646,   647,   648,   651,   652,   653,   654,
+     655,   656,   657,   658,   661,   662,   663,   664,   665,   668,
+     669,   670,   671,   672,   673,   674,   675,   678,   679,   680,
+     683,   684,   685,   686,   689,   690,   691,   694,   695,   696,
+     699,   700,   701,   704,   705,   706,   707,   708,   709,   710,
+     711,   714,   715,   718,   719,   720,   721,   722,   723,   726,
+     727,   728,   731,   732,   733,   734,   735,   736,   739,   740,
+     741,   742,   743,   744,   745,   746,   747,   751,   752,   755,
+     756,   759,   760,   763,   764,   768,   769,   770,   771,   772,
+     773,   774,   775,   778,   779,   782,   783,   784,   786,   788,
+     789,   790,   792,   796,   797,   800,   801,   803,   806,   808,
+     814,   815,   816,   819,   820,   821,   824,   825,   826,   827,
+     828,   829,   830,   836,   837,   840,   841,   842,   843,   844,
+     847,   848,   849,   852,   853,   858,   863,   870,   872,   874,
+     875,   876,   879,   881,   884,   885,   888,   889,   890,   891,
+     892,   895,   897,   899,   904,   909,   912,   913,   916,   917,
+     918,   925,   926,   927,   928,   931,   932,   935,   936,   939,
+     940,   943,   945,   949,   950,   953,   955,   956,   957,   958,
+     961,   962,   964,   965,   966,   969,   971,   973,   974,   976,
+     978,   980,   982,   986,   989,   990,   991,   994,   997,   998,
+     999,  1000,  1001,  1002,  1003,  1004,  1005,  1006,  1007,  1008,
+    1009,  1010,  1011,  1012,  1013,  1014,  1015,  1017,  1018,  1019,
+    1020,  1021,  1022,  1023,  1024,  1025,  1026,  1028,  1029,  1030,
+    1031,  1032,  1033,  1034,  1036,  1038,  1039,  1042,  1043,  1044,
+    1045,  1046,  1047,  1048,  1049,  1052,  1053,  1054,  1057,  1060,
+    1061,  1063,  1065,  1066,  1067,  1068,  1069,  1070,  1077,  1078,
+    1081,  1082,  1083,  1086,  1087,  1090,  1093,  1094,  1096,  1100,
+    1101,  1102,  1105,  1109,  1111,  1112,  1113,  1114,  1115,  1116,
+    1117,  1118,  1119,  1122,  1123,  1124,  1127,  1128,  1131,  1133,
+    1141,  1143,  1145,  1149,  1150,  1152,  1155,  1158,  1159,  1163,
+    1165,  1168,  1173,  1174,  1175,  1179,  1180,  1181,  1184,  1185,
+    1186,  1189,  1190,  1192,  1193,  1194,  1195,  1196,  1197,  1198,
+    1199,  1200,  1201,  1203,  1204,  1207,  1208,  1211,  1212,  1213,
+    1214,  1217,  1218,  1221,  1223,  1226,  1230,  1231,  1232,  1234,
+    1236,  1240,  1241,  1242,  1245,  1246,  1247,  1248,  1249,  1250,
+    1253,  1256,  1257,  1258,  1261,  1262,  1263,  1264,  1265,  1266,
+    1269,  1270,  1271,  1272,  1273,  1274,  1275,  1278,  1279,  1282,
+    1283,  1286,  1287,  1290,  1291,  1294,  1295,  1296,  1299,  1300,
+    1303,  1304,  1307,  1310,  1318,  1319,  1322,  1323,  1324,  1325,
+    1326,  1327,  1328,  1329,  1330,  1331,  1332,  1333,  1334,  1335,
+    1336,  1337,  1338,  1341,  1344,  1345,  1348,  1349,  1350,  1351,
+    1354,  1355,  1356,  1357,  1360,  1361,  1362,  1363,  1364,  1365,
+    1368,  1369,  1370,  1371,  1372,  1373,  1375,  1376,  1381,  1382,
+    1385,  1387,  1389,  1392,  1393,  1394,  1395,  1396,  1397,  1400,
+    1402,  1404,  1406,  1407,  1409,  1411,  1413,  1415,  1417,  1420,
+    1421,  1422,  1423,  1424,  1425,  1427,  1428,  1429,  1432,  1435,
+    1437,  1439,  1441,  1443,  1445,  1447,  1449,  1452,  1454,  1456,
+    1458,  1459,  1460,  1461,  1462,  1465,  1466,  1467,  1468,  1469,
+    1470,  1471,  1473,  1475,  1476,  1477,  1480,  1481,  1482,  1483,
+    1484,  1485,  1487,  1488,  1489,  1492,  1493,  1494,  1495,  1496,
+    1499,  1502,  1505,  1508,  1511,  1514,  1517,  1520,  1523,  1528,
+    1531,  1534,  1537,  1540,  1543,  1546,  1549,  1552,  1555,  1558,
+    1563,  1566,  1569,  1572,  1575,  1578,  1581,  1584,  1587,  1592,
+    1594,  1596,  1598,  1600,  1602,  1607,  1609,  1611,  1615,  1618,
+    1621,  1624,  1627,  1630,  1633,  1636,  1639,  1642,  1645,  1650,
+    1651,  1652,  1653,  1654,  1655,  1656,  1658,  1660,  1661,  1662,
+    1665,  1666,  1667,  1668,  1669,  1670,  1672,  1673,  1674,  1677,
+    1679,  1681,  1682,  1684,  1686,  1690,  1691,  1694,  1695,  1696,
+    1699,  1706,  1707,  1708,  1709,  1710,  1711,  1712,  1715,  1723,
+    1724,  1725,  1726,  1728,  1730,  1731,  1731,  1732,  1733,  1734,
+    1735,  1736,  1737,  1739,  1740,  1742,  1745,  1748,  1749,  1750,
+    1753,  1756,  1759,  1760,  1764,  1767,  1770,  1773,  1777,  1782,
+    1787,  1789,  1790,  1792,  1793,  1795,  1797,  1799,  1801,  1802,
+    1804,  1806,  1810,  1815,  1817,  1819,  1821,  1823,  1825,  1827,
+    1829,  1831,  1833,  1835,  1838,  1839,  1841,  1843,  1844,  1846,
+    1848,  1849,  1850,  1852,  1854,  1855,  1856,  1858,  1859,  1860,
+    1863,  1867,  1870,  1873,  1877,  1882,  1888,  1889,  1890,  1892,
+    1893,  1897,  1899,  1900,  1901,  1904,  1907,  1910,  1912,  1914,
+    1915,  1920,  1923,  1924,  1925,  1928,  1932,  1933,  1935,  1936,
+    1937,  1939,  1940,  1942,  1943,  1948,  1950,  1951,  1953,  1954,
+    1955,  1956,  1957,  1958,  1960,  1962,  1964,  1965,  1967,  1968,
+    1970,  1972,  1973,  1974,  1975,  1976,  1977,  1978,  1979,  1980,
+    1981,  1982,  1984,  1986,  1987,  1988,  1989,  1991,  1992,  1993,
+    1994,  1995,  1997,  1998,  1999,  2000,  2001,  2002,  2005,  2006,
+    2007,  2008,  2009,  2010,  2011,  2012,  2013,  2014,  2015,  2016,
+    2017,  2018,  2019,  2020,  2021,  2022,  2023,  2024,  2025,  2028,
+    2029,  2030,  2031,  2032,  2033,  2041,  2048,  2057,  2066,  2073,
+    2080,  2088,  2096,  2103,  2108,  2113,  2118,  2123,  2128,  2133,
+    2139,  2149,  2159,  2169,  2176,  2186,  2196,  2205,  2217,  2230,
+    2235,  2238,  2240,  2242,  2247,  2251,  2254,  2256,  2258,  2261,
+    2262,  2263,  2264,  2265,  2266,  2267,  2270,  2271,  2272,  2273,
+    2274,  2275,  2277,  2279,  2281,  2283,  2285,  2287,  2290,  2291,
+    2292,  2293,  2295,  2298,  2299,  2301,  2303,  2304,  2305,  2307,
+    2310,  2313,  2314,  2316,  2317,  2318,  2319,  2321,  2322,  2323,
+    2324,  2325,  2327,  2329,  2330,  2332,  2335,  2336,  2337,  2339,
+    2341,  2342,  2343,  2344,  2346,  2349,  2353,  2354,  2355,  2356,
+    2359,  2362,  2364,  2365,  2366,  2367,  2369,  2372,  2373,  2375,
+    2376,  2377,  2378,  2379,  2381,  2382,  2384,  2387,  2388,  2389,
+    2390,  2391,  2393,  2395,  2396,  2397,  2398,  2400,  2402,  2403,
+    2404,  2405,  2406,  2407,  2409,  2410,  2412,  2415,  2416,  2417,
+    2418,  2421,  2422,  2425,  2426,  2429,  2430,  2433,  2446,  2447,
+    2451,  2452,  2456,  2459,  2464,  2471,  2473,  2476,  2478,  2481,
+    2485,  2486,  2487,  2488,  2489,  2490,  2491,  2495,  2496,  2499,
+    2500,  2501,  2502,  2503,  2504,  2505,  2506,  2509,  2510,  2511,
+    2512,  2513,  2514,  2515,  2516,  2517,  2518,  2519,  2522,  2523,
+    2526,  2527,  2527,  2530,  2531,  2532,  2533,  2536,  2537,  2540,
+    2541,  2544,  2548,  2549,  2549,  2552,  2553,  2556,  2559,  2563,
+    2564,  2565,  2566,  2567,  2568,  2569,  2575,  2576,  2577,  2578,
+    2581,  2583,  2584,  2589,  2591,  2592,  2593,  2594,  2597,  2598,
+    2603,  2607,  2608,  2609,  2612,  2613,  2618,  2619,  2622,  2624,
+    2625,  2626,  2631,  2633,  2639,  2640,  2641,  2642,  2645,  2646,
+    2649,  2651,  2653,  2654,  2657,  2659,  2660,  2661,  2664,  2665,
+    2668,  2669,  2670,  2673,  2674,  2675,  2678,  2679,  2680,  2681,
+    2682,  2685,  2686,  2687,  2690,  2691,  2692,  2693,  2694,  2697,
+    2699,  2701,  2703,  2706,  2708,  2710,  2713,  2714,  2715,  2716,
+    2717,  2718,  2719,  2720,  2721,  2724,  2725,  2726,  2729,  2730,
+    2731,  2734,  2735,  2736,  2739,  2740,  2741,  2744,  2745,  2746,
+    2747,  2750,  2751,  2752,  2755,  2756,  2757,  2760,  2761,  2762,
+    2765,  2766,  2767,  2770,  2772,  2774,  2778,  2782,  2784,  2789,
+    2792,  2793,  2794,  2795,  2798,  2799,  2801,  2802,  2804,  2807,
+    2808,  2809,  2812,  2813,  2816,  2818,  2819,  2820,  2821,  2824,
+    2825,  2826,  2829,  2830,  2831,  2834,  2835,  2840,  2844,  2851,
+    2852,  2854,  2859,  2861,  2864,  2865,  2866,  2867,  2869,  2874
 };
 #endif
 
@@ -5192,267 +5193,267 @@ yyreduce:
   switch (yyn)
     {
         case 4:
-#line 458 "frame/parser.Y"
+#line 459 "frame/parser.Y"
     {fr->bgColorCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 5:
-#line 459 "frame/parser.Y"
+#line 460 "frame/parser.Y"
     {fr->bgColorCmd("gray");;}
     break;
 
   case 7:
-#line 461 "frame/parser.Y"
+#line 462 "frame/parser.Y"
     {fr->centerCmd();;}
     break;
 
   case 8:
-#line 462 "frame/parser.Y"
+#line 463 "frame/parser.Y"
     {fr->clearCmd();;}
     break;
 
   case 10:
-#line 464 "frame/parser.Y"
+#line 465 "frame/parser.Y"
     {fr->colorbarTagCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 17:
-#line 471 "frame/parser.Y"
+#line 472 "frame/parser.Y"
     {fr->DATASECCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 22:
-#line 476 "frame/parser.Y"
+#line 477 "frame/parser.Y"
     {fr->hideCmd();;}
     break;
 
   case 23:
-#line 477 "frame/parser.Y"
+#line 478 "frame/parser.Y"
     {fr->highliteCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 25:
-#line 479 "frame/parser.Y"
+#line 480 "frame/parser.Y"
     {fr->irafAlignCmd((yyvsp[(3) - (3)].integer));;}
     break;
 
   case 32:
-#line 486 "frame/parser.Y"
+#line 487 "frame/parser.Y"
     {fr->nanColorCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 36:
-#line 490 "frame/parser.Y"
+#line 491 "frame/parser.Y"
     {fr->queryCursorCmd();;}
     break;
 
   case 39:
-#line 493 "frame/parser.Y"
+#line 494 "frame/parser.Y"
     {fr->resetCmd();;}
     break;
 
   case 44:
-#line 498 "frame/parser.Y"
+#line 499 "frame/parser.Y"
     {fr->showCmd();;}
     break;
 
   case 46:
-#line 500 "frame/parser.Y"
+#line 501 "frame/parser.Y"
     {fr->threadsCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 48:
-#line 502 "frame/parser.Y"
+#line 503 "frame/parser.Y"
     {fr->unloadFitsCmd();;}
     break;
 
   case 50:
-#line 504 "frame/parser.Y"
+#line 505 "frame/parser.Y"
     {fr->msg("Frame 1.0");;}
     break;
 
   case 55:
-#line 511 "frame/parser.Y"
+#line 512 "frame/parser.Y"
     {(yyval.real)=(yyvsp[(1) - (1)].real);;}
     break;
 
   case 56:
-#line 512 "frame/parser.Y"
+#line 513 "frame/parser.Y"
     {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
     break;
 
   case 57:
-#line 515 "frame/parser.Y"
+#line 516 "frame/parser.Y"
     {yydebug=1;;}
     break;
 
   case 58:
-#line 516 "frame/parser.Y"
+#line 517 "frame/parser.Y"
     {yydebug=0;;}
     break;
 
   case 59:
-#line 517 "frame/parser.Y"
+#line 518 "frame/parser.Y"
     {DebugMosaic=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 60:
-#line 518 "frame/parser.Y"
+#line 519 "frame/parser.Y"
     {yydebug=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 61:
-#line 519 "frame/parser.Y"
+#line 520 "frame/parser.Y"
     {DebugPerf=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 62:
-#line 520 "frame/parser.Y"
+#line 521 "frame/parser.Y"
     {DebugWCS=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 63:
-#line 521 "frame/parser.Y"
+#line 522 "frame/parser.Y"
     {DebugBin=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 64:
-#line 522 "frame/parser.Y"
+#line 523 "frame/parser.Y"
     {DebugBlock=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 65:
-#line 523 "frame/parser.Y"
+#line 524 "frame/parser.Y"
     {DebugCompress=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 66:
-#line 524 "frame/parser.Y"
+#line 525 "frame/parser.Y"
     {DebugCrop=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 67:
-#line 525 "frame/parser.Y"
+#line 526 "frame/parser.Y"
     {DebugGZ=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 68:
-#line 526 "frame/parser.Y"
+#line 527 "frame/parser.Y"
     {DebugRGB=(yyvsp[(2) - (2)].integer);;}
     break;
 
   case 69:
-#line 529 "frame/parser.Y"
+#line 530 "frame/parser.Y"
     {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;}
     break;
 
   case 70:
-#line 531 "frame/parser.Y"
+#line 532 "frame/parser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 71:
-#line 532 "frame/parser.Y"
+#line 533 "frame/parser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 72:
-#line 533 "frame/parser.Y"
+#line 534 "frame/parser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 73:
-#line 534 "frame/parser.Y"
+#line 535 "frame/parser.Y"
     {(yyval.integer)=1;;}
     break;
 
   case 74:
-#line 536 "frame/parser.Y"
+#line 537 "frame/parser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 75:
-#line 537 "frame/parser.Y"
+#line 538 "frame/parser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 76:
-#line 538 "frame/parser.Y"
+#line 539 "frame/parser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 77:
-#line 539 "frame/parser.Y"
+#line 540 "frame/parser.Y"
     {(yyval.integer)=0;;}
     break;
 
   case 78:
-#line 542 "frame/parser.Y"
+#line 543 "frame/parser.Y"
     {(yyval.integer) = Base::ROOTBASE;;}
     break;
 
   case 79:
-#line 543 "frame/parser.Y"
+#line 544 "frame/parser.Y"
     {(yyval.integer) = Base::ROOTBASE;;}
     break;
 
   case 80:
-#line 544 "frame/parser.Y"
+#line 545 "frame/parser.Y"
     {(yyval.integer) = Base::FULLBASE;;}
     break;
 
   case 81:
-#line 545 "frame/parser.Y"
+#line 546 "frame/parser.Y"
     {(yyval.integer) = Base::ROOT;;}
     break;
 
   case 82:
-#line 546 "frame/parser.Y"
+#line 547 "frame/parser.Y"
     {(yyval.integer) = Base::FULL;;}
     break;
 
   case 83:
-#line 549 "frame/parser.Y"
+#line 550 "frame/parser.Y"
     {(yyval.real) = 0;;}
     break;
 
   case 84:
-#line 550 "frame/parser.Y"
+#line 551 "frame/parser.Y"
     {(yyval.real) = (yyvsp[(1) - (1)].real);;}
     break;
 
   case 85:
-#line 553 "frame/parser.Y"
+#line 554 "frame/parser.Y"
     {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;}
     break;
 
   case 86:
-#line 554 "frame/parser.Y"
+#line 555 "frame/parser.Y"
     {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;}
     break;
 
   case 87:
-#line 555 "frame/parser.Y"
+#line 556 "frame/parser.Y"
     {(yyval.real)=(yyvsp[(1) - (1)].real);;}
     break;
 
   case 88:
-#line 558 "frame/parser.Y"
+#line 559 "frame/parser.Y"
     {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 89:
-#line 561 "frame/parser.Y"
+#line 562 "frame/parser.Y"
     {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 90:
-#line 564 "frame/parser.Y"
+#line 565 "frame/parser.Y"
     {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
     break;
 
   case 91:
-#line 568 "frame/parser.Y"
+#line 569 "frame/parser.Y"
     {
 	  Vector r;
 	  if (currentSky == Coord::GALACTIC || currentSky == Coord::ECLIPTIC) 
@@ -5467,7 +5468,7 @@ yyreduce:
     break;
 
   case 92:
-#line 580 "frame/parser.Y"
+#line 581 "frame/parser.Y"
     {
 	  Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));
 	  (yyval.vector)[0] = r[0];
@@ -5477,7 +5478,7 @@ yyreduce:
     break;
 
   case 93:
-#line 587 "frame/parser.Y"
+#line 588 "frame/parser.Y"
     {
 	  Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));
 	  (yyval.vector)[0] = r[0];
@@ -5487,7 +5488,7 @@ yyreduce:
     break;
 
   case 94:
-#line 594 "frame/parser.Y"
+#line 595 "frame/parser.Y"
     {
 	  (yyval.vector)[0] = (yyvsp[(1) - (2)].real);
 	  (yyval.vector)[1] = (yyvsp[(2) - (2)].real);
@@ -5496,790 +5497,790 @@ yyreduce:
     break;
 
   case 95:
-#line 601 "frame/parser.Y"
+#line 602 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::IMAGE;;}
     break;
 
   case 96:
-#line 602 "frame/parser.Y"
+#line 603 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::PHYSICAL;;}
     break;
 
   case 97:
-#line 603 "frame/parser.Y"
+#line 604 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::DETECTOR;;}
     break;
 
   case 98:
-#line 604 "frame/parser.Y"
+#line 605 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::AMPLIFIER;;}
     break;
 
   case 99:
-#line 605 "frame/parser.Y"
+#line 606 "frame/parser.Y"
     {(yyval.integer) = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
     break;
 
   case 100:
-#line 608 "frame/parser.Y"
+#line 609 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCS;;}
     break;
 
   case 101:
-#line 609 "frame/parser.Y"
+#line 610 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSA;;}
     break;
 
   case 102:
-#line 610 "frame/parser.Y"
+#line 611 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSB;;}
     break;
 
   case 103:
-#line 611 "frame/parser.Y"
+#line 612 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSC;;}
     break;
 
   case 104:
-#line 612 "frame/parser.Y"
+#line 613 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSD;;}
     break;
 
   case 105:
-#line 613 "frame/parser.Y"
+#line 614 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSE;;}
     break;
 
   case 106:
-#line 614 "frame/parser.Y"
+#line 615 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSF;;}
     break;
 
   case 107:
-#line 615 "frame/parser.Y"
+#line 616 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSG;;}
     break;
 
   case 108:
-#line 616 "frame/parser.Y"
+#line 617 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSH;;}
     break;
 
   case 109:
-#line 617 "frame/parser.Y"
+#line 618 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSI;;}
     break;
 
   case 110:
-#line 618 "frame/parser.Y"
+#line 619 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSJ;;}
     break;
 
   case 111:
-#line 619 "frame/parser.Y"
+#line 620 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSK;;}
     break;
 
   case 112:
-#line 620 "frame/parser.Y"
+#line 621 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSL;;}
     break;
 
   case 113:
-#line 621 "frame/parser.Y"
+#line 622 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSM;;}
     break;
 
   case 114:
-#line 622 "frame/parser.Y"
+#line 623 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSN;;}
     break;
 
   case 115:
-#line 623 "frame/parser.Y"
+#line 624 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSO;;}
     break;
 
   case 116:
-#line 624 "frame/parser.Y"
+#line 625 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSP;;}
     break;
 
   case 117:
-#line 625 "frame/parser.Y"
+#line 626 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSQ;;}
     break;
 
   case 118:
-#line 626 "frame/parser.Y"
+#line 627 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSR;;}
     break;
 
   case 119:
-#line 627 "frame/parser.Y"
+#line 628 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSS;;}
     break;
 
   case 120:
-#line 628 "frame/parser.Y"
+#line 629 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCST;;}
     break;
 
   case 121:
-#line 629 "frame/parser.Y"
+#line 630 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSU;;}
     break;
 
   case 122:
-#line 630 "frame/parser.Y"
+#line 631 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSV;;}
     break;
 
   case 123:
-#line 631 "frame/parser.Y"
+#line 632 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSW;;}
     break;
 
   case 124:
-#line 632 "frame/parser.Y"
+#line 633 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSX;;}
     break;
 
   case 125:
-#line 633 "frame/parser.Y"
+#line 634 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSY;;}
     break;
 
   case 126:
-#line 634 "frame/parser.Y"
+#line 635 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCSZ;;}
     break;
 
   case 127:
-#line 635 "frame/parser.Y"
+#line 636 "frame/parser.Y"
     {(yyval.integer) = currentCoord = Coord::WCS0;;}
     break;
 
   case 128:
-#line 638 "frame/parser.Y"
+#line 639 "frame/parser.Y"
     {(yyval.integer) = Coord::CANVAS;;}
     break;
 
   case 129:
-#line 639 "frame/parser.Y"
+#line 640 "frame/parser.Y"
     {(yyval.integer) = Coord::PANNER;;}
     break;
 
   case 130:
-#line 642 "frame/parser.Y"
+#line 643 "frame/parser.Y"
     {(yyval.integer) = FitsMask::NONZERO;;}
     break;
 
   case 131:
-#line 643 "frame/parser.Y"
+#line 644 "frame/parser.Y"
     {(yyval.integer) = FitsMask::ZERO;;}
     break;
 
   case 132:
-#line 644 "frame/parser.Y"
+#line 645 "frame/parser.Y"
     {(yyval.integer) = FitsMask::NONZERO;;}
     break;
 
   case 133:
-#line 645 "frame/parser.Y"
+#line 646 "frame/parser.Y"
     {(yyval.integer) = FitsMask::NaN;;}
     break;
 
   case 134:
-#line 646 "frame/parser.Y"
+#line 647 "frame/parser.Y"
     {(yyval.integer) = FitsMask::NONNaN;;}
     break;
 
   case 135:
-#line 647 "frame/parser.Y"
+#line 648 "frame/parser.Y"
     {(yyval.integer) = FitsMask::RANGE;;}
     break;
 
   case 136:
-#line 650 "frame/parser.Y"
+#line 651 "frame/parser.Y"
     {(yyval.integer) = FrScale::LINEARSCALE;;}
     break;
 
   case 137:
-#line 651 "frame/parser.Y"
+#line 652 "frame/parser.Y"
     {(yyval.integer) = FrScale::LOGSCALE;;}
     break;
 
   case 138:
-#line 652 "frame/parser.Y"
+#line 653 "frame/parser.Y"
     {(yyval.integer) = FrScale::POWSCALE;;}
     break;
 
   case 139:
-#line 653 "frame/parser.Y"
+#line 654 "frame/parser.Y"
     {(yyval.integer) = FrScale::SQRTSCALE;;}
     break;
 
   case 140:
-#line 654 "frame/parser.Y"
+#line 655 "frame/parser.Y"
     {(yyval.integer) = FrScale::SQUAREDSCALE;;}
     break;
 
   case 141:
-#line 655 "frame/parser.Y"
+#line 656 "frame/parser.Y"
     {(yyval.integer) = FrScale::ASINHSCALE;;}
     break;
 
   case 142:
-#line 656 "frame/parser.Y"
+#line 657 "frame/parser.Y"
     {(yyval.integer) = FrScale::SINHSCALE;;}
     break;
 
   case 143:
-#line 657 "frame/parser.Y"
+#line 658 "frame/parser.Y"
     {(yyval.integer) = FrScale::HISTEQUSCALE;;}
     break;
 
   case 144:
-#line 660 "frame/parser.Y"
+#line 661 "frame/parser.Y"
     {(yyval.integer)=FrScale::SCAN;;}
     break;
 
   case 145:
-#line 661 "frame/parser.Y"
+#line 662 "frame/parser.Y"
     {(yyval.integer)=FrScale::SCAN;;}
     break;
 
   case 146:
-#line 662 "frame/parser.Y"
+#line 663 "frame/parser.Y"
     {(yyval.integer)=FrScale::SAMPLE;;}
     break;
 
   case 147:
-#line 663 "frame/parser.Y"
+#line 664 "frame/parser.Y"
     {(yyval.integer)=FrScale::DATAMIN;;}
     break;
 
   case 148:
-#line 664 "frame/parser.Y"
+#line 665 "frame/parser.Y"
     {(yyval.integer)=FrScale::IRAFMIN;;}
     break;
 
   case 149:
-#line 667 "frame/parser.Y"
+#line 668 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::FK5;;}
     break;
 
   case 150:
-#line 668 "frame/parser.Y"
+#line 669 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::FK4;;}
     break;
 
   case 151:
-#line 669 "frame/parser.Y"
+#line 670 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::FK4;;}
     break;
 
   case 152:
-#line 670 "frame/parser.Y"
+#line 671 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::FK5;;}
     break;
 
   case 153:
-#line 671 "frame/parser.Y"
+#line 672 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::FK5;;}
     break;
 
   case 154:
-#line 672 "frame/parser.Y"
+#line 673 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::ICRS;;}
     break;
 
   case 155:
-#line 673 "frame/parser.Y"
+#line 674 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::GALACTIC;;}
     break;
 
   case 156:
-#line 674 "frame/parser.Y"
+#line 675 "frame/parser.Y"
     {(yyval.integer) = currentSky = Coord::ECLIPTIC;;}
     break;
 
   case 157:
-#line 677 "frame/parser.Y"
+#line 678 "frame/parser.Y"
     {(yyval.integer)=Coord::DEGREES;;}
     break;
 
   case 158:
-#line 678 "frame/parser.Y"
+#line 679 "frame/parser.Y"
     {(yyval.integer)=Coord::DEGREES;;}
     break;
 
   case 159:
-#line 679 "frame/parser.Y"
+#line 680 "frame/parser.Y"
     {(yyval.integer)=Coord::SEXAGESIMAL;;}
     break;
 
   case 160:
-#line 682 "frame/parser.Y"
+#line 683 "frame/parser.Y"
     {(yyval.integer)=Coord::DEGREE;;}
     break;
 
   case 161:
-#line 683 "frame/parser.Y"
+#line 684 "frame/parser.Y"
     {(yyval.integer)=Coord::DEGREE;;}
     break;
 
   case 162:
-#line 684 "frame/parser.Y"
+#line 685 "frame/parser.Y"
     {(yyval.integer)=Coord::ARCMIN;;}
     break;
 
   case 163:
-#line 685 "frame/parser.Y"
+#line 686 "frame/parser.Y"
     {(yyval.integer)=Coord::ARCSEC;;}
     break;
 
   case 164:
-#line 688 "frame/parser.Y"
+#line 689 "frame/parser.Y"
     {(yyval.integer) = Base::SHMID;;}
     break;
 
   case 165:
-#line 689 "frame/parser.Y"
+#line 690 "frame/parser.Y"
     {(yyval.integer) = Base::SHMID;;}
     break;
 
   case 166:
-#line 690 "frame/parser.Y"
+#line 691 "frame/parser.Y"
     {(yyval.integer) = Base::KEY;;}
     break;
 
   case 167:
-#line 693 "frame/parser.Y"
+#line 694 "frame/parser.Y"
     {;}
     break;
 
   case 168:
-#line 694 "frame/parser.Y"
+#line 695 "frame/parser.Y"
     {;}
     break;
 
   case 169:
-#line 695 "frame/parser.Y"
+#line 696 "frame/parser.Y"
     {;}
     break;
 
   case 170:
-#line 698 "frame/parser.Y"
+#line 699 "frame/parser.Y"
     {(yyval.integer) = Base::IMG;;}
     break;
 
   case 171:
-#line 699 "frame/parser.Y"
+#line 700 "frame/parser.Y"
     {(yyval.integer) = Base::IMG;;}
     break;
 
   case 172:
-#line 700 "frame/parser.Y"
+#line 701 "frame/parser.Y"
     {(yyval.integer) = Base::MASK;;}
     break;
 
   case 173:
-#line 703 "frame/parser.Y"
+#line 704 "frame/parser.Y"
     {(yyval.integer) = Point::CIRCLE;;}
     break;
 
   case 174:
-#line 704 "frame/parser.Y"
+#line 705 "frame/parser.Y"
     {(yyval.integer) = Point::CIRCLE;;}
     break;
 
   case 175:
-#line 705 "frame/parser.Y"
+#line 706 "frame/parser.Y"
     {(yyval.integer) = Point::BOX;;}
     break;
 
   case 176:
-#line 706 "frame/parser.Y"
+#line 707 "frame/parser.Y"
     {(yyval.integer) = Point::DIAMOND;;}
     break;
 
   case 177:
-#line 707 "frame/parser.Y"
+#line 708 "frame/parser.Y"
     {(yyval.integer) = Point::CROSS;;}
     break;
 
   case 178:
-#line 708 "frame/parser.Y"
+#line 709 "frame/parser.Y"
     {(yyval.integer) = Point::EX;;}
     break;
 
   case 179:
-#line 709 "frame/parser.Y"
+#line 710 "frame/parser.Y"
     {(yyval.integer) = Point::ARROW;;}
     break;
 
   case 180:
-#line 710 "frame/parser.Y"
+#line 711 "frame/parser.Y"
     {(yyval.integer) = Point::BOXCIRCLE;;}
     break;
 
   case 181:
-#line 713 "frame/parser.Y"
+#line 714 "frame/parser.Y"
     {(yyval.integer) = POINTSIZE;;}
     break;
 
   case 182:
-#line 714 "frame/parser.Y"
+#line 715 "frame/parser.Y"
     {(yyval.integer) = (yyvsp[(1) - (1)].integer);;}
     break;
 
   case 183:
-#line 717 "frame/parser.Y"
+#line 718 "frame/parser.Y"
     {(yyval.integer) = Marker::PANDA;;}
     break;
 
   case 184:
-#line 718 "frame/parser.Y"
+#line 719 "frame/parser.Y"
     {(yyval.integer) = Marker::HISTOGRAM;;}
     break;
 
   case 185:
-#line 719 "frame/parser.Y"
+#line 720 "frame/parser.Y"
     {(yyval.integer) = Marker::PLOT2D;;}
     break;
 
   case 186:
-#line 720 "frame/parser.Y"
+#line 721 "frame/parser.Y"
     {(yyval.integer) = Marker::PLOT3D;;}
     break;
 
   case 187:
-#line 721 "frame/parser.Y"
+#line 722 "frame/parser.Y"
     {(yyval.integer) = Marker::RADIAL;;}
     break;
 
   case 188:
-#line 722 "frame/parser.Y"
+#line 723 "frame/parser.Y"
     {(yyval.integer) = Marker::STATS;;}
     break;
 
   case 189:
-#line 725 "frame/parser.Y"
+#line 726 "frame/parser.Y"
     {(yyval.integer) = Marker::AVERAGE;;}
     break;
 
   case 190:
-#line 726 "frame/parser.Y"
+#line 727 "frame/parser.Y"
     {(yyval.integer) = Marker::AVERAGE;;}
     break;
 
   case 191:
-#line 727 "frame/parser.Y"
+#line 728 "frame/parser.Y"
     {(yyval.integer) = Marker::SUM;;}
     break;
 
   case 192:
-#line 730 "frame/parser.Y"
+#line 731 "frame/parser.Y"
     {(yyval.integer) = FitsFile::NATIVE;;}
     break;
 
   case 193:
-#line 731 "frame/parser.Y"
+#line 732 "frame/parser.Y"
     {(yyval.integer) = FitsFile::NATIVE;;}
     break;
 
   case 194:
-#line 732 "frame/parser.Y"
+#line 733 "frame/parser.Y"
     {(yyval.integer) = FitsFile::BIG;;}
     break;
 
   case 195:
-#line 733 "frame/parser.Y"
+#line 734 "frame/parser.Y"
     {(yyval.integer) = FitsFile::BIG;;}
     break;
 
   case 196:
-#line 734 "frame/parser.Y"
+#line 735 "frame/parser.Y"
     {(yyval.integer) = FitsFile::LITTLE;;}
     break;
 
   case 197:
-#line 735 "frame/parser.Y"
+#line 736 "frame/parser.Y"
     {(yyval.integer) = FitsFile::LITTLE;;}
     break;
 
   case 202:
-#line 742 "frame/parser.Y"
+#line 743 "frame/parser.Y"
     {fr->set3dRenderMethodCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 203:
-#line 743 "frame/parser.Y"
+#line 744 "frame/parser.Y"
     {fr->set3dRenderBackgroundCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 204:
-#line 744 "frame/parser.Y"
+#line 745 "frame/parser.Y"
     {fr->set3dScaleCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 205:
-#line 745 "frame/parser.Y"
+#line 746 "frame/parser.Y"
     {fr->set3dPreserveCmd();;}
     break;
 
   case 206:
-#line 747 "frame/parser.Y"
+#line 748 "frame/parser.Y"
     {/* needed for compatibility with old version of backup */;}
     break;
 
   case 207:
-#line 750 "frame/parser.Y"
+#line 751 "frame/parser.Y"
     {fr->set3dBorderCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 208:
-#line 751 "frame/parser.Y"
+#line 752 "frame/parser.Y"
     {fr->set3dBorderColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 209:
-#line 754 "frame/parser.Y"
+#line 755 "frame/parser.Y"
     {fr->set3dCompassCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 210:
-#line 755 "frame/parser.Y"
+#line 756 "frame/parser.Y"
     {fr->set3dCompassColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 211:
-#line 758 "frame/parser.Y"
+#line 759 "frame/parser.Y"
     {fr->set3dHighliteCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 212:
-#line 759 "frame/parser.Y"
+#line 760 "frame/parser.Y"
     {fr->set3dHighliteColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 213:
-#line 762 "frame/parser.Y"
+#line 763 "frame/parser.Y"
     {fr->set3dViewCmd((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));;}
     break;
 
   case 214:
-#line 764 "frame/parser.Y"
+#line 765 "frame/parser.Y"
     {fr->set3dViewPointCmd(Vector3d((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 216:
-#line 768 "frame/parser.Y"
+#line 769 "frame/parser.Y"
     {fr->binColsCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;}
     break;
 
   case 217:
-#line 769 "frame/parser.Y"
+#line 770 "frame/parser.Y"
     {fr->binDepthCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 220:
-#line 772 "frame/parser.Y"
+#line 773 "frame/parser.Y"
     {fr->binBufferSizeCmd((yyvsp[(3) - (3)].integer));;}
     break;
 
   case 222:
-#line 774 "frame/parser.Y"
+#line 775 "frame/parser.Y"
     {fr->binFilterCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 223:
-#line 777 "frame/parser.Y"
+#line 778 "frame/parser.Y"
     {fr->binAboutCmd();;}
     break;
 
   case 224:
-#line 778 "frame/parser.Y"
+#line 779 "frame/parser.Y"
     {fr->binAboutCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 225:
-#line 781 "frame/parser.Y"
+#line 782 "frame/parser.Y"
     {fr->binFactorCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;}
     break;
 
   case 226:
-#line 782 "frame/parser.Y"
+#line 783 "frame/parser.Y"
     {fr->binFactorCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 227:
-#line 784 "frame/parser.Y"
+#line 785 "frame/parser.Y"
     {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(1) - (4)].real)), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 228:
-#line 786 "frame/parser.Y"
+#line 787 "frame/parser.Y"
     {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
     break;
 
   case 229:
-#line 787 "frame/parser.Y"
+#line 788 "frame/parser.Y"
     {fr->binFactorToCmd(Vector((yyvsp[(2) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 230:
-#line 788 "frame/parser.Y"
+#line 789 "frame/parser.Y"
     {fr->binFactorToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 231:
-#line 790 "frame/parser.Y"
+#line 791 "frame/parser.Y"
     {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
     break;
 
   case 232:
-#line 792 "frame/parser.Y"
+#line 793 "frame/parser.Y"
     {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 233:
-#line 795 "frame/parser.Y"
+#line 796 "frame/parser.Y"
     {fr->binFunctionCmd(FitsHist::AVERAGE);;}
     break;
 
   case 234:
-#line 796 "frame/parser.Y"
+#line 797 "frame/parser.Y"
     {fr->binFunctionCmd(FitsHist::SUM);;}
     break;
 
   case 235:
-#line 799 "frame/parser.Y"
+#line 800 "frame/parser.Y"
     {fr->binToFitCmd();;}
     break;
 
   case 236:
-#line 801 "frame/parser.Y"
+#line 802 "frame/parser.Y"
     {fr->binCmd(Vector((yyvsp[(1) - (7)].real),(yyvsp[(2) - (7)].real)), (yyvsp[(5) - (7)].str), (yyvsp[(6) - (7)].str), (yyvsp[(7) - (7)].str));;}
     break;
 
   case 237:
-#line 804 "frame/parser.Y"
+#line 805 "frame/parser.Y"
     {fr->binCmd(Vector((yyvsp[(1) - (11)].real),(yyvsp[(2) - (11)].real)), (yyvsp[(3) - (11)].integer), Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)), (yyvsp[(8) - (11)].str), (yyvsp[(9) - (11)].str), (yyvsp[(10) - (11)].str), (yyvsp[(11) - (11)].str));;}
     break;
 
   case 238:
-#line 806 "frame/parser.Y"
+#line 807 "frame/parser.Y"
     {fr->binCmd(Vector((yyvsp[(1) - (8)].real),(yyvsp[(2) - (8)].real)), Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (yyvsp[(6) - (8)].str), (yyvsp[(7) - (8)].str), (yyvsp[(8) - (8)].str));;}
     break;
 
   case 239:
-#line 809 "frame/parser.Y"
+#line 810 "frame/parser.Y"
     {fr->binCmd(Vector((yyvsp[(1) - (12)].real),(yyvsp[(2) - (12)].real)), (yyvsp[(3) - (12)].integer), Vector((yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real)), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), 
 	    (yyvsp[(9) - (12)].str), (yyvsp[(10) - (12)].str), (yyvsp[(11) - (12)].str), (yyvsp[(12) - (12)].str));;}
     break;
 
   case 240:
-#line 813 "frame/parser.Y"
+#line 814 "frame/parser.Y"
     {fr->blockCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;}
     break;
 
   case 241:
-#line 814 "frame/parser.Y"
+#line 815 "frame/parser.Y"
     {fr->blockCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 243:
-#line 818 "frame/parser.Y"
+#line 819 "frame/parser.Y"
     {fr->blockToFitCmd();;}
     break;
 
   case 244:
-#line 819 "frame/parser.Y"
+#line 820 "frame/parser.Y"
     {fr->blockToCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;}
     break;
 
   case 245:
-#line 820 "frame/parser.Y"
+#line 821 "frame/parser.Y"
     {fr->blockToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 249:
-#line 826 "frame/parser.Y"
+#line 827 "frame/parser.Y"
     {fr->clipUserCmd((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real));;}
     break;
 
   case 250:
-#line 827 "frame/parser.Y"
+#line 828 "frame/parser.Y"
     {fr->clipUserCmd(NAN,NAN);;}
     break;
 
   case 252:
-#line 830 "frame/parser.Y"
+#line 831 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	;}
     break;
 
   case 253:
-#line 835 "frame/parser.Y"
+#line 836 "frame/parser.Y"
     {fr->clipScopeCmd(FrScale::GLOBAL);;}
     break;
 
   case 254:
-#line 836 "frame/parser.Y"
+#line 837 "frame/parser.Y"
     {fr->clipScopeCmd(FrScale::LOCAL);;}
     break;
 
   case 255:
-#line 839 "frame/parser.Y"
+#line 840 "frame/parser.Y"
     {fr->clipModeCmd((yyvsp[(1) - (1)].real));;}
     break;
 
   case 256:
-#line 840 "frame/parser.Y"
+#line 841 "frame/parser.Y"
     {fr->clipModeCmd(FrScale::MINMAX);;}
     break;
 
   case 257:
-#line 841 "frame/parser.Y"
+#line 842 "frame/parser.Y"
     {fr->clipModeCmd(FrScale::ZSCALE);;}
     break;
 
   case 258:
-#line 842 "frame/parser.Y"
+#line 843 "frame/parser.Y"
     {fr->clipModeCmd(FrScale::ZMAX);;}
     break;
 
   case 259:
-#line 843 "frame/parser.Y"
+#line 844 "frame/parser.Y"
     {fr->clipModeCmd(FrScale::USERCLIP);;}
     break;
 
   case 260:
-#line 846 "frame/parser.Y"
+#line 847 "frame/parser.Y"
     {fr->clipMinMaxCmd((FrScale::MinMaxMode)(yyvsp[(2) - (2)].integer),(yyvsp[(1) - (2)].integer));;}
     break;
 
   case 261:
-#line 847 "frame/parser.Y"
+#line 848 "frame/parser.Y"
     {fr->clipMinMaxModeCmd((FrScale::MinMaxMode)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 262:
-#line 848 "frame/parser.Y"
+#line 849 "frame/parser.Y"
     {fr->clipMinMaxSampleCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 263:
-#line 851 "frame/parser.Y"
+#line 852 "frame/parser.Y"
     {fr->clipZScaleCmd((yyvsp[(1) - (3)].real),(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 264:
-#line 853 "frame/parser.Y"
+#line 854 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->clipZScaleContrastCmd((yyvsp[(2) - (2)].real));
@@ -6287,7 +6288,7 @@ yyreduce:
     break;
 
   case 265:
-#line 858 "frame/parser.Y"
+#line 859 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->clipZScaleSampleCmd((yyvsp[(2) - (2)].integer));
@@ -6295,7 +6296,7 @@ yyreduce:
     break;
 
   case 266:
-#line 863 "frame/parser.Y"
+#line 864 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->clipZScaleLineCmd((yyvsp[(2) - (2)].integer));
@@ -6303,57 +6304,57 @@ yyreduce:
     break;
 
   case 267:
-#line 870 "frame/parser.Y"
+#line 871 "frame/parser.Y"
     {fr->colormapCmd((yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].real), (yyvsp[(3) - (6)].real), (yyvsp[(4) - (6)].integer), (unsigned char*)(yyvsp[(5) - (6)].ptr), (yyvsp[(6) - (6)].integer));;}
     break;
 
   case 268:
-#line 872 "frame/parser.Y"
+#line 873 "frame/parser.Y"
     {fr->colormapCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;}
     break;
 
   case 269:
-#line 873 "frame/parser.Y"
+#line 874 "frame/parser.Y"
     {fr->colormapBeginCmd();;}
     break;
 
   case 271:
-#line 875 "frame/parser.Y"
+#line 876 "frame/parser.Y"
     {fr->colormapEndCmd();;}
     break;
 
   case 272:
-#line 879 "frame/parser.Y"
+#line 880 "frame/parser.Y"
     {fr->colormapMotionCmd((yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].real), (yyvsp[(3) - (6)].real), (yyvsp[(4) - (6)].integer), (unsigned char*)(yyvsp[(5) - (6)].ptr), (yyvsp[(6) - (6)].integer));;}
     break;
 
   case 273:
-#line 881 "frame/parser.Y"
+#line 882 "frame/parser.Y"
     {fr->colormapMotionCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;}
     break;
 
   case 274:
-#line 883 "frame/parser.Y"
+#line 884 "frame/parser.Y"
     {fr->colorScaleCmd((FrScale::ColorScaleType)(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 275:
-#line 884 "frame/parser.Y"
+#line 885 "frame/parser.Y"
     {fr->colorScaleLogCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 281:
-#line 895 "frame/parser.Y"
+#line 896 "frame/parser.Y"
     {fr->contourCreateCmd((yyvsp[(1) - (13)].str),(yyvsp[(2) - (13)].integer),(yyvsp[(3) - (13)].integer),(FVContour::Method)(yyvsp[(4) - (13)].integer),(yyvsp[(5) - (13)].integer),(yyvsp[(6) - (13)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (13)].integer),(yyvsp[(8) - (13)].real),(FrScale::ClipMode)(yyvsp[(9) - (13)].integer),100,(FrScale::ClipScope)(yyvsp[(10) - (13)].integer),(yyvsp[(11) - (13)].real),(yyvsp[(12) - (13)].real),(yyvsp[(13) - (13)].str));;}
     break;
 
   case 282:
-#line 897 "frame/parser.Y"
+#line 898 "frame/parser.Y"
     {fr->contourCreateCmd((yyvsp[(1) - (13)].str),(yyvsp[(2) - (13)].integer),(yyvsp[(3) - (13)].integer),(FVContour::Method)(yyvsp[(4) - (13)].integer),(yyvsp[(5) - (13)].integer),(yyvsp[(6) - (13)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (13)].integer),(yyvsp[(8) - (13)].real),FrScale::AUTOCUT,(yyvsp[(9) - (13)].real),(FrScale::ClipScope)(yyvsp[(10) - (13)].integer),(yyvsp[(11) - (13)].real),(yyvsp[(12) - (13)].real),(yyvsp[(13) - (13)].str));;}
     break;
 
   case 283:
-#line 899 "frame/parser.Y"
+#line 900 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->contourCreateCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].integer),(yyvsp[(3) - (12)].integer),(FVContour::Method)(yyvsp[(4) - (12)].integer),(yyvsp[(5) - (12)].integer),(yyvsp[(6) - (12)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (12)].integer),(yyvsp[(8) - (12)].real),(FrScale::ClipMode)(yyvsp[(9) - (12)].integer),100,FrScale::LOCAL,(yyvsp[(10) - (12)].real),(yyvsp[(11) - (12)].real),(yyvsp[(12) - (12)].str));
@@ -6361,7 +6362,7 @@ yyreduce:
     break;
 
   case 284:
-#line 904 "frame/parser.Y"
+#line 905 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->contourCreateCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].integer),(yyvsp[(3) - (12)].integer),(FVContour::Method)(yyvsp[(4) - (12)].integer),(yyvsp[(5) - (12)].integer),(yyvsp[(6) - (12)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (12)].integer),(yyvsp[(8) - (12)].real),FrScale::AUTOCUT,(yyvsp[(9) - (12)].real),FrScale::LOCAL,(yyvsp[(10) - (12)].real),(yyvsp[(11) - (12)].real),(yyvsp[(12) - (12)].str));
@@ -6369,32 +6370,32 @@ yyreduce:
     break;
 
   case 285:
-#line 908 "frame/parser.Y"
+#line 909 "frame/parser.Y"
     {fr->contourCreatePolygonCmd();;}
     break;
 
   case 286:
-#line 911 "frame/parser.Y"
+#line 912 "frame/parser.Y"
     {fr->contourDeleteCmd();;}
     break;
 
   case 287:
-#line 912 "frame/parser.Y"
+#line 913 "frame/parser.Y"
     {fr->contourDeleteAuxCmd();;}
     break;
 
   case 288:
-#line 915 "frame/parser.Y"
+#line 916 "frame/parser.Y"
     {fr->contourLoadCmd((yyvsp[(1) - (1)].str));;}
     break;
 
   case 289:
-#line 916 "frame/parser.Y"
+#line 917 "frame/parser.Y"
     {fr->contourLoadCmd((yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 290:
-#line 918 "frame/parser.Y"
+#line 919 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->contourLoadCmd((yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyFrame)(yyvsp[(6) - (6)].integer),(yyvsp[(1) - (6)].str),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer));
@@ -6402,348 +6403,348 @@ yyreduce:
     break;
 
   case 291:
-#line 924 "frame/parser.Y"
+#line 925 "frame/parser.Y"
     {(yyval.integer) = FrScale::MINMAX;;}
     break;
 
   case 292:
-#line 925 "frame/parser.Y"
+#line 926 "frame/parser.Y"
     {(yyval.integer) = FrScale::ZSCALE;;}
     break;
 
   case 293:
-#line 926 "frame/parser.Y"
+#line 927 "frame/parser.Y"
     {(yyval.integer) = FrScale::ZMAX;;}
     break;
 
   case 294:
-#line 927 "frame/parser.Y"
+#line 928 "frame/parser.Y"
     {(yyval.integer) = FrScale::USERCLIP;;}
     break;
 
   case 295:
-#line 930 "frame/parser.Y"
+#line 931 "frame/parser.Y"
     {(yyval.integer) = FrScale::GLOBAL;;}
     break;
 
   case 296:
-#line 931 "frame/parser.Y"
+#line 932 "frame/parser.Y"
     {(yyval.integer) = FrScale::LOCAL;;}
     break;
 
   case 297:
-#line 934 "frame/parser.Y"
+#line 935 "frame/parser.Y"
     {(yyval.integer) = FVContour::SMOOTH;;}
     break;
 
   case 298:
-#line 935 "frame/parser.Y"
+#line 936 "frame/parser.Y"
     {(yyval.integer) = FVContour::BLOCK;;}
     break;
 
   case 299:
-#line 938 "frame/parser.Y"
+#line 939 "frame/parser.Y"
     {fr->contourPasteCmd((yyvsp[(1) - (1)].str));;}
     break;
 
   case 300:
-#line 939 "frame/parser.Y"
+#line 940 "frame/parser.Y"
     {fr->contourPasteCmd((yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 301:
-#line 943 "frame/parser.Y"
+#line 944 "frame/parser.Y"
     {fr->contourSaveCmd((yyvsp[(1) - (3)].str), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 302:
-#line 945 "frame/parser.Y"
+#line 946 "frame/parser.Y"
     {fr->contourSaveAuxCmd((yyvsp[(2) - (4)].str),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 303:
-#line 948 "frame/parser.Y"
+#line 949 "frame/parser.Y"
     {fr->cropCmd();;}
     break;
 
   case 304:
-#line 950 "frame/parser.Y"
+#line 951 "frame/parser.Y"
     {fr->cropCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),
 	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyFrame)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 305:
-#line 953 "frame/parser.Y"
+#line 954 "frame/parser.Y"
     {fr->cropCenterCmd(Vector((yyvsp[(2) - (8)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer), Vector((yyvsp[(5) - (8)].real),(yyvsp[(6) - (8)].real)), (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 307:
-#line 955 "frame/parser.Y"
+#line 956 "frame/parser.Y"
     {fr->cropBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 308:
-#line 956 "frame/parser.Y"
+#line 957 "frame/parser.Y"
     {fr->cropMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 309:
-#line 957 "frame/parser.Y"
+#line 958 "frame/parser.Y"
     {fr->cropEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 310:
-#line 960 "frame/parser.Y"
+#line 961 "frame/parser.Y"
     {fr->crop3dCmd();;}
     break;
 
   case 311:
-#line 962 "frame/parser.Y"
+#line 963 "frame/parser.Y"
     {fr->crop3dCmd((yyvsp[(1) - (4)].real), (yyvsp[(2) - (4)].real), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 312:
-#line 963 "frame/parser.Y"
+#line 964 "frame/parser.Y"
     {fr->crop3dBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 313:
-#line 964 "frame/parser.Y"
+#line 965 "frame/parser.Y"
     {fr->crop3dMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 314:
-#line 965 "frame/parser.Y"
+#line 966 "frame/parser.Y"
     {fr->crop3dEndCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 315:
-#line 969 "frame/parser.Y"
+#line 970 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)), (Coord::InternalSystem)(yyvsp[(1) - (3)].integer));;}
     break;
 
   case 316:
-#line 971 "frame/parser.Y"
+#line 972 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
     break;
 
   case 317:
-#line 972 "frame/parser.Y"
+#line 973 "frame/parser.Y"
     {fr->crosshairCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 318:
-#line 973 "frame/parser.Y"
+#line 974 "frame/parser.Y"
     {fr->crosshairWarpCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 319:
-#line 976 "frame/parser.Y"
+#line 977 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)), (Coord::InternalSystem)(yyvsp[(3) - (5)].integer));;}
     break;
 
   case 320:
-#line 978 "frame/parser.Y"
+#line 979 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
     break;
 
   case 321:
-#line 980 "frame/parser.Y"
+#line 981 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer));;}
     break;
 
   case 322:
-#line 982 "frame/parser.Y"
+#line 983 "frame/parser.Y"
     {fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer));;}
     break;
 
   case 323:
-#line 985 "frame/parser.Y"
+#line 986 "frame/parser.Y"
     {fr->axesOrderCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 324:
-#line 988 "frame/parser.Y"
+#line 989 "frame/parser.Y"
     {(yyval.integer) = Base::AVERAGE;;}
     break;
 
   case 325:
-#line 989 "frame/parser.Y"
+#line 990 "frame/parser.Y"
     {(yyval.integer) = Base::AVERAGE;;}
     break;
 
   case 326:
-#line 990 "frame/parser.Y"
+#line 991 "frame/parser.Y"
     {(yyval.integer) = Base::SUM;;}
     break;
 
   case 327:
-#line 993 "frame/parser.Y"
+#line 994 "frame/parser.Y"
     {fr->fitsyHasExtCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 328:
-#line 996 "frame/parser.Y"
+#line 997 "frame/parser.Y"
     {fr->getBgColorCmd();;}
     break;
 
   case 342:
-#line 1010 "frame/parser.Y"
+#line 1011 "frame/parser.Y"
     {fr->getDATASECCmd();;}
     break;
 
   case 345:
-#line 1013 "frame/parser.Y"
+#line 1014 "frame/parser.Y"
     {fr->getHistogramCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 346:
-#line 1015 "frame/parser.Y"
+#line 1016 "frame/parser.Y"
     {fr->getHorzCutCmd((yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),Vector((yyvsp[(5) - (9)].real),(yyvsp[(6) - (9)].real)),(Coord::InternalSystem)(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(Base::CutMethod)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 349:
-#line 1018 "frame/parser.Y"
+#line 1019 "frame/parser.Y"
     {fr->getIRAFAlignCmd();;}
     break;
 
   case 350:
-#line 1019 "frame/parser.Y"
+#line 1020 "frame/parser.Y"
     {fr->getMinMaxCmd();;}
     break;
 
   case 353:
-#line 1022 "frame/parser.Y"
+#line 1023 "frame/parser.Y"
     {fr->getNANColorCmd();;}
     break;
 
   case 354:
-#line 1023 "frame/parser.Y"
+#line 1024 "frame/parser.Y"
     {fr->getOrientCmd();;}
     break;
 
   case 356:
-#line 1026 "frame/parser.Y"
+#line 1027 "frame/parser.Y"
     {fr->getPixelTableCmd(Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (Coord::InternalSystem)(yyvsp[(3) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(7) - (8)].integer), (yyvsp[(8) - (8)].str));;}
     break;
 
   case 358:
-#line 1028 "frame/parser.Y"
+#line 1029 "frame/parser.Y"
     {fr->getRotateCmd();;}
     break;
 
   case 360:
-#line 1030 "frame/parser.Y"
+#line 1031 "frame/parser.Y"
     {fr->getThreadsCmd();;}
     break;
 
   case 362:
-#line 1032 "frame/parser.Y"
+#line 1033 "frame/parser.Y"
     {fr->getTypeCmd();;}
     break;
 
   case 363:
-#line 1034 "frame/parser.Y"
+#line 1035 "frame/parser.Y"
     {fr->getValueCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
     break;
 
   case 364:
-#line 1036 "frame/parser.Y"
+#line 1037 "frame/parser.Y"
     {fr->getVertCutCmd((yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),Vector((yyvsp[(5) - (9)].real),(yyvsp[(6) - (9)].real)),(Coord::InternalSystem)(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(Base::CutMethod)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 366:
-#line 1038 "frame/parser.Y"
+#line 1039 "frame/parser.Y"
     {fr->getZoomCmd();;}
     break;
 
   case 367:
-#line 1041 "frame/parser.Y"
+#line 1042 "frame/parser.Y"
     {fr->getBinDepthCmd();;}
     break;
 
   case 368:
-#line 1042 "frame/parser.Y"
+#line 1043 "frame/parser.Y"
     {fr->getBinFactorCmd();;}
     break;
 
   case 369:
-#line 1043 "frame/parser.Y"
+#line 1044 "frame/parser.Y"
     {fr->getBinFunctionCmd();;}
     break;
 
   case 370:
-#line 1044 "frame/parser.Y"
+#line 1045 "frame/parser.Y"
     {fr->getBinBufferSizeCmd();;}
     break;
 
   case 371:
-#line 1045 "frame/parser.Y"
+#line 1046 "frame/parser.Y"
     {fr->getBinCursorCmd();;}
     break;
 
   case 372:
-#line 1046 "frame/parser.Y"
+#line 1047 "frame/parser.Y"
     {fr->getBinFilterCmd();;}
     break;
 
   case 374:
-#line 1048 "frame/parser.Y"
+#line 1049 "frame/parser.Y"
     {fr->getBinListCmd();;}
     break;
 
   case 375:
-#line 1051 "frame/parser.Y"
+#line 1052 "frame/parser.Y"
     {fr->getBinColsCmd();;}
     break;
 
   case 376:
-#line 1052 "frame/parser.Y"
+#line 1053 "frame/parser.Y"
     {fr->getBinColsMinMaxCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 377:
-#line 1053 "frame/parser.Y"
+#line 1054 "frame/parser.Y"
     {fr->getBinColsDimCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 378:
-#line 1056 "frame/parser.Y"
+#line 1057 "frame/parser.Y"
     {fr->getBlockCmd();;}
     break;
 
   case 379:
-#line 1059 "frame/parser.Y"
+#line 1060 "frame/parser.Y"
     {fr->getClipCmd();;}
     break;
 
   case 380:
-#line 1061 "frame/parser.Y"
+#line 1062 "frame/parser.Y"
     {fr->getClipCmd((FrScale::ClipMode)(yyvsp[(1) - (2)].integer), (FrScale::ClipScope)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 381:
-#line 1063 "frame/parser.Y"
+#line 1064 "frame/parser.Y"
     {fr->getClipCmd((yyvsp[(1) - (2)].real), (FrScale::ClipScope)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 382:
-#line 1064 "frame/parser.Y"
+#line 1065 "frame/parser.Y"
     {fr->getClipScopeCmd();;}
     break;
 
   case 383:
-#line 1065 "frame/parser.Y"
+#line 1066 "frame/parser.Y"
     {fr->getClipModeCmd();;}
     break;
 
   case 385:
-#line 1067 "frame/parser.Y"
+#line 1068 "frame/parser.Y"
     {fr->getClipUserCmd();;}
     break;
 
   case 387:
-#line 1070 "frame/parser.Y"
+#line 1071 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->getClipPreserveCmd();
@@ -6751,142 +6752,142 @@ yyreduce:
     break;
 
   case 388:
-#line 1076 "frame/parser.Y"
+#line 1077 "frame/parser.Y"
     {fr->getClipMinMaxModeCmd();;}
     break;
 
   case 389:
-#line 1077 "frame/parser.Y"
+#line 1078 "frame/parser.Y"
     {fr->getClipMinMaxSampleCmd();;}
     break;
 
   case 390:
-#line 1080 "frame/parser.Y"
+#line 1081 "frame/parser.Y"
     {fr->getClipZScaleContrastCmd();;}
     break;
 
   case 391:
-#line 1081 "frame/parser.Y"
+#line 1082 "frame/parser.Y"
     {fr->getClipZScaleSampleCmd();;}
     break;
 
   case 392:
-#line 1082 "frame/parser.Y"
+#line 1083 "frame/parser.Y"
     {fr->getClipZScaleLineCmd();;}
     break;
 
   case 393:
-#line 1085 "frame/parser.Y"
+#line 1086 "frame/parser.Y"
     {fr->getColorbarCmd();;}
     break;
 
   case 394:
-#line 1086 "frame/parser.Y"
+#line 1087 "frame/parser.Y"
     {fr->getColorbarTagCmd();;}
     break;
 
   case 396:
-#line 1092 "frame/parser.Y"
+#line 1093 "frame/parser.Y"
     {fr->getColorMapLevelCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 397:
-#line 1094 "frame/parser.Y"
+#line 1095 "frame/parser.Y"
     {fr->getColorMapLevelCmd((yyvsp[(1) - (4)].integer),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
     break;
 
   case 398:
-#line 1096 "frame/parser.Y"
+#line 1097 "frame/parser.Y"
     {fr->getColorMapLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;}
     break;
 
   case 399:
-#line 1099 "frame/parser.Y"
+#line 1100 "frame/parser.Y"
     {fr->getColorScaleCmd();;}
     break;
 
   case 401:
-#line 1101 "frame/parser.Y"
+#line 1102 "frame/parser.Y"
     {fr->getColorScaleLogCmd();;}
     break;
 
   case 402:
-#line 1105 "frame/parser.Y"
+#line 1106 "frame/parser.Y"
     {fr->getColorScaleLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;}
     break;
 
   case 403:
-#line 1109 "frame/parser.Y"
+#line 1110 "frame/parser.Y"
     {fr->getContourCmd((Coord::CoordSystem)(yyvsp[(1) - (2)].integer),(Coord::SkyFrame)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 405:
-#line 1111 "frame/parser.Y"
+#line 1112 "frame/parser.Y"
     {fr->getContourColorNameCmd();;}
     break;
 
   case 406:
-#line 1112 "frame/parser.Y"
+#line 1113 "frame/parser.Y"
     {fr->getContourDashCmd();;}
     break;
 
   case 407:
-#line 1113 "frame/parser.Y"
+#line 1114 "frame/parser.Y"
     {fr->getContourLevelCmd();;}
     break;
 
   case 408:
-#line 1114 "frame/parser.Y"
+#line 1115 "frame/parser.Y"
     {fr->getContourNumLevelCmd();;}
     break;
 
   case 409:
-#line 1115 "frame/parser.Y"
+#line 1116 "frame/parser.Y"
     {fr->getContourMethodCmd();;}
     break;
 
   case 411:
-#line 1117 "frame/parser.Y"
+#line 1118 "frame/parser.Y"
     {fr->getContourSmoothCmd();;}
     break;
 
   case 412:
-#line 1118 "frame/parser.Y"
+#line 1119 "frame/parser.Y"
     {fr->getContourLineWidthCmd();;}
     break;
 
   case 413:
-#line 1121 "frame/parser.Y"
+#line 1122 "frame/parser.Y"
     {fr->getContourClipCmd();;}
     break;
 
   case 414:
-#line 1122 "frame/parser.Y"
+#line 1123 "frame/parser.Y"
     {fr->getContourClipModeCmd();;}
     break;
 
   case 415:
-#line 1123 "frame/parser.Y"
+#line 1124 "frame/parser.Y"
     {fr->getContourClipScopeCmd();;}
     break;
 
   case 416:
-#line 1126 "frame/parser.Y"
+#line 1127 "frame/parser.Y"
     {fr->getContourScaleCmd();;}
     break;
 
   case 417:
-#line 1127 "frame/parser.Y"
+#line 1128 "frame/parser.Y"
     {fr->getContourScaleLogCmd();;}
     break;
 
   case 418:
-#line 1131 "frame/parser.Y"
+#line 1132 "frame/parser.Y"
     {fr->getCoordCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 419:
-#line 1133 "frame/parser.Y"
+#line 1134 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->getCoordCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer),
@@ -6895,416 +6896,416 @@ yyreduce:
     break;
 
   case 420:
-#line 1141 "frame/parser.Y"
+#line 1142 "frame/parser.Y"
     {fr->getCropCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 421:
-#line 1143 "frame/parser.Y"
+#line 1144 "frame/parser.Y"
     {fr->getCropCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (6)].integer), (Coord::SkyFrame)(yyvsp[(3) - (6)].integer), (Coord::SkyFormat)(yyvsp[(4) - (6)].integer), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 422:
-#line 1145 "frame/parser.Y"
+#line 1146 "frame/parser.Y"
     {fr->getCrop3dCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 423:
-#line 1148 "frame/parser.Y"
+#line 1149 "frame/parser.Y"
     {fr->getCrosshairCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 424:
-#line 1150 "frame/parser.Y"
+#line 1151 "frame/parser.Y"
     {fr->getCrosshairCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 425:
-#line 1151 "frame/parser.Y"
+#line 1152 "frame/parser.Y"
     {fr->getCrosshairStatusCmd();;}
     break;
 
   case 426:
-#line 1154 "frame/parser.Y"
+#line 1155 "frame/parser.Y"
     {fr->getAxesOrderCmd();;}
     break;
 
   case 427:
-#line 1157 "frame/parser.Y"
+#line 1158 "frame/parser.Y"
     {fr->getCursorCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 428:
-#line 1159 "frame/parser.Y"
+#line 1160 "frame/parser.Y"
     {fr->getCursorCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 429:
-#line 1163 "frame/parser.Y"
+#line 1164 "frame/parser.Y"
     {fr->getDataValuesCmd(1, Vector((yyvsp[(3) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), (yyvsp[(6) - (6)].str));;}
     break;
 
   case 430:
-#line 1165 "frame/parser.Y"
+#line 1166 "frame/parser.Y"
     {fr->getDataValuesCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].vector)), 
 	    (Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), Vector((yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].real)), (yyvsp[(7) - (7)].str));;}
     break;
 
   case 431:
-#line 1168 "frame/parser.Y"
+#line 1169 "frame/parser.Y"
     {fr->getDataValuesCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),(Coord::InternalSystem)(yyvsp[(1) - (5)].integer),
 	    Vector((yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer)));;}
     break;
 
   case 432:
-#line 1172 "frame/parser.Y"
+#line 1173 "frame/parser.Y"
     {fr->getInfoCmd((yyvsp[(1) - (1)].str));;}
     break;
 
   case 433:
-#line 1173 "frame/parser.Y"
+#line 1174 "frame/parser.Y"
     {fr->getInfoClipCmd();;}
     break;
 
   case 434:
-#line 1175 "frame/parser.Y"
+#line 1176 "frame/parser.Y"
     {fr->getInfoCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)), (Coord::InternalSystem)(yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;}
     break;
 
   case 435:
-#line 1178 "frame/parser.Y"
+#line 1179 "frame/parser.Y"
     {fr->iisGetCmd((char*)(yyvsp[(1) - (5)].ptr),(yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 436:
-#line 1179 "frame/parser.Y"
+#line 1180 "frame/parser.Y"
     {fr->iisGetCursorCmd();;}
     break;
 
   case 438:
-#line 1183 "frame/parser.Y"
+#line 1184 "frame/parser.Y"
     {fr->iisGetFileNameCmd();;}
     break;
 
   case 439:
-#line 1184 "frame/parser.Y"
+#line 1185 "frame/parser.Y"
     {fr->iisGetFileNameCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 440:
-#line 1185 "frame/parser.Y"
+#line 1186 "frame/parser.Y"
     {fr->iisGetFileNameCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 441:
-#line 1188 "frame/parser.Y"
+#line 1189 "frame/parser.Y"
     {fr->getFitsNAxesCmd();;}
     break;
 
   case 442:
-#line 1190 "frame/parser.Y"
+#line 1191 "frame/parser.Y"
     {fr->getFitsCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::SkyFormat)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 443:
-#line 1191 "frame/parser.Y"
+#line 1192 "frame/parser.Y"
     {fr->getFitsCountCmd();;}
     break;
 
   case 445:
-#line 1193 "frame/parser.Y"
+#line 1194 "frame/parser.Y"
     {fr->getBitpixCmd();;}
     break;
 
   case 449:
-#line 1197 "frame/parser.Y"
+#line 1198 "frame/parser.Y"
     {fr->getFitsHeightCmd();;}
     break;
 
   case 450:
-#line 1198 "frame/parser.Y"
+#line 1199 "frame/parser.Y"
     {fr->getFitsObjectNameCmd();;}
     break;
 
   case 451:
-#line 1199 "frame/parser.Y"
+#line 1200 "frame/parser.Y"
     {fr->getFitsSizeCmd();;}
     break;
 
   case 452:
-#line 1201 "frame/parser.Y"
+#line 1202 "frame/parser.Y"
     {fr->getFitsSizeCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::DistFormat)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 454:
-#line 1203 "frame/parser.Y"
+#line 1204 "frame/parser.Y"
     {fr->getFitsWidthCmd();;}
     break;
 
   case 455:
-#line 1206 "frame/parser.Y"
+#line 1207 "frame/parser.Y"
     {fr->getFitsExtCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 456:
-#line 1208 "frame/parser.Y"
+#line 1209 "frame/parser.Y"
     {fr->getFitsExtCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),(Coord::InternalSystem)(yyvsp[(1) - (3)].integer));;}
     break;
 
   case 457:
-#line 1210 "frame/parser.Y"
+#line 1211 "frame/parser.Y"
     {fr->getFitsHeaderCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 458:
-#line 1211 "frame/parser.Y"
+#line 1212 "frame/parser.Y"
     {fr->getFitsHeaderKeywordCmd(1,(yyvsp[(2) - (2)].str));;}
     break;
 
   case 459:
-#line 1212 "frame/parser.Y"
+#line 1213 "frame/parser.Y"
     {fr->getFitsHeaderKeywordCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 460:
-#line 1213 "frame/parser.Y"
+#line 1214 "frame/parser.Y"
     {fr->getFitsHeaderWCSCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 461:
-#line 1216 "frame/parser.Y"
+#line 1217 "frame/parser.Y"
     {fr->getFitsDepthCmd(2);;}
     break;
 
   case 462:
-#line 1217 "frame/parser.Y"
+#line 1218 "frame/parser.Y"
     {fr->getFitsDepthCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 463:
-#line 1221 "frame/parser.Y"
+#line 1222 "frame/parser.Y"
     {fr->getFitsFileNameCmd((Base::FileNameType)(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 464:
-#line 1223 "frame/parser.Y"
+#line 1224 "frame/parser.Y"
     {fr->getFitsFileNameCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer),
 	    (Base::FileNameType)(yyvsp[(1) - (4)].integer));;}
     break;
 
   case 465:
-#line 1226 "frame/parser.Y"
+#line 1227 "frame/parser.Y"
     {fr->getFitsFileNameCmd((yyvsp[(2) - (2)].integer), (Base::FileNameType)(yyvsp[(1) - (2)].integer));;}
     break;
 
   case 466:
-#line 1229 "frame/parser.Y"
+#line 1230 "frame/parser.Y"
     {fr->getFitsSliceCmd(2);;}
     break;
 
   case 467:
-#line 1230 "frame/parser.Y"
+#line 1231 "frame/parser.Y"
     {fr->getFitsSliceCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 468:
-#line 1232 "frame/parser.Y"
+#line 1233 "frame/parser.Y"
     {fr->getFitsSliceFromImageCmd((Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 469:
-#line 1234 "frame/parser.Y"
+#line 1235 "frame/parser.Y"
     {fr->getFitsSliceFromImageCmd((yyvsp[(3) - (4)].integer), (Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 470:
-#line 1236 "frame/parser.Y"
+#line 1237 "frame/parser.Y"
     {fr->getFitsSliceToImageCmd((yyvsp[(3) - (4)].real), (Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 471:
-#line 1239 "frame/parser.Y"
+#line 1240 "frame/parser.Y"
     {fr->getGridCmd();;}
     break;
 
   case 472:
-#line 1240 "frame/parser.Y"
+#line 1241 "frame/parser.Y"
     {fr->getGridOptionCmd();;}
     break;
 
   case 473:
-#line 1241 "frame/parser.Y"
+#line 1242 "frame/parser.Y"
     {fr->getGridVarsCmd();;}
     break;
 
   case 474:
-#line 1244 "frame/parser.Y"
+#line 1245 "frame/parser.Y"
     {fr->getMaskColorCmd();;}
     break;
 
   case 475:
-#line 1245 "frame/parser.Y"
+#line 1246 "frame/parser.Y"
     {fr->getMaskMarkCmd();;}
     break;
 
   case 476:
-#line 1246 "frame/parser.Y"
+#line 1247 "frame/parser.Y"
     {fr->getMaskRangeCmd();;}
     break;
 
   case 477:
-#line 1247 "frame/parser.Y"
+#line 1248 "frame/parser.Y"
     {fr->getMaskSystemCmd();;}
     break;
 
   case 478:
-#line 1248 "frame/parser.Y"
+#line 1249 "frame/parser.Y"
     {fr->getMaskTransparencyCmd();;}
     break;
 
   case 479:
-#line 1249 "frame/parser.Y"
+#line 1250 "frame/parser.Y"
     {fr->getMaskCountCmd();;}
     break;
 
   case 480:
-#line 1252 "frame/parser.Y"
+#line 1253 "frame/parser.Y"
     {fr->getPanPreserveCmd();;}
     break;
 
   case 481:
-#line 1255 "frame/parser.Y"
+#line 1256 "frame/parser.Y"
     {fr->getRGBChannelCmd();;}
     break;
 
   case 482:
-#line 1256 "frame/parser.Y"
+#line 1257 "frame/parser.Y"
     {fr->getRGBSystemCmd();;}
     break;
 
   case 483:
-#line 1257 "frame/parser.Y"
+#line 1258 "frame/parser.Y"
     {fr->getRGBViewCmd();;}
     break;
 
   case 484:
-#line 1260 "frame/parser.Y"
+#line 1261 "frame/parser.Y"
     {fr->getSmoothFunctionCmd();;}
     break;
 
   case 485:
-#line 1261 "frame/parser.Y"
+#line 1262 "frame/parser.Y"
     {fr->getSmoothRadiusCmd();;}
     break;
 
   case 486:
-#line 1262 "frame/parser.Y"
+#line 1263 "frame/parser.Y"
     {fr->getSmoothRadiusMinorCmd();;}
     break;
 
   case 487:
-#line 1263 "frame/parser.Y"
+#line 1264 "frame/parser.Y"
     {fr->getSmoothSigmaCmd();;}
     break;
 
   case 488:
-#line 1264 "frame/parser.Y"
+#line 1265 "frame/parser.Y"
     {fr->getSmoothSigmaMinorCmd();;}
     break;
 
   case 489:
-#line 1265 "frame/parser.Y"
+#line 1266 "frame/parser.Y"
     {fr->getSmoothAngleCmd();;}
     break;
 
   case 494:
-#line 1272 "frame/parser.Y"
+#line 1273 "frame/parser.Y"
     {fr->get3dRenderMethodCmd();;}
     break;
 
   case 495:
-#line 1273 "frame/parser.Y"
+#line 1274 "frame/parser.Y"
     {fr->get3dRenderBackgroundCmd();;}
     break;
 
   case 496:
-#line 1274 "frame/parser.Y"
+#line 1275 "frame/parser.Y"
     {fr->get3dScaleCmd();;}
     break;
 
   case 497:
-#line 1277 "frame/parser.Y"
+#line 1278 "frame/parser.Y"
     {fr->get3dBorderCmd();;}
     break;
 
   case 498:
-#line 1278 "frame/parser.Y"
+#line 1279 "frame/parser.Y"
     {fr->get3dBorderColorCmd();;}
     break;
 
   case 499:
-#line 1281 "frame/parser.Y"
+#line 1282 "frame/parser.Y"
     {fr->get3dCompassCmd();;}
     break;
 
   case 500:
-#line 1282 "frame/parser.Y"
+#line 1283 "frame/parser.Y"
     {fr->get3dCompassColorCmd();;}
     break;
 
   case 501:
-#line 1285 "frame/parser.Y"
+#line 1286 "frame/parser.Y"
     {fr->get3dHighliteCmd();;}
     break;
 
   case 502:
-#line 1286 "frame/parser.Y"
+#line 1287 "frame/parser.Y"
     {fr->get3dHighliteColorCmd();;}
     break;
 
   case 503:
-#line 1289 "frame/parser.Y"
+#line 1290 "frame/parser.Y"
     {fr->get3dViewCmd();;}
     break;
 
   case 504:
-#line 1290 "frame/parser.Y"
+#line 1291 "frame/parser.Y"
     {fr->get3dViewPointCmd();;}
     break;
 
   case 505:
-#line 1293 "frame/parser.Y"
+#line 1294 "frame/parser.Y"
     {fr->getWCSCmd();;}
     break;
 
   case 507:
-#line 1295 "frame/parser.Y"
+#line 1296 "frame/parser.Y"
     {fr->getWCSNameCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 508:
-#line 1298 "frame/parser.Y"
+#line 1299 "frame/parser.Y"
     {fr->getWCSAlignCmd();;}
     break;
 
   case 509:
-#line 1299 "frame/parser.Y"
+#line 1300 "frame/parser.Y"
     {fr->getWCSAlignPointerCmd();;}
     break;
 
   case 511:
-#line 1303 "frame/parser.Y"
+#line 1304 "frame/parser.Y"
     {fr->gridDeleteCmd();;}
     break;
 
   case 512:
-#line 1307 "frame/parser.Y"
+#line 1308 "frame/parser.Y"
     {fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), 
 	    (Coord::SkyFormat)(yyvsp[(3) - (6)].integer), (Grid2d::GridType)(yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].str), (yyvsp[(6) - (6)].str));;}
     break;
 
   case 513:
-#line 1310 "frame/parser.Y"
+#line 1311 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (Coord::SkyFrame)(yyvsp[(2) - (5)].integer), 
@@ -7313,667 +7314,667 @@ yyreduce:
     break;
 
   case 514:
-#line 1317 "frame/parser.Y"
+#line 1318 "frame/parser.Y"
     {(yyval.integer)=Grid2d::ANALYSIS;;}
     break;
 
   case 515:
-#line 1318 "frame/parser.Y"
+#line 1319 "frame/parser.Y"
     {(yyval.integer)=Grid2d::PUBLICATION;;}
     break;
 
   case 516:
-#line 1321 "frame/parser.Y"
+#line 1322 "frame/parser.Y"
     {fr->hasAmplifierCmd();;}
     break;
 
   case 519:
-#line 1324 "frame/parser.Y"
+#line 1325 "frame/parser.Y"
     {fr->hasCropCmd();;}
     break;
 
   case 520:
-#line 1325 "frame/parser.Y"
+#line 1326 "frame/parser.Y"
     {fr->hasDATAMINCmd();;}
     break;
 
   case 521:
-#line 1326 "frame/parser.Y"
+#line 1327 "frame/parser.Y"
     {fr->hasDATASECCmd();;}
     break;
 
   case 522:
-#line 1327 "frame/parser.Y"
+#line 1328 "frame/parser.Y"
     {fr->hasDetectorCmd();;}
     break;
 
   case 524:
-#line 1329 "frame/parser.Y"
+#line 1330 "frame/parser.Y"
     {fr->hasGridCmd();;}
     break;
 
   case 525:
-#line 1330 "frame/parser.Y"
+#line 1331 "frame/parser.Y"
     {fr->hasIISCmd();;}
     break;
 
   case 526:
-#line 1331 "frame/parser.Y"
+#line 1332 "frame/parser.Y"
     {fr->hasIRAFMINCmd();;}
     break;
 
   case 528:
-#line 1333 "frame/parser.Y"
+#line 1334 "frame/parser.Y"
     {fr->hasPhysicalCmd();;}
     break;
 
   case 529:
-#line 1334 "frame/parser.Y"
+#line 1335 "frame/parser.Y"
     {fr->hasImageCmd();;}
     break;
 
   case 530:
-#line 1335 "frame/parser.Y"
+#line 1336 "frame/parser.Y"
     {fr->hasSmoothCmd();;}
     break;
 
   case 531:
-#line 1336 "frame/parser.Y"
+#line 1337 "frame/parser.Y"
     {fr->hasSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 533:
-#line 1340 "frame/parser.Y"
+#line 1341 "frame/parser.Y"
     {fr->hasBinColCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 534:
-#line 1343 "frame/parser.Y"
+#line 1344 "frame/parser.Y"
     {fr->hasContourCmd();;}
     break;
 
   case 535:
-#line 1344 "frame/parser.Y"
+#line 1345 "frame/parser.Y"
     {fr->hasContourAuxCmd();;}
     break;
 
   case 536:
-#line 1347 "frame/parser.Y"
+#line 1348 "frame/parser.Y"
     {fr->hasFitsCmd();;}
     break;
 
   case 537:
-#line 1348 "frame/parser.Y"
+#line 1349 "frame/parser.Y"
     {fr->hasFitsBinCmd();;}
     break;
 
   case 538:
-#line 1349 "frame/parser.Y"
+#line 1350 "frame/parser.Y"
     {fr->hasFitsCubeCmd();;}
     break;
 
   case 539:
-#line 1350 "frame/parser.Y"
+#line 1351 "frame/parser.Y"
     {fr->hasFitsMosaicCmd();;}
     break;
 
   case 540:
-#line 1353 "frame/parser.Y"
+#line 1354 "frame/parser.Y"
     {fr->hasMarkerHighlitedCmd();;}
     break;
 
   case 541:
-#line 1354 "frame/parser.Y"
+#line 1355 "frame/parser.Y"
     {fr->hasMarkerSelectedCmd();;}
     break;
 
   case 542:
-#line 1355 "frame/parser.Y"
+#line 1356 "frame/parser.Y"
     {fr->hasMarkerPasteCmd();;}
     break;
 
   case 543:
-#line 1356 "frame/parser.Y"
+#line 1357 "frame/parser.Y"
     {fr->hasMarkerUndoCmd();;}
     break;
 
   case 544:
-#line 1359 "frame/parser.Y"
+#line 1360 "frame/parser.Y"
     {fr->hasWCSCmd((Coord::CoordSystem)(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 545:
-#line 1360 "frame/parser.Y"
+#line 1361 "frame/parser.Y"
     {fr->hasWCSCelCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 546:
-#line 1361 "frame/parser.Y"
+#line 1362 "frame/parser.Y"
     {fr->hasWCSEquCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 547:
-#line 1362 "frame/parser.Y"
+#line 1363 "frame/parser.Y"
     {fr->hasWCSLinearCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 548:
-#line 1363 "frame/parser.Y"
+#line 1364 "frame/parser.Y"
     {fr->hasWCSAltCmd();;}
     break;
 
   case 549:
-#line 1364 "frame/parser.Y"
+#line 1365 "frame/parser.Y"
     {fr->hasWCS3DCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 550:
-#line 1367 "frame/parser.Y"
+#line 1368 "frame/parser.Y"
     {fr->iisCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 551:
-#line 1368 "frame/parser.Y"
+#line 1369 "frame/parser.Y"
     {fr->iisEraseCmd();;}
     break;
 
   case 552:
-#line 1369 "frame/parser.Y"
+#line 1370 "frame/parser.Y"
     {fr->iisMessageCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 555:
-#line 1373 "frame/parser.Y"
+#line 1374 "frame/parser.Y"
     {fr->iisSetCmd((const char*)(yyvsp[(2) - (6)].ptr),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 556:
-#line 1374 "frame/parser.Y"
+#line 1375 "frame/parser.Y"
     {fr->iisUpdateCmd();;}
     break;
 
   case 557:
-#line 1377 "frame/parser.Y"
+#line 1378 "frame/parser.Y"
     {fr->iisWCSCmd(Matrix((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real)),Vector((yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].real)),(yyvsp[(10) - (10)].integer));;}
     break;
 
   case 558:
-#line 1380 "frame/parser.Y"
+#line 1381 "frame/parser.Y"
     {fr->iisSetFileNameCmd((yyvsp[(1) - (1)].str));;}
     break;
 
   case 559:
-#line 1381 "frame/parser.Y"
+#line 1382 "frame/parser.Y"
     {fr->iisSetFileNameCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 560:
-#line 1385 "frame/parser.Y"
+#line 1386 "frame/parser.Y"
     {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),Coord::CANVAS);;}
     break;
 
   case 561:
-#line 1387 "frame/parser.Y"
+#line 1388 "frame/parser.Y"
     {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),(Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 562:
-#line 1388 "frame/parser.Y"
+#line 1389 "frame/parser.Y"
     {fr->iisCursorModeCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 569:
-#line 1400 "frame/parser.Y"
+#line 1401 "frame/parser.Y"
     {fr->loadArrAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 570:
-#line 1402 "frame/parser.Y"
+#line 1403 "frame/parser.Y"
     {fr->loadArrAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 571:
-#line 1404 "frame/parser.Y"
+#line 1405 "frame/parser.Y"
     {fr->loadArrChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 572:
-#line 1405 "frame/parser.Y"
+#line 1406 "frame/parser.Y"
     {fr->loadArrMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 573:
-#line 1407 "frame/parser.Y"
+#line 1408 "frame/parser.Y"
     {fr->loadArrMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 574:
-#line 1409 "frame/parser.Y"
+#line 1410 "frame/parser.Y"
     {fr->loadArrShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 575:
-#line 1411 "frame/parser.Y"
+#line 1412 "frame/parser.Y"
     {fr->loadArrSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 576:
-#line 1413 "frame/parser.Y"
+#line 1414 "frame/parser.Y"
     {fr->loadArrSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 577:
-#line 1415 "frame/parser.Y"
+#line 1416 "frame/parser.Y"
     {fr->loadArrVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 579:
-#line 1419 "frame/parser.Y"
+#line 1420 "frame/parser.Y"
     {fr->loadArrayRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 580:
-#line 1420 "frame/parser.Y"
+#line 1421 "frame/parser.Y"
     {fr->loadArrayRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 581:
-#line 1421 "frame/parser.Y"
+#line 1422 "frame/parser.Y"
     {fr->loadArrayRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 582:
-#line 1422 "frame/parser.Y"
+#line 1423 "frame/parser.Y"
     {fr->loadArrayRGBCubeMMapCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 583:
-#line 1423 "frame/parser.Y"
+#line 1424 "frame/parser.Y"
     {fr->loadArrayRGBCubeMMapIncrCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 584:
-#line 1425 "frame/parser.Y"
+#line 1426 "frame/parser.Y"
     {fr->loadArrayRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 585:
-#line 1426 "frame/parser.Y"
+#line 1427 "frame/parser.Y"
     {fr->loadArrayRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 586:
-#line 1427 "frame/parser.Y"
+#line 1428 "frame/parser.Y"
     {fr->loadArrayRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 587:
-#line 1428 "frame/parser.Y"
+#line 1429 "frame/parser.Y"
     {fr->loadArrayRGBCubeVarCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 588:
-#line 1431 "frame/parser.Y"
+#line 1432 "frame/parser.Y"
     {fr->loadENVISMMapCmd((yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str));;}
     break;
 
   case 589:
-#line 1435 "frame/parser.Y"
+#line 1436 "frame/parser.Y"
     {fr->loadFitsAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 590:
-#line 1437 "frame/parser.Y"
+#line 1438 "frame/parser.Y"
     {fr->loadFitsAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 591:
-#line 1439 "frame/parser.Y"
+#line 1440 "frame/parser.Y"
     {fr->loadFitsChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 592:
-#line 1441 "frame/parser.Y"
+#line 1442 "frame/parser.Y"
     {fr->loadFitsMMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 593:
-#line 1443 "frame/parser.Y"
+#line 1444 "frame/parser.Y"
     {fr->loadFitsSMMapCmd((yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 594:
-#line 1445 "frame/parser.Y"
+#line 1446 "frame/parser.Y"
     {fr->loadFitsMMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 595:
-#line 1447 "frame/parser.Y"
+#line 1448 "frame/parser.Y"
     {fr->loadFitsShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 596:
-#line 1449 "frame/parser.Y"
+#line 1450 "frame/parser.Y"
     {fr->loadFitsSShareCmd((Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), 
 	  (Base::LayerType)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 597:
-#line 1452 "frame/parser.Y"
+#line 1453 "frame/parser.Y"
     {fr->loadFitsSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 598:
-#line 1454 "frame/parser.Y"
+#line 1455 "frame/parser.Y"
     {fr->loadFitsSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 599:
-#line 1456 "frame/parser.Y"
+#line 1457 "frame/parser.Y"
     {fr->loadFitsVarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 605:
-#line 1464 "frame/parser.Y"
+#line 1465 "frame/parser.Y"
     {fr->loadSliceAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 606:
-#line 1465 "frame/parser.Y"
+#line 1466 "frame/parser.Y"
     {fr->loadSliceAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 607:
-#line 1466 "frame/parser.Y"
+#line 1467 "frame/parser.Y"
     {fr->loadSliceChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 608:
-#line 1467 "frame/parser.Y"
+#line 1468 "frame/parser.Y"
     {fr->loadSliceMMapCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 609:
-#line 1468 "frame/parser.Y"
+#line 1469 "frame/parser.Y"
     {fr->loadSliceSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;}
     break;
 
   case 610:
-#line 1469 "frame/parser.Y"
+#line 1470 "frame/parser.Y"
     {fr->loadSliceMMapIncrCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 611:
-#line 1471 "frame/parser.Y"
+#line 1472 "frame/parser.Y"
     {fr->loadSliceShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;}
     break;
 
   case 612:
-#line 1473 "frame/parser.Y"
+#line 1474 "frame/parser.Y"
     {fr->loadSliceSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;}
     break;
 
   case 613:
-#line 1474 "frame/parser.Y"
+#line 1475 "frame/parser.Y"
     {fr->loadSliceSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 614:
-#line 1475 "frame/parser.Y"
+#line 1476 "frame/parser.Y"
     {fr->loadSliceSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 615:
-#line 1476 "frame/parser.Y"
+#line 1477 "frame/parser.Y"
     {fr->loadSliceVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 616:
-#line 1479 "frame/parser.Y"
+#line 1480 "frame/parser.Y"
     {fr->loadExtCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 617:
-#line 1480 "frame/parser.Y"
+#line 1481 "frame/parser.Y"
     {fr->loadExtCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 618:
-#line 1481 "frame/parser.Y"
+#line 1482 "frame/parser.Y"
     {fr->loadExtCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 619:
-#line 1482 "frame/parser.Y"
+#line 1483 "frame/parser.Y"
     {fr->loadExtCubeMMapCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 620:
-#line 1483 "frame/parser.Y"
+#line 1484 "frame/parser.Y"
     {fr->loadExtCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 621:
-#line 1485 "frame/parser.Y"
+#line 1486 "frame/parser.Y"
     {fr->loadExtCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;}
     break;
 
   case 622:
-#line 1486 "frame/parser.Y"
+#line 1487 "frame/parser.Y"
     {fr->loadExtCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 623:
-#line 1487 "frame/parser.Y"
+#line 1488 "frame/parser.Y"
     {fr->loadExtCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 624:
-#line 1488 "frame/parser.Y"
+#line 1489 "frame/parser.Y"
     {fr->loadExtCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 630:
-#line 1499 "frame/parser.Y"
+#line 1500 "frame/parser.Y"
     {fr->loadMosaicImageAllocCmd(Base::IRAF, Coord::WCS, 
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 631:
-#line 1502 "frame/parser.Y"
+#line 1503 "frame/parser.Y"
     {fr->loadMosaicImageAllocGZCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 632:
-#line 1505 "frame/parser.Y"
+#line 1506 "frame/parser.Y"
     {fr->loadMosaicImageChannelCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 633:
-#line 1508 "frame/parser.Y"
+#line 1509 "frame/parser.Y"
     {fr->loadMosaicImageMMapCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 634:
-#line 1511 "frame/parser.Y"
+#line 1512 "frame/parser.Y"
     {fr->loadMosaicImageMMapIncrCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 635:
-#line 1514 "frame/parser.Y"
+#line 1515 "frame/parser.Y"
     {fr->loadMosaicImageShareCmd(Base::IRAF, Coord::WCS,
 	    (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 636:
-#line 1517 "frame/parser.Y"
+#line 1518 "frame/parser.Y"
     {fr->loadMosaicImageSocketCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 637:
-#line 1520 "frame/parser.Y"
+#line 1521 "frame/parser.Y"
     {fr->loadMosaicImageSocketGZCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 638:
-#line 1523 "frame/parser.Y"
+#line 1524 "frame/parser.Y"
     {fr->loadMosaicImageVarCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 639:
-#line 1528 "frame/parser.Y"
+#line 1529 "frame/parser.Y"
     {fr->loadMosaicAllocCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 640:
-#line 1531 "frame/parser.Y"
+#line 1532 "frame/parser.Y"
     {fr->loadMosaicAllocGZCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 641:
-#line 1534 "frame/parser.Y"
+#line 1535 "frame/parser.Y"
     {fr->loadMosaicChannelCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 642:
-#line 1537 "frame/parser.Y"
+#line 1538 "frame/parser.Y"
     {fr->loadMosaicMMapCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 643:
-#line 1540 "frame/parser.Y"
+#line 1541 "frame/parser.Y"
     {fr->loadMosaicSMMapCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 644:
-#line 1543 "frame/parser.Y"
+#line 1544 "frame/parser.Y"
     {fr->loadMosaicMMapIncrCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 645:
-#line 1546 "frame/parser.Y"
+#line 1547 "frame/parser.Y"
     {fr->loadMosaicShareCmd(Base::IRAF, Coord::WCS,
 	    (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 646:
-#line 1549 "frame/parser.Y"
+#line 1550 "frame/parser.Y"
     {fr->loadMosaicSShareCmd(Base::IRAF, Coord::WCS,
 	    (Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 647:
-#line 1552 "frame/parser.Y"
+#line 1553 "frame/parser.Y"
     {fr->loadMosaicSocketCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 648:
-#line 1555 "frame/parser.Y"
+#line 1556 "frame/parser.Y"
     {fr->loadMosaicSocketGZCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 649:
-#line 1558 "frame/parser.Y"
+#line 1559 "frame/parser.Y"
     {fr->loadMosaicVarCmd(Base::IRAF, Coord::WCS,
 	    (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 650:
-#line 1563 "frame/parser.Y"
+#line 1564 "frame/parser.Y"
     {fr->loadMosaicImageAllocCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 651:
-#line 1566 "frame/parser.Y"
+#line 1567 "frame/parser.Y"
     {fr->loadMosaicImageAllocGZCmd(Base::WCSMOSAIC, 
 	    (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 652:
-#line 1569 "frame/parser.Y"
+#line 1570 "frame/parser.Y"
     {fr->loadMosaicImageChannelCmd(Base::WCSMOSAIC,
 	    (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 653:
-#line 1572 "frame/parser.Y"
+#line 1573 "frame/parser.Y"
     {fr->loadMosaicImageMMapCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 654:
-#line 1575 "frame/parser.Y"
+#line 1576 "frame/parser.Y"
     {fr->loadMosaicImageMMapIncrCmd(Base::WCSMOSAIC,
 	    (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 655:
-#line 1578 "frame/parser.Y"
+#line 1579 "frame/parser.Y"
     {fr->loadMosaicImageShareCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), 
 	    (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 656:
-#line 1581 "frame/parser.Y"
+#line 1582 "frame/parser.Y"
     {fr->loadMosaicImageSocketCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 657:
-#line 1584 "frame/parser.Y"
+#line 1585 "frame/parser.Y"
     {fr->loadMosaicImageSocketGZCmd(Base::WCSMOSAIC, 
 	    (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 658:
-#line 1587 "frame/parser.Y"
+#line 1588 "frame/parser.Y"
     {fr->loadMosaicImageVarCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
 	    (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 659:
-#line 1592 "frame/parser.Y"
+#line 1593 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2AllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 660:
-#line 1594 "frame/parser.Y"
+#line 1595 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2AllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 661:
-#line 1596 "frame/parser.Y"
+#line 1597 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2ChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 662:
-#line 1598 "frame/parser.Y"
+#line 1599 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2MMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 663:
-#line 1600 "frame/parser.Y"
+#line 1601 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2MMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 664:
-#line 1602 "frame/parser.Y"
+#line 1603 "frame/parser.Y"
     {
 	  fr->loadMosaicImageWFPC2ShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str),
 					   (Base::LayerType)(yyvsp[(6) - (6)].integer));
@@ -7981,243 +7982,243 @@ yyreduce:
     break;
 
   case 665:
-#line 1607 "frame/parser.Y"
+#line 1608 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2SocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 666:
-#line 1609 "frame/parser.Y"
+#line 1610 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2SocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 667:
-#line 1611 "frame/parser.Y"
+#line 1612 "frame/parser.Y"
     {fr->loadMosaicImageWFPC2VarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 668:
-#line 1615 "frame/parser.Y"
+#line 1616 "frame/parser.Y"
     {fr->loadMosaicAllocCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 669:
-#line 1618 "frame/parser.Y"
+#line 1619 "frame/parser.Y"
     {fr->loadMosaicAllocGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 670:
-#line 1621 "frame/parser.Y"
+#line 1622 "frame/parser.Y"
     {fr->loadMosaicChannelCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 671:
-#line 1624 "frame/parser.Y"
+#line 1625 "frame/parser.Y"
     {fr->loadMosaicMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 672:
-#line 1627 "frame/parser.Y"
+#line 1628 "frame/parser.Y"
     {fr->loadMosaicSMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
 	    (yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 673:
-#line 1630 "frame/parser.Y"
+#line 1631 "frame/parser.Y"
     {fr->loadMosaicMMapIncrCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 674:
-#line 1633 "frame/parser.Y"
+#line 1634 "frame/parser.Y"
     {fr->loadMosaicShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), 
 	    (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 675:
-#line 1636 "frame/parser.Y"
+#line 1637 "frame/parser.Y"
     {fr->loadMosaicSShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (8)].integer), 
 	    (Base::ShmType)(yyvsp[(4) - (8)].integer), (yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(2) - (8)].str), (Base::LayerType)(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 676:
-#line 1639 "frame/parser.Y"
+#line 1640 "frame/parser.Y"
     {fr->loadMosaicSocketCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 677:
-#line 1642 "frame/parser.Y"
+#line 1643 "frame/parser.Y"
     {fr->loadMosaicSocketGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
 	    (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 678:
-#line 1645 "frame/parser.Y"
+#line 1646 "frame/parser.Y"
     {fr->loadMosaicVarCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
 	    (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 679:
-#line 1649 "frame/parser.Y"
+#line 1650 "frame/parser.Y"
     {fr->loadRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 680:
-#line 1650 "frame/parser.Y"
+#line 1651 "frame/parser.Y"
     {fr->loadRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 681:
-#line 1651 "frame/parser.Y"
+#line 1652 "frame/parser.Y"
     {fr->loadRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 682:
-#line 1652 "frame/parser.Y"
+#line 1653 "frame/parser.Y"
     {fr->loadRGBCubeMMapCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 683:
-#line 1653 "frame/parser.Y"
+#line 1654 "frame/parser.Y"
     {fr->loadRGBCubeSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;}
     break;
 
   case 684:
-#line 1654 "frame/parser.Y"
+#line 1655 "frame/parser.Y"
     {fr->loadRGBCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 685:
-#line 1656 "frame/parser.Y"
+#line 1657 "frame/parser.Y"
     {fr->loadRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;}
     break;
 
   case 686:
-#line 1658 "frame/parser.Y"
+#line 1659 "frame/parser.Y"
     {fr->loadRGBCubeSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;}
     break;
 
   case 687:
-#line 1659 "frame/parser.Y"
+#line 1660 "frame/parser.Y"
     {fr->loadRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 688:
-#line 1660 "frame/parser.Y"
+#line 1661 "frame/parser.Y"
     {fr->loadRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 689:
-#line 1661 "frame/parser.Y"
+#line 1662 "frame/parser.Y"
     {fr->loadRGBCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 690:
-#line 1664 "frame/parser.Y"
+#line 1665 "frame/parser.Y"
     {fr->loadRGBImageAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 691:
-#line 1665 "frame/parser.Y"
+#line 1666 "frame/parser.Y"
     {fr->loadRGBImageAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 692:
-#line 1666 "frame/parser.Y"
+#line 1667 "frame/parser.Y"
     {fr->loadRGBImageChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 693:
-#line 1667 "frame/parser.Y"
+#line 1668 "frame/parser.Y"
     {fr->loadRGBImageMMapCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 694:
-#line 1668 "frame/parser.Y"
+#line 1669 "frame/parser.Y"
     {fr->loadRGBImageMMapIncrCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 695:
-#line 1670 "frame/parser.Y"
+#line 1671 "frame/parser.Y"
     {fr->loadRGBImageShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;}
     break;
 
   case 696:
-#line 1671 "frame/parser.Y"
+#line 1672 "frame/parser.Y"
     {fr->loadRGBImageSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 697:
-#line 1672 "frame/parser.Y"
+#line 1673 "frame/parser.Y"
     {fr->loadRGBImageSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 698:
-#line 1673 "frame/parser.Y"
+#line 1674 "frame/parser.Y"
     {fr->loadRGBImageVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 699:
-#line 1677 "frame/parser.Y"
+#line 1678 "frame/parser.Y"
     {fr->loadNRRDAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 700:
-#line 1679 "frame/parser.Y"
+#line 1680 "frame/parser.Y"
     {fr->loadNRRDChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 701:
-#line 1680 "frame/parser.Y"
+#line 1681 "frame/parser.Y"
     {fr->loadNRRDMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 702:
-#line 1682 "frame/parser.Y"
+#line 1683 "frame/parser.Y"
     {fr->loadNRRDShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 703:
-#line 1684 "frame/parser.Y"
+#line 1685 "frame/parser.Y"
     {fr->loadNRRDSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 704:
-#line 1686 "frame/parser.Y"
+#line 1687 "frame/parser.Y"
     {fr->loadNRRDVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 705:
-#line 1689 "frame/parser.Y"
+#line 1690 "frame/parser.Y"
     {fr->loadPhotoCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));;}
     break;
 
   case 706:
-#line 1690 "frame/parser.Y"
+#line 1691 "frame/parser.Y"
     {fr->loadSlicePhotoCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 707:
-#line 1693 "frame/parser.Y"
+#line 1694 "frame/parser.Y"
     {fr->loadIncrDataCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 708:
-#line 1694 "frame/parser.Y"
+#line 1695 "frame/parser.Y"
     {fr->loadIncrMinMaxCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 709:
-#line 1695 "frame/parser.Y"
+#line 1696 "frame/parser.Y"
     {fr->loadIncrEndCmd();;}
     break;
 
   case 710:
-#line 1698 "frame/parser.Y"
+#line 1699 "frame/parser.Y"
     {
 #ifdef MAC_OSX_TK
 	  fr->macosxPrintCmd();
@@ -8226,42 +8227,42 @@ yyreduce:
     break;
 
   case 711:
-#line 1705 "frame/parser.Y"
+#line 1706 "frame/parser.Y"
     {fr->magnifierCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 712:
-#line 1706 "frame/parser.Y"
+#line 1707 "frame/parser.Y"
     {fr->magnifierGraphicsCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 713:
-#line 1707 "frame/parser.Y"
+#line 1708 "frame/parser.Y"
     {fr->magnifierCursorCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 714:
-#line 1708 "frame/parser.Y"
+#line 1709 "frame/parser.Y"
     {fr->magnifierColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 715:
-#line 1709 "frame/parser.Y"
+#line 1710 "frame/parser.Y"
     {fr->magnifierCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
     break;
 
   case 716:
-#line 1710 "frame/parser.Y"
+#line 1711 "frame/parser.Y"
     {fr->updateMagnifierCmd(Vector((yyvsp[(2) - (3)].real), (yyvsp[(3) - (3)].real)));;}
     break;
 
   case 717:
-#line 1711 "frame/parser.Y"
+#line 1712 "frame/parser.Y"
     {fr->magnifierZoomCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 718:
-#line 1715 "frame/parser.Y"
+#line 1716 "frame/parser.Y"
     {
 	  fr->matchCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].str),(Coord::CoordSystem)(yyvsp[(3) - (12)].integer),(Coord::SkyFrame)(yyvsp[(4) - (12)].integer),
 		       (yyvsp[(5) - (12)].str),(yyvsp[(6) - (12)].str),(Coord::CoordSystem)(yyvsp[(7) - (12)].integer),(Coord::SkyFrame)(yyvsp[(8) - (12)].integer),
@@ -8271,869 +8272,869 @@ yyreduce:
     break;
 
   case 720:
-#line 1723 "frame/parser.Y"
+#line 1724 "frame/parser.Y"
     {fr->markerColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 721:
-#line 1724 "frame/parser.Y"
+#line 1725 "frame/parser.Y"
     {fr->markerCopyCmd();;}
     break;
 
   case 722:
-#line 1726 "frame/parser.Y"
+#line 1727 "frame/parser.Y"
     {fr->markerCommandCmd((Base::MarkerFormat)(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 723:
-#line 1728 "frame/parser.Y"
+#line 1729 "frame/parser.Y"
     {fr->markerCommandVarCmd((Base::MarkerFormat)(yyvsp[(2) - (4)].integer),(yyvsp[(4) - (4)].str));;}
     break;
 
   case 724:
-#line 1729 "frame/parser.Y"
+#line 1730 "frame/parser.Y"
     {fr->markerCompositeDeleteCmd();;}
     break;
 
   case 725:
-#line 1730 "frame/parser.Y"
+#line 1731 "frame/parser.Y"
     {maperr =0;;}
     break;
 
   case 727:
-#line 1731 "frame/parser.Y"
+#line 1732 "frame/parser.Y"
     {fr->markerCutCmd();;}
     break;
 
   case 728:
-#line 1732 "frame/parser.Y"
+#line 1733 "frame/parser.Y"
     {fr->markerDeleteCmd();;}
     break;
 
   case 729:
-#line 1733 "frame/parser.Y"
+#line 1734 "frame/parser.Y"
     {fr->markerDeleteAllCmd();;}
     break;
 
   case 731:
-#line 1735 "frame/parser.Y"
+#line 1736 "frame/parser.Y"
     {fr->markerEpsilonCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 732:
-#line 1736 "frame/parser.Y"
+#line 1737 "frame/parser.Y"
     {fr->markerFontCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 733:
-#line 1738 "frame/parser.Y"
+#line 1739 "frame/parser.Y"
     {fr->markerHighliteAllCmd();;}
     break;
 
   case 734:
-#line 1740 "frame/parser.Y"
+#line 1741 "frame/parser.Y"
     {fr->markerHighliteOnlyCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 735:
-#line 1742 "frame/parser.Y"
+#line 1743 "frame/parser.Y"
     {fr->markerHighliteToggleCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 736:
-#line 1745 "frame/parser.Y"
+#line 1746 "frame/parser.Y"
     {fr->markerAnalysisCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisTask)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;}
     break;
 
   case 737:
-#line 1747 "frame/parser.Y"
+#line 1748 "frame/parser.Y"
     {fr->markerAngleCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].real));;}
     break;
 
   case 738:
-#line 1748 "frame/parser.Y"
+#line 1749 "frame/parser.Y"
     {fr->markerAngleCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].real));;}
     break;
 
   case 739:
-#line 1750 "frame/parser.Y"
+#line 1751 "frame/parser.Y"
     {fr->markerAngleCmd((yyvsp[(1) - (5)].integer),(yyvsp[(3) - (5)].real),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 740:
-#line 1753 "frame/parser.Y"
+#line 1754 "frame/parser.Y"
     {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (8)].integer), (yyvsp[(4) - (8)].real), (yyvsp[(5) - (8)].real), (yyvsp[(6) - (8)].integer),
 	    (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 741:
-#line 1756 "frame/parser.Y"
+#line 1757 "frame/parser.Y"
     {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 742:
-#line 1758 "frame/parser.Y"
+#line 1759 "frame/parser.Y"
     {fr->markerBoxFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 743:
-#line 1761 "frame/parser.Y"
+#line 1762 "frame/parser.Y"
     {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real)), 
 	    Vector((yyvsp[(6) - (9)].real), (yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 744:
-#line 1764 "frame/parser.Y"
+#line 1765 "frame/parser.Y"
     {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 745:
-#line 1767 "frame/parser.Y"
+#line 1768 "frame/parser.Y"
     {fr->markerBoxRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), 
 	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 746:
-#line 1770 "frame/parser.Y"
+#line 1771 "frame/parser.Y"
     {fr->markerBpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer),
 	    Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;}
     break;
 
   case 747:
-#line 1774 "frame/parser.Y"
+#line 1775 "frame/parser.Y"
     {fr->markerBpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer),
 	    Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;}
     break;
 
   case 748:
-#line 1778 "frame/parser.Y"
+#line 1779 "frame/parser.Y"
     {fr->markerBpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer),
 	    Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer),
 	    (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;}
     break;
 
   case 749:
-#line 1783 "frame/parser.Y"
+#line 1784 "frame/parser.Y"
     {fr->markerBpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), 
 	    (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 750:
-#line 1787 "frame/parser.Y"
+#line 1788 "frame/parser.Y"
     {fr->markerCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;}
     break;
 
   case 751:
-#line 1788 "frame/parser.Y"
+#line 1789 "frame/parser.Y"
     {fr->markerCircleFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 752:
-#line 1790 "frame/parser.Y"
+#line 1791 "frame/parser.Y"
     {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 753:
-#line 1791 "frame/parser.Y"
+#line 1792 "frame/parser.Y"
     {fr->markerColorCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 754:
-#line 1793 "frame/parser.Y"
+#line 1794 "frame/parser.Y"
     {fr->markerCompassArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 755:
-#line 1795 "frame/parser.Y"
+#line 1796 "frame/parser.Y"
     {fr->markerCompassLabelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;}
     break;
 
   case 756:
-#line 1797 "frame/parser.Y"
+#line 1798 "frame/parser.Y"
     {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 757:
-#line 1799 "frame/parser.Y"
+#line 1800 "frame/parser.Y"
     {fr->markerCompassSystemCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 758:
-#line 1800 "frame/parser.Y"
+#line 1801 "frame/parser.Y"
     {fr->markerCompositeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 759:
-#line 1802 "frame/parser.Y"
+#line 1803 "frame/parser.Y"
     {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real), (yyvsp[(6) - (9)].integer), (yyvsp[(7) - (9)].real), (yyvsp[(8) - (9)].real), (yyvsp[(9) - (9)].integer));;}
     break;
 
   case 760:
-#line 1804 "frame/parser.Y"
+#line 1805 "frame/parser.Y"
     {fr->markerCpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real), (yyvsp[(8) - (10)].real), (yyvsp[(9) - (10)].integer));;}
     break;
 
   case 761:
-#line 1807 "frame/parser.Y"
+#line 1808 "frame/parser.Y"
     {fr->markerCpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), (yyvsp[(7) - (11)].real), (yyvsp[(8) - (11)].real), (yyvsp[(9) - (11)].integer),
 	    (Coord::CoordSystem)(yyvsp[(10) - (11)].integer), (Coord::SkyFrame)(yyvsp[(11) - (11)].integer));;}
     break;
 
   case 762:
-#line 1811 "frame/parser.Y"
+#line 1812 "frame/parser.Y"
     {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer),
 	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 763:
-#line 1815 "frame/parser.Y"
+#line 1816 "frame/parser.Y"
     {fr->markerAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 764:
-#line 1817 "frame/parser.Y"
+#line 1818 "frame/parser.Y"
     {fr->markerBoxAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 765:
-#line 1819 "frame/parser.Y"
+#line 1820 "frame/parser.Y"
     {fr->markerBpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 766:
-#line 1821 "frame/parser.Y"
+#line 1822 "frame/parser.Y"
     {fr->markerBpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 767:
-#line 1823 "frame/parser.Y"
+#line 1824 "frame/parser.Y"
     {fr->markerEllipseAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 768:
-#line 1825 "frame/parser.Y"
+#line 1826 "frame/parser.Y"
     {fr->markerEpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 769:
-#line 1827 "frame/parser.Y"
+#line 1828 "frame/parser.Y"
     {fr->markerEpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 770:
-#line 1829 "frame/parser.Y"
+#line 1830 "frame/parser.Y"
     {fr->markerCpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 771:
-#line 1831 "frame/parser.Y"
+#line 1832 "frame/parser.Y"
     {fr->markerCpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
     break;
 
   case 772:
-#line 1833 "frame/parser.Y"
+#line 1834 "frame/parser.Y"
     {fr->markerPolygonCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;}
     break;
 
   case 773:
-#line 1835 "frame/parser.Y"
+#line 1836 "frame/parser.Y"
     {fr->markerSegmentCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;}
     break;
 
   case 774:
-#line 1837 "frame/parser.Y"
+#line 1838 "frame/parser.Y"
     {fr->markerDeleteCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 775:
-#line 1839 "frame/parser.Y"
+#line 1840 "frame/parser.Y"
     {fr->markerAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 776:
-#line 1841 "frame/parser.Y"
+#line 1842 "frame/parser.Y"
     {fr->markerBoxAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 777:
-#line 1842 "frame/parser.Y"
+#line 1843 "frame/parser.Y"
     {fr->markerBpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 778:
-#line 1844 "frame/parser.Y"
+#line 1845 "frame/parser.Y"
     {fr->markerEllipseAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 779:
-#line 1846 "frame/parser.Y"
+#line 1847 "frame/parser.Y"
     {fr->markerDeleteCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].str));;}
     break;
 
   case 780:
-#line 1847 "frame/parser.Y"
+#line 1848 "frame/parser.Y"
     {fr->markerEpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 781:
-#line 1848 "frame/parser.Y"
+#line 1849 "frame/parser.Y"
     {fr->markerCpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 782:
-#line 1850 "frame/parser.Y"
+#line 1851 "frame/parser.Y"
     {fr->markerPolygonDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 783:
-#line 1852 "frame/parser.Y"
+#line 1853 "frame/parser.Y"
     {fr->markerSegmentDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 784:
-#line 1853 "frame/parser.Y"
+#line 1854 "frame/parser.Y"
     {fr->markerDeleteTagCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 785:
-#line 1854 "frame/parser.Y"
+#line 1855 "frame/parser.Y"
     {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].str));;}
     break;
 
   case 786:
-#line 1855 "frame/parser.Y"
+#line 1856 "frame/parser.Y"
     {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 787:
-#line 1857 "frame/parser.Y"
+#line 1858 "frame/parser.Y"
     {fr->markerEditBeginCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 788:
-#line 1858 "frame/parser.Y"
+#line 1859 "frame/parser.Y"
     {fr->markerEllipseFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 789:
-#line 1860 "frame/parser.Y"
+#line 1861 "frame/parser.Y"
     {fr->markerEllipseRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real), (yyvsp[(5) - (7)].real)),
 	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 790:
-#line 1864 "frame/parser.Y"
+#line 1865 "frame/parser.Y"
     {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), 
 	    Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 791:
-#line 1867 "frame/parser.Y"
+#line 1868 "frame/parser.Y"
     {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),
 	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 792:
-#line 1870 "frame/parser.Y"
+#line 1871 "frame/parser.Y"
     {fr->markerEpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer),
 	    Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;}
     break;
 
   case 793:
-#line 1874 "frame/parser.Y"
+#line 1875 "frame/parser.Y"
     {fr->markerEpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer),
 	    Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;}
     break;
 
   case 794:
-#line 1878 "frame/parser.Y"
+#line 1879 "frame/parser.Y"
     {fr->markerEpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer),
 	    Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer),
 	    (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;}
     break;
 
   case 795:
-#line 1883 "frame/parser.Y"
+#line 1884 "frame/parser.Y"
     {fr->markerEpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), 
 	    (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer),
 	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 796:
-#line 1887 "frame/parser.Y"
+#line 1888 "frame/parser.Y"
     {fr->markerFontCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 797:
-#line 1888 "frame/parser.Y"
+#line 1889 "frame/parser.Y"
     {fr->markerHighliteCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 798:
-#line 1889 "frame/parser.Y"
+#line 1890 "frame/parser.Y"
     {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 799:
-#line 1891 "frame/parser.Y"
+#line 1892 "frame/parser.Y"
     {fr->markerLineArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 800:
-#line 1893 "frame/parser.Y"
+#line 1894 "frame/parser.Y"
     {fr->markerLineCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), 
 	    (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;}
     break;
 
   case 801:
-#line 1897 "frame/parser.Y"
+#line 1898 "frame/parser.Y"
     {fr->markerMoveCmd((yyvsp[(1) - (4)].integer), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 802:
-#line 1898 "frame/parser.Y"
+#line 1899 "frame/parser.Y"
     {fr->markerFrontCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 803:
-#line 1899 "frame/parser.Y"
+#line 1900 "frame/parser.Y"
     {fr->markerBackCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 804:
-#line 1901 "frame/parser.Y"
+#line 1902 "frame/parser.Y"
     {fr->markerMoveToCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;}
     break;
 
   case 805:
-#line 1904 "frame/parser.Y"
+#line 1905 "frame/parser.Y"
     {fr->markerPolygonResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
 	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 806:
-#line 1907 "frame/parser.Y"
+#line 1908 "frame/parser.Y"
     {fr->markerSegmentResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
 	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 807:
-#line 1910 "frame/parser.Y"
+#line 1911 "frame/parser.Y"
     {fr->markerPointShapeCmd((yyvsp[(1) - (4)].integer),(Point::PointShape)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 808:
-#line 1911 "frame/parser.Y"
+#line 1912 "frame/parser.Y"
     {fr->markerPointSizeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 809:
-#line 1913 "frame/parser.Y"
+#line 1914 "frame/parser.Y"
     {fr->markerPolygonFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 810:
-#line 1916 "frame/parser.Y"
+#line 1917 "frame/parser.Y"
     {fr->markerProjectionCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(5) - (9)].vector)), Vector((yyvsp[(6) - (9)].vector)),
 	    (Coord::CoordSystem)(yyvsp[(3) - (9)].integer), (Coord::SkyFrame)(yyvsp[(4) - (9)].integer), (yyvsp[(7) - (9)].real),
 	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 811:
-#line 1920 "frame/parser.Y"
+#line 1921 "frame/parser.Y"
     {fr->markerPropertyCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 812:
-#line 1922 "frame/parser.Y"
+#line 1923 "frame/parser.Y"
     {fr->markerRotateBeginCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 813:
-#line 1923 "frame/parser.Y"
+#line 1924 "frame/parser.Y"
     {fr->markerRulerDistSpecCmd((yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;}
     break;
 
   case 814:
-#line 1925 "frame/parser.Y"
+#line 1926 "frame/parser.Y"
     {fr->markerRulerPointCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)),
 	    (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;}
     break;
 
   case 815:
-#line 1928 "frame/parser.Y"
+#line 1929 "frame/parser.Y"
     {fr->markerRulerSystemCmd((yyvsp[(1) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer),
 	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 816:
-#line 1931 "frame/parser.Y"
+#line 1932 "frame/parser.Y"
     {fr->markerSelectCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 817:
-#line 1932 "frame/parser.Y"
+#line 1933 "frame/parser.Y"
     {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 818:
-#line 1934 "frame/parser.Y"
+#line 1935 "frame/parser.Y"
     {fr->markerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 819:
-#line 1935 "frame/parser.Y"
+#line 1936 "frame/parser.Y"
     {fr->markerTextCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 820:
-#line 1936 "frame/parser.Y"
+#line 1937 "frame/parser.Y"
     {fr->markerTextRotateCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 821:
-#line 1938 "frame/parser.Y"
+#line 1939 "frame/parser.Y"
     {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 822:
-#line 1939 "frame/parser.Y"
+#line 1940 "frame/parser.Y"
     {fr->markerUnselectCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 823:
-#line 1941 "frame/parser.Y"
+#line 1942 "frame/parser.Y"
     {fr->markerVectorArrowCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 824:
-#line 1944 "frame/parser.Y"
+#line 1945 "frame/parser.Y"
     {fr->markerVectorCmd((yyvsp[(1) - (10)].integer), Vector((yyvsp[(6) - (10)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (10)].integer), (Coord::SkyFrame)(yyvsp[(5) - (10)].integer),
 	    (yyvsp[(9) - (10)].real), (Coord::CoordSystem)(yyvsp[(7) - (10)].integer), (Coord::DistFormat)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;}
     break;
 
   case 825:
-#line 1947 "frame/parser.Y"
+#line 1948 "frame/parser.Y"
     {fr->markerLineWidthCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 826:
-#line 1949 "frame/parser.Y"
+#line 1950 "frame/parser.Y"
     {fr->markerKeyCmd();;}
     break;
 
   case 827:
-#line 1950 "frame/parser.Y"
+#line 1951 "frame/parser.Y"
     {fr->markerKeyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 831:
-#line 1955 "frame/parser.Y"
+#line 1956 "frame/parser.Y"
     {fr->markerPreserveCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 832:
-#line 1956 "frame/parser.Y"
+#line 1957 "frame/parser.Y"
     {fr->markerPropertyCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 833:
-#line 1958 "frame/parser.Y"
+#line 1959 "frame/parser.Y"
     {fr->markerPropertyCmd((yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
     break;
 
   case 834:
-#line 1960 "frame/parser.Y"
+#line 1961 "frame/parser.Y"
     {fr->markerRotateBeginCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 835:
-#line 1962 "frame/parser.Y"
+#line 1963 "frame/parser.Y"
     {fr->markerRotateMotionCmd(Vector((yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real)),(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 836:
-#line 1963 "frame/parser.Y"
+#line 1964 "frame/parser.Y"
     {fr->markerRotateEndCmd();;}
     break;
 
   case 837:
-#line 1965 "frame/parser.Y"
+#line 1966 "frame/parser.Y"
     {fr->markerSaveCmd((yyvsp[(2) - (7)].str), (Base::MarkerFormat)(yyvsp[(3) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::SkyFormat)(yyvsp[(6) - (7)].integer), (yyvsp[(7) - (7)].integer));;}
     break;
 
   case 838:
-#line 1966 "frame/parser.Y"
+#line 1967 "frame/parser.Y"
     {fr->markerSaveTemplateCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 841:
-#line 1971 "frame/parser.Y"
+#line 1972 "frame/parser.Y"
     {fr->markerColorCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 842:
-#line 1972 "frame/parser.Y"
+#line 1973 "frame/parser.Y"
     {fr->markerCopyCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 843:
-#line 1973 "frame/parser.Y"
+#line 1974 "frame/parser.Y"
     {fr->markerDeleteCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 844:
-#line 1974 "frame/parser.Y"
+#line 1975 "frame/parser.Y"
     {fr->markerCutCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 845:
-#line 1975 "frame/parser.Y"
+#line 1976 "frame/parser.Y"
     {fr->markerFontCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 846:
-#line 1976 "frame/parser.Y"
+#line 1977 "frame/parser.Y"
     {fr->markerHighliteCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 847:
-#line 1977 "frame/parser.Y"
+#line 1978 "frame/parser.Y"
     {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 848:
-#line 1978 "frame/parser.Y"
+#line 1979 "frame/parser.Y"
     {fr->markerMoveCmd((yyvsp[(1) - (4)].str),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 849:
-#line 1979 "frame/parser.Y"
+#line 1980 "frame/parser.Y"
     {fr->markerFrontCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 850:
-#line 1980 "frame/parser.Y"
+#line 1981 "frame/parser.Y"
     {fr->markerBackCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 851:
-#line 1982 "frame/parser.Y"
+#line 1983 "frame/parser.Y"
     {fr->markerMoveToCmd((yyvsp[(1) - (6)].str),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;}
     break;
 
   case 852:
-#line 1984 "frame/parser.Y"
+#line 1985 "frame/parser.Y"
     {fr->markerPropertyCmd((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 853:
-#line 1985 "frame/parser.Y"
+#line 1986 "frame/parser.Y"
     {fr->markerSelectCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 854:
-#line 1986 "frame/parser.Y"
+#line 1987 "frame/parser.Y"
     {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 855:
-#line 1987 "frame/parser.Y"
+#line 1988 "frame/parser.Y"
     {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 856:
-#line 1988 "frame/parser.Y"
+#line 1989 "frame/parser.Y"
     {fr->markerUnselectCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 857:
-#line 1990 "frame/parser.Y"
+#line 1991 "frame/parser.Y"
     {fr->markerTagEditCmd((yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;}
     break;
 
   case 858:
-#line 1991 "frame/parser.Y"
+#line 1992 "frame/parser.Y"
     {fr->markerTagDeleteCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 859:
-#line 1992 "frame/parser.Y"
+#line 1993 "frame/parser.Y"
     {fr->markerTagDeleteAllCmd();;}
     break;
 
   case 860:
-#line 1993 "frame/parser.Y"
+#line 1994 "frame/parser.Y"
     {fr->markerTagCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 861:
-#line 1994 "frame/parser.Y"
+#line 1995 "frame/parser.Y"
     {fr->markerTagUpdateCmd((yyvsp[(3) - (3)].str));;}
     break;
 
   case 862:
-#line 1996 "frame/parser.Y"
+#line 1997 "frame/parser.Y"
     {fr->markerPasteCmd();;}
     break;
 
   case 863:
-#line 1997 "frame/parser.Y"
+#line 1998 "frame/parser.Y"
     {fr->markerPasteCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 864:
-#line 1998 "frame/parser.Y"
+#line 1999 "frame/parser.Y"
     {fr->markerUndoCmd();;}
     break;
 
   case 865:
-#line 1999 "frame/parser.Y"
+#line 2000 "frame/parser.Y"
     {fr->markerUnhighliteAllCmd();;}
     break;
 
   case 866:
-#line 2000 "frame/parser.Y"
+#line 2001 "frame/parser.Y"
     {fr->markerUnselectAllCmd();;}
     break;
 
   case 867:
-#line 2001 "frame/parser.Y"
+#line 2002 "frame/parser.Y"
     {fr->markerLineWidthCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 868:
-#line 2004 "frame/parser.Y"
+#line 2005 "frame/parser.Y"
     {(yyval.integer) = CallBack::SELECTCB;;}
     break;
 
   case 869:
-#line 2005 "frame/parser.Y"
+#line 2006 "frame/parser.Y"
     {(yyval.integer) = CallBack::UNSELECTCB;;}
     break;
 
   case 870:
-#line 2006 "frame/parser.Y"
+#line 2007 "frame/parser.Y"
     {(yyval.integer) = CallBack::HIGHLITECB;;}
     break;
 
   case 871:
-#line 2007 "frame/parser.Y"
+#line 2008 "frame/parser.Y"
     {(yyval.integer) = CallBack::UNHIGHLITECB;;}
     break;
 
   case 872:
-#line 2008 "frame/parser.Y"
+#line 2009 "frame/parser.Y"
     {(yyval.integer) = CallBack::MOVEBEGINCB;;}
     break;
 
   case 873:
-#line 2009 "frame/parser.Y"
+#line 2010 "frame/parser.Y"
     {(yyval.integer) = CallBack::MOVECB;;}
     break;
 
   case 874:
-#line 2010 "frame/parser.Y"
+#line 2011 "frame/parser.Y"
     {(yyval.integer) = CallBack::MOVEENDCB;;}
     break;
 
   case 875:
-#line 2011 "frame/parser.Y"
+#line 2012 "frame/parser.Y"
     {(yyval.integer) = CallBack::EDITBEGINCB;;}
     break;
 
   case 876:
-#line 2012 "frame/parser.Y"
+#line 2013 "frame/parser.Y"
     {(yyval.integer) = CallBack::EDITCB;;}
     break;
 
   case 877:
-#line 2013 "frame/parser.Y"
+#line 2014 "frame/parser.Y"
     {(yyval.integer) = CallBack::EDITENDCB;;}
     break;
 
   case 878:
-#line 2014 "frame/parser.Y"
+#line 2015 "frame/parser.Y"
     {(yyval.integer) = CallBack::ROTATEBEGINCB;;}
     break;
 
   case 879:
-#line 2015 "frame/parser.Y"
+#line 2016 "frame/parser.Y"
     {(yyval.integer) = CallBack::ROTATECB;;}
     break;
 
   case 880:
-#line 2016 "frame/parser.Y"
+#line 2017 "frame/parser.Y"
     {(yyval.integer) = CallBack::ROTATEENDCB;;}
     break;
 
   case 881:
-#line 2017 "frame/parser.Y"
+#line 2018 "frame/parser.Y"
     {(yyval.integer) = CallBack::DELETECB;;}
     break;
 
   case 882:
-#line 2018 "frame/parser.Y"
+#line 2019 "frame/parser.Y"
     {(yyval.integer) = CallBack::TEXTCB;;}
     break;
 
   case 883:
-#line 2019 "frame/parser.Y"
+#line 2020 "frame/parser.Y"
     {(yyval.integer) = CallBack::COLORCB;;}
     break;
 
   case 884:
-#line 2020 "frame/parser.Y"
+#line 2021 "frame/parser.Y"
     {(yyval.integer) = CallBack::LINEWIDTHCB;;}
     break;
 
   case 885:
-#line 2021 "frame/parser.Y"
+#line 2022 "frame/parser.Y"
     {(yyval.integer) = CallBack::PROPERTYCB;;}
     break;
 
   case 886:
-#line 2022 "frame/parser.Y"
+#line 2023 "frame/parser.Y"
     {(yyval.integer) = CallBack::FONTCB;;}
     break;
 
   case 887:
-#line 2023 "frame/parser.Y"
+#line 2024 "frame/parser.Y"
     {(yyval.integer) = CallBack::KEYCB;;}
     break;
 
   case 888:
-#line 2024 "frame/parser.Y"
+#line 2025 "frame/parser.Y"
     {(yyval.integer) = CallBack::UPDATECB;;}
     break;
 
   case 889:
-#line 2027 "frame/parser.Y"
+#line 2028 "frame/parser.Y"
     {fr->markerCentroidCmd();;}
     break;
 
   case 890:
-#line 2028 "frame/parser.Y"
+#line 2029 "frame/parser.Y"
     {fr->markerCentroidCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 891:
-#line 2029 "frame/parser.Y"
+#line 2030 "frame/parser.Y"
     {fr->markerCentroidAutoCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 892:
-#line 2030 "frame/parser.Y"
+#line 2031 "frame/parser.Y"
     {fr->markerCentroidRadiusCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 893:
-#line 2031 "frame/parser.Y"
+#line 2032 "frame/parser.Y"
     {fr->markerCentroidIterationCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 894:
-#line 2033 "frame/parser.Y"
+#line 2034 "frame/parser.Y"
     {
 	  fr->markerCentroidIterationCmd((yyvsp[(2) - (3)].integer));
 	  fr->markerCentroidRadiusCmd((yyvsp[(3) - (3)].real));
@@ -9141,7 +9142,7 @@ yyreduce:
     break;
 
   case 895:
-#line 2043 "frame/parser.Y"
+#line 2044 "frame/parser.Y"
     {fr->createCircleCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (5)].real), 0,
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9149,7 +9150,7 @@ yyreduce:
     break;
 
   case 896:
-#line 2051 "frame/parser.Y"
+#line 2052 "frame/parser.Y"
     {fr->createEllipseCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS),
 	    Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
             (yyvsp[(6) - (7)].real), 0,
@@ -9158,7 +9159,7 @@ yyreduce:
     break;
 
   case 897:
-#line 2060 "frame/parser.Y"
+#line 2061 "frame/parser.Y"
     {fr->createBoxCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS),
 	    Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
             (yyvsp[(6) - (7)].real), 0,
@@ -9167,7 +9168,7 @@ yyreduce:
     break;
 
   case 898:
-#line 2068 "frame/parser.Y"
+#line 2069 "frame/parser.Y"
     {fr->createPolygonCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS),
             Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), 0,
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9175,7 +9176,7 @@ yyreduce:
     break;
 
   case 899:
-#line 2075 "frame/parser.Y"
+#line 2076 "frame/parser.Y"
     {fr->createSegmentCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS),
 	    Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9183,7 +9184,7 @@ yyreduce:
     break;
 
   case 900:
-#line 2082 "frame/parser.Y"
+#line 2083 "frame/parser.Y"
     {fr->createLineCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS),
 	    fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS),
 	    0, 0,
@@ -9192,7 +9193,7 @@ yyreduce:
     break;
 
   case 901:
-#line 2090 "frame/parser.Y"
+#line 2091 "frame/parser.Y"
     {fr->createVectCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS),
 	    fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS),
 	    1,
@@ -9201,7 +9202,7 @@ yyreduce:
     break;
 
   case 902:
-#line 2098 "frame/parser.Y"
+#line 2099 "frame/parser.Y"
     {fr->createTextCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (5)].real), 1,
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9209,7 +9210,7 @@ yyreduce:
     break;
 
   case 903:
-#line 2103 "frame/parser.Y"
+#line 2104 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::CIRCLE, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9217,7 +9218,7 @@ yyreduce:
     break;
 
   case 904:
-#line 2108 "frame/parser.Y"
+#line 2109 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::BOX, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9225,7 +9226,7 @@ yyreduce:
     break;
 
   case 905:
-#line 2113 "frame/parser.Y"
+#line 2114 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::DIAMOND, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9233,7 +9234,7 @@ yyreduce:
     break;
 
   case 906:
-#line 2118 "frame/parser.Y"
+#line 2119 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::CROSS, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9241,7 +9242,7 @@ yyreduce:
     break;
 
   case 907:
-#line 2123 "frame/parser.Y"
+#line 2124 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::EX, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9249,7 +9250,7 @@ yyreduce:
     break;
 
   case 908:
-#line 2128 "frame/parser.Y"
+#line 2129 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::ARROW, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9257,7 +9258,7 @@ yyreduce:
     break;
 
   case 909:
-#line 2133 "frame/parser.Y"
+#line 2134 "frame/parser.Y"
     {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS),
 	    Point::BOXCIRCLE, (yyvsp[(5) - (6)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9265,7 +9266,7 @@ yyreduce:
     break;
 
   case 910:
-#line 2142 "frame/parser.Y"
+#line 2143 "frame/parser.Y"
     {fr->createRulerCmd(fr->mapToRef(Vector((yyvsp[(2) - (11)].real),(yyvsp[(3) - (11)].real)),Coord::CANVAS),
 	    fr->mapToRef(Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)),Coord::CANVAS),
             (Coord::CoordSystem)(yyvsp[(6) - (11)].integer), (Coord::SkyFrame)(yyvsp[(7) - (11)].integer), 
@@ -9275,7 +9276,7 @@ yyreduce:
     break;
 
   case 911:
-#line 2152 "frame/parser.Y"
+#line 2153 "frame/parser.Y"
     {fr->createCompassCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), 
 	    (yyvsp[(4) - (7)].real),
 	    "N", "E", 1, 1,
@@ -9285,7 +9286,7 @@ yyreduce:
     break;
 
   case 912:
-#line 2162 "frame/parser.Y"
+#line 2163 "frame/parser.Y"
     {fr->createProjectionCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS),
 	    fr->mapToRef(Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),Coord::CANVAS),
 	    (yyvsp[(6) - (7)].real),
@@ -9294,7 +9295,7 @@ yyreduce:
     break;
 
   case 913:
-#line 2171 "frame/parser.Y"
+#line 2172 "frame/parser.Y"
     {fr->createAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
@@ -9302,7 +9303,7 @@ yyreduce:
     break;
 
   case 914:
-#line 2179 "frame/parser.Y"
+#line 2180 "frame/parser.Y"
     {fr->createEllipseAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS),
 	    Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), 
 	    Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer),
@@ -9312,7 +9313,7 @@ yyreduce:
     break;
 
   case 915:
-#line 2189 "frame/parser.Y"
+#line 2190 "frame/parser.Y"
     {fr->createBoxAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS),
 	    Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)),Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer),
 	    (yyvsp[(8) - (9)].real),
@@ -9321,7 +9322,7 @@ yyreduce:
     break;
 
   case 916:
-#line 2199 "frame/parser.Y"
+#line 2200 "frame/parser.Y"
     {fr->createCpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].integer),
 	    (yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].integer),
@@ -9330,7 +9331,7 @@ yyreduce:
     break;
 
   case 917:
-#line 2209 "frame/parser.Y"
+#line 2210 "frame/parser.Y"
     {fr->createEpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer),
 	    Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)),
@@ -9341,7 +9342,7 @@ yyreduce:
     break;
 
   case 918:
-#line 2221 "frame/parser.Y"
+#line 2222 "frame/parser.Y"
     {fr->createBpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS),
 	    (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer),
 	    Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)),
@@ -9352,24 +9353,24 @@ yyreduce:
     break;
 
   case 919:
-#line 2230 "frame/parser.Y"
+#line 2231 "frame/parser.Y"
     {fr->createCompositeCmd(
 	    currentColor,currentDash,currentWidth,currentFont,
 	    currentText,currentProps,NULL,taglist,cblist);;}
     break;
 
   case 921:
-#line 2238 "frame/parser.Y"
+#line 2239 "frame/parser.Y"
     {fr->createTemplateCmd(fr->mapToRef(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),Coord::CANVAS), (yyvsp[(1) - (3)].str));;}
     break;
 
   case 922:
-#line 2240 "frame/parser.Y"
+#line 2241 "frame/parser.Y"
     {fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),Coord::CANVAS), (yyvsp[(2) - (4)].str));;}
     break;
 
   case 923:
-#line 2242 "frame/parser.Y"
+#line 2243 "frame/parser.Y"
     { 
 	    // backward compatibility
 	    fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Coord::CANVAS), (yyvsp[(4) - (4)].str));
@@ -9377,560 +9378,560 @@ yyreduce:
     break;
 
   case 924:
-#line 2247 "frame/parser.Y"
+#line 2248 "frame/parser.Y"
     {fr->createTemplateCmd(Vector((yyvsp[(4) - (4)].vector)),(Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str));;}
     break;
 
   case 925:
-#line 2250 "frame/parser.Y"
+#line 2251 "frame/parser.Y"
     {(yyval.dash)[0] = (yyvsp[(1) - (2)].integer); (yyval.dash)[1] = (yyvsp[(2) - (2)].integer);;}
     break;
 
   case 926:
-#line 2254 "frame/parser.Y"
+#line 2255 "frame/parser.Y"
     {fr->markerEditBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 927:
-#line 2256 "frame/parser.Y"
+#line 2257 "frame/parser.Y"
     {fr->markerEditMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 928:
-#line 2257 "frame/parser.Y"
+#line 2258 "frame/parser.Y"
     {fr->markerEditEndCmd();;}
     break;
 
   case 929:
-#line 2260 "frame/parser.Y"
+#line 2261 "frame/parser.Y"
     {(yyval.integer) = Base::DS9;;}
     break;
 
   case 930:
-#line 2261 "frame/parser.Y"
+#line 2262 "frame/parser.Y"
     {(yyval.integer) = Base::XML;;}
     break;
 
   case 931:
-#line 2262 "frame/parser.Y"
+#line 2263 "frame/parser.Y"
     {(yyval.integer) = Base::CIAO;;}
     break;
 
   case 932:
-#line 2263 "frame/parser.Y"
+#line 2264 "frame/parser.Y"
     {(yyval.integer) = Base::SAOTNG;;}
     break;
 
   case 933:
-#line 2264 "frame/parser.Y"
+#line 2265 "frame/parser.Y"
     {(yyval.integer) = Base::SAOIMAGE;;}
     break;
 
   case 934:
-#line 2265 "frame/parser.Y"
+#line 2266 "frame/parser.Y"
     {(yyval.integer) = Base::PROS;;}
     break;
 
   case 935:
-#line 2266 "frame/parser.Y"
+#line 2267 "frame/parser.Y"
     {(yyval.integer) = Base::RAWXY;;}
     break;
 
   case 937:
-#line 2270 "frame/parser.Y"
+#line 2271 "frame/parser.Y"
     {fr->getMarkerColorCmd();;}
     break;
 
   case 938:
-#line 2271 "frame/parser.Y"
+#line 2272 "frame/parser.Y"
     {fr->getMarkerFontCmd();;}
     break;
 
   case 939:
-#line 2272 "frame/parser.Y"
+#line 2273 "frame/parser.Y"
     {fr->getMarkerEpsilonCmd();;}
     break;
 
   case 940:
-#line 2273 "frame/parser.Y"
+#line 2274 "frame/parser.Y"
     {fr->getMarkerHandleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 941:
-#line 2274 "frame/parser.Y"
+#line 2275 "frame/parser.Y"
     {fr->getMarkerIdCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 942:
-#line 2277 "frame/parser.Y"
+#line 2278 "frame/parser.Y"
     {fr->getMarkerAnalysisPandaCmd((yyvsp[(1) - (8)].integer),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),(yyvsp[(6) - (8)].str),(Coord::CoordSystem)(yyvsp[(7) - (8)].integer),(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 943:
-#line 2279 "frame/parser.Y"
+#line 2280 "frame/parser.Y"
     {fr->getMarkerAnalysisHistogramCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 944:
-#line 2281 "frame/parser.Y"
+#line 2282 "frame/parser.Y"
     {fr->getMarkerAnalysisPlot2dCmd((yyvsp[(1) - (10)].integer),(yyvsp[(4) - (10)].str),(yyvsp[(5) - (10)].str),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),(Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyFrame)(yyvsp[(9) - (10)].integer), (Marker::AnalysisMethod)(yyvsp[(10) - (10)].integer));;}
     break;
 
   case 945:
-#line 2283 "frame/parser.Y"
+#line 2284 "frame/parser.Y"
     {fr->getMarkerAnalysisPlot3dCmd((yyvsp[(1) - (8)].integer),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),(Coord::CoordSystem)(yyvsp[(6) - (8)].integer),(Coord::SkyFrame)(yyvsp[(7) - (8)].integer), (Marker::AnalysisMethod)(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 946:
-#line 2285 "frame/parser.Y"
+#line 2286 "frame/parser.Y"
     {fr->getMarkerAnalysisRadialCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(Coord::CoordSystem)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 947:
-#line 2287 "frame/parser.Y"
+#line 2288 "frame/parser.Y"
     {fr->getMarkerAnalysisStatsCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 948:
-#line 2289 "frame/parser.Y"
+#line 2290 "frame/parser.Y"
     {fr->getMarkerIdAllCmd();;}
     break;
 
   case 949:
-#line 2290 "frame/parser.Y"
+#line 2291 "frame/parser.Y"
     {fr->getMarkerAngleCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 950:
-#line 2291 "frame/parser.Y"
+#line 2292 "frame/parser.Y"
     {fr->getMarkerAngleCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 951:
-#line 2293 "frame/parser.Y"
+#line 2294 "frame/parser.Y"
     {fr->getMarkerAngleCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 952:
-#line 2295 "frame/parser.Y"
+#line 2296 "frame/parser.Y"
     {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 953:
-#line 2297 "frame/parser.Y"
+#line 2298 "frame/parser.Y"
     {fr->getMarkerBoxFillCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 954:
-#line 2299 "frame/parser.Y"
+#line 2300 "frame/parser.Y"
     {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 955:
-#line 2301 "frame/parser.Y"
+#line 2302 "frame/parser.Y"
     {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 956:
-#line 2302 "frame/parser.Y"
+#line 2303 "frame/parser.Y"
     {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 957:
-#line 2303 "frame/parser.Y"
+#line 2304 "frame/parser.Y"
     {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
     break;
 
   case 958:
-#line 2305 "frame/parser.Y"
+#line 2306 "frame/parser.Y"
     {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 959:
-#line 2307 "frame/parser.Y"
+#line 2308 "frame/parser.Y"
     {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 960:
-#line 2310 "frame/parser.Y"
+#line 2311 "frame/parser.Y"
     {fr->getMarkerCenterCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), 
 	    (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 961:
-#line 2312 "frame/parser.Y"
+#line 2313 "frame/parser.Y"
     {fr->getMarkerCircleFillCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 962:
-#line 2314 "frame/parser.Y"
+#line 2315 "frame/parser.Y"
     {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 963:
-#line 2315 "frame/parser.Y"
+#line 2316 "frame/parser.Y"
     {fr->getMarkerColorCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 964:
-#line 2316 "frame/parser.Y"
+#line 2317 "frame/parser.Y"
     {fr->getMarkerCompassArrowCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 965:
-#line 2317 "frame/parser.Y"
+#line 2318 "frame/parser.Y"
     {fr->getMarkerCompassLabelCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 966:
-#line 2319 "frame/parser.Y"
+#line 2320 "frame/parser.Y"
     {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 967:
-#line 2320 "frame/parser.Y"
+#line 2321 "frame/parser.Y"
     {fr->getMarkerCompassSystemCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 968:
-#line 2321 "frame/parser.Y"
+#line 2322 "frame/parser.Y"
     {fr->getMarkerCompositeCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 969:
-#line 2322 "frame/parser.Y"
+#line 2323 "frame/parser.Y"
     {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 970:
-#line 2323 "frame/parser.Y"
+#line 2324 "frame/parser.Y"
     {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
     break;
 
   case 971:
-#line 2325 "frame/parser.Y"
+#line 2326 "frame/parser.Y"
     {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 972:
-#line 2327 "frame/parser.Y"
+#line 2328 "frame/parser.Y"
     {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 973:
-#line 2328 "frame/parser.Y"
+#line 2329 "frame/parser.Y"
     {fr->getMarkerEllipseFillCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 974:
-#line 2330 "frame/parser.Y"
+#line 2331 "frame/parser.Y"
     {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 975:
-#line 2332 "frame/parser.Y"
+#line 2333 "frame/parser.Y"
     {fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), 
 	    (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 976:
-#line 2334 "frame/parser.Y"
+#line 2335 "frame/parser.Y"
     {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 977:
-#line 2335 "frame/parser.Y"
+#line 2336 "frame/parser.Y"
     {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
     break;
 
   case 978:
-#line 2337 "frame/parser.Y"
+#line 2338 "frame/parser.Y"
     {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 979:
-#line 2339 "frame/parser.Y"
+#line 2340 "frame/parser.Y"
     {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 980:
-#line 2340 "frame/parser.Y"
+#line 2341 "frame/parser.Y"
     {fr->getMarkerFontCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 981:
-#line 2341 "frame/parser.Y"
+#line 2342 "frame/parser.Y"
     {fr->getMarkerHighlitedCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 982:
-#line 2342 "frame/parser.Y"
+#line 2343 "frame/parser.Y"
     {fr->getMarkerLineArrowCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 983:
-#line 2344 "frame/parser.Y"
+#line 2345 "frame/parser.Y"
     {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 984:
-#line 2346 "frame/parser.Y"
+#line 2347 "frame/parser.Y"
     {fr->getMarkerLineCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),
 	    (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 985:
-#line 2349 "frame/parser.Y"
+#line 2350 "frame/parser.Y"
     {fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real),
 	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 986:
-#line 2352 "frame/parser.Y"
+#line 2353 "frame/parser.Y"
     {fr->getMarkerPolygonFillCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 987:
-#line 2353 "frame/parser.Y"
+#line 2354 "frame/parser.Y"
     {fr->getMarkerPointShapeCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 988:
-#line 2354 "frame/parser.Y"
+#line 2355 "frame/parser.Y"
     {fr->getMarkerPointSizeCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 989:
-#line 2356 "frame/parser.Y"
+#line 2357 "frame/parser.Y"
     {fr->getMarkerProjectionPointsCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),
 	    (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 990:
-#line 2359 "frame/parser.Y"
+#line 2360 "frame/parser.Y"
     {fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), 
 	    (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 991:
-#line 2362 "frame/parser.Y"
+#line 2363 "frame/parser.Y"
     {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 992:
-#line 2363 "frame/parser.Y"
+#line 2364 "frame/parser.Y"
     {fr->getMarkerPropertyCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 993:
-#line 2364 "frame/parser.Y"
+#line 2365 "frame/parser.Y"
     {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 994:
-#line 2365 "frame/parser.Y"
+#line 2366 "frame/parser.Y"
     {fr->getMarkerRulerDistSpecCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 995:
-#line 2367 "frame/parser.Y"
+#line 2368 "frame/parser.Y"
     {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 996:
-#line 2369 "frame/parser.Y"
+#line 2370 "frame/parser.Y"
     {fr->getMarkerRulerPointCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),
 	    (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 997:
-#line 2371 "frame/parser.Y"
+#line 2372 "frame/parser.Y"
     {fr->getMarkerRulerSystemCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 998:
-#line 2372 "frame/parser.Y"
+#line 2373 "frame/parser.Y"
     {fr->getMarkerSelectedCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 999:
-#line 2374 "frame/parser.Y"
+#line 2375 "frame/parser.Y"
     {fr->getMarkerTagCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 1000:
-#line 2375 "frame/parser.Y"
+#line 2376 "frame/parser.Y"
     {fr->getMarkerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1001:
-#line 2376 "frame/parser.Y"
+#line 2377 "frame/parser.Y"
     {fr->getMarkerTextCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 1002:
-#line 2377 "frame/parser.Y"
+#line 2378 "frame/parser.Y"
     {fr->getMarkerTextRotateCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 1003:
-#line 2378 "frame/parser.Y"
+#line 2379 "frame/parser.Y"
     {fr->getMarkerTypeCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 1004:
-#line 2380 "frame/parser.Y"
+#line 2381 "frame/parser.Y"
     {fr->getMarkerVectorArrowCmd((yyvsp[(1) - (3)].integer));;}
     break;
 
   case 1005:
-#line 2382 "frame/parser.Y"
+#line 2383 "frame/parser.Y"
     {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1006:
-#line 2384 "frame/parser.Y"
+#line 2385 "frame/parser.Y"
     {fr->getMarkerVectorCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),
 	    (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 1007:
-#line 2386 "frame/parser.Y"
+#line 2387 "frame/parser.Y"
     {fr->getMarkerLineWidthCmd((yyvsp[(1) - (2)].integer));;}
     break;
 
   case 1009:
-#line 2388 "frame/parser.Y"
+#line 2389 "frame/parser.Y"
     {fr->getMarkerHighlitedNumberCmd();;}
     break;
 
   case 1010:
-#line 2389 "frame/parser.Y"
+#line 2390 "frame/parser.Y"
     {fr->getMarkerNumberCmd();;}
     break;
 
   case 1011:
-#line 2391 "frame/parser.Y"
+#line 2392 "frame/parser.Y"
     {fr->getMarkerPolygonSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 1012:
-#line 2393 "frame/parser.Y"
+#line 2394 "frame/parser.Y"
     {fr->getMarkerSegmentSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 1013:
-#line 2394 "frame/parser.Y"
+#line 2395 "frame/parser.Y"
     {fr->getMarkerPreserveCmd();;}
     break;
 
   case 1014:
-#line 2395 "frame/parser.Y"
+#line 2396 "frame/parser.Y"
     {fr->getMarkerPropertyCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1016:
-#line 2397 "frame/parser.Y"
+#line 2398 "frame/parser.Y"
     {fr->getMarkerSelectedNumberCmd();;}
     break;
 
   case 1018:
-#line 2401 "frame/parser.Y"
+#line 2402 "frame/parser.Y"
     {fr->getMarkerColorCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 1019:
-#line 2402 "frame/parser.Y"
+#line 2403 "frame/parser.Y"
     {fr->getMarkerFontCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 1020:
-#line 2403 "frame/parser.Y"
+#line 2404 "frame/parser.Y"
     {fr->getMarkerIdCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 1021:
-#line 2404 "frame/parser.Y"
+#line 2405 "frame/parser.Y"
     {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1022:
-#line 2405 "frame/parser.Y"
+#line 2406 "frame/parser.Y"
     {fr->getMarkerTagCmd((yyvsp[(1) - (2)].str));;}
     break;
 
   case 1023:
-#line 2406 "frame/parser.Y"
+#line 2407 "frame/parser.Y"
     {fr->getMarkerTagNumberCmd((yyvsp[(1) - (3)].str));;}
     break;
 
   case 1024:
-#line 2408 "frame/parser.Y"
+#line 2409 "frame/parser.Y"
     {fr->getMarkerTagsCmd();;}
     break;
 
   case 1025:
-#line 2409 "frame/parser.Y"
+#line 2410 "frame/parser.Y"
     {fr->getMarkerTagDefaultNameCmd();;}
     break;
 
   case 1026:
-#line 2411 "frame/parser.Y"
+#line 2412 "frame/parser.Y"
     {fr->getMarkerLineWidthCmd();;}
     break;
 
   case 1027:
-#line 2414 "frame/parser.Y"
+#line 2415 "frame/parser.Y"
     {fr->getMarkerCentroidAutoCmd();;}
     break;
 
   case 1028:
-#line 2415 "frame/parser.Y"
+#line 2416 "frame/parser.Y"
     {fr->getMarkerCentroidRadiusCmd();;}
     break;
 
   case 1029:
-#line 2416 "frame/parser.Y"
+#line 2417 "frame/parser.Y"
     {fr->getMarkerCentroidIterationCmd();;}
     break;
 
   case 1030:
-#line 2417 "frame/parser.Y"
+#line 2418 "frame/parser.Y"
     {fr->getMarkerCentroidOptionCmd();;}
     break;
 
   case 1031:
-#line 2420 "frame/parser.Y"
+#line 2421 "frame/parser.Y"
     {fr->getMarkerHighlitedCmd();;}
     break;
 
   case 1032:
-#line 2421 "frame/parser.Y"
+#line 2422 "frame/parser.Y"
     {fr->getMarkerHighlitedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1033:
-#line 2424 "frame/parser.Y"
+#line 2425 "frame/parser.Y"
     {fr->getMarkerSelectedCmd();;}
     break;
 
   case 1034:
-#line 2425 "frame/parser.Y"
+#line 2426 "frame/parser.Y"
     {fr->getMarkerSelectedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1035:
-#line 2428 "frame/parser.Y"
+#line 2429 "frame/parser.Y"
     {fr->getMarkerShowCmd();;}
     break;
 
   case 1036:
-#line 2429 "frame/parser.Y"
+#line 2430 "frame/parser.Y"
     {fr->getMarkerShowTextCmd();;}
     break;
 
   case 1037:
-#line 2432 "frame/parser.Y"
+#line 2433 "frame/parser.Y"
     {
 	  strncpy(currentFont, "helvetica 10 normal roman", 32);
 	  strncpy(currentColor, "green", 16);
@@ -9945,12 +9946,12 @@ yyreduce:
     break;
 
   case 1038:
-#line 2445 "frame/parser.Y"
+#line 2446 "frame/parser.Y"
     {fr->markerLayerCmd(Base::USER);;}
     break;
 
   case 1039:
-#line 2446 "frame/parser.Y"
+#line 2447 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->markerLayerCmd(Base::USER);
@@ -9958,12 +9959,12 @@ yyreduce:
     break;
 
   case 1040:
-#line 2450 "frame/parser.Y"
+#line 2451 "frame/parser.Y"
     {fr->markerLayerCmd(Base::USER);;}
     break;
 
   case 1041:
-#line 2451 "frame/parser.Y"
+#line 2452 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->markerLayerCmd(Base::USER);
@@ -9971,269 +9972,269 @@ yyreduce:
     break;
 
   case 1042:
-#line 2455 "frame/parser.Y"
+#line 2456 "frame/parser.Y"
     {fr->markerLayerCmd(Base::CATALOG);;}
     break;
 
   case 1043:
-#line 2460 "frame/parser.Y"
+#line 2461 "frame/parser.Y"
     {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(1) - (7)].integer),
 	    (Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), (Coord::SkyFormat)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer),
 	    0, propQMask, propQValue, taglist);;}
     break;
 
   case 1044:
-#line 2465 "frame/parser.Y"
+#line 2466 "frame/parser.Y"
     {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(2) - (8)].integer), 
 	    (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer), (Coord::SkyFormat)(yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer),
 	    1, propQMask, propQValue, taglist);;}
     break;
 
   case 1045:
-#line 2471 "frame/parser.Y"
+#line 2472 "frame/parser.Y"
     {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
     break;
 
   case 1046:
-#line 2473 "frame/parser.Y"
+#line 2474 "frame/parser.Y"
     {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].str),
 	    (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 1047:
-#line 2476 "frame/parser.Y"
+#line 2477 "frame/parser.Y"
     {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1048:
-#line 2478 "frame/parser.Y"
+#line 2479 "frame/parser.Y"
     {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].integer),
 	    (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 1049:
-#line 2481 "frame/parser.Y"
+#line 2482 "frame/parser.Y"
     {fr->markerLoadFitsCmd((yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].dash), (yyvsp[(5) - (6)].integer), (yyvsp[(6) - (6)].str));;}
     break;
 
   case 1050:
-#line 2484 "frame/parser.Y"
+#line 2485 "frame/parser.Y"
     {fr->markerMoveCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1051:
-#line 2485 "frame/parser.Y"
+#line 2486 "frame/parser.Y"
     {fr->markerFrontCmd();;}
     break;
 
   case 1052:
-#line 2486 "frame/parser.Y"
+#line 2487 "frame/parser.Y"
     {fr->markerBackCmd();;}
     break;
 
   case 1053:
-#line 2487 "frame/parser.Y"
+#line 2488 "frame/parser.Y"
     {fr->markerMoveBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1054:
-#line 2488 "frame/parser.Y"
+#line 2489 "frame/parser.Y"
     {fr->markerMoveMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1055:
-#line 2489 "frame/parser.Y"
+#line 2490 "frame/parser.Y"
     {fr->markerMoveEndCmd();;}
     break;
 
   case 1056:
-#line 2491 "frame/parser.Y"
+#line 2492 "frame/parser.Y"
     {fr->markerMoveToCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (4)].integer), (Coord::SkyFrame)(yyvsp[(3) - (4)].integer));;}
     break;
 
   case 1059:
-#line 2498 "frame/parser.Y"
+#line 2499 "frame/parser.Y"
     {setProps(&currentProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1060:
-#line 2499 "frame/parser.Y"
+#line 2500 "frame/parser.Y"
     {strncpy(currentColor,(yyvsp[(3) - (3)].str),16);;}
     break;
 
   case 1061:
-#line 2500 "frame/parser.Y"
+#line 2501 "frame/parser.Y"
     {currentDash[0]=(yyvsp[(3) - (4)].integer);currentDash[1]=(yyvsp[(4) - (4)].integer);;}
     break;
 
   case 1062:
-#line 2501 "frame/parser.Y"
+#line 2502 "frame/parser.Y"
     {currentWidth = (yyvsp[(3) - (3)].integer);;}
     break;
 
   case 1063:
-#line 2502 "frame/parser.Y"
+#line 2503 "frame/parser.Y"
     {strncpy(currentFont,(yyvsp[(3) - (3)].str),32);;}
     break;
 
   case 1064:
-#line 2503 "frame/parser.Y"
+#line 2504 "frame/parser.Y"
     {strncpy(currentText,(yyvsp[(3) - (3)].str),80);;}
     break;
 
   case 1067:
-#line 2508 "frame/parser.Y"
+#line 2509 "frame/parser.Y"
     {(yyval.integer) = Marker::NONE;;}
     break;
 
   case 1068:
-#line 2509 "frame/parser.Y"
+#line 2510 "frame/parser.Y"
     {(yyval.integer) = Marker::SELECT;;}
     break;
 
   case 1069:
-#line 2510 "frame/parser.Y"
+#line 2511 "frame/parser.Y"
     {(yyval.integer) = Marker::HIGHLITE;;}
     break;
 
   case 1070:
-#line 2511 "frame/parser.Y"
+#line 2512 "frame/parser.Y"
     {(yyval.integer) = Marker::DASH;;}
     break;
 
   case 1071:
-#line 2512 "frame/parser.Y"
+#line 2513 "frame/parser.Y"
     {(yyval.integer) = Marker::FIXED;;}
     break;
 
   case 1072:
-#line 2513 "frame/parser.Y"
+#line 2514 "frame/parser.Y"
     {(yyval.integer) = Marker::EDIT;;}
     break;
 
   case 1073:
-#line 2514 "frame/parser.Y"
+#line 2515 "frame/parser.Y"
     {(yyval.integer) = Marker::MOVE;;}
     break;
 
   case 1074:
-#line 2515 "frame/parser.Y"
+#line 2516 "frame/parser.Y"
     {(yyval.integer) = Marker::ROTATE;;}
     break;
 
   case 1075:
-#line 2516 "frame/parser.Y"
+#line 2517 "frame/parser.Y"
     {(yyval.integer) = Marker::DELETE;;}
     break;
 
   case 1076:
-#line 2517 "frame/parser.Y"
+#line 2518 "frame/parser.Y"
     {(yyval.integer) = Marker::INCLUDE;;}
     break;
 
   case 1077:
-#line 2518 "frame/parser.Y"
+#line 2519 "frame/parser.Y"
     {(yyval.integer) = Marker::SOURCE;;}
     break;
 
   case 1080:
-#line 2525 "frame/parser.Y"
+#line 2526 "frame/parser.Y"
     {propQMask=0;propQValue=0;;}
     break;
 
   case 1081:
-#line 2526 "frame/parser.Y"
+#line 2527 "frame/parser.Y"
     {propQMask=0;propQValue=0;;}
     break;
 
   case 1083:
-#line 2529 "frame/parser.Y"
+#line 2530 "frame/parser.Y"
     {fr->markerSelectAllCmd();;}
     break;
 
   case 1084:
-#line 2530 "frame/parser.Y"
+#line 2531 "frame/parser.Y"
     {fr->markerSelectOnlyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1085:
-#line 2531 "frame/parser.Y"
+#line 2532 "frame/parser.Y"
     {fr->markerSelectToggleCmd();;}
     break;
 
   case 1086:
-#line 2532 "frame/parser.Y"
+#line 2533 "frame/parser.Y"
     {fr->markerSelectToggleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1087:
-#line 2535 "frame/parser.Y"
+#line 2536 "frame/parser.Y"
     {fr->markerShowCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 1088:
-#line 2536 "frame/parser.Y"
+#line 2537 "frame/parser.Y"
     {fr->markerShowTextCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1091:
-#line 2544 "frame/parser.Y"
+#line 2545 "frame/parser.Y"
     {propQMask |= (yyvsp[(1) - (3)].integer); setProps(&propQValue,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1092:
-#line 2547 "frame/parser.Y"
+#line 2548 "frame/parser.Y"
     {taglist.deleteAll();;}
     break;
 
   case 1093:
-#line 2548 "frame/parser.Y"
+#line 2549 "frame/parser.Y"
     {taglist.deleteAll();;}
     break;
 
   case 1097:
-#line 2555 "frame/parser.Y"
+#line 2556 "frame/parser.Y"
     {taglist.append(new Tag((yyvsp[(3) - (3)].str)));;}
     break;
 
   case 1098:
-#line 2558 "frame/parser.Y"
+#line 2559 "frame/parser.Y"
     {cblist.append(
 	new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;}
     break;
 
   case 1099:
-#line 2562 "frame/parser.Y"
+#line 2563 "frame/parser.Y"
     {fr->maskClearCmd();;}
     break;
 
   case 1100:
-#line 2563 "frame/parser.Y"
+#line 2564 "frame/parser.Y"
     {fr->maskColorCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1101:
-#line 2564 "frame/parser.Y"
+#line 2565 "frame/parser.Y"
     {fr->maskMarkCmd((FitsMask::MaskType)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1102:
-#line 2565 "frame/parser.Y"
+#line 2566 "frame/parser.Y"
     {fr->maskRangeCmd((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real));;}
     break;
 
   case 1103:
-#line 2566 "frame/parser.Y"
+#line 2567 "frame/parser.Y"
     {fr->maskSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1104:
-#line 2567 "frame/parser.Y"
+#line 2568 "frame/parser.Y"
     {fr->maskTransparencyCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 1105:
-#line 2568 "frame/parser.Y"
+#line 2569 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->maskMarkCmd((FitsMask::MaskType)(yyvsp[(2) - (2)].integer));
@@ -10241,37 +10242,37 @@ yyreduce:
     break;
 
   case 1106:
-#line 2574 "frame/parser.Y"
+#line 2575 "frame/parser.Y"
     {fr->orientCmd(Coord::XX);;}
     break;
 
   case 1107:
-#line 2575 "frame/parser.Y"
+#line 2576 "frame/parser.Y"
     {fr->orientCmd(Coord::YY);;}
     break;
 
   case 1108:
-#line 2576 "frame/parser.Y"
+#line 2577 "frame/parser.Y"
     {fr->orientCmd(Coord::XY);;}
     break;
 
   case 1109:
-#line 2577 "frame/parser.Y"
+#line 2578 "frame/parser.Y"
     {fr->orientCmd(Coord::NORMAL);;}
     break;
 
   case 1110:
-#line 2581 "frame/parser.Y"
+#line 2582 "frame/parser.Y"
     {fr->panCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
     break;
 
   case 1111:
-#line 2582 "frame/parser.Y"
+#line 2583 "frame/parser.Y"
     {fr->panCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1112:
-#line 2584 "frame/parser.Y"
+#line 2585 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->panCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));
@@ -10279,27 +10280,27 @@ yyreduce:
     break;
 
   case 1113:
-#line 2589 "frame/parser.Y"
+#line 2590 "frame/parser.Y"
     {fr->panCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
     break;
 
   case 1115:
-#line 2591 "frame/parser.Y"
+#line 2592 "frame/parser.Y"
     {fr->panBBoxCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1117:
-#line 2593 "frame/parser.Y"
+#line 2594 "frame/parser.Y"
     {fr->panPreserveCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1118:
-#line 2596 "frame/parser.Y"
+#line 2597 "frame/parser.Y"
     {fr->panToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1119:
-#line 2598 "frame/parser.Y"
+#line 2599 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->panToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));
@@ -10307,32 +10308,32 @@ yyreduce:
     break;
 
   case 1120:
-#line 2603 "frame/parser.Y"
+#line 2604 "frame/parser.Y"
     {fr->panToCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
     break;
 
   case 1121:
-#line 2606 "frame/parser.Y"
+#line 2607 "frame/parser.Y"
     {fr->panBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1122:
-#line 2607 "frame/parser.Y"
+#line 2608 "frame/parser.Y"
     {fr->panMotionCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1123:
-#line 2608 "frame/parser.Y"
+#line 2609 "frame/parser.Y"
     {fr->panEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1124:
-#line 2611 "frame/parser.Y"
+#line 2612 "frame/parser.Y"
     {fr->pannerCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 1125:
-#line 2613 "frame/parser.Y"
+#line 2614 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->pannerCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer),(Coord::SkyFrame)(yyvsp[(3) - (3)].integer));
@@ -10340,44 +10341,44 @@ yyreduce:
     break;
 
   case 1126:
-#line 2617 "frame/parser.Y"
+#line 2618 "frame/parser.Y"
     {fr->pannerCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1127:
-#line 2618 "frame/parser.Y"
+#line 2619 "frame/parser.Y"
     {fr->updatePannerCmd();;}
     break;
 
   case 1128:
-#line 2622 "frame/parser.Y"
-    {fr->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;}
+#line 2623 "frame/parser.Y"
+    {fr->psColorSpaceCmd((PSColorSpace)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1129:
-#line 2623 "frame/parser.Y"
+#line 2624 "frame/parser.Y"
     {fr->psLevelCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1130:
-#line 2624 "frame/parser.Y"
+#line 2625 "frame/parser.Y"
     {fr->psResolutionCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1131:
-#line 2625 "frame/parser.Y"
+#line 2626 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	;}
     break;
 
   case 1132:
-#line 2631 "frame/parser.Y"
+#line 2632 "frame/parser.Y"
     {fr->precCmd((yyvsp[(1) - (9)].integer),(yyvsp[(2) - (9)].integer),(yyvsp[(3) - (9)].integer),(yyvsp[(4) - (9)].integer),(yyvsp[(5) - (9)].integer),(yyvsp[(6) - (9)].integer),(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 1133:
-#line 2632 "frame/parser.Y"
+#line 2633 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->precCmd((yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));
@@ -10385,337 +10386,337 @@ yyreduce:
     break;
 
   case 1134:
-#line 2638 "frame/parser.Y"
-    {(yyval.integer) = Widget::BW;;}
+#line 2639 "frame/parser.Y"
+    {(yyval.integer) = BW;;}
     break;
 
   case 1135:
-#line 2639 "frame/parser.Y"
-    {(yyval.integer) = Widget::GRAY;;}
+#line 2640 "frame/parser.Y"
+    {(yyval.integer) = GRAY;;}
     break;
 
   case 1136:
-#line 2640 "frame/parser.Y"
-    {(yyval.integer) = Widget::RGB;;}
+#line 2641 "frame/parser.Y"
+    {(yyval.integer) = RGB;;}
     break;
 
   case 1137:
-#line 2641 "frame/parser.Y"
-    {(yyval.integer) = Widget::CMYK;;}
+#line 2642 "frame/parser.Y"
+    {(yyval.integer) = CMYK;;}
     break;
 
   case 1140:
-#line 2649 "frame/parser.Y"
+#line 2650 "frame/parser.Y"
     {fr->regionHighliteBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1141:
-#line 2651 "frame/parser.Y"
+#line 2652 "frame/parser.Y"
     {fr->regionHighliteMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1142:
-#line 2652 "frame/parser.Y"
+#line 2653 "frame/parser.Y"
     {fr->regionHighliteEndCmd();;}
     break;
 
   case 1143:
-#line 2653 "frame/parser.Y"
+#line 2654 "frame/parser.Y"
     {fr->regionHighliteShiftEndCmd();;}
     break;
 
   case 1144:
-#line 2657 "frame/parser.Y"
+#line 2658 "frame/parser.Y"
     {fr->regionSelectBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1145:
-#line 2658 "frame/parser.Y"
+#line 2659 "frame/parser.Y"
     {fr->regionSelectMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1146:
-#line 2659 "frame/parser.Y"
+#line 2660 "frame/parser.Y"
     {fr->regionSelectEndCmd();;}
     break;
 
   case 1147:
-#line 2660 "frame/parser.Y"
+#line 2661 "frame/parser.Y"
     {fr->regionSelectShiftEndCmd();;}
     break;
 
   case 1148:
-#line 2663 "frame/parser.Y"
+#line 2664 "frame/parser.Y"
     {(yyval.integer) = Frame3dBase::MIP;;}
     break;
 
   case 1149:
-#line 2664 "frame/parser.Y"
+#line 2665 "frame/parser.Y"
     {(yyval.integer) = Frame3dBase::AIP;;}
     break;
 
   case 1150:
-#line 2667 "frame/parser.Y"
+#line 2668 "frame/parser.Y"
     {(yyval.integer) = Frame3dBase::NONE;;}
     break;
 
   case 1151:
-#line 2668 "frame/parser.Y"
+#line 2669 "frame/parser.Y"
     {(yyval.integer) = Frame3dBase::AZIMUTH;;}
     break;
 
   case 1152:
-#line 2669 "frame/parser.Y"
+#line 2670 "frame/parser.Y"
     {(yyval.integer) = Frame3dBase::ELEVATION;;}
     break;
 
   case 1153:
-#line 2672 "frame/parser.Y"
+#line 2673 "frame/parser.Y"
     {fr->setRGBChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1154:
-#line 2673 "frame/parser.Y"
+#line 2674 "frame/parser.Y"
     {fr->setRGBSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1155:
-#line 2674 "frame/parser.Y"
+#line 2675 "frame/parser.Y"
     {fr->setRGBViewCmd((yyvsp[(2) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 1156:
-#line 2677 "frame/parser.Y"
+#line 2678 "frame/parser.Y"
     {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;}
     break;
 
   case 1157:
-#line 2678 "frame/parser.Y"
+#line 2679 "frame/parser.Y"
     {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (2)].real))));;}
     break;
 
   case 1159:
-#line 2680 "frame/parser.Y"
+#line 2681 "frame/parser.Y"
     {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (2)].real))));;}
     break;
 
   case 1160:
-#line 2681 "frame/parser.Y"
+#line 2682 "frame/parser.Y"
     {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (3)].real))));;}
     break;
 
   case 1161:
-#line 2684 "frame/parser.Y"
+#line 2685 "frame/parser.Y"
     {fr->rotateBeginCmd();;}
     break;
 
   case 1162:
-#line 2685 "frame/parser.Y"
+#line 2686 "frame/parser.Y"
     {fr->rotateMotionCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;}
     break;
 
   case 1163:
-#line 2686 "frame/parser.Y"
+#line 2687 "frame/parser.Y"
     {fr->rotateEndCmd();;}
     break;
 
   case 1168:
-#line 2693 "frame/parser.Y"
+#line 2694 "frame/parser.Y"
     {fr->savePhotoCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1169:
-#line 2697 "frame/parser.Y"
+#line 2698 "frame/parser.Y"
     {fr->saveArrayFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1170:
-#line 2699 "frame/parser.Y"
+#line 2700 "frame/parser.Y"
     {fr->saveArrayChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1171:
-#line 2701 "frame/parser.Y"
+#line 2702 "frame/parser.Y"
     {fr->saveArraySocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1173:
-#line 2706 "frame/parser.Y"
+#line 2707 "frame/parser.Y"
     {fr->saveArrayRGBCubeFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1174:
-#line 2708 "frame/parser.Y"
+#line 2709 "frame/parser.Y"
     {fr->saveArrayRGBCubeChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1175:
-#line 2710 "frame/parser.Y"
+#line 2711 "frame/parser.Y"
     {fr->saveArrayRGBCubeSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1185:
-#line 2723 "frame/parser.Y"
+#line 2724 "frame/parser.Y"
     {fr->saveFitsFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1186:
-#line 2724 "frame/parser.Y"
+#line 2725 "frame/parser.Y"
     {fr->saveFitsChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1187:
-#line 2725 "frame/parser.Y"
+#line 2726 "frame/parser.Y"
     {fr->saveFitsSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1188:
-#line 2728 "frame/parser.Y"
+#line 2729 "frame/parser.Y"
     {fr->saveFitsTableFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1189:
-#line 2729 "frame/parser.Y"
+#line 2730 "frame/parser.Y"
     {fr->saveFitsTableChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1190:
-#line 2730 "frame/parser.Y"
+#line 2731 "frame/parser.Y"
     {fr->saveFitsTableSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1191:
-#line 2733 "frame/parser.Y"
+#line 2734 "frame/parser.Y"
     {fr->saveFitsSliceFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1192:
-#line 2734 "frame/parser.Y"
+#line 2735 "frame/parser.Y"
     {fr->saveFitsSliceChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1193:
-#line 2735 "frame/parser.Y"
+#line 2736 "frame/parser.Y"
     {fr->saveFitsSliceSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1194:
-#line 2738 "frame/parser.Y"
+#line 2739 "frame/parser.Y"
     {fr->saveFitsExtCubeFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1195:
-#line 2739 "frame/parser.Y"
+#line 2740 "frame/parser.Y"
     {fr->saveFitsExtCubeChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1196:
-#line 2740 "frame/parser.Y"
+#line 2741 "frame/parser.Y"
     {fr->saveFitsExtCubeSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1198:
-#line 2744 "frame/parser.Y"
+#line 2745 "frame/parser.Y"
     {fr->saveFitsMosaicFileCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1199:
-#line 2745 "frame/parser.Y"
+#line 2746 "frame/parser.Y"
     {fr->saveFitsMosaicChannelCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1200:
-#line 2746 "frame/parser.Y"
+#line 2747 "frame/parser.Y"
     {fr->saveFitsMosaicSocketCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1201:
-#line 2749 "frame/parser.Y"
+#line 2750 "frame/parser.Y"
     {fr->saveFitsMosaicImageFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1202:
-#line 2750 "frame/parser.Y"
+#line 2751 "frame/parser.Y"
     {fr->saveFitsMosaicImageChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1203:
-#line 2751 "frame/parser.Y"
+#line 2752 "frame/parser.Y"
     {fr->saveFitsMosaicImageSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1204:
-#line 2754 "frame/parser.Y"
+#line 2755 "frame/parser.Y"
     {fr->saveFitsRGBImageFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1205:
-#line 2755 "frame/parser.Y"
+#line 2756 "frame/parser.Y"
     {fr->saveFitsRGBImageChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1206:
-#line 2756 "frame/parser.Y"
+#line 2757 "frame/parser.Y"
     {fr->saveFitsRGBImageSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1207:
-#line 2759 "frame/parser.Y"
+#line 2760 "frame/parser.Y"
     {fr->saveFitsRGBCubeFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1208:
-#line 2760 "frame/parser.Y"
+#line 2761 "frame/parser.Y"
     {fr->saveFitsRGBCubeChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1209:
-#line 2761 "frame/parser.Y"
+#line 2762 "frame/parser.Y"
     {fr->saveFitsRGBCubeSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1210:
-#line 2764 "frame/parser.Y"
+#line 2765 "frame/parser.Y"
     {fr->saveFitsResampleFileCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1211:
-#line 2765 "frame/parser.Y"
+#line 2766 "frame/parser.Y"
     {fr->saveFitsResampleChannelCmd((yyvsp[(2) - (2)].str));;}
     break;
 
   case 1212:
-#line 2766 "frame/parser.Y"
+#line 2767 "frame/parser.Y"
     {fr->saveFitsResampleSocketCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1213:
-#line 2770 "frame/parser.Y"
+#line 2771 "frame/parser.Y"
     {fr->saveNRRDFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1214:
-#line 2772 "frame/parser.Y"
+#line 2773 "frame/parser.Y"
     {fr->saveNRRDChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1215:
-#line 2774 "frame/parser.Y"
+#line 2775 "frame/parser.Y"
     {fr->saveNRRDSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1216:
-#line 2778 "frame/parser.Y"
+#line 2779 "frame/parser.Y"
     {fr->saveENVIFileCmd((yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (FitsFile::ArchType)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 1217:
-#line 2782 "frame/parser.Y"
+#line 2783 "frame/parser.Y"
     {fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real));;}
     break;
 
   case 1218:
-#line 2784 "frame/parser.Y"
+#line 2785 "frame/parser.Y"
     {
 	  // backward compatibility with backup
 	  fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));
@@ -10723,122 +10724,122 @@ yyreduce:
     break;
 
   case 1219:
-#line 2788 "frame/parser.Y"
+#line 2789 "frame/parser.Y"
     {fr->smoothDeleteCmd();;}
     break;
 
   case 1220:
-#line 2791 "frame/parser.Y"
+#line 2792 "frame/parser.Y"
     {(yyval.integer) = Context::BOXCAR;;}
     break;
 
   case 1221:
-#line 2792 "frame/parser.Y"
+#line 2793 "frame/parser.Y"
     {(yyval.integer) = Context::TOPHAT;;}
     break;
 
   case 1222:
-#line 2793 "frame/parser.Y"
+#line 2794 "frame/parser.Y"
     {(yyval.integer) = Context::GAUSSIAN;;}
     break;
 
   case 1223:
-#line 2794 "frame/parser.Y"
+#line 2795 "frame/parser.Y"
     {(yyval.integer) = Context::ELLIPTIC;;}
     break;
 
   case 1224:
-#line 2797 "frame/parser.Y"
+#line 2798 "frame/parser.Y"
     {fr->updateFitsCmd(0);;}
     break;
 
   case 1225:
-#line 2799 "frame/parser.Y"
+#line 2800 "frame/parser.Y"
     {fr->updateFitsCmd((yyvsp[(1) - (5)].integer),BBox((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)),0);;}
     break;
 
   case 1226:
-#line 2800 "frame/parser.Y"
+#line 2801 "frame/parser.Y"
     {fr->updateFitsCmd(1);;}
     break;
 
   case 1227:
-#line 2802 "frame/parser.Y"
+#line 2803 "frame/parser.Y"
     {fr->updateFitsCmd((yyvsp[(2) - (6)].integer),BBox((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)),1);;}
     break;
 
   case 1229:
-#line 2806 "frame/parser.Y"
+#line 2807 "frame/parser.Y"
     {fr->sliceCmd(2,(yyvsp[(1) - (1)].integer));;}
     break;
 
   case 1230:
-#line 2807 "frame/parser.Y"
+#line 2808 "frame/parser.Y"
     {fr->sliceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1231:
-#line 2808 "frame/parser.Y"
+#line 2809 "frame/parser.Y"
     {fr->sliceCmd((yyvsp[(1) - (2)].real), (Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1232:
-#line 2811 "frame/parser.Y"
+#line 2812 "frame/parser.Y"
     {fr->warpCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1233:
-#line 2812 "frame/parser.Y"
+#line 2813 "frame/parser.Y"
     {fr->warpToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
     break;
 
   case 1234:
-#line 2816 "frame/parser.Y"
+#line 2817 "frame/parser.Y"
     {fr->wcsCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
     break;
 
   case 1236:
-#line 2818 "frame/parser.Y"
+#line 2819 "frame/parser.Y"
     {fr->wcsResetCmd((yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1239:
-#line 2823 "frame/parser.Y"
+#line 2824 "frame/parser.Y"
     {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1240:
-#line 2824 "frame/parser.Y"
+#line 2825 "frame/parser.Y"
     {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
     break;
 
   case 1241:
-#line 2825 "frame/parser.Y"
+#line 2826 "frame/parser.Y"
     {fr->wcsAppendTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 1242:
-#line 2828 "frame/parser.Y"
+#line 2829 "frame/parser.Y"
     {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
     break;
 
   case 1243:
-#line 2829 "frame/parser.Y"
+#line 2830 "frame/parser.Y"
     {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
     break;
 
   case 1244:
-#line 2830 "frame/parser.Y"
+#line 2831 "frame/parser.Y"
     {fr->wcsReplaceTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
     break;
 
   case 1245:
-#line 2833 "frame/parser.Y"
+#line 2834 "frame/parser.Y"
     {fr->wcsAlignCmd((yyvsp[(1) - (1)].integer));;}
     break;
 
   case 1246:
-#line 2835 "frame/parser.Y"
+#line 2836 "frame/parser.Y"
     {
 	  // used by backup
 	  fr->wcsAlignCmd((yyvsp[(1) - (3)].integer), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));
@@ -10846,12 +10847,12 @@ yyreduce:
     break;
 
   case 1247:
-#line 2840 "frame/parser.Y"
+#line 2841 "frame/parser.Y"
     {fr->wcsAlignCmd((yyvsp[(1) - (4)].integer), (FitsImage*)(yyvsp[(2) - (4)].ptr), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 1248:
-#line 2843 "frame/parser.Y"
+#line 2844 "frame/parser.Y"
     {
 #ifdef __WIN32
 	  fr->win32PrintCmd();
@@ -10860,17 +10861,17 @@ yyreduce:
     break;
 
   case 1249:
-#line 2850 "frame/parser.Y"
+#line 2851 "frame/parser.Y"
     {fr->zoomCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1250:
-#line 2852 "frame/parser.Y"
+#line 2853 "frame/parser.Y"
     {fr->zoomAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
     break;
 
   case 1251:
-#line 2854 "frame/parser.Y"
+#line 2855 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));
@@ -10878,32 +10879,32 @@ yyreduce:
     break;
 
   case 1252:
-#line 2859 "frame/parser.Y"
+#line 2860 "frame/parser.Y"
     {fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(6) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;}
     break;
 
   case 1254:
-#line 2863 "frame/parser.Y"
+#line 2864 "frame/parser.Y"
     {fr->zoomToFitCmd(1);;}
     break;
 
   case 1255:
-#line 2864 "frame/parser.Y"
+#line 2865 "frame/parser.Y"
     {fr->zoomToFitCmd((yyvsp[(2) - (2)].real));;}
     break;
 
   case 1256:
-#line 2865 "frame/parser.Y"
+#line 2866 "frame/parser.Y"
     {fr->zoomToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
     break;
 
   case 1257:
-#line 2867 "frame/parser.Y"
+#line 2868 "frame/parser.Y"
     {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
     break;
 
   case 1258:
-#line 2869 "frame/parser.Y"
+#line 2870 "frame/parser.Y"
     {
 	  // backward compatibility
 	  fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));
@@ -10911,14 +10912,14 @@ yyreduce:
     break;
 
   case 1259:
-#line 2874 "frame/parser.Y"
+#line 2875 "frame/parser.Y"
     {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(6) - (6)].vector)),
 	    (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;}
     break;
 
 
 /* Line 1267 of yacc.c.  */
-#line 10922 "frame/parser.C"
+#line 10923 "frame/parser.C"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -11132,7 +11133,7 @@ yyreturn:
 }
 
 
-#line 2878 "frame/parser.Y"
+#line 2879 "frame/parser.Y"
 
 
 static void setProps(unsigned short* props, unsigned short prop, int value)
diff --git a/tksao/frame/parser.H b/tksao/frame/parser.H
index 090db79..6579f94 100644
--- a/tksao/frame/parser.H
+++ b/tksao/frame/parser.H
@@ -738,7 +738,7 @@
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 52 "frame/parser.Y"
+#line 53 "frame/parser.Y"
 {
 #define FRBUFSIZE 4096
   char chr;
diff --git a/tksao/frame/parser.Y b/tksao/frame/parser.Y
index a3a28ee..4bfcf33 100644
--- a/tksao/frame/parser.Y
+++ b/tksao/frame/parser.Y
@@ -19,6 +19,7 @@
 #include "fitsimage.h"
 #include "fitsmask.h"
 #include "marker.h"
+#include "util.h"
 
 #undef yyFlexLexer
 #define yyFlexLexer frFlexLexer
@@ -2619,7 +2620,7 @@ panner	: yesno {fr->pannerCmd($1);}
 	;
 
 postscript : COLORSPACE_ pscolorspace 
-	{fr->psColorSpaceCmd((Widget::PSColorSpace)$2);}
+	{fr->psColorSpaceCmd((PSColorSpace)$2);}
 	| LEVEL_ INT {fr->psLevelCmd($2);}
 	| RESOLUTION_ INT {fr->psResolutionCmd($2);}
 	| SCALE_ numeric {
@@ -2635,10 +2636,10 @@ precision : INT INT INT INT INT INT INT INT INT
 	}
         ;
 
-pscolorspace : BW_ {$$ = Widget::BW;}
-	| GRAY_ {$$ = Widget::GRAY;}
-	| RGB_ {$$ = Widget::RGB;}
-	| CMYK_ {$$ = Widget::CMYK;}
+pscolorspace : BW_ {$$ = BW;}
+	| GRAY_ {$$ = GRAY;}
+	| RGB_ {$$ = RGB;}
+	| CMYK_ {$$ = CMYK;}
 	;
 
 region	: HIGHLITE_ regionHighlite
diff --git a/tksao/frame/point.C b/tksao/frame/point.C
index 313a269..8319c15 100644
--- a/tksao/frame/point.C
+++ b/tksao/frame/point.C
@@ -155,7 +155,7 @@ void Point::renderXLineDash(GC lgc)
 
 // PS
 
-void Point::renderPS(Widget::PSColorSpace mode) 
+void Point::renderPS(PSColorSpace mode) 
 {
   renderPSGC(mode);
   Vector* vv =NULL;
diff --git a/tksao/frame/point.h b/tksao/frame/point.h
index 2bb8c96..6450ac1 100644
--- a/tksao/frame/point.h
+++ b/tksao/frame/point.h
@@ -63,7 +63,7 @@ class Point : public Marker {
   virtual Marker* dup() {return new Point(*this);}
 
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace mode);
+  void renderPS(PSColorSpace mode);
 
 #ifdef MAC_OSX_TK
   void renderMACOSX();
diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C
index 4f07b1b..f11db71 100644
--- a/tksao/frame/polygon.C
+++ b/tksao/frame/polygon.C
@@ -74,7 +74,7 @@ void Polygon::renderX(Drawable drawable, Coord::InternalSystem sys,
     delete [] pp;
 }
 
-void Polygon::renderPS(Widget::PSColorSpace mode)
+void Polygon::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
diff --git a/tksao/frame/polygon.h b/tksao/frame/polygon.h
index dcf2fe9..9fce56c 100644
--- a/tksao/frame/polygon.h
+++ b/tksao/frame/polygon.h
@@ -16,7 +16,7 @@ class Polygon : public BasePolygon {
  protected:
   int isInRef(const Vector& v);
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C
index a55eca9..60a4a40 100644
--- a/tksao/frame/projection.C
+++ b/tksao/frame/projection.C
@@ -77,7 +77,7 @@ GC Projection::renderXGC(RenderMode mode)
   }
 }
 
-void Projection::renderPS(Widget::PSColorSpace mode)
+void Projection::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
@@ -120,7 +120,7 @@ void Projection::renderPS(Widget::PSColorSpace mode)
   }
 }
 
-void Projection::renderPSGC(Widget::PSColorSpace mode)
+void Projection::renderPSGC(PSColorSpace mode)
 {
   parent->renderPSColor(mode, parent->getXColor(colorName));
   renderPSLineNoDash();
diff --git a/tksao/frame/projection.h b/tksao/frame/projection.h
index 05285b8..83170f0 100644
--- a/tksao/frame/projection.h
+++ b/tksao/frame/projection.h
@@ -17,8 +17,8 @@ class Projection : public BaseLine {
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
   GC renderXGC(RenderMode);
 
-  void renderPS(Widget::PSColorSpace);
-  void renderPSGC(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
+  void renderPSGC(PSColorSpace);
 
 #ifdef MAC_OSX_TK
   void renderMACOSX();
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index c1c4f8d..1066a95 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -101,7 +101,7 @@ GC Ruler::renderXGC(RenderMode mode)
   return gc;
 }
 
-void Ruler::renderPS(Widget::PSColorSpace mode)
+void Ruler::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
@@ -174,7 +174,7 @@ void Ruler::renderPS(Widget::PSColorSpace mode)
   }
 }
 
-void Ruler::renderPSGC(Widget::PSColorSpace mode)
+void Ruler::renderPSGC(PSColorSpace mode)
 {
   parent->renderPSColor(mode, parent->getXColor(colorName));
   renderPSLineNoDash();
diff --git a/tksao/frame/ruler.h b/tksao/frame/ruler.h
index 339b4c2..ea89988 100644
--- a/tksao/frame/ruler.h
+++ b/tksao/frame/ruler.h
@@ -21,8 +21,8 @@ private:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
   GC renderXGC(RenderMode);
 
-  void renderPS(Widget::PSColorSpace);
-  void renderPSGC(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
+  void renderPSGC(PSColorSpace);
 
 #ifdef MAC_OSX_TK
   void renderMACOSX();
diff --git a/tksao/frame/segment.C b/tksao/frame/segment.C
index 8c1061f..142db2b 100644
--- a/tksao/frame/segment.C
+++ b/tksao/frame/segment.C
@@ -54,7 +54,7 @@ void Segment::renderX(Drawable drawable, Coord::InternalSystem sys,
   } while (vertex.next());
 }
 
-void Segment::renderPS(Widget::PSColorSpace mode)
+void Segment::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
diff --git a/tksao/frame/segment.h b/tksao/frame/segment.h
index 179f7cb..f2c1afd 100644
--- a/tksao/frame/segment.h
+++ b/tksao/frame/segment.h
@@ -12,7 +12,7 @@
 class Segment : public BasePolygon {
  protected:
   void renderX(Drawable, Coord::InternalSystem, RenderMode);
-  void renderPS(Widget::PSColorSpace);
+  void renderPS(PSColorSpace);
 #ifdef MAC_OSX_TK
   void renderMACOSX();
 #endif
diff --git a/tksao/frame/text.C b/tksao/frame/text.C
index 065376d..b73a149 100644
--- a/tksao/frame/text.C
+++ b/tksao/frame/text.C
@@ -59,7 +59,7 @@ void Text::renderX(Drawable drawable, Coord::InternalSystem sys, RenderMode mode
   }
 }
 
-void Text::renderPS(Widget::PSColorSpace mode)
+void Text::renderPS(PSColorSpace mode)
 {
   renderPSGC(mode);
 
diff --git a/tksao/frame/text.h b/tksao/frame/text.h
index 28bca37..3460370 100644
--- a/tksao/frame/text.h
+++ b/tksao/frame/text.h
@@ -16,9 +16,9 @@ class Text : public Marker {
   void renderXText(Drawable, Coord::InternalSystem, RenderMode) {}
   void renderXInclude(Drawable, Coord::InternalSystem, RenderMode) {}
 
-  void renderPS(Widget::PSColorSpace);
-  void renderPSText(Widget::PSColorSpace) {}
-  void renderPSInclude(Widget::PSColorSpace) {}
+  void renderPS(PSColorSpace);
+  void renderPSText(PSColorSpace) {}
+  void renderPSInclude(PSColorSpace) {}
 
 #ifdef MAC_OSX_TK
   void renderMACOSX();
diff --git a/tksao/util/gridbase.C b/tksao/util/gridbase.C
index 3f8082f..84303cc 100644
--- a/tksao/util/gridbase.C
+++ b/tksao/util/gridbase.C
@@ -26,7 +26,7 @@ GridBase::GridBase(Widget* pp) : parent_(pp)
   gridGC_ = NULL;
   pixmap_ = 0;
 
-  mode_ = Widget::RGB;
+  mode_ = RGB;
 }
 
 GridBase::GridBase(Widget* pp, const char* op) : parent_(pp)
@@ -40,7 +40,7 @@ GridBase::GridBase(Widget* pp, const char* op) : parent_(pp)
   gridGC_ = NULL;
   pixmap_ = 0;
 
-  mode_ = Widget::RGB;
+  mode_ = RGB;
 }
 
 GridBase::~GridBase()
diff --git a/tksao/util/gridbase.h b/tksao/util/gridbase.h
index c19fa6b..51d7384 100644
--- a/tksao/util/gridbase.h
+++ b/tksao/util/gridbase.h
@@ -29,7 +29,7 @@ class GridBase {
   Pixmap pixmap_;
 
   Matrix matrix_;
-  Widget::PSColorSpace mode_;
+  PSColorSpace mode_;
 
  protected:
   int x11Line(int n, float* x, float* y);
diff --git a/tksao/util/util.h b/tksao/util/util.h
index 04321b8..2cd64c0 100644
--- a/tksao/util/util.h
+++ b/tksao/util/util.h
@@ -46,6 +46,8 @@ int XSetClipRectangles(Display *d, GC gc, int clip_x_origin, int clip_y_origin,
 
 #define STRCMP(which,str,cnt) (!strncmp(toConstLower(which), str, cnt) && strlen(which)==cnt)
 
+enum PSColorSpace {BW, GRAY, RGB, CMYK};
+
 static const char psFonts[12][32] = {
   {"Helvetica"},
   {"Helvetica-Oblique"},
diff --git a/tksao/widget/widget.h b/tksao/widget/widget.h
index fb8de85..5def5cd 100644
--- a/tksao/widget/widget.h
+++ b/tksao/widget/widget.h
@@ -20,6 +20,7 @@ using namespace std;
 #include <tk.h>
 
 #include "vector.h"
+#include "util.h"
 
 class Attribute;
 
@@ -88,7 +89,6 @@ class Widget {
   friend class Attribute;
 
  public:
-  enum PSColorSpace {BW, GRAY, RGB, CMYK};
   Tcl_Interp* interp;         // Tcl interp
 
  protected: