PRINT: add backward compatible options for resolution to command parser

author: William Joye <wjoye@cfa.harvard.edu> 2019-01-03 19:17:06 (GMT)
committer: William Joye <wjoye@cfa.harvard.edu> 2019-01-03 19:17:06 (GMT)
commit: 0ed039f999076cdebb76a3c53ceb7d1fabab43c1 (patch)
tree: 1ebc1d5cc2a306aaf53f7d7d871c713321d02c12
parent: 6f6a42a33ba51d197a67b506d8a31c9c6f9b57a8 (diff)
download: blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.zip
blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.tar.gz
blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.tar.bz2
6 files changed, 145 insertions, 18 deletions
diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html
index bd400b6..2b6f8d9 100644
--- a/ds9/doc/ref/command.html
+++ b/ds9/doc/ref/command.html
@@ -9,9 +9,9 @@
       2.4.7-10 i686) [Netscape]">
     <title>Command Line Options</title>
   </head>
-  <body alink="#FF0000" link="#0000FF" vlink="#551A8B">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> Command Line Options</h3>
+  <body vlink="#551A8B" link="#0000FF" alink="#FF0000">
+    <h3><img alt="" src="../sun.gif" width="100" height="98"
+        align="middle"> Command Line Options</h3>
     <blockquote>
       <p>DS9 will process each command line option, one at a time, as
         the last step in the initialization process. Therefore, it is
@@ -451,6 +451,7 @@
 
 
 
+
         [&lt;ref&gt;] [filter &lt;string&gt;]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; [&lt;ref&gt;]
         [filter load &lt;filename&gt;]</tt><tt><br>
@@ -466,6 +467,7 @@
 
 
 
+
         [&lt;ref&gt;] [match]</tt><tt><br>
       </tt><tt> </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt>
       </tt><tt>[&lt;ref&gt;] [match error &lt;value&gt;
@@ -485,6 +487,7 @@
 
 
 
+
         [&lt;ref&gt;] [panto yes|no]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         [&lt;ref&gt;] [plot &lt;xcol&gt; &lt;ycol&gt; &lt;xerrcol&gt;
@@ -512,6 +515,7 @@
 
 
 
+
         [&lt;ref&gt;] [save &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         [&lt;ref&gt;] [server</tt><tt> </tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt><tt><br>
@@ -539,6 +543,7 @@
 
 
 
+
         [symbol shape</tt><tt> </tt><tt>circle point|box point|diamond
         point|</tt><tt>cross point|x point|arrow point|boxcircle point]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -546,6 +551,7 @@
 
 
 
+
         [&lt;ref&gt;] [symbol add| [#] remove]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [&lt;ref&gt;]
         [symbol save|load &lt;filename&gt;]</tt><tt><br>
@@ -595,6 +601,7 @@
 
 
 
+
         '\$Hmag' '\$e_Jmag' '\$e_Hmag'</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>$ds9 -catalog print</tt><tt><br>
       </tt><tt> </tt><tt>$ds9 -catalog psky fk5</tt><tt><br>
@@ -690,6 +697,7 @@
 
 
 
+
           [match]<br>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [lock
           [yes|no]]</tt><br>
@@ -824,6 +832,7 @@
 
 
 
+
         &lt;coordsys&gt;]<br>
         &nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [lock
         &lt;coordsys&gt;|none]</tt><br>
@@ -987,6 +996,7 @@
 
 
 
+
           -envi foo.hdr foo.bsq</tt></tt><tt><tt><tt><tt><tt><tt><br>
                 </tt></tt></tt></tt></tt></tt>
       <p><b><a name="exit" id="exit"></a>exit<br>
@@ -1020,12 +1030,14 @@
 
 
 
+
         [1-100]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>-export &lt;filename&gt;</tt><tt>.tiff
 
 
 
 
+
         [none|jpeg|packbits|deflate]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;</tt><tt><br>
       </tt><tt> Example:</tt><tt><br>
@@ -1492,11 +1504,13 @@
 
 
 
+
         &lt;coordsys&gt;]</tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
+
         [crop &lt;coordsys&gt;]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [slice
         &lt;coordsys&gt;]</tt><tt><br>
@@ -1511,6 +1525,7 @@
 
 
 
+
         [3d]</tt><tt><br>
       </tt><tt> &nbsp;</tt><tt><br>
       </tt><tt> Example:</tt><tt><br>
@@ -1631,6 +1646,7 @@
 
 
 
+
         [pan]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1638,6 +1654,7 @@
 
 
 
+
         [crosshair]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -1645,6 +1662,7 @@
 
 
 
+
         [open|close]<br>
         &nbsp;<br>
         Example:<br>
@@ -1756,6 +1774,7 @@
 
 
 
+
         [yes|open]<br>
         &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
         [no|close]<br>
@@ -1788,6 +1807,7 @@
 
 
 
+
         load &lt;filename&gt; xy|xyex|xyey|xyexey]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp; &nbsp;&nbsp;
         [[&lt;plotname&gt;] save &lt;filename&gt;]</tt><tt><br>
@@ -1804,6 +1824,7 @@
 
 
 
+
         loadconfig &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp; &nbsp; &nbsp;
         [[&lt;plotname&gt;] saveconfig &lt;filename&gt;]</tt><tt><br>
@@ -1827,11 +1848,13 @@
 
 
 
+
         close</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp; &nbsp; &nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
+
         mode pointer|zoom]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br>
@@ -1854,6 +1877,7 @@
 
 
 
+
         legend yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp; &nbsp;&nbsp;
         [[&lt;plotname&gt;] legend position right|left|top|bottom]</tt><tt><br>
@@ -1878,6 +1902,7 @@
 
 
 
+
         barmode normal|stacked|aligned|overlap]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br>
@@ -2062,10 +2087,11 @@
 
 
 
+
         [color rgb|cmyk|gray]</tt><tt><br>
-      </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2]</tt><tt><br>
+      </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2|3]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [resolution
-        53|72|75|150|300|600]</tt><tt><br>
+      </tt><tt><tt>72|screen|96|144|150|225|300|600|1200]</tt></tt><tt><br>
       </tt><tt> &nbsp;</tt><tt><br>
       </tt><tt> Example:</tt><tt><br>
       </tt><tt> $ds9 -print</tt><tt><br>
