Cleanup, part 1.

11 files changed, 43 insertions, 43 deletions

diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 90405883..fcdcf929 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -99,8 +99,8 @@ int           followMouse = no,
   ack = 1,
   someInt,
   drawMore,
-  spadMode=no, /* yes if receiving AXIOM command and calling drawViewport */
-  spadDraw=no, /* yes if drawing viewport because of a AXIOM command */
+  spadMode=no, /* yes if receiving OpenAxiom command and calling drawViewport */
+  spadDraw=no, /* yes if drawing viewport because of a OpenAxiom command */
   pointsON  = yes,  /* these would affect the choices in buttons.c */
   connectON = yes,
   splineON  = no,
@@ -114,7 +114,7 @@ int           followMouse = no,
   queriedGraph = 0,  /* current graph queried */
   picking=0,
   dropping=0,
-  viewAloned,  /** if not connected to AXIOM **/
+  viewAloned,  /** if not connected to OpenAxiom **/
   mono, 
   totalColors, 
   totalSolid, 
@@ -171,7 +171,7 @@ main(void)
   /**** link Xwindows to viewports - X10 feature ****/
   table        = XCreateAssocTable(nbuckets);  
   
-  /**** Create AXIOM color map ****/
+  /**** Create OpenAxiom color map ****/
   totalColors = XInitSpadFill(dsply,scrn,&colorMap,
                               &totalHues,&totalSolidShades,
                               &totalDitheredAndSolids,&totalShades);
@@ -417,7 +417,7 @@ main(void)
   i = 123;
   code=check(write(Socket,&i,intSize));
   
-  /* Check if I am getting stuff from AXIOM or, if I am viewAlone. */
+  /* Check if I am getting stuff from OpenAxiom or, if I am viewAlone. */
   readViewman(&viewAloned,intSize);
   readViewman(&viewData,sizeof(view2DStruct));
   readViewman(&i,intSize);
diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c
index 97f641ef..595e5a1c 100644
--- a/src/graph/view2D/process2d.c
+++ b/src/graph/view2D/process2d.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -193,7 +193,7 @@ buttonAction (int bKey)
     
   case pick2D:
     if (viewAloned) {
-      sprintf(control->message,"%s","Cannot pick without AXIOM!");
+      sprintf(control->message,"%s","Cannot pick without OpenAxiom!");
       writeControlMessage();
       XSync(dsply,False);
     }
