[SCM] image display tool for astronomy branch, upstream, updated. f6f5ad7a19a7c674dd427fb54f15a41a98d94d5e

Ole Streicher github at liska.ath.cx
Wed Jun 6 13:58:54 UTC 2012


The following commit has been merged in the upstream branch:
commit f6f5ad7a19a7c674dd427fb54f15a41a98d94d5e
Author: Ole Streicher <github at liska.ath.cx>
Date:   Wed Jun 6 15:56:59 2012 +0200

    New upstream version 7.0

diff --git a/doc/beta.html b/doc/beta.html
index dd5ebcf..3654ec2 100644
--- a/doc/beta.html
+++ b/doc/beta.html
@@ -33,7 +33,7 @@
         only. Please note these versions of DS9 are BETA, and have not
         been
         fully tested and verified. </p>
-      <p><b>DS9 Version 7.0 Beta 20 Binaries</b><br>
+      <p><b>DS9 Version 7.0 Beta 21 Binaries</b><br>
       </p>
       <blockquote>Linux
         <blockquote><a
diff --git a/doc/faq.html b/doc/faq.html
index 2ecaa53..4ae11fc 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -45,7 +45,7 @@
           licenses, you are free to distribute SAOImage DS9 along with
           your software.</p>
         <p>The <a href="http://www.gnu.org/copyleft/gpl.html">GNU site</a>
-          contains an excellent FAQ on the the do's and dont's of GPL.</p>
+          contains an excellent FAQ on the the dos and donts of GPL.</p>
       </blockquote>
       <p><b><a name="General"></a>General</b></p>
       <blockquote>
@@ -75,11 +75,11 @@
           and unpack that archive into memory. The application DS9 is
           already stripped of debugging symbols when built. </p>
         <p>It appears that the <tt>strip</tt> command is <i>stripping</i>
-          part of the archive, hence DS9 is unable to uncompress it. In
+          part of the archive, hence DS9 is unable to un-compress it. In
           summary, don't <tt>strip</tt> the DS9 binary and everything
           works fine. </p>
         <p><b>When I open my FITS image, all I see is 'white'. Yet
-            everything, including the colorbar seems to work?</b></p>
+            everything, including the color bar seems to work?</b></p>
         <p>New with version 2.1, is support for the DATASEC keyword.
           This keyword specifies what portion of the image is valid
           data, for calculating min / max and for displaying. This is
@@ -112,6 +112,7 @@
           terminal window. Then select the string and select <tt>Edit:Copy</tt>.<br>
           Windows: <b>Character Map</b> (from <tt>Start</tt> button,
           select <tt>All Programs</tt>, <tt>Accessories</tt>, <tt>System
+
             Tools</tt> and then <tt>Character Map</tt>)<br>
         </p>
       </blockquote>
@@ -131,11 +132,12 @@
         <p><b>I have FreeBSD. When I run ds9, I get the following error:</b>
           <tt>  <b>ELF binary type "0" not known</b> </tt><b>Whats
 
+
             going on?</b></p>
         <p>The solution was to use the <b><tt>brandelf</tt></b> utility
           on the file to ensure that the machine understood that it
-           was a linux program.</p>
-        <p><tt>% brandelf -t Linux (filename)<br>
+           was a Linux program.</p>
+        <p><tt>% brandelf -t Linux (file name)<br>
           </tt></p>
         <blockquote> </blockquote>
       </blockquote>
@@ -146,16 +148,16 @@
             saves only a stripe at the top of my image.<br>
           </b></p>
         <p>This problem seems to be caused by running DS9 in Windows XP
-          compatibility mode. Please uncheck the compatibility option in
-          the properties dialog.<br>
+          compatibility mode. Please un-check the compatibility option
+          in the properties dialog.<br>
         </p>
         <p><b>How can I open a FITS file with an extension name?</b></p>
         <p><b> </b>By default, the windows port of DS9 uses the Windows
           standard dialog box to open and save files. This can be a
           problem in that the native Windows dialog will not allow
-          extensions to the filename, such as <tt>foo.fits[2]</tt>. You
-          must use the Unix like standard dialogs to be able to specify
-          an extension. Select <tt>Edit->Preferences->General:Dialogbox</tt>
+          extensions to the file name, such as <tt>foo.fits[2]</tt>.
+          You must use the Unix like standard dialogs to be able to
+          specify an extension. Select <tt>Edit->Preferences->General:Dialogbox</tt>
           to change the default standard dialog.</p>
         <p><b>Every time I create an auxiliary window in ds9, such as a
             Pixel Table, or Analysis Plot, it will retreat behind the
@@ -202,8 +204,8 @@
         <p><b> </b>By default, DS9 MacOSX Aqua uses the MacOSX standard
           dialog box to open and save files. This can be a problem in
           that the native MacOSX dialog will not allow extensions to the
-          filename, such as <tt>foo.fits[2]</tt>. You must use the Unix
-          like standard dialogs to be able to specify an extension.
+          file name, such as <tt>foo.fits[2]</tt>. You must use the
+          Unix like standard dialogs to be able to specify an extension.
           Select <tt>Edit->Preferences->General</tt> to change
           the default standard dialog.</p>
         <p><b>How do I set my PATH environment variable under MacOSX for
@@ -213,8 +215,8 @@
           parse any shell startup files, such as ~/.profile. Instead,
           the environment is defined using a special environment file, <tt>.MacOSX/environment.plist</tt>.
           This file can be created with the MacOSX utility <tt>/Developer/Applications/PropertyListEditor.app.
-          </tt>For
-          further information, please click <a
+
+          </tt>For further information, please click <a
             href="http://developer.apple.com/qa/qa2001/qa1067.html">here</a>.<br>
         </p>
         <blockquote> </blockquote>
@@ -230,10 +232,10 @@
           rendering (X11, Windows, or MacOSX).<br>
           <br>
           Therefore, using DS9 as a batch process can be cumbersome. We
-          recommend using xvfb under X11. Just set up a virtual display
-          buffer, reset your DISPLAY variable, then invoke DS9 with a
-          number of command line options or use xpa from a shell script
-          as a batch processor.</p>
+          recommend using <tt>xvfb</tt> under X11. Just set up a
+          virtual display buffer, reset your DISPLAY variable, then
+          invoke DS9 with a number of command line options or use xpa
+          from a shell script as a batch processor.</p>
         <p><b>When I start DS9, I get the following error message:</b></p>
         <tt>_X11TransSocketINETConnect: Can't get address for
           foo.bar.edu </tt><br>
@@ -416,6 +418,7 @@
           <p><tt>The messages means that there is no
               /usr/local/lib/imtoolrc file </tt><tt>on the machine.
               This is created as a symlink to dev$imtoolrc by the </tt><tt>iraf
+
               install script but only if the /usr/local/lib dir already
               exists on the </tt><tt>machine. The fix is the create the
               dir and rerun the install script or </tt><tt>else make
@@ -438,9 +441,11 @@
               as a </tt><tt>/usr/local/lib/imtoolrc symlink pointing to
               the dev$imtoolrc file in the </tt><tt>iraf system. 
               This is normally what's used but XImtool (and DS9?) also </tt><tt>allow
+
               a $HOME/.imtoolrc and IMTOOLRC environment variable
               defining the </tt><tt>path as fallbacks.  There are
               several practical problems with  this:  for </tt><tt>some
+
               reason (I'm trying to fix) the imtoolrc link won't be
               created if </tt><tt>the /usr/local/lib directory doesn't
               exist when the install script is </tt><tt>run on the
@@ -448,6 +453,7 @@
             </tt><tt>directory easily.  On PC-IRAF systems there is
               also a typo in the install </tt><tt>script (extra logical
               or at line 515) which causes it to exit before </tt><tt>the
+
               display setup is run (i.e. no /dev fifos or imtoolrc). If
               users don't </tt><tt>catch this or see it in the README
               file they'll think everything went </tt><tt>fine. Lastly,
diff --git a/doc/index.html b/doc/index.html
index cc25b1b..ad929a0 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -36,11 +36,11 @@
         or support files. Versions of DS9 currently exist for Solaris,
         Linux, MacOSX, and Windows. All versions and platforms support a
         consistent set of GUI and functional capabilities.</p>
-      <p>DS9 supports advanced features such as multiple frame buffers,
-        mosaic images, tiling, blinking, geometric markers, colormap
-        manipulation, scaling, arbitrary zoom, rotation, pan, and a
-        variety of coordinate systems. DS9 also supports FTP and HTTP
-        access. </p>
+      <p>DS9 supports advanced features such as 2-D, 3-D and RGB frame
+        buffers, mosaic images, tiling, blinking, geometric markers,
+        colormap manipulation, scaling, arbitrary zoom, cropping,
+        rotation, pan, and a variety of coordinate systems.<br>
+      </p>
       <p>The GUI for DS9 is user configurable. GUI elements such as the
         coordinate display, panner, magnifier, horizontal and vertical
         graphs, button bar, and colorbar can be configured via menus or
@@ -64,24 +64,29 @@ href="http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.7.0.tar.
         <blockquote> <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/ds9.darwinlion.7.0.tar.gz">for
 
+
             OS version 10.7 (Lion)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/ds9.darwinsnowleopard.7.0.tar.gz">for
 
+
             OS version 10.6 (Snow Leopard)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/ds9.darwinleopard.7.0.tar.gz">for
 
+
             OS version 10.5 (Leopard)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/ds9.darwintiger.7.0.tar.gz">for
 
+
             OS version 10.4 (Tiger)</a><br>
         </blockquote>
         Windows <br>
         <blockquote><a
 href="http://hea-www.harvard.edu/saord/download/ds9/windows/SAOImage%20DS9%2067.0%20Install.exe">Windows
 
+
             7</a></blockquote>
         Solaris<br>
         <blockquote><a
@@ -112,18 +117,22 @@ href="http://hea-www.harvard.edu/saord/download/ds9/linux64/xpa.linux64.2.1.14.t
         <blockquote><a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/xpa.darwinlion.2.1.14.tar.gz">for
 
+
             OS version 10.7 (Lion)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/xpa.darwinsnowleopard.2.1.14.tar.gz">for
 
+
             OS version 10.6 (Snow Leopard)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/xpa.darwinleopard.2.1.14.tar.gz">for
 
+
             OS version 10.5 (Leopard)</a><br>
           <a
 href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/xpa.darwintiger.2.1.14.tar.gz">for
 
+
             OS version 10.4 (Tiger)</a><br>
         </blockquote>
       </blockquote>
@@ -135,6 +144,7 @@ href="http://hea-www.harvard.edu/saord/download/ds9/solaris/xpa.solaris.2.1.14.t
         <blockquote><a
 href="http://hea-www.harvard.edu/saord/download/ds9/windows/XPA%202.1.14%20Install.exe">Windows
 
+
             Vista/XP/2000/NT</a></blockquote>
       </blockquote>
       <p><b>pyds9</b><br>
@@ -193,6 +203,7 @@ href="http://hea-www.harvard.edu/saord/download/ds9/python/pyds9-1.2.tar.gz">Sou
         <a
           href="http://xmm.vilspa.esa.es/external/xmm_sw_cal/sas_frame.shtml">SAS:
 
+
           XMM-Newton Science Analysis System</a><br>
         <a href="http://iraf.noao.edu/iraf-homepage.html">IRAF: Image
           Reduction and Analysis Facility</a><br>
@@ -211,10 +222,9 @@ href="http://hea-www.harvard.edu/saord/download/ds9/python/pyds9-1.2.tar.gz">Sou
       <blockquote>
         <p>If you have found SAOImage DS9 to be helpful in your
           research, the following acknowledgment would be appreciated:<i>
-          </i><i>"This
-            research has made use of SAOImage DS9, developed by
-            Smithsonian Astrophysical Observatory" </i>or reference the
-          following paper <a
+          </i><i>"This research has made use of SAOImage DS9, developed
+            by Smithsonian Astrophysical Observatory" </i>or reference
+          the following paper <a
 href="http://adsabs.harvard.edu/cgi-bin/nph-bib_query?bibcode=2003adass..12..489J">2003adass..12..489J</a></p>
       </blockquote>
     </blockquote>
diff --git a/doc/new.html b/doc/new.html
index 95964b1..dbef2d6 100644
--- a/doc/new.html
+++ b/doc/new.html
@@ -9,19 +9,144 @@
   </head>
   <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
     vlink="#551a8b">
-    <h3> <img alt="" src="sun.gif" align="middle" height="98"
-        width="100">
-      SAOImage DS9 Version 7 New Features</h3>
+    <h3> <img alt="" src="sun.gif" align="middle" width="100"
+        height="98"> SAOImage DS9 Version 7 New Features</h3>
     <blockquote>
       <p><b>Version 7.0<br>
         </b></p>
       <blockquote>
+        <p><b>3-D Data Visualization</b><br>
+        </p>
+        <p> Previous versions of SAOImage DS9 would allow users to load
+          3-D data into the traditional 2-D frames, and would allow
+          users to step through successive z-dimension pixel slices of
+          the data cube. To visualize the 3-D data in DS9 v. 7.0, a new
+          module, encompassed by the new <tt>Frame 3D</tt> option,
+          allows users to load and view data cubes in multiple
+          dimensions.</p>
+        <p>The new module implements a simple ray-trace algorithm. For
+          each pixel on the screen, a ray is projected back into the
+          view volume, based on the current viewing parameters,
+          returning a data value if the ray intersects the FITS data
+          cube. To determine the value returned, there are 2 methods
+          available, Maximum Intensity Projection (MIP) and Average
+          Intensity Projection (AIP). MIP returns the maximum value
+          encountered, AIP returns an average of all values encountered.
+          At this point, normal DS9 operations are applied, such as
+          scaling, clipping and applying a color map.<br>
+        </p>
+        <p>Rendering time is independent upon the actual data cube size.
+          Instead, the time it takes to render is based on how many rays
+          are needed to project the data cube upon the screen in the
+          view volume and the current zoom factor. The new module
+          requires no special hardware or graphical processor unit (GPU)
+          and the rendering time is adequate for interactive GUI
+          manipulation on most computers. The rendering engine is
+          developed using the POSIX thread library, allowing multiple
+          light weight processes to be spawned to complete an image in
+          parallel. The number of threads actually generated is a user
+          specified parameter. Since all modern hardware contain
+          multiple CPU cores, the default value is 8 threads. For larger
+          work stations, this number can be increase. For every doubling
+          in the number of CPU cores available, rendering times decrease
+          approximately 75%.<br>
+        </p>
+        <p>The new module is support on all hardware platforms currently
+          supported by DS9, including 32-bit and 64-bit versions of
+          Linux and MacOSX, and 32-bit versions of Windows and Solaris.<br>
+        </p>
+        <p>All 2-D graphics, regions, cross hairs, contours, and
+          coordinate grids, are applied to the current slice, which is
+          selected by the user. When the user wishes to match or lock a
+          2-D image and to a 3-D data cube, the current slice is used to
+          determine the rendering solution. The user can crop the data
+          cube for all 3 axes via the command line or the GUI. The new
+          module also supports FITS event files binned into a data cube.<br>
+        </p>
+        <p>All printing support has been extended to the new 3-D module.
+          The user may generate 3-D images in Postscript, JPEG, TIFF,
+          and other formats, just as in the 2-D case. Furthermore,
+          native printing is supported for the Windows version.<br>
+        </p>
+        <p>DS9 analysis macros have been enhanced to fully support the
+          new 3-D module, allowing the user to invoke external analysis
+          tasks based on the current view parameters and to return
+          results back into DS9 in the form of text, plot, 2-D image, or
+          3-D image.<br>
+        </p>
+        <p>Funding for 3-D data visualization was provided by the JWST
+          Mission office at Space Telescope Science Institute
+          (NAS-03127) </p>
+        <p><b>Color Tags</b><br>
+        </p>
+        The purpose of color tags are to highlight (or hide) certain
+        values of data, regardless of the color map selected. The user
+        creates, edits, and deletes color tags via the GUI. To create a
+        color tag, enter the Colorbar Mode, and click once on the
+        colorbar. This creates a default color tag. Click and drag to
+        change the values. Click and drag on one side to increase or
+        decrease the value. Double click to manually edit the values and
+        color. Place the cursor over the color tag and press the delete
+        key to delete it. From the color parameters dialog, the user can
+        load, save, and delete all color tags for that frame.<br>
+        <p><b>Regions<br>
+          </b></p>
+        Regions now support analysis tasks unique to each region type.
+        In the menu of the region dialog, the <tt>Analysis</tt> menu
+        will contain any type specific analysis tasks. The <tt>Circle</tt>,
+        <tt>Ellipse</tt>, <tt>Box</tt>, <tt>Polygon</tt>, and <tt>Point</tt>
+        regions now support interactive 1-D cuts along the 3rd axis of
+        3-D data cubes. The <tt>Line</tt>, <tt>Vector</tt>, and <tt>Projection</tt>
+        regions support 2-D cuts through the current slice of 2-D and
+        3-D data. The <tt>Auto Plot</tt> option under the regions
+        preferences can be used to specify if a plot is automatically
+        generated when the region is created.<br>
+        <p><b>Analysis<br>
+          </b></p>
+        DS9 analysis macros have been enhanced to fully support the new
+        3-D module, allowing the user to invoke external analysis tasks
+        on the current slice of 3-D data cube. The macro <tt>$z</tt> is
+        now supported for 3-D data. In support of <tt>Funtools</tt>,
+        the <tt>PLANE</tt> keyword is supported.<br>
+        <p><b>Slice</b><br>
+        </p>
+        DS9 now allows the user to load a 3-D data cube one slice at a
+        time via the GUI or from the command line. Use the option <tt>-slice
+
+
+        </tt>to specify that all following 2-D files are to be
+        interpreted as a slice of a 3-D data cube.<br>
+        <p><b>Photo</b><br>
+        </p>
+        DS9 can now load images in TIFF, JPEG, and PNG file format
+        directly. When loaded into a <tt>Frame</tt>, the average of the
+        luminosity is used. When loaded into a <tt>Frame RGB</tt>, each
+        channel is loaded directly. Use the <tt>-photo</tt> command
+        line option to specify that all following files are to be
+        interpreted as a photo image.<br>
+        <p><b>Export</b><br>
+        </p>
+        DS9 will export the current image in TIFF, JPEG, or PNG file
+        format with the current colorbar parameters applied. The entire
+        image is exported (not just the visible portion) at the native
+        resolution.<br>
+        <p><b>Lock/Match</b><br>
+        </p>
+        The support for the Lock/Match functionality of DS9 has been
+        greatly enhanced. The user may choose to lock/match frames, the
+        cross hair, cropping, the current slice, binning parameters,
+        scale parameters, or color map parameters.<br>
         <p><b>Crop<br>
           </b></p>
-        DS9 now supports cropping the current image, via the GUI, Crop
-        parameters dialog, and XPA/SAMP. The user may specify a
-        rectanglur region of the image data as a center and width/height
-        in any coordinate system.<br>
+        DS9 now supports cropping the current image, via the GUI,
+        command line, or XPA/SAMP in both 2-D and 3-D. The user may
+        specify a rectangular region of the image data as a center and
+        width/height in any coordinate system via the Crop Dialog, or
+        can interactively select the region of the image to display by
+        clicking and dragging while in Crop Mode. For 3-D frames, the <i>shift-click</i>
+        to change the front clip plane, and <i>control-click</i> to
+        change the back clip plane. From the command line, cropping
+        parameters can be specified in IRAF format.<br>
         <p><b>ASINH Scale<br>
           </b></p>
         A new scale function has been added, <tt>ashinh</tt>, based on
@@ -31,86 +156,64 @@
           </b></p>
         <p>DS9 now supports basic GUI elements (buttons, menus, etc) via
           the native window manager API. Each port of DS9 will have a
-          native look
-          and feel of each hardware platform. DS9 will take advantage of
-          the
-          current user selected <i>Theme </i>if supported by the
-          native
-          windowing system.<br>
+          native look and feel of each hardware platform. DS9 will take
+          advantage of the current user selected <i>Theme </i>if
+          supported by the native windowing system.<br>
         </p>
         <p><b>Postscript</b><b><br>
           </b></p>
         DS9 now generates identical postscript code for a particular
-        image,
-        regardless of which hardware platform was used to generate the
-        image.<br>
+        image, regardless of which hardware platform was used to
+        generate the image.<br>
         <p><b>Catalogs</b><b><br>
           </b></p>
         The user may now specify coordinates in any equatorial system
-        (not just
-        FK5) for a catalog search and receive results in any equatorial
-        system,
-        to be ploted or saved. Local catalogs in any equatorial system
-        are now
-        supported.<br>
+        (not just FK5) for a catalog search and receive results in any
+        equatorial system, to be plotted or saved. Local catalogs in any
+        equatorial system are now supported.<br>
         <p><b>New WCS support</b><br>
         </p>
         <p>New WCS support for non-FITS WCS projections have been added
-          to
-          DS9: TNX, ZPX, SCAMP, SIP, and WCSDEP. In addition, the FITS
-          WCS
-          projection HPX (HealPiX) is also now supported. <br>
+          to DS9: TNX, ZPX, SCAMP, SIP and HEALPIX.  The keyword
+          WCSDEP is now supported.<br>
         </p>
         <p>Enhancements and improvements have been made in the support
-          for
-          the following FITS WCS projections: COD, COO, COE, COP, ZEA,
-          and CAR.<br>
+          for the following FITS WCS projections: COD, COO, COE, COP,
+          ZEA, and CAR.<br>
         </p>
         <p>DS9 now supports non-equatorial long/lat coordinate systems
-          in
-          the form of xLON/xLAT and xyLN/xyLT. This includes solar WCS
-          HPLN/HPLT,
-          HGLN/HGLT, and HRLN/HRLT systems.<br>
+          in the form of xLON/xLAT and xyLN/xyLT. This includes solar
+          WCS HPLN/HPLT, HGLN/HGLT, and HRLN/HRLT systems.<br>
         </p>
-        <p>DS9 now fully supports multiple alternative celestrial WCS,
-          if
+        <p>DS9 now fully supports multiple alternative celestial WCS, if
           specified. All cut/paste/copy operations, catalog, image
-          server,
-          contour, regions, and coordinate grids will now use the
-          default WCS as
-          selected by the user, via the WCS menu item.<br>
+          server, contour, regions, and coordinate grids will now use
+          the default WCS as selected by the user, via the WCS menu
+          item.<br>
         </p>
         <p><b>HEALPIX</b><br>
         </p>
         <p>DS9 now supports native HEALPIX maps, in both FITS binary
-          table
-          and ascii table form. Any table with keyword PIXTYPE=HEALPIX
-          or NSIDE=x
-          will be processed as an HEALPIX image. The user may specify
-          HEALPIX
-          parameters within the file specification to indicate RING
-          (default) or
-          NESTED order, Coordinate System (default is Unknown), 
-          Quadrant
+          table and ascii table form. Any table with keyword
+          PIXTYPE=HEALPIX or NSIDE=x will be processed as an HEALPIX
+          image. The user may specify HEALPIX parameters within the file
+          specification to indicate RING (default) or NESTED order,
+          Coordinate System (default is Unknown),  Quadrant
           (default is first), and Equator (default), North, or South
-          layout. The
-          appropriate WCS is generated for the image.<br>
+          layout. The appropriate WCS is generated for the image.<br>
         </p>
         <p><b>External Analysis</b><b> Files<br>
           </b></p>
         DS9 will now look for external analysis files in the following
-        locations at startup: the current directory, <tt>$HOME/bin,
+        locations at start up: the current directory, <tt>$HOME/bin,
           /usr/local/bin</tt>, <tt>/opt/local/bin,</tt> and <tt>/soft/saord/bin</tt>
         in the form of <tt>*.ds9</tt>. If found, they will be
-        automatically
-        loaded. Users may disable this feature via the presences
-        analysis
-        panel. DS9 will continue to load <tt>ds9.ans</tt> and <tt>ds9.analysis</tt>
-        if found, and users specified analysis files as before. DS9 will
-        verify
-        that the same analysis file is not loaded twice to avoid
-        duplication of
-        analysis menus. </blockquote>
+        automatically loaded. Users may disable this feature via the
+        presences analysis panel. DS9 will continue to load <tt>ds9.ans</tt>
+        and <tt>ds9.analysis</tt> if found, and users specified
+        analysis files as before. DS9 will verify that the same analysis
+        file is not loaded twice to avoid duplication of analysis menus.
+      </blockquote>
       <p><b> For more detailed information, Please see <a
             href="release/r7.0.html">Release Notes</a></b></p>
     </blockquote>
diff --git a/doc/ref/3d.html b/doc/ref/3d.html
index f79a2f5..7be0aa9 100644
--- a/doc/ref/3d.html
+++ b/doc/ref/3d.html
@@ -9,60 +9,72 @@
   </head>
   <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
     vlink="#551a8b">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> 3D Frames<br>
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> 3-D Frames<br>
     </h3>
     <blockquote>
-      <p>3D frames are just like the traditional 2D frames, but allows
-        the user to view a 3D data cube (or even a 2D image) from any
-        angle. The view angle is selected via the 3D dialog or the <tt>3d</tt>
-        command line/xpa commands. Example:<br>
+      <p>Previous versions of SAOImage DS9 would allow users to load 3-D
+        data into the traditional 2-D frames, and would allow users to
+        step through successive z-dimension pixel slices of the data
+        cube. To visualize the 3-D data in DS9 v. 7.0, a new module,
+        encompassed by the new <tt>Frame 3D</tt> option, allows users
+        to load and view data cubes in multiple dimensions.<br>
       </p>
-      <blockquote>
-        <p><tt># create 3d frame, load fits file</tt><tt><br>
-            # set view angle to az 45 el 30 deg</tt><tt><br>
-            # set rendering method to Average Intesity Projection</tt></p>
-        <p><tt> </tt><tt>% ds9 -3d mycube.fits </tt><tt>-3d vp 45 30 </tt><tt>-3d
-
-
-
-            method aip </tt></p>
-        <p><tt> </tt><tt>% xpaset -p ds9 3d<br>
-            % xpaset -p ds9 file mycube.fits</tt><tt><br>
-            % xpaset -p ds9 3d vp 45 30</tt><tt><br>
-            % xpaset -p ds9 3d method aip</tt></p>
-      </blockquote>
-      <p>All 2D graphics, regions, crosshairs, contours, and grids, are
-        applied to the <i>current slice</i>, which is selected via the
-        Cube Dialog. When you match or lock a 2D frame and to a 3D frame
-        based on WCS, the <i>current slice</i> is used to determine the
-        rendering solution.<br>
-      </p>
-      <p>You can crop your cube via the Crop Dialog, or via the GUI. To
-        crop the first spatial 2 axes, click and drag in the <i>current
-          slice</i>. To crop the 3rd axis, <i>shift-click</i> to move
-        the front plane, <i>control-click</i> to move the back plane.</p>
-      <p>Just as in the case of a 2D frame, the new 3D frame also
-        supports 3D binned event files. Create a new 3d frame, load a
-        fits binary event table, and use the Bin Dialog to create a 3d
-        cube, using a third axis such as PHA or TIME.</p>
-      <p>Actual rendering time is based on the size of the image on the
-        screen and not the data size. The rendering engine is threaded
-        and is currently set to 4 threads. If you have more cpu cores,
-        you can set the number of threads in the Preferences Dialog.<br>
-      </p>
-      <p>The actual volume rendering algorithm is a simple ray-trace
-        procedure. For each pixel on the screen, a ray is projected into
-        the view volume, based on the current viewing parameters,
-        returns with a data value if the ray intersects the data cube.
-        To determine the value returned, there are 2 methods available,
+      <p>The new module implements a simple ray-trace algorithm. For
+        each pixel on the screen, a ray is projected back into the view
+        volume, based on the current viewing parameters, returning a
+        data value if the ray intersects the FITS data cube. To
+        determine the value returned, there are 2 methods available,
         Maximum Intensity Projection (MIP) and Average Intensity
         Projection (AIP). MIP returns the maximum value encountered, AIP
         returns an average of all values encountered. At this point,
         normal DS9 operations are applied, such as scaling, clipping and
-        applying a colormap.<br>
+        applying a color map.<br>
       </p>
+      <p>Rendering time is independent upon the actual data cube size.
+        Instead, the time it takes to render is based on how many rays
+        are needed to project the data cube upon the screen in the view
+        volume and the current zoom factor. The new module requires no
+        special hardware or graphical processor unit (GPU) and the
+        rendering time is adequate for interactive GUI manipulation on
+        most computers. The rendering engine is developed using the
+        POSIX thread library, allowing multiple light weight processes
+        to be spawned to complete an image in parallel. The number of
+        threads actually generated is a user specified parameter. Since
+        all modern hardware contain multiple CPU cores, the default
+        value is 8 threads. For larger work stations, this number can be
+        increase. For every doubling in the number of CPU cores
+        available, rendering times decrease approximately 75%.<br>
+      </p>
+      <blockquote><tt>Example:</tt><br>
+        <tt># create 3d frame, load fits file</tt><br>
+        <tt> # set view angle to az 45 el 30 deg</tt><br>
+        <tt> # set rendering method to Average Intensity Projection</tt><br>
+        <br>
+        <tt>% ds9 -3d mycube.fits </tt><tt>-3d vp 45 30 </tt><tt>-3d
+          method aip</tt><br>
+        <br>
+        <tt>% xpaset -p ds9 3d</tt><br>
+        <tt> % xpaset -p ds9 file mycube.fits</tt><br>
+        <tt> % xpaset -p ds9 3d vp 45 30</tt><br>
+        <tt> % xpaset -p ds9 3d method aip</tt></blockquote>
+      <blockquote> </blockquote>
+      All 2-D graphics, regions, cross hairs, contours, and coordinate
+      grids, are applied to the current slice, which is selected by the
+      user. When the user wishes to match or lock a 2-D image and to a
+      3-D data cube, the current slice is used to determine the
+      rendering solution. The user can crop the data cube for all 3 axes
+      via the command line or the GUI. The new module also supports FITS
+      event files binned into a data cube.<br>
+      <br>
+      All printing support has been extended to the new 3-D module. The
+      user may generate 3-D images in Postscript, JPEG, TIFF, and other
+      formats, just as in the 2-D case. Furthermore, native printing is
+      supported for the Windows version.<br>
       <br>
-    </blockquote>
+      DS9 analysis macros have been enhanced to fully support the new
+      3-D module, allowing the user to invoke external analysis tasks
+      based on the current view parameters and to return results back
+      into DS9 in the form of text, plot, 2-D image, or 3-D image. </blockquote>
   </body>
 </html>
diff --git a/doc/ref/backup.html b/doc/ref/backup.html
index 95459f8..63bc304 100644
--- a/doc/ref/backup.html
+++ b/doc/ref/backup.html
@@ -1,71 +1,60 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
   <head>
-    <meta http-equiv="Content-Type"
-	  content="text/html; charset=ISO-8859-1">
-    <meta name="GENERATOR"
-	  content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+    <meta http-equiv="Content-Type" content="text/html;
+      charset=ISO-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+      2.4.7-10 i686) [Netscape]">
     <title>Backup</title>
   </head>