@@ -2074,7 +2100,7 @@
       </tt><tt> $ds9 -print filename foo.ps</tt><tt><br>
       </tt><tt> $ds9 -print color cmyk</tt><tt><br>
       </tt><tt> $ds9 -print level 2</tt><tt><br>
-      </tt><tt> $ds9 -print resolution 75</tt>
+      </tt><tt> $ds9 -print resolution 96</tt>
       <p><b><a name="raise" id="raise"></a>raise</b></p>
       <p>Raise in the window stacking order.</p>
       <tt>Syntax:<br>
@@ -2345,6 +2371,7 @@
 
 
 
+
         [image|table|slice]</tt><br>
       <tt>&nbsp;<br>
         Example:<br>
@@ -2464,6 +2491,7 @@
 
 
 
+
         [crosshair]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [export
         sb|tsv &lt;filename&gt;]</tt><tt><br>
@@ -2488,6 +2516,7 @@
 
 
 
+
         [update]</tt><tt><br>
       </tt><tt> </tt><tt><br>
       </tt><tt> Example:</tt><tt><br>
@@ -2599,6 +2628,7 @@
 
 
 
+
                   [sigma &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -2606,6 +2636,7 @@
 
 
 
+
                   [sigmaminor &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [angle
@@ -2614,6 +2645,7 @@
 
 
 
+
                       &lt;value&gt;]<br>
                     </tt></tt></tt></tt></tt></tt></tt>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [match]<br>
@@ -2635,12 +2667,14 @@
 
 
 
+
                   sigmaminor 2.0<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>$ds9
 
 
 
 
+
                       -smooth angle 45<br>
                     </tt></tt></tt></tt></tt></tt></tt> $ds9 -smooth
         match<br>
diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html
index df90178..db5c239 100644
--- a/ds9/doc/ref/samp.html
+++ b/ds9/doc/ref/samp.html
@@ -9,9 +9,9 @@
       2.4.7-10 i686) [Netscape]">
     <title>SAMP</title>
   </head>
-  <body alink="#FF0000" link="#0000FF" vlink="#551A8B">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> SAMP</h3>
+  <body vlink="#551A8B" link="#0000FF" alink="#FF0000">
+    <h3><img alt="" src="../sun.gif" width="100" height="98"
+        align="middle"> SAMP</h3>
     <blockquote>
       <p>SAMP is a messaging protocol that enables astronomy software
         tools to interoperate and communicate. Broadly speaking, SAMP is
@@ -466,6 +466,7 @@
 
 
 
+
         [2mass|iras]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         [csc|xmm|rosat]</tt><tt><br>
@@ -508,6 +509,7 @@
 
 
 
+
         [&lt;ref&gt;] [filter &lt;string&gt;]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; [&lt;ref&gt;]
         [filter load &lt;filename&gt;]</tt><tt><br>
@@ -523,6 +525,7 @@
 
 
 
+
         [&lt;ref&gt;] [match &lt;ref&gt; &lt;ref&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt>
       </tt><tt>[&lt;ref&gt;] [match error &lt;value&gt;
@@ -542,6 +545,7 @@
 
 
 
+
         [&lt;ref&gt;] [panto yes|no]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         [&lt;ref&gt;] [plot &lt;xcol&gt; &lt;ycol&gt; &lt;xerrcol&gt;
@@ -569,6 +573,7 @@
 
 
 
+
         [&lt;ref&gt;] [save &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
         [&lt;ref&gt;] [server</tt><tt> </tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt><tt><br>
@@ -597,6 +602,7 @@
 
 
 
+
         [symbol shape</tt><tt> </tt><tt>circle point|box point|diamond
         point|</tt><tt>cross point|x point|arrow point|boxcircle point]</tt><tt><br>
       </tt><tt> </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -654,6 +660,7 @@
 
 
 
+
         {$Hmag} {$e_Jmag} {$e_Hmag}</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>catalog print</tt><tt><br>
       </tt><tt> </tt><tt>catalog psky fk5</tt><tt><br>
@@ -672,6 +679,7 @@
 
 
 
+
         point}</tt><tt><br>
       </tt><tt> </tt><tt>catalog symbol color red</tt><tt><br>
       </tt><tt> catalog symbol font times</tt><tt><br>
@@ -816,6 +824,7 @@
 
 
 
+
             [save levels &lt;filename&gt;]<br>
           </tt></tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [copy]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [paste
@@ -900,6 +909,7 @@
 
 
 
+
         zmax &lt;coordsys&gt;]</tt><tt><br>
       </tt><tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [open|close]</tt><tt><br>
       </tt><tt> &nbsp;</tt><tt><br>
@@ -1637,6 +1647,7 @@
 
 
 
+
           Macros</a> for more information.</p>
       <tt>Syntax:<br>
         iexam []<br>
@@ -2145,6 +2156,7 @@
 
 
 
+
         load &lt;filename&gt; xy|xyex|xyey|xyexey]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] save &lt;filename&gt;]</tt><tt><br>
@@ -2155,24 +2167,28 @@
 
 
 
+
         duplicate [#]]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         stats yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         list yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         loadconfig &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] saveconfig &lt;filename&gt;]</tt><tt><br>
@@ -2196,12 +2212,14 @@
 
 
 
+
         close</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         mode pointer|zoom]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br>
@@ -2224,6 +2242,7 @@
 
 
 
+
         legend yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] legend position right|left|top|bottom]</tt><tt><br>
