update ds9 parsers

2 files changed, 28 insertions, 51 deletions

diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html
index 28f1cf6..f35141d 100644
--- a/ds9/doc/ref/command.html
+++ b/ds9/doc/ref/command.html
@@ -2923,23 +2923,7 @@
       <tt> Syntax: <br>
         # create new empty plot window</tt><br>
       <tt>-plot [line|bar|scatter]<br>
-      </tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-                                </tt></tt></tt></tt></tt>[new
-                        &lt;title&gt; &lt;xaxis label&gt; &lt;yaxis
-                        label&gt; </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]<br>
-                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </tt><tt>[new
-                        line|bar|scatter &lt;title&gt; &lt;xaxis
-                        label&gt; &lt;yaxis label&gt; </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]<br>
-                      </tt></tt></tt></tt></tt></tt></tt></tt></tt><tt><tt><tt><tt><tt><tt><tt><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-
-                    </tt></tt></tt></tt></tt>[new </tt><tt><tt><tt><tt><tt>name
-                    &lt;plotname&gt; </tt></tt></tt></tt>&lt;title&gt;
-            &lt;xaxis label&gt; &lt;yaxis label&gt; </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]<br>
-            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </tt><tt>[new </tt><tt><tt><tt><tt><tt>name
-                    &lt;plotname&gt; </tt></tt></tt></tt>line|bar|scatter
-            &lt;title&gt; &lt;xaxis label&gt; &lt;yaxis label&gt; </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]<br>
-          </tt><tt><br>
+      </tt><tt><tt><tt><br>
           </tt></tt></tt><tt><tt><tt># existing plot<br>
           </tt></tt></tt><tt>-plot </tt><tt><tt>[[&lt;plotname&gt;]
           load &lt;filename&gt; xy|xyex|xyey|xyexey]<br>
@@ -4555,33 +4539,26 @@
       </tt><tt>&nbsp; <br>
         Example: <br>
       </tt><tt><tt> </tt></tt><tt># create new empty plot window<br>
-        $ds9 -plot<br>
-        $ds9 -plot scatter<br>
-        $ds9 -plot new<br>
-        $ds9 -plot new bar<br>
-        $ds9 -plot new name foo<br>
-        $ds9 -plot new name foo scatter<br>
+        $ds9 -plot bar<br>
       </tt><tt><tt><br>
-          $ds9 -plot load foo.dat xy # load new dataset with dimension
-          xy<br>
-          $ds9 -plot save bar.dat # save current dataset<br>
-        </tt></tt><tt><tt>$ds9 -plot clear # clear all datasets<br>
-          $ds9 -plot duplicate # duplicate current dataset<br>
-          $ds9 -plot stats yes # display current dataset statistics<br>
-          $ds9 -plot list yes # list current dataset<br>
-        </tt></tt><tt><tt>$ds9 -plot loadconfig foo.plt # load plot
-          configuration <br>
-          $ds9 -plot saveconfig bar.plt # save current plot
-          configuration<br>
+        </tt></tt><tt><tt><tt><tt><tt><tt><tt><tt><tt># existing plot<br>
+                      </tt></tt></tt></tt></tt></tt></tt>$ds9 -plot load
+          xy.dat<br>
+          $ds9 -plot save foo.dat<br>
+        </tt></tt><tt><tt>$ds9 -plot clear<br>
+          $ds9 -plot duplicate 1<br>
+          $ds9 -plot stats yes<br>
+          $ds9 -plot list yes<br>
+        </tt></tt><tt><tt>$ds9 -plot loadconfig foo.plt<br>
+          $ds9 -plot saveconfig foo.plt<br>
         </tt></tt><tt><tt>$ds9 -plot pagesetup orient portrait<br>
           $ds9 -plot pagesetup size letter<br>
         </tt></tt><tt><tt>$ds9 -plot print<br>
           $ds9 -plot print destination file<br>
-          $ds9 -plot print command "lp"<br>
-          $ds9 -plot print filename "foo.ps"<br>
+          $ds9 -plot print command lp<br>
+          $ds9 -plot print filename foo.ps<br>
           $ds9 -plot print color rgb<br>
-        </tt>$ds9 -plot close # close current plot<br>
-      </tt><tt><tt><br>
+        </tt>$ds9 -plot close</tt><tt><tt><br>
           $ds9 -plot mode pointer</tt><br>
       </tt><tt><br>
         # configure plot<br>
@@ -4589,7 +4566,7 @@
         $ds9 -plot axis x log yes</tt><br>
       <tt>$ds9 -plot axis x flip yes</tt><tt><br>
       </tt><tt><tt>$ds9 -plot axis x auto no<br>
-          $ds9 -plot axis x min 0<br>
+          $ds9 -plot axis x min 1<br>
           $ds9 -plot axis x max 100<br>
         </tt><tt><tt>$ds9 -plot axis x format {%f}<br>
           </tt></tt>$ds9 -plot legend yes # show legend<br>
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html
index dfae17d..3d447aa 100644
--- a/ds9/doc/ref/xpa.html
+++ b/ds9/doc/ref/xpa.html
@@ -268,8 +268,8 @@
         </tt> Example: <br>
         $xpaget ds9 analysis<br>
         $xpaget ds9 analysis task<br>
-        $xpaget ds9 analysis entry 'Please enter something'<br>
-        $xpaget ds9 analysis entry okcancel 'Please enter something'<br>
+        $xpaget ds9 analysis entry {Please enter something}<br>
+        $xpaget ds9 analysis entry okcancel {Please enter something}<br>
         $xpaset -p ds9 analysis 0 # invoke first analysis task<br>
         $xpaset -p ds9 analysis task 0<br>
         $xpaset -p ds9 analysis task foobar<br>