-  <body alink="#ff0000" bgcolor="#ffffff" vlink="#551a8b" text="#000000"
-	link="#0000ee">
-    <h3><img alt="" src="../sun.gif" align="middle" width="100" height="98">
-      Backup and Restore</h3>
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+    vlink="#551a8b">
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> Backup and Restore</h3>
     <blockquote>
-      <p>DS9 now supports Backup and Restore. When a backup is
-	invoked, DS9 will save in a backup save set all files needed to restore
-	DS9
-	to that state, including geometry, data files, colormaps, catalogs,
-	contours, and
-	regions.<br>
+      <p>DS9 now supports Backup and Restore. When a backup is invoked,
+        DS9 will save in a backup save set all files needed to restore
+        DS9 to that state, including geometry, data files, colormaps,
+        catalogs, contours, and regions.<br>
       </p>
       <p><b>Backup Save Set</b></p>
-      <p>A backup save set consists of a text file, called a backup script,
-	and an optional directory, which will contain auxiliary data files
-	needed to restore DS9 to a previous state. The backup file and the
-	auxiliary directory maybe moved across file systems, or even platforms,
-	but must remain together in the same directory. <br>
+      <p>A backup save set consists of a text file, called a backup
+        script, and an optional directory, which will contain auxiliary
+        data files needed to restore DS9 to a previous state. The backup
+        file and the auxiliary directory maybe moved across file
+        systems, or even platforms, but must remain together in the same
+        directory. <br>
       </p>
       <p><b>Image data files</b></p>
-      <p>By default, all data image files are save within the backup save
-	set. However, the user has the option, via the Preferences, to only
-	save only an absolute pathname to the data file, and not the data file
-	itself. This option will dramatically reduce the size of a backup
-	save set, but will restrict the usage to a particular file system and
-	platform.<br>
+      <p>By default, all data image files are save within the backup
+        save set. However, the user has the option, via the Preferences,
+        to only save only an absolute pathname to the data file, and not
+        the data file itself. This option will dramatically reduce the
+        size of a backup save set, but will restrict the usage to a
+        particular file system and platform.<br>
       </p>
-      <p>Image files that have been loaded into DS9 via XPA, SAMP, or from
-	URL will always be saved into the save set.<br>
+      <p>Image files that have been loaded into DS9 via XPA, SAMP, or
+        from URL will always be saved into the save set.<br>
       </p>
       <p><b>Caveats</b></p>
-      <p>There are several caveats in the usage of Backup and Restore. In
-	particular:<br>
+      <p>There are several caveats in the usage of Backup and Restore.
+        In particular:<br>
       </p>
       <blockquote>
-	<p> <tt>Currently, there is no support for masks.<br>
-	    External Analysis
-	    menus will not be saved.<br>
-	    Plot Tool windows will not be saved.<br>
-	    IIS
-	    frames (IRAF) will not be saved.<br>
-	    SAMP and XPA sessions will not be
-	    saved.</tt></p>
+        <p> <tt>Currently, there is no support for masks.<br>
+            External Analysis menus will not be saved.<br>
+            Plot Tool windows will not be saved.<br>
+            IIS frames (IRAF) will not be saved.<br>
+            SAMP and XPA sessions will not be saved.</tt></p>
       </blockquote>
-      <p>In additions, certain complex images which involve multiple load
-	operations will not be saved correctly:<br>
-      </p>
-      <blockquote> <tt>Open Mosaic IRAF Segment<br>
-	  Open Mosaic WCS Segment<br>
-	  Open Multi Ext
-	  Data Cube </tt> </blockquote>
-      <p>And finally, if the image data had been loaded into DS9 via XPA,
-	SAMP,
-	or from a URL, the following complex load operations are not supported:</p>
+      <p>And finally, if the image data had been loaded into DS9 via
+        XPA, SAMP, or from a URL, the following complex load operations
+        are not supported:</p>
       <blockquote> <tt>Open Mosaic IRAF Image<br>
-	  Open Mosaic IRAF Segment Open Mosaic WCS Image<br>
-	  Open Mosaic WCS Segment Open Mosaic WFPC2 Open RGB Fits Image Open RGB
-	  Fits Cube Open RGB Array Open Multi Ext Data Cube Open Multi Ext
-	  Multiple Frames </tt></blockquote>
+          Open Mosaic IRAF Segment Open Mosaic WCS Image<br>
+          Open Mosaic WCS Segment Open Mosaic WFPC2 Open RGB Fits Image
+          Open RGB Fits Cube Open RGB Array Open Multi Ext Data Cube
+          Open Multi Ext Multiple Frames </tt></blockquote>
     </blockquote>
   </body>
 </html>
diff --git a/doc/ref/catalog.html b/doc/ref/catalog.html
index 2e39788..bada9dd 100644
--- a/doc/ref/catalog.html
+++ b/doc/ref/catalog.html
@@ -1,130 +1,133 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
   <head>
-    <meta http-equiv="Content-Type"
-	  content="text/html; charset=ISO-8859-1">
-    <meta name="GENERATOR"
-	  content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+    <meta http-equiv="Content-Type" content="text/html;
+      charset=ISO-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+      2.4.7-10 i686) [Netscape]">
     <title>Catalogs</title>
   </head>
-  <body link="#0000ee" text="#000000" vlink="#551a8b" alink="#ff0000"
-	bgcolor="#ffffff">
-    <h3><img alt="" src="../sun.gif" height="98" width="100" align="middle">
-      Catalogs</h3>
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+    vlink="#551a8b">
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> Catalogs</h3>
     <blockquote>
-      <p>DS9 provides full support for loading, displaying, filtering, and
-	saving catalogs. DS9 allows you to overlay symbols from multiple
-	catalogs on the
-	current image.</p>
-      <p>Local and on-line catalog access is supported. Most major catalogs
-	can be retrieved from online
-	servers. Both the CDS and SDSS catalog servers are now supported. Local
-	catalog
-	files in starbase (rdb) or CSV (with or without header) are supported.</p>
-      <p>On-line catalogs are available via services provided by the VizieR
-	catalog access tool, CDS, Strasbourg, France (VizieR is a joint effort
-	of the Centre de Données Astronomiques de Strasbourg and
-	ESA-ESRIN Information Systems Division) and by the Sloan Digital Sky
-	Survey.</p>
-      <p>A selection of popular catalogs is provided in the Analysis menu.
-	In addition, you can search for other catalogs based on title,
-	keywords, mission, wavelength, and object type.</p>
+      <p>DS9 provides full support for loading, displaying, filtering,
+        and saving catalogs. DS9 allows you to overlay symbols from
+        multiple catalogs on the current image.</p>
+      <p>Local and on-line catalog access is supported. Most major
+        catalogs can be retrieved from online servers. Both the CDS and
+        SDSS catalog servers are now supported. Local catalog files in
+        starbase (rdb) or CSV (with or without header) are supported.</p>
+      <p>On-line catalogs are available via services provided by the
+        VizieR catalog access tool, CDS, Strasbourg, France (VizieR is a
+        joint effort of the Centre de Donnees Astronomiques de
+        Strasbourg and ESA-ESRIN Information Systems Division) and by
+        the Sloan Digital Sky Survey.</p>
+      <p>A selection of popular catalogs is provided in the Analysis
+        menu. In addition, you can search for other catalogs based on
+        title, keywords, mission, wavelength, and object type.</p>
       <p>When a catalog is overlayed on an image, each displayed catalog
-	symbol consists of a shape, color, and text. An advanced symbol editor
-	is available that allows you to specify the shape, size, color, and
-	text of each symbol, based on catalog column values. These symbol
-	expressions can be saved for future use.</p>
+        symbol consists of a shape, color, and text. An advanced symbol
+        editor is available that allows you to specify the shape, size,
+        color, and text of each symbol, based on catalog column values.
+        These symbol expressions can be saved for future use.</p>
       <p>Along with the overlay display, a catalog list is provided in a
-	separate window. It displays the column values for each catalog object.
-	The catalog list can be sorted and filtered, and the catalog display
-	will be automatically updated. Advanced filtering options are
-	available. Catalogs can be loaded and saved as local files in ASCII
-	Starbase format. Each catalog contains header information which can be
-	displayed. The list can be printed separately from the image.</p>
+        separate window. It displays the column values for each catalog
+        object. The catalog list can be sorted and filtered, and the
+        catalog display will be automatically updated. Advanced
+        filtering options are available. Catalogs can be loaded and
+        saved as local files in ASCII Starbase format. Each catalog
+        contains header information which can be displayed. The list can
+        be printed separately from the image.</p>
       <p>An interactive connection between the displayed catalog symbols
-	and the catalog list is provided. When you select one or more rows
-	within the catalog list, the corresponding symbols are highlighted on
-	the image display. Conversely, selecting multiple symbols on the image
-	display will highlight the corresponding rows within the catalog list.
-	Catalog symbols can be converted to regions for use with analysis tasks.</p>
+        and the catalog list is provided. When you select one or more
+        rows within the catalog list, the corresponding symbols are
+        highlighted on the image display. Conversely, selecting multiple
+        symbols on the image display will highlight the corresponding
+        rows within the catalog list. Catalog symbols can be converted
+        to regions for use with analysis tasks.</p>
       <p><b>Filter Option</b></p>
       <p>The catalog list can be sorted and filtered, and the catalog
-	display
-	will be automatically updated. A filter is conditional expression, when
-	evaluated for each row of the catalog, if true, the row is displayed,
-	and if false, the row is not displayed. The conditional expression can
-	be any valid TCL expression. The value of a column may be indicated
-	with <tt>$<column name></tt>.</p>
-      <blockquote>
-	<tt>$_RAJ2000>180. && $_RAJ2000<270.</tt><br>
-	<tt>$Jmag>11</tt><br>
-	<tt>log($Kmag*10)<.3</tt>
-      </blockquote>
+        display will be automatically updated. A filter is conditional
+        expression, when evaluated for each row of the catalog, if true,
+        the row is displayed, and if false, the row is not displayed.
+        The conditional expression can be any valid TCL expression. The
+        value of a column may be indicated with <tt>$<column
+          name></tt>.</p>
+      <blockquote> <tt>$_RAJ2000>180. && $_RAJ2000<270.</tt><br>
+        <tt>$Jmag>11</tt><br>
+        <tt>log($Kmag*10)<.3</tt> </blockquote>
       <p><b>Advanced Symbol Editor</b></p>
-      <p>An advanced symbol editor is available that allows you to specify
-	the
-	shape, size, color, and text of each symbol, based on catalog column
-	values. For each row of the catalog, one or more conditional
-	expressions are evaluated. For the first expression to evaluate true, a
-	given symbol is displayed, with the specified shape, color, size and
-	text properties. As with the filter, the value of a particular column
-	can be indicated as <tt>$<column name>.</tt></p>
+      <p>An advanced symbol editor is available that allows you to
+        specify the shape, size, color, and text of each symbol, based
+        on catalog column values. For each row of the catalog, one or
+        more conditional expressions are evaluated. For the first
+        expression to evaluate true, a given symbol is displayed, with
+        the specified shape, color, size and text properties. As with
+        the filter, the value of a particular column can be indicated as
+        <tt>$<column name>.</tt></p>
       <p>For the condition entry, the expression you type in is
-	automatically evaluated via TCL <tt>expr</tt> after macro expansion.</p>
-      <blockquote>
-	<tt>1                               #
-	  always</tt><br>
-	<tt>0                               #
-	  never</tt><br>
-	<tt>true                            #
-	  always</tt><br>
-	<tt>false                           #
-	  never</tt><br>
-	<tt>$Jmag>2                         #
-	  conditional</tt><br>
-	<tt>sin($Jmag)>.5
-	                   
-	  #
-	  conditional</tt><br>
-	<tt>[string equal $Class
-	  SNR]       # conditional</tt><br>
-	<tt>[regexp {*SNR*}
-	  $Class]         #
-	  conditional</tt><br>
+        automatically evaluated via TCL <tt>expr</tt> after macro
+        expansion.</p>
+      <blockquote> <tt>1                               #
+
+          always</tt><br>
+        <tt>0                               #
+
+          never</tt><br>
+        <tt>true                            #
+
+          always</tt><br>
+        <tt>false                           #
+
+          never</tt><br>
+        <tt>$Jmag>2                         #
+
+          conditional</tt><br>
+        <tt>sin($Jmag)>.5
+                           
+
+          # conditional</tt><br>
+        <tt>[string equal $Class
+          SNR]       # conditional</tt><br>
+        <tt>[regexp {*SNR*}
+          $Class]         #
+          conditional</tt><br>
       </blockquote>
