clean up code

author: William Joye <wjoye@cfa.harvard.edu> 2017-08-07 18:12:09 (GMT)
committer: William Joye <wjoye@cfa.harvard.edu> 2017-08-07 18:12:09 (GMT)
commit: ac5f936afba9b8aca203ad64d4676821464e78dc (patch)
tree: e98f8aedd4787f3d593af68e16d18183f2ad6f6b
parent: 67a7da96005ebc219d94a532d6cfcc5e70cb55b8 (diff)
download: blt-ac5f936afba9b8aca203ad64d4676821464e78dc.zip
blt-ac5f936afba9b8aca203ad64d4676821464e78dc.tar.gz
blt-ac5f936afba9b8aca203ad64d4676821464e78dc.tar.bz2
17 files changed, 231 insertions, 230 deletions
diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl
index 0bd1961..2820356 100644
--- a/ds9/library/cat.tcl
+++ b/ds9/library/cat.tcl
@@ -1721,7 +1721,7 @@ proc ProcessCatalog {varname iname cvarname} {
 	    switch -- [lindex $var $i] {
 		incr {
 		    set cvar(sort,dir) "-increasing"
-p		}
+		}
 		decr {
 		    set cvar(sort,dir) "-decreasing"
 		}
diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 527c888..76973ae 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -1161,7 +1161,7 @@ void Base::printSkyFormat(Coord::SkyFormat format)
   Tcl_AppendResult(interp, coord.skyFormatStr(format), NULL);
 }
 
-void Base::printSkyDist(Coord::SkyDist dist)
+void Base::printDistFormat(Coord::DistFormat dist)
 {
   Tcl_AppendResult(interp, coord.skyDistStr(dist), NULL);
 }
@@ -1177,7 +1177,7 @@ void Base::printFromRef(FitsImage* ptr, const Vector& vv,
 }
 
 void Base::printLenFromRef(FitsImage* ptr, double dd,
-			   Coord::CoordSystem sys, Coord::SkyDist dist)
+			   Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   ostringstream str;
   ptr->listLenFromRef(str, dd, sys, dist);
@@ -1186,7 +1186,7 @@ void Base::printLenFromRef(FitsImage* ptr, double dd,
 }
 
 void Base::printLenFromRef(FitsImage* ptr, const Vector& vv,
-			   Coord::CoordSystem sys, Coord::SkyDist dist)
+			   Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   ostringstream str;
   ptr->listLenFromRef(str, vv, sys, dist);