@@ -207,7 +207,7 @@ buttonAction (int bKey)
     
   case drop2D:
     if (viewAloned) {
-      sprintf(control->message,"%s","Cannot drop without AXIOM!");
+      sprintf(control->message,"%s","Cannot drop without OpenAxiom!");
       writeControlMessage();
       XSync(dsply,False);
     } else {
diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c
index a5934018..0ce5de88 100644
--- a/src/graph/view2D/viewport2D.c
+++ b/src/graph/view2D/viewport2D.c
@@ -630,7 +630,7 @@ makeViewport(char *title,int vX,int vY,int vW,int vH,int showCP)
   (void) XSetWMProtocols(dsply, viewTitleWindow, &wm_delete_window, 1);
 
   XSetNormalHints(dsply,viewTitleWindow,&titleSizeHints); 
-  XSetStandardProperties(dsply,viewTitleWindow,"AXIOM 2D",viewport->title,
+  XSetStandardProperties(dsply,viewTitleWindow,"OpenAxiom 2D",viewport->title,
                            None,NULL,0,&titleSizeHints);
 
   viewport->titleWindow = viewTitleWindow;
diff --git a/src/graph/view3D/component3d.c b/src/graph/view3D/component3d.c
index a4d0622c..2b361295 100644
--- a/src/graph/view3D/component3d.c
+++ b/src/graph/view3D/component3d.c
@@ -76,7 +76,7 @@ scaleComponents (void)
   yRange = viewData.ymax - viewData.ymin;
   zRange = viewData.zmax - viewData.zmin;
   
-  /* We scale down, normalize the data, if it is coming from AXIOM
+  /* We scale down, normalize the data, if it is coming from OpenAxiom
      (handled by viewman).  If the data is coming from a file (handled by
      viewAlone) then it should already been scaled down. 
      */
@@ -113,7 +113,7 @@ scaleComponents (void)
   
   /* We now normalize all the points in this program. The information
      needed to link the normalized set of points back to the real object
-     space scale created in AXIOM is held in viewData.scaleToView. */
+     space scale created in OpenAxiom is held in viewData.scaleToView. */
   viewData.xmin *= viewData.scaleToView;
   viewData.xmax *= viewData.scaleToView;
   viewData.ymin *= viewData.scaleToView;
@@ -329,7 +329,7 @@ readComponentsFromViewman (void)
         maxLength = anLPoint->numOfPoints;
       for (k=0; k<anLPoint->numOfPoints; k++,anIndex++) {
         readViewman(anIndex,intSize);
-        /* AXIOM arrays are one based, C arrays are zero based */
+        /* OpenAxiom arrays are one based, C arrays are zero based */
         if (!viewAloned) (*anIndex)--;
       }
     } /* for LPoints in LLPoints (j) */
@@ -410,7 +410,7 @@ calcNormData (void)
   points is. For 3D explicit equations of two variables, the closed 
   boolean for this level is False and the closed boolean for each sublist 
   is False as well. For 3D parameterized curves of one variable, the 
-  closed boolean for this level is defined by the user from AXIOM , 
+  closed boolean for this level is defined by the user from OpenAxiom , 
   (which defaults to False) and the closed boolean for each sublist is True.
   */
 
@@ -544,7 +544,7 @@ draw3DComponents (int dFlag)
             ((anLLPoint->lp+1)->numOfPoints > 2))
           componentType = polygonComponent;
       }
-      /* Check for corrupt data and NaN data is made in AXIOM . */
+      /* Check for corrupt data and NaN data is made in OpenAxiom . */
       if (componentType == stillDontKnow)
         componentType = surfaceComponent;
       
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index a3d2e3a0..313e9040 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -102,12 +102,12 @@ int             mono, totalColors, totalSolid, totalDithered, totalHues,
 
 int             drawMore;
 
-int             spadMode=no,            /* yes if receiving AXIOM command and
+int             spadMode=no,            /* yes if receiving OpenAxiom command and
                                            calling drawViewport */
                 spadDraw=no;            /* yes if drawing viewport for 
-                                           an AXIOM command */
+                                           an OpenAxiom command */
 int             spadSignalReceived=0;  /* yes if current state is a result of
-                                           a signal from AXIOM */
+                                           a signal from OpenAxiom */
 int             inNextEvent=no;         /* true just before a call to
                                            XNextEvent */
 jmp_buf         jumpFlag;
@@ -181,7 +181,7 @@ int             finishedList=no, zoomed=yes, translated = yes,
                 gotToggle = no;
 poly            *quickList;
 
-                /** if not connected to AXIOM **/
+                /** if not connected to OpenAxiom **/
 int             viewAloned;
 
                 /** for drawing the box **/
@@ -273,7 +273,7 @@ main(void)
   /**** link Xwindows to viewports - X10 feature ****/
   table = XCreateAssocTable(nbuckets);  
 