-      <p>For the size, size2, and angle entries, the
-	expression you type in is also automatically evaluated via TCL <tt>expr</tt>
-	after macro expansion.</p>
-      <blockquote>
-	<tt>2               #
-	  value
-	  of '2' is used</tt><br>
-	<tt>$Jmag           #
-	  value
-	  of column Jmag is used</tt><br>
-	<tt>$Jmag/2.        # value
-	  of column Jmag div 2 is used</tt><br>
-	<tt>(4+2)/3         #
-	  value of '2' is used</tt><br>
+      <p>For the size, size2, and angle entries, the expression you type
+        in is also automatically evaluated via TCL <tt>expr</tt> after
+        macro expansion.</p>
+      <blockquote> <tt>2               #
+
+          value of '2' is used</tt><br>
+        <tt>$Jmag           #
+
+          value of column Jmag is used</tt><br>
+        <tt>$Jmag/2.        #
+          value of column Jmag div 2 is used</tt><br>
+        <tt>(4+2)/3         #
+
+          value of '2' is used</tt><br>
       </blockquote>
       <p>For the text portion, this is not true. It is assumed to be
-	text, unless you explicitly use an <tt>expr </tt>operator.</p>
-      <blockquote>
-	<tt>foo             #
-	  will
-	  put 'foo' above the symbol</tt><br>
-	<tt>$Jmag           #
-	  will
-	  put the value of column Jmag above the symbol</tt><br>
-	<tt>(4+2)/3         #
-	  will put the text '(4+2)/3' above the symbol</tt><br>
-	<tt>[expr (4+2)/3]  # will put the text '2' above the
-	  symbol</tt><br>
-	<tt>[expr $Jmag/2.] # will take the value of Jmag and div by 2</tt><br>
+        text, unless you explicitly use an <tt>expr </tt>operator.</p>
+      <blockquote> <tt>foo             #
+
+          will put 'foo' above the symbol</tt><br>
+        <tt>$Jmag           #
+
+          will put the value of column Jmag above the symbol</tt><br>
+        <tt>(4+2)/3         #
+
+          will put the text '(4+2)/3' above the symbol</tt><br>
+        <tt>[expr (4+2)/3]  # will put the text '2' above the
+          symbol</tt><br>
+        <tt>[expr $Jmag/2.] # will take the value of Jmag and div
+          by 2</tt><br>
       </blockquote>
-      <p>And finally, one special case for shape = text and text
-	= empty. In this case, the row number is displayed. </p>
-        
-    </blockquote>
+      <p>And finally, one special case for shape = text and text =
+        empty. In this case, the row number is displayed. </p>
+        </blockquote>
   </body>
 </html>
diff --git a/doc/ref/color.html b/doc/ref/color.html
deleted file mode 100644
index 2388fec..0000000
--- a/doc/ref/color.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-  <head>
-    <meta http-equiv="Content-Type"
-	  content="text/html; charset=ISO-8859-1">
-    <meta name="GENERATOR"
-	  content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
-    <title>Color</title>
-  </head>
-  <body alink="#ff0000" bgcolor="#ffffff" vlink="#551a8b" text="#000000"
-	link="#0000ee">
-    <h3><img alt="" src="../sun.gif" align="middle" width="100" height="98">
-      Color</h3>
-    <blockquote>
-      <p>DS9 supports a number of color environments. Not all color
-	environments, or visuals, are available on most machines. In fact, you
-	may be restricted to one or two, base on the color graphics hardware
-	your computer has. A color visual is composed of two parts, the color
-	model and the bit depth. Pseudo color uses a color lookup table to
-	derive the correct color, True color uses the value directly as a RGB
-	triplet, to derive the correct color. The follow is a list of the color
-	visuals DS9 currently supports:</p>
-      <blockquote> <tt>pseudo color, 8 bit<br>
-	  true color, 8 bit
-	  <br>
-	  true color, 15 bit <br>
-	  true color, 16 bit
-	  <br>
-	  true color, 24 bit</tt>
-      </blockquote>
-      <p> You can use the <tt>xdpyinfo</tt> command to see if one of these
-	visual are available. NOTE: Linux Users-- if your desired visual is not
-	available, use the Xconfigarator command (Red Hat) or similar
-	command under other versions of linux, to configure your X window
-	visuals.</p>
-      <p>When DS9 is invoked, by default, it will use the default visual.
-	You can find out what the default visual is by using the <tt>xdpyinfo</tt>
-	command. You can also force DS9 to use another visual by command line
-	option.
-	If you specify a visual, and it is not available, DS9 will exit with an
-	error message. </p>
-      <blockquote><tt>$ds9                     
-	  #
-	  default visual, default depth<br>
-	  $ds9 -visual pseudo       #
-	  pseudo color, default depth <br>
-	  $ds9 -visual pseudocolor  # pseudo color, default depth <br>
-	  $ds9 -visual pseudocolor8 # pseudo color 8 <br>
-	  $ds9 -visual
-	  true         # true color,
-	  default depth <br>
-	  $ds9 -visual truecolor    # true color, default
-	  depth <br>
-	  $ds9 -visual truecolor8   # true color 8 <br>
-	  $ds9 -visual truecolor16  # true color 16 <br>
-	  $ds9 -visual truecolor24  # true color 24</tt> </blockquote>
-    </blockquote>
-  </body>
-</html>
diff --git a/doc/ref/colorbar.html b/doc/ref/colorbar.html
new file mode 100644
index 0000000..ee432cd
--- /dev/null
+++ b/doc/ref/colorbar.html
@@ -0,0 +1,71 @@
+<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;
+      charset=ISO-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+      2.4.7-10 i686) [Netscape]">
+    <title>Color</title>
+  </head>
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+    vlink="#551a8b">
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> Colorbar<br>
+    </h3>
+    <blockquote>
+      <p><b>Color Tags</b></p>
+      <p>The purpose of color tags are to highlight (or hide) certain
+        values of data, regardless of the color map selected. The user
+        creates, edits, and deletes color tags via the GUI. To create a
+        color tag, enter the Colorbar Mode, and click once on the
+        colorbar. This creates a default color tag. Click and drag to
+        change the values. Click and drag on one side to increase or
+        decrease the value. Double click to manually edit the values and
+        color. Place the cursor over the color tag and press the delete
+        key to delete it. From the color parameters dialog, the user can
+        load, save, and delete all color tags for that frame.<br>
+      </p>
+      <p><b>Visuals</b></p>
+      <p>DS9 supports a number of color environments. Not all color
+        environments, or visuals, are available on most machines. In
+        fact, you may be restricted to one or two, base on the color
+        graphics hardware your computer has. A color visual is composed
+        of two parts, the color model and the bit depth. Pseudo color
+        uses a color lookup table to derive the correct color, True
+        color uses the value directly as a RGB triplet, to derive the
+        correct color. The follow is a list of the color visuals DS9
+        currently supports:</p>
+      <blockquote> <tt>pseudo color, 8 bit<br>
+          true color, 8 bit <br>
+          true color, 15 bit <br>
+          true color, 16 bit <br>
+          true color, 24 bit</tt> </blockquote>
+      <p> You can use the <tt>xdpyinfo</tt> command to see if one of
+        these visual are available. NOTE: Linux Users-- if your desired
+        visual is not available, use the Xconfigarator command (Red Hat)
+        or similar command under other versions of linux, to configure
+        your X window visuals.</p>
+      <p>When DS9 is invoked, by default, it will use the default
+        visual. You can find out what the default visual is by using the
+        <tt>xdpyinfo</tt> command. You can also force DS9 to use another
+        visual by command line option. If you specify a visual, and it
+        is not available, DS9 will exit with an error message. </p>
+      <blockquote><tt>$ds9                     
+
+
+          # default visual, default depth<br>
+          $ds9 -visual pseudo       #
+          pseudo color, default depth <br>
+          $ds9 -visual pseudocolor  # pseudo color, default depth <br>
+          $ds9 -visual pseudocolor8 # pseudo color 8 <br>
+          $ds9 -visual
+          true         # true
+          color, default depth <br>
+          $ds9 -visual truecolor    # true color, default
+          depth <br>
+          $ds9 -visual truecolor8   # true color 8 <br>
+          $ds9 -visual truecolor16  # true color 16 <br>
+          $ds9 -visual truecolor24  # true color 24</tt> </blockquote>
+    </blockquote>
+  </body>
+</html>
diff --git a/doc/ref/file.html b/doc/ref/file.html
index f2e88ce..ae27afb 100644
--- a/doc/ref/file.html
+++ b/doc/ref/file.html
@@ -9,8 +9,8 @@
   </head>
   <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
     vlink="#551a8b">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> File Formats</h3>
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> File Formats</h3>
     <blockquote> <a href="#FITS">FITS</a><br>
       <a href="#FITSImage">FITS Image</a><br>
       <a href="#FITSTable">FITS Table</a><br>
@@ -25,6 +25,7 @@
       <a href="#FITSMosaicDataCube">FITS Mosaic Data Cube</a><br>
       <a href="#FITSRGB">FITS RGB </a><br>
       <a href="#SplitFITS">Split FITS</a><br>
+      <a href="#photo">Photo</a><br>
       <a href="#DataArray">Data Array</a> <br>
       <a href="#ExternalFileSupport">External Format Support</a> <br>
       <a href="#ExternalAnalysisSupport">External Analysis Support</a> <br>
@@ -35,9 +36,9 @@
       <a href="#StartupFile">Startup File</a> <br>
       <a href="#TCL">TCL</a><br>
       <p><b><a name="FITS"></a>FITS</b></p>
-      <p>DS9 supports FITS images and FITS binary tables. The following
-        algorithm is used to locate and to load the FITS image or table
-        if no additional information is provide: </p>
+      DS9 supports FITS images and FITS binary tables. The following
+      algorithm is used to locate and to load the FITS image or table if
+      no additional information is provide:
       <blockquote> <tt> Look for FITS image in primary HDU. <br>
           If no image is found, examine each extension HDU<br>
           If image, load <br>
@@ -47,12 +48,9 @@
               column names X and Y are present<br>
           If DS9 traverses the entire FITS file without satisfying one
           of the above, an error is generated.</tt> </blockquote>
-      <p>FITS keyword inheritance is supported. All valid FITS <tt>BITPIX</tt>
-        values are supported, along with <tt>-16,</tt> for <tt>UNSIGNED
-
-
-
-          SHORT</tt>. The following FITS keywords are supported: </p>
+      FITS keyword inheritance is supported. All valid FITS <tt>BITPIX</tt>
+      values are supported, along with <tt>-16,</tt> for <tt>UNSIGNED
+        SHORT</tt>. The following FITS keywords are supported:
       <blockquote> <tt> OBJECT<br>
           BSCALE / BZERO<br>
           BLANK<br>
@@ -63,45 +61,38 @@
           WCS keywords<br>
           WCS# keywords </tt> </blockquote>
       <p><b> <a name="FITSImage"></a>FITS Image</b></p>
-      <p>At load time, the user may provide just a filename or a
-        filename along with FITS extension name/number and image section
-        specification. FITS extension names are case insensitive. When
-        specifying an extention, be sure to quote strings correctly to
-        pass both the shell and DS9 parser. A image section
-        specification is used to specify the x,y limits of an image
-        subsection. By default, numerics are in <tt>IMAGE</tt>
-        coordinates, use a <tt>'p'</tt> to indicate <tt>PHYSICAL</tt>
-        coordinates. A <tt>'*'</tt> indicates use the default for that
-        axis only.<br>
-      </p>
+      At load time, the user may provide just a filename or a filename
+      along with FITS extension name/number and image section
+      specification. FITS extension names are case insensitive. When
+      specifying an extention, be sure to quote strings correctly to
+      pass both the shell and DS9 parser. A image section specification
+      is used to specify the x,y limits of an image subsection. By
+      default, numerics are in <tt>IMAGE</tt> coordinates, use a <tt>'p'</tt>
+      to indicate <tt>PHYSICAL</tt> coordinates. A <tt>'*'</tt>
+      indicates use the default for that axis only.<br>
       <blockquote> <tt> Syntax:<br>
           filename<br>
           filename[<name>|#]<br>
-          <br>
           filename[xmin:xmax,ymin:ymax[p]]<br>
           filename[*,ymin:ymax[p]]<br>
           filename[xmin:xmax,*[p]]<br>
           filename[xdim at xcenter,ydim at ycenter[p]]<br>
           filename[dim at xcenter@ycenter[p]]<br>
-          <br>
         </tt><tt>filename[xmin:xmax,ymin:ymax,zmin:zmax]</tt><br>
         <tt> filename[*,ymin:ymax,zmin:zmax]<br>
           filename[xmin:xmax,*,zmin:zmax]<br>
         </tt><tt>filename[xmin:xmax,ymin:ymax,*]</tt><br>
         <tt> filename[xdim at xcenter,ydim at ycenter,zdim at zcenter]<br>
-          filename[dim at xcenter@ycenter at zcenter]</tt><br>
-        <tt> <br>
+          filename[dim at xcenter@ycenter at zcenter]</tt><tt><br>
           Example:<br>
           $ds9 foo.fits # default load <br>
           $ds9 foo.fits[1] # load first extension<br>
           $ds9 foo.fits[BCKGRD] # load extension named 'BCKGRD'<br>
-          <br>
           $ds9 foo.fits[10:200,40:100] # image section<br>
           $ds9 foo.fits[*,40:100] # only section y axis<br>
           $ds9 foo.fits[256 at 512@512] # section box at 512,512<br>
           $ds9 foo.fits[2][100:200,100:200] # second extension, image
           section<br>
-          <br>
         </tt><tt>$ds9 foo.fits[10:200,40:100,5:20] # cube section<br>
           $ds9 foo.fits[*,40:100,5:20] # only section y and z axes<br>
           $ds9 foo.fits[256 at 512@512 at 512] # section cube at 512,512<br>
@@ -109,50 +100,46 @@
           cube section</tt><br>
       </blockquote>
       <p><b> <a name="FITSTable"></a>FITS Table</b></p>
-      <p>At load time, the user may provide just a filename or a
-        filename along with FITS extension name or number and file
-        parameters. FITS extension names and parameters are case
-        insensitive.<br>
-      </p>
+      At load time, the user may provide just a filename or a filename
+      along with FITS extension name or number and file parameters. FITS
+      extension names and parameters are case insensitive.<br>
       <blockquote> <tt> Syntax: <br>
           filename <br>
           filename[ext] <br>
           filename[params] <br>
           filename[ext][params] <br>
           filename[ext,params] <br>
-          <br>
           where ext = [<extension name> | <extension #>]</tt><br>
       </blockquote>
       <p><b> <a name="FITSBinaryEventsTable"></a>FITS Binary Events
           Table<br>
         </b></p>
-      <p>DS9 will automatically convert an FITS binary events table into
-        a 2D image for display. The users may specify a number of
-        parameters on how to construct the image and how to filter data.
-        When specifying a filter, be sure to quote strings correctly to
-        pass both the shell and DS9 parser.</p>
-    </blockquote>
+      DS9 will automatically convert an FITS binary events table into a
+      2D image for display. The users may specify a number of parameters
+      on how to construct the image and how to filter data. When
+      specifying a filter, be sure to quote strings correctly to pass
+      both the shell and DS9 parser. </blockquote>
     <blockquote>
-      <blockquote>
-        <p><tt>Syntax: <br>
-            filename[ext,params]</tt></p>
-        <p><tt>where params:<br>
-            <br>
-            [bin=colx,coly] # bin counts <br>
-            [bin colx,coly] # bin counts <br>
-            [bin=colx,coly,colz] # bin on colz <br>
-            [bin colx,coly,colz] # bin on colz <br>
-            [bin=colz] # bin cols 'x', 'y', and colz <br>
-            [key=colx,coly] <br>
-            [binkey=colx,coly]<br>
-            [<filter>]<br>
-          </tt></p>
-        <p>(see <a
-            href="http://hea-www.harvard.edu/saord/funtools/filters.html">Introduction
+      <blockquote> <tt>Syntax: <br>
+          filename[ext,params]</tt> <br>
+        <tt>where params:<br>
+          [bin=colx,coly] # bin counts <br>
+          [bin colx,coly] # bin counts <br>
+          [bin=colx,coly,colz] # bin on colz <br>
+          [bin colx,coly,colz] # bin on colz <br>
+          [bin=colz] # bin cols 'x', 'y', and colz <br>
+          [key=colx,coly] <br>
+          [binkey=colx,coly]<br>
+          [<filter>]<br>
+        </tt><br>
+        (see <a
+          href="http://hea-www.harvard.edu/saord/funtools/filters.html">Introduction
 
 
 
-            to Filtering</a>)</p>
+
+          to Filtering</a>)<br>
+        <br>
         <tt>Example: </tt><br>
         <tt> $ds9 foo.fits # default load </tt><br>
         <tt> $ds9 foo.fits[1] # load first extension </tt><br>
@@ -180,68 +167,64 @@
         </tt></blockquote>
       <p><b> <a name="FITSHEALPIXTable"></a>FITS HEALPIX Table<br>
         </b></p>
-      <p>DS9 will automatically convert an FITS HEALPIX binary or ascii
-        table into a 2D image for display. The users may specify a
-        number of parameters on how to construct the image. Any table
-        with keyword PIXTYPE=HEALPIX or NSIDE=x will be processed as an
-        HEALPIX image. The following FITS keywords will be used if
-        present and not overwritten by a command line option: NSIDE,
-        COORDSYS, ORDER.<br>
-      </p>
+      DS9 will automatically convert an FITS HEALPIX binary or ascii
+      table into a 2D image for display. The users may specify a number
+      of parameters on how to construct the image. Any table with
+      keyword PIXTYPE=HEALPIX or NSIDE=x will be processed as an HEALPIX
+      image. The following FITS keywords will be used if present and not
+      overwritten by a command line option: NSIDE, COORDSYS, ORDER.<br>
       <blockquote>
         <blockquote> </blockquote>
-        <p><tt>Syntax: <br>
-            filename[ext,params]</tt></p>
-        <p><tt>where params:<br>
-          </tt></p>
-        <p><tt>[order=ring|nested] # default ring<br>
-            [layout=equatorial|north|south] # default equatorial<br>
-            [col=<column number>] # defaut 1<br>
-            [quad=<quadurant number>] # (1-4) default 1<br>
-            [system=equatorial|galactic|ecliptic|unknown] # default
-            unknown</tt><br>
-        </p>
-        <p><tt>Example: </tt><tt><br>
-            $ds9 foo.fits # default load </tt><tt><br>
-            $ds9 foo.fits[1] # load first extension </tt><tt><br>
-            $ds9
-            foo.fits[order=ring,layout=equatorial,col=1,quad=1,system=unknown]<br>
-          </tt><tt>$ds9 foo.fits[1,order=nested] # first extension,
-            nested order</tt><br>
-        </p>
+        <tt>Syntax: <br>
+          filename[ext,params]</tt> <br>
+        <tt>where params:</tt><br>
+        <tt>[order=ring|nested] # default ring<br>
+          [layout=equatorial|north|south] # default equatorial<br>
+          [col=<column number>] # defaut 1<br>
+          [quad=<quadurant number>] # (1-4) default 1<br>
+          [system=equatorial|galactic|ecliptic|unknown] # default
+          unknown</tt><br>
+        <tt>Example: </tt><tt><br>
+          $ds9 foo.fits # default load </tt><tt><br>
+          $ds9 foo.fits[1] # load first extension </tt><tt><br>
+          $ds9
+          foo.fits[order=ring,layout=equatorial,col=1,quad=1,system=unknown]<br>
+        </tt><tt>$ds9 foo.fits[1,order=nested] # first extension, nested
+          order</tt><br>
       </blockquote>
       <blockquote> </blockquote>
       <p><b><a name="FITSDataCube"></a>FITS Cube</b></p>
-      <p>A FITS Cube is a FITS image which contains more than 2 axes
-        (NAXES>2). DS9 will automatically detect if a cube is present
-        and will load all additional images. In addition, individual
-        images can be loaded one at a time into a cube. DS9 will display
-        the Cube dialog box which allows the user to select which 2
-        image to be displayed.</p>
+      A FITS Cube is a FITS image which contains more than 2 axes
+      (NAXES>2). DS9 will automatically detect if a cube is present
+      and will load all additional images. In addition, individual
+      images can be loaded one at a time into a cube. DS9 will display
+      the Cube dialog box which allows the user to select which 2 image
+      to be displayed.
       <p><b><a name="FITSMultipleExtensionDataCube"></a>FITS Multiple
           Extension Cube</b></p>
-      <p>A FITS Multiple Extension Data Cube file is a FITS file with
-        one or more extensions, that is to be displayed as a data cube.
-        Each image does not have to be the same size, however, only the
-        coordinate systems from the first extension will be used for
-        contours and grids. </p>
-      <tt> Example:</tt><br>
-      <tt> $ds9 -medatacube foo.fits # load multiple extension fits file
-        as data cube</tt>
+      A FITS Multiple Extension Data Cube file is a FITS file with one
+      or more extensions, that is to be displayed as a data cube. Each
+      image does not have to be the same size, however, only the
+      coordinate systems from the first extension will be used for
+      contours and grids. <br>
+      <blockquote><tt> Example:</tt><br>
+        <tt> $ds9 -medatacube foo.fits # load multiple extension fits
+          file as data cube</tt></blockquote>
       <p><b><a name="FITSMultipleExtensionMultipleFrames"></a>FITS
           Multiple Extension Multiple Frames</b></p>
-      <p>Load a multiple extension FITS file into multiple frames.
-        Please note that files loaded via standard-in or the xpa fits
-        command can not be displayed using this method. </p>
-      <tt> Example:</tt><br>
-      <tt> $ds9 -multiframe foo.fits # load multiple extension fits file
-        as multiple frames</tt>
+      Load a multiple extension FITS file into multiple frames. Please
+      note that files loaded via standard-in or the xpa fits command can
+      not be displayed using this method. <br>
+      <blockquote><tt> Example:</tt><br>
+        <tt> $ds9 -multiframe foo.fits # load multiple extension fits
+          file as multiple frames</tt></blockquote>
       <p><b><a name="FITSMosaic"></a>FITS Mosaic</b></p>
-      <p>A FITS mosaic image may exist as a series of FITS files, or as
-        one FITS file with many extensions. A FITS mosaic may be loaded
-        all a one time, or by the segment. Once loaded, the multiple
-        FITS images are treated as one FITS image. </p>
-      <p align="left">DS9 supports three forms of mosaics: </p>
+      A FITS mosaic image may exist as a series of FITS files, or as one
+      FITS file with many extensions. A FITS mosaic may be loaded all a
+      one time, or by the segment. Once loaded, the multiple FITS images
+      are treated as one FITS image. <br>
+      <br>
+      DS9 supports three forms of mosaics: 
       <center>
         <table align="center" border="1" cellpadding="2" cellspacing="2"
           width="50%">
@@ -260,6 +243,7 @@ Data
 
 
 
+
                     Structures</a></tt> <br>
               </td>
             </tr>
@@ -280,54 +264,61 @@ Data
           </tbody>
         </table>
       </center>
-      <tt>Example:<br>
-        $ds9 -mosaicimageiraf foo.fits # load mosaic iraf from one fits
-        file with multiple exts<br>
-        $ds9 -mosaiciraf foo.fits bar.fits wow.fits # load mosaic iraf
-        from 3 files<br>
-        $ds9 -mosaicimagewcs foo.fits # load mosaic wcs from one fits
-        file with multiple exts<br>
-        $ds9 -mosaicimagenext wcs foo.fits # load mosaic wcs from one
-        fits file with multiple exts<br>
-        $ds9 -mosaicwcs foo.fits bar.fits wow.fits # load mosaic wcs
-        from 3 files<br>
-        $ds9 -mosaicimagewfpc2 bar.fits # load wfpc2 mosaic<br>
-        $ds9 -mosaic foo.fits bar.fits wow.fits # load mosaic (iraf or
-        wcs) from 3 files<br>
-      </tt>
+      <tt></tt>
+      <blockquote><tt>Example:</tt><br>
+        <tt> $ds9 -mosaicimageiraf foo.fits # load mosaic iraf from one
+          fits file with multiple exts</tt><br>
+        <tt> $ds9 -mosaiciraf foo.fits bar.fits wow.fits # load mosaic
+          iraf from 3 files</tt><br>
+        <tt> $ds9 -mosaicimagewcs foo.fits # load mosaic wcs from one
+          fits file with multiple exts</tt><br>
+        <tt> $ds9 -mosaicimagenext wcs foo.fits # load mosaic wcs from
+          one fits file with multiple exts</tt><br>
+        <tt> $ds9 -mosaicwcs foo.fits bar.fits wow.fits # load mosaic
+          wcs from 3 files</tt><br>
+        <tt> $ds9 -mosaicimagewfpc2 bar.fits # load wfpc2 mosaic</tt><br>
+        <tt> $ds9 -mosaic foo.fits bar.fits wow.fits # load mosaic (iraf
+          or wcs) from 3 files</tt><br>
+        <tt> </tt></blockquote>
       <p><b><a name="FITSMosaicDataCube"></a>FITS Mosaic Data Cube</b></p>