@@ -1196,7 +1196,7 @@ void Base::printLenFromRef(FitsImage* ptr, const Vector& vv,
 
 void Base::printDistFromRef(FitsImage* ptr, 
 			    const Vector& vv1, const Vector& vv2,
-			    Coord::CoordSystem sys, Coord::SkyDist dist)
+			    Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   ostringstream str;
   ptr->listDistFromRef(str, vv1, vv2, sys, dist);
diff --git a/tksao/frame/base.h b/tksao/frame/base.h
index cc26bb7..a21014e 100644
--- a/tksao/frame/base.h
+++ b/tksao/frame/base.h
@@ -430,15 +430,15 @@ public:
   void parseMarker(MarkerFormat,istream&);
   int postscriptProc(int prepass);
   void printCoordSystem(Coord::CoordSystem);
-  void printDistFromRef(FitsImage*, const Vector&, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void printDistFromRef(FitsImage*, const Vector&, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void printDouble(double);
   void printFromRef(FitsImage*, const Vector&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
-  void printLenFromRef(FitsImage*, double, Coord::CoordSystem, Coord::SkyDist);
-  void printLenFromRef(FitsImage*, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void printLenFromRef(FitsImage*, double, Coord::CoordSystem, Coord::DistFormat);
+  void printLenFromRef(FitsImage*, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void printInteger(int);
   void printSkyFrame(Coord::SkyFrame);
   void printSkyFormat(Coord::SkyFormat);
-  void printSkyDist(Coord::SkyDist);
+  void printDistFormat(Coord::DistFormat);
   void ps();
   void psCrosshair(PSColorSpace);
   virtual void psGraphics(PSColorSpace) {}
@@ -507,8 +507,8 @@ public:
 			  Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
   double xmlAngle(const char*, int, double, Coord::AngleFormat, Coord::CoordSystem, Coord::SkyFrame);
   double* xmlAngles(const char*, int, double, int, Coord::AngleFormat, Coord::CoordSystem, Coord::SkyFrame);
-  double* xmlDistance(FitsImage*, const char*, int, Coord::CoordSystem, Coord::SkyDist);
-  Vector* xmlDistance(FitsImage*, const char*, const char*, int, Coord::CoordSystem, Coord::SkyDist);
+  double* xmlDistance(FitsImage*, const char*, int, Coord::CoordSystem, Coord::DistFormat);
+  Vector* xmlDistance(FitsImage*, const char*, const char*, int, Coord::CoordSystem, Coord::DistFormat);
   void ximageToPixmap(Pixmap, XImage*, Coord::InternalSystem);
   virtual void ximageToPixmapMagnifier();
 
@@ -575,7 +575,7 @@ public:
 		Coord::CoordSystem sys1, Coord::SkyFrame sky1,
 		const char* xxname2, const char* yyname2,
 		Coord::CoordSystem sys2, Coord::SkyFrame sky2,
-		double rad, Coord::CoordSystem sys, Coord::SkyDist dist,
+		double rad, Coord::CoordSystem sys, Coord::DistFormat dist,
 		const char* rr);
 
   // IME Analysis Commands
@@ -728,7 +728,7 @@ public:
   // Crop Commands
   void cropCmd();
   void cropCmd(const Vector&, const Vector&, Coord::CoordSystem, Coord::SkyFrame);
-  void cropCenterCmd(const Vector&, Coord::CoordSystem, Coord::SkyFrame, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void cropCenterCmd(const Vector&, Coord::CoordSystem, Coord::SkyFrame, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void cropBeginCmd(const Vector&);
   void cropMotionCmd(const Vector&);
   void cropEndCmd(const Vector&);
@@ -738,7 +738,7 @@ public:
   virtual void crop3dMotionCmd(const Vector&, int) {}
   virtual void crop3dEndCmd(const Vector&, int) {}
   void getCropCmd(Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
-  void getCropCenterCmd(Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, Coord::CoordSystem, Coord::SkyDist);
+  void getCropCenterCmd(Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, Coord::CoordSystem, Coord::DistFormat);
   void getCrop3dCmd(Coord::CoordSystem);
   void hasCropCmd();
 
@@ -777,7 +777,7 @@ public:
   void getFitsHeaderKeywordCmd(int,const char*);
   void getFitsObjectNameCmd();
   void getFitsSizeCmd();
-  void getFitsSizeCmd(Coord::CoordSystem, Coord::SkyFrame, Coord::SkyDist);
+  void getFitsSizeCmd(Coord::CoordSystem, Coord::SkyFrame, Coord::DistFormat);
   void getFitsSliceCmd(int id);
   void getFitsSliceCmd(int id, Coord::CoordSystem sys);
   void hasFitsCmd();
@@ -1113,7 +1113,7 @@ public:
 
   // Measurement Regions
   void createRulerCmd(const Vector&, const Vector&, 
-		      Coord::CoordSystem, Coord::SkyFrame, Coord::CoordSystem, Coord::SkyDist,
+		      Coord::CoordSystem, Coord::SkyFrame, Coord::CoordSystem, Coord::DistFormat,
 		      const char*, int*, int, const char*,
 		      const char*, unsigned short, const char*,
 		      const List<Tag>&, const List<CallBack>& cb);
@@ -1252,37 +1252,37 @@ public:
 
   void getMarkerAngleCmd(int);
   void getMarkerAngleCmd(int, Coord::CoordSystem, Coord::SkyFrame);
-  void getMarkerAnnulusRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerAnnulusRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerBoxFillCmd(int);
-  void getMarkerBoxAnnulusRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
-  void getMarkerBoxRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerBoxAnnulusRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
+  void getMarkerBoxRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerBpandaAnglesCmd(int);
   void getMarkerBpandaAnglesCmd(int, Coord::CoordSystem, Coord::SkyFrame);
-  void getMarkerBpandaRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerBpandaRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerCenterCmd(int, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
   void getMarkerCentroidAutoCmd();
   void getMarkerCentroidRadiusCmd();
   void getMarkerCentroidIterationCmd();
   void getMarkerCentroidOptionCmd();
   void getMarkerCircleFillCmd(int);
-  void getMarkerCircleRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerCircleRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerColorCmd();
   void getMarkerColorCmd(const char*);
   void getMarkerColorCmd(int);
   void getMarkerCompassArrowCmd(int);
   void getMarkerCompassLabelCmd(int);
-  void getMarkerCompassRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerCompassRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerCompassSystemCmd(int);
   void getMarkerCompositeCmd(int);
   void getMarkerCpandaAnglesCmd(int);
   void getMarkerCpandaAnglesCmd(int, Coord::CoordSystem, Coord::SkyFrame);
-  void getMarkerCpandaRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerCpandaRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerEllipseFillCmd(int);
-  void getMarkerEllipseRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
-  void getMarkerEllipseAnnulusRadiusCmd(int, Coord::CoordSystem,Coord::SkyDist);
+  void getMarkerEllipseRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
+  void getMarkerEllipseAnnulusRadiusCmd(int, Coord::CoordSystem,Coord::DistFormat);
   void getMarkerEpandaAnglesCmd(int);
   void getMarkerEpandaAnglesCmd(int, Coord::CoordSystem, Coord::SkyFrame);
-  void getMarkerEpandaRadiusCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerEpandaRadiusCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerEpsilonCmd();
   void getMarkerFontCmd();
   void getMarkerFontCmd(const char*);
@@ -1292,10 +1292,10 @@ public:
   void getMarkerIdAllCmd();
   void getMarkerLineCmd(int, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
   void getMarkerLineArrowCmd(int);
-  void getMarkerLineLengthCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerLineLengthCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerLineWidthCmd();
   void getMarkerLineWidthCmd(int);
-  void getMarkerMapLenFromRefCmd(int, double, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerMapLenFromRefCmd(int, double, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerNumberCmd();
   void getMarkerPointShapeCmd(int);
   void getMarkerPointSizeCmd(int);
@@ -1303,13 +1303,13 @@ public:
   void getMarkerPolygonSegmentCmd(const Vector&);
   void getMarkerPreserveCmd();
   void getMarkerProjectionPointsCmd(int, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
-  void getMarkerProjectionLengthCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerProjectionLengthCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerProjectionMethodCmd(int);
-  void getMarkerProjectionWidthCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerProjectionWidthCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerPropertyCmd(unsigned short);
   void getMarkerPropertyCmd(const char*, unsigned short);
   void getMarkerPropertyCmd(int, unsigned short);
-  void getMarkerRulerLengthCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerRulerLengthCmd(int, Coord::CoordSystem, Coord::DistFormat);
   void getMarkerRulerPointCmd(int, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
   void getMarkerRulerSystemCmd(int);
   void getMarkerSegmentSegmentCmd(const Vector&);
@@ -1335,7 +1335,7 @@ public:
   void getMarkerTypeCmd(int);
   void getMarkerVectorCmd(int, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
   void getMarkerVectorArrowCmd(int);
-  void getMarkerVectorLengthCmd(int, Coord::CoordSystem, Coord::SkyDist);
+  void getMarkerVectorLengthCmd(int, Coord::CoordSystem, Coord::DistFormat);
 
   void hasMarkerHighlitedCmd();
   void hasMarkerPasteCmd();
@@ -1351,8 +1351,8 @@ public:
   void markerAnnulusCreateRadiusCmd(int, const Vector&);
   void markerAnnulusDeleteRadiusCmd(int, int);
   void markerAnnulusRadiusCmd(int, double, double, int, Coord::InternalSystem);
-  void markerAnnulusRadiusCmd(int, double, double, int, Coord::CoordSystem, Coord::SkyDist);
-  void markerAnnulusRadiusCmd(int, const char*, Coord::CoordSystem, Coord::SkyDist);
+  void markerAnnulusRadiusCmd(int, double, double, int, Coord::CoordSystem, Coord::DistFormat);
+  void markerAnnulusRadiusCmd(int, const char*, Coord::CoordSystem, Coord::DistFormat);
 
   void markerBackCmd();
   void markerBackCmd(const char*);
@@ -1361,12 +1361,12 @@ public:
   void markerBoxAnnulusRadiusCmd(int, const Vector&, const Vector&, int, 
 				 Coord::InternalSystem);
   void markerBoxAnnulusRadiusCmd(int, const Vector&, const Vector&, int, 
-				 Coord::CoordSystem, Coord::SkyDist);
-  void markerBoxAnnulusRadiusCmd(int, const char*, Coord::CoordSystem, Coord::SkyDist);
+				 Coord::CoordSystem, Coord::DistFormat);
+  void markerBoxAnnulusRadiusCmd(int, const char*, Coord::CoordSystem, Coord::DistFormat);
   void markerBoxAnnulusCreateRadiusCmd(int, const Vector&);
   void markerBoxAnnulusDeleteRadiusCmd(int, int);
   void markerBoxRadiusCmd(int, const Vector&, Coord::InternalSystem);
-  void markerBoxRadiusCmd(int, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void markerBoxRadiusCmd(int, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void markerBpandaCreateAnglesCmd(int, const Vector&);
   void markerBpandaCreateRadiusCmd(int, const Vector&);
   void markerBpandaDeleteCmd(int, int);
@@ -1377,7 +1377,7 @@ public:
 			   Coord::CoordSystem, Coord::SkyFrame);
   void markerBpandaEditCmd(int, const char*, const char*, 
 			   Coord::CoordSystem, Coord::SkyFrame,
-			   Coord::CoordSystem, Coord::SkyDist);
+			   Coord::CoordSystem, Coord::DistFormat);
 
   void markerCallBackCmd(int, CallBack::Type, const char*, const char*);
   void markerCentroidCmd();
@@ -1388,14 +1388,14 @@ public:
   void markerCentroidIterationCmd(int);
   void markerCircleFillCmd(int, int);
   void markerCircleRadiusCmd(int, double, Coord::InternalSystem);
-  void markerCircleRadiusCmd(int, double, Coord::CoordSystem, Coord::SkyDist);
+  void markerCircleRadiusCmd(int, double, Coord::CoordSystem, Coord::DistFormat);
   void markerColorCmd(const char*);
   void markerColorCmd(const char*, const char*);
   void markerColorCmd(int, const char*);
   void markerCompassArrowCmd(int, int, int);
   void markerCompassLabelCmd(int, const char*, const char*);
   void markerCompassRadiusCmd(int, double, Coord::InternalSystem);
-  void markerCompassRadiusCmd(int, double, Coord::CoordSystem, Coord::SkyDist);
+  void markerCompassRadiusCmd(int, double, Coord::CoordSystem, Coord::DistFormat);
   void markerCompassSystemCmd(int, Coord::CoordSystem, Coord::SkyFrame);
   void markerCompositeCmd(int, int);
   void markerCompositeDeleteCmd();
@@ -1410,7 +1410,7 @@ public:
   void markerCpandaEditCmd(int, double, double, int, double, double, int,
 			   Coord::CoordSystem, Coord::SkyFrame);
   void markerCpandaEditCmd(int, const char*, const char*, 
-			   Coord::CoordSystem, Coord::SkyFrame,Coord::CoordSystem, Coord::SkyDist);
+			   Coord::CoordSystem, Coord::SkyFrame,Coord::CoordSystem, Coord::DistFormat);
   void markerCutCmd();
   void markerCutCmd(const char*);
 
@@ -1430,13 +1430,13 @@ public:
   void markerEditEndCmd();
   void markerEllipseFillCmd(int, int);
   void markerEllipseRadiusCmd(int, const Vector&, Coord::InternalSystem);
-  void markerEllipseRadiusCmd(int, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void markerEllipseRadiusCmd(int, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void markerEllipseAnnulusRadiusCmd(int, const Vector&, const Vector&, int, 
 				     Coord::InternalSystem);
   void markerEllipseAnnulusRadiusCmd(int, const Vector&, const Vector&, int, 
-				     Coord::CoordSystem, Coord::SkyDist);
+				     Coord::CoordSystem, Coord::DistFormat);
   void markerEllipseAnnulusRadiusCmd(int, const char*, 
-				     Coord::CoordSystem, Coord::SkyDist);
+				     Coord::CoordSystem, Coord::DistFormat);
   void markerEllipseAnnulusCreateRadiusCmd(int, const Vector&);
   void markerEllipseAnnulusDeleteRadiusCmd(int, int);
   void markerEpandaCreateAnglesCmd(int, const Vector&);
@@ -1449,7 +1449,7 @@ public:
 			   Coord::CoordSystem, Coord::SkyFrame);
   void markerEpandaEditCmd(int, const char*, const char*, 
 			   Coord::CoordSystem, Coord::SkyFrame,
-			   Coord::CoordSystem, Coord::SkyDist);
+			   Coord::CoordSystem, Coord::DistFormat);
   void markerEpsilonCmd(int ee) {markerEpsilon = ee;}
 
   void markerFontCmd(const char*);
@@ -1508,7 +1508,7 @@ public:
   void markerPolygonCreateVertexCmd(int, int, const Vector&);
   void markerPolygonDeleteVertexCmd(int, int);
   void markerPolygonResetCmd(int, const Vector&, Coord::InternalSystem);
-  void markerPolygonResetCmd(int, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void markerPolygonResetCmd(int, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void markerPreserveCmd(int r) {preserveMarkers = r;}
   void markerPropertyCmd(unsigned short, int);
   void markerPropertyCmd(const char*, unsigned short, int);
@@ -1518,7 +1518,7 @@ public:
 			   Coord::InternalSystem, double);
   void markerProjectionCmd(int, const Vector&, const Vector&, 
 			   Coord::CoordSystem, Coord::SkyFrame, 
-			   double, Coord::CoordSystem, Coord::SkyDist);
+			   double, Coord::CoordSystem, Coord::DistFormat);
 
   void markerRotateBeginCmd(int);
   void markerRotateBeginCmd(const Vector&);
@@ -1528,7 +1528,7 @@ public:
 			   Coord::CoordSystem, Coord::SkyFrame);
   void markerRulerPointCmd(int, const Vector&, const Vector&, Coord::InternalSystem);
   void markerRulerSystemCmd(int, Coord::CoordSystem, Coord::SkyFrame, 
-			    Coord::CoordSystem, Coord::SkyDist);
+			    Coord::CoordSystem, Coord::DistFormat);
 
   void markerSaveCmd(const char*, MarkerFormat, Coord::CoordSystem, Coord::SkyFrame,
 		     Coord::SkyFormat, int strip);
@@ -1536,7 +1536,7 @@ public:
   void markerSegmentCreateVertexCmd(int, int, const Vector&);
   void markerSegmentDeleteVertexCmd(int, int);
   void markerSegmentResetCmd(int, const Vector&, Coord::InternalSystem);
-  void markerSegmentResetCmd(int, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void markerSegmentResetCmd(int, const Vector&, Coord::CoordSystem, Coord::DistFormat);
   void markerSelectAllCmd();
   void markerSelectCmd(int); // not used
   void markerSelectCmd(const char*);
@@ -1567,7 +1567,7 @@ public:
 
   void markerVectorCmd(int, const Vector&, Coord::InternalSystem, double, double);
   void markerVectorCmd(int, const Vector&, Coord::CoordSystem, Coord::SkyFrame, 
-		       double, Coord::CoordSystem, Coord::SkyDist, double);
+		       double, Coord::CoordSystem, Coord::DistFormat, double);
   void markerVectorArrowCmd(int, int);
 
   void regionHighliteBeginCmd(const Vector& v) {regionSelectBeginCmd(v);}
diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C
index bdf4e4a..35dfe88 100644
--- a/tksao/frame/basecommand.C
+++ b/tksao/frame/basecommand.C
@@ -393,7 +393,7 @@ void Base::cropCmd(const Vector& aa, const Vector& bb,
 void Base::cropCenterCmd(const Vector& vv, 
 			 Coord::CoordSystem sys, Coord::SkyFrame sky, 
 			 const Vector& wh, 
-			 Coord::CoordSystem dsys, Coord::SkyDist dist)
+			 Coord::CoordSystem dsys, Coord::DistFormat dist)
 {
   FitsImage* ptr = currentContext->fits;
   if (!ptr)
@@ -1413,7 +1413,7 @@ void Base::getCropCmd(Coord::CoordSystem sys, Coord::SkyFrame sky,
 
 void Base::getCropCenterCmd(Coord::CoordSystem sys, Coord::SkyFrame sky, 
 			    Coord::SkyFormat format, Coord::CoordSystem dcoord,
-			    Coord::SkyDist dist)
+			    Coord::DistFormat dist)
 {
   FitsImage* ptr = currentContext->fits;
   if (!ptr)
@@ -1710,7 +1710,7 @@ void Base::getFitsSizeCmd()
 }
 
 void Base::getFitsSizeCmd(Coord::CoordSystem sys, Coord::SkyFrame sky,
-			  Coord::SkyDist dist)
+			  Coord::DistFormat dist)
 {
   if (keyContext->fits) {
     if (!keyContext->fits->hasWCSCel(sys)) {
@@ -2582,7 +2582,7 @@ void Base::matchCmd(const char* xxname1, const char* yyname1,
 		    Coord::CoordSystem sys1, Coord::SkyFrame sky1,
 		    const char* xxname2, const char* yyname2,
 		    Coord::CoordSystem sys2, Coord::SkyFrame sky2,
-		    double rad, Coord::CoordSystem sys, Coord::SkyDist dist,
+		    double rad, Coord::CoordSystem sys, Coord::DistFormat dist,
 		    const char* rrname)
 {
   if (keyContext && keyContext->fits)
diff --git a/tksao/frame/coord.C b/tksao/frame/coord.C
index 42669b4..181131a 100644
--- a/tksao/frame/coord.C
+++ b/tksao/frame/coord.C
@@ -142,7 +142,7 @@ void Coord::listCoordSystem(ostream& str, CoordSystem sys, SkyFrame sky,
   }
 }
 
-void Coord::listDistSystem(ostream& str, CoordSystem sys, SkyDist format, 
+void Coord::listDistSystem(ostream& str, CoordSystem sys, DistFormat format, 
 			   FitsImage* ptr)
 {
   switch (sys) {
@@ -319,7 +319,7 @@ void Coord::strToSkyFormat(const char* str, SkyFormat* format)
     *format = DEGREES;
 }
 
-void Coord::strToSkyDist(const char* str, SkyDist* dist)
+void Coord::strToDistFormat(const char* str, DistFormat* dist)
 {
   if (!str)
     *dist = DEGREE;
@@ -360,7 +360,7 @@ void Coord::strToSkyDist(const char* str, SkyDist* dist)
 }
 
 void Coord::strToDistSystem(const char* str, CoordSystem wcssys, 
-			    CoordSystem* sys, SkyDist* dist)
+			    CoordSystem* sys, DistFormat* dist)
 {
   if (!str) {
     *sys = PHYSICAL;
diff --git a/tksao/frame/coord.h b/tksao/frame/coord.h
index 53c8df4..22a9a6e 100644
--- a/tksao/frame/coord.h
+++ b/tksao/frame/coord.h
@@ -28,19 +28,19 @@ class Coord {
 		 ECLIPTIC, HELIOECLIPTIC};
 
   enum SkyFormat {DEGREES, SEXAGESIMAL};
-  enum SkyDist {DEGREE, ARCMIN, ARCSEC};
+  enum DistFormat {DEGREE, ARCMIN, ARCSEC};
   enum AngleFormat {DEG, RAD};
   enum Orientation {NORMAL, XX, YY, XY};
 
   public:
   void listCoordSystem(ostream&, CoordSystem, SkyFrame, FitsImage*);
-  void listDistSystem(ostream&, CoordSystem, SkyDist, FitsImage*);
+  void listDistSystem(ostream&, CoordSystem, DistFormat, FitsImage*);
   void listProsCoordSystem(ostream&, CoordSystem, SkyFrame);
 
   void strToCoordSystem(const char*, CoordSystem, CoordSystem*, SkyFrame*);
   void strToSkyFormat(const char*, SkyFormat*);
-  void strToSkyDist(const char*, SkyDist*);
-  void strToDistSystem(const char*, CoordSystem, CoordSystem*, SkyDist*);
+  void strToDistFormat(const char*, DistFormat*);
+  void strToDistSystem(const char*, CoordSystem, CoordSystem*, DistFormat*);
   void strToAngleFormat(const char*, AngleFormat*);
 
   const char* coordSystemStr(int ii);
diff --git a/tksao/frame/ds9parser.C b/tksao/frame/ds9parser.C
index eb94cb3..255fd02 100644
--- a/tksao/frame/ds9parser.C
+++ b/tksao/frame/ds9parser.C
@@ -417,8 +417,8 @@ static Coord::SkyFrame globalRulerSkyFrame;
 static Coord::SkyFrame localRulerSkyFrame;
 static Coord::CoordSystem globalRulerDistSystem;
 static Coord::CoordSystem localRulerDistSystem;
-static Coord::SkyDist globalRulerDistFormat;
-static Coord::SkyDist localRulerDistFormat;
+static Coord::DistFormat globalRulerDistFormat;
+static Coord::DistFormat localRulerDistFormat;
 
 static Coord::CoordSystem globalCompassCoordSystem;
 static Coord::SkyFrame globalCompassSkyFrame;
@@ -3719,7 +3719,7 @@ yyreduce:
 	  globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (4)].integer);
 	  globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (4)].integer);
 	  globalRulerDistSystem = localRulerDistSystem = (Coord::CoordSystem)(yyvsp[(3) - (4)].integer);
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)(yyvsp[(4) - (4)].integer);
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)(yyvsp[(4) - (4)].integer);
 	;}
     break;
 
@@ -3739,7 +3739,7 @@ yyreduce:
 	  globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer);
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -3759,7 +3759,7 @@ yyreduce:
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS;
 	  globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer);
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -3779,7 +3779,7 @@ yyreduce:
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS;
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -3789,7 +3789,7 @@ yyreduce:
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::IMAGE;
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)(yyvsp[(1) - (1)].integer);
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)(yyvsp[(1) - (1)].integer);
 	;}
     break;
 
@@ -3995,7 +3995,7 @@ yyreduce:
 	  localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (4)].integer);
 	  localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (4)].integer);
 	  localRulerDistSystem = (Coord::CoordSystem)(yyvsp[(3) - (4)].integer);