@@ -2248,6 +2267,7 @@
 
 
 
+
         barmode normal|stacked|aligned|overlap]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br>
@@ -2257,54 +2277,63 @@
 
 
 
+
         shape circle|square|diamond|plus|splus|scross|triangle|arrow]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         shape fill yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         shape color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         smooth step|linear|cubic|quadratic|catrom]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         width &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         dash yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         error yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         error color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] color &lt;value&gt;]</tt><tt><br>
@@ -2313,12 +2342,14 @@
 
 
 
+
         error width &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         name &lt;string&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># select current dataset</tt><tt><br>
@@ -2533,8 +2564,8 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [command &lt;command&gt;]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [filename &lt;filename&gt;]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [color rgb|cmyk|gray]<br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2]<br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [resolution 53|72|75|150|300|600]<br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2|3]<br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [resolution </tt><tt><tt>72|screen|96|144|150|225|300|600|1200</tt>]<br>
         &nbsp;<br>
         Example:<br>
         string value = ds9.get(string cmd)<br>
@@ -2551,7 +2582,7 @@
         print filename foo.ps<br>
         print color cmyk<br>
         print level 2<br>
-        print resolution 75</tt>
+        print resolution 96</tt>
       <p><b><a name="raise" id="raise"></a>raise</b></p>
       <p>Raise in the window stacking order.</p>
       <tt>Syntax:<br>