-      <p>A FITS Mosaic Data Cube is a FITS mosaic image which contains
-        more than 2 axes (NAXES>2). DS9 will automatically detect if
-        a mosaic data cube is present and will load all additional
-        images. At the same time, DS9 will display the DataCube dialog
-        box which allows the user to select which 2 image to be
-        displayed.</p>
+      A FITS Mosaic Data Cube is a FITS mosaic image which contains more
+      than 2 axes (NAXES>2). DS9 will automatically detect if a
+      mosaic data cube is present and will load all additional images.
+      At the same time, DS9 will display the DataCube dialog box which
+      allows the user to select which 2 image to be displayed.
       <p><b><a name="FITSRGB"></a>FITS RGB</b></p>
-      <p>A FITS RGB image may exist as three of FITS images, one FITS
-        file with three extensions, or as a FITS 3D Data cube, with
-        three slices, each representing the red, green, and blue
-        channel. A FITS RGB image may be loaded all a one time, or by
-        the channel. Once loaded, the multiple FITS images are treated
-        as one FITS image.</p>
-      <tt> Example:<br>
-        $ds9 -rgbimage rgb.fits # load rgb image consisting of one fits
-        file with 3 image exts<br>
-        $ds9 -rgbcube cube.fits # load rgb image consisting of one fits
-        data cube<br>
-        $ds9 -rgb -red foo.fits -green bar.fits -blue wow.fits # rgb
-        image from 3 fits images<br>
-      </tt>
+      A FITS RGB image may exist as three of FITS images, one FITS file
+      with three extensions, or as a FITS 3D Data cube, with three
+      slices, each representing the red, green, and blue channel. A FITS
+      RGB image may be loaded all a one time, or by the channel. Once
+      loaded, the multiple FITS images are treated as one FITS image.<br>
+      <blockquote><tt>Example:</tt><br>
+        <tt> $ds9 -rgbimage rgb.fits # load rgb image consisting of one
+          fits file with 3 image exts</tt><br>
+        <tt> $ds9 -rgbcube cube.fits # load rgb image consisting of one
+          fits data cube</tt><br>
+        <tt> $ds9 -rgb -red foo.fits -green bar.fits -blue wow.fits #
+          rgb image from 3 fits images</tt><br>
+        <tt> </tt></blockquote>
       <p><b><a name="SplitFITS"></a>Split FITS</b></p>
-      <p>A split fits is a valid fits file in which two files contain
-        the header and data segments.</p>
+      A split fits is a valid fits file in which two files contain the
+      header and data segments.
+      <p><b><a name="photo"></a>Photo</b><br>
+      </p>
+      Images in TIFF, JPEG, and PNG are supported directly. For a <tt>Frame</tt>,
+      the average of the luminosity is used. For <tt>Frame RGB</tt>,
+      each channel is loaded directly.<br>
+      <blockquote><tt>Example:</tt><br>
+        <tt>$ ds9 -photo foo.tiff</tt><br>
+        <tt>$ ds9 -photo bar.jpg</tt><br>
+      </blockquote>
       <p><b><a name="DataArray"></a>Data Array</b></p>
-      <p>Raw data arrays are supported. To load an array, the user must
-        providethe dimensions, pixel depth, and optional header size and
-        architecture type. </p>
+      Raw data arrays are supported. To load an array, the user must
+      provide the dimensions, pixel depth, and optional header size and
+      architecture type.
       <blockquote> <tt> Syntax: <br>
           filename[options]<br>
           options are:<br>
-          <br>
           xdim=value <br>
           ydim=value <br>
           zdim=value # default is a depth of 1<br>
@@ -381,13 +372,12 @@ Data
           $export DS9_ARRAY='[dim=256,bitpix=-32]'<br>
           $ds9 -array foo.arr # load 256x256 float </tt> </blockquote>
       <p><b> <a name="ExternalFileSupport"></a>External File Support</b></p>
-      <p>DS9 supports external file formats via an ASCII description
-        file. When loading a file into DS9, these descriptions are
-        referenced for instructions for loading the file, based on the
-        file extension. If found, the command is executed and the
-        result, a FITS image or FITS Binary Table, is read into DS9 via
-        stdin.</p>
-      <p>At start-up, DS9 first searches for the ASCII file, named <tt>.ds9.fil</tt>in
+      DS9 supports external file formats via an ASCII description file.
+      When loading a file into DS9, these descriptions are referenced
+      for instructions for loading the file, based on the file
+      extension. If found, the command is executed and the result, a
+      FITS image or FITS Binary Table, is read into DS9 via stdin. <br>
+      At start-up, DS9 first searches for the ASCII file, named <tt>.ds9.fil</tt>in
 
 
 the
@@ -396,39 +386,40 @@ directory,
 
 
 
-        then in the users home directory.</p>
-      <p>The file command first is macro-expanded to fill in
-        user-defined arguments and then is executed externally.</p>
-      <p>The ASCII file that defines the known image files consists of
-        one or more file descriptors, each of which has the following
-        format:</p>
+
+      then in the users home directory. <br>
+      The file command first is macro-expanded to fill in user-defined
+      arguments and then is executed externally. <br>
+      The ASCII file that defines the known image files consists of one
+      or more file descriptors, each of which has the following format:
       <blockquote> <tt> Help description<br>
           A space-separated list of templates<br>
           A space-separated list of file types (not currently used)<br>
           The command line for the loading this file type<br>
         </tt> </blockquote>
-      <p>Note that blank lines separate the file descriptions and should
-        not be used as part of a description. Also, the '#' character is
-        a comment character.</p>
-      <p>The following macros are supported: <tt>$filename</tt></p>
-      <tt> For Example: <br>
-        # File access descriptions:<br>
-        #       help explanation<br>
-        #       file template<br>
-        #       file type<br>
-        #       access command<br>
-        IRAF IMH files<br>
-        *.imh<br>
-        IMH<br>
-        i2f -s $filename </tt>
+      Note that blank lines separate the file descriptions and should
+      not be used as part of a description. Also, the '#' character is a
+      comment character. <br>
+      <br>
+      The following macros are supported: <tt>$filename</tt><br>
+      <blockquote><tt> For Example: </tt><br>
+        <tt> # File access descriptions:</tt><br>
+        <tt> #       help explanation</tt><br>
+        <tt> #       file template</tt><br>
+        <tt> #       file type</tt><br>
+        <tt> #       access command</tt><br>
+        <tt> IRAF IMH files</tt><br>
+        <tt> *.imh</tt><br>
+        <tt> IMH</tt><br>
+        <tt> i2f -s $filename </tt></blockquote>
       <p><b> <a name="ExternalAnalysisSupport"></a>External Analysis
           Support</b></p>
-      <p>For more information about external analysis support files, see
-        <a href="analysis.html">Analysis</a>. </p>
+      For more information about external analysis support files, see <a
+        href="analysis.html">Analysis</a>.
       <p><b> <a name="RegionFiles"></a>Region Files</b></p>
-      <p>DS9 can read and write a number of region file formats. See <a
-          href="region.html">Regions</a> documentation for more
-        information.</p>
+      DS9 can read and write a number of region file formats. See <a
+        href="region.html">Regions</a> documentation for more
+      information.
       <blockquote> <tt> <a href="region.html#RegionDescriptions">DS9</a><br>
           <a href="region.html#FUNTools">FUNTools</a><br>
           <a href="region.html#Ciao">Ciao</a><br>
@@ -438,17 +429,16 @@ directory,
             Table</a><br>
           <a href="region.html#XY">X Y</a> </tt> </blockquote>
       <p><b> <a name="ColorLookupTable"></a>Color Lookup Table</b></p>
-      <p>DS9 has a number of default colormaps available to the user.
-        DS9 also supports reading and writing color lookup table formats
-        from the following programs:</p>
+      DS9 has a number of default colormaps available to the user. DS9
+      also supports reading and writing color lookup table formats from
+      the following programs:
       <blockquote> <tt> <a
 href="http://tdc-www.harvard.edu/software/saoimage/saoimage.color.html#cmap">SAOimage</a><br>
           <a
             href="http://hea-www.harvard.edu/RD/saotng/adding_cmaps.html">SAOtng</a><br>
           XImtool<br>
         </tt> </blockquote>
-      <p>DS9 uses the file extension to determine the color table
-        format:</p>
+      DS9 uses the file extension to determine the color table format:
       <center>
         <table nosave="" border="1" cellpadding="2" cellspacing="2"
           width="50%">
@@ -477,23 +467,25 @@ href="http://tdc-www.harvard.edu/software/saoimage/saoimage.color.html#cmap">SAO
         </table>
       </center>
       <p><b> <a name="WCS"></a>WCS</b></p>
-      <p>A new WCS specification can be loaded and used by the current
-        image regardless of the WCS that was contained in the image
-        file. WCS specification can be sent to DS9 as an ASCII file via
-        XPA. The format of the specification is a set of valid FITS
-        keywords that describe a WCS.</p>
+      A new WCS specification can be loaded and used by the current
+      image regardless of the WCS that was contained in the image file.
+      WCS specification can be sent to DS9 as an ASCII file via XPA. The
+      format of the specification is a set of valid FITS keywords that
+      describe a WCS.
       <blockquote> <tt> Example: <br>
               CRPIX1 
           =              
 
 
 
+
           257.75<br>
               CRPIX2 
           =              
 
 
 
+
           258.93<br>
               CRVAL1 
           =      -201.94541667302 <br>
@@ -502,6 +494,7 @@ href="http://tdc-www.harvard.edu/software/saoimage/saoimage.color.html#cmap">SAO
 
 
 
+
           -47.45444<br>
               CDELT1 
           =        -2.1277777E-4 <br>
@@ -511,9 +504,9 @@ href="http://tdc-www.harvard.edu/software/saoimage/saoimage.color.html#cmap">SAO
               CTYPE1  = 'RA---TAN' <br>
               CTYPE2  = 'DEC--TAN' <br>
         </tt> </blockquote>
-      <p>Note that the WCS definitions can contain standard FITS 80
-        character WCS card images, as shown above, or free-form
-        name/value pairs without the intervening "=" sign:</p>
+      Note that the WCS definitions can contain standard FITS 80
+      character WCS card images, as shown above, or free-form name/value
+      pairs without the intervening "=" sign:
       <blockquote> <tt>     CRPIX1   
           257.75 <br>
               CRPIX2    258.93 <br>
@@ -524,18 +517,15 @@ href="http://tdc-www.harvard.edu/software/saoimage/saoimage.color.html#cmap">SAO
               CTYPE1   'RA---TAN' <br>
               CTYPE2   'DEC--TAN' </tt> </blockquote>
       <p><b> <a name="PreferenceFile"></a>Preference File</b></p>
-      <p>A preference file is a valid tcl script generated by DS9 to
-        save the current preference items. See <a href="prefs.html">Preferences</a>
-        for more information.</p>
+      A preference file is a valid tcl script generated by DS9 to save
+      the current preference items. See <a href="prefs.html">Preferences</a>
+      for more information.
       <p><b> <a name="StartupFile"></a>Startup File</b></p>
-      <p>If a startup file <tt>ds9.ini</tt> is available, it is sourced
-        as the last step in initialization. The following directories
-        are searched in order: <tt>./, $HOME, /usr/local/lib,
-          /opt/local/lib</tt>. </p>
+      If a startup file <tt>ds9.ini</tt> is available, it is sourced as
+      the last step in initialization. The following directories are
+      searched in order: <tt>./, $HOME, /usr/local/lib, /opt/local/lib</tt>.
       <p><b> <a name="TCL"></a>TCL</b></p>
-      <p>TCL/TK script file. Users may customize the appearance and
-        enhance the capabilities of DS9 by sourcing their own TCL
-        scripts. </p>
-    </blockquote>
+      TCL/TK script file. Users may customize the appearance and enhance
+      the capabilities of DS9 by sourcing their own TCL scripts. </blockquote>
   </body>
 </html>
diff --git a/doc/ref/gui.html b/doc/ref/gui.html
index 2c1d6f1..3f5b62b 100644
--- a/doc/ref/gui.html
+++ b/doc/ref/gui.html
@@ -1,24 +1,23 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
   <head>
-    <meta http-equiv="Content-Type"
-	  content="text/html; charset=ISO-8859-1">
-    <meta name="GENERATOR"
-	  content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+    <meta http-equiv="Content-Type" content="text/html;
+      charset=ISO-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+      2.4.7-10 i686) [Netscape]">
     <title>Graphical User Interface</title>
   </head>
-  <body link="#0000ff" text="#000000" vlink="#551a8b" alink="#ff0000"
-	bgcolor="#ffffff">
-    <h3> <img alt="" src="../sun.gif" height="98" width="100"
-	      align="middle"> The
-      Graphical User Interface</h3>
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ff" text="#000000"
+    vlink="#551a8b">
+    <h3> <img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> The Graphical User Interface</h3>
     <blockquote>
-      <p>DS9s GUI as been designed and implemented for ease of use. It is
-	composed of a menu bar, information panel, panner, magnifier, button
-	control panel, display frames, horizontal and vertical graphs, and a
-	colorbar. The user may reconfigure the display by showing or hiding one
-	or more of the elements. See <a href="prefs.html">Preferences</a> for
-	more details. </p>
+      <p>DS9's GUI as been designed and implemented for ease of use. It
+        is composed of a menu bar, information panel, panner, magnifier,
+        button control panel, display frames, horizontal and vertical
+        graphs, and a colorbar. The user may reconfigure the display by
+        showing or hiding one or more of the elements. See <a
+          href="prefs.html">Preferences</a> for more details. </p>
       <p><b> Menu bar</b></p>
       <a href="mfile.html">File</a><br>
       <a href="medit.html">Edit</a><br>
@@ -34,43 +33,40 @@
       <a href="mhelp.html">Help</a>
       <p><b> Tear off Menus</b></p>
       <p>All DS9 menus can be used as a floating tool palette. To 'tear
-	off'
-	a menu, select the dashed line which is the first item of each menu. At
-	this point, the menu will become its own window, which now can be
-	managed
-	by the user. Mblockquotetiple copies of the same menu can be created. </p>
+        off' a menu, select the dashed line which is the first item of
+        each menu. At this point, the menu will become its own window,
+        which now can be managed by the user. Mblockquotetiple copies of
+        the same menu can be created. </p>
       <p><b> Information Panel</b></p>
-      <p>The Information panel displays information about the current data
-	values. The information displayed is configurable via the preferences. </p>
+      <p>The Information panel displays information about the current
+        data values. The information displayed is configurable via the
+        preferences. </p>
       <p><b> Panner</b></p>
       <p>The Panner allows the user to view the entire frame, along with
-	the
-	current viewing bounding box, image cursor, and wcs cursor. To pan the
-	current frame, click and drag the viewing bounding box. </p>
+        the current viewing bounding box, image cursor, and wcs cursor.
+        To pan the current frame, click and drag the viewing bounding
+        box. </p>
       <p><b> Magnifier</b></p>
       <p>The Magnifier displays a magnified view of the current mouse
-	cursor
-	location. The Magnifier cursor outlines the size and orientation of one
-	pixel, given the current frame zoom and orientation. </p>
+        cursor location. The Magnifier cursor outlines the size and
+        orientation of one pixel, given the current frame zoom and
+        orientation. </p>
       <p><b> Button Control Panel</b></p>
-      <p>The Button Control panel provides duplicate menu functionality for
-	ease
-	of use. </p>
+      <p>The Button Control panel provides duplicate menu functionality
+        for ease of use. </p>
       <p><b> Frames</b></p>
-      <p>FITS images are displayed in Frames. Frames may be viewed one at a
-	time, or all at once in Tile mode. Only one frame is the Current Frame,
-	as indicated by the Blue Border, while in Tile mode. Most functions act
-	only on the Current Frame. </p>
+      <p>FITS images are displayed in Frames. Frames may be viewed one
+        at a time, or all at once in Tile mode. Only one frame is the
+        Current Frame, as indicated by the Blue Border, while in Tile
+        mode. Most functions act only on the Current Frame. </p>
       <p><b> Graphs</b></p>
       <p>Horizontal and Vertical graphs are available to display a cut
-	through
-	the current frame data. While the mouse cursor is in a graph, the
-	information panel reflects the current data values. Graphs are not
-	available while in Tile Mode. </p>
+        through the current frame data. While the mouse cursor is in a
+        graph, the information panel reflects the current data values.
+        Graphs are not available while in Tile Mode. </p>
       <p><b> Colorbar</b></p>
       <p>The Colorbar displays the current colormap and current bias and
-	contrast settings.
-      </p>
+        contrast settings. </p>
     </blockquote>
   </body>
 </html>
diff --git a/doc/ref/how.html b/doc/ref/how.html
index afdb8f3..14bab0c 100644
--- a/doc/ref/how.html
+++ b/doc/ref/how.html
@@ -7,9 +7,9 @@
       2.4.7-10 i686) [Netscape]">
     <title>Color</title>
   </head>
-  <body bgcolor="#ffffff" text="#000000" vlink="#551a8b" alink="#ff0000"
-    link="#0000ee">
-    <h3><img alt="" src="../sun.gif" width="100" align="middle"
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+    vlink="#551a8b">
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
         height="98"> How it Works</h3>
     <blockquote>
       <p><b>Table of Contents</b></p>
@@ -84,14 +84,14 @@
       <p>as <i>x</i> goes from 0 to 1.<br>
       </p>
       <p>The <tt>asinh</tt> scale function is defined as the following:</p>
