summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2019-04-30 19:17:19 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2019-04-30 19:17:19 (GMT)
commitc3564c38dae0f1755e53182ad95b57f01d1004a7 (patch)
tree89c301160cf8550acde3bfd2227dd83f23e0ce2d
parented1b3d50e3629685a41cababb244f26169d507ee (diff)
downloadblt-c3564c38dae0f1755e53182ad95b57f01d1004a7.zip
blt-c3564c38dae0f1755e53182ad95b57f01d1004a7.tar.gz
blt-c3564c38dae0f1755e53182ad95b57f01d1004a7.tar.bz2
clean up doc
-rw-r--r--ds9/doc/ref/3d.html69
-rw-r--r--ds9/doc/ref/analysis.html469
-rw-r--r--ds9/doc/ref/backup.html48
-rw-r--r--ds9/doc/ref/bin.html43
-rw-r--r--ds9/doc/ref/catalog.html151
-rw-r--r--ds9/doc/ref/colorbar.html127
-rw-r--r--ds9/doc/ref/contour.html106
-rw-r--r--ds9/doc/ref/file.html408
-rw-r--r--ds9/doc/ref/grid.html92
-rw-r--r--ds9/doc/ref/how.html155
-rw-r--r--ds9/doc/ref/index.html92
-rw-r--r--ds9/doc/ref/iraf.html107
-rw-r--r--ds9/doc/ref/keyboard.html83
-rw-r--r--ds9/doc/ref/prefs.html33
-rw-r--r--ds9/doc/ref/print.html47
-rw-r--r--ds9/doc/ref/region.html358
-rw-r--r--ds9/doc/ref/vo.html64
17 files changed, 654 insertions, 1798 deletions
diff --git a/ds9/doc/ref/3d.html b/ds9/doc/ref/3d.html
index 964e09c..1be3358 100644
--- a/ds9/doc/ref/3d.html
+++ b/ds9/doc/ref/3d.html
@@ -1,77 +1,32 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>3D</title>
</head>
-<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor=
-"#FFFFFF" alink="#FF0000">
-<h3><img alt="" src="../sun.gif" width="100" height="98" align=
-"middle"> 3-D Frames<br></h3>
+<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor="#FFFFFF" alink="#FF0000">
+<h3><img alt="" src="../sun.gif" width="100" height="98" align="middle"> 3-D Frames<br></h3>
<blockquote>
-<p>Previous versions of 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>
-<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>Previous versions of 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>
+<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>
<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>
+<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>
-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>
+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>
+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>
-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>
+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/ds9/doc/ref/analysis.html b/ds9/doc/ref/analysis.html
index 8b05f8b..bf64138 100644
--- a/ds9/doc/ref/analysis.html
+++ b/ds9/doc/ref/analysis.html
@@ -1,41 +1,17 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Analysis</title>
</head>
-<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text=
-"#000000" vlink="#551A8B">
-<h3><img alt="" src="../sun.gif" height="98" align="middle" width=
-"100"> Analysis</h3>
+<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" height="98" align="middle" width="100"> Analysis</h3>
<blockquote>
-<p>Each file type known to DS9 can have user-defined analysis
-commands associated with it. These analysis commands are defined at
-start-up time , or loaded by the user, by means of an ASCII
-analysis description file. The analysis commands are available for
-execution, either via the <i>Analysis Menu</i> or the XPA point
-<i>Analysis</i>. In addition, commands may be <i>bound</i> to
-events, such as keystrokes or mouse clicks. This type of command is
-called a bind command.<br></p>
-<p>DS9 searches for an analysis file named <tt>ds9.ans</tt> or
-<tt>ds9.analysis</tt> in the current directory and <tt>$HOME</tt>
-to be loaded at startup. In addition, DS9 will search the following
-directories for any analysis files to be loaded at startup in the
-form of <tt>*.ds9</tt>: the current directory, <tt>$HOME/bin</tt>,
-<tt>/usr/local/bin</tt>, <tt>/opt/local/bin</tt>, and
-<tt>/soft/saord/bin</tt>. Finally, the user may specify analysis
-files to be loaded at startup in the preferences analysis panel.
-The user may also load or clear current analysis commands via
-command line options or the <i>Analysis m</i>enu<i>.</i></p>
-<p>When activated, either from the menu, XPA, or bound event, an
-analysis command first is macro-expanded to fill in user-defined
-arguments and then is executed externally. Results may be displayed
-in a separate text window, plot window, or in a image frame.</p>
+<p>Each file type known to DS9 can have user-defined analysis commands associated with it. These analysis commands are defined at start-up time , or loaded by the user, by means of an ASCII analysis description file. The analysis commands are available for execution, either via the <i>Analysis Menu</i> or the XPA point <i>Analysis</i>. In addition, commands may be <i>bound</i> to events, such as keystrokes or mouse clicks. This type of command is called a bind command.<br></p>
+<p>DS9 searches for an analysis file named <tt>ds9.ans</tt> or <tt>ds9.analysis</tt> in the current directory and <tt>$HOME</tt> to be loaded at startup. In addition, DS9 will search the following directories for any analysis files to be loaded at startup in the form of <tt>*.ds9</tt>: the current directory, <tt>$HOME/bin</tt>, <tt>/usr/local/bin</tt>, <tt>/opt/local/bin</tt>, and <tt>/soft/saord/bin</tt>. Finally, the user may specify analysis files to be loaded at startup in the preferences analysis panel. The user may also load or clear current analysis commands via command line options or the <i>Analysis m</i>enu<i>.</i></p>
+<p>When activated, either from the menu, XPA, or bound event, an analysis command first is macro-expanded to fill in user-defined arguments and then is executed externally. Results may be displayed in a separate text window, plot window, or in a image frame.</p>
<a href="#Syntax">Syntax</a><br>
<a href="#CommandType">Command Type</a><br>
<a href="#Macros">Macros</a><br>
@@ -44,28 +20,20 @@ in a separate text window, plot window, or in a image frame.</p>
<a href="#HierarchicalMenus">Hierarchical Menus</a><br>
<a href="#Sample">Sample</a>
<p><b><a name="Syntax" id="Syntax"></a>Syntax</b></p>
-The analysis file that defines the known analysis commands consists
-of one or more file descriptors, each of which has the following
-format:
+The analysis file that defines the known analysis commands consists of one or more file descriptors, each of which has the following format:
<blockquote><tt>Menu label to be used</tt><br>
<tt>A space separated list of file templates</tt><br>
<tt>Command type [menu | bind &lt;event&gt;]</tt><br>
<tt>The command line for the analysis program</tt></blockquote>
-<p>Task names may contain space characters. All lines may be
-indented. Also, the '#' character is a comment character. A
-separator can be inserted in the menu by specifying the following
-sequence '---'.</p>
+<p>Task names may contain space characters. All lines may be indented. Also, the '#' character is a comment character. A separator can be inserted in the menu by specifying the following sequence '---'.</p>
<tt>Example:</tt>
<blockquote><tt># this will insert a menu separator</tt><br>
<tt>---</tt></blockquote>
-<p><b><a name="CommandType" id="CommandType"></a>Command
-Type</b></p>
+<p><b><a name="CommandType" id="CommandType"></a>Command Type</b></p>
<p>The third line indicates the type of command.</p>
<blockquote>
<p><b>menu</b></p>
-<p>A <tt>menu</tt> command creates an menu option under the
-<i>Analysis</i> menu option, and can be invoked by the user via the
-GUI or XPA.</p>
+<p>A <tt>menu</tt> command creates an menu option under the <i>Analysis</i> menu option, and can be invoked by the user via the GUI or XPA.</p>
<tt>Example:</tt>
<blockquote><tt># Menu command example</tt><br>
<tt>My Analysis Task</tt><br>
@@ -73,12 +41,7 @@ GUI or XPA.</p>
<tt>menu</tt><br>
<tt>$data | doit | $text</tt></blockquote>
<p><b>bind</b></p>
-<p>A <tt>bind</tt> command is a command that is bound to an event.
-When the event occurs, the command is executed. Types of events
-available include all TK events, including all <i>keystrokes</i>
-and <i>mouse clicks.</i> If a command is bound to an event other
-that a <i>keystroke</i>, care must be taken to not to interfere
-with other internal DS9 events.</p>
+<p>A <tt>bind</tt> command is a command that is bound to an event. When the event occurs, the command is executed. Types of events available include all TK events, including all <i>keystrokes</i> and <i>mouse clicks.</i> If a command is bound to an event other that a <i>keystroke</i>, care must be taken to not to interfere with other internal DS9 events.</p>
<p>To bind to a key stroke, use the following command type:</p>
<blockquote><tt>bind &lt;keystroke&gt;</tt><br></blockquote>
<tt>Example:</tt>
@@ -88,8 +51,7 @@ with other internal DS9 events.</p>
<tt>bind x</tt><br>
<tt>echo "$x $y" | $text</tt><br></blockquote>
<p><b>web</b></p>
-<p>A <tt>web</tt> command allows the user to invoke the internal
-web browser from the analysis menu.</p>
+<p>A <tt>web</tt> command allows the user to invoke the internal web browser from the analysis menu.</p>
<tt>Example:</tt>
<blockquote><tt># web command example<br>
HTTP based<br>
@@ -103,208 +65,108 @@ web<br>
file:/home/joye/index.html<br></tt></blockquote>
</blockquote>
<p><b><a name="Macros" id="Macros"></a>Macros</b></p>
-<p>The following macros are macro-expanded to fill in user-defined
-arguments before the command is executed. Strings that contain
-$&lt;macroname&gt; that user does not want to be expanded may be
-escaped by using $$&lt;macroname&gt;. All strings that contain
-$&lt;string&gt; &nbsp;that are not a macro name will not be
-affected.</p>
+<p>The following macros are macro-expanded to fill in user-defined arguments before the command is executed. Strings that contain $&lt;macroname&gt; that user does not want to be expanded may be escaped by using $$&lt;macroname&gt;. All strings that contain $&lt;string&gt; &nbsp;that are not a macro name will not be affected.</p>
<p>For example:</p>
<blockquote><tt>echo "$$data $foo" | $text</tt><br></blockquote>
<p>will display a text dialog that contains "$data $foo"</p>
<p><b>$width<br>
$height<br>
$depth</b></p>
-<p>Substitute the width, height, or depth of the data file in the
-command line.</p>
+<p>Substitute the width, height, or depth of the data file in the command line.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $width</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $height</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$width $height
-$depth" | $text</tt><br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$width $height $depth" | $text</tt><br>
<p><b>$bitpix</b></p>
<p>Substitute the bitpix of the data file in the command line.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $bitpix</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$bitpix" |
-$text</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$bitpix" | $text</tt>
<p><b>$data</b></p>
-<p>Data from the current frame becomes the input data to the
-command string. This data is in the form of a FITS image. This
-macro can only used at the beginning of the command string.</p>
+<p>Data from the current frame becomes the input data to the command string. This data is in the form of a FITS image. This macro can only used at the beginning of the command string.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $data</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $data | dosomething |
-$text</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $data | dosomething | $text</tt>
<p><b>$entry</b></p>
-<p>Display an entry modal dialog. The returned string is
-substituted. If <tt>cancel</tt> is selected, the command line is
-not executed.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$entry(&lt;message&gt;)</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$entry(Enter
-something here)" | $text</tt>
+<p>Display an entry modal dialog. The returned string is substituted. If <tt>cancel</tt> is selected, the command line is not executed.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $entry(&lt;message&gt;)</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$entry(Enter something here)" | $text</tt>
<p><b>$env</b></p>
<p>Substitute the value of a shell environment variable.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $env(&lt;shell
-variable&gt;)</tt><br>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $env(&lt;shell variable&gt;)</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$env(PATH)" |
-$text</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$env(PATH)" | $text</tt>
<p><b>$filedialog</b></p>
-<p>Display the standard file dialog. Substitutes the returned
-pathname. Argument specifies if an open file or save file dialog is
-invoked.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$filedialog([open|save])</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo
-"$filedialog(open)" | $text</tt><br>
+<p>Display the standard file dialog. Substitutes the returned pathname. Argument specifies if an open file or save file dialog is invoked.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $filedialog([open|save])</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$filedialog(open)" | $text</tt><br>
<p><b>$filename</b></p>
-<p>Substitute the filename of the data file in the command line. A
-full filename includes any absolute or relative path. A root
-filename contains no path. A (2D) subsection defines a subimage
-from <tt>xmin,ymin</tt> to <tt>xmax,ymax</tt>. For Frame3D, a 2D
-subsection will also include the current slice (PLANE=) parameter
-if not 1. A 3D subsection defines a subimage from
-<tt>xmin,ymin,zmin</tt> to <tt>xmax,ymax,zmax</tt> and no PLANE
-parameter.<br></p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $filename # filename
-with extname, (2d) subsections, filters</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; $filename(root|root,base) # root filename
-with</tt> <tt>with extname,</tt> <tt>no subsections, no
-filters)</tt><br>
-<tt>&nbsp; &nbsp; $filename(full|full,base) # full filename</tt>
-<tt>with extname,</tt> <tt>no subsections, no filters)</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething $filename
-| $text</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; dosomething $filename(root) |
-$text<br></tt><br>
+<p>Substitute the filename of the data file in the command line. A full filename includes any absolute or relative path. A root filename contains no path. A (2D) subsection defines a subimage from <tt>xmin,ymin</tt> to <tt>xmax,ymax</tt>. For Frame3D, a 2D subsection will also include the current slice (PLANE=) parameter if not 1. A 3D subsection defines a subimage from <tt>xmin,ymin,zmin</tt> to <tt>xmax,ymax,zmax</tt> and no PLANE parameter.<br></p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $filename # filename with extname, (2d) subsections, filters</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $filename(root|root,base) # root filename with</tt> <tt>with extname,</tt> <tt>no subsections, no filters)</tt><br>
+<tt>&nbsp; &nbsp; $filename(full|full,base) # full filename</tt> <tt>with extname,</tt> <tt>no subsections, no filters)</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething $filename | $text</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; dosomething $filename(root) | $text<br></tt><br>
<b>$filename[$regions]</b>
-<p>Combination of <tt>$filename</tt> and <tt>$regions</tt> macros.
-Generates a series of filenames, each with a region.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$filename[$regions]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;
-$filename[$regions(&lt;options&gt;)]</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething
-$filename[$regions] | $text</tt>
+<p>Combination of <tt>$filename</tt> and <tt>$regions</tt> macros. Generates a series of filenames, each with a region.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $filename[$regions]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $filename[$regions(&lt;options&gt;)]</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething $filename[$regions] | $text</tt>
<p><b>$geturl</b></p>
-<p>This macro differs from all other macros, including
-$<tt>url</tt>, in that no subprocess pipe is created. Only HTTP is
-supported. The contents of the url are retrieved and sent to
-$<tt>text</tt>, $<tt>plot</tt>, or $<tt>image.</tt> No other
-processing is allowed. The primary purpose of this macro is to
-support external analysis for the Windows platform, which has no
-subprocess support.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$geturl(http://&lt;hostname&gt;:&lt;port&gt;/&lt;query&gt;)</tt><br>
-
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$geturl(http://foo.bar.edu/foo.html) | $text</tt><br>
+<p>This macro differs from all other macros, including $<tt>url</tt>, in that no subprocess pipe is created. Only HTTP is supported. The contents of the url are retrieved and sent to $<tt>text</tt>, $<tt>plot</tt>, or $<tt>image.</tt> No other processing is allowed. The primary purpose of this macro is to support external analysis for the Windows platform, which has no subprocess support.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $geturl(http://&lt;hostname&gt;:&lt;port&gt;/&lt;query&gt;)</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $geturl(http://foo.bar.edu/foo.html) | $text</tt><br>
<p><b>$image</b></p>
-<p>The resulting image data is display in a DS9 frame. This macro
-should be the last macro of a command line. Optional parameter
-indicates if a new frame and what type of frame is created for the
-new data. The macro is removed from the command line before
-execution.</p>
+<p>The resulting image data is display in a DS9 frame. This macro should be the last macro of a command line. Optional parameter indicates if a new frame and what type of frame is created for the new data. The macro is removed from the command line before execution.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $image</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $image([new|rgb|3d|current])</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit |
-$image(new)</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $image(new)</tt>
<p><b>$message</b></p>
-<p>Display a message dialog box, with option buttons.&nbsp; After
-displaying the message, the macro is removed from the command line
-before execution. If <tt>cancel</tt> or <tt>no</tt> is selected,
-the command line is not executed.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$message(&lt;message&gt;)</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;
-$message([ok|okcancel|yesno],&lt;message&gt;)</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $message(okcancel,This
-is a Message)| doit | $text</tt>
+<p>Display a message dialog box, with option buttons.&nbsp; After displaying the message, the macro is removed from the command line before execution. If <tt>cancel</tt> or <tt>no</tt> is selected, the command line is not executed.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $message(&lt;message&gt;)</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $message([ok|okcancel|yesno],&lt;message&gt;)</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $message(okcancel,This is a Message)| doit | $text</tt>
<p><b>$null</b></p>
-<p>Expect no output or results from analysis task. Note: no error
-message will be returned if the analysis task fails to execute
-correctly.</p>
+<p>Expect no output or results from analysis task. Note: no error message will be returned if the analysis task fails to execute correctly.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $null</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "Hello, world"
-&gt; foo | $null</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "Hello, world" &gt; foo | $null</tt>
<p><b>$pan</b></p>
-<p>Substitute current pan location of the particular data file are
-returned. The default coordinate system is <tt>physical</tt>.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $pan<br></tt>
-<tt>&nbsp;&nbsp;&nbsp; $pan(&lt;coordinate
-system&gt;,&lt;format&gt;)</tt><br>
+<p>Substitute current pan location of the particular data file are returned. The default coordinate system is <tt>physical</tt>.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $pan<br></tt> <tt>&nbsp;&nbsp;&nbsp; $pan(&lt;coordinate system&gt;,&lt;format&gt;)</tt><br>
<p>where:</p>
-<tt>&nbsp;&nbsp;&nbsp; coordinate system =
-[image|physical|detector|amplifier|wcs|wcsa...wcsz]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[fk4|fk5|icrs|galactic|ecliptic]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[hms|sexagesimal|degrees]</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo
-$pan(fk5,sexagesimal) | $text</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; coordinate system = [image|physical|detector|amplifier|wcs|wcsa...wcsz]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [fk4|fk5|icrs|galactic|ecliptic]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [hms|sexagesimal|degrees]</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo $pan(fk5,sexagesimal) | $text</tt><br>
<p><b>$plot</b></p>
-<p>Display data in plot window. This macro should be the last macro
-of a command line. The data is read via <tt>STDIN</tt> and consist
-of a pair of coordinates, with option error values. (<tt>xy, xyex,
-xyey, xyexe</tt>y) Default dimension is <tt>xy.</tt> The macro is
-removed from the command line before execution.</p>
+<p>Display data in plot window. This macro should be the last macro of a command line. The data is read via <tt>STDIN</tt> and consist of a pair of coordinates, with option error values. (<tt>xy, xyex, xyey, xyexe</tt>y) Default dimension is <tt>xy.</tt> The macro is removed from the command line before execution.</p>
<p>For <tt>$plot(stdin)</tt> only:</p>
-<p>The title, x axis label, and y axis label are assumed to be on
-the first line of input, delimited with a new-line. However, if the
-data starts with $<tt>BEGINTEXT</tt>, all text between
-$<tt>BEGINTEXT</tt> and $<tt>ENDTEXT</tt> will be removed from the
-data and displayed in a separate text dialog window, with the
-remaining data, including the title, x axis label, and y axis
-label, will be displayed in a plot window. Furthermore, if the data
-contains the string $<tt>ERROR,</tt> an error is assumed to have
-occurred and a text dialog window is displayed only.</p>
+<p>The title, x axis label, and y axis label are assumed to be on the first line of input, delimited with a new-line. However, if the data starts with $<tt>BEGINTEXT</tt>, all text between $<tt>BEGINTEXT</tt> and $<tt>ENDTEXT</tt> will be removed from the data and displayed in a separate text dialog window, with the remaining data, including the title, x axis label, and y axis label, will be displayed in a plot window. Furthermore, if the data contains the string $<tt>ERROR,</tt> an error is assumed to have occurred and a text dialog window is displayed only.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $plot</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $plot(,,,)</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; $plot(&lt;title&gt;,&lt;x axis
-label&gt;,&lt;y axis label&gt;,[xy|xyex|xyey|xyexey])</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $plot(&lt;title&gt;,&lt;x axis label&gt;,&lt;y axis label&gt;,[xy|xyex|xyey|xyexey])</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $plot(stdin)</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $plot(This is
-aTitle,X Axis,Y Axis)<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit |
-$plot(stdin)</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $plot(This is aTitle,X Axis,Y Axis)<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $plot(stdin)</tt>
<p><b>$regions</b></p>
-<p>Substitute region definition in specified region format,
-coordinate system, and coordinate format. The default coordinate
-system is <tt>physical</tt>, default coordinate format
-<tt>degrees</tt>, and default region format <tt>DS9</tt>. Arguments
-may appear in any order, as long as they are separated by ',' and
-no spaces. If one or&nbsp; more properties are specified, only
-regions with all of the specified properties will be
-substituted.</p>
+<p>Substitute region definition in specified region format, coordinate system, and coordinate format. The default coordinate system is <tt>physical</tt>, default coordinate format <tt>degrees</tt>, and default region format <tt>DS9</tt>. Arguments may appear in any order, as long as they are separated by ',' and no spaces. If one or&nbsp; more properties are specified, only regions with all of the specified properties will be substituted.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $regions</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $regions(&lt;options&gt;)</tt>
<p>where options are one of the following:</p>
-<tt>&nbsp;&nbsp;&nbsp; regions format&nbsp;&nbsp;&nbsp; =
-[ds9|ciao|saotng|saoimage|pros|xy]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;
-property&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[include|exclude|source|background]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; coordinate system =
-[image|physical|detector|amplifier|wcs]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[fk4|fk5|icrs|galactic|ecliptic]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[sexagesimal|degrees]</tt>
+<tt>&nbsp;&nbsp;&nbsp; regions format&nbsp;&nbsp;&nbsp; = [ds9|ciao|saotng|saoimage|pros|xy]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; property&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [include|exclude|source|background]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; coordinate system = [image|physical|detector|amplifier|wcs]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [fk4|fk5|icrs|galactic|ecliptic]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [sexagesimal|degrees]</tt>
<p>also, the old <i>SAOTNG</i> formats are also supported:</p>
<tt>&nbsp;&nbsp;&nbsp; $regions_pixels</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $regions_degrees</tt><br>
@@ -317,49 +179,30 @@ format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
<tt>&nbsp;&nbsp;&nbsp; $exclude_regions_pixels</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $exclude_regions_degrees</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $exclude_regions_hms<br></tt><br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething $regions |
-$text</tt><br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; dosomething $regions | $text</tt><br>
<tt>&nbsp;&nbsp;&nbsp; dosomething $regions(pros) | $text</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; dosomething $regions(source,wcs,fk5) |
-$text</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; dosomething
-$regions(saotng,background,exclude,ecliptic,sexagesimal) |
-$text</tt>
+<tt>&nbsp;&nbsp;&nbsp; dosomething $regions(source,wcs,fk5) | $text</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; dosomething $regions(saotng,background,exclude,ecliptic,sexagesimal) | $text</tt>
<p><b>$text</b></p>
-<p>Display text in a text dialog window. This macro should be the
-last macro of a command line. To display text from only STDOUT use
-'|' as the pipe command. To display text from both STDOUT and
-STDERR, use '|&amp;' as the pipe command. No parameters are
-required. The macro is removed from the command line before
-execution.</p>
+<p>Display text in a text dialog window. This macro should be the last macro of a command line. To display text from only STDOUT use '|' as the pipe command. To display text from both STDOUT and STDERR, use '|&amp;' as the pipe command. No parameters are required. The macro is removed from the command line before execution.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $text</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $text #
-stdout<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; doit | $text # stdout<br>
&nbsp;&nbsp;&nbsp; doit |&amp; $text # stdout and stderr<br></tt>
<p><b>$url</b></p>
-<p>URLs are processed and stored in a temporary file. Only HTTP and
-anonymous FTP are supported.</p>
-<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$url(http://&lt;hostname&gt;:&lt;port&gt;/&lt;query&gt;)</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;
-$url(ftp://&lt;hostname&gt;/&lt;filename&gt;)</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp;
-$url(http://legacy.gsfc.nasa.gov/rosat/data/p000s26b.img.Z) |
-uncompress | $image</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;
-$url(ftp://legacy.gsfc.nasa.gov/rosat/data/hri/images/rh100193_img.fits)
-| $image<br></tt>
+<p>URLs are processed and stored in a temporary file. Only HTTP and anonymous FTP are supported.</p>
+<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $url(http://&lt;hostname&gt;:&lt;port&gt;/&lt;query&gt;)</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $url(ftp://&lt;hostname&gt;/&lt;filename&gt;)</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $url(http://legacy.gsfc.nasa.gov/rosat/data/p000s26b.img.Z) | uncompress | $image</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $url(ftp://legacy.gsfc.nasa.gov/rosat/data/hri/images/rh100193_img.fits) | $image<br></tt>
<p><b>$vo_method</b></p>
<p>Returns the vo method.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $vo_method</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$vo_method' |
-$text</tt><br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$vo_method' | $text</tt><br>
<p><b>$value<br></b></p>
-<p>Substitute the value at the location of the cursor of an bind
-event.<br></p>
+<p>Substitute the value at the location of the cursor of an bind event.<br></p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $value<br>
<br>
Example:<br>
@@ -367,55 +210,33 @@ Example:<br>
<p><b>$x<br>
$y<br>
$z<br></b></p>
-<p>Substitute coordinates of an bind event. When a bind event is
-triggered, the <i>x,y</i> coordinates of the mouse of the
-particular data file are returned. The default coordinate system is
-<tt>physical</tt>. This macro is only available for bind commands.
-For datacubes, the z coordinate is returned based on the current
-slice selected.<br></p>
+<p>Substitute coordinates of an bind event. When a bind event is triggered, the <i>x,y</i> coordinates of the mouse of the particular data file are returned. The default coordinate system is <tt>physical</tt>. This macro is only available for bind commands. For datacubes, the z coordinate is returned based on the current slice selected.<br></p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $x</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; $x(&lt;coordinate
-system&gt;,&lt;format&gt;)</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; $x(&lt;coordinate system&gt;,&lt;format&gt;)</tt><br>
<tt>&nbsp;&nbsp;&nbsp; $y</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; $y(&lt;coordinate
-system&gt;,&lt;format&gt;)<br>
+<tt>&nbsp;&nbsp;&nbsp; $y(&lt;coordinate system&gt;,&lt;format&gt;)<br>
&nbsp;&nbsp;&nbsp; $z<br>
&nbsp;&nbsp;&nbsp; $z(&lt;coordinate system&gt;)<br></tt>
<p>where:</p>
-<tt>&nbsp;&nbsp;&nbsp; coordinate system =
-[image|physical|detector|amplifier|wcs|wcsa...wcsz]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[fk4|fk5|icrs|galactic|ecliptic]</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; sky
-format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; =
-[hms|sexagesimal|degrees]</tt><br>
-<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$x $y" |
-$text<br>
+<tt>&nbsp;&nbsp;&nbsp; coordinate system = [image|physical|detector|amplifier|wcs|wcsa...wcsz]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky frame&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [fk4|fk5|icrs|galactic|ecliptic]</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; sky format&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; = [hms|sexagesimal|degrees]</tt><br>
+<br>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$x $y" | $text<br>
&nbsp;&nbsp;&nbsp; echo "$x $y $z" | $text<br>
-&nbsp;&nbsp;&nbsp; echo "$x(fk5,sexagesimal) $y(fk5,sexagesimal)" |
-$text<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$x(wcs) $y(wcs)
-$z(wcs)" | $text</tt><br>
+&nbsp;&nbsp;&nbsp; echo "$x(fk5,sexagesimal) $y(fk5,sexagesimal)" | $text<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo "$x(wcs) $y(wcs) $z(wcs)" | $text</tt><br>
<p><b>$xpa</b></p>
<p>Returns the xpa access point name.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $xpa</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$xpa' |
-$text</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$xpa' | $text</tt>
<p><b>$xpa_method</b></p>
<p>Returns the xpa method.</p>
<tt>Syntax:<br></tt> <tt>&nbsp;&nbsp;&nbsp; $xpa_method</tt><br>
<br>
-<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$xpa_method' |
-$text</tt>
+<tt>Example:<br></tt> <tt>&nbsp;&nbsp;&nbsp; echo '$xpa_method' | $text</tt>
<p><b><a name="Help" id="Help"></a>Help</b></p>
-<p>The user may define his own <tt>HELP</tt> message. This message
-will be available to the user as a menu item. An optional label
-maybe specified. The default label is <tt>Help</tt>. When invoked,
-an text dialog window will appear, containing the message. Multiple
-<tt>HELP</tt> items maybe defined within a menu or across
-hierarchical menus.</p>
+<p>The user may define his own <tt>HELP</tt> message. This message will be available to the user as a menu item. An optional label maybe specified. The default label is <tt>Help</tt>. When invoked, an text dialog window will appear, containing the message. Multiple <tt>HELP</tt> items maybe defined within a menu or across hierarchical menus.</p>
<tt>Example:</tt>
<blockquote><tt>help Main Help</tt><br>
<tt>A help message may contain</tt><br>
@@ -423,22 +244,16 @@ hierarchical menus.</p>
<tt>in the menu or menus</tt><br>
<tt>endhelp</tt></blockquote>
<p><b><a name="Parameters" id="Parameters"></a>Parameters</b></p>
-<p>The user may define his own macros or parameters to be evaluated
-before the command line is executed. To do this, the user defines a
-param segment that is referenced in the command line. The param
-definition has the follow format:</p>
+<p>The user may define his own macros or parameters to be evaluated before the command line is executed. To do this, the user defines a param segment that is referenced in the command line. The param definition has the follow format:</p>
<blockquote><tt>param &lt;name&gt;</tt><br>
-<tt>&lt;variable&gt; &lt;entry | checkbox | menu&gt; &lt;title&gt;
-&lt;default&gt; &lt;{comment}&gt;</tt><br>
+<tt>&lt;variable&gt; &lt;entry | checkbox | menu&gt; &lt;title&gt; &lt;default&gt; &lt;{comment}&gt;</tt><br>
<tt>...</tt><br>
<tt>endparam</tt></blockquote>
<p>or</p>
<blockquote><tt>param &lt;name&gt;</tt><br>
<tt>@&lt;iraf param filename&gt;</tt><br>
<tt>end</tt></blockquote>
-<p>The definition either consisted of a number of variables, one
-per row, or the name of a IRAF style parameter file. DS9 will look
-for the IRAF parameter file in:</p>
+<p>The definition either consisted of a number of variables, one per row, or the name of a IRAF style parameter file. DS9 will look for the IRAF parameter file in:</p>
<blockquote><tt>./&lt;filename&gt;</tt><br>
<tt>$UPARM/&lt;filename&gt;</tt><br>
<tt>$HOME/iraf/&lt;filename&gt;</tt></blockquote>
@@ -448,23 +263,14 @@ for the IRAF parameter file in:</p>
<tt>var2 checkbox {Variable 2} 1 {this is a checkbox}</tt><br>
<tt>var3 menu {Variable 3} AAA|BBB|CCC {this is a menu}</tt><br>
<tt>endparam</tt></blockquote>
-<p>To use parameters, specify the param name at the beginning of
-your command line:</p>
+<p>To use parameters, specify the param name at the beginning of your command line:</p>
<blockquote><tt>Parameter Test</tt><br>
<tt>*</tt><br>
<tt>menu</tt><br>
-<tt>$param(foobar); echo "$var1 $var2 $var3" |
-$text</tt></blockquote>
-<p>When the menu item is selected, the user will be presented with
-a dialog box that contains <i>entry, checkbox, or menu</i> choices
-for each variable specified. If the user clicks ok, the values are
-substituted in the command line before execution.</p>
-<p><b><a name="HierarchicalMenus" id=
-"HierarchicalMenus"></a>Hierarchical Menus</b></p>
-<p>The user may define hierarchical menus. Use this to organized
-crowded menus. To do this, frame menu entries with <tt>hmenu
-&lt;label&gt;</tt> and <tt>endhmenu</tt>. Hierarchical menu labels
-may contain spaces. Multiple levels maybe implemented.</p>
+<tt>$param(foobar); echo "$var1 $var2 $var3" | $text</tt></blockquote>
+<p>When the menu item is selected, the user will be presented with a dialog box that contains <i>entry, checkbox, or menu</i> choices for each variable specified. If the user clicks ok, the values are substituted in the command line before execution.</p>
+<p><b><a name="HierarchicalMenus" id="HierarchicalMenus"></a>Hierarchical Menus</b></p>
+<p>The user may define hierarchical menus. Use this to organized crowded menus. To do this, frame menu entries with <tt>hmenu &lt;label&gt;</tt> and <tt>endhmenu</tt>. Hierarchical menu labels may contain spaces. Multiple levels maybe implemented.</p>
<tt>Example:<br></tt>
<blockquote><tt>hmenu Stuff</tt><br>
<tt>&nbsp;&nbsp;&nbsp; hello</tt><br>
@@ -479,13 +285,11 @@ may contain spaces. Multiple levels maybe implemented.</p>
<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; hello world</tt><br>
<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; *</tt><br>
<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; menu</tt><br>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; echo "Hello World" |
-$text</tt><br>
+<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; echo "Hello World" | $text</tt><br>
<tt>&nbsp;&nbsp;&nbsp; endhmenu</tt><br>
<tt>endhmenu</tt></p>
</blockquote>
-<p>Will create an hierarchical menu with two members,
-<tt>hello</tt> and <tt>world</tt>.</p>
+<p>Will create an hierarchical menu with two members, <tt>hello</tt> and <tt>world</tt>.</p>
<p><b><a name="Sample" id="Sample"></a>Sample</b></p>
<tt>#<br>
# Analysis command descriptions:<br>
@@ -496,8 +300,7 @@ $text</tt><br>
<br>
param foo<br>
&nbsp;&nbsp;&nbsp; var1 entry entry 40 {this is a entry}<br>
-&nbsp;&nbsp;&nbsp; var2 checkbox checkbox 1 {this is a
-checkbox}<br>
+&nbsp;&nbsp;&nbsp; var2 checkbox checkbox 1 {this is a checkbox}<br>
&nbsp;&nbsp;&nbsp; var3 menu menu AAA|BBB|CCC {this is a menu}<br>
endparam<br>
<br>
@@ -510,8 +313,7 @@ param foobar<br>
endparam<br>
<br>
param ltc<br>
-&nbsp;&nbsp;&nbsp; bins entry "Enter number of [t1:t2:]bins" 0
-"('0' for default number of bins)"<br>
+&nbsp;&nbsp;&nbsp; bins entry "Enter number of [t1:t2:]bins" 0 "('0' for default number of bins)"<br>
endparam<br>
<br>
# Help Main Help<br>
@@ -599,24 +401,17 @@ hmenu Test Regions<br>
&nbsp;&nbsp;&nbsp; Test $regions<br>
&nbsp;&nbsp;&nbsp; *.fits<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; echo "$regions ds9_s:$regions(ds9,source,image)
-ciao_b:$regions(ciao,background)
-saotng_i:$regions(saotng,include,wcs,fk5)
-pros_e:$regions(pros,exclude,wcs,fk5,sexagesimal)
-xy_be:$regions(xy,background,exclude,wcs,fk4,hms)" | $text<br>
+&nbsp;&nbsp;&nbsp; echo "$regions ds9_s:$regions(ds9,source,image) ciao_b:$regions(ciao,background) saotng_i:$regions(saotng,include,wcs,fk5) pros_e:$regions(pros,exclude,wcs,fk5,sexagesimal) xy_be:$regions(xy,background,exclude,wcs,fk4,hms)" | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $regions wcs<br>
&nbsp;&nbsp;&nbsp; *.fits<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; echo "$regions(ds9,wcs)
-$regions(ds9,wcs,fk5,sexagesimal) $regions(ds9,wcsa) " | $text<br>
+&nbsp;&nbsp;&nbsp; echo "$regions(ds9,wcs) $regions(ds9,wcs,fk5,sexagesimal) $regions(ds9,wcsa) " | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $include_regions_pixels<br>
&nbsp;&nbsp;&nbsp; *.fits<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; echo "ds9_s: $source_regions ds9_b:
-$background_regions_pixels ds9_i: $include_regions_degrees ds9_e:
-$exclude_regions_hms" | $text<br>
+&nbsp;&nbsp;&nbsp; echo "ds9_s: $source_regions ds9_b: $background_regions_pixels ds9_i: $include_regions_degrees ds9_e: $exclude_regions_hms" | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $filename $regions<br>
&nbsp;&nbsp;&nbsp; *.fits<br>
@@ -657,14 +452,12 @@ hmenu Test Output<br>
&nbsp;&nbsp;&nbsp; Test $plot(title,x,y,xyey)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; cat xye.dat | $plot(Title,X Axis,Y
-Axis,xyey)<br>
+&nbsp;&nbsp;&nbsp; cat xye.dat | $plot(Title,X Axis,Y Axis,xyey)<br>
<br>
&nbsp;&nbsp;&nbsp; Test $plot(title,x,y,xyexey)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; cat xyee.dat | $plot(Title,X Axis,Y
-Axis,xyexey)<br>
+&nbsp;&nbsp;&nbsp; cat xyee.dat | $plot(Title,X Axis,Y Axis,xyexey)<br>
<br>
&nbsp;&nbsp;&nbsp; Test $plot(title,x,y,4)<br>
&nbsp;&nbsp;&nbsp; *<br>
@@ -710,14 +503,12 @@ hmenu Test Dialogs<br>
&nbsp;&nbsp;&nbsp; Test $message(message)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; $message(ok,This is a Message) | echo "hello" |
-$text<br>
+&nbsp;&nbsp;&nbsp; $message(ok,This is a Message) | echo "hello" | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $message(ok,message)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; $message(ok,This is a Message) | echo "World" |
-$text<br>
+&nbsp;&nbsp;&nbsp; $message(ok,This is a Message) | echo "World" | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $entry(message)<br>
&nbsp;&nbsp;&nbsp; *<br>
@@ -733,14 +524,12 @@ hmenu Test Params<br>
&nbsp;&nbsp;&nbsp; Test $param<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; $param(foo); echo "$var1 $var2 $var3" |
-$text<br>
+&nbsp;&nbsp;&nbsp; $param(foo); echo "$var1 $var2 $var3" | $text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $param @file<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; $param(bar); echo "$var1 $var2 $var3" |
-$text<br>
+&nbsp;&nbsp;&nbsp; $param(bar); echo "$var1 $var2 $var3" | $text<br>
endhmenu<br>
<br>
hmenu Test Network<br>
@@ -751,30 +540,22 @@ hmenu Test Network<br>
&nbsp;&nbsp;&nbsp; Test $url(http://)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp;
-$url(http://legacy.gsfc.nasa.gov/FTP/rosat/data/cdrom/vol1/IMAGES/00h/p000s26b.img.Z)
-| gunzip | $image<br>
+&nbsp;&nbsp;&nbsp; $url(http://legacy.gsfc.nasa.gov/FTP/rosat/data/cdrom/vol1/IMAGES/00h/p000s26b.img.Z) | gunzip | $image<br>
<br>
&nbsp;&nbsp;&nbsp; Test $url(ftp://)<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp;
-$url(ftp://legacy.gsfc.nasa.gov/rosat/data/hri/images/fits/rh100193_img.fits)
-| $image<br>
+&nbsp;&nbsp;&nbsp; $url(ftp://legacy.gsfc.nasa.gov/rosat/data/hri/images/fits/rh100193_img.fits) | $image<br>
<br>
&nbsp;&nbsp;&nbsp; Test $geturl $text<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp;
-$geturl(http://hea-www.harvard.edu/RD/saord-cgi/funtools?funcnts+$filename+$regions(source,,)+$regions(background,,))|$text<br>
-
+&nbsp;&nbsp;&nbsp; $geturl(http://hea-www.harvard.edu/RD/saord-cgi/funtools?funcnts+$filename+$regions(source,,)+$regions(background,,))|$text<br>
<br>
&nbsp;&nbsp;&nbsp; Test $geturl $plotstd<br>
&nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; $param(ltc);
-$geturl(http://hea-www.harvard.edu/RD/saord-cgi/funtools?funhist_plot+$filename[$regions]+time+$bins)|$plot(stdin)<br>
-
+&nbsp;&nbsp;&nbsp; $param(ltc); $geturl(http://hea-www.harvard.edu/RD/saord-cgi/funtools?funhist_plot+$filename[$regions]+time+$bins)|$plot(stdin)<br>
endhmenu<br>
<br>
hmenu Test Other<br>
@@ -791,8 +572,7 @@ hmenu Test Other<br>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; test<br>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; *<br>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; menu<br>
-&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; echo "Hello World" |
-$text<br>
+&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; echo "Hello World" | $text<br>
&nbsp;&nbsp;&nbsp; endhmenu<br>
endhmenu<br>
<br>
@@ -809,7 +589,6 @@ echo "$x(fk5,hms) $y(fk5,hms)" | $text<br>
$x(wcs,fk5,hms) $y(wcs,fk5,hms)<br>
*.fits<br>
bind z<br>
-echo "$x(wcs,fk5,hms) $y(wcs,fk5,hms)" |
-$text<br></tt></blockquote>
+echo "$x(wcs,fk5,hms) $y(wcs,fk5,hms)" | $text<br></tt></blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/backup.html b/ds9/doc/ref/backup.html
index 5de7bfc..1e6c0b6 100644
--- a/ds9/doc/ref/backup.html
+++ b/ds9/doc/ref/backup.html
@@ -1,42 +1,22 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<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" link="#0000EE" text=
-"#000000" vlink="#551A8B">
-<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>
+<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>
+<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>
-<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>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>
<p><b>Caveats</b></p>
-<p>There are several caveats in the usage of Backup and Restore. In
-particular:<br></p>
+<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>
@@ -44,14 +24,10 @@ 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>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 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/ds9/doc/ref/bin.html b/ds9/doc/ref/bin.html
index 88670d6..6676879 100644
--- a/ds9/doc/ref/bin.html
+++ b/ds9/doc/ref/bin.html
@@ -1,44 +1,25 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Bin</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"> Binning</h3>
+<body alink="#FF0000" bgcolor="#FFFFFF" link="#0000EE" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" align="middle" height="98" width="100"> Binning</h3>
<blockquote>
-<p>To create an image from a FITS Bin Table, the user needs to
-specify a binning factor, binning buffer size, and the binning
-function.<br></p>
-<p>The Binning (or Block) Factor is defined as the following: A
-value greater or equal to zero. This value indicates the number of
-pixel values that will fall into a particular bin.<br></p>
-<p>The Bin Buffer Size is overall size of the image generated. This
-has no relation to min and max values of the columns used to create
-the image.<br></p>
-<p>The Bin Function is defined as the following: Average - all
-pixel values that fall into one pixel bin are averaged. Sum - all
-pixel values that fall into one pixel bin are summed.<br></p>
-<p>Bin to Fit Frame will calculate a bin block factor as a power of
-2 that will allow the entire data space to be displayed in the
-current frame.</p>
-<p>By default, DS9 will bin about the center of the image. To
-determine the center of the image, DS9 will look for the following
-keywords in order:</p>
+<p>To create an image from a FITS Bin Table, the user needs to specify a binning factor, binning buffer size, and the binning function.<br></p>
+<p>The Binning (or Block) Factor is defined as the following: A value greater or equal to zero. This value indicates the number of pixel values that will fall into a particular bin.<br></p>
+<p>The Bin Buffer Size is overall size of the image generated. This has no relation to min and max values of the columns used to create the image.<br></p>
+<p>The Bin Function is defined as the following: Average - all pixel values that fall into one pixel bin are averaged. Sum - all pixel values that fall into one pixel bin are summed.<br></p>
+<p>Bin to Fit Frame will calculate a bin block factor as a power of 2 that will allow the entire data space to be displayed in the current frame.</p>
+<p>By default, DS9 will bin about the center of the image. To determine the center of the image, DS9 will look for the following keywords in order:</p>
<blockquote><tt>TDMIN/TDMAX<br>
TLMIN/TLMAX<br>
TALEN<br>
AXLEN</tt></blockquote>
-<p>If no valid keywords are found, DS9 will define the center as
-the middle of the possible data space based on the coordinate data
-type.</p>
+<p>If no valid keywords are found, DS9 will define the center as the middle of the possible data space based on the coordinate data type.</p>
<br>
<p><br></p>
<p><br></p>
diff --git a/ds9/doc/ref/catalog.html b/ds9/doc/ref/catalog.html
index 7560b84..4529b3f 100644
--- a/ds9/doc/ref/catalog.html
+++ b/ds9/doc/ref/catalog.html
@@ -1,126 +1,49 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Catalogs</title>
</head>
-<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text=
-"#000000" vlink="#551A8B">
-<h3><img alt="" src="../sun.gif" height="98" align="middle" width=
-"100"> Catalogs</h3>
+<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" height="98" align="middle" width="100"> 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 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>
-<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>
-<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>
+<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>
+<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>
+<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>
<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>$&lt;column
-name&gt;</tt>.</p>
-<blockquote><tt>$_RAJ2000&gt;180. &amp;&amp;
-$_RAJ2000&lt;270.</tt><br>
+<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>$&lt;column name&gt;</tt>.</p>
+<blockquote><tt>$_RAJ2000&gt;180. &amp;&amp; $_RAJ2000&lt;270.</tt><br>
<tt>$Jmag&gt;11</tt><br>
-<tt>log($Kmag*10)&lt;.3<br></tt> <tt>[string equal $OTYPE_S
-SNR]</tt><br></blockquote>
+<tt>log($Kmag*10)&lt;.3<br></tt> <tt>[string equal $OTYPE_S SNR]</tt><br></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>$&lt;column
-name&gt;.</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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-always</tt><br>
-<tt>0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-never</tt><br>
-<tt>true&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-always</tt><br>
-<tt>false&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-never</tt><br>
-<tt>$Jmag&gt;2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-conditional</tt><br>
-<tt>sin($Jmag)&gt;.5
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# conditional</tt><br>
-<tt>[string equal $Class
-SNR]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-conditional</tt><br>
-<tt>[regexp {*SNR*}
-$Class]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-value of '2' is used</tt><br>
-<tt>$Jmag&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-value of column Jmag is used</tt><br>
-<tt>$Jmag/2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# value
-of column Jmag div 2 is used</tt><br>
-<tt>(4+2)/3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-will put 'foo' above the symbol</tt><br>
-<tt>$Jmag&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-will put the value of column Jmag above the symbol</tt><br>
-<tt>(4+2)/3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#
-will put the text '(4+2)/3' above the symbol</tt><br>
-<tt>[expr (4+2)/3]&nbsp;&nbsp;# will put the text '2' above the
-symbol</tt><br>
-<tt>[expr $Jmag/2.]&nbsp;# 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>
+<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>$&lt;column name&gt;.</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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# always</tt><br>
+<tt>0&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# never</tt><br>
+<tt>true&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# always</tt><br>
+<tt>false&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# never</tt><br>
+<tt>$Jmag&gt;2&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# conditional</tt><br>
+<tt>sin($Jmag)&gt;.5 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # conditional</tt><br>
+<tt>[string equal $Class SNR]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# conditional</tt><br>
+<tt>[regexp {*SNR*} $Class]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# 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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# value of '2' is used</tt><br>
+<tt>$Jmag&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# value of column Jmag is used</tt><br>
+<tt>$Jmag/2.&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# value of column Jmag div 2 is used</tt><br>
+<tt>(4+2)/3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# 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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# will put 'foo' above the symbol</tt><br>
+<tt>$Jmag&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# will put the value of column Jmag above the symbol</tt><br>
+<tt>(4+2)/3&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;# will put the text '(4+2)/3' above the symbol</tt><br>
+<tt>[expr (4+2)/3]&nbsp;&nbsp;# will put the text '2' above the symbol</tt><br>
+<tt>[expr $Jmag/2.]&nbsp;# 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>
&nbsp;</blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/colorbar.html b/ds9/doc/ref/colorbar.html
index 862c3e2..479081a 100644
--- a/ds9/doc/ref/colorbar.html
+++ b/ds9/doc/ref/colorbar.html
@@ -1,68 +1,65 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
-<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# default visual, default depth<br>
-$ds9 -visual pseudo&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # pseudo
-color, default depth<br>
-$ds9 -visual pseudocolor&nbsp; # pseudo color, default depth<br>
-$ds9 -visual pseudocolor8 # pseudo color 8<br>
-$ds9 -visual true&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; #
-true color, default depth<br>
-$ds9 -visual truecolor&nbsp;&nbsp;&nbsp; # true color, default
-depth<br>
-$ds9 -visual truecolor8&nbsp;&nbsp; # true color 8<br>
-$ds9 -visual truecolor16&nbsp; # true color 16<br>
-$ds9 -visual truecolor24&nbsp; # true color 24</tt></blockquote>
-</blockquote>
-</body>
+ <head>
+ <meta name="generator" content="HTML Tidy for Mac OS X (vers 31
+ October 2006 - Apple Inc. build 16.1), see www.w3.org">
+ <meta http-equiv="Content-Type" content="text/html;
+ charset=windows-1252">
+ <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+ 2.4.7-10 i686) [Netscape]">
+ <title>Color</title>
+ </head>
+ <body bgcolor="#FFFFFF" alink="#FF0000" vlink="#551A8B" text="#000000"
+ link="#0000EE">
+ <h3><img alt="" src="../sun.gif" height="98" align="middle"
+ width="100"> 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. 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>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&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ # default visual, default depth<br>
+ $ds9 -visual
+ true&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # true
+ color, default depth<br>
+ $ds9 -visual truecolor&nbsp;&nbsp;&nbsp; # true color, default
+ depth<br>
+ $ds9 -visual truecolor8&nbsp;&nbsp; # true color 8<br>
+ $ds9 -visual truecolor16&nbsp; # true color 16<br>
+ $ds9 -visual truecolor24&nbsp; # true color 24</tt></blockquote>
+ </blockquote>
+ </body>
</html>
diff --git a/ds9/doc/ref/contour.html b/ds9/doc/ref/contour.html
index 82e0d1c..b18e374 100644
--- a/ds9/doc/ref/contour.html
+++ b/ds9/doc/ref/contour.html
@@ -1,101 +1,53 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Contours</title>
</head>
-<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor=
-"#FFFFFF" alink="#FF0000">
-<h3><img alt="" src="../sun.gif" width="100" height="98" align=
-"middle"> Contours</h3>
+<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor="#FFFFFF" alink="#FF0000">
+<h3><img alt="" src="../sun.gif" width="100" height="98" align="middle"> Contours</h3>
<blockquote>
-<p>DS9 can create and display contours as an overlay on an image.
-The Analysis Contours menu is used to display contours. To create,
-copy, paste,&nbsp; and configure contours, use the Analysis Contour
-Parameters menu.</p>
+<p>DS9 can create and display contours as an overlay on an image. The Analysis Contours menu is used to display contours. To create, copy, paste,&nbsp; and configure contours, use the Analysis Contour Parameters menu.</p>
<p><b>Contour Parameters</b></p>
-<p>When creating a new contour, a dialog box appears, in which the
-user selects the number of contour levels, smoothness, and the
-distribution of the contours.</p>
+<p>When creating a new contour, a dialog box appears, in which the user selects the number of contour levels, smoothness, and the distribution of the contours.</p>
<p><b>Contour Levels</b></p>
-<p>Specifies the number of contour levels to be generated. A
-typical number is between 1 and 10. Note: large numbers of contours
-can take a long time to generate.</p>
+<p>Specifies the number of contour levels to be generated. A typical number is between 1 and 10. Note: large numbers of contours can take a long time to generate.</p>
<p><b>Contour Smoothness</b></p>
-<p>Specifies how smooth the contours are. A smoothness level of 1
-will evaluate the contour at each image pixel. A level of 2 will
-evaluate the contour at every other pixel. The larger the number,
-the quicker the contour will be generated, and the less detail will
-be available.</p>
+<p>Specifies how smooth the contours are. A smoothness level of 1 will evaluate the contour at each image pixel. A level of 2 will evaluate the contour at every other pixel. The larger the number, the quicker the contour will be generated, and the less detail will be available.</p>
<p><b>Contour Scale</b></p>
<p>Specifies the distribution of the contour levels.<br></p>
<p><b>Contour Method</b></p>
-<p>There are two methods that are available to calculate the
-contour lines. The first, BLOCK, blocks down the image, by the
-smoothness factor, before contours are calculated. As a result, the
-larger the smoothness, the faster the result. The second method,
-SMOOTH, smooths the image before calculating contours. As a result,
-the larger the smoothness, the slower the result.<br></p>
-<p><b><a name="ContourFiles" id="ContourFiles"></a>Contour
-Files</b></p>
-<p>A contour file is an ASCII file containing a header, global
-properties, coordinate system, contour levels, and contour
-points.<br></p>
+<p>There are two methods that are available to calculate the contour lines. The first, BLOCK, blocks down the image, by the smoothness factor, before contours are calculated. As a result, the larger the smoothness, the faster the result. The second method, SMOOTH, smooths the image before calculating contours. As a result, the larger the smoothness, the slower the result.<br></p>
+<p><b><a name="ContourFiles" id="ContourFiles"></a>Contour Files</b></p>
+<p>A contour file is an ASCII file containing a header, global properties, coordinate system, contour levels, and contour points.<br></p>
<p><b>Header</b></p>
-<p>A DS9 contour file may start with the following optional
-header:</p>
-<tt>&nbsp;&nbsp;&nbsp; # Contour file format: DS9 version
-7.5</tt><br>
+<p>A DS9 contour file may start with the following optional header:</p>
+<tt>&nbsp;&nbsp;&nbsp; # Contour file format: DS9 version 7.5</tt><br>
<p><b>Global Properties</b></p>
-<p>Global properties affect all contour levels unless a line level
-attribute is specified. The <tt>global</tt> keyword is first,
-followed by a list of keyword = value pairs. Multiple global
-property lines may be used within a region file.</p>
-<tt>&nbsp;&nbsp;&nbsp; global color=green width=1 dash=1 dashlist=8
-3</tt><br>
+<p>Global properties affect all contour levels unless a line level attribute is specified. The <tt>global</tt> keyword is first, followed by a list of keyword = value pairs. Multiple global property lines may be used within a region file.</p>
+<tt>&nbsp;&nbsp;&nbsp; global color=green width=1 dash=1 dashlist=8 3</tt><br>
<p><b>Coordinate Systems</b></p>
-<p>For each contour file, it is important to specify the coordinate
-system used to interpret the contour points, i.e., to set the
-context in which the positions are interpreted. For this purpose,
-the following keywords are recognized:</p>
-<tt>&nbsp;&nbsp;&nbsp; PHYSICAL&nbsp;&nbsp;&nbsp; # pixel coords of
-original file using LTM/LTV<br>
-&nbsp;&nbsp;&nbsp; IMAGE&nbsp;&nbsp;&nbsp; # pixel coords of
-current file<br>
-&nbsp;&nbsp;&nbsp; FK4,B1950&nbsp;&nbsp;&nbsp; # sky coordinate
-systems<br>
-&nbsp;&nbsp;&nbsp; FK5,J2000&nbsp;&nbsp;&nbsp; # sky coordinate
-systems<br>
-&nbsp;&nbsp;&nbsp; ICRS&nbsp;&nbsp;&nbsp; # sky coordinate
-systems<br>
-&nbsp;&nbsp;&nbsp; GALACTIC&nbsp;&nbsp;&nbsp; # sky coordinate
-systems<br>
-&nbsp;&nbsp;&nbsp; ECLIPTIC&nbsp;&nbsp;&nbsp; # sky coordinate
-systems<br>
+<p>For each contour file, it is important to specify the coordinate system used to interpret the contour points, i.e., to set the context in which the positions are interpreted. For this purpose, the following keywords are recognized:</p>
+<tt>&nbsp;&nbsp;&nbsp; PHYSICAL&nbsp;&nbsp;&nbsp; # pixel coords of original file using LTM/LTV<br>
+&nbsp;&nbsp;&nbsp; IMAGE&nbsp;&nbsp;&nbsp; # pixel coords of current file<br>
+&nbsp;&nbsp;&nbsp; FK4,B1950&nbsp;&nbsp;&nbsp; # sky coordinate systems<br>
+&nbsp;&nbsp;&nbsp; FK5,J2000&nbsp;&nbsp;&nbsp; # sky coordinate systems<br>
+&nbsp;&nbsp;&nbsp; ICRS&nbsp;&nbsp;&nbsp; # sky coordinate systems<br>
+&nbsp;&nbsp;&nbsp; GALACTIC&nbsp;&nbsp;&nbsp; # sky coordinate systems<br>
+&nbsp;&nbsp;&nbsp; ECLIPTIC&nbsp;&nbsp;&nbsp; # sky coordinate systems<br>
&nbsp;&nbsp;&nbsp; WCS&nbsp;&nbsp;&nbsp; # primary WCS<br>
&nbsp;&nbsp;&nbsp; WCSA&nbsp;&nbsp;&nbsp; # secondary WCS<br>
-&nbsp;&nbsp;&nbsp; LINEAR&nbsp;&nbsp;&nbsp; # linear primary
-WCS<br></tt>
+&nbsp;&nbsp;&nbsp; LINEAR&nbsp;&nbsp;&nbsp; # linear primary WCS<br></tt>
<p><b>Contour Level</b></p>
-<p>Each contour level is composed of a line value, line attributes
-and one or more contours. Line attributes are specified at the
-start of a new level and only affect contours within that level
-.</p>
-<tt>&nbsp;&nbsp;&nbsp; level=15.78775 color=pink width=2 dash=yes
-dashlist=2 2</tt><br>
+<p>Each contour level is composed of a line value, line attributes and one or more contours. Line attributes are specified at the start of a new level and only affect contours within that level .</p>
+<tt>&nbsp;&nbsp;&nbsp; level=15.78775 color=pink width=2 dash=yes dashlist=2 2</tt><br>
<p><b>Contour</b></p>
-<p>Each contour is composed of one or more X,Y coordinates, with a
-deliminator of space or comma,&nbsp; starting with "(" and ending
-with ")". Contours are not closed.<br></p>
+<p>Each contour is composed of one or more X,Y coordinates, with a deliminator of space or comma,&nbsp; starting with "(" and ending with ")". Contours are not closed.<br></p>
<tt>&nbsp;&nbsp;&nbsp; (202.4836468 47.22380226<br>
&nbsp;&nbsp; &nbsp; 202.4833538 47.2239185<br>
&nbsp;&nbsp; &nbsp; 202.4831634 47.22409874<br>
-&nbsp;&nbsp; &nbsp; 202.4829883
-47.22428858)<br></tt><br></blockquote>
+&nbsp;&nbsp; &nbsp; 202.4829883 47.22428858)<br></tt><br></blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/file.html b/ds9/doc/ref/file.html
index b3f15dc..92e0d42 100644
--- a/ds9/doc/ref/file.html
+++ b/ds9/doc/ref/file.html
@@ -1,42 +1,33 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>File Formats</title>
</head>
-<body vlink="#551A8B" text="#000000" bgcolor="#FFFFFF" alink=
-"#FF0000" link="#0000EE">
-<h3><img alt="" src="../sun.gif" width="100" align="middle" height=
-"98"> File Formats</h3>
+<body vlink="#551A8B" text="#000000" bgcolor="#FFFFFF" alink="#FF0000" link="#0000EE">
+<h3><img alt="" src="../sun.gif" width="100" align="middle" height="98"> File Formats</h3>
<blockquote><a href="#FITS">FITS</a><br>
<a href="#FITSImage">FITS Image</a><br>
<a href="#FITSBinaryEventsTable">FITS Binary Events Table</a><br>
<a href="#FITSHEALPIXTable">FITS HEALPIX Table</a><br>
<a href="#FITSDataCube">FITS Data Cube</a><br>
-<a href="#FITSMultipleExtensionDataCube">FITS Multiple Extension
-Data Cube</a><br>
-<a href="#FITSMultipleExtensionMultipleFrames">FITS Multiple
-Extension Multiple Frames</a><br>
+<a href="#FITSMultipleExtensionDataCube">FITS Multiple Extension Data Cube</a><br>
+<a href="#FITSMultipleExtensionMultipleFrames">FITS Multiple Extension Multiple Frames</a><br>
<a href="#FITSMosaic">FITS Mosaic</a><br>
<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="#array">Array</a><br>
-<a href=
-"file:///Users/joye/saods9/doc/ref/file.html#nrrd">NRRD</a><br>
+<a href="file:///Users/joye/saods9/doc/ref/file.html#nrrd">NRRD</a><br>
<a href="#envi">ENVI</a><br>
<a href="#gif">GIF</a><br>
<a href="#tiff">TIFF</a><br>
<a href="#jpeg">JPEG</a><br>
<a href="#png">PNG</a><br>
<a href="#ExternalFileSupport">External Format Support</a><br>
-<a href="#ExternalAnalysisSupport">External Analysis
-Support</a><br>
+<a href="#ExternalAnalysisSupport">External Analysis Support</a><br>
<a href="#RegionFiles">Region Files</a><br>
<a href="#ContourFiles">Contour Files</a><br>
<a href="#ColorLookupTable">Color Lookup Table</a><br>
@@ -45,9 +36,7 @@ Support</a><br>
<a href="#StartupFile">Startup File</a><br>
<a href="#TCL">TCL</a><br>
<p><b><a name="FITS" id="FITS"></a>FITS</b></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:
+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>
<ul>
<li><tt>Examine primary HDU, if IMAGE, load.<br></tt></li>
@@ -55,26 +44,20 @@ no additional information is provide:
<li style="list-style: none">
<ul>
<li><tt>If IMAGE, load.<br></tt></li>
-<li><tt>If BINARY TABLE, create IMAGE if the following is
-true:</tt></li>
+<li><tt>If BINARY TABLE, create IMAGE if the following is true:</tt></li>
<li style="list-style: none">
<ul>
<li><tt>FITS COMPRESSED: keyword ZIMAGE is T.</tt></li>
-<li><tt>FITS EVENTS: keyword EXTNAME is EVENTS,STDEVT, or RAYEVENT,
-column names X and Y are present.</tt></li>
+<li><tt>FITS EVENTS: keyword EXTNAME is EVENTS,STDEVT, or RAYEVENT, column names X and Y are present.</tt></li>
<li><tt>FITS HEALPIX: keyword PIXTYPE is HEALPIX.</tt><br></li>
</ul>
</li>
</ul>
</li>
-<li><tt>If DS9 traverses the entire FITS file without satisfying
-one of the above, an error is generated.</tt></li>
+<li><tt>If DS9 traverses the entire FITS file without satisfying one of the above, an error is generated.</tt></li>
</ul>
</blockquote>
-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:<br>
+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:<br>
<br>
<tt>OBJECT</tt><br>
<tt>UNITS</tt><br>
@@ -87,16 +70,7 @@ supported:<br>
<tt>WCS keywords</tt><br>
<tt>WCS# keywords</tt><br>
<p><b><a name="FITSImage" id="FITSImage"></a>FITS Image</b></p>
-At load time, the user may provide just a file name or a file name
-along with FITS extension name/number and image section
-specification. FITS extension names are case insensitive. When
-specifying an extension, 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,
-x and y coordinates are in <tt>IMAGE</tt>, use a <tt>'p'</tt> as
-the last character to indicate <tt>PHYSICAL</tt> coordinates. A
-<tt>'*'</tt> indicates use the default for that axis only. Block is
-optional and defaults to 1.<br>
+At load time, the user may provide just a file name or a file name along with FITS extension name/number and image section specification. FITS extension names are case insensitive. When specifying an extension, 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, x and y coordinates are in <tt>IMAGE</tt>, use a <tt>'p'</tt> as the last character to indicate <tt>PHYSICAL</tt> coordinates. A <tt>'*'</tt> indicates use the default for that axis only. Block is optional and defaults to 1.<br>
<br>
<tt>Syntax:<br>
filename<br>
@@ -156,28 +130,15 @@ $ds9 foo.fits[10:200,40:100] # image section<br>
$ds9 foo.fits[10:200,40:100,2] # image section, blocked by 2<br>
$ds9 foo.fits[*,40:100] # only section y axis<br>
$ds9 foo.fits[256@512@512] # section box at 512,512<br>
-$ds9 foo.fits[2][100:200,100:200] # second extension, image
-section<br>
-$ds9 foo.fits[2][100:200,100:200,2] # second extension, image
-section, blocked by 2<br>
+$ds9 foo.fits[2][100:200,100:200] # second extension, image section<br>
+$ds9 foo.fits[2][100:200,100:200,2] # second extension, image section, blocked by 2<br>
$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@512@512] # section cube at 512,512<br>
-$ds9 foo.fits[2][100:200,100:200,5:20] # second extension, cube
-section<br>
-$ds9 foo.fits[2][100:200,100:200,2,5:20] # second extension, cube
-section, blocked by 2<br>
-<br></tt> <b><a name="FITSBinaryEventsTable" id=
-"FITSBinaryEventsTable"></a>FITS Binary Events Table<br>
-<br></b> At load time, the user may provide just a file name or a
-file name along with FITS extension name/number, image section
-specification, and binnng parameters. DS9 will automatically
-convert an FITS binary events table into a 2D image for display.
-FITS extension names and parameters are case insensitive. 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>
+$ds9 foo.fits[2][100:200,100:200,5:20] # second extension, cube section<br>
+$ds9 foo.fits[2][100:200,100:200,2,5:20] # second extension, cube section, blocked by 2<br>
+<br></tt> <b><a name="FITSBinaryEventsTable" id="FITSBinaryEventsTable"></a>FITS Binary Events Table<br>
+<br></b> At load time, the user may provide just a file name or a file name along with FITS extension name/number, image section specification, and binnng parameters. DS9 will automatically convert an FITS binary events table into a 2D image for display. FITS extension names and parameters are case insensitive. 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><tt>Syntax:<br>
filename<br>
filename[ext]<br>
@@ -206,9 +167,7 @@ bin:<br>
[bin=colz,filter] # bin cols 'x', 'y', and colz with filter<br>
[key=colx,coly]<br>
[binkey=colx,coly]<br></tt><br>
-(see <a href=
-"http://hea-www.harvard.edu/saord/funtools/filters.html">Introduction
-to Filtering</a>)<br>
+(see <a href="http://hea-www.harvard.edu/saord/funtools/filters.html">Introduction to Filtering</a>)<br>
<br>
<tt>Example:<br>
$ds9 foo.fits # default load<br>
@@ -216,33 +175,18 @@ $ds9 foo.fits[1] # load first extension<br>
$ds9 foo.fits[BCKGRD] # load extension named 'BCKGRD'<br>
$ds9 foo.fits[bin=detx,dety] # bin on detx,dety<br>
$ds9 foo.fits[2][bin=rawx,rawy] # load ext 2, cols rawx,rawy<br>
-$ds9 foo.fits[bg_events,bin=rawx,rawy] # load ext bg_events, cols
-rawx,rawy<br>
+$ds9 foo.fits[bg_events,bin=rawx,rawy] # load ext bg_events, cols rawx,rawy<br>
$ds9 foo.fits[bin=x,y,pha] # bin on x,y,pi<br>
$ds9 foo.fits[bin=pi] # bin on x,y,pi<br>
-$ds9 'foo.fits[ccd_id==3&amp;&amp;energy&gt;4000]' # quoted
-filter<br>
-$ds9 '"foo.fits[ccd_id==3 &amp;&amp; energy&gt;4000]"' # double
-quoted filter<br>
-$ds9 'foo.fits[events][pha&gt;5,pi&lt;2]' # load extension 'events'
-and filter</tt><br></blockquote>
+$ds9 'foo.fits[ccd_id==3&amp;&amp;energy&gt;4000]' # quoted filter<br>
+$ds9 '"foo.fits[ccd_id==3 &amp;&amp; energy&gt;4000]"' # double quoted filter<br>
+$ds9 'foo.fits[events][pha&gt;5,pi&lt;2]' # load extension 'events' and filter</tt><br></blockquote>
<blockquote>
-<p>The shell environment variable <tt>DS9_BINKEY</tt> may be used
-to specify default bin cols for FITS bin tables. Example:</p>
+<p>The shell environment variable <tt>DS9_BINKEY</tt> may be used to specify default bin cols for FITS bin tables. Example:</p>
<tt>$ export DS9_BINKEY='[bin=rawx,rawy]'<br>
$ ds9 foo.fits # load FITS bin table, bin on rawx, rawy</tt><br>
-<p><b><a name="FITSHEALPIXTable" id="FITSHEALPIXTable"></a>FITS
-HEALPIX Table<br></b></p>
-At load time, the user may provide just a file name or a file name
-along with FITS extension name/number, image section specification,
-and Healpix parameters. DS9 will automatically convert a FITS
-HEALPIX binary or ascii table into a 2D image for display. FITS
-extension names and parameters are case insensitive. 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><b><a name="FITSHEALPIXTable" id="FITSHEALPIXTable"></a>FITS HEALPIX Table<br></b></p>
+At load time, the user may provide just a file name or a file name along with FITS extension name/number, image section specification, and Healpix parameters. DS9 will automatically convert a FITS HEALPIX binary or ascii table into a 2D image for display. FITS extension names and parameters are case insensitive. 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>
<br>
<tt>Syntax:<br>
filename<br>
@@ -260,12 +204,8 @@ filename[sect][hpx]<br>
filename[ext,hpx]<br>
<br>
where:<br>
-ext: see<a href=
-"file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS
-Image</a><br>
-sect: see<a href=
-"file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS
-Image</a><br>
+ext: see<a href="file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS Image</a><br>
+sect: see<a href="file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS Image</a><br>
<br>
hpx:<br>
[order=ring|nested] # default ring<br>
@@ -277,123 +217,71 @@ hpx:<br>
Example:<br>
$ds9 foo.fits # default load<br>
$ds9 foo.fits[1] # load first extension<br>
-$ds9
-foo.fits[order=ring,layout=equatorial,col=1,quad=1,system=unknown]<br>
-
-$ds9 foo.fits[1,order=nested] # first extension, nested
-order</tt><br>
-<p><b><a name="FITSDataCube" id="FITSDataCube"></a>FITS
-Cube</b></p>
-A FITS Cube is a FITS image which contains more than 2 axes
-(NAXES&gt;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" id=
-"FITSMultipleExtensionDataCube"></a>FITS Multiple Extension
-Cube</b></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.<br>
+$ds9 foo.fits[order=ring,layout=equatorial,col=1,quad=1,system=unknown]<br>
+$ds9 foo.fits[1,order=nested] # first extension, nested order</tt><br>
+<p><b><a name="FITSDataCube" id="FITSDataCube"></a>FITS Cube</b></p>
+A FITS Cube is a FITS image which contains more than 2 axes (NAXES&gt;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" id="FITSMultipleExtensionDataCube"></a>FITS Multiple Extension Cube</b></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.<br>
<br>
<tt>Example:<br>
-$ds9 -mecube foo.fits # load multiple extension fits file as data
-cube</tt><br>
-<p><b><a name="FITSMultipleExtensionMultipleFrames" id=
-"FITSMultipleExtensionMultipleFrames"></a>FITS Multiple Extension
-Multiple Frames</b></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.<br>
+$ds9 -mecube foo.fits # load multiple extension fits file as data cube</tt><br>
+<p><b><a name="FITSMultipleExtensionMultipleFrames" id="FITSMultipleExtensionMultipleFrames"></a>FITS Multiple Extension Multiple Frames</b></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.<br>
<br>
<tt>Example:<br>
-$ds9 -multiframe foo.fits # load multiple extension fits file as
-multiple frames</tt><br>
+$ds9 -multiframe foo.fits # load multiple extension fits file as multiple frames</tt><br>
<p><b><a name="FITSMosaic" id="FITSMosaic"></a>FITS Mosaic</b></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>
+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:&nbsp;
<center>
-<table width="50%" cellspacing="2" cellpadding="2" border="1"
-align="center">
+<table summary="" width="50%" cellspacing="2" cellpadding="2" border="1" align="center">
<tbody>
<tr>
<td valign="top"><tt>IRAF</tt><br></td>
<td valign="top"><tt>contains the DETSEC and DETSIZE keywords.<br>
-See <a href=
-"http://iraf.noao.edu/projects/ccdmosaic/imagedef/imagedef.html">NOAO
-IRAF Mosaic Data Structures</a></tt><br></td>
+See <a href="http://iraf.noao.edu/projects/ccdmosaic/imagedef/imagedef.html">NOAO IRAF Mosaic Data Structures</a></tt><br></td>
</tr>
<tr>
<td valign="top" align="left"><tt>WCS</tt><br></td>
-<td valign="top" align="left"><tt>each FITS image contains a valid
-WCS.</tt><br></td>
+<td valign="top" align="left"><tt>each FITS image contains a valid WCS.</tt><br></td>
</tr>
<tr>
<td valign="top" align="left"><tt>HST WFPC2</tt><br></td>
-<td valign="top" align="left"><tt>valid HST WFPC2 data cube,
-consisting of 4 planes, along with a fits ascii table containing
-wcs information.</tt></td>
+<td valign="top" align="left"><tt>valid HST WFPC2 data cube, consisting of 4 planes, along with a fits ascii table containing wcs information.</tt></td>
</tr>
</tbody>
</table>
</center>
<br>
<tt>Example:<br>
-$ds9 -mosaicimage iraf foo.fits # load mosaic iraf from one fits
-file with multiple exts<br>
-$ds9 -mosaic iraf foo.fits bar.fits wow.fits # load mosaic iraf
-from 3 files<br>
-$ds9 -mosaicimage wcs foo.fits # load mosaic wcs from one fits file
-with multiple exts<br>
-$ds9 -mosaic wcs foo.fits bar.fits wow.fits # load mosaic wcs from
-3 files<br>
+$ds9 -mosaicimage iraf foo.fits # load mosaic iraf from one fits file with multiple exts<br>
+$ds9 -mosaic iraf foo.fits bar.fits wow.fits # load mosaic iraf from 3 files<br>
+$ds9 -mosaicimage wcs foo.fits # load mosaic wcs from one fits file with multiple exts<br>
+$ds9 -mosaic wcs foo.fits bar.fits wow.fits # load mosaic wcs from 3 files<br>
$ds9 -mosaicimage wfpc2 bar.fits # load wfpc2 mosaic<br>
-$ds9 -mosaic foo.fits bar.fits wow.fits # load mosaic (wcs) from 3
-files</tt><br>
-<p><b><a name="FITSMosaicDataCube" id="FITSMosaicDataCube"></a>FITS
-Mosaic Data Cube</b></p>
-A FITS Mosaic Data Cube is a FITS mosaic image which contains more
-than 2 axes (NAXES&gt;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 data cube dialog box which allows
-the user to select which 2 image to be displayed.
+$ds9 -mosaic foo.fits bar.fits wow.fits # load mosaic (wcs) from 3 files</tt><br>
+<p><b><a name="FITSMosaicDataCube" id="FITSMosaicDataCube"></a>FITS Mosaic Data Cube</b></p>
+A FITS Mosaic Data Cube is a FITS mosaic image which contains more than 2 axes (NAXES&gt;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 data cube dialog box which allows the user to select which 2 image to be displayed.
<p><b><a name="FITSRGB" id="FITSRGB"></a>FITS RGB</b></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.<br>
+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>
<br>
<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</tt><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</tt><br>
<p><b><a name="SplitFITS" id="SplitFITS"></a>Split FITS</b></p>
-A split fits is a valid fits file in which two files contain the
-header and data segments.
+A split fits is a valid fits file in which two files contain the header and data segments.
<p><b><a name="array" id="array"></a>Array</b></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.
+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[arr]<br>
filename[arr][sect]<br>
filename[sect][arr]<br>
&nbsp;</tt><br>
where<br>
-<tt>sect: see <a href=
-"file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS
-Image</a><br>
+<tt>sect: see <a href="file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS Image</a><br>
arr:<br></tt>
<blockquote><tt>xdim=value</tt><br>
<tt>ydim=value</tt><br>
@@ -404,15 +292,11 @@ arr:<br></tt>
<tt>skip=value # must be even, most must be factor of 4</tt><br>
<tt>arch|endian=[big|bigendian|little|littleendian]</tt><br></blockquote>
<tt>Example:<br>
-$ds9 -array bar.arr[xdim=512,ydim=512,zdim=1,bitpix=16] # load
-512x512 short<br>
-$ds9 -array bar.arr[dim=256,bitpix=-32,skip=4] # load 256x256 float
-with 4 byte head<br>
-$ds9 -array bar.arr[dim=512,bitpix=32,arch=little] # load 512x512
-long, intel<br></tt>
+$ds9 -array bar.arr[xdim=512,ydim=512,zdim=1,bitpix=16] # load 512x512 short<br>
+$ds9 -array bar.arr[dim=256,bitpix=-32,skip=4] # load 256x256 float with 4 byte head<br>
+$ds9 -array bar.arr[dim=512,bitpix=32,arch=little] # load 512x512 long, intel<br></tt>
<p>or alternate format:</p>
<tt>filename[array(&lt;type&gt;&lt;dim&gt;&lt;:skip&gt;&lt;endian&gt;)]<br>
-
<br>
where:<br>
type:</tt>
@@ -429,56 +313,42 @@ type:</tt>
int.int # x,y dim<br>
int.int.int # x,y,z dim<br></tt></blockquote>
<tt>skip:</tt>
-<blockquote><tt>int&nbsp;&nbsp;&nbsp;&nbsp; # number of bytes to
-skip</tt></blockquote>
+<blockquote><tt>int&nbsp;&nbsp;&nbsp;&nbsp; # number of bytes to skip</tt></blockquote>
<tt>endian:</tt>
<blockquote><tt>'l' little endian<br>
'b' big endian<br></tt></blockquote>
<tt>Example:<br>
-$ds9 -array bar.arr[array(s512)]&nbsp;&nbsp; # load 512x512
-short<br>
-$ds9 -array bar.arr[array(r256:4)] # load 256x256 float with 4 byte
-head<br>
-$ds9 -array bar.arr[array(i512l)]&nbsp; # load 512x512 long,
-intel</tt>
-<p>The shell environment variable <tt>DS9_ARRAY</tt> may be used to
-specify default array parameters.</p>
+$ds9 -array bar.arr[array(s512)]&nbsp;&nbsp; # load 512x512 short<br>
+$ds9 -array bar.arr[array(r256:4)] # load 256x256 float with 4 byte head<br>
+$ds9 -array bar.arr[array(i512l)]&nbsp; # load 512x512 long, intel</tt>
+<p>The shell environment variable <tt>DS9_ARRAY</tt> may be used to specify default array parameters.</p>
<tt>Example:<br>
$export DS9_ARRAY='[dim=256,bitpix=-32]'<br>
$ds9 -array foo.arr # load 256x256 float<br></tt></blockquote>
-<p><b><a name="nrrd" id="nrrd"></a>NRRD (Nearly Raw Raster
-Data)</b><br></p>
-Images in NRRD are supported directly. Encodings supported:
-<tt>raw, gzip<br></tt><br>
+<p><b><a name="nrrd" id="nrrd"></a>NRRD (Nearly Raw Raster Data)</b><br></p>
+Images in NRRD are supported directly. Encodings supported: <tt>raw, gzip<br></tt><br>
<tt>Syntax:<br></tt> filename<br>
filename[sect]<br>
<br>
where:<br>
-sect: see <a href=
-"file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS
-Image</a><br>
+sect: see <a href="file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS Image</a><br>
Example:<br>
$ds9 -nrrd foo.nrrd<br>
$ds9 -nrrd foo.nrrd[100:200,100:200] # cropped<br>
<p><b><a name="envi" id="envi"></a>ENVI</b><br></p>
-Images in ENVI are supported directly. Encodings supported: BIL,
-BIP, BSQ.<br>
+Images in ENVI are supported directly. Encodings supported: BIL, BIP, BSQ.<br>
Syntax:<br>
filename<br>
filename[sect]<br>
<br>
where:<br>
-sect: see <a href=
-"file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS
-Image</a><br>
+sect: see <a href="file:///Users/joye/saods9/ds9/doc/ref/FITSImage">FITS Image</a><br>
<br>
Example:<br>
$ds9 -envi foo.hdr foo.bsq<br>
$ds9 -envi foo.hdr foo.bsq[100:200,100:200] # cropped<br>
<p><b><a name="gif" id="gif"></a>GIF</b><br></p>
-Images in GIF 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>
+Images in GIF 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>
<tt><br>
Syntax:<br>
filename<br>
@@ -486,9 +356,7 @@ filename<br>
Example:<br>
$ ds9 -gif foo.gif</tt><br>
<p><b><a name="tiff" id="tiff"></a>TIFF</b><br></p>
-Images in TIFF 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>
+Images in TIFF 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>
<br>
<tt>Syntax:<br>
filename<br>
@@ -496,9 +364,7 @@ filename<br>
Example:<br>
$ ds9 -tiff foo.tiff</tt><br>
<p><b><a name="jpeg" id="jpeg"></a>JPEG</b><br></p>
-Images in JPEG 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>
+Images in JPEG 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>
<tt><br>
Syntax:<br>
filename<br>
@@ -506,40 +372,25 @@ filename<br>
Example:<br>
$ ds9 -jpeg foo.jpeg</tt><br>
<p><b><a name="png" id="png"></a>PNG</b><br></p>
-Images in 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>
+Images in 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>
<br>
<tt>Syntax:<br>
filename<br>
<br>
Example:<br>
$ ds9 -png foo.png</tt><br>
-<p><b><a name="ExternalFileSupport" id=
-"ExternalFileSupport"></a>External File Support</b></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.<br>
-At start-up, DS9 first searches for the ASCII file, named
-<tt>.ds9.fil</tt>in the local directory, 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:<br>
+<p><b><a name="ExternalFileSupport" id="ExternalFileSupport"></a>External File Support</b></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.<br>
+At start-up, DS9 first searches for the ASCII file, named <tt>.ds9.fil</tt>in the local directory, 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:<br>
<br>
<tt>Help description</tt><br>
<tt>A space-separated list of templates</tt><br>
-<tt>A space-separated list of file types (not currently
-used)</tt><br>
+<tt>A space-separated list of file types (not currently used)</tt><br>
<tt>The command line for the loading this file type</tt><br>
<br>
-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>
+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>
<br>
@@ -553,70 +404,43 @@ The following macros are supported: <tt>$filename</tt><br>
<tt>*.imh</tt><br>
<tt>IMH</tt><br>
<tt>i2f -s $filename</tt><br>
-<p><b><a name="ExternalAnalysisSupport" id=
-"ExternalAnalysisSupport"></a>External Analysis Support</b></p>
-For more information about external analysis support files, see
-<a href="analysis.html">Analysis</a>.
-<p><b><a name="RegionFiles" id="RegionFiles"></a>Region
-Files</b></p>
-DS9 can read and write a number of region file formats. See
-<a href="region.html">Regions</a> documentation for more
-information.<br>
+<p><b><a name="ExternalAnalysisSupport" id="ExternalAnalysisSupport"></a>External Analysis Support</b></p>
+For more information about external analysis support files, see <a href="analysis.html">Analysis</a>.
+<p><b><a name="RegionFiles" id="RegionFiles"></a>Region Files</b></p>
+DS9 can read and write a number of region file formats. See <a href="region.html">Regions</a> documentation for more information.<br>
<br>
<tt><a href="region.html#RegionDescriptions">DS9</a></tt><br>
<tt><a href="region.html#FUNTools">FUNTools</a></tt><br>
<tt><a href="region.html#Ciao">Ciao</a></tt><br>
<tt><a href="region.html#SAOimage">SAOimage</a></tt><br>
<tt><a href="region.html#IRAFPROS">IRAF PROS</a></tt><br>
-<tt><a href="region.html#FITSREGIONBinaryTable">FITS REGION Binary
-Table</a></tt><br>
+<tt><a href="region.html#FITSREGIONBinaryTable">FITS REGION Binary Table</a></tt><br>
<tt><a href="region.html#XY">X Y</a></tt><br>
-<p><b><a name="ContourFiles" id="ContourFiles"></a>Contour
-Files</b></p>
-See <a href="contour.html">Contours</a> documentation for more
-information.<br>
-<p><b><a name="ColorLookupTable" id="ColorLookupTable"></a>Color
-Lookup Table</b></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:<br>
+<p><b><a name="ContourFiles" id="ContourFiles"></a>Contour Files</b></p>
+See <a href="contour.html">Contours</a> documentation for more information.<br>
+<p><b><a name="ColorLookupTable" id="ColorLookupTable"></a>Color Lookup Table</b></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:<br>
<br>
<tt>SAOimage</tt><br>
<tt>SAOtng</tt><br>
<tt>XImtool</tt><br>
<br>
-DS9 uses the file extension to determine the color table
-format:<br>
+DS9 uses the file extension to determine the color table format:<br>
<br>
<tt>.lut # XImtool, SAOtng<br>
.sao # DS9, SAOImage</tt><br>
<p><b><a name="WCS" id="WCS"></a>WCS</b></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.<br>
-<br>
-<tt>CRPIX1&nbsp;
-=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-257.75</tt><br>
-<tt>CRPIX2&nbsp;
-=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-258.93</tt><br>
-<tt>CRVAL1&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--201.94541667302</tt><br>
-<tt>CRVAL2&nbsp;
-=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--47.45444</tt><br>
-<tt>CDELT1&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--2.1277777E-4</tt><br>
-<tt>CDELT2&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-2.1277777E-4</tt><br>
+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.<br>
+<br>
+<tt>CRPIX1&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 257.75</tt><br>
+<tt>CRPIX2&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 258.93</tt><br>
+<tt>CRVAL1&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -201.94541667302</tt><br>
+<tt>CRVAL2&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -47.45444</tt><br>
+<tt>CDELT1&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -2.1277777E-4</tt><br>
+<tt>CDELT2&nbsp; =&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2.1277777E-4</tt><br>
<tt>CTYPE2&nbsp; = 'DEC--TAN'</tt><br>
<br>
-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:<br>
+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:<br>
<br>
<tt>CRPIX1&nbsp;&nbsp;&nbsp; 257.75</tt><br>
<tt>CRPIX2&nbsp;&nbsp;&nbsp; 258.93</tt><br>
@@ -627,26 +451,12 @@ pairs without the intervening "=" sign:<br>
<tt>CTYPE1&nbsp;&nbsp; 'RA---TAN'</tt><br>
<tt>CTYPE2&nbsp;&nbsp; 'DEC--TAN'</tt><br></blockquote>
<blockquote>
-<p><b><a name="PreferenceFile" id="PreferenceFile"></a>Preference
-File</b></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" id="StartupFile"></a>Startup
-File</b></p>
-If a startup file <tt>$HOME/ds9.ini</tt> is available, it is
-sourced as the last step in initialization. The file permissions
-must be group/world readonly.<br>
-Users may have several different startup files. DS9 looks for a
-startup file with its own name. By default, if the application is
-named <tt>ds9</tt>, it will look for <tt>.ds9.ini.</tt> However, if
-the DS9 application is named <tt>foo</tt>, then DS9 will look for
-<tt>.foo.ini.</tt> In this manner, the user can have several
-predefined startup files that are activated by invoking DS9 with a
-different application names.<br>
+<p><b><a name="PreferenceFile" id="PreferenceFile"></a>Preference File</b></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" id="StartupFile"></a>Startup File</b></p>
+If a startup file <tt>$HOME/ds9.ini</tt> is available, it is sourced as the last step in initialization. The file permissions must be group/world readonly.<br>
+Users may have several different startup files. DS9 looks for a startup file with its own name. By default, if the application is named <tt>ds9</tt>, it will look for <tt>.ds9.ini.</tt> However, if the DS9 application is named <tt>foo</tt>, then DS9 will look for <tt>.foo.ini.</tt> In this manner, the user can have several predefined startup files that are activated by invoking DS9 with a different application names.<br>
<p><b><a name="TCL" id="TCL"></a>TCL</b></p>
-TCL/TK script file. Users may customize the appearance and enhance
-the capabilities of DS9 by sourcing their own TCL
-scripts.</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/ds9/doc/ref/grid.html b/ds9/doc/ref/grid.html
index 9ca2f17..e660006 100644
--- a/ds9/doc/ref/grid.html
+++ b/ds9/doc/ref/grid.html
@@ -1,89 +1,39 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Coordinate Grids</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"> Coordinate Grids</h3>
+<body alink="#FF0000" bgcolor="#FFFFFF" link="#0000EE" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" align="middle" height="98" width="100"> Coordinate Grids</h3>
<blockquote>
-<p>DS9 can create and display coordinate grids as an overlay on an
-image. The Display Coordinate Grid Menu is used to display grids. A
-coordinate grid is composed of Grid Lines, Axes, Border, and Title.
-Axes include tick marks, title, and numbers. The appearance of the
-coordinate grid is specified by parameters. These parameters may be
-configured via the Coordinate Grid Parameters dialog box. In
-addition to the axes titles and the grid title, the following menus
-are available.</p>
+<p>DS9 can create and display coordinate grids as an overlay on an image. The Display Coordinate Grid Menu is used to display grids. A coordinate grid is composed of Grid Lines, Axes, Border, and Title. Axes include tick marks, title, and numbers. The appearance of the coordinate grid is specified by parameters. These parameters may be configured via the Coordinate Grid Parameters dialog box. In addition to the axes titles and the grid title, the following menus are available.</p>
<p><b><a name="Format" id="Format"></a>Numeric Formats</b></p>
-<p>The user may specify custom numeric formats for either axes. The
-format specification can be empty (default) or a print function,
-based on the selected coordinate system:<br></p>
+<p>The user may specify custom numeric formats for either axes. The format specification can be empty (default) or a print function, based on the selected coordinate system:<br></p>
<blockquote><tt>image</tt><br>
<tt>physical</tt><br>
<tt>detector</tt><br>
<tt>amplifier</tt><br>
<tt>wcs linear</tt><br>
<tt>wcs equatorial</tt><br></blockquote>
-<p>The format specification string to be passed to the C "printf"
-function (e.g. "%%1.7G") in order to format a single coordinate
-value.</p>
-<p>The Format string supplied should contain one or more of the
-following characters. These may occur in any order, but the
-following is recommended for clarity:</p>
-<blockquote>"": Indicates that a plus sign should be prefixed to
-positive values. By default, no plus sign is used.<br>
-"z": Indicates that leading zeros should be prefixed to the value
-so that the first field is of constant width, as would be required
-in a fixed-width table (leading zeros are always prefixed to any
-fields that follow). By default, no leading zeros are added.<br>
-"i": Use the standard ISO field separator (a colon) between fields.
-This is the default behaviour.<br>
+<p>The format specification string to be passed to the C "printf" function (e.g. "%%1.7G") in order to format a single coordinate value.</p>
+<p>The Format string supplied should contain one or more of the following characters. These may occur in any order, but the following is recommended for clarity:</p>
+<blockquote>"": Indicates that a plus sign should be prefixed to positive values. By default, no plus sign is used.<br>
+"z": Indicates that leading zeros should be prefixed to the value so that the first field is of constant width, as would be required in a fixed-width table (leading zeros are always prefixed to any fields that follow). By default, no leading zeros are added.<br>
+"i": Use the standard ISO field separator (a colon) between fields. This is the default behaviour.<br>
"b": Use a blank to separate fields.<br>
-"l": Use a letter ("h"/"d", "m" or "s" as appropriate) to separate
-fields.<br>
-"g": Use a letter and symbols to separate fields ("h"/"d", "m" or
-"s", etc, as appropriate), but include escape sequences in the
-formatted value so that the Plot class will draw the separators as
-small super-scripts.<br>
-"d": Include a degrees field. Expressing the angle purely in
-degrees is also the default if none of "h", "m", "s" or "t" are
-given.<br>
-"h": Express the angle as a time and include an hours field (where
-24 hours correspond to 360 degrees). Expressing the angle purely in
-hours is also the default if "t" is given without either "m" or
-"s".<br>
+"l": Use a letter ("h"/"d", "m" or "s" as appropriate) to separate fields.<br>
+"g": Use a letter and symbols to separate fields ("h"/"d", "m" or "s", etc, as appropriate), but include escape sequences in the formatted value so that the Plot class will draw the separators as small super-scripts.<br>
+"d": Include a degrees field. Expressing the angle purely in degrees is also the default if none of "h", "m", "s" or "t" are given.<br>
+"h": Express the angle as a time and include an hours field (where 24 hours correspond to 360 degrees). Expressing the angle purely in hours is also the default if "t" is given without either "m" or "s".<br>
"m": Include a minutes field. By default this is not included.<br>
-"s": Include a seconds field. By default this is not included. This
-request is ignored if "d" or "h" is given, unless a minutes field
-is also included.<br>
-"t": Express the angle as a time (where 24 hours correspond to 360
-degrees). This option is ignored if either "d" or "h" is given and
-is intended for use where the value is to be expressed purely in
-minutes and/or seconds of time (with no hours field). If "t" is
-given without "d", "h", "m" or "s" being present, then it is
-equivalent to "h".<br>
-".": Indicates that decimal places are to be given for the final
-field in the formatted string (whichever field this is). The "."
-should be followed immediately by an unsigned integer which gives
-the number of decimal places required, or by an asterisk. If an
-asterisk is supplied, a default number of decimal places is used
-which is based on the value of the Digits
-attribute.<br></blockquote>
-<p>All of the above format specifiers are case-insensitive. If
-several characters make conflicting requests (e.g. if both "i" and
-"b" appear), then the character occurring last takes precedence,
-except that "d" and "h" always override "t".</p>
-<p>The default formats are <tt>d.3</tt> for degrees and
-<tt>hms.1</tt> / <tt>dms.1</tt> / <tt>ldms.1</tt> for
-sexagesimal.<br></p>
+"s": Include a seconds field. By default this is not included. This request is ignored if "d" or "h" is given, unless a minutes field is also included.<br>
+"t": Express the angle as a time (where 24 hours correspond to 360 degrees). This option is ignored if either "d" or "h" is given and is intended for use where the value is to be expressed purely in minutes and/or seconds of time (with no hours field). If "t" is given without "d", "h", "m" or "s" being present, then it is equivalent to "h".<br>
+".": Indicates that decimal places are to be given for the final field in the formatted string (whichever field this is). The "." should be followed immediately by an unsigned integer which gives the number of decimal places required, or by an asterisk. If an asterisk is supplied, a default number of decimal places is used which is based on the value of the Digits attribute.<br></blockquote>
+<p>All of the above format specifiers are case-insensitive. If several characters make conflicting requests (e.g. if both "i" and "b" appear), then the character occurring last takes precedence, except that "d" and "h" always override "t".</p>
+<p>The default formats are <tt>d.3</tt> for degrees and <tt>hms.1</tt> / <tt>dms.1</tt> / <tt>ldms.1</tt> for sexagesimal.<br></p>
</blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/how.html b/ds9/doc/ref/how.html
index eb8f966..8786176 100644
--- a/ds9/doc/ref/how.html
+++ b/ds9/doc/ref/how.html
@@ -1,18 +1,13 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>How</title>
</head>
-<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor=
-"#FFFFFF" alink="#FF0000">
-<h3><img alt="" src="../sun.gif" width="100" height="98" align=
-"middle"> How it Works</h3>
+<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor="#FFFFFF" alink="#FF0000">
+<h3><img alt="" src="../sun.gif" width="100" height="98" align="middle"> How it Works</h3>
<blockquote>
<p><b>Table of Contents</b></p>
<a href="#How">How DS9 Renders an Image</a><br>
@@ -21,136 +16,66 @@
<a href="#Contours">Contours</a><br>
<a href="#LargeFiles">Large Files</a><br>
<p><b><a name="How" id="How"></a>How DS9 renders an image</b></p>
-<p>Here is a short description on how DS9 decides to paint a pixel
-a color on the the screen, give an data value... you need a color
-scale, a contrast/bias pair for the colorscale, clip values for the
-data, a scale distribution, and finally, the value of the pixel in
-question.</p>
+<p>Here is a short description on how DS9 decides to paint a pixel a color on the the screen, give an data value... you need a color scale, a contrast/bias pair for the colorscale, clip values for the data, a scale distribution, and finally, the value of the pixel in question.</p>
<blockquote>
-<p>Step 1. Select a color scale. A color scale is defined as a
-number of colors (RGB triplets). The number of RGB triplets can
-vary from just a few to over 200. DS9 contains a number of
-predefined color scales (Gray, A, B, I8, ...) or the user may load
-his own color scale.</p>
-<p>Step 2. Apply a contrast/bias pair. This step takes the result
-of step 1 and creates a new array with the contrast/bias applied.
-The length of the new array will between 200 (for pseudocolor) and
-4096 (for truecolor).</p>
-<p>Step 3. Calculate the data clip values (low/high data values).
-The min/max data values may be used or an algorithm may be used to
-determine the clip data values.</p>
-<p>Step 4. Apply the scale distribution. This involves taking the
-result of step 2, and creating yet another array, this time of size
-16384, redistributing the colors, based on the scale algorithm
-selected (see <a href="Scales">Scales</a>).</p>
-<p>Step 5. Based on your data clip values, and the value of the
-pixel you have, index into the result of step 4, and you have an
-index into lookup table (for pseudocolor) and an RGB pair (for
-truecolor and postscript).</p>
+<p>Step 1. Select a color scale. A color scale is defined as a number of colors (RGB triplets). The number of RGB triplets can vary from just a few to over 200. DS9 contains a number of predefined color scales (Gray, A, B, I8, ...) or the user may load his own color scale.</p>
+<p>Step 2. Apply a contrast/bias pair. This step takes the result of step 1 and creates a new array with the contrast/bias applied. The length of the new array will between 200 (for pseudocolor) and 4096 (for truecolor).</p>
+<p>Step 3. Calculate the data clip values (low/high data values). The min/max data values may be used or an algorithm may be used to determine the clip data values.</p>
+<p>Step 4. Apply the scale distribution. This involves taking the result of step 2, and creating yet another array, this time of size 16384, redistributing the colors, based on the scale algorithm selected (see <a href="Scales">Scales</a>).</p>
+<p>Step 5. Based on your data clip values, and the value of the pixel you have, index into the result of step 4, and you have an index into lookup table (for pseudocolor) and an RGB pair (for truecolor and postscript).</p>
</blockquote>
<p><b><a name="Scales" id="Scales"></a>Scales</b></p>
<p>The <tt>log</tt> function is defined as the following:</p>
<blockquote>
-<p><b><img src="img/log.png" alt="log equation" width="78" height=
-"32"></b></p>
+<p><b><img src="img/log.png" alt="log equation" width="78" height="32"></b></p>
</blockquote>
-<p>as <i>x</i> goes from 0 to 1. The user may specify an exponent
-<i>a</i> to change the distribution of colors within the colorbar.
-The default value of <i>a</i> is 1000. Typically, optical images
-respond well at 1000, IR images as low as 100, and high energy bin
-tables up to 10000. A value of 10000 closely matches the
-<b><tt>log</tt></b> function of SAOImage as defined as the
-following:</p>
+<p>as <i>x</i> goes from 0 to 1. The user may specify an exponent <i>a</i> to change the distribution of colors within the colorbar. The default value of <i>a</i> is 1000. Typically, optical images respond well at 1000, IR images as low as 100, and high energy bin tables up to 10000. A value of 10000 closely matches the <b><tt>log</tt></b> function of SAOImage as defined as the following:</p>
<blockquote>
-<p><b><img src="img/saolog.png" alt="SAOImage log equation" width=
-"65" height="34"></b></p>
+<p><b><img src="img/saolog.png" alt="SAOImage log equation" width="65" height="34"></b></p>
</blockquote>
<p>The <tt>pow</tt> function is defined as the following:</p>
<blockquote>
-<p><b><img src="img/pow.png" alt="pow equation" width="51" height=
-"30"></b></p>
+<p><b><img src="img/pow.png" alt="pow equation" width="51" height="30"></b></p>
</blockquote>
-<p>as <i>x</i> goes from 0 to 1. The user may specify an exponent
-<i>a</i> to change the distribution of colors within the colorbar.
-The default value of <i>a</i> is 1000.</p>
-<p>The <tt>sqrt</tt> scale function is defined as the
-following:</p>
-<blockquote><img src="img/sqrt.png" alt="sqrt equation" width="42"
-height="21"><br></blockquote>
+<p>as <i>x</i> goes from 0 to 1. The user may specify an exponent <i>a</i> to change the distribution of colors within the colorbar. The default value of <i>a</i> is 1000.</p>
+<p>The <tt>sqrt</tt> scale function is defined as the following:</p>
+<blockquote><img src="img/sqrt.png" alt="sqrt equation" width="42" height="21"><br></blockquote>
<p>as <i>x</i> goes from 0 to 1.</p>
-<p>The <tt>square</tt> scale function is defined as the
-following:</p>
-<blockquote><img src="img/square.png" alt="square equation" width=
-"35" height="21"><br></blockquote>
+<p>The <tt>square</tt> scale function is defined as the following:</p>
+<blockquote><img src="img/square.png" alt="square equation" width="35" height="21"><br></blockquote>
<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 alt="asinh" src="img/asinh.png" width="80" height=
-"29"><br></blockquote>
+<p>The <tt>asinh</tt> scale function is defined as the following:</p>
+<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 alt="sinh" src="img/sinh.png" width="69" height=
-"29"><br></blockquote>
+<p>The <tt>sinh</tt> scale function is defined as the following:</p>
+<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>
+<p>The <tt>histogram equalization</tt> scale function distributes colors based on the frequency of each data value.</p>
<p><b><a name="Smoothing" id="Smoothing"></a>Smoothing</b></p>
-<p>The user may select one of three types of smoothing kernels. Two
-parameters, <i>r</i><i>&nbsp; (radius)</i> and <i><tt>k</tt></i>
-<i>(kernel size</i><i>)</i>, are defined as the following:</p>
-<blockquote>Kernel width/height = <i>2k+1</i> with <i>r</i>
-<i>&lt;=</i> <i><tt>k</tt></i><br>
+<p>The user may select one of three types of smoothing kernels. Two parameters, <i>r</i><i>&nbsp; (radius)</i> and <i><tt>k</tt></i> <i>(kernel size</i><i>)</i>, are defined as the following:</p>
+<blockquote>Kernel width/height = <i>2k+1</i> with <i>r</i> <i>&lt;=</i> <i><tt>k</tt></i><br>
Boxcar function, width = <i>2</i><i>r</i><i>+1</i><br>
Tophat function, where the diameter = <i>2r</i><i>+1</i><br>
Gaussian function, defined as:
-<blockquote><img src="img/gauss.png" alt="Gaussian Equation" width=
-"173" height="38"><br></blockquote>
+<blockquote><img src="img/gauss.png" alt="Gaussian Equation" width="173" height="38"><br></blockquote>
where the mean = 0 and sigma = <i>r/2</i><br></blockquote>
<p><b><a name="Contours" id="Contours"></a>Contours</b></p>
-<p>The contour algorithm is from an unknown author and originally
-came from FV. The difference between the two modes
-are:<tt><br></tt></p>
-<blockquote><tt>block</tt> : the image is blocked down before the
-contour is generated<br>
-<tt>smooth</tt> : the image is smoothed via a Gaussian kernel
-before the contour is generated.</blockquote>
-<p><tt>block</tt> mode is faster as the smoothing parameter
-increases. Inversely, <tt>smooth</tt> mode is much slower as the
-smoothing parameter increases.</p>
+<p>The contour algorithm is from an unknown author and originally came from FV. The difference between the two modes are:<tt><br></tt></p>
+<blockquote><tt>block</tt> : the image is blocked down before the contour is generated<br>
+<tt>smooth</tt> : the image is smoothed via a Gaussian kernel before the contour is generated.</blockquote>
+<p><tt>block</tt> mode is faster as the smoothing parameter increases. Inversely, <tt>smooth</tt> mode is much slower as the smoothing parameter increases.</p>
<p><b><a name="LargeFiles" id="LargeFiles"></a>Large Files</b></p>
-There are several factors that determine if DS9 will be able to
-load a large file.<br>
-<p>32 bit OS vs 64 bit OS : to address very large files, you may
-need to use an 64 bit OS with a 64bit version of DS9. 32bit apps
-can address up to 4Gb of address space. However, depending on the
-OS, this limit may be less. Linux for example, the limit appears to
-be ~3GB (the OS and shared libs eat up a lot of address space).
-Under 64bit Solaris, 32bit ds9 has a full 4Gb of space. MacOSX
-appears to have a limit ~3Gb. Under windows, ~2Gb.</p>
-<p>Large File Support: is the ability to sequence thru files larger
-than 4Gb. DS9 is compiled with LFS.</p>
-<p>File system: the OS file system must be able to support files
-larger than 4Gb. Most recent file systems fully support
-4GB&gt;.</p>
-<p>Memory Management: There are a number of memory management
-techniques supported in DS9 that will greatly affect the ability
-and speed of loading large files:</p>
+There are several factors that determine if DS9 will be able to load a large file.<br>
+<p>32 bit OS vs 64 bit OS : to address very large files, you may need to use an 64 bit OS with a 64bit version of DS9. 32bit apps can address up to 4Gb of address space. However, depending on the OS, this limit may be less. Linux for example, the limit appears to be ~3GB (the OS and shared libs eat up a lot of address space). Under 64bit Solaris, 32bit ds9 has a full 4Gb of space. MacOSX appears to have a limit ~3Gb. Under windows, ~2Gb.</p>
+<p>Large File Support: is the ability to sequence thru files larger than 4Gb. DS9 is compiled with LFS.</p>
+<p>File system: the OS file system must be able to support files larger than 4Gb. Most recent file systems fully support 4GB&gt;.</p>
+<p>Memory Management: There are a number of memory management techniques supported in DS9 that will greatly affect the ability and speed of loading large files:</p>
<blockquote><tt>$ ds9 foo.fits # uses mmap</tt><br>
<tt>$ cat foo.fits | ds9 - # allocates memory</tt><br>
<tt>$ xpaset -p ds9 file foo.fits # uses mmap</tt><br>
-<tt>$ xpaset -p ds9 fits foo.fits # allocates
-memory</tt><br></blockquote>
-<p>Memory Map (<tt>mmap</tt>) is very fast, limit is memory address
-space (see above). Allocate is very slow, limit is amount of
-physical memory + swap partition.</p>
-<p>Scanning Data: DS9 needs to determine the min and max data
-values to correctly display your image. For large files, such as
-Mosaics and Data Cubes,&nbsp; this can take time. You have the
-option of using using the FITS keywords DATAMIN/MAX or IRAFMIN/MAX
-- great if present, bad because they are always wrong. Another
-option is to specify the low and high clip values via the command
-line or Scale dialogbox.<br></p>
+<tt>$ xpaset -p ds9 fits foo.fits # allocates memory</tt><br></blockquote>
+<p>Memory Map (<tt>mmap</tt>) is very fast, limit is memory address space (see above). Allocate is very slow, limit is amount of physical memory + swap partition.</p>
+<p>Scanning Data: DS9 needs to determine the min and max data values to correctly display your image. For large files, such as Mosaics and Data Cubes,&nbsp; this can take time. You have the option of using using the FITS keywords DATAMIN/MAX or IRAFMIN/MAX - great if present, bad because they are always wrong. Another option is to specify the low and high clip values via the command line or Scale dialogbox.<br></p>
<blockquote><br></blockquote>
</blockquote>
</body>
diff --git a/ds9/doc/ref/index.html b/ds9/doc/ref/index.html
index db6d624..ec89c37 100644
--- a/ds9/doc/ref/index.html
+++ b/ds9/doc/ref/index.html
@@ -1,87 +1,47 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Reference Manual</title>
</head>
-<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor=
-"#FFFFFF" alink="#FF0000">
-<h3><img alt="" src="../sun.gif" width="100" height="98" align=
-"middle"> SAOImageDS9 Reference Manual</h3>
+<body vlink="#551A8B" text="#000000" link="#0000EE" bgcolor="#FFFFFF" alink="#FF0000">
+<h3><img alt="" src="../sun.gif" width="100" height="98" align="middle"> SAOImageDS9 Reference Manual</h3>
<blockquote>
-<p>DS9 is&nbsp; the next version of the popular <a href=
-"http://hea-www.harvard.edu/RD/saotng/">SAOtng</a> display program.
-It is a Tk/Tcl application which utilizes the TkSAO widget set. It
-also incorporates the new X Public Access (<a href=
-"http://hea-www.harvard.edu/RD/xpa/">XPA</a>) mechanism to allow
-external processes to access and control its data, GUI functions,
-and algorithms. DS9&nbsp; supports the direct display of FITS
-images and binary tables, multiple frame buffers, region cursor
-manipulation, many scale algorithms and colormaps, and easy
-communication with external analysis tasks. It is highly
-configurable and extensible to meet the evolving needs of the
-astronomical community.</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 (including Image, Physical, Detector, and
-WCS). DS9 also supports FTP and HTTP access. The GUI for DS9 is
-user configurable.</p>
-<table width="75%" summary="" cellspacing="2" cellpadding="4"
-border="0" align="center">
+<p>DS9 is&nbsp; the next version of the popular <a href="http://hea-www.harvard.edu/RD/saotng/">SAOtng</a> display program. It is a Tk/Tcl application which utilizes the TkSAO widget set. It also incorporates the new X Public Access (<a href="http://hea-www.harvard.edu/RD/xpa/">XPA</a>) mechanism to allow external processes to access and control its data, GUI functions, and algorithms. DS9&nbsp; supports the direct display of FITS images and binary tables, multiple frame buffers, region cursor manipulation, many scale algorithms and colormaps, and easy communication with external analysis tasks. It is highly configurable and extensible to meet the evolving needs of the astronomical community.</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 (including Image, Physical, Detector, and WCS). DS9 also supports FTP and HTTP access. The GUI for DS9 is user configurable.</p>
+<table width="75%" summary="" cellspacing="2" cellpadding="4" border="0" align="center">
<tbody>
<tr>
-<td valign="middle" align="center"><a href="how.html">How It
-Works</a></td>
-<td valign="top" align="center"><a href="backup.html">Backup and
-Restore</a></td>
-<td valign="middle" align="center"><a href="file.html">File
-Formats</a></td>
+<td valign="middle" align="center"><a href="how.html">How It Works</a></td>
+<td valign="top" align="center"><a href="backup.html">Backup and Restore</a></td>
+<td valign="middle" align="center"><a href="file.html">File Formats</a></td>
</tr>
<tr>
-<td valign="middle" align="center"><a href="keyboard.html">Mouse
-and Keyboard</a></td>
-<td valign="top" align="center"><a href="grid.html">Coordinate
-Grids</a></td>
-<td valign="middle" align="center"><a href=
-"prefs.html">Preferences</a></td>
+<td valign="middle" align="center"><a href="keyboard.html">Mouse and Keyboard</a></td>
+<td valign="top" align="center"><a href="grid.html">Coordinate Grids</a></td>
+<td valign="middle" align="center"><a href="prefs.html">Preferences</a></td>
</tr>
<tr>
-<td valign="middle" align="center"><a href="command.html">Command
-Line Options</a></td>
-<td valign="top" align="center"><a href=
-"catalog.html">Catalogs</a></td>
-<td valign="middle" align="center"><a href="3d.html">3-D
-Frames</a></td>
+<td valign="middle" align="center"><a href="command.html">Command Line Options</a></td>
+<td valign="top" align="center"><a href="catalog.html">Catalogs</a></td>
+<td valign="middle" align="center"><a href="3d.html">3-D Frames</a></td>
</tr>
<tr>
-<td valign="middle" align="center"><a href="xpa.html">XPA Access
-Points</a></td>
-<td valign="top" align="center"><a href=
-"colorbar.html">Colorbar</a><br></td>
-<td valign="middle" align="center"><a href=
-"contour.html">Contours</a></td>
+<td valign="middle" align="center"><a href="xpa.html">XPA Access Points</a></td>
+<td valign="top" align="center"><a href="colorbar.html">Colorbar</a><br></td>
+<td valign="middle" align="center"><a href="contour.html">Contours</a></td>
</tr>
<tr>
-<td valign="top" align="center"><a href=
-"samp.html">SAMP<br></a></td>
-<td valign="top" align="center"><a href=
-"print.html">Printing</a></td>
-<td valign="top" align="center"><a href="iraf.html">IRAF
-Support</a></td>
+<td valign="top" align="center"><a href="samp.html">SAMP<br></a></td>
+<td valign="top" align="center"><a href="print.html">Printing</a></td>
+<td valign="top" align="center"><a href="iraf.html">IRAF Support</a></td>
</tr>
<tr>
-<td valign="middle" align="center"><a href=
-"region.html">Regions</a></td>
-<td valign="top" align="center"><a href=
-"analysis.html">Analysis</a></td>
-<td valign="middle" align="center"><a href=
-"bin.html">Binning</a><br></td>
+<td valign="middle" align="center"><a href="region.html">Regions</a></td>
+<td valign="top" align="center"><a href="analysis.html">Analysis</a></td>
+<td valign="middle" align="center"><a href="bin.html">Binning</a><br></td>
</tr>
</tbody>
</table>
diff --git a/ds9/doc/ref/iraf.html b/ds9/doc/ref/iraf.html
index a789f29..b516a22 100644
--- a/ds9/doc/ref/iraf.html
+++ b/ds9/doc/ref/iraf.html
@@ -1,36 +1,18 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>IRAF Support</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"> IRAF Support</h3>
+<body link="#0000EE" text="#000000" vlink="#551A8B" alink="#FF0000" bgcolor="#FFFFFF">
+<h3><img alt="" src="../sun.gif" height="98" width="100" align="middle"> IRAF Support</h3>
<blockquote>
-<p>DS9 is a fully functional IRAF image display server. IRAF uses
-the IIS protocol to communicate with a valid image display server,
-such as DS9, ximtool, saoimage, and saotng. With DS9, no special
-scripts are needed. If you have one of the above currently working,
-DS9 works <i>right</i> <i>out of the box.</i> And DS9 now supports
-IRAF's new IIS image display protocol that supports up to 16
-display frames.</p>
-<p>All native DS9 functions may be used with images load with IRAF
-display except for the <tt>Scale</tt> menu items. Values displayed
-may the the true values, if a linear scale is specified with the
-<tt>display</tt> command. Otherwise, the value is a scaled value.
-DS9 supports IRAF in all display visuals including
-<tt>Truecolor</tt>. Support full postscript printing of images
-loaded from IRAF is provided.</p>
+<p>DS9 is a fully functional IRAF image display server. IRAF uses the IIS protocol to communicate with a valid image display server, such as DS9, ximtool, saoimage, and saotng. With DS9, no special scripts are needed. If you have one of the above currently working, DS9 works <i>right</i> <i>out of the box.</i> And DS9 now supports IRAF's new IIS image display protocol that supports up to 16 display frames.</p>
+<p>All native DS9 functions may be used with images load with IRAF display except for the <tt>Scale</tt> menu items. Values displayed may the the true values, if a linear scale is specified with the <tt>display</tt> command. Otherwise, the value is a scaled value. DS9 supports IRAF in all display visuals including <tt>Truecolor</tt>. Support full postscript printing of images loaded from IRAF is provided.</p>
<p><b>Command Line Arguments</b></p>
-<p>As with <i>ximtool</i>, the follow command line arguments may be
-used to specify the communication parameters:</p>
+<p>As with <i>ximtool</i>, the follow command line arguments may be used to specify the communication parameters:</p>
<blockquote><tt><a href="command.html#fifo">fifo</a><br>
<a href="command.html#fifo_only">fifo_only</a><br>
<a href="command.html#port_only">inet_only</a><br>
@@ -43,18 +25,9 @@ used to specify the communication parameters:</p>
port 5137<br>
unix /tmp/.IMT%d</tt></blockquote>
<p><b>Configuration</b></p>
-<p>An <i>IRAF</i> image server uses a configuration file to specify
-the number of available buffers and their sizes. What actually
-passes from IRAF is not the buffer size, but an index number into
-this file.</p>
-<p>So when an image server starts (DS9), it will attempt to locate
-this file as <tt>$HOME/.imtoolrc</tt> and
-/<tt>usr/local/lib/imtoolrc</tt>. If not found, it will look for
-shell environment variables <tt>IMTOOLRC</tt> and
-<tt>imtoolrc</tt>, that contains the name of the configuration
-file.</p>
-<p>If no configuration file is found, DS9 will assume the following
-default configuration:</p>
+<p>An <i>IRAF</i> image server uses a configuration file to specify the number of available buffers and their sizes. What actually passes from IRAF is not the buffer size, but an index number into this file.</p>
+<p>So when an image server starts (DS9), it will attempt to locate this file as <tt>$HOME/.imtoolrc</tt> and /<tt>usr/local/lib/imtoolrc</tt>. If not found, it will look for shell environment variables <tt>IMTOOLRC</tt> and <tt>imtoolrc</tt>, that contains the name of the configuration file.</p>
+<p>If no configuration file is found, DS9 will assume the following default configuration:</p>
<blockquote><tt>1 2 512 512 # imt1|imt512<br>
2 2 800 800 # imt2|imt800<br>
3 2 1024 1024 # imt3|imt1024<br>
@@ -64,8 +37,7 @@ default configuration:</p>
7 1 8192 8192 # imt7|imt8192<br>
8 1 1024 4096 # imt8|imt1x4<br>
9 2 1144 880 # imt9|imtfs full screen (1152x900 minus frame)<br>
-10 2 1144 764 # imt10|imtfs35 full screen at 35mm film aspect
-ratio<br>
+10 2 1144 764 # imt10|imtfs35 full screen at 35mm film aspect ratio<br>
11 2 128 128 # imt11|imt128<br>
12 2 256 256 # imt12|imt256<br>
13 2 128 1056 # imt13|imttall128 tall &amp; narrow for spectro.<br>
@@ -75,69 +47,30 @@ ratio<br>
17 2 1008 648 # imt17|imtssy Solitaire fmt w/ imtool border<br>
18 2 1024 680 # imt18|imtssn Solitaire fmt w/out imtool border<br>
19 1 4096 1024 # imt19|imt4x1</tt></blockquote>
-<p>If on the other hand, IRAF assumes a different buffer size, the
-image will appear corrupted and DS9 may issue a number of error
-messages.</p>
-<p>Another problem is that this file must be in sync with
-<tt>dev$graphcap</tt>. If your system administrator has made
-changes to <tt>graphcap</tt>, they must also be implemented in
-<tt>imtoolrc</tt>.</p>
+<p>If on the other hand, IRAF assumes a different buffer size, the image will appear corrupted and DS9 may issue a number of error messages.</p>
+<p>Another problem is that this file must be in sync with <tt>dev$graphcap</tt>. If your system administrator has made changes to <tt>graphcap</tt>, they must also be implemented in <tt>imtoolrc</tt>.</p>
<p>Here is a note from NOAO:</p>
<blockquote>
-<p><tt>The messages means that there is no /usr/local/lib/imtoolrc
-file on the machine. This is created as a symlink to dev$imtoolrc
-by the iraf install script but only if the /usr/local/lib dir
-already exists on the machine. The fix is the create the dir and
-rerun the install script or else make the link by hand. Users can
-also just copy dev$imtoolrc to $HOME/.imtoolrc and restart the
-server to also workaround it. Note that an existing .imtoolrc might
-define old frame buffer configs which might confuse things, so if
-the system file exists check for a private copy screwing things
-up.</tt></p>
+<p><tt>The messages means that there is no /usr/local/lib/imtoolrc file on the machine. This is created as a symlink to dev$imtoolrc by the iraf install script but only if the /usr/local/lib dir already exists on the machine. The fix is the create the dir and rerun the install script or else make the link by hand. Users can also just copy dev$imtoolrc to $HOME/.imtoolrc and restart the server to also workaround it. Note that an existing .imtoolrc might define old frame buffer configs which might confuse things, so if the system file exists check for a private copy screwing things up.</tt></p>
</blockquote>
<p><b>Windows DS9 and IRAF</b></p>
-<p>To direct image output from IRAF to DS9 running under windows,
-use the <tt>IMTDEV</tt> environment variable. For example, if the
-windows machine is named 'foo.bar.edu', define <tt>IMTDEV</tt> to
-the follow value before entering IRAF.</p>
+<p>To direct image output from IRAF to DS9 running under windows, use the <tt>IMTDEV</tt> environment variable. For example, if the windows machine is named 'foo.bar.edu', define <tt>IMTDEV</tt> to the follow value before entering IRAF.</p>
<blockquote><tt>$ setenv IMTDEV inet:5137:foo.bar.edu<br>
$ cl<br>
cl&gt; display dev$pix</tt></blockquote>
<p><b>Scale Menu Disabled</b></p>
-<p>When you display an image from <i>IRAF</i> into DS9, <i>IRAF</i>
-actually does the color scale distribution. In <tt>Display</tt>,
-use the <tt>ztrans</tt> and <tt>z1</tt>,<tt>z2</tt><tt>zscale</tt>
-parameter to auto determine <tt>z1,z2. Here</tt> are the
-<tt>DISPLAY</tt> parameters in question: parameters to set the
-upper/lower bounds and distribution. You can also use the</p>
+<p>When you display an image from <i>IRAF</i> into DS9, <i>IRAF</i> actually does the color scale distribution. In <tt>Display</tt>, use the <tt>ztrans</tt> and <tt>z1</tt>,<tt>z2</tt><tt>zscale</tt> parameter to auto determine <tt>z1,z2. Here</tt> are the <tt>DISPLAY</tt> parameters in question: parameters to set the upper/lower bounds and distribution. You can also use the</p>
<blockquote><tt>ztrans=[linear|log|none|user]<br>
z1=min<br>
z2=max<br>
zscale=[yes|no]</tt></blockquote>
-<p>What actually is sent from <i>IRAF</i> to DS9 is one byte per
-pixel, values 0-200, which already has applied both the upper and
-lower clipping bounds and the distribution. So this is why, the
-<tt>SCALE</tt> menu is disabled in DS9 when it receives a image
-from <i>IRAF</i>.</p>
+<p>What actually is sent from <i>IRAF</i> to DS9 is one byte per pixel, values 0-200, which already has applied both the upper and lower clipping bounds and the distribution. So this is why, the <tt>SCALE</tt> menu is disabled in DS9 when it receives a image from <i>IRAF</i>.</p>
<p><b>MSCRED/MSCZERO<br></b></p>
-<p>DS9 now supports IRAF's new IIS image display protocol. However,
-there is one minor problem with the <b>mscred</b> task
-<b>msczero.</b> Before using <b>msczero</b>, issue the following
-command in the cl:</p>
+<p>DS9 now supports IRAF's new IIS image display protocol. However, there is one minor problem with the <b>mscred</b> task <b>msczero.</b> Before using <b>msczero</b>, issue the following command in the cl:</p>
<blockquote><tt>cl&gt; set disable_wcs_maps=""<br>
cl&gt; flpr</tt><br></blockquote>
<p><b>IMEXAMINE</b></p>
-<p>Due to the unique relationship between DS9 and IRAF, if you use
-the <b>imexamine</b> task, you can take advantage of a special
-feature of DS9. Instead of loading the image from IRAF with the
-<b>display</b> task, load the image directly into DS9. Then, from
-the <b>cl</b> prompt, invoke <b>imexamine</b> without a filename.
-IRAF will ask DS9 for the current filename and use it for analysis.
-This approach provides several advantages over previous methods.
-First, it will work with compound fits images such as mosaics, data
-cubes, and rgb images. Second, the image displays includes true
-image data and WCS information, not the approximated data from
-IRAF.</p>
+<p>Due to the unique relationship between DS9 and IRAF, if you use the <b>imexamine</b> task, you can take advantage of a special feature of DS9. Instead of loading the image from IRAF with the <b>display</b> task, load the image directly into DS9. Then, from the <b>cl</b> prompt, invoke <b>imexamine</b> without a filename. IRAF will ask DS9 for the current filename and use it for analysis. This approach provides several advantages over previous methods. First, it will work with compound fits images such as mosaics, data cubes, and rgb images. Second, the image displays includes true image data and WCS information, not the approximated data from IRAF.</p>
</blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/keyboard.html b/ds9/doc/ref/keyboard.html
index 594ca03..bcb79c4 100644
--- a/ds9/doc/ref/keyboard.html
+++ b/ds9/doc/ref/keyboard.html
@@ -1,24 +1,18 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Mouse and Keyboard</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"> Mouse and Keyboard</h3>
+<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>
<blockquote>
<p><b>Mouse Buttons</b></p>
-<p>The following table contains the event bindings for the mouse
-buttons.</p>
+<p>The following table contains the event bindings for the mouse buttons.</p>
<center>
-<table nosave="" border="1" width="75%">
+<table summary="" border="1" width="75%">
<tbody>
<tr>
<td>
@@ -30,57 +24,38 @@ buttons.</p>
</tr>
<tr>
<td><font face="Courier New,Courier">Button 1</font></td>
-<td>Depends on current MODE, which may be selected by the EDIT menu
-option.<br>
+<td>Depends on current MODE, which may be selected by the EDIT menu option.<br>
In Region mode, create/edit/delete regions.<br>
In Crosshair mode, will move current crosshair.<br>
In Colorbar mode, will change contrast and bias of colormap.<br>
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 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 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>
</tr>
<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>
+<td>Pan mode: will move or pan to clicked location. Behavior depends on the PAN preference settings.</td>
</tr>
<tr>
<td><font face="Courier New,Courier">Button 3</font></td>
-<td>Colorbar mode: will change the contrast and bias of the
-colormap.</td>
+<td>Colorbar mode: will change the contrast and bias of the colormap.</td>
</tr>
</tbody>
</table>
</center>
<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>
+<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>
<blockquote>
-<p>Linux- Gnome: <b>gucharmap<br></b> Linux- KDE:
-<b>kcharselect<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>
+<p>Linux- Gnome: <b>gucharmap<br></b> Linux- KDE: <b>kcharselect<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>
</blockquote>
<p><b>Keyboard Shortcuts</b></p>
-<p>The following table contains the list of keyboard shortcuts and
-the resulting action taken.&nbsp;</p>
+<p>The following table contains the list of keyboard shortcuts and the resulting action taken.&nbsp;</p>
<center>
-<table nosave="" border="1" width="75%">
+<table summary="" border="1" width="75%">
<tbody>
<tr>
<td align="center">Key Stroke</td>
@@ -148,14 +123,12 @@ 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="">
+<tr>
<td align="center"><tt>Right</tt> <tt>Arrow<br>
l<br></tt></td>
-<td nosave="">Will move selected regions to the right one
-pixel.<br>
+<td>Will move selected regions to the right one 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 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>
@@ -163,8 +136,7 @@ In Pan mode, will pan the image to the right one pixel.</td>
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 pixel.<br>
-In Crosshair mode, will move the crosshair 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>
</tr>
<tr>
@@ -176,19 +148,14 @@ 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 New,Courier">-</font><tt>Drag</tt></td>
-<td>In Pointer mode, will select all regions within the indicated
-region.<br>
-In Crop mode, for 3D frame, will move front crop plane
-forward.<br></td>
+<td align="center"><tt>Shift</tt><font face="Courier New,Courier">-</font><tt>Drag</tt></td>
+<td>In Pointer mode, will select all regions within the indicated region.<br>
+In Crop mode, for 3D frame, will move front crop plane forward.<br></td>
</tr>
<tr>
<td align="center"><tt>Control-Drag</tt></td>
-<td>In Poiner mode, on selected <tt>ANNULUS</tt> Regions, will
-create new radii.<br>
-In Crop mode, for 3D frame, will move back crop plane
-backward.<br></td>
+<td>In Poiner mode, on selected <tt>ANNULUS</tt> Regions, will create new radii.<br>
+In Crop mode, for 3D frame, will move back crop plane backward.<br></td>
</tr>
<tr>
<td align="center" valign="top"><tt>Command-`</tt><br></td>
diff --git a/ds9/doc/ref/prefs.html b/ds9/doc/ref/prefs.html
index df89038..00ff4cb 100644
--- a/ds9/doc/ref/prefs.html
+++ b/ds9/doc/ref/prefs.html
@@ -1,34 +1,17 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Preferences</title>
</head>
-<body alink="#FF0000" bgcolor="#FFFFFF" link="#0000FF" text=
-"#000000" vlink="#551A8B">
-<h3><img alt="" src="../sun.gif" height="98" align="middle" width=
-"100"> Preferences</h3>
+<body alink="#FF0000" bgcolor="#FFFFFF" link="#0000FF" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" height="98" align="middle" width="100"> Preferences</h3>
<blockquote>
-<p>Allows the user to customize the appearance and behavior of the
-GUI . Please note: some preferences take effect immediately, while
-others require DS9 to be restarted. Changes to the preferences can
-be saved by selecting the <tt>Save</tt> button<tt>.</tt> Use the
-<tt>Clear Preferences</tt> button to restore default settings.</p>
-<p>User preferences are stored in <tt>$HOME/.ds9.prf</tt>. DO NOT
-EDIT this file, since it will be deleted or overwritten by DS9. The
-file permissions must be group/world readonly.<br></p>
-<p>Users may have several different preference files. DS9 looks for
-a preference file with its own name. By default, if the application
-is named <tt>ds9</tt>, it will look for <tt>.ds9.prf.</tt> However,
-if the DS9 application is named <tt>foo</tt>, then DS9 will look
-for <tt>.foo.prf.</tt> In this manner, the user can have several
-predefined preference files that are activated by invoking DS9 with
-a different application names.</p>
+<p>Allows the user to customize the appearance and behavior of the GUI . Please note: some preferences take effect immediately, while others require DS9 to be restarted. Changes to the preferences can be saved by selecting the <tt>Save</tt> button<tt>.</tt> Use the <tt>Clear Preferences</tt> button to restore default settings.</p>
+<p>User preferences are stored in <tt>$HOME/.ds9.prf</tt>. DO NOT EDIT this file, since it will be deleted or overwritten by DS9. The file permissions must be group/world readonly.<br></p>
+<p>Users may have several different preference files. DS9 looks for a preference file with its own name. By default, if the application is named <tt>ds9</tt>, it will look for <tt>.ds9.prf.</tt> However, if the DS9 application is named <tt>foo</tt>, then DS9 will look for <tt>.foo.prf.</tt> In this manner, the user can have several predefined preference files that are activated by invoking DS9 with a different application names.</p>
</blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/print.html b/ds9/doc/ref/print.html
index bd5dd19..5f5c08a 100644
--- a/ds9/doc/ref/print.html
+++ b/ds9/doc/ref/print.html
@@ -1,55 +1,30 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Printing</title>
</head>
-<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text=
-"#000000" vlink="#551A8B">
-<h3><img alt="" src="../sun.gif" height="98" align="middle" width=
-"100"> Printing</h3>
+<body link="#0000EE" alink="#FF0000" bgcolor="#FFFFFF" text="#000000" vlink="#551A8B">
+<h3><img alt="" src="../sun.gif" height="98" align="middle" width="100"> Printing</h3>
<blockquote>
-<p>DS9 provides strong Postscript printing support. This is not a
-screen capture method, but a full level 1/2/3 postscript driver.
-The postscript images generated are detailed and accurate as
-possible, given the resolution of the data, and the printing
-resolution.</p>
+<p>DS9 provides strong Postscript printing support. This is not a screen capture method, but a full level 1/2/3 postscript driver. The postscript images generated are detailed and accurate as possible, given the resolution of the data, and the printing resolution.</p>
<p><b>Postscript Level</b></p>
<blockquote>
-<p>Level 1-- The postscript generated consist of a color lookup
-table and image data, encoded in <tt>ASCIIHEX</tt>. All line
-graphics and text are postscript elements.</p>
-<p>Level 2-- The postscript generated consist of a color lookup
-table and image data, compressed with RLE, and encoded in
-<tt>ASCIIHEX85.</tt> All line graphics and text are postscript
-elements.</p>
+<p>Level 1-- The postscript generated consist of a color lookup table and image data, encoded in <tt>ASCIIHEX</tt>. All line graphics and text are postscript elements.</p>
+<p>Level 2-- The postscript generated consist of a color lookup table and image data, compressed with RLE, and encoded in <tt>ASCIIHEX85.</tt> All line graphics and text are postscript elements.</p>
</blockquote>
<blockquote>
-<p>Level 3-- The postscript generated consist of a color lookup
-table and image data, compressed with GZIP<tt>.</tt> All line
-graphics and text are postscript elements.</p>
+<p>Level 3-- The postscript generated consist of a color lookup table and image data, compressed with GZIP<tt>.</tt> All line graphics and text are postscript elements.</p>
</blockquote>
<p><b>Postscript Color Model</b></p>
-<p>DS9 supports three color models for level 2/3 postscript. All
-three color models generate approximately the same size files.</p>
+<p>DS9 supports three color models for level 2/3 postscript. All three color models generate approximately the same size files.</p>
<blockquote><tt>RGB<br>
CMYK<br>
Grayscale<br></tt></blockquote>
<p><b>Resolution</b></p>
-<p>Unlike graphic elements, image data must be sampled when encoded
-into postscript. The specified resolution parameter is in "pixels
-per inch" and is independent of the current screen resolution. A
-value of 96 maps to the current screen resolution. Any value over
-96 will over sample the image, while any value under 96 will under
-sample. For high resolution printers and posters, the higher
-resolution sampling, the better. However, keep in mind the size of
-the postscript file grows with the square of the increase in
-resolution.</p>
+<p>Unlike graphic elements, image data must be sampled when encoded into postscript. The specified resolution parameter is in "pixels per inch" and is independent of the current screen resolution. A value of 96 maps to the current screen resolution. Any value over 96 will over sample the image, while any value under 96 will under sample. For high resolution printers and posters, the higher resolution sampling, the better. However, keep in mind the size of the postscript file grows with the square of the increase in resolution.</p>
</blockquote>
</body>
</html>
diff --git a/ds9/doc/ref/region.html b/ds9/doc/ref/region.html
index 9a70e95..41c3063 100644
--- a/ds9/doc/ref/region.html
+++ b/ds9/doc/ref/region.html
@@ -1,36 +1,24 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Regions</title>
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<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=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
</head>
-<body vlink="#551A8B" text="#000000" link="#0000FF" bgcolor=
-"#FFFFFF" alink="#FF0000">
-<h3><img alt="" src="../sun.gif" width="100" height="98" align=
-"middle"> Regions</h3>
+<body vlink="#551A8B" text="#000000" link="#0000FF" bgcolor="#FFFFFF" alink="#FF0000">
+<h3><img alt="" src="../sun.gif" width="100" height="98" align="middle"> Regions</h3>
<blockquote>
-<p>Regions provide a means for marking particular areas of an image
-for further analysis. Regions may also be used for presentation
-purposes. DS9 supports a number of region descriptions, each of
-which may be edited, moved, rotated, displayed, saved and loaded,
-via the GUI and XPA.</p>
+<p>Regions provide a means for marking particular areas of an image for further analysis. Regions may also be used for presentation purposes. DS9 supports a number of region descriptions, each of which may be edited, moved, rotated, displayed, saved and loaded, via the GUI and XPA.</p>
<a href="#RegionDescriptions">Region Descriptions</a><br>
<a href="#RegionProperties">Region Properties</a><br>
<a href="#RegionFileFormat">Region File Format</a><br>
<a href="#CompositeRegion">Composite Region</a><br>
<a href="#TemplateRegion">Template Region</a><br>
<a href="#ExternalRegionFiles">External Region Files</a><br>
-<p><b><a name="RegionDescriptions" id=
-"RegionDescriptions"></a>Region Descriptions</b></p>
+<p><b><a name="RegionDescriptions" id="RegionDescriptions"></a>Region Descriptions</b></p>
<p><tt>Circle<br>
Usage: circle x y radius # fill=[0|1]<br></tt></p>
<p><tt>Ellipse<br>
@@ -40,154 +28,101 @@ Usage: box x y width height angle# fill=[0|1]</tt></p>
<p><tt>Polygon<br>
Usage: polygon x1 y1 x2 y2 x3 y3 ...# fill=[0|1]</tt></p>
<p><tt>Point<br>
-Usage: point x y #
-point=[circle|box|diamond|cross|x|arrow|boxcircle] [size]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; circle point x
-y&nbsp;</tt></p>
+Usage: point x y # point=[circle|box|diamond|cross|x|arrow|boxcircle] [size]<br>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; circle point x y&nbsp;</tt></p>
<p><tt>Line<br>
Usage: line x1 y1 x2 y2 # line=[0|1] [0|1]</tt></p>
<p><tt>Vector<br>
Usage: vector x1 y1 length angle # vector=[0|1]</tt></p>
<p><tt>Text<br>
Usage: text x y # text={Your Text Here}<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; text x y {Your Text
-Here}</tt></p>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; text x y {Your Text Here}</tt></p>
<p><tt>Ruler<br>
-Usage: ruler x1 y1 x2 y2 # ruler=[pixels|degrees|arcmin|arcsec]
-[format=&lt;spec&gt;]<br></tt></p>
+Usage: ruler x1 y1 x2 y2 # ruler=[pixels|degrees|arcmin|arcsec] [format=&lt;spec&gt;]<br></tt></p>
<p><tt>Compass<br>
-Usage: compass x1 y1 length # compass=&lt;coordinate system&gt;
-&lt;north label&gt; &lt;east label&gt; [0|1] [0|1]</tt></p>
+Usage: compass x1 y1 length # compass=&lt;coordinate system&gt; &lt;north label&gt; &lt;east label&gt; [0|1] [0|1]</tt></p>
<p><tt>Projection<br>
Usage: projection x1 y1 x2 y2 width</tt></p>
<p><tt>Annulus<br>
Usage: annulus x y inner outer n=#<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; annulus x y r1 r2
-r3...</tt></p>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; annulus x y r1 r2 r3...</tt></p>
<p><tt>Ellipse Annulus<br>
-Usage: ellipse x y r11 r12 r21 r22 n=# [angle]<br></tt>
-<tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ellipse x y r11 r12 r21
-r22 r31 r32 ... [angle]</tt></p>
+Usage: ellipse x y r11 r12 r21 r22 n=# [angle]<br></tt> <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ellipse x y r11 r12 r21 r22 r31 r32 ... [angle]</tt></p>
<p><tt>Box Annulus<br>
Usage: box x y w1 h1 w2 h2 [angle]<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; box x y w1 h1 w2 h2 w3 h3 ...
-[angle]</tt></p>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; box x y w1 h1 w2 h2 w3 h3 ... [angle]</tt></p>
<p><tt>Panda<br>
-Usage: panda x y startangle stopangle nangle inner outer
-nradius</tt></p>
+Usage: panda x y startangle stopangle nangle inner outer nradius</tt></p>
<p><tt>Epanda<br>
-Usage: epanda x y startangle stopangle nangle inner outer nradius
-[angle]</tt></p>
+Usage: epanda x y startangle stopangle nangle inner outer nradius [angle]</tt></p>
<p><tt>Bpanda<br>
-Usage: bpanda x y startangle stopangle nangle inner outer nradius
-[angle]</tt></p>
+Usage: bpanda x y startangle stopangle nangle inner outer nradius [angle]</tt></p>
<p><tt>Composite<br>
Usage: # composite x y angle</tt></p>
-<p><b><a name="RegionProperties" id="RegionProperties"></a>Region
-Properties</b></p>
-<p>Each region has a number of properties associated with the
-region, which indicates how the region is to be rendered or
-manipulated. Properties are defined for a region in the comment
-section of the region description. The exception is the
-Include/Exclude property. It is set via '+' or '-' preceding the
-region. In addition, the Line, Point, and Ruler regions have unique
-properties, not shared by others. Not all properties are available
-via the GUI or are applicable for all regions.</p>
+<p><b><a name="RegionProperties" id="RegionProperties"></a>Region Properties</b></p>
+<p>Each region has a number of properties associated with the region, which indicates how the region is to be rendered or manipulated. Properties are defined for a region in the comment section of the region description. The exception is the Include/Exclude property. It is set via '+' or '-' preceding the region. In addition, the Line, Point, and Ruler regions have unique properties, not shared by others. Not all properties are available via the GUI or are applicable for all regions.</p>
<p><b>Text</b></p>
-<p>All regions may have text associated with them. Use the text
-property to set the text. Strings may be quoted with " or ' or {}.
-For best results, use {}. Use <tt>textangle</tt> to specify angle
-in degress based on current coordinate system axes.<br></p>
-<tt>Example: circle(100,100,20) # text={This message has both a "
-and ' in it} textangle=30</tt>
+<p>All regions may have text associated with them. Use the text property to set the text. Strings may be quoted with " or ' or {}. For best results, use {}. Use <tt>textangle</tt> to specify angle in degress based on current coordinate system axes.<br></p>
+<tt>Example: circle(100,100,20) # text={This message has both a " and ' in it} textangle=30</tt>
<p><b>Color</b></p>
-<p>The color property specifies the color of the region when
-rendered. DS9 recognizes many symbolic color names (i.e. "red",
-"green", "blue", "pink", etc) along with 3, 6, and 9 digit RGB hex
-values (#fff, #ffffff, #fffffffff)<br></p>
+<p>The color property specifies the color of the region when rendered. DS9 recognizes many symbolic color names (i.e. "red", "green", "blue", "pink", etc) along with 3, 6, and 9 digit RGB hex values (#fff, #ffffff, #fffffffff)<br></p>
<tt>Example:</tt><br>
<tt>circle(100,100,20) # color=green</tt><br>
<tt>circle(100,100,20) # color=#48f</tt>
<p><b>Dash List</b></p>
-<p>Sets dashed line parameters. This does not render the region in
-dashed lines.</p>
+<p>Sets dashed line parameters. This does not render the region in dashed lines.</p>
<tt>Example: circle(100,100,20) # dashlist=8 3</tt><br>
<p><b>Width</b></p>
<p>Sets the line width used to render the region.</p>
<tt>Example: circle(100,100,20) # width=2</tt><br>
<p><b>Font</b></p>
-<p>The font property specifies the font family, size, weight, and
-slant of any text to be displayed along with the region.</p>
+<p>The font property specifies the font family, size, weight, and slant of any text to be displayed along with the region.</p>
<tt>Example: circle(100,100,20) # font="times 12 bold italic"</tt>
<p><b>Can Select</b></p>
-<p>The Select property specifies if the user is allowed to select
-(hence, edit) the region via the GUI. For Regions used for catalogs
-and such, it is desirable that the user is unable to edit, move, or
-delete the region.<br></p>
+<p>The Select property specifies if the user is allowed to select (hence, edit) the region via the GUI. For Regions used for catalogs and such, it is desirable that the user is unable to edit, move, or delete the region.<br></p>
<tt>Example: circle(100,100,20) # select=1</tt><br>
<p><b>Can Highlite</b></p>
-The Highlite property specifies if the edit handles become visible
-when the region is selected.<br>
+The Highlite property specifies if the edit handles become visible when the region is selected.<br>
<tt>Example: circle(100,100,20) # hightlite=1</tt><br>
<p><b>Dash</b></p>
-<p>Render region using dashed lines using current <tt>dashlist</tt>
-value.</p>
+<p>Render region using dashed lines using current <tt>dashlist</tt> value.</p>
<tt>Example: circle(100,100,20) # dash=1</tt><br>
<p><b>Fixed in Size</b></p>
-<p>The Fixed in Size property specifies that the region does not
-change in size as the image magnification factor changes. This
-allows the user to build complex pointer type regions.</p>
+<p>The Fixed in Size property specifies that the region does not change in size as the image magnification factor changes. This allows the user to build complex pointer type regions.</p>
<tt>Example: circle(100,100,20) # fixed=1</tt>
<p><b>Can Edit</b></p>
-<p>The Edit property specifies if the user is allowed to edit the
-region via the GUI.</p>
+<p>The Edit property specifies if the user is allowed to edit the region via the GUI.</p>
<tt>Example: circle(100,100,20) # edit=1</tt>
<p><b>Can Move</b></p>
-<p>The Move property specifies if the user is allowed to move the
-region via the GUI.</p>
+<p>The Move property specifies if the user is allowed to move the region via the GUI.</p>
<tt>Example: circle(100,100,20) # move=1</tt>
<p><b>Can Rotate</b></p>
-<p>The Rotate property specifies if the user is allowed to rotate
-the region via the GUI.</p>
+<p>The Rotate property specifies if the user is allowed to rotate the region via the GUI.</p>
<tt>Example: circle(100,100,20) # rotate=1</tt>
<p><b>Can Delete</b></p>
-<p>The Delete property specifies if the user is allowed to delete
-the region via the GUI.</p>
+<p>The Delete property specifies if the user is allowed to delete the region via the GUI.</p>
<tt>Example: circle(100,100,20) # delete=1</tt>
<p><b>Include/Exclude</b></p>
-<p>The Include/Exclude properties flags the region with a boolean
-<tt>NOT</tt> for later analysis. Use '+' for include (default), '-'
-for exclude.</p>
+<p>The Include/Exclude properties flags the region with a boolean <tt>NOT</tt> for later analysis. Use '+' for include (default), '-' for exclude.</p>
<tt>Example: -circle(100,100,20)</tt><br>
<p><b>Source/Background</b></p>
-<p>The Source/Background properties flag the region for use with
-other analysis applications. The default is <tt>source</tt></p>
+<p>The Source/Background properties flag the region for use with other analysis applications. The default is <tt>source</tt></p>
<tt>Example: circle(100,100,20) # source</tt><br>
-<tt>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;circle(200,200,10)
-# background</tt><br>
+<tt>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;circle(200,200,10) # background</tt><br>
<p><b>Tag</b></p>
-<p>All regions may have zero or more tags associated with it, which
-may be used for grouping and searching.</p>
-<tt>Example:&nbsp; circle(100,100,20) # tag={Group 1} tag={Group
-2}</tt>
+<p>All regions may have zero or more tags associated with it, which may be used for grouping and searching.</p>
+<tt>Example:&nbsp; circle(100,100,20) # tag={Group 1} tag={Group 2}</tt>
<p><b>Circle | Ellipse | Box | Polygon<br></b></p>
-<p>Circle, ellipse, box, and polygon regions may be rendered with
-outline or solid color fill. To indicate fill, use the fill
-property. A '1' indicates fill, '0' indicates no outline.</p>
+<p>Circle, ellipse, box, and polygon regions may be rendered with outline or solid color fill. To indicate fill, use the fill property. A '1' indicates fill, '0' indicates no outline.</p>
<tt>Example: circle(100,100,20) # fill=1</tt>
<p><b>Line</b></p>
-<p>The line region may be rendered with arrows, one at each end. To
-indicate arrows, use the line property. A '1' indicates an arrow,
-'0' indicates no arrow.</p>
+<p>The line region may be rendered with arrows, one at each end. To indicate arrows, use the line property. A '1' indicates an arrow, '0' indicates no arrow.</p>
<tt>Example: line(100,100,200,200) # line=1 1</tt>
<p><b>Ruler</b></p>
-<p>The ruler region may display information in 'pixels', 'degrees',
-'arcmin', or 'arcsec'. Use the ruler property to indicate which
-format to display distances in.</p>
+<p>The ruler region may display information in 'pixels', 'degrees', 'arcmin', or 'arcsec'. Use the ruler property to indicate which format to display distances in.</p>
<tt>Example: ruler(100,100,200,200) # ruler=arcmin</tt>
<p><b>Point</b></p>
-<p>Point regions have an associated type and size. Use the point
-property to set the point type.</p>
+<p>Point regions have an associated type and size. Use the point property to set the point type.</p>
<tt>Example: point(100,100) # point=diamond 31</tt>
<p><b>Default Properties</b></p>
<p>The default properties are:</p>
@@ -201,45 +136,30 @@ property to set the point type.</p>
<tt>highlite=1</tt><br>
<tt>include=1</tt><br>
<tt>fixed=0</tt><br>
-<p><b><a name="RegionFileFormat" id="RegionFileFormat"></a>Region
-File Format</b></p>
+<p><b><a name="RegionFileFormat" id="RegionFileFormat"></a>Region File Format</b></p>
<p><b>Syntax</b></p>
-<p>Region arguments may be separated with either a comma or space.
-Optional parentheses may be used a the beginning and end of a
-description.</p>
+<p>Region arguments may be separated with either a comma or space. Optional parentheses may be used a the beginning and end of a description.</p>
<tt>circle 100 100 10</tt><br>
<tt>circle(100 100 10)</tt><br>
<tt>circle(100,100,10)</tt><br>
<p><b>Comments</b></p>
-<p>All lines that begin with <tt>#</tt> are comments and will be
-ignored.</p>
+<p>All lines that begin with <tt>#</tt> are comments and will be ignored.</p>
<tt># This is a comment</tt><br>
<p><b>Delimiter</b></p>
-<p>All lines may be delimited with either a new-line or
-semi-colon.</p>
+<p>All lines may be delimited with either a new-line or semi-colon.</p>
<tt>circle 100 100 10</tt><br>
<tt>ellipse 200 200 20 40 ; box 300 300 20 40</tt><br>
<p><b>Header</b></p>
-<p>A DS9 region file may start with the following optional
-header:</p>
+<p>A DS9 region file may start with the following optional header:</p>
<tt># Region file format: DS9 version 4.0</tt><br>
<p><b>Global Properties</b></p>
-<p>Global properties affect all regions unless a local property is
-specified. The <tt>global</tt> keyword is first, followed by a list
-of keyword = value pairs. Multiple global property lines may be
-used within a region file.</p>
-<tt>global color=green font="helvetica 10 normal roman" edit=1
-move=1 delete=1 highlite=1 include=1 wcs=wcs</tt><br>
+<p>Global properties affect all regions unless a local property is specified. The <tt>global</tt> keyword is first, followed by a list of keyword = value pairs. Multiple global property lines may be used within a region file.</p>
+<tt>global color=green font="helvetica 10 normal roman" edit=1 move=1 delete=1 highlite=1 include=1 wcs=wcs</tt><br>
<p><b>Local Properties</b></p>
-<p>Local properties start with a # after a region description and
-only affect the region it is specified with.</p>
-<tt>physical;circle(504,513,20) # color=red text={This is a
-Circle}</tt><br>
+<p>Local properties start with a # after a region description and only affect the region it is specified with.</p>
+<tt>physical;circle(504,513,20) # color=red text={This is a Circle}</tt><br>
<p><b>Coordinate Systems</b></p>
-<p>For each region, it is important to specify the coordinate
-system used to interpret the region, i.e., to set the context in
-which the position and size values are interpreted. For this
-purpose, the following keywords are recognized:</p>
+<p>For each region, it is important to specify the coordinate system used to interpret the region, i.e., to set the context in which the position and size values are interpreted. For this purpose, the following keywords are recognized:</p>
<tt>PHYSICAL<br>
IMAGE<br>
FK4,B1950<br>
@@ -251,71 +171,35 @@ WCS<br>
WCSA<br>
LINEAR</tt><br>
<p><b>Mosaic Images</b></p>
-<p>While some coordinate systems are unique across mosaic images,
-others coordinate systems, such as <tt>image</tt>, or
-<tt>physical</tt> , are valid on a per segment basis. In this case,
-use <tt>tile</tt> to specify which header to use in all coordinate
-conversions. The default is the first header, or <tt>tile
-1</tt>.</p>
+<p>While some coordinate systems are unique across mosaic images, others coordinate systems, such as <tt>image</tt>, or <tt>physical</tt> , are valid on a per segment basis. In this case, use <tt>tile</tt> to specify which header to use in all coordinate conversions. The default is the first header, or <tt>tile 1</tt>.</p>
<tt>Example: tile 2;fk5;point(100,100)</tt>
<p><b>Multiple WCS</b></p>
-<p>If an image has multiple wcs's defined, use <tt>wcs#</tt> to
-specify which wcs to use for all wcs references. Valid values are
-<tt>wcs, wcsa, wcsb, wcsc... wcsz.<br>
+<p>If an image has multiple wcs's defined, use <tt>wcs#</tt> to specify which wcs to use for all wcs references. Valid values are <tt>wcs, wcsa, wcsb, wcsc... wcsz.<br>
<br>
Example: wcsa;linear;point(100,100) # point=diamond</tt></p>
<p><b>Specifying Positions and Sizes</b></p>
-<p>The arguments to region shapes can be floats or integers
-describing positions and sizes. They can be specified as pure
-numbers or using explicit formatting directives:</p>
+<p>The arguments to region shapes can be floats or integers describing positions and sizes. They can be specified as pure numbers or using explicit formatting directives:</p>
<p><b>position arguments</b></p>
-<tt>[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# context-dependent (see below)</tt><br>
-<tt>[num]d&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# degrees</tt><br>
-<tt>[num]r&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# radians</tt><br>
-<tt>[num]p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# physical pixels</tt><br>
-<tt>[num]i&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# image pixels</tt><br>
-<tt>[num]:[num]:[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # hms for
-'odd' position arguments</tt><br>
-<tt>[num]:[num]:[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # dms for
-'even' position arguments</tt><br>
-<tt>[num]h[num]m[num]s&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # explicit
-hms</tt><br>
-<tt>[num]d[num]m[num]s&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # explicit
-dms</tt>
+<tt>[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # context-dependent (see below)</tt><br>
+<tt>[num]d&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # degrees</tt><br>
+<tt>[num]r&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # radians</tt><br>
+<tt>[num]p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # physical pixels</tt><br>
+<tt>[num]i&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # image pixels</tt><br>
+<tt>[num]:[num]:[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # hms for 'odd' position arguments</tt><br>
+<tt>[num]:[num]:[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # dms for 'even' position arguments</tt><br>
+<tt>[num]h[num]m[num]s&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # explicit hms</tt><br>
+<tt>[num]d[num]m[num]s&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # explicit dms</tt>
<p><b>size arguments</b></p>
-<tt>[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# context-dependent (see below)</tt><br>
-<tt>[num]"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# arc sec</tt><br>
-<tt>[num]'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# arc min</tt><br>
-<tt>[num]d&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# degrees</tt><br>
-<tt>[num]r&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# radians</tt><br>
-<tt>[num]p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# physical pixels</tt><br>
-<tt>[num]i&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-# image pixels</tt><br>
-<p>When a "pure number" (i.e. one without a format directive such
-as 'd' for 'degrees') is specified, its interpretation depends on
-the context defined by the 'coordsys' keyword. In general, the rule
-is:</p>
-<p><i>All pure numbers have implied units corresponding to the
-current coordinate system.</i></p>
-<p>If no such system is explicitly specified, the default system is
-implicitly assumed to be <tt>PHYSICAL</tt>. In practice this means
-that for <tt>IMAGE</tt> and <tt>PHYSICAL</tt> systems, pure numbers
-are pixels. Otherwise, for all systems other than linear, pure
-numbers are degrees. For <tt>LINEAR</tt> systems, pure numbers are
-in the units of the linear system. This rule covers both positions
-and sizes. The input values to each shape can be specified in
-several coordinate systems including:</p>
+<tt>[num]&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # context-dependent (see below)</tt><br>
+<tt>[num]"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # arc sec</tt><br>
+<tt>[num]'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # arc min</tt><br>
+<tt>[num]d&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # degrees</tt><br>
+<tt>[num]r&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # radians</tt><br>
+<tt>[num]p&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # physical pixels</tt><br>
+<tt>[num]i&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; # image pixels</tt><br>
+<p>When a "pure number" (i.e. one without a format directive such as 'd' for 'degrees') is specified, its interpretation depends on the context defined by the 'coordsys' keyword. In general, the rule is:</p>
+<p><i>All pure numbers have implied units corresponding to the current coordinate system.</i></p>
+<p>If no such system is explicitly specified, the default system is implicitly assumed to be <tt>PHYSICAL</tt>. In practice this means that for <tt>IMAGE</tt> and <tt>PHYSICAL</tt> systems, pure numbers are pixels. Otherwise, for all systems other than linear, pure numbers are degrees. For <tt>LINEAR</tt> systems, pure numbers are in the units of the linear system. This rule covers both positions and sizes. The input values to each shape can be specified in several coordinate systems including:</p>
<tt>IMAGE<br>
LINEAR<br>
FK4, B1950<br>
@@ -327,81 +211,33 @@ PHYSICAL<br>
AMPLIFIER<br>
DETECTOR<br>
WCS,WCSA-WCSZ<br></tt>
-<p>If no coordinate system is specified, <tt>PHYSICAL</tt> is
-assumed. <tt>PHYSICAL</tt> or a World Coordinate System such as
-<tt>J2000</tt> is preferred and most general. The coordinate system
-specifier should appear at the beginning of the region description,
-on a separate line (in a file), or followed by a new-line or
-semicolon; e.g.,</p>
+<p>If no coordinate system is specified, <tt>PHYSICAL</tt> is assumed. <tt>PHYSICAL</tt> or a World Coordinate System such as <tt>J2000</tt> is preferred and most general. The coordinate system specifier should appear at the beginning of the region description, on a separate line (in a file), or followed by a new-line or semicolon; e.g.,</p>
<tt>image; circle 100 100 10</tt><br>
<tt>physical; ellipse 200 200 10 20</tt><br>
<tt>fk5; point 30 50</tt><br>
<tt>wcsa; fk4; point 202 47</tt><br>
<tt>wcsp; linear; point 100 100</tt><br>
-<p>The use of celestial input units automatically implies WORLD
-coordinates of the reference image. Thus, if the world coordinate
-system of the reference image is <tt>J2000</tt>, then</p>
+<p>The use of celestial input units automatically implies WORLD coordinates of the reference image. Thus, if the world coordinate system of the reference image is <tt>J2000</tt>, then</p>
<tt>circle 10:10:0 20:22:0 3'</tt><br>
<p>is equivalent to:<br></p>
<tt>j2000; circle 10:10:0 20:22:0 3'</tt><br>
-<p>Note that by using units as described above, you may mix
-coordinate systems within a region specifier; e.g.,</p>
+<p>Note that by using units as described above, you may mix coordinate systems within a region specifier; e.g.,</p>
<tt>physical; circle 6500 9320 3'</tt><br>
-<p>Note that, for regions which accept a rotation angle such
-as:</p>
+<p>Note that, for regions which accept a rotation angle such as:</p>
<tt>ellipse (x, y, r1, r2, angle)</tt><br>
<tt>box(x, y, w, h, angle)</tt><br>
-<p>the angle is relative to the specified coordinate system. In
-particular, if the region is specified in WCS coordinates, the
-angle is related to the WCS system, not x/y image coordinate axis.
-For WCS systems with no rotation, this obviously is not an issue.
-However, some images do define an implicit rotation (e.g., by using
-a non-zero CROTA value in the WCS parameters) and for these images,
-the angle will be relative to the WCS axes. In such case, a region
-specification such as:</p>
+<p>the angle is relative to the specified coordinate system. In particular, if the region is specified in WCS coordinates, the angle is related to the WCS system, not x/y image coordinate axis. For WCS systems with no rotation, this obviously is not an issue. However, some images do define an implicit rotation (e.g., by using a non-zero CROTA value in the WCS parameters) and for these images, the angle will be relative to the WCS axes. In such case, a region specification such as:</p>
<tt>fk4;ellipse(22:59:43.985, +58:45:26.92,320", 160", 30)</tt><br>
<p>will not, in general, be the same region specified as:</p>
<tt>physical;ellipse(465, 578, 40, 20, 30)</tt><br>
-<p>even when positions and sizes match. The angle is relative to
-WCS axes in the first case, and relative to physical x,y axes in
-the second.</p>
-<p><b><a name="CompositeRegion" id="CompositeRegion"></a>Composite
-Region</b></p>
-<p>A Composite Region is a region which is a collection of other
-regions, which share common properties. A composite region is
-composed of a center point and a rotation angle, of which all its
-members are rendered in reference to. A composite region is defined
-by the # composite x y angle declaration followed by a number of
-regions who are or'd together. A composite region is manipulated as
-a single region within ds9. A composite region maybe created from
-the current selection of regions by selecting the Create Composite
-Region menu option. Likewise, a composite region can be dissolved
-by selecting the Dissolve Composite Region menu option.</p>
-<p><b><a name="TemplateRegion" id="TemplateRegion"></a>Template
-Region</b></p>
-<p>A Template Region is a special form of a region which is saved
-in a special wcs coordinate system WCS0. WCS0 indicates that the ra
-and dec values are relative to the current WCS location, not
-absolute. A template region can be loaded at any location into any
-fits image which contains a valid wcs. For example, a user may
-create a series of regions, which represent an instrument template.
-Then, by selecting the Save As Template menu option, a template
-region saved. The user may now load this templated into any other
-fits image which contains a valid WCS.</p>
-<p><b><a name="ExternalRegionFiles" id=
-"ExternalRegionFiles"></a>External Region Files</b></p>
-<p>DS9 can read and write a number of region file formats. Not all
-formats support all the functionality of DS9 regions. Therefore,
-the user may loose some information when writing and then reading
-back from a region file in a format other that DS9. On output, the
-regions File Format menu or the <a href="xpa.html#regions">XPA</a>
-regions point is used specify the output coordinate system and
-format. On input, the menu or xpa point is used only for the <tt>X
-Y</tt> format. For all other formats, the input coordinate system
-is specified in the regions file itself.</p>
-<p><b><a name="FUNTools" id="FUNTools"></a><a href=
-"http://hea-www.harvard.edu/RD/funtools/regions.html">Funtools</a></b><br>
-</p>
+<p>even when positions and sizes match. The angle is relative to WCS axes in the first case, and relative to physical x,y axes in the second.</p>
+<p><b><a name="CompositeRegion" id="CompositeRegion"></a>Composite Region</b></p>
+<p>A Composite Region is a region which is a collection of other regions, which share common properties. A composite region is composed of a center point and a rotation angle, of which all its members are rendered in reference to. A composite region is defined by the # composite x y angle declaration followed by a number of regions who are or'd together. A composite region is manipulated as a single region within ds9. A composite region maybe created from the current selection of regions by selecting the Create Composite Region menu option. Likewise, a composite region can be dissolved by selecting the Dissolve Composite Region menu option.</p>
+<p><b><a name="TemplateRegion" id="TemplateRegion"></a>Template Region</b></p>
+<p>A Template Region is a special form of a region which is saved in a special wcs coordinate system WCS0. WCS0 indicates that the ra and dec values are relative to the current WCS location, not absolute. A template region can be loaded at any location into any fits image which contains a valid wcs. For example, a user may create a series of regions, which represent an instrument template. Then, by selecting the Save As Template menu option, a template region saved. The user may now load this templated into any other fits image which contains a valid WCS.</p>
+<p><b><a name="ExternalRegionFiles" id="ExternalRegionFiles"></a>External Region Files</b></p>
+<p>DS9 can read and write a number of region file formats. Not all formats support all the functionality of DS9 regions. Therefore, the user may loose some information when writing and then reading back from a region file in a format other that DS9. On output, the regions File Format menu or the <a href="xpa.html#regions">XPA</a> regions point is used specify the output coordinate system and format. On input, the menu or xpa point is used only for the <tt>X Y</tt> format. For all other formats, the input coordinate system is specified in the regions file itself.</p>
+<p><b><a name="FUNTools" id="FUNTools"></a><a href="http://hea-www.harvard.edu/RD/funtools/regions.html">Funtools</a></b><br></p>
<tt>When using DS9 regions file in FUNTOOLS:<br>
LINE is ignored<br>
VECTOR is ignored<br>
@@ -434,9 +270,7 @@ ELLIPSE ANNULUS is ignored<br>
BOX ANNULUS is ignored<br>
EPANDA is ignored<br>
BPANDA is ignored<br>
-<br></tt> <a name="SAOimage" id="SAOimage"></a><a href=
-"http://tdc-www.harvard.edu/software/saoimage/saoimage.region.html">SAOimage</a><br>
-
+<br></tt> <a name="SAOimage" id="SAOimage"></a><a href="http://tdc-www.harvard.edu/software/saoimage/saoimage.region.html">SAOimage</a><br>
&nbsp;<br>
<tt>When importing from SAOIMAGE into DS9:<br>
POINT is translated into BOX CIRCLE POINT<br>
@@ -474,8 +308,7 @@ BOX ANNULUS is ignored<br>
PANDA is ignored<br>
EPANDA is ignored<br>
BPANDA is ignored<br></tt><br>
-<a name="FITSREGIONBinaryTable" id="FITSREGIONBinaryTable"></a>FITS
-REGION Binary Table<br>
+<a name="FITSREGIONBinaryTable" id="FITSREGIONBinaryTable"></a>FITS REGION Binary Table<br>
<br>
<tt>When importing from FITS REGION into DS9:<br>
POINT is translated into BOX CIRCLE POINT<br>
@@ -493,14 +326,7 @@ ROTRHOMBUSis ignored<br>
&nbsp;<br>
DS9 currently can not export into this format.<br>
<br></tt> <a name="XY" id="XY"></a>X Y<br>
-<p>This format consists of a number of coordinate pairs, one per
-line. The coordinate format for both input and output is specified
-via the Save Regions Parameters menu or <a href=
-"xpa.html#regions">XPA</a> regions point. The first two coordinates
-are read, the rest of the line is ignored. The comment character
-'#' may be used at the beginning of line and the line is ignored.
-This format is very useful for reading in coordinates from other
-external analysis programs, such as IRAF.</p>
+<p>This format consists of a number of coordinate pairs, one per line. The coordinate format for both input and output is specified via the Save Regions Parameters menu or <a href="xpa.html#regions">XPA</a> regions point. The first two coordinates are read, the rest of the line is ignored. The comment character '#' may be used at the beginning of line and the line is ignored. This format is very useful for reading in coordinates from other external analysis programs, such as IRAF.</p>
<tt>Example:# this is a comment<br>
physical # this overrides the specified coordinate system<br>
300 300<br>
diff --git a/ds9/doc/ref/vo.html b/ds9/doc/ref/vo.html
index bf929a7..6118aea 100644
--- a/ds9/doc/ref/vo.html
+++ b/ds9/doc/ref/vo.html
@@ -1,65 +1,29 @@
<!DOCTYPE doctype PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
-<meta name="generator" content=
-"HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
-<meta http-equiv="Content-Type" content=
-"text/html; charset=us-ascii">
-<meta name="GENERATOR" content=
-"Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
+<meta name="generator" content="HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 16.1), see www.w3.org">
+<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
+<meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
<title>Virtual Observatory</title>
</head>
-<body alink="#FF0000" bgcolor="#FFFFFF" vlink="#551A8B" text=
-"#000000" link="#0000FF">
-<h3><img alt="" src="../sun.gif" align="middle" width="100" height=
-"98"> Virtual Observatory Reference</h3>
+<body alink="#FF0000" bgcolor="#FFFFFF" vlink="#551A8B" text="#000000" link="#0000FF">
+<h3><img alt="" src="../sun.gif" align="middle" width="100" height="98"> Virtual Observatory Reference</h3>
<blockquote>
<p><b>Summary</b></p>
-<p>Use the Web proxy connection if your firewall does not allow
-your computer to connect directly to external computers. In this
-case, you also must use DS9's internal browser.</p>
+<p>Use the Web proxy connection if your firewall does not allow your computer to connect directly to external computers. In this case, you also must use DS9's internal browser.</p>
<p><b>Details</b></p>
-<p>When you click on one of the Virtual Observatory servers in the
-VO list, DS9 will attempt to connect to that server and (if the
-internal Web display is enabled) display its Web page. The square
-box to the left of the server name turns yellow while the
-connection is being established and then green to signal
-success.</p>
-<p>A direct connection is fast and flexible. Among other things, it
-allows you to perform analysis on your own local data (the VO
-server will retrieve the image from DS9) and also allows you to use
-an external browser to load images.</p>
-<p>Some system managers configure their firewall explicitly to
-prevent computers in their care from making a direct connection to
-an external host. Instead, they only allow external access through
-a Web proxy<br>
-server (such as SOCKS). If you are using a computer behind a
-restricted firewall of this sort, then DS9 will not be able to
-connect directly to a VO server. The yellow box will not turn green
-and eventually DS9 will display an error message.</p>
-<p>In this case, you can choose to have DS9 communicate with the VO
-servers through your Web proxy server. DS9 will use your proxy to
-send its commands and retrieve its data and analysis results,
-rather than doing this directly. Note that the following
-restrictions apply:<br></p>
+<p>When you click on one of the Virtual Observatory servers in the VO list, DS9 will attempt to connect to that server and (if the internal Web display is enabled) display its Web page. The square box to the left of the server name turns yellow while the connection is being established and then green to signal success.</p>
+<p>A direct connection is fast and flexible. Among other things, it allows you to perform analysis on your own local data (the VO server will retrieve the image from DS9) and also allows you to use an external browser to load images.</p>
+<p>Some system managers configure their firewall explicitly to prevent computers in their care from making a direct connection to an external host. Instead, they only allow external access through a Web proxy<br>
+server (such as SOCKS). If you are using a computer behind a restricted firewall of this sort, then DS9 will not be able to connect directly to a VO server. The yellow box will not turn green and eventually DS9 will display an error message.</p>
+<p>In this case, you can choose to have DS9 communicate with the VO servers through your Web proxy server. DS9 will use your proxy to send its commands and retrieve its data and analysis results, rather than doing this directly. Note that the following restrictions apply:<br></p>
<blockquote><i>The transfer of data is slower.<br>
You must use the internal Web browser for loading images, etc.<br>
You cannot perform analysis on local data.<br>
-There is a (large but finite) restriction on the number of annuli,
-and number of polygon points you can specify in a region, as well
-as the total number of regions allowed.</i><br></blockquote>
-<p>If your computer and firewall have been configured to require
-use of a Web proxy server, you will have to tell DS9 about this
-server. Click the <b>Configure Web Proxy</b> button and type the
-relevant information into the boxes. (Your systems administrator
-will be able to tell you the details.) At this point, you should be
-able to connect to a VO server successfully. Please let us know if
-you have problems!</p>
+There is a (large but finite) restriction on the number of annuli, and number of polygon points you can specify in a region, as well as the total number of regions allowed.</i><br></blockquote>
+<p>If your computer and firewall have been configured to require use of a Web proxy server, you will have to tell DS9 about this server. Click the <b>Configure Web Proxy</b> button and type the relevant information into the boxes. (Your systems administrator will be able to tell you the details.) At this point, you should be able to connect to a VO server successfully. Please let us know if you have problems!</p>
<blockquote>
-<p><i>A final note: you may, of course, choose to use the Web proxy
-even if your computer and firewall are configured to allow direct
-connections. In this case, there is no need to configure the proxy
-server.<br></i></p>
+<p><i>A final note: you may, of course, choose to use the Web proxy even if your computer and firewall are configured to allow direct connections. In this case, there is no need to configure the proxy server.<br></i></p>
</blockquote>
</blockquote>
</body>