@@ -1129,7 +1129,7 @@
       </tt><tt><tt>$xpaset -p ds9 catalog new<br>
         </tt>$xpaset -p ds9 catalog 2mass<br>
         $xpaset -p ds9 catalog cds 2mass<br>
-        $xpaset -p ds9 catalog cds "I/252"<br>
+        $xpaset -p ds9 catalog cds {I/252}<br>
         <br>
       </tt><tt>$xpaset -p ds9 catalog load foo.xml<br>
         $xpaset -p ds9 catalog import tsv foo.tsv<br>
@@ -1172,7 +1172,7 @@
       </tt><tt>$xpaset -p ds9 catalog show yes</tt><br>
       <tt>$xpaset -p ds9 catalog size 1 1 degrees</tt><br>
       <tt>$xpaset -p ds9 catalog symbol condition '$Jmag&gt;15'<br>
-        $xpaset -p ds9 catalog symbol 2 shape "boxcircle point"<br>
+        $xpaset -p ds9 catalog symbol 2 shape {boxcircle point}<br>
         $xpaset -p ds9 catalog symbol color red<br>
         $xpaset -p ds9 catalog symbol font times<br>
       </tt><tt>$xpaset -p ds9 catalog symbol fontsize 14<br>
@@ -1184,7 +1184,7 @@
         $xpaset -p ds9 catalog symbol save bar.sym</tt><tt><br>
         $xpaset -p ds9 catalog sky fk5<br>
         $xpaset -p ds9 catalog skyformat degrees<br>
-      </tt><tt>$xpaset -p ds9 catalog sort "Jmag" incr<br>
+      </tt><tt>$xpaset -p ds9 catalog sort {Jmag} incr<br>
       </tt><tt>$xpaset -p ds9 catalog system wcs</tt><tt><br>
       </tt><tt>$xpaset -p ds9 catalog update<br>
       </tt><tt>$xpaset -p ds9 catalog x RA<br>
@@ -4758,10 +4758,10 @@
                   </tt>$xpaget ds9 plot stats<br>
                 </tt></tt></tt></tt></tt></tt><tt><tt><tt><tt>$xpaget
               ds9 plot list<br>
-            </tt></tt>$xpaset -p ds9 plot load plot/xy.dat xy<br>
+            </tt></tt>$xpaset -p ds9 plot load xy.dat xy<br>
           $xpaset -p ds9 plot save foo.dat<br>
         </tt></tt><tt><tt>$xpaset -p ds9 plot clear<br>
-          $xpaset -p ds9 plot duplicate<br>
+          $xpaset -p ds9 plot duplicate 1<br>
         </tt></tt><tt><tt><tt><tt><tt><tt>$xpaset -p ds9 plot stats yes<br>
                 </tt></tt></tt></tt></tt></tt><tt><tt>$xpaset -p ds9
           plot list yes<br>
@@ -4771,8 +4771,8 @@
           $xpaset -p ds9 plot pagesetup size letter<br>
         </tt></tt><tt><tt>$xpaset -p ds9 plot print<br>
           $xpaset -p ds9 plot print destination file<br>
-          $xpaset -p ds9 plot print command "lp"<br>
-          $xpaset -p ds9 plot print filename "foo.ps"<br>
+          $xpaset -p ds9 plot print command lp<br>
+          $xpaset -p ds9 plot print filename foo.ps<br>
           $xpaset -p ds9 plot print color rgb<br>
         </tt>$xpaset -p ds9 plot close</tt><tt><tt><br>
           $xpaget ds9 plot mode<br>
@@ -4932,7 +4932,7 @@
       </tt><tt><tt>$xpaset -p ds9 plot axis x auto no<br>
           $xpaset -p ds9 plot axis x min 1<br>
           $xpaset -p ds9 plot axis x max 100<br>
-          $xpaset -p ds9 plot axis x format "%f"<br>
+          $xpaset -p ds9 plot axis x format {%f}<br>
           <br>
         </tt></tt><tt><tt><tt><tt><tt>$xpaget ds9 plot legend<br>
               </tt></tt></tt></tt><tt><tt><tt><tt><tt>$xpaget ds9 plot
@@ -5980,7 +5980,7 @@
         $echo "box 100 100 20 40 25" | xpaset ds9 regions <br>
         $echo "image; line 100 100 200 400" | xpaset ds9 regions <br>
         $echo "physical; ruler 200 300 200 400" | xpaset ds9 regions <br>
-        $echo "image; text 100 100 # text={Hello, World} | xpaset ds9
+        $echo "image; text 100 100 # text={Hello, World}" | xpaset ds9
         regions <br>
         $echo "fk4; boxcircle point 13:29:55 47:11:50" | xpaset ds9
         regions <br>
@@ -6959,7 +6959,7 @@
         $xpaget ds9 vo delay<br>
         $xpaget ds9 vo connect<br>
         $xpaset -p ds9 vo method xpa<br>
-        $xpaset -p ds9 vo server "http://foo.bar.edu/list.txt"<br>
+        $xpaset -p ds9 vo server http://foo.bar.edu/list.txt<br>
         $xpaset -p ds9 vo internal yes<br>
         $xpaset -p ds9 vo delay 15 # keep-alive delay<br>
         $xpaset -p ds9 vo chandra-ed<br>