-      <blockquote><img
-src="data:image/png;base64,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"
-          alt=""> </blockquote>
+      <blockquote><img alt="asinh" src="img/asinh.png" width="80"
+          height="29"><br>
+      </blockquote>
       <p>as <i>x</i> goes from 0 to 1. </p>
       <p>The <tt>sinh</tt> scale function is defined as the following:</p>
-      <blockquote><img
-src="data:image/png;base64,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"
-          alt=""> </blockquote>
+      <blockquote><img alt="sinh" src="img/sinh.png" width="69"
+          height="29"><br>
+      </blockquote>
       <p>as <i>x</i> goes from 0 to 1. </p>
       <p>The <tt>histogram equalization</tt> scale function distributes
         colors based on the frequency of each data value.</p>
@@ -148,10 +148,10 @@ src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEUAAAAdCAYAAAD8UKGzAAAXiWlDQ
         values to correctly display your image. For large files, this
         can take time. You have several options available under the <tt>Scale</tt>
         menu:</p>
-      <blockquote><b>Scan Data</b> - reads all data<br>
-        <b>Sample Data</b> - samples every x values (much faster)<br>
-        <b>Use FITS keyword DATAMIN/MAX or IRAFMIN/MAX</b> - great if in
-        the header, bad because they are always wrong.<br>
+      <blockquote>Scan Data - reads all data<br>
+        Sample Data - samples every x values (much faster)<br>
+        Use FITS keyword DATAMIN/MAX or IRAFMIN/MAX - great if in the
+        header, bad because they are always wrong.<br>
       </blockquote>
       <p>The best thing to do is to use sample data, and set the data
         sample between 10 and 100.</p>
diff --git a/doc/ref/img/asinh.png b/doc/ref/img/asinh.png
new file mode 100644
index 0000000..7021885
Binary files /dev/null and b/doc/ref/img/asinh.png differ
diff --git a/doc/ref/img/sinh.png b/doc/ref/img/sinh.png
new file mode 100644
index 0000000..395e6d9
Binary files /dev/null and b/doc/ref/img/sinh.png differ
diff --git a/doc/ref/index.html b/doc/ref/index.html
index 8e1f3a4..673aac7 100644
--- a/doc/ref/index.html
+++ b/doc/ref/index.html
@@ -9,8 +9,8 @@
   </head>
   <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
     vlink="#551a8b">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> SAOImage DS9 Reference Manual</h3>
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> SAOImage DS9 Reference Manual</h3>
     <blockquote>
       <p>DS9 is  the next version of the popular <a
           href="http://hea-www.harvard.edu/RD/saotng/">SAOtng</a>
@@ -30,71 +30,65 @@
         variety of coordinate systems (including Image, Physical,
         Detector, and WCS). DS9 also supports FTP and HTTP access. The
         GUI for DS9 is user configurable.</p>
-      <table border="0" cellpadding="4" cellspacing="2" height="25%"
-        width="75%">
+      <table align="center" border="0" cellpadding="4" cellspacing="2"
+        width="75%" height="25%">
         <tbody>
           <tr>
-            <td align="center" valign="middle"> <b><a href="gui.html">The
+            <td align="center" valign="middle"> <a href="gui.html">The
+                Graphical User Interface</a> </td>
+            <td align="center" valign="top"><a href="backup.html">Backup
+                and Restore</a></td>
+            <td align="center" valign="middle"> <a href="file.html">File
+
+
 
-                  Graphical User Interface</a></b> </td>
-            <td align="center" valign="middle"> <b><a
-                  href="catalog.html">Catalogs</a></b> </td>
-          </tr>
-          <tr>
-            <td align="center" valign="middle"> <b><a
-                  href="keyboard.html">Mouse and Keyboard</a></b> </td>
-            <td align="center" valign="middle"> <b><a href="color.html">Color</a></b>
-            </td>
-          </tr>
-          <tr>
-            <td align="center" valign="middle"> <b><a
-                  href="command.html">Command Line Options</a></b> </td>
-            <td align="center" valign="middle"> <b><a href="print.html">Printing</a></b>
-            </td>
-          </tr>
-          <tr>
-            <td align="center" valign="middle"> <b><a href="xpa.html">XPA
 
-                  Access Points</a></b> </td>
-            <td align="center" valign="middle"> <b><a
-                  href="analysis.html">Analysis</a></b> </td>
+
+                Formats</a></td>
           </tr>
           <tr>
-            <td align="center" valign="top"> <b><a href="samp.html">SAMP<br>
-                </a></b> </td>
-            <td align="center" valign="top"> <b><a href="iraf.html">IRAF
+            <td align="center" valign="middle"> <a href="keyboard.html">Mouse
+
+
+                and Keyboard</a> </td>
+            <td align="center" valign="top"><a href="grid.html">Coordinate
+
+
 
-                  Support</a></b> </td>
+
+
+                Grids</a></td>
+            <td align="center" valign="middle"> <a href="prefs.html">Preferences</a></td>
           </tr>
           <tr>
-            <td align="center" valign="middle"> <b><a
-                  href="region.html">Regions</a></b> </td>
-            <td align="center" valign="middle"> <b><a href="file.html">File
+            <td align="center" valign="middle"> <a href="command.html">Command
+
 
-                  Formats</a></b> </td>
+                Line Options</a> </td>
+            <td align="center" valign="top"><a href="catalog.html">Catalogs</a></td>
+            <td align="center" valign="middle"> <a href="3d.html">3-D
+                Frames</a></td>
           </tr>
           <tr>
-            <td align="center" valign="middle"> <b><a
-                  href="contour.html">Contours</a></b> </td>
-            <td align="center" valign="middle"> <b><a href="prefs.html">Preferences</a></b>
+            <td align="center" valign="middle"> <a href="xpa.html">XPA
+                Access Points</a> </td>
+            <td align="center" valign="top"><a href="colorbar.html">Colorbar</a><br>
             </td>
+            <td align="center" valign="middle"> <a href="contour.html">Contours</a></td>
           </tr>
           <tr>
-            <td align="center" valign="middle"> <b><a href="grid.html">Coordinate
-
-                  Grids</a></b> </td>
-            <td align="center" valign="middle"> <b><a href="3d.html">3D
-                  Frames<br>
-                </a></b></td>
+            <td align="center" valign="top"> <a href="samp.html">SAMP<br>
+              </a> </td>
+            <td align="center" valign="top"><a href="print.html">Printing</a></td>
+            <td align="center" valign="top"> <a href="iraf.html">IRAF
+                Support</a></td>
           </tr>
           <tr>
-            <td align="center" valign="top"> <b><a href="backup.html">Backup
-
-                  and Restore</a></b>
-              <p><b><a href="backup.html"> </a></b></p>
+            <td align="center" valign="middle"> <a href="region.html">Regions</a>
             </td>
-            <td align="center" valign="top"><b><a href="how.html">How It
-                  Works</a></b> </td>
+            <td align="center" valign="top"><a href="analysis.html">Analysis</a></td>
+            <td align="center" valign="middle"> <a href="how.html">How
+                It Works</a></td>
           </tr>
         </tbody>
       </table>
diff --git a/doc/ref/keyboard.html b/doc/ref/keyboard.html
index 0cc7f02..1c7be76 100644
--- a/doc/ref/keyboard.html
+++ b/doc/ref/keyboard.html
@@ -9,9 +9,8 @@
   </head>
   <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
     vlink="#551a8b">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100">
-      Mouse and Keyboard</h3>
+    <h3><img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> Mouse and Keyboard</h3>
     <blockquote>
       <p><b> Mouse Buttons</b></p>
       <p>The following table contains the event bindings for the mouse
@@ -37,7 +36,9 @@
                 In Pan mode, will move or pan to clicked location.<br>
                 In Zoom mode, will zoom about clicked location.<br>
                 In Rotate mode, will rotate image about center.<br>
-                In Crop mode, will select 2D crop region.<br>
+                In Crop mode, will select 2-D crop region. For 3-D <i>Shift-click</i>
+                will edit front clip plane, <i>Control-click</i> will
+                edit back clip plane.<br>
                 In Catalog mode, will select catalog regions.<br>
                 In examine mode, will follow IRAF examine protocol.<br>
               </td>
@@ -45,8 +46,7 @@
             <tr>
               <td><font face="Courier New,Courier">Button 2</font></td>
               <td>Pan mode: will move or pan to clicked location.
-                Behavior
-                depends on the PAN preference settings.</td>
+                Behavior depends on the PAN preference settings.</td>
             </tr>
             <tr>
               <td><font face="Courier New,Courier">Button 3</font></td>
@@ -59,31 +59,22 @@
       <p><b>Greek and other special characters.</b> </p>
       <p>The concept of a separate <tt>SYMBOL</tt> font is no longer
         implemented with the latest OS font and scripting support,
-        especially
-        with scalable anti-alias fonts such as Xft for Linux. Most newer
-        fonts
-        (if not all) now have greek characters as part of the font. The
-        greek
-        characters start at unicode \u0391 for 'A' and \u03b1 for 'a'.
-        Each OS
-        has a
-        tool used to build and copy a string of characters. Then use the
-        Edit:Paste menu of DS9 to insert the character string.</p>
+        especially with scalable anti-alias fonts such as Xft for Linux.
+        Most newer fonts (if not all) now have greek characters as part
+        of the font. The greek characters start at unicode \u0391 for
+        'A' and \u03b1 for 'a'. Each OS has a tool used to build and
+        copy a string of characters. Then use the Edit:Paste menu of DS9
+        to insert the character string.</p>
       <blockquote>
         <p>Linux- Gnome: <b>gucharmap<br>
           </b>Linux- KDE: <b>kcharselect<br>
-          </b>MacOSX: <b>Character Viewer</b> (from <tt>System
-            Preferences</tt>,
-          select <tt>Language & Text</tt>, <tt>Input Sources</tt>,
-          and
-          enable <tt>Keyboard and & Charactor Viewer</tt>. It is
-          now
-          available under the keyboard menu in the menu bar.)<br>
+          </b>MacOSX: <b>Character Viewer</b> (Select <tt>Edit:Special
+            Characters</tt>) Now click and drag the characters to a
+          terminal window. Then select the string and select <tt>Edit:Copy</tt>.<br>
           Windows: <b>Character Map</b> (from <tt>Start</tt> button,
-          select <tt>All
-            Programs</tt>, <tt>Accessories</tt>, <tt>System Tools</tt>
-          and then <tt>Character
-            Map</tt>)</p>
+          select <tt>All Programs</tt>, <tt>Accessories</tt>, <tt>System
+
+            Tools</tt> and then <tt>Character Map</tt>)</p>
       </blockquote>
       <p><b>Keyboard Shortcuts</b></p>
       <p>The following table contains the list of keyboard shortcuts and
@@ -164,10 +155,9 @@
                   k<br>
                 </tt></td>
               <td>Will move selected regions up one pixel. <br>
-                In Pointer mode,
-                will move the cursor up one pixel. <br>
-                In Crosshair mode, will move the
-                crosshair up one pixel. <br>
+                In Pointer mode, will move the cursor up one pixel. <br>
+                In Crosshair mode, will move the crosshair up one pixel.
+                <br>
                 In Pan mode, will pan the image up one pixel.</td>
             </tr>
             <tr nosave="">
@@ -179,11 +169,9 @@
                 pixel. <br>
                 In Pointer mode, will move the cursor to the right one
                 pixel. <br>
-                In
-                Crosshair mode, will move the crosshair to the right one
-                pixel. <br>
-                In Pan
-                mode, will pan the image to the right one pixel.</td>
+                In Crosshair mode, will move the crosshair to the right
+                one pixel. <br>
+                In Pan mode, will pan the image to the right one pixel.</td>
             </tr>
             <tr>
               <td align="center"><tt>Left</tt><font face="Courier
@@ -191,13 +179,11 @@
                   h<br>
                 </tt></td>
               <td>Will move selected regions to the left one pixel. <br>
-                In
-                Pointer mode, will move the cursor to the left one
+                In Pointer mode, will move the cursor to the left one
                 pixel. <br>
-                In Crosshair
-                mode, will move the crosshair to the left one pixel. <br>
-                In Pan mode, will
-                pan the image to the left one pixel.</td>
+                In Crosshair mode, will move the crosshair to the left
+                one pixel. <br>
+                In Pan mode, will pan the image to the left one pixel.</td>
             </tr>
             <tr>
               <td align="center"><tt>Down</tt><font face="Courier
@@ -205,12 +191,11 @@
                   j<br>
                 </tt></td>
               <td>Will move selected regions down one pixel. <br>
-                In Pointer mode,
-                will move the cursor up down one pixel. <br>
-                In Crosshair mode, will also
-                move the crosshair down one pixel. <br>
-                In Pan mode, will pan the image down
-                one pixel.</td>
+                In Pointer mode, will move the cursor up down one pixel.
+                <br>
+                In Crosshair mode, will also move the crosshair down one
+                pixel. <br>
+                In Pan mode, will pan the image down one pixel.</td>
             </tr>
             <tr>
               <td align="center"><tt>Shift</tt><font face="Courier
diff --git a/doc/release/r7.0.html b/doc/release/r7.0.html
index a026537..f3d16d4 100644
--- a/doc/release/r7.0.html
+++ b/doc/release/r7.0.html
@@ -1,196 +1,328 @@
 <!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
 <html>