@@ -3022,6 +3053,7 @@
 
 
 
+
         [&lt;ref&gt;] [save &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp; &nbsp;&nbsp; &nbsp; [&lt;ref&gt;]
         [radius &lt;value&gt; degrees|arcmin|arcsec]</tt><tt><br>
@@ -3144,6 +3176,7 @@
 
 
 
+
                   [sigma &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3151,6 +3184,7 @@
 
 
 
+
                   [sigmaminor &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [angle
@@ -3159,12 +3193,14 @@
 
 
 
+
                       &lt;value&gt;]<br>
                     </tt></tt></tt></tt></tt></tt></tt></tt> <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
 
 
 
+
         [match]<br>
         &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; [lock [yes|no]]</tt><br>
       <tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [open|close]<br>
@@ -3190,18 +3226,21 @@
 
 
 
+
                         sigma 2.0<br>
                       </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>smooth
 
 
 
 
+
                         sigmaminor 2.0<br>
                       </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>smooth
 
 
 
 
+
                               angle 45<br>
                             </tt></tt></tt></tt></tt></tt></tt></tt></tt></tt></tt>
         smooth open<br>
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html
index 9fd8f80..c509dd9 100644
--- a/ds9/doc/ref/xpa.html
+++ b/ds9/doc/ref/xpa.html
@@ -9,9 +9,9 @@
       2.4.7-10 i686) [Netscape]">
     <title>XPA Access Points</title>
   </head>
-  <body alink="#FF0000" link="#0000FF" vlink="#551A8B">
-    <h3><img alt="" src="../sun.gif" align="middle" height="98"
-        width="100"> XPA Access Points</h3>
+  <body vlink="#551A8B" link="#0000FF" alink="#FF0000">
+    <h3><img alt="" src="../sun.gif" width="100" height="98"
+        align="middle"> XPA Access Points</h3>
     <blockquote>
       <p>The <a href="http://hea-www.harvard.edu/RD/xpa/index.html">XPA</a>
         messaging system provides seamless communication between DS9 and
@@ -211,6 +211,7 @@
 
 
 
+
                       -p ds9 3d match</tt></tt></tt></tt></tt></tt></tt></tt><br>
       <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset -p ds9 3d lock
                             yes</tt><br>
@@ -453,6 +454,7 @@
 
 
 
+
         [crosshair]</tt><br>
       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [dec
         &lt;col&gt;]</tt><br>
@@ -476,6 +478,7 @@
 
 
 
+
             [&lt;ref&gt;] [match &lt;ref&gt; &lt;ref&gt;]<br>
           </tt></tt> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt> <tt>[&lt;ref&gt;]
 [match
@@ -484,24 +487,28 @@
 
 
 
+
         error &lt;value&gt; degrees|arcmin|arcsec]</tt><br>
       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt> <tt>[&lt;ref&gt;]
 
 
 
 
+
         [match function 1and2|1not2|2not1]<br>
       </tt> <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt> <tt>[&lt;ref&gt;]
 
 
 
 
+
         [match return 1and2|1only|2only]</tt><br>
       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt> <tt>[&lt;ref&gt;]
 
 
 
 
+
         [match unique yes|no]</tt><br>
       <tt>&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [maxrows
         &lt;number&gt;]</tt><br>
@@ -554,11 +561,13 @@
 
 
 
+
           shape</tt></tt> <tt><tt>circle point|box point|diamond point|</tt>cross
 
 
 
 
+
         point|x point|arrow point|boxcircle point]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [symbol
         add| [#] remove]<br>
@@ -571,6 +580,7 @@
 
 
 
+
         [update]</tt><br>
       <tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [x
         &lt;col&gt;]</tt><br>
@@ -1101,6 +1111,7 @@
 
 
 
+
                           -p ds9 export envi foo.hdr foo.bsq little</tt></tt><br>
                     </tt></tt></tt></tt> $xpaset -p ds9 export tiff
               foo.tiff jpeg</tt></tt></tt><br>
@@ -1990,6 +2001,7 @@
 
 
 
+
         [line|bar|scatter] &lt;title&gt; &lt;xaxis label&gt; &lt;yaxis
         label&gt;</tt><tt> </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[new</tt><tt>
@@ -2008,11 +2020,13 @@
 
 
 
+
         name &lt;plotname&gt; stdin</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[new
 
 
 
+
         name &lt;plotname&gt;</tt><tt> </tt><tt>line|bar|scatter</tt><tt>
       </tt><tt>stdin</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
@@ -2026,6 +2040,7 @@
 
 
 
+
         load &lt;filename&gt; xy|xyex|xyey|xyexey]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] save &lt;filename&gt;]</tt><tt><br>
@@ -2036,24 +2051,28 @@
 
 
 
+
         duplicate [#]]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         stats yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         list yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         loadconfig &lt;filename&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] saveconfig &lt;filename&gt;]</tt><tt><br>
@@ -2077,12 +2096,14 @@
 
 
 
+
         close</tt><tt>]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         mode pointer|zoom]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br>
@@ -2105,6 +2126,7 @@
 
 
 
+
         legend yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] legend position right|left|top|bottom]</tt><tt><br>
