From 70fa1e5c66e30bb297476febd2c4abd4eaa1f7ea Mon Sep 17 00:00:00 2001 From: William Joye Date: Tue, 23 Oct 2018 17:24:50 -0400 Subject: new mask --- ds9/doc/ref/command.html | 1187 +++---- ds9/doc/ref/samp.html | 1468 +++----- ds9/doc/ref/xpa.html | 1676 ++++------ ds9/library/mask.tcl | 26 +- ds9/parsers/maskparser.tac | 10 + ds9/parsers/masksendparser.tac | 2 + tksao/frame/base.h | 2 + tksao/frame/basecommand.C | 5 + tksao/frame/frame.C | 11 + tksao/frame/frame.h | 8 +- tksao/frame/parser.C | 7255 ++++++++++++++++++++-------------------- tksao/frame/parser.Y | 4 +- 12 files changed, 5306 insertions(+), 6348 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index 2b84c66..a90ef65 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -14,15 +14,12 @@ align="middle"> Command Line Options

DS9 will process each command line option, one at a time, as - the - last step in the initialization process. Therefore, it is - possible - to use command line options as a little script. For example, the - following command line option is used:

+ the last step in the initialization process. Therefore, it is + possible to use command line options as a little script. For + example, the following command line option is used:

$ds9 -tile foo.fits -cmap Heat -zscale bar.fits -cmap I8

First DS9 is put in tile mode, then foo.fits is - loaded. - Then the colormap for foo.fits is changed to Heat + loaded. Then the colormap for foo.fits is changed to Heat and the scale changed to zscale. Next, bar.fits is loaded and the colormap for bar.fits is changed to I8.

@@ -159,11 +156,9 @@ Syntax:
-2mass []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -176,10 +171,8 @@ $ds9 -2mass
$ds9 -2mass m31
 $ds9 -2mass name m31
- - $ds9 -2mass name clear
- $ds9 -2mass - 00:42:44.404 +41:16:08.78
+ $ds9 -2mass name clear
+ $ds9 -2mass 00:42:44.404 +41:16:08.78
$ds9 -2mass size 60 60 arcmin
$ds9 -2mass save yes
$ds9 -2mass frame current
@@ -197,21 +190,16 @@     [el <el>]
    [scale <scale>]
    [method mip|aip]
-     [background - none|azimuth|elevation]
-     - [border yes|no]
+     [background none|azimuth|elevation]
+     [border yes|no]
    [border color]
-     - [highlite yes|no]
+     [highlite yes|no]
    [highlite color]
- -     [compass yes|no]
+     [compass yes|no]
    [compass color]
    [match]
    [lock [yes|no]]
-     - [open|close]
+     [open|close]
  
Example:
$ds9 -3d # create new 3D frame
@@ -221,13 +209,11 @@ $ds9 -3d scale 10
$ds9 -3d method mip
$ds9 -3d background azimuth
- $ds9 -3d border - yes
+ $ds9 -3d border yes
$ds9 -3d border color red
 $ds9 -3d highlite yes
$ds9 -3d highlite color red
- $ds9 -3d compass - yes
+ $ds9 -3d compass yes
$ds9 -3d compass color red
$ds9 -3d match
$ds9 -3d lock yes
@@ -253,8 +239,7 @@

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
-analysis [<task number>]
          @@ -265,20 +250,17 @@ <filename>]
          [clear]
          - [clear][load - <filename>]
+ [clear][load <filename>]
          [message ok|okcancel|yesno <message>]
          [entry <message>]
-           - [text]
+           [text]
  
Example:
$ds9 -analysis 0 # invoke first analysis task
$ds9 -analysis task 0
- $ds9 -analysis task - foobar
+ $ds9 -analysis task foobar
 $ds9 -analysis task {foo bar}
$ds9 -analysis my.ans
$ds9 -analysis load my.ans
@@ -296,8 +278,7 @@  
Example:
$ds9 -array foo.arr[dim=512,bitpix=-32,endian=little]
- $cat foo.arr | ds9 -array - -[dim=512,bitpix=-32,endian=little]
+ $cat foo.arr | ds9 -array -[dim=512,bitpix=-32,endian=little]

asinh

Select ASINH scale function for the current frame.

@@ -334,10 +315,8 @@      [factor <value> [<value>]]
     [depth <value>]
     [filter <string>]
- -      [filter clear]
- -      [function average|sum]
+      [filter clear]
+      [function average|sum]
     [in]
     [out]
     [to fit]
@@ -387,8 +366,7 @@ <value>]
       [in]
       [out]
- -        [to fit]
+        [to fit]
       [match]
       [lock [yes|no]]
       [open|close]
@@ -396,15 +374,12 @@ Example:
 $ds9 -block 4
$ds9 -block 4 2
- - $ds9 -block to 4
+ $ds9 -block to 4
$ds9 -block to 4 2
- $ds9 - -block in
- $ds9 - -block out
- $ds9 - -block to fit
+ $ds9 -block in
+ $ds9 -block + out
+ $ds9 -block to fit
$ds9 -block match
$ds9 -block lock yes
$ds9 -block open
@@ -421,20 +396,16 @@

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
 -catalog [new]
        [ned|simbad|denis|skybot]
- -         +         [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
- -         [2mass|iras]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
        @@ -447,31 +418,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -480,28 +446,25 @@ <code>]
        [<ref>] [match <ref> <ref>]
- -         +         + [<ref>] [match]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -513,57 +476,47 @@ <col>]
        [<ref>] [regions]
-         [<ref>] - [retrieve]
-         - [<ref>] [samp]
+         [<ref>] [retrieve]
+         [<ref>] + [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
        [<ref>] - [symbol - shape circle|ellipse|box|text|point]
-         - [<ref>] [symbol shape - circle point|box point|diamond - point|cross point|x point|arrow - point|boxcircle - point]
+ [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
         [<ref>] [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -571,8 +524,7 @@
Example:
 $ds9 -catalog new
- $ds9 -catalog - 2mass
+ $ds9 -catalog 2mass
$ds9 -catalog cds 2mass
$ds9 -catalog cds "I/252"

@@ -580,76 +532,58 @@ $ds9 -catalog import tsv foo.tsv

 $ds9 -catalog 202.48 47.21 fk5
- $ds9 - -catalog allrows
+ $ds9 -catalog allrows
$ds9 -catalog allcols
$ds9 -catalog cancel
- - $ds9 -catalog clear
+ $ds9 -catalog clear
 $ds9 -catalog close
- - $ds9 -catalog crosshair
- $ds9 -catalog dec - DEC
+ $ds9 -catalog crosshair
+ $ds9 -catalog dec DEC
 $ds9 -catalog edit yes
- $ds9 -catalog - export tsv bar.tsv
- $ds9 -catalog filter - '\$Jmag>15'
+ $ds9 -catalog export tsv bar.tsv
+ $ds9 -catalog filter '\$Jmag>15'
$ds9 -catalog filter load foo.flt
$ds9 -catalog header
- $ds9 -catalog location - 500
+ $ds9 -catalog location 500
$ds9 -catalog match error 2 arcsec
$ds9 -catalog match function 1and2
$ds9 -catalog match unique no
$ds9 -catalog match return 1only
- $ds9 -catalog match # - last two catalogs loaded
- $ds9 -catalog match 2mass - csc
+ $ds9 -catalog match # last two catalogs loaded
+ $ds9 -catalog match 2mass csc
 $ds9 -catalog maxrows 2000
- $ds9 - -catalog name m51
+ $ds9 -catalog name m51
$ds9 -catalog panto no
- $ds9 -catalog plot - '\$Jmag' '\$Hmag' '\$e_Jmag' '\$e_Hmag'
- - $ds9 -catalog print
+ $ds9 -catalog plot '\$Jmag' '\$Hmag' + '\$e_Jmag' '\$e_Hmag'
+ $ds9 -catalog print
$ds9 -catalog psky fk5
$ds9 -catalog psystem wcs
$ds9 -catalog ra RA
$ds9 -catalog regions
- $ds9 -catalog - retrieve
+ $ds9 -catalog retrieve
$ds9 -catalog samp broadcast
$ds9 -catalog samp send aladin
$ds9 -catalog save foo.xml
- $ds9 -catalog server - sao
+ $ds9 -catalog server sao
 $ds9 -catalog show yes
$ds9 -catalog radius 1 degrees
$ds9 -catalog symbol condition '\$Jmag>15'
$ds9 -catalog symbol 2 shape "boxcircle point"
$ds9 -catalog symbol color red
$ds9 -catalog symbol font times
- $ds9 -catalog symbol - fontsize 14
- $ds9 -catalog symbol fontweight - bold
+ $ds9 -catalog symbol fontsize 14
+ $ds9 -catalog symbol fontweight bold
 $ds9 -catalog symbol fontslant italic
- - $ds9 -catalog symbol add
+ $ds9 -catalog symbol add
$ds9 -catalog symbol 2 remove
$ds9 -catalog symbol load foo.sym
$ds9 -catalog symbol save bar.sym
$ds9 -catalog sky fk5
$ds9 -catalog skyformat degrees
- $ds9 -catalog sort - "Jmag" incr
+ $ds9 -catalog sort "Jmag" incr
 $ds9 -catalog system wcs
- - $ds9 -catalog update
+ $ds9 -catalog update
 $ds9 -catalog x RA
$ds9 -catalog y DEC

cd

@@ -663,17 +597,15 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
-cmap [<colormap>]
      [load <filename>]
      [save <filename>]
      [invert yes|no]
-       [<contrast> - <bias>]
-       [tag - [load|save] <filename>]
+       [<contrast> <bias>]
+       [tag [load|save] + <filename>]
      [tag delete]
      [open|close]
 
@@ -705,14 +637,13 @@           [fontsize <value>]
          - [fontweight - normal|bold]
+ [fontweight normal|bold]
          [fontslant roman|italic]
          [size]
          [ticks]
- -           +           + [match]
          [lock [yes|no]]
@@ -749,15 +680,13 @@          [load <filename>]
         [save - <filename> - [<coordsys> <skyframe>]]
+ <filename> [<coordsys> <skyframe>]]
         [convert]
         [load levels <filename>]
         [save levels <filename>]
- -          [copy]
+          [copy]
         [paste [<coordsys> <color> <width> yes|no]]
         [color @@ -770,21 +699,18 @@          [method block|smooth]
         [nlevels <number - of - levels>]
+ of levels>]
         [scale linear|log|pow|squared|sqrt|asinh|sinh|histequ]
         [log exp <value>]
         [mode minmax|<value>|zscale|zmax]
-          [scope - global|local]
+          [scope global|local]
         [limits <min> <max>]
         [levels - <value - value value...>]
+ <value value value...>]
         [open|close]
 
Example:
@@ -793,19 +719,14 @@ $ds9 -contour generate
$ds9 -contour clear
$ds9 -contour load ds9.ctr
- $ds9 -contour save - ds9.ctr
- $ds9 -contour save ds9.ctr wcs - fk5
+ $ds9 -contour save ds9.ctr
+ $ds9 -contour save ds9.ctr wcs fk5
 $ds9 -contour convert
$ds9 -contour load levels ds9.ctr
- $ds9 -contour - save levels ds9.lev
+ $ds9 -contour save levels ds9.lev
 $ds9 -contour copy
- - $ds9 -contour paste
- $ds9 -contour - paste wcs red 2 no
+ $ds9 -contour paste
+ $ds9 -contour paste wcs red 2 no
 $ds9 -contour color yellow
$ds9 -contour width 2
$ds9 -contour dash yes
@@ -826,10 +747,8 @@ Syntax:
-crop [<x> <y> <width> <height> [<coordsys>][<skyframe>][degrees|arcmin|arcsec]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [reset]
      [3d zmin zmax <coordsys>]
      [open|close]
@@ -854,6 +773,7 @@ [<skyframe>]]
           [match + <coordsys>]
           [lock <coordsys>|none]
@@ -874,13 +794,11 @@       [<slice> [<coordsys>][<axis>]]
      [interval <numeric>]
- -       [match <coordsys>]
+       [match <coordsys>]
      [lock <coordsys>|none]
      [order 123|132|213|231|312|321]
      [axes lock [yes|no]]
- -       [open|close]
+       [open|close]
 
Example:
$ds9 -cube
@@ -914,8 +832,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -927,11 +844,9 @@ Example:
$ds9 -dsssao
$ds9 -dsssao m31
- $ds9 -dsssao name - m31
+ $ds9 -dsssao name m31
 $ds9 -dsssao name clear
- - $ds9 -dsssao 00:42:44.404 +41:16:08.78
+ $ds9 -dsssao 00:42:44.404 +41:16:08.78
$ds9 -dsssao size 60 60 arcmin
$ds9 -dsssao save yes
$ds9 -dsssao frame current
@@ -947,8 +862,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -962,11 +876,9 @@ Example:
$ds9 -dsseso
$ds9 -dsseso m31
- $ds9 -dsseso name - m31
+ $ds9 -dsseso name m31
 $ds9 -dsseso name clear
- - $ds9 -dsseso 00:42:44.404 +41:16:08.78
+ $ds9 -dsseso 00:42:44.404 +41:16:08.78
$ds9 -dsseso size 60 60 arcmin
$ds9 -dsseso save yes
$ds9 -dsseso frame current
@@ -982,8 +894,7 @@           [name <object>|clear]
          - [<ra> - <dec>] # in wcs fk5
+ [<ra> <dec>] # in wcs fk5
          [size <width> <height> degrees|arcmin|arcsec]
          [save @@ -1003,10 +914,8 @@ Example:
$ds9 -dssstsci
$ds9 -dssstsci m31
- $ds9 -dssstsci name - m31
- $ds9 -dssstsci name - clear
+ $ds9 -dssstsci name m31
+ $ds9 -dssstsci name clear
 $ds9 -dssstsci 00:42:44.404 +41:16:08.78
$ds9 -dssstsci size 60 60 arcmin
$ds9 -dssstsci save yes
@@ -1016,18 +925,15 @@ $ds9 -dssstsci open
$ds9 -dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
-envi <header> [<filename>]
 
Example:
- $ds9 -envi - foo.hdr
- - $ds9 -envi foo.hdr - foo.bsq
+ $ds9 -envi foo.hdr
+ $ds9 + -envi foo.hdr foo.bsq

exit
quit

@@ -1044,42 +950,31 @@

Export loaded image data of current frame in specified image format, at native resolution, using current colormap and contrast/bias settings. NOTE: not scaling, rotation, or - translation - is applied. If no format specified, the file name extension is - used - to determine the output format. Optional parameters: jpeg - quality - (1-100) and tiff compression method.
+ translation is applied. If no format specified, the file name + extension is used to determine the output format. Optional + parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- -export [array|nrrd|envi|gif|tiff|jpeg|png] - <filename>
- -export array - <filename> [big|little|native]
- - -export nrrd <filename> - [big|little|native]
- -export envi <header> [<filename>] - [big|little|native]
- -export - <filename>.jpeg [1-100]
- -export - <filename>.tiff + -export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
+ -export array <filename> [big|little|native]
+ -export nrrd <filename> [big|little|native]
+ -export envi <header> [<filename>] [big|little|native] +
+ -export <filename>.jpeg [1-100]
+ -export <filename>.tiff [none|jpeg|packbits|deflate]
 
Example:
$ds9 -export array foo.arr little
$ds9 -export nrrd foo.nrrd little
$ds9 -export envi foo.hdr little
- $ds9 -export envi - foo.hdr foo.bsq little
+ $ds9 -export envi foo.hdr foo.bsq little
 $ds9 -export tiff foo.tiff jpeg
$ds9 -export jpeg foo.jpeg 75
$ds9 -export png foo.png

fifo

Set the name of the IRAF input and output fifos. The default is - /dev/imt1. These fifos are used by IRAF to communicate with - DS9.

+ /dev/imt1. These fifos are used by IRAF to communicate with DS9.

Syntax:
-fifo name
 
@@ -1108,12 +1003,10 @@

frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
-frame [center [#|all]]
       [clear [#|all]]
@@ -1171,8 +1064,7 @@

geometry

Define the initial window geometry. This includes all of the - ds9 - window, not just the image space. see X(1).

+ ds9 window, not just the image space. see X(1).

Syntax:
-geometry value
 
@@ -1200,21 +1092,17 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
-       [axes type - interior|exterior]
-       - [axes origin lll|llu|lul|luu|ull|ulu|uul|uuu]
+       [axes type interior|exterior]
+       [axes origin + lll|llu|lul|luu|ull|ulu|uul|uuu]
      [format1 <format>]
      [format2 <format>]
      [tickmarks yes|no]
@@ -1228,22 +1116,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1257,15 +1140,11 @@       [title color <color>]
      [labels yes|no]
      [labels text1 <text>]
- -       [labels text2 +       [labels text2 <text>]
-       [labels def1 - yes|no]
-       [labels - def2 yes|no]
-       [labels gap1 - <value>]
+       [labels def1 yes|no]
+       [labels def2 yes|no]
+       [labels gap1 <value>]
      [labels gap2 <value>]
      [labels font times|helvetica|courier]
@@ -1290,11 +1169,9 @@ $ds9 -grid grid width 2
$ds9 -grid grid dash yes
$ds9 -grid grid gap1 10
- $ds9 -grid grid gap2 - 10
+ $ds9 -grid grid gap2 10
 $ds9 -grid grid gap3 10
- - $ds9 -grid axes yes
+ $ds9 -grid axes yes
$ds9 -grid axes color red
$ds9 -grid axes width 2
$ds9 -grid axes dash yes
@@ -1317,10 +1194,8 @@ $ds9 -grid numerics fontslant italic
$ds9 -grid numerics color red
$ds9 -grid numerics gap1 10
- $ds9 -grid numerics - gap2 10
- $ds9 -grid numerics gap3 - 10
+ $ds9 -grid numerics gap2 10
+ $ds9 -grid numerics gap3 10
 $ds9 -grid numerics type exterior
$ds9 -grid numerics vertical yes
$ds9 -grid title yes
@@ -1334,12 +1209,10 @@ $ds9 -grid title color red
$ds9 -grid labels yes
$ds9 -grid labels text1 {Hello World}
- $ds9 -grid - labels text2 {Hello World}
+ $ds9 -grid labels text2 {Hello World}
 $ds9 -grid labels def1 yes
$ds9 -grid labels def2 yes
- $ds9 -grid labels gap1 - 10
+ $ds9 -grid labels gap1 10
 $ds9 -grid labels gap2 10
$ds9 -grid labels font courier
$ds9 -grid labels fontsize 12
@@ -1370,8 +1243,7 @@

height

Set the height of the image display window. Use the geometry command to set the - overall - width and height of the ds9 window.

+ overall width and height of the ds9 window.

Syntax:
-height [<value>]
 
@@ -1391,8 +1263,7 @@ Example:
$ds9 -help # Display brief help message and exit.
$ds9 --help # Display command line options within help facility
- $ds9 -? # Display command line options within help - facility.
+ $ds9 -? # Display command line options within help facility.

histequ

Select histogram equalization scale function for the current @@ -1454,37 +1325,30 @@

lock

Lock all other frames to the current frame.

Syntax:
- -lock [frame - <coordsys>|none]
+ -lock [frame <coordsys>|none]
      [crosshair <coordsys>|none]
-     -   [crop <coordsys>|none]
-       [slice - <coordsys>|none]
+       [crop <coordsys>|none]
+       [slice <coordsys>|none]
      [bin [yes|no]]
      [axes [yes|no]]
      [scale [yes|no]]
      [scalelimits [yes|no]]
      [colorbar [yes|no]]
      [block [yes|no]]
- -       [smooth [yes|no]]
+       [smooth [yes|no]]
      [3d [yes|no]]
- -
+
Example:
$ds9 -lock frame wcs
- $ds9 -lock crosshair - wcs
+ $ds9 -lock crosshair wcs
 $ds9 -lock crop wcs
$ds9 -lock slice wcs
$ds9 -lock bin yes
$ds9 -lock axes yes
 $ds9 -lock scale yes
$ds9 -lock scalelimits yes
- $ds9 -lock colorbar - yes
+ $ds9 -lock colorbar yes
$ds9 -lock block yes
$ds9 -lock smooth yes
$ds9 -lock 3d yes
@@ -1529,7 +1393,9 @@ -mask [color <color>]
      [mark 1|0]
      [transparency <value>]
-       [clear]
+       [system + <coordsys>]
+       [clear]
      [open|close]
-nomask
 
@@ -1537,6 +1403,7 @@ $ds9 -mask color red
$ds9 -mask mark 0
$ds9 -mask transparency 50
+ $ds9 -mask system wcs
$ds9 -mask clear
$ds9 -mask open
$ds9 -mask close
@@ -1545,15 +1412,12 @@

match

Match all other frames to the current frame.

Syntax:
- -match [frame - <coordsys>]
+ -match [frame <coordsys>]
       [crosshair <coordsys>]
- -        [crop - <coordsys>]
-        [slice +        [crop <coordsys>]
+        [slice <coordsys>]
       [bin]
       [axes]
       [scale]
@@ -1561,13 +1425,11 @@        [colorbar]
       [block]
       [smooth]
- -        [3d]
+        [3d]
 
Example:
 $ds9 -match frame wcs
- $ds9 - -match crosshair wcs
+ $ds9 -match crosshair wcs
 $ds9 -match crop wcs
$ds9 -match slice wcs
$ds9 -match bin
@@ -1577,8 +1439,7 @@ $ds9 -match colorbar
$ds9 -match block
 $ds9 -match smooth
- $ds9 - -match 3d
+ $ds9 -match 3d
 
 mecube

Load FITS multiple extension file as data cube.
@@ -1588,8 +1449,7 @@  
Example:
$ds9 -mecube foo.fits
- $cat foo.fits | ds9 - -mecube -
+ $cat foo.fits | ds9 -mecube -

minmax

This is how DS9 determines  the min and max data values from the data. SCAN will scan all data.

@@ -1619,10 +1479,8 @@  
Example:
$ds9 -mosaic foo.fits
- $ds9 -mosaic wcs - foo.fits
- $cat foo.fits | ds9 - -mosaic -
+ $ds9 -mosaic wcs foo.fits
+ $cat foo.fits | ds9 -mosaic -
$cat foo.fits | ds9 -mosaic wcs -

mosaicimage

@@ -1632,22 +1490,20 @@  
Example:
$ds9 -mosaicimage foo.fits
- $ds9 -mosaicimage wcs - foo.fits
- $cat foo.fits | ds9 - -mosaicimage
+ $ds9 -mosaicimage wcs foo.fits
+ $cat foo.fits | ds9 -mosaicimage
$cat foo.fits | ds9 -mosaiimage wcs

movie
savempeg

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.
+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
-movie [slice|frame|3d] <filename>
@@ -1657,8 +1513,7 @@  
Example:
$ds9 -movie slice ds9.mpg
- $ds9 -movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate - 1
+ $ds9 -movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate 1

msg

Specify a directory of translation tables to be loaded.

Syntax:
@@ -1674,23 +1529,24 @@  
Example:
$ds9 -multiframe foo.fits
- $cat foo.fits | ds9 - -multiframe -
+ $cat foo.fits | ds9 -multiframe -

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
-nameserver [<object>]
            [name <object>]
-             [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+             [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
            [skyformat degrees|sexagesimal]
-            +             + [pan]
-            +             + [crosshair]
-            +             + [open|close]
 
Example:
@@ -1729,8 +1585,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -1740,10 +1595,8 @@ $ds9 -nvss
$ds9 -nvss m31
 $ds9 -nvss name m31
- - $ds9 -nvss name clear
- $ds9 -nvss - 00:42:44.404 +41:16:08.78
+ $ds9 -nvss name clear
+ $ds9 -nvss 00:42:44.404 +41:16:08.78
$ds9 -nvss size 60 60 arcmin
$ds9 -nvss save yes
$ds9 -nvss frame current
@@ -1768,8 +1621,7 @@ Syntax:
-pagesetup [orient portrait|landscape]
           - [scale - <numberic>]
+ [scale <numberic>]
           [size letter|legal|tabloid|poster|a4]
 
@@ -1781,11 +1633,10 @@

Controls the current image cursor location for the current frame.

Syntax:
- -pan [<x> <h> <coordsys> - [<skyframe>]] # relative
+ -pan [<x> <h> <coordsys> [<skyframe>]] # + relative
     [to <x> <h> - <coordsys> - [<skyframe>]] # absolute
+ <coordsys> [<skyframe>]] # absolute
     [open|close]
 
Example:
@@ -1800,7 +1651,8 @@

Display/Hide the pixel table.

Syntax:
-pixeltable []
-            +             + [yes|open]
            [no|close]
@@ -1815,10 +1667,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -1827,258 +1677,178 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
- -plot - [line|bar|scatter]
+ # create new empty plot window
+ -plot [line|bar|scatter]
- # existing - plot
+ # existing plot
 -plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -       [[<plotname>] save +       [[<plotname>] save <filename>]
-       - [[<plotname>] clear]
-    -    [[<plotname>] duplicate - [#]]
-       - [[<plotname>] stats yes|no]
- -       [[<plotname>] list - yes|no]
-       - [[<plotname>] loadconfig +       [[<plotname>] clear]
+       [[<plotname>] + duplicate [#]]
+       [[<plotname>] + stats yes|no]
+       [[<plotname>] + list yes|no]
+       [[<plotname>] + loadconfig <filename>]
+       [[<plotname>] saveconfig <filename>]
-       - [[<plotname>] saveconfig <filename>]
- -       [[<plotname>] pagesetup orient - portrait|landscape]
-       - [[<plotname>] pagesetup size +       [[<plotname>] pagesetup + orient portrait|landscape]
+       [[<plotname>] pagesetup size letter|legal|tabloid|poster|a4]
-     -   [[<plotname>] print]
-   -     [[<plotname>] print destination - printer|file]
-       - [[<plotname>] print command +       [[<plotname>] print]
+       [[<plotname>] print + destination printer|file]
+       [[<plotname>] print command <command>]
-       - [[<plotname>] print filename +       [[<plotname>] print filename <filename>]
-       - [[<plotname>] print color rgb|gray]
- -       [[<plotname>] +       [[<plotname>] print color + rgb|gray]
+       [[<plotname>] close]
-       - [[<plotname>] mode pointer|zoom]
- -
+       [[<plotname>] mode + pointer|zoom]
+
# configure graph
- -plot - [[<plotname>] axis x|y grid yes|no]
- -       [[[<plotname>] axis x|y log + -plot [[<plotname>] axis x|y grid yes|no]
+       [[[<plotname>] axis x|y + log yes|no]
+       [[<plotname>] axis x|y + flip yes|no]
+       [[<plotname>] axis x|y auto yes|no]
-       - [[<plotname>] axis x|y flip yes|no]
- -       [[<plotname>] axis x|y auto - yes|no]
-       - [[<plotname>] axis x|y min <value>]
- -       [[<plotname>] axis x|y max +       [[<plotname>] axis x|y min <value>]
-       - [[<plotname>] axis x|y format - <string>]
-       - [[<plotname>] legend yes|no]
- -       [[<plotname>] legend position - right|left|top|bottom]
-       - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] axis x|y max + <value>]
+       [[<plotname>] axis x|y + format <string>]
+       [[<plotname>] + legend yes|no]
+       [[<plotname>] legend + position right|left|top|bottom]
+       [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+       [[<plotname>] font title|labels|numbers size <value>]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] font title|labels|numbers weight normal|bold]
-       - [[<plotname>] font title|labels|numbers +       [[<plotname>] font title|labels|numbers slant roman|italic]
-       - [[<plotname>] title <string>]
- -       [[<plotname>] title x|y +       [[<plotname>] title + <string>]
+       [[<plotname>] title x|y <string>]
-       - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+       [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- -plot - [[<plotname>] show yes|no]
-   -     [[<plotname>] shape - circle|square|diamond|plus|splus|scross|triangle|arrow]
-       - [[<plotname>] shape fill yes|no]
- -       [[<plotname>] + # configure current dataset
+ -plot [[<plotname>] show yes|no]
+       [[<plotname>] + shape circle|square|diamond|plus|splus|scross|triangle|arrow]
+       [[<plotname>] + shape fill yes|no]
+       [[<plotname>] + shape color <value>]
- -       [[<plotname>] +       [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
- -       [[<plotname>] +       [[<plotname>] + color <value>]
- -       [[<plotname>] +       [[<plotname>] + width <value>]
- -       [[<plotname>] +       [[<plotname>] + dash yes|no]
- -       [[<plotname>] +       [[<plotname>] + error yes|no]
- -       [[<plotname>] +       [[<plotname>] + error color <value>]
- -       [[<plotname>] color - <value>]
- -       [[<plotname>] +       [[<plotname>] + color <value>]
+       [[<plotname>] + error width <value>]
- -       [[<plotname>] +       [[<plotname>] + name <string>]
- # select - current dataset
- -plot [[<plotname>] - select <value>]
- -  
+ # select current dataset
+ -plot [[<plotname>] select <value>]
+  
 Example:
- # - create new empty plot window
- $ds9 -plot - bar
+ # create new empty plot window
+ $ds9 -plot bar
- # existing - plot
+ # existing plot
 $ds9 -plot load xy.dat
- - $ds9 -plot save foo.dat
- $ds9 -plot - clear
- $ds9 -plot duplicate - 1
+ $ds9 -plot save foo.dat
+ $ds9 -plot clear
+ $ds9 -plot duplicate 1
 $ds9 -plot stats yes
- - $ds9 -plot list yes
- $ds9 -plot loadconfig - foo.plt
- $ds9 -plot saveconfig - foo.plt
- $ds9 -plot pagesetup orient - portrait
- $ds9 -plot pagesetup size - letter
+ $ds9 -plot list yes
+ $ds9 -plot loadconfig foo.plt
+ $ds9 -plot saveconfig foo.plt
+ $ds9 -plot pagesetup orient portrait
+ $ds9 -plot pagesetup size letter
 $ds9 -plot print
- - $ds9 -plot print destination file
- $ds9 - -plot print command lp
- $ds9 -plot print - filename foo.ps
- $ds9 -plot print color - rgb
+ $ds9 -plot print destination file
+ $ds9 -plot print command lp
+ $ds9 -plot print filename foo.ps
+ $ds9 -plot print color rgb
 $ds9 -plot close
- - $ds9 -plot mode pointer
+ $ds9 -plot mode pointer
- # - configure plot
- $ds9 -plot axis x grid - yes
- $ds9 -plot axis x log - yes
- $ds9 -plot axis x flip - yes
- $ds9 -plot axis x auto - no
+ # configure plot
+ $ds9 -plot axis x grid yes
+ $ds9 -plot axis x log yes
+ $ds9 -plot axis x flip yes
+ $ds9 -plot axis x auto no
 $ds9 -plot axis x min 1
- - $ds9 -plot axis x max 100
- $ds9 -plot axis - x format '%f'
+ $ds9 -plot axis x max 100
+ $ds9 -plot axis x format '%f'
- $ds9 -plot legend - yes
- $ds9 -plot legend position - left
+ $ds9 -plot legend yes
+ $ds9 -plot legend position left
- $ds9 -plot font numbers - font times
- $ds9 -plot font numbers size - 12
- $ds9 -plot font numbers weight - bold
- $ds9 -plot font numbers slant - italic
+ $ds9 -plot font numbers font times
+ $ds9 -plot font numbers size 12
+ $ds9 -plot font numbers weight bold
+ $ds9 -plot font numbers slant italic
- $ds9 -plot title 'This - is a Title'
- $ds9 -plot title x 'X - Axis'
- $ds9 -plot title y 'Y - Axis'
- $ds9 -plot title legend 'This is the - Legend'
+ $ds9 -plot title 'This is a Title'
+ $ds9 -plot title x 'X Axis'
+ $ds9 -plot title y 'Y Axis'
+ $ds9 -plot title legend 'This is the Legend'
- $ds9 -plot barmode - aligned
+ $ds9 -plot barmode aligned
- # configure current - dataset
+ # configure current dataset
 $ds9 -plot show yes
- - $ds9 -plot shape circle
- $ds9 -plot shape - fill no
- $ds9 -plot shape color - cyan
+ $ds9 -plot shape circle
+ $ds9 -plot shape fill no
+ $ds9 -plot shape color cyan
 $ds9 -plot smooth step
- - $ds9 -plot color red
- $ds9 -plot width - 2
+ $ds9 -plot color red
+ $ds9 -plot width 2
 $ds9 -plot dash yes
- - $ds9 -plot error yes
- $ds9 -plot error - color red
- $ds9 -plot error width - 2
+ $ds9 -plot error yes
+ $ds9 -plot error color red
+ $ds9 -plot error width 2
 $ds9 -plot name 'My Data'
- -
+
# select current dataset
- - $ds9 -plot select 2 + $ds9 -plot select 2

png

Load PNG image into current frame.

@@ -2087,13 +1857,11 @@  
Example:
$ds9 png foo.png
- $cat foo.png | - ds9 -png -
+ $cat foo.png | ds9 -png -

port

Set the IRAF port number, used by IRAF to communicate with DS9. - The default is 5137, the standard IRAF port used by - ximtool.

+ The default is 5137, the standard IRAF port used by ximtool.

Syntax:
-port number
 
@@ -2121,10 +1889,8 @@

Set region and coordinate output format precision.

Syntax:
-precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
$ds9 -precision 8 10 4 3 5 3
@@ -2153,16 +1919,14 @@ href="file:///Users/joye/saods9/ds9/doc/ref/command.html#print">print for further details.

print

-

Controls printing. Use print option to set printing - options.
+

Controls printing. Use print option to set printing options.

Syntax:
-print [destination printer|file]
       [command <command>]
-        [filename - <filename>]
-        - [color rgb|cmyk|gray]
+        [filename <filename>]
+        [color + rgb|cmyk|gray]
       [level 1|2]
       [resolution 53|72|75|150|300|600]
@@ -2200,15 +1964,13 @@          [centroid auto yes|no]
         [centroid - radius - <value>|iteration <value>]
+ radius <value>|iteration <value>]
         [getinfo]
         [move front]
         [move back]
         [select all]
         [select none]
-          [select - invert]
+          [select invert]
         [delete all]
         [delete select]
         [format @@ -2226,8 +1988,8 @@ <color>
         [width <width>]
-     -      [fixed|edit|rotate|delete yes|no]
+          + [fixed|edit|rotate|delete yes|no]
         [include|exclude|source|background]
         [command @@ -2241,19 +2003,15 @@ <skyframe>]
         [savetemplate <filename>]
-     -      [group new]
- -          [group +          [group new]
+          [group <tag> new]
         [group - <tag> - update]
-          - [group <tag> select]
-     -      [group <tag> color - <color>]
+ <tag> update]
+          [group + <tag> select]
+          [group + <tag> color <color>]
         [group <tag> copy]
         [group <tag> @@ -2261,11 +2019,9 @@          [group <tag> cut]
         [group <tag> - font - <font>]
+ font <font>]
         [group <tag> - move - <int> <int>]
+ move <int> <int>]
         [group <tag> movefront]
         [group <tag> @@ -2317,8 +2073,7 @@ $ds9 -regions width 3
 $ds9 -regions edit yes
$ds9 -regions include
- $ds9 -regions command "circle - 100 100 20 # color=red"
+ $ds9 -regions command "circle 100 100 20 # color=red"
$ds9 -regions composite
$ds9 -regions dissolve
$ds9 -regions template foo.tpl
@@ -2376,8 +2131,7 @@ $ds9 -rgb channel red # set current channel to red
$ds9 -rgb view blue no # turn off blue channel
$ds9 -rgb system wcs # set rgb coordinate system
- $ds9 - -rgb lock wcs yes
+ $ds9 -rgb lock wcs yes
$ds9 -rgb lock crop yes
$ds9 -rgb lock slice yes
$ds9 -rgb lock bin yes
@@ -2397,8 +2151,7 @@ <filename>[[xdim=<x>,ydim=<y>|dim=<dim>],[zdim=3],bitpix=<b>,skip=<s>,endian=[little|big]]
 
Example:
- $ds9 -rgbarray - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ $ds9 -rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | ds9 -rgbarray -[dim=512,zdim=3,bitpix=-32,endian=little]

rgbcube

@@ -2409,8 +2162,7 @@  
Example:
$ds9 -rgbcube foo.fits
- $cat foo.fits | ds9 - -rgbcube -
+ $cat foo.fits | ds9 -rgbcube -

rgbimage

Load FITS rgbimage into rgb frame.

@@ -2419,8 +2171,7 @@  
Example:
$ds9 -rgbimage foo.fits
- $cat foo.fits | ds9 - -rgbimage -
+ $cat foo.fits | ds9 -rgbimage -

rotate

Controls the rotation angle (in degrees) of the current frame.<

@@ -2446,8 +2197,7 @@ Example:
$ds9 -samp yes
 $ds9 -samp connect
- $ds9 - -samp broadcast image
+ $ds9 -samp broadcast image
$ds9 -samp send image aladin

save

@@ -2455,6 +2205,7 @@ Syntax:
-save [fits|rgbimage|rgbcube|mecube|mosaic|mosaicimage] <filename> + [image|table|slice]
 
Example:
@@ -2463,8 +2214,7 @@ $ds9 -save fits foo.fits table
$ds9 -save fits foo.fits slice
$ds9 -save rgbimage foo.fits
- $ds9 -save rgbcube - foo.fits
+ $ds9 -save rgbcube foo.fits
$ds9 -save mecube foo.fits
$ds9 -save mosaic foo.fits
$ds9 -save mosaicimage foo.fits
@@ -2475,8 +2225,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- -saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ -saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
-saveimage <filename>.jpeg [1-100]
-saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -2526,11 +2275,10 @@      [fits [key|shmid] <id> [<filename>]]
     [mosaicimage - [iraf|wcs|wcsa...wcsz|wfpc2] - [key|shmid] <id> [<filename>]]
+ [iraf|wcs|wcsa...wcsz|wfpc2] [key|shmid] <id> + [<filename>]]
     [mosaic [iraf|wcs|wcsa...wcsz] - [key|shmid] - <id> [<filename>]]
+ [key|shmid] <id> [<filename>]]
     [rgbcube [key|shmid] <id> [<filename>]]
     [rgbimage [key|shmid] <id> @@ -2560,69 +2308,51 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- -sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ -sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

      [<ref>] [cancel]
-      [<ref>] - [clear]
-      [<ref>] - [close]
+      [<ref>] [clear]
+      [<ref>] [close]
     [<ref>] [coordinate <ra> <dec> <coordsys>]
- -      [<ref>] +      [<ref>] [crosshair]
     [<ref>] [export sb|tsv <filename>]
-      [<ref>] - [name <object>]
-      - [<ref>] [print]
+      [<ref>] [name <object>]
+      [<ref>] [print]
     [<ref>] [retrieve]
- -      [<ref>] [save +      [<ref>] [save <filename>]
     [<ref>] [radius <value> degrees|arcmin|arcsec]
-      [<ref>] [sky - <skyframe>]
-      - [<ref>] [skyformat <skyformat>]
- -      [<ref>] [system +      [<ref>] [sky <skyframe>]
+      [<ref>] [skyformat + <skyformat>]
+      [<ref>] [system <coordsys>]
- -      [<ref>] +      [<ref>] [update]

Example:
 $ds9 -sia 2mass
- $ds9 -sia - cancel
+ $ds9 -sia cancel
 $ds9 -sia clear
- $ds9 -sia - close
+ $ds9 -sia close
 $ds9 -sia coordinate 202.48 47.21 fk5
- - $ds9 -sia crosshair
- $ds9 -sia export tsv - bar.tsv
+ $ds9 -sia crosshair
+ $ds9 -sia export tsv bar.tsv
 $ds9 -sia name m51
- $ds9 -sia - print
+ $ds9 -sia print
$ds9 -sia retrieve
 $ds9 -sia save foo.xml
- - $ds9 -sia radius 1 degrees
+ $ds9 -sia radius 1 degrees
$ds9 -sia sky fk5
$ds9 -sia skyformat degrees
- $ds9 -sia system - wcs
+ $ds9 -sia system wcs
 $ds9 -sia update

 single @@ -2657,10 +2387,8 @@ Example:
$ds9 -skyview
$ds9 -skyview m31
- $ds9 -skyview name - m31
- $ds9 -skyview name - clear
+ $ds9 -skyview name m31
+ $ds9 -skyview name clear
 $ds9 -skyview 00:42:44.404 +41:16:08.78
$ds9 -skyview size 60 60 arcmin
$ds9 -skyview pixels 600 600
@@ -2700,52 +2428,46 @@ Boxcar width = 2*radius+1
Tophat diameter = 2*radius+1
Gaussian diameter = 2*radius+1, mean =0
- Elliptical Gaussian diameter = 2*radius+1, mean - =0
+ Elliptical Gaussian diameter = 2*radius+1, mean =0

Syntax:
-smooth []
        [yes|no]
        [function boxcar|tophat|gaussian|elliptic]
- -         [radius +         [radius <value>]
- -         +         [radiusminor <value>]
- -         +         + [sigma <value>]
- -         +         + [sigmaminor <value>]
- -         +         [angle + <value>]
         [match]
        [lock [yes|no]]
- -         [open|close]
+         + [open|close]
 
Example:
$ds9 -smooth
$ds9 -smooth yes
$ds9 -smooth function tophat
- $ds9 -smooth radius - 4
+ $ds9 -smooth radius 4
 $ds9 -smooth radiusminor 4
- - $ds9 -smooth sigma - 2.0
+ $ds9 -smooth sigma 2.0
 $ds9 -smooth + sigmaminor 2.0
- - $ds9 -smooth angle - 45
+ $ds9 + -smooth angle 45
 $ds9 -smooth match
$ds9 -smooth lock yes
@@ -2799,10 +2521,8 @@ -tiff <filename>
 
Example:
- $ds9 -tiff - foo.tiff
- $cat - foo.fits | ds9 -tiff -
+ $ds9 -tiff foo.tiff
+ $cat foo.fits | ds9 -tiff -

tile

Controls the tile display mode.

@@ -2860,9 +2580,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
-update []
        [# x1 y1 x2 y2]
@@ -2908,8 +2627,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -2947,11 +2665,9 @@ Syntax:
-vla []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -2964,10 +2680,8 @@ $ds9 -vla
$ds9 -vla m31
 $ds9 -vla name m31
- - $ds9 -vla name clear
- $ds9 -vla - 00:42:44.404 +41:16:08.78
+ $ds9 -vla name clear
+ $ds9 -vla 00:42:44.404 +41:16:08.78
$ds9 -vla size 60 60 arcmin
$ds9 -vla save yes
$ds9 -vla frame current
@@ -2984,8 +2698,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -2995,10 +2708,8 @@ $ds9 -vlss
$ds9 -vlss m31
 $ds9 -vlss name m31
- - $ds9 -vlss name clear
- $ds9 -vlss - 00:42:44.404 +41:16:08.78
+ $ds9 -vlss name clear
+ $ds9 -vlss 00:42:44.404 +41:16:08.78
$ds9 -vlss size 60 60 arcmin
$ds9 -vlss save yes
$ds9 -vlss frame current
@@ -3031,14 +2742,11 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - a - new WCS specification can be loaded and used by the current - image - regardless of the WCS that was contained in the image file. - Please - see WCS for more information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, a new WCS specification can be loaded and + used by the current image regardless of the WCS that was + contained in the image file. Please see WCS + for more information.

Syntax:
-wcs [[system] wcs|wcsa...wcsz]
     [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3053,11 +2761,9 @@ $ds9 -wcs wcs
$ds9 -wcs system wcs
 $ds9 -wcs fk5
- $ds9 - -wcs sky fk5
+ $ds9 -wcs sky fk5
 $ds9 -wcs sexagesimal
- $ds9 - -wcs skyformat sexagesimal
+ $ds9 -wcs skyformat sexagesimal
$ds9 -wcs align yes
$ds9 -wcs reset
$ds9 -wcs reset 3
@@ -3091,8 +2797,7 @@

width

Set the width of the image display window. Use the geometry command to set the - overall - width and height of the ds9 window.

+ overall width and height of the ds9 window.

Syntax:
-width [<value>]
 
diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index 234796d..6776582 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -15,13 +15,13 @@

SAMP is a messaging protocol that enables astronomy software tools to interoperate and communicate. Broadly speaking, SAMP is - an - abstract framework for loosely-coupled, asynchronous, RPC-like - and/or event-based communication, based on a central service - providing multi-directional publish/subscribe message brokering. - The message semantics are extensible and use structured but - weakly-typed data. For more information on SAMP, please click - here.

+ an abstract framework for loosely-coupled, asynchronous, + RPC-like and/or event-based communication, based on a central + service providing multi-directional publish/subscribe message + brokering. The message semantics are extensible and use + structured but weakly-typed data. For more information on SAMP, + please click here.

The samp implementation for DS9 is based on the XPA model with 2 private calls:

ds9.get
@@ -163,8 +163,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -183,10 +182,8 @@ 2mass
2mass m31
 2mass name m31
- - 2mass name clear
- 2mass 00:42:44.404 - +41:16:08.78
+ 2mass name clear
+ 2mass 00:42:44.404 +41:16:08.78
2mass size 60 60 arcmin
2mass save yes
2mass frame current
@@ -205,19 +202,15 @@    [scale <scale>]
   [method mip|aip]
   [background none|azimuth|elevation]
- -    [border yes|no]
+    [border yes|no]
   [border color <color>]
-    - [highlite yes|no]
+    [highlite yes|no]
   [hightlite color <color>]
- -    [compass yes|no]
+    [compass yes|no]
   [compass color <color>]
   [match]
   [lock [yes|no]]
-    - [open|close]
+    [open|close]
 
Example:
string value = ds9.get(string cmd)
@@ -235,8 +228,7 @@ 3d compass color
3d lock
 ds9.set(string cmd)
- 3d # create new - 3D frame
+ 3d # create new 3D frame
3d view 45 30
3d az 45
3d el 30
@@ -270,17 +262,14 @@       [yes|no]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 align
 ds9.set(string cmd)
- - align yes
+ align yes

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
analysis [<task number>]
         @@ -296,8 +285,7 @@ ok|okcancel|yesno <message>]
         [entry <message>]
-          - [text]
+          [text]
  
Example:
string value = ds9.get(string cmd)
@@ -316,8 +304,7 @@ analysis clear load my.ans
analysis message {This is a message}
analysis text {this is text}
- ds9.set(string - cmd, string url)
+ ds9.set(string cmd, string url)
analysis load
analysis text
 @@ -331,16 +318,12 @@  
Example:
 string url = ds9.get(string cmd)
- - array
+ array
array little
- ds9.set(string command, string - url)
+ ds9.set(string command, string url)
 array foo.arr[dim=512,bitpix=-32,endian=little]
- array new - foo.arr[dim=512,bitpix=-32,endian=little]
- array mask - foo.arr[dim=512,bitpix=-32,endian=little]
+ array new foo.arr[dim=512,bitpix=-32,endian=little]
+ array mask foo.arr[dim=512,bitpix=-32,endian=little]

bg
background

@@ -352,8 +335,7 @@ string url = ds9.get(string cmd)
bg
 ds9.set(string cmd)
- bg - red
+ bg red
 bg red

backup

Create a backup save set.

@@ -362,13 +344,11 @@  
Example:
 ds9.set(string cmd)
- backup - ds9.bck
+ backup ds9.bck

bin

Controls binning factor, binning buffer size, and  binning function for binning FITS bin tables. The access point blocking - is - provided for backward compatibility.

+ is provided for backward compatibility.

Syntax:
bin [about <x> <y>]
    [about center]
@@ -378,10 +358,8 @@     [factor <value> [<vector>]]
    [depth <value>]
    [filter <string>]
- -     [filter clear]
- -     [function average|sum]
+     [filter clear]
+     [function average|sum]
    [in]
    [out]
    [to fit]
@@ -448,58 +426,43 @@ <value>]
      [in]
      [out]
- -       [to fit]
+       [to fit]
      [match]
      [lock [yes|no]]
      [open|close]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 block
block lock
 ds9.set(string cmd)
- - block 4
- block - 4 2
+ block 4
+ block 4 2
 block to 4
- - block to 4 2
- - block in
- - block out
- - block to fit
- - block match
- - block lock yes
- - block open
- - block close
+ block to 4 2
+ block in
+ block out
+ block to fit
+ block match
+ block lock yes
+ block open
+ block close

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
 catalog [new]
        [ned|simbad|denis|skybot]
- -         +         [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
- -         [2mass|iras]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         + [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
        @@ -512,31 +475,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -545,28 +503,25 @@ <code>]
        [<ref>] [match]
- -         +         + [<ref>] [match <ref> <ref>]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -576,58 +531,48 @@ <coordsys>]
        [<ref>] [ra <col>]
-         [<ref>] - [regions]
+         [<ref>] [regions]
        [<ref>] [retrieve]
        [<ref>] [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
-     -     [<ref>] [symbol shape - circle|ellipse|box|text|point]
-         - [<ref>] [symbol shape - circle point|box point|diamond - point|cross point|x point|arrow - point|boxcircle - point]
-         - [<ref>] [symbol add| [#] remove]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
+         [<ref>] + [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
+         [<ref>] + [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -640,8 +585,7 @@
ds9.set(string cmd)
 catalog new
- catalog - 2mass
+ catalog 2mass
catalog cds 2mass
catalog cds {I/252}

@@ -651,19 +595,14 @@ catalog allrows
catalog allcols
 catalog cancel
- catalog - clear
+ catalog clear
 catalog close
- catalog coordinate - 202.48 47.21 fk5
+ catalog coordinate 202.48 47.21 fk5
 catalog crosshair
- - catalog dec DEC
+ catalog dec DEC
 catalog edit yes
- - catalog export tsv bar.tsv
- catalog filter - {$Jmag>10}
+ catalog export tsv bar.tsv
+ catalog filter {$Jmag>10}
catalog filter load foo.flt
catalog header
 catalog location 500
@@ -671,49 +610,41 @@ catalog match function 1and2
catalog match unique no
catalog match return 1only
- catalog match # last two - catalogs loaded
+ catalog match # last two catalogs loaded
 catalog match 2mass csc
- - catalog maxrows 2000
+ catalog maxrows 2000
 catalog name m51
catalog panto no
- catalog plot {$Jmag} {$Hmag} - {$e_Jmag} {$e_Hmag}
+ catalog plot {$Jmag} {$Hmag} {$e_Jmag} + {$e_Hmag}
 catalog print
catalog psky fk5
catalog psystem wcs
catalog ra RA
catalog regions
 catalog retrieve
- - catalog samp broadcast
+ catalog samp broadcast
catalog samp send aladin
catalog save foo.xml
 catalog server sao
- - catalog show yes
+ catalog show yes
catalog radius 1 degrees
catalog symbol condition {$Jmag>15}
catalog symbol 2 shape {boxcircle point}
catalog symbol color red
catalog symbol font times
- catalog symbol fontsize - 14
+ catalog symbol fontsize 14
 catalog symbol fontweight bold
- catalog - symbol fontslant italic
+ catalog symbol fontslant italic
 catalog symbol add
catalog symbol 2 remove
catalog symbol load foo.sym
catalog symbol save bar.sym
catalog sky fk5
catalog skyformat degrees
- catalog sort {Jmag} - incr
+ catalog sort {Jmag} incr
 catalog system wcs
- catalog - update
+ catalog update
 catalog x RA
catalog y DEC

cd

@@ -730,8 +661,7 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
cmap [<colormap>]
     [file]
@@ -739,8 +669,8 @@      [save <filename>]
     [invert yes|no]
     [<constrast> <bias>]
- -      [tag [load|save] <filename>]
+      [tag [load|save] + <filename>]
     [tag delete]
     [open|close]
 
@@ -785,8 +715,7 @@ roman|italic]
         [size]
         [ticks]
-          - [match]
+          [match]
         [lock [yes|no]]
 
@@ -838,18 +767,13 @@         [save <filename> [<coordsys> <skyframe>]]
        [convert]
- -         [load levels - <filename>]
- -         [save - levels - <filename>]
- -         [copy]
+         [load + levels <filename>]
+         + [save levels <filename>]
+         [copy]
        [paste - [<coordsys> - <color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -867,8 +791,7 @@         [limits <min> <max>]
        [levels <value - value - value...>]
+ value value...>]
        [open|close]
 
Example:
@@ -894,20 +817,14 @@ contour clear
contour generate
contour load ds9.ctr
- contour save - ds9.con
- contour save ds9.con wcs - fk5
+ contour save ds9.con
+ contour save ds9.con wcs fk5
 contour convert
- contour load - levels ds9.ctr
- contour save levels - ds9.lev
+ contour load levels ds9.ctr
+ contour save levels ds9.lev
 contour copy
- contour - paste
- contour paste wcs red 2 - no
+ contour paste
+ contour paste wcs red 2 no
 contour color yellow
contour width 2
contour dash yes
@@ -928,10 +845,8 @@ Syntax:
crop [<x> <y> <width> <height> [<coordsys>][<skyframe>][degrees|arcmin|arcsec]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [reset]
      [3d zmin zmax <coordsys>]
@@ -939,10 +854,8 @@  
Example:
string value = ds9.get(string cmd)
- crop # get crop in - physical coords
- crop wcs galactic sexagesimal - arcsec
+ crop # get crop in physical coords
+ crop wcs galactic sexagesimal arcsec
crop lock
 ds9.set(string cmd)
crop 40 30 10 20 # set crop in physical coords
@@ -962,9 +875,8 @@ Syntax:
crosshair [<x> <y> <coordsys> [<skyframe>]]
- -           [match - <coordsys>]
+           + [match <coordsys>]
          [lock <coordsys>|none]
 
@@ -989,8 +901,7 @@      [<slice> [<coordsys>][<axis>]]
     [interval <numeric>]
- -      [match <coordsys>]
+      [match <coordsys>]
     [lock <coordsys>|none]
     [order 123|132|213|231|312|321]
     [axes lock [yes|no]]
@@ -1029,10 +940,8 @@

data

Return an array of data values given a lower left corner and a width and height in specified coordinate system. The last - argument - of yes indicates to strip the coordinates from the output and - just - list the data values. The default is yes.
+ argument of yes indicates to strip the coordinates from the + output and just list the data values. The default is yes.

Syntax:
data [<coordsys> [<skyframe>] <x> <y> @@ -1044,8 +953,7 @@ data physical 899 1039 6 6 no
data fk5 202.47091 47.196811 0.00016516669 0.00016516669 no
data wcs fk5 13:29:53.018 +47:11:48.52 0.00016516669 - 0.00016516669 - no
+ 0.00016516669 no

dsssao
dss
@@ -1054,11 +962,9 @@ Syntax:
dsssao []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1077,10 +983,8 @@ dsssao
dsssao m31
 dsssao name m31
- - dsssao name clear
- dsssao 00:42:44.404 - +41:16:08.78
+ dsssao name clear
+ dsssao 00:42:44.404 +41:16:08.78
dsssao size 60 60 arcmin
dsssao save yes
dsssao frame current
@@ -1093,11 +997,9 @@ Syntax:
dsseso []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1119,10 +1021,8 @@ dsseso
dsseso m31
 dsseso name m31
- - dsseso name clear
- dsseso 00:42:44.404 - +41:16:08.78
+ dsseso name clear
+ dsseso 00:42:44.404 +41:16:08.78
dsseso size 60 60 arcmin
dsseso save yes
dsseso frame current
@@ -1166,10 +1066,8 @@ dssstsci
dssstsci m31
 dssstsci name m31
- - dssstsci name clear
- dssstsci 00:42:44.404 - +41:16:08.78
+ dssstsci name clear
+ dssstsci 00:42:44.404 +41:16:08.78
dssstsci size 60 60 arcmin
dssstsci save yes
dssstsci frame current
@@ -1178,8 +1076,7 @@ dssstsci open
dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
envi [new] <header> [<filename>]
@@ -1206,31 +1103,21 @@ format. Optional parameters: array endian, nrrd endian, jpeg quality (1-100) and tiff compression method.

Syntax:
- export - [array|nrrd|envi|gif|tiff|jpeg|png] + export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
- export array - <filename> - [big|little|native]
- export nrrd - <filename> [big|little|native]
- export envi <header> [<filename>] - [big|little|native]
- export jpeg - <filename> [1-100]
- export tiff - <filename> - [none|jpeg|packbits|deflate]
+ export array <filename> [big|little|native]
+ export nrrd <filename> [big|little|native]
+ export envi <header> [<filename>] [big|little|native]
+ export jpeg <filename> [1-100]
+ export tiff <filename> [none|jpeg|packbits|deflate]
 
Example:
 ds9.set (string cmd)
- export - array foo.arr little
+ export array foo.arr little
export nrrd foo.nrrd little
export envi foo.hdr little
export envi foo.hdr foo.bsq little
- - export tiff foo.tiff jpeg
+ export tiff foo.tiff jpeg
export jpeg foo.jpeg 75
export png foo.png

file

@@ -1247,10 +1134,8 @@ loaded image.

Syntax:
- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix|type]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix|type]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1276,8 +1161,7 @@ fits table
fits slice
ds9.set(string cmd, string url)
- fits - foo.fits
+ fits foo.fits
fits new foo.fits
fits bar.fits[bin=detx,dety]
fits slice foo.fits
@@ -1289,10 +1173,8 @@ fits mask

Syntax:

- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1315,10 +1197,8 @@ fits
fits image
 fits table
- - fits slice
- ds9.set(string cmd, string - url)
+ fits slice
+ ds9.set(string cmd, string url)
fits foo.fits
fits new foo.fits
fits bar.fits[bin=detx,dety]
@@ -1327,12 +1207,10 @@
frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
frame [center [#|all]]
      [clear [#|all]]
@@ -1360,15 +1238,13 @@       [has fits [ |bin|cube|mosaic]]
      [has marker [highlite|paste|select|undo]]
-       [has system - <coordsys>]
- -       [has wcs +       [has system <coordsys>]
+       [has wcs [<wcssys>]]
-       [has wcs - celestial [<wcssys>]]
-       - [has wcs linear [<wcssys>]]
+       [has wcs celestial + [<wcssys>]]
+       [has wcs linear + [<wcssys>]]
 
Example:
string value = ds9.get(string cmd)
@@ -1431,14 +1307,12 @@ gif [new|slice] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 gif
ds9.set(string cmd)
 gif foo.gif
gif new foo.gif
- gif slice - foo.gif
+ gif slice foo.gif
 gif
gif new
 gif slice @@ -1457,21 +1331,17 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
-       [axes type - interior|exterior]
-       - [axes origin lll|llu|lul|luu|ull|ulu|uul|uuu]
+       [axes type interior|exterior]
+       [axes origin + lll|llu|lul|luu|ull|ulu|uul|uuu]
      [format1 <format>]
      [format2 <format>]
      [tickmarks yes|no]
@@ -1485,22 +1355,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1514,17 +1379,13 @@       [title color <color>]
      [labels yes|no]
      [labels text1 <text>]
- -       [labels text2 +       [labels text2 <text>]
-       [labels def1 - yes|no]
+       [labels def1 yes|no]
      [labels def2 yes|no]
- -       [labels gap1 +       [labels gap1 <value>]
-       [labels gap2 - <value>]
+       [labels gap2 <value>]
      [labels font times|helvetica|courier]
      [labels fontsize <value>]
@@ -1549,8 +1410,7 @@ grid grid dash
grid grid gap1
 grid grid gap2
- - grid grid gap3
+ grid grid gap3
 grid axes
grid axes color
grid axes width
@@ -1574,11 +1434,9 @@ grid numerics fontslant
grid numerics color
grid numerics gap1
- grid numerics - gap2
+ grid numerics gap2
 grid numerics gap3
- - grid numerics type
+ grid numerics type
grid numerics vertical
grid title
grid title text
@@ -1592,12 +1450,10 @@ grid labels
grid labels text1
 grid labels text2
- grid - labels def1
+ grid labels def1
grid labels def2
 grid labels gap1
- grid - labels gap2
+ grid labels gap2
grid labels font
grid labels fontsize
grid labels fontweight
@@ -1616,8 +1472,7 @@ grid grid dash yes
grid grid gap1 10
 grid grid gap2 10
- - grid grid gap3 10
+ grid grid gap3 10
 grid axes yes
grid axes color red
grid axes width 2
@@ -1641,11 +1496,9 @@ grid numerics fontslant italic
grid numerics color red
grid numerics gap1 10
- grid numerics gap2 - 10
+ grid numerics gap2 10
 grid numerics gap3 10
- - grid numerics type exterior
+ grid numerics type exterior
grid numerics vertical yes
grid title yes
grid title text {Hello World}
@@ -1658,13 +1511,11 @@ grid title color red
grid labels yes
grid labels text1 {Hello World}
- grid labels text2 - {Hello World}
+ grid labels text2 {Hello World}
 grid labels def1 yes
grid labels def2 yes
 grid labels gap1 10
- - grid labels gap2 10
+ grid labels gap2 10
grid labels font courier
grid labels fontsize 12
grid labels fontweight bold
@@ -1717,41 +1568,36 @@ iconify yes

iexam

Interactive examine function. A blinking cursor will indicate - to - the user to click on a point on an image. The specified - information - will be returned at that time. The default event is + to the user to click on a point on an image. The specified + information will be returned at that time. The default event is button. In the last form, the following macros will be expanded if present: $width, $height, $depth, $bitpix, $filename, $regions, $filename[$regions], $env, $pan, $value, - $x, - $y, $z. See See Analysis + Macros for more information.

Syntax:
iexam []
-       - [[]|button|key|any] coordinate <coordsys> - [<skyframe>] +       [[]|button|key|any] + coordinate <coordsys> [<skyframe>] [<skyformat>]
      [[]|button|key|any] data [width][height]
-       - [[]|button|key|any] <macro string>]
+       [[]|button|key|any] + <macro string>]
 
Example:
string value = ds9.get(string cmd)
 iexam
- - iexam coordinate image
+ iexam coordinate image
iexam key coordinate image # return coordinate and key event
iexam coordinate wcs fk5 degrees
iexam coordinate wcs galactic sexagesimal
iexam coordinate fk5
iexam data # return data value
iexam key data # return data value and key event
- iexam data 3 3 # return all data in 3x3 box about selected - point
+ iexam data 3 3 # return all data in 3x3 box about selected point
iexam {'Click at $x,$y in file $filename'}

iis

Set/Get IIS Filename. Optional mosaic number maybe supplied.

@@ -1766,34 +1612,29 @@ iis filename foo.fits
iis filename bar.fits 4

jpeg

-

Load JPEG image into current frame. Optional parameters: - jpeg quality (1-100)

+

Load JPEG image into current frame. Optional parameters: jpeg + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 jpeg
jpeg 100
 ds9.set(string cmd)
- - jpeg foo.jpeg
+ jpeg foo.jpeg
jpeg new foo.jpeg
- jpeg slice - foo.jpeg
+ jpeg slice foo.jpeg
 jpeg
jpeg new
 jpeg slice

lock

Lock all other frames to the current frame.

Syntax:
- lock [frame - <coordsys>|none]
+ lock [frame <coordsys>|none]
     [crosshair <coordsys>|none]
- -      [crop <coordsys>|none]
+      [crop <coordsys>|none]
     [slice <coordsys>|none]
     [bin [yes|no]]
     [axes [yes|no]]
@@ -1801,16 +1642,12 @@      [scalelimits [yes|no]]
     [colorbar [yes|no]]
     [block [yes|no]]
- -      [smooth [yes|no]]
- -      [3d [yes|no]]
- -  
+      [smooth [yes|no]]
+      [3d [yes|no]]
+  
Example:
 string value = ds9.get(string cmd)
- - lock frame
+ lock frame
lock crosshair
 lock crop
lock slice
@@ -1822,13 +1659,10 @@ lock block
lock smooth
 lock 3d
- - ds9.set(string cmd)
- lock frame - wcs
+ ds9.set(string cmd)
+ lock frame wcs
 lock crosshair wcs
- lock crop - wcs
+ lock crop wcs
lock slice wcs
lock bin yes
lock axes yes
@@ -1878,6 +1712,7 @@ mask [color <color>]
     [mark 1|0]
     [transparency <value>]
+      [system <coordsys>]
     [clear]
     [open|close]
 
@@ -1885,11 +1720,13 @@ string value = ds9.get(string cmd)
mask color
mask mark
+ mask system
mask transparency
ds9.set(string cmd)
mask color red
mask mark 0
mask transparency 50
+ mask system wcs
mask clear
mask open
mask close
@@ -1897,17 +1734,12 @@

match

Match all other frames to the current frame.

Syntax:
- match [frame - <coordsys>]
+ match [frame <coordsys>]
      [crosshair <coordsys>]
- -       [crop <coordsys>]
- -       [slice - <coordsys>]
-       - [bin]
+       [crop <coordsys>]
+       [slice <coordsys>]
+       [bin]
      [axes]
      [scale]
      [scalelimits]
@@ -1919,8 +1751,7 @@ Example:
ds9.set(string cmd)
 match frame wcs
- match - crosshair wcs
+ match crosshair wcs
 match crop wcs
match slice wcs
match bin
@@ -1940,11 +1771,9 @@  
Example:
string value = ds9.get(string cmd)
- - mecube
+ mecube
 ds9.set(string cmd)
- - mecube foo.fits
+ mecube foo.fits
mecube new foo.fits
 mecube
mecube new @@ -1983,16 +1812,13 @@ mosaic [wcs|wcsa...wcsz|iraf] [new|mask] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 mosaic
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 mosaic foo.fits
mosaic wcs foo.fits
mosaic wcs new foo.fits
- mosaic wcs mask - foo.fits
+ mosaic wcs mask foo.fits
 mosaic
mosaic wcs
mosaic wcs new
@@ -2005,40 +1831,36 @@ [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 mosaicimage
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 mosaicimage foo.fits
mosaicimage wcs foo.fits
mosaicimage wcs new foo.fits
- mosaicimage wcs mask - foo.fits
+ mosaicimage wcs mask foo.fits
 mosaicimage
mosaicimage wcs
mosaicimage wcs new
 mosaicimage wcs mask

movie

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.

+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
movie [slice|frame|3d] <filename>
- - movie 3d <filename> + movie 3d <filename> [number|azfrom|azto|elfrom|elto|slfrom|slto|oscillate|repeat <#>]
 
Example:
ds9.set(string cmd)
movie slice ds9.mpg
- movie 3d ds9.mpg number 10 azfrom - -60 azto 60 oscillate 1
+ movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate + 1

multiframe

Load FITS multiple extension file as multiple images.

@@ -2047,19 +1869,16 @@  
Example:
 ds9.set(string cmd)
- multiframe - foo.fits
+ multiframe foo.fits
 multiframe

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
nameserver [<object>]
           - [name - <object>]
+ [name <object>]
           - [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+ [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
           [skyformat degrees|sexagesimal]
           @@ -2103,17 +1922,13 @@ nrrd [new|mask] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 nrrd
nrrd big
- ds9.set(string - cmd, string url)
- nrrd - foo.nrrd
+ ds9.set(string cmd, string url)
+ nrrd foo.nrrd
nrrd new foo.nrrd
- nrrd mask - foo.nrrd
+ nrrd mask foo.nrrd
 nrrd
nrrd new
nrrd mask
@@ -2142,10 +1957,8 @@ nvss
nvss m31
 nvss name m31
- - nvss name clear
- nvss 00:42:44.404 - +41:16:08.78
+ nvss name clear
+ nvss 00:42:44.404 +41:16:08.78
nvss size 60 60 arcmin
nvss save yes
nvss frame current
@@ -2231,10 +2044,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -2243,394 +2054,251 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
+ # create new empty plot window
 plot []
- -      [line|bar|scatter]
- -      [new]
- -      [new - line|bar|scatter]
-      - [new name <plotname>]
- -      [new name <plotname> +      [line|bar|scatter]
+      [new]
+      [new line|bar|scatter]
+      [new name <plotname>]
+      [new name <plotname> line|bar|scatter]
- # - load data into existing plot from stdin
- - plot [[<plotname>] data - xy|xyex|xyey|xyexey]
+ # load data into existing plot from stdin
+ plot [[<plotname>] data xy|xyex|xyey|xyexey]
- # existing - plot
+ # existing plot
 plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -      [[<plotname>] save - <filename>]
-      - [[<plotname>] clear]
- -      [[<plotname>] - duplicate - [#]]
-      - [[<plotname>] stats yes|no]
- -      [[<plotname>] list - yes|no]
-      - [[<plotname>] loadconfig +      [[<plotname>] save <filename>]
-      - [[<plotname>] saveconfig <filename>]
- -      [[<plotname>] pagesetup orient - portrait|landscape]
-      - [[<plotname>] pagesetup size - letter|legal|tabloid|poster|a4]
- -      [[<plotname>] - print]
-      - [[<plotname>] print destination - printer|file]
-      - [[<plotname>] print command - <command>]
-      - [[<plotname>] print filename +      [[<plotname>] clear]
+      [[<plotname>] + duplicate [#]]
+      [[<plotname>] + stats yes|no]
+      [[<plotname>] + list yes|no]
+      [[<plotname>] + loadconfig <filename>]
+      [[<plotname>] saveconfig <filename>]
-      - [[<plotname>] print color rgb|gray]
- -      [[<plotname>] +      [[<plotname>] pagesetup + orient portrait|landscape]
+      [[<plotname>] pagesetup + size letter|legal|tabloid|poster|a4]
+      [[<plotname>] print]
+      [[<plotname>] print + destination printer|file]
+      [[<plotname>] print + command <command>]
+      [[<plotname>] print + filename <filename>]
+      [[<plotname>] print + color rgb|gray]
+      [[<plotname>] close]
-      - [[<plotname>] mode pointer|zoom]
- -
+      [[<plotname>] + mode pointer|zoom]
+
# configure graph
- plot - [[<plotname>] axis x|y grid yes|no]
- -      [[<plotname>] axis x|y log - yes|no]
-      - [[<plotname>] axis x|y flip yes|no]
- -      [[<plotname>] axis x|y auto + plot [[<plotname>] axis x|y grid yes|no]
+      [[<plotname>] axis x|y + log yes|no]
+      [[<plotname>] axis x|y + flip yes|no]
+      [[<plotname>] axis x|y auto yes|no]
-      - [[<plotname>] axis x|y min <value>]
- -      [[<plotname>] axis x|y max +      [[<plotname>] axis x|y min + <value>]
+      [[<plotname>] axis x|y max <value>]
-      - [[<plotname>] axis x|y format +      [[<plotname>] axis x|y format <string>]
-      - [[<plotname>] legend yes|no]
- -      [[<plotname>] legend position - right|left|top|bottom]
-      - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] + legend yes|no]
+      [[<plotname>] legend + position right|left|top|bottom]
+      [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+      [[<plotname>] font title|labels|numbers size <value>]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers weight normal|bold]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers slant roman|italic]
-      - [[<plotname>] title <string>]
- -      [[<plotname>] title x|y +      [[<plotname>] title + <string>]
+      [[<plotname>] title x|y <string>]
-      - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+      [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- plot - [[<plotname>] show yes|no]
-   -    [[<plotname>] shape + # configure current dataset
+ plot [[<plotname>] show yes|no]
+      [[<plotname>] shape circle|square|diamond|plus|splus|scross|triangle|arrow]
      [[<plotname>] shape fill yes|no]
- -      [[<plotname>] shape - color <value>]
- -      [[<plotname>] smooth - step|linear|cubic|quadratic|catrom]
- -      [[<plotname>] color - <value>]
-      - [[<plotname>] width <value>]
- -      [[<plotname>] dash - yes|no]
-      - [[<plotname>] error yes|no]
- -      [[<plotname>] error +      [[<plotname>] + shape color <value>]
+      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
+      [[<plotname>] color <value>]
-      - [[<plotname>] color <value>]
- -      [[<plotname>] error +      [[<plotname>] width <value>]
- -      [[<plotname>] name - <string>]
+      [[<plotname>] + dash yes|no]
+      [[<plotname>] + error yes|no]
+      [[<plotname>] + error color <value>]
+      [[<plotname>] color + <value>]
+      [[<plotname>] + error width <value>]
+      [[<plotname>] + name <string>]
- # select - current dataset
- plot [[<plotname>] - select <value>]
+ # select current dataset
+ plot [[<plotname>] select <value>]
  
Example:
- # return all - plotnames
- string value = ds9.get(string - cmd)
+ # return all plotnames
+ string value = ds9.get(string cmd)
 plot
- - # create new empty plot window
- - ds9.set(string cmd)
- - plot
+ # create new empty plot window
+ ds9.set(string cmd)
+ plot
 plot bar
- plot - new
+ plot new
 plot new bar
- plot - new name foo
- plot new name foo - bar
+ plot new name foo
+ plot new name foo bar
- # load additional dataset - into an existing plot
- ds9.set(string cmd, - string url)
- plot data xy # plot additional - data
- plot foo data xy # plot additional - data
+ # load additional dataset into an existing plot
+ ds9.set(string cmd, string url)
+ plot data xy # plot additional data
+ plot foo data xy # plot additional data
- string value = - ds9.get(string cmd)
- plot - stats
+ string value = ds9.get(string cmd)
+ plot stats
 plot list
- - ds9.set(string cmd)
- plot load foo.dat - xy
+ ds9.set(string cmd)
+ plot load foo.dat xy
 plot save foo.dat
- - plot clear
- plot duplicate - 1
+ plot clear
+ plot duplicate 1
 plot stats yes
- plot - list yes
- plot loadconfig - foo.plt
- plot saveconfig - foo.plt
- plot pagesetup orient - portrait
- plot pagesetup size - letter
+ plot list yes
+ plot loadconfig foo.plt
+ plot saveconfig foo.plt
+ plot pagesetup orient portrait
+ plot pagesetup size letter
 plot print
- plot - print destination file
- plot print command - lp
- plot print filename - foo.ps
+ plot print destination file
+ plot print command lp
+ plot print filename foo.ps
 plot print color rgb
- - plot close
+ plot close
- string value = - ds9.get(string cmd)
- plot - mode
+ string value = ds9.get(string cmd)
+ plot mode
 ds9.set(string cmd)
- - plot mode pointer
+ plot mode pointer
- # - configure plot
- string value = ds9.get(string - cmd)
+ # configure plot
+ string value = ds9.get(string cmd)
 plot axis x grid
- - plot axis x log
- plot axis x - flip
+ plot axis x log
+ plot axis x flip
 plot axis x auto
- - plot axis x min
- plot axis x - max
+ plot axis x min
+ plot axis x max
 plot axis x format
- - plot legend
- plot legend - position
- plot font numbers - font
+ plot legend
+ plot legend position
+ plot font numbers font
 plot font numbers size
- - plot font numbers weight
- plot font - numbers slant
+ plot font numbers weight
+ plot font numbers slant
 plot title
- - plot title x
- plot - barmode
+ plot title x
+ plot barmode
 ds9.set(string cmd)
- - plot axis x grid yes
- plot axis x log - yes
+ plot axis x grid yes
+ plot axis x log yes
 plot axis x flip yes
- - plot axis x auto no
- plot axis x min - 0
+ plot axis x auto no
+ plot axis x min 0
 plot axis x max 100
- - plot axis x format "%f"
+ plot axis x format "%f"
- - string value = ds9.get(string cmd)
- plot - legend
+ string value = ds9.get(string cmd)
+ plot legend
 plot legend position
- - ds9.set(string cmd)
- plot legend - yes
- plot legend position - left
+ ds9.set(string cmd)
+ plot legend yes
+ plot legend position left
- string value = - ds9.get(string cmd)
- plot font numbers - font
+ string value = ds9.get(string cmd)
+ plot font numbers font
 plot font numbers size
- - plot font numbers weight
- plot font - numbers slant
- ds9.set(string - cmd)
- plot font numbers font - times
- plot font numbers size - 12
- plot font numbers weight - bold
- plot font numbers slant - italic
+ plot font numbers weight
+ plot font numbers slant
+ ds9.set(string cmd)
+ plot font numbers font times
+ plot font numbers size 12
+ plot font numbers weight bold
+ plot font numbers slant italic
- string value = - ds9.get(string cmd)
- plot - title
+ string value = ds9.get(string cmd)
+ plot title
 plot title xaxis
- - plot title yaxis
- ds9.set(string - cmd)
- plot title "This is a - Title"
- plot title x "X - Axis"
+ plot title yaxis
+ ds9.set(string cmd)
+ plot title "This is a Title"
+ plot title x "X Axis"
 plot title y "Y Axis"
- - plot title legend "This is the Legend"
- -
- string value = ds9.get(string - cmd)
+ plot title legend "This is the Legend"
+
+ string value = ds9.get(string cmd)
 plot barmode
- - ds9.set(string cmd)
- plot barmode - aligned
+ ds9.set(string cmd)
+ plot barmode aligned
- # configure current - dataset
- string value = ds9.get(string - cmd)
+ # configure current dataset
+ string value = ds9.get(string cmd)
 plot show
- plot - shape
+ plot shape
 plot shape fill
- - plot shape color
- plot - smooth
+ plot shape color
+ plot smooth
 plot color
- plot - width
+ plot width
 plot dash
- plot - error
+ plot error
 plot error color
- - plot error width
- plot - name
+ plot error width
+ plot name
 ds9.set(string cmd)
- - plot show yes
- plot shape - circle
+ plot show yes
+ plot shape circle
 plot shape fill no
- - plot shape color cyan
- plot smooth - step
+ plot shape color cyan
+ plot smooth step
 plot color red
- - plot width 2
- plot dash - yes
+ plot width 2
+ plot dash yes
 plot error yes
- plot - error color red
- plot error width - 2
+ plot error color red
+ plot error width 2
 plot name "My Data"
- -
+
# select current dataset
- - string value = ds9.get(string cmd)
- plot - select
+ string value = ds9.get(string cmd)
+ plot select
 ds9.set(string cmd)
plot select 2

@@ -2641,14 +2309,12 @@ png [new|slice] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 png
ds9.set(string cmd)
 png foo.png
png new foo.png
- png slice - foo.png
+ png slice foo.png
 png
png new
 png slice
@@ -2656,10 +2322,8 @@

Set region and coordinate output format precision.

Syntax:
precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
string value = ds9.get(string cmd)
@@ -2705,8 +2369,7 @@       [filename <filename>]
      [color rgb|cmyk|gray]
      [level 1|2]
-       [resolution - 53|72|75|150|300|600]
+       [resolution 53|72|75|150|300|600]
 
Example:
string value = ds9.get(string cmd)
@@ -2767,12 +2430,10 @@         [skyformat degrees|sexagesimal]
        [strip yes|no]
-         [shape - <shape>]
+         [shape <shape>]
        [color &ltcolor>]
-         [width - <width>]
+         [width <width>]
         [fixed|edit|rotate|delete yes|no]
        @@ -2784,8 +2445,7 @@         [template <filename>]
        [template <filename> - at - <ra> <dec> <coordsys> <skyframe>]
+ at <ra> <dec> <coordsys> <skyframe>]
        [savetemplate <filename>]
        [groups]
@@ -2794,13 +2454,11 @@ new]
        [group <tag> update]
-         [group <tag> - select]
+         [group <tag> select]
        [group <tag> color <color>]
        [group <tag> copy]
-         [group <tag> - delete]
+         [group <tag> delete]
        [group <tag> cut]
        [group <tag> font <font>]
@@ -2811,8 +2469,7 @@         [group <tag> moveback]
        [group <tag> - property - <property> yes|no]
+ property <property> yes|no]
        [copy]
        [cut]
        [paste @@ -2968,8 +2625,7 @@ rgb channel red # set current channel to red
rgb view blue no # turn off blue channel
rgb system wcs # set rgb coordinate system
- rgb lock - wcs yes
+ rgb lock wcs yes
rgb lock crop yes
rgb lock slice yes
rgb lock bin yes
@@ -2989,16 +2645,13 @@ [[xdim=<x>,ydim=<y>|dim=<dim>],[zdim=3],bitpix=<b>,skip=<s>,endian=[little|big]]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbarray
rgbarray little
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
- rgbarray new - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ rgbarray new foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]

rgbcube

Load FITS rgbcube into rgb frame.

@@ -3006,12 +2659,10 @@ rgbcube [new] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbcube
 ds9.set(string cmd)
- - rgbcube foo.fits
+ rgbcube foo.fits
rgbcube new foo.fits
 rgbcube
rgbcube new
@@ -3022,18 +2673,15 @@ rgbimage [new] [<filename>]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 rgbimage
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 rgbimage foo.fits
rgbimage new foo.fits
 rgbimage
rgbimage new

rotate

-

Controls the rotation angle (in degrees) of the current - frame.

+

Controls the rotation angle (in degrees) of the current frame.

Syntax:
rotate [<value>]
       [to <value>]
@@ -3057,11 +2705,9 @@  
Example:
 ds9.set(string cmd)
- samp - no
+ samp no
 samp disconnect
- samp broadcast - image
+ samp broadcast image
samp send image aladin

save

@@ -3072,14 +2718,12 @@  
Example:
 ds9.set(string cmd)
- save - foo.fits
+ save foo.fits
save fits foo.fits image
save fits foo.fits table
save fits foo.fits slice
save rgbimage foo.fits
- save rgbcube - foo.fits
+ save rgbcube foo.fits
save mecube foo.fits
save mosaic foo.fits
save mosaicimage foo.fits
@@ -3090,8 +2734,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
saveimage <filename>.jpeg [1-100]
saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -3186,47 +2829,38 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

         [<ref>] [cancel]
-     -     [<ref>] [clear]
-    -      [<ref>] [close]
+         [<ref>] + [clear]
+         [<ref>] [close]
        [<ref>] - [coordinate - <ra> <dec> <coordsys>]
- -         - [<ref>] [crosshair]
+ [coordinate <ra> <dec> <coordsys>]
+         [<ref>] + [crosshair]
        [<ref>] [export sb|tsv <filename>]
-    -      [<ref>] [name <object>]
- -         [<ref>] [print]
+         [<ref>] [name + <object>]
+         [<ref>] [print]
        [<ref>] [retrieve]
- -         [<ref>] [save - <filename>]
+         + [<ref>] [save <filename>]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [system - <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [system <coordsys>]
+         [<ref>] + [update]
 
Example:
string value = ds9.get(string cmd)
@@ -3269,8 +2903,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -3295,10 +2928,8 @@ skyview
skyview m31
 skyview name m31
- - skyview name clear
- skyview 00:42:44.404 - +41:16:08.78
+ skyview name clear
+ skyview 00:42:44.404 +41:16:08.78
skyview size 60 60 arcmin
skyview pixels 600 600
skyview save yes
@@ -3331,25 +2962,22 @@        [yes|no]
       [function boxcar|tophat|gaussian]
- -        [radius +        [radius <value>]
- -        [radiusminor - <value>]
- -        - [sigma - <value>]
- -        +        + [radiusminor <value>]
+        + + [sigma <value>]
+        + [sigmaminor <value>]
- -        +        [angle + <value>]
- -        [match]
+        + [match]
       [lock [yes|no]]
       [open|close]
 
@@ -3358,8 +2986,7 @@ smooth
smooth function
 smooth radius
- - smooth radiusminor
+ smooth radiusminor
smooth sigma
smooth sigmaminor
smooth angle
@@ -3368,19 +2995,14 @@ smooth
smooth yes
smooth function tophat
- smooth radius - 4
- smooth radiusminor - 4
- - smooth sigma - 2.0
- - smooth sigmaminor - 2.0
- - smooth angle - 45
+ smooth radius 4
+ smooth radiusminor 4
+ smooth + sigma 2.0
+ smooth + sigmaminor 2.0
+ smooth + angle 45
 smooth open
smooth close
@@ -3405,8 +3027,7 @@  
Example:
 ds9.set(string cmd)
- tcl {puts - {Hello, World}}
+ tcl {puts {Hello, World}}

threads

Set number of process threads for functions which are @@ -3416,24 +3037,20 @@  
Example:
string value = ds9.get(string cmd)
- - threads
+ threads
ds9.set(string cmd)
 threads 8

tiff

-

Load TIFF image into current frame. Optional parameters: - tiff compression method.

+

Load TIFF image into current frame. Optional parameters: tiff + compression method.

Syntax:
- tiff [new|slice] [<filename>] - [none|jpeg|packbits|deflate]
+ tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
 
Example:
- string value = ds9.get(string - cmd)
+ string value = ds9.get(string cmd)
 tiff
tiff jpeg
- ds9.set(string - cmd)
+ ds9.set(string cmd)
 tiff foo.tiff
tiff new foo.tiff
tiff slice foo.tiff
@@ -3478,9 +3095,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
update []
       [# x1 y1 x2 y2]
@@ -3500,8 +3116,7 @@  
Example:
 ds9.set(string cmd)
- url - http://foo.bar.edu/foo.fits + url http://foo.bar.edu/foo.fits

version

Returns the current version of DS9.

Syntax:
@@ -3532,8 +3147,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -3575,8 +3189,7 @@ view units yes
view wcsa yes
 view frame yes
- view red - yes
+ view red yes
view green yes
view blue yes

vla

@@ -3588,8 +3201,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -3608,8 +3220,7 @@ vla
vla m31
 vla name m31
- vla - name clear
+ vla name clear
 vla 00:42:44.404 +41:16:08.78
vla size 60 60 arcmin
vla save yes
@@ -3644,10 +3255,8 @@ vlss
vlss m31
 vlss name m31
- - vlss name clear
- vlss 00:42:44.404 - +41:16:08.78
+ vlss name clear
+ vlss 00:42:44.404 +41:16:08.78
vlss size 60 60 arcmin
vlss save yes
vlss frame current
@@ -3688,16 +3297,12 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - using this access point, 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 . Please see WCS for more - information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, using this access point, 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 . Please see WCS for more information.

Syntax:
wcs [[system] wcs|wcsa...wcsz]
    [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3719,11 +3324,9 @@ wcs wcs
wcs system wcs
 wcs fk5
- wcs sky - fk5
+ wcs sky fk5
 wcs sexagesimal
- wcs skyformat - sexagesimal
+ wcs skyformat sexagesimal
wcs align yes
wcs reset
wcs reset 3
@@ -3743,8 +3346,7 @@ web []
    [<url>]
    [new <webname> <url>]
- -     [<webname>] [click +     [<webname>] [click back|forward|stop|reload|#]
    [<webname>] [clear]
    [<webname>] [close]
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index 44335ff..595dff9 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -14,18 +14,14 @@ align="middle"> XPA Access Points

The XPA - messaging - system provides seamless communication between DS9 and other - Unix - programs, including X programs, Perl, S-Lang, and Tcl/Tk. It also provides an easy way for users to - communicate - with DS9 by executing XPA client commands in the shell or by - utilizing such commands in scripts. Because XPA works both at - the - programming level and the shell level, it is a powerful tool for - unifying any analysis environment.

+ communicate with DS9 by executing XPA client commands in the + shell or by utilizing such commands in scripts. Because XPA + works both at the programming level and the shell level, it is a + powerful tool for unifying any analysis environment.

2mass
3d
about
@@ -136,16 +132,13 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
      [survey j|h|k]
- -       [open|close]
- -  
+       [open|close]
+  
Example:
$xpaget ds9 2mass name
$xpaget ds9 2mass coord
@@ -155,19 +148,15 @@ $xpaget ds9 2mass survey
$xpaset -p ds9 2mass
 $xpaset -p ds9 2mass m31
- - $xpaset -p ds9 2mass name m31
- - $xpaset -p ds9 2mass name clear
- $xpaset - -p ds9 2mass 00:42:44.404 +41:16:08.78
+ $xpaset -p ds9 2mass name m31
+ $xpaset -p ds9 2mass name clear
+ $xpaset -p ds9 2mass 00:42:44.404 +41:16:08.78
$xpaset -p ds9 2mass size 60 60 arcmin
$xpaset -p ds9 2mass save yes
$xpaset -p ds9 2mass frame current
$xpaset -p ds9 2mass update frame
$xpaset -p ds9 2mass survey j
- $xpaset -p ds9 2mass - open
+ $xpaset -p ds9 2mass open
$xpaset -p ds9 2mass close

3d

Support for 3D frame.

@@ -179,19 +168,15 @@    [scale <scale>]
   [method mip|aip]
   [background none|azimuth|elevation]
- -    [border yes|no]
+    [border yes|no]
   [border color <color>]
   [highlite yes|no]
   [highlite color <color>]
- -    [compass yes|no]
+    [compass yes|no]
   [compass color <color>]
- -    [match]
+    [match]
   [lock [yes|no]]
-    - [open|close]
+    [open|close]
  
Example:
$xpaget ds9 3d view
@@ -199,44 +184,34 @@ $xpaget ds9 3d el
$xpaget ds9 3d scale
$xpaget ds9 3d method
- $xpaget ds9 3d - background
+ $xpaget ds9 3d background
 $xpaget ds9 3d border
$xpaget ds9 3d border color
$xpaget ds9 3d highlite
$xpaget ds9 3d highlite color
- $xpaget ds9 3d - compass
- $xpaget ds9 3d compass - color
- $xpaget ds9 3d - lock
- $xpaset -p ds9 3d # create new 3D - frame
+ $xpaget ds9 3d compass
+ $xpaget ds9 3d compass color
+ $xpaget ds9 3d lock
+ $xpaset -p ds9 3d # create new 3D frame
$xpaset -p ds9 3d view 45 30
$xpaset -p ds9 3d az 45
$xpaset -p ds9 3d el 30
$xpaset -p ds9 3d scale 10
$xpaset -p ds9 3d method mip
$xpaset -p ds9 3d background azimuth
- $xpaset -p - ds9 3d border yes
+ $xpaset -p ds9 3d border yes
$xpaset -p ds9 3d border color red
$xpaset -p ds9 3d highlite yes
$xpaset -p ds9 3d highlite color red
- $xpaset - -p ds9 3d compass yes
- - $xpaset -p ds9 3d compass color - red
- - $xpaset -p ds9 3d - match
+ $xpaset -p ds9 3d compass yes
+ $xpaset -p ds9 3d + compass color red
+ $xpaset + -p ds9 3d match
$xpaset -p ds9 3d lock yes
 - $xpaset - -p ds9 3d open
+ $xpaset -p ds9 3d open
$xpaset -p ds9 3d close

about

@@ -261,8 +236,7 @@

analysis

Control external analysis tasks. Tasks are numbered as they are loaded, starting with 0. Can also be used to display a message - and - display text in the text dialog window.

+ and display text in the text dialog window.

Syntax:
analysis [<task number>]
         @@ -278,8 +252,7 @@ ok|okcancel|yesno <message>]
         [entry <message>]
-          - [text]
+          [text]

 Example:
$xpaget ds9 analysis
@@ -311,10 +284,8 @@ $xpaget ds9 array > foo.arr
$xpaget ds9 array little > foo.arr
$xpaset -p ds9 array foo.arr[dim=512,bitpix=-32,endian=little]
- $xpaset -p ds9 array new - foo.arr[dim=512,bitpix=-32,endian=little]
- $xpaset -p ds9 array mask - foo.arr[dim=512,bitpix=-32,endian=little]
+ $xpaset -p ds9 array new foo.arr[dim=512,bitpix=-32,endian=little]
+ $xpaset -p ds9 array mask foo.arr[dim=512,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 array [dim=512,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 array new @@ -340,8 +311,7 @@

bin

Controls binning factor, binning buffer size, and  binning function for binning FITS bin tables. The access point blocking - is - provided for backward compatibility.

+ is provided for backward compatibility.

Syntax:
bin [about <x> <y>]
    [about center]
@@ -351,10 +321,8 @@     [factor <value> [<vector>]]
    [depth <value>]
    [filter <string>]
- -     [filter clear]
- -     [function average|sum]
+     [filter clear]
+     [function average|sum]
    [in]
    [out]
    [to fit]
@@ -417,8 +385,7 @@ <value>]
      [in]
      [out]
- -       [to fit]
+       [to fit]
      [match]
      [lock [yes|no]]
      [open|close]
@@ -426,41 +393,34 @@ Example:
$xpaget ds9 block
$xpaget ds9 block lock
- $xpaset -p ds9 - block 4
+ $xpaset -p ds9 block 4
$xpaset -p ds9 block 4 2
- - $xpaset -p ds9 block to - 4
+ $xpaset -p ds9 block + to 4
$xpaset -p ds9 block to 4 2
- - $xpaset -p ds9 block in
- - $xpaset -p ds9 block + $xpaset -p ds9 block in
+ $xpaset -p ds9 block out
- $xpaset -p ds9 block - to fit
+ $xpaset -p ds9 block to + fit
$xpaset -p ds9 block match
$xpaset -p ds9 block lock yes
$xpaset -p ds9 block open
- $xpaset -p ds9 block - close
+ $xpaset -p ds9 block close

catalog
cat

Support for catalogs. The first three commands will create a - new - catalog search. All other commands operated on the last search - created, unless indicated otherwise.

+ new catalog search. All other commands operated on the last + search created, unless indicated otherwise.

Syntax:
catalog [new]
        [ned|simbad|denis|skybot]
        [aavso|ac|ascss|cmc|gaia|gsc1|gsc2|gsc3|nomad|ppmx|sao|sdss5|sdss6|sdss7|sdss8|sdss9|tycho]
-         - [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
+         [ua2|ub1|ucac2|ucac2sup|ucac3|ucac4|urat1]
        [2mass|iras]
        [csc|xmm|rosat]
        [first|nvss]
@@ -474,31 +434,26 @@         [import sb|tsv <filename>]

-         - [<ref>] [<ra> <dec> - <coordsys>]
-       -   [<ref>] [allcols]
- -         [<ref>] - [allrows]
+         [<ref>] + [<ra> <dec> <coordsys>]
+         [<ref>] [allcols]
+         + [<ref>] [allrows]
        [<ref>] [cancel]
-         - [<ref>] [clear]
-         - [<ref>] [close]
-         - [<ref>] [crosshair]
+         [<ref>] + [clear]
+         [<ref>] [close]
+         [<ref>] + [crosshair]
        [<ref>] [dec <col>]
        [<ref>] [edit yes|no]
        [<ref>] [export sb|tsv <filename>]
- -         [<ref>] - [filter <string>]
+         + [<ref>] [filter <string>]
        [<ref>] [filter load <filename>]
        [<ref>] @@ -507,28 +462,25 @@ <code>]
        [<ref>] [match]
- -         +         + [<ref>] [match <ref> <ref>]
- -         [<ref>] +         [<ref>] [match + error <value> degrees|arcmin|arcsec]
-         - [<ref>] [match function 1and2|1not2|2not1]
- -         - [<ref>] [match return 1and2|1only|2only]
-         - [<ref>] [match unique yes|no]
+         [<ref>] + [match function 1and2|1not2|2not1]
+         [<ref>] + [match return 1and2|1only|2only]
+         [<ref>] + [match unique yes|no]
        [<ref>] [maxrows <number>]
        [<ref>] [name <object>]
- -         [<ref>] - [panto - yes|no]
+         + [<ref>] [panto yes|no]
        [<ref>] [plot <xcol> <ycol> <xerrcol> <yerrcol>]
        [<ref>] [print]
@@ -538,55 +490,48 @@ <coordsys>]
        [<ref>] [ra <col>]
-         [<ref>] - [regions]
-         [<ref>] - [retrieve]
+         [<ref>] [regions]
+         [<ref>] [retrieve]
        [<ref>] [samp]
        [<ref>] [samp broadcast]
        [<ref>] [samp - send - <application>]
- -         [<ref>] [save - <filename>]
+ send <application>]
+         + [<ref>] [save <filename>]
        [<ref>] - [server - cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
+ [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]
        [<ref>] [show yes|no]
        [<ref>] [radius <value> degrees|arcmin|arcsec]
        [<ref>] [sky <skyframe>]
-     -     [<ref>] [skyformat - <skyformat>]
-     -     [<ref>] [sort <col> - incr|decr]
+         [<ref>] + [skyformat <skyformat>]
+         [<ref>] + [sort <col> incr|decr]
        [<ref>] [symbol [#] condition|shape|color|text|font|fontsize|fontweight|fontslant <value>]
-         - [<ref>] [symbol [#] text|size|size2|units|angle - <value>]
-         - [<ref>] [symbol shape circle|ellipse|box|text|point]
+         [<ref>] + [symbol [#] text|size|size2|units|angle <value>]
+         [<ref>] + [symbol shape circle|ellipse|box|text|point]
        [<ref>] [symbol - shape circle point|box point|diamond - point|cross point|x point|arrow point|boxcircle point]
+ + shape circle point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
        [<ref>] [symbol add| [#] remove]
        [<ref>] [symbol save|load <filename>]
        [<ref>] [system <coordsys>]
-      -    [<ref>] [update]
+         [<ref>] + [update]
        [<ref>] [x <col>]
        [<ref>] [y @@ -594,12 +539,10 @@  
Example:
$xpaget ds9 catalog
- $xpaget ds9 catalog - header
+ $xpaget ds9 catalog header

 $xpaset -p ds9 catalog new
- $xpaset - -p ds9 catalog 2mass
+ $xpaset -p ds9 catalog 2mass
$xpaset -p ds9 catalog cds 2mass
$xpaset -p ds9 catalog cds {I/252}

@@ -607,79 +550,58 @@ $xpaset -p ds9 catalog import tsv foo.tsv

$xpaset -p ds9 catalog 202.48 47.21 fk5
- - $xpaset -p ds9 catalog allrows
+ $xpaset -p ds9 catalog allrows
$xpaset -p ds9 catalog allcols
- $xpaset -p ds9 catalog - cancel
+ $xpaset -p ds9 catalog cancel
 $xpaset -p ds9 catalog clear
- - $xpaset -p ds9 catalog close
- $xpaset -p ds9 - catalog crosshair
- $xpaset -p ds9 catalog dec - DEC
+ $xpaset -p ds9 catalog close
+ $xpaset -p ds9 catalog crosshair
+ $xpaset -p ds9 catalog dec DEC
 $xpaset -p ds9 catalog edit yes
- - $xpaset -p ds9 catalog export tsv bar.tsv
- $xpaset - -p ds9 catalog filter '$Jmag>10'
+ $xpaset -p ds9 catalog export tsv bar.tsv
+ $xpaset -p ds9 catalog filter '$Jmag>10'
$xpaset -p ds9 catalog filter load foo.flt
$xpaset -p ds9 catalog header
- $xpaset -p ds9 catalog - location 500
+ $xpaset -p ds9 catalog location 500
$xpaset -p ds9 catalog match error 2 arcsec
$xpaset -p ds9 catalog match function 1and2
$xpaset -p ds9 catalog match unique no
$xpaset -p ds9 catalog match return 1only
- $xpaset -p - ds9 catalog match # last two catalogs loaded
- $xpaset - -p ds9 catalog match 2mass csc
- $xpaset -p ds9 catalog - maxrows 2000
+ $xpaset -p ds9 catalog match # last two catalogs loaded
+ $xpaset -p ds9 catalog match 2mass csc
+ $xpaset -p ds9 catalog maxrows 2000
 $xpaset -p ds9 catalog name m51
$xpaset -p ds9 catalog panto no
- $xpaset -p ds9 catalog - plot '$Jmag' '$Hmag' '$e_Jmag' '$e_Hmag'
- $xpaset -p - ds9 catalog print
+ $xpaset -p ds9 catalog plot '$Jmag' '$Hmag' '$e_Jmag' + '$e_Hmag'
+ $xpaset -p ds9 catalog print
$xpaset -p ds9 catalog psky fk5
$xpaset -p ds9 catalog psystem wcs
$xpaset -p ds9 catalog ra RA
$xpaset -p ds9 catalog regions
$xpaset -p ds9 catalog retrieve
- $xpaset -p ds9 - catalog samp broadcast
+ $xpaset -p ds9 catalog samp broadcast
$xpaset -p ds9 catalog samp send aladin
$xpaset -p ds9 catalog save foo.xml
- $xpaset -p ds9 - catalog server sao
- $xpaset -p ds9 catalog show - yes
+ $xpaset -p ds9 catalog server sao
+ $xpaset -p ds9 catalog show yes
$xpaset -p ds9 catalog radius 1 degrees
$xpaset -p ds9 catalog symbol condition '$Jmag>15'
$xpaset -p ds9 catalog symbol 2 shape {boxcircle point}
$xpaset -p ds9 catalog symbol color red
$xpaset -p ds9 catalog symbol font times
- $xpaset -p - ds9 catalog symbol fontsize 14
- $xpaset -p ds9 catalog - symbol fontweight bold
- $xpaset -p ds9 catalog symbol - fontslant italic
+ $xpaset -p ds9 catalog symbol fontsize 14
+ $xpaset -p ds9 catalog symbol fontweight bold
+ $xpaset -p ds9 catalog symbol fontslant italic
 $xpaset -p ds9 catalog symbol add
$xpaset -p ds9 catalog symbol 2 remove
$xpaset -p ds9 catalog symbol load foo.sym
$xpaset -p ds9 catalog symbol save bar.sym
$xpaset -p ds9 catalog sky fk5
$xpaset -p ds9 catalog skyformat degrees
- $xpaset -p - ds9 catalog sort {Jmag} incr
- $xpaset -p ds9 catalog - system wcs
- $xpaset -p ds9 catalog - update
+ $xpaset -p ds9 catalog sort {Jmag} incr
+ $xpaset -p ds9 catalog system wcs
+ $xpaset -p ds9 catalog update
 $xpaset -p ds9 catalog x RA
$xpaset -p ds9 catalog y DEC

cd

@@ -694,21 +616,17 @@

cmap

Controls the colormap for the current frame. The colormap name is not case sensitive. A valid contrast value is  from 0 to - 10 - and bias value from 0 to 1.

+ 10 and bias value from 0 to 1.

Syntax:
cmap [<colormap>]
     [file]
     [load <filename>]
- -      [save <filename>]
- -      [invert yes|no]
+      [save <filename>]
+      [invert yes|no]
     [<constrast> <bias>]
     [tag [load|save] <filename>]
     [tag delete]
- -      [open|close]
+      [open|close]
 
Example:
$xpaget ds9 cmap
@@ -717,15 +635,13 @@ $xpaget ds9 cmap value
 $xpaset -p ds9 cmap Heat
$xpaset -p ds9 cmap load foo.sao
- $xpaset -p ds9 cmap - save bar.sao
+ $xpaset -p ds9 cmap save bar.sao
 $xpaset -p ds9 cmap invert yes
$xpaset -p ds9 cmap 5 .5
$xpaset -p ds9 cmap tag load foo.tag
$xpaset -p ds9 cmap tag save foo.tag
$xpaset -p ds9 cmap tag delete
- $xpaset -p ds9 cmap - open
+ $xpaset -p ds9 cmap open
$xpaset -p ds9 cmap close

colorbar
@@ -751,8 +667,7 @@ roman|italic]
         [size]
         [ticks]
-          - [match]
+          [match]
         [lock [yes|no]]
  
@@ -811,8 +726,7 @@ <filename>]
        [copy]
        [paste - [<coordsys> - <color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -829,8 +743,7 @@         [limits <min> <max>]
        [levels <value - value - value...>]
+ value value...>]
        [open|close]
 
Example:
@@ -852,21 +765,16 @@ $xpaset -p ds9 contour yes
$xpaset -p ds9 contour clear
$xpaset -p ds9 contour generate
- $xpaset -p ds9 - contour load ds9.ctr
- $xpaset -p ds9 contour - save ds9.ctr
- $xpaset -p ds9 contour save ds9.ctr wcs - fk5
+ $xpaset -p ds9 contour load ds9.ctr
+ $xpaset -p ds9 contour save ds9.ctr
+ $xpaset -p ds9 contour save ds9.ctr wcs fk5
$xpaset -p ds9 contour convert
$xpaset -p ds9 contour load levels ds9.ctr
$xpaset -p ds9 contour save levels ds9.lev
- $xpaset - -p ds9 contour copy
- $xpaset -p ds9 contour - paste
- $xpaset -p ds9 contour paste wcs - red 2 no
+ $xpaset -p ds9 contour copy
+ $xpaset -p ds9 contour paste
+ $xpaset -p ds9 contour paste wcs red 2 + no
 $xpaset -p ds9 contour color yellow
$xpaset -p ds9 contour width 2
$xpaset -p ds9 contour dash yes
@@ -902,10 +810,8 @@ 22.000204 wcs galactic arcsec
$xpaset -p ds9 crop match wcs
$xpaset -p ds9 crop lock wcs
- $xpaset -p ds9 crop - reset
- $xpaset -p ds9 crop 3d .25 .50 - wcs
+ $xpaset -p ds9 crop reset
+ $xpaset -p ds9 crop 3d .25 .50 wcs
$xpaset -p ds9 crop open
$xpaset -p ds9 crop close

crosshair

@@ -978,10 +884,8 @@

data

Return an array of data values given a lower left corner and a width and height in specified coordinate system. The last - argument - of yes indicates to strip the coordinates from the output and - just - list the data values. The default is yes.

+ argument of yes indicates to strip the coordinates from the + output and just list the data values. The default is yes.

Syntax:
data [<coordsys> [<skyframe>] <x> <y> <width> <height> [yes|no]]
@@ -1001,11 +905,9 @@ Syntax:
dsssao []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1021,29 +923,23 @@ $xpaget ds9 dsssao frame
$xpaset -p ds9 dsssao
$xpaset -p ds9 dsssao m31
- $xpaset -p ds9 dsssao - name m31
- $xpaset -p ds9 dsssao name - clear
- $xpaset -p ds9 dsssao 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dsssao name m31
+ $xpaset -p ds9 dsssao name clear
+ $xpaset -p ds9 dsssao 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsssao size 60 60 arcmin
$xpaset -p ds9 dsssao save yes
$xpaset -p ds9 dsssao frame current
$xpaset -p ds9 dsssao update frame
$xpaset -p ds9 dsssao open
- $xpaset -p ds9 dsssao - close
+ $xpaset -p ds9 dsssao close

dsseso

Support for Digital Sky Survey at ESO.

Syntax:
dsseso []
       [<object>]
-        [name - <object>|clear]
+        [name <object>|clear]
       [<ra> <dec>] # - in - wcs fk5
+ in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1062,20 +958,16 @@ $xpaget ds9 dsseso survey
$xpaset -p ds9 dsseso
$xpaset -p ds9 dsseso m31
- $xpaset -p ds9 dsseso - name m31
- $xpaset -p ds9 dsseso name - clear
- $xpaset -p ds9 dsseso 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dsseso name m31
+ $xpaset -p ds9 dsseso name clear
+ $xpaset -p ds9 dsseso 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsseso size 60 60 arcmin
$xpaset -p ds9 dsseso save yes
$xpaset -p ds9 dsseso frame current
$xpaset -p ds9 dsseso update frame
$xpaset -p ds9 dsseso survey DSS2-red
$xpaset -p ds9 dsseso open
- $xpaset -p ds9 dsseso - close
+ $xpaset -p ds9 dsseso close

dssstsci

Support for Digital Sky Survey at STSCI.

Syntax:
@@ -1109,12 +1001,9 @@ $xpaget ds9 dssstsci survey
$xpaset -p ds9 dssstsci
$xpaset -p ds9 dssstsci m31
- $xpaset -p ds9 - dssstsci name m31
- $xpaset -p ds9 dssstsci - name clear
- $xpaset -p ds9 dssstsci 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 dssstsci name m31
+ $xpaset -p ds9 dssstsci name clear
+ $xpaset -p ds9 dssstsci 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dssstsci size 60 60 arcmin
$xpaset -p ds9 dssstsci save yes
$xpaset -p ds9 dssstsci frame current
@@ -1123,8 +1012,7 @@ $xpaset -p ds9 dssstsci open
$xpaset -p ds9 dssstsci close

envi

-

Load an ENVI header and file. Optional parameter: array - endian.
+

Load an ENVI header and file. Optional parameter: array endian.

Syntax:
envi [new] <header> [<filename>]
@@ -1132,8 +1020,7 @@ Example:
 $xpaset -p ds9 envi foo.hdr
$xpaset -p ds9 envi new foo.hdr
- - $xpaset -p ds9 envi foo.hdr + $xpaset -p ds9 envi foo.hdr foo.bsq

 exit
@@ -1153,32 +1040,23 @@ format. Optional parameters: array endian, nrrd endian, jpeg quality (1-100) and tiff compression method.

Syntax:
- export - [array|nrrd|envi|gif|tiff|jpeg|png] + export [array|nrrd|envi|gif|tiff|jpeg|png] <filename>
- export array - <filename> [big|little|native]
- - export nrrd <filename> - [big|little|native]
- export envi <header> [<filename>] - [big|little|native]
+ export array <filename> [big|little|native]
+ export nrrd <filename> [big|little|native]
+ export envi <header> [<filename>] [big|little|native] +
export jpeg <filename> [1-100]
- - export tiff <filename> - [none|jpeg|packbits|deflate]
+ export tiff <filename> [none|jpeg|packbits|deflate]
 
Example:
- $xpaset -p ds9 export array foo.arr - little
+ $xpaset -p ds9 export array foo.arr little
$xpaset -p ds9 export nrrd foo.nrrd little
- $xpaset -p ds9 export envi foo.hdr - little
- - $xpaset -p ds9 export envi - foo.hdr foo.bsq little
- $xpaset -p - ds9 export tiff foo.tiff jpeg
+ $xpaset -p ds9 export envi foo.hdr little
+ $xpaset + -p ds9 export envi foo.hdr foo.bsq little
+ $xpaset -p ds9 export tiff + foo.tiff jpeg
$xpaset -p ds9 export jpeg foo.jpeg 75
$xpaset -p ds9 export png foo.png

file

@@ -1193,10 +1071,8 @@ loaded image.

Syntax:
- fits [new|mask|slice] - [<filename>]
-      - [width|height|depth|bitpix]
+ fits [new|mask|slice] [<filename>]
+      [width|height|depth|bitpix]
     [size [wcs|wcsa...wcsz] [fk4|fk5|icrs|galactic|ecliptic] [degrees|arcmin|arcsecs]]
     [header [<ext>] [keyword @@ -1210,8 +1086,7 @@ $xpaget ds9 fits depth
$xpaget ds9 fits bitpix
$xpaget ds9 fits size
- $xpaget ds9 fits size wcs - fk5 arcmin
+ $xpaget ds9 fits size wcs fk5 arcmin
$xpaget ds9 fits header # primary
$xpaget ds9 fits header 2 # hdu 2
$xpaget ds9 fits header -2 # hdu 2 with inherit
@@ -1220,8 +1095,7 @@ $xpaget ds9 fits image > foo.fits
$xpaget ds9 fits table > bar.fits
$xpaget ds9 fits slice > foo.fits
- $xpaset -p ds9 fits - foo.fits
+ $xpaset -p ds9 fits foo.fits
$xpaset -p ds9 fits new foo.fits
$xpaset -p ds9 fits bar.fits[bin=detx,dety]
$xpaset -p ds9 fits slice foo.fits
@@ -1234,12 +1108,10 @@

frame

Controls frame functions. Frames may be created, deleted, - reset, - and centered. While return the current frame number. If you goto - a - frame that does not exists, it will be created. If the frame is - hidden, it will be shown. The 'frameno' option is available for - backward compatibility.

+ reset, and centered. While return the current frame number. If + you goto a frame that does not exists, it will be created. If + the frame is hidden, it will be shown. The 'frameno' option is + available for backward compatibility.

Syntax:
frame [center [#|all]]
      [clear [#|all]]
@@ -1259,32 +1131,27 @@       [last]
      [frameno #]
      [#]
- -       [match <coordsys>]
-       [lock - <coordsys>|none]
+       [match <coordsys>]
+       [lock <coordsys>|none]
      [has [amplifier|datamin|datasec|detector|grid|iis|irafmin|physical|smooth]]
      [has contour [aux]]]
      [has fits [bin|cube|mosaic]]
      [has marker [highlite|paste|select|undo]]
-       [has system - <coordsys>]
- -       [has wcs +       [has system <coordsys>]
+       [has wcs [<wcssys>]]
-       [has wcs - celestial [<wcssys>]]
-       - [has wcs linear [<wcssys>]]
+       [has wcs celestial + [<wcssys>]]
+       [has wcs linear + [<wcssys>]]
 
Example:
$xpaget ds9 frame # returns the id of the current frame
$xpaget ds9 frame frameno # returns the id of the current frame
$xpaget ds9 frame all # returns the id of all frames
- $xpaget ds9 frame active # returns the id of all active - frames
+ $xpaget ds9 frame active # returns the id of all active frames
 $xpaget ds9 frame lock
$xpaget ds9 frame has amplifier
$xpaget ds9 frame has datamin
@@ -1343,15 +1210,13 @@ $xpaget ds9 gif > foo.gif
$xpaset -p ds9 gif foo.gif
$xpaset -p ds9 gif new foo.gif
- - $xpaset -p ds9 gif slice foo.gif
- $cat - foo.gif | xpaset ds9 gif # not available windows
+ $xpaset -p ds9 gif slice foo.gif
+ $cat foo.gif | xpaset ds9 gif # not available + windows
$cat foo.gif | xpaset ds9 gif new # not - available - windows
- $cat foo.gif | xpaset ds9 gif slice - # not available windows + available windows
+ $cat foo.gif | xpaset ds9 gif slice # + not available windows

grid

Controls coordinate grid. For grid numeric format syntax,  click here.

@@ -1367,14 +1232,11 @@       [grid width <value>]
      [grid dash yes|no]
      [grid gap1 <value>]
- -       [grid gap2 +       [grid gap2 <value>]
- -       [grid gap3 - <value>]
-       [axes - yes|no]
+       [grid + gap3 <value>]
+       [axes yes|no]
      [axes color <color>]
      [axes width <value>]
      [axes dash yes|no]
@@ -1394,22 +1256,17 @@       [numerics yes|no]
      [numerics font times|helvetica|courier]
-       [numerics fontsize - <value>]
-       [numerics fontweight - normal|bold]
-       [numerics fontslant - roman|italic]
+       [numerics fontsize <value>]
+       [numerics fontweight normal|bold]
+       [numerics fontslant roman|italic]
      [numerics color <color>]
-       [numerics gap1 - <value>]
-       - [numerics gap2 <value>]
- -       [numerics gap3 - <value>]
-       - [numerics type interior|exterior]
+       [numerics gap1 <value>]
+       [numerics gap2 + <value>]
+       [numerics + gap3 <value>]
+       [numerics type + interior|exterior]
      [numerics vertical yes|no]
      [title yes|no]
      [title text <text>]
@@ -1422,20 +1279,15 @@       [title fontslant roman|italic]
      [title color <color>]
      [labels yes|no]
- -       [labels def1 yes|no]
+       [labels def1 yes|no]
      [labels def2 yes|no]
- -       [labels text1 <text>]
- -       [labels text2 +       [labels text1 <text>]
+       [labels text2 <text>]
-       - [labels gap1 <value>]
-       - [labels gap2 <value>]
- -       [labels font +       [labels gap1 + <value>]
+       [labels gap2 <value>]
+       [labels font times|helvetica|courier]
      [labels fontsize <value>]
      [labels fontweight normal|bold]
@@ -1457,10 +1309,8 @@ $xpaget ds9 grid grid width
$xpaget ds9 grid grid dash
$xpaget ds9 grid grid gap1
- $xpaget ds9 grid grid - gap2
- $xpaget ds9 grid grid - gap3
+ $xpaget ds9 grid grid gap2
+ $xpaget ds9 grid grid gap3
 $xpaget ds9 grid axes
$xpaget ds9 grid axes color
$xpaget ds9 grid axes width
@@ -1484,10 +1334,8 @@ $xpaget ds9 grid numerics fontslant
$xpaget ds9 grid numerics color
$xpaget ds9 grid numerics gap1
- $xpaget ds9 grid - numerics gap2
- $xpaget ds9 grid numerics - gap3
+ $xpaget ds9 grid numerics gap2
+ $xpaget ds9 grid numerics gap3
 $xpaget ds9 grid numerics type
$xpaget ds9 grid numerics vertical
$xpaget ds9 grid title
@@ -1523,8 +1371,7 @@ $xpaset -p ds9 grid grid dash yes
$xpaset -p ds9 grid grid gap1 10
$xpaset -p ds9 grid grid gap2 10
- $xpaset -p ds9 - grid grid gap3 10
+ $xpaset -p ds9 grid grid gap3 10
 $xpaset -p ds9 grid axes yes
$xpaset -p ds9 grid axes color red
$xpaset -p ds9 grid axes width 2
@@ -1548,12 +1395,9 @@ $xpaset -p ds9 grid numerics fontslant italic
$xpaset -p ds9 grid numerics color red
$xpaset -p ds9 grid numerics gap1 10
- $xpaset -p - ds9 grid numerics gap2 10
- $xpaset -p ds9 - grid numerics gap3 10
- $xpaset -p ds9 grid numerics - type exterior
+ $xpaset -p ds9 grid numerics gap2 10
+ $xpaset -p ds9 grid numerics gap3 10
+ $xpaset -p ds9 grid numerics type exterior
$xpaset -p ds9 grid numerics vertical yes
$xpaset -p ds9 grid title yes
$xpaset -p ds9 grid title text {Hello World}
@@ -1584,8 +1428,7 @@

header

Display current fits header dialog. Optional extension number - maybe specified. Please note, this differs from xpa fits - header.

+ maybe specified. Please note, this differs from xpa fits header.

Syntax:
header [<ext>]
       [close [<ext>]]
@@ -1619,17 +1462,13 @@ $xpaset -p ds9 iconify yes

iexam

Interactive examine function. A blinking cursor will indicate - to - the user to click on a point on an image. The specified - information - will be returned at that time. The default event is + to the user to click on a point on an image. The specified + information will be returned at that time. The default event is button. In the last form, the following macros will be expanded if present: $width, $height, $depth, $bitpix, $filename, $regions, $filename[$regions], $env, $pan, $value, - $x, - $y, $z. See Analysis - Macros - for more information.
+ $x, $y, $z. See Analysis + Macros for more information.

Syntax:
iexam []
@@ -1637,15 +1476,14 @@ <coordsys> [<skyframe>] [<skyformat>]
      [[]|button|key|any] data [width][height]
-       - [[]|button|key|any] <macro string>]
+       [[]|button|key|any] + <macro string>]
 
Example:
$xpaget ds9 iexam # image coordinates
- $xpaget ds9 - iexam coordinate image
- $xpaget ds9 iexam key coordinate - image # return coordinate and key event
+ $xpaget ds9 iexam coordinate image
+ $xpaget ds9 iexam key coordinate image # return coordinate + and key event
$xpaget ds9 iexam coordinate wcs fk5 degrees
$xpaget ds9 iexam coordinate wcs galactic sexagesimal
$xpaget ds9 iexam coordinate fk5
@@ -1665,8 +1503,8 @@ $xpaset -p ds9 iis filename foo.fits
$xpaset -p ds9 iis filename bar.fits 4

jpeg

-

Load JPEG image into current frame. Optional parameters: - jpeg quality (1-100)

+

Load JPEG image into current frame. Optional parameters: jpeg + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
 
@@ -1675,43 +1513,34 @@ $xpaget ds9 jpeg 100 > foo.jpeg
$xpaset -p ds9 jpeg foo.jpeg
$xpaset -p ds9 jpeg new foo.jpeg
- - $xpaset -p ds9 jpeg slice foo.jpeg
- $cat - foo.jpeg | xpaset ds9 jpeg # not available - windows
- $cat foo.jpeg | xpaset ds9 jpeg new - # not available windows
- $cat - foo.jpeg | xpaset ds9 jpeg slice # - not - available windows + $xpaset -p ds9 jpeg slice foo.jpeg
+ $cat foo.jpeg | xpaset ds9 jpeg # + not available windows
+ $cat foo.jpeg | xpaset ds9 jpeg new # + not available windows
+ $cat foo.jpeg | xpaset ds9 jpeg slice # + not available windows

lock

Lock all other frames to the current frame.

Syntax:
lock [frame <coordsys>|none]
     [crosshair <coordsys>|none]
- -      [crop <coordsys>|none]
-      [slice - <coordsys>|none]]
-      [bin - [yes|no]]
+      [crop <coordsys>|none]
+      [slice <coordsys>|none]]
+      [bin [yes|no]]
     [axes [yes|no]]
     [scale [yes|no]]
     [scalelimites [yes|no]]
     [colorbar [yes|no]]
     [block [yes|no]]
- -      [smooth [yes|no]]
+      [smooth [yes|no]]
     [3d [yes|no]]
 
Example:
$xpaget -p ds9 lock frame
$xpaget -p ds9 lock crosshair
- $xpaget -p ds9 lock - crop
+ $xpaget -p ds9 lock crop
$xpaget -p ds9 lock slice
$xpaget -p ds9 lock bin
$xpaget -p ds9 lock axes
@@ -1719,23 +1548,17 @@ $xpaget -p ds9 lock scalelimits
$xpaget -p ds9 lock colorbar
$xpaget -p ds9 lock block
- $xpaget -p ds9 lock - smooth
- $xpaget -p ds9 lock - 3d
+ $xpaget -p ds9 lock smooth
+ $xpaget -p ds9 lock 3d
 $xpaset -p ds9 lock frame wcs
- - $xpaset -p ds9 lock crosshair wcs
- $xpaset -p ds9 - lock crop wcs
+ $xpaset -p ds9 lock crosshair wcs
+ $xpaset -p ds9 lock crop wcs
$xpaset -p ds9 lock slice wcs
$xpaset -p ds9 lock bin yes
$xpaset -p ds9 lock axes yes
- $xpaset -p ds9 lock scale - yes
+ $xpaset -p ds9 lock scale yes
$xpaset -p ds9 lock scalelimits yes
- $xpaset -p ds9 - lock colorbar yes
+ $xpaset -p ds9 lock colorbar yes
$xpaset -p ds9 lock block yes
$xpaset -p ds9 lock smooth yes
$xpaset -p ds9 lock 3d yes
@@ -1775,16 +1598,19 @@ mask [color <color>]
     [mark 1|0]
     [transparency <value>]
-      [clear]
+      [system <coordsys>]
+      [clear]
     [open|close]
 
Example:
$xpaget ds9 mask color
$xpaget ds9 mask mark
+ $xpaget ds9 mask system
$xpaget ds9 mask transparency
$xpaset -p ds9 mask color red
$xpaset -p ds9 mask mark 0
$xpaset -p ds9 mask transparency 50
+ $xpaset -p ds9 mask system wcs
$xpaset -p ds9 mask clear
$xpaset -p ds9 mask open
$xpaset -p ds9 mask close
@@ -1792,14 +1618,11 @@

match

Match all other frames to the current frame.

Syntax:
- match [frame - <coordsys>]
+ match [frame <coordsys>]
      [crosshair <coordsys>]
- -       [crop <coordsys>]
-       [slice - <coordsys>]
+       [crop <coordsys>]
+       [slice <coordsys>]
      [bin]
      [axes]
      [scale]
@@ -1809,15 +1632,12 @@       [smooth]
      [3d]
- - Example:
+ Example:
$xpaset -p ds9 match frame wcs
- $xpaset -p ds9 match - crosshair wcs
+ $xpaset -p ds9 match crosshair wcs
 $xpaset -p ds9 match crop wcs
$xpaset -p ds9 match slice wcs
- $xpaset -p - ds9 match bin
+ $xpaset -p ds9 match bin
$xpaset -p ds9 match axes
$xpaset -p ds9 match scale
$xpaset -p ds9 match scalelimits
@@ -1836,14 +1656,13 @@ $xpaget ds9 mecube > foo.fits
$xpaset -p ds9 mecube foo.fits
$xpaset -p ds9 mecube new foo.fits
- $cat foo.fits | - xpaset ds9 mecube
+ $cat foo.fits | xpaset ds9 mecube
$cat foo.fits | xpaset ds9 mecube new

minmax

This is how DS9 determines  the min and max data values - from the data. SCAN will scan all - data. DATAMIN and IRAFMIN will use the - values of the keywords if present.
+ from the data. SCAN will scan all data. DATAMIN + and IRAFMIN will use the values of the keywords if + present.

Syntax:
minmax [scan|sample|datamin|irafmin]
@@ -1877,14 +1696,11 @@ $xpaset -p ds9 mosaic foo.fits
$xpaset -p ds9 mosaic wcs foo.fits
$xpaset -p ds9 mosaic wcs new foo.fits
- $xpaset -p ds9 mosaic wcs mask - foo.fits
- $cat foo.fits | xpaset - ds9 mosaic
+ $xpaset -p ds9 mosaic wcs mask foo.fits
+ $cat foo.fits | xpaset ds9 mosaic
$cat foo.fits | xpaset ds9 mosaic wcs
$cat foo.fits | xpaset ds9 mosaic wcs new
- $cat - foo.fits | xpaset ds9 mosaic wcs mask
+ $cat foo.fits | xpaset ds9 mosaic wcs mask

mosaicimage

Load FITS mosaic image into current frame.

@@ -1897,35 +1713,31 @@ $xpaset -p ds9 mosaicimage foo.fits
$xpaset -p ds9 mosaicimage wcs foo.fits
$xpaset -p ds9 mosaicimage wcs new foo.fits
- $xpaset -p ds9 mosaicimage wcs mask - foo.fits
- $cat foo.fits | xpaset - ds9 mosaicimage
+ $xpaset -p ds9 mosaicimage wcs mask foo.fits
+ $cat foo.fits | xpaset ds9 mosaicimage
$cat foo.fits | xpaset ds9 mosaicimage wcs
$cat foo.fits | xpaset ds9 mosaicimage wcs new
- - $cat foo.fits | xpaset ds9 mosaicimage wcs mask
+ $cat foo.fits | xpaset ds9 mosaicimage wcs mask

movie
savempeg

-

Create mpeg1 movie from snap shots of the DS9 window. A - slice movie cycles though all slices of a cube. A - frame movie cycles through all active frames. A - 3d movie cycles through specified viewing angles. The - default is frame. Optional parameters for 3d: - number of frames, azimuth from/to, elevation from/to, slice - from/to, oscillate/repeat times.

+

Create mpeg1 movie from snap shots of the DS9 window. A slice + movie cycles though all slices of a cube. A frame + movie cycles through all active frames. A 3d movie + cycles through specified viewing angles. The default is frame. + Optional parameters for 3d: number of frames, azimuth + from/to, elevation from/to, slice from/to, oscillate/repeat + times.

Syntax:
movie [slice|frame|3d] <filename>
- - movie 3d <filename> + movie 3d <filename> [number|azfrom|azto|elfrom|elto|slfrom|slto|oscillate|repeat <#>]
 
Example:
$xpaset -p ds9 movie slice ds9.mpg
- $xpaset -p ds9 - movie 3d ds9.mpg number 10 azfrom -60 azto 60 oscillate 1
+ $xpaset -p ds9 movie 3d ds9.mpg number 10 azfrom -60 + azto 60 oscillate 1

multiframe

Load FITS multiple extension file as multiple images.

@@ -1934,20 +1746,16 @@  
Example:
$xpaset -p ds9 multiframe foo.fits
- $cat - foo.fits | xpaset ds9 multiframe # not - available - windows
+ $cat foo.fits | xpaset ds9 multiframe # + not available windows

nameserver

Support Name Server functions. Coordinates are in fk5.

Syntax:
nameserver [<object>]
           - [name - <object>]
+ [name <object>]
           - [server - ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
+ [server ned-sao|ned-cds|simbad-sao|simbad-cds|vizier-sao|vizier-cds]
           [skyformat degrees|sexagesimal]
           @@ -1992,10 +1800,8 @@ $xpaget ds9 nrrd
$xpaget ds9 nrrd big
$xpaset -p ds9 nrrd foo.nrrd
- $xpaset -p ds9 nrrd new - foo.nrrd
- $xpaset -p ds9 nrrd mask - foo.nrrd
+ $xpaset -p ds9 nrrd new foo.nrrd
+ $xpaset -p ds9 nrrd mask foo.nrrd
 $cat foo.nrrd | xpaset ds9 nrrd
$cat foo.nrrd | xpaset ds9 nrrd new
@@ -2022,19 +1828,15 @@ $xpaget ds9 nvss frame
$xpaset -p ds9 nvss
$xpaset -p ds9 nvss m31
- $xpaset -p ds9 nvss name - m31
- $xpaset -p ds9 nvss name - clear
- $xpaset -p ds9 nvss 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 nvss name m31
+ $xpaset -p ds9 nvss name clear
+ $xpaset -p ds9 nvss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 nvss size 60 60 arcmin
$xpaset -p ds9 nvss save yes
$xpaset -p ds9 nvss frame current
$xpaset -p ds9 nvss update frame
$xpaset -p ds9 nvss open
- $xpaset -p ds9 nvss - close
+ $xpaset -p ds9 nvss close

orient

Controls the orientation of the current frame.

Syntax:
@@ -2072,8 +1874,8 @@ pan [<coordsys> [<skyframe>] [<skyformat>]] # get current coords

- pan [<x> <y> <coordsys> - [<skyframe>]] # relative
+ pan [<x> <y> <coordsys> [<skyframe>]] # + relative
    [to <x> <y> <coordsys> [<skyframe>]] # absolute
    [open|close]
@@ -2106,10 +1908,8 @@

Display and configure data plots. All plot commands take an optional second command, the plot name. If no plot name is specified, the last plot created is assumed. Plot data is - assumed - to be a pair of coordinates, with optional error values. The - follow - are valid data descriptions:

+ assumed to be a pair of coordinates, with optional error values. + The follow are valid data descriptions:

xy        x and y coordinates
xyex      x,y coordinates with x errors
xyey      x,y coordinates with y errors
@@ -2118,425 +1918,263 @@

To create a new plot, use the plot new command.

Syntax:
- # create new empty plot - window
+ # create new empty plot window
 plot []
- -      [line|bar|scatter]
- -      [new]
- -      [new - line|bar|scatter]
-      - [new name <plotname>]
- -      [new name <plotname> +      [line|bar|scatter]
+      [new]
+      [new line|bar|scatter]
+      [new name <plotname>]
+      [new name <plotname> line|bar|scatter]
- # create new - plot with data from stdin
- plot [new - <title> <xaxis label> <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new [line|bar|scatter] - <title> <xaxis label> <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new name + # create new plot with data from stdin
+ plot [new <title> <xaxis label> + <yaxis label> xy|xyex|xyey|xyexey]
+      [new + [line|bar|scatter] <title> <xaxis label> <yaxis + label> xy|xyex|xyey|xyexey]
+      [new name <plotname> <title> <xaxis label> - <yaxis label> - xy|xyex|xyey|xyexey]
- -      [new name + <yaxis label> xy|xyex|xyey|xyexey]
+      [new name <plotname> line|bar|scatter <title> - <xaxis - label> <yaxis label> - xy|xyex|xyey|xyexey]
+ <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]
- - # create new plot with data from stdin which includes - title/dim - headers
- plot [new - stdin]
-      - [new [line|bar|scatter] - stdin]
- -      [new name <plotname> - stdin]
-      - [new name <plotname> line|bar|scatter + # create new plot with data from stdin which includes + title/dim headers
+ plot [new stdin]
+      [new [line|bar|scatter] stdin]
+      [new name + <plotname> stdin]
+      [new name + <plotname> line|bar|scatter stdin]
- # - load data into existing plot from stdin
- - plot [[<plotname>] data - xy|xyex|xyey|xyexey]
+ # load data into existing plot from stdin
+ plot [[<plotname>] data xy|xyex|xyey|xyexey]
- # existing - plot
+ # existing plot
 plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
- -      [[<plotname>] save - <filename>]
-      - [[<plotname>] clear]
- -      [[<plotname>] - duplicate - [#]]
-      - [[<plotname>] stats yes|no]
- -      [[<plotname>] list - yes|no]
-      - [[<plotname>] loadconfig +      [[<plotname>] save <filename>]
-      - [[<plotname>] saveconfig <filename>]
- -      [[<plotname>] pagesetup orient - portrait|landscape]
-      - [[<plotname>] pagesetup size - letter|legal|tabloid|poster|a4]
- -      [[<plotname>] - print]
-      - [[<plotname>] print destination - printer|file]
-      - [[<plotname>] print command - <command>]
-      - [[<plotname>] print filename +      [[<plotname>] clear]
+      [[<plotname>] + duplicate [#]]
+      [[<plotname>] + stats yes|no]
+      [[<plotname>] + list yes|no]
+      [[<plotname>] + loadconfig <filename>]
+      [[<plotname>] saveconfig <filename>]
-      - [[<plotname>] print color rgb|gray]
- -      [[<plotname>] +      [[<plotname>] pagesetup + orient portrait|landscape]
+      [[<plotname>] pagesetup + size letter|legal|tabloid|poster|a4]
+      [[<plotname>] print]
+      [[<plotname>] print + destination printer|file]
+      [[<plotname>] print + command <command>]
+      [[<plotname>] print + filename <filename>]
+      [[<plotname>] print + color rgb|gray]
+      [[<plotname>] close]
-      - [[<plotname>] mode pointer|zoom]
- -
+      [[<plotname>] + mode pointer|zoom]
+
# configure graph
- plot - [[<plotname>] axis x|y grid yes|no]
- -      [[<plotname>] axis x|y log + plot [[<plotname>] axis x|y grid yes|no]
+      [[<plotname>] axis x|y + log yes|no]
+      [[<plotname>] axis x|y + flip yes|no]
+      [[<plotname>] axis x|y auto yes|no]
-      - [[<plotname>] axis x|y flip yes|no]
- -      [[<plotname>] axis x|y auto - yes|no]
-      - [[<plotname>] axis x|y min <value>]
- -      [[<plotname>] axis x|y max +      [[<plotname>] axis x|y min <value>]
-      - [[<plotname>] axis x|y format +      [[<plotname>] axis x|y max + <value>]
+      [[<plotname>] axis x|y format <string>]
-      - [[<plotname>] legend yes|no]
- -      [[<plotname>] legend position - right|left|top|bottom]
-      - [[<plotname>] font title|labels|numbers font - times|helvetica|courier]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] + legend yes|no]
+      [[<plotname>] legend + position right|left|top|bottom]
+      [[<plotname>] font + title|labels|numbers font times|helvetica|courier]
+      [[<plotname>] font title|labels|numbers size <value>]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers weight normal|bold]
-      - [[<plotname>] font title|labels|numbers +      [[<plotname>] font title|labels|numbers slant roman|italic]
-      - [[<plotname>] title <string>]
- -      [[<plotname>] title x|y +      [[<plotname>] title + <string>]
+      [[<plotname>] title x|y <string>]
-      - [[<plotname>] barmode - normal|stacked|aligned|overlap]
+      [[<plotname>] + barmode normal|stacked|aligned|overlap]
- - # configure current dataset
- plot - [[<plotname>] show yes|no]
-   -    [[<plotname>] shape + # configure current dataset
+ plot [[<plotname>] show yes|no]
+      [[<plotname>] shape circle|square|diamond|plus|splus|scross|triangle|arrow]
      [[<plotname>] shape fill yes|no]
- -      [[<plotname>] shape - color <value>]
- -      [[<plotname>] smooth - step|linear|cubic|quadratic|catrom]
- -      [[<plotname>] color - <value>]
-      - [[<plotname>] width <value>]
- -      [[<plotname>] dash - yes|no]
-      - [[<plotname>] error yes|no]
- -      [[<plotname>] error +      [[<plotname>] + shape color <value>]
+      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]
+      [[<plotname>] color <value>]
-      - [[<plotname>] color <value>]
- -      [[<plotname>] error +      [[<plotname>] width <value>]
- -      [[<plotname>] name - <string>]
+      [[<plotname>] + dash yes|no]
+      [[<plotname>] + error yes|no]
+      [[<plotname>] + error color <value>]
+      [[<plotname>] color + <value>]
+      [[<plotname>] + error width <value>]
+      [[<plotname>] + name <string>]
- # select - current dataset
- plot [[<plotname>] - select <value>]
- -  
+ # select current dataset
+ plot [[<plotname>] select <value>]
+  
 Example:
- # - return all plotnames
- $xpaget ds9 - plot
+ # return all plotnames
+ $xpaget ds9 plot
- # create new empty plot - window
+ # create new empty plot window
 $xpaset -p ds9 plot
- - $xpaset -p ds9 plot bar
- $xpaset -p ds9 - plot new
- $xpaset -p ds9 plot new - bar
- $xpaset -p ds9 plot new name - foo
- $xpaset -p ds9 plot new name foo - bar
+ $xpaset -p ds9 plot bar
+ $xpaset -p ds9 plot new
+ $xpaset -p ds9 plot new bar
+ $xpaset -p ds9 plot new name foo
+ $xpaset -p ds9 plot new name foo bar
- # create new plot with data - from stdin
- $cat xy.dat | xpaset ds9 plot new - {The Title} {X Axis} {Y Axis} xy
- $cat xy.dat - | xpaset ds9 plot new bar {The Title} {X Axis} {Y Axis} - xy
- $cat xy.dat | xpaset ds9 plot new name foo - {The Title} {X Axis} {Y Axis} xy
- $cat xy.dat - | xpaset ds9 plot new name foo bar {The Title} {X Axis} {Y Axis} - xy
+ # create new plot with data from stdin
+ $cat xy.dat | xpaset ds9 plot new {The Title} {X Axis} + {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new bar {The Title} {X + Axis} {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new name foo {The Title} + {X Axis} {Y Axis} xy
+ $cat xy.dat | xpaset ds9 plot new name foo bar {The + Title} {X Axis} {Y Axis} xy
- # create new plot with data - from stdin which includes title/dim headers
- - $cat stdin.2.dat | xpaset ds9 plot new stdin
- - $cat stdin.2.dat | xpaset ds9 plot new line + # create new plot with data from stdin which includes + title/dim headers
+ $cat stdin.2.dat | xpaset ds9 plot new stdin
+ $cat stdin.2.dat | xpaset ds9 plot new line stdin
+ $cat stdin.2.dat | xpaset ds9 plot new name foo stdin
+ $cat stdin.2.dat | xpaset ds9 plot new name foo line stdin
- $cat stdin.2.dat | xpaset ds9 plot new - name foo stdin
- $cat stdin.2.dat | xpaset ds9 - plot new name foo line stdin
- - # load data into existing plot from - stdin
- $cat xy.dat | xpaset ds9 plot data - xy
- $cat xy.dat | xpaset ds9 plot foo data - xy
+ # load data into existing plot from stdin
+ $cat xy.dat | xpaset ds9 plot data xy
+ $cat xy.dat | xpaset ds9 plot foo data xy
- # existing - plot
+ # existing plot
 $xpaget ds9 plot stats
- - $xpaget ds9 plot list
- $xpaset -p ds9 plot - load xy.dat xy
- $xpaset -p ds9 plot save - foo.dat
- $xpaset -p ds9 plot - clear
- $xpaset -p ds9 plot duplicate - 1
- $xpaset -p ds9 plot stats - yes
- $xpaset -p ds9 plot list - yes
- $xpaset -p ds9 plot loadconfig - foo.plt
- $xpaset -p ds9 plot saveconfig - foo.plt
- $xpaset -p ds9 plot pagesetup orient - portrait
- $xpaset -p ds9 plot pagesetup size - letter
- $xpaset -p ds9 plot - print
- $xpaset -p ds9 plot print destination - file
- $xpaset -p ds9 plot print command - lp
- $xpaset -p ds9 plot print filename - foo.ps
- $xpaset -p ds9 plot print color - rgb
- $xpaset -p ds9 plot - close
+ $xpaget ds9 plot list
+ $xpaset -p ds9 plot load xy.dat xy
+ $xpaset -p ds9 plot save foo.dat
+ $xpaset -p ds9 plot clear
+ $xpaset -p ds9 plot duplicate 1
+ $xpaset -p ds9 plot stats yes
+ $xpaset -p ds9 plot list yes
+ $xpaset -p ds9 plot loadconfig foo.plt
+ $xpaset -p ds9 plot saveconfig foo.plt
+ $xpaset -p ds9 plot pagesetup orient portrait
+ $xpaset -p ds9 plot pagesetup size letter
+ $xpaset -p ds9 plot print
+ $xpaset -p ds9 plot print destination file
+ $xpaset -p ds9 plot print command lp
+ $xpaset -p ds9 plot print filename foo.ps
+ $xpaset -p ds9 plot print color rgb
+ $xpaset -p ds9 plot close
 $xpaget ds9 plot mode
- - $xpaset -p ds9 plot mode pointer
+ $xpaset -p ds9 plot mode pointer
# configure plot
- $xpaget ds9 plot - axis x grid
- $xpaget ds9 plot axis x - log
- $xpaget ds9 plot axis x - flip
- $xpaget ds9 plot axis x - auto
- $xpaget ds9 plot axis x - min
- $xpaget ds9 plot axis x - max
- $xpaget ds9 plot axis x - format
- $xpaset -p ds9 plot axis x grid - yes
- $xpaset -p ds9 plot axis x log - yes
- $xpaset -p ds9 plot axis x flip - yes
- $xpaset -p ds9 plot axis x auto - no
- $xpaset -p ds9 plot axis x min - 1
- $xpaset -p ds9 plot axis x max - 100
- $xpaset -p ds9 plot axis x format - {%f}
+ $xpaget ds9 plot axis x grid
+ $xpaget ds9 plot axis x log
+ $xpaget ds9 plot axis x flip
+ $xpaget ds9 plot axis x auto
+ $xpaget ds9 plot axis x min
+ $xpaget ds9 plot axis x max
+ $xpaget ds9 plot axis x format
+ $xpaset -p ds9 plot axis x grid yes
+ $xpaset -p ds9 plot axis x log yes
+ $xpaset -p ds9 plot axis x flip yes
+ $xpaset -p ds9 plot axis x auto no
+ $xpaset -p ds9 plot axis x min 1
+ $xpaset -p ds9 plot axis x max 100
+ $xpaset -p ds9 plot axis x format {%f}
- $xpaget ds9 plot - legend
- $xpaget ds9 plot legend - position
- $xpaset -p ds9 plot legend - yes
- $xpaset -p ds9 plot legend position - left
+ $xpaget ds9 plot legend
+ $xpaget ds9 plot legend position
+ $xpaset -p ds9 plot legend yes
+ $xpaset -p ds9 plot legend position left
- $xpaget ds9 plot font - numbers font
- $xpaget ds9 plot font numbers - size
- $xpaget ds9 plot font numbers - weight
- $xpaget ds9 plot font numbers - slant
- $xpaset -p ds9 plot font numbers font - times
- $xpaset -p ds9 plot font numbers size - 12
- $xpaset -p ds9 plot font numbers weight - bold
- $xpaset -p ds9 plot font numbers slant - italic
+ $xpaget ds9 plot font numbers font
+ $xpaget ds9 plot font numbers size
+ $xpaget ds9 plot font numbers weight
+ $xpaget ds9 plot font numbers slant
+ $xpaset -p ds9 plot font numbers font times
+ $xpaset -p ds9 plot font numbers size 12
+ $xpaset -p ds9 plot font numbers weight bold
+ $xpaset -p ds9 plot font numbers slant italic
- $xpaget ds9 plot - title
- $xpaget ds9 plot title - xaxis
- $xpaget ds9 plot title - yaxis
- $xpaset -p ds9 plot title {This is a - Title}
- $xpaset -p ds9 plot title x {X - Axis}
- $xpaset -p ds9 plot title y {Y - Axis}
- $xpaset -p ds9 plot title legend {This - is the Legend}
+ $xpaget ds9 plot title
+ $xpaget ds9 plot title xaxis
+ $xpaget ds9 plot title yaxis
+ $xpaset -p ds9 plot title {This is a Title}
+ $xpaset -p ds9 plot title x {X Axis}
+ $xpaset -p ds9 plot title y {Y Axis}
+ $xpaset -p ds9 plot title legend {This is the Legend}
- $xpaget ds9 plot - barmode
- $xpaset -p ds9 plot barmode - aligned
+ $xpaget ds9 plot barmode
+ $xpaset -p ds9 plot barmode aligned
- # configure current - dataset
- $xpaget ds9 plot - show
+ # configure current dataset
+ $xpaget ds9 plot show
 $xpaget ds9 plot shape
- - $xpaget ds9 plot shape fill
- $xpaget ds9 - plot shape color
- $xpaget ds9 plot - smooth
- $xpaget ds9 plot - color
- $xpaget ds9 plot - width
+ $xpaget ds9 plot shape fill
+ $xpaget ds9 plot shape color
+ $xpaget ds9 plot smooth
+ $xpaget ds9 plot color
+ $xpaget ds9 plot width
 $xpaget ds9 plot dash
- - $xpaget ds9 plot error
- $xpaget ds9 plot - error color
- $xpaget ds9 plot error - width
+ $xpaget ds9 plot error
+ $xpaget ds9 plot error color
+ $xpaget ds9 plot error width
 $xpaget ds9 plot name
- - $xpaset -p ds9 plot show yes
- $xpaset -p - ds9 plot shape circle
- $xpaset -p ds9 plot - shape fill no
- $xpaset -p ds9 plot shape color - cyan
- $xpaset -p ds9 plot smooth - step
- $xpaset -p ds9 plot color - red
- $xpaset -p ds9 plot width - 2
- $xpaset -p ds9 plot dash - yes
- $xpaset -p ds9 plot error - yes
- $xpaset -p ds9 plot error color - red
- $xpaset -p ds9 plot error width - 2
- $xpaset -p ds9 plot name {My - Data}
+ $xpaset -p ds9 plot show yes
+ $xpaset -p ds9 plot shape circle
+ $xpaset -p ds9 plot shape fill no
+ $xpaset -p ds9 plot shape color cyan
+ $xpaset -p ds9 plot smooth step
+ $xpaset -p ds9 plot color red
+ $xpaset -p ds9 plot width 2
+ $xpaset -p ds9 plot dash yes
+ $xpaset -p ds9 plot error yes
+ $xpaset -p ds9 plot error color red
+ $xpaset -p ds9 plot error width 2
+ $xpaset -p ds9 plot name {My Data}
- # select current - dataset
- $xpaget ds9 plot - select
+ # select current dataset
+ $xpaget ds9 plot select
 $xpaset -p ds9 plot select 2

png

Load PNG image into current frame.
@@ -2548,25 +2186,20 @@ $xpaget ds9 png > foo.png
$xpaset -p ds9 png foo.png
$xpaset -p ds9 png new foo.png
- - $xpaset -p ds9 png slice foo.png
- $cat - foo.png | xpaset ds9 png # not available - windows
- $cat foo.png | xpaset ds9 png new - # not available windows
- $cat - foo.png | xpaset ds9 png slice # not - available windows
+ $xpaset -p ds9 png slice foo.png
+ $cat foo.png | xpaset ds9 png # + not available windows
+ $cat foo.png | xpaset ds9 png new # + not available windows
+ $cat foo.png | xpaset ds9 png slice # + not available windows

precision

Set region and coordinate output format precision.

Syntax:
precision <linear> <degree> - <hms> - <dms> - <arcmin> - <arcsec>
+ <hms> <dms> + <arcmin> <arcsec>

 Example:
$xpaget ds9 precision
@@ -2606,8 +2239,7 @@       [filename <filename>]
      [color rgb|cmyk|gray]
      [level 1|2]
-       [resolution - 53|72|75|150|300|600]
+       [resolution 53|72|75|150|300|600]
 
Example:
$xpaget ds9 print destination
@@ -2664,12 +2296,10 @@         [skyformat degrees|sexagesimal]
        [strip yes|no]
-         [shape - <shape>]
+         [shape <shape>]
        [color &ltcolor>]
-         [width - <width>]
+         [width <width>]
         [fixed|edit|rotate|delete yes|no]
        @@ -2681,23 +2311,20 @@         [template <filename>]
        [template <filename> - at - <ra> <dec> <coordsys> <skyframe>]
+ at <ra> <dec> <coordsys> <skyframe>]
        [savetemplate <filename>]
        [groups]
        [group new]
        [group <tag> new]
-         [group <tag> - update]
+         [group <tag> update]
        [group <tag> select]
        [group <tag> color &ltcolor>]
        [group <tag> copy]
-         [group <tag> - delete]
+         [group <tag> delete]
        [group <tag> cut]
        [group <tag> font <font>]
@@ -2708,8 +2335,7 @@         [group <tag> moveback]
        [group <tag> - property - <property> yes|no]
+ property <property> yes|no]
        [copy]
        [cut]
        [paste @@ -2723,8 +2349,7 @@ fk4|fk5|icrs|galactic|ecliptic]
        [-skyformat degrees|sexagesimal]
-         [-delim - [nl|<char>]]
+         [-delim [nl|<char>]]
        [-prop select|edit|move|rotate|delete|fixed|include|source 1|0]
        [-group <tag>]
@@ -2774,8 +2399,7 @@ $xpaset -p ds9 regions -format ciao bar.reg # load as ciao format
$xpaset -p ds9 regions foo.fits # FITS regions files do not need - a - format specification
+ a format specification
$xpaset -p ds9 regions load foo.reg # load foo.reg into current frame
$xpaset -p ds9 regions load all foo.reg # load foo.reg into all @@ -2812,19 +2436,16 @@ $xpaset -p ds9 regions width 3
$xpaset -p ds9 regions edit yes
$xpaset -p ds9 regions include
- $xpaset -p ds9 regions command '{circle 100 100 20 # - color=red}'
+ $xpaset -p ds9 regions command '{circle 100 100 20 # color=red}'
$xpaset -p ds9 regions composite
$xpaset -p ds9 regions dissolve
$xpaset -p ds9 regions template foo.tpl
$xpaset -p ds9 regions template foo.tpl at 13:29:55.92 - +47:12:48.02 - fk5
+ +47:12:48.02 fk5
$xpaset -p ds9 regions savetemplate foo.tpl
$xpaset -p ds9 regions group new
$xpaset -p ds9 regions group foo new
- $xpaset -p ds9 - regions group foo update
+ $xpaset -p ds9 regions group foo update
$xpaset -p ds9 regions group foo select
$xpaset -p ds9 regions group foo color red
$xpaset -p ds9 regions group foo copy
@@ -2863,8 +2484,7 @@  
Example:
$xpaget ds9 rgb channel
- $xpaget ds9 rgb lock - wcs
+ $xpaget ds9 rgb lock wcs
$xpaget ds9 rgb lock crop
$xpaget ds9 rgb lock slice
$xpaget ds9 rgb lock bin
@@ -2882,8 +2502,7 @@ $xpaset -p ds9 rgb channel red # set current channel to red
$xpaset -p ds9 rgb view blue no # turn off blue channel
$xpaset -p ds9 rgb system wcs # set rgb coordinate system
- - $xpaset -p ds9 rgb lock wcs yes
+ $xpaset -p ds9 rgb lock wcs yes
$xpaset -p ds9 rgb lock crop yes
$xpaset -p ds9 rgb lock slice yes
$xpaset -p ds9 rgb lock bin yes
@@ -2907,8 +2526,7 @@ $xpaget ds9 rgbarray little > foo.arr
$xpaset -p ds9 rgbarray foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
- $xpaset -p ds9 rgbarray new - foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
+ $xpaset -p ds9 rgbarray new foo.arr[dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 rgbarray [dim=512,zdim=3,bitpix=-32,endian=little]
$cat foo.arr | xpaset ds9 rgbarray new @@ -2923,8 +2541,7 @@ $xpaget ds9 rgbcube > foo.fits
$xpaset -p ds9 rgbcube foo.fits
$xpaset -p ds9 rgbcube new foo.fits
- $cat foo.fits - | xpaset ds9 rgbcube
+ $cat foo.fits | xpaset ds9 rgbcube
$cat foo.fits | xpaset ds9 rgbcube new

rgbimage

Load FITS rgbimage into rgb frame.
@@ -2936,13 +2553,11 @@ $xpaget ds9 rgbimage > foo.fits
$xpaset -p ds9 rgbimage foo.fits
$xpaset -p ds9 rgbimage new foo.fits
- $cat foo.fits - | xpaset ds9 rgbimage
+ $cat foo.fits | xpaset ds9 rgbimage
$cat foo.fits | xpaset ds9 rgbimage new

rotate

-

Controls the rotation angle (in degrees) of the current - frame.

+

Controls the rotation angle (in degrees) of the current frame.

Syntax:
rotate [<value>]
       [to <value>]
@@ -2968,8 +2583,7 @@ $xpaset -p ds9 save fits foo.fits table
$xpaset -p ds9 save fits foo.fits slice
$xpaset -p ds9 save rgbimage foo.fits
- $xpaset -p - ds9 save rgbcube foo.fits
+ $xpaset -p ds9 save rgbcube foo.fits
$xpaset -p ds9 save mecube foo.fits
$xpaset -p ds9 save mosaic foo.fits
$xpaset -p ds9 save mosaicimage foo.fits
@@ -2981,8 +2595,7 @@ parameters: jpeg quality (1-100) and tiff compression method.

Syntax:
- saveimage [fits|eps|gif|tiff|jpeg|png] - <filename>
+ saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
saveimage <filename>.jpeg [1-100]
saveimage <filename>.tiff [none|jpeg|packbits|deflate]
 
@@ -3072,67 +2685,49 @@

Support for VO Simple Image Access protocol. The first command will create a new search. All other commands operated on the - last - search created, unless indicated otherwise.

+ last search created, unless indicated otherwise.

Syntax:
- sia - [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]
+ sia [2mass|akari|astrowise|cadc|cxc|mast|sdss|skyview|tgssadr]

-     [<ref>] - [cancel]
-     [<ref>] - [clear]
-     [<ref>] - [close]
+     [<ref>] [cancel]
+     [<ref>] [clear]
+     [<ref>] [close]
    [<ref>] [coordinate <ra> <dec> <coordsys>]
- -     [<ref>] [crosshair]
+     [<ref>] [crosshair]
    [<ref>] [export sb|tsv <filename>]
-     [<ref>] - [name <object>]
-     [<ref>] - [print]
+     [<ref>] [name <object>]
+     [<ref>] [print]
    [<ref>] [retrieve]
-     [<ref>] [save - <filename>]
+     [<ref>] [save <filename>]
    [<ref>] [radius <value> degrees|arcmin|arcsec]
-     [<ref>] [sky - <skyframe>]
-     [<ref>] - [skyformat <skyformat>]
-     - [<ref>] [system <coordsys>]
- -     [<ref>] [update]
+     [<ref>] [sky <skyframe>]
+     [<ref>] [skyformat + <skyformat>]
+     [<ref>] [system + <coordsys>]
+     [<ref>] [update]
 
Example:
$xpaget ds9 sia
$xpaset -p ds9 sia 2mass
- $xpaset -p ds9 sia - cancel
+ $xpaset -p ds9 sia cancel
 $xpaset -p ds9 sia clear
- $xpaset - -p ds9 sia close
- $xpaset -p ds9 sia coordinate 202.48 - 47.21 fk5
+ $xpaset -p ds9 sia close
+ $xpaset -p ds9 sia coordinate 202.48 47.21 fk5
 $xpaset -p ds9 sia crosshair
- - $xpaset -p ds9 sia export tsv bar.tsv
- $xpaset -p - ds9 sia name m51
+ $xpaset -p ds9 sia export tsv bar.tsv
+ $xpaset -p ds9 sia name m51
 $xpaset -p ds9 sia print
$xpaset -p ds9 sia retrieve
$xpaset -p ds9 sia save foo.xml
- $xpaset -p ds9 sia - radius 1 degrees
+ $xpaset -p ds9 sia radius 1 degrees
$xpaset -p ds9 sia sky fk5
$xpaset -p ds9 sia skyformat degrees
- $xpaset -p ds9 - sia system wcs
+ $xpaset -p ds9 sia system wcs
 $xpaset -p ds9 sia update

 single @@ -3152,8 +2747,7 @@         [name <object>|clear]
        [<ra> - <dec>] - # in wcs fk5
+ <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -3175,12 +2769,9 @@ $xpaget ds9 skyview survey
$xpaset -p ds9 skyview
$xpaset -p ds9 skyview m31
- $xpaset -p ds9 skyview - name m31
- $xpaset -p ds9 skyview name - clear
- $xpaset -p ds9 skyview 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 skyview name m31
+ $xpaset -p ds9 skyview name clear
+ $xpaset -p ds9 skyview 00:42:44.404 +41:16:08.78
$xpaset -p ds9 skyview size 60 60 arcmin
$xpaset -p ds9 skyview pixels 600 600
$xpaset -p ds9 skyview save yes
@@ -3188,8 +2779,7 @@ $xpaset -p ds9 skyview update frame
$xpaset -p ds9 skyview survey sdssi
$xpaset -p ds9 skyview open
- $xpaset -p ds9 skyview - close
+ $xpaset -p ds9 skyview close

sleep

Delays execution for specified number of seconds. Default is 1 second.
@@ -3206,8 +2796,7 @@ Boxcar width = 2*radius+1
Tophat diameter = 2*radius+1
Gaussian diameter = 2*radius+1, mean =0
- Elliptical Gaussian diameter = 2*radius+1, mean - =0
+ Elliptical Gaussian diameter = 2*radius+1, mean =0
  
Syntax:

@@ -3215,60 +2804,47 @@        [yes|no]
       [function boxcar|tophat|gaussian]
- -        [radius +        [radius <value>]
- -        [radiusminor - <value>]
- -        - [sigma - <value>]
- -        +        + [radiusminor <value>]
+        + + [sigma <value>]
+        + [sigmaminor <value>]
- -        +        [angle + <value>]
- -        [match]
+     +    [match]
       [lock [yes|no]]
       [open|close]

 Example:
$xpaget ds9 smooth
$xpaget ds9 smooth function
- $xpaget ds9 smooth - radius
- $xpaget ds9 smooth - radiusminor
- $xpaget ds9 - smooth sigma
- - $xpaget ds9 smooth - sigmaminor
+ $xpaget ds9 smooth radius
+ $xpaget ds9 smooth radiusminor
+ $xpaget ds9 smooth sigma
+ $xpaget + ds9 smooth sigmaminor
 $xpaget - ds9 - smooth lock
+ ds9 smooth lock
$xpaset -p ds9 smooth
$xpaset -p ds9 smooth yes
$xpaset -p ds9 smooth function tophat
- $xpaset -p - ds9 smooth radius 4
- $xpaset - -p ds9 smooth radiusminor 4
- - $xpaset -p ds9 smooth sigma - 2.0
- - $xpaset -p ds9 smooth - sigmaminor 2.0
- - $xpaset -p ds9 - smooth angle - 45
+ $xpaset -p ds9 smooth radius 4
+ $xpaset -p ds9 smooth + radiusminor 4
+ $xpaset + -p ds9 smooth sigma 2.0
+ $xpaset + -p ds9 smooth sigmaminor 2.0
+ $xpaset + -p ds9 smooth angle 45
 $xpaset -p ds9 smooth match
$xpaset -p ds9 smooth lock yes
@@ -3304,28 +2880,23 @@ $xpaget ds9 threads
$xpaset -p ds9 threads 8

tiff

-

Load TIFF image into current frame. Optional parameters: - tiff compression method.

+

Load TIFF image into current frame. Optional parameters: tiff + compression method.

Syntax:
- tiff [new|slice] [<filename>] - [none|jpeg|packbits|deflate]
+ tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
 
Example:
$xpaget ds9 tiff > foo.tiff
$xpaget ds9 tiff jpeg > foo.tiff
$xpaset -p ds9 tiff foo.tiff
$xpaset -p ds9 tiff new foo.tiff
- - $xpaset -p ds9 tiff slice foo.tiff
- $cat - foo.tiff | xpaset ds9 tiff # not available - windows
- $cat foo.tiff | xpaset ds9 tiff new - # not available windows
- $cat - foo.tiff | xpaset ds9 tiff slice # - not - available windows + $xpaset -p ds9 tiff slice foo.tiff
+ $cat foo.tiff | xpaset ds9 tiff # + not available windows
+ $cat foo.tiff | xpaset ds9 tiff new # + not available windows
+ $cat foo.tiff | xpaset ds9 tiff slice # + not available windows

tile

Controls the tile display mode.

Syntax:
@@ -3362,9 +2933,8 @@ form, the first argument is the number of the fits HDU (starting with 1) and the remaining args are a bounding box in IMAGE coordinates. By default, the screen is updated the next - available - idle cycle. However, you may force an immediate update by - specifying the NOW option.

+ available idle cycle. However, you may force an immediate update + by specifying the NOW option.

Syntax:
update []
       [# x1 y1 x2 y2]
@@ -3413,8 +2983,7 @@       [units yes|no]
      [image|physical|wcs|wcsa...wcsz yes|no]
-       [frame - yes|no]
+       [frame yes|no]
       [red yes|no]
      [green yes|no]
      [blue yes|no]
@@ -3437,8 +3006,7 @@ $xpaget ds9 view image
$xpaget ds9 view wcsa
$xpaget ds9 view red
- $xpaget ds9 view - frame
+ $xpaget ds9 view frame
 $xpaset -p ds9 view layout vertical
$xpaset -p ds9 view keyvalue BITPIX
$xpaset -p ds9 view info yes
@@ -3454,8 +3022,7 @@ $xpaset -p ds9 view lowhigh yes
$xpaset -p ds9 view units yes
$xpaset -p ds9 view wcsa yes
- $xpaset -p ds9 view - frame yes
+ $xpaset -p ds9 view frame yes
$xpaset -p ds9 view red yes
$xpaset -p ds9 view green yes
$xpaset -p ds9 view blue yes
@@ -3469,8 +3036,7 @@       [<ra> <dec>] # in wcs fk5
      [size <width> - <height> - degrees|arcmin|arcsec]
+ <height> degrees|arcmin|arcsec]
      [save yes|no]
      [frame new|current]
      [update frame|crosshair]
@@ -3486,20 +3052,16 @@ $xpaget ds9 vla survey
$xpaset -p ds9 vla
$xpaset -p ds9 vla m31
- $xpaset -p ds9 vla name - m31
- $xpaset -p ds9 vla name - clear
- $xpaset -p ds9 vla 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 vla name m31
+ $xpaset -p ds9 vla name clear
+ $xpaset -p ds9 vla 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vla size 60 60 arcmin
$xpaset -p ds9 vla save yes
$xpaset -p ds9 vla frame current
$xpaset -p ds9 vla update frame
$xpaset -p ds9 vla survey stripe82
$xpaset -p ds9 vla open
- $xpaset -p ds9 vla - close
+ $xpaset -p ds9 vla close

vlss

Support for NRAO VLSS Sky Survey.

@@ -3523,19 +3085,15 @@ $xpaget ds9 vlss frame
$xpaset -p ds9 vlss
$xpaset -p ds9 vlss m31
- $xpaset -p ds9 vlss name - m31
- $xpaset -p ds9 vlss name - clear
- $xpaset -p ds9 vlss 00:42:44.404 - +41:16:08.78
+ $xpaset -p ds9 vlss name m31
+ $xpaset -p ds9 vlss name clear
+ $xpaset -p ds9 vlss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vlss size 60 60 arcmin
$xpaset -p ds9 vlss save yes
$xpaset -p ds9 vlss frame current
$xpaset -p ds9 vlss update frame
$xpaset -p ds9 vlss open
- $xpaset -p ds9 vlss - close
+ $xpaset -p ds9 vlss close

vo

Invoke an connection to a Virtual Observatory site.

@@ -3569,16 +3127,12 @@

wcs

Controls the World Coordinate System for the current frame. If the wcs system, skyframe, or skyformat is modified, the info - panel, - compass, grid, and alignment will be modified accordingly. Also, - using this access point, 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 . Please see WCS for more - information.

+ panel, compass, grid, and alignment will be modified + accordingly. Also, using this access point, 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 . Please see WCS for more information.

Syntax:
wcs [[system] wcs|wcsa...wcsz]
    [[sky] fk4|fk5|icrs|galactic|ecliptic]
@@ -3598,11 +3152,9 @@ $xpaset -p ds9 wcs wcs
$xpaset -p ds9 wcs system wcs
$xpaset -p ds9 wcs fk5
- $xpaset -p ds9 wcs sky - fk5
+ $xpaset -p ds9 wcs sky fk5
 $xpaset -p ds9 wcs sexagesimal
- - $xpaset -p ds9 wcs skyformat sexagesimal
+ $xpaset -p ds9 wcs skyformat sexagesimal
$xpaset -p ds9 wcs align yes
$xpaset -p ds9 wcs reset
$xpaset -p ds9 wcs reset 3
diff --git a/ds9/library/mask.tcl b/ds9/library/mask.tcl index 58036b4..10e754b 100644 --- a/ds9/library/mask.tcl +++ b/ds9/library/mask.tcl @@ -12,6 +12,7 @@ proc MaskDef {} { set imask(top) .msk set imask(mb) .mskmb + set mask(system) physical set mask(color) red set mask(mark) 1 set mask(transparency) 0 @@ -19,24 +20,6 @@ proc MaskDef {} { array set pmask [array get mask] } -proc MaskMark {} { - global mask - global current - - if {$current(frame) != {}} { - $current(frame) mask mark $mask(mark) - } -} - -proc MaskColor {} { - global mask - global current - - if {$current(frame) != {}} { - $current(frame) mask color $mask(color) - } -} - proc MaskTransparency {} { global mask global current @@ -166,6 +149,7 @@ proc UpdateMaskMenu {} { set mask(color) [$current(frame) get mask color] set mask(mark) [$current(frame) get mask mark] + set mask(system) [$current(frame) get mask system] set mask(transparency) [$current(frame) get mask transparency] switch -- [$current(frame) get type] { @@ -190,6 +174,7 @@ proc MaskLoad {} { if {$rr} { $current(frame) mask color $mask(color) $current(frame) mask mark $mask(mark) + $current(frame) mask system $mask(system) } } return $rr @@ -210,8 +195,12 @@ proc MaskParamsDialog {} { # Param set f [ttk::frame $w.param] + ttk::label $f.coordtitle -text [msgcat::mc {Coordinate System}] + CoordMenuButton $f.coordbutton mask system 1 {} {} {} + ttk::label $f.colortitle -text [msgcat::mc {Color}] ColorMenuButton $f.colorbutton ed color {} + ttk::label $f.marktitle -text [msgcat::mc {Block}] ttk::radiobutton $f.markz -text [msgcat::mc {Zero}] \ -variable ed(mark) -value 0 @@ -219,6 +208,7 @@ proc MaskParamsDialog {} { -variable ed(mark) -value 1 ttk::label $f.marktitle2 -text [msgcat::mc {Value}] + grid $f.coordtitle $f.coordbutton - -padx 2 -pady 2 -sticky w grid $f.colortitle $f.colorbutton - -padx 2 -pady 2 -sticky w grid $f.marktitle $f.markz $f.marknz $f.marktitle2 -padx 2 -pady 2 -sticky w diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac index 4759e50..55596cb 100644 --- a/ds9/parsers/maskparser.tac +++ b/ds9/parsers/maskparser.tac @@ -2,6 +2,8 @@ %} #include def.tin +#include coordsys.tin +#include wcssys.tin #include numeric.tin #include string.tin @@ -12,10 +14,13 @@ %token COLOR_ %token MARK_ %token OPEN_ +%token SYSTEM_ %token TRANSPARENCY_ %% +#include coordsys.trl +#include wcssys.trl #include numeric.trl command : mask @@ -28,9 +33,14 @@ mask : {global parse; set parse(result) mask} | CLEAR_ {MaskClear} | COLOR_ STRING_ {ProcessCmdSet mask color $2 MaskColor} | MARK_ INT_ {ProcessCmdSet mask mark $2 MaskMark} + | SYSTEM_ system | TRANSPARENCY_ numeric {ProcessCmdSet mask transparency $2 MaskTransparency} ; +system : coordsys {ProcessCmdSet mask system $1 MaskSystem} + | wcssys {ProcessCmdSet mask system $1 MaskSystem} + ; + %% proc mask::yyerror {msg} { diff --git a/ds9/parsers/masksendparser.tac b/ds9/parsers/masksendparser.tac index bfb4f8a..9fdb15d 100644 --- a/ds9/parsers/masksendparser.tac +++ b/ds9/parsers/masksendparser.tac @@ -6,12 +6,14 @@ %token COLOR_ %token MARK_ +%token SYSTEM_ %token TRANSPARENCY_ %% masksend : COLOR_ {ProcessSendCmdGet mask color} | MARK_ {ProcessSendCmdGet mask mark} + | SYSTEM_ {ProcessSendCmdGet mask system} | TRANSPARENCY_ {ProcessSendCmdGet mask transparency} ; diff --git a/tksao/frame/base.h b/tksao/frame/base.h index fbc50a5..0450ffc 100644 --- a/tksao/frame/base.h +++ b/tksao/frame/base.h @@ -1553,10 +1553,12 @@ public: // Mask Commands virtual void getMaskColorCmd(); virtual void getMaskMarkCmd(); + virtual void getMaskSystemCmd(); virtual void getMaskTransparencyCmd(); virtual void maskClearCmd() {}; virtual void maskColorCmd(const char*) {}; + virtual void maskSystemCmd(Coord::CoordSystem) {}; virtual void maskTransparencyCmd(float) {}; virtual void maskMarkCmd(int) {}; diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index 5daa343..792f660 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -1942,6 +1942,11 @@ void Base::getMaskMarkCmd() Tcl_AppendResult(interp, "1", NULL); } +void Base::getMaskSystemCmd() +{ + Tcl_AppendResult(interp, "physical", NULL); +} + void Base::getMaskTransparencyCmd() { printDouble(0); diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C index 7d1e5a7..38f5175 100644 --- a/tksao/frame/frame.C +++ b/tksao/frame/frame.C @@ -34,6 +34,7 @@ Frame::Frame(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item) maskColorName = dupstr("red"); maskAlpha = 1; maskMark = 1; + maskSystem = Coord::PHYSICAL; } Frame::~Frame() @@ -387,6 +388,11 @@ void Frame::getMaskMarkCmd() Tcl_AppendResult(interp, "0", NULL); } +void Frame::getMaskSystemCmd() +{ + printCoordSystem(maskSystem); +} + void Frame::getMaskTransparencyCmd() { printDouble((1-maskAlpha)*100.); @@ -406,6 +412,11 @@ void Frame::maskColorCmd(const char* color) maskColorName = dupstr(color); } +void Frame::maskSystemCmd(Coord::CoordSystem sys) +{ + maskSystem = sys; +} + void Frame::maskTransparencyCmd(float tt) { maskAlpha = 1-(tt/100.); diff --git a/tksao/frame/frame.h b/tksao/frame/frame.h index 9acc5e9..8ea57ff 100644 --- a/tksao/frame/frame.h +++ b/tksao/frame/frame.h @@ -29,6 +29,7 @@ class Frame : public FrameBase { char* maskColorName; float maskAlpha; int maskMark; + Coord::CoordSystem maskSystem; private: unsigned char* blend(unsigned char*, unsigned char*, int, int); @@ -53,14 +54,17 @@ class Frame : public FrameBase { Frame(Tcl_Interp*, Tk_Canvas, Tk_Item*); virtual ~Frame(); + void maskClearCmd(); + void getMaskColorCmd(); void getMaskMarkCmd(); + void getMaskSystemCmd(); void getMaskTransparencyCmd(); - void maskClearCmd(); void maskColorCmd(const char*); - void maskTransparencyCmd(float); void maskMarkCmd(int mm) {maskMark=mm;} + void maskSystemCmd(Coord::CoordSystem); + void maskTransparencyCmd(float); void colormapCmd(int, float, float, int, unsigned char*, int); void colormapBeginCmd(); diff --git a/tksao/frame/parser.C b/tksao/frame/parser.C index fe60e66..c0b0301 100644 --- a/tksao/frame/parser.C +++ b/tksao/frame/parser.C @@ -1064,18 +1064,18 @@ union yyalloc #endif /* YYFINAL -- State number of the termination state. */ -#define YYFINAL 353 +#define YYFINAL 354 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 5122 +#define YYLAST 5439 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 348 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 216 /* YYNRULES -- Number of rules. */ -#define YYNRULES 1244 +#define YYNRULES 1246 /* YYNRULES -- Number of states. */ -#define YYNSTATES 2757 +#define YYNSTATES 2760 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -1201,84 +1201,84 @@ static const yytype_uint16 yyprhs[] = 1310, 1314, 1317, 1319, 1322, 1324, 1329, 1332, 1334, 1336, 1340, 1342, 1345, 1349, 1352, 1353, 1355, 1360, 1363, 1364, 1369, 1375, 1381, 1382, 1384, 1386, 1388, 1390, 1392, 1394, - 1396, 1398, 1400, 1402, 1404, 1407, 1409, 1412, 1414, 1417, - 1420, 1423, 1426, 1428, 1430, 1432, 1433, 1435, 1436, 1438, - 1439, 1441, 1442, 1444, 1445, 1448, 1451, 1452, 1454, 1457, - 1459, 1466, 1472, 1474, 1476, 1478, 1481, 1484, 1486, 1488, - 1490, 1492, 1495, 1497, 1499, 1501, 1504, 1506, 1508, 1510, - 1513, 1516, 1519, 1520, 1522, 1523, 1525, 1527, 1529, 1531, - 1533, 1535, 1537, 1539, 1542, 1545, 1548, 1550, 1553, 1557, - 1559, 1562, 1565, 1570, 1577, 1579, 1590, 1592, 1595, 1599, - 1603, 1606, 1609, 1612, 1615, 1618, 1621, 1624, 1629, 1634, - 1639, 1643, 1647, 1653, 1658, 1663, 1668, 1672, 1676, 1680, - 1684, 1687, 1690, 1695, 1699, 1703, 1707, 1711, 1716, 1721, - 1726, 1731, 1737, 1742, 1749, 1757, 1762, 1767, 1773, 1776, - 1780, 1784, 1788, 1791, 1795, 1799, 1803, 1807, 1812, 1816, - 1822, 1829, 1833, 1837, 1842, 1846, 1850, 1854, 1858, 1862, - 1868, 1872, 1876, 1881, 1885, 1888, 1891, 1893, 1897, 1902, - 1907, 1912, 1917, 1922, 1929, 1934, 1939, 1945, 1950, 1955, - 1960, 1965, 1971, 1976, 1983, 1991, 1996, 2001, 2007, 2013, - 2019, 2025, 2031, 2037, 2045, 2051, 2057, 2064, 2070, 2076, - 2082, 2088, 2095, 2101, 2109, 2118, 2124, 2130, 2137, 2141, - 2145, 2149, 2153, 2157, 2163, 2167, 2171, 2176, 2180, 2184, - 2188, 2192, 2197, 2201, 2207, 2214, 2218, 2222, 2227, 2231, - 2235, 2239, 2243, 2247, 2253, 2257, 2261, 2266, 2271, 2276, - 2280, 2286, 2291, 2296, 2299, 2303, 2310, 2317, 2319, 2321, - 2323, 2326, 2329, 2332, 2336, 2340, 2343, 2356, 2359, 2362, - 2364, 2368, 2373, 2376, 2377, 2381, 2383, 2385, 2388, 2391, - 2394, 2397, 2400, 2405, 2410, 2415, 2419, 2424, 2430, 2439, - 2446, 2451, 2461, 2468, 2476, 2487, 2499, 2512, 2522, 2528, - 2533, 2540, 2544, 2550, 2556, 2563, 2569, 2574, 2584, 2595, - 2607, 2617, 2624, 2631, 2638, 2645, 2652, 2659, 2666, 2673, - 2680, 2688, 2696, 2699, 2704, 2709, 2714, 2719, 2725, 2730, - 2735, 2741, 2747, 2751, 2756, 2761, 2766, 2771, 2779, 2789, - 2796, 2807, 2819, 2832, 2842, 2846, 2849, 2853, 2859, 2867, - 2872, 2876, 2880, 2887, 2895, 2903, 2908, 2913, 2918, 2928, - 2933, 2937, 2942, 2950, 2958, 2961, 2965, 2969, 2973, 2978, - 2981, 2984, 2989, 3000, 3004, 3006, 3010, 3013, 3016, 3019, - 3022, 3026, 3032, 3037, 3043, 3046, 3054, 3058, 3061, 3064, - 3068, 3071, 3074, 3077, 3081, 3084, 3088, 3093, 3097, 3101, - 3108, 3113, 3116, 3120, 3123, 3126, 3131, 3135, 3139, 3142, - 3146, 3148, 3151, 3153, 3156, 3159, 3162, 3164, 3166, 3168, - 3170, 3173, 3175, 3178, 3181, 3183, 3186, 3189, 3191, 3194, - 3196, 3198, 3200, 3202, 3204, 3206, 3208, 3210, 3211, 3213, - 3216, 3219, 3222, 3226, 3232, 3240, 3248, 3255, 3262, 3269, - 3276, 3282, 3289, 3296, 3303, 3310, 3317, 3324, 3331, 3343, - 3351, 3359, 3367, 3377, 3387, 3398, 3411, 3424, 3427, 3430, - 3434, 3439, 3444, 3449, 3452, 3457, 3462, 3464, 3466, 3468, - 3470, 3472, 3474, 3476, 3478, 3481, 3483, 3485, 3487, 3491, - 3495, 3500, 3507, 3518, 3527, 3535, 3541, 3544, 3547, 3551, - 3556, 3562, 3566, 3572, 3578, 3582, 3587, 3593, 3599, 3605, - 3609, 3615, 3618, 3622, 3626, 3632, 3636, 3640, 3644, 3649, - 3655, 3661, 3665, 3671, 3677, 3681, 3686, 3692, 3698, 3701, - 3704, 3708, 3714, 3721, 3728, 3732, 3736, 3740, 3747, 3753, - 3759, 3762, 3766, 3770, 3776, 3783, 3787, 3790, 3793, 3797, - 3800, 3804, 3807, 3811, 3817, 3824, 3827, 3830, 3833, 3835, - 3840, 3845, 3847, 3850, 3853, 3856, 3859, 3862, 3865, 3868, - 3872, 3875, 3879, 3882, 3886, 3888, 3890, 3892, 3894, 3896, - 3897, 3900, 3901, 3904, 3905, 3907, 3908, 3909, 3911, 3913, - 3915, 3917, 3925, 3934, 3937, 3942, 3945, 3950, 3957, 3960, - 3962, 3964, 3968, 3972, 3974, 3979, 3982, 3984, 3988, 3992, - 3997, 4001, 4005, 4009, 4011, 4013, 4015, 4017, 4019, 4021, - 4023, 4025, 4027, 4029, 4031, 4033, 4035, 4037, 4040, 4041, - 4042, 4045, 4047, 4051, 4053, 4057, 4059, 4062, 4065, 4067, - 4071, 4072, 4073, 4076, 4079, 4081, 4085, 4091, 4093, 4096, - 4099, 4102, 4104, 4106, 4108, 4110, 4115, 4118, 4122, 4126, - 4129, 4133, 4136, 4139, 4142, 4146, 4150, 4154, 4157, 4161, - 4163, 4167, 4171, 4173, 4176, 4179, 4182, 4185, 4195, 4202, - 4204, 4206, 4208, 4210, 4213, 4216, 4220, 4224, 4226, 4229, - 4233, 4237, 4239, 4242, 4244, 4246, 4248, 4250, 4252, 4255, - 4258, 4263, 4265, 4268, 4271, 4274, 4278, 4280, 4282, 4284, - 4287, 4290, 4293, 4296, 4299, 4303, 4307, 4311, 4315, 4319, - 4323, 4327, 4329, 4332, 4335, 4338, 4342, 4345, 4349, 4353, - 4356, 4359, 4362, 4365, 4368, 4371, 4374, 4377, 4380, 4383, - 4386, 4389, 4392, 4395, 4399, 4403, 4407, 4410, 4413, 4416, - 4419, 4422, 4425, 4428, 4431, 4434, 4437, 4440, 4443, 4447, - 4451, 4455, 4460, 4467, 4470, 4472, 4474, 4476, 4478, 4480, - 4481, 4487, 4489, 4496, 4500, 4502, 4506, 4509, 4512, 4516, - 4520, 4523, 4526, 4529, 4532, 4535, 4538, 4542, 4545, 4548, - 4552, 4554, 4558, 4563, 4565, 4568, 4574, 4581, 4588, 4591, - 4593, 4596, 4599, 4605, 4612 + 1396, 1398, 1400, 1402, 1404, 1406, 1409, 1411, 1414, 1416, + 1419, 1422, 1425, 1428, 1430, 1432, 1434, 1435, 1437, 1438, + 1440, 1441, 1443, 1444, 1446, 1447, 1450, 1453, 1454, 1456, + 1459, 1461, 1468, 1474, 1476, 1478, 1480, 1483, 1486, 1488, + 1490, 1492, 1494, 1497, 1499, 1501, 1503, 1506, 1508, 1510, + 1512, 1515, 1518, 1521, 1522, 1524, 1525, 1527, 1529, 1531, + 1533, 1535, 1537, 1539, 1541, 1544, 1547, 1550, 1552, 1555, + 1559, 1561, 1564, 1567, 1572, 1579, 1581, 1592, 1594, 1597, + 1601, 1605, 1608, 1611, 1614, 1617, 1620, 1623, 1626, 1631, + 1636, 1641, 1645, 1649, 1655, 1660, 1665, 1670, 1674, 1678, + 1682, 1686, 1689, 1692, 1697, 1701, 1705, 1709, 1713, 1718, + 1723, 1728, 1733, 1739, 1744, 1751, 1759, 1764, 1769, 1775, + 1778, 1782, 1786, 1790, 1793, 1797, 1801, 1805, 1809, 1814, + 1818, 1824, 1831, 1835, 1839, 1844, 1848, 1852, 1856, 1860, + 1864, 1870, 1874, 1878, 1883, 1887, 1890, 1893, 1895, 1899, + 1904, 1909, 1914, 1919, 1924, 1931, 1936, 1941, 1947, 1952, + 1957, 1962, 1967, 1973, 1978, 1985, 1993, 1998, 2003, 2009, + 2015, 2021, 2027, 2033, 2039, 2047, 2053, 2059, 2066, 2072, + 2078, 2084, 2090, 2097, 2103, 2111, 2120, 2126, 2132, 2139, + 2143, 2147, 2151, 2155, 2159, 2165, 2169, 2173, 2178, 2182, + 2186, 2190, 2194, 2199, 2203, 2209, 2216, 2220, 2224, 2229, + 2233, 2237, 2241, 2245, 2249, 2255, 2259, 2263, 2268, 2273, + 2278, 2282, 2288, 2293, 2298, 2301, 2305, 2312, 2319, 2321, + 2323, 2325, 2328, 2331, 2334, 2338, 2342, 2345, 2358, 2361, + 2364, 2366, 2370, 2375, 2378, 2379, 2383, 2385, 2387, 2390, + 2393, 2396, 2399, 2402, 2407, 2412, 2417, 2421, 2426, 2432, + 2441, 2448, 2453, 2463, 2470, 2478, 2489, 2501, 2514, 2524, + 2530, 2535, 2542, 2546, 2552, 2558, 2565, 2571, 2576, 2586, + 2597, 2609, 2619, 2626, 2633, 2640, 2647, 2654, 2661, 2668, + 2675, 2682, 2690, 2698, 2701, 2706, 2711, 2716, 2721, 2727, + 2732, 2737, 2743, 2749, 2753, 2758, 2763, 2768, 2773, 2781, + 2791, 2798, 2809, 2821, 2834, 2844, 2848, 2851, 2855, 2861, + 2869, 2874, 2878, 2882, 2889, 2897, 2905, 2910, 2915, 2920, + 2930, 2935, 2939, 2944, 2952, 2960, 2963, 2967, 2971, 2975, + 2980, 2983, 2986, 2991, 3002, 3006, 3008, 3012, 3015, 3018, + 3021, 3024, 3028, 3034, 3039, 3045, 3048, 3056, 3060, 3063, + 3066, 3070, 3073, 3076, 3079, 3083, 3086, 3090, 3095, 3099, + 3103, 3110, 3115, 3118, 3122, 3125, 3128, 3133, 3137, 3141, + 3144, 3148, 3150, 3153, 3155, 3158, 3161, 3164, 3166, 3168, + 3170, 3172, 3175, 3177, 3180, 3183, 3185, 3188, 3191, 3193, + 3196, 3198, 3200, 3202, 3204, 3206, 3208, 3210, 3212, 3213, + 3215, 3218, 3221, 3224, 3228, 3234, 3242, 3250, 3257, 3264, + 3271, 3278, 3284, 3291, 3298, 3305, 3312, 3319, 3326, 3333, + 3345, 3353, 3361, 3369, 3379, 3389, 3400, 3413, 3426, 3429, + 3432, 3436, 3441, 3446, 3451, 3454, 3459, 3464, 3466, 3468, + 3470, 3472, 3474, 3476, 3478, 3480, 3483, 3485, 3487, 3489, + 3493, 3497, 3502, 3509, 3520, 3529, 3537, 3543, 3546, 3549, + 3553, 3558, 3564, 3568, 3574, 3580, 3584, 3589, 3595, 3601, + 3607, 3611, 3617, 3620, 3624, 3628, 3634, 3638, 3642, 3646, + 3651, 3657, 3663, 3667, 3673, 3679, 3683, 3688, 3694, 3700, + 3703, 3706, 3710, 3716, 3723, 3730, 3734, 3738, 3742, 3749, + 3755, 3761, 3764, 3768, 3772, 3778, 3785, 3789, 3792, 3795, + 3799, 3802, 3806, 3809, 3813, 3819, 3826, 3829, 3832, 3835, + 3837, 3842, 3847, 3849, 3852, 3855, 3858, 3861, 3864, 3867, + 3870, 3874, 3877, 3881, 3884, 3888, 3890, 3892, 3894, 3896, + 3898, 3899, 3902, 3903, 3906, 3907, 3909, 3910, 3911, 3913, + 3915, 3917, 3919, 3927, 3936, 3939, 3944, 3947, 3952, 3959, + 3962, 3964, 3966, 3970, 3974, 3976, 3981, 3984, 3986, 3990, + 3994, 3999, 4003, 4007, 4011, 4013, 4015, 4017, 4019, 4021, + 4023, 4025, 4027, 4029, 4031, 4033, 4035, 4037, 4039, 4042, + 4043, 4044, 4047, 4049, 4053, 4055, 4059, 4061, 4064, 4067, + 4069, 4073, 4074, 4075, 4078, 4081, 4083, 4087, 4093, 4095, + 4098, 4101, 4104, 4107, 4109, 4111, 4113, 4115, 4120, 4123, + 4127, 4131, 4134, 4138, 4141, 4144, 4147, 4151, 4155, 4159, + 4162, 4166, 4168, 4172, 4176, 4178, 4181, 4184, 4187, 4190, + 4200, 4207, 4209, 4211, 4213, 4215, 4218, 4221, 4225, 4229, + 4231, 4234, 4238, 4242, 4244, 4247, 4249, 4251, 4253, 4255, + 4257, 4260, 4263, 4268, 4270, 4273, 4276, 4279, 4283, 4285, + 4287, 4289, 4292, 4295, 4298, 4301, 4304, 4308, 4312, 4316, + 4320, 4324, 4328, 4332, 4334, 4337, 4340, 4343, 4347, 4350, + 4354, 4358, 4361, 4364, 4367, 4370, 4373, 4376, 4379, 4382, + 4385, 4388, 4391, 4394, 4397, 4400, 4404, 4408, 4412, 4415, + 4418, 4421, 4424, 4427, 4430, 4433, 4436, 4439, 4442, 4445, + 4448, 4452, 4456, 4460, 4465, 4472, 4475, 4477, 4479, 4481, + 4483, 4485, 4486, 4492, 4494, 4501, 4505, 4507, 4511, 4514, + 4517, 4521, 4525, 4528, 4531, 4534, 4537, 4540, 4543, 4547, + 4550, 4553, 4557, 4559, 4563, 4568, 4570, 4573, 4579, 4586, + 4593, 4596, 4598, 4601, 4604, 4610, 4617 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -1423,329 +1423,330 @@ static const yytype_int16 yyrhs[] = 353, 4, -1, -1, 131, 156, 360, 365, -1, 131, 156, 4, 360, 365, -1, 288, 156, 350, 360, 365, -1, -1, 210, -1, 300, -1, 66, -1, 181, -1, - 287, -1, 229, -1, 61, -1, 278, -1, 301, -1, - 134, -1, 236, -1, 236, 187, -1, 263, -1, 263, - 187, -1, 21, -1, 301, 450, -1, 47, 447, -1, - 74, 448, -1, 149, 449, -1, 185, -1, 37, -1, - 250, -1, -1, 66, -1, -1, 66, -1, -1, 66, - -1, -1, 222, -1, -1, 16, 452, -1, 195, 361, - -1, -1, 223, -1, 83, 454, -1, 99, -1, 360, - 365, 366, 455, 5, 5, -1, 360, 365, 366, 455, - 5, -1, 20, -1, 232, -1, 19, -1, 44, 457, - -1, 77, 458, -1, 84, -1, 94, -1, 95, -1, - 101, -1, 124, 459, -1, 141, -1, 155, -1, 162, - -1, 182, 460, -1, 218, -1, 156, -1, 268, -1, - 278, 360, -1, 307, 461, -1, 72, 5, -1, -1, - 31, -1, -1, 44, -1, 87, -1, 191, -1, 149, - -1, 255, -1, 215, -1, 293, -1, 360, -1, 58, - 360, -1, 115, 360, -1, 172, 360, -1, 18, -1, - 284, 360, -1, 199, 4, 4, -1, 116, -1, 184, - 5, -1, 88, 464, -1, 256, 120, 195, 463, -1, - 256, 6, 4, 4, 4, 4, -1, 297, -1, 307, - 350, 350, 350, 350, 350, 350, 350, 350, 4, -1, - 5, -1, 5, 4, -1, 4, 4, 56, -1, 4, - 4, 360, -1, 192, 352, -1, 26, 466, -1, 112, - 468, -1, 124, 469, -1, 158, 482, -1, 204, 480, - -1, 217, 481, -1, 5, 14, 5, 370, -1, 5, - 15, 5, 370, -1, 5, 61, 5, 370, -1, 5, - 189, 370, -1, 5, 190, 370, -1, 5, 259, 368, - 4, 370, -1, 5, 269, 4, 370, -1, 5, 270, - 4, 370, -1, 5, 300, 5, 370, -1, 242, 87, - 467, -1, 5, 14, 5, -1, 5, 15, 5, -1, - 5, 61, 5, -1, 5, 189, -1, 5, 190, -1, - 5, 259, 368, 4, -1, 5, 269, 4, -1, 5, - 270, 4, -1, 5, 300, 5, -1, 5, 5, 267, - -1, 5, 14, 5, 370, -1, 5, 15, 5, 370, - -1, 5, 61, 5, 370, -1, 5, 189, 369, 370, - -1, 5, 5, 267, 369, 370, -1, 5, 190, 369, - 370, -1, 5, 259, 368, 4, 369, 370, -1, 5, - 274, 368, 4, 4, 369, 370, -1, 5, 269, 4, - 370, -1, 5, 270, 4, 370, -1, 5, 300, 5, - 369, 370, -1, 266, 470, -1, 117, 87, 471, -1, - 242, 156, 479, -1, 242, 87, 478, -1, 191, 472, - -1, 5, 14, 5, -1, 5, 15, 5, -1, 5, - 61, 5, -1, 5, 189, 369, -1, 5, 5, 267, - 369, -1, 5, 190, 369, -1, 5, 259, 368, 4, - 369, -1, 5, 274, 368, 4, 4, 369, -1, 5, - 269, 4, -1, 5, 270, 4, -1, 5, 300, 5, - 369, -1, 5, 14, 5, -1, 5, 15, 5, -1, - 5, 61, 5, -1, 5, 189, 369, -1, 5, 190, - 369, -1, 5, 259, 368, 4, 369, -1, 5, 269, - 4, -1, 5, 270, 4, -1, 5, 300, 5, 369, - -1, 156, 161, 473, -1, 161, 474, -1, 156, 475, - -1, 476, -1, 156, 335, 477, -1, 5, 14, 5, - 370, -1, 5, 15, 5, 370, -1, 5, 61, 5, - 370, -1, 5, 189, 369, 370, -1, 5, 190, 369, - 370, -1, 5, 259, 368, 4, 369, 370, -1, 5, + 278, -1, 287, -1, 229, -1, 61, -1, 278, -1, + 301, -1, 134, -1, 236, -1, 236, 187, -1, 263, + -1, 263, 187, -1, 21, -1, 301, 450, -1, 47, + 447, -1, 74, 448, -1, 149, 449, -1, 185, -1, + 37, -1, 250, -1, -1, 66, -1, -1, 66, -1, + -1, 66, -1, -1, 222, -1, -1, 16, 452, -1, + 195, 361, -1, -1, 223, -1, 83, 454, -1, 99, + -1, 360, 365, 366, 455, 5, 5, -1, 360, 365, + 366, 455, 5, -1, 20, -1, 232, -1, 19, -1, + 44, 457, -1, 77, 458, -1, 84, -1, 94, -1, + 95, -1, 101, -1, 124, 459, -1, 141, -1, 155, + -1, 162, -1, 182, 460, -1, 218, -1, 156, -1, + 268, -1, 278, 360, -1, 307, 461, -1, 72, 5, + -1, -1, 31, -1, -1, 44, -1, 87, -1, 191, + -1, 149, -1, 255, -1, 215, -1, 293, -1, 360, + -1, 58, 360, -1, 115, 360, -1, 172, 360, -1, + 18, -1, 284, 360, -1, 199, 4, 4, -1, 116, + -1, 184, 5, -1, 88, 464, -1, 256, 120, 195, + 463, -1, 256, 6, 4, 4, 4, 4, -1, 297, + -1, 307, 350, 350, 350, 350, 350, 350, 350, 350, + 4, -1, 5, -1, 5, 4, -1, 4, 4, 56, + -1, 4, 4, 360, -1, 192, 352, -1, 26, 466, + -1, 112, 468, -1, 124, 469, -1, 158, 482, -1, + 204, 480, -1, 217, 481, -1, 5, 14, 5, 370, + -1, 5, 15, 5, 370, -1, 5, 61, 5, 370, + -1, 5, 189, 370, -1, 5, 190, 370, -1, 5, + 259, 368, 4, 370, -1, 5, 269, 4, 370, -1, + 5, 270, 4, 370, -1, 5, 300, 5, 370, -1, + 242, 87, 467, -1, 5, 14, 5, -1, 5, 15, + 5, -1, 5, 61, 5, -1, 5, 189, -1, 5, + 190, -1, 5, 259, 368, 4, -1, 5, 269, 4, + -1, 5, 270, 4, -1, 5, 300, 5, -1, 5, + 5, 267, -1, 5, 14, 5, 370, -1, 5, 15, + 5, 370, -1, 5, 61, 5, 370, -1, 5, 189, + 369, 370, -1, 5, 5, 267, 369, 370, -1, 5, + 190, 369, 370, -1, 5, 259, 368, 4, 369, 370, + -1, 5, 274, 368, 4, 4, 369, 370, -1, 5, 269, 4, 370, -1, 5, 270, 4, 370, -1, 5, - 300, 5, 369, 370, -1, 5, 14, 5, 370, -1, - 5, 15, 5, 370, -1, 5, 61, 5, 370, -1, - 5, 189, 369, 370, -1, 5, 5, 267, 369, 370, - -1, 5, 190, 369, 370, -1, 5, 259, 368, 4, - 369, 370, -1, 5, 274, 368, 4, 4, 369, 370, + 300, 5, 369, 370, -1, 266, 470, -1, 117, 87, + 471, -1, 242, 156, 479, -1, 242, 87, 478, -1, + 191, 472, -1, 5, 14, 5, -1, 5, 15, 5, + -1, 5, 61, 5, -1, 5, 189, 369, -1, 5, + 5, 267, 369, -1, 5, 190, 369, -1, 5, 259, + 368, 4, 369, -1, 5, 274, 368, 4, 4, 369, + -1, 5, 269, 4, -1, 5, 270, 4, -1, 5, + 300, 5, 369, -1, 5, 14, 5, -1, 5, 15, + 5, -1, 5, 61, 5, -1, 5, 189, 369, -1, + 5, 190, 369, -1, 5, 259, 368, 4, 369, -1, + 5, 269, 4, -1, 5, 270, 4, -1, 5, 300, + 5, 369, -1, 156, 161, 473, -1, 161, 474, -1, + 156, 475, -1, 476, -1, 156, 335, 477, -1, 5, + 14, 5, 370, -1, 5, 15, 5, 370, -1, 5, + 61, 5, 370, -1, 5, 189, 369, 370, -1, 5, + 190, 369, 370, -1, 5, 259, 368, 4, 369, 370, -1, 5, 269, 4, 370, -1, 5, 270, 4, 370, - -1, 5, 300, 5, 369, 370, -1, 361, 5, 14, - 5, 370, -1, 361, 5, 15, 5, 370, -1, 361, - 5, 61, 5, 370, -1, 361, 5, 189, 369, 370, - -1, 361, 5, 190, 369, 370, -1, 361, 5, 259, - 368, 4, 369, 370, -1, 361, 5, 269, 4, 370, - -1, 361, 5, 270, 4, 370, -1, 361, 5, 300, - 5, 369, 370, -1, 361, 5, 14, 5, 370, -1, - 361, 5, 15, 5, 370, -1, 361, 5, 61, 5, - 370, -1, 361, 5, 189, 369, 370, -1, 361, 5, - 5, 267, 369, 370, -1, 361, 5, 190, 369, 370, - -1, 361, 5, 259, 368, 4, 369, 370, -1, 361, - 5, 274, 368, 4, 4, 369, 370, -1, 361, 5, - 269, 4, 370, -1, 361, 5, 270, 4, 370, -1, - 361, 5, 300, 5, 369, 370, -1, 5, 14, 5, - -1, 5, 15, 5, -1, 5, 61, 5, -1, 5, - 189, 369, -1, 5, 190, 369, -1, 5, 259, 368, - 4, 369, -1, 5, 269, 4, -1, 5, 270, 4, - -1, 5, 300, 5, 369, -1, 5, 14, 5, -1, - 5, 15, 5, -1, 5, 61, 5, -1, 5, 189, - 369, -1, 5, 5, 267, 369, -1, 5, 190, 369, - -1, 5, 259, 368, 4, 369, -1, 5, 274, 368, - 4, 4, 369, -1, 5, 269, 4, -1, 5, 270, - 4, -1, 5, 300, 5, 369, -1, 5, 14, 5, - -1, 5, 15, 5, -1, 5, 61, 5, -1, 5, - 189, 369, -1, 5, 190, 369, -1, 5, 259, 368, - 4, 369, -1, 5, 269, 4, -1, 5, 270, 4, - -1, 5, 300, 5, 369, -1, 5, 14, 5, 370, - -1, 5, 61, 5, 370, -1, 5, 189, 370, -1, - 5, 259, 368, 4, 370, -1, 5, 269, 4, 370, - -1, 5, 300, 5, 370, -1, 5, 5, -1, 266, - 5, 5, -1, 93, 4, 4, 4, 4, 4, -1, - 186, 4, 4, 4, 4, 4, -1, 111, -1, 228, - -1, 352, -1, 139, 352, -1, 88, 352, -1, 66, - 5, -1, 5, 4, 4, -1, 297, 350, 350, -1, - 343, 350, -1, 5, 5, 361, 365, 5, 5, 361, - 365, 350, 361, 367, 5, -1, 60, 489, -1, 66, - 5, -1, 80, -1, 73, 494, 5, -1, 73, 494, - 300, 5, -1, 75, 99, -1, -1, 83, 487, 490, - -1, 89, -1, 99, -1, 99, 17, -1, 105, 493, - -1, 114, 4, -1, 129, 5, -1, 149, 17, -1, - 149, 209, 350, 350, -1, 149, 289, 350, 350, -1, - 4, 20, 373, 352, -1, 4, 21, 355, -1, 4, - 21, 355, 362, -1, 4, 21, 355, 360, 365, -1, - 4, 22, 236, 350, 350, 4, 360, 367, -1, 4, - 22, 236, 5, 360, 367, -1, 4, 48, 121, 352, - -1, 4, 49, 236, 350, 350, 350, 4, 360, 367, - -1, 4, 49, 236, 5, 360, 367, -1, 4, 48, - 236, 350, 350, 360, 367, -1, 4, 52, 105, 355, - 355, 4, 350, 350, 350, 4, -1, 4, 52, 105, - 355, 355, 4, 350, 350, 350, 4, 362, -1, 4, - 52, 105, 355, 355, 4, 350, 350, 350, 4, 360, - 365, -1, 4, 52, 105, 5, 5, 360, 365, 360, - 367, -1, 4, 55, 488, 5, 5, -1, 4, 62, - 121, 352, -1, 4, 62, 236, 350, 360, 367, -1, - 4, 66, 5, -1, 4, 74, 27, 352, 352, -1, - 4, 74, 166, 5, 5, -1, 4, 74, 236, 350, - 360, 367, -1, 4, 74, 278, 360, 365, -1, 4, - 75, 138, 352, -1, 4, 82, 105, 355, 355, 4, - 350, 350, 4, -1, 4, 82, 105, 355, 355, 4, - 350, 350, 4, 362, -1, 4, 82, 105, 355, 355, - 4, 350, 350, 4, 360, 365, -1, 4, 82, 105, - 5, 5, 360, 365, 360, 367, -1, 4, 83, 22, - 236, 350, 350, -1, 4, 83, 49, 236, 350, 350, - -1, 4, 83, 52, 21, 350, 350, -1, 4, 83, - 52, 236, 350, 350, -1, 4, 83, 110, 236, 350, - 350, -1, 4, 83, 113, 21, 350, 350, -1, 4, - 83, 113, 236, 350, 350, -1, 4, 83, 82, 21, - 350, 350, -1, 4, 83, 82, 236, 350, 350, -1, - 4, 83, 224, 304, 4, 350, 350, -1, 4, 83, - 254, 304, 4, 350, 350, -1, 4, 99, -1, 4, - 99, 22, 4, -1, 4, 99, 49, 4, -1, 4, - 99, 52, 4, -1, 4, 99, 110, 4, -1, 4, - 99, 55, 488, 5, -1, 4, 99, 113, 4, -1, - 4, 99, 82, 4, -1, 4, 99, 224, 304, 4, - -1, 4, 99, 254, 304, 4, -1, 4, 99, 280, - -1, 4, 99, 280, 5, -1, 4, 99, 280, 4, - -1, 4, 105, 40, 4, -1, 4, 109, 121, 352, - -1, 4, 109, 236, 350, 350, 360, 367, -1, 4, - 110, 236, 350, 350, 350, 4, 360, 367, -1, 4, - 110, 236, 5, 360, 367, -1, 4, 113, 105, 355, - 355, 4, 350, 350, 350, 4, -1, 4, 113, 105, - 355, 355, 4, 350, 350, 350, 4, 362, -1, 4, - 113, 105, 355, 355, 4, 350, 350, 350, 4, 360, - 365, -1, 4, 113, 105, 5, 5, 360, 365, 360, - 367, -1, 4, 129, 5, -1, 4, 149, -1, 4, - 149, 209, -1, 4, 171, 27, 352, 352, -1, 4, - 171, 222, 360, 365, 359, 359, -1, 4, 194, 350, - 350, -1, 4, 194, 132, -1, 4, 194, 36, -1, - 4, 194, 288, 360, 365, 359, -1, 4, 224, 240, - 350, 350, 360, 367, -1, 4, 254, 240, 350, 350, - 360, 367, -1, 4, 222, 258, 371, -1, 4, 222, - 265, 4, -1, 4, 224, 121, 352, -1, 4, 230, - 360, 365, 359, 359, 350, 360, 367, -1, 4, 231, - 507, 352, -1, 4, 244, 40, -1, 4, 245, 130, - 5, -1, 4, 245, 222, 360, 365, 359, 359, -1, - 4, 245, 278, 360, 365, 360, 367, -1, 4, 255, - -1, 4, 255, 209, -1, 4, 280, 5, -1, 4, - 282, 5, -1, 4, 282, 244, 352, -1, 4, 294, - -1, 4, 296, -1, 4, 302, 27, 352, -1, 4, - 302, 222, 360, 365, 359, 360, 367, 350, 355, -1, - 4, 336, 4, -1, 164, -1, 164, 350, 350, -1, - 173, 502, -1, 174, 503, -1, 194, 504, -1, 229, - 352, -1, 231, 507, 352, -1, 231, 507, 352, 350, - 350, -1, 244, 40, 350, 350, -1, 244, 193, 350, - 350, 4, -1, 244, 111, -1, 249, 5, 494, 360, - 365, 366, 352, -1, 249, 281, 5, -1, 255, 511, - -1, 262, 512, -1, 5, 66, 5, -1, 5, 80, - -1, 5, 99, -1, 5, 89, -1, 5, 129, 5, - -1, 5, 149, -1, 5, 149, 209, -1, 5, 194, - 350, 350, -1, 5, 194, 132, -1, 5, 194, 36, - -1, 5, 194, 288, 360, 365, 359, -1, 5, 231, - 507, 352, -1, 5, 255, -1, 5, 255, 209, -1, - 5, 294, -1, 5, 296, -1, 280, 105, 5, 5, - -1, 280, 99, 5, -1, 280, 99, 17, -1, 280, - 5, -1, 280, 297, 5, -1, 215, -1, 215, 360, - -1, 293, -1, 294, 17, -1, 296, 17, -1, 336, - 4, -1, 255, -1, 296, -1, 149, -1, 294, -1, - 40, 194, -1, 194, -1, 111, 194, -1, 40, 105, - -1, 105, -1, 111, 105, -1, 40, 244, -1, 244, - -1, 111, 244, -1, 99, -1, 282, -1, 66, -1, - 336, -1, 231, -1, 129, -1, 164, -1, 297, -1, - -1, 4, -1, 30, 352, -1, 236, 350, -1, 160, - 4, -1, 210, 4, 350, -1, 62, 350, 350, 350, - 508, -1, 109, 350, 350, 350, 350, 354, 508, -1, - 48, 350, 350, 350, 350, 354, 508, -1, 224, 350, - 350, 350, 350, 508, -1, 254, 350, 350, 350, 350, - 508, -1, 171, 350, 350, 350, 350, 508, -1, 302, - 350, 350, 350, 350, 508, -1, 282, 350, 350, 354, - 508, -1, 62, 222, 350, 350, 372, 508, -1, 48, - 222, 350, 350, 372, 508, -1, 102, 222, 350, 350, - 372, 508, -1, 85, 222, 350, 350, 372, 508, -1, - 346, 222, 350, 350, 372, 508, -1, 27, 222, 350, - 350, 372, 508, -1, 51, 222, 350, 350, 372, 508, - -1, 245, 350, 350, 350, 350, 360, 365, 360, 367, - 5, 508, -1, 74, 350, 350, 350, 360, 365, 508, - -1, 230, 350, 350, 350, 350, 350, 508, -1, 22, - 350, 350, 350, 350, 4, 508, -1, 110, 350, 350, - 350, 350, 350, 4, 354, 508, -1, 49, 350, 350, - 350, 350, 350, 4, 354, 508, -1, 82, 350, 350, - 355, 355, 4, 350, 350, 4, 508, -1, 113, 350, - 350, 355, 355, 4, 350, 350, 350, 4, 354, 508, - -1, 52, 350, 350, 355, 355, 4, 350, 350, 350, - 4, 354, 508, -1, 75, 508, -1, 281, 491, -1, - 5, 350, 350, -1, 300, 5, 350, 350, -1, 350, - 350, 300, 5, -1, 5, 360, 365, 359, -1, 4, - 4, -1, 40, 350, 350, 4, -1, 193, 350, 350, - 4, -1, 111, -1, 104, -1, 338, -1, 63, -1, - 248, -1, 247, -1, 233, -1, 339, -1, 60, 496, - -1, 66, -1, 129, -1, 114, -1, 143, 350, 350, - -1, 154, 350, 350, -1, 4, 20, 82, 360, -1, - 4, 20, 151, 5, 5, 4, -1, 4, 20, 220, - 5, 5, 5, 5, 360, 365, 374, -1, 4, 20, - 221, 5, 5, 360, 365, 374, -1, 4, 20, 235, - 5, 5, 5, 360, -1, 4, 20, 275, 360, 365, - -1, 154, 17, -1, 4, 21, -1, 4, 21, 362, - -1, 4, 21, 360, 365, -1, 4, 22, 236, 360, - 367, -1, 4, 48, 121, -1, 4, 49, 236, 360, - 367, -1, 4, 48, 236, 360, 367, -1, 4, 52, - 21, -1, 4, 52, 21, 362, -1, 4, 52, 21, - 360, 365, -1, 4, 52, 236, 360, 367, -1, 4, - 59, 360, 365, 366, -1, 4, 62, 121, -1, 4, - 62, 236, 360, 367, -1, 4, 66, -1, 4, 74, - 27, -1, 4, 74, 166, -1, 4, 74, 236, 360, - 367, -1, 4, 74, 278, -1, 4, 75, 138, -1, - 4, 82, 21, -1, 4, 82, 21, 362, -1, 4, - 82, 21, 360, 365, -1, 4, 82, 236, 360, 367, - -1, 4, 109, 121, -1, 4, 109, 236, 360, 367, - -1, 4, 110, 236, 360, 367, -1, 4, 113, 21, - -1, 4, 113, 21, 362, -1, 4, 113, 21, 360, - 365, -1, 4, 113, 236, 360, 367, -1, 4, 129, - -1, 4, 149, -1, 4, 171, 27, -1, 4, 171, - 167, 360, 367, -1, 4, 171, 222, 360, 365, 366, - -1, 4, 180, 167, 350, 360, 367, -1, 4, 224, - 121, -1, 4, 222, 258, -1, 4, 222, 265, -1, - 4, 230, 222, 360, 365, 366, -1, 4, 230, 167, - 360, 367, -1, 4, 230, 286, 360, 367, -1, 4, - 231, -1, 4, 231, 507, -1, 4, 245, 130, -1, - 4, 245, 167, 360, 367, -1, 4, 245, 222, 360, - 365, 366, -1, 4, 245, 278, -1, 4, 255, -1, - 4, 280, -1, 4, 280, 4, -1, 4, 282, -1, - 4, 282, 244, -1, 4, 292, -1, 4, 302, 27, - -1, 4, 302, 167, 360, 367, -1, 4, 302, 222, - 360, 365, 366, -1, 4, 336, -1, 149, 497, -1, - 149, 205, -1, 205, -1, 224, 254, 350, 350, -1, - 254, 254, 350, 350, -1, 229, -1, 231, 507, -1, - 255, 498, -1, 255, 205, -1, 262, 499, -1, 5, - 66, -1, 5, 129, -1, 5, 154, -1, 5, 231, - 507, -1, 5, 280, -1, 5, 280, 205, -1, 280, - 17, -1, 280, 98, 195, -1, 336, -1, 30, -1, - 236, -1, 160, -1, 210, -1, -1, 350, 350, -1, - -1, 350, 350, -1, -1, 282, -1, -1, -1, 223, - -1, 237, -1, 298, -1, 57, -1, 494, 360, 365, - 366, 352, 509, 515, -1, 255, 494, 360, 365, 366, - 352, 509, 515, -1, 494, 5, -1, 494, 5, 360, - 365, -1, 494, 4, -1, 494, 4, 360, 365, -1, - 124, 5, 5, 492, 4, 5, -1, 350, 350, -1, - 132, -1, 36, -1, 40, 350, 350, -1, 193, 350, - 350, -1, 111, -1, 288, 360, 365, 359, -1, 505, - 506, -1, 506, -1, 507, 347, 352, -1, 66, 347, - 5, -1, 92, 347, 4, 4, -1, 336, 347, 4, - -1, 129, 347, 5, -1, 282, 347, 5, -1, 518, - -1, 519, -1, 202, -1, 255, -1, 149, -1, 91, - -1, 126, -1, 105, -1, 194, -1, 244, -1, 99, - -1, 157, -1, 271, -1, 500, -1, 500, 505, -1, - -1, -1, 510, 513, -1, 17, -1, 209, 350, 350, - -1, 289, -1, 289, 350, 350, -1, 352, -1, 282, - 352, -1, 513, 514, -1, 514, -1, 507, 347, 352, - -1, -1, -1, 516, 517, -1, 517, 518, -1, 518, - -1, 280, 347, 5, -1, 55, 347, 488, 5, 5, - -1, 64, -1, 66, 5, -1, 181, 4, -1, 287, - 350, -1, 346, -1, 344, -1, 339, -1, 202, -1, - 350, 350, 350, 350, -1, 350, 350, -1, 362, 350, - 350, -1, 360, 365, 359, -1, 288, 523, -1, 39, - 350, 350, -1, 193, 524, -1, 229, 352, -1, 350, - 350, -1, 362, 350, 350, -1, 360, 365, 359, -1, - 40, 350, 350, -1, 350, 350, -1, 111, 350, 350, - -1, 352, -1, 307, 361, 365, -1, 5, 4, 4, - -1, 297, -1, 70, 528, -1, 168, 4, -1, 241, - 4, -1, 250, 350, -1, 4, 4, 4, 4, 4, - 4, 4, 4, 4, -1, 4, 4, 4, 4, 4, - 4, -1, 54, -1, 140, -1, 242, -1, 90, -1, - 149, 530, -1, 255, 531, -1, 40, 350, 350, -1, - 193, 350, 350, -1, 111, -1, 260, 111, -1, 40, - 350, 350, -1, 193, 350, 350, -1, 111, -1, 260, - 111, -1, 188, -1, 13, -1, 202, -1, 34, -1, - 107, -1, 61, 5, -1, 278, 360, -1, 301, 4, - 4, 4, -1, 350, -1, 350, 97, -1, 193, 536, - -1, 288, 350, -1, 288, 350, 97, -1, 40, -1, - 350, -1, 111, -1, 26, 538, -1, 124, 540, -1, - 204, 550, -1, 112, 551, -1, 217, 5, -1, 120, - 5, 375, -1, 61, 5, 375, -1, 269, 4, 375, - -1, 242, 87, 539, -1, 120, 5, 375, -1, 61, - 5, 375, -1, 269, 4, 375, -1, 541, -1, 156, - 541, -1, 279, 542, -1, 266, 543, -1, 117, 87, - 544, -1, 191, 545, -1, 242, 156, 547, -1, 242, - 87, 548, -1, 239, 549, -1, 120, 5, -1, 61, - 5, -1, 269, 4, -1, 120, 5, -1, 61, 5, - -1, 269, 4, -1, 120, 5, -1, 61, 5, -1, - 269, 4, -1, 120, 5, -1, 61, 5, -1, 269, - 4, -1, 156, 546, -1, 120, 5, 4, -1, 61, - 5, 4, -1, 269, 4, 4, -1, 120, 5, -1, - 61, 5, -1, 269, 4, -1, 120, 5, -1, 61, - 5, -1, 269, 4, -1, 120, 5, -1, 61, 5, - -1, 269, 4, -1, 120, 5, -1, 61, 5, -1, - 269, 4, -1, 120, 5, 375, -1, 61, 5, 375, - -1, 269, 4, 375, -1, 120, 5, 5, 375, -1, - 553, 4, 4, 350, 350, 355, -1, 553, 4, -1, - 99, -1, 50, -1, 290, -1, 136, -1, 108, -1, - -1, 4, 350, 350, 350, 350, -1, 203, -1, 203, - 4, 350, 350, 350, 350, -1, 124, 266, 555, -1, - 4, -1, 350, 360, 365, -1, 4, 4, -1, 350, - 350, -1, 288, 350, 350, -1, 361, 365, 366, -1, - 16, 560, -1, 240, 4, -1, 238, 559, -1, 23, - 558, -1, 4, 4, -1, 4, 5, -1, 282, 4, - 5, -1, 4, 4, -1, 4, 5, -1, 282, 4, - 5, -1, 4, -1, 4, 361, 365, -1, 4, 6, - 361, 365, -1, 228, -1, 350, 350, -1, 350, 350, - 12, 350, 350, -1, 350, 350, 12, 362, 350, 350, - -1, 350, 350, 12, 360, 365, 359, -1, 288, 563, - -1, 123, -1, 123, 350, -1, 350, 350, -1, 350, - 350, 12, 350, 350, -1, 350, 350, 12, 362, 350, - 350, -1, 350, 350, 12, 360, 365, 359, -1 + -1, 5, 300, 5, 369, 370, -1, 5, 14, 5, + 370, -1, 5, 15, 5, 370, -1, 5, 61, 5, + 370, -1, 5, 189, 369, 370, -1, 5, 5, 267, + 369, 370, -1, 5, 190, 369, 370, -1, 5, 259, + 368, 4, 369, 370, -1, 5, 274, 368, 4, 4, + 369, 370, -1, 5, 269, 4, 370, -1, 5, 270, + 4, 370, -1, 5, 300, 5, 369, 370, -1, 361, + 5, 14, 5, 370, -1, 361, 5, 15, 5, 370, + -1, 361, 5, 61, 5, 370, -1, 361, 5, 189, + 369, 370, -1, 361, 5, 190, 369, 370, -1, 361, + 5, 259, 368, 4, 369, 370, -1, 361, 5, 269, + 4, 370, -1, 361, 5, 270, 4, 370, -1, 361, + 5, 300, 5, 369, 370, -1, 361, 5, 14, 5, + 370, -1, 361, 5, 15, 5, 370, -1, 361, 5, + 61, 5, 370, -1, 361, 5, 189, 369, 370, -1, + 361, 5, 5, 267, 369, 370, -1, 361, 5, 190, + 369, 370, -1, 361, 5, 259, 368, 4, 369, 370, + -1, 361, 5, 274, 368, 4, 4, 369, 370, -1, + 361, 5, 269, 4, 370, -1, 361, 5, 270, 4, + 370, -1, 361, 5, 300, 5, 369, 370, -1, 5, + 14, 5, -1, 5, 15, 5, -1, 5, 61, 5, + -1, 5, 189, 369, -1, 5, 190, 369, -1, 5, + 259, 368, 4, 369, -1, 5, 269, 4, -1, 5, + 270, 4, -1, 5, 300, 5, 369, -1, 5, 14, + 5, -1, 5, 15, 5, -1, 5, 61, 5, -1, + 5, 189, 369, -1, 5, 5, 267, 369, -1, 5, + 190, 369, -1, 5, 259, 368, 4, 369, -1, 5, + 274, 368, 4, 4, 369, -1, 5, 269, 4, -1, + 5, 270, 4, -1, 5, 300, 5, 369, -1, 5, + 14, 5, -1, 5, 15, 5, -1, 5, 61, 5, + -1, 5, 189, 369, -1, 5, 190, 369, -1, 5, + 259, 368, 4, 369, -1, 5, 269, 4, -1, 5, + 270, 4, -1, 5, 300, 5, 369, -1, 5, 14, + 5, 370, -1, 5, 61, 5, 370, -1, 5, 189, + 370, -1, 5, 259, 368, 4, 370, -1, 5, 269, + 4, 370, -1, 5, 300, 5, 370, -1, 5, 5, + -1, 266, 5, 5, -1, 93, 4, 4, 4, 4, + 4, -1, 186, 4, 4, 4, 4, 4, -1, 111, + -1, 228, -1, 352, -1, 139, 352, -1, 88, 352, + -1, 66, 5, -1, 5, 4, 4, -1, 297, 350, + 350, -1, 343, 350, -1, 5, 5, 361, 365, 5, + 5, 361, 365, 350, 361, 367, 5, -1, 60, 489, + -1, 66, 5, -1, 80, -1, 73, 494, 5, -1, + 73, 494, 300, 5, -1, 75, 99, -1, -1, 83, + 487, 490, -1, 89, -1, 99, -1, 99, 17, -1, + 105, 493, -1, 114, 4, -1, 129, 5, -1, 149, + 17, -1, 149, 209, 350, 350, -1, 149, 289, 350, + 350, -1, 4, 20, 373, 352, -1, 4, 21, 355, + -1, 4, 21, 355, 362, -1, 4, 21, 355, 360, + 365, -1, 4, 22, 236, 350, 350, 4, 360, 367, + -1, 4, 22, 236, 5, 360, 367, -1, 4, 48, + 121, 352, -1, 4, 49, 236, 350, 350, 350, 4, + 360, 367, -1, 4, 49, 236, 5, 360, 367, -1, + 4, 48, 236, 350, 350, 360, 367, -1, 4, 52, + 105, 355, 355, 4, 350, 350, 350, 4, -1, 4, + 52, 105, 355, 355, 4, 350, 350, 350, 4, 362, + -1, 4, 52, 105, 355, 355, 4, 350, 350, 350, + 4, 360, 365, -1, 4, 52, 105, 5, 5, 360, + 365, 360, 367, -1, 4, 55, 488, 5, 5, -1, + 4, 62, 121, 352, -1, 4, 62, 236, 350, 360, + 367, -1, 4, 66, 5, -1, 4, 74, 27, 352, + 352, -1, 4, 74, 166, 5, 5, -1, 4, 74, + 236, 350, 360, 367, -1, 4, 74, 278, 360, 365, + -1, 4, 75, 138, 352, -1, 4, 82, 105, 355, + 355, 4, 350, 350, 4, -1, 4, 82, 105, 355, + 355, 4, 350, 350, 4, 362, -1, 4, 82, 105, + 355, 355, 4, 350, 350, 4, 360, 365, -1, 4, + 82, 105, 5, 5, 360, 365, 360, 367, -1, 4, + 83, 22, 236, 350, 350, -1, 4, 83, 49, 236, + 350, 350, -1, 4, 83, 52, 21, 350, 350, -1, + 4, 83, 52, 236, 350, 350, -1, 4, 83, 110, + 236, 350, 350, -1, 4, 83, 113, 21, 350, 350, + -1, 4, 83, 113, 236, 350, 350, -1, 4, 83, + 82, 21, 350, 350, -1, 4, 83, 82, 236, 350, + 350, -1, 4, 83, 224, 304, 4, 350, 350, -1, + 4, 83, 254, 304, 4, 350, 350, -1, 4, 99, + -1, 4, 99, 22, 4, -1, 4, 99, 49, 4, + -1, 4, 99, 52, 4, -1, 4, 99, 110, 4, + -1, 4, 99, 55, 488, 5, -1, 4, 99, 113, + 4, -1, 4, 99, 82, 4, -1, 4, 99, 224, + 304, 4, -1, 4, 99, 254, 304, 4, -1, 4, + 99, 280, -1, 4, 99, 280, 5, -1, 4, 99, + 280, 4, -1, 4, 105, 40, 4, -1, 4, 109, + 121, 352, -1, 4, 109, 236, 350, 350, 360, 367, + -1, 4, 110, 236, 350, 350, 350, 4, 360, 367, + -1, 4, 110, 236, 5, 360, 367, -1, 4, 113, + 105, 355, 355, 4, 350, 350, 350, 4, -1, 4, + 113, 105, 355, 355, 4, 350, 350, 350, 4, 362, + -1, 4, 113, 105, 355, 355, 4, 350, 350, 350, + 4, 360, 365, -1, 4, 113, 105, 5, 5, 360, + 365, 360, 367, -1, 4, 129, 5, -1, 4, 149, + -1, 4, 149, 209, -1, 4, 171, 27, 352, 352, + -1, 4, 171, 222, 360, 365, 359, 359, -1, 4, + 194, 350, 350, -1, 4, 194, 132, -1, 4, 194, + 36, -1, 4, 194, 288, 360, 365, 359, -1, 4, + 224, 240, 350, 350, 360, 367, -1, 4, 254, 240, + 350, 350, 360, 367, -1, 4, 222, 258, 371, -1, + 4, 222, 265, 4, -1, 4, 224, 121, 352, -1, + 4, 230, 360, 365, 359, 359, 350, 360, 367, -1, + 4, 231, 507, 352, -1, 4, 244, 40, -1, 4, + 245, 130, 5, -1, 4, 245, 222, 360, 365, 359, + 359, -1, 4, 245, 278, 360, 365, 360, 367, -1, + 4, 255, -1, 4, 255, 209, -1, 4, 280, 5, + -1, 4, 282, 5, -1, 4, 282, 244, 352, -1, + 4, 294, -1, 4, 296, -1, 4, 302, 27, 352, + -1, 4, 302, 222, 360, 365, 359, 360, 367, 350, + 355, -1, 4, 336, 4, -1, 164, -1, 164, 350, + 350, -1, 173, 502, -1, 174, 503, -1, 194, 504, + -1, 229, 352, -1, 231, 507, 352, -1, 231, 507, + 352, 350, 350, -1, 244, 40, 350, 350, -1, 244, + 193, 350, 350, 4, -1, 244, 111, -1, 249, 5, + 494, 360, 365, 366, 352, -1, 249, 281, 5, -1, + 255, 511, -1, 262, 512, -1, 5, 66, 5, -1, + 5, 80, -1, 5, 99, -1, 5, 89, -1, 5, + 129, 5, -1, 5, 149, -1, 5, 149, 209, -1, + 5, 194, 350, 350, -1, 5, 194, 132, -1, 5, + 194, 36, -1, 5, 194, 288, 360, 365, 359, -1, + 5, 231, 507, 352, -1, 5, 255, -1, 5, 255, + 209, -1, 5, 294, -1, 5, 296, -1, 280, 105, + 5, 5, -1, 280, 99, 5, -1, 280, 99, 17, + -1, 280, 5, -1, 280, 297, 5, -1, 215, -1, + 215, 360, -1, 293, -1, 294, 17, -1, 296, 17, + -1, 336, 4, -1, 255, -1, 296, -1, 149, -1, + 294, -1, 40, 194, -1, 194, -1, 111, 194, -1, + 40, 105, -1, 105, -1, 111, 105, -1, 40, 244, + -1, 244, -1, 111, 244, -1, 99, -1, 282, -1, + 66, -1, 336, -1, 231, -1, 129, -1, 164, -1, + 297, -1, -1, 4, -1, 30, 352, -1, 236, 350, + -1, 160, 4, -1, 210, 4, 350, -1, 62, 350, + 350, 350, 508, -1, 109, 350, 350, 350, 350, 354, + 508, -1, 48, 350, 350, 350, 350, 354, 508, -1, + 224, 350, 350, 350, 350, 508, -1, 254, 350, 350, + 350, 350, 508, -1, 171, 350, 350, 350, 350, 508, + -1, 302, 350, 350, 350, 350, 508, -1, 282, 350, + 350, 354, 508, -1, 62, 222, 350, 350, 372, 508, + -1, 48, 222, 350, 350, 372, 508, -1, 102, 222, + 350, 350, 372, 508, -1, 85, 222, 350, 350, 372, + 508, -1, 346, 222, 350, 350, 372, 508, -1, 27, + 222, 350, 350, 372, 508, -1, 51, 222, 350, 350, + 372, 508, -1, 245, 350, 350, 350, 350, 360, 365, + 360, 367, 5, 508, -1, 74, 350, 350, 350, 360, + 365, 508, -1, 230, 350, 350, 350, 350, 350, 508, + -1, 22, 350, 350, 350, 350, 4, 508, -1, 110, + 350, 350, 350, 350, 350, 4, 354, 508, -1, 49, + 350, 350, 350, 350, 350, 4, 354, 508, -1, 82, + 350, 350, 355, 355, 4, 350, 350, 4, 508, -1, + 113, 350, 350, 355, 355, 4, 350, 350, 350, 4, + 354, 508, -1, 52, 350, 350, 355, 355, 4, 350, + 350, 350, 4, 354, 508, -1, 75, 508, -1, 281, + 491, -1, 5, 350, 350, -1, 300, 5, 350, 350, + -1, 350, 350, 300, 5, -1, 5, 360, 365, 359, + -1, 4, 4, -1, 40, 350, 350, 4, -1, 193, + 350, 350, 4, -1, 111, -1, 104, -1, 338, -1, + 63, -1, 248, -1, 247, -1, 233, -1, 339, -1, + 60, 496, -1, 66, -1, 129, -1, 114, -1, 143, + 350, 350, -1, 154, 350, 350, -1, 4, 20, 82, + 360, -1, 4, 20, 151, 5, 5, 4, -1, 4, + 20, 220, 5, 5, 5, 5, 360, 365, 374, -1, + 4, 20, 221, 5, 5, 360, 365, 374, -1, 4, + 20, 235, 5, 5, 5, 360, -1, 4, 20, 275, + 360, 365, -1, 154, 17, -1, 4, 21, -1, 4, + 21, 362, -1, 4, 21, 360, 365, -1, 4, 22, + 236, 360, 367, -1, 4, 48, 121, -1, 4, 49, + 236, 360, 367, -1, 4, 48, 236, 360, 367, -1, + 4, 52, 21, -1, 4, 52, 21, 362, -1, 4, + 52, 21, 360, 365, -1, 4, 52, 236, 360, 367, + -1, 4, 59, 360, 365, 366, -1, 4, 62, 121, + -1, 4, 62, 236, 360, 367, -1, 4, 66, -1, + 4, 74, 27, -1, 4, 74, 166, -1, 4, 74, + 236, 360, 367, -1, 4, 74, 278, -1, 4, 75, + 138, -1, 4, 82, 21, -1, 4, 82, 21, 362, + -1, 4, 82, 21, 360, 365, -1, 4, 82, 236, + 360, 367, -1, 4, 109, 121, -1, 4, 109, 236, + 360, 367, -1, 4, 110, 236, 360, 367, -1, 4, + 113, 21, -1, 4, 113, 21, 362, -1, 4, 113, + 21, 360, 365, -1, 4, 113, 236, 360, 367, -1, + 4, 129, -1, 4, 149, -1, 4, 171, 27, -1, + 4, 171, 167, 360, 367, -1, 4, 171, 222, 360, + 365, 366, -1, 4, 180, 167, 350, 360, 367, -1, + 4, 224, 121, -1, 4, 222, 258, -1, 4, 222, + 265, -1, 4, 230, 222, 360, 365, 366, -1, 4, + 230, 167, 360, 367, -1, 4, 230, 286, 360, 367, + -1, 4, 231, -1, 4, 231, 507, -1, 4, 245, + 130, -1, 4, 245, 167, 360, 367, -1, 4, 245, + 222, 360, 365, 366, -1, 4, 245, 278, -1, 4, + 255, -1, 4, 280, -1, 4, 280, 4, -1, 4, + 282, -1, 4, 282, 244, -1, 4, 292, -1, 4, + 302, 27, -1, 4, 302, 167, 360, 367, -1, 4, + 302, 222, 360, 365, 366, -1, 4, 336, -1, 149, + 497, -1, 149, 205, -1, 205, -1, 224, 254, 350, + 350, -1, 254, 254, 350, 350, -1, 229, -1, 231, + 507, -1, 255, 498, -1, 255, 205, -1, 262, 499, + -1, 5, 66, -1, 5, 129, -1, 5, 154, -1, + 5, 231, 507, -1, 5, 280, -1, 5, 280, 205, + -1, 280, 17, -1, 280, 98, 195, -1, 336, -1, + 30, -1, 236, -1, 160, -1, 210, -1, -1, 350, + 350, -1, -1, 350, 350, -1, -1, 282, -1, -1, + -1, 223, -1, 237, -1, 298, -1, 57, -1, 494, + 360, 365, 366, 352, 509, 515, -1, 255, 494, 360, + 365, 366, 352, 509, 515, -1, 494, 5, -1, 494, + 5, 360, 365, -1, 494, 4, -1, 494, 4, 360, + 365, -1, 124, 5, 5, 492, 4, 5, -1, 350, + 350, -1, 132, -1, 36, -1, 40, 350, 350, -1, + 193, 350, 350, -1, 111, -1, 288, 360, 365, 359, + -1, 505, 506, -1, 506, -1, 507, 347, 352, -1, + 66, 347, 5, -1, 92, 347, 4, 4, -1, 336, + 347, 4, -1, 129, 347, 5, -1, 282, 347, 5, + -1, 518, -1, 519, -1, 202, -1, 255, -1, 149, + -1, 91, -1, 126, -1, 105, -1, 194, -1, 244, + -1, 99, -1, 157, -1, 271, -1, 500, -1, 500, + 505, -1, -1, -1, 510, 513, -1, 17, -1, 209, + 350, 350, -1, 289, -1, 289, 350, 350, -1, 352, + -1, 282, 352, -1, 513, 514, -1, 514, -1, 507, + 347, 352, -1, -1, -1, 516, 517, -1, 517, 518, + -1, 518, -1, 280, 347, 5, -1, 55, 347, 488, + 5, 5, -1, 64, -1, 66, 5, -1, 181, 4, + -1, 278, 360, -1, 287, 350, -1, 346, -1, 344, + -1, 339, -1, 202, -1, 350, 350, 350, 350, -1, + 350, 350, -1, 362, 350, 350, -1, 360, 365, 359, + -1, 288, 523, -1, 39, 350, 350, -1, 193, 524, + -1, 229, 352, -1, 350, 350, -1, 362, 350, 350, + -1, 360, 365, 359, -1, 40, 350, 350, -1, 350, + 350, -1, 111, 350, 350, -1, 352, -1, 307, 361, + 365, -1, 5, 4, 4, -1, 297, -1, 70, 528, + -1, 168, 4, -1, 241, 4, -1, 250, 350, -1, + 4, 4, 4, 4, 4, 4, 4, 4, 4, -1, + 4, 4, 4, 4, 4, 4, -1, 54, -1, 140, + -1, 242, -1, 90, -1, 149, 530, -1, 255, 531, + -1, 40, 350, 350, -1, 193, 350, 350, -1, 111, + -1, 260, 111, -1, 40, 350, 350, -1, 193, 350, + 350, -1, 111, -1, 260, 111, -1, 188, -1, 13, + -1, 202, -1, 34, -1, 107, -1, 61, 5, -1, + 278, 360, -1, 301, 4, 4, 4, -1, 350, -1, + 350, 97, -1, 193, 536, -1, 288, 350, -1, 288, + 350, 97, -1, 40, -1, 350, -1, 111, -1, 26, + 538, -1, 124, 540, -1, 204, 550, -1, 112, 551, + -1, 217, 5, -1, 120, 5, 375, -1, 61, 5, + 375, -1, 269, 4, 375, -1, 242, 87, 539, -1, + 120, 5, 375, -1, 61, 5, 375, -1, 269, 4, + 375, -1, 541, -1, 156, 541, -1, 279, 542, -1, + 266, 543, -1, 117, 87, 544, -1, 191, 545, -1, + 242, 156, 547, -1, 242, 87, 548, -1, 239, 549, + -1, 120, 5, -1, 61, 5, -1, 269, 4, -1, + 120, 5, -1, 61, 5, -1, 269, 4, -1, 120, + 5, -1, 61, 5, -1, 269, 4, -1, 120, 5, + -1, 61, 5, -1, 269, 4, -1, 156, 546, -1, + 120, 5, 4, -1, 61, 5, 4, -1, 269, 4, + 4, -1, 120, 5, -1, 61, 5, -1, 269, 4, + -1, 120, 5, -1, 61, 5, -1, 269, 4, -1, + 120, 5, -1, 61, 5, -1, 269, 4, -1, 120, + 5, -1, 61, 5, -1, 269, 4, -1, 120, 5, + 375, -1, 61, 5, 375, -1, 269, 4, 375, -1, + 120, 5, 5, 375, -1, 553, 4, 4, 350, 350, + 355, -1, 553, 4, -1, 99, -1, 50, -1, 290, + -1, 136, -1, 108, -1, -1, 4, 350, 350, 350, + 350, -1, 203, -1, 203, 4, 350, 350, 350, 350, + -1, 124, 266, 555, -1, 4, -1, 350, 360, 365, + -1, 4, 4, -1, 350, 350, -1, 288, 350, 350, + -1, 361, 365, 366, -1, 16, 560, -1, 240, 4, + -1, 238, 559, -1, 23, 558, -1, 4, 4, -1, + 4, 5, -1, 282, 4, 5, -1, 4, 4, -1, + 4, 5, -1, 282, 4, 5, -1, 4, -1, 4, + 361, 365, -1, 4, 6, 361, 365, -1, 228, -1, + 350, 350, -1, 350, 350, 12, 350, 350, -1, 350, + 350, 12, 362, 350, 350, -1, 350, 350, 12, 360, + 365, 359, -1, 288, 563, -1, 123, -1, 123, 350, + -1, 350, 350, -1, 350, 350, 12, 350, 350, -1, + 350, 350, 12, 362, 350, 350, -1, 350, 350, 12, + 360, 365, 359, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -1797,85 +1798,85 @@ static const yytype_uint16 yyrline[] = 1165, 1168, 1169, 1170, 1173, 1174, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1187, 1188, 1191, 1192, 1195, 1196, 1197, 1198, 1201, 1204, 1206, 1209, 1213, 1214, - 1216, 1218, 1222, 1223, 1224, 1227, 1228, 1229, 1232, 1235, - 1236, 1237, 1240, 1241, 1242, 1243, 1244, 1245, 1248, 1249, - 1250, 1251, 1252, 1253, 1254, 1257, 1258, 1261, 1262, 1265, - 1266, 1269, 1270, 1273, 1274, 1275, 1278, 1279, 1282, 1283, - 1286, 1289, 1297, 1298, 1301, 1302, 1303, 1304, 1305, 1306, + 1216, 1218, 1222, 1223, 1224, 1227, 1228, 1229, 1230, 1233, + 1236, 1237, 1238, 1241, 1242, 1243, 1244, 1245, 1246, 1249, + 1250, 1251, 1252, 1253, 1254, 1255, 1258, 1259, 1262, 1263, + 1266, 1267, 1270, 1271, 1274, 1275, 1276, 1279, 1280, 1283, + 1284, 1287, 1290, 1298, 1299, 1302, 1303, 1304, 1305, 1306, 1307, 1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316, - 1317, 1320, 1323, 1324, 1327, 1328, 1329, 1330, 1333, 1334, - 1335, 1336, 1339, 1340, 1341, 1342, 1343, 1344, 1347, 1348, - 1349, 1350, 1351, 1352, 1354, 1355, 1360, 1361, 1364, 1366, - 1368, 1371, 1372, 1373, 1374, 1375, 1376, 1379, 1381, 1383, - 1385, 1386, 1388, 1390, 1392, 1394, 1396, 1399, 1400, 1401, - 1402, 1403, 1404, 1406, 1407, 1408, 1411, 1414, 1416, 1418, - 1420, 1422, 1424, 1426, 1428, 1431, 1433, 1435, 1437, 1438, - 1439, 1440, 1441, 1444, 1445, 1446, 1447, 1448, 1449, 1450, - 1452, 1454, 1455, 1456, 1459, 1460, 1461, 1462, 1463, 1464, - 1466, 1467, 1468, 1471, 1472, 1473, 1474, 1475, 1478, 1481, - 1484, 1487, 1490, 1493, 1496, 1499, 1502, 1507, 1510, 1513, - 1516, 1519, 1522, 1525, 1528, 1531, 1534, 1537, 1542, 1545, - 1548, 1551, 1554, 1557, 1560, 1563, 1566, 1571, 1574, 1577, - 1580, 1583, 1586, 1589, 1592, 1595, 1598, 1601, 1606, 1608, - 1609, 1610, 1611, 1612, 1614, 1615, 1616, 1618, 1619, 1620, - 1621, 1622, 1623, 1624, 1626, 1628, 1629, 1630, 1633, 1634, - 1635, 1636, 1637, 1638, 1640, 1641, 1642, 1645, 1647, 1649, - 1650, 1652, 1654, 1658, 1659, 1662, 1663, 1664, 1667, 1674, - 1675, 1676, 1677, 1678, 1679, 1680, 1683, 1691, 1692, 1693, - 1694, 1696, 1698, 1699, 1699, 1700, 1701, 1702, 1703, 1704, - 1705, 1707, 1708, 1710, 1713, 1716, 1717, 1718, 1721, 1724, - 1727, 1728, 1732, 1735, 1738, 1741, 1745, 1750, 1755, 1757, - 1758, 1760, 1761, 1763, 1765, 1767, 1769, 1770, 1772, 1774, - 1778, 1783, 1785, 1787, 1789, 1791, 1793, 1795, 1797, 1799, - 1801, 1803, 1806, 1807, 1809, 1811, 1812, 1814, 1816, 1817, - 1818, 1820, 1822, 1823, 1824, 1826, 1827, 1828, 1831, 1835, - 1838, 1841, 1845, 1850, 1856, 1857, 1858, 1860, 1861, 1865, - 1867, 1868, 1869, 1872, 1875, 1878, 1880, 1882, 1883, 1888, - 1891, 1892, 1893, 1896, 1900, 1901, 1903, 1904, 1905, 1907, - 1908, 1910, 1911, 1916, 1918, 1919, 1921, 1922, 1923, 1924, - 1925, 1926, 1928, 1930, 1932, 1933, 1935, 1936, 1938, 1940, + 1317, 1318, 1321, 1324, 1325, 1328, 1329, 1330, 1331, 1334, + 1335, 1336, 1337, 1340, 1341, 1342, 1343, 1344, 1345, 1348, + 1349, 1350, 1351, 1352, 1353, 1355, 1356, 1361, 1362, 1365, + 1367, 1369, 1372, 1373, 1374, 1375, 1376, 1377, 1380, 1382, + 1384, 1386, 1387, 1389, 1391, 1393, 1395, 1397, 1400, 1401, + 1402, 1403, 1404, 1405, 1407, 1408, 1409, 1412, 1415, 1417, + 1419, 1421, 1423, 1425, 1427, 1429, 1432, 1434, 1436, 1438, + 1439, 1440, 1441, 1442, 1445, 1446, 1447, 1448, 1449, 1450, + 1451, 1453, 1455, 1456, 1457, 1460, 1461, 1462, 1463, 1464, + 1465, 1467, 1468, 1469, 1472, 1473, 1474, 1475, 1476, 1479, + 1482, 1485, 1488, 1491, 1494, 1497, 1500, 1503, 1508, 1511, + 1514, 1517, 1520, 1523, 1526, 1529, 1532, 1535, 1538, 1543, + 1546, 1549, 1552, 1555, 1558, 1561, 1564, 1567, 1572, 1575, + 1578, 1581, 1584, 1587, 1590, 1593, 1596, 1599, 1602, 1607, + 1609, 1610, 1611, 1612, 1613, 1615, 1616, 1617, 1619, 1620, + 1621, 1622, 1623, 1624, 1625, 1627, 1629, 1630, 1631, 1634, + 1635, 1636, 1637, 1638, 1639, 1641, 1642, 1643, 1646, 1648, + 1650, 1651, 1653, 1655, 1659, 1660, 1663, 1664, 1665, 1668, + 1675, 1676, 1677, 1678, 1679, 1680, 1681, 1684, 1692, 1693, + 1694, 1695, 1697, 1699, 1700, 1700, 1701, 1702, 1703, 1704, + 1705, 1706, 1708, 1709, 1711, 1714, 1717, 1718, 1719, 1722, + 1725, 1728, 1729, 1733, 1736, 1739, 1742, 1746, 1751, 1756, + 1758, 1759, 1761, 1762, 1764, 1766, 1768, 1770, 1771, 1773, + 1775, 1779, 1784, 1786, 1788, 1790, 1792, 1794, 1796, 1798, + 1800, 1802, 1804, 1807, 1808, 1810, 1812, 1813, 1815, 1817, + 1818, 1819, 1821, 1823, 1824, 1825, 1827, 1828, 1829, 1832, + 1836, 1839, 1842, 1846, 1851, 1857, 1858, 1859, 1861, 1862, + 1866, 1868, 1869, 1870, 1873, 1876, 1879, 1881, 1883, 1884, + 1889, 1892, 1893, 1894, 1897, 1901, 1902, 1904, 1905, 1906, + 1908, 1909, 1911, 1912, 1917, 1919, 1920, 1922, 1923, 1924, + 1925, 1926, 1927, 1929, 1931, 1933, 1934, 1936, 1937, 1939, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1949, 1950, - 1952, 1954, 1955, 1956, 1957, 1959, 1960, 1961, 1962, 1963, - 1965, 1966, 1967, 1968, 1969, 1970, 1973, 1974, 1975, 1976, + 1951, 1953, 1955, 1956, 1957, 1958, 1960, 1961, 1962, 1963, + 1964, 1966, 1967, 1968, 1969, 1970, 1971, 1974, 1975, 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985, 1986, - 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997, 1998, - 1999, 2000, 2001, 2009, 2016, 2025, 2034, 2041, 2048, 2056, - 2064, 2071, 2076, 2081, 2086, 2091, 2096, 2101, 2107, 2117, - 2127, 2137, 2144, 2154, 2164, 2173, 2185, 2198, 2203, 2206, - 2208, 2210, 2215, 2219, 2222, 2224, 2226, 2229, 2230, 2231, - 2232, 2233, 2234, 2235, 2238, 2239, 2240, 2241, 2242, 2243, - 2245, 2247, 2249, 2251, 2253, 2255, 2258, 2259, 2260, 2261, - 2263, 2266, 2267, 2269, 2271, 2272, 2273, 2275, 2278, 2281, - 2282, 2284, 2285, 2286, 2287, 2289, 2290, 2291, 2292, 2293, - 2295, 2297, 2298, 2300, 2303, 2304, 2305, 2307, 2309, 2310, - 2311, 2312, 2314, 2317, 2321, 2322, 2323, 2324, 2327, 2330, - 2332, 2333, 2334, 2335, 2337, 2340, 2341, 2343, 2344, 2345, - 2346, 2347, 2349, 2350, 2352, 2355, 2356, 2357, 2358, 2359, - 2361, 2363, 2364, 2365, 2366, 2368, 2370, 2371, 2372, 2373, - 2374, 2375, 2377, 2378, 2380, 2383, 2384, 2385, 2386, 2389, - 2390, 2393, 2394, 2397, 2398, 2401, 2414, 2415, 2419, 2420, - 2424, 2427, 2432, 2439, 2441, 2444, 2446, 2449, 2453, 2454, - 2455, 2456, 2457, 2458, 2459, 2463, 2464, 2467, 2468, 2469, - 2470, 2471, 2472, 2473, 2474, 2477, 2478, 2479, 2480, 2481, - 2482, 2483, 2484, 2485, 2486, 2487, 2490, 2491, 2494, 2495, - 2495, 2498, 2499, 2500, 2501, 2504, 2505, 2508, 2509, 2512, - 2516, 2517, 2517, 2520, 2521, 2524, 2527, 2531, 2532, 2533, - 2534, 2537, 2538, 2539, 2540, 2543, 2545, 2546, 2551, 2553, - 2554, 2555, 2556, 2559, 2560, 2565, 2569, 2570, 2571, 2574, - 2575, 2580, 2581, 2584, 2586, 2587, 2588, 2593, 2595, 2601, - 2602, 2603, 2604, 2607, 2608, 2611, 2613, 2615, 2616, 2619, - 2621, 2622, 2623, 2626, 2627, 2630, 2631, 2632, 2635, 2636, - 2637, 2640, 2641, 2642, 2643, 2644, 2647, 2648, 2649, 2652, - 2653, 2654, 2655, 2656, 2659, 2661, 2663, 2665, 2668, 2670, - 2672, 2675, 2676, 2677, 2678, 2679, 2680, 2681, 2682, 2683, - 2686, 2687, 2688, 2691, 2692, 2693, 2696, 2697, 2698, 2701, - 2702, 2703, 2706, 2707, 2708, 2709, 2712, 2713, 2714, 2717, - 2718, 2719, 2722, 2723, 2724, 2727, 2728, 2729, 2732, 2734, - 2736, 2740, 2744, 2746, 2751, 2754, 2755, 2756, 2757, 2760, - 2761, 2763, 2764, 2766, 2769, 2770, 2772, 2778, 2779, 2782, - 2784, 2785, 2786, 2787, 2790, 2791, 2792, 2795, 2796, 2797, - 2800, 2801, 2806, 2810, 2817, 2818, 2820, 2825, 2827, 2830, - 2831, 2832, 2833, 2835, 2840 + 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1997, 1998, + 1999, 2000, 2001, 2002, 2010, 2017, 2026, 2035, 2042, 2049, + 2057, 2065, 2072, 2077, 2082, 2087, 2092, 2097, 2102, 2108, + 2118, 2128, 2138, 2145, 2155, 2165, 2174, 2186, 2199, 2204, + 2207, 2209, 2211, 2216, 2220, 2223, 2225, 2227, 2230, 2231, + 2232, 2233, 2234, 2235, 2236, 2239, 2240, 2241, 2242, 2243, + 2244, 2246, 2248, 2250, 2252, 2254, 2256, 2259, 2260, 2261, + 2262, 2264, 2267, 2268, 2270, 2272, 2273, 2274, 2276, 2279, + 2282, 2283, 2285, 2286, 2287, 2288, 2290, 2291, 2292, 2293, + 2294, 2296, 2298, 2299, 2301, 2304, 2305, 2306, 2308, 2310, + 2311, 2312, 2313, 2315, 2318, 2322, 2323, 2324, 2325, 2328, + 2331, 2333, 2334, 2335, 2336, 2338, 2341, 2342, 2344, 2345, + 2346, 2347, 2348, 2350, 2351, 2353, 2356, 2357, 2358, 2359, + 2360, 2362, 2364, 2365, 2366, 2367, 2369, 2371, 2372, 2373, + 2374, 2375, 2376, 2378, 2379, 2381, 2384, 2385, 2386, 2387, + 2390, 2391, 2394, 2395, 2398, 2399, 2402, 2415, 2416, 2420, + 2421, 2425, 2428, 2433, 2440, 2442, 2445, 2447, 2450, 2454, + 2455, 2456, 2457, 2458, 2459, 2460, 2464, 2465, 2468, 2469, + 2470, 2471, 2472, 2473, 2474, 2475, 2478, 2479, 2480, 2481, + 2482, 2483, 2484, 2485, 2486, 2487, 2488, 2491, 2492, 2495, + 2496, 2496, 2499, 2500, 2501, 2502, 2505, 2506, 2509, 2510, + 2513, 2517, 2518, 2518, 2521, 2522, 2525, 2528, 2532, 2533, + 2534, 2535, 2536, 2539, 2540, 2541, 2542, 2545, 2547, 2548, + 2553, 2555, 2556, 2557, 2558, 2561, 2562, 2567, 2571, 2572, + 2573, 2576, 2577, 2582, 2583, 2586, 2588, 2589, 2590, 2595, + 2597, 2603, 2604, 2605, 2606, 2609, 2610, 2613, 2615, 2617, + 2618, 2621, 2623, 2624, 2625, 2628, 2629, 2632, 2633, 2634, + 2637, 2638, 2639, 2642, 2643, 2644, 2645, 2646, 2649, 2650, + 2651, 2654, 2655, 2656, 2657, 2658, 2661, 2663, 2665, 2667, + 2670, 2672, 2674, 2677, 2678, 2679, 2680, 2681, 2682, 2683, + 2684, 2685, 2688, 2689, 2690, 2693, 2694, 2695, 2698, 2699, + 2700, 2703, 2704, 2705, 2708, 2709, 2710, 2711, 2714, 2715, + 2716, 2719, 2720, 2721, 2724, 2725, 2726, 2729, 2730, 2731, + 2734, 2736, 2738, 2742, 2746, 2748, 2753, 2756, 2757, 2758, + 2759, 2762, 2763, 2765, 2766, 2768, 2771, 2772, 2774, 2780, + 2781, 2784, 2786, 2787, 2788, 2789, 2792, 2793, 2794, 2797, + 2798, 2799, 2802, 2803, 2808, 2812, 2819, 2820, 2822, 2827, + 2829, 2832, 2833, 2834, 2835, 2837, 2842 }; #endif @@ -2077,32 +2078,32 @@ static const yytype_uint16 yyr1[] = 433, 434, 434, 434, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 435, 436, 436, 437, 437, 437, 437, 438, 439, 439, 439, 440, 440, - 440, 440, 441, 441, 441, 442, 442, 442, 443, 444, - 444, 444, 445, 445, 445, 445, 445, 445, 446, 446, - 446, 446, 446, 446, 446, 447, 447, 448, 448, 449, - 449, 450, 450, 451, 451, 451, 452, 452, 453, 453, - 454, 454, 455, 455, 456, 456, 456, 456, 456, 456, + 440, 440, 441, 441, 441, 442, 442, 442, 442, 443, + 444, 444, 444, 445, 445, 445, 445, 445, 445, 446, + 446, 446, 446, 446, 446, 446, 447, 447, 448, 448, + 449, 449, 450, 450, 451, 451, 451, 452, 452, 453, + 453, 454, 454, 455, 455, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 457, 458, 458, 459, 459, 459, 459, 460, 460, - 460, 460, 461, 461, 461, 461, 461, 461, 462, 462, - 462, 462, 462, 462, 462, 462, 463, 463, 464, 464, - 464, 465, 465, 465, 465, 465, 465, 466, 466, 466, - 466, 466, 466, 466, 466, 466, 466, 467, 467, 467, - 467, 467, 467, 467, 467, 467, 468, 469, 469, 469, + 456, 456, 457, 458, 458, 459, 459, 459, 459, 460, + 460, 460, 460, 461, 461, 461, 461, 461, 461, 462, + 462, 462, 462, 462, 462, 462, 462, 463, 463, 464, + 464, 464, 465, 465, 465, 465, 465, 465, 466, 466, + 466, 466, 466, 466, 466, 466, 466, 466, 467, 467, + 467, 467, 467, 467, 467, 467, 467, 468, 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, 469, - 469, 469, 469, 470, 470, 470, 470, 470, 470, 470, - 470, 470, 470, 470, 471, 471, 471, 471, 471, 471, - 471, 471, 471, 472, 472, 472, 472, 472, 473, 473, - 473, 473, 473, 473, 473, 473, 473, 474, 474, 474, - 474, 474, 474, 474, 474, 474, 474, 474, 475, 475, - 475, 475, 475, 475, 475, 475, 475, 476, 476, 476, - 476, 476, 476, 476, 476, 476, 476, 476, 477, 477, - 477, 477, 477, 477, 477, 477, 477, 478, 478, 478, - 478, 478, 478, 478, 478, 478, 478, 478, 479, 479, - 479, 479, 479, 479, 479, 479, 479, 480, 480, 480, - 480, 480, 480, 481, 481, 482, 482, 482, 483, 484, - 484, 484, 484, 484, 484, 484, 485, 486, 486, 486, - 486, 486, 486, 487, 486, 486, 486, 486, 486, 486, + 469, 469, 469, 469, 470, 470, 470, 470, 470, 470, + 470, 470, 470, 470, 470, 471, 471, 471, 471, 471, + 471, 471, 471, 471, 472, 472, 472, 472, 472, 473, + 473, 473, 473, 473, 473, 473, 473, 473, 474, 474, + 474, 474, 474, 474, 474, 474, 474, 474, 474, 475, + 475, 475, 475, 475, 475, 475, 475, 475, 476, 476, + 476, 476, 476, 476, 476, 476, 476, 476, 476, 477, + 477, 477, 477, 477, 477, 477, 477, 477, 478, 478, + 478, 478, 478, 478, 478, 478, 478, 478, 478, 479, + 479, 479, 479, 479, 479, 479, 479, 479, 480, 480, + 480, 480, 480, 480, 481, 481, 482, 482, 482, 483, + 484, 484, 484, 484, 484, 484, 484, 485, 486, 486, + 486, 486, 486, 486, 487, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, @@ -2116,14 +2117,14 @@ static const yytype_uint16 yyr1[] = 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, 486, - 486, 486, 486, 486, 486, 486, 488, 488, 488, 488, + 486, 486, 486, 486, 486, 486, 486, 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, 488, - 488, 488, 488, 488, 488, 488, 488, 489, 489, 489, - 489, 489, 489, 490, 490, 490, 490, 490, 490, 490, + 488, 488, 488, 488, 488, 488, 488, 488, 489, 489, + 489, 489, 489, 489, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, - 490, 490, 490, 490, 490, 490, 490, 490, 490, 491, - 491, 491, 491, 492, 493, 493, 493, 494, 494, 494, - 494, 494, 494, 494, 495, 495, 495, 495, 495, 495, + 490, 490, 490, 490, 490, 490, 490, 490, 490, 490, + 491, 491, 491, 491, 492, 493, 493, 493, 494, 494, + 494, 494, 494, 494, 494, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, @@ -2132,30 +2133,30 @@ static const yytype_uint16 yyr1[] = 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, 495, - 495, 495, 495, 495, 495, 496, 496, 496, 496, 497, - 497, 498, 498, 499, 499, 500, 501, 501, 501, 501, - 501, 502, 502, 503, 503, 503, 503, 503, 504, 504, - 504, 504, 504, 504, 504, 505, 505, 506, 506, 506, - 506, 506, 506, 506, 506, 507, 507, 507, 507, 507, - 507, 507, 507, 507, 507, 507, 508, 508, 509, 510, - 509, 511, 511, 511, 511, 512, 512, 513, 513, 514, - 515, 516, 515, 517, 517, 518, 519, 520, 520, 520, - 520, 521, 521, 521, 521, 522, 522, 522, 522, 522, - 522, 522, 522, 523, 523, 523, 524, 524, 524, 525, - 525, 525, 525, 526, 526, 526, 526, 527, 527, 528, - 528, 528, 528, 529, 529, 530, 530, 530, 530, 531, - 531, 531, 531, 532, 532, 533, 533, 533, 534, 534, - 534, 535, 535, 535, 535, 535, 536, 536, 536, 537, - 537, 537, 537, 537, 538, 538, 538, 538, 539, 539, - 539, 540, 540, 540, 540, 540, 540, 540, 540, 540, - 541, 541, 541, 542, 542, 542, 543, 543, 543, 544, - 544, 544, 545, 545, 545, 545, 546, 546, 546, 547, - 547, 547, 548, 548, 548, 549, 549, 549, 550, 550, - 550, 551, 552, 552, 552, 553, 553, 553, 553, 554, - 554, 554, 554, 554, 555, 555, 555, 556, 556, 557, - 557, 557, 557, 557, 558, 558, 558, 559, 559, 559, - 560, 560, 560, 561, 562, 562, 562, 562, 562, 563, - 563, 563, 563, 563, 563 + 495, 495, 495, 495, 495, 495, 496, 496, 496, 496, + 497, 497, 498, 498, 499, 499, 500, 501, 501, 501, + 501, 501, 502, 502, 503, 503, 503, 503, 503, 504, + 504, 504, 504, 504, 504, 504, 505, 505, 506, 506, + 506, 506, 506, 506, 506, 506, 507, 507, 507, 507, + 507, 507, 507, 507, 507, 507, 507, 508, 508, 509, + 510, 509, 511, 511, 511, 511, 512, 512, 513, 513, + 514, 515, 516, 515, 517, 517, 518, 519, 520, 520, + 520, 520, 520, 521, 521, 521, 521, 522, 522, 522, + 522, 522, 522, 522, 522, 523, 523, 523, 524, 524, + 524, 525, 525, 525, 525, 526, 526, 526, 526, 527, + 527, 528, 528, 528, 528, 529, 529, 530, 530, 530, + 530, 531, 531, 531, 531, 532, 532, 533, 533, 533, + 534, 534, 534, 535, 535, 535, 535, 535, 536, 536, + 536, 537, 537, 537, 537, 537, 538, 538, 538, 538, + 539, 539, 539, 540, 540, 540, 540, 540, 540, 540, + 540, 540, 541, 541, 541, 542, 542, 542, 543, 543, + 543, 544, 544, 544, 545, 545, 545, 545, 546, 546, + 546, 547, 547, 547, 548, 548, 548, 549, 549, 549, + 550, 550, 550, 551, 552, 552, 552, 553, 553, 553, + 553, 554, 554, 554, 554, 554, 555, 555, 555, 556, + 556, 557, 557, 557, 557, 557, 558, 558, 558, 559, + 559, 559, 560, 560, 560, 561, 562, 562, 562, 562, + 562, 563, 563, 563, 563, 563, 563 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -2208,84 +2209,84 @@ static const yytype_uint8 yyr2[] = 3, 2, 1, 2, 1, 4, 2, 1, 1, 3, 1, 2, 3, 2, 0, 1, 4, 2, 0, 4, 5, 5, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 1, 2, 1, 2, 2, - 2, 2, 1, 1, 1, 0, 1, 0, 1, 0, - 1, 0, 1, 0, 2, 2, 0, 1, 2, 1, - 6, 5, 1, 1, 1, 2, 2, 1, 1, 1, - 1, 2, 1, 1, 1, 2, 1, 1, 1, 2, - 2, 2, 0, 1, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 2, 2, 1, 2, 3, 1, - 2, 2, 4, 6, 1, 10, 1, 2, 3, 3, - 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, - 3, 3, 5, 4, 4, 4, 3, 3, 3, 3, - 2, 2, 4, 3, 3, 3, 3, 4, 4, 4, - 4, 5, 4, 6, 7, 4, 4, 5, 2, 3, - 3, 3, 2, 3, 3, 3, 3, 4, 3, 5, - 6, 3, 3, 4, 3, 3, 3, 3, 3, 5, - 3, 3, 4, 3, 2, 2, 1, 3, 4, 4, - 4, 4, 4, 6, 4, 4, 5, 4, 4, 4, - 4, 5, 4, 6, 7, 4, 4, 5, 5, 5, - 5, 5, 5, 7, 5, 5, 6, 5, 5, 5, - 5, 6, 5, 7, 8, 5, 5, 6, 3, 3, - 3, 3, 3, 5, 3, 3, 4, 3, 3, 3, - 3, 4, 3, 5, 6, 3, 3, 4, 3, 3, - 3, 3, 3, 5, 3, 3, 4, 4, 4, 3, - 5, 4, 4, 2, 3, 6, 6, 1, 1, 1, - 2, 2, 2, 3, 3, 2, 12, 2, 2, 1, - 3, 4, 2, 0, 3, 1, 1, 2, 2, 2, - 2, 2, 4, 4, 4, 3, 4, 5, 8, 6, - 4, 9, 6, 7, 10, 11, 12, 9, 5, 4, - 6, 3, 5, 5, 6, 5, 4, 9, 10, 11, - 9, 6, 6, 6, 6, 6, 6, 6, 6, 6, - 7, 7, 2, 4, 4, 4, 4, 5, 4, 4, - 5, 5, 3, 4, 4, 4, 4, 7, 9, 6, - 10, 11, 12, 9, 3, 2, 3, 5, 7, 4, - 3, 3, 6, 7, 7, 4, 4, 4, 9, 4, - 3, 4, 7, 7, 2, 3, 3, 3, 4, 2, - 2, 4, 10, 3, 1, 3, 2, 2, 2, 2, - 3, 5, 4, 5, 2, 7, 3, 2, 2, 3, - 2, 2, 2, 3, 2, 3, 4, 3, 3, 6, - 4, 2, 3, 2, 2, 4, 3, 3, 2, 3, - 1, 2, 1, 2, 2, 2, 1, 1, 1, 1, - 2, 1, 2, 2, 1, 2, 2, 1, 2, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 1, 2, - 2, 2, 3, 5, 7, 7, 6, 6, 6, 6, - 5, 6, 6, 6, 6, 6, 6, 6, 11, 7, - 7, 7, 9, 9, 10, 12, 12, 2, 2, 3, - 4, 4, 4, 2, 4, 4, 1, 1, 1, 1, - 1, 1, 1, 1, 2, 1, 1, 1, 3, 3, - 4, 6, 10, 8, 7, 5, 2, 2, 3, 4, - 5, 3, 5, 5, 3, 4, 5, 5, 5, 3, - 5, 2, 3, 3, 5, 3, 3, 3, 4, 5, - 5, 3, 5, 5, 3, 4, 5, 5, 2, 2, - 3, 5, 6, 6, 3, 3, 3, 6, 5, 5, - 2, 3, 3, 5, 6, 3, 2, 2, 3, 2, - 3, 2, 3, 5, 6, 2, 2, 2, 1, 4, - 4, 1, 2, 2, 2, 2, 2, 2, 2, 3, - 2, 3, 2, 3, 1, 1, 1, 1, 1, 0, - 2, 0, 2, 0, 1, 0, 0, 1, 1, 1, - 1, 7, 8, 2, 4, 2, 4, 6, 2, 1, - 1, 3, 3, 1, 4, 2, 1, 3, 3, 4, - 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 2, 0, 0, - 2, 1, 3, 1, 3, 1, 2, 2, 1, 3, - 0, 0, 2, 2, 1, 3, 5, 1, 2, 2, - 2, 1, 1, 1, 1, 4, 2, 3, 3, 2, - 3, 2, 2, 2, 3, 3, 3, 2, 3, 1, - 3, 3, 1, 2, 2, 2, 2, 9, 6, 1, - 1, 1, 1, 2, 2, 3, 3, 1, 2, 3, - 3, 1, 2, 1, 1, 1, 1, 1, 2, 2, - 4, 1, 2, 2, 2, 3, 1, 1, 1, 2, - 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, - 3, 1, 2, 2, 2, 3, 2, 3, 3, 2, + 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, + 2, 2, 2, 1, 1, 1, 0, 1, 0, 1, + 0, 1, 0, 1, 0, 2, 2, 0, 1, 2, + 1, 6, 5, 1, 1, 1, 2, 2, 1, 1, + 1, 1, 2, 1, 1, 1, 2, 1, 1, 1, + 2, 2, 2, 0, 1, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 2, 2, 2, 1, 2, 3, + 1, 2, 2, 4, 6, 1, 10, 1, 2, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 4, 4, + 4, 3, 3, 5, 4, 4, 4, 3, 3, 3, + 3, 2, 2, 4, 3, 3, 3, 3, 4, 4, + 4, 4, 5, 4, 6, 7, 4, 4, 5, 2, + 3, 3, 3, 2, 3, 3, 3, 3, 4, 3, + 5, 6, 3, 3, 4, 3, 3, 3, 3, 3, + 5, 3, 3, 4, 3, 2, 2, 1, 3, 4, + 4, 4, 4, 4, 6, 4, 4, 5, 4, 4, + 4, 4, 5, 4, 6, 7, 4, 4, 5, 5, + 5, 5, 5, 5, 7, 5, 5, 6, 5, 5, + 5, 5, 6, 5, 7, 8, 5, 5, 6, 3, + 3, 3, 3, 3, 5, 3, 3, 4, 3, 3, + 3, 3, 4, 3, 5, 6, 3, 3, 4, 3, + 3, 3, 3, 3, 5, 3, 3, 4, 4, 4, + 3, 5, 4, 4, 2, 3, 6, 6, 1, 1, + 1, 2, 2, 2, 3, 3, 2, 12, 2, 2, + 1, 3, 4, 2, 0, 3, 1, 1, 2, 2, + 2, 2, 2, 4, 4, 4, 3, 4, 5, 8, + 6, 4, 9, 6, 7, 10, 11, 12, 9, 5, + 4, 6, 3, 5, 5, 6, 5, 4, 9, 10, + 11, 9, 6, 6, 6, 6, 6, 6, 6, 6, + 6, 7, 7, 2, 4, 4, 4, 4, 5, 4, + 4, 5, 5, 3, 4, 4, 4, 4, 7, 9, + 6, 10, 11, 12, 9, 3, 2, 3, 5, 7, + 4, 3, 3, 6, 7, 7, 4, 4, 4, 9, + 4, 3, 4, 7, 7, 2, 3, 3, 3, 4, + 2, 2, 4, 10, 3, 1, 3, 2, 2, 2, + 2, 3, 5, 4, 5, 2, 7, 3, 2, 2, + 3, 2, 2, 2, 3, 2, 3, 4, 3, 3, + 6, 4, 2, 3, 2, 2, 4, 3, 3, 2, + 3, 1, 2, 1, 2, 2, 2, 1, 1, 1, + 1, 2, 1, 2, 2, 1, 2, 2, 1, 2, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, + 2, 2, 2, 3, 5, 7, 7, 6, 6, 6, + 6, 5, 6, 6, 6, 6, 6, 6, 6, 11, + 7, 7, 7, 9, 9, 10, 12, 12, 2, 2, + 3, 4, 4, 4, 2, 4, 4, 1, 1, 1, + 1, 1, 1, 1, 1, 2, 1, 1, 1, 3, + 3, 4, 6, 10, 8, 7, 5, 2, 2, 3, + 4, 5, 3, 5, 5, 3, 4, 5, 5, 5, + 3, 5, 2, 3, 3, 5, 3, 3, 3, 4, + 5, 5, 3, 5, 5, 3, 4, 5, 5, 2, + 2, 3, 5, 6, 6, 3, 3, 3, 6, 5, + 5, 2, 3, 3, 5, 6, 3, 2, 2, 3, + 2, 3, 2, 3, 5, 6, 2, 2, 2, 1, + 4, 4, 1, 2, 2, 2, 2, 2, 2, 2, + 3, 2, 3, 2, 3, 1, 1, 1, 1, 1, + 0, 2, 0, 2, 0, 1, 0, 0, 1, 1, + 1, 1, 7, 8, 2, 4, 2, 4, 6, 2, + 1, 1, 3, 3, 1, 4, 2, 1, 3, 3, + 4, 3, 3, 3, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 2, 0, + 0, 2, 1, 3, 1, 3, 1, 2, 2, 1, + 3, 0, 0, 2, 2, 1, 3, 5, 1, 2, + 2, 2, 2, 1, 1, 1, 1, 4, 2, 3, + 3, 2, 3, 2, 2, 2, 3, 3, 3, 2, + 3, 1, 3, 3, 1, 2, 2, 2, 2, 9, + 6, 1, 1, 1, 1, 2, 2, 3, 3, 1, + 2, 3, 3, 1, 2, 1, 1, 1, 1, 1, + 2, 2, 4, 1, 2, 2, 2, 3, 1, 1, + 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, + 3, 3, 3, 1, 2, 2, 2, 3, 2, 3, + 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 3, 3, 3, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, - 3, 4, 6, 2, 1, 1, 1, 1, 1, 0, - 5, 1, 6, 3, 1, 3, 2, 2, 3, 3, - 2, 2, 2, 2, 2, 2, 3, 2, 2, 3, - 1, 3, 4, 1, 2, 5, 6, 6, 2, 1, - 2, 2, 5, 6, 6 + 3, 3, 3, 4, 6, 2, 1, 1, 1, 1, + 1, 0, 5, 1, 6, 3, 1, 3, 2, 2, + 3, 3, 2, 2, 2, 2, 2, 2, 3, 2, + 2, 3, 1, 3, 4, 1, 2, 5, 6, 6, + 2, 1, 2, 2, 5, 6, 6 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -2295,9 +2296,9 @@ static const yytype_uint16 yydefact[] = { 0, 0, 0, 0, 6, 7, 0, 0, 0, 0, 0, 296, 0, 0, 0, 0, 0, 0, 0, 0, - 21, 0, 0, 0, 0, 0, 0, 0, 1026, 0, - 0, 0, 0, 0, 0, 0, 0, 1026, 38, 0, - 0, 0, 43, 0, 0, 0, 47, 1209, 49, 0, + 21, 0, 0, 0, 0, 0, 0, 0, 1027, 0, + 0, 0, 0, 0, 0, 0, 0, 1027, 38, 0, + 0, 0, 43, 0, 0, 0, 47, 1211, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 54, 55, 0, 233, 5, 0, 0, 0, 0, 0, 0, 8, 0, 0, 262, 264, @@ -2312,1639 +2313,1701 @@ static const yytype_uint16 yydefact[] = 0, 0, 0, 0, 0, 0, 57, 56, 0, 0, 0, 0, 2, 0, 17, 0, 0, 0, 372, 386, 0, 392, 0, 0, 0, 0, 0, 0, 0, 335, - 0, 462, 0, 0, 0, 0, 0, 1026, 0, 343, + 0, 462, 0, 0, 0, 0, 0, 1027, 0, 343, 0, 347, 0, 0, 0, 351, 0, 353, 0, 355, - 0, 0, 493, 359, 18, 0, 499, 19, 504, 0, - 522, 507, 508, 509, 510, 524, 512, 513, 517, 514, - 0, 516, 518, 0, 0, 20, 22, 0, 539, 0, - 0, 0, 544, 0, 23, 0, 0, 0, 0, 0, - 0, 0, 25, 698, 26, 0, 0, 0, 0, 0, - 0, 699, 27, 0, 28, 1030, 1027, 1028, 1029, 0, - 1087, 0, 0, 0, 30, 0, 1094, 1093, 1092, 1091, - 32, 0, 0, 0, 0, 0, 142, 0, 33, 0, - 1112, 0, 1109, 34, 0, 0, 0, 0, 37, 0, - 36, 35, 0, 0, 0, 0, 40, 0, 0, 1141, - 41, 0, 0, 0, 0, 0, 42, 1205, 1204, 1208, - 1207, 1206, 44, 0, 45, 0, 0, 0, 0, 0, - 198, 0, 0, 0, 46, 0, 0, 1211, 48, 0, - 0, 50, 0, 0, 0, 0, 142, 51, 1233, 52, - 0, 0, 53, 1, 4, 216, 0, 208, 0, 0, - 210, 0, 218, 211, 215, 226, 227, 212, 228, 0, - 214, 236, 237, 235, 234, 0, 0, 0, 241, 249, - 252, 251, 250, 248, 240, 245, 246, 247, 239, 0, - 0, 0, 0, 0, 0, 244, 9, 0, 0, 0, - 263, 0, 268, 0, 278, 269, 280, 270, 281, 271, - 292, 272, 0, 0, 273, 0, 87, 88, 89, 0, + 0, 0, 494, 359, 18, 0, 500, 19, 505, 0, + 523, 508, 509, 510, 511, 525, 513, 514, 518, 515, + 0, 517, 519, 0, 0, 20, 22, 0, 540, 0, + 0, 0, 545, 0, 23, 0, 0, 0, 0, 0, + 0, 0, 25, 699, 26, 0, 0, 0, 0, 0, + 0, 700, 27, 0, 28, 1031, 1028, 1029, 1030, 0, + 1088, 0, 0, 0, 0, 30, 0, 1096, 1095, 1094, + 1093, 32, 0, 0, 0, 0, 0, 142, 0, 33, + 0, 1114, 0, 1111, 34, 0, 0, 0, 0, 37, + 0, 36, 35, 0, 0, 0, 0, 40, 0, 0, + 1143, 41, 0, 0, 0, 0, 0, 42, 1207, 1206, + 1210, 1209, 1208, 44, 0, 45, 0, 0, 0, 0, + 0, 198, 0, 0, 0, 46, 0, 0, 1213, 48, + 0, 0, 50, 0, 0, 0, 0, 142, 51, 1235, + 52, 0, 0, 53, 1, 4, 216, 0, 208, 0, + 0, 210, 0, 218, 211, 215, 226, 227, 212, 228, + 0, 214, 236, 237, 235, 234, 0, 0, 0, 241, + 249, 252, 251, 250, 248, 240, 245, 246, 247, 239, + 0, 0, 0, 0, 0, 0, 244, 9, 0, 0, + 0, 263, 0, 268, 0, 278, 269, 280, 270, 281, + 271, 292, 272, 0, 0, 273, 0, 87, 88, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 299, 0, 0, 0, 0, 0, 144, 149, 143, 145, - 148, 147, 146, 0, 0, 316, 62, 63, 64, 65, - 66, 58, 59, 60, 67, 61, 0, 321, 0, 368, - 364, 360, 361, 365, 362, 367, 322, 371, 323, 284, - 376, 380, 375, 287, 286, 285, 0, 0, 324, 387, - 326, 0, 325, 0, 394, 327, 406, 398, 409, 399, - 400, 402, 0, 404, 405, 142, 328, 0, 0, 329, - 0, 0, 142, 330, 418, 142, 416, 331, 419, 333, - 142, 420, 332, 0, 142, 0, 334, 438, 0, 436, - 454, 0, 0, 0, 442, 434, 0, 444, 458, 447, - 336, 463, 464, 337, 0, 0, 0, 429, 0, 340, - 425, 426, 0, 341, 342, 0, 465, 466, 467, 345, - 346, 468, 348, 0, 469, 470, 471, 350, 477, 472, - 473, 475, 352, 483, 485, 487, 489, 482, 484, 491, - 354, 0, 0, 496, 0, 358, 142, 498, 0, 505, - 523, 506, 525, 526, 527, 511, 528, 530, 529, 531, - 515, 519, 536, 0, 0, 0, 0, 532, 520, 0, - 0, 541, 540, 0, 0, 0, 0, 24, 0, 0, - 551, 0, 552, 0, 0, 0, 0, 0, 553, 0, - 697, 0, 554, 0, 555, 0, 0, 556, 0, 702, - 701, 700, 0, 705, 0, 0, 0, 877, 0, 0, - 0, 709, 713, 715, 716, 0, 0, 0, 0, 814, - 0, 0, 0, 850, 0, 0, 0, 0, 0, 0, - 0, 852, 0, 0, 0, 29, 1088, 1089, 1090, 31, - 0, 0, 0, 0, 1101, 1102, 0, 142, 0, 1099, - 1096, 0, 0, 0, 142, 1119, 1122, 1120, 1121, 1113, - 1114, 1115, 1116, 0, 0, 0, 39, 1138, 1139, 0, - 1146, 1148, 1147, 1143, 1144, 1142, 0, 0, 0, 0, - 1149, 0, 1152, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1150, 1161, 0, 0, 0, 1151, 1153, - 1203, 1136, 1137, 1135, 196, 0, 200, 192, 0, 202, - 193, 0, 204, 194, 1134, 1133, 195, 197, 199, 0, - 0, 191, 0, 0, 0, 0, 1217, 1230, 1220, 0, - 0, 1223, 0, 0, 1222, 1221, 150, 1239, 0, 1238, - 1234, 217, 213, 0, 222, 0, 219, 0, 238, 137, - 140, 141, 139, 138, 253, 254, 255, 243, 242, 257, - 259, 258, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 142, 0, 300, 93, 90, 91, 92, 142, 302, - 301, 0, 0, 0, 0, 0, 0, 0, 315, 0, - 311, 309, 308, 320, 363, 0, 0, 366, 381, 382, - 377, 378, 383, 385, 384, 379, 288, 289, 374, 373, - 389, 388, 0, 393, 407, 408, 397, 410, 403, 401, - 396, 0, 0, 142, 142, 150, 150, 150, 142, 0, - 0, 142, 437, 448, 0, 439, 77, 450, 0, 0, - 441, 443, 142, 0, 0, 446, 0, 0, 0, 431, - 0, 0, 0, 0, 925, 927, 926, 0, 1019, 0, - 998, 0, 1001, 0, 0, 1021, 1023, 0, 1014, 344, - 0, 474, 476, 486, 479, 488, 480, 490, 481, 492, - 478, 0, 0, 497, 494, 495, 150, 521, 533, 534, - 535, 537, 0, 550, 538, 0, 0, 0, 0, 0, - 0, 163, 163, 157, 0, 0, 0, 0, 0, 0, + 0, 299, 0, 0, 0, 0, 0, 144, 149, 143, + 145, 148, 147, 146, 0, 0, 316, 62, 63, 64, + 65, 66, 58, 59, 60, 67, 61, 0, 321, 0, + 368, 364, 360, 361, 365, 362, 367, 322, 371, 323, + 284, 376, 380, 375, 287, 286, 285, 0, 0, 324, + 387, 326, 0, 325, 0, 394, 327, 406, 398, 409, + 399, 400, 402, 0, 404, 405, 142, 328, 0, 0, + 329, 0, 0, 142, 330, 418, 142, 416, 331, 419, + 333, 142, 420, 332, 0, 142, 0, 334, 438, 0, + 436, 454, 0, 0, 0, 442, 434, 0, 444, 458, + 447, 336, 463, 464, 337, 0, 0, 0, 429, 0, + 340, 425, 426, 0, 341, 342, 0, 465, 466, 467, + 468, 345, 346, 469, 348, 0, 470, 471, 472, 350, + 478, 473, 474, 476, 352, 484, 486, 488, 490, 483, + 485, 492, 354, 0, 0, 497, 0, 358, 142, 499, + 0, 506, 524, 507, 526, 527, 528, 512, 529, 531, + 530, 532, 516, 520, 537, 0, 0, 0, 0, 533, + 521, 0, 0, 542, 541, 0, 0, 0, 0, 24, + 0, 0, 552, 0, 553, 0, 0, 0, 0, 0, + 554, 0, 698, 0, 555, 0, 556, 0, 0, 557, + 0, 703, 702, 701, 0, 706, 0, 0, 0, 878, + 0, 0, 0, 710, 714, 716, 717, 0, 0, 0, + 0, 815, 0, 0, 0, 851, 0, 0, 0, 0, + 0, 0, 0, 853, 0, 0, 0, 29, 1089, 1090, + 1091, 1092, 31, 0, 0, 0, 0, 1103, 1104, 0, + 142, 0, 1101, 1098, 0, 0, 0, 142, 1121, 1124, + 1122, 1123, 1115, 1116, 1117, 1118, 0, 0, 0, 39, + 1140, 1141, 0, 1148, 1150, 1149, 1145, 1146, 1144, 0, + 0, 0, 0, 1151, 0, 1154, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1152, 1163, 0, 0, + 0, 1153, 1155, 1205, 1138, 1139, 1137, 196, 0, 200, + 192, 0, 202, 193, 0, 204, 194, 1136, 1135, 195, + 197, 199, 0, 0, 191, 0, 0, 0, 0, 1219, + 1232, 1222, 0, 0, 1225, 0, 0, 1224, 1223, 150, + 1241, 0, 1240, 1236, 217, 213, 0, 222, 0, 219, + 0, 238, 137, 140, 141, 139, 138, 253, 254, 255, + 243, 242, 257, 259, 258, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 142, 0, 300, 93, 90, 91, + 92, 142, 302, 301, 0, 0, 0, 0, 0, 0, + 0, 315, 0, 311, 309, 308, 320, 363, 0, 0, + 366, 381, 382, 377, 378, 383, 385, 384, 379, 288, + 289, 374, 373, 389, 388, 0, 393, 407, 408, 397, + 410, 403, 401, 396, 0, 0, 142, 142, 150, 150, + 150, 142, 0, 0, 142, 437, 448, 0, 439, 77, + 450, 0, 0, 441, 443, 142, 0, 0, 446, 0, + 0, 0, 431, 0, 0, 0, 0, 926, 928, 927, + 0, 1020, 0, 999, 0, 1002, 0, 0, 1022, 1024, + 0, 1015, 344, 0, 475, 477, 487, 480, 489, 481, + 491, 482, 493, 479, 0, 0, 498, 495, 496, 150, + 522, 534, 535, 536, 538, 0, 551, 539, 0, 0, + 0, 0, 0, 0, 163, 163, 157, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 160, 160, 157, 0, + 0, 157, 0, 0, 0, 0, 0, 593, 617, 0, + 0, 0, 589, 0, 0, 0, 0, 163, 157, 0, + 0, 694, 0, 704, 705, 142, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 763, + 0, 0, 0, 0, 0, 786, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 805, 0, 0, 810, 811, + 0, 0, 0, 831, 833, 832, 0, 835, 0, 0, + 842, 844, 845, 879, 0, 0, 0, 0, 708, 709, + 920, 918, 923, 922, 921, 919, 924, 0, 713, 0, + 718, 0, 917, 0, 719, 720, 721, 722, 0, 0, + 0, 0, 0, 817, 0, 0, 818, 1041, 0, 1044, + 1040, 0, 0, 0, 819, 852, 820, 1059, 1064, 1061, + 1060, 1058, 1065, 1062, 1056, 1063, 1057, 1066, 0, 0, + 825, 0, 0, 0, 1072, 0, 1074, 828, 0, 1076, + 829, 849, 0, 0, 0, 854, 855, 856, 1102, 0, + 0, 1109, 1105, 0, 0, 0, 1100, 1099, 1113, 1112, + 0, 0, 1129, 0, 0, 1125, 0, 1133, 0, 0, + 1126, 0, 1147, 185, 185, 0, 185, 0, 1173, 0, + 1172, 1164, 0, 0, 0, 0, 1168, 0, 0, 0, + 1171, 0, 0, 0, 0, 0, 1166, 1174, 0, 0, + 0, 1165, 185, 185, 185, 0, 201, 203, 205, 0, + 206, 0, 55, 0, 1215, 0, 1220, 0, 142, 1226, + 1227, 0, 1229, 1230, 0, 151, 152, 1221, 1242, 1243, + 0, 209, 0, 223, 0, 0, 0, 0, 256, 0, + 0, 0, 0, 0, 0, 0, 0, 294, 142, 0, + 0, 0, 0, 142, 0, 314, 0, 313, 370, 369, + 0, 0, 0, 142, 0, 150, 415, 413, 417, 421, + 0, 0, 0, 150, 0, 81, 80, 455, 440, 0, + 451, 453, 153, 0, 0, 338, 0, 0, 55, 0, + 430, 0, 0, 938, 0, 0, 0, 0, 0, 0, + 952, 0, 0, 0, 0, 0, 0, 969, 970, 0, + 0, 0, 0, 0, 981, 0, 987, 988, 990, 992, + 0, 996, 1007, 1008, 1009, 0, 1011, 1016, 1018, 1019, + 1017, 925, 0, 998, 0, 997, 937, 0, 0, 1003, + 0, 1005, 0, 1004, 1025, 1006, 1013, 0, 0, 356, + 0, 0, 549, 550, 0, 547, 543, 0, 163, 163, + 163, 164, 165, 561, 562, 159, 158, 0, 163, 163, + 163, 0, 567, 577, 160, 163, 163, 163, 161, 162, + 163, 163, 0, 163, 163, 0, 160, 0, 590, 0, + 0, 0, 616, 0, 615, 0, 0, 592, 0, 591, + 0, 0, 0, 0, 160, 160, 157, 0, 0, 157, + 0, 0, 0, 163, 163, 690, 0, 163, 163, 695, + 0, 176, 177, 178, 179, 180, 181, 0, 85, 86, + 84, 726, 0, 0, 0, 0, 0, 0, 872, 870, + 865, 0, 875, 859, 876, 862, 874, 868, 857, 871, + 860, 858, 877, 873, 0, 0, 0, 742, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 773, 0, 0, 0, 0, 0, 785, 787, 0, + 0, 792, 791, 0, 0, 166, 0, 0, 0, 142, + 0, 801, 0, 0, 0, 0, 806, 807, 808, 0, + 0, 0, 814, 830, 834, 836, 839, 838, 0, 0, + 0, 843, 880, 882, 0, 881, 711, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1026, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 715, 0, 0, 0, 0, 816, 0, 142, + 0, 1036, 1034, 0, 0, 142, 1039, 821, 0, 0, + 0, 827, 0, 0, 1077, 847, 848, 0, 850, 1108, + 1110, 1107, 1106, 1097, 0, 0, 0, 1130, 0, 0, + 1134, 1142, 187, 188, 189, 190, 186, 1157, 1156, 0, + 0, 0, 1159, 1158, 185, 0, 0, 0, 1167, 0, + 0, 0, 0, 0, 1184, 0, 1198, 1197, 1199, 0, + 0, 0, 1170, 0, 0, 0, 1169, 1179, 1178, 1180, + 1176, 1175, 1177, 1201, 1200, 1202, 0, 0, 0, 1218, + 142, 0, 142, 1233, 1228, 1231, 0, 0, 142, 0, + 0, 0, 220, 0, 0, 0, 0, 0, 0, 0, + 0, 291, 290, 0, 0, 282, 293, 295, 0, 305, + 307, 306, 304, 142, 312, 0, 0, 0, 150, 142, + 0, 0, 0, 0, 435, 449, 79, 78, 457, 0, + 452, 155, 156, 154, 445, 0, 142, 0, 0, 0, + 433, 427, 0, 0, 0, 0, 0, 0, 142, 939, + 0, 942, 0, 0, 945, 0, 142, 950, 0, 953, + 954, 0, 956, 957, 958, 0, 962, 0, 0, 965, + 0, 971, 0, 0, 0, 976, 977, 975, 0, 0, + 0, 982, 983, 0, 0, 986, 989, 991, 993, 0, + 0, 1010, 1012, 929, 1021, 930, 0, 0, 1023, 1014, + 0, 0, 503, 504, 0, 0, 548, 0, 558, 559, + 560, 163, 564, 565, 566, 0, 0, 0, 571, 572, + 157, 0, 0, 0, 163, 578, 579, 580, 581, 583, + 160, 586, 587, 0, 163, 0, 0, 0, 160, 160, + 157, 0, 0, 0, 0, 614, 0, 618, 0, 0, 0, 0, 0, 160, 160, 157, 0, 0, 157, 0, - 0, 0, 0, 0, 592, 616, 0, 0, 0, 588, - 0, 0, 0, 0, 163, 157, 0, 0, 693, 0, - 703, 704, 142, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 762, 0, 0, 0, - 0, 0, 785, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 804, 0, 0, 809, 810, 0, 0, 0, - 830, 832, 831, 0, 834, 0, 0, 841, 843, 844, - 878, 0, 0, 0, 0, 707, 708, 919, 917, 922, - 921, 920, 918, 923, 0, 712, 0, 717, 0, 916, - 0, 718, 719, 720, 721, 0, 0, 0, 0, 0, - 816, 0, 0, 817, 1040, 0, 1043, 1039, 0, 0, - 0, 818, 851, 819, 1058, 1063, 1060, 1059, 1057, 1064, - 1061, 1055, 1062, 1056, 1065, 0, 0, 824, 0, 0, - 0, 1071, 0, 1073, 827, 0, 1075, 828, 848, 0, - 0, 0, 853, 854, 855, 1100, 0, 0, 1107, 1103, - 0, 0, 0, 1098, 1097, 1111, 1110, 0, 0, 1127, - 0, 0, 1123, 0, 1131, 0, 0, 1124, 0, 1145, - 185, 185, 0, 185, 0, 1171, 0, 1170, 1162, 0, - 0, 0, 0, 1166, 0, 0, 0, 1169, 0, 0, - 0, 0, 0, 1164, 1172, 0, 0, 0, 1163, 185, - 185, 185, 0, 201, 203, 205, 0, 206, 0, 55, - 0, 1213, 0, 1218, 0, 142, 1224, 1225, 0, 1227, - 1228, 0, 151, 152, 1219, 1240, 1241, 0, 209, 0, - 223, 0, 0, 0, 0, 256, 0, 0, 0, 0, - 0, 0, 0, 0, 294, 142, 0, 0, 0, 0, - 142, 0, 314, 0, 313, 370, 369, 0, 0, 0, - 142, 0, 150, 415, 413, 417, 421, 0, 0, 0, - 150, 0, 81, 80, 455, 440, 0, 451, 453, 153, - 0, 0, 338, 0, 0, 55, 0, 430, 0, 0, - 937, 0, 0, 0, 0, 0, 0, 951, 0, 0, - 0, 0, 0, 0, 968, 969, 0, 0, 0, 0, - 0, 980, 0, 986, 987, 989, 991, 0, 995, 1006, - 1007, 1008, 0, 1010, 1015, 1017, 1018, 1016, 924, 0, - 997, 0, 996, 936, 0, 0, 1002, 0, 1004, 0, - 1003, 1024, 1005, 1012, 0, 0, 356, 0, 0, 548, - 549, 0, 546, 542, 0, 163, 163, 163, 164, 165, - 560, 561, 159, 158, 0, 163, 163, 163, 0, 566, - 576, 160, 163, 163, 163, 161, 162, 163, 163, 0, - 163, 163, 0, 160, 0, 589, 0, 0, 0, 615, - 0, 614, 0, 0, 591, 0, 590, 0, 0, 0, - 0, 160, 160, 157, 0, 0, 157, 0, 0, 0, - 163, 163, 689, 0, 163, 163, 694, 0, 176, 177, - 178, 179, 180, 181, 0, 85, 86, 84, 725, 0, - 0, 0, 0, 0, 0, 871, 869, 864, 0, 874, - 858, 875, 861, 873, 867, 856, 870, 859, 857, 876, - 872, 0, 0, 0, 741, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 160, 160, 157, 0, 0, 157, + 0, 0, 0, 0, 0, 160, 160, 157, 0, 0, + 157, 0, 0, 0, 0, 160, 160, 157, 0, 0, + 0, 160, 594, 595, 596, 597, 599, 0, 602, 603, + 0, 160, 0, 0, 688, 689, 163, 692, 693, 0, + 725, 142, 727, 0, 0, 731, 0, 0, 0, 0, + 0, 864, 861, 867, 866, 863, 869, 0, 740, 0, + 0, 0, 0, 142, 747, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 764, 765, + 766, 0, 770, 767, 769, 0, 0, 775, 774, 776, + 777, 0, 0, 0, 0, 0, 0, 142, 142, 790, + 172, 168, 173, 167, 170, 169, 171, 796, 797, 798, + 0, 0, 800, 802, 142, 142, 0, 809, 812, 142, + 142, 837, 841, 883, 712, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1067, 908, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 772, 0, - 0, 0, 0, 0, 784, 786, 0, 0, 791, 790, - 0, 0, 166, 0, 0, 0, 142, 0, 800, 0, - 0, 0, 0, 805, 806, 807, 0, 0, 0, 813, - 829, 833, 835, 838, 837, 0, 0, 0, 842, 879, - 881, 0, 880, 710, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1025, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 714, - 0, 0, 0, 0, 815, 0, 142, 0, 1035, 1033, - 0, 0, 142, 1038, 820, 0, 0, 0, 826, 0, - 0, 1076, 846, 847, 0, 849, 1106, 1108, 1105, 1104, - 1095, 0, 0, 0, 1128, 0, 0, 1132, 1140, 187, - 188, 189, 190, 186, 1155, 1154, 0, 0, 0, 1157, - 1156, 185, 0, 0, 0, 1165, 0, 0, 0, 0, - 0, 1182, 0, 1196, 1195, 1197, 0, 0, 0, 1168, - 0, 0, 0, 1167, 1177, 1176, 1178, 1174, 1173, 1175, - 1199, 1198, 1200, 0, 0, 0, 1216, 142, 0, 142, - 1231, 1226, 1229, 0, 0, 142, 0, 0, 0, 220, - 0, 0, 0, 0, 0, 0, 0, 0, 291, 290, - 0, 0, 282, 293, 295, 0, 305, 307, 306, 304, - 142, 312, 0, 0, 0, 150, 142, 0, 0, 0, - 0, 435, 449, 79, 78, 457, 0, 452, 155, 156, - 154, 445, 0, 142, 0, 0, 0, 433, 427, 0, - 0, 0, 0, 0, 0, 142, 938, 0, 941, 0, - 0, 944, 0, 142, 949, 0, 952, 953, 0, 955, - 956, 957, 0, 961, 0, 0, 964, 0, 970, 0, - 0, 0, 975, 976, 974, 0, 0, 0, 981, 982, - 0, 0, 985, 988, 990, 992, 0, 0, 1009, 1011, - 928, 1020, 929, 0, 0, 1022, 1013, 0, 0, 502, - 503, 0, 0, 547, 0, 557, 558, 559, 163, 563, - 564, 565, 0, 0, 0, 570, 571, 157, 0, 0, - 0, 163, 577, 578, 579, 580, 582, 160, 585, 586, - 0, 163, 0, 0, 0, 160, 160, 157, 0, 0, - 0, 0, 613, 0, 617, 0, 0, 0, 0, 0, - 160, 160, 157, 0, 0, 157, 0, 0, 0, 0, - 0, 160, 160, 157, 0, 0, 157, 0, 0, 0, - 0, 0, 160, 160, 157, 0, 0, 157, 0, 0, - 0, 0, 160, 160, 157, 0, 0, 0, 160, 593, - 594, 595, 596, 598, 0, 601, 602, 0, 160, 0, - 0, 687, 688, 163, 691, 692, 0, 724, 142, 726, - 0, 0, 730, 0, 0, 0, 0, 0, 863, 860, - 866, 865, 862, 868, 0, 739, 0, 0, 0, 0, - 142, 746, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 763, 764, 765, 0, 769, - 766, 768, 0, 0, 774, 773, 775, 776, 0, 0, - 0, 0, 0, 0, 142, 142, 789, 172, 168, 173, - 167, 170, 169, 171, 795, 796, 797, 0, 0, 799, - 801, 142, 142, 0, 808, 811, 142, 142, 836, 840, - 882, 711, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1066, 907, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 908, 0, - 0, 0, 0, 0, 722, 723, 142, 150, 0, 142, - 142, 1041, 1042, 0, 0, 822, 0, 142, 1072, 1074, - 845, 0, 1125, 1126, 1129, 1130, 185, 185, 185, 1201, - 1180, 1179, 1181, 1184, 1183, 1187, 1186, 1188, 1185, 1193, - 1192, 1194, 1190, 1189, 1191, 0, 0, 1210, 1215, 0, - 1232, 0, 142, 0, 1235, 0, 0, 224, 0, 221, - 0, 0, 0, 260, 0, 0, 0, 0, 142, 0, - 297, 130, 0, 390, 0, 411, 150, 153, 0, 0, - 424, 0, 142, 459, 142, 0, 428, 930, 0, 0, - 0, 0, 142, 939, 153, 153, 153, 142, 945, 153, - 150, 153, 153, 142, 958, 153, 153, 153, 142, 965, - 153, 153, 142, 0, 153, 142, 153, 153, 142, 153, - 142, 999, 1000, 0, 0, 501, 543, 0, 562, 567, - 568, 569, 0, 573, 574, 575, 581, 163, 160, 587, - 604, 605, 606, 607, 608, 0, 610, 611, 160, 0, - 0, 0, 160, 160, 157, 0, 0, 0, 0, 0, - 0, 160, 160, 157, 0, 0, 0, 0, 0, 0, - 160, 160, 157, 0, 0, 0, 160, 163, 163, 163, - 163, 163, 0, 163, 163, 0, 160, 160, 163, 163, - 163, 163, 163, 0, 163, 163, 0, 160, 160, 667, - 668, 669, 670, 672, 0, 675, 676, 0, 160, 678, - 679, 680, 681, 682, 0, 684, 685, 160, 597, 160, - 0, 603, 0, 0, 690, 0, 727, 153, 0, 0, - 153, 0, 0, 0, 738, 153, 742, 743, 153, 745, + 0, 909, 0, 0, 0, 0, 0, 723, 724, 142, + 150, 0, 142, 142, 1042, 1043, 0, 0, 823, 0, + 142, 1073, 1075, 846, 0, 1127, 1128, 1131, 1132, 185, + 185, 185, 1203, 1182, 1181, 1183, 1186, 1185, 1189, 1188, + 1190, 1187, 1195, 1194, 1196, 1192, 1191, 1193, 0, 0, + 1212, 1217, 0, 1234, 0, 142, 0, 1237, 0, 0, + 224, 0, 221, 0, 0, 0, 260, 0, 0, 0, + 0, 142, 0, 297, 130, 0, 390, 0, 411, 150, + 153, 0, 0, 424, 0, 142, 459, 142, 0, 428, + 931, 0, 0, 0, 0, 142, 940, 153, 153, 153, + 142, 946, 153, 150, 153, 153, 142, 959, 153, 153, + 153, 142, 966, 153, 153, 142, 0, 153, 142, 153, + 153, 142, 153, 142, 1000, 1001, 0, 0, 502, 544, + 0, 563, 568, 569, 570, 0, 574, 575, 576, 582, + 163, 160, 588, 605, 606, 607, 608, 609, 0, 611, + 612, 160, 0, 0, 0, 160, 160, 157, 0, 0, + 0, 0, 0, 0, 160, 160, 157, 0, 0, 0, + 0, 0, 0, 160, 160, 157, 0, 0, 0, 160, + 163, 163, 163, 163, 163, 0, 163, 163, 0, 160, + 160, 163, 163, 163, 163, 163, 0, 163, 163, 0, + 160, 160, 668, 669, 670, 671, 673, 0, 676, 677, + 0, 160, 679, 680, 681, 682, 683, 0, 685, 686, + 160, 598, 160, 0, 604, 0, 0, 691, 0, 728, + 153, 0, 0, 153, 0, 0, 0, 739, 153, 743, + 744, 153, 746, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 768, 771, 772, 0, + 153, 0, 0, 0, 788, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 767, 770, 771, 0, 153, 0, 0, - 0, 787, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1067, 1046, - 0, 1053, 1054, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 142, 0, 0, 82, 0, - 0, 914, 915, 150, 0, 0, 0, 1036, 1034, 1044, - 821, 823, 150, 1118, 1159, 1158, 1160, 1202, 0, 1212, - 1242, 0, 0, 1237, 1236, 225, 0, 0, 0, 265, - 0, 0, 0, 283, 153, 391, 395, 412, 414, 0, - 422, 456, 460, 461, 0, 0, 0, 0, 0, 935, - 940, 943, 942, 946, 947, 948, 950, 954, 959, 960, - 962, 963, 966, 967, 971, 150, 153, 978, 150, 979, - 983, 150, 993, 150, 0, 0, 500, 0, 572, 583, - 163, 160, 612, 163, 163, 163, 163, 163, 0, 163, - 163, 160, 658, 659, 660, 661, 662, 0, 664, 665, - 160, 163, 163, 163, 163, 163, 0, 163, 163, 160, - 163, 627, 628, 629, 630, 632, 160, 635, 636, 0, - 163, 163, 647, 648, 649, 650, 652, 160, 655, 656, - 0, 163, 671, 160, 0, 677, 160, 686, 599, 160, - 695, 696, 142, 729, 0, 153, 732, 0, 142, 0, - 740, 744, 142, 0, 751, 752, 753, 754, 758, 759, - 755, 756, 757, 0, 0, 153, 779, 0, 142, 0, - 0, 792, 153, 0, 0, 153, 153, 0, 839, 0, - 174, 174, 0, 0, 174, 0, 174, 1025, 0, 0, - 0, 0, 0, 0, 0, 0, 1045, 0, 0, 174, - 174, 0, 0, 0, 0, 0, 0, 0, 0, 909, - 0, 0, 0, 1025, 83, 0, 174, 0, 1069, 913, - 0, 0, 0, 207, 1244, 1243, 0, 0, 229, 0, - 0, 0, 0, 298, 423, 317, 931, 0, 142, 0, - 972, 973, 977, 984, 994, 349, 317, 0, 584, 609, - 618, 619, 620, 621, 622, 160, 624, 625, 163, 160, - 666, 638, 639, 640, 641, 642, 160, 644, 645, 163, - 631, 163, 160, 637, 651, 163, 160, 657, 673, 160, - 683, 600, 0, 153, 733, 0, 0, 0, 0, 0, - 760, 761, 777, 0, 0, 0, 788, 793, 0, 802, - 803, 794, 153, 0, 175, 1025, 1025, 82, 0, 1025, - 0, 1025, 883, 142, 0, 1048, 0, 1051, 1085, 1052, - 1050, 1047, 0, 1025, 1025, 82, 0, 0, 1025, 1025, - 0, 0, 1025, 912, 910, 911, 890, 1025, 1025, 1069, - 1080, 0, 1037, 825, 0, 0, 0, 231, 0, 0, - 0, 318, 319, 339, 0, 182, 934, 357, 0, 163, - 626, 663, 163, 646, 633, 163, 653, 163, 674, 0, - 728, 153, 153, 0, 153, 0, 153, 153, 0, 153, - 0, 1025, 896, 892, 1025, 0, 897, 0, 891, 1025, - 0, 1049, 0, 894, 893, 1025, 0, 0, 888, 886, - 1025, 142, 887, 889, 895, 1080, 1031, 0, 0, 1070, - 1078, 1117, 0, 0, 0, 261, 284, 287, 285, 0, - 0, 142, 183, 184, 933, 545, 623, 643, 634, 654, - 153, 731, 737, 0, 750, 747, 778, 783, 0, 798, - 0, 901, 885, 82, 0, 899, 1086, 0, 884, 82, - 0, 900, 0, 1032, 1082, 1084, 0, 1077, 0, 0, - 266, 0, 0, 0, 0, 182, 0, 734, 142, 748, - 780, 812, 1025, 0, 0, 1025, 0, 153, 1083, 1079, - 230, 0, 0, 0, 0, 0, 932, 706, 142, 735, - 749, 142, 781, 903, 0, 1025, 902, 0, 0, 232, - 277, 0, 276, 0, 736, 782, 82, 904, 82, 1025, - 275, 274, 1025, 1025, 898, 906, 905 + 0, 1068, 1047, 0, 1054, 1055, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 142, 0, + 0, 82, 0, 0, 915, 916, 150, 0, 0, 0, + 1037, 1035, 1045, 822, 824, 150, 1120, 1161, 1160, 1162, + 1204, 0, 1214, 1244, 0, 0, 1239, 1238, 225, 0, + 0, 0, 265, 0, 0, 0, 283, 153, 391, 395, + 412, 414, 0, 422, 456, 460, 461, 0, 0, 0, + 0, 0, 936, 941, 944, 943, 947, 948, 949, 951, + 955, 960, 961, 963, 964, 967, 968, 972, 150, 153, + 979, 150, 980, 984, 150, 994, 150, 0, 0, 501, + 0, 573, 584, 163, 160, 613, 163, 163, 163, 163, + 163, 0, 163, 163, 160, 659, 660, 661, 662, 663, + 0, 665, 666, 160, 163, 163, 163, 163, 163, 0, + 163, 163, 160, 163, 628, 629, 630, 631, 633, 160, + 636, 637, 0, 163, 163, 648, 649, 650, 651, 653, + 160, 656, 657, 0, 163, 672, 160, 0, 678, 160, + 687, 600, 160, 696, 697, 142, 730, 0, 153, 733, + 0, 142, 0, 741, 745, 142, 0, 752, 753, 754, + 755, 759, 760, 756, 757, 758, 0, 0, 153, 780, + 0, 142, 0, 0, 793, 153, 0, 0, 153, 153, + 0, 840, 0, 174, 174, 0, 0, 174, 0, 174, + 1026, 0, 0, 0, 0, 0, 0, 0, 0, 1046, + 0, 0, 174, 174, 0, 0, 0, 0, 0, 0, + 0, 0, 910, 0, 0, 0, 1026, 83, 0, 174, + 0, 1070, 914, 0, 0, 0, 207, 1246, 1245, 0, + 0, 229, 0, 0, 0, 0, 298, 423, 317, 932, + 0, 142, 0, 973, 974, 978, 985, 995, 349, 317, + 0, 585, 610, 619, 620, 621, 622, 623, 160, 625, + 626, 163, 160, 667, 639, 640, 641, 642, 643, 160, + 645, 646, 163, 632, 163, 160, 638, 652, 163, 160, + 658, 674, 160, 684, 601, 0, 153, 734, 0, 0, + 0, 0, 0, 761, 762, 778, 0, 0, 0, 789, + 794, 0, 803, 804, 795, 153, 0, 175, 1026, 1026, + 82, 0, 1026, 0, 1026, 884, 142, 0, 1049, 0, + 1052, 1086, 1053, 1051, 1048, 0, 1026, 1026, 82, 0, + 0, 1026, 1026, 0, 0, 1026, 913, 911, 912, 891, + 1026, 1026, 1070, 1081, 0, 1038, 826, 0, 0, 0, + 231, 0, 0, 0, 318, 319, 339, 0, 182, 935, + 357, 0, 163, 627, 664, 163, 647, 634, 163, 654, + 163, 675, 0, 729, 153, 153, 0, 153, 0, 153, + 153, 0, 153, 0, 1026, 897, 893, 1026, 0, 898, + 0, 892, 1026, 0, 1050, 0, 895, 894, 1026, 0, + 0, 889, 887, 1026, 142, 888, 890, 896, 1081, 1032, + 0, 0, 1071, 1079, 1119, 0, 0, 0, 261, 284, + 287, 285, 0, 0, 142, 183, 184, 934, 546, 624, + 644, 635, 655, 153, 732, 738, 0, 751, 748, 779, + 784, 0, 799, 0, 902, 886, 82, 0, 900, 1087, + 0, 885, 82, 0, 901, 0, 1033, 1083, 1085, 0, + 1078, 0, 0, 266, 0, 0, 0, 0, 182, 0, + 735, 142, 749, 781, 813, 1026, 0, 0, 1026, 0, + 153, 1084, 1080, 230, 0, 0, 0, 0, 0, 933, + 707, 142, 736, 750, 142, 782, 904, 0, 1026, 903, + 0, 0, 232, 277, 0, 276, 0, 737, 783, 82, + 905, 82, 1026, 275, 274, 1026, 1026, 899, 907, 906 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 53, 1377, 172, 152, 1224, 2453, 2454, 420, 421, - 422, 423, 153, 154, 155, 91, 784, 443, 1174, 1641, - 1314, 1327, 1310, 1884, 2545, 1374, 2664, 1544, 334, 737, - 740, 743, 751, 63, 357, 363, 367, 370, 68, 373, - 75, 388, 384, 378, 395, 82, 400, 92, 98, 405, - 407, 409, 477, 838, 1610, 411, 414, 105, 430, 156, - 158, 2593, 174, 214, 466, 827, 468, 478, 830, 835, - 480, 482, 841, 485, 843, 496, 846, 848, 499, 503, - 507, 509, 512, 516, 543, 539, 1237, 530, 865, 870, - 862, 1225, 875, 533, 549, 552, 557, 562, 570, 904, - 906, 908, 910, 575, 914, 217, 577, 1711, 235, 579, - 581, 585, 590, 598, 244, 1303, 601, 252, 610, 1319, - 612, 618, 959, 1335, 954, 1752, 1341, 1339, 955, 1754, - 1344, 1346, 624, 627, 622, 254, 262, 264, 665, 1036, - 1401, 1025, 1499, 1928, 2246, 1041, 1034, 899, 1278, 1282, - 1290, 1292, 1912, 269, 1050, 1053, 1061, 2218, 2219, 2220, - 1913, 2580, 2581, 1084, 1087, 2649, 2650, 2646, 2647, 2694, - 2221, 2222, 274, 280, 288, 679, 674, 293, 298, 300, - 689, 696, 1112, 1117, 746, 734, 306, 310, 703, 316, - 710, 1549, 723, 724, 1148, 1143, 1555, 1133, 1561, 1573, - 1569, 1137, 728, 712, 322, 323, 338, 1161, 341, 347, - 761, 764, 758, 349, 352, 769 + -1, 53, 1380, 172, 152, 1227, 2456, 2457, 421, 422, + 423, 424, 153, 154, 155, 91, 787, 444, 1177, 1644, + 1317, 1330, 1313, 1887, 2548, 1377, 2667, 1547, 335, 740, + 743, 746, 754, 63, 358, 364, 368, 371, 68, 374, + 75, 389, 385, 379, 396, 82, 401, 92, 98, 406, + 408, 410, 478, 841, 1613, 412, 415, 105, 431, 156, + 158, 2596, 174, 214, 467, 830, 469, 479, 833, 838, + 481, 483, 844, 486, 846, 497, 849, 851, 500, 504, + 508, 510, 513, 517, 544, 540, 1240, 531, 868, 873, + 865, 1228, 878, 534, 551, 554, 559, 564, 572, 907, + 909, 911, 913, 577, 917, 217, 579, 1714, 235, 581, + 583, 587, 592, 600, 244, 1306, 603, 252, 612, 1322, + 614, 620, 962, 1338, 957, 1755, 1344, 1342, 958, 1757, + 1347, 1349, 626, 629, 624, 254, 262, 264, 667, 1039, + 1404, 1028, 1502, 1931, 2249, 1044, 1037, 902, 1281, 1285, + 1293, 1295, 1915, 269, 1053, 1056, 1064, 2221, 2222, 2223, + 1916, 2583, 2584, 1087, 1090, 2652, 2653, 2649, 2650, 2697, + 2224, 2225, 275, 281, 289, 682, 677, 294, 299, 301, + 692, 699, 1115, 1120, 749, 737, 307, 311, 706, 317, + 713, 1552, 726, 727, 1151, 1146, 1558, 1136, 1564, 1576, + 1572, 1140, 731, 715, 323, 324, 339, 1164, 342, 348, + 764, 767, 761, 350, 353, 772 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -2482 +#define YYPACT_NINF -2137 static const yytype_int16 yypact[] = { - 4688, 94, 396, 69, -2482, -2482, 1070, -189, 548, 1072, - 676, 169, 3251, 98, 282, 1508, -24, 4722, 635, 1148, - -2482, 282, 857, 154, 873, -39, 28, 174, 176, 87, - 181, -147, 2800, 11, 772, 194, 177, 176, -2482, -26, - 38, 1063, -2482, 411, 478, 1136, -2482, 621, -2482, 104, - 3410, 278, 129, 511, 584, 155, 339, 653, 637, 132, - 671, -13, 488, -2482, -2482, -2482, 944, 983, -2482, 183, - 8, 282, -11, 137, 173, -2482, 704, 983, -2482, -2482, - 32, 983, -2482, -2482, -2482, -2482, 983, -2482, -2482, -2482, - -2482, -2482, -2482, 22, 613, 717, 730, 160, -2482, 983, - 1243, 983, 983, 869, 983, -2482, -2482, -2482, 539, -2482, - -2482, -2482, -2482, 4274, -2482, -2482, -2482, -2482, -2482, -2482, - 983, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 1200, -2482, 983, -2482, 769, -2482, -2482, - 282, 282, 282, 282, 282, 282, -2482, -2482, 282, 282, - 282, 282, -2482, 731, -2482, 755, 1569, 751, 19, 580, - 711, 331, 3609, 461, 4326, 3757, 854, 4274, 1970, -2482, - 515, -42, 885, 804, 81, 543, 880, 176, 44, -2482, - 835, -2482, 690, 648, 89, -2482, 116, -2482, 617, -2482, - -5, 843, 31, -2482, -2482, 4394, -2482, -2482, -2482, 867, - 910, -2482, -2482, -2482, -2482, 668, -2482, -2482, -2482, -2482, - 773, -2482, -2482, 4394, 3845, -2482, -2482, 406, -2482, 971, - 977, 100, -2482, 983, -2482, 980, 151, 984, 25, 596, - 991, 0, -2482, -2482, -2482, 997, 1003, 282, 282, 983, - 983, -2482, -2482, 1005, -2482, -2482, -2482, -2482, -2482, 2661, - -2482, 1018, 1022, 983, -2482, 1028, -2482, -2482, -2482, -2482, - -2482, 983, 960, 282, 814, 983, 1200, 983, -2482, 1032, - -2482, 4788, -2482, -2482, 646, 1042, 1059, 983, -2482, 1064, - -2482, -2482, 427, 1073, 4394, 1078, -2482, 1080, 983, 907, - -2482, 441, 972, 726, 436, 1090, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 1097, -2482, 4, 36, 115, 196, 450, - -2482, 983, 983, 141, -2482, 983, 837, 1112, -2482, 983, - 983, -2482, 1152, 10, 17, 1157, 1200, -2482, -2482, -2482, - 951, 983, -2482, -2482, -2482, -2482, 983, -2482, 1162, 1163, - -2482, 983, 1013, -2482, -2482, -2482, -2482, -2482, -2482, 983, - -2482, -2482, 983, -2482, -2482, 537, 537, 1173, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, 986, - 983, 983, 1180, 1190, 1207, -2482, -2482, 983, 983, 983, - -2482, 983, -2482, 1213, -2482, -2482, -2482, -2482, 1044, -2482, - 1216, -2482, 4394, 1218, -2482, 983, -2482, -2482, -2482, 983, - 1215, 1220, 1220, 4394, 983, 983, 983, 983, 983, 983, - -2482, 983, 4274, 1243, 983, 983, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 1243, 983, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, 1221, -2482, 962, -8, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, 661, - -2482, -2482, -2482, 1068, -2482, 391, 84, 84, -2482, -2482, - -2482, 1233, -2482, 1237, -2482, -2482, 570, -2482, 1069, -2482, - -2482, -2482, 1082, -2482, -2482, 1200, -2482, 983, 983, -2482, - 4394, 4394, 1200, -2482, -2482, 1200, -2482, -2482, -2482, -2482, - 1200, -2482, -2482, 4394, 1200, 983, -2482, -2482, 4394, -2482, - -2482, 452, 1060, 6, -2482, -2482, 1065, 4394, 178, -2482, - -2482, -2482, -2482, -2482, 1253, 1256, 1261, -2482, 1076, -2482, - -2482, -2482, 983, -2482, -2482, 499, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -5, -2482, -2482, -2482, -2482, -2482, -2482, - 1081, 1086, -2482, -2482, 1217, 1224, 1225, -2482, -2482, 1071, - -2482, 983, 1282, 1074, 4788, -2482, 1200, -2482, 1291, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 4394, 4394, 4394, 4394, -2482, -2482, 1298, - 282, -2482, -2482, 1301, 1307, 1117, 983, -2482, 65, 1227, - -2482, 1310, -2482, 188, 1238, 4726, 381, 1319, -2482, 1330, - -2482, 1333, -2482, 216, -2482, 1336, 1338, -2482, 1342, -2482, - -2482, -2482, 983, -2482, 4788, 4167, 1429, 534, 1347, 280, - 1248, -2482, -2482, -2482, 1337, 605, 1360, 1366, 14, 983, - 438, 633, 121, 4394, 282, 1638, 647, 15, 51, 272, - 23, -2482, 1355, 1357, 1373, -2482, -2482, -2482, -2482, -2482, - 983, 983, 983, 983, -2482, -2482, 983, 1200, 983, -2482, - 983, 1243, 983, 1379, 1200, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 1387, 387, 412, -2482, -2482, -2482, 1393, - -2482, -2482, -2482, -2482, 1306, -2482, 1404, 1412, 1331, 1415, - -2482, 1417, -2482, 1418, 1340, 1419, 494, 546, 572, 390, - 578, 1416, 595, -2482, -2482, 1420, 1425, 1427, -2482, -2482, - 1428, -2482, -2482, -2482, -2482, 1430, -2482, -2482, 1434, -2482, - -2482, 1435, -2482, -2482, -2482, -2482, -2482, -2482, -2482, 983, - 983, -2482, 983, 1056, 983, 983, -2482, 1765, -2482, 1049, - 1437, -2482, 1104, 1440, -2482, -2482, -36, 983, 983, -2482, - 1421, -2482, -2482, 1441, 1026, 983, 1422, 807, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, 1443, 1446, 983, 983, 983, 1450, 282, 1452, - 1453, 1200, 4394, -2482, -2482, -2482, -2482, -2482, 1200, -2482, - -2482, 983, 983, 983, 4394, 983, 1243, 983, -2482, 983, - -2482, -2482, -2482, -2482, -2482, 1455, 1456, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - 461, -2482, 983, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, 4394, 983, 1200, 1200, -36, -36, -36, 1200, 1243, - 983, 1200, -2482, -2482, 983, -2482, 315, 1293, 1457, 1461, - -2482, -2482, 1200, 1313, 1314, -2482, 1467, 1468, 1472, 1193, - 983, 4277, 614, 694, -2482, -2482, -2482, 983, 78, 145, - -2482, 1228, -2482, 1638, 1229, 447, 1214, 126, -2482, -2482, - 983, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, 983, 1497, -2482, -2482, -2482, -36, -2482, -2482, -2482, - -2482, -2482, 4354, -2482, -2482, 1499, 1501, 983, 1514, 1515, - 1516, 366, 366, -71, 1518, 1519, 1520, 1521, 1257, 1260, - 1526, 1529, 1532, 59, 59, -71, 1534, 1536, -71, 1538, - 1539, 4759, 1540, 1541, -2482, -2482, 1542, 1544, 530, -2482, - 1537, 1546, 1550, 1551, 366, -71, 1547, 1552, -2482, 1557, - -2482, -2482, 1200, 999, 1391, 1268, -32, 1334, 1462, 1502, - -29, 1567, 343, 1436, 1470, 745, 816, 1543, 394, 1343, - 1481, 1582, 1380, 16, 50, 153, -52, 4394, 1638, 1548, - -68, 1356, 1390, 1600, 29, -2482, -2482, 362, 1602, 1603, - -2482, -2482, -2482, 1604, 1401, 54, 1638, 1402, -2482, -2482, - -2482, 282, 1610, 1611, 983, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, 1, -2482, 3200, -2482, 983, -2482, - 983, -2482, -2482, -2482, -2482, 983, 983, 983, 280, 4394, - -2482, 1612, 1147, -2482, -2482, 983, -2482, -2482, 983, 4394, - 983, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, 282, 983, -2482, 983, 280, - 1613, -2482, 983, 983, -2482, 282, -2482, -2482, -2482, 779, - 1614, 1616, -2482, -2482, -2482, -2482, 983, 983, -2482, -2482, - 1243, 983, 983, -2482, -2482, -2482, -2482, 1620, 983, -2482, - 983, 1505, -2482, 983, -2482, 983, 1517, -2482, 1623, -2482, - 1170, 1170, 620, 1170, 1624, -2482, 681, -2482, -2482, 1625, - 1627, 687, 1631, -2482, 1632, 1633, 1635, -2482, 708, 742, - 1636, 1641, 1639, -2482, -2482, 1642, 1644, 1648, -2482, 1170, - 1170, 1170, 983, -2482, -2482, -2482, 983, -2482, 983, 727, - 4394, -2482, 983, -2482, 4788, 1200, -2482, -2482, 1650, -2482, - -2482, 1651, -2482, -2482, -2482, -2482, 1647, 814, -2482, 983, - 1649, 983, 983, 983, 975, -2482, 1630, 1658, 983, 983, - -7, 1659, 282, 282, -2482, 1200, 983, 1661, 1663, 1664, - 1200, 4394, -2482, 983, -2482, -2482, -2482, 983, 983, 983, - 1200, 4394, -36, -2482, -2482, -2482, -2482, 1243, 983, 1666, - -36, 983, 1615, 1634, 477, -2482, 1668, -2482, -2482, 950, - 3292, 983, -2482, 983, 1667, 1674, 983, -2482, 1672, 1087, - 4274, 1444, 542, 1445, 27, 4394, 639, -2482, 358, 1525, - 118, 723, 1449, 164, -2482, -2482, 473, 1527, 658, 1561, - 402, 1638, 836, -2482, 1682, 1448, -2482, 607, -2482, -2482, - -2482, -2482, 1638, 1483, -2482, -2482, -2482, -2482, -2482, 983, - -2482, 983, -2482, -2482, 983, 983, -2482, 983, -2482, 983, - -2482, -2482, -2482, -2482, 1498, 983, -2482, 983, 109, -2482, - -2482, 1693, 1694, -2482, 983, 366, 366, 366, -2482, -2482, - -2482, -2482, -2482, -2482, 1698, 366, 366, 366, 536, -2482, - -2482, 59, 366, 366, 366, -2482, -2482, 366, 366, 1702, - 366, 366, 1703, 59, 636, -2482, 1704, 1707, 1708, -2482, - 724, -2482, 817, 929, -2482, 1000, -2482, 1447, 1712, 1714, - 1715, 59, 59, -71, 1722, 1723, -71, 1727, 1724, 1730, - 366, 366, -2482, 1731, 366, 366, -2482, 1733, -2482, -2482, - -2482, -2482, -2482, -2482, 282, -2482, -2482, -2482, 4274, 1015, - 282, 983, 1167, 1353, 416, -2482, -2482, -2482, 758, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, 1734, 282, 983, -2482, 282, 1735, 983, 4394, 282, - 1377, 1509, 1511, 218, 248, 1512, 250, 1432, 1451, 1740, - 1745, 1747, 1502, 1748, 1749, 1750, 1454, 1458, 1197, 1752, - 282, 983, 1410, 1403, -2482, -2482, 282, 4394, -2482, -2482, - 4394, 983, 61, 1756, 282, 983, 1200, 282, -2482, 1760, - 4394, 4394, 983, -2482, -2482, -2482, 282, 282, 4394, -2482, - -2482, -2482, -2482, -2482, -2482, 4394, 983, 282, -2482, -2482, - -2482, 983, -2482, -2482, 1761, 983, 1486, 180, 983, 1545, - 983, 192, 983, -2482, 983, 1553, 1554, 983, 983, 983, - 983, 983, 983, 983, 983, 21, 983, 983, 1555, -2482, - 983, 983, 983, 983, -2482, 4394, 1200, 1763, 4394, 4394, - 983, 983, 1200, -2482, 983, 983, 983, 4394, -2482, 983, - 983, -2482, -2482, -2482, 1767, -2482, -2482, -2482, -2482, -2482, - -2482, 1757, 983, 983, -2482, 983, 983, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, 1769, 1774, 1776, -2482, - -2482, 1170, 1777, 1778, 1781, -2482, 1782, 1784, 1786, 1787, - 1785, -2482, 1789, -2482, -2482, -2482, 1792, 1796, 1790, -2482, - 1797, 1798, 1800, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 983, 983, 983, -2482, 1200, 983, 1200, - -2482, -2482, -2482, 814, 983, 1200, 983, 983, 983, -2482, - 983, 983, 1801, 983, 1803, 1775, 983, 983, -2482, -2482, - 1804, 4394, -2482, -2482, -2482, 983, -2482, -2482, -2482, -2482, - 1200, -2482, 1179, 983, 1179, -36, 1200, 4394, 983, 983, - 1807, -2482, -2482, -2482, -2482, -2482, 983, -2482, -2482, -2482, - -2482, -2482, 4394, 1200, 4394, 983, 1810, -2482, -2482, 4394, - 1814, 1816, 1818, 1819, 4394, 1200, -2482, 4394, -2482, 4394, - 4394, 4274, 4394, 1200, -2482, 4394, -2482, -2482, 4394, -2482, - -2482, 4274, 4394, -2482, 4394, 4394, 4274, 4394, -2482, 4394, - 4394, 983, -2482, -2482, -2482, 4394, 4394, 4394, -2482, -2482, - 4394, 4394, -2482, -2482, -2482, -2482, 4394, 4394, -2482, -2482, - -2482, -2482, -2482, 983, 983, -2482, -2482, 1821, 983, -2482, - -2482, 1822, 1824, -2482, 983, -2482, -2482, -2482, 366, -2482, - -2482, -2482, 1825, 1826, 1828, -2482, -2482, -71, 1830, 1831, - 1832, 366, -2482, -2482, -2482, -2482, -2482, 59, -2482, -2482, - 1835, 366, 1845, 1846, 1847, 59, 59, -71, 1849, 1850, - 1851, 1050, -2482, 1375, -2482, 1500, 1559, 1852, 1853, 1854, - 59, 59, -71, 1856, 1858, -71, 1859, 1562, 1861, 1863, - 1864, 59, 59, -71, 1866, 1867, -71, 1868, 1588, 1869, - 1870, 1871, 59, 59, -71, 1873, 1875, -71, 1876, 1878, - 1881, 1882, 59, 59, -71, 1884, 1885, 1886, 59, -2482, - -2482, -2482, -2482, -2482, 1888, -2482, -2482, 1890, 59, 1891, - 1892, -2482, -2482, 366, -2482, -2482, 1893, -2482, 1200, -2482, - 4394, 983, -2482, 983, 4394, 983, 1905, 1391, -2482, -2482, - -2482, -2482, -2482, -2482, 1918, -2482, 4394, 282, 1920, 4394, - 1200, -2482, 1925, 1391, 983, 983, 983, 983, 983, 983, - 983, 983, 983, 1927, 1928, -2482, -2482, -2482, 1929, -2482, - -2482, -2482, 1931, 1932, -2482, -2482, -2482, -2482, 983, 4394, - 983, 1933, 1391, 282, 1200, 1200, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, 983, 1243, -2482, - -2482, 1200, 1200, 983, -2482, -2482, 1200, 1200, -2482, -2482, - -2482, -2482, 983, 983, 983, 983, 983, 983, 983, 983, - 983, 983, 2448, -2482, 983, 983, 983, 983, 983, 983, - 983, 983, 983, 983, 983, 2864, 1934, 983, -2482, 983, - 983, 983, 1939, 1940, -2482, -2482, 1200, -36, 1941, 1200, - 1200, -2482, -2482, 1243, 983, -2482, 1942, 1200, -2482, -2482, - -2482, 1943, -2482, -2482, -2482, -2482, 1170, 1170, 1170, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, 1391, 983, -2482, -2482, 983, - -2482, 983, 1200, 983, -2482, 1243, 983, -2482, 983, -2482, - 1793, 1944, 1945, -2482, 1947, 983, 983, 1948, 1200, 4394, - -2482, -2482, 983, -2482, 983, -2482, -36, 950, 983, 1949, - -2482, 983, 1200, -2482, 1200, -5, -2482, -2482, 1950, 1951, - 1952, 1953, 1200, -2482, 950, 950, 950, 1200, -2482, 950, - -36, 950, 950, 1200, -2482, 950, 950, 950, 1200, -2482, - 950, 950, 1200, 4394, 950, 1200, 950, 950, 1200, 950, - 1200, -2482, -2482, 1955, -5, 1956, -2482, 983, -2482, -2482, - -2482, -2482, 1958, -2482, -2482, -2482, -2482, 366, 59, -2482, - -2482, -2482, -2482, -2482, -2482, 1959, -2482, -2482, 59, 1960, - 1961, 1962, 59, 59, -71, 1964, 1965, 1966, 1967, 1972, - 1974, 59, 59, -71, 1971, 1977, 1979, 1981, 1982, 1983, - 59, 59, -71, 1986, 1987, 1989, 59, 366, 366, 366, - 366, 366, 1991, 366, 366, 1992, 59, 59, 366, 366, - 366, 366, 366, 1994, 366, 366, 1996, 59, 59, -2482, - -2482, -2482, -2482, -2482, 1999, -2482, -2482, 2000, 59, -2482, - -2482, -2482, -2482, -2482, 2002, -2482, -2482, 59, -2482, 59, - 2003, -2482, 2005, 2006, -2482, 4788, -2482, 950, 2008, 4394, - 950, 983, 4394, 2011, -2482, 950, -2482, -2482, 950, -2482, - 4394, 2014, 983, 983, 983, 983, 983, 983, 983, 983, - 983, 983, 983, -2482, -2482, -2482, 4394, 950, 983, 4394, - 2015, -2482, 1243, 1243, 4394, 1243, 1243, 4394, 4394, 1243, - 1243, 983, 983, 983, 983, 983, 983, 1391, 983, 983, - 983, 1489, 1533, 1586, 1590, 1601, 1606, 1617, 2448, -2482, - 1673, -2482, -2482, 1391, 983, 983, 983, 983, 1391, 983, - 983, 983, 983, 983, 983, 1200, 983, 1563, 1391, 983, - 983, -2482, -2482, -36, 282, 2017, 2018, -2482, -2482, -2482, - -2482, -2482, -36, 2019, -2482, -2482, -2482, -2482, 983, -2482, - -2482, 1243, 983, -2482, -2482, -2482, 1047, 2020, 2023, -2482, - 983, 2025, 1179, -2482, 950, -2482, -2482, -2482, -2482, 2027, - -2482, -2482, -2482, -2482, 2026, 2029, 2031, 4394, 2032, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -36, 950, -2482, -36, -2482, - -2482, -36, -2482, -36, 2033, 2030, -2482, 983, -2482, -2482, - 366, 59, -2482, 366, 366, 366, 366, 366, 2035, 366, - 366, 59, -2482, -2482, -2482, -2482, -2482, 2036, -2482, -2482, - 59, 366, 366, 366, 366, 366, 2037, 366, 366, 59, - 366, -2482, -2482, -2482, -2482, -2482, 59, -2482, -2482, 2038, - 366, 366, -2482, -2482, -2482, -2482, -2482, 59, -2482, -2482, - 2039, 366, -2482, 59, 2041, -2482, 59, -2482, -2482, 59, - -2482, -2482, 1200, -2482, 4394, 950, -2482, 2042, 1200, 983, - -2482, -2482, 1200, 983, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 983, 983, 950, -2482, 2044, 1200, 983, - 1243, -2482, 950, 983, 1243, 950, 950, 4394, -2482, 983, - 2045, 2045, 983, 983, 2045, 1391, 2045, -2482, 4394, 1502, - 2046, 2048, 2050, 2051, 2052, 2049, -2482, 282, 1391, 2045, - 2045, 983, 983, 1391, 983, 983, 983, 983, 983, -2482, - 1243, 983, 2053, -2482, -2482, 983, 2045, 282, 13, -2482, - 2054, 282, 2056, -2482, -2482, -2482, 2059, 983, -2482, 2063, - 2057, 1954, 983, -2482, -2482, 33, -2482, 2064, 1200, 4394, - -2482, -2482, -2482, -2482, -2482, -2482, 33, 983, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, 59, -2482, -2482, 366, 59, - -2482, -2482, -2482, -2482, -2482, -2482, 59, -2482, -2482, 366, - -2482, 366, 59, -2482, -2482, 366, 59, -2482, -2482, 59, - -2482, -2482, 983, 950, -2482, 4394, 4394, 983, 4394, 983, - -2482, -2482, -2482, 4394, 4394, 983, -2482, -2482, 4394, -2482, - -2482, -2482, 950, 2066, -2482, -2482, -2482, 1391, 983, -2482, - 2096, -2482, -2482, 1200, 2097, -2482, 2100, -2482, -2482, -2482, - -2482, -2482, 2101, -2482, -2482, 1391, 983, 2103, -2482, -2482, - 983, 4394, -2482, -2482, -2482, -2482, -2482, -2482, -2482, 13, - 1592, 1638, -2482, -2482, 2104, 2105, 2107, -2482, 2095, 2110, - 41, -2482, -2482, -2482, 4394, 34, -2482, -2482, 2111, 366, - -2482, -2482, 366, -2482, -2482, 366, -2482, 366, -2482, 4788, - -2482, 950, 950, 983, 950, 2112, 950, 950, 983, 950, - 983, -2482, -2482, -2482, -2482, 2114, -2482, 983, -2482, -2482, - 2115, -2482, 983, -2482, -2482, -2482, 2117, 983, -2482, -2482, - -2482, 1200, -2482, -2482, -2482, 1592, -2482, 1744, 1762, 1638, - -2482, -2482, 2118, 2119, 2121, -2482, -2482, -2482, -2482, 468, - 468, 1200, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - 950, -2482, -2482, 2123, -2482, 4274, -2482, -2482, 2124, -2482, - 1391, -2482, -2482, 1391, 983, -2482, -2482, 983, -2482, 1391, - 983, -2482, 4394, -2482, 1744, -2482, 282, -2482, 2125, 2126, - -2482, 983, 983, 983, 983, 34, 2127, 4274, 1200, -2482, - 4274, -2482, -2482, 983, 2130, -2482, 983, 950, -2482, -2482, - -2482, 2131, 2132, 983, 2133, 983, -2482, -2482, 1200, -2482, - -2482, 1200, -2482, -2482, 2135, -2482, -2482, 2136, 2137, -2482, - -2482, 2138, -2482, 2139, -2482, -2482, 1391, -2482, 1391, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482 + 5062, 101, 368, 19, -2137, -2137, 984, -111, 470, 1043, + 824, 453, 2460, 138, 293, 1362, 47, 5096, 645, 807, + -2137, 293, 694, 194, 1309, -27, 378, 241, 167, 371, + 419, 646, 2823, 11, 752, 504, 443, 167, -2137, -14, + 132, 805, -2137, 427, 574, 1390, -2137, 58, -2137, 38, + 3615, 406, 81, 666, 640, 969, 483, 680, 715, 87, + 766, -19, 572, -2137, -2137, -2137, 710, 185, -2137, 44, + 16, 293, 385, 592, 444, -2137, 782, 185, -2137, -2137, + 46, 185, -2137, -2137, -2137, -2137, 185, -2137, -2137, -2137, + -2137, -2137, -2137, 123, 726, 800, 815, 733, -2137, 185, + 1299, 185, 185, 973, 185, -2137, -2137, -2137, 630, -2137, + -2137, -2137, -2137, 4570, -2137, -2137, -2137, -2137, -2137, -2137, + 185, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, 1277, -2137, 185, -2137, 814, -2137, -2137, + 293, 293, 293, 293, 293, 293, -2137, -2137, 293, 293, + 293, 293, -2137, 712, -2137, 779, 1630, 751, 21, 655, + 735, 754, 3965, 587, 4650, 4532, 839, 4570, 3229, -2137, + 70, 362, 920, 849, 844, 728, 928, 167, 310, -2137, + 883, -2137, 730, 687, 171, -2137, 372, -2137, -9, -2137, + 198, 879, 190, -2137, -2137, 4768, -2137, -2137, -2137, 902, + 947, -2137, -2137, -2137, -2137, 617, -2137, -2137, -2137, -2137, + 354, -2137, -2137, 4768, 4149, -2137, -2137, 238, -2137, 982, + 993, 149, -2137, 185, -2137, 996, 49, 1000, 30, 813, + 1002, 106, -2137, -2137, -2137, 1010, 1025, 293, 293, 185, + 185, -2137, -2137, 1032, -2137, -2137, -2137, -2137, -2137, 2793, + -2137, 1039, 1044, 4768, 185, -2137, 1054, -2137, -2137, -2137, + -2137, -2137, 185, 864, 293, 2853, 185, 1277, 185, -2137, + 1061, -2137, 2881, -2137, -2137, 104, 1068, 1073, 185, -2137, + 1083, -2137, -2137, -81, 1085, 4768, 1091, -2137, 1046, 185, + 1007, -2137, 501, 987, 1493, 414, 1104, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, 1115, -2137, 669, 193, 201, 348, + 63, -2137, 185, 185, 118, -2137, 185, 858, 1124, -2137, + 185, 185, -2137, 1131, 17, 40, 1134, 1277, -2137, -2137, + -2137, 798, 185, -2137, -2137, -2137, -2137, 185, -2137, 1157, + 1164, -2137, 185, 992, -2137, -2137, -2137, -2137, -2137, -2137, + 185, -2137, -2137, 185, -2137, -2137, 52, 52, 1171, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + 1006, 185, 185, 1174, 1176, 1188, -2137, -2137, 185, 185, + 185, -2137, 185, -2137, 1206, -2137, -2137, -2137, -2137, 911, + -2137, 1207, -2137, 4768, 1209, -2137, 185, -2137, -2137, -2137, + 185, 1211, 1217, 1217, 4768, 185, 185, 185, 185, 185, + 185, -2137, 185, 4570, 1299, 185, 185, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, 1299, 185, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, 1225, -2137, 1009, + 335, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + 347, -2137, -2137, -2137, 1103, -2137, 608, 603, 603, -2137, + -2137, -2137, 1274, -2137, 1276, -2137, -2137, 391, -2137, 1107, + -2137, -2137, -2137, 1122, -2137, -2137, 1277, -2137, 185, 185, + -2137, 4768, 4768, 1277, -2137, -2137, 1277, -2137, -2137, -2137, + -2137, 1277, -2137, -2137, 4768, 1277, 185, -2137, -2137, 4768, + -2137, -2137, 474, 1097, 8, -2137, -2137, 1101, 4768, 53, + -2137, -2137, -2137, -2137, -2137, 1293, 1300, 1317, -2137, 1118, + -2137, -2137, -2137, 185, -2137, -2137, 511, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, 198, -2137, -2137, -2137, -2137, + -2137, -2137, 1143, 1144, -2137, -2137, 1266, 1267, 1270, -2137, + -2137, 1125, -2137, 185, 1336, 1121, 2881, -2137, 1277, -2137, + 1345, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, 4768, 4768, 4768, 4768, -2137, + -2137, 1347, 293, -2137, -2137, 1351, 1354, 1165, 185, -2137, + 73, 1278, -2137, 1359, -2137, 596, 1289, 4070, 424, 1361, + -2137, 1376, -2137, 1380, -2137, 105, -2137, 1381, 1384, -2137, + 1386, -2137, -2137, -2137, 185, -2137, 2881, 4467, 1268, 469, + 1388, 420, 1286, -2137, -2137, -2137, 1377, 93, 1391, 1395, + 28, 185, 303, 773, 128, 4768, 293, 1563, 563, 12, + 175, 262, 13, -2137, 1385, 1393, 1397, -2137, -2137, -2137, + -2137, -2137, -2137, 185, 185, 185, 185, -2137, -2137, 185, + 1277, 185, -2137, 185, 1299, 185, 1407, 1277, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, 1409, 503, 517, -2137, + -2137, -2137, 1410, -2137, -2137, -2137, -2137, 1318, -2137, 1414, + 1417, 1338, 1419, -2137, 1421, -2137, 1423, 1342, 1430, 512, + 616, 589, 727, 641, 1432, 670, -2137, -2137, 1434, 1439, + 1454, -2137, -2137, 1457, -2137, -2137, -2137, -2137, 1458, -2137, + -2137, 1460, -2137, -2137, 1465, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, 185, 185, -2137, 185, 1077, 185, 185, -2137, + 3587, -2137, 1138, 1468, -2137, 1145, 1469, -2137, -2137, -37, + 185, 185, -2137, 1462, -2137, -2137, 1471, 1023, 185, 1467, + 555, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, 1479, 1494, 185, 185, 185, + 1501, 293, 1502, 1503, 1277, 4768, -2137, -2137, -2137, -2137, + -2137, 1277, -2137, -2137, 185, 185, 185, 4768, 185, 1299, + 185, -2137, 185, -2137, -2137, -2137, -2137, -2137, 1504, 1513, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, 587, -2137, 185, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, 4768, 185, 1277, 1277, -37, -37, + -37, 1277, 1299, 185, 1277, -2137, -2137, 185, -2137, 582, + 1357, 1520, 1525, -2137, -2137, 1277, 1374, 1375, -2137, 1530, + 1535, 1537, 1191, 185, 4535, 703, 524, -2137, -2137, -2137, + 185, 623, 1130, -2137, 1292, -2137, 1563, 1297, 704, 1261, + 599, -2137, -2137, 185, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, 185, 1542, -2137, -2137, -2137, -37, + -2137, -2137, -2137, -2137, -2137, 4711, -2137, -2137, 1546, 1547, + 185, 1556, 1560, 1561, -40, -40, -61, 1564, 1567, 1562, + 1568, 1305, 1314, 1581, 1582, 1584, 454, 454, -61, 1586, + 1587, -61, 1590, 1594, 5099, 1603, 1604, -2137, -2137, 1607, + 1612, 684, -2137, 1614, 1617, 1621, 1625, -40, -61, 1618, + 1626, -2137, 1627, -2137, -2137, 1277, 885, 1231, 1398, -64, + 1399, 1511, 2262, -55, 1632, -1, 1505, 1536, 1119, 1611, + 1602, -28, 1412, 1541, 1646, 1443, 176, 77, 534, -7, + 4768, 1563, 1613, -26, 1416, 1448, 1653, 31, -2137, -2137, + 344, 1655, 1656, -2137, -2137, -2137, 1659, 1456, 91, 1563, + 1461, -2137, -2137, -2137, 293, 1667, 1668, 185, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, 9, -2137, 2229, + -2137, 185, -2137, 185, -2137, -2137, -2137, -2137, 185, 185, + 185, 420, 4768, -2137, 1669, 1272, -2137, -2137, 185, -2137, + -2137, 185, 4768, 185, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, 293, 185, + -2137, 185, 420, 1671, -2137, 185, 185, -2137, 293, -2137, + -2137, -2137, 181, 1672, 1673, -2137, -2137, -2137, -2137, 185, + 185, -2137, -2137, 1299, 185, 185, -2137, -2137, -2137, -2137, + 1675, 185, -2137, 185, 1569, -2137, 185, -2137, 185, 1571, + -2137, 1681, -2137, 1148, 1148, 678, 1148, 1682, -2137, 701, + -2137, -2137, 1683, 1685, 719, 1688, -2137, 1689, 1691, 1693, + -2137, 742, 743, 1694, 1695, 1701, -2137, -2137, 1704, 1705, + 1702, -2137, 1148, 1148, 1148, 185, -2137, -2137, -2137, 185, + -2137, 185, 957, 4768, -2137, 185, -2137, 2881, 1277, -2137, + -2137, 1706, -2137, -2137, 1708, -2137, -2137, -2137, -2137, 1674, + 2853, -2137, 185, 1703, 185, 185, 185, 1064, -2137, 1710, + 1715, 185, 185, 56, 1720, 293, 293, -2137, 1277, 185, + 1722, 1723, 1724, 1277, 4768, -2137, 185, -2137, -2137, -2137, + 185, 185, 185, 1277, 4768, -37, -2137, -2137, -2137, -2137, + 1299, 185, 1727, -37, 185, 1696, 1698, 538, -2137, 1728, + -2137, -2137, 955, 3258, 185, -2137, 185, 1734, 1739, 185, + -2137, 1736, 1117, 4570, 1506, 384, 1507, 156, 4768, 605, + -2137, 416, 1606, 174, 625, 1509, 204, -2137, -2137, 26, + 1579, 675, 1633, -59, 1563, -44, -2137, 1743, 1512, -2137, + 62, -2137, -2137, -2137, -2137, 1563, 1548, -2137, -2137, -2137, + -2137, -2137, 185, -2137, 185, -2137, -2137, 185, 185, -2137, + 185, -2137, 185, -2137, -2137, -2137, -2137, 1566, 185, -2137, + 185, 23, -2137, -2137, 1747, 1751, -2137, 185, -40, -40, + -40, -2137, -2137, -2137, -2137, -2137, -2137, 1754, -40, -40, + -40, 330, -2137, -2137, 454, -40, -40, -40, -2137, -2137, + -40, -40, 1759, -40, -40, 1763, 454, 867, -2137, 1764, + 1766, 1768, -2137, 686, -2137, 792, 829, -2137, 904, -2137, + 1508, 1769, 1771, 1773, 454, 454, -61, 1776, 1777, -61, + 1779, 1778, 1781, -40, -40, -2137, 1782, -40, -40, -2137, + 1783, -2137, -2137, -2137, -2137, -2137, -2137, 293, -2137, -2137, + -2137, 4570, 1127, 293, 185, 1182, 1446, -33, -2137, -2137, + -2137, 5, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, 1784, 293, 185, -2137, 293, 1786, + 185, 4768, 293, 1452, 1532, 1557, 226, 244, 1558, 268, + 1488, 1491, 1792, 1793, 1794, 2262, 1795, 1796, 1797, 1498, + 1500, 1296, 1801, 293, 185, 1222, 1552, -2137, -2137, 293, + 4768, -2137, -2137, 4768, 185, 7, 1802, 293, 185, 1277, + 293, -2137, 1803, 4768, 4768, 185, -2137, -2137, -2137, 293, + 293, 4768, -2137, -2137, -2137, -2137, -2137, -2137, 4768, 185, + 293, -2137, -2137, -2137, 185, -2137, -2137, 1804, 185, 1588, + 442, 185, 1589, 185, 484, 185, -2137, 185, 1592, 1595, + 185, 185, 185, 185, 185, 185, 185, 185, 27, 185, + 185, 1600, -2137, 185, 185, 185, 185, -2137, 4768, 1277, + 1819, 4768, 4768, 185, 185, 1277, -2137, 185, 185, 185, + 4768, -2137, 185, 185, -2137, -2137, -2137, 1821, -2137, -2137, + -2137, -2137, -2137, -2137, 1823, 185, 185, -2137, 185, 185, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, 1824, + 1825, 1827, -2137, -2137, 1148, 1828, 1831, 1833, -2137, 1834, + 1836, 1837, 1838, 1849, -2137, 1850, -2137, -2137, -2137, 1851, + 1852, 1854, -2137, 1855, 1856, 1858, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, 185, 185, 185, -2137, + 1277, 185, 1277, -2137, -2137, -2137, 2853, 185, 1277, 185, + 185, 185, -2137, 185, 185, 1859, 185, 1862, 1822, 185, + 185, -2137, -2137, 1865, 4768, -2137, -2137, -2137, 185, -2137, + -2137, -2137, -2137, 1277, -2137, 1170, 185, 1170, -37, 1277, + 4768, 185, 185, 1867, -2137, -2137, -2137, -2137, -2137, 185, + -2137, -2137, -2137, -2137, -2137, 4768, 1277, 4768, 185, 1868, + -2137, -2137, 4768, 1869, 1870, 1871, 1872, 4768, 1277, -2137, + 4768, -2137, 4768, 4768, 4570, 4768, 1277, -2137, 4768, -2137, + -2137, 4768, -2137, -2137, 4570, 4768, -2137, 4768, 4768, 4570, + 4768, -2137, 4768, 4768, 185, -2137, -2137, -2137, 4768, 4768, + 4768, -2137, -2137, 4768, 4768, -2137, -2137, -2137, -2137, 4768, + 4768, -2137, -2137, -2137, -2137, -2137, 185, 185, -2137, -2137, + 1874, 185, -2137, -2137, 1875, 1878, -2137, 185, -2137, -2137, + -2137, -40, -2137, -2137, -2137, 1879, 1880, 1881, -2137, -2137, + -61, 1885, 1886, 1887, -40, -2137, -2137, -2137, -2137, -2137, + 454, -2137, -2137, 1890, -40, 1891, 1892, 1893, 454, 454, + -61, 1895, 1896, 1907, 1258, -2137, 1279, -2137, 1355, 1565, + 1908, 1921, 1923, 454, 454, -61, 1897, 1928, -61, 1929, + 1572, 1930, 1931, 1932, 454, 454, -61, 1934, 1935, -61, + 1936, 1574, 1937, 1940, 1941, 454, 454, -61, 1943, 1945, + -61, 1946, 1947, 1948, 1949, 454, 454, -61, 1951, 1952, + 1953, 454, -2137, -2137, -2137, -2137, -2137, 1955, -2137, -2137, + 1956, 454, 1957, 1958, -2137, -2137, -40, -2137, -2137, 1959, + -2137, 1277, -2137, 4768, 185, -2137, 185, 4768, 185, 1960, + 1231, -2137, -2137, -2137, -2137, -2137, -2137, 1961, -2137, 4768, + 293, 1962, 4768, 1277, -2137, 1963, 1231, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 1965, 1966, -2137, -2137, + -2137, 1967, -2137, -2137, -2137, 1969, 1970, -2137, -2137, -2137, + -2137, 185, 4768, 185, 1972, 1231, 293, 1277, 1277, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + 185, 1299, -2137, -2137, 1277, 1277, 185, -2137, -2137, 1277, + 1277, -2137, -2137, -2137, -2137, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 2183, -2137, 185, 185, 185, + 185, 185, 185, 185, 185, 185, 185, 185, 933, 1973, + 185, -2137, 185, 185, 185, 1971, 1976, -2137, -2137, 1277, + -37, 1978, 1277, 1277, -2137, -2137, 1299, 185, -2137, 1980, + 1277, -2137, -2137, -2137, 1983, -2137, -2137, -2137, -2137, 1148, + 1148, 1148, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, 1231, 185, + -2137, -2137, 185, -2137, 185, 1277, 185, -2137, 1299, 185, + -2137, 185, -2137, 1843, 1984, 1985, -2137, 1987, 185, 185, + 1988, 1277, 4768, -2137, -2137, 185, -2137, 185, -2137, -37, + 955, 185, 1989, -2137, 185, 1277, -2137, 1277, 198, -2137, + -2137, 1992, 1993, 1994, 1995, 1277, -2137, 955, 955, 955, + 1277, -2137, 955, -37, 955, 955, 1277, -2137, 955, 955, + 955, 1277, -2137, 955, 955, 1277, 4768, 955, 1277, 955, + 955, 1277, 955, 1277, -2137, -2137, 1999, 198, 2000, -2137, + 185, -2137, -2137, -2137, -2137, 2002, -2137, -2137, -2137, -2137, + -40, 454, -2137, -2137, -2137, -2137, -2137, -2137, 2003, -2137, + -2137, 454, 2004, 2005, 2007, 454, 454, -61, 2009, 2010, + 2011, 2013, 2016, 2019, 454, 454, -61, 2021, 2022, 2023, + 2024, 2026, 2027, 454, 454, -61, 2029, 2031, 2032, 454, + -40, -40, -40, -40, -40, 2034, -40, -40, 2035, 454, + 454, -40, -40, -40, -40, -40, 2036, -40, -40, 2037, + 454, 454, -2137, -2137, -2137, -2137, -2137, 2038, -2137, -2137, + 2039, 454, -2137, -2137, -2137, -2137, -2137, 2040, -2137, -2137, + 454, -2137, 454, 2041, -2137, 2042, 2043, -2137, 2881, -2137, + 955, 2044, 4768, 955, 185, 4768, 2045, -2137, 955, -2137, + -2137, 955, -2137, 4768, 2047, 185, 185, 185, 185, 185, + 185, 185, 185, 185, 185, 185, -2137, -2137, -2137, 4768, + 955, 185, 4768, 2048, -2137, 1299, 1299, 4768, 1299, 1299, + 4768, 4768, 1299, 1299, 185, 185, 185, 185, 185, 185, + 1231, 185, 185, 185, 1516, 1526, 1593, 1610, 1616, 1624, + 1680, 2183, -2137, 1707, -2137, -2137, 1231, 185, 185, 185, + 185, 1231, 185, 185, 185, 185, 185, 185, 1277, 185, + 1559, 1231, 185, 185, -2137, -2137, -37, 293, 2049, 2051, + -2137, -2137, -2137, -2137, -2137, -37, 2052, -2137, -2137, -2137, + -2137, 185, -2137, -2137, 1299, 185, -2137, -2137, -2137, 1113, + 2053, 2054, -2137, 185, 2056, 1170, -2137, 955, -2137, -2137, + -2137, -2137, 2057, -2137, -2137, -2137, -2137, 2059, 2060, 2061, + 4768, 2062, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -37, 955, + -2137, -37, -2137, -2137, -37, -2137, -37, 2066, 2068, -2137, + 185, -2137, -2137, -40, 454, -2137, -40, -40, -40, -40, + -40, 2069, -40, -40, 454, -2137, -2137, -2137, -2137, -2137, + 2070, -2137, -2137, 454, -40, -40, -40, -40, -40, 2071, + -40, -40, 454, -40, -2137, -2137, -2137, -2137, -2137, 454, + -2137, -2137, 2072, -40, -40, -2137, -2137, -2137, -2137, -2137, + 454, -2137, -2137, 2074, -40, -2137, 454, 2075, -2137, 454, + -2137, -2137, 454, -2137, -2137, 1277, -2137, 4768, 955, -2137, + 2076, 1277, 185, -2137, -2137, 1277, 185, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, 185, 185, 955, -2137, + 2077, 1277, 185, 1299, -2137, 955, 185, 1299, 955, 955, + 4768, -2137, 185, 2078, 2078, 185, 185, 2078, 1231, 2078, + -2137, 4768, 2262, 2079, 2081, 2082, 2083, 2084, 2086, -2137, + 293, 1231, 2078, 2078, 185, 185, 1231, 185, 185, 185, + 185, 185, -2137, 1299, 185, 2087, -2137, -2137, 185, 2078, + 293, 33, -2137, 2088, 293, 2090, -2137, -2137, -2137, 2091, + 185, -2137, 2092, 2094, 1873, 185, -2137, -2137, 109, -2137, + 2096, 1277, 4768, -2137, -2137, -2137, -2137, -2137, -2137, 109, + 185, -2137, -2137, -2137, -2137, -2137, -2137, -2137, 454, -2137, + -2137, -40, 454, -2137, -2137, -2137, -2137, -2137, -2137, 454, + -2137, -2137, -40, -2137, -40, 454, -2137, -2137, -40, 454, + -2137, -2137, 454, -2137, -2137, 185, 955, -2137, 4768, 4768, + 185, 4768, 185, -2137, -2137, -2137, 4768, 4768, 185, -2137, + -2137, 4768, -2137, -2137, -2137, 955, 2095, -2137, -2137, -2137, + 1231, 185, -2137, 2098, -2137, -2137, 1277, 2099, -2137, 2101, + -2137, -2137, -2137, -2137, -2137, 2102, -2137, -2137, 1231, 185, + 2103, -2137, -2137, 185, 4768, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, 33, 1615, 1563, -2137, -2137, 2106, 2107, 2108, + -2137, 1877, 2110, 36, -2137, -2137, -2137, 4768, 151, -2137, + -2137, 2111, -40, -2137, -2137, -40, -2137, -2137, -40, -2137, + -40, -2137, 2881, -2137, 955, 955, 185, 955, 2112, 955, + 955, 185, 955, 185, -2137, -2137, -2137, -2137, 2113, -2137, + 185, -2137, -2137, 2114, -2137, 185, -2137, -2137, -2137, 2117, + 185, -2137, -2137, -2137, 1277, -2137, -2137, -2137, 1615, -2137, + 1670, 1718, 1563, -2137, -2137, 2118, 2119, 2121, -2137, -2137, + -2137, -2137, 895, 895, 1277, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, 955, -2137, -2137, 2122, -2137, 4570, -2137, + -2137, 2123, -2137, 1231, -2137, -2137, 1231, 185, -2137, -2137, + 185, -2137, 1231, 185, -2137, 4768, -2137, 1670, -2137, 293, + -2137, 2124, 2126, -2137, 185, 185, 185, 185, 151, 2127, + 4570, 1277, -2137, 4570, -2137, -2137, 185, 2129, -2137, 185, + 955, -2137, -2137, -2137, 2130, 2131, 185, 2133, 185, -2137, + -2137, 1277, -2137, -2137, 1277, -2137, -2137, 2135, -2137, -2137, + 2137, 2138, -2137, -2137, 2139, -2137, 2140, -2137, -2137, 1231, + -2137, 1231, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -2482, -2482, -3, -2482, 274, -2482, -1644, -890, 1477, -2482, - 787, -383, 1829, -49, 102, -1615, 1743, 1817, -742, -1454, - -827, 714, 1038, -2482, -1108, -2482, -655, -1046, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -468, -473, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -357, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -1420, -2482, -2482, -2482, -2482, -2482, -633, -2482, -2482, -2482, - -2482, -2482, -2482, 48, -2482, -2482, -2482, -2482, -83, -652, - -1176, -438, -2482, -2482, -2482, -2482, -504, -499, -2482, -2482, - -2481, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, 1433, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, -2482, - -2482, -2482, -2482, -2482, -2482, -2482 + -2137, -2137, -3, -2137, 290, -2137, -1527, -904, 1662, -2137, + 901, -383, 1835, -49, 43, -1616, 1638, 1790, -734, -1890, + -941, -732, 1643, -2137, -1068, -2137, -715, -1047, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -557, -476, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -403, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -1422, -2137, -2137, -2137, -2137, -2137, -648, -2137, -2137, -2137, + -2137, -2137, -2137, 142, -2137, -2137, -2137, -2137, -130, -651, + -1427, -487, -2137, -2137, -2137, -2137, -549, -537, -2137, -2137, + -2136, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, 1403, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, -2137, + -2137, -2137, -2137, -2137, -2137, -2137 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -1215 +#define YYTABLE_NINF -1217 static const yytype_int16 yytable[] = { - 67, 346, 1858, 1075, 839, 625, 1473, 2002, 104, 2004, - 867, 64, 65, -1068, 759, 106, 289, 1049, 1052, 365, - 1079, 762, 64, 65, 64, 65, 1925, 403, 1088, 285, - 613, 1044, 106, 255, 1455, 303, 398, 309, 731, 1608, - 106, 64, 65, 1436, 64, 65, 340, 573, 1661, 351, - 818, 109, 356, 64, 65, 276, 362, 64, 65, 369, - 821, 1172, 1449, 372, 374, 2591, 2662, 383, 1081, 1444, - 390, 394, 64, 65, 397, 1545, 1325, 1550, 401, 928, - 929, 64, 65, 402, 1378, 302, 1438, 536, 1877, 1380, - 1463, 76, 1402, 1312, 256, 825, 415, 419, 424, 425, - 429, 431, 735, 1580, 1581, 1582, 604, 64, 65, 1878, - 546, 732, 1879, 1214, 1215, 1216, 257, 435, 1329, 106, - 173, 1332, 1089, 1880, 64, 65, 930, 386, 1090, 1709, - 111, 157, 64, 65, 287, 64, 65, 558, 1363, 1671, - 64, 65, 614, 1293, 64, 65, 1881, 111, 64, 65, - 554, 270, 444, 271, 1450, 111, 608, 1054, 64, 65, - 54, 1055, 1283, 1882, 387, 412, 2695, 258, 531, 537, - 245, 868, 64, 65, 1298, 476, 64, 65, 826, 263, - 497, 738, 1439, 64, 65, 1676, 1464, 375, 1445, 253, - 1313, 413, 277, 939, 379, 64, 65, 278, 299, 279, - 106, 538, 940, 941, 1381, 469, 733, 1403, 117, 99, - 1451, 470, 114, 2718, 355, 434, 615, 1326, 115, 116, - 605, 1173, 836, 1045, 1294, 547, 574, 2656, 100, 114, - 962, 307, 1056, 265, 111, 115, 116, 114, 1437, 1846, - 606, 1286, 684, 115, 116, 545, 404, 275, 471, 942, - 559, 391, 304, 1057, 931, 932, 632, 633, 532, 837, - 1082, 1609, 741, 1662, 366, 301, 626, 616, 272, 1848, - 668, 1851, 472, 1456, 399, 305, 106, 963, 670, 673, - 101, 676, 680, 1280, 682, 498, 106, 506, 159, 511, - 515, 617, 760, -1068, 692, 236, 1080, 542, 1103, 763, - 261, 1474, 119, 1046, 702, 704, 380, 292, 290, 873, - 2592, 2663, 571, 869, 1058, 111, 114, 473, 291, 119, - 1091, 1926, 115, 116, 933, 259, 308, 119, 747, 748, - 750, 548, 752, 389, 934, 935, 755, 756, 1440, 2657, - 1083, 1710, 1465, 1027, 392, 385, 1447, 768, 770, 381, - 382, 149, 560, 771, 1672, 150, 151, 66, 774, 776, - 474, 475, 102, 749, 1467, 936, 777, 555, 149, 778, - 1405, 260, 150, 151, 273, 376, 149, 943, 944, 561, - 150, 151, 474, 2658, 1028, 1666, 678, 788, 789, 1457, - 556, 111, 339, 609, 793, 794, 795, 114, 796, 266, - 1677, 111, 1904, 115, 116, 964, 119, 1883, 55, 1059, - 599, 1442, 803, 267, 1909, 1505, 804, 350, 1443, 393, - 361, 809, 810, 811, 812, 813, 814, 1108, 815, 377, - 419, 819, 820, 1202, 446, 447, 448, 449, 450, 451, - 419, 822, 452, 453, 454, 455, 1517, 945, 1222, 56, - 64, 65, 1113, 103, 1847, 149, 863, 946, 947, 150, - 151, 317, 948, 744, 64, 65, 874, 57, 956, 832, - 1627, 64, 65, 114, 268, 965, 1218, 1138, 1631, 115, - 116, 1635, 324, 114, 1849, 966, 1852, 119, 949, 115, - 116, 64, 65, 1827, 851, 852, 58, 725, 1109, 483, - 1678, 1027, 706, 881, 882, 1959, 348, 484, 109, 1406, - 318, 353, 860, 1029, 59, 1430, 967, 109, 60, 319, - 1843, 1828, 1308, 1114, 1667, 915, 1804, 1030, 1031, 1807, - 61, 630, 631, 109, 817, 1347, 149, 957, 1020, 880, - 150, 151, 1028, 1872, 1348, 1349, 1139, 320, 540, 1309, - 1722, 1723, 77, 2278, 1085, 713, 726, 675, 1223, 883, - 517, 707, 833, 119, 1021, 884, 953, 779, 911, 1685, - 2290, 2291, 2292, 119, 518, 2294, 694, 2296, 2297, 1407, - 1110, 2299, 2300, 2301, 1458, 972, 2303, 2304, 78, 354, - 2307, 1350, 2309, 2310, 1668, 2312, 519, 1724, 600, 109, - 736, 739, 742, 927, 358, 1115, 836, 1129, 541, 1688, - 1829, 368, 149, 885, 715, 520, 150, 151, 1032, 1033, - 1698, 1408, 149, 864, 1686, 335, 150, 151, 886, 971, - 1431, 780, 521, 1134, 1695, 522, 1669, 834, 745, 1140, - 1679, 360, 887, 837, 406, 1038, 1047, 1111, 888, 1060, - 1742, 1743, 1288, 889, 563, 900, 1145, 2472, 359, 79, - 1830, 523, 524, 1658, 564, 117, 1130, 1095, 1096, 1097, - 1098, 1029, 1116, 1099, 117, 1101, 364, 1102, 419, 1104, - 1269, 1546, 695, 708, 62, 1030, 1031, 1076, 1687, 619, - 117, 565, 1135, 1048, 1022, 1680, 1027, 1744, 1141, 781, - 685, 321, 1131, 2383, 890, 727, 2386, 620, 1165, 396, - 709, 2390, 582, 525, 2391, 1146, 1039, 1528, 215, 1351, - 1352, 526, 408, 891, 1274, 1725, 1726, -1214, 892, 1756, - 893, 1586, 432, 2406, 216, 410, 686, 1028, 1757, 1758, - 1547, 80, 1552, 1270, 1023, 336, 1156, 1157, 1558, 1158, - 1160, 1162, 1163, 894, 895, 583, 117, 1051, 1077, 93, - 1664, 896, 844, 721, 1175, 1176, 566, 1411, 1271, 1566, - 1024, 1180, 1181, 445, 1696, 94, 1032, 1033, 1659, 897, - 527, 528, 621, 782, 1522, 1759, 687, 713, 783, 1353, - 81, 1187, 1188, 1189, 1412, 1727, 1523, 1413, 1040, 1354, - 1355, 1553, 567, 1570, 1356, 1728, 1729, 1559, 1197, 1198, - 1199, 1183, 1201, 419, 1203, 1132, 1204, 64, 65, 1184, - 2473, 457, 1767, 845, 337, 1745, 1746, 1414, 1567, 1697, - 1357, 1768, 1769, 107, 1628, 898, 1730, 1207, 1419, 1209, - 1078, 1136, 294, 714, 1673, 1272, 715, 1142, 456, 1211, - 95, 529, 2481, 828, 1275, 1415, 419, 1219, 1416, 584, - 479, 1221, 1571, 1831, 1147, 1420, 1029, 568, 1421, 467, - 109, 1422, 64, 65, 923, 1665, 1236, 1238, 1770, 481, - 1030, 1031, 716, 2005, 1279, 1281, 1284, 508, 688, 1548, - 534, 96, 1289, 535, 1273, 1747, 544, 1295, 1423, 246, - 2062, 550, 1338, 2624, 1276, 1748, 1749, 829, 1296, 426, - 2254, 2255, 2256, 1760, 1761, 110, 1682, 717, 569, 551, - 2075, 2635, 586, 1683, 1304, 97, 1424, 553, 1063, 1425, - 1277, 2524, 572, 1086, 1778, 2112, 1750, 2163, 2115, 578, - 295, 580, 1208, 1779, 1780, 237, 2123, 64, 65, 2126, - 1554, 2532, 1832, 2171, 64, 65, 1560, 2134, 2537, 1674, - 2137, 2540, 2541, 64, 65, 718, 1689, 2144, 719, 1417, - 112, 1032, 1033, 238, 1638, 1639, 602, 1568, 64, 65, - 427, 603, 2190, 1762, 607, 247, 64, 65, 587, 611, - 1781, 1441, 720, 1763, 1764, 721, 623, 248, 1765, 1418, - 671, 628, 1833, 1690, 705, 722, 1771, 1772, 629, 2554, - 634, 1572, 1466, 296, 1789, 1790, 64, 65, 64, 65, - 1820, 1472, 297, 666, 1766, 775, 667, 117, 588, 64, - 65, 249, 118, 669, 1602, 1500, 683, 1501, 1179, 2712, - 1426, 239, 1502, 1503, 1504, 2715, 690, 1640, 798, 799, - 64, 65, 1510, 1166, 1167, 1511, 240, 1513, 1691, 64, - 1159, 1791, 428, 691, 2079, 2080, 589, 371, 693, 2610, - 1427, 672, 1191, 1515, 767, 1516, 1773, 250, 697, 1519, - 1520, 1368, 699, 64, 65, 2257, 1774, 1775, 2620, 311, - 251, 1776, 711, 1526, 1527, 729, 1428, 419, 1529, 1530, - 83, 730, 2752, 753, 2753, 1532, 2466, 1533, 1169, 1170, - 1535, 2081, 1536, 241, 1692, 1589, 754, 1777, 1782, 1783, - 700, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 1583, - 1369, 1508, 1509, 1584, 242, 1585, 757, 2671, 2672, 1588, - 2674, 765, 2676, 2677, 243, 2679, 772, 218, 773, 1649, - 64, 65, 1824, 325, 1594, 312, 1597, 786, 1599, 1600, - 1601, 1603, 787, 326, 790, 1606, 1607, 313, 1784, 1792, - 1793, 701, 219, 1615, 791, 2244, 64, 1235, 1785, 1786, - 1621, 1864, 1865, 1787, 1622, 1623, 1624, 83, 806, 807, - 327, 792, 1539, 1540, 419, 1629, 2706, 797, 1632, 1370, - 1371, 800, 84, 802, 416, 220, 823, 824, 1644, 1788, - 1645, 418, 221, 1647, 1372, 436, 831, 840, 1650, 2082, - 2083, 842, 222, 223, 85, 847, 64, 65, 86, 224, - 849, 2552, 416, 417, 418, 866, 69, 2328, 876, 1794, - 871, 877, 70, 2738, 2277, 878, 2337, 314, 901, 1795, - 1796, 879, 225, 902, 1373, 2346, 1700, 2576, 1701, 1596, - 315, 1702, 1703, 903, 1704, 328, 1705, 912, 2295, 226, - 905, 907, 1707, 909, 1708, 1469, 917, 913, 87, 71, - 1797, 1714, 922, 227, 228, 924, 437, 1651, 1652, 2084, - 229, 925, 926, 2546, 937, 938, 2549, 2425, 2551, 2085, - 2086, 329, 1653, 72, 958, 950, 1636, 438, 439, 84, - 230, 2563, 2564, 2438, 960, 440, 88, 961, 2443, 1541, - 1542, 968, 1656, 969, 89, 90, 970, 1035, 2578, 1514, - 2087, 85, 1026, 441, 1037, 2001, 64, 65, 1826, 1521, - 1375, 1376, 1654, 442, 1042, 330, 231, 1543, 73, 2622, - 2623, 1043, 1092, 2626, 1093, 2628, 1821, 1094, 1823, 1825, - 64, 65, 1842, 1105, 1375, 1376, 331, 2633, 2634, 2088, - 2089, 1107, 2638, 2639, 64, 65, 2642, 1118, 1375, 1376, - 1836, 2643, 2644, 1119, 1839, 87, 64, 65, 1871, 1120, - 1375, 1376, 74, 64, 65, 1869, 232, 1121, 1122, 1123, - 1144, 332, 1124, 1125, 1127, 1149, 233, 1126, 1868, 1870, - 1150, 1151, 1152, 1177, 1182, 1153, 2090, 333, 1876, 1154, - 1155, 1168, 1887, 88, 1171, 2681, 1178, 1185, 2682, 1893, - 1186, 89, 90, 2685, 1190, 234, 1192, 1193, 1226, 2688, - 1205, 1206, 1227, 1898, 2691, 1228, 1612, 1613, 1900, 1230, - 1231, 1232, 1902, 1233, 1905, 1906, 1234, 1908, 1910, 1911, - 1819, 1914, 1285, 1287, 1917, 1918, 1919, 1920, 1921, 1922, - 1923, 1924, 1927, 1929, 1930, 1009, 1291, 1932, 1933, 1934, - 1935, 2457, 1297, 1301, 1379, 2195, 1302, 1941, 1942, 1010, - 2461, 1944, 1945, 1946, 2097, 2098, 1948, 1949, 1011, 1305, - 1306, 1307, 1315, 1316, 1320, 1317, 1318, 1321, 1012, 1952, - 1953, 1322, 1954, 1955, 1323, 2550, 2733, 1324, 1330, 2736, - 1331, 1358, 1384, 1333, 1334, 1340, 1342, 1343, 2562, 1345, - 1359, 1364, 160, 2567, 161, 1360, 1361, 1365, 1013, 2747, - 2249, 2099, 1366, 2480, 2091, 2092, 2482, 1383, 1385, 2483, - 1382, 2484, 1404, 2754, 1409, 1410, 2755, 2756, 1014, 1432, - 1975, 1976, 1977, 1429, 162, 1979, 1433, 1434, 1448, 1435, - 1981, 1984, 163, 1986, 1987, 1988, 1452, 1989, 1990, 1453, - 1992, 1386, 2263, 1995, 1996, 1454, 1459, 1387, 1460, 1461, - 1462, 1468, 1999, 1388, 1470, 1471, 1534, 1507, 1518, 1524, - 2003, 1525, 458, 1015, 1531, 2008, 2009, 1538, 1537, 1551, - 1556, 1389, 1557, 2011, 2093, 1562, 1604, 1563, 1564, 1565, - 459, 1574, 2015, 1576, 2094, 2095, 1575, 1577, 1817, 1578, - 164, 1390, 1579, 1633, 1822, 1591, 1592, 460, 1328, 1593, - 1016, 1598, 1605, 1670, 1611, 1616, 1391, 1617, 1618, 461, - 1630, 1646, 1634, 1637, -432, 2096, 1835, 1648, 2043, 1837, - 1657, 1660, 1684, 1841, 1017, 1675, 1693, 462, 1699, 2100, - 2101, 463, 1694, 1706, 1681, 1983, 1392, 1712, 1713, 165, - 2051, 2052, 1718, 464, 1867, 2054, 1737, 1740, 1903, 1751, - 1873, 2057, 1753, 1755, 1798, 166, 167, 1799, 1886, 1800, - 1801, 1889, 168, 1018, 169, 1019, 1805, 1806, 1809, 1064, - 1894, 1895, 1808, 1393, 1810, 1813, 1853, 1065, 1816, 1834, - 1838, 1899, 465, 1066, 1855, 1844, 1394, 1845, 1850, 1856, - 170, 1857, 1859, 1860, 1861, 1854, 1866, 1395, 1862, 2102, - 1885, 1951, 1863, 2028, 1067, 1890, 1901, 1907, 1938, 2103, - 2104, 1164, 1950, 2034, 1956, 1915, 1916, 1931, 2039, 1957, - 1958, 1994, 1960, 1961, 1396, 1962, 1963, 1068, 1964, 1967, - 2711, 1965, 1966, 1968, 1971, 1069, 1397, 1969, 1398, 1399, - 2105, 1970, 1972, 1973, 1974, 2266, 1991, 1993, 1997, 2410, - 2411, 2010, 2413, 2414, 2016, 171, 2417, 2418, 2158, 2018, - 2159, 2019, 2161, 2020, 2021, 2053, 2106, 2055, 2056, 2117, - 2059, 2060, 1070, 2061, 2063, 2064, 2429, 2065, 1400, 2068, - 1071, 2172, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, - 2070, 2071, 2072, 2076, 2077, 2128, 2078, 2107, 2108, 2109, - 2113, 286, 2114, 2452, 2116, 2186, 2118, 2188, 2119, 2120, - 2124, 2125, -1081, 2127, 2129, 2130, 2131, 2135, 2464, 2136, - 2430, 2138, 1072, 2139, 2194, 419, 2140, 2141, 2145, 2146, - 2198, 2147, 2149, 1073, 2150, 2152, 2153, 805, 2155, 2201, - 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 1074, - 2162, 2223, 2224, 2225, 2226, 2227, 2228, 2229, 2230, 2231, - 2232, 2233, 2234, 2164, 2237, 2167, 2238, 2239, 2240, 2648, - 2170, 2181, 2182, 2431, 2183, 2184, 2185, 2432, 2189, 2236, - 419, 2250, 433, 2241, 2242, 2245, 2251, 2253, 2433, 2267, - 2268, 2269, 2272, 2434, 2280, 2285, 2286, 2287, 2288, 2314, - 2589, 2316, 2318, 2321, 2435, 2323, 2324, 2325, 2329, 2330, - 1311, 2331, 2332, 2258, 513, 2338, 2259, 2333, 2260, 2334, - 2262, 2339, 419, 2264, 2340, 2265, 2341, 2342, 2343, 107, - 2347, 2348, 2270, 2271, 2349, 2356, 2359, 2648, 2367, 2275, - 2370, 2276, 1362, 2373, 2374, 2279, 2376, 2379, 2281, 2380, - 2381, 495, 2384, 502, 505, 2389, 510, 514, 2393, 2409, - 2437, 2459, 2460, 2462, 2215, 2468, 109, 2536, 2469, 2471, - 2475, 2539, 2474, 2476, 2486, 1731, 2477, 2479, 2485, 2495, - 2499, 2506, 2512, 2516, 576, 2519, 2525, 1741, 2533, 2544, - 2726, 2555, 2556, 2560, 2317, 2557, 2558, 2559, 2575, 2582, - 2584, 2588, 591, 597, 2585, 1802, 1803, 2573, 2587, 2594, - 2621, 110, 121, 122, 123, 124, 125, 126, 127, 128, - 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 2627, 2654, 2630, 681, 2631, 2632, 2382, 2637, 2651, 2696, - 2652, 2166, 2653, 677, 2655, 2665, 2675, 2284, 2683, 785, - 2686, 2689, 2660, 2698, 2699, 2700, 112, 2707, 2710, 2597, - 2720, 2721, 2727, 698, 2735, 2436, 2739, 2740, 2742, 2746, - 2748, 2645, 2749, 2750, 2751, 2697, 2693, 2191, 0, 1128, - 0, 0, 0, 0, 0, 0, 2315, 0, 2387, 0, - 0, 0, 0, 766, 0, 0, 0, 0, 0, 2394, - 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, - 0, 0, 0, 117, 0, 2407, 2702, 2704, 118, 419, - 419, 0, 419, 419, 0, 0, 419, 419, 2419, 2420, - 2421, 2422, 2423, 2424, 0, 2426, 2427, 2428, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2439, 2440, 2441, 2442, 0, 2444, 2445, 2446, 2447, - 2448, 2449, 0, 2451, 0, 0, 2455, 2456, 0, 0, - 0, 801, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 808, 0, 0, 2463, 0, 0, 419, 2465, - 0, 816, 0, 2467, 0, 0, 0, 2470, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 0, 0, 0, 0, 0, - 0, 0, 850, 0, 2487, 0, 0, 0, 0, 855, - 0, 0, 856, 0, 0, 0, 0, 857, 0, 853, - 854, 859, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 858, 1715, 1716, 1717, 0, 861, 0, 0, - 0, 0, 0, 1719, 1720, 1721, 872, 0, 0, 0, - 1732, 1733, 1734, 0, 0, 1735, 1736, 0, 1738, 1739, + 67, 347, 842, 1861, 1052, 1055, 1078, 1332, 104, 2005, + 1335, 2007, 870, 366, 1476, 106, 290, 1082, 1091, 64, + 65, 762, 64, 65, 64, 65, 1408, 1366, 565, 286, + 64, 65, 1928, -1069, 1880, 615, 1458, 310, 566, 64, + 65, 64, 65, 1712, 765, 1047, 341, 304, 376, 352, + 399, 821, 357, 1681, 610, 1881, 363, 1383, 1882, 370, + 1175, 824, 336, 373, 375, 567, 1405, 384, 697, 1883, + 391, 395, 1831, 1381, 398, 288, 747, 1548, 402, 1553, + 64, 65, 782, 403, 64, 65, 1692, 931, 932, 1698, + 64, 65, 1884, 1433, 64, 65, 416, 420, 425, 426, + 430, 432, 1611, 1315, 1452, 1583, 1584, 1585, 1688, 1885, + 1834, 627, 1092, 1441, 1447, 518, 1311, 436, 1093, 965, + 2281, 64, 65, 1693, 1217, 1218, 1219, 1466, 404, 519, + 111, 64, 65, 1041, 933, 64, 65, 2293, 2294, 2295, + 568, 2594, 2297, 1312, 2299, 2300, 783, 616, 2302, 2303, + 2304, 520, 445, 2306, 2307, 606, 435, 2310, 688, 2312, + 2313, 1832, 2315, 1689, 1057, 1409, 966, 54, 1058, 76, + 521, 157, 1384, 871, 698, 477, 569, 1664, 1694, 303, + 498, 1406, 337, 2665, 876, 1301, 1525, 522, 64, 65, + 523, 173, 1084, 1682, 689, 1674, 1453, 106, 1526, 1835, + 1316, 253, 380, 1439, 1042, 106, 575, 470, 1434, 1442, + 245, 1833, 114, 471, 784, 1331, 524, 525, 115, 116, + 1176, 617, 2659, 1467, 265, 1679, 499, 1690, 507, 1699, + 512, 516, 556, 1448, 1695, 1410, 377, 1048, 543, 1059, + 608, 570, 601, 687, 690, 1289, 263, 1849, 1683, 1836, + 472, 748, 1454, 573, 109, 1713, 634, 635, 367, 738, + 1060, 338, 934, 935, 305, 1851, 106, 741, 526, 607, + 2386, 671, 618, 2389, 473, 1459, 527, 1411, 2393, 673, + 676, 2394, 679, 683, 1700, 685, 1043, 306, 400, 1854, + 378, 611, 571, 1083, 967, 695, 619, 106, 785, 763, + 2409, 1106, 119, 786, 159, 705, 707, 66, 291, 1477, + 1094, 236, 111, -1069, 381, 872, 261, 1049, 292, 474, + 111, 1061, 766, 293, 1612, 308, 340, 1929, 681, 750, + 751, 753, 936, 755, 2660, 528, 529, 758, 759, 546, + 752, 877, 937, 938, 1725, 1726, 691, 405, 771, 773, + 1450, 149, 106, 1886, 774, 150, 151, 382, 383, 777, + 779, 386, 475, 476, 968, 1443, 1030, 780, 1470, 351, + 781, 1460, 628, 939, 969, 362, 547, 475, 2661, 1468, + 55, 111, 106, 255, 1085, 576, 2595, 2476, 791, 792, + 266, 1727, 1665, 560, 114, 796, 797, 798, 1440, 799, + 115, 116, 114, 1508, 267, 970, 530, 1031, 115, 116, + 1675, 117, 111, 806, 744, 1807, 1062, 807, 1810, 2484, + 309, 56, 812, 813, 814, 815, 816, 817, 2666, 818, + 602, 420, 822, 823, 1520, 270, 1205, 271, 828, 57, + 1680, 420, 825, 1669, 256, 64, 65, 64, 65, 557, + 447, 448, 449, 450, 451, 452, 64, 65, 453, 454, + 455, 456, 1850, 114, 1086, 268, 257, 111, 58, 115, + 116, 1328, 558, 1023, 77, 728, 820, 318, 866, 1221, + 1852, 1630, 1830, 1030, 119, 276, 59, 64, 65, 1634, + 60, 548, 119, 99, 114, 854, 855, 111, 2527, 1024, + 115, 116, 61, 588, 1855, 1661, 561, 1962, 300, 1846, + 78, 959, 100, 863, 2698, 884, 885, 258, 2535, 1728, + 1729, 829, 392, 387, 1031, 2540, 319, 918, 2543, 2544, + 109, 302, 1875, 149, 729, 320, 1032, 150, 151, 831, + 883, 149, 1638, 1111, 1088, 150, 151, 632, 633, 114, + 1033, 1034, 272, 119, 1277, 115, 116, 1116, 1051, 1186, + 388, 2721, 709, 321, 101, 867, 1461, 1187, 956, 589, + 914, 886, 532, 716, 678, 64, 65, 887, 325, 114, + 960, 79, 1670, 847, 119, 115, 116, 975, 549, 1730, + 64, 65, 1734, 832, 109, 64, 65, 550, 903, 1731, + 1732, 942, 149, 1079, 1744, 930, 150, 151, 562, 590, + 943, 944, 1329, 1691, 1112, 393, 1296, 739, 742, 745, + 1662, 710, 1805, 1806, 1701, 888, 64, 65, 1117, 1025, + 1733, 974, 718, 149, 349, 563, 2613, 150, 151, 119, + 889, 1035, 1036, 109, 848, 355, 102, 591, 1050, 273, + 1137, 1063, 1671, 1032, 890, 2623, 62, 945, 274, 2475, + 891, 584, 533, 80, 1907, 892, 354, 1033, 1034, 119, + 1098, 1099, 1100, 1101, 1080, 259, 1102, 1132, 1104, 1026, + 1105, 420, 1107, 730, 1278, 360, 835, 117, 149, 1350, + 394, 1759, 150, 151, 1672, 369, 1113, 1297, 1351, 1352, + 1760, 1761, 1143, 734, 585, 1027, 1912, 64, 65, 1138, + 1118, 1168, 81, 64, 65, 1225, 893, 322, 149, 361, + 1531, 260, 150, 151, 2674, 2675, 1667, 2677, 215, 2679, + 2680, 1148, 2682, 541, 1279, 894, 1133, 103, 413, 1549, + 895, 839, 896, 711, 216, 1353, 1676, 1762, 359, 1159, + 1160, 117, 1161, 1163, 1165, 1166, 1081, 407, 1035, 1036, + 1280, 1144, 1555, 1114, 414, 897, 898, 1178, 1179, 1272, + 712, 365, 1134, 899, 1183, 1184, 735, 1119, 840, 836, + 1561, 724, 237, 2709, 109, 946, 947, 397, 390, 2065, + 1149, 900, 1445, 542, 1190, 1191, 1192, 1770, 1550, 1446, + 117, 64, 65, 1569, 1573, 409, 1771, 1772, 586, 2078, + 238, 1200, 1201, 1202, 1141, 1204, 420, 1206, 446, 1207, + 411, 1556, 295, 433, 2115, 1226, 218, 2118, 1283, 457, + 2741, 312, 1273, 372, 1781, 2126, 1030, 1631, 2129, 1562, + 1210, 1668, 1212, 1782, 1783, 458, 2137, 901, 277, 2140, + 537, 219, 1214, 1773, 837, 948, 2147, 1274, 1139, 420, + 1222, 1677, 1570, 1574, 1224, 949, 950, 64, 65, 468, + 951, 736, 509, 1354, 1355, 1763, 1764, 1031, 239, 1239, + 1241, 1745, 1746, 1142, 220, 1135, 1211, 1282, 1284, 1287, + 1784, 221, 926, 240, 2008, 1292, 952, 1054, 64, 65, + 1298, 222, 223, 482, 674, 1341, 621, 93, 224, 1291, + 1145, 1299, 2257, 2258, 2259, 801, 802, 313, 1792, 1793, + 296, 770, 484, 94, 622, 535, 2166, 1307, 1747, 314, + 485, 225, 538, 1685, 1275, 480, 64, 65, 536, 1150, + 1686, 117, 2174, 1356, 545, 1765, 1066, 1551, 226, 552, + 241, 1089, 107, 1357, 1358, 1766, 1767, -1216, 1359, 553, + 1768, 1589, 227, 228, 539, 1794, 555, 1371, 574, 229, + 1557, 2193, 64, 65, 580, 675, 64, 65, 582, 1641, + 1642, 1774, 1775, 1276, 1360, 278, 1769, 604, 1563, 230, + 279, 242, 280, 297, 1444, 64, 65, 605, 95, 623, + 609, 243, 298, 2555, 778, 613, 1032, 625, 2070, 315, + 2557, 1571, 1575, 427, 630, 1469, 2076, 2077, 1785, 1786, + 1033, 1034, 316, 2627, 1475, 231, 64, 65, 356, 2579, + 631, 2113, 2114, 839, 110, 1182, 1372, 636, 1503, 96, + 1504, 2638, 2124, 2125, 668, 1505, 1506, 1507, 669, 64, + 65, 1776, 1643, 2135, 2136, 1513, 1748, 1749, 1514, 672, + 1516, 1777, 1778, 2145, 2146, 686, 1779, 64, 65, 2151, + 840, 83, 693, 97, 2260, 232, 1518, 694, 1519, 2154, + 64, 1162, 1522, 1523, 428, 233, 703, 696, 1787, 112, + 700, 1194, 1780, 1795, 1796, 702, 1529, 1530, 1788, 1789, + 420, 1532, 1533, 1790, 708, 1373, 1374, 714, 1535, 732, + 1536, 1035, 1036, 1538, 234, 1539, 64, 65, 1592, 733, + 1375, 2625, 2626, 1605, 756, 2629, 1750, 2631, 757, 1791, + 64, 65, 1823, 64, 65, 760, 1751, 1752, 768, 2636, + 2637, 1414, 1169, 1170, 2641, 2642, 2331, 1286, 2645, 1172, + 1173, 118, 1586, 2646, 2647, 2340, 1587, 704, 1588, 2715, + 1376, 775, 1591, 1797, 2349, 2718, 429, 1753, 1415, 776, + 69, 1416, 2469, 1798, 1799, 789, 70, 1597, 793, 1600, + 794, 1602, 1603, 1604, 1606, 64, 65, 1827, 1609, 1610, + 1542, 1543, 795, 84, 64, 1238, 1618, 2684, 83, 1652, + 2685, 1417, 790, 1624, 1800, 2688, 2247, 1625, 1626, 1627, + 800, 2691, 803, 71, 805, 85, 2694, 420, 1632, 86, + 417, 1635, 2755, 1599, 2756, 64, 65, 1872, 419, 1418, + 826, 1647, 1419, 1648, 64, 65, 1650, 72, 1378, 1379, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 1653, 87, + 1639, 834, 2082, 2083, 827, 2280, 1511, 1512, 843, 1703, + 845, 1704, 73, 850, 1705, 1706, 1659, 1707, 2736, 1708, + 852, 2739, 869, 2091, 2092, 1710, 874, 1711, 879, 2298, + 1867, 1868, 64, 65, 1717, 880, 2428, 88, 417, 418, + 419, 2750, 437, 882, 1472, 89, 90, 1544, 1545, 2084, + 84, 881, 2441, 809, 810, 2757, 74, 2446, 2758, 2759, + 904, 905, 906, 908, 1012, 246, 910, 1654, 1655, 2323, + 2093, 915, 85, 1420, 916, 1546, 2004, 912, 1013, 2325, + 920, 925, 1656, 2329, 2330, 927, 2549, 1014, 928, 2552, + 929, 2554, 2338, 2339, 941, 940, 961, 1015, 1517, 2100, + 2101, 2347, 2348, 1421, 2566, 2567, 953, 2353, 1524, 1824, + 963, 1826, 1828, 438, 964, 1038, 971, 2363, 2364, 972, + 973, 2581, 1657, 1029, 1040, 1045, 87, 1016, 2374, 2375, + 1046, 1097, 1095, 1839, 439, 440, 160, 1842, 161, 2378, + 1096, 1108, 441, 1110, 1121, 1122, 2102, 1017, 2380, 1123, + 2381, 247, 1124, 1126, 1822, 1125, 1127, 326, 1128, 1129, + 442, 1871, 1873, 248, 88, 1130, 1147, 327, 162, 1152, + 443, 1879, 89, 90, 1153, 1890, 163, 2085, 2086, 64, + 65, 1829, 1896, 1378, 1379, 64, 65, 1845, 1154, 1378, + 1379, 1155, 1018, 1156, 328, 1157, 1901, 249, 2094, 2095, + 1158, 1903, 1171, 1174, 1180, 1905, 1181, 1908, 1909, 1185, + 1911, 1913, 1914, 1188, 1917, 1615, 1616, 1920, 1921, 1922, + 1923, 1924, 1925, 1926, 1927, 1930, 1932, 1933, 1189, 1019, + 1935, 1936, 1937, 1938, 164, 1193, 1195, 1196, 2198, 1208, + 1944, 1945, 2460, 250, 1947, 1948, 1949, 2087, 1209, 1951, + 1952, 2464, 1229, 1020, 2553, 1230, 251, 2088, 2089, 1231, + 1233, 1234, 1955, 1956, 1235, 1957, 1958, 2565, 2096, 329, + 1236, 1237, 2570, 1294, 2103, 2104, 1288, 1300, 2097, 2098, + 1304, 1290, 1305, 165, 716, 64, 65, 1874, 2090, 1378, + 1379, 1308, 1021, 2252, 1022, 1309, 1310, 1320, 1318, 166, + 167, 1319, 1323, 1321, 2483, 330, 168, 2485, 169, 2099, + 2486, 1324, 2487, 1978, 1979, 1980, 1325, 1326, 1982, 1327, + 1333, 1334, 2492, 1984, 1987, 1336, 1989, 1990, 1991, 1337, + 1992, 1993, 2501, 1995, 170, 2266, 1998, 1999, 1343, 1345, + 717, 2503, 1346, 718, 2105, 2002, 1386, 1348, 1361, 331, + 2512, 1362, 1367, 2006, 2106, 2107, 1363, 2514, 2011, 2012, + 1364, 1368, 1369, 1422, 1382, 1385, 2014, 1407, 2518, 1986, + 332, 1413, 1432, 1412, 2521, 2018, 1436, 2523, 1435, 719, + 2524, 1437, 1438, 1451, 1067, 2108, 1455, 1456, 1457, 1462, + 1423, 1463, 1068, 1424, 1464, 1465, 1425, 1820, 1069, 171, + 1471, 1473, 1474, 1825, 1510, 333, 1521, 1527, 1528, 1534, + 1537, 2046, 1540, 459, 720, 1541, 1596, 1554, 1559, 1070, + 1560, 334, 1565, 1426, 1566, 1838, 1567, 1568, 1840, 1577, + 1578, 460, 1844, 2054, 2055, 1579, 1582, 2031, 2057, 1580, + 1581, 1594, 1071, 1595, 2060, 1601, 1607, 2037, 461, 1608, + 1072, 1427, 2042, 1870, 1428, 1614, 1619, 1620, 1621, 1876, + 462, 1633, 721, 1640, 1636, 722, 1637, 1889, 1649, -432, + 1892, 1651, 1660, 1663, 1673, 1678, 1684, 1696, 463, 1897, + 1898, 1715, 464, 1702, 1687, 1716, 1697, 1073, 1721, 723, + 1902, 1709, 724, 1740, 465, 1074, 2602, 1743, 1847, 1754, + 2604, 1756, 725, 1758, 1802, 1801, 1803, 2605, 1804, 2714, + 1808, 1809, 1812, 2608, 1811, 1813, 1816, 2610, 1819, 1837, + 2611, 1841, 1856, 1848, 1853, 1857, 1858, 1859, 1860, 1862, + 1863, 1864, 1865, 466, 1866, 1869, 1888, 1075, 1893, 1904, + 1906, 1910, 2413, 2414, 1918, 2416, 2417, 1919, 1076, 2420, + 2421, 2161, 1934, 2162, 1941, 2164, 1953, 1954, 1997, 1959, + 1960, 1961, 2109, 1963, 1077, 1429, 1964, 1965, 1966, 2120, + 1967, 2131, 1968, 1969, 2175, 2176, 2177, 2178, 2179, 2180, + 2181, 2182, 2183, 1970, 1971, 2269, 1972, 1973, 1974, 2455, + 1975, 1976, 1977, 2432, 1994, 1430, 1996, 287, 2189, 2000, + 2191, 2013, 2019, 2433, 2021, 2022, 2023, 2024, 2056, 2592, + 2058, 2467, 2059, 2657, 2062, 2063, 2064, 2197, 420, 2066, + 2067, 1431, 2068, 2201, 2071, -1082, 2073, 2074, 2075, 2079, + 2080, 2116, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211, + 2212, 2213, 2081, 2110, 2226, 2227, 2228, 2229, 2230, 2231, + 2232, 2233, 2234, 2235, 2236, 2237, 2111, 2240, 2112, 2241, + 2242, 2243, 2117, 2651, 2119, 2121, 2122, 2123, 2127, 2128, + 2434, 2130, 2132, 420, 2253, 2133, 2134, 2138, 434, 2139, + 2218, 2141, 2142, 2143, 2144, 2148, 2149, 2435, 2150, 2152, + 2153, 2155, 2156, 2436, 2158, 2165, 2167, 2170, 2173, 2184, + 2185, 2437, 2186, 2187, 2188, 2244, 2261, 2192, 2239, 2262, + 2245, 2263, 2248, 2265, 2254, 420, 2267, 2256, 2268, 2270, + 2271, 2272, 2275, 2729, 2283, 2273, 2274, 2288, 2289, 2290, + 2291, 2651, 2278, 2317, 2279, 2319, 2321, 2324, 2282, 2326, + 2327, 2284, 2328, 2332, 2333, 788, 2334, 496, 2335, 503, + 506, 2336, 511, 515, 2337, 2341, 2342, 2438, 2343, 2344, + 2539, 2345, 2346, 2350, 2542, 2351, 2663, 2352, 2359, 2362, + 2370, 2373, 2376, 2377, 2379, 2382, 2383, 2384, 2387, 2392, + 578, 2396, 2412, 2462, 2440, 2463, 2465, 2320, 2471, 2472, + 2474, 2287, 2477, 2478, 2479, 2699, 2480, 2482, 593, 599, + 2576, 2488, 2489, 2498, 2502, 2509, 2515, 684, 2519, 2522, + 2528, 2536, 2547, 808, 2558, 2559, 2600, 2560, 2561, 2562, + 2563, 2439, 2578, 2585, 2587, 2648, 2588, 2590, 2591, 2624, + 2318, 2597, 2630, 2700, 2633, 2634, 2635, 2640, 670, 2385, + 2654, 2696, 2655, 2656, 2658, 2668, 2678, 2686, 0, 2689, + 680, 2692, 1131, 2701, 2702, 2703, 2710, 2713, 0, 2723, + 2169, 2724, 2730, 2738, 0, 2742, 2743, 769, 2745, 2749, + 701, 2751, 0, 2752, 2753, 2754, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2527, 0, 0, 0, - 2529, 0, 0, 916, 0, 0, 0, 0, 1811, 1812, - 2530, 2531, 1814, 1815, 0, 0, 2535, 419, 0, 0, - 2538, 419, 0, 0, 0, 0, 2543, 0, 0, 2547, - 2548, 0, 918, 919, 920, 921, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2565, 2566, - 0, 2568, 2569, 2570, 2571, 2572, 0, 419, 2574, 0, - 0, 2067, 2577, 0, 0, 0, 0, 0, 0, 2073, - 2074, 0, 0, 0, 2586, 0, 0, 0, 0, 2590, - 0, 0, 0, 0, 2110, 2111, 0, 0, 0, 0, - 0, 0, 1062, 0, 2598, 2121, 2122, 0, 0, 0, - 0, 0, 0, 0, 1100, 0, 2132, 2133, 0, 0, - 0, 1106, 0, 2211, 0, 0, 2142, 2143, 0, 0, - 0, 0, 2148, 0, 2212, 0, 0, 0, 2458, 2609, - 0, 0, 2151, 0, 2613, 0, 2615, 0, 0, 0, - 0, 0, 2618, 0, 0, 0, 0, 0, 0, 1064, - 2213, 0, 0, 0, 0, 2625, 0, 1065, 0, 0, - 0, 0, 0, 1066, 0, 0, 0, 0, 0, 0, - 2670, 0, 0, 2636, 0, 0, 0, 2640, 0, 0, - 0, 0, 0, 0, 1067, 0, 0, 2214, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 2659, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1068, 0, 0, - 0, 0, 0, 0, 0, 1069, 0, 0, 0, 0, - 2673, 0, 0, 0, 0, 2678, 0, 2680, 1194, 0, - 0, 0, 0, 0, 2684, 1196, 0, 0, 0, 2687, - 0, 1195, 0, 0, 2690, 0, 0, 0, 0, 0, - 0, 0, 1070, 1200, 0, 0, 0, 0, 0, 0, - 1071, 0, 0, 0, 0, 0, 2701, 2703, 0, 0, - 0, 0, 0, 0, 0, 635, 636, 0, 0, 0, - 1212, 1213, 0, 0, 0, 1217, 0, 0, 1220, 0, - 1210, 2713, 0, 0, 2714, 0, 0, 2716, 0, 1229, - 0, 0, 1072, 0, 0, 0, 0, 0, 2722, 2723, - 2724, 2725, 0, 1073, 0, 0, 0, 0, 0, 0, - 2734, 2561, 0, 2737, 0, 0, 0, 0, 0, 1074, - 2741, 637, 2743, 0, 0, 0, 0, 638, 2215, 0, - 2216, 2579, 0, 0, 639, 2583, 640, 0, 0, 0, - 0, 641, 0, 0, 642, 0, 0, 0, 0, 0, - 643, 1300, 0, 0, 0, 0, 2058, 0, 0, 0, - 644, 0, 0, 0, 0, 0, 645, 0, 0, 2066, - 0, 0, 0, 0, 0, 646, 0, 2709, 0, 2069, - 0, 0, 2320, 0, 2217, 0, 0, 0, 0, 1367, - 647, 0, 2322, 0, 0, 0, 2326, 2327, 0, 0, - 0, 0, 0, 64, 65, 2335, 2336, 0, 0, 2729, - 648, 0, 2732, 0, 2344, 2345, 0, 0, 0, 107, - 2350, 0, 0, 0, 0, 649, 1446, 0, 0, 0, - 2360, 2361, 0, 0, 650, 651, 0, 0, 0, 281, - 0, 2371, 2372, 0, 0, 0, 0, 0, 0, 0, - 0, 2154, 2375, 0, 0, 652, 109, 0, 0, 0, - 0, 2377, 0, 2378, 0, 0, 0, 64, 65, 0, - 0, 0, 0, 0, 0, 0, 653, 0, 1506, 0, - 0, 0, 0, 107, 0, 0, 0, 0, 1512, 0, - 654, 0, 655, 0, 0, 0, 0, 0, 0, 0, - 0, 110, 0, 0, 0, 656, 0, 0, 0, 0, - 657, 0, 0, 0, 0, 0, 658, 0, 0, 0, - 0, 0, 0, 659, 0, 0, 0, 0, 0, 0, + 0, 2390, 0, 0, 0, 0, 2194, 0, 0, 0, + 0, 0, 2397, 2398, 2399, 2400, 2401, 2402, 2403, 2404, + 2405, 2406, 2407, 0, 0, 0, 2705, 2707, 2410, 0, + 0, 0, 420, 420, 0, 420, 420, 0, 0, 420, + 420, 2422, 2423, 2424, 2425, 2426, 2427, 0, 2429, 2430, + 2431, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2442, 2443, 2444, 2445, 0, 2447, + 2448, 2449, 2450, 2451, 2452, 0, 2454, 0, 2214, 2458, + 2459, 0, 0, 0, 0, 0, 0, 0, 804, 2215, + 0, 1478, 0, 0, 0, 0, 1479, 0, 2466, 811, + 0, 420, 2468, 0, 0, 0, 2470, 0, 819, 0, + 2473, 0, 0, 0, 1067, 2216, 0, 1480, 1481, 0, + 1482, 1483, 1068, 0, 0, 0, 853, 0, 1069, 0, + 0, 1484, 0, 858, 0, 0, 859, 0, 0, 0, + 0, 860, 1387, 1485, 1486, 862, 0, 0, 0, 1070, + 0, 1487, 2217, 0, 1488, 0, 0, 2490, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1388, 0, + 0, 1489, 1071, 0, 0, 0, 856, 857, 1490, 1491, + 1072, 0, 1492, 0, 0, 0, 0, 0, 0, 861, + 0, 0, 0, 0, 864, 0, 0, 0, 0, 0, + 0, 1389, 0, 875, 0, 0, 0, 1390, 919, 0, + 0, 0, 0, 1391, 0, 0, 0, 1073, 0, 0, + 0, 0, 0, 0, 0, 1074, 0, 0, 0, 2530, + 0, 1392, 0, 2532, 0, 0, 0, 0, 0, 0, + 1493, 0, 0, 2533, 2534, 0, 0, 0, 0, 2538, + 420, 1393, 0, 2541, 420, 0, 0, 0, 0, 2546, + 0, 0, 2550, 2551, 0, 0, 1394, 1075, 0, 0, + 921, 922, 923, 924, 0, 0, 0, 0, 1076, 0, + 0, 2568, 2569, 0, 2571, 2572, 2573, 2574, 2575, 0, + 420, 2577, 0, 1494, 1077, 2580, 1395, 0, 0, 1495, + 0, 0, 0, 2218, 106, 2219, 0, 2589, 0, 0, + 1103, 0, 2593, 0, 1496, 0, 0, 1109, 0, 107, + 0, 0, 0, 1497, 0, 0, 0, 2601, 0, 0, + 1065, 0, 0, 1396, 0, 0, 0, 0, 0, 0, + 108, 0, 0, 0, 0, 0, 1397, 0, 0, 0, + 1498, 1499, 0, 0, 0, 0, 109, 1398, 0, 2220, + 0, 0, 2612, 0, 0, 0, 0, 2616, 0, 2618, + 0, 1500, 0, 0, 0, 2621, 0, 2461, 0, 0, + 0, 0, 0, 0, 1399, 0, 0, 0, 2628, 0, + 0, 0, 0, 0, 0, 0, 1400, 0, 1401, 1402, + 0, 110, 0, 2673, 0, 0, 2639, 0, 0, 0, + 2643, 0, 0, 0, 0, 1501, 0, 0, 1314, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 660, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 661, 662, 112, 663, 0, 0, - 0, 0, 0, 0, 0, 110, 0, 0, 0, 0, + 2662, 0, 0, 0, 1197, 0, 0, 0, 1403, 0, + 0, 1199, 0, 0, 0, 0, 0, 0, 0, 0, + 1365, 0, 0, 2676, 0, 0, 112, 0, 2681, 0, + 2683, 0, 0, 0, 0, 0, 0, 2687, 0, 0, + 0, 0, 2690, 0, 0, 0, 0, 2693, 0, 0, + 1198, 0, 0, 0, 0, 0, 1215, 1216, 0, 0, + 0, 1220, 1203, 113, 1223, 0, 0, 0, 0, 2704, + 2706, 114, 0, 0, 0, 1232, 0, 115, 116, 0, + 0, 0, 0, 117, 0, 0, 0, 0, 118, 0, + 0, 0, 0, 0, 2716, 0, 0, 2717, 0, 1213, 2719, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1590, 0, 0, 0, 0, 0, 0, 1587, - 0, 0, 0, 282, 0, 0, 0, 664, 0, 0, - 0, 0, 0, 0, 0, 0, 1595, 0, 0, 0, - 0, 0, 1614, 117, 0, 0, 0, 1619, 118, 0, - 112, 0, 0, 0, 0, 0, 0, 1625, 0, 283, - 1620, 0, 0, 0, 0, 2489, 0, 0, 0, 0, - 1626, 0, 0, 0, 0, 2498, 0, 0, 0, 0, - 0, 0, 0, 0, 2500, 0, 0, 0, 0, 1643, - 0, 0, 0, 2509, 0, 0, 0, 0, 0, 1655, - 2511, 0, 0, 0, 1663, 0, 0, 0, 0, 0, - 0, 2515, 118, 0, 0, 0, 0, 2518, 284, 0, - 2520, 0, 0, 2521, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2319, 0, 121, 122, 123, + 0, 2725, 2726, 2727, 2728, 0, 0, 0, 0, 0, + 0, 0, 0, 2737, 0, 0, 2740, 0, 0, 0, + 0, 2712, 0, 2744, 0, 2746, 0, 0, 0, 0, + 2564, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 2582, 119, 0, 2732, 2586, 0, 2735, 0, 0, 0, + 1303, 0, 0, 0, 0, 1370, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2351, 2352, 2353, 2354, 2355, - 0, 2357, 2358, 0, 0, 0, 2362, 2363, 2364, 2365, - 2366, 0, 2368, 2369, 0, 0, 0, 0, 0, 0, - 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 0, - 0, 0, 0, 0, 0, 0, 0, 1818, 0, 2599, - 0, 0, 0, 2601, 0, 0, 0, 0, 0, 0, - 2602, 0, 1475, 0, 0, 0, 2605, 1476, 0, 0, - 2607, 0, 0, 2608, 0, 0, 0, 1840, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1477, 1478, - 0, 1479, 1480, 0, 0, 106, 0, 0, 0, 0, - 0, 0, 1481, 1888, 0, 0, 1874, 0, 0, 1875, - 107, 0, 0, 0, 1482, 1483, 0, 0, 0, 1891, - 1892, 0, 1484, 0, 0, 1485, 0, 1896, 0, 0, - 0, 108, 0, 0, 1897, 0, 1642, 0, 0, 0, - 0, 0, 1486, 0, 0, 0, 0, 109, 0, 1487, - 1488, 107, 0, 1489, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1937, 0, 0, 0, 0, 0, 1943, - 0, 0, 0, 0, 1936, 0, 0, 1939, 1940, 0, - 0, 0, 0, 0, 0, 0, 1947, 0, 0, 0, - 0, 0, 110, 0, 0, 0, 0, 0, 2488, 0, - 0, 2490, 2491, 2492, 2493, 2494, 0, 2496, 2497, 0, - 111, 1490, 0, 0, 0, 0, 0, 0, 0, 2501, - 2502, 2503, 2504, 2505, 0, 2507, 2508, 0, 2510, 0, - 0, 0, 0, 110, 0, 0, 0, 0, 2513, 2514, - 0, 0, 0, 0, 1978, 0, 1980, 112, 0, 2517, - 0, 0, 1985, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1982, 0, 1491, 0, 342, 0, 0, 0, - 1492, 0, 0, 343, 0, 0, 0, 2000, 0, 0, - 1998, 0, 0, 2006, 113, 1493, 0, 0, 112, 0, - 0, 0, 114, 0, 1494, 0, 2007, 0, 115, 116, - 2013, 0, 0, 0, 117, 0, 0, 0, 0, 118, - 0, 2012, 2023, 2014, 0, 0, 0, 0, 2017, 0, - 2030, 1495, 1496, 2022, 0, 0, 2024, 0, 2025, 2026, - 2027, 2029, 0, 0, 2031, 0, 0, 2032, 0, 0, - 2033, 2035, 1497, 2036, 2037, 2038, 2040, 0, 2041, 2042, - 118, 0, 0, 0, 2044, 2045, 2046, 0, 0, 2047, - 2048, 0, 0, 0, 0, 2049, 2050, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2600, 0, 0, 0, - 0, 0, 119, 0, 0, 0, 1498, 2603, 0, 2604, - 0, 0, 0, 2606, 0, 0, 0, 120, 121, 122, + 144, 145, 146, 147, 148, 0, 0, 637, 638, 0, + 149, 0, 0, 0, 150, 151, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 64, 65, 0, 0, + 0, 0, 0, 0, 0, 1449, 0, 0, 0, 0, + 0, 0, 107, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 639, 0, 0, 64, 65, 0, 640, + 0, 0, 282, 0, 0, 0, 641, 0, 642, 0, + 0, 0, 107, 643, 0, 0, 644, 0, 0, 109, + 0, 0, 645, 0, 0, 0, 0, 1509, 0, 0, + 0, 0, 646, 0, 0, 0, 0, 1515, 647, 0, + 0, 0, 0, 0, 0, 0, 0, 648, 0, 109, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 649, 0, 110, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 650, 0, 0, 0, 0, 0, 0, 0, + 0, 1718, 1719, 1720, 110, 0, 0, 651, 1593, 0, + 0, 1722, 1723, 1724, 0, 0, 652, 653, 1735, 1736, + 1737, 0, 0, 1738, 1739, 0, 1741, 1742, 0, 112, + 0, 0, 0, 0, 0, 0, 0, 654, 1617, 2722, + 0, 0, 0, 1622, 0, 0, 0, 0, 1590, 0, + 0, 0, 0, 1628, 0, 0, 1814, 1815, 655, 112, + 1817, 1818, 0, 0, 0, 1598, 283, 0, 0, 0, + 0, 0, 656, 0, 657, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 117, 658, 0, 1623, + 0, 118, 659, 0, 0, 0, 0, 0, 660, 1629, + 0, 0, 284, 0, 0, 661, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 117, 0, 1646, 0, + 0, 118, 0, 662, 0, 0, 0, 0, 1658, 0, + 0, 0, 0, 1666, 0, 0, 663, 664, 0, 665, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 285, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 666, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 0, 0, + 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, + 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, + 141, 142, 143, 144, 145, 146, 147, 148, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, - 143, 144, 145, 146, 147, 148, 0, 0, 0, 0, - 0, 149, 0, 0, 0, 150, 151, 0, 0, 121, - 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, - 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, - 142, 143, 144, 145, 146, 147, 148, 0, 107, 0, - 0, 0, 0, 0, 0, 2156, 0, 2666, 0, 0, - 2667, 0, 0, 2668, 0, 2669, 0, 0, 344, 2157, - 345, 0, 0, 2160, 0, 0, 0, 2169, 0, 0, - 0, 0, 0, 0, 0, 2165, 0, 0, 2168, 0, - 0, 0, 0, 0, 486, 487, 0, 0, 488, 0, + 143, 144, 145, 146, 147, 148, 1821, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2192, 2193, 0, 0, 0, 0, 0, 2187, 0, - 489, 0, 0, 0, 0, 0, 0, 0, 2196, 2197, - 110, 0, 0, 2199, 2200, 0, 0, 121, 122, 123, - 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, - 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, - 144, 145, 146, 147, 148, 0, 0, 0, 0, 0, - 0, 0, 0, 2243, 2235, 0, 2247, 2248, 0, 0, - 0, 0, 0, 0, 2252, 112, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 107, 490, 0, 0, + 0, 0, 0, 514, 0, 0, 0, 0, 0, 1891, + 0, 0, 0, 0, 0, 0, 1843, 0, 107, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1645, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1877, 0, 107, 1878, 0, + 0, 0, 0, 0, 0, 109, 0, 0, 1894, 1895, + 0, 0, 0, 0, 0, 0, 1899, 0, 0, 1940, + 0, 0, 0, 1900, 0, 1946, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 491, 0, 0, 0, 0, 2261, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 109, 492, 2273, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 118, 2274, 2282, - 0, 2283, 0, 0, 0, 0, 0, 0, 0, 2289, - 0, 0, 0, 0, 2293, 0, 0, 0, 0, 0, - 2298, 0, 0, 0, 0, 2302, 0, 0, 110, 2305, - 0, 0, 2308, 592, 107, 2311, 0, 2313, 0, 0, - 0, 0, 2306, 0, 0, 0, 0, 493, 0, 0, + 110, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1939, 0, 0, 1942, 1943, 0, 0, + 0, 0, 0, 0, 0, 1950, 0, 0, 0, 110, + 0, 0, 0, 0, 2061, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2069, 0, 0, + 1981, 0, 1983, 0, 0, 112, 0, 2072, 1988, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 593, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 112, 0, 0, 121, 122, 123, 124, + 0, 0, 0, 2003, 112, 0, 0, 0, 0, 2009, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1985, 0, 0, 0, 0, 2016, 0, 0, 0, + 0, 0, 117, 0, 0, 0, 0, 118, 2026, 2001, + 0, 0, 0, 0, 0, 0, 2033, 0, 0, 2157, + 0, 0, 0, 0, 0, 2010, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 118, 0, 0, 0, + 2015, 0, 2017, 0, 0, 0, 0, 2020, 0, 0, + 0, 0, 2025, 0, 0, 2027, 0, 2028, 2029, 2030, + 2032, 0, 0, 2034, 0, 0, 2035, 0, 0, 2036, + 2038, 0, 2039, 2040, 2041, 2043, 0, 2044, 2045, 0, + 0, 0, 0, 2047, 2048, 2049, 0, 0, 2050, 2051, + 0, 0, 0, 0, 2052, 2053, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 0, 494, 110, 0, 0, 0, + 145, 146, 147, 148, 0, 121, 122, 123, 124, 125, + 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, + 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, + 146, 147, 148, 1167, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 594, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 117, 0, 0, 0, 0, 118, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 2385, 0, - 0, 2388, 0, 0, 0, 0, 0, 0, 0, 2392, - 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2405, 0, 595, 2408, 0, - 0, 0, 0, 2412, 0, 0, 2415, 2416, 0, 0, - 0, 0, 0, 504, 0, 0, 0, 0, 0, 0, + 0, 343, 0, 2172, 0, 0, 0, 0, 344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2450, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 118, 121, 122, 123, 124, 125, 126, + 0, 0, 0, 0, 0, 0, 0, 0, 2160, 0, + 0, 0, 2163, 0, 0, 0, 0, 2195, 2196, 0, + 0, 0, 0, 0, 2168, 0, 0, 2171, 0, 0, + 0, 0, 0, 0, 2199, 2200, 0, 0, 0, 2202, + 2203, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2190, 0, 0, + 0, 0, 0, 2322, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 2246, + 0, 0, 2250, 2251, 0, 0, 0, 0, 0, 0, + 2255, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 2354, 2355, 2356, 2357, 2358, 0, 2360, + 2361, 0, 0, 2238, 2365, 2366, 2367, 2368, 2369, 0, + 2371, 2372, 0, 0, 0, 2264, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2276, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2285, 0, 2286, 0, 0, + 0, 0, 0, 0, 0, 2292, 0, 0, 0, 0, + 2296, 0, 0, 0, 0, 0, 2301, 0, 0, 0, + 0, 2305, 0, 0, 0, 2308, 0, 2277, 2311, 0, + 0, 2314, 0, 2316, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 345, 0, 346, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2309, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, - 147, 148, 0, 0, 0, 0, 0, 0, 0, 0, + 147, 148, 121, 122, 123, 124, 125, 126, 127, 128, + 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, + 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2491, 0, 0, 2493, + 2494, 2495, 2496, 2497, 0, 2499, 2500, 0, 0, 0, + 0, 0, 0, 0, 107, 0, 0, 2504, 2505, 2506, + 2507, 2508, 0, 2510, 2511, 0, 2513, 2388, 0, 0, + 2391, 0, 0, 0, 0, 0, 2516, 2517, 2395, 0, + 0, 0, 0, 0, 0, 0, 0, 2520, 0, 0, + 0, 0, 0, 0, 2408, 0, 0, 2411, 2453, 0, + 487, 488, 2415, 0, 489, 2418, 2419, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 490, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 110, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 2478, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 596, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 121, 122, 123, 124, 125, 126, 127, 128, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 112, 0, 0, 0, 2481, 0, 0, 0, 0, + 0, 0, 0, 491, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2603, 0, 0, 0, 0, 0, + 492, 0, 0, 0, 0, 2606, 0, 2607, 0, 0, + 0, 2609, 0, 0, 0, 0, 0, 594, 107, 0, + 493, 0, 0, 0, 0, 2525, 0, 0, 0, 0, + 0, 2529, 0, 118, 0, 2531, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2537, 0, 0, 0, 0, 0, 595, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 2526, 0, 0, 0, 954, 0, 0, 0, + 0, 955, 0, 494, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 2669, 0, 0, 2670, 0, + 110, 2671, 0, 2672, 0, 2545, 0, 0, 0, 0, + 0, 0, 0, 0, 596, 0, 2556, 0, 0, 0, + 0, 2598, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, - 0, 0, 0, 0, 0, 0, 0, 973, 974, 975, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 2522, - 0, 0, 0, 0, 0, 2526, 0, 0, 0, 2528, - 0, 0, 0, 2523, 0, 976, 977, 0, 0, 978, - 0, 0, 979, 0, 0, 2534, 0, 0, 0, 980, - 0, 0, 0, 981, 0, 0, 0, 0, 0, 0, - 0, 982, 983, 0, 0, 0, 2542, 0, 0, 984, - 985, 0, 0, 0, 0, 0, 0, 2553, 0, 0, - 0, 0, 0, 0, 0, 0, 986, 0, 0, 0, - 0, 0, 987, 0, 0, 0, 988, 989, 0, 0, - 990, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 107, 0, 2595, 991, 1239, 1240, 1241, - 0, 0, 0, 0, 0, 0, 0, 0, 2596, 0, - 0, 0, 0, 0, 0, 0, 992, 0, 0, 0, - 0, 0, 0, 0, 0, 1242, 1243, 0, 0, 1244, - 109, 0, 0, 0, 0, 0, 1245, 0, 993, 1246, - 0, 0, 0, 1247, 0, 107, 0, 0, 0, 0, - 0, 1248, 1249, 0, 2611, 2612, 0, 2614, 0, 1250, - 0, 994, 2616, 2617, 0, 0, 0, 2619, 0, 0, - 2629, 0, 0, 107, 0, 110, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 500, 1251, 1252, 0, 995, - 1253, 996, 0, 0, 0, 0, 0, 997, 998, 0, - 2641, 0, 0, 0, 0, 0, 1254, 0, 0, 0, - 1299, 999, 1000, 107, 0, 0, 0, 0, 0, 0, - 0, 1001, 1002, 2661, 0, 0, 1255, 110, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1003, 1256, 1004, - 0, 0, 0, 0, 0, 110, 0, 1257, 2692, 0, - 0, 1005, 0, 1006, 0, 0, 0, 0, 0, 1007, - 0, 0, 0, 0, 0, 0, 0, 0, 2705, 0, - 0, 0, 112, 0, 0, 0, 0, 117, 0, 0, - 0, 0, 118, 0, 0, 110, 0, 0, 0, 1258, - 0, 1259, 0, 1008, 2708, 0, 0, 1260, 1261, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 2717, 1262, 0, 0, 2730, 0, 0, 0, 0, - 0, 0, 1263, 0, 0, 0, 2728, 0, 0, 2731, - 0, 0, 0, 0, 118, 2744, 0, 0, 2745, 0, - 112, 0, 0, 0, 0, 0, 0, 1264, 0, 1265, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1266, - 0, 0, 118, 0, 0, 0, 0, 0, 0, 1267, - 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 0, - 501, 0, 118, 1268, 0, 0, 0, 0, 0, 0, + 0, 495, 0, 0, 0, 112, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2599, 0, 0, + 0, 597, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 2632, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 0, + 0, 0, 0, 2614, 2615, 0, 2617, 118, 0, 0, + 0, 2619, 2620, 0, 0, 0, 2622, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 0, 0, 0, 0, 2644, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, - 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, - 140, 141, 142, 143, 144, 145, 146, 147, 148, 1, - 0, 0, 2, 0, 3, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, - 0, 0, 5, 6, 0, 7, 8, 9, 0, 0, - 0, 0, 0, 175, 0, 10, 176, 0, 177, 0, - 0, 0, 11, 0, 12, 13, 0, 0, 0, 0, - 0, 0, 0, 14, 15, 0, 0, 178, 0, 179, - 180, 181, 0, 0, 0, 0, 0, 0, 0, 182, - 0, 183, 0, 0, 0, 0, 184, 0, 185, 186, - 187, 0, 0, 16, 0, 188, 0, 189, 0, 0, - 0, 0, 0, 0, 0, 17, 0, 0, 0, 18, - 0, 0, 19, 0, 0, 0, 20, 21, 0, 0, - 0, 0, 0, 22, 0, 0, 190, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 24, 191, 0, 25, 26, 27, 0, 0, - 28, 29, 0, 192, 193, 0, 0, 194, 0, 0, - 0, 195, 951, 196, 30, 0, 0, 952, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, - 32, 33, 0, 0, 197, 198, 0, 0, 199, 0, - 0, 0, 0, 34, 0, 35, 0, 0, 200, 0, - 1336, 0, 36, 0, 0, 37, 0, 0, 38, 0, - 39, 0, 40, 201, 202, 0, 0, 41, 0, 0, - 0, 203, 0, 0, 0, 0, 0, 0, 0, 0, - 42, 0, 0, 0, 0, 0, 43, 0, 0, 0, - 0, 0, 0, 0, 204, 0, 205, 0, 0, 0, - 0, 44, 45, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 46, 0, 47, 0, 0, 0, 0, - 206, 48, 0, 0, 49, 50, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 207, 208, 0, 0, 0, - 0, 0, 0, 0, 209, 0, 0, 0, 0, 0, - 0, 210, 0, 0, 0, 51, 0, 211, 0, 212, - 0, 52, 0, 121, 122, 123, 124, 125, 126, 127, - 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, - 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, - 148, 0, 0, 0, 0, 213, 121, 122, 123, 124, + 0, 0, 2664, 598, 2695, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 2708, 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, - 145, 146, 147, 148, 1337, 121, 122, 123, 124, 125, + 145, 146, 147, 148, 0, 0, 0, 976, 977, 978, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 2733, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 2711, 0, 979, 980, 0, 0, 981, + 0, 2747, 982, 0, 2748, 0, 0, 0, 0, 983, + 2720, 0, 0, 984, 0, 0, 0, 0, 0, 0, + 0, 985, 986, 0, 0, 2731, 0, 0, 2734, 987, + 988, 107, 0, 0, 0, 1242, 1243, 1244, 0, 0, + 0, 0, 0, 0, 0, 0, 989, 0, 0, 0, + 0, 0, 990, 0, 0, 0, 991, 992, 0, 0, + 993, 0, 0, 1245, 1246, 0, 0, 1247, 109, 107, + 0, 0, 0, 0, 1248, 0, 994, 1249, 0, 0, + 0, 1250, 0, 0, 0, 0, 0, 0, 0, 1251, + 1252, 0, 0, 0, 0, 0, 995, 1253, 0, 0, + 0, 0, 0, 0, 0, 0, 109, 0, 0, 0, + 0, 0, 0, 110, 0, 0, 0, 0, 996, 0, + 0, 0, 0, 0, 1254, 1255, 0, 0, 1256, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 997, 0, 0, 1257, 0, 0, 0, 0, 107, + 0, 110, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1258, 0, 0, 0, 112, 998, + 0, 999, 0, 0, 0, 0, 0, 1000, 1001, 0, + 0, 0, 0, 0, 0, 0, 1259, 0, 0, 501, + 0, 1002, 1003, 0, 0, 1260, 0, 0, 0, 0, + 0, 1004, 1005, 0, 0, 0, 112, 0, 0, 0, + 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 117, 0, 1006, 0, 1007, + 118, 110, 0, 0, 0, 0, 0, 1261, 0, 1262, + 0, 1008, 0, 1009, 0, 1263, 1264, 1302, 0, 1010, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1265, 0, 0, 117, 0, 0, 0, 107, 118, 0, + 1266, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1011, 0, 0, 112, 0, 505, 0, + 0, 0, 110, 0, 0, 1267, 0, 1268, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1269, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1270, 0, 121, + 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, + 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 142, 143, 144, 145, 146, 147, 148, 112, 118, 110, + 0, 1271, 0, 0, 0, 0, 0, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 112, 0, 0, 0, 0, 118, + 0, 0, 0, 0, 502, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 121, 122, 123, + 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, + 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, + 144, 145, 146, 147, 148, 0, 118, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 121, 122, + 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, + 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, + 143, 144, 145, 146, 147, 148, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, - 146, 147, 148 + 146, 147, 148, 1, 0, 0, 2, 0, 3, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 4, 0, 0, 0, 0, 5, 6, 0, 7, + 8, 9, 0, 0, 0, 0, 0, 175, 0, 10, + 176, 0, 177, 0, 0, 0, 11, 0, 12, 13, + 0, 0, 0, 0, 0, 0, 0, 14, 15, 0, + 0, 178, 0, 179, 180, 181, 0, 0, 0, 0, + 0, 0, 0, 182, 0, 183, 0, 0, 0, 0, + 184, 0, 185, 186, 187, 0, 0, 16, 0, 188, + 0, 189, 0, 0, 0, 0, 0, 0, 0, 17, + 0, 0, 0, 18, 0, 0, 19, 0, 0, 0, + 20, 21, 0, 0, 0, 0, 0, 22, 0, 0, + 190, 0, 0, 23, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 24, 191, 0, 25, + 26, 27, 0, 0, 28, 29, 0, 192, 193, 0, + 0, 194, 0, 0, 0, 195, 0, 196, 30, 0, + 1339, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 31, 32, 33, 0, 0, 197, 198, + 0, 0, 199, 0, 0, 0, 0, 34, 0, 35, + 0, 0, 200, 0, 0, 0, 36, 0, 0, 37, + 0, 0, 38, 0, 39, 0, 40, 201, 202, 0, + 0, 41, 0, 0, 0, 203, 0, 0, 0, 0, + 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, + 43, 0, 0, 0, 0, 0, 0, 0, 204, 0, + 205, 0, 0, 0, 0, 44, 45, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 46, 0, 47, + 0, 0, 0, 0, 206, 48, 0, 0, 49, 50, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 207, + 208, 0, 0, 0, 0, 0, 0, 0, 209, 0, + 0, 0, 0, 0, 0, 210, 0, 0, 0, 51, + 0, 211, 0, 212, 0, 52, 121, 122, 123, 124, + 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, + 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, + 145, 146, 147, 148, 1340, 0, 0, 0, 0, 213 }; static const yytype_int16 yycheck[] = { - 3, 50, 1422, 655, 477, 5, 5, 1622, 11, 1624, - 4, 3, 4, 0, 4, 4, 5, 650, 651, 32, - 5, 4, 3, 4, 3, 4, 5, 5, 5, 32, - 5, 17, 4, 5, 5, 61, 4, 40, 34, 46, - 4, 3, 4, 27, 3, 4, 49, 16, 21, 52, - 433, 56, 55, 3, 4, 202, 59, 3, 4, 62, - 443, 97, 130, 66, 67, 32, 32, 70, 17, 121, - 73, 74, 3, 4, 77, 1121, 17, 1123, 81, 14, - 15, 3, 4, 86, 974, 37, 36, 6, 27, 121, - 36, 280, 121, 164, 66, 103, 99, 100, 101, 102, - 103, 104, 66, 1149, 1150, 1151, 6, 3, 4, 48, - 66, 107, 51, 855, 856, 857, 88, 120, 945, 4, - 144, 948, 99, 62, 3, 4, 61, 138, 105, 20, - 119, 33, 3, 4, 32, 3, 4, 21, 965, 21, - 3, 4, 117, 17, 3, 4, 85, 119, 3, 4, - 61, 64, 155, 66, 222, 119, 5, 36, 3, 4, - 66, 40, 17, 102, 175, 5, 2647, 139, 210, 88, - 16, 165, 3, 4, 916, 178, 3, 4, 186, 5, - 183, 66, 132, 3, 4, 21, 132, 4, 240, 228, - 261, 31, 339, 5, 186, 3, 4, 344, 4, 346, - 4, 120, 14, 15, 236, 186, 202, 236, 213, 40, - 278, 192, 201, 2694, 59, 113, 191, 158, 207, 208, - 120, 257, 138, 209, 98, 181, 195, 186, 59, 201, - 14, 193, 111, 57, 119, 207, 208, 201, 222, 21, - 243, 893, 291, 207, 208, 197, 224, 66, 229, 61, - 134, 78, 278, 132, 189, 190, 259, 260, 300, 175, - 209, 268, 66, 236, 277, 88, 266, 242, 181, 21, - 273, 21, 253, 244, 242, 301, 4, 61, 281, 282, - 111, 284, 285, 205, 287, 183, 4, 185, 14, 187, - 188, 266, 282, 280, 297, 21, 281, 195, 681, 282, - 26, 300, 291, 289, 307, 308, 298, 33, 297, 131, - 277, 277, 210, 307, 193, 119, 201, 298, 307, 291, - 297, 300, 207, 208, 259, 297, 288, 291, 331, 332, - 333, 287, 335, 196, 269, 270, 339, 340, 288, 298, - 289, 232, 288, 63, 171, 71, 998, 350, 351, 341, - 342, 340, 236, 356, 236, 344, 345, 288, 361, 362, - 341, 342, 193, 222, 1016, 300, 369, 278, 340, 372, - 27, 343, 344, 345, 287, 192, 340, 189, 190, 263, - 344, 345, 341, 342, 104, 27, 284, 390, 391, 27, - 301, 119, 288, 242, 397, 398, 399, 201, 401, 223, - 236, 119, 222, 207, 208, 189, 291, 346, 12, 288, - 4, 258, 415, 237, 222, 1048, 419, 288, 265, 246, - 288, 424, 425, 426, 427, 428, 429, 40, 431, 246, - 433, 434, 435, 816, 160, 161, 162, 163, 164, 165, - 443, 444, 168, 169, 170, 171, 1079, 259, 133, 53, - 3, 4, 40, 284, 236, 340, 4, 269, 270, 344, - 345, 50, 274, 13, 3, 4, 288, 71, 87, 78, - 1212, 3, 4, 201, 298, 259, 859, 87, 1220, 207, - 208, 4, 4, 201, 236, 269, 236, 291, 300, 207, - 208, 3, 4, 1383, 497, 498, 100, 61, 111, 168, - 27, 63, 61, 4, 5, 1551, 228, 176, 56, 166, - 99, 0, 515, 233, 118, 121, 300, 56, 122, 108, - 1410, 105, 156, 111, 166, 574, 1353, 247, 248, 1356, - 134, 257, 258, 56, 432, 5, 340, 156, 4, 542, - 344, 345, 104, 1433, 14, 15, 156, 136, 5, 183, - 14, 15, 4, 2007, 282, 61, 120, 283, 243, 60, - 45, 120, 171, 291, 30, 66, 615, 30, 571, 167, - 2024, 2025, 2026, 291, 59, 2029, 149, 2031, 2032, 236, - 193, 2035, 2036, 2037, 222, 634, 2040, 2041, 40, 5, - 2044, 61, 2046, 2047, 236, 2049, 81, 61, 192, 56, - 326, 327, 328, 606, 265, 193, 138, 61, 65, 1261, - 194, 123, 340, 114, 120, 100, 344, 345, 338, 339, - 1272, 278, 340, 521, 222, 4, 344, 345, 129, 632, - 236, 94, 117, 61, 27, 120, 278, 246, 188, 61, - 167, 4, 143, 175, 31, 40, 649, 260, 149, 652, - 14, 15, 205, 154, 37, 553, 61, 2272, 5, 111, - 244, 146, 147, 121, 47, 213, 120, 670, 671, 672, - 673, 233, 260, 676, 213, 678, 5, 680, 681, 682, - 66, 61, 255, 242, 288, 247, 248, 40, 286, 93, - 213, 74, 120, 255, 160, 222, 63, 61, 120, 162, - 54, 290, 156, 2157, 205, 269, 2160, 111, 757, 5, - 269, 2165, 44, 198, 2168, 120, 111, 1100, 83, 189, - 190, 206, 5, 224, 30, 189, 190, 0, 229, 5, - 231, 4, 193, 2187, 99, 5, 90, 104, 14, 15, - 120, 193, 61, 129, 210, 124, 749, 750, 61, 752, - 753, 754, 755, 254, 255, 87, 213, 124, 111, 83, - 121, 262, 192, 269, 767, 768, 149, 22, 154, 61, - 236, 774, 775, 4, 167, 99, 338, 339, 236, 280, - 265, 266, 186, 246, 5, 61, 140, 61, 251, 259, - 242, 794, 795, 796, 49, 259, 17, 52, 193, 269, - 270, 120, 185, 61, 274, 269, 270, 120, 811, 812, - 813, 4, 815, 816, 817, 269, 819, 3, 4, 12, - 2274, 66, 5, 253, 203, 189, 190, 82, 120, 222, - 300, 14, 15, 19, 1217, 336, 300, 840, 22, 842, - 193, 269, 70, 117, 121, 231, 120, 269, 117, 852, - 174, 336, 2306, 192, 160, 110, 859, 860, 113, 191, - 280, 864, 120, 105, 269, 49, 233, 250, 52, 118, - 56, 55, 3, 4, 600, 236, 879, 880, 61, 168, - 247, 248, 156, 1625, 887, 888, 889, 33, 242, 269, - 5, 215, 895, 89, 280, 259, 16, 900, 82, 26, - 1727, 66, 951, 2547, 210, 269, 270, 246, 911, 40, - 1956, 1957, 1958, 189, 190, 101, 258, 191, 301, 229, - 1747, 2565, 149, 265, 927, 249, 110, 279, 654, 113, - 236, 2385, 89, 659, 5, 1762, 300, 1827, 1765, 72, - 168, 31, 840, 14, 15, 88, 1773, 3, 4, 1776, - 269, 2405, 194, 1843, 3, 4, 269, 1784, 2412, 236, - 1787, 2415, 2416, 3, 4, 239, 130, 1794, 242, 224, - 156, 338, 339, 116, 24, 25, 5, 269, 3, 4, - 111, 4, 1872, 259, 4, 112, 3, 4, 215, 5, - 61, 994, 266, 269, 270, 269, 5, 124, 274, 254, - 40, 4, 244, 167, 97, 279, 189, 190, 5, 2429, - 5, 269, 1015, 241, 14, 15, 3, 4, 3, 4, - 5, 1024, 250, 5, 300, 12, 4, 213, 255, 3, - 4, 158, 218, 5, 59, 1038, 4, 1040, 12, 2683, - 224, 184, 1045, 1046, 1047, 2689, 4, 97, 4, 5, - 3, 4, 1055, 4, 5, 1058, 199, 1060, 222, 3, - 4, 61, 193, 4, 14, 15, 293, 123, 4, 2523, - 254, 111, 798, 1076, 123, 1078, 259, 204, 5, 1082, - 1083, 82, 4, 3, 4, 1975, 269, 270, 2542, 26, - 217, 274, 120, 1096, 1097, 5, 280, 1100, 1101, 1102, - 28, 4, 2746, 266, 2748, 1108, 59, 1110, 4, 5, - 1113, 61, 1115, 256, 278, 1164, 4, 300, 189, 190, - 40, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, 1152, - 151, 4, 5, 1156, 297, 1158, 4, 2611, 2612, 1162, - 2614, 4, 2616, 2617, 307, 2619, 4, 19, 5, 82, - 3, 4, 5, 37, 1177, 112, 1179, 4, 1181, 1182, - 1183, 1184, 196, 47, 4, 1188, 1189, 124, 259, 189, - 190, 111, 44, 1196, 4, 1937, 3, 4, 269, 270, - 1203, 4, 5, 274, 1207, 1208, 1209, 28, 421, 422, - 74, 4, 42, 43, 1217, 1218, 2670, 4, 1221, 220, - 221, 5, 150, 5, 9, 77, 5, 265, 1231, 300, - 1233, 11, 84, 1236, 235, 35, 168, 4, 151, 189, - 190, 4, 94, 95, 172, 176, 3, 4, 176, 101, - 168, 2427, 9, 10, 11, 195, 186, 2084, 5, 259, - 195, 5, 192, 2717, 2006, 4, 2093, 204, 187, 269, - 270, 195, 124, 187, 275, 2102, 1279, 2453, 1281, 1177, - 217, 1284, 1285, 66, 1287, 149, 1289, 5, 2030, 141, - 66, 66, 1295, 222, 1297, 1021, 5, 223, 226, 229, - 300, 1304, 4, 155, 156, 4, 106, 220, 221, 259, - 162, 4, 195, 2421, 87, 5, 2424, 2207, 2426, 269, - 270, 185, 235, 253, 5, 87, 1224, 127, 128, 150, - 182, 2439, 2440, 2223, 4, 135, 264, 4, 2228, 169, - 170, 5, 1240, 5, 272, 273, 4, 99, 2456, 1075, - 300, 172, 5, 153, 17, 176, 3, 4, 5, 1085, - 7, 8, 275, 163, 4, 229, 218, 197, 298, 2545, - 2546, 5, 17, 2549, 17, 2551, 1379, 4, 1381, 1382, - 3, 4, 5, 4, 7, 8, 250, 2563, 2564, 14, - 15, 4, 2568, 2569, 3, 4, 2572, 4, 7, 8, - 1403, 2577, 2578, 97, 1407, 226, 3, 4, 5, 5, - 7, 8, 342, 3, 4, 5, 268, 5, 87, 4, - 4, 285, 5, 5, 5, 5, 278, 87, 1431, 1432, - 5, 4, 4, 12, 12, 5, 61, 301, 1441, 5, - 5, 4, 1445, 264, 4, 2621, 5, 4, 2624, 1452, - 4, 272, 273, 2629, 4, 307, 4, 4, 165, 2635, - 5, 5, 5, 1466, 2640, 4, 1192, 1193, 1471, 156, - 156, 4, 1475, 5, 1477, 1478, 4, 1480, 1481, 1482, - 1378, 1484, 254, 254, 1487, 1488, 1489, 1490, 1491, 1492, - 1493, 1494, 1495, 1496, 1497, 66, 282, 1500, 1501, 1502, - 1503, 2243, 5, 4, 236, 1888, 5, 1510, 1511, 80, - 2252, 1514, 1515, 1516, 14, 15, 1519, 1520, 89, 5, - 5, 5, 4, 4, 267, 5, 5, 267, 99, 1532, - 1533, 5, 1535, 1536, 5, 2425, 2712, 5, 4, 2715, - 4, 4, 40, 5, 5, 5, 5, 5, 2438, 5, - 4, 4, 44, 2443, 46, 5, 5, 5, 129, 2735, - 1943, 61, 5, 2305, 189, 190, 2308, 105, 66, 2311, - 236, 2313, 5, 2749, 138, 105, 2752, 2753, 149, 236, - 1583, 1584, 1585, 40, 76, 1588, 105, 5, 40, 209, - 1593, 1594, 84, 1596, 1597, 1598, 240, 1600, 1601, 209, - 1603, 99, 1985, 1606, 1607, 5, 4, 105, 5, 5, - 209, 209, 1615, 111, 4, 4, 111, 5, 5, 5, - 1623, 5, 53, 194, 4, 1628, 1629, 4, 111, 5, - 5, 129, 5, 1636, 259, 4, 6, 5, 5, 4, - 71, 5, 1645, 4, 269, 270, 5, 5, 1374, 5, - 142, 149, 4, 38, 1380, 5, 5, 88, 944, 12, - 231, 12, 4, 138, 5, 4, 164, 4, 4, 100, - 4, 4, 38, 5, 0, 300, 1402, 5, 1681, 1405, - 236, 236, 121, 1409, 255, 236, 4, 118, 205, 189, - 190, 122, 244, 195, 167, 1593, 194, 4, 4, 191, - 1703, 1704, 4, 134, 1430, 1708, 4, 4, 222, 5, - 1436, 1714, 5, 5, 267, 207, 208, 5, 1444, 5, - 5, 1447, 214, 294, 216, 296, 4, 4, 4, 91, - 1456, 1457, 5, 231, 4, 4, 304, 99, 5, 5, - 5, 1467, 173, 105, 4, 236, 244, 236, 236, 4, - 242, 4, 4, 4, 4, 304, 4, 255, 304, 259, - 4, 4, 304, 1661, 126, 5, 5, 222, 5, 269, - 270, 6, 5, 1671, 5, 222, 222, 222, 1676, 5, - 4, 6, 5, 5, 282, 4, 4, 149, 4, 4, - 2680, 5, 5, 4, 4, 157, 294, 5, 296, 297, - 300, 5, 5, 5, 4, 12, 5, 4, 4, 2192, - 2193, 4, 2195, 2196, 4, 307, 2199, 2200, 1821, 5, - 1823, 5, 1825, 5, 5, 4, 267, 5, 4, 267, - 5, 5, 194, 5, 4, 4, 347, 5, 336, 4, - 202, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1851, 1852, - 5, 5, 5, 4, 4, 267, 5, 5, 5, 5, - 4, 32, 4, 300, 5, 1868, 5, 1870, 5, 5, - 4, 4, 280, 5, 5, 5, 5, 4, 2261, 4, - 347, 5, 244, 5, 1887, 1888, 5, 5, 4, 4, - 1893, 5, 4, 255, 4, 4, 4, 420, 5, 1902, - 1903, 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 271, - 5, 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, - 1923, 1924, 1925, 5, 1927, 5, 1929, 1930, 1931, 2581, - 5, 4, 4, 347, 5, 4, 4, 347, 5, 5, - 1943, 1944, 113, 4, 4, 4, 4, 4, 347, 5, - 5, 4, 4, 347, 5, 5, 5, 5, 5, 4, - 6, 5, 4, 4, 347, 5, 5, 5, 4, 4, - 932, 5, 5, 1976, 4, 4, 1979, 5, 1981, 5, - 1983, 4, 1985, 1986, 5, 1988, 5, 5, 5, 19, - 4, 4, 1995, 1996, 5, 4, 4, 2649, 4, 2002, - 4, 2004, 964, 4, 4, 2008, 4, 4, 2011, 4, - 4, 182, 4, 184, 185, 4, 187, 188, 4, 4, - 347, 4, 4, 4, 280, 5, 56, 2410, 5, 4, - 4, 2414, 5, 4, 4, 1321, 5, 5, 5, 4, - 4, 4, 4, 4, 215, 4, 4, 1333, 4, 4, - 2705, 5, 4, 4, 2057, 5, 5, 5, 5, 5, - 4, 4, 233, 234, 5, 1351, 1352, 2450, 5, 5, - 4, 101, 307, 308, 309, 310, 311, 312, 313, 314, - 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, - 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - 4, 6, 5, 286, 4, 4, 2155, 4, 4, 347, - 5, 1837, 5, 284, 4, 4, 4, 2015, 4, 376, - 5, 4, 2590, 5, 5, 4, 156, 4, 4, 2486, - 5, 5, 5, 304, 4, 2218, 5, 5, 5, 4, - 4, 2579, 5, 5, 5, 2649, 2645, 1873, -1, 716, - -1, -1, -1, -1, -1, -1, 2054, -1, 2161, -1, - -1, -1, -1, 346, -1, -1, -1, -1, -1, 2172, - 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180, 2181, 2182, - -1, -1, -1, 213, -1, 2188, 2659, 2660, 218, 2192, - 2193, -1, 2195, 2196, -1, -1, 2199, 2200, 2201, 2202, - 2203, 2204, 2205, 2206, -1, 2208, 2209, 2210, -1, -1, + 3, 50, 478, 1425, 652, 653, 657, 948, 11, 1625, + 951, 1627, 4, 32, 5, 4, 5, 5, 5, 3, + 4, 4, 3, 4, 3, 4, 27, 968, 37, 32, + 3, 4, 5, 0, 27, 5, 5, 40, 47, 3, + 4, 3, 4, 20, 4, 17, 49, 61, 4, 52, + 4, 434, 55, 27, 5, 48, 59, 121, 51, 62, + 97, 444, 4, 66, 67, 74, 121, 70, 149, 62, + 73, 74, 105, 977, 77, 32, 13, 1124, 81, 1126, + 3, 4, 30, 86, 3, 4, 130, 14, 15, 27, + 3, 4, 85, 121, 3, 4, 99, 100, 101, 102, + 103, 104, 46, 164, 130, 1152, 1153, 1154, 167, 102, + 105, 5, 99, 36, 121, 45, 156, 120, 105, 14, + 2010, 3, 4, 167, 858, 859, 860, 36, 5, 59, + 119, 3, 4, 40, 61, 3, 4, 2027, 2028, 2029, + 149, 32, 2032, 183, 2034, 2035, 94, 117, 2038, 2039, + 2040, 81, 155, 2043, 2044, 6, 113, 2047, 54, 2049, + 2050, 194, 2052, 222, 36, 166, 61, 66, 40, 280, + 100, 33, 236, 165, 255, 178, 185, 21, 222, 37, + 183, 236, 124, 32, 131, 919, 5, 117, 3, 4, + 120, 144, 17, 167, 90, 21, 222, 4, 17, 194, + 261, 228, 186, 27, 111, 4, 16, 186, 236, 132, + 16, 244, 201, 192, 162, 947, 146, 147, 207, 208, + 257, 191, 186, 132, 57, 21, 183, 286, 185, 167, + 187, 188, 61, 240, 278, 236, 192, 209, 195, 111, + 243, 250, 4, 292, 140, 896, 5, 21, 222, 244, + 229, 188, 278, 210, 56, 232, 259, 260, 277, 66, + 132, 203, 189, 190, 278, 21, 4, 66, 198, 120, + 2160, 274, 242, 2163, 253, 244, 206, 278, 2168, 282, + 283, 2171, 285, 286, 222, 288, 193, 301, 242, 21, + 246, 242, 301, 281, 189, 298, 266, 4, 246, 282, + 2190, 684, 291, 251, 14, 308, 309, 288, 297, 300, + 297, 21, 119, 280, 298, 307, 26, 289, 307, 298, + 119, 193, 282, 33, 268, 193, 288, 300, 285, 332, + 333, 334, 259, 336, 298, 265, 266, 340, 341, 197, + 222, 288, 269, 270, 14, 15, 242, 224, 351, 352, + 1001, 340, 4, 346, 357, 344, 345, 341, 342, 362, + 363, 71, 341, 342, 259, 288, 63, 370, 1019, 288, + 373, 27, 266, 300, 269, 288, 66, 341, 342, 288, + 12, 119, 4, 5, 209, 195, 277, 2277, 391, 392, + 223, 61, 236, 21, 201, 398, 399, 400, 222, 402, + 207, 208, 201, 1051, 237, 300, 336, 104, 207, 208, + 236, 213, 119, 416, 66, 1356, 288, 420, 1359, 2309, + 288, 53, 425, 426, 427, 428, 429, 430, 277, 432, + 192, 434, 435, 436, 1082, 64, 819, 66, 103, 71, + 236, 444, 445, 27, 66, 3, 4, 3, 4, 278, + 160, 161, 162, 163, 164, 165, 3, 4, 168, 169, + 170, 171, 236, 201, 289, 298, 88, 119, 100, 207, + 208, 17, 301, 4, 4, 61, 433, 50, 4, 862, + 236, 1215, 1386, 63, 291, 66, 118, 3, 4, 1223, + 122, 181, 291, 40, 201, 498, 499, 119, 2388, 30, + 207, 208, 134, 149, 236, 121, 134, 1554, 4, 1413, + 40, 87, 59, 516, 2650, 4, 5, 139, 2408, 189, + 190, 186, 78, 138, 104, 2415, 99, 576, 2418, 2419, + 56, 88, 1436, 340, 120, 108, 233, 344, 345, 192, + 543, 340, 4, 40, 282, 344, 345, 257, 258, 201, + 247, 248, 181, 291, 30, 207, 208, 40, 255, 4, + 175, 2697, 61, 136, 111, 522, 222, 12, 617, 215, + 573, 60, 210, 61, 284, 3, 4, 66, 4, 201, + 156, 111, 166, 192, 291, 207, 208, 636, 278, 259, + 3, 4, 1324, 246, 56, 3, 4, 287, 555, 269, + 270, 5, 340, 40, 1336, 608, 344, 345, 236, 255, + 14, 15, 158, 1264, 111, 171, 17, 327, 328, 329, + 236, 120, 1354, 1355, 1275, 114, 3, 4, 111, 160, + 300, 634, 120, 340, 228, 263, 2526, 344, 345, 291, + 129, 338, 339, 56, 253, 5, 193, 293, 651, 278, + 61, 654, 236, 233, 143, 2545, 288, 61, 287, 2275, + 149, 44, 300, 193, 222, 154, 0, 247, 248, 291, + 673, 674, 675, 676, 111, 297, 679, 61, 681, 210, + 683, 684, 685, 269, 160, 5, 78, 213, 340, 5, + 246, 5, 344, 345, 278, 123, 193, 98, 14, 15, + 14, 15, 61, 34, 87, 236, 222, 3, 4, 120, + 193, 760, 242, 3, 4, 133, 205, 290, 340, 4, + 1103, 343, 344, 345, 2614, 2615, 121, 2617, 83, 2619, + 2620, 61, 2622, 5, 210, 224, 120, 284, 5, 61, + 229, 138, 231, 242, 99, 61, 121, 61, 265, 752, + 753, 213, 755, 756, 757, 758, 193, 31, 338, 339, + 236, 120, 61, 260, 31, 254, 255, 770, 771, 66, + 269, 5, 156, 262, 777, 778, 107, 260, 175, 171, + 61, 269, 88, 2673, 56, 189, 190, 5, 196, 1730, + 120, 280, 258, 65, 797, 798, 799, 5, 120, 265, + 213, 3, 4, 61, 61, 5, 14, 15, 191, 1750, + 116, 814, 815, 816, 87, 818, 819, 820, 4, 822, + 5, 120, 70, 193, 1765, 243, 19, 1768, 205, 117, + 2720, 26, 129, 123, 5, 1776, 63, 1220, 1779, 120, + 843, 236, 845, 14, 15, 66, 1787, 336, 202, 1790, + 6, 44, 855, 61, 246, 259, 1797, 154, 269, 862, + 863, 236, 120, 120, 867, 269, 270, 3, 4, 118, + 274, 202, 33, 189, 190, 189, 190, 104, 184, 882, + 883, 14, 15, 156, 77, 269, 843, 890, 891, 892, + 61, 84, 602, 199, 1628, 898, 300, 124, 3, 4, + 903, 94, 95, 168, 40, 954, 93, 83, 101, 205, + 269, 914, 1959, 1960, 1961, 4, 5, 112, 14, 15, + 168, 123, 168, 99, 111, 5, 1830, 930, 61, 124, + 176, 124, 88, 258, 231, 280, 3, 4, 89, 269, + 265, 213, 1846, 259, 16, 259, 656, 269, 141, 66, + 256, 661, 19, 269, 270, 269, 270, 0, 274, 229, + 274, 4, 155, 156, 120, 61, 279, 82, 89, 162, + 269, 1875, 3, 4, 72, 111, 3, 4, 31, 24, + 25, 189, 190, 280, 300, 339, 300, 5, 269, 182, + 344, 297, 346, 241, 997, 3, 4, 4, 174, 186, + 4, 307, 250, 2430, 12, 5, 233, 5, 1740, 204, + 2432, 269, 269, 40, 4, 1018, 1748, 1749, 189, 190, + 247, 248, 217, 2550, 1027, 218, 3, 4, 59, 2456, + 5, 1763, 1764, 138, 101, 12, 151, 5, 1041, 215, + 1043, 2568, 1774, 1775, 5, 1048, 1049, 1050, 4, 3, + 4, 259, 97, 1785, 1786, 1058, 189, 190, 1061, 5, + 1063, 269, 270, 1795, 1796, 4, 274, 3, 4, 1801, + 175, 28, 4, 249, 1978, 268, 1079, 4, 1081, 1811, + 3, 4, 1085, 1086, 111, 278, 40, 4, 259, 156, + 5, 801, 300, 189, 190, 4, 1099, 1100, 269, 270, + 1103, 1104, 1105, 274, 97, 220, 221, 120, 1111, 5, + 1113, 338, 339, 1116, 307, 1118, 3, 4, 1167, 4, + 235, 2548, 2549, 59, 266, 2552, 259, 2554, 4, 300, + 3, 4, 5, 3, 4, 4, 269, 270, 4, 2566, + 2567, 22, 4, 5, 2571, 2572, 2087, 17, 2575, 4, + 5, 218, 1155, 2580, 2581, 2096, 1159, 111, 1161, 2686, + 275, 4, 1165, 259, 2105, 2692, 193, 300, 49, 5, + 186, 52, 59, 269, 270, 4, 192, 1180, 4, 1182, + 4, 1184, 1185, 1186, 1187, 3, 4, 5, 1191, 1192, + 42, 43, 4, 150, 3, 4, 1199, 2624, 28, 82, + 2627, 82, 196, 1206, 300, 2632, 1940, 1210, 1211, 1212, + 4, 2638, 5, 229, 5, 172, 2643, 1220, 1221, 176, + 9, 1224, 2749, 1180, 2751, 3, 4, 5, 11, 110, + 5, 1234, 113, 1236, 3, 4, 1239, 253, 7, 8, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, 151, 226, + 1227, 168, 14, 15, 265, 2009, 4, 5, 4, 1282, + 4, 1284, 298, 176, 1287, 1288, 1243, 1290, 2715, 1292, + 168, 2718, 195, 14, 15, 1298, 195, 1300, 5, 2033, + 4, 5, 3, 4, 1307, 5, 2210, 264, 9, 10, + 11, 2738, 35, 195, 1024, 272, 273, 169, 170, 61, + 150, 4, 2226, 422, 423, 2752, 342, 2231, 2755, 2756, + 187, 187, 66, 66, 66, 26, 66, 220, 221, 2071, + 61, 5, 172, 224, 223, 197, 176, 222, 80, 2081, + 5, 4, 235, 2085, 2086, 4, 2424, 89, 4, 2427, + 195, 2429, 2094, 2095, 5, 87, 5, 99, 1078, 14, + 15, 2103, 2104, 254, 2442, 2443, 87, 2109, 1088, 1382, + 4, 1384, 1385, 106, 4, 99, 5, 2119, 2120, 5, + 4, 2459, 275, 5, 17, 4, 226, 129, 2130, 2131, + 5, 4, 17, 1406, 127, 128, 44, 1410, 46, 2141, + 17, 4, 135, 4, 4, 97, 61, 149, 2150, 5, + 2152, 112, 5, 4, 1381, 87, 5, 37, 5, 87, + 153, 1434, 1435, 124, 264, 5, 4, 47, 76, 5, + 163, 1444, 272, 273, 5, 1448, 84, 189, 190, 3, + 4, 5, 1455, 7, 8, 3, 4, 5, 4, 7, + 8, 4, 194, 5, 74, 5, 1469, 158, 189, 190, + 5, 1474, 4, 4, 12, 1478, 5, 1480, 1481, 12, + 1483, 1484, 1485, 4, 1487, 1195, 1196, 1490, 1491, 1492, + 1493, 1494, 1495, 1496, 1497, 1498, 1499, 1500, 4, 231, + 1503, 1504, 1505, 1506, 142, 4, 4, 4, 1891, 5, + 1513, 1514, 2246, 204, 1517, 1518, 1519, 259, 5, 1522, + 1523, 2255, 165, 255, 2428, 5, 217, 269, 270, 4, + 156, 156, 1535, 1536, 4, 1538, 1539, 2441, 259, 149, + 5, 4, 2446, 282, 189, 190, 254, 5, 269, 270, + 4, 254, 5, 191, 61, 3, 4, 5, 300, 7, + 8, 5, 294, 1946, 296, 5, 5, 5, 4, 207, + 208, 4, 267, 5, 2308, 185, 214, 2311, 216, 300, + 2314, 267, 2316, 1586, 1587, 1588, 5, 5, 1591, 5, + 4, 4, 2324, 1596, 1597, 5, 1599, 1600, 1601, 5, + 1603, 1604, 2334, 1606, 242, 1988, 1609, 1610, 5, 5, + 117, 2343, 5, 120, 259, 1618, 105, 5, 4, 229, + 2352, 4, 4, 1626, 269, 270, 5, 2359, 1631, 1632, + 5, 5, 5, 22, 236, 236, 1639, 5, 2370, 1596, + 250, 105, 40, 138, 2376, 1648, 105, 2379, 236, 156, + 2382, 5, 209, 40, 91, 300, 240, 209, 5, 4, + 49, 5, 99, 52, 5, 209, 55, 1377, 105, 307, + 209, 4, 4, 1383, 5, 285, 5, 5, 5, 4, + 111, 1684, 111, 53, 191, 4, 12, 5, 5, 126, + 5, 301, 4, 82, 5, 1405, 5, 4, 1408, 5, + 5, 71, 1412, 1706, 1707, 4, 4, 1664, 1711, 5, + 5, 5, 149, 5, 1717, 12, 6, 1674, 88, 4, + 157, 110, 1679, 1433, 113, 5, 4, 4, 4, 1439, + 100, 4, 239, 5, 38, 242, 38, 1447, 4, 0, + 1450, 5, 236, 236, 138, 236, 167, 4, 118, 1459, + 1460, 4, 122, 205, 121, 4, 244, 194, 4, 266, + 1470, 195, 269, 4, 134, 202, 2498, 4, 236, 5, + 2502, 5, 279, 5, 5, 267, 5, 2509, 5, 2683, + 4, 4, 4, 2515, 5, 4, 4, 2519, 5, 5, + 2522, 5, 304, 236, 236, 304, 4, 4, 4, 4, + 4, 4, 304, 173, 304, 4, 4, 244, 5, 5, + 222, 222, 2195, 2196, 222, 2198, 2199, 222, 255, 2202, + 2203, 1824, 222, 1826, 5, 1828, 5, 4, 6, 5, + 5, 4, 267, 5, 271, 224, 5, 4, 4, 267, + 4, 267, 5, 5, 1847, 1848, 1849, 1850, 1851, 1852, + 1853, 1854, 1855, 4, 4, 12, 5, 5, 4, 300, + 5, 5, 4, 347, 5, 254, 4, 32, 1871, 4, + 1873, 4, 4, 347, 5, 5, 5, 5, 4, 6, + 5, 2264, 4, 6, 5, 5, 5, 1890, 1891, 4, + 4, 280, 5, 1896, 4, 280, 5, 5, 5, 4, + 4, 4, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, + 1913, 1914, 5, 5, 1917, 1918, 1919, 1920, 1921, 1922, + 1923, 1924, 1925, 1926, 1927, 1928, 5, 1930, 5, 1932, + 1933, 1934, 4, 2584, 5, 5, 5, 5, 4, 4, + 347, 5, 5, 1946, 1947, 5, 5, 4, 113, 4, + 280, 5, 5, 5, 5, 4, 4, 347, 5, 4, + 4, 4, 4, 347, 5, 5, 5, 5, 5, 4, + 4, 347, 5, 4, 4, 4, 1979, 5, 5, 1982, + 4, 1984, 4, 1986, 4, 1988, 1989, 4, 1991, 5, + 5, 4, 4, 2708, 5, 1998, 1999, 5, 5, 5, + 5, 2652, 2005, 4, 2007, 5, 4, 4, 2011, 5, + 5, 2014, 5, 4, 4, 377, 5, 182, 5, 184, + 185, 5, 187, 188, 5, 4, 4, 347, 5, 5, + 2413, 5, 5, 4, 2417, 4, 2593, 5, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 215, 4, 4, 4, 347, 4, 4, 2060, 5, 5, + 4, 2018, 5, 4, 4, 347, 5, 5, 233, 234, + 2453, 5, 4, 4, 4, 4, 4, 287, 4, 4, + 4, 4, 4, 421, 5, 4, 2489, 5, 5, 5, + 4, 2221, 5, 5, 4, 2582, 5, 5, 4, 4, + 2057, 5, 4, 2652, 5, 4, 4, 4, 273, 2158, + 4, 2648, 5, 5, 4, 4, 4, 4, -1, 5, + 285, 4, 719, 5, 5, 4, 4, 4, -1, 5, + 1840, 5, 5, 4, -1, 5, 5, 347, 5, 4, + 305, 4, -1, 5, 5, 5, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 2224, 2225, 2226, 2227, -1, 2229, 2230, 2231, 2232, - 2233, 2234, -1, 2236, -1, -1, 2239, 2240, -1, -1, - -1, 412, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 423, -1, -1, 2258, -1, -1, 2261, 2262, - -1, 432, -1, 2266, -1, -1, -1, 2270, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 333, 334, -1, -1, -1, -1, -1, - -1, -1, 495, -1, 2317, -1, -1, -1, -1, 502, - -1, -1, 505, -1, -1, -1, -1, 510, -1, 500, - 501, 514, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 513, 1305, 1306, 1307, -1, 518, -1, -1, - -1, -1, -1, 1315, 1316, 1317, 527, -1, -1, -1, - 1322, 1323, 1324, -1, -1, 1327, 1328, -1, 1330, 1331, + -1, 2164, -1, -1, -1, -1, 1876, -1, -1, -1, + -1, -1, 2175, 2176, 2177, 2178, 2179, 2180, 2181, 2182, + 2183, 2184, 2185, -1, -1, -1, 2662, 2663, 2191, -1, + -1, -1, 2195, 2196, -1, 2198, 2199, -1, -1, 2202, + 2203, 2204, 2205, 2206, 2207, 2208, 2209, -1, 2211, 2212, + 2213, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 2227, 2228, 2229, 2230, -1, 2232, + 2233, 2234, 2235, 2236, 2237, -1, 2239, -1, 55, 2242, + 2243, -1, -1, -1, -1, -1, -1, -1, 413, 66, + -1, 22, -1, -1, -1, -1, 27, -1, 2261, 424, + -1, 2264, 2265, -1, -1, -1, 2269, -1, 433, -1, + 2273, -1, -1, -1, 91, 92, -1, 48, 49, -1, + 51, 52, 99, -1, -1, -1, 496, -1, 105, -1, + -1, 62, -1, 503, -1, -1, 506, -1, -1, -1, + -1, 511, 40, 74, 75, 515, -1, -1, -1, 126, + -1, 82, 129, -1, 85, -1, -1, 2320, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 66, -1, + -1, 102, 149, -1, -1, -1, 501, 502, 109, 110, + 157, -1, 113, -1, -1, -1, -1, -1, -1, 514, + -1, -1, -1, -1, 519, -1, -1, -1, -1, -1, + -1, 99, -1, 528, -1, -1, -1, 105, 578, -1, + -1, -1, -1, 111, -1, -1, -1, 194, -1, -1, + -1, -1, -1, -1, -1, 202, -1, -1, -1, 2392, + -1, 129, -1, 2396, -1, -1, -1, -1, -1, -1, + 171, -1, -1, 2406, 2407, -1, -1, -1, -1, 2412, + 2413, 149, -1, 2416, 2417, -1, -1, -1, -1, 2422, + -1, -1, 2425, 2426, -1, -1, 164, 244, -1, -1, + 595, 596, 597, 598, -1, -1, -1, -1, 255, -1, + -1, 2444, 2445, -1, 2447, 2448, 2449, 2450, 2451, -1, + 2453, 2454, -1, 224, 271, 2458, 194, -1, -1, 230, + -1, -1, -1, 280, 4, 282, -1, 2470, -1, -1, + 680, -1, 2475, -1, 245, -1, -1, 687, -1, 19, + -1, -1, -1, 254, -1, -1, -1, 2490, -1, -1, + 655, -1, -1, 231, -1, -1, -1, -1, -1, -1, + 40, -1, -1, -1, -1, -1, 244, -1, -1, -1, + 281, 282, -1, -1, -1, -1, 56, 255, -1, 336, + -1, -1, 2525, -1, -1, -1, -1, 2530, -1, 2532, + -1, 302, -1, -1, -1, 2538, -1, 2247, -1, -1, + -1, -1, -1, -1, 282, -1, -1, -1, 2551, -1, + -1, -1, -1, -1, -1, -1, 294, -1, 296, 297, + -1, 101, -1, 2612, -1, -1, 2569, -1, -1, -1, + 2573, -1, -1, -1, -1, 346, -1, -1, 935, 119, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 2389, -1, -1, -1, - 2393, -1, -1, 576, -1, -1, -1, -1, 1360, 1361, - 2403, 2404, 1364, 1365, -1, -1, 2409, 2410, -1, -1, - 2413, 2414, -1, -1, -1, -1, 2419, -1, -1, 2422, - 2423, -1, 593, 594, 595, 596, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 2441, 2442, - -1, 2444, 2445, 2446, 2447, 2448, -1, 2450, 2451, -1, - -1, 1737, 2455, -1, -1, -1, -1, -1, -1, 1745, - 1746, -1, -1, -1, 2467, -1, -1, -1, -1, 2472, - -1, -1, -1, -1, 1760, 1761, -1, -1, -1, -1, - -1, -1, 653, -1, 2487, 1771, 1772, -1, -1, -1, - -1, -1, -1, -1, 677, -1, 1782, 1783, -1, -1, - -1, 684, -1, 55, -1, -1, 1792, 1793, -1, -1, - -1, -1, 1798, -1, 66, -1, -1, -1, 2244, 2522, - -1, -1, 1808, -1, 2527, -1, 2529, -1, -1, -1, - -1, -1, 2535, -1, -1, -1, -1, -1, -1, 91, - 92, -1, -1, -1, -1, 2548, -1, 99, -1, -1, - -1, -1, -1, 105, -1, -1, -1, -1, -1, -1, - 2609, -1, -1, 2566, -1, -1, -1, 2570, -1, -1, - -1, -1, -1, -1, 126, -1, -1, 129, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 2590, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 149, -1, -1, - -1, -1, -1, -1, -1, 157, -1, -1, -1, -1, - 2613, -1, -1, -1, -1, 2618, -1, 2620, 801, -1, - -1, -1, -1, -1, 2627, 808, -1, -1, -1, 2632, - -1, 802, -1, -1, 2637, -1, -1, -1, -1, -1, - -1, -1, 194, 814, -1, -1, -1, -1, -1, -1, - 202, -1, -1, -1, -1, -1, 2659, 2660, -1, -1, - -1, -1, -1, -1, -1, 4, 5, -1, -1, -1, - 853, 854, -1, -1, -1, 858, -1, -1, 861, -1, - 851, 2684, -1, -1, 2687, -1, -1, 2690, -1, 872, - -1, -1, 244, -1, -1, -1, -1, -1, 2701, 2702, - 2703, 2704, -1, 255, -1, -1, -1, -1, -1, -1, - 2713, 2437, -1, 2716, -1, -1, -1, -1, -1, 271, - 2723, 60, 2725, -1, -1, -1, -1, 66, 280, -1, - 282, 2457, -1, -1, 73, 2461, 75, -1, -1, -1, - -1, 80, -1, -1, 83, -1, -1, -1, -1, -1, - 89, 922, -1, -1, -1, -1, 1718, -1, -1, -1, - 99, -1, -1, -1, -1, -1, 105, -1, -1, 1731, - -1, -1, -1, -1, -1, 114, -1, 2675, -1, 1741, - -1, -1, 2068, -1, 336, -1, -1, -1, -1, 972, - 129, -1, 2078, -1, -1, -1, 2082, 2083, -1, -1, - -1, -1, -1, 3, 4, 2091, 2092, -1, -1, 2707, - 149, -1, 2710, -1, 2100, 2101, -1, -1, -1, 19, - 2106, -1, -1, -1, -1, 164, 997, -1, -1, -1, - 2116, 2117, -1, -1, 173, 174, -1, -1, -1, 39, - -1, 2127, 2128, -1, -1, -1, -1, -1, -1, -1, - -1, 1813, 2138, -1, -1, 194, 56, -1, -1, -1, - -1, 2147, -1, 2149, -1, -1, -1, 3, 4, -1, - -1, -1, -1, -1, -1, -1, 215, -1, 1049, -1, - -1, -1, -1, 19, -1, -1, -1, -1, 1059, -1, - 229, -1, 231, -1, -1, -1, -1, -1, -1, -1, - -1, 101, -1, -1, -1, 244, -1, -1, -1, -1, - 249, -1, -1, -1, -1, -1, 255, -1, -1, -1, - -1, -1, -1, 262, -1, -1, -1, -1, -1, -1, + 2593, -1, -1, -1, 804, -1, -1, -1, 336, -1, + -1, 811, -1, -1, -1, -1, -1, -1, -1, -1, + 967, -1, -1, 2616, -1, -1, 156, -1, 2621, -1, + 2623, -1, -1, -1, -1, -1, -1, 2630, -1, -1, + -1, -1, 2635, -1, -1, -1, -1, 2640, -1, -1, + 805, -1, -1, -1, -1, -1, 856, 857, -1, -1, + -1, 861, 817, 193, 864, -1, -1, -1, -1, 2662, + 2663, 201, -1, -1, -1, 875, -1, 207, 208, -1, + -1, -1, -1, 213, -1, -1, -1, -1, 218, -1, + -1, -1, -1, -1, 2687, -1, -1, 2690, -1, 854, + 2693, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 2704, 2705, 2706, 2707, -1, -1, -1, -1, -1, + -1, -1, -1, 2716, -1, -1, 2719, -1, -1, -1, + -1, 2678, -1, 2726, -1, 2728, -1, -1, -1, -1, + 2440, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 280, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 293, 294, 156, 296, -1, -1, - -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, - 2696, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 1165, -1, -1, -1, -1, -1, -1, 1160, - -1, -1, -1, 193, -1, -1, -1, 336, -1, -1, - -1, -1, -1, -1, -1, -1, 1177, -1, -1, -1, - -1, -1, 1195, 213, -1, -1, -1, 1200, 218, -1, - 156, -1, -1, -1, -1, -1, -1, 1210, -1, 229, - 1201, -1, -1, -1, -1, 2321, -1, -1, -1, -1, - 1211, -1, -1, -1, -1, 2331, -1, -1, -1, -1, - -1, -1, -1, -1, 2340, -1, -1, -1, -1, 1230, - -1, -1, -1, 2349, -1, -1, -1, -1, -1, 1240, - 2356, -1, -1, -1, 1245, -1, -1, -1, -1, -1, - -1, 2367, 218, -1, -1, -1, -1, 2373, 288, -1, - 2376, -1, -1, 2379, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 2067, -1, 307, 308, 309, + 2460, 291, -1, 2710, 2464, -1, 2713, -1, -1, -1, + 925, -1, -1, -1, -1, 975, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 333, 334, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 2107, 2108, 2109, 2110, 2111, - -1, 2113, 2114, -1, -1, -1, 2118, 2119, 2120, 2121, - 2122, -1, 2124, 2125, -1, -1, -1, -1, -1, -1, - -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, -1, - -1, -1, -1, -1, -1, -1, -1, 1378, -1, 2495, - -1, -1, -1, 2499, -1, -1, -1, -1, -1, -1, - 2506, -1, 22, -1, -1, -1, 2512, 27, -1, -1, - 2516, -1, -1, 2519, -1, -1, -1, 1408, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 48, 49, - -1, 51, 52, -1, -1, 4, -1, -1, -1, -1, - -1, -1, 62, 1446, -1, -1, 1437, -1, -1, 1440, - 19, -1, -1, -1, 74, 75, -1, -1, -1, 1450, - 1451, -1, 82, -1, -1, 85, -1, 1458, -1, -1, - -1, 40, -1, -1, 1465, -1, 4, -1, -1, -1, - -1, -1, 102, -1, -1, -1, -1, 56, -1, 109, - 110, 19, -1, 113, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 1506, -1, -1, -1, -1, -1, 1512, - -1, -1, -1, -1, 1505, -1, -1, 1508, 1509, -1, - -1, -1, -1, -1, -1, -1, 1517, -1, -1, -1, - -1, -1, 101, -1, -1, -1, -1, -1, 2320, -1, - -1, 2323, 2324, 2325, 2326, 2327, -1, 2329, 2330, -1, - 119, 171, -1, -1, -1, -1, -1, -1, -1, 2341, - 2342, 2343, 2344, 2345, -1, 2347, 2348, -1, 2350, -1, - -1, -1, -1, 101, -1, -1, -1, -1, 2360, 2361, - -1, -1, -1, -1, 1587, -1, 1589, 156, -1, 2371, - -1, -1, 1595, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 1593, -1, 224, -1, 16, -1, -1, -1, - 230, -1, -1, 23, -1, -1, -1, 1620, -1, -1, - 1611, -1, -1, 1626, 193, 245, -1, -1, 156, -1, - -1, -1, 201, -1, 254, -1, 1627, -1, 207, 208, - 1643, -1, -1, -1, 213, -1, -1, -1, -1, 218, - -1, 1642, 1655, 1644, -1, -1, -1, -1, 1649, -1, - 1663, 281, 282, 1654, -1, -1, 1657, -1, 1659, 1660, - 1661, 1662, -1, -1, 1665, -1, -1, 1668, -1, -1, - 1671, 1672, 302, 1674, 1675, 1676, 1677, -1, 1679, 1680, - 218, -1, -1, -1, 1685, 1686, 1687, -1, -1, 1690, - 1691, -1, -1, -1, -1, 1696, 1697, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 2498, -1, -1, -1, - -1, -1, 291, -1, -1, -1, 346, 2509, -1, 2511, - -1, -1, -1, 2515, -1, -1, -1, 306, 307, 308, + 330, 331, 332, 333, 334, -1, -1, 4, 5, -1, + 340, -1, -1, -1, 344, 345, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 3, 4, -1, -1, + -1, -1, -1, -1, -1, 1000, -1, -1, -1, -1, + -1, -1, 19, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 60, -1, -1, 3, 4, -1, 66, + -1, -1, 39, -1, -1, -1, 73, -1, 75, -1, + -1, -1, 19, 80, -1, -1, 83, -1, -1, 56, + -1, -1, 89, -1, -1, -1, -1, 1052, -1, -1, + -1, -1, 99, -1, -1, -1, -1, 1062, 105, -1, + -1, -1, -1, -1, -1, -1, -1, 114, -1, 56, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 129, -1, 101, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 149, -1, -1, -1, -1, -1, -1, -1, + -1, 1308, 1309, 1310, 101, -1, -1, 164, 1168, -1, + -1, 1318, 1319, 1320, -1, -1, 173, 174, 1325, 1326, + 1327, -1, -1, 1330, 1331, -1, 1333, 1334, -1, 156, + -1, -1, -1, -1, -1, -1, -1, 194, 1198, 2699, + -1, -1, -1, 1203, -1, -1, -1, -1, 1163, -1, + -1, -1, -1, 1213, -1, -1, 1363, 1364, 215, 156, + 1367, 1368, -1, -1, -1, 1180, 193, -1, -1, -1, + -1, -1, 229, -1, 231, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 213, 244, -1, 1204, + -1, 218, 249, -1, -1, -1, -1, -1, 255, 1214, + -1, -1, 229, -1, -1, 262, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 213, -1, 1233, -1, + -1, 218, -1, 280, -1, -1, -1, -1, 1243, -1, + -1, -1, -1, 1248, -1, -1, 293, 294, -1, 296, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 288, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 336, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, -1, -1, + 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, + 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, + 327, 328, 329, 330, 331, 332, 333, 334, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, - 329, 330, 331, 332, 333, 334, -1, -1, -1, -1, - -1, 340, -1, -1, -1, 344, 345, -1, -1, 307, - 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, - 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, - 328, 329, 330, 331, 332, 333, 334, -1, 19, -1, - -1, -1, -1, -1, -1, 1818, -1, 2599, -1, -1, - 2602, -1, -1, 2605, -1, 2607, -1, -1, 238, 1820, - 240, -1, -1, 1824, -1, -1, -1, 1840, -1, -1, - -1, -1, -1, -1, -1, 1836, -1, -1, 1839, -1, - -1, -1, -1, -1, 65, 66, -1, -1, 69, -1, + 329, 330, 331, 332, 333, 334, 1381, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 4, -1, -1, -1, -1, -1, 1449, + -1, -1, -1, -1, -1, -1, 1411, -1, 19, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 4, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 1440, -1, 19, 1443, -1, + -1, -1, -1, -1, -1, 56, -1, -1, 1453, 1454, + -1, -1, -1, -1, -1, -1, 1461, -1, -1, 1509, + -1, -1, -1, 1468, -1, 1515, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 1874, 1875, -1, -1, -1, -1, -1, 1869, -1, - 91, -1, -1, -1, -1, -1, -1, -1, 1891, 1892, - 101, -1, -1, 1896, 1897, -1, -1, 307, 308, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 333, 334, -1, -1, -1, -1, -1, - -1, -1, -1, 1936, 1925, -1, 1939, 1940, -1, -1, - -1, -1, -1, -1, 1947, 156, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 19, 168, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 185, -1, -1, -1, -1, 1982, + 101, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 1508, -1, -1, 1511, 1512, -1, -1, + -1, -1, -1, -1, -1, 1520, -1, -1, -1, 101, + -1, -1, -1, -1, 1721, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 1734, -1, -1, + 1590, -1, 1592, -1, -1, 156, -1, 1744, 1598, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 56, 205, 1998, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 218, 1999, 2012, - -1, 2014, -1, -1, -1, -1, -1, -1, -1, 2022, - -1, -1, -1, -1, 2027, -1, -1, -1, -1, -1, - 2033, -1, -1, -1, -1, 2038, -1, -1, 101, 2042, - -1, -1, 2045, 18, 19, 2048, -1, 2050, -1, -1, - -1, -1, 2043, -1, -1, -1, -1, 268, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 1623, 156, -1, -1, -1, -1, 1629, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 58, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 156, -1, -1, 307, 308, 309, 310, + -1, 1596, -1, -1, -1, -1, 1646, -1, -1, -1, + -1, -1, 213, -1, -1, -1, -1, 218, 1658, 1614, + -1, -1, -1, -1, -1, -1, 1666, -1, -1, 1816, + -1, -1, -1, -1, -1, 1630, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 218, -1, -1, -1, + 1645, -1, 1647, -1, -1, -1, -1, 1652, -1, -1, + -1, -1, 1657, -1, -1, 1660, -1, 1662, 1663, 1664, + 1665, -1, -1, 1668, -1, -1, 1671, -1, -1, 1674, + 1675, -1, 1677, 1678, 1679, 1680, -1, 1682, 1683, -1, + -1, -1, -1, 1688, 1689, 1690, -1, -1, 1693, 1694, + -1, -1, -1, -1, 1699, 1700, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, -1, 336, 101, -1, -1, -1, + 331, 332, 333, 334, -1, 307, 308, 309, 310, 311, + 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, + 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, + 332, 333, 334, 6, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 1821, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 16, -1, 1843, -1, -1, -1, -1, 23, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 115, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 213, -1, -1, -1, -1, 218, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 2159, -1, - -1, 2162, -1, -1, -1, -1, -1, -1, -1, 2170, - -1, 156, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 2186, -1, 172, 2189, -1, - -1, -1, -1, 2194, -1, -1, 2197, 2198, -1, -1, - -1, -1, -1, 276, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 1823, -1, + -1, -1, 1827, -1, -1, -1, -1, 1877, 1878, -1, + -1, -1, -1, -1, 1839, -1, -1, 1842, -1, -1, + -1, -1, -1, -1, 1894, 1895, -1, -1, -1, 1899, + 1900, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 1872, -1, -1, + -1, -1, -1, 2070, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 1939, + -1, -1, 1942, 1943, -1, -1, -1, -1, -1, -1, + 1950, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 2110, 2111, 2112, 2113, 2114, -1, 2116, + 2117, -1, -1, 1928, 2121, 2122, 2123, 2124, 2125, -1, + 2127, 2128, -1, -1, -1, 1985, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 2235, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 218, 307, 308, 309, 310, 311, 312, + -1, 2001, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 2015, -1, 2017, -1, -1, + -1, -1, -1, -1, -1, 2025, -1, -1, -1, -1, + 2030, -1, -1, -1, -1, -1, 2036, -1, -1, -1, + -1, 2041, -1, -1, -1, 2045, -1, 2002, 2048, -1, + -1, 2051, -1, 2053, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 238, -1, 240, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 2046, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, - 333, 334, -1, -1, -1, -1, -1, -1, -1, -1, + 333, 334, 307, 308, 309, 310, 311, 312, 313, 314, + 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, + 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 2323, -1, -1, 2326, + 2327, 2328, 2329, 2330, -1, 2332, 2333, -1, -1, -1, + -1, -1, -1, -1, 19, -1, -1, 2344, 2345, 2346, + 2347, 2348, -1, 2350, 2351, -1, 2353, 2162, -1, -1, + 2165, -1, -1, -1, -1, -1, 2363, 2364, 2173, -1, + -1, -1, -1, -1, -1, -1, -1, 2374, -1, -1, + -1, -1, -1, -1, 2189, -1, -1, 2192, 2238, -1, + 65, 66, 2197, -1, 69, 2200, 2201, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 91, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 101, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 2287, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 284, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 307, 308, 309, 310, 311, 312, 313, 314, + -1, 156, -1, -1, -1, 2290, -1, -1, -1, -1, + -1, -1, -1, 168, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 2501, -1, -1, -1, -1, -1, + 185, -1, -1, -1, -1, 2512, -1, 2514, -1, -1, + -1, 2518, -1, -1, -1, -1, -1, 18, 19, -1, + 205, -1, -1, -1, -1, 2385, -1, -1, -1, -1, + -1, 2391, -1, 218, -1, 2395, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 2411, -1, -1, -1, -1, -1, 58, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 2387, -1, -1, -1, 156, -1, -1, -1, + -1, 161, -1, 268, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 2602, -1, -1, 2605, -1, + 101, 2608, -1, 2610, -1, 2420, -1, -1, -1, -1, + -1, -1, -1, -1, 115, -1, 2431, -1, -1, -1, + -1, 2481, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, - -1, -1, -1, -1, -1, -1, -1, 20, 21, 22, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 2382, - -1, -1, -1, -1, -1, 2388, -1, -1, -1, 2392, - -1, -1, -1, 2384, -1, 48, 49, -1, -1, 52, - -1, -1, 55, -1, -1, 2408, -1, -1, -1, 62, - -1, -1, -1, 66, -1, -1, -1, -1, -1, -1, - -1, 74, 75, -1, -1, -1, 2417, -1, -1, 82, - 83, -1, -1, -1, -1, -1, -1, 2428, -1, -1, - -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, - -1, -1, 105, -1, -1, -1, 109, 110, -1, -1, - 113, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 19, -1, 2478, 129, 20, 21, 22, - -1, -1, -1, -1, -1, -1, -1, -1, 2479, -1, - -1, -1, -1, -1, -1, -1, 149, -1, -1, -1, - -1, -1, -1, -1, -1, 48, 49, -1, -1, 52, - 56, -1, -1, -1, -1, -1, 59, -1, 171, 62, - -1, -1, -1, 66, -1, 19, -1, -1, -1, -1, - -1, 74, 75, -1, 2525, 2526, -1, 2528, -1, 82, - -1, 194, 2533, 2534, -1, -1, -1, 2538, -1, -1, - 2553, -1, -1, 19, -1, 101, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 59, 109, 110, -1, 222, - 113, 224, -1, -1, -1, -1, -1, 230, 231, -1, - 2571, -1, -1, -1, -1, -1, 129, -1, -1, -1, - 56, 244, 245, 19, -1, -1, -1, -1, -1, -1, - -1, 254, 255, 2594, -1, -1, 149, 101, -1, -1, - 156, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 280, 171, 282, - -1, -1, -1, -1, -1, 101, -1, 180, 2641, -1, - -1, 294, -1, 296, -1, -1, -1, -1, -1, 302, - -1, -1, -1, -1, -1, -1, -1, -1, 2661, -1, - -1, -1, 156, -1, -1, -1, -1, 213, -1, -1, - -1, -1, 218, -1, -1, 101, -1, -1, -1, 222, - -1, 224, -1, 336, 2675, -1, -1, 230, 231, -1, - 156, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 2692, 245, -1, -1, 2708, -1, -1, -1, -1, - -1, -1, 255, -1, -1, -1, 2707, -1, -1, 2710, - -1, -1, -1, -1, 218, 2728, -1, -1, 2731, -1, - 156, -1, -1, -1, -1, -1, -1, 280, -1, 282, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 292, - -1, -1, 218, -1, -1, -1, -1, -1, -1, 302, - -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, -1, - 284, -1, 218, 336, -1, -1, -1, -1, -1, -1, + -1, 336, -1, -1, -1, 156, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 2482, -1, -1, + -1, 172, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, -1, + -1, -1, -1, -1, -1, -1, 2556, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 2528, 2529, -1, 2531, 218, -1, -1, + -1, 2536, 2537, -1, -1, -1, 2541, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, -1, -1, -1, -1, 2574, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, - 326, 327, 328, 329, 330, 331, 332, 333, 334, 41, - -1, -1, 44, -1, 46, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 59, -1, -1, - -1, -1, 64, 65, -1, 67, 68, 69, -1, -1, - -1, -1, -1, 41, -1, 77, 44, -1, 46, -1, - -1, -1, 84, -1, 86, 87, -1, -1, -1, -1, - -1, -1, -1, 95, 96, -1, -1, 65, -1, 67, - 68, 69, -1, -1, -1, -1, -1, -1, -1, 77, - -1, 79, -1, -1, -1, -1, 84, -1, 86, 87, - 88, -1, -1, 125, -1, 93, -1, 95, -1, -1, - -1, -1, -1, -1, -1, 137, -1, -1, -1, 141, - -1, -1, 144, -1, -1, -1, 148, 149, -1, -1, - -1, -1, -1, 155, -1, -1, 124, -1, -1, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 174, 141, -1, 177, 178, 179, -1, -1, - 182, 183, -1, 151, 152, -1, -1, 155, -1, -1, - -1, 159, 156, 161, 196, -1, -1, 161, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 211, - 212, 213, -1, -1, 182, 183, -1, -1, 186, -1, - -1, -1, -1, 225, -1, 227, -1, -1, 196, -1, - 161, -1, 234, -1, -1, 237, -1, -1, 240, -1, - 242, -1, 244, 211, 212, -1, -1, 249, -1, -1, - -1, 219, -1, -1, -1, -1, -1, -1, -1, -1, - 262, -1, -1, -1, -1, -1, 268, -1, -1, -1, - -1, -1, -1, -1, 242, -1, 244, -1, -1, -1, - -1, 283, 284, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 295, -1, 297, -1, -1, -1, -1, - 268, 303, -1, -1, 306, 307, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 283, 284, -1, -1, -1, - -1, -1, -1, -1, 292, -1, -1, -1, -1, -1, - -1, 299, -1, -1, -1, 337, -1, 305, -1, 307, - -1, 343, -1, 307, 308, 309, 310, 311, 312, 313, - 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, - 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, - 334, -1, -1, -1, -1, 343, 307, 308, 309, 310, + -1, -1, 2597, 284, 2644, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 2664, -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, - 331, 332, 333, 334, 335, 307, 308, 309, 310, 311, + 331, 332, 333, 334, -1, -1, -1, 20, 21, 22, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 2711, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 2678, -1, 48, 49, -1, -1, 52, + -1, 2731, 55, -1, 2734, -1, -1, -1, -1, 62, + 2695, -1, -1, 66, -1, -1, -1, -1, -1, -1, + -1, 74, 75, -1, -1, 2710, -1, -1, 2713, 82, + 83, 19, -1, -1, -1, 20, 21, 22, -1, -1, + -1, -1, -1, -1, -1, -1, 99, -1, -1, -1, + -1, -1, 105, -1, -1, -1, 109, 110, -1, -1, + 113, -1, -1, 48, 49, -1, -1, 52, 56, 19, + -1, -1, -1, -1, 59, -1, 129, 62, -1, -1, + -1, 66, -1, -1, -1, -1, -1, -1, -1, 74, + 75, -1, -1, -1, -1, -1, 149, 82, -1, -1, + -1, -1, -1, -1, -1, -1, 56, -1, -1, -1, + -1, -1, -1, 101, -1, -1, -1, -1, 171, -1, + -1, -1, -1, -1, 109, 110, -1, -1, 113, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 194, -1, -1, 129, -1, -1, -1, -1, 19, + -1, 101, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 149, -1, -1, -1, 156, 222, + -1, 224, -1, -1, -1, -1, -1, 230, 231, -1, + -1, -1, -1, -1, -1, -1, 171, -1, -1, 59, + -1, 244, 245, -1, -1, 180, -1, -1, -1, -1, + -1, 254, 255, -1, -1, -1, 156, -1, -1, -1, + 19, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 213, -1, 280, -1, 282, + 218, 101, -1, -1, -1, -1, -1, 222, -1, 224, + -1, 294, -1, 296, -1, 230, 231, 56, -1, 302, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 245, -1, -1, 213, -1, -1, -1, 19, 218, -1, + 255, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 336, -1, -1, 156, -1, 276, -1, + -1, -1, 101, -1, -1, 280, -1, 282, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 292, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 302, -1, 307, + 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, + 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, + 328, 329, 330, 331, 332, 333, 334, 156, 218, 101, + -1, 336, -1, -1, -1, -1, -1, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 156, -1, -1, -1, -1, 218, + -1, -1, -1, -1, 284, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 307, 308, 309, + 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, + 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, + 330, 331, 332, 333, 334, -1, 218, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 307, 308, + 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, + 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, + 329, 330, 331, 332, 333, 334, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, 331, - 332, 333, 334 + 332, 333, 334, 41, -1, -1, 44, -1, 46, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 59, -1, -1, -1, -1, 64, 65, -1, 67, + 68, 69, -1, -1, -1, -1, -1, 41, -1, 77, + 44, -1, 46, -1, -1, -1, 84, -1, 86, 87, + -1, -1, -1, -1, -1, -1, -1, 95, 96, -1, + -1, 65, -1, 67, 68, 69, -1, -1, -1, -1, + -1, -1, -1, 77, -1, 79, -1, -1, -1, -1, + 84, -1, 86, 87, 88, -1, -1, 125, -1, 93, + -1, 95, -1, -1, -1, -1, -1, -1, -1, 137, + -1, -1, -1, 141, -1, -1, 144, -1, -1, -1, + 148, 149, -1, -1, -1, -1, -1, 155, -1, -1, + 124, -1, -1, 161, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 174, 141, -1, 177, + 178, 179, -1, -1, 182, 183, -1, 151, 152, -1, + -1, 155, -1, -1, -1, 159, -1, 161, 196, -1, + 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 211, 212, 213, -1, -1, 182, 183, + -1, -1, 186, -1, -1, -1, -1, 225, -1, 227, + -1, -1, 196, -1, -1, -1, 234, -1, -1, 237, + -1, -1, 240, -1, 242, -1, 244, 211, 212, -1, + -1, 249, -1, -1, -1, 219, -1, -1, -1, -1, + -1, -1, -1, -1, 262, -1, -1, -1, -1, -1, + 268, -1, -1, -1, -1, -1, -1, -1, 242, -1, + 244, -1, -1, -1, -1, 283, 284, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 295, -1, 297, + -1, -1, -1, -1, 268, 303, -1, -1, 306, 307, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 283, + 284, -1, -1, -1, -1, -1, -1, -1, 292, -1, + -1, -1, -1, -1, -1, 299, -1, -1, -1, 337, + -1, 305, -1, 307, -1, 343, 307, 308, 309, 310, + 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, + 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 333, 334, 335, -1, -1, -1, -1, 343 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -3978,255 +4041,255 @@ static const yytype_uint16 yystos[] = 199, 256, 297, 307, 462, 16, 26, 112, 124, 158, 204, 217, 465, 228, 483, 5, 66, 88, 139, 297, 343, 352, 484, 5, 485, 57, 223, 237, 298, 501, - 64, 66, 181, 287, 520, 66, 202, 339, 344, 346, - 521, 39, 193, 229, 288, 350, 360, 362, 522, 5, - 297, 307, 352, 525, 70, 168, 241, 250, 526, 4, - 527, 88, 501, 61, 278, 301, 534, 193, 288, 350, - 535, 26, 112, 124, 204, 217, 537, 50, 99, 108, - 136, 290, 552, 553, 4, 37, 47, 74, 149, 185, - 229, 250, 285, 301, 376, 4, 124, 203, 554, 288, - 350, 556, 16, 23, 238, 240, 361, 557, 228, 561, - 288, 350, 562, 0, 5, 59, 350, 382, 265, 5, - 4, 288, 350, 383, 5, 32, 277, 384, 123, 350, - 385, 123, 350, 387, 350, 4, 192, 246, 391, 186, - 298, 341, 342, 350, 390, 352, 138, 175, 389, 196, - 350, 78, 171, 246, 350, 392, 5, 350, 4, 242, - 394, 350, 350, 5, 224, 397, 31, 398, 5, 399, - 5, 403, 5, 31, 404, 350, 9, 10, 11, 350, - 356, 357, 358, 359, 350, 350, 40, 111, 193, 350, - 406, 350, 193, 360, 362, 350, 35, 106, 127, 128, - 135, 153, 163, 365, 350, 4, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 117, 66, 53, 71, - 88, 100, 118, 122, 134, 173, 412, 118, 414, 186, - 192, 229, 253, 298, 341, 342, 350, 400, 415, 280, - 418, 168, 419, 168, 176, 421, 65, 66, 69, 91, - 168, 185, 205, 268, 336, 360, 423, 350, 362, 426, - 59, 284, 360, 427, 276, 360, 362, 428, 33, 429, - 360, 362, 430, 4, 360, 362, 431, 45, 59, 81, - 100, 117, 120, 146, 147, 198, 206, 265, 266, 336, - 435, 210, 300, 441, 5, 89, 6, 88, 120, 433, - 5, 65, 362, 432, 16, 501, 66, 181, 287, 442, - 66, 229, 443, 279, 61, 278, 301, 444, 21, 134, - 236, 263, 445, 37, 47, 74, 149, 185, 250, 301, - 446, 362, 89, 16, 195, 451, 360, 454, 72, 457, - 31, 458, 44, 87, 191, 459, 149, 215, 255, 293, - 460, 360, 18, 58, 115, 172, 284, 360, 461, 4, - 192, 464, 5, 4, 6, 120, 350, 4, 5, 242, - 466, 5, 468, 5, 117, 191, 242, 266, 469, 93, - 111, 186, 482, 5, 480, 5, 266, 481, 4, 5, - 352, 352, 350, 350, 5, 4, 5, 60, 66, 73, - 75, 80, 83, 89, 99, 105, 114, 129, 149, 164, - 173, 174, 194, 215, 229, 231, 244, 249, 255, 262, - 280, 293, 294, 296, 336, 486, 5, 4, 350, 5, - 350, 40, 111, 350, 524, 352, 350, 360, 362, 523, - 350, 365, 350, 4, 361, 54, 90, 140, 242, 528, - 4, 4, 350, 4, 149, 255, 529, 5, 360, 4, - 40, 111, 350, 536, 350, 97, 61, 120, 242, 269, - 538, 120, 551, 61, 117, 120, 156, 191, 239, 242, - 266, 269, 279, 540, 541, 61, 120, 269, 550, 5, - 4, 34, 107, 202, 533, 66, 352, 377, 66, 352, - 378, 66, 352, 379, 13, 188, 532, 350, 350, 222, - 350, 380, 350, 266, 4, 350, 350, 4, 560, 4, - 282, 558, 4, 282, 559, 4, 365, 123, 350, 563, - 350, 350, 4, 5, 350, 12, 350, 350, 350, 30, - 94, 162, 246, 251, 364, 364, 4, 196, 350, 350, - 4, 4, 4, 350, 350, 350, 350, 4, 4, 5, - 5, 360, 5, 350, 350, 356, 358, 358, 360, 350, - 350, 350, 350, 350, 350, 350, 360, 362, 359, 350, - 350, 359, 350, 5, 265, 103, 186, 413, 192, 246, - 416, 168, 78, 171, 246, 417, 138, 175, 401, 401, - 4, 420, 4, 422, 192, 253, 424, 176, 425, 168, - 365, 350, 350, 360, 360, 365, 365, 365, 360, 365, - 350, 360, 438, 4, 362, 436, 195, 4, 165, 307, - 437, 195, 360, 131, 288, 440, 5, 5, 4, 195, - 350, 4, 5, 60, 66, 114, 129, 143, 149, 154, - 205, 224, 229, 231, 254, 255, 262, 280, 336, 495, - 362, 187, 187, 66, 447, 66, 448, 66, 449, 222, - 450, 350, 5, 223, 452, 361, 365, 5, 360, 360, - 360, 360, 4, 352, 4, 4, 195, 350, 14, 15, - 61, 189, 190, 259, 269, 270, 300, 87, 5, 5, + 64, 66, 181, 278, 287, 520, 66, 202, 339, 344, + 346, 521, 39, 193, 229, 288, 350, 360, 362, 522, + 5, 297, 307, 352, 525, 70, 168, 241, 250, 526, + 4, 527, 88, 501, 61, 278, 301, 534, 193, 288, + 350, 535, 26, 112, 124, 204, 217, 537, 50, 99, + 108, 136, 290, 552, 553, 4, 37, 47, 74, 149, + 185, 229, 250, 285, 301, 376, 4, 124, 203, 554, + 288, 350, 556, 16, 23, 238, 240, 361, 557, 228, + 561, 288, 350, 562, 0, 5, 59, 350, 382, 265, + 5, 4, 288, 350, 383, 5, 32, 277, 384, 123, + 350, 385, 123, 350, 387, 350, 4, 192, 246, 391, + 186, 298, 341, 342, 350, 390, 352, 138, 175, 389, + 196, 350, 78, 171, 246, 350, 392, 5, 350, 4, + 242, 394, 350, 350, 5, 224, 397, 31, 398, 5, + 399, 5, 403, 5, 31, 404, 350, 9, 10, 11, + 350, 356, 357, 358, 359, 350, 350, 40, 111, 193, + 350, 406, 350, 193, 360, 362, 350, 35, 106, 127, + 128, 135, 153, 163, 365, 350, 4, 352, 352, 352, + 352, 352, 352, 352, 352, 352, 352, 117, 66, 53, + 71, 88, 100, 118, 122, 134, 173, 412, 118, 414, + 186, 192, 229, 253, 298, 341, 342, 350, 400, 415, + 280, 418, 168, 419, 168, 176, 421, 65, 66, 69, + 91, 168, 185, 205, 268, 336, 360, 423, 350, 362, + 426, 59, 284, 360, 427, 276, 360, 362, 428, 33, + 429, 360, 362, 430, 4, 360, 362, 431, 45, 59, + 81, 100, 117, 120, 146, 147, 198, 206, 265, 266, + 336, 435, 210, 300, 441, 5, 89, 6, 88, 120, + 433, 5, 65, 362, 432, 16, 501, 66, 181, 278, + 287, 442, 66, 229, 443, 279, 61, 278, 301, 444, + 21, 134, 236, 263, 445, 37, 47, 74, 149, 185, + 250, 301, 446, 362, 89, 16, 195, 451, 360, 454, + 72, 457, 31, 458, 44, 87, 191, 459, 149, 215, + 255, 293, 460, 360, 18, 58, 115, 172, 284, 360, + 461, 4, 192, 464, 5, 4, 6, 120, 350, 4, + 5, 242, 466, 5, 468, 5, 117, 191, 242, 266, + 469, 93, 111, 186, 482, 5, 480, 5, 266, 481, + 4, 5, 352, 352, 350, 350, 5, 4, 5, 60, + 66, 73, 75, 80, 83, 89, 99, 105, 114, 129, + 149, 164, 173, 174, 194, 215, 229, 231, 244, 249, + 255, 262, 280, 293, 294, 296, 336, 486, 5, 4, + 360, 350, 5, 350, 40, 111, 350, 524, 352, 350, + 360, 362, 523, 350, 365, 350, 4, 361, 54, 90, + 140, 242, 528, 4, 4, 350, 4, 149, 255, 529, + 5, 360, 4, 40, 111, 350, 536, 350, 97, 61, + 120, 242, 269, 538, 120, 551, 61, 117, 120, 156, + 191, 239, 242, 266, 269, 279, 540, 541, 61, 120, + 269, 550, 5, 4, 34, 107, 202, 533, 66, 352, + 377, 66, 352, 378, 66, 352, 379, 13, 188, 532, + 350, 350, 222, 350, 380, 350, 266, 4, 350, 350, + 4, 560, 4, 282, 558, 4, 282, 559, 4, 365, + 123, 350, 563, 350, 350, 4, 5, 350, 12, 350, + 350, 350, 30, 94, 162, 246, 251, 364, 364, 4, + 196, 350, 350, 4, 4, 4, 350, 350, 350, 350, + 4, 4, 5, 5, 360, 5, 350, 350, 356, 358, + 358, 360, 350, 350, 350, 350, 350, 350, 350, 360, + 362, 359, 350, 350, 359, 350, 5, 265, 103, 186, + 413, 192, 246, 416, 168, 78, 171, 246, 417, 138, + 175, 401, 401, 4, 420, 4, 422, 192, 253, 424, + 176, 425, 168, 365, 350, 350, 360, 360, 365, 365, + 365, 360, 365, 350, 360, 438, 4, 362, 436, 195, + 4, 165, 307, 437, 195, 360, 131, 288, 440, 5, + 5, 4, 195, 350, 4, 5, 60, 66, 114, 129, + 143, 149, 154, 205, 224, 229, 231, 254, 255, 262, + 280, 336, 495, 362, 187, 187, 66, 447, 66, 448, + 66, 449, 222, 450, 350, 5, 223, 452, 361, 365, + 5, 360, 360, 360, 360, 4, 352, 4, 4, 195, + 350, 14, 15, 61, 189, 190, 259, 269, 270, 300, + 87, 5, 5, 14, 15, 61, 189, 190, 259, 269, + 270, 274, 300, 87, 156, 161, 361, 472, 476, 87, + 156, 5, 470, 4, 4, 14, 61, 189, 259, 269, + 300, 5, 5, 4, 350, 361, 20, 21, 22, 48, + 49, 52, 55, 62, 66, 74, 75, 82, 83, 99, + 105, 109, 110, 113, 129, 149, 171, 194, 222, 224, + 230, 231, 244, 245, 254, 255, 280, 282, 294, 296, + 302, 336, 66, 80, 89, 99, 129, 149, 194, 231, + 255, 294, 296, 4, 30, 160, 210, 236, 489, 5, + 63, 104, 233, 247, 248, 338, 339, 494, 99, 487, + 17, 40, 111, 193, 493, 4, 5, 17, 209, 289, + 350, 255, 494, 502, 124, 494, 503, 36, 40, 111, + 132, 193, 288, 350, 504, 360, 352, 91, 99, 105, + 126, 149, 157, 194, 202, 244, 255, 271, 507, 40, + 111, 193, 5, 281, 17, 209, 289, 511, 282, 352, + 512, 5, 99, 105, 297, 17, 17, 4, 350, 350, + 350, 350, 350, 365, 350, 350, 359, 350, 4, 365, + 4, 40, 111, 193, 260, 530, 40, 111, 193, 260, + 531, 4, 97, 5, 5, 87, 4, 5, 5, 87, + 5, 541, 61, 120, 156, 269, 545, 61, 120, 269, + 549, 87, 156, 61, 120, 269, 543, 4, 61, 120, + 269, 542, 5, 5, 4, 4, 5, 5, 5, 350, + 350, 350, 4, 350, 555, 350, 350, 6, 361, 4, + 5, 4, 4, 5, 4, 97, 257, 366, 350, 350, + 12, 5, 12, 350, 350, 12, 4, 12, 4, 4, + 350, 350, 350, 4, 352, 4, 4, 365, 360, 365, + 350, 350, 350, 360, 350, 359, 350, 350, 5, 5, + 350, 362, 350, 360, 350, 365, 365, 366, 366, 366, + 365, 359, 350, 365, 350, 133, 243, 353, 439, 165, + 5, 4, 365, 156, 156, 4, 5, 4, 4, 350, + 434, 350, 20, 21, 22, 48, 49, 52, 59, 62, + 66, 74, 75, 82, 109, 110, 113, 129, 149, 171, + 180, 222, 224, 230, 231, 245, 255, 280, 282, 292, + 302, 336, 66, 129, 154, 231, 280, 30, 160, 210, + 236, 496, 350, 205, 350, 497, 17, 350, 254, 507, + 254, 205, 350, 498, 282, 499, 17, 98, 350, 350, + 5, 366, 56, 360, 4, 5, 463, 350, 5, 5, + 5, 156, 183, 370, 370, 164, 261, 368, 4, 4, + 5, 5, 467, 267, 267, 5, 5, 5, 17, 158, + 369, 369, 368, 4, 4, 368, 5, 5, 471, 161, + 335, 361, 475, 5, 474, 5, 5, 478, 5, 479, + 5, 14, 15, 61, 189, 190, 259, 269, 270, 274, + 300, 4, 4, 5, 5, 370, 368, 4, 5, 5, + 365, 82, 151, 220, 221, 235, 275, 373, 7, 8, + 350, 355, 236, 121, 236, 236, 105, 40, 66, 99, + 105, 111, 129, 149, 164, 194, 231, 244, 255, 282, + 294, 296, 297, 336, 488, 121, 236, 5, 27, 166, + 236, 278, 138, 105, 22, 49, 52, 82, 110, 113, + 224, 254, 22, 49, 52, 55, 82, 110, 113, 224, + 254, 280, 40, 121, 236, 236, 105, 5, 209, 27, + 222, 36, 132, 288, 350, 258, 265, 121, 240, 360, + 507, 40, 130, 222, 278, 240, 209, 5, 5, 244, + 27, 222, 4, 5, 5, 209, 36, 132, 288, 350, + 507, 209, 352, 4, 4, 350, 5, 300, 22, 27, + 48, 49, 51, 52, 62, 74, 75, 82, 85, 102, + 109, 110, 113, 171, 224, 230, 245, 254, 281, 282, + 302, 346, 490, 350, 350, 350, 350, 350, 494, 360, + 5, 4, 5, 350, 350, 360, 350, 352, 350, 350, + 494, 5, 350, 350, 352, 5, 17, 5, 5, 350, + 350, 359, 350, 350, 4, 350, 350, 111, 350, 350, + 111, 4, 42, 43, 169, 170, 197, 375, 375, 61, + 120, 269, 539, 375, 5, 61, 120, 269, 544, 5, + 5, 61, 120, 269, 546, 4, 5, 5, 4, 61, + 120, 269, 548, 61, 120, 269, 547, 5, 5, 4, + 5, 5, 4, 375, 375, 375, 350, 350, 350, 4, + 360, 350, 361, 365, 5, 5, 12, 350, 360, 362, + 350, 12, 350, 350, 350, 59, 350, 6, 4, 350, + 350, 46, 268, 402, 5, 352, 352, 365, 350, 4, + 4, 4, 365, 360, 350, 350, 350, 350, 365, 360, + 366, 359, 350, 4, 366, 350, 38, 38, 4, 362, + 5, 24, 25, 97, 367, 4, 360, 350, 350, 4, + 350, 5, 82, 151, 220, 221, 235, 275, 360, 362, + 236, 121, 236, 236, 21, 236, 360, 121, 236, 27, + 166, 236, 278, 138, 21, 236, 121, 236, 236, 21, + 236, 27, 167, 222, 167, 258, 265, 121, 167, 222, + 286, 507, 130, 167, 222, 278, 4, 244, 27, 167, + 222, 507, 205, 350, 350, 350, 350, 350, 350, 195, + 350, 350, 20, 232, 455, 4, 4, 350, 370, 370, + 370, 4, 370, 370, 370, 14, 15, 61, 189, 190, + 259, 269, 270, 300, 369, 370, 370, 370, 370, 370, + 4, 370, 370, 4, 369, 14, 15, 61, 189, 190, + 259, 269, 270, 300, 5, 473, 5, 477, 5, 5, 14, 15, 61, 189, 190, 259, 269, 270, 274, 300, - 87, 156, 161, 361, 472, 476, 87, 156, 5, 470, - 4, 4, 14, 61, 189, 259, 269, 300, 5, 5, - 4, 350, 361, 20, 21, 22, 48, 49, 52, 55, - 62, 66, 74, 75, 82, 83, 99, 105, 109, 110, - 113, 129, 149, 171, 194, 222, 224, 230, 231, 244, - 245, 254, 255, 280, 282, 294, 296, 302, 336, 66, - 80, 89, 99, 129, 149, 194, 231, 255, 294, 296, - 4, 30, 160, 210, 236, 489, 5, 63, 104, 233, - 247, 248, 338, 339, 494, 99, 487, 17, 40, 111, - 193, 493, 4, 5, 17, 209, 289, 350, 255, 494, - 502, 124, 494, 503, 36, 40, 111, 132, 193, 288, - 350, 504, 360, 352, 91, 99, 105, 126, 149, 157, - 194, 202, 244, 255, 271, 507, 40, 111, 193, 5, - 281, 17, 209, 289, 511, 282, 352, 512, 5, 99, - 105, 297, 17, 17, 4, 350, 350, 350, 350, 350, - 365, 350, 350, 359, 350, 4, 365, 4, 40, 111, - 193, 260, 530, 40, 111, 193, 260, 531, 4, 97, - 5, 5, 87, 4, 5, 5, 87, 5, 541, 61, - 120, 156, 269, 545, 61, 120, 269, 549, 87, 156, - 61, 120, 269, 543, 4, 61, 120, 269, 542, 5, - 5, 4, 4, 5, 5, 5, 350, 350, 350, 4, - 350, 555, 350, 350, 6, 361, 4, 5, 4, 4, - 5, 4, 97, 257, 366, 350, 350, 12, 5, 12, - 350, 350, 12, 4, 12, 4, 4, 350, 350, 350, - 4, 352, 4, 4, 365, 360, 365, 350, 350, 350, - 360, 350, 359, 350, 350, 5, 5, 350, 362, 350, - 360, 350, 365, 365, 366, 366, 366, 365, 359, 350, - 365, 350, 133, 243, 353, 439, 165, 5, 4, 365, - 156, 156, 4, 5, 4, 4, 350, 434, 350, 20, - 21, 22, 48, 49, 52, 59, 62, 66, 74, 75, - 82, 109, 110, 113, 129, 149, 171, 180, 222, 224, - 230, 231, 245, 255, 280, 282, 292, 302, 336, 66, - 129, 154, 231, 280, 30, 160, 210, 236, 496, 350, - 205, 350, 497, 17, 350, 254, 507, 254, 205, 350, - 498, 282, 499, 17, 98, 350, 350, 5, 366, 56, - 360, 4, 5, 463, 350, 5, 5, 5, 156, 183, - 370, 370, 164, 261, 368, 4, 4, 5, 5, 467, - 267, 267, 5, 5, 5, 17, 158, 369, 369, 368, - 4, 4, 368, 5, 5, 471, 161, 335, 361, 475, - 5, 474, 5, 5, 478, 5, 479, 5, 14, 15, - 61, 189, 190, 259, 269, 270, 274, 300, 4, 4, - 5, 5, 370, 368, 4, 5, 5, 365, 82, 151, - 220, 221, 235, 275, 373, 7, 8, 350, 355, 236, - 121, 236, 236, 105, 40, 66, 99, 105, 111, 129, - 149, 164, 194, 231, 244, 255, 282, 294, 296, 297, - 336, 488, 121, 236, 5, 27, 166, 236, 278, 138, - 105, 22, 49, 52, 82, 110, 113, 224, 254, 22, - 49, 52, 55, 82, 110, 113, 224, 254, 280, 40, - 121, 236, 236, 105, 5, 209, 27, 222, 36, 132, - 288, 350, 258, 265, 121, 240, 360, 507, 40, 130, - 222, 278, 240, 209, 5, 5, 244, 27, 222, 4, - 5, 5, 209, 36, 132, 288, 350, 507, 209, 352, - 4, 4, 350, 5, 300, 22, 27, 48, 49, 51, - 52, 62, 74, 75, 82, 85, 102, 109, 110, 113, - 171, 224, 230, 245, 254, 281, 282, 302, 346, 490, - 350, 350, 350, 350, 350, 494, 360, 5, 4, 5, - 350, 350, 360, 350, 352, 350, 350, 494, 5, 350, - 350, 352, 5, 17, 5, 5, 350, 350, 359, 350, - 350, 4, 350, 350, 111, 350, 350, 111, 4, 42, - 43, 169, 170, 197, 375, 375, 61, 120, 269, 539, - 375, 5, 61, 120, 269, 544, 5, 5, 61, 120, - 269, 546, 4, 5, 5, 4, 61, 120, 269, 548, - 61, 120, 269, 547, 5, 5, 4, 5, 5, 4, - 375, 375, 375, 350, 350, 350, 4, 360, 350, 361, - 365, 5, 5, 12, 350, 360, 362, 350, 12, 350, - 350, 350, 59, 350, 6, 4, 350, 350, 46, 268, - 402, 5, 352, 352, 365, 350, 4, 4, 4, 365, - 360, 350, 350, 350, 350, 365, 360, 366, 359, 350, - 4, 366, 350, 38, 38, 4, 362, 5, 24, 25, - 97, 367, 4, 360, 350, 350, 4, 350, 5, 82, - 151, 220, 221, 235, 275, 360, 362, 236, 121, 236, - 236, 21, 236, 360, 121, 236, 27, 166, 236, 278, - 138, 21, 236, 121, 236, 236, 21, 236, 27, 167, - 222, 167, 258, 265, 121, 167, 222, 286, 507, 130, - 167, 222, 278, 4, 244, 27, 167, 222, 507, 205, - 350, 350, 350, 350, 350, 350, 195, 350, 350, 20, - 232, 455, 4, 4, 350, 370, 370, 370, 4, 370, - 370, 370, 14, 15, 61, 189, 190, 259, 269, 270, - 300, 369, 370, 370, 370, 370, 370, 4, 370, 370, - 4, 369, 14, 15, 61, 189, 190, 259, 269, 270, - 300, 5, 473, 5, 477, 5, 5, 14, 15, 61, - 189, 190, 259, 269, 270, 274, 300, 5, 14, 15, - 61, 189, 190, 259, 269, 270, 274, 300, 5, 14, - 15, 61, 189, 190, 259, 269, 270, 274, 300, 14, - 15, 61, 189, 190, 259, 269, 270, 300, 267, 5, - 5, 5, 369, 369, 368, 4, 4, 368, 5, 4, - 4, 370, 370, 4, 370, 370, 5, 352, 360, 362, - 5, 350, 352, 350, 5, 350, 5, 355, 105, 194, - 244, 105, 194, 244, 5, 352, 350, 352, 5, 350, - 360, 352, 5, 355, 236, 236, 21, 236, 21, 236, - 236, 21, 236, 304, 304, 4, 4, 4, 488, 4, - 4, 4, 304, 304, 4, 5, 4, 352, 350, 5, - 350, 5, 355, 352, 360, 360, 350, 27, 48, 51, - 62, 85, 102, 346, 371, 4, 352, 350, 365, 352, - 5, 360, 360, 350, 352, 352, 360, 360, 350, 352, - 350, 5, 350, 222, 222, 350, 350, 222, 350, 222, - 350, 350, 500, 508, 350, 222, 222, 350, 350, 350, - 350, 350, 350, 350, 350, 5, 300, 350, 491, 350, - 350, 222, 350, 350, 350, 350, 360, 365, 5, 360, - 360, 350, 350, 365, 350, 350, 350, 360, 350, 350, - 5, 4, 350, 350, 350, 350, 5, 5, 4, 375, - 5, 5, 4, 4, 4, 5, 5, 4, 4, 5, - 5, 4, 5, 5, 4, 350, 350, 350, 365, 350, - 365, 350, 360, 362, 350, 365, 350, 350, 350, 350, - 350, 5, 350, 4, 6, 350, 350, 4, 360, 350, - 365, 176, 363, 350, 363, 366, 365, 360, 350, 350, - 4, 350, 360, 365, 360, 350, 4, 360, 5, 5, - 5, 5, 360, 365, 360, 360, 360, 360, 362, 360, - 365, 360, 360, 360, 362, 360, 360, 360, 360, 362, - 360, 360, 360, 350, 360, 360, 360, 360, 360, 360, - 360, 350, 350, 4, 350, 5, 4, 350, 370, 5, - 5, 5, 368, 4, 4, 5, 370, 369, 4, 370, - 5, 5, 5, 369, 369, 368, 4, 4, 5, 14, - 15, 61, 189, 190, 259, 269, 270, 300, 14, 15, - 61, 189, 190, 259, 269, 270, 300, 14, 15, 61, - 189, 190, 259, 269, 270, 300, 267, 5, 5, 5, - 369, 369, 368, 4, 4, 368, 5, 267, 5, 5, - 5, 369, 369, 368, 4, 4, 368, 5, 267, 5, - 5, 5, 369, 369, 368, 4, 4, 368, 5, 5, - 5, 5, 369, 369, 368, 4, 4, 5, 369, 4, - 4, 369, 4, 4, 370, 5, 365, 360, 350, 350, - 360, 350, 5, 355, 5, 360, 352, 5, 360, 365, - 5, 355, 350, 350, 350, 350, 350, 350, 350, 350, - 350, 4, 4, 5, 4, 4, 350, 360, 350, 5, - 355, 352, 365, 365, 350, 359, 365, 365, 350, 365, - 365, 350, 350, 350, 350, 350, 350, 350, 350, 350, - 350, 55, 66, 92, 129, 280, 282, 336, 505, 506, - 507, 518, 519, 350, 350, 350, 350, 350, 350, 350, - 350, 350, 350, 350, 350, 360, 5, 350, 350, 350, - 350, 4, 4, 365, 366, 4, 492, 365, 365, 359, - 350, 4, 365, 4, 375, 375, 375, 355, 350, 350, - 350, 365, 350, 359, 350, 350, 12, 5, 5, 4, - 350, 350, 4, 365, 360, 350, 350, 366, 367, 350, - 5, 350, 365, 365, 362, 5, 5, 5, 5, 365, - 367, 367, 367, 365, 367, 366, 367, 367, 365, 367, - 367, 367, 365, 367, 367, 365, 360, 367, 365, 367, - 367, 365, 367, 365, 4, 362, 5, 350, 4, 370, - 369, 4, 369, 5, 5, 5, 369, 369, 368, 4, - 4, 5, 5, 5, 5, 369, 369, 368, 4, 4, - 5, 5, 5, 5, 369, 369, 368, 4, 4, 5, - 369, 370, 370, 370, 370, 370, 4, 370, 370, 4, - 369, 369, 370, 370, 370, 370, 370, 4, 370, 370, - 4, 369, 369, 4, 4, 369, 4, 369, 369, 4, - 4, 4, 361, 367, 4, 360, 367, 350, 360, 4, - 367, 367, 360, 4, 350, 350, 350, 350, 350, 350, - 350, 350, 350, 350, 350, 360, 367, 350, 360, 4, - 359, 359, 360, 359, 359, 360, 360, 359, 359, 350, - 350, 350, 350, 350, 350, 355, 350, 350, 350, 347, - 347, 347, 347, 347, 347, 347, 506, 347, 355, 350, - 350, 350, 350, 355, 350, 350, 350, 350, 350, 350, - 365, 350, 300, 354, 355, 350, 350, 366, 352, 4, - 4, 366, 4, 350, 359, 350, 59, 350, 5, 5, - 350, 4, 363, 367, 5, 4, 4, 5, 360, 5, - 366, 367, 366, 366, 366, 5, 4, 350, 370, 369, - 370, 370, 370, 370, 370, 4, 370, 370, 369, 4, - 369, 370, 370, 370, 370, 370, 4, 370, 370, 369, - 370, 369, 4, 370, 370, 369, 4, 370, 369, 4, - 369, 369, 365, 360, 367, 4, 365, 350, 365, 350, - 350, 350, 367, 4, 365, 350, 359, 367, 350, 359, - 367, 367, 360, 350, 4, 372, 372, 350, 350, 372, - 355, 372, 508, 360, 488, 5, 4, 5, 5, 5, - 4, 352, 355, 372, 372, 350, 350, 355, 350, 350, - 350, 350, 350, 359, 350, 5, 508, 350, 372, 352, - 509, 510, 5, 352, 4, 5, 350, 5, 4, 6, - 350, 32, 277, 409, 5, 365, 360, 409, 350, 369, - 370, 369, 369, 370, 370, 369, 370, 369, 369, 350, - 367, 360, 360, 350, 360, 350, 360, 360, 350, 360, - 367, 4, 508, 508, 354, 350, 508, 4, 508, 365, - 5, 4, 4, 508, 508, 354, 350, 4, 508, 508, - 350, 360, 508, 508, 508, 509, 515, 516, 507, 513, - 514, 4, 5, 5, 6, 4, 186, 298, 342, 350, - 400, 360, 32, 277, 374, 4, 370, 370, 370, 370, - 361, 367, 367, 350, 367, 4, 367, 367, 350, 367, - 350, 508, 508, 4, 350, 508, 5, 350, 508, 4, - 350, 508, 365, 515, 517, 518, 347, 514, 5, 5, - 4, 350, 401, 350, 401, 365, 367, 4, 360, 362, - 4, 355, 354, 350, 350, 354, 350, 360, 518, 352, - 5, 5, 350, 350, 350, 350, 374, 5, 360, 362, - 365, 360, 362, 508, 350, 4, 508, 350, 367, 5, - 5, 350, 5, 350, 365, 365, 4, 508, 4, 5, - 5, 5, 354, 354, 508, 508, 508 + 5, 14, 15, 61, 189, 190, 259, 269, 270, 274, + 300, 5, 14, 15, 61, 189, 190, 259, 269, 270, + 274, 300, 14, 15, 61, 189, 190, 259, 269, 270, + 300, 267, 5, 5, 5, 369, 369, 368, 4, 4, + 368, 5, 4, 4, 370, 370, 4, 370, 370, 5, + 352, 360, 362, 5, 350, 352, 350, 5, 350, 5, + 355, 105, 194, 244, 105, 194, 244, 5, 352, 350, + 352, 5, 350, 360, 352, 5, 355, 236, 236, 21, + 236, 21, 236, 236, 21, 236, 304, 304, 4, 4, + 4, 488, 4, 4, 4, 304, 304, 4, 5, 4, + 352, 350, 5, 350, 5, 355, 352, 360, 360, 350, + 27, 48, 51, 62, 85, 102, 346, 371, 4, 352, + 350, 365, 352, 5, 360, 360, 350, 352, 352, 360, + 360, 350, 352, 350, 5, 350, 222, 222, 350, 350, + 222, 350, 222, 350, 350, 500, 508, 350, 222, 222, + 350, 350, 350, 350, 350, 350, 350, 350, 5, 300, + 350, 491, 350, 350, 222, 350, 350, 350, 350, 360, + 365, 5, 360, 360, 350, 350, 365, 350, 350, 350, + 360, 350, 350, 5, 4, 350, 350, 350, 350, 5, + 5, 4, 375, 5, 5, 4, 4, 4, 5, 5, + 4, 4, 5, 5, 4, 5, 5, 4, 350, 350, + 350, 365, 350, 365, 350, 360, 362, 350, 365, 350, + 350, 350, 350, 350, 5, 350, 4, 6, 350, 350, + 4, 360, 350, 365, 176, 363, 350, 363, 366, 365, + 360, 350, 350, 4, 350, 360, 365, 360, 350, 4, + 360, 5, 5, 5, 5, 360, 365, 360, 360, 360, + 360, 362, 360, 365, 360, 360, 360, 362, 360, 360, + 360, 360, 362, 360, 360, 360, 350, 360, 360, 360, + 360, 360, 360, 360, 350, 350, 4, 350, 5, 4, + 350, 370, 5, 5, 5, 368, 4, 4, 5, 370, + 369, 4, 370, 5, 5, 5, 369, 369, 368, 4, + 4, 5, 14, 15, 61, 189, 190, 259, 269, 270, + 300, 14, 15, 61, 189, 190, 259, 269, 270, 300, + 14, 15, 61, 189, 190, 259, 269, 270, 300, 267, + 5, 5, 5, 369, 369, 368, 4, 4, 368, 5, + 267, 5, 5, 5, 369, 369, 368, 4, 4, 368, + 5, 267, 5, 5, 5, 369, 369, 368, 4, 4, + 368, 5, 5, 5, 5, 369, 369, 368, 4, 4, + 5, 369, 4, 4, 369, 4, 4, 370, 5, 365, + 360, 350, 350, 360, 350, 5, 355, 5, 360, 352, + 5, 360, 365, 5, 355, 350, 350, 350, 350, 350, + 350, 350, 350, 350, 4, 4, 5, 4, 4, 350, + 360, 350, 5, 355, 352, 365, 365, 350, 359, 365, + 365, 350, 365, 365, 350, 350, 350, 350, 350, 350, + 350, 350, 350, 350, 55, 66, 92, 129, 280, 282, + 336, 505, 506, 507, 518, 519, 350, 350, 350, 350, + 350, 350, 350, 350, 350, 350, 350, 350, 360, 5, + 350, 350, 350, 350, 4, 4, 365, 366, 4, 492, + 365, 365, 359, 350, 4, 365, 4, 375, 375, 375, + 355, 350, 350, 350, 365, 350, 359, 350, 350, 12, + 5, 5, 4, 350, 350, 4, 365, 360, 350, 350, + 366, 367, 350, 5, 350, 365, 365, 362, 5, 5, + 5, 5, 365, 367, 367, 367, 365, 367, 366, 367, + 367, 365, 367, 367, 367, 365, 367, 367, 365, 360, + 367, 365, 367, 367, 365, 367, 365, 4, 362, 5, + 350, 4, 370, 369, 4, 369, 5, 5, 5, 369, + 369, 368, 4, 4, 5, 5, 5, 5, 369, 369, + 368, 4, 4, 5, 5, 5, 5, 369, 369, 368, + 4, 4, 5, 369, 370, 370, 370, 370, 370, 4, + 370, 370, 4, 369, 369, 370, 370, 370, 370, 370, + 4, 370, 370, 4, 369, 369, 4, 4, 369, 4, + 369, 369, 4, 4, 4, 361, 367, 4, 360, 367, + 350, 360, 4, 367, 367, 360, 4, 350, 350, 350, + 350, 350, 350, 350, 350, 350, 350, 350, 360, 367, + 350, 360, 4, 359, 359, 360, 359, 359, 360, 360, + 359, 359, 350, 350, 350, 350, 350, 350, 355, 350, + 350, 350, 347, 347, 347, 347, 347, 347, 347, 506, + 347, 355, 350, 350, 350, 350, 355, 350, 350, 350, + 350, 350, 350, 365, 350, 300, 354, 355, 350, 350, + 366, 352, 4, 4, 366, 4, 350, 359, 350, 59, + 350, 5, 5, 350, 4, 363, 367, 5, 4, 4, + 5, 360, 5, 366, 367, 366, 366, 366, 5, 4, + 350, 370, 369, 370, 370, 370, 370, 370, 4, 370, + 370, 369, 4, 369, 370, 370, 370, 370, 370, 4, + 370, 370, 369, 370, 369, 4, 370, 370, 369, 4, + 370, 369, 4, 369, 369, 365, 360, 367, 4, 365, + 350, 365, 350, 350, 350, 367, 4, 365, 350, 359, + 367, 350, 359, 367, 367, 360, 350, 4, 372, 372, + 350, 350, 372, 355, 372, 508, 360, 488, 5, 4, + 5, 5, 5, 4, 352, 355, 372, 372, 350, 350, + 355, 350, 350, 350, 350, 350, 359, 350, 5, 508, + 350, 372, 352, 509, 510, 5, 352, 4, 5, 350, + 5, 4, 6, 350, 32, 277, 409, 5, 365, 360, + 409, 350, 369, 370, 369, 369, 370, 370, 369, 370, + 369, 369, 350, 367, 360, 360, 350, 360, 350, 360, + 360, 350, 360, 367, 4, 508, 508, 354, 350, 508, + 4, 508, 365, 5, 4, 4, 508, 508, 354, 350, + 4, 508, 508, 350, 360, 508, 508, 508, 509, 515, + 516, 507, 513, 514, 4, 5, 5, 6, 4, 186, + 298, 342, 350, 400, 360, 32, 277, 374, 4, 370, + 370, 370, 370, 361, 367, 367, 350, 367, 4, 367, + 367, 350, 367, 350, 508, 508, 4, 350, 508, 5, + 350, 508, 4, 350, 508, 365, 515, 517, 518, 347, + 514, 5, 5, 4, 350, 401, 350, 401, 365, 367, + 4, 360, 362, 4, 355, 354, 350, 350, 354, 350, + 360, 518, 352, 5, 5, 350, 350, 350, 350, 374, + 5, 360, 362, 365, 360, 362, 508, 350, 4, 508, + 350, 367, 5, 5, 350, 5, 350, 365, 365, 4, + 508, 4, 5, 5, 5, 354, 354, 508, 508, 508 }; #define yyerrok (yyerrstatus = 0) @@ -6966,147 +7029,152 @@ yyreduce: case 467: #line 1229 "frame/parser.Y" - {fr->getMaskTransparencyCmd();;} + {fr->getMaskSystemCmd();;} break; case 468: -#line 1232 "frame/parser.Y" - {fr->getPanPreserveCmd();;} +#line 1230 "frame/parser.Y" + {fr->getMaskTransparencyCmd();;} break; case 469: -#line 1235 "frame/parser.Y" - {fr->getRGBChannelCmd();;} +#line 1233 "frame/parser.Y" + {fr->getPanPreserveCmd();;} break; case 470: #line 1236 "frame/parser.Y" - {fr->getRGBSystemCmd();;} + {fr->getRGBChannelCmd();;} break; case 471: #line 1237 "frame/parser.Y" - {fr->getRGBViewCmd();;} + {fr->getRGBSystemCmd();;} break; case 472: -#line 1240 "frame/parser.Y" - {fr->getSmoothFunctionCmd();;} +#line 1238 "frame/parser.Y" + {fr->getRGBViewCmd();;} break; case 473: #line 1241 "frame/parser.Y" - {fr->getSmoothRadiusCmd();;} + {fr->getSmoothFunctionCmd();;} break; case 474: #line 1242 "frame/parser.Y" - {fr->getSmoothRadiusMinorCmd();;} + {fr->getSmoothRadiusCmd();;} break; case 475: #line 1243 "frame/parser.Y" - {fr->getSmoothSigmaCmd();;} + {fr->getSmoothRadiusMinorCmd();;} break; case 476: #line 1244 "frame/parser.Y" - {fr->getSmoothSigmaMinorCmd();;} + {fr->getSmoothSigmaCmd();;} break; case 477: #line 1245 "frame/parser.Y" - {fr->getSmoothAngleCmd();;} + {fr->getSmoothSigmaMinorCmd();;} break; - case 482: -#line 1252 "frame/parser.Y" - {fr->get3dRenderMethodCmd();;} + case 478: +#line 1246 "frame/parser.Y" + {fr->getSmoothAngleCmd();;} break; case 483: #line 1253 "frame/parser.Y" - {fr->get3dRenderBackgroundCmd();;} + {fr->get3dRenderMethodCmd();;} break; case 484: #line 1254 "frame/parser.Y" - {fr->get3dScaleCmd();;} + {fr->get3dRenderBackgroundCmd();;} break; case 485: -#line 1257 "frame/parser.Y" - {fr->get3dBorderCmd();;} +#line 1255 "frame/parser.Y" + {fr->get3dScaleCmd();;} break; case 486: #line 1258 "frame/parser.Y" - {fr->get3dBorderColorCmd();;} + {fr->get3dBorderCmd();;} break; case 487: -#line 1261 "frame/parser.Y" - {fr->get3dCompassCmd();;} +#line 1259 "frame/parser.Y" + {fr->get3dBorderColorCmd();;} break; case 488: #line 1262 "frame/parser.Y" - {fr->get3dCompassColorCmd();;} + {fr->get3dCompassCmd();;} break; case 489: -#line 1265 "frame/parser.Y" - {fr->get3dHighliteCmd();;} +#line 1263 "frame/parser.Y" + {fr->get3dCompassColorCmd();;} break; case 490: #line 1266 "frame/parser.Y" - {fr->get3dHighliteColorCmd();;} + {fr->get3dHighliteCmd();;} break; case 491: -#line 1269 "frame/parser.Y" - {fr->get3dViewCmd();;} +#line 1267 "frame/parser.Y" + {fr->get3dHighliteColorCmd();;} break; case 492: #line 1270 "frame/parser.Y" - {fr->get3dViewPointCmd();;} + {fr->get3dViewCmd();;} break; case 493: -#line 1273 "frame/parser.Y" - {fr->getWCSCmd();;} +#line 1271 "frame/parser.Y" + {fr->get3dViewPointCmd();;} break; - case 495: -#line 1275 "frame/parser.Y" - {fr->getWCSNameCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + case 494: +#line 1274 "frame/parser.Y" + {fr->getWCSCmd();;} break; case 496: -#line 1278 "frame/parser.Y" - {fr->getWCSAlignCmd();;} +#line 1276 "frame/parser.Y" + {fr->getWCSNameCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 497: #line 1279 "frame/parser.Y" + {fr->getWCSAlignCmd();;} + break; + + case 498: +#line 1280 "frame/parser.Y" {fr->getWCSAlignPointerCmd();;} break; - case 499: -#line 1283 "frame/parser.Y" + case 500: +#line 1284 "frame/parser.Y" {fr->gridDeleteCmd();;} break; - case 500: -#line 1287 "frame/parser.Y" + case 501: +#line 1288 "frame/parser.Y" {fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), (Coord::SkyFormat)(yyvsp[(3) - (6)].integer), (Grid2d::GridType)(yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].str), (yyvsp[(6) - (6)].str));;} break; - case 501: -#line 1290 "frame/parser.Y" + case 502: +#line 1291 "frame/parser.Y" { // backward compatibility with backup fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (Coord::SkyFrame)(yyvsp[(2) - (5)].integer), @@ -7114,909 +7182,909 @@ yyreduce: ;} break; - case 502: -#line 1297 "frame/parser.Y" - {(yyval.integer)=Grid2d::ANALYSIS;;} - break; - case 503: #line 1298 "frame/parser.Y" - {(yyval.integer)=Grid2d::PUBLICATION;;} + {(yyval.integer)=Grid2d::ANALYSIS;;} break; case 504: -#line 1301 "frame/parser.Y" - {fr->hasAmplifierCmd();;} +#line 1299 "frame/parser.Y" + {(yyval.integer)=Grid2d::PUBLICATION;;} break; - case 507: -#line 1304 "frame/parser.Y" - {fr->hasCropCmd();;} + case 505: +#line 1302 "frame/parser.Y" + {fr->hasAmplifierCmd();;} break; case 508: #line 1305 "frame/parser.Y" - {fr->hasDATAMINCmd();;} + {fr->hasCropCmd();;} break; case 509: #line 1306 "frame/parser.Y" - {fr->hasDATASECCmd();;} + {fr->hasDATAMINCmd();;} break; case 510: #line 1307 "frame/parser.Y" - {fr->hasDetectorCmd();;} + {fr->hasDATASECCmd();;} break; - case 512: -#line 1309 "frame/parser.Y" - {fr->hasGridCmd();;} + case 511: +#line 1308 "frame/parser.Y" + {fr->hasDetectorCmd();;} break; case 513: #line 1310 "frame/parser.Y" - {fr->hasIISCmd();;} + {fr->hasGridCmd();;} break; case 514: #line 1311 "frame/parser.Y" - {fr->hasIRAFMINCmd();;} + {fr->hasIISCmd();;} break; - case 516: -#line 1313 "frame/parser.Y" - {fr->hasPhysicalCmd();;} + case 515: +#line 1312 "frame/parser.Y" + {fr->hasIRAFMINCmd();;} break; case 517: #line 1314 "frame/parser.Y" - {fr->hasImageCmd();;} + {fr->hasPhysicalCmd();;} break; case 518: #line 1315 "frame/parser.Y" - {fr->hasSmoothCmd();;} + {fr->hasImageCmd();;} break; case 519: #line 1316 "frame/parser.Y" - {fr->hasSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->hasSmoothCmd();;} break; - case 521: -#line 1320 "frame/parser.Y" - {fr->hasBinColCmd((yyvsp[(2) - (2)].str));;} + case 520: +#line 1317 "frame/parser.Y" + {fr->hasSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 522: -#line 1323 "frame/parser.Y" - {fr->hasContourCmd();;} +#line 1321 "frame/parser.Y" + {fr->hasBinColCmd((yyvsp[(2) - (2)].str));;} break; case 523: #line 1324 "frame/parser.Y" - {fr->hasContourAuxCmd();;} + {fr->hasContourCmd();;} break; case 524: -#line 1327 "frame/parser.Y" - {fr->hasFitsCmd();;} +#line 1325 "frame/parser.Y" + {fr->hasContourAuxCmd();;} break; case 525: #line 1328 "frame/parser.Y" - {fr->hasFitsBinCmd();;} + {fr->hasFitsCmd();;} break; case 526: #line 1329 "frame/parser.Y" - {fr->hasFitsCubeCmd();;} + {fr->hasFitsBinCmd();;} break; case 527: #line 1330 "frame/parser.Y" - {fr->hasFitsMosaicCmd();;} + {fr->hasFitsCubeCmd();;} break; case 528: -#line 1333 "frame/parser.Y" - {fr->hasMarkerHighlitedCmd();;} +#line 1331 "frame/parser.Y" + {fr->hasFitsMosaicCmd();;} break; case 529: #line 1334 "frame/parser.Y" - {fr->hasMarkerSelectedCmd();;} + {fr->hasMarkerHighlitedCmd();;} break; case 530: #line 1335 "frame/parser.Y" - {fr->hasMarkerPasteCmd();;} + {fr->hasMarkerSelectedCmd();;} break; case 531: #line 1336 "frame/parser.Y" - {fr->hasMarkerUndoCmd();;} + {fr->hasMarkerPasteCmd();;} break; case 532: -#line 1339 "frame/parser.Y" - {fr->hasWCSCmd((Coord::CoordSystem)(yyvsp[(1) - (1)].integer));;} +#line 1337 "frame/parser.Y" + {fr->hasMarkerUndoCmd();;} break; case 533: #line 1340 "frame/parser.Y" - {fr->hasWCSCelCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->hasWCSCmd((Coord::CoordSystem)(yyvsp[(1) - (1)].integer));;} break; case 534: #line 1341 "frame/parser.Y" - {fr->hasWCSEquCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->hasWCSCelCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 535: #line 1342 "frame/parser.Y" - {fr->hasWCSLinearCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->hasWCSEquCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 536: #line 1343 "frame/parser.Y" - {fr->hasWCSAltCmd();;} + {fr->hasWCSLinearCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 537: #line 1344 "frame/parser.Y" - {fr->hasWCS3DCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->hasWCSAltCmd();;} break; case 538: -#line 1347 "frame/parser.Y" - {fr->iisCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} +#line 1345 "frame/parser.Y" + {fr->hasWCS3DCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 539: #line 1348 "frame/parser.Y" - {fr->iisEraseCmd();;} + {fr->iisCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 540: #line 1349 "frame/parser.Y" - {fr->iisMessageCmd((yyvsp[(2) - (2)].str));;} + {fr->iisEraseCmd();;} break; - case 543: -#line 1353 "frame/parser.Y" - {fr->iisSetCmd((const char*)(yyvsp[(2) - (6)].ptr),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} + case 541: +#line 1350 "frame/parser.Y" + {fr->iisMessageCmd((yyvsp[(2) - (2)].str));;} break; case 544: #line 1354 "frame/parser.Y" - {fr->iisUpdateCmd();;} + {fr->iisSetCmd((const char*)(yyvsp[(2) - (6)].ptr),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 545: -#line 1357 "frame/parser.Y" - {fr->iisWCSCmd(Matrix((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real)),Vector((yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].real)),(yyvsp[(10) - (10)].integer));;} +#line 1355 "frame/parser.Y" + {fr->iisUpdateCmd();;} break; case 546: -#line 1360 "frame/parser.Y" - {fr->iisSetFileNameCmd((yyvsp[(1) - (1)].str));;} +#line 1358 "frame/parser.Y" + {fr->iisWCSCmd(Matrix((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real)),Vector((yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].real)),(yyvsp[(10) - (10)].integer));;} break; case 547: #line 1361 "frame/parser.Y" - {fr->iisSetFileNameCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].integer));;} + {fr->iisSetFileNameCmd((yyvsp[(1) - (1)].str));;} break; case 548: -#line 1365 "frame/parser.Y" - {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),Coord::CANVAS);;} +#line 1362 "frame/parser.Y" + {fr->iisSetFileNameCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].integer));;} break; case 549: -#line 1367 "frame/parser.Y" - {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),(Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;} +#line 1366 "frame/parser.Y" + {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),Coord::CANVAS);;} break; case 550: #line 1368 "frame/parser.Y" - {fr->iisCursorModeCmd((yyvsp[(2) - (2)].integer));;} + {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),(Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;} break; - case 557: -#line 1380 "frame/parser.Y" - {fr->loadArrAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} + case 551: +#line 1369 "frame/parser.Y" + {fr->iisCursorModeCmd((yyvsp[(2) - (2)].integer));;} break; case 558: -#line 1382 "frame/parser.Y" - {fr->loadArrAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1381 "frame/parser.Y" + {fr->loadArrAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 559: -#line 1384 "frame/parser.Y" - {fr->loadArrChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1383 "frame/parser.Y" + {fr->loadArrAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 560: #line 1385 "frame/parser.Y" - {fr->loadArrMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} + {fr->loadArrChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 561: -#line 1387 "frame/parser.Y" - {fr->loadArrMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} +#line 1386 "frame/parser.Y" + {fr->loadArrMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 562: -#line 1389 "frame/parser.Y" - {fr->loadArrShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} +#line 1388 "frame/parser.Y" + {fr->loadArrMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 563: -#line 1391 "frame/parser.Y" - {fr->loadArrSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1390 "frame/parser.Y" + {fr->loadArrShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 564: -#line 1393 "frame/parser.Y" - {fr->loadArrSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1392 "frame/parser.Y" + {fr->loadArrSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 565: -#line 1395 "frame/parser.Y" - {fr->loadArrVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1394 "frame/parser.Y" + {fr->loadArrSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 567: -#line 1399 "frame/parser.Y" - {fr->loadArrayRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + case 566: +#line 1396 "frame/parser.Y" + {fr->loadArrVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 568: #line 1400 "frame/parser.Y" - {fr->loadArrayRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadArrayRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 569: #line 1401 "frame/parser.Y" - {fr->loadArrayRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadArrayRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 570: #line 1402 "frame/parser.Y" - {fr->loadArrayRGBCubeMMapCmd((yyvsp[(1) - (2)].str));;} + {fr->loadArrayRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 571: #line 1403 "frame/parser.Y" - {fr->loadArrayRGBCubeMMapIncrCmd((yyvsp[(1) - (2)].str));;} + {fr->loadArrayRGBCubeMMapCmd((yyvsp[(1) - (2)].str));;} break; case 572: -#line 1405 "frame/parser.Y" - {fr->loadArrayRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer), (yyvsp[(1) - (4)].str));;} +#line 1404 "frame/parser.Y" + {fr->loadArrayRGBCubeMMapIncrCmd((yyvsp[(1) - (2)].str));;} break; case 573: #line 1406 "frame/parser.Y" - {fr->loadArrayRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadArrayRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer), (yyvsp[(1) - (4)].str));;} break; case 574: #line 1407 "frame/parser.Y" - {fr->loadArrayRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadArrayRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 575: #line 1408 "frame/parser.Y" - {fr->loadArrayRGBCubeVarCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadArrayRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 576: -#line 1411 "frame/parser.Y" - {fr->loadENVISMMapCmd((yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str));;} +#line 1409 "frame/parser.Y" + {fr->loadArrayRGBCubeVarCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 577: -#line 1415 "frame/parser.Y" - {fr->loadFitsAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1412 "frame/parser.Y" + {fr->loadENVISMMapCmd((yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str));;} break; case 578: -#line 1417 "frame/parser.Y" - {fr->loadFitsAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1416 "frame/parser.Y" + {fr->loadFitsAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 579: -#line 1419 "frame/parser.Y" - {fr->loadFitsChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1418 "frame/parser.Y" + {fr->loadFitsAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 580: -#line 1421 "frame/parser.Y" - {fr->loadFitsMMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1420 "frame/parser.Y" + {fr->loadFitsChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 581: -#line 1423 "frame/parser.Y" - {fr->loadFitsSMMapCmd((yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} +#line 1422 "frame/parser.Y" + {fr->loadFitsMMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 582: -#line 1425 "frame/parser.Y" - {fr->loadFitsMMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1424 "frame/parser.Y" + {fr->loadFitsSMMapCmd((yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 583: -#line 1427 "frame/parser.Y" - {fr->loadFitsShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} +#line 1426 "frame/parser.Y" + {fr->loadFitsMMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 584: -#line 1429 "frame/parser.Y" - {fr->loadFitsSShareCmd((Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), - (Base::LayerType)(yyvsp[(7) - (7)].integer));;} +#line 1428 "frame/parser.Y" + {fr->loadFitsShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 585: -#line 1432 "frame/parser.Y" - {fr->loadFitsSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1430 "frame/parser.Y" + {fr->loadFitsSShareCmd((Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), + (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; case 586: -#line 1434 "frame/parser.Y" - {fr->loadFitsSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1433 "frame/parser.Y" + {fr->loadFitsSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 587: -#line 1436 "frame/parser.Y" - {fr->loadFitsVarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} +#line 1435 "frame/parser.Y" + {fr->loadFitsSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 593: -#line 1444 "frame/parser.Y" - {fr->loadSliceAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + case 588: +#line 1437 "frame/parser.Y" + {fr->loadFitsVarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 594: #line 1445 "frame/parser.Y" - {fr->loadSliceAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadSliceAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 595: #line 1446 "frame/parser.Y" - {fr->loadSliceChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadSliceAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 596: #line 1447 "frame/parser.Y" - {fr->loadSliceMMapCmd((yyvsp[(1) - (3)].str));;} + {fr->loadSliceChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 597: #line 1448 "frame/parser.Y" - {fr->loadSliceSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} + {fr->loadSliceMMapCmd((yyvsp[(1) - (3)].str));;} break; case 598: #line 1449 "frame/parser.Y" - {fr->loadSliceMMapIncrCmd((yyvsp[(1) - (3)].str));;} + {fr->loadSliceSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} break; case 599: -#line 1451 "frame/parser.Y" - {fr->loadSliceShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} +#line 1450 "frame/parser.Y" + {fr->loadSliceMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 600: -#line 1453 "frame/parser.Y" - {fr->loadSliceSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} +#line 1452 "frame/parser.Y" + {fr->loadSliceShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 601: #line 1454 "frame/parser.Y" - {fr->loadSliceSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadSliceSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} break; case 602: #line 1455 "frame/parser.Y" - {fr->loadSliceSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadSliceSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 603: #line 1456 "frame/parser.Y" - {fr->loadSliceVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} + {fr->loadSliceSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 604: -#line 1459 "frame/parser.Y" - {fr->loadExtCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} +#line 1457 "frame/parser.Y" + {fr->loadSliceVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 605: #line 1460 "frame/parser.Y" - {fr->loadExtCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 606: #line 1461 "frame/parser.Y" - {fr->loadExtCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 607: #line 1462 "frame/parser.Y" - {fr->loadExtCubeMMapCmd((yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 608: #line 1463 "frame/parser.Y" - {fr->loadExtCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeMMapCmd((yyvsp[(1) - (3)].str));;} break; case 609: -#line 1465 "frame/parser.Y" - {fr->loadExtCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} +#line 1464 "frame/parser.Y" + {fr->loadExtCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 610: #line 1466 "frame/parser.Y" - {fr->loadExtCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 611: #line 1467 "frame/parser.Y" - {fr->loadExtCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadExtCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 612: #line 1468 "frame/parser.Y" + {fr->loadExtCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + break; + + case 613: +#line 1469 "frame/parser.Y" {fr->loadExtCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; - case 618: -#line 1479 "frame/parser.Y" + case 619: +#line 1480 "frame/parser.Y" {fr->loadMosaicImageAllocCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 619: -#line 1482 "frame/parser.Y" + case 620: +#line 1483 "frame/parser.Y" {fr->loadMosaicImageAllocGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 620: -#line 1485 "frame/parser.Y" + case 621: +#line 1486 "frame/parser.Y" {fr->loadMosaicImageChannelCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 621: -#line 1488 "frame/parser.Y" + case 622: +#line 1489 "frame/parser.Y" {fr->loadMosaicImageMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 622: -#line 1491 "frame/parser.Y" + case 623: +#line 1492 "frame/parser.Y" {fr->loadMosaicImageMMapIncrCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 623: -#line 1494 "frame/parser.Y" + case 624: +#line 1495 "frame/parser.Y" {fr->loadMosaicImageShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; - case 624: -#line 1497 "frame/parser.Y" + case 625: +#line 1498 "frame/parser.Y" {fr->loadMosaicImageSocketCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 625: -#line 1500 "frame/parser.Y" + case 626: +#line 1501 "frame/parser.Y" {fr->loadMosaicImageSocketGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 626: -#line 1503 "frame/parser.Y" + case 627: +#line 1504 "frame/parser.Y" {fr->loadMosaicImageVarCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 627: -#line 1508 "frame/parser.Y" + case 628: +#line 1509 "frame/parser.Y" {fr->loadMosaicAllocCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 628: -#line 1511 "frame/parser.Y" + case 629: +#line 1512 "frame/parser.Y" {fr->loadMosaicAllocGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 629: -#line 1514 "frame/parser.Y" + case 630: +#line 1515 "frame/parser.Y" {fr->loadMosaicChannelCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 630: -#line 1517 "frame/parser.Y" + case 631: +#line 1518 "frame/parser.Y" {fr->loadMosaicMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 631: -#line 1520 "frame/parser.Y" + case 632: +#line 1521 "frame/parser.Y" {fr->loadMosaicSMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 632: -#line 1523 "frame/parser.Y" + case 633: +#line 1524 "frame/parser.Y" {fr->loadMosaicMMapIncrCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 633: -#line 1526 "frame/parser.Y" + case 634: +#line 1527 "frame/parser.Y" {fr->loadMosaicShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; - case 634: -#line 1529 "frame/parser.Y" + case 635: +#line 1530 "frame/parser.Y" {fr->loadMosaicSShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; - case 635: -#line 1532 "frame/parser.Y" + case 636: +#line 1533 "frame/parser.Y" {fr->loadMosaicSocketCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 636: -#line 1535 "frame/parser.Y" + case 637: +#line 1536 "frame/parser.Y" {fr->loadMosaicSocketGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; - case 637: -#line 1538 "frame/parser.Y" + case 638: +#line 1539 "frame/parser.Y" {fr->loadMosaicVarCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 638: -#line 1543 "frame/parser.Y" + case 639: +#line 1544 "frame/parser.Y" {fr->loadMosaicImageAllocCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 639: -#line 1546 "frame/parser.Y" + case 640: +#line 1547 "frame/parser.Y" {fr->loadMosaicImageAllocGZCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 640: -#line 1549 "frame/parser.Y" + case 641: +#line 1550 "frame/parser.Y" {fr->loadMosaicImageChannelCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 641: -#line 1552 "frame/parser.Y" + case 642: +#line 1553 "frame/parser.Y" {fr->loadMosaicImageMMapCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 642: -#line 1555 "frame/parser.Y" + case 643: +#line 1556 "frame/parser.Y" {fr->loadMosaicImageMMapIncrCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 643: -#line 1558 "frame/parser.Y" + case 644: +#line 1559 "frame/parser.Y" {fr->loadMosaicImageShareCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; - case 644: -#line 1561 "frame/parser.Y" + case 645: +#line 1562 "frame/parser.Y" {fr->loadMosaicImageSocketCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 645: -#line 1564 "frame/parser.Y" + case 646: +#line 1565 "frame/parser.Y" {fr->loadMosaicImageSocketGZCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 646: -#line 1567 "frame/parser.Y" + case 647: +#line 1568 "frame/parser.Y" {fr->loadMosaicImageVarCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; - case 647: -#line 1572 "frame/parser.Y" + case 648: +#line 1573 "frame/parser.Y" {fr->loadMosaicAllocCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 648: -#line 1575 "frame/parser.Y" + case 649: +#line 1576 "frame/parser.Y" {fr->loadMosaicAllocGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 649: -#line 1578 "frame/parser.Y" + case 650: +#line 1579 "frame/parser.Y" {fr->loadMosaicChannelCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 650: -#line 1581 "frame/parser.Y" + case 651: +#line 1582 "frame/parser.Y" {fr->loadMosaicMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 651: -#line 1584 "frame/parser.Y" + case 652: +#line 1585 "frame/parser.Y" {fr->loadMosaicSMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; - case 652: -#line 1587 "frame/parser.Y" + case 653: +#line 1588 "frame/parser.Y" {fr->loadMosaicMMapIncrCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 653: -#line 1590 "frame/parser.Y" + case 654: +#line 1591 "frame/parser.Y" {fr->loadMosaicShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; - case 654: -#line 1593 "frame/parser.Y" + case 655: +#line 1594 "frame/parser.Y" {fr->loadMosaicSShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (8)].integer), (Base::ShmType)(yyvsp[(4) - (8)].integer), (yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(2) - (8)].str), (Base::LayerType)(yyvsp[(8) - (8)].integer));;} break; - case 655: -#line 1596 "frame/parser.Y" + case 656: +#line 1597 "frame/parser.Y" {fr->loadMosaicSocketCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 656: -#line 1599 "frame/parser.Y" + case 657: +#line 1600 "frame/parser.Y" {fr->loadMosaicSocketGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; - case 657: -#line 1602 "frame/parser.Y" + case 658: +#line 1603 "frame/parser.Y" {fr->loadMosaicVarCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; - case 658: -#line 1607 "frame/parser.Y" - {fr->loadMosaicImageWFPC2AllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} - break; - case 659: #line 1608 "frame/parser.Y" - {fr->loadMosaicImageWFPC2AllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2AllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 660: #line 1609 "frame/parser.Y" - {fr->loadMosaicImageWFPC2ChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2AllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 661: #line 1610 "frame/parser.Y" - {fr->loadMosaicImageWFPC2MMapCmd((yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2ChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 662: #line 1611 "frame/parser.Y" - {fr->loadMosaicImageWFPC2MMapIncrCmd((yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2MMapCmd((yyvsp[(1) - (3)].str));;} break; case 663: -#line 1613 "frame/parser.Y" - {fr->loadMosaicImageWFPC2ShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} +#line 1612 "frame/parser.Y" + {fr->loadMosaicImageWFPC2MMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 664: #line 1614 "frame/parser.Y" - {fr->loadMosaicImageWFPC2SocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2ShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 665: #line 1615 "frame/parser.Y" - {fr->loadMosaicImageWFPC2SocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadMosaicImageWFPC2SocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 666: #line 1616 "frame/parser.Y" - {fr->loadMosaicImageWFPC2VarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} + {fr->loadMosaicImageWFPC2SocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 667: -#line 1618 "frame/parser.Y" - {fr->loadRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} +#line 1617 "frame/parser.Y" + {fr->loadMosaicImageWFPC2VarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 668: #line 1619 "frame/parser.Y" - {fr->loadRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 669: #line 1620 "frame/parser.Y" - {fr->loadRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 670: #line 1621 "frame/parser.Y" - {fr->loadRGBCubeMMapCmd((yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 671: #line 1622 "frame/parser.Y" - {fr->loadRGBCubeSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} + {fr->loadRGBCubeMMapCmd((yyvsp[(1) - (3)].str));;} break; case 672: #line 1623 "frame/parser.Y" - {fr->loadRGBCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} break; case 673: -#line 1625 "frame/parser.Y" - {fr->loadRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} +#line 1624 "frame/parser.Y" + {fr->loadRGBCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 674: -#line 1627 "frame/parser.Y" - {fr->loadRGBCubeSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} +#line 1626 "frame/parser.Y" + {fr->loadRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 675: #line 1628 "frame/parser.Y" - {fr->loadRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} break; case 676: #line 1629 "frame/parser.Y" - {fr->loadRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 677: #line 1630 "frame/parser.Y" - {fr->loadRGBCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} + {fr->loadRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 678: -#line 1633 "frame/parser.Y" - {fr->loadRGBImageAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} +#line 1631 "frame/parser.Y" + {fr->loadRGBCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 679: #line 1634 "frame/parser.Y" - {fr->loadRGBImageAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 680: #line 1635 "frame/parser.Y" - {fr->loadRGBImageChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 681: #line 1636 "frame/parser.Y" - {fr->loadRGBImageMMapCmd((yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 682: #line 1637 "frame/parser.Y" - {fr->loadRGBImageMMapIncrCmd((yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageMMapCmd((yyvsp[(1) - (3)].str));;} break; case 683: -#line 1639 "frame/parser.Y" - {fr->loadRGBImageShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} +#line 1638 "frame/parser.Y" + {fr->loadRGBImageMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 684: #line 1640 "frame/parser.Y" - {fr->loadRGBImageSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 685: #line 1641 "frame/parser.Y" - {fr->loadRGBImageSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} + {fr->loadRGBImageSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 686: #line 1642 "frame/parser.Y" - {fr->loadRGBImageVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} + {fr->loadRGBImageSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 687: -#line 1646 "frame/parser.Y" - {fr->loadNRRDAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1643 "frame/parser.Y" + {fr->loadRGBImageVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 688: -#line 1648 "frame/parser.Y" - {fr->loadNRRDChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1647 "frame/parser.Y" + {fr->loadNRRDAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 689: #line 1649 "frame/parser.Y" - {fr->loadNRRDMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} + {fr->loadNRRDChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 690: -#line 1651 "frame/parser.Y" - {fr->loadNRRDShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} +#line 1650 "frame/parser.Y" + {fr->loadNRRDMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 691: -#line 1653 "frame/parser.Y" - {fr->loadNRRDSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1652 "frame/parser.Y" + {fr->loadNRRDShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 692: -#line 1655 "frame/parser.Y" - {fr->loadNRRDVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} +#line 1654 "frame/parser.Y" + {fr->loadNRRDSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 693: -#line 1658 "frame/parser.Y" - {fr->loadPhotoCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));;} +#line 1656 "frame/parser.Y" + {fr->loadNRRDVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 694: #line 1659 "frame/parser.Y" - {fr->loadSlicePhotoCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;} + {fr->loadPhotoCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));;} break; case 695: -#line 1662 "frame/parser.Y" - {fr->loadIncrDataCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} +#line 1660 "frame/parser.Y" + {fr->loadSlicePhotoCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 696: #line 1663 "frame/parser.Y" - {fr->loadIncrMinMaxCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} + {fr->loadIncrDataCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 697: #line 1664 "frame/parser.Y" - {fr->loadIncrEndCmd();;} + {fr->loadIncrMinMaxCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 698: -#line 1667 "frame/parser.Y" +#line 1665 "frame/parser.Y" + {fr->loadIncrEndCmd();;} + break; + + case 699: +#line 1668 "frame/parser.Y" { #ifdef MAC_OSX_TK fr->macosxPrintCmd(); @@ -8024,43 +8092,43 @@ yyreduce: ;} break; - case 699: -#line 1674 "frame/parser.Y" - {fr->magnifierCmd((yyvsp[(1) - (1)].integer));;} - break; - case 700: #line 1675 "frame/parser.Y" - {fr->magnifierGraphicsCmd((yyvsp[(2) - (2)].integer));;} + {fr->magnifierCmd((yyvsp[(1) - (1)].integer));;} break; case 701: #line 1676 "frame/parser.Y" - {fr->magnifierCursorCmd((yyvsp[(2) - (2)].integer));;} + {fr->magnifierGraphicsCmd((yyvsp[(2) - (2)].integer));;} break; case 702: #line 1677 "frame/parser.Y" - {fr->magnifierColorCmd((yyvsp[(2) - (2)].str));;} + {fr->magnifierCursorCmd((yyvsp[(2) - (2)].integer));;} break; case 703: #line 1678 "frame/parser.Y" - {fr->magnifierCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} + {fr->magnifierColorCmd((yyvsp[(2) - (2)].str));;} break; case 704: #line 1679 "frame/parser.Y" - {fr->updateMagnifierCmd(Vector((yyvsp[(2) - (3)].real), (yyvsp[(3) - (3)].real)));;} + {fr->magnifierCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} break; case 705: #line 1680 "frame/parser.Y" - {fr->magnifierZoomCmd((yyvsp[(2) - (2)].real));;} + {fr->updateMagnifierCmd(Vector((yyvsp[(2) - (3)].real), (yyvsp[(3) - (3)].real)));;} break; case 706: -#line 1684 "frame/parser.Y" +#line 1681 "frame/parser.Y" + {fr->magnifierZoomCmd((yyvsp[(2) - (2)].real));;} + break; + + case 707: +#line 1685 "frame/parser.Y" { fr->matchCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].str),(Coord::CoordSystem)(yyvsp[(3) - (12)].integer),(Coord::SkyFrame)(yyvsp[(4) - (12)].integer), (yyvsp[(5) - (12)].str),(yyvsp[(6) - (12)].str),(Coord::CoordSystem)(yyvsp[(7) - (12)].integer),(Coord::SkyFrame)(yyvsp[(8) - (12)].integer), @@ -8069,886 +8137,886 @@ yyreduce: ;} break; - case 708: -#line 1692 "frame/parser.Y" - {fr->markerColorCmd((yyvsp[(2) - (2)].str));;} - break; - case 709: #line 1693 "frame/parser.Y" - {fr->markerCopyCmd();;} + {fr->markerColorCmd((yyvsp[(2) - (2)].str));;} break; case 710: -#line 1695 "frame/parser.Y" - {fr->markerCommandCmd((Base::MarkerFormat)(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} +#line 1694 "frame/parser.Y" + {fr->markerCopyCmd();;} break; case 711: -#line 1697 "frame/parser.Y" - {fr->markerCommandVarCmd((Base::MarkerFormat)(yyvsp[(2) - (4)].integer),(yyvsp[(4) - (4)].str));;} +#line 1696 "frame/parser.Y" + {fr->markerCommandCmd((Base::MarkerFormat)(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 712: #line 1698 "frame/parser.Y" - {fr->markerCompositeDeleteCmd();;} + {fr->markerCommandVarCmd((Base::MarkerFormat)(yyvsp[(2) - (4)].integer),(yyvsp[(4) - (4)].str));;} break; case 713: #line 1699 "frame/parser.Y" - {maperr =0;;} + {fr->markerCompositeDeleteCmd();;} break; - case 715: + case 714: #line 1700 "frame/parser.Y" - {fr->markerCutCmd();;} + {maperr =0;;} break; case 716: #line 1701 "frame/parser.Y" - {fr->markerDeleteCmd();;} + {fr->markerCutCmd();;} break; case 717: #line 1702 "frame/parser.Y" - {fr->markerDeleteAllCmd();;} + {fr->markerDeleteCmd();;} break; - case 719: -#line 1704 "frame/parser.Y" - {fr->markerEpsilonCmd((yyvsp[(2) - (2)].integer));;} + case 718: +#line 1703 "frame/parser.Y" + {fr->markerDeleteAllCmd();;} break; case 720: #line 1705 "frame/parser.Y" - {fr->markerFontCmd((yyvsp[(2) - (2)].str));;} + {fr->markerEpsilonCmd((yyvsp[(2) - (2)].integer));;} break; case 721: -#line 1707 "frame/parser.Y" - {fr->markerHighliteAllCmd();;} +#line 1706 "frame/parser.Y" + {fr->markerFontCmd((yyvsp[(2) - (2)].str));;} break; case 722: -#line 1709 "frame/parser.Y" - {fr->markerHighliteOnlyCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 1708 "frame/parser.Y" + {fr->markerHighliteAllCmd();;} break; case 723: -#line 1711 "frame/parser.Y" - {fr->markerHighliteToggleCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 1710 "frame/parser.Y" + {fr->markerHighliteOnlyCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 724: -#line 1714 "frame/parser.Y" - {fr->markerAnalysisCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisTask)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;} +#line 1712 "frame/parser.Y" + {fr->markerHighliteToggleCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 725: -#line 1716 "frame/parser.Y" - {fr->markerAngleCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].real));;} +#line 1715 "frame/parser.Y" + {fr->markerAnalysisCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisTask)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;} break; case 726: #line 1717 "frame/parser.Y" - {fr->markerAngleCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].real));;} + {fr->markerAngleCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].real));;} break; case 727: -#line 1719 "frame/parser.Y" - {fr->markerAngleCmd((yyvsp[(1) - (5)].integer),(yyvsp[(3) - (5)].real),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 1718 "frame/parser.Y" + {fr->markerAngleCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].real));;} break; case 728: -#line 1722 "frame/parser.Y" +#line 1720 "frame/parser.Y" + {fr->markerAngleCmd((yyvsp[(1) - (5)].integer),(yyvsp[(3) - (5)].real),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} + break; + + case 729: +#line 1723 "frame/parser.Y" {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (8)].integer), (yyvsp[(4) - (8)].real), (yyvsp[(5) - (8)].real), (yyvsp[(6) - (8)].integer), (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;} break; - case 729: -#line 1725 "frame/parser.Y" + case 730: +#line 1726 "frame/parser.Y" {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; - case 730: -#line 1727 "frame/parser.Y" + case 731: +#line 1728 "frame/parser.Y" {fr->markerBoxFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; - case 731: -#line 1730 "frame/parser.Y" + case 732: +#line 1731 "frame/parser.Y" {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real), (yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; - case 732: -#line 1733 "frame/parser.Y" + case 733: +#line 1734 "frame/parser.Y" {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; - case 733: -#line 1736 "frame/parser.Y" + case 734: +#line 1737 "frame/parser.Y" {fr->markerBoxRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; - case 734: -#line 1739 "frame/parser.Y" + case 735: +#line 1740 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;} break; - case 735: -#line 1743 "frame/parser.Y" + case 736: +#line 1744 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;} break; - case 736: -#line 1747 "frame/parser.Y" + case 737: +#line 1748 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer), (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;} break; - case 737: -#line 1752 "frame/parser.Y" + case 738: +#line 1753 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; - case 738: -#line 1756 "frame/parser.Y" - {fr->markerCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} - break; - case 739: #line 1757 "frame/parser.Y" - {fr->markerCircleFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} break; case 740: -#line 1759 "frame/parser.Y" - {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} +#line 1758 "frame/parser.Y" + {fr->markerCircleFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 741: #line 1760 "frame/parser.Y" - {fr->markerColorCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} + {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 742: -#line 1762 "frame/parser.Y" - {fr->markerCompassArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} +#line 1761 "frame/parser.Y" + {fr->markerColorCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 743: -#line 1764 "frame/parser.Y" - {fr->markerCompassLabelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} +#line 1763 "frame/parser.Y" + {fr->markerCompassArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 744: -#line 1766 "frame/parser.Y" - {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} +#line 1765 "frame/parser.Y" + {fr->markerCompassLabelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} break; case 745: -#line 1768 "frame/parser.Y" - {fr->markerCompassSystemCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 1767 "frame/parser.Y" + {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 746: #line 1769 "frame/parser.Y" - {fr->markerCompositeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerCompassSystemCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 747: -#line 1771 "frame/parser.Y" - {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real), (yyvsp[(6) - (9)].integer), (yyvsp[(7) - (9)].real), (yyvsp[(8) - (9)].real), (yyvsp[(9) - (9)].integer));;} +#line 1770 "frame/parser.Y" + {fr->markerCompositeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 748: -#line 1773 "frame/parser.Y" - {fr->markerCpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real), (yyvsp[(8) - (10)].real), (yyvsp[(9) - (10)].integer));;} +#line 1772 "frame/parser.Y" + {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real), (yyvsp[(6) - (9)].integer), (yyvsp[(7) - (9)].real), (yyvsp[(8) - (9)].real), (yyvsp[(9) - (9)].integer));;} break; case 749: -#line 1776 "frame/parser.Y" - {fr->markerCpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), (yyvsp[(7) - (11)].real), (yyvsp[(8) - (11)].real), (yyvsp[(9) - (11)].integer), - (Coord::CoordSystem)(yyvsp[(10) - (11)].integer), (Coord::SkyFrame)(yyvsp[(11) - (11)].integer));;} +#line 1774 "frame/parser.Y" + {fr->markerCpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real), (yyvsp[(8) - (10)].real), (yyvsp[(9) - (10)].integer));;} break; case 750: -#line 1780 "frame/parser.Y" - {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), - (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} +#line 1777 "frame/parser.Y" + {fr->markerCpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), (yyvsp[(7) - (11)].real), (yyvsp[(8) - (11)].real), (yyvsp[(9) - (11)].integer), + (Coord::CoordSystem)(yyvsp[(10) - (11)].integer), (Coord::SkyFrame)(yyvsp[(11) - (11)].integer));;} break; case 751: -#line 1784 "frame/parser.Y" - {fr->markerAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1781 "frame/parser.Y" + {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), + (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 752: -#line 1786 "frame/parser.Y" - {fr->markerBoxAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1785 "frame/parser.Y" + {fr->markerAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 753: -#line 1788 "frame/parser.Y" - {fr->markerBpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1787 "frame/parser.Y" + {fr->markerBoxAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 754: -#line 1790 "frame/parser.Y" - {fr->markerBpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1789 "frame/parser.Y" + {fr->markerBpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 755: -#line 1792 "frame/parser.Y" - {fr->markerEllipseAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1791 "frame/parser.Y" + {fr->markerBpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 756: -#line 1794 "frame/parser.Y" - {fr->markerEpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1793 "frame/parser.Y" + {fr->markerEllipseAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 757: -#line 1796 "frame/parser.Y" - {fr->markerEpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1795 "frame/parser.Y" + {fr->markerEpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 758: -#line 1798 "frame/parser.Y" - {fr->markerCpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1797 "frame/parser.Y" + {fr->markerEpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 759: -#line 1800 "frame/parser.Y" - {fr->markerCpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} +#line 1799 "frame/parser.Y" + {fr->markerCpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 760: -#line 1802 "frame/parser.Y" - {fr->markerPolygonCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} +#line 1801 "frame/parser.Y" + {fr->markerCpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 761: -#line 1804 "frame/parser.Y" - {fr->markerSegmentCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} +#line 1803 "frame/parser.Y" + {fr->markerPolygonCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} break; case 762: -#line 1806 "frame/parser.Y" - {fr->markerDeleteCmd((yyvsp[(1) - (2)].integer));;} +#line 1805 "frame/parser.Y" + {fr->markerSegmentCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} break; case 763: -#line 1808 "frame/parser.Y" - {fr->markerAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1807 "frame/parser.Y" + {fr->markerDeleteCmd((yyvsp[(1) - (2)].integer));;} break; case 764: -#line 1810 "frame/parser.Y" - {fr->markerBoxAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1809 "frame/parser.Y" + {fr->markerAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 765: #line 1811 "frame/parser.Y" - {fr->markerBpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerBoxAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 766: -#line 1813 "frame/parser.Y" - {fr->markerEllipseAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1812 "frame/parser.Y" + {fr->markerBpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 767: -#line 1815 "frame/parser.Y" - {fr->markerDeleteCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].str));;} +#line 1814 "frame/parser.Y" + {fr->markerEllipseAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 768: #line 1816 "frame/parser.Y" - {fr->markerEpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerDeleteCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].str));;} break; case 769: #line 1817 "frame/parser.Y" - {fr->markerCpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerEpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 770: -#line 1819 "frame/parser.Y" - {fr->markerPolygonDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} +#line 1818 "frame/parser.Y" + {fr->markerCpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 771: -#line 1821 "frame/parser.Y" - {fr->markerSegmentDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} +#line 1820 "frame/parser.Y" + {fr->markerPolygonDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 772: #line 1822 "frame/parser.Y" - {fr->markerDeleteTagCmd((yyvsp[(1) - (3)].integer));;} + {fr->markerSegmentDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 773: #line 1823 "frame/parser.Y" - {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].str));;} + {fr->markerDeleteTagCmd((yyvsp[(1) - (3)].integer));;} break; case 774: #line 1824 "frame/parser.Y" - {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].str));;} break; case 775: -#line 1826 "frame/parser.Y" - {fr->markerEditBeginCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1825 "frame/parser.Y" + {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 776: #line 1827 "frame/parser.Y" - {fr->markerEllipseFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerEditBeginCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 777: -#line 1829 "frame/parser.Y" +#line 1828 "frame/parser.Y" + {fr->markerEllipseFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + break; + + case 778: +#line 1830 "frame/parser.Y" {fr->markerEllipseRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real), (yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; - case 778: -#line 1833 "frame/parser.Y" + case 779: +#line 1834 "frame/parser.Y" {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; - case 779: -#line 1836 "frame/parser.Y" + case 780: +#line 1837 "frame/parser.Y" {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; - case 780: -#line 1839 "frame/parser.Y" + case 781: +#line 1840 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;} break; - case 781: -#line 1843 "frame/parser.Y" + case 782: +#line 1844 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;} break; - case 782: -#line 1847 "frame/parser.Y" + case 783: +#line 1848 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer), (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;} break; - case 783: -#line 1852 "frame/parser.Y" + case 784: +#line 1853 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; - case 784: -#line 1856 "frame/parser.Y" - {fr->markerFontCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} - break; - case 785: #line 1857 "frame/parser.Y" - {fr->markerHighliteCmd((yyvsp[(1) - (2)].integer));;} + {fr->markerFontCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 786: #line 1858 "frame/parser.Y" - {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].integer));;} + {fr->markerHighliteCmd((yyvsp[(1) - (2)].integer));;} break; case 787: -#line 1860 "frame/parser.Y" - {fr->markerLineArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} +#line 1859 "frame/parser.Y" + {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].integer));;} break; case 788: -#line 1862 "frame/parser.Y" - {fr->markerLineCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), - (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;} +#line 1861 "frame/parser.Y" + {fr->markerLineArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 789: -#line 1866 "frame/parser.Y" - {fr->markerMoveCmd((yyvsp[(1) - (4)].integer), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 1863 "frame/parser.Y" + {fr->markerLineCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), + (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;} break; case 790: #line 1867 "frame/parser.Y" - {fr->markerFrontCmd((yyvsp[(1) - (3)].integer));;} + {fr->markerMoveCmd((yyvsp[(1) - (4)].integer), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 791: #line 1868 "frame/parser.Y" - {fr->markerBackCmd((yyvsp[(1) - (3)].integer));;} + {fr->markerFrontCmd((yyvsp[(1) - (3)].integer));;} break; case 792: -#line 1870 "frame/parser.Y" - {fr->markerMoveToCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} +#line 1869 "frame/parser.Y" + {fr->markerBackCmd((yyvsp[(1) - (3)].integer));;} break; case 793: -#line 1873 "frame/parser.Y" - {fr->markerPolygonResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), - (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} +#line 1871 "frame/parser.Y" + {fr->markerMoveToCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; case 794: -#line 1876 "frame/parser.Y" - {fr->markerSegmentResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), +#line 1874 "frame/parser.Y" + {fr->markerPolygonResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 795: -#line 1879 "frame/parser.Y" - {fr->markerPointShapeCmd((yyvsp[(1) - (4)].integer),(Point::PointShape)(yyvsp[(4) - (4)].integer));;} +#line 1877 "frame/parser.Y" + {fr->markerSegmentResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), + (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 796: #line 1880 "frame/parser.Y" - {fr->markerPointSizeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerPointShapeCmd((yyvsp[(1) - (4)].integer),(Point::PointShape)(yyvsp[(4) - (4)].integer));;} break; case 797: -#line 1882 "frame/parser.Y" - {fr->markerPolygonFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1881 "frame/parser.Y" + {fr->markerPointSizeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 798: -#line 1885 "frame/parser.Y" +#line 1883 "frame/parser.Y" + {fr->markerPolygonFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + break; + + case 799: +#line 1886 "frame/parser.Y" {fr->markerProjectionCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(5) - (9)].vector)), Vector((yyvsp[(6) - (9)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (9)].integer), (Coord::SkyFrame)(yyvsp[(4) - (9)].integer), (yyvsp[(7) - (9)].real), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; - case 799: -#line 1889 "frame/parser.Y" + case 800: +#line 1890 "frame/parser.Y" {fr->markerPropertyCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; - case 800: -#line 1891 "frame/parser.Y" + case 801: +#line 1892 "frame/parser.Y" {fr->markerRotateBeginCmd((yyvsp[(1) - (3)].integer));;} break; - case 801: -#line 1892 "frame/parser.Y" + case 802: +#line 1893 "frame/parser.Y" {fr->markerRulerDistSpecCmd((yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;} break; - case 802: -#line 1894 "frame/parser.Y" + case 803: +#line 1895 "frame/parser.Y" {fr->markerRulerPointCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;} break; - case 803: -#line 1897 "frame/parser.Y" + case 804: +#line 1898 "frame/parser.Y" {fr->markerRulerSystemCmd((yyvsp[(1) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; - case 804: -#line 1900 "frame/parser.Y" - {fr->markerSelectCmd((yyvsp[(1) - (2)].integer));;} - break; - case 805: #line 1901 "frame/parser.Y" - {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].integer));;} + {fr->markerSelectCmd((yyvsp[(1) - (2)].integer));;} break; case 806: -#line 1903 "frame/parser.Y" - {fr->markerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} +#line 1902 "frame/parser.Y" + {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].integer));;} break; case 807: #line 1904 "frame/parser.Y" - {fr->markerTextCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} + {fr->markerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 808: #line 1905 "frame/parser.Y" - {fr->markerTextRotateCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->markerTextCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 809: -#line 1907 "frame/parser.Y" - {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].integer));;} +#line 1906 "frame/parser.Y" + {fr->markerTextRotateCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 810: #line 1908 "frame/parser.Y" - {fr->markerUnselectCmd((yyvsp[(1) - (2)].integer));;} + {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].integer));;} break; case 811: -#line 1910 "frame/parser.Y" - {fr->markerVectorArrowCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1909 "frame/parser.Y" + {fr->markerUnselectCmd((yyvsp[(1) - (2)].integer));;} break; case 812: -#line 1913 "frame/parser.Y" - {fr->markerVectorCmd((yyvsp[(1) - (10)].integer), Vector((yyvsp[(6) - (10)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (10)].integer), (Coord::SkyFrame)(yyvsp[(5) - (10)].integer), - (yyvsp[(9) - (10)].real), (Coord::CoordSystem)(yyvsp[(7) - (10)].integer), (Coord::DistFormat)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;} +#line 1911 "frame/parser.Y" + {fr->markerVectorArrowCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 813: -#line 1916 "frame/parser.Y" - {fr->markerLineWidthCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} +#line 1914 "frame/parser.Y" + {fr->markerVectorCmd((yyvsp[(1) - (10)].integer), Vector((yyvsp[(6) - (10)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (10)].integer), (Coord::SkyFrame)(yyvsp[(5) - (10)].integer), + (yyvsp[(9) - (10)].real), (Coord::CoordSystem)(yyvsp[(7) - (10)].integer), (Coord::DistFormat)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;} break; case 814: -#line 1918 "frame/parser.Y" - {fr->markerKeyCmd();;} +#line 1917 "frame/parser.Y" + {fr->markerLineWidthCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 815: #line 1919 "frame/parser.Y" - {fr->markerKeyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->markerKeyCmd();;} break; - case 819: -#line 1924 "frame/parser.Y" - {fr->markerPreserveCmd((yyvsp[(2) - (2)].integer));;} + case 816: +#line 1920 "frame/parser.Y" + {fr->markerKeyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 820: #line 1925 "frame/parser.Y" - {fr->markerPropertyCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + {fr->markerPreserveCmd((yyvsp[(2) - (2)].integer));;} break; case 821: -#line 1927 "frame/parser.Y" - {fr->markerPropertyCmd((yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} +#line 1926 "frame/parser.Y" + {fr->markerPropertyCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 822: -#line 1929 "frame/parser.Y" - {fr->markerRotateBeginCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 1928 "frame/parser.Y" + {fr->markerPropertyCmd((yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 823: -#line 1931 "frame/parser.Y" - {fr->markerRotateMotionCmd(Vector((yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real)),(yyvsp[(5) - (5)].integer));;} +#line 1930 "frame/parser.Y" + {fr->markerRotateBeginCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 824: #line 1932 "frame/parser.Y" - {fr->markerRotateEndCmd();;} + {fr->markerRotateMotionCmd(Vector((yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real)),(yyvsp[(5) - (5)].integer));;} break; case 825: -#line 1934 "frame/parser.Y" - {fr->markerSaveCmd((yyvsp[(2) - (7)].str), (Base::MarkerFormat)(yyvsp[(3) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::SkyFormat)(yyvsp[(6) - (7)].integer), (yyvsp[(7) - (7)].integer));;} +#line 1933 "frame/parser.Y" + {fr->markerRotateEndCmd();;} break; case 826: #line 1935 "frame/parser.Y" - {fr->markerSaveTemplateCmd((yyvsp[(3) - (3)].str));;} + {fr->markerSaveCmd((yyvsp[(2) - (7)].str), (Base::MarkerFormat)(yyvsp[(3) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::SkyFormat)(yyvsp[(6) - (7)].integer), (yyvsp[(7) - (7)].integer));;} break; - case 829: -#line 1940 "frame/parser.Y" - {fr->markerColorCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} + case 827: +#line 1936 "frame/parser.Y" + {fr->markerSaveTemplateCmd((yyvsp[(3) - (3)].str));;} break; case 830: #line 1941 "frame/parser.Y" - {fr->markerCopyCmd((yyvsp[(1) - (2)].str));;} + {fr->markerColorCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 831: #line 1942 "frame/parser.Y" - {fr->markerDeleteCmd((yyvsp[(1) - (2)].str));;} + {fr->markerCopyCmd((yyvsp[(1) - (2)].str));;} break; case 832: #line 1943 "frame/parser.Y" - {fr->markerCutCmd((yyvsp[(1) - (2)].str));;} + {fr->markerDeleteCmd((yyvsp[(1) - (2)].str));;} break; case 833: #line 1944 "frame/parser.Y" - {fr->markerFontCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} + {fr->markerCutCmd((yyvsp[(1) - (2)].str));;} break; case 834: #line 1945 "frame/parser.Y" - {fr->markerHighliteCmd((yyvsp[(1) - (2)].str));;} + {fr->markerFontCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 835: #line 1946 "frame/parser.Y" - {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].str));;} + {fr->markerHighliteCmd((yyvsp[(1) - (2)].str));;} break; case 836: #line 1947 "frame/parser.Y" - {fr->markerMoveCmd((yyvsp[(1) - (4)].str),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} + {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].str));;} break; case 837: #line 1948 "frame/parser.Y" - {fr->markerFrontCmd((yyvsp[(1) - (3)].str));;} + {fr->markerMoveCmd((yyvsp[(1) - (4)].str),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 838: #line 1949 "frame/parser.Y" - {fr->markerBackCmd((yyvsp[(1) - (3)].str));;} + {fr->markerFrontCmd((yyvsp[(1) - (3)].str));;} break; case 839: -#line 1951 "frame/parser.Y" - {fr->markerMoveToCmd((yyvsp[(1) - (6)].str),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} +#line 1950 "frame/parser.Y" + {fr->markerBackCmd((yyvsp[(1) - (3)].str));;} break; case 840: -#line 1953 "frame/parser.Y" - {fr->markerPropertyCmd((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} +#line 1952 "frame/parser.Y" + {fr->markerMoveToCmd((yyvsp[(1) - (6)].str),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; case 841: #line 1954 "frame/parser.Y" - {fr->markerSelectCmd((yyvsp[(1) - (2)].str));;} + {fr->markerPropertyCmd((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 842: #line 1955 "frame/parser.Y" - {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].str));;} + {fr->markerSelectCmd((yyvsp[(1) - (2)].str));;} break; case 843: #line 1956 "frame/parser.Y" - {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].str));;} + {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].str));;} break; case 844: #line 1957 "frame/parser.Y" - {fr->markerUnselectCmd((yyvsp[(1) - (2)].str));;} + {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].str));;} break; case 845: -#line 1959 "frame/parser.Y" - {fr->markerTagEditCmd((yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;} +#line 1958 "frame/parser.Y" + {fr->markerUnselectCmd((yyvsp[(1) - (2)].str));;} break; case 846: #line 1960 "frame/parser.Y" - {fr->markerTagDeleteCmd((yyvsp[(3) - (3)].str));;} + {fr->markerTagEditCmd((yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;} break; case 847: #line 1961 "frame/parser.Y" - {fr->markerTagDeleteAllCmd();;} + {fr->markerTagDeleteCmd((yyvsp[(3) - (3)].str));;} break; case 848: #line 1962 "frame/parser.Y" - {fr->markerTagCmd((yyvsp[(2) - (2)].str));;} + {fr->markerTagDeleteAllCmd();;} break; case 849: #line 1963 "frame/parser.Y" - {fr->markerTagUpdateCmd((yyvsp[(3) - (3)].str));;} + {fr->markerTagCmd((yyvsp[(2) - (2)].str));;} break; case 850: -#line 1965 "frame/parser.Y" - {fr->markerPasteCmd();;} +#line 1964 "frame/parser.Y" + {fr->markerTagUpdateCmd((yyvsp[(3) - (3)].str));;} break; case 851: #line 1966 "frame/parser.Y" - {fr->markerPasteCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} + {fr->markerPasteCmd();;} break; case 852: #line 1967 "frame/parser.Y" - {fr->markerUndoCmd();;} + {fr->markerPasteCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 853: #line 1968 "frame/parser.Y" - {fr->markerUnhighliteAllCmd();;} + {fr->markerUndoCmd();;} break; case 854: #line 1969 "frame/parser.Y" - {fr->markerUnselectAllCmd();;} + {fr->markerUnhighliteAllCmd();;} break; case 855: #line 1970 "frame/parser.Y" - {fr->markerLineWidthCmd((yyvsp[(2) - (2)].integer));;} + {fr->markerUnselectAllCmd();;} break; case 856: -#line 1973 "frame/parser.Y" - {(yyval.integer) = CallBack::SELECTCB;;} +#line 1971 "frame/parser.Y" + {fr->markerLineWidthCmd((yyvsp[(2) - (2)].integer));;} break; case 857: #line 1974 "frame/parser.Y" - {(yyval.integer) = CallBack::UNSELECTCB;;} + {(yyval.integer) = CallBack::SELECTCB;;} break; case 858: #line 1975 "frame/parser.Y" - {(yyval.integer) = CallBack::HIGHLITECB;;} + {(yyval.integer) = CallBack::UNSELECTCB;;} break; case 859: #line 1976 "frame/parser.Y" - {(yyval.integer) = CallBack::UNHIGHLITECB;;} + {(yyval.integer) = CallBack::HIGHLITECB;;} break; case 860: #line 1977 "frame/parser.Y" - {(yyval.integer) = CallBack::MOVEBEGINCB;;} + {(yyval.integer) = CallBack::UNHIGHLITECB;;} break; case 861: #line 1978 "frame/parser.Y" - {(yyval.integer) = CallBack::MOVECB;;} + {(yyval.integer) = CallBack::MOVEBEGINCB;;} break; case 862: #line 1979 "frame/parser.Y" - {(yyval.integer) = CallBack::MOVEENDCB;;} + {(yyval.integer) = CallBack::MOVECB;;} break; case 863: #line 1980 "frame/parser.Y" - {(yyval.integer) = CallBack::EDITBEGINCB;;} + {(yyval.integer) = CallBack::MOVEENDCB;;} break; case 864: #line 1981 "frame/parser.Y" - {(yyval.integer) = CallBack::EDITCB;;} + {(yyval.integer) = CallBack::EDITBEGINCB;;} break; case 865: #line 1982 "frame/parser.Y" - {(yyval.integer) = CallBack::EDITENDCB;;} + {(yyval.integer) = CallBack::EDITCB;;} break; case 866: #line 1983 "frame/parser.Y" - {(yyval.integer) = CallBack::ROTATEBEGINCB;;} + {(yyval.integer) = CallBack::EDITENDCB;;} break; case 867: #line 1984 "frame/parser.Y" - {(yyval.integer) = CallBack::ROTATECB;;} + {(yyval.integer) = CallBack::ROTATEBEGINCB;;} break; case 868: #line 1985 "frame/parser.Y" - {(yyval.integer) = CallBack::ROTATEENDCB;;} + {(yyval.integer) = CallBack::ROTATECB;;} break; case 869: #line 1986 "frame/parser.Y" - {(yyval.integer) = CallBack::DELETECB;;} + {(yyval.integer) = CallBack::ROTATEENDCB;;} break; case 870: #line 1987 "frame/parser.Y" - {(yyval.integer) = CallBack::TEXTCB;;} + {(yyval.integer) = CallBack::DELETECB;;} break; case 871: #line 1988 "frame/parser.Y" - {(yyval.integer) = CallBack::COLORCB;;} + {(yyval.integer) = CallBack::TEXTCB;;} break; case 872: #line 1989 "frame/parser.Y" - {(yyval.integer) = CallBack::LINEWIDTHCB;;} + {(yyval.integer) = CallBack::COLORCB;;} break; case 873: #line 1990 "frame/parser.Y" - {(yyval.integer) = CallBack::PROPERTYCB;;} + {(yyval.integer) = CallBack::LINEWIDTHCB;;} break; case 874: #line 1991 "frame/parser.Y" - {(yyval.integer) = CallBack::FONTCB;;} + {(yyval.integer) = CallBack::PROPERTYCB;;} break; case 875: #line 1992 "frame/parser.Y" - {(yyval.integer) = CallBack::KEYCB;;} + {(yyval.integer) = CallBack::FONTCB;;} break; case 876: #line 1993 "frame/parser.Y" - {(yyval.integer) = CallBack::UPDATECB;;} + {(yyval.integer) = CallBack::KEYCB;;} break; case 877: -#line 1996 "frame/parser.Y" - {fr->markerCentroidCmd();;} +#line 1994 "frame/parser.Y" + {(yyval.integer) = CallBack::UPDATECB;;} break; case 878: #line 1997 "frame/parser.Y" - {fr->markerCentroidCmd((yyvsp[(1) - (1)].integer));;} + {fr->markerCentroidCmd();;} break; case 879: #line 1998 "frame/parser.Y" - {fr->markerCentroidAutoCmd((yyvsp[(2) - (2)].integer));;} + {fr->markerCentroidCmd((yyvsp[(1) - (1)].integer));;} break; case 880: #line 1999 "frame/parser.Y" - {fr->markerCentroidRadiusCmd((yyvsp[(2) - (2)].real));;} + {fr->markerCentroidAutoCmd((yyvsp[(2) - (2)].integer));;} break; case 881: #line 2000 "frame/parser.Y" - {fr->markerCentroidIterationCmd((yyvsp[(2) - (2)].integer));;} + {fr->markerCentroidRadiusCmd((yyvsp[(2) - (2)].real));;} break; case 882: -#line 2002 "frame/parser.Y" +#line 2001 "frame/parser.Y" + {fr->markerCentroidIterationCmd((yyvsp[(2) - (2)].integer));;} + break; + + case 883: +#line 2003 "frame/parser.Y" { fr->markerCentroidIterationCmd((yyvsp[(2) - (3)].integer)); fr->markerCentroidRadiusCmd((yyvsp[(3) - (3)].real)); ;} break; - case 883: -#line 2012 "frame/parser.Y" + case 884: +#line 2013 "frame/parser.Y" {fr->createCircleCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS), (yyvsp[(4) - (5)].real), 0, currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 884: -#line 2020 "frame/parser.Y" + case 885: +#line 2021 "frame/parser.Y" {fr->createEllipseCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (yyvsp[(6) - (7)].real), 0, @@ -8956,8 +9024,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 885: -#line 2029 "frame/parser.Y" + case 886: +#line 2030 "frame/parser.Y" {fr->createBoxCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (yyvsp[(6) - (7)].real), 0, @@ -8965,24 +9033,24 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 886: -#line 2037 "frame/parser.Y" + case 887: +#line 2038 "frame/parser.Y" {fr->createPolygonCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), 0, currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 887: -#line 2044 "frame/parser.Y" + case 888: +#line 2045 "frame/parser.Y" {fr->createSegmentCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 888: -#line 2051 "frame/parser.Y" + case 889: +#line 2052 "frame/parser.Y" {fr->createLineCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS), 0, 0, @@ -8990,8 +9058,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 889: -#line 2059 "frame/parser.Y" + case 890: +#line 2060 "frame/parser.Y" {fr->createVectCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS), 1, @@ -8999,72 +9067,72 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 890: -#line 2067 "frame/parser.Y" + case 891: +#line 2068 "frame/parser.Y" {fr->createTextCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS), (yyvsp[(4) - (5)].real), 1, currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 891: -#line 2072 "frame/parser.Y" + case 892: +#line 2073 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::CIRCLE, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 892: -#line 2077 "frame/parser.Y" + case 893: +#line 2078 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::BOX, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 893: -#line 2082 "frame/parser.Y" + case 894: +#line 2083 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::DIAMOND, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 894: -#line 2087 "frame/parser.Y" + case 895: +#line 2088 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::CROSS, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 895: -#line 2092 "frame/parser.Y" + case 896: +#line 2093 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::EX, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 896: -#line 2097 "frame/parser.Y" + case 897: +#line 2098 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::ARROW, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 897: -#line 2102 "frame/parser.Y" + case 898: +#line 2103 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::BOXCIRCLE, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 898: -#line 2111 "frame/parser.Y" + case 899: +#line 2112 "frame/parser.Y" {fr->createRulerCmd(fr->mapToRef(Vector((yyvsp[(2) - (11)].real),(yyvsp[(3) - (11)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)),Coord::CANVAS), (Coord::CoordSystem)(yyvsp[(6) - (11)].integer), (Coord::SkyFrame)(yyvsp[(7) - (11)].integer), @@ -9073,8 +9141,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 899: -#line 2121 "frame/parser.Y" + case 900: +#line 2122 "frame/parser.Y" {fr->createCompassCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), (yyvsp[(4) - (7)].real), "N", "E", 1, 1, @@ -9083,8 +9151,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 900: -#line 2131 "frame/parser.Y" + case 901: +#line 2132 "frame/parser.Y" {fr->createProjectionCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),Coord::CANVAS), (yyvsp[(6) - (7)].real), @@ -9092,16 +9160,16 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 901: -#line 2140 "frame/parser.Y" + case 902: +#line 2141 "frame/parser.Y" {fr->createAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), (yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].integer), currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 902: -#line 2148 "frame/parser.Y" + case 903: +#line 2149 "frame/parser.Y" {fr->createEllipseAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer), @@ -9110,8 +9178,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 903: -#line 2158 "frame/parser.Y" + case 904: +#line 2159 "frame/parser.Y" {fr->createBoxAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)),Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer), (yyvsp[(8) - (9)].real), @@ -9119,8 +9187,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 904: -#line 2168 "frame/parser.Y" + case 905: +#line 2169 "frame/parser.Y" {fr->createCpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real)),Coord::CANVAS), (yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].integer), @@ -9128,8 +9196,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 905: -#line 2178 "frame/parser.Y" + case 906: +#line 2179 "frame/parser.Y" {fr->createEpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS), (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), @@ -9139,8 +9207,8 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 906: -#line 2190 "frame/parser.Y" + case 907: +#line 2191 "frame/parser.Y" {fr->createBpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS), (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), @@ -9150,586 +9218,586 @@ yyreduce: currentText,currentProps,NULL,taglist,cblist);;} break; - case 907: -#line 2199 "frame/parser.Y" + case 908: +#line 2200 "frame/parser.Y" {fr->createCompositeCmd( currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; - case 909: -#line 2207 "frame/parser.Y" + case 910: +#line 2208 "frame/parser.Y" {fr->createTemplateCmd(fr->mapToRef(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),Coord::CANVAS), (yyvsp[(1) - (3)].str));;} break; - case 910: -#line 2209 "frame/parser.Y" + case 911: +#line 2210 "frame/parser.Y" {fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),Coord::CANVAS), (yyvsp[(2) - (4)].str));;} break; - case 911: -#line 2211 "frame/parser.Y" + case 912: +#line 2212 "frame/parser.Y" { // backward compatibility fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Coord::CANVAS), (yyvsp[(4) - (4)].str)); ;} break; - case 912: -#line 2216 "frame/parser.Y" - {fr->createTemplateCmd(Vector((yyvsp[(4) - (4)].vector)),(Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str));;} - break; - case 913: -#line 2219 "frame/parser.Y" - {(yyval.dash)[0] = (yyvsp[(1) - (2)].integer); (yyval.dash)[1] = (yyvsp[(2) - (2)].integer);;} +#line 2217 "frame/parser.Y" + {fr->createTemplateCmd(Vector((yyvsp[(4) - (4)].vector)),(Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str));;} break; case 914: -#line 2223 "frame/parser.Y" - {fr->markerEditBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} +#line 2220 "frame/parser.Y" + {(yyval.dash)[0] = (yyvsp[(1) - (2)].integer); (yyval.dash)[1] = (yyvsp[(2) - (2)].integer);;} break; case 915: -#line 2225 "frame/parser.Y" - {fr->markerEditMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} +#line 2224 "frame/parser.Y" + {fr->markerEditBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 916: #line 2226 "frame/parser.Y" - {fr->markerEditEndCmd();;} + {fr->markerEditMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 917: -#line 2229 "frame/parser.Y" - {(yyval.integer) = Base::DS9;;} +#line 2227 "frame/parser.Y" + {fr->markerEditEndCmd();;} break; case 918: #line 2230 "frame/parser.Y" - {(yyval.integer) = Base::XML;;} + {(yyval.integer) = Base::DS9;;} break; case 919: #line 2231 "frame/parser.Y" - {(yyval.integer) = Base::CIAO;;} + {(yyval.integer) = Base::XML;;} break; case 920: #line 2232 "frame/parser.Y" - {(yyval.integer) = Base::SAOTNG;;} + {(yyval.integer) = Base::CIAO;;} break; case 921: #line 2233 "frame/parser.Y" - {(yyval.integer) = Base::SAOIMAGE;;} + {(yyval.integer) = Base::SAOTNG;;} break; case 922: #line 2234 "frame/parser.Y" - {(yyval.integer) = Base::PROS;;} + {(yyval.integer) = Base::SAOIMAGE;;} break; case 923: #line 2235 "frame/parser.Y" - {(yyval.integer) = Base::RAWXY;;} + {(yyval.integer) = Base::PROS;;} break; - case 925: -#line 2239 "frame/parser.Y" - {fr->getMarkerColorCmd();;} + case 924: +#line 2236 "frame/parser.Y" + {(yyval.integer) = Base::RAWXY;;} break; case 926: #line 2240 "frame/parser.Y" - {fr->getMarkerFontCmd();;} + {fr->getMarkerColorCmd();;} break; case 927: #line 2241 "frame/parser.Y" - {fr->getMarkerEpsilonCmd();;} + {fr->getMarkerFontCmd();;} break; case 928: #line 2242 "frame/parser.Y" - {fr->getMarkerHandleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->getMarkerEpsilonCmd();;} break; case 929: #line 2243 "frame/parser.Y" - {fr->getMarkerIdCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->getMarkerHandleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 930: -#line 2246 "frame/parser.Y" - {fr->getMarkerAnalysisPandaCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;} +#line 2244 "frame/parser.Y" + {fr->getMarkerIdCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 931: -#line 2248 "frame/parser.Y" - {fr->getMarkerAnalysisHistogramCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].integer));;} +#line 2247 "frame/parser.Y" + {fr->getMarkerAnalysisPandaCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;} break; case 932: -#line 2250 "frame/parser.Y" - {fr->getMarkerAnalysisPlot2dCmd((yyvsp[(1) - (10)].integer),(yyvsp[(4) - (10)].str),(yyvsp[(5) - (10)].str),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),(Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyFrame)(yyvsp[(9) - (10)].integer), (Marker::AnalysisMethod)(yyvsp[(10) - (10)].integer));;} +#line 2249 "frame/parser.Y" + {fr->getMarkerAnalysisHistogramCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].integer));;} break; case 933: -#line 2252 "frame/parser.Y" - {fr->getMarkerAnalysisPlot3dCmd((yyvsp[(1) - (8)].integer),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),(Coord::CoordSystem)(yyvsp[(6) - (8)].integer),(Coord::SkyFrame)(yyvsp[(7) - (8)].integer), (Marker::AnalysisMethod)(yyvsp[(8) - (8)].integer));;} +#line 2251 "frame/parser.Y" + {fr->getMarkerAnalysisPlot2dCmd((yyvsp[(1) - (10)].integer),(yyvsp[(4) - (10)].str),(yyvsp[(5) - (10)].str),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),(Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyFrame)(yyvsp[(9) - (10)].integer), (Marker::AnalysisMethod)(yyvsp[(10) - (10)].integer));;} break; case 934: -#line 2254 "frame/parser.Y" - {fr->getMarkerAnalysisRadialCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(Coord::CoordSystem)(yyvsp[(7) - (7)].integer));;} +#line 2253 "frame/parser.Y" + {fr->getMarkerAnalysisPlot3dCmd((yyvsp[(1) - (8)].integer),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),(Coord::CoordSystem)(yyvsp[(6) - (8)].integer),(Coord::SkyFrame)(yyvsp[(7) - (8)].integer), (Marker::AnalysisMethod)(yyvsp[(8) - (8)].integer));;} break; case 935: -#line 2256 "frame/parser.Y" - {fr->getMarkerAnalysisStatsCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 2255 "frame/parser.Y" + {fr->getMarkerAnalysisRadialCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(Coord::CoordSystem)(yyvsp[(7) - (7)].integer));;} break; case 936: -#line 2258 "frame/parser.Y" - {fr->getMarkerIdAllCmd();;} +#line 2257 "frame/parser.Y" + {fr->getMarkerAnalysisStatsCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 937: #line 2259 "frame/parser.Y" - {fr->getMarkerAngleCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerIdAllCmd();;} break; case 938: #line 2260 "frame/parser.Y" - {fr->getMarkerAngleCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerAngleCmd((yyvsp[(1) - (2)].integer));;} break; case 939: -#line 2262 "frame/parser.Y" - {fr->getMarkerAngleCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} +#line 2261 "frame/parser.Y" + {fr->getMarkerAngleCmd((yyvsp[(1) - (3)].integer));;} break; case 940: -#line 2264 "frame/parser.Y" - {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2263 "frame/parser.Y" + {fr->getMarkerAngleCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 941: -#line 2266 "frame/parser.Y" - {fr->getMarkerBoxFillCmd((yyvsp[(1) - (3)].integer));;} +#line 2265 "frame/parser.Y" + {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 942: -#line 2268 "frame/parser.Y" - {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2267 "frame/parser.Y" + {fr->getMarkerBoxFillCmd((yyvsp[(1) - (3)].integer));;} break; case 943: -#line 2270 "frame/parser.Y" - {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2269 "frame/parser.Y" + {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 944: #line 2271 "frame/parser.Y" - {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 945: #line 2272 "frame/parser.Y" - {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} + {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 946: -#line 2274 "frame/parser.Y" - {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 2273 "frame/parser.Y" + {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 947: -#line 2276 "frame/parser.Y" - {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2275 "frame/parser.Y" + {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 948: -#line 2279 "frame/parser.Y" - {fr->getMarkerCenterCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), - (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;} +#line 2277 "frame/parser.Y" + {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 949: -#line 2281 "frame/parser.Y" - {fr->getMarkerCircleFillCmd((yyvsp[(1) - (3)].integer));;} +#line 2280 "frame/parser.Y" + {fr->getMarkerCenterCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), + (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;} break; case 950: -#line 2283 "frame/parser.Y" - {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2282 "frame/parser.Y" + {fr->getMarkerCircleFillCmd((yyvsp[(1) - (3)].integer));;} break; case 951: #line 2284 "frame/parser.Y" - {fr->getMarkerColorCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 952: #line 2285 "frame/parser.Y" - {fr->getMarkerCompassArrowCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerColorCmd((yyvsp[(1) - (2)].integer));;} break; case 953: #line 2286 "frame/parser.Y" - {fr->getMarkerCompassLabelCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerCompassArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 954: -#line 2288 "frame/parser.Y" - {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2287 "frame/parser.Y" + {fr->getMarkerCompassLabelCmd((yyvsp[(1) - (3)].integer));;} break; case 955: #line 2289 "frame/parser.Y" - {fr->getMarkerCompassSystemCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 956: #line 2290 "frame/parser.Y" - {fr->getMarkerCompositeCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerCompassSystemCmd((yyvsp[(1) - (3)].integer));;} break; case 957: #line 2291 "frame/parser.Y" - {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerCompositeCmd((yyvsp[(1) - (3)].integer));;} break; case 958: #line 2292 "frame/parser.Y" - {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} + {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 959: -#line 2294 "frame/parser.Y" - {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 2293 "frame/parser.Y" + {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 960: -#line 2296 "frame/parser.Y" - {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2295 "frame/parser.Y" + {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 961: #line 2297 "frame/parser.Y" - {fr->getMarkerEllipseFillCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 962: -#line 2299 "frame/parser.Y" - {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2298 "frame/parser.Y" + {fr->getMarkerEllipseFillCmd((yyvsp[(1) - (3)].integer));;} break; case 963: -#line 2301 "frame/parser.Y" - {fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), - (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2300 "frame/parser.Y" + {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 964: -#line 2303 "frame/parser.Y" - {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} +#line 2302 "frame/parser.Y" + {fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), + (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 965: #line 2304 "frame/parser.Y" - {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} + {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 966: -#line 2306 "frame/parser.Y" - {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} +#line 2305 "frame/parser.Y" + {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 967: -#line 2308 "frame/parser.Y" - {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2307 "frame/parser.Y" + {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 968: #line 2309 "frame/parser.Y" - {fr->getMarkerFontCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 969: #line 2310 "frame/parser.Y" - {fr->getMarkerHighlitedCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerFontCmd((yyvsp[(1) - (2)].integer));;} break; case 970: #line 2311 "frame/parser.Y" - {fr->getMarkerLineArrowCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerHighlitedCmd((yyvsp[(1) - (2)].integer));;} break; case 971: -#line 2313 "frame/parser.Y" - {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2312 "frame/parser.Y" + {fr->getMarkerLineArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 972: -#line 2315 "frame/parser.Y" - {fr->getMarkerLineCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), - (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} +#line 2314 "frame/parser.Y" + {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 973: -#line 2318 "frame/parser.Y" - {fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), - (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} +#line 2316 "frame/parser.Y" + {fr->getMarkerLineCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), + (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 974: -#line 2321 "frame/parser.Y" - {fr->getMarkerPolygonFillCmd((yyvsp[(1) - (3)].integer));;} +#line 2319 "frame/parser.Y" + {fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), + (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 975: #line 2322 "frame/parser.Y" - {fr->getMarkerPointShapeCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerPolygonFillCmd((yyvsp[(1) - (3)].integer));;} break; case 976: #line 2323 "frame/parser.Y" - {fr->getMarkerPointSizeCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerPointShapeCmd((yyvsp[(1) - (3)].integer));;} break; case 977: -#line 2325 "frame/parser.Y" - {fr->getMarkerProjectionPointsCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), - (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} +#line 2324 "frame/parser.Y" + {fr->getMarkerPointSizeCmd((yyvsp[(1) - (3)].integer));;} break; case 978: -#line 2328 "frame/parser.Y" - {fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), - (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2326 "frame/parser.Y" + {fr->getMarkerProjectionPointsCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), + (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 979: -#line 2331 "frame/parser.Y" - {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2329 "frame/parser.Y" + {fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), + (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 980: #line 2332 "frame/parser.Y" - {fr->getMarkerPropertyCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 981: #line 2333 "frame/parser.Y" - {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + {fr->getMarkerPropertyCmd((yyvsp[(1) - (2)].integer));;} break; case 982: #line 2334 "frame/parser.Y" - {fr->getMarkerRulerDistSpecCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 983: -#line 2336 "frame/parser.Y" - {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2335 "frame/parser.Y" + {fr->getMarkerRulerDistSpecCmd((yyvsp[(1) - (3)].integer));;} break; case 984: -#line 2338 "frame/parser.Y" - {fr->getMarkerRulerPointCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), - (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} +#line 2337 "frame/parser.Y" + {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 985: -#line 2340 "frame/parser.Y" - {fr->getMarkerRulerSystemCmd((yyvsp[(1) - (3)].integer));;} +#line 2339 "frame/parser.Y" + {fr->getMarkerRulerPointCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), + (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 986: #line 2341 "frame/parser.Y" - {fr->getMarkerSelectedCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerRulerSystemCmd((yyvsp[(1) - (3)].integer));;} break; case 987: -#line 2343 "frame/parser.Y" - {fr->getMarkerTagCmd((yyvsp[(1) - (2)].integer));;} +#line 2342 "frame/parser.Y" + {fr->getMarkerSelectedCmd((yyvsp[(1) - (2)].integer));;} break; case 988: #line 2344 "frame/parser.Y" - {fr->getMarkerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + {fr->getMarkerTagCmd((yyvsp[(1) - (2)].integer));;} break; case 989: #line 2345 "frame/parser.Y" - {fr->getMarkerTextCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 990: #line 2346 "frame/parser.Y" - {fr->getMarkerTextRotateCmd((yyvsp[(1) - (3)].integer));;} + {fr->getMarkerTextCmd((yyvsp[(1) - (2)].integer));;} break; case 991: #line 2347 "frame/parser.Y" - {fr->getMarkerTypeCmd((yyvsp[(1) - (2)].integer));;} + {fr->getMarkerTextRotateCmd((yyvsp[(1) - (3)].integer));;} break; case 992: -#line 2349 "frame/parser.Y" - {fr->getMarkerVectorArrowCmd((yyvsp[(1) - (3)].integer));;} +#line 2348 "frame/parser.Y" + {fr->getMarkerTypeCmd((yyvsp[(1) - (2)].integer));;} break; case 993: -#line 2351 "frame/parser.Y" - {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} +#line 2350 "frame/parser.Y" + {fr->getMarkerVectorArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 994: -#line 2353 "frame/parser.Y" - {fr->getMarkerVectorCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), - (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} +#line 2352 "frame/parser.Y" + {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 995: -#line 2355 "frame/parser.Y" - {fr->getMarkerLineWidthCmd((yyvsp[(1) - (2)].integer));;} +#line 2354 "frame/parser.Y" + {fr->getMarkerVectorCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), + (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; - case 997: -#line 2357 "frame/parser.Y" - {fr->getMarkerHighlitedNumberCmd();;} + case 996: +#line 2356 "frame/parser.Y" + {fr->getMarkerLineWidthCmd((yyvsp[(1) - (2)].integer));;} break; case 998: #line 2358 "frame/parser.Y" - {fr->getMarkerNumberCmd();;} + {fr->getMarkerHighlitedNumberCmd();;} break; case 999: -#line 2360 "frame/parser.Y" - {fr->getMarkerPolygonSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 2359 "frame/parser.Y" + {fr->getMarkerNumberCmd();;} break; case 1000: -#line 2362 "frame/parser.Y" - {fr->getMarkerSegmentSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 2361 "frame/parser.Y" + {fr->getMarkerPolygonSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 1001: #line 2363 "frame/parser.Y" - {fr->getMarkerPreserveCmd();;} + {fr->getMarkerSegmentSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 1002: #line 2364 "frame/parser.Y" - {fr->getMarkerPropertyCmd((yyvsp[(2) - (2)].integer));;} + {fr->getMarkerPreserveCmd();;} break; - case 1004: -#line 2366 "frame/parser.Y" - {fr->getMarkerSelectedNumberCmd();;} + case 1003: +#line 2365 "frame/parser.Y" + {fr->getMarkerPropertyCmd((yyvsp[(2) - (2)].integer));;} break; - case 1006: -#line 2370 "frame/parser.Y" - {fr->getMarkerColorCmd((yyvsp[(1) - (2)].str));;} + case 1005: +#line 2367 "frame/parser.Y" + {fr->getMarkerSelectedNumberCmd();;} break; case 1007: #line 2371 "frame/parser.Y" - {fr->getMarkerFontCmd((yyvsp[(1) - (2)].str));;} + {fr->getMarkerColorCmd((yyvsp[(1) - (2)].str));;} break; case 1008: #line 2372 "frame/parser.Y" - {fr->getMarkerIdCmd((yyvsp[(1) - (2)].str));;} + {fr->getMarkerFontCmd((yyvsp[(1) - (2)].str));;} break; case 1009: #line 2373 "frame/parser.Y" - {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].integer));;} + {fr->getMarkerIdCmd((yyvsp[(1) - (2)].str));;} break; case 1010: #line 2374 "frame/parser.Y" - {fr->getMarkerTagCmd((yyvsp[(1) - (2)].str));;} + {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1011: #line 2375 "frame/parser.Y" - {fr->getMarkerTagNumberCmd((yyvsp[(1) - (3)].str));;} + {fr->getMarkerTagCmd((yyvsp[(1) - (2)].str));;} break; case 1012: -#line 2377 "frame/parser.Y" - {fr->getMarkerTagsCmd();;} +#line 2376 "frame/parser.Y" + {fr->getMarkerTagNumberCmd((yyvsp[(1) - (3)].str));;} break; case 1013: #line 2378 "frame/parser.Y" - {fr->getMarkerTagDefaultNameCmd();;} + {fr->getMarkerTagsCmd();;} break; case 1014: -#line 2380 "frame/parser.Y" - {fr->getMarkerLineWidthCmd();;} +#line 2379 "frame/parser.Y" + {fr->getMarkerTagDefaultNameCmd();;} break; case 1015: -#line 2383 "frame/parser.Y" - {fr->getMarkerCentroidAutoCmd();;} +#line 2381 "frame/parser.Y" + {fr->getMarkerLineWidthCmd();;} break; case 1016: #line 2384 "frame/parser.Y" - {fr->getMarkerCentroidRadiusCmd();;} + {fr->getMarkerCentroidAutoCmd();;} break; case 1017: #line 2385 "frame/parser.Y" - {fr->getMarkerCentroidIterationCmd();;} + {fr->getMarkerCentroidRadiusCmd();;} break; case 1018: #line 2386 "frame/parser.Y" - {fr->getMarkerCentroidOptionCmd();;} + {fr->getMarkerCentroidIterationCmd();;} break; case 1019: -#line 2389 "frame/parser.Y" - {fr->getMarkerHighlitedCmd();;} +#line 2387 "frame/parser.Y" + {fr->getMarkerCentroidOptionCmd();;} break; case 1020: #line 2390 "frame/parser.Y" - {fr->getMarkerHighlitedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} + {fr->getMarkerHighlitedCmd();;} break; case 1021: -#line 2393 "frame/parser.Y" - {fr->getMarkerSelectedCmd();;} +#line 2391 "frame/parser.Y" + {fr->getMarkerHighlitedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1022: #line 2394 "frame/parser.Y" - {fr->getMarkerSelectedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} + {fr->getMarkerSelectedCmd();;} break; case 1023: -#line 2397 "frame/parser.Y" - {fr->getMarkerShowCmd();;} +#line 2395 "frame/parser.Y" + {fr->getMarkerSelectedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1024: #line 2398 "frame/parser.Y" - {fr->getMarkerShowTextCmd();;} + {fr->getMarkerShowCmd();;} break; case 1025: -#line 2401 "frame/parser.Y" +#line 2399 "frame/parser.Y" + {fr->getMarkerShowTextCmd();;} + break; + + case 1026: +#line 2402 "frame/parser.Y" { strncpy(currentFont, "helvetica 10 normal roman", 32); strncpy(currentColor, "green", 16); @@ -9743,201 +9811,196 @@ yyreduce: ;} break; - case 1026: -#line 2414 "frame/parser.Y" + case 1027: +#line 2415 "frame/parser.Y" {fr->markerLayerCmd(Base::USER);;} break; - case 1027: -#line 2415 "frame/parser.Y" + case 1028: +#line 2416 "frame/parser.Y" { // backward compatibility fr->markerLayerCmd(Base::USER); ;} break; - case 1028: -#line 2419 "frame/parser.Y" + case 1029: +#line 2420 "frame/parser.Y" {fr->markerLayerCmd(Base::USER);;} break; - case 1029: -#line 2420 "frame/parser.Y" + case 1030: +#line 2421 "frame/parser.Y" { // backward compatibility fr->markerLayerCmd(Base::USER); ;} break; - case 1030: -#line 2424 "frame/parser.Y" + case 1031: +#line 2425 "frame/parser.Y" {fr->markerLayerCmd(Base::CATALOG);;} break; - case 1031: -#line 2429 "frame/parser.Y" + case 1032: +#line 2430 "frame/parser.Y" {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(1) - (7)].integer), (Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), (Coord::SkyFormat)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), 0, propQMask, propQValue, taglist);;} break; - case 1032: -#line 2434 "frame/parser.Y" + case 1033: +#line 2435 "frame/parser.Y" {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(2) - (8)].integer), (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer), (Coord::SkyFormat)(yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer), 1, propQMask, propQValue, taglist);;} break; - case 1033: -#line 2440 "frame/parser.Y" + case 1034: +#line 2441 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; - case 1034: -#line 2442 "frame/parser.Y" + case 1035: +#line 2443 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].str), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; - case 1035: -#line 2445 "frame/parser.Y" + case 1036: +#line 2446 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; - case 1036: -#line 2447 "frame/parser.Y" + case 1037: +#line 2448 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].integer), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; - case 1037: -#line 2450 "frame/parser.Y" - {fr->markerLoadFitsCmd((yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].dash), (yyvsp[(5) - (6)].integer), (yyvsp[(6) - (6)].str));;} - break; - case 1038: -#line 2453 "frame/parser.Y" - {fr->markerMoveCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} +#line 2451 "frame/parser.Y" + {fr->markerLoadFitsCmd((yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].dash), (yyvsp[(5) - (6)].integer), (yyvsp[(6) - (6)].str));;} break; case 1039: #line 2454 "frame/parser.Y" - {fr->markerFrontCmd();;} + {fr->markerMoveCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1040: #line 2455 "frame/parser.Y" - {fr->markerBackCmd();;} + {fr->markerFrontCmd();;} break; case 1041: #line 2456 "frame/parser.Y" - {fr->markerMoveBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->markerBackCmd();;} break; case 1042: #line 2457 "frame/parser.Y" - {fr->markerMoveMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->markerMoveBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1043: #line 2458 "frame/parser.Y" - {fr->markerMoveEndCmd();;} + {fr->markerMoveMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1044: -#line 2460 "frame/parser.Y" - {fr->markerMoveToCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (4)].integer), (Coord::SkyFrame)(yyvsp[(3) - (4)].integer));;} +#line 2459 "frame/parser.Y" + {fr->markerMoveEndCmd();;} break; - case 1047: -#line 2467 "frame/parser.Y" - {setProps(¤tProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + case 1045: +#line 2461 "frame/parser.Y" + {fr->markerMoveToCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (4)].integer), (Coord::SkyFrame)(yyvsp[(3) - (4)].integer));;} break; case 1048: #line 2468 "frame/parser.Y" - {strncpy(currentColor,(yyvsp[(3) - (3)].str),16);;} + {setProps(¤tProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1049: #line 2469 "frame/parser.Y" - {currentDash[0]=(yyvsp[(3) - (4)].integer);currentDash[1]=(yyvsp[(4) - (4)].integer);;} + {strncpy(currentColor,(yyvsp[(3) - (3)].str),16);;} break; case 1050: #line 2470 "frame/parser.Y" - {currentWidth = (yyvsp[(3) - (3)].integer);;} + {currentDash[0]=(yyvsp[(3) - (4)].integer);currentDash[1]=(yyvsp[(4) - (4)].integer);;} break; case 1051: #line 2471 "frame/parser.Y" - {strncpy(currentFont,(yyvsp[(3) - (3)].str),32);;} + {currentWidth = (yyvsp[(3) - (3)].integer);;} break; case 1052: #line 2472 "frame/parser.Y" - {strncpy(currentText,(yyvsp[(3) - (3)].str),80);;} + {strncpy(currentFont,(yyvsp[(3) - (3)].str),32);;} break; - case 1055: -#line 2477 "frame/parser.Y" - {(yyval.integer) = Marker::NONE;;} + case 1053: +#line 2473 "frame/parser.Y" + {strncpy(currentText,(yyvsp[(3) - (3)].str),80);;} break; case 1056: #line 2478 "frame/parser.Y" - {(yyval.integer) = Marker::SELECT;;} + {(yyval.integer) = Marker::NONE;;} break; case 1057: #line 2479 "frame/parser.Y" - {(yyval.integer) = Marker::HIGHLITE;;} + {(yyval.integer) = Marker::SELECT;;} break; case 1058: #line 2480 "frame/parser.Y" - {(yyval.integer) = Marker::DASH;;} + {(yyval.integer) = Marker::HIGHLITE;;} break; case 1059: #line 2481 "frame/parser.Y" - {(yyval.integer) = Marker::FIXED;;} + {(yyval.integer) = Marker::DASH;;} break; case 1060: #line 2482 "frame/parser.Y" - {(yyval.integer) = Marker::EDIT;;} + {(yyval.integer) = Marker::FIXED;;} break; case 1061: #line 2483 "frame/parser.Y" - {(yyval.integer) = Marker::MOVE;;} + {(yyval.integer) = Marker::EDIT;;} break; case 1062: #line 2484 "frame/parser.Y" - {(yyval.integer) = Marker::ROTATE;;} + {(yyval.integer) = Marker::MOVE;;} break; case 1063: #line 2485 "frame/parser.Y" - {(yyval.integer) = Marker::DELETE;;} + {(yyval.integer) = Marker::ROTATE;;} break; case 1064: #line 2486 "frame/parser.Y" - {(yyval.integer) = Marker::INCLUDE;;} + {(yyval.integer) = Marker::DELETE;;} break; case 1065: #line 2487 "frame/parser.Y" - {(yyval.integer) = Marker::SOURCE;;} + {(yyval.integer) = Marker::INCLUDE;;} break; - case 1068: -#line 2494 "frame/parser.Y" - {propQMask=0;propQValue=0;;} + case 1066: +#line 2488 "frame/parser.Y" + {(yyval.integer) = Marker::SOURCE;;} break; case 1069: @@ -9945,44 +10008,44 @@ yyreduce: {propQMask=0;propQValue=0;;} break; - case 1071: -#line 2498 "frame/parser.Y" - {fr->markerSelectAllCmd();;} + case 1070: +#line 2496 "frame/parser.Y" + {propQMask=0;propQValue=0;;} break; case 1072: #line 2499 "frame/parser.Y" - {fr->markerSelectOnlyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->markerSelectAllCmd();;} break; case 1073: #line 2500 "frame/parser.Y" - {fr->markerSelectToggleCmd();;} + {fr->markerSelectOnlyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1074: #line 2501 "frame/parser.Y" - {fr->markerSelectToggleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->markerSelectToggleCmd();;} break; case 1075: -#line 2504 "frame/parser.Y" - {fr->markerShowCmd((yyvsp[(1) - (1)].integer));;} +#line 2502 "frame/parser.Y" + {fr->markerSelectToggleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1076: #line 2505 "frame/parser.Y" - {fr->markerShowTextCmd((yyvsp[(2) - (2)].integer));;} + {fr->markerShowCmd((yyvsp[(1) - (1)].integer));;} break; - case 1079: -#line 2513 "frame/parser.Y" - {propQMask |= (yyvsp[(1) - (3)].integer); setProps(&propQValue,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + case 1077: +#line 2506 "frame/parser.Y" + {fr->markerShowTextCmd((yyvsp[(2) - (2)].integer));;} break; case 1080: -#line 2516 "frame/parser.Y" - {taglist.deleteAll();;} +#line 2514 "frame/parser.Y" + {propQMask |= (yyvsp[(1) - (3)].integer); setProps(&propQValue,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1081: @@ -9990,652 +10053,662 @@ yyreduce: {taglist.deleteAll();;} break; - case 1085: -#line 2524 "frame/parser.Y" - {taglist.append(new Tag((yyvsp[(3) - (3)].str)));;} + case 1082: +#line 2518 "frame/parser.Y" + {taglist.deleteAll();;} break; case 1086: -#line 2527 "frame/parser.Y" - {cblist.append( - new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;} +#line 2525 "frame/parser.Y" + {taglist.append(new Tag((yyvsp[(3) - (3)].str)));;} break; case 1087: -#line 2531 "frame/parser.Y" - {fr->maskClearCmd();;} +#line 2528 "frame/parser.Y" + {cblist.append( + new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;} break; case 1088: #line 2532 "frame/parser.Y" - {fr->maskColorCmd((yyvsp[(2) - (2)].str));;} + {fr->maskClearCmd();;} break; case 1089: #line 2533 "frame/parser.Y" - {fr->maskMarkCmd((yyvsp[(2) - (2)].integer));;} + {fr->maskColorCmd((yyvsp[(2) - (2)].str));;} break; case 1090: #line 2534 "frame/parser.Y" - {fr->maskTransparencyCmd((yyvsp[(2) - (2)].real));;} + {fr->maskMarkCmd((yyvsp[(2) - (2)].integer));;} break; case 1091: -#line 2537 "frame/parser.Y" - {fr->orientCmd(Coord::XX);;} +#line 2535 "frame/parser.Y" + {fr->maskSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 1092: -#line 2538 "frame/parser.Y" - {fr->orientCmd(Coord::YY);;} +#line 2536 "frame/parser.Y" + {fr->maskTransparencyCmd((yyvsp[(2) - (2)].real));;} break; case 1093: #line 2539 "frame/parser.Y" - {fr->orientCmd(Coord::XY);;} + {fr->orientCmd(Coord::XX);;} break; case 1094: #line 2540 "frame/parser.Y" - {fr->orientCmd(Coord::NORMAL);;} + {fr->orientCmd(Coord::YY);;} break; case 1095: -#line 2544 "frame/parser.Y" - {fr->panCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} +#line 2541 "frame/parser.Y" + {fr->orientCmd(Coord::XY);;} break; case 1096: -#line 2545 "frame/parser.Y" - {fr->panCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} +#line 2542 "frame/parser.Y" + {fr->orientCmd(Coord::NORMAL);;} break; case 1097: +#line 2546 "frame/parser.Y" + {fr->panCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} + break; + + case 1098: #line 2547 "frame/parser.Y" + {fr->panCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} + break; + + case 1099: +#line 2549 "frame/parser.Y" { // backward compatibility fr->panCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real))); ;} break; - case 1098: -#line 2552 "frame/parser.Y" - {fr->panCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} - break; - case 1100: #line 2554 "frame/parser.Y" - {fr->panBBoxCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + {fr->panCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} break; case 1102: #line 2556 "frame/parser.Y" + {fr->panBBoxCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + break; + + case 1104: +#line 2558 "frame/parser.Y" {fr->panPreserveCmd((yyvsp[(2) - (2)].integer));;} break; - case 1103: -#line 2559 "frame/parser.Y" + case 1105: +#line 2561 "frame/parser.Y" {fr->panToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; - case 1104: -#line 2561 "frame/parser.Y" + case 1106: +#line 2563 "frame/parser.Y" { // backward compatibility fr->panToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real))); ;} break; - case 1105: -#line 2566 "frame/parser.Y" + case 1107: +#line 2568 "frame/parser.Y" {fr->panToCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} break; - case 1106: -#line 2569 "frame/parser.Y" + case 1108: +#line 2571 "frame/parser.Y" {fr->panBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; - case 1107: -#line 2570 "frame/parser.Y" + case 1109: +#line 2572 "frame/parser.Y" {fr->panMotionCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; - case 1108: -#line 2571 "frame/parser.Y" + case 1110: +#line 2573 "frame/parser.Y" {fr->panEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; - case 1109: -#line 2574 "frame/parser.Y" + case 1111: +#line 2576 "frame/parser.Y" {fr->pannerCmd((yyvsp[(1) - (1)].integer));;} break; - case 1110: -#line 2576 "frame/parser.Y" + case 1112: +#line 2578 "frame/parser.Y" { // backward compatibility fr->pannerCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer),(Coord::SkyFrame)(yyvsp[(3) - (3)].integer)); ;} break; - case 1111: -#line 2580 "frame/parser.Y" - {fr->pannerCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} - break; - - case 1112: -#line 2581 "frame/parser.Y" - {fr->updatePannerCmd();;} - break; - case 1113: -#line 2585 "frame/parser.Y" - {fr->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;} +#line 2582 "frame/parser.Y" + {fr->pannerCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} break; case 1114: -#line 2586 "frame/parser.Y" - {fr->psLevelCmd((yyvsp[(2) - (2)].integer));;} +#line 2583 "frame/parser.Y" + {fr->updatePannerCmd();;} break; case 1115: #line 2587 "frame/parser.Y" - {fr->psResolutionCmd((yyvsp[(2) - (2)].integer));;} + {fr->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;} break; case 1116: #line 2588 "frame/parser.Y" - { - // backward compatibility with backup - ;} + {fr->psLevelCmd((yyvsp[(2) - (2)].integer));;} break; case 1117: -#line 2594 "frame/parser.Y" - {fr->precCmd((yyvsp[(1) - (9)].integer),(yyvsp[(2) - (9)].integer),(yyvsp[(3) - (9)].integer),(yyvsp[(4) - (9)].integer),(yyvsp[(5) - (9)].integer),(yyvsp[(6) - (9)].integer),(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(yyvsp[(9) - (9)].integer));;} +#line 2589 "frame/parser.Y" + {fr->psResolutionCmd((yyvsp[(2) - (2)].integer));;} break; case 1118: -#line 2595 "frame/parser.Y" +#line 2590 "frame/parser.Y" { // backward compatibility with backup - fr->precCmd((yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer)); ;} break; case 1119: -#line 2601 "frame/parser.Y" - {(yyval.integer) = Widget::BW;;} +#line 2596 "frame/parser.Y" + {fr->precCmd((yyvsp[(1) - (9)].integer),(yyvsp[(2) - (9)].integer),(yyvsp[(3) - (9)].integer),(yyvsp[(4) - (9)].integer),(yyvsp[(5) - (9)].integer),(yyvsp[(6) - (9)].integer),(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(yyvsp[(9) - (9)].integer));;} break; case 1120: -#line 2602 "frame/parser.Y" - {(yyval.integer) = Widget::GRAY;;} +#line 2597 "frame/parser.Y" + { + // backward compatibility with backup + fr->precCmd((yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer)); + ;} break; case 1121: #line 2603 "frame/parser.Y" - {(yyval.integer) = Widget::RGB;;} + {(yyval.integer) = Widget::BW;;} break; case 1122: #line 2604 "frame/parser.Y" - {(yyval.integer) = Widget::CMYK;;} + {(yyval.integer) = Widget::GRAY;;} break; - case 1125: -#line 2612 "frame/parser.Y" - {fr->regionHighliteBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + case 1123: +#line 2605 "frame/parser.Y" + {(yyval.integer) = Widget::RGB;;} break; - case 1126: -#line 2614 "frame/parser.Y" - {fr->regionHighliteMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} + case 1124: +#line 2606 "frame/parser.Y" + {(yyval.integer) = Widget::CMYK;;} break; case 1127: -#line 2615 "frame/parser.Y" - {fr->regionHighliteEndCmd();;} +#line 2614 "frame/parser.Y" + {fr->regionHighliteBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1128: #line 2616 "frame/parser.Y" - {fr->regionHighliteShiftEndCmd();;} + {fr->regionHighliteMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1129: -#line 2620 "frame/parser.Y" - {fr->regionSelectBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} +#line 2617 "frame/parser.Y" + {fr->regionHighliteEndCmd();;} break; case 1130: -#line 2621 "frame/parser.Y" - {fr->regionSelectMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} +#line 2618 "frame/parser.Y" + {fr->regionHighliteShiftEndCmd();;} break; case 1131: #line 2622 "frame/parser.Y" - {fr->regionSelectEndCmd();;} + {fr->regionSelectBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1132: #line 2623 "frame/parser.Y" - {fr->regionSelectShiftEndCmd();;} + {fr->regionSelectMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1133: -#line 2626 "frame/parser.Y" - {(yyval.integer) = Frame3dBase::MIP;;} +#line 2624 "frame/parser.Y" + {fr->regionSelectEndCmd();;} break; case 1134: -#line 2627 "frame/parser.Y" - {(yyval.integer) = Frame3dBase::AIP;;} +#line 2625 "frame/parser.Y" + {fr->regionSelectShiftEndCmd();;} break; case 1135: -#line 2630 "frame/parser.Y" - {(yyval.integer) = Frame3dBase::NONE;;} +#line 2628 "frame/parser.Y" + {(yyval.integer) = Frame3dBase::MIP;;} break; case 1136: -#line 2631 "frame/parser.Y" - {(yyval.integer) = Frame3dBase::AZIMUTH;;} +#line 2629 "frame/parser.Y" + {(yyval.integer) = Frame3dBase::AIP;;} break; case 1137: #line 2632 "frame/parser.Y" - {(yyval.integer) = Frame3dBase::ELEVATION;;} + {(yyval.integer) = Frame3dBase::NONE;;} break; case 1138: -#line 2635 "frame/parser.Y" - {fr->setRGBChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2633 "frame/parser.Y" + {(yyval.integer) = Frame3dBase::AZIMUTH;;} break; case 1139: -#line 2636 "frame/parser.Y" - {fr->setRGBSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} +#line 2634 "frame/parser.Y" + {(yyval.integer) = Frame3dBase::ELEVATION;;} break; case 1140: #line 2637 "frame/parser.Y" - {fr->setRGBViewCmd((yyvsp[(2) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + {fr->setRGBChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1141: -#line 2640 "frame/parser.Y" - {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;} +#line 2638 "frame/parser.Y" + {fr->setRGBSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 1142: -#line 2641 "frame/parser.Y" - {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (2)].real))));;} +#line 2639 "frame/parser.Y" + {fr->setRGBViewCmd((yyvsp[(2) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} + break; + + case 1143: +#line 2642 "frame/parser.Y" + {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;} break; case 1144: #line 2643 "frame/parser.Y" + {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (2)].real))));;} + break; + + case 1146: +#line 2645 "frame/parser.Y" {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (2)].real))));;} break; - case 1145: -#line 2644 "frame/parser.Y" + case 1147: +#line 2646 "frame/parser.Y" {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (3)].real))));;} break; - case 1146: -#line 2647 "frame/parser.Y" + case 1148: +#line 2649 "frame/parser.Y" {fr->rotateBeginCmd();;} break; - case 1147: -#line 2648 "frame/parser.Y" + case 1149: +#line 2650 "frame/parser.Y" {fr->rotateMotionCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;} break; - case 1148: -#line 2649 "frame/parser.Y" + case 1150: +#line 2651 "frame/parser.Y" {fr->rotateEndCmd();;} break; - case 1153: -#line 2656 "frame/parser.Y" + case 1155: +#line 2658 "frame/parser.Y" {fr->savePhotoCmd((yyvsp[(2) - (2)].str));;} break; - case 1154: -#line 2660 "frame/parser.Y" + case 1156: +#line 2662 "frame/parser.Y" {fr->saveArrayFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1155: -#line 2662 "frame/parser.Y" + case 1157: +#line 2664 "frame/parser.Y" {fr->saveArrayChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1156: -#line 2664 "frame/parser.Y" + case 1158: +#line 2666 "frame/parser.Y" {fr->saveArraySocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1158: -#line 2669 "frame/parser.Y" + case 1160: +#line 2671 "frame/parser.Y" {fr->saveArrayRGBCubeFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1159: -#line 2671 "frame/parser.Y" + case 1161: +#line 2673 "frame/parser.Y" {fr->saveArrayRGBCubeChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1160: -#line 2673 "frame/parser.Y" + case 1162: +#line 2675 "frame/parser.Y" {fr->saveArrayRGBCubeSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; - case 1170: -#line 2686 "frame/parser.Y" - {fr->saveFitsFileCmd((yyvsp[(2) - (2)].str));;} - break; - - case 1171: -#line 2687 "frame/parser.Y" - {fr->saveFitsChannelCmd((yyvsp[(2) - (2)].str));;} - break; - case 1172: #line 2688 "frame/parser.Y" - {fr->saveFitsSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsFileCmd((yyvsp[(2) - (2)].str));;} break; case 1173: -#line 2691 "frame/parser.Y" - {fr->saveFitsTableFileCmd((yyvsp[(2) - (2)].str));;} +#line 2689 "frame/parser.Y" + {fr->saveFitsChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1174: -#line 2692 "frame/parser.Y" - {fr->saveFitsTableChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2690 "frame/parser.Y" + {fr->saveFitsSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1175: #line 2693 "frame/parser.Y" - {fr->saveFitsTableSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsTableFileCmd((yyvsp[(2) - (2)].str));;} break; case 1176: -#line 2696 "frame/parser.Y" - {fr->saveFitsSliceFileCmd((yyvsp[(2) - (2)].str));;} +#line 2694 "frame/parser.Y" + {fr->saveFitsTableChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1177: -#line 2697 "frame/parser.Y" - {fr->saveFitsSliceChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2695 "frame/parser.Y" + {fr->saveFitsTableSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1178: #line 2698 "frame/parser.Y" - {fr->saveFitsSliceSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsSliceFileCmd((yyvsp[(2) - (2)].str));;} break; case 1179: -#line 2701 "frame/parser.Y" - {fr->saveFitsExtCubeFileCmd((yyvsp[(2) - (2)].str));;} +#line 2699 "frame/parser.Y" + {fr->saveFitsSliceChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1180: -#line 2702 "frame/parser.Y" - {fr->saveFitsExtCubeChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2700 "frame/parser.Y" + {fr->saveFitsSliceSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1181: #line 2703 "frame/parser.Y" - {fr->saveFitsExtCubeSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsExtCubeFileCmd((yyvsp[(2) - (2)].str));;} break; - case 1183: -#line 2707 "frame/parser.Y" - {fr->saveFitsMosaicFileCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} + case 1182: +#line 2704 "frame/parser.Y" + {fr->saveFitsExtCubeChannelCmd((yyvsp[(2) - (2)].str));;} break; - case 1184: -#line 2708 "frame/parser.Y" - {fr->saveFitsMosaicChannelCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} + case 1183: +#line 2705 "frame/parser.Y" + {fr->saveFitsExtCubeSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1185: #line 2709 "frame/parser.Y" - {fr->saveFitsMosaicSocketCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} + {fr->saveFitsMosaicFileCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1186: -#line 2712 "frame/parser.Y" - {fr->saveFitsMosaicImageFileCmd((yyvsp[(2) - (2)].str));;} +#line 2710 "frame/parser.Y" + {fr->saveFitsMosaicChannelCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1187: -#line 2713 "frame/parser.Y" - {fr->saveFitsMosaicImageChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2711 "frame/parser.Y" + {fr->saveFitsMosaicSocketCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1188: #line 2714 "frame/parser.Y" - {fr->saveFitsMosaicImageSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsMosaicImageFileCmd((yyvsp[(2) - (2)].str));;} break; case 1189: -#line 2717 "frame/parser.Y" - {fr->saveFitsRGBImageFileCmd((yyvsp[(2) - (2)].str));;} +#line 2715 "frame/parser.Y" + {fr->saveFitsMosaicImageChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1190: -#line 2718 "frame/parser.Y" - {fr->saveFitsRGBImageChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2716 "frame/parser.Y" + {fr->saveFitsMosaicImageSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1191: #line 2719 "frame/parser.Y" - {fr->saveFitsRGBImageSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsRGBImageFileCmd((yyvsp[(2) - (2)].str));;} break; case 1192: -#line 2722 "frame/parser.Y" - {fr->saveFitsRGBCubeFileCmd((yyvsp[(2) - (2)].str));;} +#line 2720 "frame/parser.Y" + {fr->saveFitsRGBImageChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1193: -#line 2723 "frame/parser.Y" - {fr->saveFitsRGBCubeChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2721 "frame/parser.Y" + {fr->saveFitsRGBImageSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1194: #line 2724 "frame/parser.Y" - {fr->saveFitsRGBCubeSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsRGBCubeFileCmd((yyvsp[(2) - (2)].str));;} break; case 1195: -#line 2727 "frame/parser.Y" - {fr->saveFitsResampleFileCmd((yyvsp[(2) - (2)].str));;} +#line 2725 "frame/parser.Y" + {fr->saveFitsRGBCubeChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1196: -#line 2728 "frame/parser.Y" - {fr->saveFitsResampleChannelCmd((yyvsp[(2) - (2)].str));;} +#line 2726 "frame/parser.Y" + {fr->saveFitsRGBCubeSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1197: #line 2729 "frame/parser.Y" - {fr->saveFitsResampleSocketCmd((yyvsp[(2) - (2)].integer));;} + {fr->saveFitsResampleFileCmd((yyvsp[(2) - (2)].str));;} break; case 1198: -#line 2733 "frame/parser.Y" - {fr->saveNRRDFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} +#line 2730 "frame/parser.Y" + {fr->saveFitsResampleChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1199: -#line 2735 "frame/parser.Y" - {fr->saveNRRDChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} +#line 2731 "frame/parser.Y" + {fr->saveFitsResampleSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1200: -#line 2737 "frame/parser.Y" - {fr->saveNRRDSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} +#line 2735 "frame/parser.Y" + {fr->saveNRRDFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1201: -#line 2741 "frame/parser.Y" - {fr->saveENVIFileCmd((yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (FitsFile::ArchType)(yyvsp[(4) - (4)].integer));;} +#line 2737 "frame/parser.Y" + {fr->saveNRRDChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1202: -#line 2745 "frame/parser.Y" - {fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real));;} +#line 2739 "frame/parser.Y" + {fr->saveNRRDSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1203: +#line 2743 "frame/parser.Y" + {fr->saveENVIFileCmd((yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (FitsFile::ArchType)(yyvsp[(4) - (4)].integer));;} + break; + + case 1204: #line 2747 "frame/parser.Y" + {fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real));;} + break; + + case 1205: +#line 2749 "frame/parser.Y" { // backward compatibility with backup fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer)); ;} break; - case 1204: -#line 2751 "frame/parser.Y" + case 1206: +#line 2753 "frame/parser.Y" {fr->smoothDeleteCmd();;} break; - case 1205: -#line 2754 "frame/parser.Y" + case 1207: +#line 2756 "frame/parser.Y" {(yyval.integer) = Context::BOXCAR;;} break; - case 1206: -#line 2755 "frame/parser.Y" + case 1208: +#line 2757 "frame/parser.Y" {(yyval.integer) = Context::TOPHAT;;} break; - case 1207: -#line 2756 "frame/parser.Y" + case 1209: +#line 2758 "frame/parser.Y" {(yyval.integer) = Context::GAUSSIAN;;} break; - case 1208: -#line 2757 "frame/parser.Y" + case 1210: +#line 2759 "frame/parser.Y" {(yyval.integer) = Context::ELLIPTIC;;} break; - case 1209: -#line 2760 "frame/parser.Y" + case 1211: +#line 2762 "frame/parser.Y" {fr->updateFitsCmd(0);;} break; - case 1210: -#line 2762 "frame/parser.Y" + case 1212: +#line 2764 "frame/parser.Y" {fr->updateFitsCmd((yyvsp[(1) - (5)].integer),BBox((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)),0);;} break; - case 1211: -#line 2763 "frame/parser.Y" + case 1213: +#line 2765 "frame/parser.Y" {fr->updateFitsCmd(1);;} break; - case 1212: -#line 2765 "frame/parser.Y" + case 1214: +#line 2767 "frame/parser.Y" {fr->updateFitsCmd((yyvsp[(2) - (6)].integer),BBox((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)),1);;} break; - case 1214: -#line 2769 "frame/parser.Y" + case 1216: +#line 2771 "frame/parser.Y" {fr->sliceCmd((yyvsp[(1) - (1)].integer));;} break; - case 1215: -#line 2771 "frame/parser.Y" + case 1217: +#line 2773 "frame/parser.Y" {fr->sliceCmd((yyvsp[(1) - (3)].real), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame (yyvsp[(3) - (3)].integer)));;} break; - case 1216: -#line 2772 "frame/parser.Y" + case 1218: +#line 2774 "frame/parser.Y" { // backward compatibility with backup fr->sliceCmd((yyvsp[(2) - (2)].integer)); ;} break; - case 1217: -#line 2778 "frame/parser.Y" + case 1219: +#line 2780 "frame/parser.Y" {fr->warpCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; - case 1218: -#line 2779 "frame/parser.Y" + case 1220: +#line 2781 "frame/parser.Y" {fr->warpToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; - case 1219: -#line 2783 "frame/parser.Y" + case 1221: +#line 2785 "frame/parser.Y" {fr->wcsCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;} break; - case 1221: -#line 2785 "frame/parser.Y" + case 1223: +#line 2787 "frame/parser.Y" {fr->wcsResetCmd((yyvsp[(2) - (2)].integer));;} break; - case 1224: -#line 2790 "frame/parser.Y" + case 1226: +#line 2792 "frame/parser.Y" {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; - case 1225: -#line 2791 "frame/parser.Y" + case 1227: +#line 2793 "frame/parser.Y" {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; - case 1226: -#line 2792 "frame/parser.Y" + case 1228: +#line 2794 "frame/parser.Y" {fr->wcsAppendTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; - case 1227: -#line 2795 "frame/parser.Y" + case 1229: +#line 2797 "frame/parser.Y" {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; - case 1228: -#line 2796 "frame/parser.Y" + case 1230: +#line 2798 "frame/parser.Y" {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; - case 1229: -#line 2797 "frame/parser.Y" + case 1231: +#line 2799 "frame/parser.Y" {fr->wcsReplaceTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; - case 1230: -#line 2800 "frame/parser.Y" + case 1232: +#line 2802 "frame/parser.Y" {fr->wcsAlignCmd((yyvsp[(1) - (1)].integer));;} break; - case 1231: -#line 2802 "frame/parser.Y" + case 1233: +#line 2804 "frame/parser.Y" { // used by backup fr->wcsAlignCmd((yyvsp[(1) - (3)].integer), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer)); ;} break; - case 1232: -#line 2807 "frame/parser.Y" + case 1234: +#line 2809 "frame/parser.Y" {fr->wcsAlignCmd((yyvsp[(1) - (4)].integer), (FitsImage*)(yyvsp[(2) - (4)].ptr), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; - case 1233: -#line 2810 "frame/parser.Y" + case 1235: +#line 2812 "frame/parser.Y" { #ifdef __WIN32 fr->win32PrintCmd(); @@ -10643,66 +10716,66 @@ yyreduce: ;} break; - case 1234: -#line 2817 "frame/parser.Y" + case 1236: +#line 2819 "frame/parser.Y" {fr->zoomCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; - case 1235: -#line 2819 "frame/parser.Y" + case 1237: +#line 2821 "frame/parser.Y" {fr->zoomAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; - case 1236: -#line 2821 "frame/parser.Y" + case 1238: +#line 2823 "frame/parser.Y" { // backward compatibility fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real))); ;} break; - case 1237: -#line 2826 "frame/parser.Y" + case 1239: +#line 2828 "frame/parser.Y" {fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(6) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; - case 1239: -#line 2830 "frame/parser.Y" + case 1241: +#line 2832 "frame/parser.Y" {fr->zoomToFitCmd(1);;} break; - case 1240: -#line 2831 "frame/parser.Y" + case 1242: +#line 2833 "frame/parser.Y" {fr->zoomToFitCmd((yyvsp[(2) - (2)].real));;} break; - case 1241: -#line 2832 "frame/parser.Y" + case 1243: +#line 2834 "frame/parser.Y" {fr->zoomToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; - case 1242: -#line 2834 "frame/parser.Y" + case 1244: +#line 2836 "frame/parser.Y" {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; - case 1243: -#line 2836 "frame/parser.Y" + case 1245: +#line 2838 "frame/parser.Y" { // backward compatibility fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real))); ;} break; - case 1244: -#line 2841 "frame/parser.Y" + case 1246: +#line 2843 "frame/parser.Y" {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(6) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; /* Line 1267 of yacc.c. */ -#line 10706 "frame/parser.C" +#line 10779 "frame/parser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -10916,7 +10989,7 @@ yyreturn: } -#line 2845 "frame/parser.Y" +#line 2847 "frame/parser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/parser.Y b/tksao/frame/parser.Y index a614b62..f33ec46 100644 --- a/tksao/frame/parser.Y +++ b/tksao/frame/parser.Y @@ -1226,7 +1226,8 @@ getGrid : /* empty */ {fr->getGridCmd();} getMask : COLOR_ {fr->getMaskColorCmd();} | MARK_ {fr->getMaskMarkCmd();} - | TRANSPARENCY_{fr->getMaskTransparencyCmd();} + | SYSTEM_ {fr->getMaskSystemCmd();} + | TRANSPARENCY_ {fr->getMaskTransparencyCmd();} ; getPan : PRESERVE_ {fr->getPanPreserveCmd();} @@ -2531,6 +2532,7 @@ callback : CALLBACK_ '=' markerCallBack STRING STRING {cblist.append( mask : CLEAR_ {fr->maskClearCmd();} | COLOR_ STRING {fr->maskColorCmd($2);} | MARK_ INT {fr->maskMarkCmd($2);} + | SYSTEM_ coordSystem {fr->maskSystemCmd((Coord::CoordSystem)$2);} | TRANSPARENCY_ numeric {fr->maskTransparencyCmd($2);} ; -- cgit v0.12