-<head>
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-  <meta name="GENERATOR"
- content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
-  <title>DS9 Version 7 Release Notes</title>
-</head>
-<body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
- vlink="#551a8b">
-<h3> <img alt="" src="../sun.gif" align="middle" height="98"
- width="100">
-SAOImage DS9 Version 7 Release Notes</h3>
-<ol>
-  <ol>
-    <li><tt>10.18.2010 SCALE: fixed a problem preserve Scale at load.</tt></li>
-    <li><tt>10.18.2010 REGION: add group new, group update, and select invert commands.</tt></li>
-    <li><tt>10.20.2010 TCL/TK: update to version 8.5.9.</tt></li>
-    <li><tt>12.01.2010 FOV: Add HEASARC/Suzaku templates for HXD, XIS, and XRS</tt></li>
-    <li><tt>12.03.2010 CATALOGS: fixed a problem when dec is specified as -00:xx:xx for CXC, SIMBAD, SKYBOT, and SKYVIEW</tt></li>
-    <li><tt>12.07.2010 BINNING: update WCS keywords for FITS bintables</tt></li>
-    <li><tt>12.10.2010 GUI: fixed a problem with displaying greek letters under linux.</tt></li>
-    <li><tt>12.24.2010 MOSAIC: fixed a problem introduced with verison 6.1 with wcs mosaics when first segment is flipped.</tt></li>
-    <li><tt>12.24.2010 MOSAIC: removed the FLT_EPSILON fudge factors in calculating mosaic segment matrices.</tt></li>
-    <li><tt>01.04.2011 SOLARIS: fixed a major bug with color allocation.</tt></li>
-    <li><tt>02.03.2011 POSTSCRIPT: all ports now generate identical postscript output (with a minor exception with ast grid numerics).</tt></li>
-    <li><tt>02.03.2011 TEXT: selecting a TEXT region now handles rotated text correctly.</tt></li>
-    <li><tt>02.18.2011 GROUPS: fixed a problem with selecting multiple regions.</tt></li>
-    <li><tt>02.21.2011 PIXELTABLE: fixed two problems with xpa and copy commands.</tt></li>
-    <li><tt>02.28.2011 GUI: add theme options.</tt></li>
-    <li><tt>03.01.2011 TKTABLE: updated to version 2.10.</tt></li>
-    <li><tt>03.03.2011 POSTSCRIPT: add new scale factor.</tt></li>
-    <li><tt>03.02.2011 GUI: all dialogs now use the new ttk widgets (with a few exceptions).</tt></li>
-    <li><tt>03.04.2011 PREFS: add -bg and -nan xpa/command line options.</tt></li>
-    <li><tt>03.14.2011 MOSAIC: added patch from Frank Valdes for default DETSIZE values.</tt></li>
-    <li><tt>03.14.2011 CMAP: add load/save xpa/command line options.</tt></li>
-    <li><tt>03.14.2011 BACKUP: fixed a problem with saved cmaps. Pathname is now relative.</tt></li>
-    <li><tt>03.17.2011 TKIMG: updated to version 1.4.</tt></li>
-    <li><tt>03.17.2011 ZLIB: updated to version 1.2.5</tt></li>
-    <li><tt>03.18.2011 WCSSUBS: updated to version 3.8.2</tt></li>
-    <li><tt>04.05.2011 AST: updated to version 5.6-0</tt></li>
-    <li><tt>04.05.2011 WCS: fixed/improved support for TNX, ZPN, ZPX, CAR.</tt></li>
-    <li><tt>04.25.2011 WCS: use AST for most WCS functions.</tt></li>
-    <li><tt>04.25.2011 SCALE: fix Scale Dialog formating issues.</tt></li>
-    <li><tt>04.26.2011 HELP: All user manual images are now local.</tt></li>
-    <li><tt>04.26.2011 CONTOUR: fixed problem with generating contours with BITPIX=-64.</tt></li>
-    <li><tt>04.26.2011 SMOOTH: now generates BITPIX=-64 image.</tt></li>
-    <li><tt>04.27.2011 SCALE: fixed a problem with setting scale user limits and then loading an image.</tt></li>
-    <li><tt>04.28.2011 EXTERNAL FILE: fixed a problem with macro substitution $filename.</tt></li>
-    <li><tt>04.28.2011 FUNTOOLS: updated to version 1.4.5.</tt></li>
-    <li><tt>04.28.2011 XPA: reinstalled version 2.1.13.</tt></li>
-    <li><tt>05.02.2011 WCS: use AST for all FITS WCS projections and DSS. Use WCSSUBS for TNX, ZPX, SIP, SCAMP, WCSDEP.</tt></li>
-    <li><tt>05.06.2011 WCS: Added additional reverse transformation (thanks Ed Los) for calculation of Panner WCS compass.</tt></li>
-    <li><tt>05.09.2011 GRID: add support for non-standard WCSDEP keyword.</tt></li>
-    <li><tt>05.12.2011 IMGSVR: for all image servers (2mass,dss,first,nvss,skyview) if invoked with no argument, yet dialog has a name or coords, automatically retreive the image.</tt></li>
-    <li><tt>05.12.2011 FITS: External File support- fixed a problem where the channel was not closed after the open pipe cmd was invoked and ds9 would run out of resources.</tt></li>
-    <li><tt>05.13.2011 GUI: enhanced/implemented Match/Lock Crosshairs.</tt></li>
-    <li><tt>05.13.2011 GUI: enhanced/implemented Match/Lock Frames.</tt></li>
-    <li><tt>05.13.2011 GUI: Moved Match Scale/Bin/Colorbar to respective menus.</tt></li>
-    <li><tt>05.16.2011 CONTOUR: fixed a problem with NAN in data.</tt></li>
-    <li><tt>05.17.2011 CATALOGS: NED fixed a problem with getURL and added support for in/out sys/sky formats.</tt></li>
-    <li><tt>05.19.2011 CATALOGS: SIMBAD added support for in/out sys/sky formats.</tt></li>
-    <li><tt>05.19.2011 CATALOGS: CDS added support for in/out sys/sky formats.</tt></li>
-    <li><tt>05.20.2011 COMPOSITE: speed up create/delete composite region with +1000 regions.</tt></li>
-    <li><tt>05.20.2011 WCS: implemented preferred WCS for each frame. All WCS functions use the preferred WCS (i.e. copy/paste/load/save regions, contours, align, match, lock, rgb, cube).</tt></li>
-    <li><tt>05.25.2011 WCSSUBS: updated to version 3.8.3.</tt></li>
-    <li><tt>05.25.2011 AST: updated to version 5.7-0.</tt></li>
-    <li><tt>05.26.2011 WCS: use AST for TNX,ZPX,SCAMP.</tt></li>
-    <li><tt>05.27.2011 REGIONS: if unable to copy/cut/paste in WCS, fall back upon PHYSICAL.</tt></li>
-    <li><tt>05.27.2011 REGIONS: if unable to map coordinates correctly, do not a region.</tt></li>
-    <li><tt>06.03.2011 WCS: added support for xLON/xLAT and xyLN xyLT WCS.</tt></li>
-    <li><tt>06.03.2011 REGIONS: added regions properites commands to xpa,samp, and command line.</tt></li>
-    <li><tt>06.10.2011 HEALPIX: added support for generating an image from a healpix table (both binary and ascii).</tt></li>
-    <li><tt>06.13.2011 WCS: use AST for all WCS including TAN-SIP and WCSDEP.</tt></li>
-    <li><tt>06.16.2011 SAMP: added code to clean up better when DS9 is unable to parse a SAMP hub file.</tt></li>
-    <li><tt>06.16.2011 REGIONS: be sure to return template id when created.</tt></li>
-    <li><tt>06.16.2011 ANALYSIS: added autoload support for analysis files. DS9 will search a list of known dirs for *.ds9, at which DS9 will load the analysis file, and add the path to env(PATH).</tt></li>
-    <li><tt>06.20.2011 RGB: fixed a problem where the calculated wcs rotation between two frames was reset.</tt></li>
-    <li><tt>06.27.2011 REGIONS: fixed a problem the ds9, ciao, and pros regions parser. The parsers will now accept arcmin and arcsec syntax which includes sciencetific notation.</tt></li>
-    <li><tt>07.07.2011 POSTSCRIPT: generate postscipt now uses generic font names reguardless of platform and window manager.</tt></li>
-    <li><tt>07.08.2011 BIN: split mousewheel preferences between zoom and binning. By default, a bin file is zoom'd in/out with the mouse wheel, unless the binning mouse wheel is enabled via the preferences.</tt></li>
-    <li><tt>07.08.2011 GUI: add preference for standard dialog box for order of file types.</tt></li>
-    <li><tt>07.21.2011 GUI: all non-modal dialogs have Edit menu.</tt></li>
-    <li><tt>07.21.2011 DATACUBE: add match/lock slice commands.</tt></li>
-    <li><tt>07.22.2011 AST: updated to version 5.7-2</tt></li>
-    <li><tt>07.22.2011 WCS: speedup generating sexagesimal output</tt></li>
-    <li><tt>07.25.2011 BIN: fixed a problem with the update filter function.</tt></li>
-    <li><tt>07.29.2011 DIALOGS: fixed a problem with the motif dialogbox and selection of the initial directory. Set the code to the same as tkfmbox.tcl.</tt></li>
-    <li><tt>08.22.2011 WCS: if CTYPE is not of known type, assume LINEAR.</tt></li>
-    <li><tt>08.26.2011 PANNER: simplified compass prefs.</tt></li>
-    <li><tt>09.19.2011 WCS: only use A_ and B_ keywords if CTYPE is TAN-SIP. Ignore otherwise.</tt></li>
-    <li><tt>09.26.2011 REGIONS: use ::math::fuzzy for comparisons in basepanda, composite, and convert.</tt></li>
-    <li><tt>09.27.2011 WCSSUBS: updated to version 3.8.4.</tt></li>
-    <li><tt>09.30.2011 REGIONS: implemented M_PI_2, M_TWOMPI constants.</tt></li>
-    <li><tt>09.30.2011 REGIONS: use fuzzy math for degToRad() and radToDeg()</tt></li>
-    <li><tt>10.04.2011 WCS: pass any PV and QV keywords if present, regardless of projection.</tt></li>
-    <li><tt>10.05.2011 AST: updated to version 5.7-3</tt></li>
-    <li><tt>10.24.2011 REGIONS: fixed a problem with angs and PANDA, EPANDA, and BPANDA and copy/paste in FK5. This is related to the fuzzy math changes made earlier.</tt></li>
-    <li><tt>10.25.2011 FITSY++: fixed a problem finding cols by name in bin tables. Previous 'R' would be matched by 'RA'.</tt></li>
-    <li><tt>10.28.2011 HV: remove NED,SIMBAD,ADS,TDC,SKYVIEW,W3BROWSE from ANALYSIS:ARCHIVES menu due to lack of support from sites.</tt></li>
-    <li><tt>10.28.2011 COLORMAP: add colormap server to colormap dialog</tt></li>
-    <li><tt>11.01.2011 PRINT COORDINATES: now uses default skyframe and skyformat (as defined by WCS menu).</tt></li>
-    <li><tt>11.04.2011 SCALE: add asinh() and sinh() scales.</tt></li>
-    <li><tt>11.10.2011 CROP: add new crop commands.</tt></li>
-    <li><tt>12.09.2011 AST: updated to version 6.0-1</tt></li>
-    <li><tt>12.09.2011 CROSSHAIR: fixed an issue with coordinates of crosshair were .5 pixel off in Y.</tt></li>
-    <li><tt>12.09.2011 GUI: fixed an issue with centerimage() was .5 pixel off in Y.</tt></li>
-    <li><tt>12.15.2011 GRID: fixed an issue with text upside down.</tt></li>
-    <li><tt>01.03.2012 BIN: fixed a problem with depth of a 3d bin'd table.</tt></li>
-    <li><tt>01.03.2012 GRID: DSS and Linear projections use AST.</tt></li>
-    <li><tt>01.17.2012 3D: 3D Frame is now available.</tt></li>
-    <li><tt>01.19.2012 ANALYSIS: added $z macro.</tt></li>
-    <li><tt>01.19.2012 CROP: add [xmin:xmax,ymin:ymax,zmin:zmax] syntax</tt></li>
-    <li><tt>01.19.2012 CROP: check for valid crop with [] syntax.</tt></li>
-    <li><tt>01.23.2012 3D: add current slice highlite.</tt></li>
-    <li><tt>01.23.2012 SAVEAS: fixed a problem with frame highlite during saveas process.</tt></li>
-    <li><tt>01.23.2012 ANALYSIS: expand $image macro to accept new params: rgb and 3d.</tt></li>
-    <li><tt>01.27.2012 ANALYSIS: expand $filename(full) to return full filename (without cropping or filters parameters).</tt></li>
-    <li><tt>01.27.2012 ANALYSIS: add macro $value.</tt></li> 
-    <li><tt>01.27.2012 CROP: fixed a problem when using an image subsection spec for a datacube.</tt></li> 
-    <li><tt>01.28.2012 REGIONS: clean up rendering code for X,ps,win32,macosx to reduce un-needed calls to set the graphics context.</tt></li> 
-    <li><tt>01.28.2012 CROP: all data cubes can be cropped in 3D.</tt></li> 
-    <li><tt>01.28.2012 CROP: cropping in 3D will reset currentSlice if needed.</tt></li> 
-    <li><tt>01.28.2012 REGIONS: fixed a problem if the region color was an X11 valid color, some names would get mapped to the incorrect color when printing.</tt></li> 
-    <li><tt>02.02.2012 COLORMAP: fixed a problem with SAO format colormaps that have very long lines.</tt></li> 
-    <li><tt>02.03.2012 PRINT COORDINATES: added filename to options.</tt></li> 
-    <li><tt>02.03.2012 WCS: if wcs parameters are changed or reset, all open catalogs regions are updated. Normal regions are not changed.</tt></li> 
-    <li><tt>02.07.2012 COLORMAP: remove support for old RTD and ITT colormaps</tt></li> 
-    <li><tt>02.08.2012 GUI: consolidate MATCH and LOCK items into submenus.</tt></li> 
-    <li><tt>02.08.2012 GUI: move match bin, match scale, and match colorbar to frame match menu.</tt></li> 
-    <li><tt>02.16.2012 CUBE: fixed a proble with calculating the wcs to image for axis 3.</tt></li> 
-    <li><tt>02.16.2012 FITSY++: changes required for gcc 4.7.</tt></li> 
-    <li><tt>02.16.2012 BLT: patched graph.tcl to use legendRelief instead of labelRelief.</tt></li> 
-    <li><tt>02.16.2012 RGB: added lock wcs.</tt></li> 
-    <li><tt>02.16.2012 FUNTOOLS: updated to version 1.4.5-2.</tt></li>
-    <li><tt>02.21.2012 3D: fixed a problem with scale clip scope. Should alway be in GLOBAL.</tt></li>
-    <li><tt>02.29.2012 HEADER: add save header command.</tt></li>
-    <li><tt>03.01.2012 XPA: updated to version 2.1.14.</tt></li>
-    <li><tt>03.01.2012 MINMAX: AUTOSCAN set to SAMPLE if width*height*depth > 1e8.</tt></li>
-    <li><tt>03.12.2012 IMGSVR: fixed a problem with clearing params if no image was loaded previously.</tt></li>
-    <li><tt>03.22.2012 REGION: add ellipse3d, box3d, polygon3d, point3d regions.</tt></li>
-    <li><tt>03.23.2012 IMGSVR: fixed a problem new frame option and rgb.</tt></li>
-    <li><tt>03.23.2012 BIN: check for valid col names for -bin col command.</tt></li>
-    <li><tt>03.28.2012 REGIONS: add Analysis support per region.</tt></li>
-    <li><tt>03.28.2012 REGIONS: add Plot3d support for Circle,Ellipse,Box,Polygon,Point.</tt></li>
-    <li><tt>03.28.2012 REGIONS: add Plot2d support for Projection,Line,Vector.</tt></li>
-    <li><tt>03.28.2012 REGIONS: Circle3d now converted to Circle.</tt></li>
-    <li><tt>03.28.2012 REGIONS: Plot3d saves native coordinate values.</tt></li>
-    <li><tt>03.28.2012 SCALE: simplified scale dialog controls to allow user values.</tt></li>
-    <li><tt>03.29.2012 WCS: fixed a problem with numaxes > 3 images and editing WCS params.</tt></li>
-    <li><tt>04.09.2012 WCS: second attempt to handle non-equatorial wcs. try to build a legal header from the wcssubs struct to feed to ast.</tt></li>
-    <li><tt>04.10.2012 SCALE: fixed an issue with autocut, ll != hh.</tt></li>
-    <li><tt>04.10.2012 SKYVIEW: add WISE/COBE/WMAP to skyview survey menu.</tt></li>
-    <li><tt>04.10.2012 WCS: if CD matrix is all zero, use cdelt/pc matrix.</tt></li>
-    <li><tt>04.11.2012 SMOOTH: fixed a problem with images with BSCALE/BZERO.</tt></li>
-    <li><tt>04.11.2012 CATALOG: fixed a problem with d:m:s formated DEC which started with a '+'</tt></li>
-    <li><tt>04.12.2012 CATALOG: fixed a problem with d:m:s to degree conversion. Try to maintain higher precision.</tt></li>
-    <li><tt>04.12.2012 CATALOG: add IAU location code to dialog.</tt></li>
-    <li><tt>04.13.2012 COLORMAP: add user contributed cmaps.</tt></li>
-    <li><tt>04.18.2012 GUI: fixed a problem with long WCSNAME values.</tt></li>
-    <li><tt>04.20.2012 FITSY: added support for GZIP compresss parameter ZQUANTIZ.</tt></li>
-    <li><tt>04.23.2012 PS: fixed a bug with definiton of 32 bit integers on 64 bit OS.</tt></li>
-    <li><tt>04.23.2012 PREFS: add Text Dialog Font preferences menu.</tt></li>
-    <li><tt>04.23.2012 LOCK: fixed a problem with lock frame and mouse wheel events.</tt></li>
-    <li><tt>04.24.2012 SKYBOT: Look for EXPTIME and add 1/2 to DATE-OBS to get middle of observation.</tt></li>
-    <li><tt>04.24.2012 LINUX64: add --hash-style=both to support old and new GNU API for hash libs.</tt></li>
-    <li><tt>04.26.2012 PHOTO: add support for other image formats.</tt></li>
-    <li><tt>04.26.2012 EXPORT: add support for exporting to other image formats.</tt></li>
-    <li><tt>04.30.2012 WCS: fixed a problem with TAN-SIP and wcs append/replace.</tt></li>
-    <li><tt>05.01.2012 TCL: check to see if packages msgcat and http have already been found before sourcing during startup.</tt></li>
-    <li><tt>05.03.2012 MPEG: fixed a problem with the bottom of an image cut off.</tt></li>
-    <li><tt>05.07.2012 COLORTAG: add color tags.</tt></li>
-    <li><tt>05.10.2012 CROP: fixed a problem with backup and lock crop.</tt></li>
-    <li><tt>05.10.2012 SCALE: fixed a problem lock scale and crop.</tt></li>
-    <li><tt>05.10.2012 BACKUP: fixed a problem with back and -slice, -mosaic load options.</tt></li>
-    <li><tt>05.11.2012 REGIONS: add auto plot2d and plot3d prefs.</tt></li>
-    <li><tt>05.14.2012 GUI: add fits save.</tt></li>
-    <li><tt>05.17.2012 MPEG: updated to ezMPEG v0.1</tt></li>
-    <li><tt>05.17.2012 AST: updated to 7.0.3</tt></li>
-    <li><tt>05.23.2012 WCS: is always displayed</tt></li>
-    <li><tt>05.23.2012 CATALOG: fixed a problem with the sign of d:m:s conversion introduced on 04.12.2012.</tt></li>
-    <li><tt>05.28.2012 MOVIE: minor tweaks on incr slice during movie.</tt></li>
-    <li><tt>05.28.2012 WIN32: fixed a problem with 3d fillImageJoin. Statck overflow.</tt></li>
-    <li><tt>05.29.2012 BACKUP: fixed active frames issue.</tt></li>
-    <li><tt>05.30.2012 GUI: add threads command.</tt></li>
-    <li><tt>05.30.2012 GUI: fixed a problem with PASTE for entries. Will now process unicode.</tt></li>
-    <li><tt>05.31.2012 GRID: fixed a problem with parsing 6.1 and 6.2 backup save sets. New grid options parser implemented.</tt></li>
-    <li><tt>05.31.2012 PLOT: fixed a problem in generating postscript. Now just set plot size./tt></li>
-    <li><tt>05.31.2012 PLOT: fixed a postscript font issue with helvetica./tt></li>
-    <li><tt>05.31.2012 PLOT: add axes format/tt></li>
-    <li><tt><b>06.15.2012 RELEASE version 7.0</b></tt></li>
-  </ol>
-</ol>
-</body>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;
+      charset=ISO-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+      2.4.7-10 i686) [Netscape]">
+    <title>DS9 Version 7 Release Notes</title>
+  </head>
+  <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+    vlink="#551a8b">
+    <h3> <img alt="" src="../sun.gif" align="middle" width="100"
+        height="98"> SAOImage DS9 Version 7 Release Notes</h3>
+    <ol>
+      <ol>
+        <li><tt>10.18.2010 SCALE: fixed a problem preserve Scale at
+            load.</tt></li>
+        <li><tt>10.18.2010 REGION: add group new, group update, and
+            select invert commands.</tt></li>
+        <li><tt>10.20.2010 TCL/TK: update to version 8.5.9.</tt></li>
+        <li><tt>12.01.2010 FOV: Add HEASARC/Suzaku templates for HXD,
+            XIS, and XRS</tt></li>
+        <li><tt>12.03.2010 CATALOGS: fixed a problem when dec is
+            specified as -00:xx:xx for CXC, SIMBAD, SKYBOT, and SKYVIEW</tt></li>
+        <li><tt>12.07.2010 BINNING: update WCS keywords for FITS
+            bintables</tt></li>
+        <li><tt>12.10.2010 GUI: fixed a problem with displaying greek
+            letters under linux.</tt></li>
+        <li><tt>12.24.2010 MOSAIC: fixed a problem introduced with
+            verison 6.1 with wcs mosaics when first segment is flipped.</tt></li>
+        <li><tt>12.24.2010 MOSAIC: removed the FLT_EPSILON fudge factors
+            in calculating mosaic segment matrices.</tt></li>
+        <li><tt>01.04.2011 SOLARIS: fixed a major bug with color
+            allocation.</tt></li>
+        <li><tt>02.03.2011 POSTSCRIPT: all ports now generate identical
+            postscript output (with a minor exception with ast grid
+            numerics).</tt></li>
+        <li><tt>02.03.2011 TEXT: selecting a TEXT region now handles
+            rotated text correctly.</tt></li>
+        <li><tt>02.18.2011 GROUPS: fixed a problem with selecting
+            multiple regions.</tt></li>
+        <li><tt>02.21.2011 PIXELTABLE: fixed two problems with xpa and
+            copy commands.</tt></li>
+        <li><tt>02.28.2011 GUI: add theme options.</tt></li>
+        <li><tt>03.01.2011 TKTABLE: updated to version 2.10.</tt></li>
+        <li><tt>03.03.2011 POSTSCRIPT: add new scale factor.</tt></li>
+        <li><tt>03.02.2011 GUI: all dialogs now use the new ttk widgets
+            (with a few exceptions).</tt></li>
+        <li><tt>03.04.2011 PREFS: add -bg and -nan xpa/command line
+            options.</tt></li>
+        <li><tt>03.14.2011 MOSAIC: added patch from Frank Valdes for
+            default DETSIZE values.</tt></li>
+        <li><tt>03.14.2011 CMAP: add load/save xpa/command line options.</tt></li>
+        <li><tt>03.14.2011 BACKUP: fixed a problem with saved cmaps.
+            Pathname is now relative.</tt></li>
+        <li><tt>03.17.2011 TKIMG: updated to version 1.4.</tt></li>
+        <li><tt>03.17.2011 ZLIB: updated to version 1.2.5</tt></li>
+        <li><tt>03.18.2011 WCSSUBS: updated to version 3.8.2</tt></li>
+        <li><tt>04.05.2011 AST: updated to version 5.6-0</tt></li>
+        <li><tt>04.05.2011 WCS: fixed/improved support for TNX, ZPN,
+            ZPX, CAR.</tt></li>
+        <li><tt>04.25.2011 WCS: use AST for most WCS functions.</tt></li>
+        <li><tt>04.25.2011 SCALE: fix Scale Dialog formating issues.</tt></li>
+        <li><tt>04.26.2011 HELP: All user manual images are now local.</tt></li>
+        <li><tt>04.26.2011 CONTOUR: fixed problem with generating
+            contours with BITPIX=-64.</tt></li>
+        <li><tt>04.26.2011 SMOOTH: now generates BITPIX=-64 image.</tt></li>
+        <li><tt>04.27.2011 SCALE: fixed a problem with setting scale
+            user limits and then loading an image.</tt></li>
+        <li><tt>04.28.2011 EXTERNAL FILE: fixed a problem with macro
+            substitution $filename.</tt></li>
+        <li><tt>04.28.2011 FUNTOOLS: updated to version 1.4.5.</tt></li>
+        <li><tt>04.28.2011 XPA: reinstalled version 2.1.13.</tt></li>
+        <li><tt>05.02.2011 WCS: use AST for all FITS WCS projections and
+            DSS. Use WCSSUBS for TNX, ZPX, SIP, SCAMP, WCSDEP.</tt></li>
+        <li><tt>05.06.2011 WCS: Added additional reverse transformation
+            (thanks Ed Los) for calculation of Panner WCS compass.</tt></li>
+        <li><tt>05.09.2011 GRID: add support for non-standard WCSDEP
+            keyword.</tt></li>
+        <li><tt>05.12.2011 IMGSVR: for all image servers
+            (2mass,dss,first,nvss,skyview) if invoked with no argument,
+            yet dialog has a name or coords, automatically retreive the
+            image.</tt></li>
+        <li><tt>05.12.2011 FITS: External File support- fixed a problem
+            where the channel was not closed after the open pipe cmd was
+            invoked and ds9 would run out of resources.</tt></li>
+        <li><tt>05.13.2011 GUI: enhanced/implemented Match/Lock
+            Crosshairs.</tt></li>
+        <li><tt>05.13.2011 GUI: enhanced/implemented Match/Lock Frames.</tt></li>
+        <li><tt>05.13.2011 GUI: Moved Match Scale/Bin/Colorbar to
+            respective menus.</tt></li>
+        <li><tt>05.16.2011 CONTOUR: fixed a problem with NAN in data.</tt></li>
+        <li><tt>05.17.2011 CATALOGS: NED fixed a problem with getURL and
+            added support for in/out sys/sky formats.</tt></li>
+        <li><tt>05.19.2011 CATALOGS: SIMBAD added support for in/out
+            sys/sky formats.</tt></li>
+        <li><tt>05.19.2011 CATALOGS: CDS added support for in/out
+            sys/sky formats.</tt></li>
+        <li><tt>05.20.2011 COMPOSITE: speed up create/delete composite
+            region with +1000 regions.</tt></li>
+        <li><tt>05.20.2011 WCS: implemented preferred WCS for each
+            frame. All WCS functions use the preferred WCS (i.e.
+            copy/paste/load/save regions, contours, align, match, lock,
+            rgb, cube).</tt></li>
+        <li><tt>05.25.2011 WCSSUBS: updated to version 3.8.3.</tt></li>
+        <li><tt>05.25.2011 AST: updated to version 5.7-0.</tt></li>
+        <li><tt>05.26.2011 WCS: use AST for TNX,ZPX,SCAMP.</tt></li>
+        <li><tt>05.27.2011 REGIONS: if unable to copy/cut/paste in WCS,
+            fall back upon PHYSICAL.</tt></li>
+        <li><tt>05.27.2011 REGIONS: if unable to map coordinates
+            correctly, do not a region.</tt></li>
+        <li><tt>06.03.2011 WCS: added support for xLON/xLAT and xyLN
+            xyLT WCS.</tt></li>
+        <li><tt>06.03.2011 REGIONS: added regions properites commands to
+            xpa,samp, and command line.</tt></li>
+        <li><tt>06.10.2011 HEALPIX: added support for generating an
+            image from a healpix table (both binary and ascii).</tt></li>
+        <li><tt>06.13.2011 WCS: use AST for all WCS including TAN-SIP
+            and WCSDEP.</tt></li>
+        <li><tt>06.16.2011 SAMP: added code to clean up better when DS9
+            is unable to parse a SAMP hub file.</tt></li>
+        <li><tt>06.16.2011 REGIONS: be sure to return template id when
+            created.</tt></li>
+        <li><tt>06.16.2011 ANALYSIS: added autoload support for analysis
+            files. DS9 will search a list of known dirs for *.ds9, at
+            which DS9 will load the analysis file, and add the path to
+            env(PATH).</tt></li>
+        <li><tt>06.20.2011 RGB: fixed a problem where the calculated wcs
+            rotation between two frames was reset.</tt></li>
+        <li><tt>06.27.2011 REGIONS: fixed a problem the ds9, ciao, and
+            pros regions parser. The parsers will now accept arcmin and
+            arcsec syntax which includes sciencetific notation.</tt></li>
+        <li><tt>07.07.2011 POSTSCRIPT: generate postscipt now uses
+            generic font names reguardless of platform and window
+            manager.</tt></li>
+        <li><tt>07.08.2011 BIN: split mousewheel preferences between
+            zoom and binning. By default, a bin file is zoom'd in/out
+            with the mouse wheel, unless the binning mouse wheel is
+            enabled via the preferences.</tt></li>
+        <li><tt>07.08.2011 GUI: add preference for standard dialog box
+            for order of file types.</tt></li>
+        <li><tt>07.21.2011 GUI: all non-modal dialogs have Edit menu.</tt></li>
+        <li><tt>07.21.2011 DATACUBE: add match/lock slice commands.</tt></li>
+        <li><tt>07.22.2011 AST: updated to version 5.7-2</tt></li>
+        <li><tt>07.22.2011 WCS: speedup generating sexagesimal output</tt></li>
+        <li><tt>07.25.2011 BIN: fixed a problem with the update filter
+            function.</tt></li>
+        <li><tt>07.29.2011 DIALOGS: fixed a problem with the motif
+            dialogbox and selection of the initial directory. Set the
+            code to the same as tkfmbox.tcl.</tt></li>
+        <li><tt>08.22.2011 WCS: if CTYPE is not of known type, assume
+            LINEAR.</tt></li>
+        <li><tt>08.26.2011 PANNER: simplified compass prefs.</tt></li>
+        <li><tt>09.19.2011 WCS: only use A_ and B_ keywords if CTYPE is
+            TAN-SIP. Ignore otherwise.</tt></li>
+        <li><tt>09.26.2011 REGIONS: use ::math::fuzzy for comparisons in
+            basepanda, composite, and convert.</tt></li>
+        <li><tt>09.27.2011 WCSSUBS: updated to version 3.8.4.</tt></li>
+        <li><tt>09.30.2011 REGIONS: implemented M_PI_2, M_TWOMPI
+            constants.</tt></li>
+        <li><tt>09.30.2011 REGIONS: use fuzzy math for degToRad() and
+            radToDeg()</tt></li>
+        <li><tt>10.04.2011 WCS: pass any PV and QV keywords if present,
+            regardless of projection.</tt></li>
+        <li><tt>10.05.2011 AST: updated to version 5.7-3</tt></li>
+        <li><tt>10.24.2011 REGIONS: fixed a problem with angs and PANDA,
+            EPANDA, and BPANDA and copy/paste in FK5. This is related to
+            the fuzzy math changes made earlier.</tt></li>
+        <li><tt>10.25.2011 FITSY++: fixed a problem finding cols by name
+            in bin tables. Previous 'R' would be matched by 'RA'.</tt></li>
+        <li><tt>10.28.2011 HV: remove
+            NED,SIMBAD,ADS,TDC,SKYVIEW,W3BROWSE from ANALYSIS:ARCHIVES
+            menu due to lack of support from sites.</tt></li>
+        <li><tt>10.28.2011 COLORMAP: add colormap server to colormap
+            dialog</tt></li>
+        <li><tt>11.01.2011 PRINT COORDINATES: now uses default skyframe
+            and skyformat (as defined by WCS menu).</tt></li>
+        <li><tt>11.04.2011 SCALE: add asinh() and sinh() scales.</tt></li>
+        <li><tt>11.10.2011 CROP: add new crop commands.</tt></li>
+        <li><tt>12.09.2011 AST: updated to version 6.0-1</tt></li>
+        <li><tt>12.09.2011 CROSSHAIR: fixed an issue with coordinates of
+            crosshair were .5 pixel off in Y.</tt></li>
+        <li><tt>12.09.2011 GUI: fixed an issue with centerimage() was .5
+            pixel off in Y.</tt></li>
+        <li><tt>12.15.2011 GRID: fixed an issue with text upside down.</tt></li>
+        <li><tt>01.03.2012 BIN: fixed a problem with depth of a 3d bin'd
+            table.</tt></li>
+        <li><tt>01.03.2012 GRID: DSS and Linear projections use AST.</tt></li>
+        <li><tt>01.17.2012 3D: 3D Frame is now available.</tt></li>
+        <li><tt>01.19.2012 ANALYSIS: added $z macro.</tt></li>
+        <li><tt>01.19.2012 CROP: add [xmin:xmax,ymin:ymax,zmin:zmax]
+            syntax</tt></li>
+        <li><tt>01.19.2012 CROP: check for valid crop with [] syntax.</tt></li>
+        <li><tt>01.23.2012 3D: add current slice highlite.</tt></li>
+        <li><tt>01.23.2012 SAVEAS: fixed a problem with frame highlite
+            during saveas process.</tt></li>
+        <li><tt>01.23.2012 ANALYSIS: expand $image macro to accept new
+            params: rgb and 3d.</tt></li>
+        <li><tt>01.27.2012 ANALYSIS: expand $filename(full) to return
+            full filename (without cropping or filters parameters).</tt></li>
+        <li><tt>01.27.2012 ANALYSIS: add macro $value.</tt></li>
+        <li><tt>01.27.2012 CROP: fixed a problem when using an image
+            subsection spec for a datacube.</tt></li>
+        <li><tt>01.28.2012 REGIONS: clean up rendering code for
+            X,ps,win32,macosx to reduce un-needed calls to set the
+            graphics context.</tt></li>
+        <li><tt>01.28.2012 CROP: all data cubes can be cropped in 3D.</tt></li>
+        <li><tt>01.28.2012 CROP: cropping in 3D will reset currentSlice
+            if needed.</tt></li>
+        <li><tt>01.28.2012 REGIONS: fixed a problem if the region color
+            was an X11 valid color, some names would get mapped to the
+            incorrect color when printing.</tt></li>
+        <li><tt>02.02.2012 COLORMAP: fixed a problem with SAO format
+            colormaps that have very long lines.</tt></li>
+        <li><tt>02.03.2012 PRINT COORDINATES: added filename to options.</tt></li>
+        <li><tt>02.03.2012 WCS: if wcs parameters are changed or reset,
+            all open catalogs regions are updated. Normal regions are
+            not changed.</tt></li>
+        <li><tt>02.07.2012 COLORMAP: remove support for old RTD and ITT
+            colormaps</tt></li>
+        <li><tt>02.08.2012 GUI: consolidate MATCH and LOCK items into
+            submenus.</tt></li>
+        <li><tt>02.08.2012 GUI: move match bin, match scale, and match
+            colorbar to frame match menu.</tt></li>
+        <li><tt>02.16.2012 CUBE: fixed a proble with calculating the wcs
+            to image for axis 3.</tt></li>
+        <li><tt>02.16.2012 FITSY++: changes required for gcc 4.7.</tt></li>
+        <li><tt>02.16.2012 BLT: patched graph.tcl to use legendRelief
+            instead of labelRelief.</tt></li>
+        <li><tt>02.16.2012 RGB: added lock wcs.</tt></li>
+        <li><tt>02.16.2012 FUNTOOLS: updated to version 1.4.5-2.</tt></li>
+        <li><tt>02.21.2012 3D: fixed a problem with scale clip scope.
+            Should alway be in GLOBAL.</tt></li>
+        <li><tt>02.29.2012 HEADER: add save header command.</tt></li>
+        <li><tt>03.01.2012 XPA: updated to version 2.1.14.</tt></li>
+        <li><tt>03.01.2012 MINMAX: AUTOSCAN set to SAMPLE if
+            width*height*depth > 1e8.</tt></li>
+        <li><tt>03.12.2012 IMGSVR: fixed a problem with clearing params
+            if no image was loaded previously.</tt></li>
+        <li><tt>03.22.2012 REGION: add ellipse3d, box3d, polygon3d,
+            point3d regions.</tt></li>
+        <li><tt>03.23.2012 IMGSVR: fixed a problem new frame option and
+            rgb.</tt></li>
+        <li><tt>03.23.2012 BIN: check for valid col names for -bin col
+            command.</tt></li>
+        <li><tt>03.28.2012 REGIONS: add Analysis support per region.</tt></li>
+        <li><tt>03.28.2012 REGIONS: add Plot3d support for
+            Circle,Ellipse,Box,Polygon,Point.</tt></li>
+        <li><tt>03.28.2012 REGIONS: add Plot2d support for
+            Projection,Line,Vector.</tt></li>
+        <li><tt>03.28.2012 REGIONS: Circle3d now converted to Circle.</tt></li>
+        <li><tt>03.28.2012 REGIONS: Plot3d saves native coordinate
+            values.</tt></li>
+        <li><tt>03.28.2012 SCALE: simplified scale dialog controls to
+            allow user values.</tt></li>
+        <li><tt>03.29.2012 WCS: fixed a problem with numaxes > 3
+            images and editing WCS params.</tt></li>
+        <li><tt>04.09.2012 WCS: second attempt to handle non-equatorial
+            wcs. try to build a legal header from the wcssubs struct to
+            feed to ast.</tt></li>
+        <li><tt>04.10.2012 SCALE: fixed an issue with autocut, ll != hh.</tt></li>
+        <li><tt>04.10.2012 SKYVIEW: add WISE/COBE/WMAP to skyview survey
+            menu.</tt></li>
+        <li><tt>04.10.2012 WCS: if CD matrix is all zero, use cdelt/pc
+            matrix.</tt></li>
+        <li><tt>04.11.2012 SMOOTH: fixed a problem with images with
+            BSCALE/BZERO.</tt></li>
+        <li><tt>04.11.2012 CATALOG: fixed a problem with d:m:s formated
+            DEC which started with a '+'</tt></li>
+        <li><tt>04.12.2012 CATALOG: fixed a problem with d:m:s to degree
+            conversion. Try to maintain higher precision.</tt></li>
+        <li><tt>04.12.2012 CATALOG: add IAU location code to dialog.</tt></li>
+        <li><tt>04.13.2012 COLORMAP: add user contributed cmaps.</tt></li>
+        <li><tt>04.18.2012 GUI: fixed a problem with long WCSNAME
+            values.</tt></li>
+        <li><tt>04.20.2012 FITSY: added support for GZIP compresss
+            parameter ZQUANTIZ.</tt></li>
+        <li><tt>04.23.2012 PS: fixed a bug with definiton of 32 bit
+            integers on 64 bit OS.</tt></li>
+        <li><tt>04.23.2012 PREFS: add Text Dialog Font preferences menu.</tt></li>
+        <li><tt>04.23.2012 LOCK: fixed a problem with lock frame and
+            mouse wheel events.</tt></li>
+        <li><tt>04.24.2012 SKYBOT: Look for EXPTIME and add 1/2 to
+            DATE-OBS to get middle of observation.</tt></li>
+        <li><tt>04.24.2012 LINUX64: add --hash-style=both to support old
+            and new GNU API for hash libs.</tt></li>
+        <li><tt>04.26.2012 PHOTO: add support for other image formats.</tt></li>
+        <li><tt>04.26.2012 EXPORT: add support for exporting to other
+            image formats.</tt></li>
+        <li><tt>04.30.2012 WCS: fixed a problem with TAN-SIP and wcs
+            append/replace.</tt></li>
+        <li><tt>05.01.2012 TCL: check to see if packages msgcat and http
+            have already been found before sourcing during startup.</tt></li>
+        <li><tt>05.03.2012 MPEG: fixed a problem with the bottom of an
+            image cut off.</tt></li>
+        <li><tt>05.07.2012 COLORTAG: add color tags.</tt></li>
+        <li><tt>05.10.2012 CROP: fixed a problem with backup and lock
+            crop.</tt></li>
+        <li><tt>05.10.2012 SCALE: fixed a problem lock scale and crop.</tt></li>
+        <li><tt>05.10.2012 BACKUP: fixed a problem with back and -slice,
+            -mosaic load options.</tt></li>
+        <li><tt>05.11.2012 REGIONS: add auto plot2d and plot3d prefs.</tt></li>
+        <li><tt>05.14.2012 GUI: add fits save.</tt></li>
+        <li><tt>05.17.2012 MPEG: updated to ezMPEG v0.1</tt></li>
+        <li><tt>05.17.2012 AST: updated to 7.0.3</tt></li>
+        <li><tt>05.23.2012 WCS: is always displayed</tt></li>
+        <li><tt>05.23.2012 CATALOG: fixed a problem with the sign of
+            d:m:s conversion introduced on 04.12.2012.</tt></li>
+        <li><tt>05.28.2012 MOVIE: minor tweaks on incr slice during
+            movie.</tt></li>
+        <li><tt>05.28.2012 WIN32: fixed a problem with 3d fillImageJoin.
+            Statck overflow.</tt></li>
+        <li><tt>05.29.2012 BACKUP: fixed active frames issue.</tt></li>
+        <li><tt>05.30.2012 GUI: add threads command.</tt></li>
+        <li><tt>05.30.2012 GUI: fixed a problem with PASTE for entries.
+            Will now process unicode.</tt></li>
+        <li><tt>05.31.2012 GRID: fixed a problem with parsing 6.1 and
+            6.2 backup save sets. New grid options parser implemented.</tt></li>
+        <li><tt>05.31.2012 PLOT: fixed a problem in generating
+            postscript. Now just set plot size.</tt></li>
+        <li><tt>05.31.2012 PLOT: fixed a postscript font issue with
+            helvetica.</tt></li>
+        <li><tt>05.31.2012 PLOT: add axes format.</tt></li>
+        <li><tt><b>06.15.2012 RELEASE version 7.0</b></tt></li>
+      </ol>
+    </ol>
+  </body>
 </html>
diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc
index e79fbe0..b889dd9 100644
--- a/ds9/win/ds9.rc
+++ b/ds9/win/ds9.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-#define VV "7.0 beta 21"
+#define VV "7.0"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    7,0,0,0
diff --git a/make.pkgs b/make.pkgs
index 62b1695..c439aa9 100644
--- a/make.pkgs
+++ b/make.pkgs
@@ -1,6 +1,6 @@
 #--------------------------basic
 
-DS9VERSION= 7.0b21
+DS9VERSION= 7.0
 XPAVERSION= 2.1.14
 
 #--------------------------version
diff --git a/msgs/cs.msg b/msgs/cs.msg
index bed4995..9334627 100644
--- a/msgs/cs.msg
+++ b/msgs/cs.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset cs {Axis Range} [encoding convertfrom iso8859-2 {Rozsah osy}]
 ::msgcat::mcset cs {2D} 
 ::msgcat::mcset cs {3D} 
 ::msgcat::mcset cs {A postscript generation error has occurred} [encoding convertfrom iso8859-2 {Chyba pøi generování postscriptu}]
@@ -579,7 +578,6 @@
 ::msgcat::mcset cs {Quadratic} 
 ::msgcat::mcset cs {RGB} 
 ::msgcat::mcset cs {Radius} 
-::msgcat::mcset cs {Range} 
 ::msgcat::mcset cs {Redo} 
 ::msgcat::mcset cs {Red} 
 ::msgcat::mcset cs {Reference Manual} [encoding convertfrom iso8859-2 {Seznam pøíkazù}]
@@ -758,16 +756,15 @@
 ::msgcat::mcset cs {Words matching title, description} 
 ::msgcat::mcset cs {Writing Catalog} 
 ::msgcat::mcset cs {X Axis Label} 