-  /**** Create AXIOM color map ****/
+  /**** Create OpenAxiom color map ****/
   totalShades = 0;
   totalColors = XInitSpadFill(dsply,scrn,&colorMap,
                               &totalHues,&totalSolidShades,
@@ -520,7 +520,7 @@ main(void)
   i    = 123;   /* Used in viewman, what is this for? */
   code = check(write(Socket,&i,intSize));
 
-  /* Check if I am getting stuff from AXIOM or, if I am viewAlone. */
+  /* Check if I am getting stuff from OpenAxiom or, if I am viewAlone. */
   readViewman(&viewAloned,intSize);
   readViewman(&viewData,sizeof(view3DStruct));
   readViewman(&i,intSize);
@@ -541,7 +541,7 @@ main(void)
   switch (viewData.typeOf3D) {
 
   /* Currently, the view3DType information doesn't get sent from
-     AXIOM - all surfaces are alike regardless of how they
+     OpenAxiom - all surfaces are alike regardless of how they
      were created. We may revert back to receiving this information
      in case we want to take advantage of certain properties of
      certain surfaces (e.g. z=f(x,y)). */
diff --git a/src/graph/view3D/spadAction3d.c b/src/graph/view3D/spadAction3d.c
index 4c5dcfc8..64530676 100644
--- a/src/graph/view3D/spadAction3d.c
+++ b/src/graph/view3D/spadAction3d.c
@@ -199,7 +199,7 @@ spadAction (void)
     if (viewport->haveControl) drawControlPanel();
     break;
 
-/* Non-uniform scaling is not in AXIOM yet. */
+/* Non-uniform scaling is not in OpenAxiom yet. */
 /* Neither is object or origin rotation. */
 
   case perspectiveOnOff:
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index 9c3a58d9..c783943f 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -116,12 +116,12 @@ int             someInt;
 
 int             drawMore;
 
-int             spadMode=no,            /* yes if receiving AXIOM command and
+int             spadMode=no,            /* yes if receiving OpenAxiom command and
                                            calling drawViewport */
                 spadDraw=no;            /* yes if drawing viewport for 
-                                           an AXIOM command */
+                                           an OpenAxiom command */
 int             spadSignalReceived=0;  /* yes if current state is a result of
-                                           a signal from AXIOM */
+                                           a signal from OpenAxiom */
 int             inNextEvent=no;         /* true just before a call to
                                            XNextEvent */
 jmp_buf         jumpFlag;
@@ -195,7 +195,7 @@ int             finishedList=no, zoomed=yes, translated = yes,
                 gotToggle = no;
 poly            *quickList;
 
-                /** if not connected to AXIOM **/
+                /** if not connected to OpenAxiom **/
 int             viewAloned;
 
                 /** for drawing the box **/
@@ -276,7 +276,7 @@ main(void)
   /**** link Xwindows to viewports - X10 feature ****/
   table = XCreateAssocTable(nbuckets);  
 
-  /**** Create AXIOM color map ****/
+  /**** Create OpenAxiom color map ****/
   totalShades = 0;
   totalColors = XInitSpadFill(dsply,scrn,&colorMap,
                               &totalHues,&totalSolidShades,
@@ -550,10 +550,10 @@ main(void)
 
   XSetNormalHints(dsply,viewTitleWindow,&titleSizeHints);
   if (strlen(viewport->title) < 30)
-    XSetStandardProperties(dsply,viewTitleWindow,"AXIOM 3D",viewport->title,
+    XSetStandardProperties(dsply,viewTitleWindow,"OpenAxiom 3D",viewport->title,
                            None,NULL,0,&titleSizeHints);
   else
-    XSetStandardProperties(dsply,viewTitleWindow,"AXIOM 3D","3D AXIOM Graph",
+    XSetStandardProperties(dsply,viewTitleWindow,"OpenAxiom 3D","3D OpenAxiom Graph",
                            None,NULL,0,&titleSizeHints);
   viewport->titleWindow = viewTitleWindow;
 
diff --git a/src/graph/view3D/viewport3d.c b/src/graph/view3D/viewport3d.c
index 23f060cc..3b7482c2 100644
--- a/src/graph/view3D/viewport3d.c
+++ b/src/graph/view3D/viewport3d.c
@@ -683,10 +683,10 @@ makeViewport (void)
 
   XSetNormalHints(dsply,viewTitleWindow,&titleSizeHints);
   if (strlen(viewport->title) < 30)
-    XSetStandardProperties(dsply,viewTitleWindow,"AXIOM 3D",viewport->title,
+    XSetStandardProperties(dsply,viewTitleWindow,"OpenAxiom 3D",viewport->title,
                            None,NULL,0,&titleSizeHints);
   else
-    XSetStandardProperties(dsply,viewTitleWindow,"AXIOM 3D","3D AXIOM Graph",
+    XSetStandardProperties(dsply,viewTitleWindow,"OpenAxiom 3D","3D OpenAxiom Graph",
                            None,NULL,0,&titleSizeHints);
   viewport->titleWindow = viewTitleWindow;
 
diff --git a/src/graph/viewman/globalsM.h b/src/graph/viewman/globalsM.h
index e7e3846b..cce83265 100644
--- a/src/graph/viewman/globalsM.h
+++ b/src/graph/viewman/globalsM.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights resrved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -34,7 +34,7 @@
 */
 
 extern viewManager *viewports,*slot,*stepSlot;
-extern Sock        *spadSock;
+extern openaxiom_sio* spadSock;
 extern int         viewType, viewCommand; 
 extern fd_set         filedes;
 extern int             acknow;
diff --git a/src/graph/viewman/makeGraph.c b/src/graph/viewman/makeGraph.c
index 69e0a656..d4188a41 100644
--- a/src/graph/viewman/makeGraph.c
+++ b/src/graph/viewman/makeGraph.c
@@ -93,7 +93,7 @@ makeGraphFromSpadData(void)
     pL->listOfPoints = p;             /** point to current point list **/
 
     for (j=0; j<pL->numberOfPoints; j++) {
-      p->x     = get_float(spadSock);         /* get numbers from AXIOM */
+      p->x     = get_float(spadSock);         /* get numbers from OpenAxiom */
       p->y     = get_float(spadSock);
       p->hue   = get_float(spadSock) - 1;     /* make zero based */
       p->shade = get_float(spadSock) - 1;
diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c
index 96a6e13f..fca67796 100644
--- a/src/graph/viewman/viewman.c
+++ b/src/graph/viewman/viewman.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 1991-2002, The Numerical ALgorithms Group Ltd.
+  Copyright (C) 1991-2002, The Numerical Algorithms Group Ltd.
   All rights reserved.
   Copyright (C) 2007-2008, Gabriel Dos Reis.
   All rights reserved.
@@ -16,7 +16,7 @@
         the documentation and/or other materials provided with the
         distribution.
 
-      - Neither the name of The Numerical ALgorithms Group Ltd. nor the
+      - Neither the name of The Numerical Algorithms Group Ltd. nor the
         names of its contributors may be used to endorse or promote products
         derived from this software without specific prior written permission.
 
@@ -65,7 +65,7 @@ XEvent  viewmanEvent;
 viewManager *viewports,
   *slot,
   *stepSlot;
-Sock        *spadSock;
+openaxiom_sio* spadSock;
 int         viewType, 
   viewCommand,
   acknow,
@@ -95,15 +95,15 @@ main (void)
   bsdSignal(OPENAXIOM_SIGCHLD,endChild,RestartSystemCalls);
   bsdSignal(SIGTERM,goodbye,DontRestartSystemCalls);
   
-  /* Connect up to AXIOM server */
+  /* Connect up to OpenAxiom server */
   spadSock = connect_to_local_server(SpadServer,ViewportServer,Forever);
   if (spadSock == NULL) {
-    fprintf(stderr,"The viewport manager couldn't connect to AXIOM\n");
+    fprintf(stderr,"The viewport manager couldn't connect to OpenAxiom\n");
     exit(-1);
   }
 #ifdef DEBUG
   else
-    fprintf(stderr,"viewman: Connected to AXIOM\n");
+    fprintf(stderr,"viewman: Connected to OpenAxiom\n");
 #endif
   
   /******** initialize ********/
@@ -112,7 +112,7 @@ main (void)
   
   /******** getting stuff from spad and viewports ********
   *********   the viewports have priority over    ****
-  ***   AXIOM.                              ***/
+  ***   OpenAxiom.                              ***/
   while (1) {
     FD_ZERO(&filedes); /* zero out file descriptor */
     FD_SET(spadSock->socket,&filedes);