Index: trunk/psLib/src/astronomy/psCoord.h
===================================================================
--- trunk/psLib/src/astronomy/psCoord.h	(revision 1287)
+++ trunk/psLib/src/astronomy/psCoord.h	(revision 1293)
@@ -10,6 +10,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-23 03:13:39 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-24 02:42:59 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,6 +27,6 @@
 typedef struct
 {
-    double x;    ///< x position
-    double y;    ///< y position
+    double x;      ///< x position
+    double y;      ///< y position
     double xErr;   ///< Error in x position
     double yErr;   ///< Error in y position
@@ -36,6 +36,6 @@
 typedef struct
 {
-    double r;    ///< RA
-    double d;    ///< Dec
+    double r;      ///< RA
+    double d;      ///< Dec
     double rErr;   ///< Error in RA
     double dErr;   ///< Error in Dec
@@ -63,22 +63,24 @@
     double sinNPlat;   ///< sin of North Pole latitude
     double cosNPlat;   ///< cos of North Pole latitude
-    double sinZP;   ///< sin of Forst PT os Ares lon
-    double cosZP;   ///< cos of Forst PT os Ares lon
+    double sinZP;      ///< sin of Forst PT os Ares lon
+    double cosZP;      ///< cos of Forst PT os Ares lon
 }
 psSphereTransform;
 
 typedef enum {
-    PS_PROJ_TAN,   ///< Tangent projection
-    PS_PROJ_SIN,   ///< Sine projection
-    PS_PROJ_AIT,   ///< Aitoff projection
-    PS_PROJ_PAR,   ///< Par projection
-    PS_PROJ_GLS,   ///< GLS projection
-    PS_PROJ_NTYPE   ///< Number of types; must be last.
+    PS_PROJ_TAN,       ///< Tangent projection
+    PS_PROJ_SIN,       ///< Sine projection
+    PS_PROJ_AIT,       ///< Aitoff projection
+    PS_PROJ_PAR,       ///< Par projection
+    PS_PROJ_GLS,       ///< GLS projection
+    PS_PROJ_CAR,       ///< CAR projection
+    PS_PROJ_MER,       ///< MER projection
+    PS_PROJ_NTYPE      ///< Number of types; must be last.
 } psProjectionType;
 
 typedef struct
 {
-    double R;    ///< Coordinates of projection center
-    double D;    ///< Coordinates of projection center
+    double R;     ///< Coordinates of projection center
+    double D;     ///< Coordinates of projection center
     double Xs;    ///< plate-scale in X direction
     double Ys;    ///< plate-scale in Y direction
@@ -128,6 +130,6 @@
                    const psProjection *projection);
 
-psSphere *psProject(const psPlane *coord,
-                    const psProjection *projection);
+psSphere *psDeproject(const psPlane *coord,
+                      const psProjection *projection);
 
 psSphere *psSphereGetOffset(const psSphere *restrict position1,