-::msgcat::mcset cs {X Axis} 
 ::msgcat::mcset cs {XPA Information} 
 ::msgcat::mcset cs {XPA not initialized} [encoding convertfrom iso8859-2]
 ::msgcat::mcset cs {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset cs {XPA} 
 ::msgcat::mcset cs {X} 
 ::msgcat::mcset cs {Y Axis Label} [encoding convertfrom iso8859-2 {Popisek Y osy}]
-::msgcat::mcset cs {Y Axis} [encoding convertfrom iso8859-2 {Osa Y}]
 ::msgcat::mcset cs {Yellow} [encoding convertfrom iso8859-2 {®lutá}]
 ::msgcat::mcset cs {Yes} [encoding convertfrom iso8859-2 {Ano}]
+::msgcat::mcset cs {Y} 
 ::msgcat::mcset cs {ZScale Parameters} [encoding convertfrom iso8859-2 {Parametry ZScale}]
 ::msgcat::mcset cs {Zero} [encoding convertfrom iso8859-2 {Nula}]
 ::msgcat::mcset cs {Zoom In} [encoding convertfrom iso8859-2 {Zvìt¹it}]
@@ -782,8 +779,6 @@
 ::msgcat::mcset cs {grey} [encoding convertfrom iso8859-2 {¹edá}]
 ::msgcat::mcset cs {g} 
 ::msgcat::mcset cs {heat} [encoding convertfrom iso8859-2 {horko}]
-::msgcat::mcset cs {inches} 
-::msgcat::mcset cs {mm} 
 ::msgcat::mcset cs {or center of data} 
 ::msgcat::mcset cs {rainbow} [encoding convertfrom iso8859-2 {duha}]
 ::msgcat::mcset cs {red} [encoding convertfrom iso8859-2 {èervená}]
diff --git a/msgs/da.msg b/msgs/da.msg
index 1fc4fae..c094599 100644
--- a/msgs/da.msg
+++ b/msgs/da.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset da {Axis Range} [encoding convertfrom iso8859-1 {Akse intervallængde}]
 ::msgcat::mcset da {2D} 
 ::msgcat::mcset da {3D} 
 ::msgcat::mcset da {A postscript generation error has occurred} [encoding convertfrom iso8859-1 {En fejl er opstået under postscript generering}]
@@ -579,7 +578,6 @@
 ::msgcat::mcset da {Quadratic} {Kvadratisk}
 ::msgcat::mcset da {RGB} 
 ::msgcat::mcset da {Radius} 
-::msgcat::mcset da {Range} {vidde}
 ::msgcat::mcset da {Redo} {Gentag sidste}
 ::msgcat::mcset da {Red} [encoding convertfrom iso8859-1 {Rød}]
 ::msgcat::mcset da {Reference Manual} 
@@ -758,16 +756,15 @@
 ::msgcat::mcset da {Words matching title, description} {Ord tilpasset titel, beskrivelse }
 ::msgcat::mcset da {Writing Catalog} 
 ::msgcat::mcset da {X Axis Label} {X akse tekst}
-::msgcat::mcset da {X Axis} {X akse}
 ::msgcat::mcset da {XPA Information} {XPA information}
 ::msgcat::mcset da {XPA not initialized} {XPA ikke startet}
 ::msgcat::mcset da {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset da {XPA} 
 ::msgcat::mcset da {X} 
 ::msgcat::mcset da {Y Axis Label} {Y akse tekst}
-::msgcat::mcset da {Y Axis} {Y akse}
 ::msgcat::mcset da {Yellow} {Gul}
 ::msgcat::mcset da {Yes} {Ja}
+::msgcat::mcset da {Y} 
 ::msgcat::mcset da {ZScale Parameters} 
 ::msgcat::mcset da {Zero} {Nul}
 ::msgcat::mcset da {Zoom In} {Zoom ind}
@@ -782,8 +779,6 @@
 ::msgcat::mcset da {grey} [encoding convertfrom iso8859-1 {grå}]
 ::msgcat::mcset da {g} 
 ::msgcat::mcset da {heat} 
-::msgcat::mcset da {inches} 
-::msgcat::mcset da {mm} 
 ::msgcat::mcset da {or center of data} {eller center for data}
 ::msgcat::mcset da {rainbow} {regnbue}
 ::msgcat::mcset da {red} 
diff --git a/msgs/de.msg b/msgs/de.msg
index 73911d9..7193ad4 100644
--- a/msgs/de.msg
+++ b/msgs/de.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset de {Axis Range} {Achsenbereich}
 ::msgcat::mcset de {2D} 
 ::msgcat::mcset de {3D} 
 ::msgcat::mcset de {A postscript generation error has occurred} {Beim Erstellen von Postscript ist ein Fehler aufgetreten} 
@@ -579,7 +578,6 @@
 ::msgcat::mcset de {Quadratic} {Quadratisch}
 ::msgcat::mcset de {RGB} 
 ::msgcat::mcset de {Radius} 
-::msgcat::mcset de {Range} {Bereich}
 ::msgcat::mcset de {Redo} {Wiederholen}
 ::msgcat::mcset de {Red} {Rot}
 ::msgcat::mcset de {Reference Manual} {Referenzhandbuch}
@@ -758,16 +756,15 @@
 ::msgcat::mcset de {Words matching title, description} {Worte im Titel, Bezeichnung}
 ::msgcat::mcset de {Writing Catalog} 
 ::msgcat::mcset de {X Axis Label} {X-Achsenbeschriftung}
-::msgcat::mcset de {X Axis} {X-Achse}
 ::msgcat::mcset de {XPA Information} 
 ::msgcat::mcset de {XPA not initialized} {XPA nicht initialisiert}
 ::msgcat::mcset de {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset de {XPA} 
 ::msgcat::mcset de {X} 
 ::msgcat::mcset de {Y Axis Label} {Y-Achsenbeschriftung}
-::msgcat::mcset de {Y Axis} {Y-Achse}
 ::msgcat::mcset de {Yellow} {Gelb}
 ::msgcat::mcset de {Yes} {Ja}
+::msgcat::mcset de {Y} 
 ::msgcat::mcset de {ZScale Parameters} 
 ::msgcat::mcset de {Zero} 
 ::msgcat::mcset de {Zoom In} {Hineinzoomen}
@@ -782,8 +779,6 @@
 ::msgcat::mcset de {grey} 
 ::msgcat::mcset de {g} 
 ::msgcat::mcset de {heat} 
-::msgcat::mcset de {inches} 
-::msgcat::mcset de {mm} 
 ::msgcat::mcset de {or center of data} {oder Zentrum der Daten}
 ::msgcat::mcset de {rainbow} 
 ::msgcat::mcset de {red} 
diff --git a/msgs/es.msg b/msgs/es.msg
index 5a7b6eb..4ec8f72 100644
--- a/msgs/es.msg
+++ b/msgs/es.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset es {Axis Range} {Rango del eje}
 ::msgcat::mcset es {2D} 
 ::msgcat::mcset es {3D} 
 ::msgcat::mcset es {A postscript generation error has occurred} [encoding convertfrom iso8859-1 {Un error ha ocurrido en la generación del fichero postscript}]
@@ -579,7 +578,6 @@
 ::msgcat::mcset es {Quadratic} [encoding convertfrom iso8859-1 {Cuadrático}]
 ::msgcat::mcset es {RGB} 
 ::msgcat::mcset es {Radius} {Radio}
-::msgcat::mcset es {Range} {Rango}
 ::msgcat::mcset es {Redo} {Rehacer}
 ::msgcat::mcset es {Red} {Rojo}
 ::msgcat::mcset es {Reference Manual} {Manual de referencia}
@@ -758,16 +756,15 @@
 ::msgcat::mcset es {Words matching title, description} [encoding convertfrom iso8859-1 {Palabras que coincidan con el título, descripción}]
 ::msgcat::mcset es {Writing Catalog} 
 ::msgcat::mcset es {X Axis Label} {Etiqueta del eje X}
-::msgcat::mcset es {X Axis} {Eje X}
 ::msgcat::mcset es {XPA Information} [encoding convertfrom iso8859-1 {Información XPA}]
 ::msgcat::mcset es {XPA not initialized} {XPA no inicializado}
 ::msgcat::mcset es {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset es {XPA} 
 ::msgcat::mcset es {X} 
 ::msgcat::mcset es {Y Axis Label} {Etiqueta del eje Y}
-::msgcat::mcset es {Y Axis} {Eje Y}
 ::msgcat::mcset es {Yellow} {Amarillo}
 ::msgcat::mcset es {Yes} [encoding convertfrom iso8859-1 {Sí}]
+::msgcat::mcset es {Y} 
 ::msgcat::mcset es {ZScale Parameters} [encoding convertfrom iso8859-1 {Parámetros de la escala Z}]
 ::msgcat::mcset es {Zero} 
 ::msgcat::mcset es {Zoom In} {Aumentar}
@@ -782,8 +779,6 @@
 ::msgcat::mcset es {grey} {gris}
 ::msgcat::mcset es {g} 
 ::msgcat::mcset es {heat} 
-::msgcat::mcset es {inches} 
-::msgcat::mcset es {mm} 
 ::msgcat::mcset es {or center of data} {o centro de los datos}
 ::msgcat::mcset es {rainbow} 
 ::msgcat::mcset es {red} 
diff --git a/msgs/fr.msg b/msgs/fr.msg
index dfc0dfc..10e6960 100644
--- a/msgs/fr.msg
+++ b/msgs/fr.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset fr {Axis Range} {Intervalle de l'axe}
 ::msgcat::mcset fr {2D} 
 ::msgcat::mcset fr {3D} 
 ::msgcat::mcset fr {A postscript generation error has occurred}  [encoding convertfrom iso8859-1 {Une erreur de génération de postscript s'est produite}]
@@ -579,7 +578,6 @@
 ::msgcat::mcset fr {Quadratic} 
 ::msgcat::mcset fr {RGB} 
 ::msgcat::mcset fr {Radius} 
-::msgcat::mcset fr {Range} 
 ::msgcat::mcset fr {Redo} {Refaire}
 ::msgcat::mcset fr {Red} 
 ::msgcat::mcset fr {Reference Manual} 
@@ -758,16 +756,15 @@
 ::msgcat::mcset fr {Words matching title, description} 
 ::msgcat::mcset fr {Writing Catalog} 
 ::msgcat::mcset fr {X Axis Label} 
-::msgcat::mcset fr {X Axis} 
 ::msgcat::mcset fr {XPA Information} 
 ::msgcat::mcset fr {XPA not initialized} 
 ::msgcat::mcset fr {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset fr {XPA} 
 ::msgcat::mcset fr {X} 
 ::msgcat::mcset fr {Y Axis Label} 
-::msgcat::mcset fr {Y Axis} 
 ::msgcat::mcset fr {Yellow} 
 ::msgcat::mcset fr {Yes} 
+::msgcat::mcset fr {Y} 
 ::msgcat::mcset fr {ZScale Parameters} 
 ::msgcat::mcset fr {Zero} 
 ::msgcat::mcset fr {Zoom In} 
@@ -782,8 +779,6 @@
 ::msgcat::mcset fr {grey} 
 ::msgcat::mcset fr {g} 
 ::msgcat::mcset fr {heat} 
-::msgcat::mcset fr {inches} 
-::msgcat::mcset fr {mm} 
 ::msgcat::mcset fr {or center of data} 
 ::msgcat::mcset fr {rainbow} 
 ::msgcat::mcset fr {red} 
diff --git a/msgs/ja.msg b/msgs/ja.msg
index 4ef75e2..b0600aa 100644
--- a/msgs/ja.msg
+++ b/msgs/ja.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset ja {Axis Range} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xc8\xcf\xb0\xcf"]
 ::msgcat::mcset ja {2D} 
 ::msgcat::mcset ja {3D} [encoding convertfrom euc-jp "\x33\xbc\xa1\xb8\xb5"]
 ::msgcat::mcset ja {A postscript generation error has occurred} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xc8\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xa5\xd5\xa5\xa1\xa5\xa4\xa5\xeb\xba\xee\xc0\xae\xa4\xcb\xbc\xba\xc7\xd4\xa4\xb7\xa4\xde\xa4\xb7\xa4\xbf\xa1\xa3"]
@@ -579,7 +578,6 @@
 ::msgcat::mcset ja {Quadratic} 
 ::msgcat::mcset ja {RGB} [encoding convertfrom euc-jp "\x52\x47\x42\xbf\xa7"]
 ::msgcat::mcset ja {Radius} [encoding convertfrom euc-jp "\xc8\xbe\xb7\xc2"]
-::msgcat::mcset ja {Range} [encoding convertfrom euc-jp "\xc8\xcf\xb0\xcf"]
 ::msgcat::mcset ja {Redo} [encoding convertfrom euc-jp "\xa4\xe2\xa4\xa6\xb0\xec\xc5\xd9"]
 ::msgcat::mcset ja {Red} [encoding convertfrom euc-jp "\xc0\xd6\xbf\xa7"]
 ::msgcat::mcset ja {Reference Manual} [encoding convertfrom euc-jp "\xa5\xea\xa5\xd5\xa5\xa1\xa5\xec\xa5\xf3\xa5\xb9\xa5\xde\xa5\xcb\xa5\xe5\xa5\xa2\xa5\xeb"]
@@ -758,16 +756,15 @@
 ::msgcat::mcset ja {Words matching title, description} 
 ::msgcat::mcset ja {Writing Catalog} [encoding convertfrom euc-jp "\xa5\xab\xa5\xbf\xa5\xed\xa5\xb0\xa4\xf2\xbd\xf1\xa4\xad\xbd\xd0\xa4\xb7\xc3\xe6"]
 ::msgcat::mcset ja {X Axis Label} [encoding convertfrom euc-jp "\x58\xbc\xb4\xa5\xe9\xa5\xd9\xa5\xeb"]
-::msgcat::mcset ja {X Axis} [encoding convertfrom euc-jp "\x58\xbc\xb4"]
 ::msgcat::mcset ja {XPA Information} [encoding convertfrom euc-jp "\x58\x50\x41\xa4\xce\xbe\xf0\xca\xf3"]
 ::msgcat::mcset ja {XPA not initialized} [encoding convertfrom euc-jp "\x58\x50\x41\x20\xa4\xac\xbd\xe9\xb4\xfc\xb2\xbd\xa4\xb5\xa4\xec\xa4\xc6\xa4\xa4\xa4\xde\xa4\xbb\xa4\xf3\xa1\xa3"]
 ::msgcat::mcset ja {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset ja {XPA} [encoding convertfrom euc-jp "\x58\x50\x41"]
 ::msgcat::mcset ja {X} 
 ::msgcat::mcset ja {Y Axis Label} [encoding convertfrom euc-jp "\x59\xbc\xb4\xa5\xe9\xa5\xd9\xa5\xeb"]
-::msgcat::mcset ja {Y Axis} [encoding convertfrom euc-jp "\x59\xbc\xb4"]
 ::msgcat::mcset ja {Yellow} [encoding convertfrom euc-jp "\xb2\xab\xbf\xa7"]
 ::msgcat::mcset ja {Yes} [encoding convertfrom euc-jp "\xa4\xcf\xa4\xa4"]
+::msgcat::mcset ja {Y} 
 ::msgcat::mcset ja {ZScale Parameters} [encoding convertfrom euc-jp "\x5a\xa5\xb9\xa5\xb1\xa1\xbc\xa5\xeb\xa4\xce\xc0\xdf\xc4\xea"]
 ::msgcat::mcset ja {Zero} [encoding convertfrom euc-jp "\xce\xed"]
 ::msgcat::mcset ja {Zoom In} [encoding convertfrom euc-jp "\xb3\xc8\xc2\xe7"]
@@ -782,8 +779,6 @@
 ::msgcat::mcset ja {grey} 
 ::msgcat::mcset ja {g} 
 ::msgcat::mcset ja {heat} 
-::msgcat::mcset ja {inches} 
-::msgcat::mcset ja {mm} 
 ::msgcat::mcset ja {or center of data} [encoding convertfrom euc-jp "\xa4\xe2\xa4\xb7\xa4\xaf\xa4\xcf\xa5\xc7\xa1\xbc\xa5\xbf\xa4\xce\xc3\xe6\xbf\xb4"]
 ::msgcat::mcset ja {rainbow} 
 ::msgcat::mcset ja {red} 
diff --git a/msgs/pt.msg b/msgs/pt.msg
index 2683575..1b97fe2 100644
--- a/msgs/pt.msg
+++ b/msgs/pt.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset pt {Axis Range} {Intervalo do eixo}
 ::msgcat::mcset pt {2D} 
 ::msgcat::mcset pt {3D} 
 ::msgcat::mcset pt {A postscript generation error has occurred} {Um erro ocorreu ao gerar o postscript}
@@ -579,7 +578,6 @@
 ::msgcat::mcset pt {Quadratic} [encoding convertfrom iso8859-1 {Quadrático}]
 ::msgcat::mcset pt {RGB} 
 ::msgcat::mcset pt {Radius} {Raio}
-::msgcat::mcset pt {Range} {Intervalo}
 ::msgcat::mcset pt {Redo} {Refazer}
 ::msgcat::mcset pt {Red} {Vermelho}
 ::msgcat::mcset pt {Reference Manual} [encoding convertfrom iso8859-1 {Manual de referência}]
@@ -758,16 +756,15 @@
 ::msgcat::mcset pt {Words matching title, description} 
 ::msgcat::mcset pt {Writing Catalog} 
 ::msgcat::mcset pt {X Axis Label} {Legenda do Eixo X}
-::msgcat::mcset pt {X Axis} {Eixo X}
 ::msgcat::mcset pt {XPA Information} [encoding convertfrom iso8859-1 {Informação sobre o XPA}]
 ::msgcat::mcset pt {XPA not initialized} [encoding convertfrom iso8859-1 {XPA não inicializado}]
 ::msgcat::mcset pt {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset pt {XPA} 
 ::msgcat::mcset pt {X} 
 ::msgcat::mcset pt {Y Axis Label} {Leganda do Eixo Y}
-::msgcat::mcset pt {Y Axis} {Eixo Y}
 ::msgcat::mcset pt {Yellow} {Amarelo}
 ::msgcat::mcset pt {Yes} {Sim}
+::msgcat::mcset pt {Y} 
 ::msgcat::mcset pt {ZScale Parameters} [encoding convertfrom iso8859-1 {Parâmetros da escala Z}]
 ::msgcat::mcset pt {Zero} 
 ::msgcat::mcset pt {Zoom In} {Aumentar}
@@ -782,8 +779,6 @@
 ::msgcat::mcset pt {grey} 
 ::msgcat::mcset pt {g} 
 ::msgcat::mcset pt {heat} 
-::msgcat::mcset pt {inches} 
-::msgcat::mcset pt {mm} 
 ::msgcat::mcset pt {or center of data} {ou centro dos dados}
 ::msgcat::mcset pt {rainbow} 
 ::msgcat::mcset pt {red} 
diff --git a/msgs/zh.msg b/msgs/zh.msg
index 094a24d..d7d9c70 100644
--- a/msgs/zh.msg
+++ b/msgs/zh.msg
@@ -1,4 +1,3 @@
-# ::msgcat::mcset zh {Axis Range} 
 ::msgcat::mcset zh {2D} 
 ::msgcat::mcset zh {3D} 
 ::msgcat::mcset zh {A postscript generation error has occurred} 
@@ -579,7 +578,6 @@
 ::msgcat::mcset zh {Quadratic} 
 ::msgcat::mcset zh {RGB} 
 ::msgcat::mcset zh {Radius} 
-::msgcat::mcset zh {Range} 
 ::msgcat::mcset zh {Redo} 
 ::msgcat::mcset zh {Red} 
 ::msgcat::mcset zh {Reference Manual} 
@@ -758,16 +756,15 @@
 ::msgcat::mcset zh {Words matching title, description} 
 ::msgcat::mcset zh {Writing Catalog} 
 ::msgcat::mcset zh {X Axis Label} 
-::msgcat::mcset zh {X Axis} 
 ::msgcat::mcset zh {XPA Information} 
 ::msgcat::mcset zh {XPA not initialized} 
 ::msgcat::mcset zh {XPA unable to verify hostname, setting XPA_METHOD to LOCAL} 
 ::msgcat::mcset zh {XPA} 
 ::msgcat::mcset zh {X} 
 ::msgcat::mcset zh {Y Axis Label} 
-::msgcat::mcset zh {Y Axis} 
 ::msgcat::mcset zh {Yellow} 
 ::msgcat::mcset zh {Yes} 
+::msgcat::mcset zh {Y} 
 ::msgcat::mcset zh {ZScale Parameters} 
 ::msgcat::mcset zh {Zero} 
 ::msgcat::mcset zh {Zoom In} 
@@ -782,8 +779,6 @@
 ::msgcat::mcset zh {grey} 
 ::msgcat::mcset zh {g} 
 ::msgcat::mcset zh {heat} 
-::msgcat::mcset zh {inches} 
-::msgcat::mcset zh {mm} 
 ::msgcat::mcset zh {or center of data} 
 ::msgcat::mcset zh {rainbow} 
 ::msgcat::mcset zh {red} 
diff --git a/notes.txt b/notes.txt
index bcb1209..7603fcb 100644
--- a/notes.txt
+++ b/notes.txt
@@ -57,36 +57,15 @@ Future:
 	Mosaic Reprojection
 	Astrometry.net
 	Catalog to 3D cube
+	Catalog matching
 
 List
-	-7.0beta
-	  cube dialog wcs/image coords off by 1 (3d.fits)
-
-	  look at bill's bck issue
-	  color tag documentation
-
-	  3d composite region
-	    handles
-	    cb error
-	    refresh
-
-	  tests
-	    linux
-	    solaris
-	    windows
-
-	  scale dialog (local/global)
-	    cube
-	    mosaic
-	    3d
-
 	- 7.1
 	  windows native plot print
 	  check/update blt
 	  update tcl/tk8.6
 	  xpa/samp PhotoCmd
 	  LoadURL Photo
-	  catalog matching
 	  xpa-talk
 
 	  3D other
diff --git a/src/comm.tcl b/src/comm.tcl
index bdb35fb..e3ad923 100644
--- a/src/comm.tcl
+++ b/src/comm.tcl
@@ -52,6 +52,7 @@ proc CommSet {fn paramlist} {
 	dsseso {ProcessESOCmd param i}
 	dssstsci {ProcessSTSCICmd param i}
 	exit {ProcessQuitCmd param i}
+	export {ProcessExportCmd param i}
 	file {ProcessFileCmd param i {} {}}
 	first {ProcessFIRSTCmd param i}
 	fits {ProcessFitsCmd param i {} $fn}
@@ -161,6 +162,7 @@ proc CommGet {proc id paramlist fn} {
 	dsseso {ProcessSendESOCmd $proc $id $param}
 	dssstsci {ProcessSendSTSCICmd $proc $id $param}
 	exit {}
+	export {}
 	file {ProcessSendFileCmd $proc $id $param}
 	first {ProcessSendFIRSTCmd $proc $id $param}
 	fits {ProcessSendFitsCmd $proc $id $param {} $fn}
diff --git a/src/ds9.tcl b/src/ds9.tcl
index e54661d..71d9c48 100755
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
@@ -7,7 +7,7 @@ proc DS9Def {} {
     global pds9
 
     set ds9(title) "$ds9(app)"
-    set ds9(version) {7.0 beta 21}
+    set ds9(version) {7.0}
 
     set ds9(top) .
     set ds9(mb) .mb
diff --git a/src/mhelp.tcl b/src/mhelp.tcl
index a26b94c..5d90d7a 100644
--- a/src/mhelp.tcl
+++ b/src/mhelp.tcl
@@ -30,6 +30,7 @@ proc HelpMenu {mb} {
 	-command HelpStory
     $mb.help add command -label [msgcat::mc {Acknowledgment}] \
 	-command HelpAck
+    $mb.help add separator
     $mb.help add command -label [msgcat::mc {DS9 Home Page}] \
 	-command HelpHome
 }
diff --git a/tests/command.sh b/tests/command.sh
index 65d099d..53ed4bc 100755
--- a/tests/command.sh
+++ b/tests/command.sh
@@ -96,7 +96,7 @@ testit "-array 'array.arr[dim=512,bitpix=-32,arch=bigendian]'"
 doit
 fi
 
-if [ "$1" = "bg" ]; then
+if [ "$1" = "bg" -o -z "$1" ]; then
 initit "bg"
 testit "-background red"
 testit "-bg blue"
@@ -775,7 +775,7 @@ fi
 
 if [ "$1" = "movie" -o -z "$1" ]; then
 initit "movie"
-testit "-movie slice foo.mpg"
+testit "-width 700 -height 400"
 testit "-movie frame foo.mpg"
 testit "-frame new 3d"
 testit "-movie 3d foo.mpg number 1 azfrom 0 azto 0 elfrom 0 elto 0 slfrom 1 slto 1 repeat 1"
@@ -812,14 +812,14 @@ testit "-frame reset"
 doit
 fi
 
-if [ "$1" = "nan" ]; then
+if [ "$1" = "nan" -o -z "$1" ]; then
 initit "nan"
 testit "-nan blue"
 testit "-nan white"
 doit
 fi
 
-if [ "$1" = "nvss" ]; then
+if [ "$1" = "nvss" -o -z "$1" ]; then
 initit "nvss"
 testit "-nvss open"
 testit "-nvss close"
@@ -1044,7 +1044,7 @@ testit "-inet_only"
 doit
 fi
 
-if [ "$1" = "prefs" ]; then
+if [ "$1" = "prefs" -o -z "$1" ]; then
 initit "prefs"
 testit "-prefs clear"
 doit
@@ -1320,7 +1320,7 @@ testit "-single"
 doit
 fi
 
-if [ "$1" = "skyview" ]; then
+if [ "$1" = "skyview" -o -z "$1" ]; then
 initit "skyview"
 testit "-skyview open"
 testit "-skyview close"
diff --git a/tests/samp.sh b/tests/samp.sh
index 9fa68d0..99a09c3 100755
--- a/tests/samp.sh
+++ b/tests/samp.sh
@@ -21,6 +21,7 @@ fi
 testit () {
     echo "Testing $1"
     tclsh ../admin/samp.tcl block < samp/${1}.samp
+#    tclsh85sg ../admin/samp.tcl block < samp/${1}.samp
     echo "PASSED"
 }
 
@@ -85,8 +86,8 @@ doit "$1" mask
 doit "$1" match
 doit "$1" minmax
 doit "$1" mode
-doit "$1" movie
-rm -f foo.mpg
+#doit "$1" movie
+#rm -f foo.mpg
 doit "$1" nameserver
 doit "$1" nan
 doit "$1" nvss
diff --git a/tests/samp/movie.samp b/tests/samp/movie.samp
index 2562bb2..58ef5a6 100644
--- a/tests/samp/movie.samp
+++ b/tests/samp/movie.samp
@@ -1,3 +1,5 @@
+set {} width 700
+set {} height 400
 set {} movie slice foo.mpg
 set {} movie frame foo.mpg
 set {} frame new 3d
diff --git a/tests/xpa.sh b/tests/xpa.sh
index 40c71d1..2436b3a 100755
--- a/tests/xpa.sh
+++ b/tests/xpa.sh
@@ -626,7 +626,7 @@ xpaset -p ds9 single
 testit $tt
 fi
 
-if [ "$1" = "first" ]; then
+if [ "$1" = "first" -o -z "$1" ]; then
 tt="first"
 xpaset -p ds9 first open
 xpaset -p ds9 first close
@@ -1111,8 +1111,10 @@ xpaset -p ds9 mode pointer
 testit $tt
 fi
 
-if [ "$1" = "movie" ]; then
+if [ "$1" = "movie" -o -z "$1" ]; then
 tt="movie"
+xpaset -p ds9 width 700
+xpaset -p ds9 height 400
 xpaset -p ds9 movie slice foo.mpg
 xpaset -p ds9 movie frame foo.mpg
 xpaset -p ds9 frame new 3d
@@ -1747,7 +1749,7 @@ xpaset -p ds9 cube close
 testit $tt
 fi
 
-if [ "$1" = "skyview" ]; then
+if [ "$1" = "skyview" -o -z "$1" ]; then
 tt="skyview"
 xpaset -p ds9 skyview open
 xpaset -p ds9 skyview close

-- 
image display tool for astronomy



More information about the debian-science-commits mailing list