-	  localRulerDistFormat = (Coord::SkyDist)(yyvsp[(4) - (4)].integer);
+	  localRulerDistFormat = (Coord::DistFormat)(yyvsp[(4) - (4)].integer);
 	;}
     break;
 
@@ -4015,7 +4015,7 @@ yyreduce:
 	  localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer);
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -4035,7 +4035,7 @@ yyreduce:
 	  localRulerCoordSystem = Coord::WCS;
 	  localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer);
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -4055,7 +4055,7 @@ yyreduce:
 	  localRulerCoordSystem = Coord::WCS;
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)(yyvsp[(2) - (2)].integer);
+	  localRulerDistFormat = (Coord::DistFormat)(yyvsp[(2) - (2)].integer);
 	;}
     break;
 
@@ -4065,7 +4065,7 @@ yyreduce:
 	  localRulerCoordSystem = Coord::IMAGE;
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)(yyvsp[(1) - (1)].integer);
+	  localRulerDistFormat = (Coord::DistFormat)(yyvsp[(1) - (1)].integer);
 	;}
     break;
 
diff --git a/tksao/frame/ds9parser.Y b/tksao/frame/ds9parser.Y
index 0453e78..9074166 100644
--- a/tksao/frame/ds9parser.Y
+++ b/tksao/frame/ds9parser.Y
@@ -89,8 +89,8 @@ static Coord::SkyFrame globalRulerSkyFrame;
 static Coord::SkyFrame localRulerSkyFrame;
 static Coord::CoordSystem globalRulerDistSystem;
 static Coord::CoordSystem localRulerDistSystem;
-static Coord::SkyDist globalRulerDistFormat;
-static Coord::SkyDist localRulerDistFormat;
+static Coord::DistFormat globalRulerDistFormat;
+static Coord::DistFormat localRulerDistFormat;
 
 static Coord::CoordSystem globalCompassCoordSystem;
 static Coord::SkyFrame globalCompassSkyFrame;
@@ -691,7 +691,7 @@ globalRuler : coordSystem skyFrame coordSystem skyDist
 	  globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)$1;
 	  globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)$2;
 	  globalRulerDistSystem = localRulerDistSystem = (Coord::CoordSystem)$3;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)$4;
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)$4;
 	}
 	| coordSystem coordSystem
 	{
@@ -705,7 +705,7 @@ globalRuler : coordSystem skyFrame coordSystem skyDist
 	  globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)$1;
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)$2;
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| skyFrame coordSystem
 	{
@@ -719,7 +719,7 @@ globalRuler : coordSystem skyFrame coordSystem skyDist
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS;
 	  globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)$1;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)$2;
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| LINEAR_ coordSystem
 	{
@@ -733,14 +733,14 @@ globalRuler : coordSystem skyFrame coordSystem skyDist
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS;
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)$2;
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| skyDist
 	{
 	  globalRulerCoordSystem = localRulerCoordSystem = Coord::IMAGE;
 	  globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5;
 	  globalRulerDistSystem = localRulerDistSystem = Coord::WCS;
-	  globalRulerDistFormat = localRulerDistFormat = (Coord::SkyDist)$1;
+	  globalRulerDistFormat = localRulerDistFormat = (Coord::DistFormat)$1;
 	}
 	| PIXELS_
 	{
@@ -863,7 +863,7 @@ localRuler : coordSystem skyFrame coordSystem skyDist
 	  localRulerCoordSystem = (Coord::CoordSystem)$1;
 	  localRulerSkyFrame = (Coord::SkyFrame)$2;
 	  localRulerDistSystem = (Coord::CoordSystem)$3;
-	  localRulerDistFormat = (Coord::SkyDist)$4;
+	  localRulerDistFormat = (Coord::DistFormat)$4;
 	}
 	| coordSystem coordSystem
 	{
@@ -877,7 +877,7 @@ localRuler : coordSystem skyFrame coordSystem skyDist
 	  localRulerCoordSystem = (Coord::CoordSystem)$1;
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)$2;
+	  localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| skyFrame coordSystem
 	{
@@ -891,7 +891,7 @@ localRuler : coordSystem skyFrame coordSystem skyDist
 	  localRulerCoordSystem = Coord::WCS;
 	  localRulerSkyFrame = (Coord::SkyFrame)$1;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)$2;