@@ -2129,6 +2151,7 @@
 
 
 
+
         barmode normal|stacked|aligned|overlap]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br>
@@ -2138,54 +2161,63 @@
 
 
 
+
         shape circle|square|diamond|plus|splus|scross|triangle|arrow]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         shape fill yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         shape color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         smooth step|linear|cubic|quadratic|catrom]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         width &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         dash yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         error yes|no]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         error color &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;
         [[&lt;plotname&gt;] color &lt;value&gt;]</tt><tt><br>
@@ -2194,12 +2226,14 @@
 
 
 
+
         error width &lt;value&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;</tt><tt> </tt><tt>[[&lt;plotname&gt;]
 
 
 
 
+
         name &lt;string&gt;]</tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt><br>
       </tt><tt> </tt><tt> </tt><tt># select current dataset</tt><tt><br>
@@ -2421,8 +2455,8 @@
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [command &lt;command&gt;]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [filename &lt;filename&gt;]<br>
         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [color rgb|cmyk|gray]<br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2]<br>
-        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [resolution 53|72|75|150|300|600]<br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [level 1|2|3]<br>
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [resolution 72|screen|96|144|150|225|300|600|1200]<br>
         &nbsp;<br>
         Example:<br>
         $xpaget ds9 print destination<br>
@@ -2437,7 +2471,7 @@
         $xpaset -p ds9 print filename foo.ps<br>
         $xpaset -p ds9 print color cmyk<br>
         $xpaset -p ds9 print level 2<br>
-        $xpaset -p ds9 print resolution 75</tt>
+        $xpaset -p ds9 print resolution 96</tt>
       <p><b><a name="raise" id="raise"></a>raise</b></p>
       <p>Raise in the window stacking order.</p>
       <tt>Syntax:<br>