+	  localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| LINEAR_ coordSystem
 	{
@@ -905,14 +905,14 @@ localRuler : coordSystem skyFrame coordSystem skyDist
 	  localRulerCoordSystem = Coord::WCS;
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)$2;
+	  localRulerDistFormat = (Coord::DistFormat)$2;
 	}
 	| skyDist
 	{
 	  localRulerCoordSystem = Coord::IMAGE;
 	  localRulerSkyFrame = Coord::FK5;
 	  localRulerDistSystem = Coord::WCS;
-	  localRulerDistFormat = (Coord::SkyDist)$1;
+	  localRulerDistFormat = (Coord::DistFormat)$1;
 	}
 	| PIXELS_
 	{
diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
index 91497ab..5217eef 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -1373,7 +1373,8 @@ void FitsImage::match(const char* xxname1, const char* yyname1,
 		      Coord::CoordSystem sys1, Coord::SkyFrame sky1,
 		      const char* xxname2, const char* yyname2,
 		      Coord::CoordSystem sys2, Coord::SkyFrame sky2,
-		      double rad, Coord::CoordSystem sys, Coord::SkyDist dist,
+		      double rad, Coord::CoordSystem sys, 
+		      Coord::DistFormat dist,
 		      const char* rrname)
 {
   astClearStatus;
diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
index 29a6235..29b6615 100644
--- a/tksao/frame/fitsimage.h
+++ b/tksao/frame/fitsimage.h
@@ -280,7 +280,7 @@ class FitsImage {
 	     Coord::CoordSystem sys1, Coord::SkyFrame sky1,
 	     const char* xxname2, const char* yyname2,
 	     Coord::CoordSystem sys2, Coord::SkyFrame sky2,
-	     double rad, Coord::CoordSystem sys, Coord::SkyDist dist,
+	     double rad, Coord::CoordSystem sys, Coord::DistFormat dist,
 	     const char* rrname);
 
   FitsHead* parseWCS(istream&);
@@ -418,16 +418,16 @@ class FitsImage {
   Vector mapToRef(const Vector&, Coord::CoordSystem, Coord::SkyFrame =Coord::FK5);
   double mapFromRef3axis(double, Coord::CoordSystem, int);
   double mapToRef3axis(double, Coord::CoordSystem, int);
-  double mapLenFromRef(double, Coord::CoordSystem, Coord::SkyDist =Coord::DEGREE);
-  Vector mapLenFromRef(const Vector&, Coord::CoordSystem, Coord::SkyDist =Coord::DEGREE);
-  double mapLenToRef(double, Coord::CoordSystem, Coord::SkyDist =Coord::DEGREE);
-  Vector mapLenToRef(const Vector&, Coord::CoordSystem, Coord::SkyDist =Coord::DEGREE);
+  double mapLenFromRef(double, Coord::CoordSystem, Coord::DistFormat =Coord::DEGREE);
+  Vector mapLenFromRef(const Vector&, Coord::CoordSystem, Coord::DistFormat =Coord::DEGREE);
+  double mapLenToRef(double, Coord::CoordSystem, Coord::DistFormat =Coord::DEGREE);
+  Vector mapLenToRef(const Vector&, Coord::CoordSystem, Coord::DistFormat =Coord::DEGREE);
   double mapDistFromRef(const Vector&, const Vector&, Coord::CoordSystem,
-		       Coord::SkyDist =Coord::DEGREE);
+		       Coord::DistFormat =Coord::DEGREE);
   void listFromRef(ostream&, const Vector&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
-  void listLenFromRef(ostream&, double, Coord::CoordSystem, Coord::SkyDist);
-  void listLenFromRef(ostream&, const Vector&, Coord::CoordSystem, Coord::SkyDist);
-  void listDistFromRef(ostream&, const Vector&, const Vector&, Coord::CoordSystem, Coord::SkyDist);
+  void listLenFromRef(ostream&, double, Coord::CoordSystem, Coord::DistFormat);
+  void listLenFromRef(ostream&, const Vector&, Coord::CoordSystem, Coord::DistFormat);
+  void listDistFromRef(ostream&, const Vector&, const Vector&, Coord::CoordSystem, Coord::DistFormat);
 
   const char* getValue(const Vector& v);
   float getValueFloat(const Vector& v) {return data_->getValueFloat(v);}
diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C
index 17e9c1b..3dbb138 100644
--- a/tksao/frame/fitsmap.C
+++ b/tksao/frame/fitsmap.C
@@ -108,14 +108,14 @@ void FitsImage::listFromRef(ostream& str, const Vector& vv,
 // Map Length
 
 double FitsImage::mapLenFromRef(double dd, Coord::CoordSystem sys,
-				Coord::SkyDist dist)
+				Coord::DistFormat dist)
 {
   Vector rr = mapLenFromRef(Vector(dd,0),sys,dist);
   return rr[0];
 }
 
 Vector FitsImage::mapLenFromRef(const Vector& vv, Coord::CoordSystem sys,
-				Coord::SkyDist dist)
+				Coord::DistFormat dist)
 {
   // really from image coords
   switch (sys) {
@@ -154,14 +154,14 @@ Vector FitsImage::mapLenFromRef(const Vector& vv, Coord::CoordSystem sys,
 }
 
 double FitsImage::mapLenToRef(double dd, Coord::CoordSystem sys, 
-			      Coord::SkyDist dist)
+			      Coord::DistFormat dist)
 {
   Vector rr = mapLenToRef(Vector(dd,0), sys, dist);
   return rr[0];
 }
 
 Vector FitsImage::mapLenToRef(const Vector& vv, Coord::CoordSystem sys,
-			      Coord::SkyDist dist)
+			      Coord::DistFormat dist)
 {
   switch (sys) {
   case Coord::IMAGE:
@@ -199,7 +199,7 @@ Vector FitsImage::mapLenToRef(const Vector& vv, Coord::CoordSystem sys,
 }
 
 void FitsImage::listLenFromRef(ostream& str, double dd,
-			       Coord::CoordSystem sys, Coord::SkyDist dist)
+			       Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   double out = mapLenFromRef(dd, sys, dist);
 
@@ -236,7 +236,7 @@ void FitsImage::listLenFromRef(ostream& str, double dd,
 }
 
 void FitsImage::listLenFromRef(ostream& str, const Vector& vv,
-			       Coord::CoordSystem sys, Coord::SkyDist dist)
+			       Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Vector out = mapLenFromRef(vv, sys, dist);
 
@@ -275,7 +275,7 @@ void FitsImage::listLenFromRef(ostream& str, const Vector& vv,
 // Map Distance
 
 double FitsImage::mapDistFromRef(const Vector& vv1, const Vector& vv2, 
-				 Coord::CoordSystem sys, Coord::SkyDist dist)
+				 Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   switch (sys) {
   case Coord::IMAGE:
@@ -328,7 +328,7 @@ double FitsImage::mapDistFromRef(const Vector& vv1, const Vector& vv2,
 
 void FitsImage::listDistFromRef(ostream& str,
 				const Vector& vv1, const Vector& vv2,
-				Coord::CoordSystem sys, Coord::SkyDist dist)
+				Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   double out = mapDistFromRef(vv1, vv2, sys, dist);
 
diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C
index bc23f52..d2e2ab1 100644
--- a/tksao/frame/frmarker.C
+++ b/tksao/frame/frmarker.C
@@ -477,7 +477,7 @@ void Base::createPointCmd(const Vector& center,
 // Measurement Regions
 void Base::createRulerCmd(const Vector& center, const Vector& p2,
 			  Coord::CoordSystem sys, Coord::SkyFrame sky,
-			  Coord::CoordSystem distsys, Coord::SkyDist distdist,
+			  Coord::CoordSystem distsys, Coord::DistFormat distdist,
 			  const char* color, int* dash, 
 			  int width, const char* font,
 			  const char* text, unsigned short prop,
@@ -1168,7 +1168,7 @@ void Base::getMarkerAngleCmd(int id, Coord::CoordSystem sys, Coord::SkyFrame sky
 }
 
 void Base::getMarkerAnnulusRadiusCmd(int id, Coord::CoordSystem sys, 
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1207,7 +1207,7 @@ void Base::getMarkerBoxFillCmd(int id)
 }
 
 void Base::getMarkerBoxAnnulusRadiusCmd(int id, Coord::CoordSystem sys, 
-					Coord::SkyDist dist)
+					Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1229,7 +1229,7 @@ void Base::getMarkerBoxAnnulusRadiusCmd(int id, Coord::CoordSystem sys,
 }
 
 void Base::getMarkerBoxRadiusCmd(int id, Coord::CoordSystem sys, 
-				 Coord::SkyDist dist)
+				 Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1296,7 +1296,7 @@ void Base::getMarkerBpandaAnglesCmd(int id, Coord::CoordSystem sys, Coord::SkyFr
 }
 
 void Base::getMarkerBpandaRadiusCmd(int id, Coord::CoordSystem sys, 
-				    Coord::SkyDist dist)
+				    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1349,7 +1349,7 @@ void Base::getMarkerCircleFillCmd(int id)
 }
 
 void Base::getMarkerCircleRadiusCmd(int id, Coord::CoordSystem sys,
-				    Coord::SkyDist dist)
+				    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1420,7 +1420,7 @@ void Base::getMarkerCpandaAnglesCmd(int id, Coord::CoordSystem sys, Coord::SkyFr
 }
 
 void Base::getMarkerCpandaRadiusCmd(int id, Coord::CoordSystem sys, 
-				    Coord::SkyDist dist)
+				    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1526,7 +1526,7 @@ void Base::getMarkerCompassLabelCmd(int id)
 }
 
 void Base::getMarkerCompassRadiusCmd(int id, Coord::CoordSystem sys,
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1592,7 +1592,7 @@ void Base::getMarkerEllipseFillCmd(int id)
 }
 
 void Base::getMarkerEllipseRadiusCmd(int id, Coord::CoordSystem sys, 
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1610,7 +1610,7 @@ void Base::getMarkerEllipseRadiusCmd(int id, Coord::CoordSystem sys,
 }
 
 void Base::getMarkerEllipseAnnulusRadiusCmd(int id, Coord::CoordSystem sys, 
-					    Coord::SkyDist dist)
+					    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1681,7 +1681,7 @@ void Base::getMarkerEpandaAnglesCmd(int id, Coord::CoordSystem sys, Coord::SkyFr
 }
 
 void Base::getMarkerEpandaRadiusCmd(int id, Coord::CoordSystem sys, 
-				    Coord::SkyDist dist)
+				    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1848,7 +1848,7 @@ void Base::getMarkerLineArrowCmd(int id)
 }
 
 void Base::getMarkerLineLengthCmd(int id, Coord::CoordSystem sys, 
-				  Coord::SkyDist dist)
+				  Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -1901,7 +1901,7 @@ void Base::getMarkerLineWidthCmd(int id)
 
 void Base::getMarkerMapLenFromRefCmd(int id, double dd,
 				     Coord::CoordSystem sys, 
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2008,7 +2008,7 @@ void Base::getMarkerProjectionPointsCmd(int id, Coord::CoordSystem sys,
 }
 
 void Base::getMarkerProjectionLengthCmd(int id, Coord::CoordSystem sys,
-					Coord::SkyDist dist)
+					Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2027,7 +2027,7 @@ void Base::getMarkerProjectionLengthCmd(int id, Coord::CoordSystem sys,
 }
 
 void Base::getMarkerProjectionWidthCmd(int id, Coord::CoordSystem sys, 
-				       Coord::SkyDist dist)
+				       Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2103,7 +2103,7 @@ void Base::getMarkerPropertyCmd(int id, unsigned short which)
 }
 
 void Base::getMarkerRulerLengthCmd(int id, Coord::CoordSystem sys, 
-				   Coord::SkyDist dist)
+				   Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2156,7 +2156,7 @@ void Base::getMarkerRulerSystemCmd(int id)
       Tcl_AppendResult(interp, " ", NULL);
       printCoordSystem(((Ruler*)mm)->getDistSystem());
       Tcl_AppendResult(interp, " ", NULL);
-      printSkyDist(((Ruler*)mm)->getDistDist());
+      printDistFormat(((Ruler*)mm)->getDistDist());
       return;
     }
     mm=mm->next();
@@ -2550,7 +2550,7 @@ void Base::getMarkerVectorArrowCmd(int id)
 }
 
 void Base::getMarkerVectorLengthCmd(int id, Coord::CoordSystem sys,
-				    Coord::SkyDist dist)
+				    Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2771,7 +2771,7 @@ void Base::markerAnnulusRadiusCmd(int id, double inner, double outer,
 
 void Base::markerAnnulusRadiusCmd(int id, double inner, double outer,
 				  int num, Coord::CoordSystem sys,
-				  Coord::SkyDist dist)
+				  Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2796,7 +2796,7 @@ void Base::markerAnnulusRadiusCmd(int id, double inner, double outer,
 }
 
 void Base::markerAnnulusRadiusCmd(int id, const char* lev, 
-				  Coord::CoordSystem sys, Coord::SkyDist dist)
+				  Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2921,7 +2921,7 @@ void Base::markerBoxAnnulusRadiusCmd(int id, const Vector& inner,
 void Base::markerBoxAnnulusRadiusCmd(int id, const Vector& inner,
 				     const Vector& outer, int num,
 				     Coord::CoordSystem sys,
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -2947,7 +2947,7 @@ void Base::markerBoxAnnulusRadiusCmd(int id, const Vector& inner,
 
 void Base::markerBoxAnnulusRadiusCmd(int id,const char* lev, 
 				     Coord::CoordSystem sys,
-				     Coord::SkyDist dist)
+				     Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -3046,7 +3046,7 @@ void Base::markerBoxRadiusCmd(int id, const Vector& size,
 }
 
 void Base::markerBoxRadiusCmd(int id, const Vector& size, 
-			      Coord::CoordSystem sys, Coord::SkyDist dist)
+			      Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -3178,7 +3178,7 @@ void Base::markerBpandaEditCmd(int id,
 void Base::markerBpandaEditCmd(int id, 
 			       const char* a, const char* r,
 			       Coord::CoordSystem sys, Coord::SkyFrame sky, 
-			       Coord::CoordSystem rsys, Coord::SkyDist rdist)
+			       Coord::CoordSystem rsys, Coord::DistFormat rdist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -3351,7 +3351,7 @@ void Base::markerCircleRadiusCmd(int id, double radius,
 }
 
 void Base::markerCircleRadiusCmd(int id, double radius, Coord::CoordSystem sys,
-				 Coord::SkyDist dist)
+				 Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -3512,7 +3512,7 @@ void Base::markerCompassRadiusCmd(int id, double r, Coord::InternalSystem sys)
 }
 
 void Base::markerCompassRadiusCmd(int id, double r, Coord::CoordSystem sys, 
-				  Coord::SkyDist dist)
+				  Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -3725,7 +3725,7 @@ void Base::markerCpandaEditCmd(int id, double a1, double a2, int an,
 
 void Base::markerCpandaEditCmd(int id, const char* a, const char* r,
 			       Coord::CoordSystem sys, Coord::SkyFrame sky, 
-			       Coord::CoordSystem rsys, Coord::SkyDist rdist)
+			       Coord::CoordSystem rsys, Coord::DistFormat rdist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -4067,7 +4067,7 @@ void Base::markerEllipseRadiusCmd(int id, const Vector& radius,
 }
 
 void Base::markerEllipseRadiusCmd(int id, const Vector& radius, 
-				  Coord::CoordSystem sys, Coord::SkyDist dist)
+				  Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -4119,7 +4119,7 @@ void Base::markerEllipseAnnulusRadiusCmd(int id,
 					 const Vector& inner,
 					 const Vector& outer, int num,
 					 Coord::CoordSystem sys,
-					 Coord::SkyDist dist)
+					 Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -4146,7 +4146,7 @@ void Base::markerEllipseAnnulusRadiusCmd(int id,
 void Base::markerEllipseAnnulusRadiusCmd(int id, 
 					 const char* lev,
 					 Coord::CoordSystem sys,
-					 Coord::SkyDist dist)
+					 Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -4332,7 +4332,7 @@ void Base::markerEpandaEditCmd(int id,
 void Base::markerEpandaEditCmd(int id, 
 			       const char* a, const char* r,
 			       Coord::CoordSystem sys, Coord::SkyFrame sky, 
-			       Coord::CoordSystem rsys, Coord::SkyDist rdist)
+			       Coord::CoordSystem rsys, Coord::DistFormat rdist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -5587,7 +5587,7 @@ void Base::markerPolygonResetCmd(int id, const Vector& size,
 }
 
 void Base::markerPolygonResetCmd(int id, const Vector& size, 
-				 Coord::CoordSystem sys, Coord::SkyDist dist)
+				 Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -5636,7 +5636,7 @@ void Base::markerProjectionCmd(int id,
 			       const Vector& p1, const Vector& p2, 
 			       Coord::CoordSystem sys, Coord::SkyFrame sky,
 			       double width, 
-			       Coord::CoordSystem wdsys, Coord::SkyDist wddist)
+			       Coord::CoordSystem wdsys, Coord::DistFormat wddist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -5852,7 +5852,7 @@ void Base::markerRulerPointCmd(int id, const Vector& p1, const Vector& p2,
 
 void Base::markerRulerSystemCmd(int id, Coord::CoordSystem sys,
 				Coord::SkyFrame sky,
-				Coord::CoordSystem dsys, Coord::SkyDist dist)
+				Coord::CoordSystem dsys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -6070,7 +6070,7 @@ void Base::markerSegmentResetCmd(int id, const Vector& size, Coord::InternalSyst
 }
 
 void Base::markerSegmentResetCmd(int id, const Vector& size, 
-				 Coord::CoordSystem sys, Coord::SkyDist dist)
+				 Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Marker* mm=markers->head();
   while (mm) {
@@ -6490,7 +6490,7 @@ void Base::markerVectorCmd(int id, const Vector& p, Coord::InternalSystem sys,
 void Base::markerVectorCmd(int id, const Vector& p,
 			   Coord::CoordSystem sys, Coord::SkyFrame sky,
 			   double mag,
-			   Coord::CoordSystem dsys, Coord::SkyDist dist,
+			   Coord::CoordSystem dsys, Coord::DistFormat dist,
 			   double ang)
 {
   Marker* mm=markers->head();
diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C
index 35af443..c7dc84a 100644
--- a/tksao/frame/frmarkerxml.C
+++ b/tksao/frame/frmarkerxml.C
@@ -266,7 +266,7 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref,
   r2 = r2def;
   Coord::CoordSystem rsys =Coord::PHYSICAL;
   Coord::SkyFrame rsky =Coord::FK5;
-  Coord::SkyDist rdist =Coord::ARCMIN;
+  Coord::DistFormat rdist =Coord::ARCMIN;
 
   // rv,rv2
   char* rv =NULL;
@@ -277,7 +277,7 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref,
   rv2 = rv2def;
   Coord::CoordSystem rvsys =Coord::PHYSICAL;
   Coord::SkyFrame rvsky =Coord::FK5;
-  Coord::SkyDist rvdist =Coord::ARCMIN;
+  Coord::DistFormat rvdist =Coord::ARCMIN;
 
   // ang
   char* ang =NULL;
@@ -362,7 +362,7 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref,
 	if (ref[ii])
 	  coord.strToCoordSystem(ref[ii],wcsSystem_,&rsys,&rsky);
 	if (unit[ii])
-	  coord.strToSkyDist(unit[ii],&rdist);	  
+	  coord.strToDistFormat(unit[ii],&rdist);	  
 	break;
       case XMLR2:
 	r2 = cols[ii];
@@ -373,7 +373,7 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref,
 	if (ref[ii])
 	  coord.strToCoordSystem(ref[ii],wcsSystem_,&rvsys,&rvsky);
 	if (unit[ii])
-	  coord.strToSkyDist(unit[ii],&rvdist);	  
+	  coord.strToDistFormat(unit[ii],&rvdist);	  
 	break;
       case XMLRV2:
 	rv2 = cols[ii];
@@ -693,7 +693,7 @@ void Base::xmlParseTR(char** cols, int* id, char** unit, char** ref,
     Coord::SkyFrame rsky;
     coord.strToCoordSystem(param, wcsSystem_, &rsys, &rsky);
     Coord::CoordSystem dsys;
-    Coord::SkyDist ddist;
+    Coord::DistFormat ddist;
     coord.strToDistSystem(param2, wcsSystem_, &dsys, &ddist);
     createRulerCmd(xmlPoint(ptr, xv, yv, vsys, vsky, vformat, 0),
 		   xmlPoint(ptr, xv, yv, vsys, vsky, vformat, 1),
@@ -910,7 +910,7 @@ List<Vertex>* Base::xmlVertex(FitsImage* ptr,
 }
 
 double* Base::xmlDistance(FitsImage* ptr, const char* r, int cnt, 
-			  Coord::CoordSystem sys, Coord::SkyDist dist)
+			  Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   double* rr = new double[cnt];
 
@@ -930,7 +930,7 @@ double* Base::xmlDistance(FitsImage* ptr, const char* r, int cnt,
 }
 
 Vector* Base::xmlDistance(FitsImage* ptr, const char* r, const char* r2,
-			  int cnt, Coord::CoordSystem sys, Coord::SkyDist dist)
+			  int cnt, Coord::CoordSystem sys, Coord::DistFormat dist)
 {
   Vector* vv = new Vector[cnt];
 
diff --git a/tksao/frame/parser.C b/tksao/frame/parser.C
index f3f0849..e47b17d 100644
--- a/tksao/frame/parser.C
+++ b/tksao/frame/parser.C
@@ -6577,7 +6577,7 @@ yyreduce:
 
   case 315:
 #line 968 "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::SkyDist)(yyvsp[(8) - (8)].integer));;}
+    {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 317:
@@ -7009,7 +7009,7 @@ yyreduce:
 
   case 432:
 #line 1159 "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::SkyDist)(yyvsp[(6) - (6)].integer));;}
+    {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 433:
@@ -7141,7 +7141,7 @@ yyreduce:
 
   case 463:
 #line 1216 "frame/parser.Y"
-    {fr->getFitsSizeCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::SkyDist)(yyvsp[(4) - (4)].integer));;}
+    {fr->getFitsSizeCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::DistFormat)(yyvsp[(4) - (4)].integer));;}
     break;
 
   case 465:
@@ -8340,7 +8340,7 @@ yyreduce:
     {
 	  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),
-		       (yyvsp[(9) - (12)].real),(Coord::CoordSystem)(yyvsp[(10) - (12)].integer),(Coord::SkyDist)(yyvsp[(11) - (12)].integer),
+		       (yyvsp[(9) - (12)].real),(Coord::CoordSystem)(yyvsp[(10) - (12)].integer),(Coord::DistFormat)(yyvsp[(11) - (12)].integer),
 		       (yyvsp[(12) - (12)].str));
 	;}
     break;
@@ -8443,12 +8443,12 @@ yyreduce:
   case 746:
 #line 1750 "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::SkyDist)(yyvsp[(8) - (8)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;}
     break;
 
   case 747:
 #line 1753 "frame/parser.Y"
-    {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+    {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 748:
@@ -8465,12 +8465,12 @@ yyreduce:
   case 750:
 #line 1761 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    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 751:
 #line 1764 "frame/parser.Y"
-    {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+    {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 752:
@@ -8481,7 +8481,7 @@ yyreduce:
   case 753:
 #line 1769 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 754:
@@ -8506,7 +8506,7 @@ yyreduce:
   case 757:
 #line 1785 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    (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 758:
@@ -8526,7 +8526,7 @@ yyreduce:
 
   case 761:
 #line 1794 "frame/parser.Y"
-    {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+    {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 762:
@@ -8551,7 +8551,7 @@ yyreduce:
 
   case 766:
 #line 1803 "frame/parser.Y"
-    {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+    {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 767:
@@ -8583,7 +8583,7 @@ yyreduce:
   case 772:
 #line 1817 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 773:
@@ -8724,7 +8724,7 @@ yyreduce:
   case 800:
 #line 1868 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 801:
@@ -8736,13 +8736,13 @@ yyreduce:
   case 802:
 #line 1876 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    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 803:
 #line 1879 "frame/parser.Y"
     {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),
-	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 804:
@@ -8768,7 +8768,7 @@ yyreduce:
 #line 1895 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 808:
@@ -8835,7 +8835,7 @@ yyreduce:
   case 820:
 #line 1922 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 821:
@@ -8846,7 +8846,7 @@ yyreduce:
   case 822:
 #line 1927 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 823:
@@ -8874,7 +8874,7 @@ yyreduce:
 #line 1939 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;}
     break;
 
   case 828:
@@ -8902,7 +8902,7 @@ yyreduce:
   case 832:
 #line 1953 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;}
     break;
 
   case 833:
@@ -8953,7 +8953,7 @@ yyreduce:
   case 842:
 #line 1971 "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::SkyDist)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;}
+	    (yyvsp[(9) - (10)].real), (Coord::CoordSystem)(yyvsp[(7) - (10)].integer), (Coord::DistFormat)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;}
     break;
 
   case 843:
@@ -9417,7 +9417,7 @@ yyreduce:
 #line 2171 "frame/parser.Y"
     {fr->createRulerCmd(fr->mapToRef(Vector((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real)),Coord::CANVAS),
 	    fr->mapToRef(Vector((yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real)),Coord::CANVAS),
-	    (Coord::CoordSystem)(yyvsp[(6) - (10)].integer), (Coord::SkyFrame)(yyvsp[(7) - (10)].integer), (Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyDist)(yyvsp[(9) - (10)].integer),
+	    (Coord::CoordSystem)(yyvsp[(6) - (10)].integer), (Coord::SkyFrame)(yyvsp[(7) - (10)].integer), (Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::DistFormat)(yyvsp[(9) - (10)].integer),
 	    currentColor,currentDash,currentWidth,currentFont,
 	    currentText,currentProps,NULL,taglist,cblist);;}
     break;
@@ -9691,7 +9691,7 @@ yyreduce:
 
   case 977:
 #line 2336 "frame/parser.Y"
-    {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 978:
@@ -9701,12 +9701,12 @@ yyreduce:
 
   case 979:
 #line 2340 "frame/parser.Y"
-    {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 980:
 #line 2342 "frame/parser.Y"
-    {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 981:
@@ -9726,7 +9726,7 @@ yyreduce:
 
   case 984:
 #line 2348 "frame/parser.Y"
-    {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 985:
@@ -9742,7 +9742,7 @@ yyreduce:
 
   case 987:
 #line 2355 "frame/parser.Y"
-    {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 988:
@@ -9762,7 +9762,7 @@ yyreduce:
 
   case 991:
 #line 2360 "frame/parser.Y"
-    {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 992:
@@ -9792,7 +9792,7 @@ yyreduce:
 
   case 997:
 #line 2368 "frame/parser.Y"
-    {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 998:
@@ -9802,13 +9802,13 @@ yyreduce:
 
   case 999:
 #line 2371 "frame/parser.Y"
-    {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1000:
 #line 2373 "frame/parser.Y"
     {fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), 
-	    (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+	    (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1001:
@@ -9828,7 +9828,7 @@ yyreduce:
 
   case 1004:
 #line 2380 "frame/parser.Y"
-    {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1005:
@@ -9848,7 +9848,7 @@ yyreduce:
 
   case 1008:
 #line 2385 "frame/parser.Y"
-    {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1009:
@@ -9860,7 +9860,7 @@ yyreduce:
   case 1010:
 #line 2390 "frame/parser.Y"
     {fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real),
-	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
+	    (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;}
     break;
 
   case 1011:
@@ -9887,12 +9887,12 @@ yyreduce:
   case 1015:
 #line 2400 "frame/parser.Y"
     {fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), 
-	    (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+	    (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1016:
 #line 2403 "frame/parser.Y"
-    {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1017:
@@ -9907,7 +9907,7 @@ yyreduce:
 
   case 1019:
 #line 2407 "frame/parser.Y"
-    {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1020:
@@ -9958,7 +9958,7 @@ yyreduce:
 
   case 1029:
 #line 2422 "frame/parser.Y"
-    {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
+    {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;}
     break;
 
   case 1030:
diff --git a/tksao/frame/parser.Y b/tksao/frame/parser.Y
index 67fadba..cf1ca71 100644
--- a/tksao/frame/parser.Y
+++ b/tksao/frame/parser.Y
@@ -965,7 +965,7 @@ crop	: /* empty */ {fr->cropCmd();}
 	{fr->cropCmd(Vector($1,$2), Vector($3,$4),
 	    (Coord::CoordSystem)$5, (Coord::SkyFrame)$6);}
 	| CENTER_ coord coordSystem skyFrame numeric numeric coordSystem skyDist
-	{fr->cropCenterCmd(Vector($2), (Coord::CoordSystem)$3, (Coord::SkyFrame)$4, Vector($5,$6), (Coord::CoordSystem)$7, (Coord::SkyDist)$8);}
+	{fr->cropCenterCmd(Vector($2), (Coord::CoordSystem)$3, (Coord::SkyFrame)$4, Vector($5,$6), (Coord::CoordSystem)$7, (Coord::DistFormat)$8);}
 	| THREED_ crop3d
 	| BEGIN_ numeric numeric {fr->cropBeginCmd(Vector($2,$3));}
 	| MOTION_ numeric numeric {fr->cropMotionCmd(Vector($2,$3));}
@@ -1156,7 +1156,7 @@ getCoord : numeric numeric coordSystem skyFrame skyFormat
 getCrop	: coordSystem skyFrame skyFormat
         {fr->getCropCmd((Coord::CoordSystem)$1, (Coord::SkyFrame)$2, (Coord::SkyFormat)$3);}
 	| CENTER_ coordSystem skyFrame skyFormat coordSystem skyDist
-	{fr->getCropCenterCmd((Coord::CoordSystem)$2, (Coord::SkyFrame)$3, (Coord::SkyFormat)$4, (Coord::CoordSystem)$5, (Coord::SkyDist)$6);}
+	{fr->getCropCenterCmd((Coord::CoordSystem)$2, (Coord::SkyFrame)$3, (Coord::SkyFormat)$4, (Coord::CoordSystem)$5, (Coord::DistFormat)$6);}
 	| THREED_ coordSystem {fr->getCrop3dCmd((Coord::CoordSystem)$2);}
 	;
 
@@ -1213,7 +1213,7 @@ getFits	: NAXES_ /* empty */ {fr->getFitsNAxesCmd();}
 	| OBJECT_ NAME_ {fr->getFitsObjectNameCmd();}
 	| SIZE_ {fr->getFitsSizeCmd();}
 	| SIZE_ coordSystem skyFrame skyDist
-	{fr->getFitsSizeCmd((Coord::CoordSystem)$2,(Coord::SkyFrame)$3,(Coord::SkyDist)$4);}
+	{fr->getFitsSizeCmd((Coord::CoordSystem)$2,(Coord::SkyFrame)$3,(Coord::DistFormat)$4);}
 	| SLICE_ getFitsSlice
 	| WIDTH_ {fr->getFitsWidthCmd();}
 	;
@@ -1710,7 +1710,7 @@ match	: STRING STRING wcsSystem skyFrame STRING STRING wcsSystem skyFrame numeri
 	{
 	  fr->matchCmd($1,$2,(Coord::CoordSystem)$3,(Coord::SkyFrame)$4,
 		       $5,$6,(Coord::CoordSystem)$7,(Coord::SkyFrame)$8,
-		       $9,(Coord::CoordSystem)$10,(Coord::SkyDist)$11,
+		       $9,(Coord::CoordSystem)$10,(Coord::DistFormat)$11,
 		       $12);
 	}
 
@@ -1748,9 +1748,9 @@ marker	: CENTROID_ markerCentroid
 	{fr->markerAnnulusRadiusCmd($1, $4, $5, $6, (Coord::InternalSystem)$7);}
 	| INT ANNULUS_ RADIUS_ numeric numeric INT coordSystem skyDist
 	{fr->markerAnnulusRadiusCmd($1, $4, $5, $6,
-	    (Coord::CoordSystem)$7, (Coord::SkyDist)$8);}
+	    (Coord::CoordSystem)$7, (Coord::DistFormat)$8);}
 	| INT ANNULUS_ RADIUS_ STRING coordSystem skyDist
-	{fr->markerAnnulusRadiusCmd($1, $4,(Coord::CoordSystem)$5,(Coord::SkyDist)$6);}
+	{fr->markerAnnulusRadiusCmd($1, $4,(Coord::CoordSystem)$5,(Coord::DistFormat)$6);}
 
 	| INT BOX_ FILL_ yesno {fr->markerBoxFillCmd($1,$4);}
 	| INT BOXANNULUS_ RADIUS_ numeric numeric numeric INT internalSystem
@@ -1759,15 +1759,15 @@ marker	: CENTROID_ markerCentroid
 	| INT BOXANNULUS_ RADIUS_ numeric numeric numeric INT 
 	    coordSystem skyDist
 	{fr->markerBoxAnnulusRadiusCmd($1, Vector($4, $5), 
-	    Vector($6, $6*$5/$4), $7, (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    Vector($6, $6*$5/$4), $7, (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 	| INT BOXANNULUS_ RADIUS_ STRING coordSystem skyDist
-	{fr->markerBoxAnnulusRadiusCmd($1,$4,(Coord::CoordSystem)$5,(Coord::SkyDist)$6);}
+	{fr->markerBoxAnnulusRadiusCmd($1,$4,(Coord::CoordSystem)$5,(Coord::DistFormat)$6);}
 
 	| INT BOX_ RADIUS_ numeric numeric internalSystem
 	{fr->markerBoxRadiusCmd($1, Vector($4,$5), (Coord::InternalSystem)$6);}
 	| INT BOX_ RADIUS_ numeric numeric coordSystem skyDist
 	{fr->markerBoxRadiusCmd($1, Vector($4,$5), 
-	    (Coord::CoordSystem)$6, (Coord::SkyDist)$7);}
+	    (Coord::CoordSystem)$6, (Coord::DistFormat)$7);}
 	| INT BPANDA_ EDIT_ angle angle INT numeric numeric numeric INT 
 	{fr->markerBpandaEditCmd($1, $4, $5, $6,
 	    Vector($7,$8), Vector($9,$9*$8/$7), $10);}
@@ -1783,7 +1783,7 @@ marker	: CENTROID_ markerCentroid
 	| INT BPANDA_ EDIT_ STRING STRING coordSystem skyFrame 
 	    coordSystem skyDist
 	{fr->markerBpandaEditCmd($1, $4, $5, 
-	    (Coord::CoordSystem)$6, (Coord::SkyFrame)$7, (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    (Coord::CoordSystem)$6, (Coord::SkyFrame)$7, (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 
 	| INT CALLBACK_ markerCallBack STRING STRING
 	{fr->markerCallBackCmd($1,(CallBack::Type)$3,$4,$5);}
@@ -1791,7 +1791,7 @@ marker	: CENTROID_ markerCentroid
 	| INT CIRCLE_ RADIUS_ numeric internalSystem
 	{fr->markerCircleRadiusCmd($1, $4, (Coord::InternalSystem)$5);}
 	| INT CIRCLE_ RADIUS_ numeric coordSystem skyDist
-	{fr->markerCircleRadiusCmd($1, $4, (Coord::CoordSystem)$5, (Coord::SkyDist)$6);}
+	{fr->markerCircleRadiusCmd($1, $4, (Coord::CoordSystem)$5, (Coord::DistFormat)$6);}
 	| INT COLOR_ STRING {fr->markerColorCmd($1,$3);}
 	| INT COMPASS_ ARROW_ yesno yesno 
 	{fr->markerCompassArrowCmd($1,$4,$5);}
@@ -1800,7 +1800,7 @@ marker	: CENTROID_ markerCentroid
 	| INT COMPASS_ RADIUS_ numeric internalSystem
 	{fr->markerCompassRadiusCmd($1,$4,(Coord::InternalSystem)$5);}
 	| INT COMPASS_ RADIUS_ numeric coordSystem skyDist
-	  {fr->markerCompassRadiusCmd($1,$4,(Coord::CoordSystem)$5,(Coord::SkyDist)$6);}
+	  {fr->markerCompassRadiusCmd($1,$4,(Coord::CoordSystem)$5,(Coord::DistFormat)$6);}
 	| INT COMPASS_ SYSTEM_ coordSystem skyFrame
 	{fr->markerCompassSystemCmd($1, (Coord::CoordSystem)$4, (Coord::SkyFrame)$5);}
 	| INT COMPOSITE_ GLOBAL_ yesno {fr->markerCompositeCmd($1,$4);}
@@ -1815,7 +1815,7 @@ marker	: CENTROID_ markerCentroid
 	| INT CPANDA_ EDIT_ STRING STRING coordSystem skyFrame 
 	    coordSystem skyDist
 	{fr->markerCpandaEditCmd($1, $4, $5, (Coord::CoordSystem)$6, (Coord::SkyFrame)$7,
-	    (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 
 	| INT CREATE_ ANNULUS_ RADIUS_ numeric numeric
 	{fr->markerAnnulusCreateRadiusCmd($1,Vector($5,$6));}
@@ -1866,7 +1866,7 @@ marker	: CENTROID_ markerCentroid
 	{fr->markerEllipseRadiusCmd($1, Vector($4, $5), (Coord::InternalSystem)$6);}
 	| INT ELLIPSE_ RADIUS_ numeric numeric coordSystem skyDist
 	{fr->markerEllipseRadiusCmd($1, Vector($4, $5),
-	    (Coord::CoordSystem)$6, (Coord::SkyDist)$7);}
+	    (Coord::CoordSystem)$6, (Coord::DistFormat)$7);}
 	| INT ELLIPSEANNULUS_ RADIUS_ numeric numeric numeric INT
 	    internalSystem
 	{fr->markerEllipseAnnulusRadiusCmd($1, Vector($4,$5), 
@@ -1874,10 +1874,10 @@ marker	: CENTROID_ markerCentroid
 	| INT ELLIPSEANNULUS_ RADIUS_ numeric numeric numeric INT
 	    coordSystem skyDist
 	{fr->markerEllipseAnnulusRadiusCmd($1, Vector($4,$5), 
-	    Vector($6,$6*$5/$4), $7, (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    Vector($6,$6*$5/$4), $7, (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 	| INT ELLIPSEANNULUS_ RADIUS_ STRING coordSystem skyDist
 	{fr->markerEllipseAnnulusRadiusCmd($1, $4,
-	    (Coord::CoordSystem)$5, (Coord::SkyDist)$6);}
+	    (Coord::CoordSystem)$5, (Coord::DistFormat)$6);}
 	| INT EPANDA_ EDIT_ angle angle INT numeric numeric numeric INT 
 	{fr->markerEpandaEditCmd($1, $4, $5, $6,
 	    Vector($7,$8), Vector($9,$9*$8/$7), $10);}
@@ -1894,7 +1894,7 @@ marker	: CENTROID_ markerCentroid
 	    coordSystem skyDist
 	{fr->markerEpandaEditCmd($1, $4, $5, 
 	    (Coord::CoordSystem)$6, (Coord::SkyFrame)$7,
-	    (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 
 	| INT FONT_ STRING {fr->markerFontCmd($1,$3);}
 	| INT HIGHLITE_ {fr->markerHighliteCmd($1);}
@@ -1920,12 +1920,12 @@ marker	: CENTROID_ markerCentroid
 	{fr->markerPolygonResetCmd($1, Vector($4,$5),(Coord::InternalSystem)$6);}
 	| INT POLYGON_ RESET_ numeric numeric coordSystem skyDist
 	{fr->markerPolygonResetCmd($1, Vector($4,$5),
-	    (Coord::CoordSystem)$6, (Coord::SkyDist)$7);}
+	    (Coord::CoordSystem)$6, (Coord::DistFormat)$7);}
 	| INT SEGMENT_ RESET_ numeric numeric internalSystem
 	{fr->markerSegmentResetCmd($1, Vector($4,$5),(Coord::InternalSystem)$6);}
 	| INT SEGMENT_ RESET_ numeric numeric coordSystem skyDist
 	{fr->markerSegmentResetCmd($1, Vector($4,$5),
-	    (Coord::CoordSystem)$6, (Coord::SkyDist)$7);}
+	    (Coord::CoordSystem)$6, (Coord::DistFormat)$7);}
 	| INT POINT_ SHAPE_ pointShape 
 	{fr->markerPointShapeCmd($1,(Point::PointShape)$4);}
 	| INT POINT_ SIZE_ INT {fr->markerPointSizeCmd($1,$4);}
@@ -1938,7 +1938,7 @@ marker	: CENTROID_ markerCentroid
 	    coordSystem skyDist
 	{fr->markerProjectionCmd($1, Vector($5), Vector($6),
 	    (Coord::CoordSystem)$3, (Coord::SkyFrame)$4, $7,
-	    (Coord::CoordSystem)$8, (Coord::SkyDist)$9);}
+	    (Coord::CoordSystem)$8, (Coord::DistFormat)$9);}
 	| INT PROPERTY_ markerProperty yesno 
 	{fr->markerPropertyCmd($1,$3,$4);}
 
@@ -1951,7 +1951,7 @@ marker	: CENTROID_ markerCentroid
 	    (Coord::CoordSystem)$4, (Coord::SkyFrame)$5);}
 	| INT RULER_ SYSTEM_ coordSystem skyFrame coordSystem skyDist
 	{fr->markerRulerSystemCmd($1, (Coord::CoordSystem)$4, (Coord::SkyFrame)$5,
-	    (Coord::CoordSystem)$6, (Coord::SkyDist)$7);}
+	    (Coord::CoordSystem)$6, (Coord::DistFormat)$7);}
 
 	| INT SELECT_ {fr->markerSelectCmd($1);}
 	| INT SELECT_ ONLY_ {fr->markerSelectOnlyCmd($1);}
@@ -1969,7 +1969,7 @@ marker	: CENTROID_ markerCentroid
 	| INT VECTOR_ POINT_ coordSystem skyFrame coord 
 	    coordSystem skyDist numeric angle
 	{fr->markerVectorCmd($1, Vector($6), (Coord::CoordSystem)$4, (Coord::SkyFrame)$5,
-	    $9, (Coord::CoordSystem)$7, (Coord::SkyDist)$8, $10);}
+	    $9, (Coord::CoordSystem)$7, (Coord::DistFormat)$8, $10);}
 
 	| INT WIDTH_ INT {fr->markerLineWidthCmd($1,$3);}
 
@@ -2170,7 +2170,7 @@ markerCreate :
 	    markerProperties
 	{fr->createRulerCmd(fr->mapToRef(Vector($2,$3),Coord::CANVAS),
 	    fr->mapToRef(Vector($4,$5),Coord::CANVAS),
-	    (Coord::CoordSystem)$6, (Coord::SkyFrame)$7, (Coord::CoordSystem)$8, (Coord::SkyDist)$9,
+	    (Coord::CoordSystem)$6, (Coord::SkyFrame)$7, (Coord::CoordSystem)$8, (Coord::DistFormat)$9,
 	    currentColor,currentDash,currentWidth,currentFont,
 	    currentText,currentProps,NULL,taglist,cblist);}
 	| COMPASS_ numeric numeric 
@@ -2333,31 +2333,31 @@ markerGet : CENTROID_ markerGetCentroid
 	| INT ANGLE_ coordSystem skyFrame
 	{fr->getMarkerAngleCmd($1,(Coord::CoordSystem)$3, (Coord::SkyFrame)$4);}
 	| INT ANNULUS_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerAnnulusRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerAnnulusRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 
 	| INT BOX_ FILL_ {fr->getMarkerBoxFillCmd($1);}
 	| INT BOXANNULUS_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerBoxAnnulusRadiusCmd($1,(Coord::CoordSystem)$4,(Coord::SkyDist)$5);}
+	{fr->getMarkerBoxAnnulusRadiusCmd($1,(Coord::CoordSystem)$4,(Coord::DistFormat)$5);}
 	| INT BOX_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerBoxRadiusCmd($1,(Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerBoxRadiusCmd($1,(Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT BPANDA_ ANGLE_ {fr->getMarkerBpandaAnglesCmd($1);}
 	| INT BPANDA_ ANGLE_ internalSystem {fr->getMarkerBpandaAnglesCmd($1);}
 	| INT BPANDA_ ANGLE_ coordSystem skyFrame
 	{fr->getMarkerBpandaAnglesCmd($1, (Coord::CoordSystem)$4, (Coord::SkyFrame)$5);}
 	| INT BPANDA_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerBpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerBpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 
 	| INT CENTER_ coordSystem skyFrame skyFormat 
 	{fr->getMarkerCenterCmd($1, (Coord::CoordSystem)$3, (Coord::SkyFrame)$4, 
 	    (Coord::SkyFormat)$5);}
 	| INT CIRCLE_ FILL_ {fr->getMarkerCircleFillCmd($1);}
 	| INT CIRCLE_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerCircleRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerCircleRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT COLOR_ {fr->getMarkerColorCmd($1);}
 	| INT COMPASS_ ARROW_ {fr->getMarkerCompassArrowCmd($1);}
 	| INT COMPASS_ LABEL_ {fr->getMarkerCompassLabelCmd($1);}
 	| INT COMPASS_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerCompassRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerCompassRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT COMPASS_ SYSTEM_ {fr->getMarkerCompassSystemCmd($1);}
 	| INT COMPOSITE_ GLOBAL_ {fr->getMarkerCompositeCmd($1);}
 	| INT CPANDA_ ANGLE_ {fr->getMarkerCpandaAnglesCmd($1);}
@@ -2365,30 +2365,30 @@ markerGet : CENTROID_ markerGetCentroid
 	| INT CPANDA_ ANGLE_ coordSystem skyFrame
 	{fr->getMarkerCpandaAnglesCmd($1, (Coord::CoordSystem)$4, (Coord::SkyFrame)$5);}
 	| INT CPANDA_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerCpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerCpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT ELLIPSE_ FILL_ {fr->getMarkerEllipseFillCmd($1);}
 	| INT ELLIPSE_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerEllipseRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerEllipseRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT ELLIPSEANNULUS_ RADIUS_ coordSystem skyDist
 	{fr->getMarkerEllipseAnnulusRadiusCmd($1, (Coord::CoordSystem)$4, 
-	    (Coord::SkyDist)$5);}
+	    (Coord::DistFormat)$5);}
 	| INT EPANDA_ ANGLE_ {fr->getMarkerEpandaAnglesCmd($1);}
 	| INT EPANDA_ ANGLE_ internalSystem {fr->getMarkerEpandaAnglesCmd($1);}
 	| INT EPANDA_ ANGLE_ coordSystem skyFrame
 	{fr->getMarkerEpandaAnglesCmd($1, (Coord::CoordSystem)$4, (Coord::SkyFrame)$5);}
 	| INT EPANDA_ RADIUS_ coordSystem skyDist
-	{fr->getMarkerEpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerEpandaRadiusCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT FONT_ {fr->getMarkerFontCmd($1);}
 	| INT HIGHLITE_ {fr->getMarkerHighlitedCmd($1);}
 	| INT LINE_ ARROW_ {fr->getMarkerLineArrowCmd($1);}
 	| INT LINE_ LENGTH_ coordSystem skyDist
-	{fr->getMarkerLineLengthCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerLineLengthCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT LINE_ POINT_ coordSystem skyFrame skyFormat
 	{fr->getMarkerLineCmd($1, (Coord::CoordSystem)$4,
 	    (Coord::SkyFrame)$5, (Coord::SkyFormat)$6);}
 	| INT MAP_ LENGTH_ numeric coordSystem skyDist
 	{fr->getMarkerMapLenFromRefCmd($1, $4,
-	    (Coord::CoordSystem)$5,(Coord::SkyDist)$6);}
+	    (Coord::CoordSystem)$5,(Coord::DistFormat)$6);}
 
 	| INT POLYGON_ FILL_ {fr->getMarkerPolygonFillCmd($1);}
 	| INT POINT_ SHAPE_ {fr->getMarkerPointShapeCmd($1);}
@@ -2398,13 +2398,13 @@ markerGet : CENTROID_ markerGetCentroid
 	    (Coord::SkyFrame)$5, (Coord::SkyFormat)$6);}
 	| INT PROJECTION_ LENGTH_ coordSystem skyDist
 	{fr->getMarkerProjectionLengthCmd($1, (Coord::CoordSystem)$4, 
-	    (Coord::SkyDist)$5);}
+	    (Coord::DistFormat)$5);}
 	| INT PROJECTION_ THICK_ coordSystem skyDist
-	{fr->getMarkerProjectionWidthCmd($1,(Coord::CoordSystem)$4,(Coord::SkyDist)$5);}
+	{fr->getMarkerProjectionWidthCmd($1,(Coord::CoordSystem)$4,(Coord::DistFormat)$5);}
 	| INT PROPERTY_ {fr->getMarkerPropertyCmd($1);}
 	| INT PROPERTY_ markerProperty {fr->getMarkerPropertyCmd($1,$3);}
 	| INT RULER_ LENGTH_ coordSystem skyDist
-	{fr->getMarkerRulerLengthCmd($1,(Coord::CoordSystem)$4,(Coord::SkyDist)$5);}
+	{fr->getMarkerRulerLengthCmd($1,(Coord::CoordSystem)$4,(Coord::DistFormat)$5);}
 	| INT RULER_ POINT_ coordSystem skyFrame skyFormat
 	{fr->getMarkerRulerPointCmd($1, (Coord::CoordSystem)$4,
 	    (Coord::SkyFrame)$5, (Coord::SkyFormat)$6);}
@@ -2419,7 +2419,7 @@ markerGet : CENTROID_ markerGetCentroid
 
 	| INT VECTOR_ ARROW_ {fr->getMarkerVectorArrowCmd($1);}
 	| INT VECTOR_ LENGTH_ coordSystem skyDist
-	{fr->getMarkerVectorLengthCmd($1, (Coord::CoordSystem)$4, (Coord::SkyDist)$5);}
+	{fr->getMarkerVectorLengthCmd($1, (Coord::CoordSystem)$4, (Coord::DistFormat)$5);}
 	| INT VECTOR_ POINT_ coordSystem skyFrame skyFormat
 	{fr->getMarkerVectorCmd($1, (Coord::CoordSystem)$4,
 	    (Coord::SkyFrame)$5, (Coord::SkyFormat)$6);}
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index 371d692..3b2addb 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -19,7 +19,7 @@ Ruler::Ruler(const Ruler& a) : BaseLine(a)
 
 Ruler::Ruler(Base* p, const Vector& ptr1, const Vector& ptr2,
 	     Coord::CoordSystem sys, Coord::SkyFrame sky, 
-	     Coord::CoordSystem distsys, Coord::SkyDist distfor,
+	     Coord::CoordSystem distsys, Coord::DistFormat distfor,
 	     const char* clr, int* dsh,
 	     int wth, const char* fnt, const char* txt, 
 	     unsigned short prop, const char* cmt,
@@ -423,7 +423,7 @@ int Ruler::isIn(const Vector& vv)
 }
 
 void Ruler::setCoordSystem(Coord::CoordSystem sys, Coord::SkyFrame sky, 
-			   Coord::CoordSystem dsys, Coord::SkyDist dist)
+			   Coord::CoordSystem dsys, Coord::DistFormat dist)
 {
   coordSystem = sys;
   skyFrame = sky;
diff --git a/tksao/frame/ruler.h b/tksao/frame/ruler.h
index 23b15dc..849d5fc 100644
--- a/tksao/frame/ruler.h
+++ b/tksao/frame/ruler.h
@@ -13,7 +13,7 @@ private:
   Coord::CoordSystem coordSystem;
   Coord::SkyFrame skyFrame;
   Coord::CoordSystem distSystem;
-  Coord::SkyDist distDist;
+  Coord::DistFormat distDist;
   double dist;
 
 private:
@@ -43,7 +43,7 @@ public:
   Ruler(const Ruler&);
   Ruler(Base* p, const Vector& ptr1, const Vector& ptr2,
 	Coord::CoordSystem sys, Coord::SkyFrame sky, 
-	Coord::CoordSystem distsys, Coord::SkyDist distfor,
+	Coord::CoordSystem distsys, Coord::DistFormat distfor,
 	const char* clr, int* dsh,
 	int wth, const char* fnt, const char* txt, 
 	unsigned short prop, const char* cmt,
@@ -58,13 +58,13 @@ public:
   const Vector& getP1() {return p1;}
   const Vector& getP2() {return p2;}
   const Vector& getP3() {return p3;}
-  void setCoordSystem(Coord::CoordSystem, Coord::SkyFrame, Coord::CoordSystem, Coord::SkyDist);
+  void setCoordSystem(Coord::CoordSystem, Coord::SkyFrame, Coord::CoordSystem, Coord::DistFormat);
 
   Coord::CoordSystem getSystem() {return coordSystem;}
   Coord::SkyFrame getSkyFrame() {return skyFrame;}
 
   Coord::CoordSystem getDistSystem() {return distSystem;}
-  Coord::SkyDist getDistDist() {return distDist;}
+  Coord::DistFormat getDistDist() {return distDist;}
 
   void list(ostream&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, int, int);
   void listXML(ostream&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);
author	William Joye <wjoye@cfa.harvard.edu>	2017-08-07 18:12:09 (GMT)
committer	William Joye <wjoye@cfa.harvard.edu>	2017-08-07 18:12:09 (GMT)
commit	ac5f936afba9b8aca203ad64d4676821464e78dc (patch)
tree	e98f8aedd4787f3d593af68e16d18183f2ad6f6b
parent	67a7da96005ebc219d94a532d6cfcc5e70cb55b8 (diff)
download	blt-ac5f936afba9b8aca203ad64d4676821464e78dc.zip blt-ac5f936afba9b8aca203ad64d4676821464e78dc.tar.gz blt-ac5f936afba9b8aca203ad64d4676821464e78dc.tar.bz2