@@ -2885,6 +2919,7 @@
 
 
 
+
         [crosshair]</tt><tt><br>
       </tt><tt> </tt><tt>&nbsp;&nbsp;&nbsp; [&lt;ref&gt;] [export
         sb|tsv &lt;filename&gt;]</tt><tt><br>
@@ -2907,6 +2942,7 @@
 
 
 
+
         [update]</tt><br>
       &nbsp; <tt><br>
         Example:<br>
@@ -3013,6 +3049,7 @@
 
 
 
+
                   [sigma &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 
@@ -3020,6 +3057,7 @@
 
 
 
+
                   [sigmaminor &lt;value&gt;]<br>
                 </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 [angle
@@ -3028,12 +3066,14 @@
 
 
 
+
                       &lt;value&gt;]<br>
                     </tt></tt></tt></tt></tt></tt></tt></tt> <tt>&nbsp;&nbsp;&nbsp;
 
 
 
 
+
         &nbsp;&nbsp; [match]<br>
         &nbsp;&nbsp;&nbsp; &nbsp;&nbsp; [lock [yes|no]]</tt><br>
       <tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [open|close]<br>
@@ -3049,6 +3089,7 @@
 
 
 
+
                         ds9 smooth sigmaminor<br>
                       </tt></tt></tt></tt></tt></tt></tt></tt> $xpaget
         ds9 smooth lock<br>
@@ -3063,18 +3104,21 @@
 
 
 
+
                         -p ds9 smooth sigma 2.0<br>
                       </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset
 
 
 
 
+
                         -p ds9 smooth sigmaminor 2.0<br>
                       </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset
 
 
 
 
+
                               -p ds9 smooth angle 45<br>
                             </tt></tt></tt></tt></tt></tt></tt></tt></tt></tt></tt>
         $xpaset -p ds9 smooth match<br>
diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index 323e5c5..d6e0e41 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -32,6 +32,7 @@
 <li><tt>12.29.2018 TKWIN: update TEA to 3.13.</tt></li>
 <li><tt>01.03.2019 DS9: fixed a problem with MacOS Aqua and Windows unable to locate ds9 parser scripts at startup.</tt></li>
 <li><tt>01.03.2019 SCALE: fixed scale command.</tt></li>
+<li><tt>01.03.2019 PRINT: add backward compatible options for resolution to command parser.</tt></li>
 <li><tt><b>xx.xx.2018 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl
index ea34343..208d7b8 100644
--- a/ds9/parsers/pslex.fcl
+++ b/ds9/parsers/pslex.fcl
@@ -31,6 +31,9 @@ screen	    {return $SCREEN_}
 600	    {return $600_}
 1200	    {return $1200_}
 
+53	    {return $53_}
+75	    {return $75_}
+
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac
index aca229c..6bd877c 100644
--- a/ds9/parsers/psparser.tac
+++ b/ds9/parsers/psparser.tac
@@ -30,6 +30,9 @@
 %token 600_
 %token 1200_
 
+%token 53_
+%token 75_
+
 %%
 
 command : ps 
@@ -70,6 +73,9 @@ resolution : 72_ {set _ 72}
  | 300_ {set _ 300}
  | 600_ {set _ 600}
  | 1200_ {set _ 1200}
+#backward compatibility
+ | 53_ {set _ 53}
+ | 75_ {set _ 75}
  ;
 
 %%
author	William Joye <wjoye@cfa.harvard.edu>	2019-01-03 19:17:06 (GMT)
committer	William Joye <wjoye@cfa.harvard.edu>	2019-01-03 19:17:06 (GMT)
commit	0ed039f999076cdebb76a3c53ceb7d1fabab43c1 (patch)
tree	1ebc1d5cc2a306aaf53f7d7d871c713321d02c12
parent	6f6a42a33ba51d197a67b506d8a31c9c6f9b57a8 (diff)
download	blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.zip blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.tar.gz blt-0ed039f999076cdebb76a3c53ceb7d1fabab43c1.tar.bz2