[SCM] image display tool for astronomy branch, upstream, updated. f6f5ad7a19a7c674dd427fb54f15a41a98d94d5e
Ole Streicher
debian at liska.ath.cx
Wed Jun 6 13:58:53 UTC 2012
The following commit has been merged in the upstream branch:
commit 52df4e302f256b0b10e317e95cda27315d7d0317
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sun Jun 3 19:47:53 2012 +0200
New upstream beta version 7.0~b21
diff --git a/doc/acknowledgment.html b/doc/acknowledgment.html
index 3c34523..ecc7f91 100644
--- a/doc/acknowledgment.html
+++ b/doc/acknowledgment.html
@@ -9,21 +9,22 @@
</head>
<body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
vlink="#551a8b">
- <h3> <img alt="" src="sun.gif" align="middle" height="98"
- width="100">
- SAOImage DS9 Acknowledgment</h3>
+ <h3> <img alt="" src="sun.gif" align="middle" width="100"
+ height="98"> SAOImage DS9 Acknowledgment</h3>
<blockquote>
- <p>SAOImage DS9 development has been made possible by funding
- from the Chandra X-ray Science Center (NAS8-03060), High Energy
- Astrophysics Science Archive Center (NCC5-568), and JWST Mission
- office at Space Telescope Science Institute (NAS-03127).</p>
+ <p>SAOImage DS9 development has been made possible by funding from
+ the Chandra X-ray Science Center (NAS8-03060) and the High
+ Energy Astrophysics Science Archive Center (NCC5-568).
+ Additional funding was provided by the JWST Mission office at
+ Space Telescope Science Institute (NAS-03127) to improve
+ capabilities for 3-D data visualization.<br>
+ </p>
<p>If you have found SAOImage DS9 to be helpful in your research,
- the
- following acknowledgment would be appreciated</p>
+ the following acknowledgment would be appreciated</p>
<p><i> </i></p>
<blockquote>
- <p><i>"This research has made use of SAOImage DS9, developed
- by Smithsonian Astrophysical Observatory" </i></p>
+ <p><i>"This research has made use of SAOImage DS9, developed by
+ Smithsonian Astrophysical Observatory" </i></p>
</blockquote>
<p>or reference the following paper<a
href="http://adsabs.harvard.edu/cgi-bin/nph-bib_query?bibcode=2003adass..12..489J">2003adass..12..489J</a></p>
diff --git a/doc/beta.html b/doc/beta.html
index 14af193..dd5ebcf 100644
--- a/doc/beta.html
+++ b/doc/beta.html
@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
-<head>
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
- <meta name="GENERATOR"
- content="Mozilla/4.76 [en] (X11; U; SunOS 5.8 sun4u) [Netscape]">
- <title>DS9</title>
-<script type="text/javascript">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
+ charset=ISO-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.76 [en] (X11; U; SunOS 5.8
+ sun4u) [Netscape]">
+ <title>DS9</title>
+ <script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-30382362-2']);
@@ -18,89 +18,90 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-</script></head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<h3> <img src="sun.gif" alt="" height="98" width="100" align="middle">
-SAOImage DS9: Beta Releases<br>
-</h3>
-<blockquote>
- <p>New releases of the DS9 binaries, including new features and bug
-fixes,
-are made available three times a year on January 15th, April 15th, and
-October 15th. In addition, periodically, beta
-releases are also made available for testing and verification purposes
-only. Please note these versions of DS9 are BETA, and have not been
-fully tested and verified. </p>
- <p><b>DS9 Version 7.0 Beta 20 Binaries</b><br>
- </p>
- <blockquote>Linux
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.7.0b20.tar.gz">Linux</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.7.0b20.tar.gz">Linux64</a><br>
- </blockquote>
-MacOSX Application <i>(currently unavailable)</i><br>
- <br>
-MacOSX using X11 Window System (command-line program for
-advanced users)
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/ds9.darwinlion.7.0b20.tar.gz">for
-OS
-version
-10.7
-(Lion)</a><a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/ds9.darwinsnowleopard.7.0b20.tar.gz"><br>
-for
-OS
-version
-10.6
-(Snow
-Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/ds9.darwinleopard.7.0b20.tar.gz">for
-OS
-version
-10.5
-(Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/ds9.darwintiger.7.0b20.tar.gz">for
-OS
-version
-10.4
-(Tiger)</a><br>
- </blockquote>
-Windows<br>
- <i> </i>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/windows/SAOImage%20DS9%207.0b20%20Install.exe">Windows
-7/Vista/XP</a><br>
- <i> </i></blockquote>
-Solaris<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/solaris/ds9.solaris.7.0b20.tar.gz">Solaris</a><br>
- </blockquote>
-Source
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0b20.tar.gz">Source</a></blockquote>
+</script>
+ </head>
+ <body style="color: rgb(0, 0, 0); background-color: rgb(255, 255,
+ 255);" alink="#ff0000" link="#0000ee" vlink="#551a8b">
+ <h3> <img src="sun.gif" alt="" align="middle" width="100"
+ height="98">
+ SAOImage DS9: Beta Releases<br>
+ </h3>
<blockquote>
- <blockquote> </blockquote>
+ <p>Periodically, beta
+ releases are also made available for testing and verification
+ purposes
+ only. Please note these versions of DS9 are BETA, and have not
+ been
+ fully tested and verified. </p>
+ <p><b>DS9 Version 7.0 Beta 20 Binaries</b><br>
+ </p>
+ <blockquote>Linux
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.7.0b21.tar.gz">Linux</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.7.0b21.tar.gz">Linux64</a><br>
+ </blockquote>
+ MacOSX using X11 Window System (command-line program for
+ advanced users)
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/ds9.darwinlion.7.0b21.tar.gz">for
+ OS
+ version
+ 10.7
+ (Lion)</a><a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/ds9.darwinsnowleopard.7.0b21.tar.gz"><br>
+ for
+ OS
+ version
+ 10.6
+ (Snow
+ Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/ds9.darwinleopard.7.0b21.tar.gz">for
+ OS
+ version
+ 10.5
+ (Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/ds9.darwintiger.7.0b21.tar.gz">for
+ OS
+ version
+ 10.4
+ (Tiger)</a><br>
+ </blockquote>
+ Windows<br>
+ <i> </i>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/windows/SAOImage%20DS9%207.0b21%20Install.exe">Windows
+ 7</a><br>
+ <i> </i></blockquote>
+ Solaris<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/solaris/ds9.solaris.7.0b21.tar.gz">Solaris</a><br>
+ </blockquote>
+ Source
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0b21.tar.gz">Source</a></blockquote>
+ <blockquote>
+ <blockquote> </blockquote>
+ </blockquote>
+ </blockquote>
+ <p><b>Documentation </b></p>
+ <blockquote><a href="release/r7.0.html">Release Notes</a><br>
+ </blockquote>
+ <p><b>Contact Information</b><br>
+ </p>
+ <blockquote> If you encounter any problems or have suggestions
+ with
+ SAOImage
+ DS9, please contact us: saord @
+ cfa.harvard.edu<br>
+ <br>
+ William Joye<br>
+ Smithsonian Astrophysical Observatory<br>
+ 60 Garden St.<br>
+ Cambridge, MA 02138 USA </blockquote>
+ <br>
</blockquote>
- </blockquote>
- <p><b>Documentation </b></p>
- <blockquote><a href="release/r7.0.html">Release Notes</a><br>
- </blockquote>
- <p><b>Contact Information</b><br>
- </p>
- <blockquote> If you encounter any problems or have suggestions with
-SAOImage
-DS9, please contact us: saord @ cfa.harvard.edu<br>
- <br>
-William Joye<br>
-Smithsonian Astrophysical Observatory<br>
-60 Garden St.<br>
-Cambridge, MA 02138 USA </blockquote>
- <br>
-</blockquote>
-</body>
+ </body>
</html>
diff --git a/doc/faq.html b/doc/faq.html
index 647a306..2ecaa53 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -1,791 +1,744 @@
<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
-<head>
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
- <meta name="GENERATOR"
- content="Mozilla/4.78 [en] (X11; U; Linux 2.4.7-10 i686) [Netscape]">
- <title>DS9 FAQ</title>
-</head>
-<body link="#0000ee" text="#000000" vlink="#551a8b" alink="#ff0000"
- bgcolor="#ffffff">
-<h3> <img alt="" src="sun.gif" height="98" width="100" align="middle">
-SAOImage DS9 FAQ</h3>
-<blockquote>
- <p>This FAQ is a new, on going project, and it is far from
-being complete.
-But as common questions on DS9 are received, the FAQ will be updated. </p>
- <p><b>Contents</b></p>
- <blockquote><a href="#Copyright">Copyright</a><br>
- <a href="#General">General</a><br>
- <a href="#Fonts">Fonts</a><br>
- <a href="faq.html#Linux">Linux</a> <br>
- <a href="faq.html#Windows">Windows</a> <br>
- <a href="#MacOSX">MacOSX</a><br>
- <a href="faq.html#X11">X11</a> <br>
- <a href="#IRAF">IRAF</a> <br>
- <a href="#Coordinates">Coordinates</a> <br>
- <a href="#Regions">Regions</a> <br>
- <a href="#Printing">Printing</a> <br>
- <a href="#XPA">XPA</a><br>
- <a href="#VO">VO</a><br>
- </blockquote>
-</blockquote>
-<blockquote>
- <p> <b><a name="Copyright"></a>Copyright</b></p>
- <blockquote>
- <p>SAOImage DS9 is composed of approximately 20 open source
-packages, all of which are distributed under their own open source
-license agreements, usually GPL, LGPL, or BSD. In addition, several
-open source packages have been developed here at the Smithsonian
-Astrophysical Observatory, Cambridge, MA, USA and are distributed under
-the terms of the GNU General Public License as published by the Free
-Software Foundation. As long as you continue to adhere to the
-provisions of the licenses, you are free to distribute SAOImage DS9
-along with your software.</p>
- <p>The <a href="http://www.gnu.org/copyleft/gpl.html">GNU site</a>
-contains an excellent FAQ on the the do's and dont's of
-GPL.</p>
- </blockquote>
- <p><b><a name="General"></a>General</b></p>
- <blockquote>
- <p><b>The web browser, catalog tool, image server, and other
-Analysis functions don't appear to work. Whats going on?<br>
- </b></p>
- <p>For a number of the Analysis functions, DS9 requires temporary
-disk space to download and store data. By default, this directory is
-defined by the TMP or TEMP environment variable. This is usually
-defined as <tt>/tmp</tt> for Linux and MacOSX users. For Windows
-users, this will vary, depending on which version of Windows you have.
-In any case, if the temp directory is not writable, or you have
-specified an invalid directory in the preferences, these functions will
-fail with a variety of error messages.<br>
- </p>
- <p><b>My system admin stripped the DS9 binary and now DS9
-fails to start with the following error message:</b></p>
- <p><tt>Application initialization failed: Can't find a usable
-tk.tcl
-in the
-following directories...</tt></p>
- <p>DS9 is based on tcl/tk which is a scripting language which
-requires
-many support files. To create a stand alone application, we <i>fool</i>
-tcl/tk into thinking that it has a valid installation. To do this, DS9
-is really an application, along with an zip archive attached. The first
-thing DS9 does is to create a virtual file system in memory and unpack
-that archive into memory. The application DS9 is already stripped of
-debugging symbols when built. </p>
- <p>It appears that the <tt>strip</tt> command is <i>stripping</i>
-part
-of the archive, hence DS9 is unable to uncompress it. In summary, don't
- <tt>strip</tt> the DS9 binary and everything works fine. </p>
- <p><b>When I open my FITS image, all I see is 'white'. Yet
-everything, including the colorbar seems to work?</b></p>
- <p>New with version 2.1, is support for the DATASEC keyword.
-This
-keyword
-specifies what portion of the image is valid data, for calculating min
-/ max and for displaying. This is very important for images created
-from CCDs with over scan and bias strips. By default, this support is
-enabled. However, a number of fits images with this keyword, have
-invalid
-values.
-Therefor, when DS9 opens the image, it finds no valid data to display.
-To
-correct this problem, either disable DATASEC support, via the Scale
-menu, or correct the the value of DATASEC in the fits header. You can
-also change the default behavior by disabling DATASEC from the
-preferences menu.<br>
- </p>
- </blockquote>
- <p> <b><a name="Fonts"></a>Fonts</b></p>
- <blockquote>
- <p><b>Where is the Symbol Font? How do I enter special characters
-into an entry dialog?</b> </p>
- <p>The concept of a separate <tt>SYMBOL</tt> font is no longer
-implemented with the latest OS font and scripting support, especially
-with scalable anti-alias fonts such as Xft for Linux. Most newer fonts
-(if not all) now have greek characters as part of the font. The greek
-chars start at unicode \u0391 for 'A' and \u03b1 for 'a'. Each OS
-has a
-tool used to build and copy a string of characters. Then use the
-Edit:Paste menu of DS9 to insert the character string.</p>
- <p>Linux- Gnome: <b>gucharmap<br>
- </b>Linux- KDE: <b>kcharselect<br>
- </b>MacOSX: <b>Character Viewer</b> (from <tt>System Preferences</tt>,
-select
-
- <tt>Language & Text</tt>, <tt>Input Sources</tt>, and
-enable <tt>Keyboard and & Charactor Viewer</tt>. It is now
-available under the keyboard menu in the menu bar.)<br>
-Windows: <b>Character Map</b> (from <tt>Start</tt> button, select <tt>All
-Programs</tt>, <tt>Accessories</tt>, <tt>System Tools</tt> and then <tt>Character
-Map</tt>)<br>
- </p>
- </blockquote>
- <p> <b><a name="Linux"></a>Linux</b></p>
- <blockquote>
- <p><b>I have Red Hat 7, and I'm running KDE. The magnifier
-keeps going blank after a few seconds, what's going on?</b> </p>
- <p>The problem was in KDE. If the user has decided to
-hide the panel taskbar and sets a delay time for when it appears
-if the mouse is moved to the panel location, then it appears that
-KDE creates mouse events that fool DS9 into thinking the mouse is
-outside and it blanks the magnifier. By turning off the hide
-panel, the effect goes away. The alternative is to update to
-KDE2.1Beta where this method of dealing with the hidden panel is
-not used and all is well, as it was for KDE </p>
- <p><b>I have FreeBSD. When I run ds9, I get the following
-error:</b> <tt> <b>ELF binary type "0" not known</b> </tt><b>Whats
-going
-on?</b></p>
- <p>The solution was to use the <b><tt>brandelf</tt></b> utility on
-the
-file to ensure that the machine understood that it was a linux
-program.</p>
- <p><tt>% brandelf -t Linux (filename)<br>
- </tt></p>
- <blockquote> </blockquote>
- </blockquote>
- <p> <b><a name="Windows"></a>Windows</b></p>
- <blockquote>
- <p><b>When I do Save Image, I get the same result (and this is true
-for either .gif, .jpeg, .tiff, .png and .ppm) : it saves only a stripe
-at the top of my image.<br>
- </b></p>
- <p>This problem seems to be caused by running DS9 in Windows XP
-compatibility mode. Please uncheck the compatibility option in the
-properties dialog.<br>
- </p>
- <p><b>How can I open a FITS file with an extension name?</b></p>
- <p><b> </b>By default, the windows port of DS9 uses the Windows
-standard
-dialog box to open and save files. This can be a problem in that the
-native Windows dialog will not allow extensions to the filename, such
-as <tt>foo.fits[2]</tt>. You must use the Unix like standard dialogs
-to be able to specify an extension. Select <tt>Edit->Preferences->General:Dialogbox</tt>
-to change the default standard dialog.</p>
- <p><b>Every time I create an auxiliary window in ds9, such
-as
-a
-Pixel Table, or Analysis Plot, it will retreat behind the main ds9
-window. Then, when I bring the auxiliary window to the front and move
-the mouse out of it, it automatically goes behind the main ds9 window
-again. What can I do to fix things so that the auxiliary window stays
-on top of the ds9 window?</b> </p>
- <p>To fix things so that the auxiliary window stays on top of the
-ds9 window, do the following: </p>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
+ charset=ISO-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.78 [en] (X11; U; Linux
+ 2.4.7-10 i686) [Netscape]">
+ <title>DS9 FAQ</title>
+ </head>
+ <body alink="#ff0000" bgcolor="#ffffff" link="#0000ee" text="#000000"
+ vlink="#551a8b">
+ <h3> <img alt="" src="sun.gif" align="middle" width="100"
+ height="98"> SAOImage DS9 FAQ</h3>
<blockquote>
- <p><tt>Go to the icon task bar at the bottom of the screen.</tt><tt>
-Bring the auxiliary window to the front by clicking on
-its icon in the icon task bar.</tt><tt> While the mouse still is on the
-aux window icon, press
-the mouse button, and keeping it pressed, move the mouse off the task
-bar.</tt><tt> Release the mouse while off the task bar.</tt><tt> The
-auxiliary window will now stay on top of the main
-ds9 window.</tt></p>
- <blockquote> </blockquote>
+ <p>This FAQ is a new, on going project, and it is far from being
+ complete. But as common questions on DS9 are received, the FAQ
+ will be updated. </p>
+ <p><b>Contents</b></p>
+ <blockquote><a href="#Copyright">Copyright</a><br>
+ <a href="#General">General</a><br>
+ <a href="#Fonts">Fonts</a><br>
+ <a href="faq.html#Linux">Linux</a> <br>
+ <a href="faq.html#Windows">Windows</a> <br>
+ <a href="#MacOSX">MacOSX</a><br>
+ <a href="faq.html#X11">X11</a> <br>
+ <a href="#IRAF">IRAF</a> <br>
+ <a href="#Coordinates">Coordinates</a> <br>
+ <a href="#Regions">Regions</a> <br>
+ <a href="#Printing">Printing</a> <br>
+ <a href="#XPA">XPA</a><br>
+ <a href="#VO">VO</a><br>
+ </blockquote>
</blockquote>
- </blockquote>
- <p><b><a name="MacOSX"></a>MacOSX</b><br>
- </p>
- <blockquote>
- <p><b>When I invoke DS9 MacOSX Aqua from the command line, I get
-weird
-errors such as<tt>:</tt></b></p>
<blockquote>
- <p><tt>The document "foo.fits" could not be opened.
-SAOImage DS9 cannot open files in the "Flexible Image Transport System"
-format.</tt></p>
- </blockquote>
- <p><b><tt> </tt></b>When
-opening MacOSX Aqua from the command line, it is better to use the <tt>OPEN</tt>
-application as opposed to specifying the binary directly. The <tt>OPEN</tt>
-application sets up the environment just as it is when a user double
-clicks.</p>
- <tt> # good</tt><br>
- <tt>% open /Applications/SAOImage\ DS9.app foo.fits<br>
- <br>
-# bad<br>
-% /Applications/SAOImage\ DS9.app/Contents/MacOS/ds9 bar.fits</tt><br>
- <p><b>How can I open a FITS file with an extension name?</b></p>
- <p><b> </b>By default, DS9 MacOSX Aqua uses the MacOSX
-standard
-dialog box to open and save files. This can be a problem in that the
-native MacOSX dialog will not allow extensions to the filename, such
-as <tt>foo.fits[2]</tt>. You must use the Unix like standard dialogs
-to be able to specify an extension. Select <tt>Edit->Preferences->General</tt>
-to change the default standard dialog.</p>
- <p><b>How do I set my PATH environment variable under MacOSX for
-use with external analysis programs, such as funtools?<br>
- </b></p>
- <p>When you double click on a MacOSX application, it does not parse
-any shell startup files, such as ~/.profile. Instead, the environment
-is defined using a special environment file, <tt>.MacOSX/environment.plist</tt>.
-This
-file
-can
-be
-created
-with
-the
-MacOSX
-utility
-
+ <p> <b><a name="Copyright"></a>Copyright</b></p>
+ <blockquote>
+ <p>SAOImage DS9 is composed of approximately 20 open source
+ packages, all of which are distributed under their own open
+ source license agreements, usually GPL, LGPL, or BSD. In
+ addition, several open source packages have been developed
+ here at the Smithsonian Astrophysical Observatory, Cambridge,
+ MA, USA and are distributed under the terms of the GNU General
+ Public License as published by the Free Software Foundation.
+ As long as you continue to adhere to the provisions of the
+ licenses, you are free to distribute SAOImage DS9 along with
+ your software.</p>
+ <p>The <a href="http://www.gnu.org/copyleft/gpl.html">GNU site</a>
+ contains an excellent FAQ on the the do's and dont's of GPL.</p>
+ </blockquote>
+ <p><b><a name="General"></a>General</b></p>
+ <blockquote>
+ <p><b>The web browser, catalog tool, image server, and other
+ Analysis functions don't appear to work. Whats going on?<br>
+ </b></p>
+ <p>For a number of the Analysis functions, DS9 requires
+ temporary disk space to download and store data. By default,
+ this directory is defined by the TMP or TEMP environment
+ variable. This is usually defined as <tt>/tmp</tt> for Linux
+ and MacOSX users. For Windows users, this will vary, depending
+ on which version of Windows you have. In any case, if the temp
+ directory is not writable, or you have specified an invalid
+ directory in the preferences, these functions will fail with a
+ variety of error messages.<br>
+ </p>
+ <p><b>My system admin stripped the DS9 binary and now DS9 fails
+ to start with the following error message:</b></p>
+ <p><tt>Application initialization failed: Can't find a usable
+ tk.tcl in the following directories...</tt></p>
+ <p>DS9 is based on tcl/tk which is a scripting language which
+ requires many support files. To create a stand alone
+ application, we <i>fool</i> tcl/tk into thinking that it has
+ a valid installation. To do this, DS9 is really an
+ application, along with an zip archive attached. The first
+ thing DS9 does is to create a virtual file system in memory
+ and unpack that archive into memory. The application DS9 is
+ already stripped of debugging symbols when built. </p>
+ <p>It appears that the <tt>strip</tt> command is <i>stripping</i>
+ part of the archive, hence DS9 is unable to uncompress it. In
+ summary, don't <tt>strip</tt> the DS9 binary and everything
+ works fine. </p>
+ <p><b>When I open my FITS image, all I see is 'white'. Yet
+ everything, including the colorbar seems to work?</b></p>
+ <p>New with version 2.1, is support for the DATASEC keyword.
+ This keyword specifies what portion of the image is valid
+ data, for calculating min / max and for displaying. This is
+ very important for images created from CCDs with over scan and
+ bias strips. By default, this support is enabled. However, a
+ number of fits images with this keyword, have invalid values.
+ Therefor, when DS9 opens the image, it finds no valid data to
+ display. To correct this problem, either disable DATASEC
+ support, via the Scale menu, or correct the the value of
+ DATASEC in the fits header. You can also change the default
+ behavior by disabling DATASEC from the preferences menu.<br>
+ </p>
+ </blockquote>
+ <p> <b><a name="Fonts"></a>Fonts</b></p>
+ <blockquote>
+ <p><b>Where is the Symbol Font? How do I enter special
+ characters into an entry dialog?</b> </p>
+ <p>The concept of a separate <tt>SYMBOL</tt> font is no longer
+ implemented with the latest OS font and scripting support,
+ especially with scalable anti-alias fonts such as Xft for
+ Linux. Most newer fonts (if not all) now have greek characters
+ as part of the font. The greek chars start at unicode \u0391
+ for 'A' and \u03b1 for 'a'. Each OS has a tool used to build
+ and copy a string of characters. Then use the Edit:Paste menu
+ of DS9 to insert the character string.</p>
+ <p>Linux- Gnome: <b>gucharmap<br>
+ </b>Linux- KDE: <b>kcharselect<br>
+ </b>MacOSX: <b>Character Viewer</b> (Select <tt>Edit:Special
+ Characters</tt>) Now click and drag the characters to a
+ terminal window. Then select the string and select <tt>Edit:Copy</tt>.<br>
+ Windows: <b>Character Map</b> (from <tt>Start</tt> button,
+ select <tt>All Programs</tt>, <tt>Accessories</tt>, <tt>System
+ Tools</tt> and then <tt>Character Map</tt>)<br>
+ </p>
+ </blockquote>
+ <p> <b><a name="Linux"></a>Linux</b></p>
+ <blockquote>
+ <p><b>I have Red Hat 7, and I'm running KDE. The magnifier keeps
+ going blank after a few seconds, what's going on?</b> </p>
+ <p>The problem was in KDE. If the user has decided to hide the
+ panel taskbar and sets a delay time for when it appears
+ if the mouse is moved to the panel location, then it
+ appears that KDE creates mouse events that fool DS9 into
+ thinking the mouse is outside and it blanks the magnifier. By
+ turning off the hide panel, the effect goes away. The
+ alternative is to update to KDE2.1Beta where this method
+ of dealing with the hidden panel is not used and all is
+ well, as it was for KDE </p>
+ <p><b>I have FreeBSD. When I run ds9, I get the following error:</b>
+ <tt> <b>ELF binary type "0" not known</b> </tt><b>Whats
-
-
- <tt>/Developer/Applications/PropertyListEditor.app. </tt>For
-further information, please click <a
- href="http://developer.apple.com/qa/qa2001/qa1067.html">here</a>.<br>
- </p>
- <blockquote> </blockquote>
- </blockquote>
- <p> <b><a name="X11"></a>X11</b><br>
- </p>
- <blockquote>
- <p><b>Is it possible to work in batch mode without a physical
-display?<br>
- </b></p>
- <p>DS9 is written as an interactive, window client program, and as
-a result, does require a window server to be available for rendering
-(X11, Windows, or MacOSX).<br>
- <br>
-Therefore, using DS9 as a batch process can be cumbersome. We recommend
-using xvfb under X11. Just set up a virtual display buffer, reset your
-DISPLAY variable, then invoke DS9 with a number of command line options
-or use xpa from a shell script as a batch processor.</p>
- <p><b>When I start DS9, I get the following error message:</b></p>
- <tt>_X11TransSocketINETConnect: Can't get address for foo.bar.edu </tt><br>
- <tt>couldn't connect to display "foo.bar.edu:0.0"</tt> <br>
- <p>DS9 is unable
-to determine a valid X11 Display server, because of a
-number of reasons. Most often this is seen when you have a laptop
-configured for a network, but is not physically connected. You need to
-set the DISPLAY environment variable to :0.0 </p>
- <blockquote><tt>$ xhost + </tt><br>
- <tt>$ set DISPLAY=:0.0 </tt><br>
- <tt>$ export DISPLAY </tt><br>
+ going on?</b></p>
+ <p>The solution was to use the <b><tt>brandelf</tt></b> utility
+ on the file to ensure that the machine understood that it
+ was a linux program.</p>
+ <p><tt>% brandelf -t Linux (filename)<br>
+ </tt></p>
+ <blockquote> </blockquote>
+ </blockquote>
+ <p> <b><a name="Windows"></a>Windows</b></p>
+ <blockquote>
+ <p><b>When I do Save Image, I get the same result (and this is
+ true for either .gif, .jpeg, .tiff, .png and .ppm) : it
+ saves only a stripe at the top of my image.<br>
+ </b></p>
+ <p>This problem seems to be caused by running DS9 in Windows XP
+ compatibility mode. Please uncheck the compatibility option in
+ the properties dialog.<br>
+ </p>
+ <p><b>How can I open a FITS file with an extension name?</b></p>
+ <p><b> </b>By default, the windows port of DS9 uses the Windows
+ standard dialog box to open and save files. This can be a
+ problem in that the native Windows dialog will not allow
+ extensions to the filename, such as <tt>foo.fits[2]</tt>. You
+ must use the Unix like standard dialogs to be able to specify
+ an extension. Select <tt>Edit->Preferences->General:Dialogbox</tt>
+ to change the default standard dialog.</p>
+ <p><b>Every time I create an auxiliary window in ds9, such as a
+ Pixel Table, or Analysis Plot, it will retreat behind the
+ main ds9 window. Then, when I bring the auxiliary window to
+ the front and move the mouse out of it, it automatically
+ goes behind the main ds9 window again. What can I do to fix
+ things so that the auxiliary window stays on top of the ds9
+ window?</b> </p>
+ <p>To fix things so that the auxiliary window stays on top of
+ the ds9 window, do the following: </p>
+ <blockquote>
+ <p><tt>Go to the icon task bar at the bottom of the screen.</tt><tt>
+ Bring the auxiliary window to the front by clicking on its
+ icon in the icon task bar.</tt><tt> While the mouse still
+ is on the aux window icon, press the mouse button, and
+ keeping it pressed, move the mouse off the task bar.</tt><tt>
+ Release the mouse while off the task bar.</tt><tt> The
+ auxiliary window will now stay on top of the main ds9
+ window.</tt></p>
+ <blockquote> </blockquote>
+ </blockquote>
+ </blockquote>
+ <p><b><a name="MacOSX"></a>MacOSX</b><br>
+ </p>
+ <blockquote>
+ <p><b>When I invoke DS9 MacOSX Aqua from the command line, I get
+ weird errors such as<tt>:</tt></b></p>
+ <blockquote>
+ <p><tt>The document "foo.fits" could not be opened. SAOImage
+ DS9 cannot open files in the "Flexible Image Transport
+ System" format.</tt></p>
+ </blockquote>
+ <p><b><tt> </tt></b>When opening MacOSX Aqua from the command
+ line, it is better to use the <tt>OPEN</tt> application as
+ opposed to specifying the binary directly. The <tt>OPEN</tt>
+ application sets up the environment just as it is when a user
+ double clicks.</p>
+ <tt> # good</tt><br>
+ <tt>% open /Applications/SAOImage\ DS9.app foo.fits<br>
+ <br>
+ # bad<br>
+ % /Applications/SAOImage\ DS9.app/Contents/MacOS/ds9 bar.fits</tt><br>
+ <p><b>How can I open a FITS file with an extension name?</b></p>
+ <p><b> </b>By default, DS9 MacOSX Aqua uses the MacOSX standard
+ dialog box to open and save files. This can be a problem in
+ that the native MacOSX dialog will not allow extensions to the
+ filename, such as <tt>foo.fits[2]</tt>. You must use the Unix
+ like standard dialogs to be able to specify an extension.
+ Select <tt>Edit->Preferences->General</tt> to change
+ the default standard dialog.</p>
+ <p><b>How do I set my PATH environment variable under MacOSX for
+ use with external analysis programs, such as funtools?<br>
+ </b></p>
+ <p>When you double click on a MacOSX application, it does not
+ parse any shell startup files, such as ~/.profile. Instead,
+ the environment is defined using a special environment file, <tt>.MacOSX/environment.plist</tt>.
+ This file can be created with the MacOSX utility <tt>/Developer/Applications/PropertyListEditor.app.
+ </tt>For
+ further information, please click <a
+ href="http://developer.apple.com/qa/qa2001/qa1067.html">here</a>.<br>
+ </p>
+ <blockquote> </blockquote>
+ </blockquote>
+ <p> <b><a name="X11"></a>X11</b><br>
+ </p>
+ <blockquote>
+ <p><b>Is it possible to work in batch mode without a physical
+ display?<br>
+ </b></p>
+ <p>DS9 is written as an interactive, window client program, and
+ as a result, does require a window server to be available for
+ rendering (X11, Windows, or MacOSX).<br>
+ <br>
+ Therefore, using DS9 as a batch process can be cumbersome. We
+ recommend using xvfb under X11. Just set up a virtual display
+ buffer, reset your DISPLAY variable, then invoke DS9 with a
+ number of command line options or use xpa from a shell script
+ as a batch processor.</p>
+ <p><b>When I start DS9, I get the following error message:</b></p>
+ <tt>_X11TransSocketINETConnect: Can't get address for
+ foo.bar.edu </tt><br>
+ <tt>couldn't connect to display "foo.bar.edu:0.0"</tt> <br>
+ <p>DS9 is unable to determine a valid X11 Display server,
+ because of a number of reasons. Most often this is seen when
+ you have a laptop configured for a network, but is not
+ physically connected. You need to set the DISPLAY environment
+ variable to :0.0 </p>
+ <blockquote><tt>$ xhost + </tt><br>
+ <tt>$ set DISPLAY=:0.0 </tt><br>
+ <tt>$ export DISPLAY </tt><br>
+ </blockquote>
+ <p><b>Under Solaris, when I start DS9, my twm window manager
+ crashes!</b></p>
+ <p>TWM distributed with X11R5 had a major bug, that was
+ corrected around 1996. DS9 will trigger this bug, and will
+ cause TWM to crash. If you are running Solaris, and have X11R5
+ installed, be sure that /usr/openwin/bin is in your path
+ before X11R5/bin. This will insure that you are running the
+ correct version of TWM . </p>
+ <p><b>When I run ds9 with the tvtwm window manager, sometimes
+ the open file dialog box does not appear?</b> </p>
+ <p>If you are running tvtwm, and you are currently viewing a
+ virtual screen other than the first, when you open a file, the
+ dialog box will appear in the first virtual screen, not your
+ current. This is a bug with tvtwm and not ds9.</p>
+ </blockquote>
+ <blockquote>
+ <p> </p>
+ </blockquote>
</blockquote>
- <p><b>Under Solaris, when I start DS9, my twm window manager
-crashes!</b></p>
- <p>TWM distributed with X11R5 had a major bug, that was corrected
-around
-1996. DS9 will trigger this bug, and will cause TWM to crash.
-If you are running Solaris, and have X11R5 installed, be sure that
-/usr/openwin/bin is in your path before X11R5/bin. This will insure
-that you are running the correct version of TWM . </p>
- <p><b>When I run ds9 with the tvtwm window manager,
-sometimes the open file dialog box does not appear?</b> </p>
- <p>If you are running tvtwm, and you are currently viewing a
-virtual screen other than the first, when you open a file, the dialog
-box will appear in the first virtual screen, not your current. This is
-a bug with tvtwm and not ds9.</p>
- </blockquote>
- <blockquote>
- <p> </p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p><b><a name="IRAF"></a>IRAF</b></p>
-</blockquote>
-<blockquote>
- <blockquote>
<blockquote>
- <blockquote> </blockquote>
+ <p><b><a name="IRAF"></a>IRAF</b></p>
</blockquote>
- <p><b>I can't use more than 9 frames with the IMEXAMINE task?</b><br>
- </p>
- <p>The task <tt>IMEXAMINE</tt> can not be used with frame numbers
-greater
-than 9.</p>
- <p><b>Can I display from IRAF to DS9 running under Windows or
-MacOSX?</b> </p>
- <p>Yes, DS9 for Windows and MacOSX is also a fully functional IRAF
-display server.
-To
-direct image output from IRAF to DS9 running under Windows or MacOSX,
-use the
-IMTDEV environment variable. For example, if the machine is
-named 'foo.bar.edu', define IMTDEV to the follow value before entering
-IRAF. </p>
- <blockquote><tt>$ setenv IMTDEV inet:5137:foo.bar.edu </tt><br>
- <tt>$ cl </tt><br>
- <tt>cl> display dev$pix</tt><br>
+ <blockquote>
+ <blockquote>
+ <blockquote>
+ <blockquote> </blockquote>
+ </blockquote>
+ <p><b>I can't use more than 9 frames with the IMEXAMINE task?</b><br>
+ </p>
+ <p>The task <tt>IMEXAMINE</tt> can not be used with frame
+ numbers greater than 9.</p>
+ <p><b>Can I display from IRAF to DS9 running under Windows or
+ MacOSX?</b> </p>
+ <p>Yes, DS9 for Windows and MacOSX is also a fully functional
+ IRAF display server. To direct image output from IRAF to DS9
+ running under Windows or MacOSX, use the IMTDEV environment
+ variable. For example, if the machine is named 'foo.bar.edu',
+ define IMTDEV to the follow value before entering IRAF. </p>
+ <blockquote><tt>$ setenv IMTDEV inet:5137:foo.bar.edu </tt><br>
+ <tt>$ cl </tt><br>
+ <tt>cl> display dev$pix</tt><br>
+ </blockquote>
+ <blockquote>
+ <blockquote> </blockquote>
+ </blockquote>
+ <p><b>I'm having problems with </b><b>mscred task </b><b>msczero?</b></p>
+ DS9 now supports IRAF's new IIS image display protocol. However,
+ there is one minor problem with the <b>mscred</b> task <b>msczero.</b>
+ Before using <b>msczero</b>, issue the following command in the
+ cl:<br>
+ <br>
+ <tt>cl> set disable_wcs_maps=""<br>
+ cl> flpr</tt><br>
+ <p><b>I find that there is a frustrating delay in performing
+ operations on images displayed from IRAF - there's a wait of
+ a second or two before an image is (re)displayed, whereas <i>saoimage</i>
+ reacts virtually instantly for the same type of operation.
+ This makes running imexamine on a batch of images a pain,
+ and using the mouse to change color gamma/bias to desired
+ values basically impossible.</b> </p>
+ <p>DS9 and <i>saoimage</i> are similar in speed when working
+ with IRAF. In fact, DS9 uses the same code to interface
+ with IRAF as saoimage and ximtool. The only difference
+ is that DS9 is double buffered, whereas, <i>saoimage</i> and
+ <i>ximtool</i> only use a single buffer. So with <i>saoimage</i>
+ and <i>ximtool</i>, you see incremental progress, where
+ DS9 will render the image all at one time. However, the
+ overall time to finish rendering should almost be the
+ same. </p>
+ <p>DS9 runs in both 8 bit and 24 bit environments, but <i>saoimage</i>
+ is restricted to 8 bit. If you are running DS9 and <i>saoimage</i>
+ at the same time, then you must be in 8 bit mode. You should
+ not see any delay in changing the color bias/contrast
+ between the two. </p>
+ <p>However, if you are running DS9 in 24 bit mode, then you will
+ see slower performance in changing the bias/contrast, as
+ compared to 8 bit mode. Instead of changing a color look
+ up table, as in 8 bit mode, DS9 has to update every
+ pixel on the screen. If your cpu speed is slow, you can
+ select the Edit:Preferences:True Colorbar to tell DS9
+ not to update the entire screen, only a part of the
+ screen. This should only be needed if your machine is
+ slower than 200 MHz. Again <i>saoimage</i> does not
+ even run in 24 bit mode, so there are no comparisons. </p>
+ <p><b>I try to display an image from IRAF and I get the
+ following error message:</b></p>
+ <p><tt>Cannot open device (node!imtool,,512,512)</tt></p>
+ <p> </p>
+ <p>DS9 works the same way as <tt>ximtool,</tt> <tt>saoimage,</tt>
+ and <tt>saotng.</tt> No special scripts should be
+ needed. If you have one of the above currently working, DS9
+ should work <i>out of the box</i>. </p>
+ <p>IRAF can use one of three methods to communicate with DS9:
+ fifo, socket, and unix domain name. The DS9 defaults
+ are:</p>
+ <blockquote><tt>fifo /dev/imt1</tt> <br>
+ <tt>port 5137</tt> <br>
+ <tt>unix /tmp/.IMT%d</tt> </blockquote>
+ <p>If your IRAF configuration is set up different (i.e., a
+ different port number, or via a fifo), you need to tell
+ DS9 how to communicate with iraf. DS9 uses the same
+ command line options as XIMTOOL: </p>
+ <blockquote><tt>-fifo </tt> <br>
+ <tt> -fifo_only </tt><br>
+ <tt> -inet_only </tt> <br>
+ <tt> -port </tt> <br>
+ <tt> -port_only </tt> <br>
+ <tt> -unix </tt> <br>
+ <tt> -unix_only </tt> </blockquote>
+ </blockquote>
</blockquote>
+ <blockquote> </blockquote>
<blockquote>
- <blockquote> </blockquote>
+ <blockquote>
+ <p><b>I try to display an image, I see something, but it's
+ corrupted and I get multiple error messages from DS9...</b></p>
+ <p><b> </b>An IRAF image server (<i>ximtool</i>, <i>saoimage</i>,
+ DS9, etc...) uses a configuration file to specify the
+ number of available buffers and their sizes. What actually
+ passes from IRAF is not the buffer size, but an index
+ number into this file. </p>
+ <p>So when an image server starts (DS9), it will attempt to
+ locate this file as $HOME/.imtoolrc and
+ /usr/local/lib/imtoolrc. If not found, it will look for
+ shell environment variables IMTOOLRC and imtoolrc, that
+ contains the name of the configuration file. </p>
+ <p>If no configuration file is found, DS9 will assume the
+ following default configuration: </p>
+ <blockquote><tt> 1 2 512 512 #
+ imt1|imt512 </tt><br>
+ <tt> 2 2 800 800 # imt2|imt800 </tt><br>
+ <tt> 3 2 1024 1024 # imt3|imt1024 </tt><br>
+ <tt> 4 1 1600 1600 # imt4|imt1600 </tt><br>
+ <tt> 5 1 2048 2048 # imt5|imt2048 </tt><br>
+ <tt> 6 1 4096 4096 # imt6|imt4096 </tt><br>
+ <tt> 7 1 8192 8192 # imt7|imt8192 </tt><br>
+ <tt> 8 1 1024 4096 # imt8|imt1x4 </tt><br>
+ <tt> 9 2 1144 880 # imt9|imtfs full
+ screen (1152x900 minus frame) </tt><br>
+ <tt>10 2 1144 764 # imt10|imtfs35 full
+ screen at 35mm film aspect ratio </tt><br>
+ <tt>11 2 128 128 # imt11|imt128 </tt><br>
+ <tt>12 2 256 256 # imt12|imt256 </tt><br>
+ <tt>13 2 128 1056 # imt13|imttall128 tall
+ & narrow for spectro. </tt><br>
+ <tt>14 2 256 1056 # imt14|imttall256 tall
+ & wider for spectro. </tt><br>
+ <tt>15 2 1056 128 # imt15|imtwide128 wide
+ & thin for spectro. </tt><br>
+ <tt>16 2 1056 256 # imt16|imtwide256 wide
+ & fatter for spectro. </tt><br>
+ <tt>17 2 1008 648 # imt17|imtssy Solitaire
+ fmt w/ imtool border </tt><br>
+ <tt>18 2 1024 680 # imt18|imtssn Solitaire
+ fmt w/out imtool border </tt><br>
+ <tt>19 1 4096 1024 # imt19|imt4x1</tt><br>
+ </blockquote>
+ <p>If on the other hand, IRAF assumes a different buffer size,
+ the image will appear corrupted and DS9 may issue a number of
+ error messages. </p>
+ <p>Another problem is that this file must be in sync with
+ dev$graphcap. If your system administrator has made
+ changes to graphcap, they must also be implemented in
+ imtoolrc. </p>
+ <p>Here is a note from NOAO: </p>
+ <blockquote>
+ <p><tt>The messages means that there is no
+ /usr/local/lib/imtoolrc file </tt><tt>on the machine.
+ This is created as a symlink to dev$imtoolrc by the </tt><tt>iraf
+ install script but only if the /usr/local/lib dir already
+ exists on the </tt><tt>machine. The fix is the create the
+ dir and rerun the install script or </tt><tt>else make
+ the link by hand. Users can also just copy
+ dev$imtoolrc </tt><tt>to $HOME/.imtoolrc and restart the
+ server to also workaround it. Note </tt><tt>that an
+ existing .imtoolrc might define old frame buffer configs
+ which </tt><tt>might confuse things, so if the system
+ file exists check for a private </tt><tt>copy screwing
+ things up. </tt></p>
+ </blockquote>
+ </blockquote>
</blockquote>
- <p><b>I'm having problems with </b><b>mscred task </b><b>msczero?</b></p>
-DS9 now supports IRAF's new IIS image display protocol. However, there
-is
-one minor problem with the <b>mscred</b> task <b>msczero.</b> Before
-using <b>msczero</b>, issue the following command in the cl:<br>
- <br>
- <tt>cl> set disable_wcs_maps=""<br>
-cl> flpr</tt><br>
- <p><b>I find that there is a frustrating delay in
-performing operations on images displayed from IRAF - there's a wait of
-a second or two before an image is (re)displayed, whereas <i>saoimage</i>
-reacts virtually instantly for the same type of operation. This makes
-running imexamine on a batch of images a pain, and using the mouse to
-change color gamma/bias to desired values basically impossible.</b> </p>
- <p>DS9 and <i>saoimage</i> are similar in speed when working with
-IRAF.
-In fact, DS9 uses the same code to interface with IRAF as
-saoimage and ximtool. The only difference is that DS9 is double
-buffered, whereas, <i>saoimage</i> and <i>ximtool</i> only use
-a single buffer. So with <i>saoimage</i> and <i>ximtool</i>, you see
-incremental progress, where DS9 will render the image all at one
-time. However, the overall time to finish rendering should almost
-be the same. </p>
- <p>DS9 runs in both 8 bit and 24 bit environments, but <i>saoimage</i>
-is restricted to 8 bit. If you are running DS9 and <i>saoimage</i> at
-the same time, then you must be in 8 bit mode. You should not see
-any delay in changing the color bias/contrast between the two. </p>
- <p>However, if you are running DS9 in 24 bit mode, then you will
-see slower performance in changing the bias/contrast, as compared
-to 8 bit mode. Instead of changing a color look up table, as in 8
-bit mode, DS9 has to update every pixel on the screen. If your
-cpu
-speed is slow, you can select the Edit:Preferences:True Colorbar
-to tell DS9 not to update the entire screen, only a part of the
-screen.
-This should only be needed if your machine is slower than 200
-MHz.
-Again <i>saoimage</i> does not even run in 24 bit mode, so there are
-no comparisons. </p>
- <p><b>I try to display an image from IRAF and I get the following
-error message:</b></p>
- <p><tt>Cannot open device (node!imtool,,512,512)</tt></p>
- <p> </p>
- <p>DS9 works the same way as <tt>ximtool,</tt> <tt>saoimage,</tt>
-and <tt>saotng.</tt> No special scripts should be needed. If you
-have one of the above currently working, DS9 should work <i>out
-of
-the box</i>. </p>
- <p>IRAF can use one of three methods to communicate with DS9: fifo,
-socket,
-and unix domain name. The DS9 defaults are:</p>
- <blockquote><tt>fifo /dev/imt1</tt> <br>
- <tt>port 5137</tt> <br>
- <tt>unix /tmp/.IMT%d</tt> </blockquote>
- <p>If your IRAF configuration is set up different (i.e., a
-different port number, or via a fifo), you need to tell DS9 how
-to communicate with iraf. DS9 uses the same command line options
-as XIMTOOL: </p>
- <blockquote><tt>-fifo </tt> <br>
- <tt> -fifo_only </tt><br>
- <tt> -inet_only </tt> <br>
- <tt> -port </tt> <br>
- <tt> -port_only </tt> <br>
- <tt> -unix </tt> <br>
- <tt> -unix_only </tt> </blockquote>
- </blockquote>
-</blockquote>
-<blockquote> </blockquote>
-<blockquote>
- <blockquote>
- <p><b>I try to display an image, I see something, but it's
-corrupted and I get multiple error messages from DS9...</b></p>
- <p><b> </b>An IRAF image server (<i>ximtool</i>, <i>saoimage</i>,
-DS9,
-etc...)
-uses a configuration file to specify the number of available
-buffers and their sizes. What actually passes from IRAF is not
-the buffer size, but an index number into this file. </p>
- <p>So when an image server starts (DS9), it will attempt to locate
-this file as $HOME/.imtoolrc and /usr/local/lib/imtoolrc. If not
-found, it will look for shell environment variables IMTOOLRC and
-imtoolrc, that contains the name of the configuration file. </p>
- <p>If no configuration file is found, DS9 will assume the following
-default
-configuration: </p>
- <blockquote><tt> 1 2 512 512 #
-imt1|imt512 </tt><br>
- <tt> 2 2 800 800 # imt2|imt800 </tt><br>
- <tt> 3 2 1024 1024 # imt3|imt1024 </tt><br>
- <tt> 4 1 1600 1600 # imt4|imt1600 </tt><br>
- <tt> 5 1 2048 2048 # imt5|imt2048 </tt><br>
- <tt> 6 1 4096 4096 # imt6|imt4096 </tt><br>
- <tt> 7 1 8192 8192 # imt7|imt8192 </tt><br>
- <tt> 8 1 1024 4096 # imt8|imt1x4 </tt><br>
- <tt> 9 2 1144 880 # imt9|imtfs full screen
-(1152x900 minus frame) </tt><br>
- <tt>10 2 1144 764 # imt10|imtfs35 full screen
-at 35mm
-film aspect ratio </tt><br>
- <tt>11 2 128 128 # imt11|imt128 </tt><br>
- <tt>12 2 256 256 # imt12|imt256 </tt><br>
- <tt>13 2 128 1056 # imt13|imttall128 tall &
-narrow for spectro. </tt><br>
- <tt>14 2 256 1056 # imt14|imttall256 tall &
-wider for spectro. </tt><br>
- <tt>15 2 1056 128 # imt15|imtwide128 wide &
-thin for spectro. </tt><br>
- <tt>16 2 1056 256 # imt16|imtwide256 wide &
-fatter for spectro. </tt><br>
- <tt>17 2 1008 648 # imt17|imtssy Solitaire fmt
-w/ imtool
-border </tt><br>
- <tt>18 2 1024 680 # imt18|imtssn Solitaire fmt
-w/out
-imtool border </tt><br>
- <tt>19 1 4096 1024 # imt19|imt4x1</tt><br>
+ <blockquote>
+ <blockquote>
+ <p><b>Where do I find this .imtoolrc file?</b> </p>
+ <p>Again, here a note from NOAO concerning this issue: </p>
+ <blockquote>
+ <p><tt>In a smooth installation the imtoolrc file is installed
+ as a </tt><tt>/usr/local/lib/imtoolrc symlink pointing to
+ the dev$imtoolrc file in the </tt><tt>iraf system.
+ This is normally what's used but XImtool (and DS9?) also </tt><tt>allow
+ a $HOME/.imtoolrc and IMTOOLRC environment variable
+ defining the </tt><tt>path as fallbacks. There are
+ several practical problems with this: for </tt><tt>some
+ reason (I'm trying to fix) the imtoolrc link won't be
+ created if </tt><tt>the /usr/local/lib directory doesn't
+ exist when the install script is </tt><tt>run on the
+ machine, even though it's run as root and the file can be
+ </tt><tt>directory easily. On PC-IRAF systems there is
+ also a typo in the install </tt><tt>script (extra logical
+ or at line 515) which causes it to exit before </tt><tt>the
+ display setup is run (i.e. no /dev fifos or imtoolrc). If
+ users don't </tt><tt>catch this or see it in the README
+ file they'll think everything went </tt><tt>fine. Lastly,
+ the local iraf admin might not have run the install script
+ </tt><tt>on the local iraf NFS client machine at all.</tt></p>
+ </blockquote>
+ </blockquote>
</blockquote>
- <p>If on the other hand, IRAF assumes a different buffer size, the
-image
-will appear corrupted and DS9 may issue a number of error messages. </p>
- <p>Another problem is that this file must be in sync with
-dev$graphcap. If your system administrator has made changes to
-graphcap, they must also be implemented in imtoolrc. </p>
- <p>Here is a note from NOAO: </p>
<blockquote>
- <p><tt>The messages means that there is no
-/usr/local/lib/imtoolrc
-file </tt><tt>on the machine. This is created as a symlink to
-dev$imtoolrc
-by the </tt><tt>iraf install script but only if the /usr/local/lib dir
-already exists
-on the </tt><tt>machine. The fix is the create the dir and rerun the
-install
-script or </tt><tt>else make the link by hand. Users can also
-just copy dev$imtoolrc </tt><tt>to $HOME/.imtoolrc and restart the
-server to also workaround
-it. Note </tt><tt>that an existing .imtoolrc might define old frame
-buffer
-configs which </tt><tt>might confuse things, so if the system file
-exists check for
-a private </tt><tt>copy screwing things up. </tt></p>
+ <blockquote>
+ <p><b>When I display an image from IRAF, the SCALE menu option
+ is not active, Why?</b> </p>
+ <p>When you display an image from IRAF into DS9, IRAF actually
+ does the color scale distribution. In Display, use the
+ ztrans and z1,z2 parameters to set the upper/lower bounds and
+ distribution. You can also use the zscale parameter to auto
+ determine z1,z2.Here are the DISPLAY parameters in question: </p>
+ <blockquote><tt>ztrans=[linear|log|none|user] </tt><br>
+ <tt>z1=min </tt><br>
+ <tt>z2=max </tt><br>
+ <tt>zscale=[yes|no]</tt></blockquote>
+ <p>What actually is sent from IRAF to DS9 is one byte per pixel,
+ values 0-200, which already has applied both the upper
+ and lower clipping bounds and the distribution. So this is
+ why, the SCALE menu is disabled in DS9 when it receives a
+ image from IRAF.</p>
+ </blockquote>
</blockquote>
- </blockquote>
-</blockquote>
-<blockquote>
- <blockquote>
- <p><b>Where do I find this .imtoolrc file?</b> </p>
- <p>Again, here a note from NOAO concerning this issue: </p>
<blockquote>
- <p><tt>In a smooth installation the imtoolrc file is
-installed as
-a </tt><tt>/usr/local/lib/imtoolrc symlink pointing to the
-dev$imtoolrc
-file in
-the </tt><tt>iraf system. This is normally what's used but
-XImtool
-(and DS9?)
-also </tt><tt>allow a $HOME/.imtoolrc and IMTOOLRC environment
-variable
-defining the </tt><tt>path as fallbacks. There are several
-practical problems
-with this: for </tt><tt>some reason (I'm trying to fix)
-the imtoolrc link won't be
-created if </tt><tt>the /usr/local/lib directory doesn't exist when
-the install
-script is </tt><tt>run on the machine, even though it's run as root
-and the file
-can be </tt><tt>directory easily. On PC-IRAF systems there is
-also a
-typo in the
-install </tt><tt>script (extra logical or at line 515) which causes it
-to exit
-before </tt><tt>the display setup is run (i.e. no /dev fifos or
-imtoolrc). If
-users don't </tt><tt>catch this or see it in the README file they'll
-think
-everything went </tt><tt>fine. Lastly, the local iraf admin might not
-have run the
-install
-script </tt><tt>on the local iraf NFS client machine at all.</tt></p>
+ <p> <b><a name="Coordinates"></a>Coordinates</b></p>
</blockquote>
- </blockquote>
-</blockquote>
-<blockquote>
- <blockquote>
- <p><b>When I display an image from IRAF, the SCALE menu
-option is not active, Why?</b> </p>
- <p>When you display an image from IRAF into DS9, IRAF actually does
-the
-color scale distribution. In Display, use the ztrans and z1,z2
-parameters to set the upper/lower bounds and distribution. You can also
-use the zscale parameter to auto determine z1,z2.Here are the DISPLAY
-parameters in question: </p>
- <blockquote><tt>ztrans=[linear|log|none|user] </tt><br>
- <tt>z1=min </tt><br>
- <tt>z2=max </tt><br>
- <tt>zscale=[yes|no]</tt></blockquote>
- <p>What actually is sent from IRAF to DS9 is one byte per pixel,
-values 0-200, which already has applied both the upper and lower
-clipping bounds and the distribution. So this is why, the SCALE menu is
-disabled in DS9 when it receives a image from IRAF.</p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p> <b><a name="Coordinates"></a>Coordinates</b></p>
-</blockquote>
-<blockquote>
- <blockquote>
- <p><b>Why don't I see PHYSICAL/WCS/WCSA...WCSZ coordinates
-displayed when I load my image?</b></p>
- <p>DS9 supports the following coordinate systems: </p>
- <blockquote><tt>WCS Sky coords (fk4,fk5,icrs,galactic,ecliptic) <br>
- </tt><tt>WCS Linear coords <br>
- </tt><tt>Image (also known as Logical) <br>
- </tt><tt>Physical (also known as CCD)<br>
-Detector<br>
-Amplifier </tt><br>
+ <blockquote>
+ <blockquote>
+ <p><b>Why don't I see PHYSICAL/WCS/WCSA...WCSZ coordinates
+ displayed when I load my image?</b></p>
+ <p>DS9 supports the following coordinate systems: </p>
+ <blockquote><tt>WCS Sky coords (fk4,fk5,icrs,galactic,ecliptic)
+ <br>
+ </tt><tt>WCS Linear coords <br>
+ </tt><tt>Image (also known as Logical) <br>
+ </tt><tt>Physical (also known as CCD)<br>
+ Detector<br>
+ Amplifier </tt><br>
+ </blockquote>
+ <p>DS9 uses the following FITS keywords in the header to define
+ a coordinate system: </p>
+ </blockquote>
+ <center>
+ <table nosave="" border="1" cellpadding="4" width="75%">
+ <tbody>
+ <tr>
+ <td><b>Coordinate System</b></td>
+ <td><b>Keyword Values</b></td>
+ </tr>
+ <tr nosave="">
+ <td nosave=""><tt>WCS / WCSA...WCSZ</tt></td>
+ <td><tt>CRVAL,CRPIX,CRDELT,CD... (for images) <br>
+ TCRVL,TCRPX,TCDLT,... (for tables)</tt></td>
+ </tr>
+ <tr>
+ <td><tt>Image</tt></td>
+ <td><tt>none required</tt></td>
+ </tr>
+ <tr>
+ <td><tt>Physical</tt></td>
+ <td><tt>WCSNAMEP='PHYSICAL' or LTMx_x/LTVx</tt></td>
+ </tr>
+ <tr>
+ <td valign="top"><tt>Detector</tt><br>
+ </td>
+ <td valign="top"><tt>DTMx_x/DTVx</tt><br>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top"><tt>Amplifier</tt><br>
+ </td>
+ <td valign="top"><tt>ATMx_x/ATVx</tt><br>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </center>
+ <blockquote>
+ <p>If the required keywords are not present, values for those
+ coordinates are not displayed. </p>
+ <p>Note: For PHYSICAL, DS9 will first look for an alternative
+ WCS with WCSNAMEx='PHYSICAL'. If not found, DS9 will then look
+ for the LTMx_x LTVx keywords.</p>
+ </blockquote>
</blockquote>
- <p>DS9 uses the following FITS keywords in the header to define a
-coordinate system: </p>
- </blockquote>
- <center>
- <table nosave="" width="75%" border="1" cellpadding="4">
- <tbody>
- <tr>
- <td><b>Coordinate System</b></td>
- <td><b>Keyword Values</b></td>
- </tr>
- <tr nosave="">
- <td nosave=""><tt>WCS / WCSA...WCSZ</tt></td>
- <td><tt>CRVAL,CRPIX,CRDELT,CD... (for images) <br>
-TCRVL,TCRPX,TCDLT,... (for tables)</tt></td>
- </tr>
- <tr>
- <td><tt>Image</tt></td>
- <td><tt>none required</tt></td>
- </tr>
- <tr>
- <td><tt>Physical</tt></td>
- <td><tt>WCSNAMEP='PHYSICAL' or LTMx_x/LTVx</tt></td>
- </tr>
- <tr>
- <td valign="top"><tt>Detector</tt><br>
- </td>
- <td valign="top"><tt>DTMx_x/DTVx</tt><br>
- </td>
- </tr>
- <tr>
- <td valign="top"><tt>Amplifier</tt><br>
- </td>
- <td valign="top"><tt>ATMx_x/ATVx</tt><br>
- </td>
- </tr>
- </tbody>
- </table>
- </center>
- <blockquote>
- <p>If the required keywords are not present, values for those
-coordinates are not displayed. </p>
- <p>Note: For PHYSICAL, DS9 will first look for an alternative WCS
-with WCSNAMEx='PHYSICAL'. If not found, DS9 will then look for the
-LTMx_x LTVx keywords.</p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p> <b><a name="Regions"></a>Regions</b></p>
- <blockquote>
- <p><b>How do I indicate distance on my printed images?</b> </p>
- <p>You have two choices, the RULER region and the LINE region. The
-ruler
-region is mainly used for interactive measurements. For printed output,
-use the LINE region to create a distance indicator. In the line region
-dialog, there is a read-only entry that indicates the length in pixels,
-degrees, arcmin, or arcsec. Edit to the desired distance and enter the
-desired label, including ' or ", in the region text labile entry. You
-have the option of arrows at each end of the line. </p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p> <b><a name="Printing"></a>Printing</b></p>
- <blockquote>
- <p><b>I can make some wonderful color images in DS9 and save
-them
-as postscript files that look great, but often when I print them they
-appear
-washed out or very different than they do on the screen. My question
-then
-is what, if anything, can I do about this?</b> </p>
- <p>The problem is that you create an image on a display, which is
-the product of RGB colors (red, green, and blue) and print the
-image on a printer, which is the product of CMYK colors (cyan,
-yellow, magenta, and black). Furthermore, every monitor is
-different in how it will display a certain color, and every
-printing technology is different in how well it will reproduce
-that color. And finally, the
-translation between RGB and CMYK is not symmetric, i.e. its not
-possible to translate some colors back and forth. </p>
- <p>It's possible to calibrate your monitor and your printer, to
-create a translation matrix, to correct for problems outlined
-above (in the Macintosh world, this is what ColorSync does). The
-idea is to <i>apply</i> a gamma correction to the output of DS9,
-so that it will print much more in line with what you expect. To
-do this you'd need special software and hardware, and its only
-valid for your
-monitor and your printer. </p>
- <p>In summary, its not worth it. Especially in the case of
-publication, such as ApJ, where you have no idea on what printing
-technology will be used to reproduce your image. So the only
-control you have is to calibrate your monitor and to hope for the
-best. </p>
- <p>However, there are some <i>rules of thumb </i>that might help.
-First, printers have a very hard time with <i>blues</i> and <i>purples</i>,
-as
-they
-tend
-to
-be
-washed
-out.
-Either
-avoid
-these
-colors,
-or
-over
-compensate
-these colors. </p>
- <p>ApJ has a good idea in that you send in both an electronic
-version and a hard copy of your color image. That way, they can
-manually adjust the printers to try to match your output.</p>
- <p><i>NOTE: Even though ApJ requests images in CMYK, we recommend
-RGB.
-From personal experience, if you send RGB, the printed results will be
-closer to
-the original.</i></p>
- <p><b>We used DS9 to generate 300 dpi CMYK eps figures, as per the
-ApJ
-specifications, but the color scheme on our proofs is
-wrong. In the proofs, the violet is washed out and looks similar
-to the black, and the blue is not nearly as intense.</b></p>
- <p><b> </b>There are two issues here: first, color printers
-are
-notorious for failure to reproduce blues and purples correctly.
-Second, not all colors in RGB space can be reproduced correctly
-in CMYK space, blues being the prime example. Below is an excerpt from
-an industry pamphlet:</p>
<blockquote>
- <p><tt>Be aware that it is possible to see
-colors in RGB that you can't make
-with CMYK. They are said to be "out of the CMYK color gamut". What
-happens is that the RGB-to-CMYK translator just gets as close as
-possible to the appearance of the original and that's as good as it can
-be. It's something that everyone in the industry puts up with. So it's
-best to select any colors you use for fonts or other design elements in
-your layout using CMYK definitions instead of RGB. That way, you will
-have a better idea of how they will appear in your printed piece.
-Here's a common example: many programs translate the 100% Blue in RGB
-into a somewhat purple-looking color in CMYK. We recommend a CMYK value
-of 100-65-0-0 to get a nice clean blue.<font size="-1"><br>
- </font></tt></p>
+ <p> <b><a name="Regions"></a>Regions</b></p>
+ <blockquote>
+ <p><b>How do I indicate distance on my printed images?</b>
+ </p>
+ <p>You have two choices, the RULER region and the LINE region.
+ The ruler region is mainly used for interactive measurements.
+ For printed output, use the LINE region to create a distance
+ indicator. In the line region dialog, there is a read-only
+ entry that indicates the length in pixels, degrees, arcmin, or
+ arcsec. Edit to the desired distance and enter the desired
+ label, including ' or ", in the region text labile entry. You
+ have the option of arrows at each end of the line. </p>
+ </blockquote>
</blockquote>
- <p>For this reason, you may wish to use the RGB color space or
-colormaps
-without deep blues and purples, such as <tt>BB</tt> or <tt>Heat.</tt></p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p> <b><a name="XPA"></a>XPA</b></p>
- <blockquote>
- <p><b>How can I use XPA to display from a client machine to DS9 on
-a server machine?<br>
- </b></p>
- <p>Assuming you have direct IP reachability between the machines
-(i.e.
-one host can successfully connect() to the other), XPA does allow you
-to have an XPA-enabled server like DS9 on one machine and a client on
-another. To make this work, you need to do two things (let's assume DS9
-is running on a machine called "server_host" and you want to send xpa
-commands from "client_host"):<br>
- </p>
- <ol>
- <li>The XPA server program (i.e. DS9) must allow the client host
-to send XPA commands. Access can be permitted in one of two ways:<br>
- <ol style="list-style-type: lower-alpha;">
- <li>Send the XPA server an acl request by running xpaset on
-the same host on which the server is running (i.e. on the server_host):<br>
- <br>
- <span style="font-family: monospace;">% xpaset -p ds9 -acl
-client_host +<br>
- <br>
- </span></li>
- <li>For more permanent access, add permissions in ~acls.xpa:<br>
- <br>
- <span style="font-family: monospace;">% cat > ~/acls.xpa</span><br
- style="font-family: monospace;">
- <span style="font-family: monospace;">DS9:ds9 client_host +<br>
- </span><br>
-You can check the acls for an XPA server using xpaget: <br>
- <br>
- <span style="font-family: monospace;">% xpaget ds9 -acl<br>
- </span><br>
- </li>
- </ol>
- </li>
- <li>On the client side, the client needs to communicate with the
-xpansname server program on the server machine to find the XPA server
-communication info. This also can be done in two ways:<br>
- <ol style="list-style-type: lower-alpha;">
- <li>use the -i [host] switch to override <span
- style="font-family: monospace;">XPA_NSINET</span> for this execution
-(The default port is 14285):<br>
- <span style="font-family: monospace;"><br>
-% xpaget -i 'server_host:14285<span style="font-family: monospace;">'
-ds9</span></span><br>
- <br>
+ <blockquote>
+ <p> <b><a name="Printing"></a>Printing</b></p>
+ <blockquote>
+ <p><b>I can make some wonderful color images in DS9 and save
+ them as postscript files that look great, but often when I
+ print them they appear washed out or very different than
+ they do on the screen. My question then is what, if
+ anything, can I do about this?</b> </p>
+ <p>The problem is that you create an image on a display, which
+ is the product of RGB colors (red, green, and blue) and
+ print the image on a printer, which is the product of
+ CMYK colors (cyan, yellow, magenta, and black). Furthermore,
+ every monitor is different in how it will display a
+ certain color, and every printing technology is
+ different in how well it will reproduce that color. And
+ finally, the translation between RGB and CMYK is not
+ symmetric, i.e. its not possible to translate some
+ colors back and forth. </p>
+ <p>It's possible to calibrate your monitor and your printer, to
+ create a translation matrix, to correct for problems
+ outlined above (in the Macintosh world, this is what
+ ColorSync does). The idea is to <i>apply</i> a gamma
+ correction to the output of DS9, so that it will print
+ much more in line with what you expect. To do this you'd
+ need special software and hardware, and its only valid
+ for your monitor and your printer. </p>
+ <p>In summary, its not worth it. Especially in the case of
+ publication, such as ApJ, where you have no idea on what
+ printing technology will be used to reproduce your
+ image. So the only control you have is to calibrate your
+ monitor and to hope for the best. </p>
+ <p>However, there are some <i>rules of thumb </i>that might
+ help. First, printers have a very hard time with <i>blues</i>
+ and <i>purples</i>, as they tend to be washed out. Either
+ avoid these colors, or over compensate these colors. </p>
+ <p>ApJ has a good idea in that you send in both an electronic
+ version and a hard copy of your color image. That way, they
+ can manually adjust the printers to try to match your
+ output.</p>
+ <p><i>NOTE: Even though ApJ requests images in CMYK, we
+ recommend RGB. From personal experience, if you send RGB,
+ the printed results will be closer to the original.</i></p>
+ <p><b>We used DS9 to generate 300 dpi CMYK eps figures, as per
+ the ApJ specifications, but the color scheme on our
+ proofs is wrong. In the proofs, the violet is washed
+ out and looks similar to the black, and the blue is not
+ nearly as intense.</b></p>
+ <p><b> </b>There are two issues here: first, color
+ printers are notorious for failure to reproduce blues and
+ purples correctly. Second, not all colors in RGB space
+ can be reproduced correctly in CMYK space, blues being the
+ prime example. Below is an excerpt from an industry pamphlet:</p>
+ <blockquote>
+ <p><tt>Be aware that it is possible to see colors in RGB that
+ you can't make with CMYK. They are said to be "out of the
+ CMYK color gamut". What happens is that the RGB-to-CMYK
+ translator just gets as close as possible to the
+ appearance of the original and that's as good as it can
+ be. It's something that everyone in the industry puts up
+ with. So it's best to select any colors you use for fonts
+ or other design elements in your layout using CMYK
+ definitions instead of RGB. That way, you will have a
+ better idea of how they will appear in your printed piece.
+ Here's a common example: many programs translate the 100%
+ Blue in RGB into a somewhat purple-looking color in CMYK.
+ We recommend a CMYK value of 100-65-0-0 to get a nice
+ clean blue.<font size="-1"><br>
+ </font></tt></p>
+ </blockquote>
+ <p>For this reason, you may wish to use the RGB color space or
+ colormaps without deep blues and purples, such as <tt>BB</tt>
+ or <tt>Heat.</tt></p>
+ </blockquote>
+ </blockquote>
+ <blockquote>
+ <p> <b><a name="XPA"></a>XPA</b></p>
+ <blockquote>
+ <p><b>How can I use XPA to display from a client machine to DS9
+ on a server machine?<br>
+ </b></p>
+ <p>Assuming you have direct IP reachability between the machines
+ (i.e. one host can successfully connect() to the other), XPA
+ does allow you to have an XPA-enabled server like DS9 on one
+ machine and a client on another. To make this work, you need
+ to do two things (let's assume DS9 is running on a machine
+ called "server_host" and you want to send xpa commands from
+ "client_host"):<br>
+ </p>
+ <ol>
+ <li>The XPA server program (i.e. DS9) must allow the client
+ host to send XPA commands. Access can be permitted in one of
+ two ways:<br>
+ <ol style="list-style-type: lower-alpha;">
+ <li>Send the XPA server an acl request by running xpaset
+ on the same host on which the server is running (i.e. on
+ the server_host):<br>
+ <br>
+ <span style="font-family: monospace;">% xpaset -p ds9
+ -acl client_host +<br>
+ <br>
+ </span></li>
+ <li>For more permanent access, add permissions in
+ ~acls.xpa:<br>
+ <br>
+ <span style="font-family: monospace;">% cat >
+ ~/acls.xpa</span><br style="font-family: monospace;">
+ <span style="font-family: monospace;">DS9:ds9
+ client_host +<br>
+ </span><br>
+ You can check the acls for an XPA server using xpaget: <br>
+ <br>
+ <span style="font-family: monospace;">% xpaget ds9 -acl<br>
+ </span><br>
+ </li>
+ </ol>
</li>
- <li>Set the <span style="font-family: monospace;">XPA_NSINET</span>
-variable for more permanent selection of xpans on the server host:<br>
- <br>
- <span style="font-family: monospace;">% setenv XPA_NSINET
-'server_host:14285'</span><br>
+ <li>On the client side, the client needs to communicate with
+ the xpansname server program on the server machine to find
+ the XPA server communication info. This also can be done in
+ two ways:<br>
+ <ol style="list-style-type: lower-alpha;">
+ <li>use the -i [host] switch to override <span
+ style="font-family: monospace;">XPA_NSINET</span> for
+ this execution (The default port is 14285):<br>
+ <span style="font-family: monospace;"><br>
+ % xpaget -i 'server_host:14285<span
+ style="font-family: monospace;">' ds9</span></span><br>
+ <br>
+ </li>
+ <li>Set the <span style="font-family: monospace;">XPA_NSINET</span>
+ variable for more permanent selection of xpans on the
+ server host:<br>
+ <br>
+ <span style="font-family: monospace;">% setenv
+ XPA_NSINET 'server_host:14285'</span><br>
+ </li>
+ </ol>
</li>
</ol>
- </li>
- </ol>
- <p>Once these two setup steps are performed, you should be able to
-send commands to DS9 and receive data from DS9. You can look at the <a
- href="http://hea-www.harvard.edu/saord/xpa/acl.html">xpaacl man page</a>
-for more information.</p>
- <p><b>I have a laptop, that most of the time, is connected
-to a network. DS9 runs fine. However, when I'm not connected to a
-network and I start DS9, it hangs. What's going on?</b></p>
- <p> DS9 uses XPA for interprocess communication. When DS9
-starts, XPA
-initializes itself. XPA uses either IP sockets or UNIX sockets, based
-if your machine is configured to connect to the internet. In the case
-where your machine is configured for the internet, but you are not
-currently connected, XPA gets very confused. So, you can define a shell
-variable, XPA_METHOD, that tells XPA which method to use. </p>
- <p>The following is from the XPA documentation: </p>
+ <p>Once these two setup steps are performed, you should be able
+ to send commands to DS9 and receive data from DS9. You can
+ look at the <a
+ href="http://hea-www.harvard.edu/saord/xpa/acl.html">xpaacl
+ man page</a> for more information.</p>
+ <p><b>I have a laptop, that most of the time, is connected to a
+ network. DS9 runs fine. However, when I'm not connected to a
+ network and I start DS9, it hangs. What's going on?</b></p>
+ <p> DS9 uses XPA for interprocess communication. When DS9
+ starts, XPA initializes itself. XPA uses either IP sockets or
+ UNIX sockets, based if your machine is configured to connect
+ to the internet. In the case where your machine is configured
+ for the internet, but you are not currently connected, XPA
+ gets very confused. So, you can define a shell variable,
+ XPA_METHOD, that tells XPA which method to use. </p>
+ <p>The following is from the XPA documentation: </p>
+ <blockquote>
+ <p><tt>Determines the socket connection method used by this
+ session of XPA. The choices are: inet (to use INET or
+ Internet-based sockets) and local (unix) (to use UNIX
+ sockets). The default is INET. Using the inet method will
+ allow access from other machines (subject to access
+ controls) but using local will not. Local is most useful
+ for private access and when the machine in question is not
+ connected to the Internet</tt></p>
+ </blockquote>
+ <p>More information is available on XPA shell variables at: <a
+ href="http://hea-www.harvard.edu/RD/xpa/env.html">The XPA
+ Environment</a><br>
+ </p>
+ </blockquote>
+ </blockquote>
+ <blockquote>
+ <blockquote>
+ <p> </p>
+ </blockquote>
+ </blockquote>
<blockquote>
- <p><tt>Determines the socket connection method used by
-this session
-of XPA. The choices are: inet (to use INET or Internet-based sockets)
-and
-local (unix) (to use UNIX sockets). The default is INET. Using the inet
-method will allow access from other machines (subject to access
-controls) but using local will not. Local is most useful for private
-access and when the machine in question is not connected to the Internet</tt></p>
+ <p><b><a name="VO"></a>VO</b></p>
+ <blockquote>
+ <p><b>I can't connect to any of the virtual observatories. What
+ do I do now?</b></p>
+ <p>The DS9 help facility now contains a tutorial on how to
+ configure DS9 to by pass network firewalls. See <a
+ href="ref/vo.html">Virtual Observatory Reference</a> for
+ more information.</p>
+ </blockquote>
</blockquote>
- <p>More information is available on XPA shell variables at: <a
- href="http://hea-www.harvard.edu/RD/xpa/env.html">The XPA Environment</a><br>
- </p>
- </blockquote>
-</blockquote>
-<blockquote>
- <blockquote>
- <p> </p>
- </blockquote>
-</blockquote>
-<blockquote>
- <p><b><a name="VO"></a>VO</b></p>
- <blockquote>
- <p><b>I can't connect to any of the virtual observatories.
-What do I do now?</b></p>
- <p>The DS9 help facility now contains a tutorial on how to
-configure DS9 to by pass network firewalls. See <a href="ref/vo.html">Virtual
-Observatory
-Reference</a> for more information.</p>
- </blockquote>
-</blockquote>
-</body>
+ </body>
</html>
diff --git a/doc/index.html b/doc/index.html
index e10bf47..cc25b1b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -1,12 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//w3c//dtd html 4.0 transitional//en">
+<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en">
<html>
-<head>
- <meta http-equiv="Content-Type"
- content="text/html; charset=ISO-8859-1">
- <meta name="GENERATOR"
- content="Mozilla/4.76 [en] (X11; U; SunOS 5.8 sun4u) [Netscape]">
- <title>DS9</title>
-<script type="text/javascript">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html;
+ charset=ISO-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.76 [en] (X11; U; SunOS 5.8
+ sun4u) [Netscape]">
+ <title>DS9</title>
+ <script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-30382362-1']);
@@ -19,258 +19,206 @@
})();
</script>
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#0000ee" vlink="#551a8b" alink="#ff0000">
-<h3> <img src="sun.gif" alt="" height="98" width="100" align="middle">
-SAOImage DS9: Astronomical Data Visualization Application</h3>
-<blockquote>
- <p>SAOImage DS9 is an astronomical
-imaging and data
-visualization application. DS9 supports FITS images and binary tables,
-multiple frame buffers, region manipulation, and many scale algorithms
-and colormaps. It provides for easy communication with external
-analysis tasks and is highly configurable and extensible via XPA and
-SAMP. </p>
- <p>DS9 is a stand-alone application. It requires no installation or
-support files. Versions of DS9 currently exist for Solaris, Linux,
-MacOSX,
-and Windows.
-All
-versions and platforms support a consistent set of GUI and functional
-capabilities.</p>
- <p>DS9 supports advanced features such as multiple frame buffers,
-mosaic
-images, tiling, blinking, geometric markers, colormap manipulation,
-scaling, arbitrary zoom, rotation, pan, and a variety of coordinate
-systems. DS9 also supports FTP and HTTP access. </p>
- <p>The GUI for DS9 is user configurable. GUI elements such as the
-coordinate display, panner, magnifier, horizontal and vertical graphs,
-button bar, and colorbar can be configured via menus or the command
-line. </p>
- <p>DS9 is a Tk/Tcl application which utilizes the SAOTk widget set.
-It
-also incorporates the <a href="http://hea-www.harvard.edu/RD/xpa/"> X
-Public Access (XPA)</a> mechanism to allow external processes to access
-and control its data, GUI functions, and algorithms.</p>
- <p>New releases of the DS9 binaries, including new features and bug
-fixes,
-are made available 3 times a year on January 15th, May 15th, and
-September 15th.</p>
- <p><b>Notes: <br>
- </b></p>
- <blockquote>DS9 version 6.2 is not available for Windows, Solaris
-and
-MacOSX Application users at this time.<br>
-MacOSX X11 Users: The first time DS9 6.2 is invoked, there may
-be a delay due to the MacOSX X11 windows manager.<br>
- </blockquote>
- <p> </p>
- <p><b>DS9 Version 6.2 Binaries</b><i><br>
- </i></p>
- <blockquote>Linux<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.6.2.tar.gz">Linux</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.6.2.tar.gz">Linux64</a><br>
- </blockquote>
-MacOSX using X11 Window System (command-line program for advanced users)<br>
- <blockquote> <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/ds9.darwinsnowleopard.6.2.tar.gz">for
-OS
-version
-10.6
-(Snow
-Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/ds9.darwinleopard.6.2.tar.gz">for
-OS
-version
-10.5
-(Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/ds9.darwintiger.6.2.tar.gz">for
-OS
-version
-10.4
-(Tiger)</a><br>
- </blockquote>
-Source<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/source/ds9.6.2.tar.gz">Source</a><br>
- </blockquote>
-Beta<br>
- <blockquote>The
-latest beta versions
-of DS9 are available <a href="beta.html">here.</a><br>
- </blockquote>
-Archive<br>
- <blockquote>Older archived versions of DS9 are available <a
- href="archive">here.</a></blockquote>
- </blockquote>
- <p><b>DS9 Version 6.1 Binaries</b><i><br>
- </i></p>
- <blockquote>Solaris<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/solaris/ds9.solaris.6.1.tar.gz">Solaris</a><br>
- </blockquote>
-MacOSX Application<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/macosxsnowleopard/SAOImage%20DS9%206.1.dmg">for
-OS
-verison
-10.6
-(Snow
-Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/macosxleopard/SAOImage%20DS9%206.1.dmg">for
-OS
-verison
-10.5
-(Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/macosxtiger/SAOImage%20DS9%206.1.dmg">for
-OS
-version
-10.4
-(Tiger)</a> </blockquote>
-Windows <br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/windows/SAOImage%20DS9%206.1%20Install.exe">Windows
-7/Vista/XP</a><br>
- </blockquote>
-Source<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/source/ds9.6.1.tar.gz">Source</a><br>
- </blockquote>
- </blockquote>
- <p><b>XPA Version 2.1.13 Binaries</b></p>
- <blockquote>Linux<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux/xpa.linux.2.1.13.tar.gz">Linux</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/linux64/xpa.linux64.2.1.13.tar.gz">Linux64</a><br>
- </blockquote>
-MacOSX<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/xpa.darwinsnowleopard.2.1.13.tar.gz">for
-OS
-version
-10.6
-(Snow
-Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/xpa.darwinleopard.2.1.13.tar.gz">for
-OS
-version
-10.5
-(Leopard)</a><br>
- <a
- href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/xpa.darwintiger.2.1.13.tar.gz">for
-OS
-version
-10.4
-(Tiger)</a><br>
- </blockquote>
- </blockquote>
- <p><b>XPA Version 2.1.12 Binaries</b></p>
- <blockquote>Solaris<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/solaris/xpa.solaris.2.1.12.tar.gz">Solaris</a><br>
- </blockquote>
-Windows<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/windows/XPA%202.1.12%20Install.exe">Windows
-Vista/XP/2000/NT</a></blockquote>
- </blockquote>
- <p><b>pyds9</b><br>
- </p>
- <blockquote>The pyds9 module uses a Python interface to XPA
-to communicate with DS9. It supports communication with all of DS9’s
-XPA access points.<br>
- <blockquote><a
- href="http://hea-www.harvard.edu/saord/download/ds9/python/pyds9-1.2.tar.gz">Source</a><br>
- <a href="http://hea-www.harvard.edu/saord/ds9/pyds9/">Documentation</a><br>
- </blockquote>
- </blockquote>
- <p><b>S-Lang XPA</b><br>
- </p>
- <blockquote>SLxpa is a plugin which binds the XPA library and DS9 to
-the S-Lang
-language. It makes XPA callable directly from the S-Lang
-interpreter
-and provides dozens of functions to control and interact with DS9 from
-modeling and analysis applications such as <a
- href="http://space.mit.edu/cxc/isis">ISIS</a>.
- <blockquote><a href="http://space.mit.edu/cxc/slxpa/">S-Lang XPA</a><br>
+ </head>
+ <body style="color: rgb(0, 0, 0); background-color: rgb(255, 255,
+ 255);" alink="#ff0000" link="#0000ee" vlink="#551a8b">
+ <h3> <img src="sun.gif" alt="" align="middle" width="100"
+ height="98"> SAOImage DS9: Astronomical Data Visualization
+ Application</h3>
+ <blockquote>
+ <p>SAOImage DS9 is an astronomical imaging and data visualization
+ application. DS9 supports FITS images and binary tables,
+ multiple frame buffers, region manipulation, and many scale
+ algorithms and colormaps. It provides for easy communication
+ with external analysis tasks and is highly configurable and
+ extensible via XPA and SAMP. </p>
+ <p>DS9 is a stand-alone application. It requires no installation
+ or support files. Versions of DS9 currently exist for Solaris,
+ Linux, MacOSX, and Windows. All versions and platforms support a
+ consistent set of GUI and functional capabilities.</p>
+ <p>DS9 supports advanced features such as multiple frame buffers,
+ mosaic images, tiling, blinking, geometric markers, colormap
+ manipulation, scaling, arbitrary zoom, rotation, pan, and a
+ variety of coordinate systems. DS9 also supports FTP and HTTP
+ access. </p>
+ <p>The GUI for DS9 is user configurable. GUI elements such as the
+ coordinate display, panner, magnifier, horizontal and vertical
+ graphs, button bar, and colorbar can be configured via menus or
+ the command line. </p>
+ <p>DS9 is a Tk/Tcl application which utilizes the SAOTk widget
+ set. It also incorporates the <a
+ href="http://hea-www.harvard.edu/RD/xpa/"> X Public Access
+ (XPA)</a> mechanism to allow external processes to access and
+ control its data, GUI functions, and algorithms.</p>
+ <p> </p>
+ <p><b>DS9 Version 7.0 Binaries</b><i><br>
+ </i></p>
+ <blockquote>Linux<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux/ds9.linux.7.0.tar.gz">Linux</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux64/ds9.linux64.7.0.tar.gz">Linux64</a><br>
+ </blockquote>
+ MacOSX using X11 Window System (command-line program for
+ advanced users)<br>
+ <blockquote> <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/ds9.darwinlion.7.0.tar.gz">for
+
+ OS version 10.7 (Lion)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/ds9.darwinsnowleopard.7.0.tar.gz">for
+
+ OS version 10.6 (Snow Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/ds9.darwinleopard.7.0.tar.gz">for
+
+ OS version 10.5 (Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/ds9.darwintiger.7.0.tar.gz">for
+
+ OS version 10.4 (Tiger)</a><br>
+ </blockquote>
+ Windows <br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/windows/SAOImage%20DS9%2067.0%20Install.exe">Windows
+
+ 7</a></blockquote>
+ Solaris<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/solaris/ds9.solaris.7.0.tar.gz">Solaris</a><br>
+ </blockquote>
+ Source<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/source/ds9.7.0.tar.gz">Source</a><br>
+ </blockquote>
+ <!--
+ Beta<br>
+ <blockquote>The
+ latest beta versions
+ of DS9 are available <a href="beta.html">here.</a><br>
+ </blockquote>
+--> Archive<br>
+ <blockquote>Older archived versions of DS9 are available <a
+ href="archive">here.</a></blockquote>
+ </blockquote>
+ <p><b>XPA Version 2.1.14 Binaries</b></p>
+ <blockquote>Linux<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux/xpa.linux.2.1.14.tar.gz">Linux</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/linux64/xpa.linux64.2.1.14.tar.gz">Linux64</a><br>
+ </blockquote>
+ MacOSX<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinlion/xpa.darwinlion.2.1.14.tar.gz">for
+
+ OS version 10.7 (Lion)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinsnowleopard/xpa.darwinsnowleopard.2.1.14.tar.gz">for
+
+ OS version 10.6 (Snow Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwinleopard/xpa.darwinleopard.2.1.14.tar.gz">for
+
+ OS version 10.5 (Leopard)</a><br>
+ <a
+href="http://hea-www.harvard.edu/saord/download/ds9/darwintiger/xpa.darwintiger.2.1.14.tar.gz">for
+
+ OS version 10.4 (Tiger)</a><br>
+ </blockquote>
+ </blockquote>
+ <blockquote>Solaris<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/solaris/xpa.solaris.2.1.14.tar.gz">Solaris</a><br>
+ </blockquote>
+ Windows<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/windows/XPA%202.1.14%20Install.exe">Windows
+
+ Vista/XP/2000/NT</a></blockquote>
+ </blockquote>
+ <p><b>pyds9</b><br>
+ </p>
+ <blockquote>The pyds9 module uses a Python interface to XPA to
+ communicate with DS9. It supports communication with all of
+ DS9’s XPA access points.<br>
+ <blockquote><a
+href="http://hea-www.harvard.edu/saord/download/ds9/python/pyds9-1.2.tar.gz">Source</a><br>
+ <a href="http://hea-www.harvard.edu/saord/ds9/pyds9/">Documentation</a><br>
+ </blockquote>
+ </blockquote>
+ <p><b>S-Lang XPA</b><br>
+ </p>
+ <blockquote>SLxpa is a plugin which binds the XPA library and DS9
+ to the S-Lang language. It makes XPA callable directly
+ from the S-Lang interpreter and provides dozens of functions to
+ control and interact with DS9 from modeling and analysis
+ applications such as <a href="http://space.mit.edu/cxc/isis">ISIS</a>.
+ <blockquote><a href="http://space.mit.edu/cxc/slxpa/">S-Lang XPA</a><br>
+ </blockquote>
+ </blockquote>
+ <p><b>Documentation </b></p>
+ <blockquote><a href="ref/index.html">Reference Manual</a><br>
+ <a href="ref/ref.ps">Reference Manual (postscript)</a><br>
+ <a href="ref/ref.pdf">Reference Manual (pdf)</a><br>
+ <br>
+ <a href="user/index.html">User Manual</a><br>
+ <a href="user/user.ps">User Manual (postscript)</a><br>
+ <a href="user/user.pdf">User Manual (pdf)</a><br>
+ <br>
+ <a href="faq.html">FAQ</a> <br>
+ <a href="new.html">New Features</a><br>
+ <a href="release/r7.0.html">Release Notes</a><br>
+ <br>
+ <a href="story.html">Story of SAOImage DS9</a><br>
+ <a href="tutorial.html">Tutorials</a><br>
+ </blockquote>
+ <p><b>Contact Information</b></p>
+ <blockquote>If you encounter any problems or have suggestions with
+ SAOImage DS9, please contact us: saord @
+ cfa.harvard.edu<br>
+ <br>
+ William Joye<br>
+ Smithsonian Astrophysical Observatory<br>
+ 60 Garden St.<br>
+ Cambridge, MA 02138 USA<br>
+ </blockquote>
+ <p><b>Links</b></p>
+ <blockquote>
+ <p>SAOImage DS9 provides visualization support for a number
+ of popular astronomical analysis software packages, of
+ which a few have been listed below:</p>
+ <a href="http://cxc.harvard.edu/ciao/">CIAO: Chandra Interactive
+ Analysis of Observations</a><br>
+ <a
+ href="http://xmm.vilspa.esa.es/external/xmm_sw_cal/sas_frame.shtml">SAS:
+
+ XMM-Newton Science Analysis System</a><br>
+ <a href="http://iraf.noao.edu/iraf-homepage.html">IRAF: Image
+ Reduction and Analysis Facility</a><br>
+ <a href="http://heasarc.gsfc.nasa.gov/docs/software/ftools/fv/"><i>fv</i>:
+ The Interactive FITS File Editor</a><br>
+ </blockquote>
+ <p><b>Acknowledgment</b></p>
+ <blockquote>
+ <p>SAOImage DS9 development has been made possible by funding
+ from the Chandra X-ray Science Center (NAS8-03060) and the
+ High Energy Astrophysics Science Archive Center (NCC5-568).
+ Additional funding was provided by the JWST Mission office at
+ Space Telescope Science Institute (NAS-03127) to improve
+ capabilities for 3-D data visualization.</p>
+ </blockquote>
+ <blockquote>
+ <p>If you have found SAOImage DS9 to be helpful in your
+ research, the following acknowledgment would be appreciated:<i>
+ </i><i>"This
+ research has made use of SAOImage DS9, developed by
+ Smithsonian Astrophysical Observatory" </i>or reference the
+ following paper <a
+href="http://adsabs.harvard.edu/cgi-bin/nph-bib_query?bibcode=2003adass..12..489J">2003adass..12..489J</a></p>
+ </blockquote>
</blockquote>
- </blockquote>
- <p><b>Documentation </b></p>
- <blockquote><a href="ref/index.html">Reference
-Manual</a><br>
- <a href="ref/ref.ps">Reference Manual (postscript)</a><br>
- <a href="ref/ref.pdf">Reference Manual (pdf)</a><br>
- <br>
- <a href="user/index.html">User Manual</a><br>
- <a href="user/user.ps">User Manual (postscript)</a><br>
- <a href="user/user.pdf">User Manual (pdf)</a><br>
- <br>
- <a href="faq.html">FAQ</a> <br>
- <a href="new.html">New Features</a><br>
- <a href="release/r6.0.html">Release Notes</a><br>
<br>
- <a href="story.html">Story of SAOImage DS9</a><br>
- <a href="tutorial.html">Tutorials</a><br>
- </blockquote>
- <p><b>Contact Information</b></p>
- <blockquote>If you encounter any problems or have suggestions with
-SAOImage
-DS9, please contact us: saord @ cfa.harvard.edu<br>
<br>
-William Joye<br>
-Smithsonian Astrophysical Observatory<br>
-60 Garden St.<br>
-Cambridge, MA 02138 USA<br>
- </blockquote>
- <p><b>Links</b></p>
- <blockquote>
- <p>SAOImage DS9 provides visualization
-support for a number of
-popular astronomical analysis software packages, of which a few have
-been listed below:</p>
- <a href="http://cxc.harvard.edu/ciao/">CIAO:
-Chandra
-Interactive Analysis of Observations</a><br>
- <a
- href="http://xmm.vilspa.esa.es/external/xmm_sw_cal/sas_frame.shtml">SAS:
-XMM-Newton
-Science
-Analysis
-System</a><br>
- <a href="http://iraf.noao.edu/iraf-homepage.html">IRAF: Image
-Reduction and Analysis Facility</a><br>
- <a href="http://heasarc.gsfc.nasa.gov/docs/software/ftools/fv/"><i>fv</i>:
-The
-Interactive
-FITS
-File
-Editor</a><br>
- </blockquote>
- <p><b>Acknowledgment</b></p>
- <blockquote>
- <p>SAOImage DS9 development has been made
-possible by funding from the
-Chandra X-ray Science Center<tt> (NAS8-03060</tt>) and the High Energy
-Astrophysics Science Archive Center (NCC5-568).</p>
- <p>If you have found SAOImage DS9 to be helpful in your research,
-the
-following acknowledgment would be appreciated:<i> </i><i>"This
-research has made use of SAOImage DS9, developed by Smithsonian
-Astrophysical Observatory" </i>or reference the following paper <a
- href="http://adsabs.harvard.edu/cgi-bin/nph-bib_query?bibcode=2003adass..12..489J">2003adass..12..489J</a></p>
- </blockquote>
-</blockquote>
-<br>
-<br>
-</body>
+ </body>
</html>
diff --git a/doc/ref/command.html b/doc/ref/command.html
index d85f014..64a519f 100644
--- a/doc/ref/command.html
+++ b/doc/ref/command.html
@@ -128,6 +128,7 @@
<a href="#source">source</a><br>
<a href="#tcl">tcl</a><br>
<a href="#theme">theme</a><br>
+ <a href="#threads">threads</a><br>
<a href="#tile">tile</a><br>
<a href="#title">title</a><br>
<a href="#unix">unix</a><br>
@@ -697,6 +698,9 @@
+
+
+
[match <coordsys>]<br>
[lock
<coordsys>|none]</tt><br>
@@ -860,6 +864,9 @@
+
+
+
gif, tiff (tif), jpeg (jpg), png, ppm</tt> formats supported.
If no format specified, the file name extension is used to
determine the output format. Optional parameters: jpeg quality
@@ -1474,6 +1481,9 @@
+
+
+
[pan]<br>
@@ -1502,6 +1512,9 @@
+
+
+
[crosshair]<br>
@@ -1530,6 +1543,9 @@
+
+
+
[open|close]<br>
<br>
Example: <br>
@@ -1588,18 +1604,19 @@
$ds9 -orient close<br>
</tt>
<p><b> <a name="pagesetup"></a>pagesetup</b></p>
- <p>Controls Page Setup options. </p>
+ <p>Controls Page Setup options.<br>
+ </p>
<tt> Syntax: <br>
-pagesetup [orient portrait|landscape] <br>
- [scale <numberic>] <br>
-
- [size letter|legal|tabloid|poster|a4] <br>
- <br>
+ [scale <numberic>]</tt><br>
+ <tt>
+ [size letter|legal|tabloid|poster|a4]</tt><br>
+ <tt> <br>
Example: <br>
$ds9 -pagesetup orient portrait <br>
$ds9 -pagesetup scale 50<br>
- $ds9 -pagesetup size poster </tt>
+ $ds9 -pagesetup size poster</tt><tt></tt><br>
<p><b> <a name="pan"></a>pan</b></p>
<p>Controls the current image cursor location for the current
frame. </p>
@@ -1657,6 +1674,9 @@
+
+
+
[yes|open]<br>
[no|close]<br>
@@ -2367,6 +2387,14 @@
<br>
Example: <br>
$ds9 -theme clam</tt><br>
+ <p><b> <a name="threads"></a>threads</b></p>
+ <p>Set number of process threads for functions which are
+ multi-threaded. </p>
+ <tt> Syntax:<br>
+ -threads #<br>
+ <br>
+ Example: <br>
+ $ds9 -threads 8</tt><br>
<p><b> <a name="tile"></a>tile</b></p>
<p>Controls the tile display mode. </p>
<tt> Syntax: <br>
diff --git a/doc/ref/samp.html b/doc/ref/samp.html
index 04e0fa7..6d42cb8 100644
--- a/doc/ref/samp.html
+++ b/doc/ref/samp.html
@@ -122,6 +122,7 @@
<a href="#smooth">smooth</a><br>
<a href="#source">source</a><br>
<a href="#theme">theme</a><br>
+ <a href="#threads">threads</a><br>
<a href="#tcl">tcl</a><br>
<a href="#tile">tile</a><br>
<a href="#update">update</a><br>
@@ -954,6 +955,9 @@
+
+
+
gif, tiff (tif), jpeg (jpg), png, ppm</tt> formats supported.
If no format specified, the file name extension is used to
determine the output format. Optional parameters: jpeg quality
@@ -1751,12 +1755,12 @@
<p><b> <a name="pagesetup"></a>pagesetup</b></p>
<p>Controls Page Setup options. </p>
<tt> Syntax: <br>
- pagesetup [orient portrait|landscape] <br>
- [scale
- <numeric>] <br>
- [size
- letter|legal|tabloid|poster|a4] <br>
- <br>
+ pagesetup [orient portrait|landscape]</tt><br>
+ <tt> [scale
+ <numeric>]</tt><br>
+ <tt> [size
+ letter|legal|tabloid|poster|a4]</tt><br>
+ <tt> <br>
Example:<br>
string value = ds9.get(string cmd)<br>
pagesetup orient<br>
@@ -1765,7 +1769,8 @@
ds9.set(string cmd)<br>
pagesetup orient portrait <br>
pagesetup scale 50<br>
- pagesetup size poster </tt>
+ pagesetup size poster<br>
+ </tt>
<p><b> <a name="pan"></a>pan</b></p>
<p>Controls the current image cursor location for the current
frame. </p>
@@ -2524,6 +2529,17 @@
<tt>ds9.set(string cmd)<br>
</tt><tt>theme clam<br>
</tt>
+ <p><b> <a name="threads"></a>threads</b></p>
+ <p>Set number of process threads for functions which are
+ multi-threaded. </p>
+ <tt> Syntax:<br>
+ threads #<br>
+ <br>
+ Example: <br>
+ </tt><tt>string value = ds9.get(string cmd)<br>
+ </tt><tt>threads</tt><br>
+ <tt>ds9.set(string cmd)<br>
+ </tt><tt>threads 8</tt><br>
<p><b> <a name="tile"></a>tile</b></p>
<p>Controls the tile display mode. </p>
<tt> Syntax: <br>
diff --git a/doc/ref/xpa.html b/doc/ref/xpa.html
index 720174d..b1b2c57 100644
--- a/doc/ref/xpa.html
+++ b/doc/ref/xpa.html
@@ -92,6 +92,7 @@
<a href="#source">source</a><br>
<a href="#tcl">tcl</a><br>
<a href="#theme">theme</a><br>
+ <a href="#threads">threads</a><br>
<a href="#tile">tile</a><br>
<a href="#update">update</a><br>
<a href="#version">version</a><br>
@@ -684,6 +685,9 @@
+
+
+
<br>
[match <coordsys>]<br>
[lock <coordsys>|none]<br>
@@ -911,6 +915,9 @@
+
+
+
gif, tiff (tif), jpeg (jpg), png, ppm</tt> formats supported.
If no format specified, the file name extension is used to
determine the output format. Optional parameters: jpeg quality
@@ -1667,21 +1674,23 @@
$xpaset -p ds9 orient close<br>
</tt>
<p><b> <a name="pagesetup"></a>pagesetup</b></p>
- <p>Controls Page Setup options. </p>
+ <p>Controls Page Setup options.<br>
+ </p>
<tt> Syntax: <br>
pagesetup [orient portrait|landscape] <br>
[scale
- <numberic>] <br>
- [size
- letter|legal|tabloid|poster|a4] <br>
- <br>
+ <numberic>]</tt><br>
+ <tt> [size
+ letter|legal|tabloid|poster|a4]</tt><tt></tt><br>
+ <tt> <br>
Example: <br>
$xpaget ds9 pagesetup orient<br>
$xpaget ds9 pagesetup scale <br>
$xpaget ds9 pagesetup size <br>
$xpaset -p ds9 pagesetup orient portrait <br>
$xpaset -p ds9 pagesetup scale 50<br>
- $xpaset -p ds9 pagesetup size poster </tt>
+ $xpaset -p ds9 pagesetup size poster<br>
+ </tt>
<p><b> <a name="pan"></a>pan</b></p>
<p>Controls the current image cursor location for the current
frame. </p>
@@ -2422,6 +2431,17 @@
$xpaget ds9 theme<br>
$xpaset -p ds9 theme clam<br>
</tt>
+ <p><b> <a name="threads"></a>threads</b></p>
+ <p>Set number of process threads for functions which are
+ multi-threaded.<br>
+ </p>
+ <tt> Syntax:<br>
+ threads #<br>
+ <br>
+ Example: <br>
+ $xpaget ds9 threads<br>
+ $xpaset -p ds9 threads 8<br>
+ </tt>
<p><b> <a name="tile"></a>tile</b></p>
<p>Controls the tile display mode. </p>
<tt> Syntax: <br>
diff --git a/doc/release/r7.0.html b/doc/release/r7.0.html
index 8376a15..a026537 100644
--- a/doc/release/r7.0.html
+++ b/doc/release/r7.0.html
@@ -180,7 +180,16 @@ SAOImage DS9 Version 7 Release Notes</h3>
<li><tt>05.17.2012 AST: updated to 7.0.3</tt></li>
<li><tt>05.23.2012 WCS: is always displayed</tt></li>
<li><tt>05.23.2012 CATALOG: fixed a problem with the sign of d:m:s conversion introduced on 04.12.2012.</tt></li>
- <li><tt><b>xx.xx.2012 RELEASE version 7.0</b></tt></li>
+ <li><tt>05.28.2012 MOVIE: minor tweaks on incr slice during movie.</tt></li>
+ <li><tt>05.28.2012 WIN32: fixed a problem with 3d fillImageJoin. Statck overflow.</tt></li>
+ <li><tt>05.29.2012 BACKUP: fixed active frames issue.</tt></li>
+ <li><tt>05.30.2012 GUI: add threads command.</tt></li>
+ <li><tt>05.30.2012 GUI: fixed a problem with PASTE for entries. Will now process unicode.</tt></li>
+ <li><tt>05.31.2012 GRID: fixed a problem with parsing 6.1 and 6.2 backup save sets. New grid options parser implemented.</tt></li>
+ <li><tt>05.31.2012 PLOT: fixed a problem in generating postscript. Now just set plot size./tt></li>
+ <li><tt>05.31.2012 PLOT: fixed a postscript font issue with helvetica./tt></li>
+ <li><tt>05.31.2012 PLOT: add axes format/tt></li>
+ <li><tt><b>06.15.2012 RELEASE version 7.0</b></tt></li>
</ol>
</ol>
</body>
diff --git a/ds9/macosx/SAOImage DS9.app/Contents/Info.plist b/ds9/macosx/SAOImage DS9.app/Contents/Info.plist
index f7f3fe4..a0fe0a8 100644
--- a/ds9/macosx/SAOImage DS9.app/Contents/Info.plist
+++ b/ds9/macosx/SAOImage DS9.app/Contents/Info.plist
@@ -53,7 +53,7 @@
<key>CFBundleSignature</key>
<string>DS9 </string>
<key>CFBundleVersion</key>
- <string>7.0 beta 20</string>
+ <string>7.0</string>
<key>CSResourcesFileMapped</key>
<true/>
<key>LSMinimumSystemVersion</key>
diff --git a/ds9/macosx/SAOImage DS9.app/Contents/Resources/English.lproj/InfoPlist.strings b/ds9/macosx/SAOImage DS9.app/Contents/Resources/English.lproj/InfoPlist.strings
index d3f9603..f1f4568 100644
Binary files a/ds9/macosx/SAOImage DS9.app/Contents/Resources/English.lproj/InfoPlist.strings and b/ds9/macosx/SAOImage DS9.app/Contents/Resources/English.lproj/InfoPlist.strings differ
diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc
index b2f1b86..e79fbe0 100644
--- a/ds9/win/ds9.rc
+++ b/ds9/win/ds9.rc
@@ -1,6 +1,6 @@
#include <windows.h>
-#define VV "7.0 beta 20"
+#define VV "7.0 beta 21"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,0,0,0
diff --git a/make.pkgs b/make.pkgs
index cf531af..62b1695 100644
--- a/make.pkgs
+++ b/make.pkgs
@@ -1,6 +1,6 @@
#--------------------------basic
-DS9VERSION= 7.0b20
+DS9VERSION= 7.0b21
XPAVERSION= 2.1.14
#--------------------------version
diff --git a/msgs/cs.msg b/msgs/cs.msg
index a11b7aa..bed4995 100644
--- a/msgs/cs.msg
+++ b/msgs/cs.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset cs {Axis Range} [encoding convertfrom iso8859-2 {Rozsah osy}]
::msgcat::mcset cs {2D}
::msgcat::mcset cs {3D}
::msgcat::mcset cs {A postscript generation error has occurred} [encoding convertfrom iso8859-2 {Chyba pøi generování postscriptu}]
@@ -55,7 +56,6 @@
::msgcat::mcset cs {Axis Label} [encoding convertfrom iso8859-2 {Popisek osy}]
::msgcat::mcset cs {Axis Length} [encoding convertfrom iso8859-2 {Délka osy}]
::msgcat::mcset cs {Axis Numbers} [encoding convertfrom iso8859-2 {Èíslování osy}]
-::msgcat::mcset cs {Axis Range} [encoding convertfrom iso8859-2 {Rozsah osy}]
::msgcat::mcset cs {Axis} [encoding convertfrom iso8859-2 {Osy}]
::msgcat::mcset cs {Azimuth} [encoding convertfrom iso8859-2 {Azimut}]
::msgcat::mcset cs {Background Color} [encoding convertfrom iso8859-2 {Barva pozadí}]
@@ -782,6 +782,8 @@
::msgcat::mcset cs {grey} [encoding convertfrom iso8859-2 {¹edá}]
::msgcat::mcset cs {g}
::msgcat::mcset cs {heat} [encoding convertfrom iso8859-2 {horko}]
+::msgcat::mcset cs {inches}
+::msgcat::mcset cs {mm}
::msgcat::mcset cs {or center of data}
::msgcat::mcset cs {rainbow} [encoding convertfrom iso8859-2 {duha}]
::msgcat::mcset cs {red} [encoding convertfrom iso8859-2 {èervená}]
diff --git a/msgs/da.msg b/msgs/da.msg
index 2652e4f..1fc4fae 100644
--- a/msgs/da.msg
+++ b/msgs/da.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset da {Axis Range} [encoding convertfrom iso8859-1 {Akse intervallængde}]
::msgcat::mcset da {2D}
::msgcat::mcset da {3D}
::msgcat::mcset da {A postscript generation error has occurred} [encoding convertfrom iso8859-1 {En fejl er opstået under postscript generering}]
@@ -55,7 +56,6 @@
::msgcat::mcset da {Axis Label} {Akse tekster}
::msgcat::mcset da {Axis Length} [encoding convertfrom iso8859-1 {Akse længde}]
::msgcat::mcset da {Axis Numbers} {Akse tal}
-::msgcat::mcset da {Axis Range} [encoding convertfrom iso8859-1 {Akse intervallængde}]
::msgcat::mcset da {Axis} {Akser}
::msgcat::mcset da {Azimuth}
::msgcat::mcset da {Background Color} {Baggrunds farve}
@@ -782,6 +782,8 @@
::msgcat::mcset da {grey} [encoding convertfrom iso8859-1 {grå}]
::msgcat::mcset da {g}
::msgcat::mcset da {heat}
+::msgcat::mcset da {inches}
+::msgcat::mcset da {mm}
::msgcat::mcset da {or center of data} {eller center for data}
::msgcat::mcset da {rainbow} {regnbue}
::msgcat::mcset da {red}
diff --git a/msgs/de.msg b/msgs/de.msg
index a3596ae..73911d9 100644
--- a/msgs/de.msg
+++ b/msgs/de.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset de {Axis Range} {Achsenbereich}
::msgcat::mcset de {2D}
::msgcat::mcset de {3D}
::msgcat::mcset de {A postscript generation error has occurred} {Beim Erstellen von Postscript ist ein Fehler aufgetreten}
@@ -55,7 +56,6 @@
::msgcat::mcset de {Axis Label} {Achsenbeschriftung}
::msgcat::mcset de {Axis Length} [encoding convertfrom iso8859-1 {Achsenlänge}]
::msgcat::mcset de {Axis Numbers} {Achsenziffern}
-::msgcat::mcset de {Axis Range} {Achsenbereich}
::msgcat::mcset de {Axis} {Achse}
::msgcat::mcset de {Azimuth}
::msgcat::mcset de {Background Color} {Hintergrundfarbe}
@@ -782,6 +782,8 @@
::msgcat::mcset de {grey}
::msgcat::mcset de {g}
::msgcat::mcset de {heat}
+::msgcat::mcset de {inches}
+::msgcat::mcset de {mm}
::msgcat::mcset de {or center of data} {oder Zentrum der Daten}
::msgcat::mcset de {rainbow}
::msgcat::mcset de {red}
diff --git a/msgs/es.msg b/msgs/es.msg
index 97798aa..5a7b6eb 100644
--- a/msgs/es.msg
+++ b/msgs/es.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset es {Axis Range} {Rango del eje}
::msgcat::mcset es {2D}
::msgcat::mcset es {3D}
::msgcat::mcset es {A postscript generation error has occurred} [encoding convertfrom iso8859-1 {Un error ha ocurrido en la generación del fichero postscript}]
@@ -55,7 +56,6 @@
::msgcat::mcset es {Axis Label} [encoding convertfrom iso8859-1 {Nombre del eje}]
::msgcat::mcset es {Axis Length} {Longitud del eje}
::msgcat::mcset es {Axis Numbers} [encoding convertfrom iso8859-1 {Números de los ejes}]
-::msgcat::mcset es {Axis Range} {Rango del eje}
::msgcat::mcset es {Axis} {Eje}
::msgcat::mcset es {Azimuth}
::msgcat::mcset es {Background Color} {Color de fondo}
@@ -782,6 +782,8 @@
::msgcat::mcset es {grey} {gris}
::msgcat::mcset es {g}
::msgcat::mcset es {heat}
+::msgcat::mcset es {inches}
+::msgcat::mcset es {mm}
::msgcat::mcset es {or center of data} {o centro de los datos}
::msgcat::mcset es {rainbow}
::msgcat::mcset es {red}
diff --git a/msgs/fr.msg b/msgs/fr.msg
index c31f704..dfc0dfc 100644
--- a/msgs/fr.msg
+++ b/msgs/fr.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset fr {Axis Range} {Intervalle de l'axe}
::msgcat::mcset fr {2D}
::msgcat::mcset fr {3D}
::msgcat::mcset fr {A postscript generation error has occurred} [encoding convertfrom iso8859-1 {Une erreur de génération de postscript s'est produite}]
@@ -55,7 +56,6 @@
::msgcat::mcset fr {Axis Label} {Nom de l'axe}
::msgcat::mcset fr {Axis Length} {Longueur de l'axe}
::msgcat::mcset fr {Axis Numbers} [encoding convertfrom iso8859-1 {Échelle de l'axe}]
-::msgcat::mcset fr {Axis Range} {Intervalle de l'axe}
::msgcat::mcset fr {Axis} {Axe}
::msgcat::mcset fr {Azimuth}
::msgcat::mcset fr {Background Color} {Couleur de fond}
@@ -782,6 +782,8 @@
::msgcat::mcset fr {grey}
::msgcat::mcset fr {g}
::msgcat::mcset fr {heat}
+::msgcat::mcset fr {inches}
+::msgcat::mcset fr {mm}
::msgcat::mcset fr {or center of data}
::msgcat::mcset fr {rainbow}
::msgcat::mcset fr {red}
diff --git a/msgs/ja.msg b/msgs/ja.msg
index de2b561..4ef75e2 100644
--- a/msgs/ja.msg
+++ b/msgs/ja.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset ja {Axis Range} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xc8\xcf\xb0\xcf"]
::msgcat::mcset ja {2D}
::msgcat::mcset ja {3D} [encoding convertfrom euc-jp "\x33\xbc\xa1\xb8\xb5"]
::msgcat::mcset ja {A postscript generation error has occurred} [encoding convertfrom euc-jp "\xa5\xdd\xa5\xb9\xa5\xc8\xa5\xb9\xa5\xaf\xa5\xea\xa5\xd7\xa5\xc8\xa5\xd5\xa5\xa1\xa5\xa4\xa5\xeb\xba\xee\xc0\xae\xa4\xcb\xbc\xba\xc7\xd4\xa4\xb7\xa4\xde\xa4\xb7\xa4\xbf\xa1\xa3"]
@@ -55,7 +56,6 @@
::msgcat::mcset ja {Axis Label} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xa5\xe9\xa5\xd9\xa5\xeb"]
::msgcat::mcset ja {Axis Length} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xc4\xb9\xa4\xb5"]
::msgcat::mcset ja {Axis Numbers} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xbf\xf4\xc3\xcd"]
-::msgcat::mcset ja {Axis Range} [encoding convertfrom euc-jp "\xbc\xb4\xa4\xce\xc8\xcf\xb0\xcf"]
::msgcat::mcset ja {Axis} [encoding convertfrom euc-jp "\xbc\xb4"]
::msgcat::mcset ja {Azimuth} [encoding convertfrom euc-jp "\xca\xfd\xb0\xcc\xb3\xd1"]
::msgcat::mcset ja {Background Color} [encoding convertfrom euc-jp "\xc7\xd8\xb7\xca\xbf\xa7"]
@@ -782,6 +782,8 @@
::msgcat::mcset ja {grey}
::msgcat::mcset ja {g}
::msgcat::mcset ja {heat}
+::msgcat::mcset ja {inches}
+::msgcat::mcset ja {mm}
::msgcat::mcset ja {or center of data} [encoding convertfrom euc-jp "\xa4\xe2\xa4\xb7\xa4\xaf\xa4\xcf\xa5\xc7\xa1\xbc\xa5\xbf\xa4\xce\xc3\xe6\xbf\xb4"]
::msgcat::mcset ja {rainbow}
::msgcat::mcset ja {red}
diff --git a/msgs/pt.msg b/msgs/pt.msg
index 5b023f2..2683575 100644
--- a/msgs/pt.msg
+++ b/msgs/pt.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset pt {Axis Range} {Intervalo do eixo}
::msgcat::mcset pt {2D}
::msgcat::mcset pt {3D}
::msgcat::mcset pt {A postscript generation error has occurred} {Um erro ocorreu ao gerar o postscript}
@@ -55,7 +56,6 @@
::msgcat::mcset pt {Axis Label} {Legendas dos eixos}
::msgcat::mcset pt {Axis Length} {Tamanho do eixo}
::msgcat::mcset pt {Axis Numbers} [encoding convertfrom iso8859-1 {Numeração do eixo}]
-::msgcat::mcset pt {Axis Range} {Intervalo do eixo}
::msgcat::mcset pt {Axis} {Eixo}
::msgcat::mcset pt {Azimuth}
::msgcat::mcset pt {Background Color} {Cor de fundo}
@@ -782,6 +782,8 @@
::msgcat::mcset pt {grey}
::msgcat::mcset pt {g}
::msgcat::mcset pt {heat}
+::msgcat::mcset pt {inches}
+::msgcat::mcset pt {mm}
::msgcat::mcset pt {or center of data} {ou centro dos dados}
::msgcat::mcset pt {rainbow}
::msgcat::mcset pt {red}
diff --git a/msgs/zh.msg b/msgs/zh.msg
index 3180bfa..094a24d 100644
--- a/msgs/zh.msg
+++ b/msgs/zh.msg
@@ -1,3 +1,4 @@
+# ::msgcat::mcset zh {Axis Range}
::msgcat::mcset zh {2D}
::msgcat::mcset zh {3D}
::msgcat::mcset zh {A postscript generation error has occurred}
@@ -55,7 +56,6 @@
::msgcat::mcset zh {Axis Label}
::msgcat::mcset zh {Axis Length}
::msgcat::mcset zh {Axis Numbers}
-::msgcat::mcset zh {Axis Range}
::msgcat::mcset zh {Axis}
::msgcat::mcset zh {Azimuth}
::msgcat::mcset zh {Background Color}
@@ -782,6 +782,8 @@
::msgcat::mcset zh {grey}
::msgcat::mcset zh {g}
::msgcat::mcset zh {heat}
+::msgcat::mcset zh {inches}
+::msgcat::mcset zh {mm}
::msgcat::mcset zh {or center of data}
::msgcat::mcset zh {rainbow}
::msgcat::mcset zh {red}
diff --git a/notes.txt b/notes.txt
index a3ec165..bcb1209 100644
--- a/notes.txt
+++ b/notes.txt
@@ -56,17 +56,24 @@ Future:
Topcat like plot
Mosaic Reprojection
Astrometry.net
+ Catalog to 3D cube
List
-7.0beta
- 3d/2d? center crop after restore?
+ cube dialog wcs/image coords off by 1 (3d.fits)
- darwin X11- greek input
- color tag/scale
+ look at bill's bck issue
+ color tag documentation
- 3d grids
- rotate text
- ps text over grid
+ 3d composite region
+ handles
+ cb error
+ refresh
+
+ tests
+ linux
+ solaris
+ windows
scale dialog (local/global)
cube
@@ -74,14 +81,19 @@ List
3d
- 7.1
+ windows native plot print
+ check/update blt
+ update tcl/tk8.6
xpa/samp PhotoCmd
LoadURL Photo
- plot
- format wcs3
- ps crops x axis numerics
+ catalog matching
+ xpa-talk
3D other
- command line for # threads -auto?
+ grids
+ rotate text
+ ps text over grid
+ SIP
prefs for AUTOSCAN value
keyContext vs context vs currentContext
mosaics
@@ -90,32 +102,17 @@ List
magnifier cursor
cleanup frame.C vs frame3d.C
panner/widget blank issue while rotating: only at vp=0,0 and depth=1
- bin- test reblock
wcszoom for point regions
zoom[0]!=zoom[1]
panner arrows (see marker arrows)
config instead of forget? (layout vert)
-
special modes
+-x frames, updated as current slice moves
line cut down 3rd axis-> new image
- problems- casa, 256x256x256, block to 16, bin to fit- segv
-
markers
+ compass
arrows
- composite
- handles
- cb error
- refresh
-
- 3D SIP
- 3d grid rotated text?
- catalog matching
- xpa-talk
-
- check/update blt
- update tcl/tk8.6
save (fits)
current wcs
@@ -225,9 +222,6 @@ List
-Windows
::ttk::checkbutton vo.tcl (tri state check)
- native plot print
- print
- setup
clip regions
glob?
screen aspect ratio
diff --git a/saotk/colorbar/colorbarbase.C b/saotk/colorbar/colorbarbase.C
index a9463dc..48a62ad 100644
--- a/saotk/colorbar/colorbarbase.C
+++ b/saotk/colorbar/colorbarbase.C
@@ -805,6 +805,7 @@ void ColorbarBase::macosxGrid()
Matrix mm = Translate(originX, originY);
macosxColor(getXColor("black"));
+ macosxDash(NULL,0);
macosxWidth(.5);
// Box
@@ -971,6 +972,7 @@ void ColorbarBase::win32Grid()
Matrix mm = Translate(originX, originY);
win32Color(getXColor("black"));
+ win32Dash(NULL,0);
win32Width(.5);
// box
diff --git a/saotk/frame/base.C b/saotk/frame/base.C
index 62fe7ad..029fa95 100644
--- a/saotk/frame/base.C
+++ b/saotk/frame/base.C
@@ -55,6 +55,8 @@ void frerror(Base* fr, frFlexLexer* ll, const char* m)
Base::Base(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
: Widget(i, c, item)
{
+ threads_ = 4;
+
baseXImage = NULL;
basePixmap = 0;
needsUpdate = NOUPDATE;
@@ -1139,6 +1141,29 @@ void Base::printVector(const Vector& v, Precision p)
Tcl_AppendResult(interp, str.str().c_str(), NULL);
}
+void Base::printVector(const Vector3d& v, Precision p)
+{
+ ostringstream str;
+ switch (p) {
+ case DEFAULT:
+ str << setprecision(8) << v << ends;
+ break;
+ case FIXED:
+ str << setiosflags(ios::fixed) << setw(9) << setprecision(3) << v << ends;
+ break;
+ case SCIENTIFIC:
+ str << setiosflags(ios::scientific) << setprecision(8) << v << ends;
+ break;
+ case INTEGER:
+ {
+ Vector z = v;
+ str << z.round() << ends;
+ break;
+ }
+ }
+ Tcl_AppendResult(interp, str.str().c_str(), NULL);
+}
+
void Base::printFromRef(FitsImage* ptr, const Vector& v,
Coord::CoordSystem sys, Coord::SkyFrame sky,
Coord::SkyFormat format,
@@ -2082,13 +2107,15 @@ void Base::macosx()
Vector v2 = Vector(rr->x+rr->width, rr->y+rr->height) * widgetToCanvas;
macosxClip(v1,v2-v1);
- // scale
- double scale = 150 / 72.;
- int width = options->width*scale;
- int height = options->height*scale;
+ if (currentContext->fits) {
+ // scale
+ double scale = 150 / 72.;
+ int width = options->width*scale;
+ int height = options->height*scale;
- // image
- macosxImage(scale, width, height, v1, v2-v1);
+ // image
+ macosxImage(scale, width, height, v1, v2-v1);
+ }
}
void Base::macosxContours()
@@ -2201,13 +2228,15 @@ void Base::win32()
Vector v2 = Vector(rr->x+rr->width, rr->y+rr->height) * widgetToCanvas;
win32Clip(v1,v2-v1);
- // scale
- double scale = 1.0;
- int width = options->width*scale;
- int height = options->height*scale;
-
- // image
- win32Image(scale, width, height, v1, v2-v1);
+ if (currentContext->fits) {
+ // scale
+ double scale = 1.0;
+ int width = options->width*scale;
+ int height = options->height*scale;
+
+ // image
+ win32Image(scale, width, height, v1, v2-v1);
+ }
}
void Base::win32Contours()
@@ -2238,6 +2267,7 @@ void Base::win32Crosshair()
win32Color(getXColor("green"));
win32Width(1);
+ win32Dash(NULL,0);
win32DrawLine(aa,bb);
win32DrawLine(cc,dd);
}
diff --git a/saotk/frame/base.h b/saotk/frame/base.h
index 6cc2877..4122d22 100644
--- a/saotk/frame/base.h
+++ b/saotk/frame/base.h
@@ -129,6 +129,7 @@ public:
protected:
Context* context;
+ int threads_;
List<Marker>* markers; // pointer to current marker stack
List<Marker>* undoMarkers; // pointer to current marker stack
@@ -411,6 +412,7 @@ public:
void printSkyFormat(Coord::SkyFormat);
void printSkyDist(Coord::SkyDist);
void printVector(const Vector&, Precision);
+ void printVector(const Vector3d&, Precision);
void ps();
void psContours(PSColorSpace);
void psCrosshair(PSColorSpace);
@@ -1562,6 +1564,10 @@ public:
void smoothCmd(int,int);
void smoothDeleteCmd();
+ // Threads Commands
+ void getThreadsCmd();
+ void threadsCmd(int);
+
// WCS
void wcsAppendCmd(int, int);
void wcsAppendCmd(int, const char*);
@@ -1583,13 +1589,13 @@ public:
virtual void get3dHighliteCmd() =0;
virtual void get3dHighliteColorCmd() =0;
virtual void get3dViewCmd() =0;
+ virtual void get3dViewPointCmd() =0;
virtual void get3dRenderMethodCmd() =0;
- virtual void get3dThreadsCmd() =0;
- virtual void set3dHighliteCmd(int) {};
- virtual void set3dHighliteColorCmd(const char*) {};
- virtual void set3dViewCmd(float, float) {};
- virtual void set3dRenderMethodCmd(int) {};
- virtual void set3dThreadsCmd(int) {};
+ virtual void set3dHighliteCmd(int) {}
+ virtual void set3dHighliteColorCmd(const char*) {}
+ virtual void set3dViewCmd(float, float) {}
+ virtual void set3dViewPointCmd(const Vector3d&, const Vector&) {}
+ virtual void set3dRenderMethodCmd(int) {}
};
#endif
diff --git a/saotk/frame/basecommand.C b/saotk/frame/basecommand.C
index cc4a92b..5c0c7f3 100644
--- a/saotk/frame/basecommand.C
+++ b/saotk/frame/basecommand.C
@@ -2316,6 +2316,13 @@ void Base::getSmoothRadiusCmd()
printInteger(smoothRadius_);
}
+void Base::getThreadsCmd()
+{
+ ostringstream str;
+ str << threads_ << ends;
+ Tcl_AppendResult(interp, str.str().c_str(), NULL);
+}
+
void Base::getValueCmd(const Vector& vv, Coord::InternalSystem sys)
{
Vector rr;
@@ -3018,6 +3025,12 @@ void Base::smoothDeleteCmd()
update(MATRIX);
}
+void Base::threadsCmd(int th)
+{
+ if (th>=1)
+ threads_ = th;
+}
+
// not used
// don't know if this is used by anyone else
void Base::unloadFitsCmd()
diff --git a/saotk/frame/composite.h b/saotk/frame/composite.h
index 5b49dcb..d92c680 100644
--- a/saotk/frame/composite.h
+++ b/saotk/frame/composite.h
@@ -19,7 +19,7 @@ class Composite : public Marker {
void renderMACOSX() {}
#endif
#ifdef _WIN32
- void renderWIN32() {};
+ void renderWIN32() {}
#endif
protected:
diff --git a/saotk/frame/contour.C b/saotk/frame/contour.C
index 7ef4e10..a88ba0b 100644
--- a/saotk/frame/contour.C
+++ b/saotk/frame/contour.C
@@ -156,6 +156,8 @@ void Contour::macosx()
dlist[1] = dashlist[1];
macosxDash(dlist,2);
}
+ else
+ macosxDash(NULL,0);
Vector u1 = contours_.current()->vector;
while (contours_.next()) {
@@ -186,6 +188,8 @@ void Contour::win32()
dlist[1] = dashlist[1];
win32Dash(dlist,2);
}
+ else
+ win32Dash(NULL,0);
Vector u1 = contours_.current()->vector;
while (contours_.next()) {
diff --git a/saotk/frame/fr3dcommand.C b/saotk/frame/fr3dcommand.C
index 3cfa929..0b07e7c 100644
--- a/saotk/frame/fr3dcommand.C
+++ b/saotk/frame/fr3dcommand.C
@@ -244,17 +244,17 @@ void Frame3dBase::get3dRenderMethodCmd()
Tcl_AppendResult(interp, str.str().c_str(), NULL);
}
-void Frame3dBase::get3dThreadsCmd()
+void Frame3dBase::get3dViewCmd()
{
ostringstream str;
- str << threads_ << ends;
+ str << m180To180(radToDeg(az_)) << ' ' << m180To180(radToDeg(el_)) << ends;
Tcl_AppendResult(interp, str.str().c_str(), NULL);
}
-void Frame3dBase::get3dViewCmd()
+void Frame3dBase::get3dViewPointCmd()
{
ostringstream str;
- str << m180To180(radToDeg(az_)) << ' ' << m180To180(radToDeg(el_)) << ends;
+ str << vp_ << viewCursor_ << ends;
Tcl_AppendResult(interp, str.str().c_str(), NULL);
}
@@ -411,13 +411,6 @@ void Frame3dBase::set3dRenderMethodCmd(int m)
}
}
-void Frame3dBase::set3dThreadsCmd(int th)
-{
- if (th>=1)
- threads_ = th;
- // no need to redraw
-}
-
void Frame3dBase::set3dViewCmd(float az, float el)
{
if (az>=-180 && az<=180)
@@ -427,6 +420,13 @@ void Frame3dBase::set3dViewCmd(float az, float el)
update(MATRIX);
}
+void Frame3dBase::set3dViewPointCmd(const Vector3d& vv, const Vector& cc)
+{
+ vp_ = vv;
+ viewCursor_ = cc;
+ update(MATRIX);
+}
+
void Frame3dBase::zoomAboutCmd(const Vector& zz, const Vector& vv)
{
Vector dd = Vector(options->width,options->height)/2. - vv*canvasToWidget;
diff --git a/saotk/frame/frame.h b/saotk/frame/frame.h
index 5d1b4f2..722fa60 100644
--- a/saotk/frame/frame.h
+++ b/saotk/frame/frame.h
@@ -25,7 +25,7 @@ class Frame : public virtual FrameBase {
private:
int isIIS();
void reset();
- void setKeyFits() {};
+ void setKeyFits() {}
void unloadFits();
protected:
diff --git a/saotk/frame/frame3d.C b/saotk/frame/frame3d.C
index 871fc9f..acf131e 100644
--- a/saotk/frame/frame3d.C
+++ b/saotk/frame/frame3d.C
@@ -275,8 +275,8 @@ unsigned char* Frame3d::fillImageJoin(int width, int height, Coord::InternalSyst
// local var overide
int nrays = ww*hh;
float incr = nrays/threads_;
- int xid[nrays];
- int yid[nrays];
+ int* xid = new int[nrays];
+ int* yid = new int[nrays];
int x=bb.ll[0]+.5; // don't know why;
int y=bb.ll[1]+.5; // don't know why
@@ -327,6 +327,11 @@ unsigned char* Frame3d::fillImageJoin(int width, int height, Coord::InternalSyst
if (rr)
internalError("Unable to Join Thread");
}
+
+ if (xid)
+ delete [] xid;
+ if (yid)
+ delete [] yid;
}
return fillImageColor(width, height);
diff --git a/saotk/frame/frame3d.h b/saotk/frame/frame3d.h
index 2b7a84d..9c5450c 100644
--- a/saotk/frame/frame3d.h
+++ b/saotk/frame/frame3d.h
@@ -59,7 +59,7 @@ class Frame3d : public virtual Frame3dBase {
void reset();
- void setKeyFits() {};
+ void setKeyFits() {}
void pushMatrices();
void pushMagnifierMatrices();
diff --git a/saotk/frame/frame3dbase.C b/saotk/frame/frame3dbase.C
index 98c8a41..72ac3a2 100644
--- a/saotk/frame/frame3dbase.C
+++ b/saotk/frame/frame3dbase.C
@@ -32,7 +32,6 @@ Frame3dBase::Frame3dBase(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
az_ =0;
el_ =0;
renderMethod_ = MIP;
- threads_ =4;
threedGC = NULL;
diff --git a/saotk/frame/frame3dbase.h b/saotk/frame/frame3dbase.h
index b437fec..ceb4d8e 100644
--- a/saotk/frame/frame3dbase.h
+++ b/saotk/frame/frame3dbase.h
@@ -33,7 +33,6 @@ class Frame3dBase : public Base {
float az_;
float el_;
RenderMethod renderMethod_;
- int threads_;
GC threedGC;
@@ -161,12 +160,12 @@ class Frame3dBase : public Base {
void get3dHighliteColorCmd();
void get3dRenderMethodCmd();
void get3dViewCmd();
- void get3dThreadsCmd();
+ void get3dViewPointCmd();
void set3dHighliteCmd(int);
void set3dHighliteColorCmd(const char*);
void set3dRenderMethodCmd(int);
void set3dViewCmd(float, float);
- void set3dThreadsCmd(int);
+ void set3dViewPointCmd(const Vector3d&, const Vector&);
#ifdef _MACOSX
void macosxHighlite();
diff --git a/saotk/frame/framebase.h b/saotk/frame/framebase.h
index 47f69c9..51d9884 100644
--- a/saotk/frame/framebase.h
+++ b/saotk/frame/framebase.h
@@ -89,8 +89,8 @@ public:
void get3dHighliteCmd();
void get3dHighliteColorCmd();
void get3dViewCmd();
+ void get3dViewPointCmd();
void get3dRenderMethodCmd();
- void get3dThreadsCmd();
};
#endif
diff --git a/saotk/frame/frcommand.C b/saotk/frame/frcommand.C
index 42d7315..418f135 100644
--- a/saotk/frame/frcommand.C
+++ b/saotk/frame/frcommand.C
@@ -54,14 +54,14 @@ void FrameBase::get3dRenderMethodCmd()
Tcl_AppendResult(interp, "mip", NULL);
}
-void FrameBase::get3dThreadsCmd()
+void FrameBase::get3dViewCmd()
{
- Tcl_AppendResult(interp, "1", NULL);
+ Tcl_AppendResult(interp, "0 0", NULL);
}
-void FrameBase::get3dViewCmd()
+void FrameBase::get3dViewPointCmd()
{
- Tcl_AppendResult(interp, "0 0", NULL);
+ Tcl_AppendResult(interp, "0 0 0 0 0", NULL);
}
void FrameBase::getCursorCmd(Coord::InternalSystem sys)
diff --git a/saotk/frame/parser.C b/saotk/frame/parser.C
index 0b1dbec..cebad14 100644
--- a/saotk/frame/parser.C
+++ b/saotk/frame/parser.C
@@ -1040,18 +1040,18 @@ union yyalloc
#endif
/* YYFINAL -- State number of the termination state. */
-#define YYFINAL 323
+#define YYFINAL 325
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 5299
+#define YYLAST 5217
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 336
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 192
+#define YYNNTS 194
/* YYNRULES -- Number of rules. */
-#define YYNRULES 1166
+#define YYNRULES 1170
/* YYNRULES -- Number of states. */
-#define YYNSTATES 2541
+#define YYNSTATES 2550
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -1133,560 +1133,563 @@ static const yytype_uint16 yyprhs[] =
27, 30, 33, 36, 39, 42, 45, 48, 51, 54,
56, 59, 62, 65, 68, 71, 75, 78, 82, 85,
88, 91, 94, 96, 100, 103, 106, 109, 111, 114,
- 117, 119, 122, 124, 127, 130, 133, 136, 138, 140,
- 142, 145, 148, 151, 154, 157, 160, 163, 166, 169,
- 172, 174, 176, 178, 180, 182, 184, 186, 188, 190,
- 191, 193, 195, 197, 199, 200, 203, 206, 208, 210,
- 213, 216, 217, 219, 221, 223, 225, 227, 229, 231,
- 234, 237, 240, 243, 245, 247, 249, 251, 253, 255,
- 257, 259, 261, 263, 265, 267, 269, 271, 273, 275,
- 277, 279, 281, 283, 285, 287, 289, 291, 293, 295,
- 297, 299, 301, 303, 305, 307, 309, 311, 313, 315,
- 317, 319, 321, 323, 325, 327, 329, 330, 332, 334,
- 336, 338, 340, 342, 344, 346, 348, 350, 351, 353,
- 355, 356, 358, 360, 362, 364, 366, 368, 370, 372,
- 373, 375, 377, 378, 380, 382, 383, 385, 387, 388,
- 390, 392, 393, 395, 397, 399, 401, 403, 405, 407,
- 408, 410, 412, 414, 416, 417, 419, 421, 422, 424,
- 426, 430, 433, 436, 439, 442, 444, 447, 450, 455,
- 458, 461, 464, 468, 471, 474, 476, 479, 481, 484,
- 489, 495, 498, 502, 508, 515, 517, 519, 521, 529,
- 541, 550, 563, 566, 569, 572, 575, 578, 581, 584,
- 587, 590, 592, 594, 596, 598, 600, 602, 604, 607,
- 610, 612, 614, 616, 618, 620, 623, 626, 629, 637,
- 648, 650, 653, 655, 663, 674, 676, 679, 682, 685,
- 689, 692, 695, 697, 700, 708, 716, 721, 724, 726,
- 728, 733, 746, 749, 751, 753, 754, 761, 770, 773,
- 777, 781, 785, 786, 790, 795, 800, 805, 809, 813,
- 815, 819, 825, 830, 835, 839, 843, 846, 849, 852,
- 855, 858, 861, 864, 867, 870, 873, 876, 879, 881,
- 884, 887, 891, 899, 902, 905, 907, 911, 914, 917,
- 919, 922, 931, 934, 937, 940, 943, 945, 950, 958,
- 961, 964, 966, 968, 970, 973, 975, 977, 980, 982,
- 983, 986, 989, 991, 993, 995, 998, 1001, 1004, 1006,
- 1007, 1009, 1011, 1013, 1015, 1017, 1019, 1021, 1023, 1025,
- 1027, 1028, 1030, 1033, 1035, 1040, 1046, 1047, 1050, 1052,
- 1058, 1061, 1064, 1067, 1069, 1071, 1073, 1076, 1078, 1081,
- 1083, 1085, 1087, 1089, 1091, 1092, 1094, 1095, 1097, 1103,
- 1110, 1114, 1119, 1124, 1128, 1135, 1138, 1140, 1145, 1147,
- 1149, 1154, 1161, 1169, 1175, 1177, 1179, 1184, 1190, 1192,
- 1194, 1196, 1200, 1201, 1203, 1206, 1208, 1214, 1216, 1219,
- 1221, 1226, 1230, 1233, 1235, 1238, 1240, 1246, 1249, 1251,
- 1253, 1257, 1260, 1261, 1263, 1265, 1270, 1273, 1274, 1276,
- 1277, 1279, 1281, 1283, 1285, 1287, 1289, 1291, 1293, 1295,
- 1297, 1299, 1301, 1304, 1306, 1308, 1309, 1311, 1312, 1315,
- 1318, 1319, 1321, 1323, 1330, 1332, 1334, 1336, 1338, 1341,
- 1344, 1346, 1348, 1350, 1352, 1355, 1357, 1359, 1361, 1364,
- 1366, 1368, 1371, 1374, 1377, 1378, 1380, 1381, 1383, 1385,
- 1387, 1389, 1391, 1393, 1395, 1397, 1400, 1403, 1405, 1408,
- 1412, 1414, 1417, 1420, 1425, 1432, 1434, 1445, 1447, 1450,
- 1454, 1458, 1461, 1464, 1467, 1470, 1473, 1478, 1483, 1488,
- 1492, 1496, 1502, 1507, 1512, 1517, 1521, 1525, 1529, 1533,
- 1536, 1539, 1544, 1548, 1552, 1556, 1561, 1566, 1571, 1576,
- 1582, 1587, 1594, 1602, 1607, 1612, 1618, 1621, 1625, 1628,
- 1631, 1635, 1639, 1643, 1647, 1652, 1656, 1662, 1669, 1673,
- 1677, 1682, 1686, 1690, 1694, 1698, 1702, 1708, 1712, 1716,
- 1721, 1725, 1728, 1731, 1733, 1737, 1742, 1747, 1752, 1757,
- 1762, 1769, 1774, 1779, 1785, 1790, 1795, 1800, 1805, 1811,
- 1816, 1823, 1831, 1836, 1841, 1847, 1853, 1859, 1865, 1871,
- 1877, 1885, 1891, 1897, 1904, 1910, 1916, 1922, 1928, 1935,
- 1941, 1949, 1958, 1964, 1970, 1977, 1981, 1985, 1989, 1993,
- 1997, 2003, 2007, 2011, 2016, 2019, 2022, 2026, 2030, 2034,
- 2038, 2043, 2047, 2053, 2060, 2064, 2068, 2073, 2077, 2081,
- 2085, 2089, 2093, 2099, 2103, 2107, 2112, 2115, 2119, 2126,
- 2133, 2135, 2137, 2139, 2142, 2145, 2148, 2152, 2156, 2159,
- 2162, 2165, 2167, 2171, 2176, 2179, 2180, 2184, 2186, 2188,
- 2191, 2194, 2197, 2200, 2205, 2210, 2215, 2220, 2226, 2230,
- 2235, 2241, 2249, 2258, 2265, 2274, 2284, 2291, 2298, 2306,
- 2317, 2329, 2342, 2352, 2358, 2364, 2371, 2375, 2381, 2387,
- 2393, 2400, 2406, 2411, 2421, 2432, 2444, 2454, 2461, 2468,
- 2475, 2482, 2489, 2496, 2503, 2510, 2517, 2525, 2528, 2533,
- 2538, 2543, 2548, 2554, 2559, 2564, 2570, 2574, 2579, 2584,
- 2589, 2596, 2604, 2613, 2623, 2630, 2641, 2653, 2666, 2676,
- 2680, 2683, 2687, 2693, 2700, 2708, 2713, 2717, 2721, 2728,
- 2735, 2742, 2750, 2755, 2760, 2767, 2777, 2782, 2786, 2793,
- 2801, 2809, 2812, 2816, 2820, 2824, 2829, 2832, 2835, 2840,
- 2848, 2859, 2863, 2865, 2869, 2872, 2875, 2878, 2881, 2885,
- 2891, 2896, 2902, 2905, 2913, 2917, 2920, 2923, 2927, 2930,
- 2933, 2936, 2940, 2943, 2947, 2952, 2956, 2960, 2966, 2973,
- 2978, 2981, 2985, 2988, 2991, 2996, 3000, 3004, 3007, 3011,
- 3013, 3017, 3019, 3022, 3025, 3028, 3030, 3032, 3034, 3036,
- 3039, 3041, 3044, 3047, 3049, 3052, 3055, 3057, 3060, 3062,
- 3064, 3066, 3068, 3070, 3072, 3074, 3076, 3077, 3079, 3082,
- 3085, 3088, 3092, 3098, 3106, 3114, 3121, 3128, 3135, 3141,
- 3148, 3155, 3162, 3169, 3176, 3183, 3190, 3201, 3209, 3217,
- 3225, 3235, 3245, 3256, 3269, 3282, 3285, 3288, 3292, 3297,
- 3302, 3307, 3310, 3315, 3320, 3322, 3324, 3326, 3328, 3330,
- 3332, 3334, 3336, 3339, 3341, 3343, 3347, 3351, 3359, 3365,
- 3369, 3373, 3376, 3379, 3383, 3388, 3393, 3399, 3404, 3410,
- 3415, 3421, 3425, 3430, 3436, 3441, 3447, 3451, 3457, 3462,
- 3468, 3471, 3475, 3479, 3484, 3490, 3494, 3498, 3502, 3507,
- 3513, 3518, 3524, 3529, 3535, 3540, 3546, 3550, 3555, 3561,
- 3566, 3572, 3575, 3578, 3582, 3588, 3593, 3600, 3607, 3611,
- 3615, 3620, 3627, 3633, 3638, 3644, 3647, 3651, 3657, 3662,
- 3669, 3673, 3676, 3679, 3683, 3686, 3690, 3693, 3697, 3703,
- 3708, 3715, 3718, 3721, 3724, 3726, 3731, 3733, 3736, 3739,
- 3742, 3745, 3748, 3751, 3754, 3758, 3761, 3765, 3768, 3772,
- 3774, 3776, 3778, 3780, 3782, 3783, 3786, 3787, 3790, 3791,
- 3793, 3794, 3795, 3797, 3799, 3801, 3809, 3818, 3821, 3826,
- 3829, 3834, 3841, 3844, 3846, 3848, 3852, 3856, 3858, 3862,
- 3867, 3870, 3872, 3876, 3880, 3885, 3889, 3893, 3897, 3899,
- 3901, 3903, 3905, 3907, 3909, 3911, 3913, 3915, 3917, 3919,
- 3921, 3923, 3925, 3928, 3929, 3930, 3933, 3935, 3939, 3941,
- 3945, 3947, 3950, 3953, 3955, 3959, 3960, 3961, 3964, 3967,
- 3969, 3973, 3979, 3981, 3984, 3987, 3990, 3992, 3994, 3996,
- 3998, 4003, 4006, 4010, 4014, 4017, 4021, 4024, 4027, 4030,
- 4034, 4038, 4042, 4045, 4049, 4051, 4055, 4059, 4061, 4064,
- 4067, 4070, 4073, 4075, 4077, 4079, 4081, 4084, 4087, 4091,
- 4095, 4097, 4100, 4104, 4108, 4110, 4113, 4115, 4117, 4120,
- 4123, 4128, 4130, 4133, 4136, 4139, 4143, 4145, 4147, 4149,
- 4152, 4155, 4158, 4162, 4166, 4170, 4173, 4176, 4179, 4183,
- 4187, 4191, 4195, 4199, 4203, 4207, 4211, 4215, 4218, 4220,
- 4222, 4224, 4226, 4227, 4233, 4235, 4242, 4246, 4248, 4251,
- 4254, 4258, 4262, 4265, 4268, 4271, 4274, 4277, 4280, 4284,
- 4287, 4290, 4294, 4296, 4300, 4304, 4306, 4309, 4315, 4322,
- 4329, 4332, 4334, 4337, 4340, 4346, 4353
+ 117, 120, 122, 125, 127, 130, 133, 136, 139, 141,
+ 143, 145, 148, 151, 154, 157, 160, 163, 166, 169,
+ 172, 175, 177, 179, 181, 183, 185, 187, 189, 191,
+ 193, 194, 196, 198, 200, 202, 203, 206, 209, 211,
+ 213, 216, 219, 220, 222, 224, 226, 228, 230, 232,
+ 234, 237, 240, 243, 246, 248, 250, 252, 254, 256,
+ 258, 260, 262, 264, 266, 268, 270, 272, 274, 276,
+ 278, 280, 282, 284, 286, 288, 290, 292, 294, 296,
+ 298, 300, 302, 304, 306, 308, 310, 312, 314, 316,
+ 318, 320, 322, 324, 326, 328, 330, 332, 333, 335,
+ 337, 339, 341, 343, 345, 347, 349, 351, 353, 354,
+ 356, 358, 359, 361, 363, 365, 367, 369, 371, 373,
+ 375, 376, 378, 380, 381, 383, 385, 386, 388, 390,
+ 391, 393, 395, 396, 398, 400, 402, 404, 406, 408,
+ 410, 411, 413, 415, 417, 419, 420, 422, 424, 425,
+ 427, 429, 432, 435, 438, 441, 443, 446, 449, 456,
+ 459, 464, 467, 470, 473, 477, 480, 483, 485, 488,
+ 490, 493, 498, 504, 507, 511, 517, 524, 526, 528,
+ 530, 538, 550, 559, 572, 575, 578, 581, 584, 587,
+ 590, 593, 596, 599, 601, 603, 605, 607, 609, 611,
+ 613, 616, 619, 621, 623, 625, 627, 629, 632, 635,
+ 638, 646, 657, 659, 662, 664, 672, 683, 685, 688,
+ 691, 694, 698, 701, 704, 706, 709, 717, 725, 730,
+ 733, 735, 737, 742, 755, 758, 760, 762, 763, 770,
+ 779, 782, 786, 790, 794, 795, 799, 804, 809, 814,
+ 818, 822, 824, 828, 834, 839, 844, 848, 852, 855,
+ 858, 861, 864, 867, 870, 873, 876, 879, 882, 885,
+ 888, 890, 893, 896, 900, 908, 911, 914, 916, 920,
+ 923, 926, 928, 931, 940, 943, 946, 949, 951, 954,
+ 956, 961, 969, 972, 975, 977, 979, 981, 984, 986,
+ 988, 991, 993, 994, 997, 1000, 1002, 1004, 1006, 1009,
+ 1012, 1015, 1017, 1018, 1020, 1022, 1024, 1026, 1028, 1030,
+ 1032, 1034, 1036, 1038, 1039, 1041, 1044, 1046, 1051, 1057,
+ 1058, 1061, 1063, 1069, 1072, 1075, 1078, 1080, 1082, 1084,
+ 1087, 1089, 1092, 1094, 1096, 1098, 1100, 1102, 1103, 1105,
+ 1106, 1108, 1114, 1121, 1125, 1130, 1135, 1139, 1146, 1149,
+ 1151, 1156, 1158, 1160, 1165, 1172, 1180, 1186, 1188, 1190,
+ 1195, 1201, 1203, 1205, 1207, 1211, 1212, 1214, 1217, 1219,
+ 1225, 1227, 1230, 1232, 1237, 1241, 1244, 1246, 1249, 1251,
+ 1257, 1260, 1262, 1264, 1268, 1271, 1272, 1274, 1276, 1281,
+ 1284, 1285, 1287, 1288, 1290, 1292, 1294, 1296, 1298, 1300,
+ 1302, 1304, 1306, 1308, 1310, 1313, 1316, 1318, 1319, 1321,
+ 1322, 1324, 1325, 1328, 1331, 1332, 1334, 1336, 1343, 1345,
+ 1347, 1349, 1351, 1354, 1357, 1359, 1361, 1363, 1365, 1368,
+ 1370, 1372, 1374, 1377, 1379, 1381, 1384, 1387, 1390, 1391,
+ 1393, 1394, 1396, 1398, 1400, 1402, 1404, 1406, 1408, 1410,
+ 1413, 1416, 1418, 1421, 1425, 1427, 1430, 1433, 1438, 1445,
+ 1447, 1458, 1460, 1463, 1467, 1471, 1474, 1477, 1480, 1483,
+ 1486, 1491, 1496, 1501, 1505, 1509, 1515, 1520, 1525, 1530,
+ 1534, 1538, 1542, 1546, 1549, 1552, 1557, 1561, 1565, 1569,
+ 1574, 1579, 1584, 1589, 1595, 1600, 1607, 1615, 1620, 1625,
+ 1631, 1634, 1638, 1641, 1644, 1648, 1652, 1656, 1660, 1665,
+ 1669, 1675, 1682, 1686, 1690, 1695, 1699, 1703, 1707, 1711,
+ 1715, 1721, 1725, 1729, 1734, 1738, 1741, 1744, 1746, 1750,
+ 1755, 1760, 1765, 1770, 1775, 1782, 1787, 1792, 1798, 1803,
+ 1808, 1813, 1818, 1824, 1829, 1836, 1844, 1849, 1854, 1860,
+ 1866, 1872, 1878, 1884, 1890, 1898, 1904, 1910, 1917, 1923,
+ 1929, 1935, 1941, 1948, 1954, 1962, 1971, 1977, 1983, 1990,
+ 1994, 1998, 2002, 2006, 2010, 2016, 2020, 2024, 2029, 2032,
+ 2035, 2039, 2043, 2047, 2051, 2056, 2060, 2066, 2073, 2077,
+ 2081, 2086, 2090, 2094, 2098, 2102, 2106, 2112, 2116, 2120,
+ 2125, 2128, 2132, 2139, 2146, 2148, 2150, 2152, 2155, 2158,
+ 2161, 2165, 2169, 2172, 2175, 2178, 2180, 2184, 2189, 2192,
+ 2193, 2197, 2199, 2201, 2204, 2207, 2210, 2213, 2218, 2223,
+ 2228, 2233, 2239, 2243, 2248, 2254, 2262, 2271, 2278, 2287,
+ 2297, 2304, 2311, 2319, 2330, 2342, 2355, 2365, 2371, 2377,
+ 2384, 2388, 2394, 2400, 2406, 2413, 2419, 2424, 2434, 2445,
+ 2457, 2467, 2474, 2481, 2488, 2495, 2502, 2509, 2516, 2523,
+ 2530, 2538, 2541, 2546, 2551, 2556, 2561, 2567, 2572, 2577,
+ 2583, 2587, 2592, 2597, 2602, 2609, 2617, 2626, 2636, 2643,
+ 2654, 2666, 2679, 2689, 2693, 2696, 2700, 2706, 2713, 2721,
+ 2726, 2730, 2734, 2741, 2748, 2755, 2763, 2768, 2773, 2780,
+ 2790, 2795, 2799, 2806, 2814, 2822, 2825, 2829, 2833, 2837,
+ 2842, 2845, 2848, 2853, 2861, 2872, 2876, 2878, 2882, 2885,
+ 2888, 2891, 2894, 2898, 2904, 2909, 2915, 2918, 2926, 2930,
+ 2933, 2936, 2940, 2943, 2946, 2949, 2953, 2956, 2960, 2965,
+ 2969, 2973, 2979, 2986, 2991, 2994, 2998, 3001, 3004, 3009,
+ 3013, 3017, 3020, 3024, 3026, 3030, 3032, 3035, 3038, 3041,
+ 3043, 3045, 3047, 3049, 3052, 3054, 3057, 3060, 3062, 3065,
+ 3068, 3070, 3073, 3075, 3077, 3079, 3081, 3083, 3085, 3087,
+ 3089, 3090, 3092, 3095, 3098, 3101, 3105, 3111, 3119, 3127,
+ 3134, 3141, 3148, 3154, 3161, 3168, 3175, 3182, 3189, 3196,
+ 3203, 3214, 3222, 3230, 3238, 3248, 3258, 3269, 3282, 3295,
+ 3298, 3301, 3305, 3310, 3315, 3320, 3323, 3328, 3333, 3335,
+ 3337, 3339, 3341, 3343, 3345, 3347, 3349, 3352, 3354, 3356,
+ 3360, 3364, 3372, 3378, 3382, 3386, 3389, 3392, 3396, 3401,
+ 3406, 3412, 3417, 3423, 3428, 3434, 3438, 3443, 3449, 3454,
+ 3460, 3464, 3470, 3475, 3481, 3484, 3488, 3492, 3497, 3503,
+ 3507, 3511, 3515, 3520, 3526, 3531, 3537, 3542, 3548, 3553,
+ 3559, 3563, 3568, 3574, 3579, 3585, 3588, 3591, 3595, 3601,
+ 3606, 3613, 3620, 3624, 3628, 3633, 3640, 3646, 3651, 3657,
+ 3660, 3664, 3670, 3675, 3682, 3686, 3689, 3692, 3696, 3699,
+ 3703, 3706, 3710, 3716, 3721, 3728, 3731, 3734, 3737, 3739,
+ 3744, 3746, 3749, 3752, 3755, 3758, 3761, 3764, 3767, 3771,
+ 3774, 3778, 3781, 3785, 3787, 3789, 3791, 3793, 3795, 3796,
+ 3799, 3800, 3803, 3804, 3806, 3807, 3808, 3810, 3812, 3814,
+ 3822, 3831, 3834, 3839, 3842, 3847, 3854, 3857, 3859, 3861,
+ 3865, 3869, 3871, 3875, 3880, 3883, 3885, 3889, 3893, 3898,
+ 3902, 3906, 3910, 3912, 3914, 3916, 3918, 3920, 3922, 3924,
+ 3926, 3928, 3930, 3932, 3934, 3936, 3938, 3941, 3942, 3943,
+ 3946, 3948, 3952, 3954, 3958, 3960, 3963, 3966, 3968, 3972,
+ 3973, 3974, 3977, 3980, 3982, 3986, 3992, 3994, 3997, 4000,
+ 4003, 4005, 4007, 4009, 4011, 4016, 4019, 4023, 4027, 4030,
+ 4034, 4037, 4040, 4043, 4047, 4051, 4055, 4058, 4062, 4064,
+ 4068, 4072, 4074, 4077, 4080, 4083, 4086, 4088, 4090, 4092,
+ 4094, 4097, 4100, 4104, 4108, 4110, 4113, 4117, 4121, 4123,
+ 4126, 4128, 4130, 4133, 4136, 4141, 4143, 4146, 4149, 4152,
+ 4156, 4158, 4160, 4162, 4165, 4168, 4171, 4175, 4179, 4183,
+ 4186, 4189, 4192, 4196, 4200, 4204, 4208, 4212, 4216, 4220,
+ 4224, 4228, 4231, 4233, 4235, 4237, 4239, 4240, 4246, 4248,
+ 4255, 4259, 4261, 4264, 4267, 4271, 4275, 4278, 4281, 4284,
+ 4287, 4290, 4293, 4297, 4300, 4303, 4307, 4309, 4313, 4317,
+ 4319, 4322, 4328, 4335, 4342, 4345, 4347, 4350, 4353, 4359,
+ 4366
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 337, 0, -1, 92, 339, -1, 40, 368, -1, 38,
- 62, 5, -1, 55, -1, 60, -1, 61, 373, -1,
- 63, 268, 5, -1, 64, 380, -1, 65, 382, -1,
- 73, 383, -1, 80, 387, -1, 82, 389, -1, 91,
- 340, -1, 116, 390, -1, 128, 391, -1, 132, 431,
- -1, 135, 433, -1, 140, -1, 142, 340, -1, 148,
- 439, -1, 167, 442, -1, 171, 459, -1, 172, 460,
- -1, 175, 476, 461, -1, 176, 495, -1, 188, 62,
- 5, -1, 201, 496, -1, 202, 497, -1, 203, 500,
- -1, 216, 501, -1, 228, -1, 225, 476, 503, -1,
- 230, 507, -1, 232, 508, -1, 237, 510, -1, 250,
- -1, 255, 516, -1, 272, 366, -1, 283, -1, 285,
- 518, -1, 291, -1, 294, 520, -1, 295, 521, -1,
- 325, 525, -1, 331, 526, -1, 3, -1, 4, -1,
- 340, -1, 29, 340, -1, 183, 340, -1, 205, 340,
- -1, 207, 340, -1, 295, 340, -1, 40, 340, -1,
- 72, 340, -1, 80, 340, -1, 133, 340, -1, 230,
- 340, -1, 4, -1, 328, -1, 332, -1, 198, -1,
- 279, -1, 192, -1, 333, -1, 197, -1, 111, -1,
- -1, 94, -1, 117, -1, 240, -1, 153, -1, -1,
- 231, 35, -1, 124, 35, -1, 231, -1, 124, -1,
- 231, 272, -1, 124, 272, -1, -1, 344, -1, 338,
- -1, 7, -1, 8, -1, 9, -1, 10, -1, 11,
- -1, 345, 345, -1, 346, 347, -1, 347, 347, -1,
- 338, 338, -1, 149, -1, 209, -1, 97, -1, 19,
- -1, 350, -1, 295, -1, 296, -1, 297, -1, 298,
- -1, 299, -1, 300, -1, 301, -1, 302, -1, 303,
- -1, 304, -1, 305, -1, 306, -1, 307, -1, 308,
- -1, 309, -1, 310, -1, 311, -1, 312, -1, 313,
- -1, 314, -1, 315, -1, 316, -1, 317, -1, 318,
- -1, 319, -1, 320, -1, 321, -1, 322, -1, 52,
- -1, 203, -1, 165, -1, 169, -1, 217, -1, 259,
- -1, 260, -1, 28, -1, 251, -1, 143, -1, -1,
- 118, -1, 119, -1, 33, -1, 120, -1, 157, -1,
- 146, -1, 126, -1, 264, -1, 102, -1, 139, -1,
- -1, 93, -1, 245, -1, -1, 93, -1, 24, -1,
- 25, -1, 338, -1, 179, -1, 330, -1, 329, -1,
- 286, -1, -1, 249, -1, 158, -1, -1, 17, -1,
- 151, -1, -1, 149, -1, 176, -1, -1, 193, -1,
- 133, -1, -1, 58, -1, 44, -1, 98, -1, 81,
- -1, 334, -1, 27, -1, 47, -1, -1, 4, -1,
- 262, -1, 211, -1, 212, -1, -1, 32, -1, 265,
- -1, -1, 39, -1, 163, -1, 289, 338, 338, -1,
- 142, 367, -1, 178, 506, -1, 271, 4, -1, 273,
- 338, -1, 340, -1, 62, 5, -1, 12, 369, -1,
- 67, 5, 5, 5, -1, 96, 4, -1, 110, 370,
- -1, 125, 371, -1, 49, 252, 4, -1, 276, 372,
- -1, 113, 5, -1, 55, -1, 338, 338, -1, 338,
- -1, 338, 338, -1, 338, 12, 338, 338, -1, 338,
- 338, 12, 338, 338, -1, 276, 338, -1, 276, 338,
- 338, -1, 276, 338, 12, 338, 338, -1, 276, 338,
- 338, 12, 338, 338, -1, 32, -1, 265, -1, 114,
- -1, 338, 338, 12, 55, 5, 5, 5, -1, 338,
- 338, 4, 338, 338, 12, 55, 5, 5, 5, 5,
- -1, 338, 338, 12, 338, 338, 5, 5, 5, -1,
- 338, 338, 4, 338, 338, 12, 338, 338, 5, 5,
- 5, 5, -1, 241, 375, -1, 184, 376, -1, 179,
- 377, -1, 286, 374, -1, 330, 379, -1, 219, 340,
- -1, 338, 338, -1, 170, 338, -1, 141, 338, -1,
- 129, -1, 168, -1, 338, -1, 179, -1, 330, -1,
- 329, -1, 286, -1, 184, 378, -1, 234, 4, -1,
- 30, -1, 239, -1, 234, -1, 90, -1, 156, -1,
- 74, 338, -1, 234, 4, -1, 164, 4, -1, 4,
- 338, 338, 4, 6, 6, 4, -1, 230, 338, 338,
- 338, 338, 338, 338, 4, 6, 4, -1, 37, -1,
- 185, 381, -1, 105, -1, 4, 338, 338, 4, 6,
- 6, 4, -1, 230, 338, 338, 338, 338, 338, 338,
- 4, 6, 4, -1, 352, -1, 169, 338, -1, 31,
- 384, -1, 62, 5, -1, 76, 349, 353, -1, 79,
- 385, -1, 87, 4, -1, 95, -1, 95, 17, -1,
- 167, 5, 4, 4, 5, 349, 353, -1, 206, 5,
- 4, 4, 6, 349, 353, -1, 237, 5, 349, 353,
- -1, 324, 4, -1, 136, -1, 191, -1, 237, 5,
- 349, 353, -1, 5, 4, 4, 386, 4, 4, 352,
- 338, 356, 338, 338, 5, -1, 215, 483, -1, 255,
- -1, 42, -1, -1, 338, 338, 338, 338, 349, 353,
- -1, 55, 348, 349, 353, 338, 338, 349, 355, -1,
- 272, 388, -1, 37, 338, 338, -1, 185, 338, 338,
- -1, 105, 338, 338, -1, -1, 338, 338, 349, -1,
- 37, 338, 338, 4, -1, 185, 338, 338, 4, -1,
- 105, 338, 338, 4, -1, 351, 338, 338, -1, 349,
- 353, 348, -1, 340, -1, 294, 338, 338, -1, 37,
- 185, 351, 338, 338, -1, 185, 351, 338, 338, -1,
- 37, 185, 349, 348, -1, 185, 349, 348, -1, 135,
- 109, 5, -1, 38, 62, -1, 40, 392, -1, 61,
- 394, -1, 64, 399, -1, 63, 398, -1, 65, 401,
- -1, 73, 403, -1, 75, 407, -1, 80, 408, -1,
- 82, 409, -1, 84, 410, -1, 89, 411, -1, 91,
- -1, 115, 415, -1, 132, 420, -1, 144, 5, 5,
- -1, 145, 85, 5, 5, 338, 338, 351, -1, 148,
- 413, -1, 152, 412, -1, 179, -1, 175, 476, 470,
- -1, 176, 421, -1, 188, 62, -1, 201, -1, 202,
- 422, -1, 210, 267, 351, 338, 338, 4, 4, 5,
- -1, 230, 423, -1, 232, 424, -1, 255, 425, -1,
- 272, 426, -1, 280, -1, 287, 351, 338, 338, -1,
- 293, 85, 5, 5, 338, 338, 351, -1, 295, 428,
- -1, 331, 430, -1, 96, -1, 110, -1, 125, -1,
- 49, 252, -1, 84, -1, 113, -1, 67, 393, -1,
- 166, -1, -1, 179, 5, -1, 99, 5, -1, 395,
- -1, 241, -1, 184, -1, 179, 396, -1, 286, 162,
- -1, 330, 397, -1, 219, -1, -1, 338, -1, 179,
- -1, 330, -1, 329, -1, 286, -1, 184, -1, 234,
- -1, 74, -1, 234, -1, 164, -1, -1, 268, -1,
- 162, 400, -1, 4, -1, 4, 351, 338, 338, -1,
- 4, 338, 338, 352, 338, -1, -1, 162, 402, -1,
- 169, -1, 4, 338, 338, 352, 338, -1, 349, 353,
- -1, 31, 404, -1, 61, 405, -1, 62, -1, 87,
- -1, 162, -1, 195, 162, -1, 178, -1, 65, 406,
- -1, 255, -1, 324, -1, 62, -1, 87, -1, 324,
- -1, -1, 184, -1, -1, 169, -1, 338, 338, 349,
- 353, 354, -1, 351, 338, 338, 349, 353, 354, -1,
- 338, 349, 4, -1, 122, 338, 349, 4, -1, 276,
- 338, 349, 4, -1, 349, 353, 354, -1, 55, 349,
- 353, 354, 349, 355, -1, 272, 349, -1, 351, -1,
- 349, 353, 354, 341, -1, 263, -1, 351, -1, 349,
- 353, 354, 341, -1, 349, 353, 348, 338, 338, 5,
- -1, 4, 349, 353, 348, 338, 338, 5, -1, 351,
- 338, 338, 4, 4, -1, 5, -1, 61, -1, 351,
- 338, 338, 5, -1, 6, 4, 4, 4, 4, -1,
- 84, -1, 324, -1, 138, -1, 112, 187, 414, -1,
- -1, 4, -1, 338, 338, -1, 189, -1, 55, 349,
- 353, 354, 341, -1, 77, -1, 96, 417, -1, 41,
- -1, 109, 351, 338, 338, -1, 112, 187, 418, -1,
- 137, 416, -1, 138, -1, 196, 187, -1, 252, -1,
- 252, 349, 353, 355, 341, -1, 253, 419, -1, 324,
- -1, 4, -1, 4, 159, 5, -1, 295, 4, -1,
- -1, 4, -1, 342, -1, 342, 351, 338, 338, -1,
- 342, 4, -1, -1, 4, -1, -1, 200, -1, 62,
- -1, 174, -1, 275, -1, 219, -1, 57, -1, 266,
- -1, 289, -1, 341, -1, 125, -1, 224, -1, 289,
- -1, 142, 427, -1, 178, -1, 271, -1, -1, 62,
- -1, -1, 16, 429, -1, 187, 350, -1, -1, 214,
- -1, 341, -1, 79, 349, 353, 354, 432, 5, -1,
- 95, -1, 20, -1, 222, -1, 19, -1, 40, 434,
- -1, 73, 435, -1, 80, -1, 90, -1, 91, -1,
- 97, -1, 115, 436, -1, 132, -1, 148, -1, 156,
- -1, 175, 437, -1, 209, -1, 255, -1, 266, 349,
- -1, 295, 438, -1, 68, 5, -1, -1, 31, -1,
- -1, 40, -1, 83, -1, 183, -1, 142, -1, 243,
- -1, 206, -1, 281, -1, 349, -1, 107, 349, -1,
- 54, 349, -1, 18, -1, 272, 349, -1, 190, 4,
- 4, -1, 108, -1, 177, 5, -1, 84, 441, -1,
- 244, 112, 187, 440, -1, 244, 6, 4, 4, 4,
- 4, -1, 285, -1, 295, 338, 338, 338, 338, 338,
- 338, 338, 338, 4, -1, 5, -1, 5, 4, -1,
- 4, 4, 52, -1, 4, 4, 349, -1, 184, 340,
- -1, 26, 443, -1, 115, 445, -1, 151, 458, -1,
- 208, 457, -1, 5, 14, 5, 359, -1, 5, 15,
- 5, 359, -1, 5, 57, 5, 359, -1, 5, 181,
- 359, -1, 5, 182, 359, -1, 5, 247, 357, 4,
- 359, -1, 5, 256, 4, 359, -1, 5, 257, 4,
- 359, -1, 5, 288, 5, 359, -1, 230, 83, 444,
- -1, 5, 14, 5, -1, 5, 15, 5, -1, 5,
- 57, 5, -1, 5, 181, -1, 5, 182, -1, 5,
- 247, 357, 4, -1, 5, 256, 4, -1, 5, 257,
- 4, -1, 5, 288, 5, -1, 5, 14, 5, 359,
+ 337, 0, -1, 92, 339, -1, 40, 369, -1, 38,
+ 62, 5, -1, 55, -1, 60, -1, 61, 374, -1,
+ 63, 268, 5, -1, 64, 381, -1, 65, 383, -1,
+ 73, 384, -1, 80, 388, -1, 82, 390, -1, 91,
+ 340, -1, 116, 391, -1, 128, 392, -1, 132, 433,
+ -1, 135, 435, -1, 140, -1, 142, 340, -1, 148,
+ 441, -1, 167, 444, -1, 171, 461, -1, 172, 462,
+ -1, 175, 478, 463, -1, 176, 497, -1, 188, 62,
+ 5, -1, 201, 498, -1, 202, 499, -1, 203, 502,
+ -1, 216, 503, -1, 228, -1, 225, 478, 505, -1,
+ 230, 509, -1, 232, 510, -1, 237, 512, -1, 250,
+ -1, 255, 518, -1, 271, 4, -1, 272, 366, -1,
+ 283, -1, 285, 520, -1, 291, -1, 294, 522, -1,
+ 295, 523, -1, 325, 527, -1, 331, 528, -1, 3,
+ -1, 4, -1, 340, -1, 29, 340, -1, 183, 340,
+ -1, 205, 340, -1, 207, 340, -1, 295, 340, -1,
+ 40, 340, -1, 72, 340, -1, 80, 340, -1, 133,
+ 340, -1, 230, 340, -1, 4, -1, 328, -1, 332,
+ -1, 198, -1, 279, -1, 192, -1, 333, -1, 197,
+ -1, 111, -1, -1, 94, -1, 117, -1, 240, -1,
+ 153, -1, -1, 231, 35, -1, 124, 35, -1, 231,
+ -1, 124, -1, 231, 272, -1, 124, 272, -1, -1,
+ 344, -1, 338, -1, 7, -1, 8, -1, 9, -1,
+ 10, -1, 11, -1, 345, 345, -1, 346, 347, -1,
+ 347, 347, -1, 338, 338, -1, 149, -1, 209, -1,
+ 97, -1, 19, -1, 350, -1, 295, -1, 296, -1,
+ 297, -1, 298, -1, 299, -1, 300, -1, 301, -1,
+ 302, -1, 303, -1, 304, -1, 305, -1, 306, -1,
+ 307, -1, 308, -1, 309, -1, 310, -1, 311, -1,
+ 312, -1, 313, -1, 314, -1, 315, -1, 316, -1,
+ 317, -1, 318, -1, 319, -1, 320, -1, 321, -1,
+ 322, -1, 52, -1, 203, -1, 165, -1, 169, -1,
+ 217, -1, 259, -1, 260, -1, 28, -1, 251, -1,
+ 143, -1, -1, 118, -1, 119, -1, 33, -1, 120,
+ -1, 157, -1, 146, -1, 126, -1, 264, -1, 102,
+ -1, 139, -1, -1, 93, -1, 245, -1, -1, 93,
+ -1, 24, -1, 25, -1, 338, -1, 179, -1, 330,
+ -1, 329, -1, 286, -1, -1, 249, -1, 158, -1,
+ -1, 17, -1, 151, -1, -1, 149, -1, 176, -1,
+ -1, 193, -1, 133, -1, -1, 58, -1, 44, -1,
+ 98, -1, 81, -1, 334, -1, 27, -1, 47, -1,
+ -1, 4, -1, 262, -1, 211, -1, 212, -1, -1,
+ 32, -1, 265, -1, -1, 39, -1, 163, -1, 289,
+ 368, -1, 142, 367, -1, 178, 508, -1, 273, 338,
+ -1, 340, -1, 62, 5, -1, 338, 338, -1, 213,
+ 338, 338, 338, 338, 338, -1, 12, 370, -1, 67,
+ 5, 5, 5, -1, 96, 4, -1, 110, 371, -1,
+ 125, 372, -1, 49, 252, 4, -1, 276, 373, -1,
+ 113, 5, -1, 55, -1, 338, 338, -1, 338, -1,
+ 338, 338, -1, 338, 12, 338, 338, -1, 338, 338,
+ 12, 338, 338, -1, 276, 338, -1, 276, 338, 338,
+ -1, 276, 338, 12, 338, 338, -1, 276, 338, 338,
+ 12, 338, 338, -1, 32, -1, 265, -1, 114, -1,
+ 338, 338, 12, 55, 5, 5, 5, -1, 338, 338,
+ 4, 338, 338, 12, 55, 5, 5, 5, 5, -1,
+ 338, 338, 12, 338, 338, 5, 5, 5, -1, 338,
+ 338, 4, 338, 338, 12, 338, 338, 5, 5, 5,
+ 5, -1, 241, 376, -1, 184, 377, -1, 179, 378,
+ -1, 286, 375, -1, 330, 380, -1, 219, 340, -1,
+ 338, 338, -1, 170, 338, -1, 141, 338, -1, 129,
+ -1, 168, -1, 338, -1, 179, -1, 330, -1, 329,
+ -1, 286, -1, 184, 379, -1, 234, 4, -1, 30,
+ -1, 239, -1, 234, -1, 90, -1, 156, -1, 74,
+ 338, -1, 234, 4, -1, 164, 4, -1, 4, 338,
+ 338, 4, 6, 6, 4, -1, 230, 338, 338, 338,
+ 338, 338, 338, 4, 6, 4, -1, 37, -1, 185,
+ 382, -1, 105, -1, 4, 338, 338, 4, 6, 6,
+ 4, -1, 230, 338, 338, 338, 338, 338, 338, 4,
+ 6, 4, -1, 352, -1, 169, 338, -1, 31, 385,
+ -1, 62, 5, -1, 76, 349, 353, -1, 79, 386,
+ -1, 87, 4, -1, 95, -1, 95, 17, -1, 167,
+ 5, 4, 4, 5, 349, 353, -1, 206, 5, 4,
+ 4, 6, 349, 353, -1, 237, 5, 349, 353, -1,
+ 324, 4, -1, 136, -1, 191, -1, 237, 5, 349,
+ 353, -1, 5, 4, 4, 387, 4, 4, 352, 338,
+ 356, 338, 338, 5, -1, 215, 485, -1, 255, -1,
+ 42, -1, -1, 338, 338, 338, 338, 349, 353, -1,
+ 55, 348, 349, 353, 338, 338, 349, 355, -1, 272,
+ 389, -1, 37, 338, 338, -1, 185, 338, 338, -1,
+ 105, 338, 338, -1, -1, 338, 338, 349, -1, 37,
+ 338, 338, 4, -1, 185, 338, 338, 4, -1, 105,
+ 338, 338, 4, -1, 351, 338, 338, -1, 349, 353,
+ 348, -1, 340, -1, 294, 338, 338, -1, 37, 185,
+ 351, 338, 338, -1, 185, 351, 338, 338, -1, 37,
+ 185, 349, 348, -1, 185, 349, 348, -1, 135, 109,
+ 5, -1, 38, 62, -1, 40, 393, -1, 61, 395,
+ -1, 64, 400, -1, 63, 399, -1, 65, 402, -1,
+ 73, 404, -1, 75, 408, -1, 80, 409, -1, 82,
+ 410, -1, 84, 411, -1, 89, 412, -1, 91, -1,
+ 115, 416, -1, 132, 421, -1, 144, 5, 5, -1,
+ 145, 85, 5, 5, 338, 338, 351, -1, 148, 414,
+ -1, 152, 413, -1, 179, -1, 175, 478, 472, -1,
+ 176, 422, -1, 188, 62, -1, 201, -1, 202, 423,
+ -1, 210, 267, 351, 338, 338, 4, 4, 5, -1,
+ 230, 424, -1, 232, 425, -1, 255, 426, -1, 271,
+ -1, 272, 427, -1, 280, -1, 287, 351, 338, 338,
+ -1, 293, 85, 5, 5, 338, 338, 351, -1, 295,
+ 430, -1, 331, 432, -1, 96, -1, 110, -1, 125,
+ -1, 49, 252, -1, 84, -1, 113, -1, 67, 394,
+ -1, 166, -1, -1, 179, 5, -1, 99, 5, -1,
+ 396, -1, 241, -1, 184, -1, 179, 397, -1, 286,
+ 162, -1, 330, 398, -1, 219, -1, -1, 338, -1,
+ 179, -1, 330, -1, 329, -1, 286, -1, 184, -1,
+ 234, -1, 74, -1, 234, -1, 164, -1, -1, 268,
+ -1, 162, 401, -1, 4, -1, 4, 351, 338, 338,
+ -1, 4, 338, 338, 352, 338, -1, -1, 162, 403,
+ -1, 169, -1, 4, 338, 338, 352, 338, -1, 349,
+ 353, -1, 31, 405, -1, 61, 406, -1, 62, -1,
+ 87, -1, 162, -1, 195, 162, -1, 178, -1, 65,
+ 407, -1, 255, -1, 324, -1, 62, -1, 87, -1,
+ 324, -1, -1, 184, -1, -1, 169, -1, 338, 338,
+ 349, 353, 354, -1, 351, 338, 338, 349, 353, 354,
+ -1, 338, 349, 4, -1, 122, 338, 349, 4, -1,
+ 276, 338, 349, 4, -1, 349, 353, 354, -1, 55,
+ 349, 353, 354, 349, 355, -1, 272, 349, -1, 351,
+ -1, 349, 353, 354, 341, -1, 263, -1, 351, -1,
+ 349, 353, 354, 341, -1, 349, 353, 348, 338, 338,
+ 5, -1, 4, 349, 353, 348, 338, 338, 5, -1,
+ 351, 338, 338, 4, 4, -1, 5, -1, 61, -1,
+ 351, 338, 338, 5, -1, 6, 4, 4, 4, 4,
+ -1, 84, -1, 324, -1, 138, -1, 112, 187, 415,
+ -1, -1, 4, -1, 338, 338, -1, 189, -1, 55,
+ 349, 353, 354, 341, -1, 77, -1, 96, 418, -1,
+ 41, -1, 109, 351, 338, 338, -1, 112, 187, 419,
+ -1, 137, 417, -1, 138, -1, 196, 187, -1, 252,
+ -1, 252, 349, 353, 355, 341, -1, 253, 420, -1,
+ 324, -1, 4, -1, 4, 159, 5, -1, 295, 4,
+ -1, -1, 4, -1, 342, -1, 342, 351, 338, 338,
+ -1, 342, 4, -1, -1, 4, -1, -1, 200, -1,
+ 62, -1, 174, -1, 275, -1, 219, -1, 57, -1,
+ 266, -1, 289, -1, 341, -1, 125, -1, 224, -1,
+ 289, 429, -1, 142, 428, -1, 178, -1, -1, 62,
+ -1, -1, 213, -1, -1, 16, 431, -1, 187, 350,
+ -1, -1, 214, -1, 341, -1, 79, 349, 353, 354,
+ 434, 5, -1, 95, -1, 20, -1, 222, -1, 19,
+ -1, 40, 436, -1, 73, 437, -1, 80, -1, 90,
+ -1, 91, -1, 97, -1, 115, 438, -1, 132, -1,
+ 148, -1, 156, -1, 175, 439, -1, 209, -1, 255,
+ -1, 266, 349, -1, 295, 440, -1, 68, 5, -1,
+ -1, 31, -1, -1, 40, -1, 83, -1, 183, -1,
+ 142, -1, 243, -1, 206, -1, 281, -1, 349, -1,
+ 107, 349, -1, 54, 349, -1, 18, -1, 272, 349,
+ -1, 190, 4, 4, -1, 108, -1, 177, 5, -1,
+ 84, 443, -1, 244, 112, 187, 442, -1, 244, 6,
+ 4, 4, 4, 4, -1, 285, -1, 295, 338, 338,
+ 338, 338, 338, 338, 338, 338, 4, -1, 5, -1,
+ 5, 4, -1, 4, 4, 52, -1, 4, 4, 349,
+ -1, 184, 340, -1, 26, 445, -1, 115, 447, -1,
+ 151, 460, -1, 208, 459, -1, 5, 14, 5, 359,
-1, 5, 15, 5, 359, -1, 5, 57, 5, 359,
- -1, 5, 181, 358, 359, -1, 5, 5, 254, 358,
- 359, -1, 5, 182, 358, 359, -1, 5, 247, 357,
- 4, 358, 359, -1, 5, 261, 357, 4, 4, 358,
+ -1, 5, 181, 359, -1, 5, 182, 359, -1, 5,
+ 247, 357, 4, 359, -1, 5, 256, 4, 359, -1,
+ 5, 257, 4, 359, -1, 5, 288, 5, 359, -1,
+ 230, 83, 446, -1, 5, 14, 5, -1, 5, 15,
+ 5, -1, 5, 57, 5, -1, 5, 181, -1, 5,
+ 182, -1, 5, 247, 357, 4, -1, 5, 256, 4,
+ -1, 5, 257, 4, -1, 5, 288, 5, -1, 5,
+ 14, 5, 359, -1, 5, 15, 5, 359, -1, 5,
+ 57, 5, 359, -1, 5, 181, 358, 359, -1, 5,
+ 5, 254, 358, 359, -1, 5, 182, 358, 359, -1,
+ 5, 247, 357, 4, 358, 359, -1, 5, 261, 357,
+ 4, 4, 358, 359, -1, 5, 256, 4, 359, -1,
+ 5, 257, 4, 359, -1, 5, 288, 5, 358, 359,
+ -1, 253, 448, -1, 109, 83, 449, -1, 183, 450,
+ -1, 230, 456, -1, 5, 14, 5, -1, 5, 15,
+ 5, -1, 5, 57, 5, -1, 5, 181, 358, -1,
+ 5, 5, 254, 358, -1, 5, 182, 358, -1, 5,
+ 247, 357, 4, 358, -1, 5, 261, 357, 4, 4,
+ 358, -1, 5, 256, 4, -1, 5, 257, 4, -1,
+ 5, 288, 5, 358, -1, 5, 14, 5, -1, 5,
+ 15, 5, -1, 5, 57, 5, -1, 5, 181, 358,
+ -1, 5, 182, 358, -1, 5, 247, 357, 4, 358,
+ -1, 5, 256, 4, -1, 5, 257, 4, -1, 5,
+ 288, 5, 358, -1, 149, 155, 451, -1, 155, 452,
+ -1, 149, 453, -1, 454, -1, 149, 323, 455, -1,
+ 5, 14, 5, 359, -1, 5, 15, 5, 359, -1,
+ 5, 57, 5, 359, -1, 5, 181, 358, 359, -1,
+ 5, 182, 358, 359, -1, 5, 247, 357, 4, 358,
359, -1, 5, 256, 4, 359, -1, 5, 257, 4,
- 359, -1, 5, 288, 5, 358, 359, -1, 253, 446,
- -1, 109, 83, 447, -1, 183, 448, -1, 230, 454,
- -1, 5, 14, 5, -1, 5, 15, 5, -1, 5,
- 57, 5, -1, 5, 181, 358, -1, 5, 5, 254,
- 358, -1, 5, 182, 358, -1, 5, 247, 357, 4,
- 358, -1, 5, 261, 357, 4, 4, 358, -1, 5,
- 256, 4, -1, 5, 257, 4, -1, 5, 288, 5,
- 358, -1, 5, 14, 5, -1, 5, 15, 5, -1,
- 5, 57, 5, -1, 5, 181, 358, -1, 5, 182,
- 358, -1, 5, 247, 357, 4, 358, -1, 5, 256,
- 4, -1, 5, 257, 4, -1, 5, 288, 5, 358,
- -1, 149, 155, 449, -1, 155, 450, -1, 149, 451,
- -1, 452, -1, 149, 323, 453, -1, 5, 14, 5,
- 359, -1, 5, 15, 5, 359, -1, 5, 57, 5,
- 359, -1, 5, 181, 358, 359, -1, 5, 182, 358,
- 359, -1, 5, 247, 357, 4, 358, 359, -1, 5,
- 256, 4, 359, -1, 5, 257, 4, 359, -1, 5,
- 288, 5, 358, 359, -1, 5, 14, 5, 359, -1,
- 5, 15, 5, 359, -1, 5, 57, 5, 359, -1,
- 5, 181, 358, 359, -1, 5, 5, 254, 358, 359,
- -1, 5, 182, 358, 359, -1, 5, 247, 357, 4,
- 358, 359, -1, 5, 261, 357, 4, 4, 358, 359,
- -1, 5, 256, 4, 359, -1, 5, 257, 4, 359,
- -1, 5, 288, 5, 358, 359, -1, 350, 5, 14,
+ 359, -1, 5, 288, 5, 358, 359, -1, 5, 14,
+ 5, 359, -1, 5, 15, 5, 359, -1, 5, 57,
+ 5, 359, -1, 5, 181, 358, 359, -1, 5, 5,
+ 254, 358, 359, -1, 5, 182, 358, 359, -1, 5,
+ 247, 357, 4, 358, 359, -1, 5, 261, 357, 4,
+ 4, 358, 359, -1, 5, 256, 4, 359, -1, 5,
+ 257, 4, 359, -1, 5, 288, 5, 358, 359, -1,
+ 350, 5, 14, 5, 359, -1, 350, 5, 15, 5,
+ 359, -1, 350, 5, 57, 5, 359, -1, 350, 5,
+ 181, 358, 359, -1, 350, 5, 182, 358, 359, -1,
+ 350, 5, 247, 357, 4, 358, 359, -1, 350, 5,
+ 256, 4, 359, -1, 350, 5, 257, 4, 359, -1,
+ 350, 5, 288, 5, 358, 359, -1, 350, 5, 14,
5, 359, -1, 350, 5, 15, 5, 359, -1, 350,
5, 57, 5, 359, -1, 350, 5, 181, 358, 359,
- -1, 350, 5, 182, 358, 359, -1, 350, 5, 247,
- 357, 4, 358, 359, -1, 350, 5, 256, 4, 359,
- -1, 350, 5, 257, 4, 359, -1, 350, 5, 288,
- 5, 358, 359, -1, 350, 5, 14, 5, 359, -1,
- 350, 5, 15, 5, 359, -1, 350, 5, 57, 5,
- 359, -1, 350, 5, 181, 358, 359, -1, 350, 5,
- 5, 254, 358, 359, -1, 350, 5, 182, 358, 359,
- -1, 350, 5, 247, 357, 4, 358, 359, -1, 350,
- 5, 261, 357, 4, 4, 358, 359, -1, 350, 5,
- 256, 4, 359, -1, 350, 5, 257, 4, 359, -1,
- 350, 5, 288, 5, 358, 359, -1, 5, 14, 5,
- -1, 5, 15, 5, -1, 5, 57, 5, -1, 5,
- 181, 358, -1, 5, 182, 358, -1, 5, 247, 357,
+ -1, 350, 5, 5, 254, 358, 359, -1, 350, 5,
+ 182, 358, 359, -1, 350, 5, 247, 357, 4, 358,
+ 359, -1, 350, 5, 261, 357, 4, 4, 358, 359,
+ -1, 350, 5, 256, 4, 359, -1, 350, 5, 257,
+ 4, 359, -1, 350, 5, 288, 5, 358, 359, -1,
+ 5, 14, 5, -1, 5, 15, 5, -1, 5, 57,
+ 5, -1, 5, 181, 358, -1, 5, 182, 358, -1,
+ 5, 247, 357, 4, 358, -1, 5, 256, 4, -1,
+ 5, 257, 4, -1, 5, 288, 5, 358, -1, 83,
+ 457, -1, 149, 458, -1, 5, 14, 5, -1, 5,
+ 15, 5, -1, 5, 57, 5, -1, 5, 181, 358,
+ -1, 5, 5, 254, 358, -1, 5, 182, 358, -1,
+ 5, 247, 357, 4, 358, -1, 5, 261, 357, 4,
4, 358, -1, 5, 256, 4, -1, 5, 257, 4,
- -1, 5, 288, 5, 358, -1, 83, 455, -1, 149,
- 456, -1, 5, 14, 5, -1, 5, 15, 5, -1,
- 5, 57, 5, -1, 5, 181, 358, -1, 5, 5,
- 254, 358, -1, 5, 182, 358, -1, 5, 247, 357,
- 4, 358, -1, 5, 261, 357, 4, 4, 358, -1,
- 5, 256, 4, -1, 5, 257, 4, -1, 5, 288,
- 5, 358, -1, 5, 14, 5, -1, 5, 15, 5,
- -1, 5, 57, 5, -1, 5, 181, 358, -1, 5,
- 182, 358, -1, 5, 247, 357, 4, 358, -1, 5,
- 256, 4, -1, 5, 257, 4, -1, 5, 288, 5,
- 358, -1, 5, 5, -1, 253, 5, 5, -1, 89,
- 4, 4, 4, 4, 4, -1, 179, 4, 4, 4,
- 4, 4, -1, 105, -1, 218, -1, 340, -1, 130,
- 340, -1, 84, 340, -1, 62, 5, -1, 5, 4,
- 4, -1, 285, 338, 338, -1, 331, 338, -1, 56,
- 464, -1, 62, 5, -1, 76, -1, 69, 469, 5,
- -1, 69, 469, 288, 5, -1, 71, 95, -1, -1,
- 79, 462, 465, -1, 85, -1, 95, -1, 95, 17,
- -1, 101, 468, -1, 121, 5, -1, 142, 17, -1,
- 142, 199, 338, 338, -1, 142, 277, 338, 338, -1,
- 4, 20, 363, 340, -1, 4, 20, 204, 364, -1,
- 4, 20, 266, 349, 353, -1, 4, 21, 344, -1,
- 4, 21, 344, 351, -1, 4, 21, 344, 349, 353,
- -1, 4, 22, 224, 338, 338, 4, 351, -1, 4,
- 22, 224, 338, 338, 4, 349, 355, -1, 4, 22,
- 224, 5, 349, 355, -1, 4, 45, 224, 338, 338,
- 338, 4, 351, -1, 4, 45, 224, 338, 338, 338,
- 4, 349, 355, -1, 4, 45, 224, 5, 349, 355,
- -1, 4, 44, 224, 338, 338, 351, -1, 4, 44,
- 224, 338, 338, 349, 355, -1, 4, 48, 101, 344,
- 344, 4, 338, 338, 338, 4, -1, 4, 48, 101,
- 344, 344, 4, 338, 338, 338, 4, 351, -1, 4,
- 48, 101, 344, 344, 4, 338, 338, 338, 4, 349,
- 353, -1, 4, 48, 101, 5, 5, 349, 353, 349,
- 355, -1, 4, 51, 463, 5, 5, -1, 4, 58,
- 224, 338, 351, -1, 4, 58, 224, 338, 349, 355,
- -1, 4, 62, 5, -1, 4, 70, 27, 340, 340,
- -1, 4, 70, 160, 5, 5, -1, 4, 70, 224,
- 338, 351, -1, 4, 70, 224, 338, 349, 355, -1,
- 4, 70, 266, 349, 353, -1, 4, 71, 129, 340,
- -1, 4, 78, 101, 344, 344, 4, 338, 338, 4,
- -1, 4, 78, 101, 344, 344, 4, 338, 338, 4,
- 351, -1, 4, 78, 101, 344, 344, 4, 338, 338,
- 4, 349, 353, -1, 4, 78, 101, 5, 5, 349,
- 353, 349, 355, -1, 4, 79, 22, 224, 338, 338,
- -1, 4, 79, 45, 224, 338, 338, -1, 4, 79,
- 48, 21, 338, 338, -1, 4, 79, 48, 224, 338,
- 338, -1, 4, 79, 104, 224, 338, 338, -1, 4,
- 79, 106, 21, 338, 338, -1, 4, 79, 106, 224,
- 338, 338, -1, 4, 79, 78, 21, 338, 338, -1,
- 4, 79, 78, 224, 338, 338, -1, 4, 79, 215,
- 292, 4, 338, 338, -1, 4, 95, -1, 4, 95,
- 22, 4, -1, 4, 95, 45, 4, -1, 4, 95,
- 48, 4, -1, 4, 95, 104, 4, -1, 4, 95,
- 51, 463, 5, -1, 4, 95, 106, 4, -1, 4,
- 95, 78, 4, -1, 4, 95, 215, 292, 4, -1,
- 4, 95, 268, -1, 4, 95, 268, 5, -1, 4,
- 95, 268, 4, -1, 4, 101, 37, 4, -1, 4,
- 103, 224, 338, 338, 351, -1, 4, 103, 224, 338,
- 338, 349, 355, -1, 4, 104, 224, 338, 338, 338,
- 4, 351, -1, 4, 104, 224, 338, 338, 338, 4,
- 349, 355, -1, 4, 104, 224, 5, 349, 355, -1,
- 4, 106, 101, 344, 344, 4, 338, 338, 338, 4,
- -1, 4, 106, 101, 344, 344, 4, 338, 338, 338,
- 4, 351, -1, 4, 106, 101, 344, 344, 4, 338,
- 338, 338, 4, 349, 353, -1, 4, 106, 101, 5,
- 5, 349, 353, 349, 355, -1, 4, 121, 5, -1,
- 4, 142, -1, 4, 142, 199, -1, 4, 164, 27,
- 340, 340, -1, 4, 164, 213, 351, 348, 348, -1,
- 4, 164, 213, 349, 353, 348, 348, -1, 4, 186,
- 338, 338, -1, 4, 186, 123, -1, 4, 186, 34,
- -1, 4, 186, 276, 351, 338, 338, -1, 4, 186,
- 276, 349, 353, 348, -1, 4, 215, 228, 338, 338,
- 351, -1, 4, 215, 228, 338, 338, 349, 355, -1,
- 4, 213, 246, 361, -1, 4, 213, 252, 4, -1,
- 4, 220, 351, 348, 348, 338, -1, 4, 220, 349,
- 353, 348, 348, 338, 349, 355, -1, 4, 221, 482,
- 340, -1, 4, 232, 37, -1, 4, 233, 213, 351,
- 348, 348, -1, 4, 233, 213, 349, 353, 348, 348,
- -1, 4, 233, 266, 349, 353, 349, 355, -1, 4,
- 243, -1, 4, 243, 199, -1, 4, 268, 5, -1,
- 4, 270, 5, -1, 4, 270, 232, 340, -1, 4,
- 282, -1, 4, 284, -1, 4, 290, 27, 340, -1,
- 4, 290, 213, 351, 348, 338, 344, -1, 4, 290,
- 213, 349, 353, 348, 349, 355, 338, 344, -1, 4,
- 324, 4, -1, 158, -1, 158, 338, 338, -1, 166,
- 477, -1, 167, 478, -1, 186, 479, -1, 219, 340,
- -1, 221, 482, 340, -1, 221, 482, 340, 338, 338,
- -1, 232, 37, 338, 338, -1, 232, 185, 338, 338,
- 4, -1, 232, 105, -1, 237, 5, 469, 349, 353,
- 354, 340, -1, 237, 269, 5, -1, 243, 486, -1,
- 250, 487, -1, 5, 62, 5, -1, 5, 76, -1,
- 5, 95, -1, 5, 85, -1, 5, 121, 5, -1,
- 5, 142, -1, 5, 142, 199, -1, 5, 186, 338,
- 338, -1, 5, 186, 123, -1, 5, 186, 34, -1,
- 5, 186, 276, 351, 348, -1, 5, 186, 276, 349,
- 353, 348, -1, 5, 221, 482, 340, -1, 5, 243,
- -1, 5, 243, 199, -1, 5, 282, -1, 5, 284,
- -1, 268, 101, 5, 5, -1, 268, 95, 5, -1,
- 268, 95, 17, -1, 268, 5, -1, 268, 285, 5,
- -1, 206, -1, 206, 349, 349, -1, 281, -1, 282,
- 17, -1, 284, 17, -1, 324, 4, -1, 243, -1,
- 284, -1, 142, -1, 282, -1, 37, 186, -1, 186,
- -1, 105, 186, -1, 37, 101, -1, 101, -1, 105,
- 101, -1, 37, 232, -1, 232, -1, 105, 232, -1,
- 95, -1, 270, -1, 62, -1, 324, -1, 221, -1,
- 121, -1, 158, -1, 285, -1, -1, 4, -1, 30,
- 340, -1, 224, 338, -1, 154, 4, -1, 200, 4,
- 338, -1, 58, 338, 338, 338, 483, -1, 103, 338,
- 338, 338, 338, 343, 483, -1, 44, 338, 338, 338,
- 338, 343, 483, -1, 215, 338, 338, 338, 338, 483,
- -1, 164, 338, 338, 338, 338, 483, -1, 290, 338,
- 338, 338, 338, 483, -1, 270, 338, 338, 343, 483,
- -1, 58, 213, 338, 338, 362, 483, -1, 44, 213,
- 338, 338, 362, 483, -1, 98, 213, 338, 338, 362,
- 483, -1, 81, 213, 338, 338, 362, 483, -1, 334,
- 213, 338, 338, 362, 483, -1, 27, 213, 338, 338,
- 362, 483, -1, 47, 213, 338, 338, 362, 483, -1,
- 233, 338, 338, 338, 338, 349, 353, 349, 355, 483,
- -1, 70, 338, 338, 338, 349, 353, 483, -1, 220,
- 338, 338, 338, 338, 338, 483, -1, 22, 338, 338,
- 338, 338, 4, 483, -1, 104, 338, 338, 338, 338,
- 338, 4, 343, 483, -1, 45, 338, 338, 338, 338,
- 338, 4, 343, 483, -1, 78, 338, 338, 344, 344,
- 4, 338, 338, 4, 483, -1, 106, 338, 338, 344,
- 344, 4, 338, 338, 338, 4, 343, 483, -1, 48,
+ -1, 5, 288, 5, 358, -1, 5, 14, 5, -1,
+ 5, 15, 5, -1, 5, 57, 5, -1, 5, 181,
+ 358, -1, 5, 182, 358, -1, 5, 247, 357, 4,
+ 358, -1, 5, 256, 4, -1, 5, 257, 4, -1,
+ 5, 288, 5, 358, -1, 5, 5, -1, 253, 5,
+ 5, -1, 89, 4, 4, 4, 4, 4, -1, 179,
+ 4, 4, 4, 4, 4, -1, 105, -1, 218, -1,
+ 340, -1, 130, 340, -1, 84, 340, -1, 62, 5,
+ -1, 5, 4, 4, -1, 285, 338, 338, -1, 331,
+ 338, -1, 56, 466, -1, 62, 5, -1, 76, -1,
+ 69, 471, 5, -1, 69, 471, 288, 5, -1, 71,
+ 95, -1, -1, 79, 464, 467, -1, 85, -1, 95,
+ -1, 95, 17, -1, 101, 470, -1, 121, 5, -1,
+ 142, 17, -1, 142, 199, 338, 338, -1, 142, 277,
+ 338, 338, -1, 4, 20, 363, 340, -1, 4, 20,
+ 204, 364, -1, 4, 20, 266, 349, 353, -1, 4,
+ 21, 344, -1, 4, 21, 344, 351, -1, 4, 21,
+ 344, 349, 353, -1, 4, 22, 224, 338, 338, 4,
+ 351, -1, 4, 22, 224, 338, 338, 4, 349, 355,
+ -1, 4, 22, 224, 5, 349, 355, -1, 4, 45,
+ 224, 338, 338, 338, 4, 351, -1, 4, 45, 224,
+ 338, 338, 338, 4, 349, 355, -1, 4, 45, 224,
+ 5, 349, 355, -1, 4, 44, 224, 338, 338, 351,
+ -1, 4, 44, 224, 338, 338, 349, 355, -1, 4,
+ 48, 101, 344, 344, 4, 338, 338, 338, 4, -1,
+ 4, 48, 101, 344, 344, 4, 338, 338, 338, 4,
+ 351, -1, 4, 48, 101, 344, 344, 4, 338, 338,
+ 338, 4, 349, 353, -1, 4, 48, 101, 5, 5,
+ 349, 353, 349, 355, -1, 4, 51, 465, 5, 5,
+ -1, 4, 58, 224, 338, 351, -1, 4, 58, 224,
+ 338, 349, 355, -1, 4, 62, 5, -1, 4, 70,
+ 27, 340, 340, -1, 4, 70, 160, 5, 5, -1,
+ 4, 70, 224, 338, 351, -1, 4, 70, 224, 338,
+ 349, 355, -1, 4, 70, 266, 349, 353, -1, 4,
+ 71, 129, 340, -1, 4, 78, 101, 344, 344, 4,
+ 338, 338, 4, -1, 4, 78, 101, 344, 344, 4,
+ 338, 338, 4, 351, -1, 4, 78, 101, 344, 344,
+ 4, 338, 338, 4, 349, 353, -1, 4, 78, 101,
+ 5, 5, 349, 353, 349, 355, -1, 4, 79, 22,
+ 224, 338, 338, -1, 4, 79, 45, 224, 338, 338,
+ -1, 4, 79, 48, 21, 338, 338, -1, 4, 79,
+ 48, 224, 338, 338, -1, 4, 79, 104, 224, 338,
+ 338, -1, 4, 79, 106, 21, 338, 338, -1, 4,
+ 79, 106, 224, 338, 338, -1, 4, 79, 78, 21,
+ 338, 338, -1, 4, 79, 78, 224, 338, 338, -1,
+ 4, 79, 215, 292, 4, 338, 338, -1, 4, 95,
+ -1, 4, 95, 22, 4, -1, 4, 95, 45, 4,
+ -1, 4, 95, 48, 4, -1, 4, 95, 104, 4,
+ -1, 4, 95, 51, 465, 5, -1, 4, 95, 106,
+ 4, -1, 4, 95, 78, 4, -1, 4, 95, 215,
+ 292, 4, -1, 4, 95, 268, -1, 4, 95, 268,
+ 5, -1, 4, 95, 268, 4, -1, 4, 101, 37,
+ 4, -1, 4, 103, 224, 338, 338, 351, -1, 4,
+ 103, 224, 338, 338, 349, 355, -1, 4, 104, 224,
+ 338, 338, 338, 4, 351, -1, 4, 104, 224, 338,
+ 338, 338, 4, 349, 355, -1, 4, 104, 224, 5,
+ 349, 355, -1, 4, 106, 101, 344, 344, 4, 338,
+ 338, 338, 4, -1, 4, 106, 101, 344, 344, 4,
+ 338, 338, 338, 4, 351, -1, 4, 106, 101, 344,
+ 344, 4, 338, 338, 338, 4, 349, 353, -1, 4,
+ 106, 101, 5, 5, 349, 353, 349, 355, -1, 4,
+ 121, 5, -1, 4, 142, -1, 4, 142, 199, -1,
+ 4, 164, 27, 340, 340, -1, 4, 164, 213, 351,
+ 348, 348, -1, 4, 164, 213, 349, 353, 348, 348,
+ -1, 4, 186, 338, 338, -1, 4, 186, 123, -1,
+ 4, 186, 34, -1, 4, 186, 276, 351, 338, 338,
+ -1, 4, 186, 276, 349, 353, 348, -1, 4, 215,
+ 228, 338, 338, 351, -1, 4, 215, 228, 338, 338,
+ 349, 355, -1, 4, 213, 246, 361, -1, 4, 213,
+ 252, 4, -1, 4, 220, 351, 348, 348, 338, -1,
+ 4, 220, 349, 353, 348, 348, 338, 349, 355, -1,
+ 4, 221, 484, 340, -1, 4, 232, 37, -1, 4,
+ 233, 213, 351, 348, 348, -1, 4, 233, 213, 349,
+ 353, 348, 348, -1, 4, 233, 266, 349, 353, 349,
+ 355, -1, 4, 243, -1, 4, 243, 199, -1, 4,
+ 268, 5, -1, 4, 270, 5, -1, 4, 270, 232,
+ 340, -1, 4, 282, -1, 4, 284, -1, 4, 290,
+ 27, 340, -1, 4, 290, 213, 351, 348, 338, 344,
+ -1, 4, 290, 213, 349, 353, 348, 349, 355, 338,
+ 344, -1, 4, 324, 4, -1, 158, -1, 158, 338,
+ 338, -1, 166, 479, -1, 167, 480, -1, 186, 481,
+ -1, 219, 340, -1, 221, 484, 340, -1, 221, 484,
+ 340, 338, 338, -1, 232, 37, 338, 338, -1, 232,
+ 185, 338, 338, 4, -1, 232, 105, -1, 237, 5,
+ 471, 349, 353, 354, 340, -1, 237, 269, 5, -1,
+ 243, 488, -1, 250, 489, -1, 5, 62, 5, -1,
+ 5, 76, -1, 5, 95, -1, 5, 85, -1, 5,
+ 121, 5, -1, 5, 142, -1, 5, 142, 199, -1,
+ 5, 186, 338, 338, -1, 5, 186, 123, -1, 5,
+ 186, 34, -1, 5, 186, 276, 351, 348, -1, 5,
+ 186, 276, 349, 353, 348, -1, 5, 221, 484, 340,
+ -1, 5, 243, -1, 5, 243, 199, -1, 5, 282,
+ -1, 5, 284, -1, 268, 101, 5, 5, -1, 268,
+ 95, 5, -1, 268, 95, 17, -1, 268, 5, -1,
+ 268, 285, 5, -1, 206, -1, 206, 349, 349, -1,
+ 281, -1, 282, 17, -1, 284, 17, -1, 324, 4,
+ -1, 243, -1, 284, -1, 142, -1, 282, -1, 37,
+ 186, -1, 186, -1, 105, 186, -1, 37, 101, -1,
+ 101, -1, 105, 101, -1, 37, 232, -1, 232, -1,
+ 105, 232, -1, 95, -1, 270, -1, 62, -1, 324,
+ -1, 221, -1, 121, -1, 158, -1, 285, -1, -1,
+ 4, -1, 30, 340, -1, 224, 338, -1, 154, 4,
+ -1, 200, 4, 338, -1, 58, 338, 338, 338, 485,
+ -1, 103, 338, 338, 338, 338, 343, 485, -1, 44,
+ 338, 338, 338, 338, 343, 485, -1, 215, 338, 338,
+ 338, 338, 485, -1, 164, 338, 338, 338, 338, 485,
+ -1, 290, 338, 338, 338, 338, 485, -1, 270, 338,
+ 338, 343, 485, -1, 58, 213, 338, 338, 362, 485,
+ -1, 44, 213, 338, 338, 362, 485, -1, 98, 213,
+ 338, 338, 362, 485, -1, 81, 213, 338, 338, 362,
+ 485, -1, 334, 213, 338, 338, 362, 485, -1, 27,
+ 213, 338, 338, 362, 485, -1, 47, 213, 338, 338,
+ 362, 485, -1, 233, 338, 338, 338, 338, 349, 353,
+ 349, 355, 485, -1, 70, 338, 338, 338, 349, 353,
+ 485, -1, 220, 338, 338, 338, 338, 338, 485, -1,
+ 22, 338, 338, 338, 338, 4, 485, -1, 104, 338,
+ 338, 338, 338, 338, 4, 343, 485, -1, 45, 338,
+ 338, 338, 338, 338, 4, 343, 485, -1, 78, 338,
+ 338, 344, 344, 4, 338, 338, 4, 485, -1, 106,
338, 338, 344, 344, 4, 338, 338, 338, 4, 343,
- 483, -1, 71, 483, -1, 269, 466, -1, 5, 338,
- 338, -1, 288, 5, 338, 338, -1, 338, 338, 288,
- 5, -1, 5, 349, 353, 348, -1, 4, 4, -1,
- 37, 338, 338, 4, -1, 185, 338, 338, 4, -1,
- 105, -1, 100, -1, 326, -1, 59, -1, 236, -1,
- 235, -1, 223, -1, 327, -1, 56, 471, -1, 62,
- -1, 121, -1, 134, 338, 338, -1, 147, 338, 338,
- -1, 4, 20, 211, 5, 5, 5, 5, -1, 4,
- 20, 212, 5, 5, -1, 4, 20, 204, -1, 4,
- 20, 266, -1, 147, 17, -1, 4, 21, -1, 4,
- 21, 351, -1, 4, 21, 349, 353, -1, 4, 22,
- 224, 351, -1, 4, 22, 224, 349, 355, -1, 4,
- 45, 224, 351, -1, 4, 45, 224, 349, 355, -1,
- 4, 44, 224, 351, -1, 4, 44, 224, 349, 355,
- -1, 4, 48, 21, -1, 4, 48, 21, 351, -1,
- 4, 48, 21, 349, 353, -1, 4, 48, 224, 351,
- -1, 4, 48, 224, 349, 355, -1, 4, 55, 351,
- -1, 4, 55, 349, 353, 354, -1, 4, 58, 224,
- 351, -1, 4, 58, 224, 349, 355, -1, 4, 62,
- -1, 4, 70, 27, -1, 4, 70, 160, -1, 4,
- 70, 224, 351, -1, 4, 70, 224, 349, 355, -1,
- 4, 70, 266, -1, 4, 71, 129, -1, 4, 78,
- 21, -1, 4, 78, 21, 351, -1, 4, 78, 21,
- 349, 353, -1, 4, 78, 224, 351, -1, 4, 78,
- 224, 349, 355, -1, 4, 103, 224, 351, -1, 4,
- 103, 224, 349, 355, -1, 4, 104, 224, 351, -1,
- 4, 104, 224, 349, 355, -1, 4, 106, 21, -1,
- 4, 106, 21, 351, -1, 4, 106, 21, 349, 353,
- -1, 4, 106, 224, 351, -1, 4, 106, 224, 349,
- 355, -1, 4, 121, -1, 4, 142, -1, 4, 164,
- 27, -1, 4, 164, 161, 349, 355, -1, 4, 164,
- 213, 351, -1, 4, 164, 213, 349, 353, 354, -1,
- 4, 173, 161, 338, 349, 355, -1, 4, 213, 246,
- -1, 4, 213, 252, -1, 4, 220, 213, 351, -1,
- 4, 220, 213, 349, 353, 354, -1, 4, 220, 161,
- 349, 355, -1, 4, 220, 274, 351, -1, 4, 220,
- 274, 349, 355, -1, 4, 221, -1, 4, 221, 482,
- -1, 4, 233, 161, 349, 355, -1, 4, 233, 213,
- 351, -1, 4, 233, 213, 349, 353, 354, -1, 4,
- 233, 266, -1, 4, 243, -1, 4, 268, -1, 4,
- 268, 4, -1, 4, 270, -1, 4, 270, 232, -1,
- 4, 280, -1, 4, 290, 27, -1, 4, 290, 161,
- 349, 355, -1, 4, 290, 213, 351, -1, 4, 290,
- 213, 349, 353, 354, -1, 4, 324, -1, 142, 472,
- -1, 142, 195, -1, 195, -1, 215, 242, 338, 338,
- -1, 219, -1, 221, 482, -1, 243, 473, -1, 243,
- 195, -1, 250, 474, -1, 5, 62, -1, 5, 121,
- -1, 5, 147, -1, 5, 221, 482, -1, 5, 268,
- -1, 5, 268, 195, -1, 268, 17, -1, 268, 94,
- 187, -1, 324, -1, 30, -1, 224, -1, 154, -1,
- 200, -1, -1, 338, 338, -1, -1, 338, 338, -1,
- -1, 270, -1, -1, -1, 214, -1, 286, -1, 53,
- -1, 469, 349, 353, 354, 340, 484, 490, -1, 243,
- 469, 349, 353, 354, 340, 484, 490, -1, 469, 5,
- -1, 469, 5, 349, 353, -1, 469, 4, -1, 469,
- 4, 349, 353, -1, 115, 5, 5, 467, 4, 5,
- -1, 338, 338, -1, 123, -1, 34, -1, 37, 338,
- 338, -1, 185, 338, 338, -1, 105, -1, 276, 351,
- 348, -1, 276, 349, 353, 348, -1, 480, 481, -1,
- 481, -1, 482, 335, 340, -1, 62, 335, 5, -1,
- 88, 335, 4, 4, -1, 324, 335, 4, -1, 121,
- 335, 5, -1, 270, 335, 5, -1, 493, -1, 494,
- -1, 193, -1, 243, -1, 142, -1, 87, -1, 117,
- -1, 101, -1, 186, -1, 232, -1, 95, -1, 150,
- -1, 258, -1, 475, -1, 475, 480, -1, -1, -1,
- 485, 488, -1, 17, -1, 199, 338, 338, -1, 277,
- -1, 277, 338, 338, -1, 340, -1, 270, 340, -1,
- 488, 489, -1, 489, -1, 482, 335, 340, -1, -1,
- -1, 491, 492, -1, 492, 493, -1, 493, -1, 268,
- 335, 5, -1, 51, 335, 463, 5, 5, -1, 60,
- -1, 62, 5, -1, 174, 4, -1, 275, 338, -1,
- 334, -1, 332, -1, 327, -1, 193, -1, 338, 338,
- 338, 338, -1, 338, 338, -1, 351, 338, 338, -1,
- 349, 353, 348, -1, 276, 498, -1, 36, 338, 338,
- -1, 185, 499, -1, 219, 340, -1, 338, 338, -1,
- 351, 338, 338, -1, 349, 353, 348, -1, 37, 338,
- 338, -1, 338, 338, -1, 105, 338, 338, -1, 340,
- -1, 295, 350, 353, -1, 5, 4, 4, -1, 285,
- -1, 66, 502, -1, 162, 4, -1, 229, 4, -1,
- 238, 338, -1, 50, -1, 131, -1, 230, -1, 86,
- -1, 142, 504, -1, 243, 505, -1, 37, 338, 338,
- -1, 185, 338, 338, -1, 105, -1, 248, 105, -1,
+ 485, -1, 48, 338, 338, 344, 344, 4, 338, 338,
+ 338, 4, 343, 485, -1, 71, 485, -1, 269, 468,
+ -1, 5, 338, 338, -1, 288, 5, 338, 338, -1,
+ 338, 338, 288, 5, -1, 5, 349, 353, 348, -1,
+ 4, 4, -1, 37, 338, 338, 4, -1, 185, 338,
+ 338, 4, -1, 105, -1, 100, -1, 326, -1, 59,
+ -1, 236, -1, 235, -1, 223, -1, 327, -1, 56,
+ 473, -1, 62, -1, 121, -1, 134, 338, 338, -1,
+ 147, 338, 338, -1, 4, 20, 211, 5, 5, 5,
+ 5, -1, 4, 20, 212, 5, 5, -1, 4, 20,
+ 204, -1, 4, 20, 266, -1, 147, 17, -1, 4,
+ 21, -1, 4, 21, 351, -1, 4, 21, 349, 353,
+ -1, 4, 22, 224, 351, -1, 4, 22, 224, 349,
+ 355, -1, 4, 45, 224, 351, -1, 4, 45, 224,
+ 349, 355, -1, 4, 44, 224, 351, -1, 4, 44,
+ 224, 349, 355, -1, 4, 48, 21, -1, 4, 48,
+ 21, 351, -1, 4, 48, 21, 349, 353, -1, 4,
+ 48, 224, 351, -1, 4, 48, 224, 349, 355, -1,
+ 4, 55, 351, -1, 4, 55, 349, 353, 354, -1,
+ 4, 58, 224, 351, -1, 4, 58, 224, 349, 355,
+ -1, 4, 62, -1, 4, 70, 27, -1, 4, 70,
+ 160, -1, 4, 70, 224, 351, -1, 4, 70, 224,
+ 349, 355, -1, 4, 70, 266, -1, 4, 71, 129,
+ -1, 4, 78, 21, -1, 4, 78, 21, 351, -1,
+ 4, 78, 21, 349, 353, -1, 4, 78, 224, 351,
+ -1, 4, 78, 224, 349, 355, -1, 4, 103, 224,
+ 351, -1, 4, 103, 224, 349, 355, -1, 4, 104,
+ 224, 351, -1, 4, 104, 224, 349, 355, -1, 4,
+ 106, 21, -1, 4, 106, 21, 351, -1, 4, 106,
+ 21, 349, 353, -1, 4, 106, 224, 351, -1, 4,
+ 106, 224, 349, 355, -1, 4, 121, -1, 4, 142,
+ -1, 4, 164, 27, -1, 4, 164, 161, 349, 355,
+ -1, 4, 164, 213, 351, -1, 4, 164, 213, 349,
+ 353, 354, -1, 4, 173, 161, 338, 349, 355, -1,
+ 4, 213, 246, -1, 4, 213, 252, -1, 4, 220,
+ 213, 351, -1, 4, 220, 213, 349, 353, 354, -1,
+ 4, 220, 161, 349, 355, -1, 4, 220, 274, 351,
+ -1, 4, 220, 274, 349, 355, -1, 4, 221, -1,
+ 4, 221, 484, -1, 4, 233, 161, 349, 355, -1,
+ 4, 233, 213, 351, -1, 4, 233, 213, 349, 353,
+ 354, -1, 4, 233, 266, -1, 4, 243, -1, 4,
+ 268, -1, 4, 268, 4, -1, 4, 270, -1, 4,
+ 270, 232, -1, 4, 280, -1, 4, 290, 27, -1,
+ 4, 290, 161, 349, 355, -1, 4, 290, 213, 351,
+ -1, 4, 290, 213, 349, 353, 354, -1, 4, 324,
+ -1, 142, 474, -1, 142, 195, -1, 195, -1, 215,
+ 242, 338, 338, -1, 219, -1, 221, 484, -1, 243,
+ 475, -1, 243, 195, -1, 250, 476, -1, 5, 62,
+ -1, 5, 121, -1, 5, 147, -1, 5, 221, 484,
+ -1, 5, 268, -1, 5, 268, 195, -1, 268, 17,
+ -1, 268, 94, 187, -1, 324, -1, 30, -1, 224,
+ -1, 154, -1, 200, -1, -1, 338, 338, -1, -1,
+ 338, 338, -1, -1, 270, -1, -1, -1, 214, -1,
+ 286, -1, 53, -1, 471, 349, 353, 354, 340, 486,
+ 492, -1, 243, 471, 349, 353, 354, 340, 486, 492,
+ -1, 471, 5, -1, 471, 5, 349, 353, -1, 471,
+ 4, -1, 471, 4, 349, 353, -1, 115, 5, 5,
+ 469, 4, 5, -1, 338, 338, -1, 123, -1, 34,
+ -1, 37, 338, 338, -1, 185, 338, 338, -1, 105,
+ -1, 276, 351, 348, -1, 276, 349, 353, 348, -1,
+ 482, 483, -1, 483, -1, 484, 335, 340, -1, 62,
+ 335, 5, -1, 88, 335, 4, 4, -1, 324, 335,
+ 4, -1, 121, 335, 5, -1, 270, 335, 5, -1,
+ 495, -1, 496, -1, 193, -1, 243, -1, 142, -1,
+ 87, -1, 117, -1, 101, -1, 186, -1, 232, -1,
+ 95, -1, 150, -1, 258, -1, 477, -1, 477, 482,
+ -1, -1, -1, 487, 490, -1, 17, -1, 199, 338,
+ 338, -1, 277, -1, 277, 338, 338, -1, 340, -1,
+ 270, 340, -1, 490, 491, -1, 491, -1, 484, 335,
+ 340, -1, -1, -1, 493, 494, -1, 494, 495, -1,
+ 495, -1, 268, 335, 5, -1, 51, 335, 465, 5,
+ 5, -1, 60, -1, 62, 5, -1, 174, 4, -1,
+ 275, 338, -1, 334, -1, 332, -1, 327, -1, 193,
+ -1, 338, 338, 338, 338, -1, 338, 338, -1, 351,
+ 338, 338, -1, 349, 353, 348, -1, 276, 500, -1,
+ 36, 338, 338, -1, 185, 501, -1, 219, 340, -1,
+ 338, 338, -1, 351, 338, 338, -1, 349, 353, 348,
+ -1, 37, 338, 338, -1, 338, 338, -1, 105, 338,
+ 338, -1, 340, -1, 295, 350, 353, -1, 5, 4,
+ 4, -1, 285, -1, 66, 504, -1, 162, 4, -1,
+ 229, 4, -1, 238, 338, -1, 50, -1, 131, -1,
+ 230, -1, 86, -1, 142, 506, -1, 243, 507, -1,
37, 338, 338, -1, 185, 338, 338, -1, 105, -1,
- 248, 105, -1, 180, -1, 13, -1, 57, 5, -1,
- 266, 349, -1, 289, 4, 4, 4, -1, 338, -1,
- 338, 93, -1, 185, 509, -1, 276, 338, -1, 276,
- 338, 93, -1, 37, -1, 338, -1, 105, -1, 26,
- 511, -1, 115, 512, -1, 208, 5, -1, 112, 5,
- 365, -1, 57, 5, 365, -1, 256, 4, 365, -1,
- 149, 513, -1, 267, 514, -1, 227, 515, -1, 112,
- 5, 360, -1, 57, 5, 360, -1, 256, 4, 360,
- -1, 112, 5, 360, -1, 57, 5, 360, -1, 256,
- 4, 360, -1, 112, 5, 360, -1, 57, 5, 360,
- -1, 256, 4, 360, -1, 517, 4, -1, 95, -1,
- 46, -1, 127, -1, 278, -1, -1, 4, 338, 338,
- 338, 338, -1, 194, -1, 194, 4, 338, 338, 338,
- 338, -1, 115, 253, 519, -1, 4, -1, 4, 4,
- -1, 338, 338, -1, 276, 338, 338, -1, 350, 353,
- 354, -1, 16, 524, -1, 228, 4, -1, 226, 523,
- -1, 23, 522, -1, 4, 4, -1, 4, 5, -1,
- 270, 4, 5, -1, 4, 4, -1, 4, 5, -1,
- 270, 4, 5, -1, 4, -1, 4, 350, 353, -1,
- 4, 6, 350, -1, 218, -1, 338, 338, -1, 338,
- 338, 12, 338, 338, -1, 338, 338, 12, 351, 338,
- 338, -1, 338, 338, 12, 349, 353, 348, -1, 276,
- 527, -1, 114, -1, 114, 338, -1, 338, 338, -1,
- 338, 338, 12, 338, 338, -1, 338, 338, 12, 351,
- 338, 338, -1, 338, 338, 12, 349, 353, 348, -1
+ 248, 105, -1, 37, 338, 338, -1, 185, 338, 338,
+ -1, 105, -1, 248, 105, -1, 180, -1, 13, -1,
+ 57, 5, -1, 266, 349, -1, 289, 4, 4, 4,
+ -1, 338, -1, 338, 93, -1, 185, 511, -1, 276,
+ 338, -1, 276, 338, 93, -1, 37, -1, 338, -1,
+ 105, -1, 26, 513, -1, 115, 514, -1, 208, 5,
+ -1, 112, 5, 365, -1, 57, 5, 365, -1, 256,
+ 4, 365, -1, 149, 515, -1, 267, 516, -1, 227,
+ 517, -1, 112, 5, 360, -1, 57, 5, 360, -1,
+ 256, 4, 360, -1, 112, 5, 360, -1, 57, 5,
+ 360, -1, 256, 4, 360, -1, 112, 5, 360, -1,
+ 57, 5, 360, -1, 256, 4, 360, -1, 519, 4,
+ -1, 95, -1, 46, -1, 127, -1, 278, -1, -1,
+ 4, 338, 338, 338, 338, -1, 194, -1, 194, 4,
+ 338, 338, 338, 338, -1, 115, 253, 521, -1, 4,
+ -1, 4, 4, -1, 338, 338, -1, 276, 338, 338,
+ -1, 350, 353, 354, -1, 16, 526, -1, 228, 4,
+ -1, 226, 525, -1, 23, 524, -1, 4, 4, -1,
+ 4, 5, -1, 270, 4, 5, -1, 4, 4, -1,
+ 4, 5, -1, 270, 4, 5, -1, 4, -1, 4,
+ 350, 353, -1, 4, 6, 350, -1, 218, -1, 338,
+ 338, -1, 338, 338, 12, 338, 338, -1, 338, 338,
+ 12, 351, 338, 338, -1, 338, 338, 12, 349, 353,
+ 348, -1, 276, 529, -1, 114, -1, 114, 338, -1,
+ 338, 338, -1, 338, 338, 12, 338, 338, -1, 338,
+ 338, 12, 351, 338, 338, -1, 338, 338, 12, 349,
+ 353, 348, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -1696,119 +1699,120 @@ static const yytype_uint16 yyrline[] =
446, 447, 448, 449, 450, 451, 452, 453, 454, 455,
456, 457, 458, 459, 460, 461, 462, 463, 464, 465,
466, 467, 468, 469, 470, 471, 472, 473, 474, 475,
- 476, 477, 478, 479, 480, 481, 482, 485, 486, 489,
+ 476, 477, 478, 479, 480, 481, 482, 483, 486, 487,
490, 491, 492, 493, 494, 495, 496, 497, 498, 499,
- 502, 504, 505, 506, 507, 509, 510, 511, 512, 515,
- 516, 517, 518, 519, 522, 523, 524, 525, 526, 527,
- 528, 531, 532, 535, 536, 537, 540, 543, 546, 549,
- 561, 568, 575, 583, 584, 585, 586, 587, 590, 591,
+ 500, 503, 505, 506, 507, 508, 510, 511, 512, 513,
+ 516, 517, 518, 519, 520, 523, 524, 525, 526, 527,
+ 528, 529, 532, 533, 536, 537, 538, 541, 544, 547,
+ 550, 562, 569, 576, 584, 585, 586, 587, 588, 591,
592, 593, 594, 595, 596, 597, 598, 599, 600, 601,
602, 603, 604, 605, 606, 607, 608, 609, 610, 611,
- 612, 613, 614, 615, 616, 617, 620, 621, 624, 625,
- 626, 627, 628, 629, 630, 631, 634, 635, 636, 637,
- 638, 639, 640, 641, 642, 643, 644, 647, 648, 649,
- 652, 653, 654, 655, 658, 659, 660, 661, 662, 665,
- 666, 667, 670, 671, 672, 675, 676, 677, 680, 681,
- 682, 685, 686, 687, 688, 689, 690, 691, 692, 695,
- 696, 699, 700, 701, 704, 705, 706, 709, 710, 711,
- 714, 715, 716, 717, 718, 722, 723, 726, 727, 728,
- 729, 730, 731, 732, 733, 736, 737, 740, 741, 742,
- 744, 746, 747, 748, 750, 754, 755, 758, 759, 761,
- 764, 766, 772, 773, 774, 775, 776, 777, 780, 781,
- 782, 785, 786, 789, 790, 791, 792, 793, 796, 797,
- 800, 801, 802, 803, 804, 807, 808, 809, 812, 815,
- 817, 818, 819, 822, 825, 829, 830, 833, 834, 835,
- 837, 838, 839, 840, 841, 843, 845, 847, 850, 851,
- 852, 856, 858, 863, 864, 867, 868, 871, 874, 875,
- 876, 877, 880, 881, 882, 883, 884, 887, 889, 891,
- 892, 894, 896, 898, 900, 904, 907, 908, 909, 910,
- 911, 912, 913, 914, 915, 916, 917, 918, 919, 920,
- 921, 922, 923, 925, 926, 927, 928, 929, 930, 931,
- 932, 933, 935, 936, 937, 938, 939, 940, 942, 944,
- 945, 948, 949, 950, 951, 952, 953, 954, 955, 958,
- 959, 960, 963, 964, 965, 966, 967, 968, 969, 972,
- 973, 974, 975, 976, 977, 980, 981, 984, 985, 986,
- 989, 990, 993, 996, 997, 999, 1003, 1004, 1005, 1008,
- 1012, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, 1022,
- 1023, 1026, 1027, 1028, 1031, 1032, 1035, 1036, 1039, 1042,
- 1048, 1050, 1052, 1056, 1058, 1061, 1064, 1065, 1068, 1071,
- 1072, 1077, 1080, 1083, 1088, 1089, 1090, 1094, 1095, 1096,
- 1097, 1098, 1101, 1102, 1103, 1106, 1107, 1110, 1111, 1112,
- 1113, 1115, 1116, 1117, 1118, 1119, 1120, 1123, 1124, 1127,
- 1128, 1129, 1132, 1133, 1136, 1138, 1141, 1145, 1146, 1149,
- 1150, 1153, 1154, 1155, 1158, 1161, 1162, 1163, 1166, 1169,
- 1170, 1173, 1174, 1175, 1176, 1179, 1180, 1183, 1184, 1185,
- 1188, 1189, 1192, 1195, 1198, 1201, 1202, 1205, 1206, 1207,
- 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1217,
- 1218, 1219, 1220, 1223, 1226, 1227, 1230, 1231, 1232, 1233,
- 1236, 1237, 1238, 1239, 1242, 1243, 1244, 1245, 1246, 1249,
- 1250, 1251, 1252, 1253, 1254, 1256, 1257, 1262, 1263, 1266,
- 1268, 1270, 1273, 1274, 1275, 1276, 1279, 1281, 1283, 1285,
- 1287, 1289, 1292, 1294, 1296, 1298, 1301, 1302, 1303, 1304,
- 1305, 1306, 1308, 1309, 1310, 1313, 1315, 1317, 1319, 1322,
- 1325, 1328, 1331, 1334, 1336, 1338, 1341, 1342, 1343, 1344,
- 1347, 1349, 1351, 1353, 1355, 1357, 1359, 1361, 1363, 1365,
- 1367, 1371, 1373, 1375, 1377, 1379, 1381, 1384, 1386, 1388,
- 1392, 1393, 1394, 1395, 1396, 1399, 1402, 1405, 1408, 1411,
- 1414, 1418, 1421, 1424, 1429, 1432, 1435, 1438, 1441, 1444,
- 1447, 1451, 1455, 1458, 1461, 1466, 1469, 1472, 1475, 1478,
- 1481, 1485, 1488, 1491, 1496, 1499, 1502, 1505, 1508, 1511,
- 1514, 1518, 1522, 1525, 1528, 1533, 1535, 1537, 1539, 1541,
- 1543, 1546, 1548, 1550, 1553, 1554, 1557, 1558, 1559, 1560,
- 1562, 1564, 1566, 1569, 1572, 1573, 1574, 1578, 1579, 1580,
- 1581, 1583, 1585, 1588, 1589, 1590, 1594, 1595, 1598, 1599,
- 1600, 1603, 1610, 1611, 1612, 1613, 1614, 1615, 1616, 1619,
- 1620, 1621, 1622, 1624, 1626, 1627, 1627, 1628, 1629, 1630,
- 1631, 1632, 1634, 1635, 1637, 1640, 1642, 1644, 1647, 1648,
- 1649, 1652, 1654, 1657, 1660, 1663, 1667, 1670, 1672, 1675,
- 1678, 1682, 1687, 1692, 1694, 1696, 1698, 1699, 1701, 1703,
- 1705, 1707, 1709, 1710, 1712, 1714, 1718, 1723, 1725, 1727,
- 1729, 1731, 1733, 1735, 1737, 1739, 1741, 1744, 1745, 1747,
- 1749, 1750, 1752, 1754, 1755, 1756, 1758, 1759, 1760, 1762,
- 1763, 1765, 1768, 1772, 1776, 1779, 1782, 1786, 1791, 1797,
- 1798, 1799, 1801, 1802, 1804, 1808, 1810, 1811, 1812, 1814,
- 1817, 1819, 1822, 1824, 1826, 1829, 1834, 1837, 1838, 1841,
- 1844, 1848, 1849, 1851, 1852, 1853, 1855, 1856, 1858, 1859,
- 1861, 1866, 1868, 1869, 1871, 1872, 1873, 1874, 1875, 1876,
- 1878, 1880, 1882, 1883, 1886, 1887, 1889, 1891, 1892, 1893,
- 1894, 1895, 1896, 1897, 1898, 1899, 1900, 1901, 1903, 1905,
- 1907, 1908, 1909, 1910, 1912, 1913, 1914, 1915, 1916, 1918,
- 1919, 1921, 1922, 1923, 1924, 1927, 1928, 1929, 1930, 1931,
- 1932, 1933, 1934, 1935, 1936, 1937, 1938, 1939, 1940, 1941,
- 1942, 1943, 1944, 1945, 1946, 1947, 1950, 1951, 1952, 1953,
- 1954, 1955, 1962, 1969, 1978, 1987, 1994, 2002, 2010, 2017,
- 2022, 2027, 2032, 2037, 2042, 2047, 2053, 2062, 2072, 2082,
- 2089, 2099, 2109, 2118, 2130, 2143, 2148, 2151, 2153, 2155,
- 2160, 2164, 2167, 2169, 2171, 2174, 2175, 2176, 2177, 2178,
- 2179, 2180, 2183, 2184, 2185, 2186, 2187, 2189, 2191, 2193,
- 2194, 2196, 2197, 2198, 2199, 2201, 2203, 2206, 2208, 2210,
- 2212, 2214, 2215, 2216, 2218, 2220, 2223, 2225, 2228, 2230,
- 2232, 2233, 2234, 2235, 2237, 2239, 2240, 2241, 2242, 2243,
- 2245, 2247, 2249, 2251, 2253, 2255, 2258, 2259, 2260, 2262,
- 2264, 2266, 2267, 2268, 2269, 2271, 2273, 2276, 2280, 2281,
- 2282, 2284, 2287, 2290, 2292, 2294, 2295, 2296, 2298, 2300,
- 2303, 2304, 2306, 2307, 2308, 2309, 2310, 2312, 2313, 2315,
- 2317, 2320, 2321, 2322, 2323, 2324, 2326, 2327, 2328, 2329,
- 2331, 2333, 2334, 2335, 2336, 2337, 2338, 2340, 2341, 2343,
- 2346, 2347, 2348, 2349, 2352, 2353, 2356, 2357, 2360, 2361,
- 2364, 2377, 2378, 2379, 2380, 2383, 2388, 2395, 2397, 2400,
- 2402, 2405, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2417,
- 2421, 2422, 2425, 2426, 2427, 2428, 2429, 2430, 2431, 2432,
- 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2442, 2443, 2444,
- 2445, 2448, 2449, 2452, 2453, 2453, 2456, 2457, 2458, 2459,
- 2462, 2463, 2466, 2467, 2470, 2474, 2475, 2475, 2478, 2479,
- 2482, 2485, 2489, 2490, 2491, 2492, 2495, 2496, 2497, 2498,
- 2501, 2503, 2504, 2509, 2511, 2512, 2513, 2514, 2517, 2518,
- 2523, 2527, 2528, 2529, 2532, 2533, 2535, 2536, 2539, 2541,
- 2542, 2543, 2546, 2547, 2548, 2549, 2552, 2553, 2556, 2558,
- 2560, 2561, 2564, 2566, 2567, 2568, 2571, 2572, 2575, 2576,
- 2577, 2580, 2581, 2582, 2583, 2584, 2587, 2588, 2589, 2592,
- 2593, 2594, 2597, 2599, 2601, 2605, 2606, 2607, 2610, 2611,
- 2612, 2615, 2616, 2617, 2620, 2622, 2624, 2628, 2629, 2632,
- 2633, 2634, 2637, 2638, 2640, 2641, 2643, 2646, 2647, 2650,
- 2651, 2654, 2656, 2657, 2658, 2659, 2662, 2663, 2664, 2667,
- 2668, 2669, 2672, 2673, 2678, 2682, 2689, 2690, 2692, 2697,
- 2700, 2703, 2704, 2705, 2706, 2708, 2713
+ 612, 613, 614, 615, 616, 617, 618, 621, 622, 625,
+ 626, 627, 628, 629, 630, 631, 632, 635, 636, 637,
+ 638, 639, 640, 641, 642, 643, 644, 645, 648, 649,
+ 650, 653, 654, 655, 656, 659, 660, 661, 662, 663,
+ 666, 667, 668, 671, 672, 673, 676, 677, 678, 681,
+ 682, 683, 686, 687, 688, 689, 690, 691, 692, 693,
+ 696, 697, 700, 701, 702, 705, 706, 707, 710, 711,
+ 712, 715, 716, 717, 718, 722, 723, 726, 727, 731,
+ 732, 733, 734, 735, 736, 737, 738, 741, 742, 745,
+ 746, 747, 749, 751, 752, 753, 755, 759, 760, 763,
+ 764, 766, 769, 771, 777, 778, 779, 780, 781, 782,
+ 785, 786, 787, 790, 791, 794, 795, 796, 797, 798,
+ 801, 802, 805, 806, 807, 808, 809, 812, 813, 814,
+ 817, 820, 822, 823, 824, 827, 830, 834, 835, 838,
+ 839, 840, 842, 843, 844, 845, 846, 848, 850, 852,
+ 855, 856, 857, 861, 863, 868, 869, 872, 873, 876,
+ 879, 880, 881, 882, 885, 886, 887, 888, 889, 892,
+ 894, 896, 897, 899, 901, 903, 905, 909, 912, 913,
+ 914, 915, 916, 917, 918, 919, 920, 921, 922, 923,
+ 924, 925, 926, 927, 928, 930, 931, 932, 933, 934,
+ 935, 936, 937, 938, 940, 941, 942, 943, 944, 945,
+ 946, 948, 950, 951, 954, 955, 956, 957, 958, 959,
+ 960, 961, 964, 965, 966, 969, 970, 971, 972, 973,
+ 974, 975, 978, 979, 980, 981, 982, 983, 986, 987,
+ 990, 991, 992, 995, 996, 999, 1002, 1003, 1005, 1009,
+ 1010, 1011, 1014, 1018, 1020, 1021, 1022, 1023, 1024, 1025,
+ 1026, 1027, 1028, 1029, 1032, 1033, 1034, 1037, 1038, 1041,
+ 1042, 1045, 1048, 1054, 1056, 1058, 1062, 1064, 1067, 1070,
+ 1071, 1074, 1077, 1078, 1083, 1086, 1089, 1094, 1095, 1096,
+ 1100, 1101, 1102, 1103, 1104, 1107, 1108, 1109, 1112, 1113,
+ 1116, 1117, 1118, 1119, 1121, 1122, 1123, 1124, 1125, 1126,
+ 1129, 1130, 1133, 1134, 1135, 1138, 1139, 1142, 1144, 1147,
+ 1151, 1152, 1155, 1156, 1159, 1160, 1161, 1164, 1167, 1168,
+ 1169, 1172, 1175, 1176, 1179, 1180, 1181, 1184, 1185, 1188,
+ 1189, 1192, 1193, 1194, 1197, 1198, 1201, 1204, 1207, 1210,
+ 1211, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1222,
+ 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1232, 1235, 1236,
+ 1239, 1240, 1241, 1242, 1245, 1246, 1247, 1248, 1251, 1252,
+ 1253, 1254, 1255, 1258, 1259, 1260, 1261, 1262, 1263, 1265,
+ 1266, 1271, 1272, 1275, 1277, 1279, 1282, 1283, 1284, 1285,
+ 1288, 1290, 1292, 1294, 1296, 1298, 1301, 1303, 1305, 1307,
+ 1310, 1311, 1312, 1313, 1314, 1315, 1317, 1318, 1319, 1322,
+ 1324, 1326, 1328, 1331, 1334, 1337, 1340, 1343, 1345, 1347,
+ 1350, 1351, 1352, 1353, 1356, 1358, 1360, 1362, 1364, 1366,
+ 1368, 1370, 1372, 1374, 1376, 1380, 1382, 1384, 1386, 1388,
+ 1390, 1393, 1395, 1397, 1401, 1402, 1403, 1404, 1405, 1408,
+ 1411, 1414, 1417, 1420, 1423, 1427, 1430, 1433, 1438, 1441,
+ 1444, 1447, 1450, 1453, 1456, 1460, 1464, 1467, 1470, 1475,
+ 1478, 1481, 1484, 1487, 1490, 1494, 1497, 1500, 1505, 1508,
+ 1511, 1514, 1517, 1520, 1523, 1527, 1531, 1534, 1537, 1542,
+ 1544, 1546, 1548, 1550, 1552, 1555, 1557, 1559, 1562, 1563,
+ 1566, 1567, 1568, 1569, 1571, 1573, 1575, 1578, 1581, 1582,
+ 1583, 1587, 1588, 1589, 1590, 1592, 1594, 1597, 1598, 1599,
+ 1603, 1604, 1607, 1608, 1609, 1612, 1619, 1620, 1621, 1622,
+ 1623, 1624, 1625, 1628, 1629, 1630, 1631, 1633, 1635, 1636,
+ 1636, 1637, 1638, 1639, 1640, 1641, 1643, 1644, 1646, 1649,
+ 1651, 1653, 1656, 1657, 1658, 1661, 1663, 1666, 1669, 1672,
+ 1676, 1679, 1681, 1684, 1687, 1691, 1696, 1701, 1703, 1705,
+ 1707, 1708, 1710, 1712, 1714, 1716, 1718, 1719, 1721, 1723,
+ 1727, 1732, 1734, 1736, 1738, 1740, 1742, 1744, 1746, 1748,
+ 1750, 1753, 1754, 1756, 1758, 1759, 1761, 1763, 1764, 1765,
+ 1767, 1768, 1769, 1771, 1772, 1774, 1777, 1781, 1785, 1788,
+ 1791, 1795, 1800, 1806, 1807, 1808, 1810, 1811, 1813, 1817,
+ 1819, 1820, 1821, 1823, 1826, 1828, 1831, 1833, 1835, 1838,
+ 1843, 1846, 1847, 1850, 1853, 1857, 1858, 1860, 1861, 1862,
+ 1864, 1865, 1867, 1868, 1870, 1875, 1877, 1878, 1880, 1881,
+ 1882, 1883, 1884, 1885, 1887, 1889, 1891, 1892, 1895, 1896,
+ 1898, 1900, 1901, 1902, 1903, 1904, 1905, 1906, 1907, 1908,
+ 1909, 1910, 1912, 1914, 1916, 1917, 1918, 1919, 1921, 1922,
+ 1923, 1924, 1925, 1927, 1928, 1930, 1931, 1932, 1933, 1936,
+ 1937, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946,
+ 1947, 1948, 1949, 1950, 1951, 1952, 1953, 1954, 1955, 1956,
+ 1959, 1960, 1961, 1962, 1963, 1964, 1971, 1978, 1987, 1996,
+ 2003, 2011, 2019, 2026, 2031, 2036, 2041, 2046, 2051, 2056,
+ 2062, 2071, 2081, 2091, 2098, 2108, 2118, 2127, 2139, 2152,
+ 2157, 2160, 2162, 2164, 2169, 2173, 2176, 2178, 2180, 2183,
+ 2184, 2185, 2186, 2187, 2188, 2189, 2192, 2193, 2194, 2195,
+ 2196, 2198, 2200, 2202, 2203, 2205, 2206, 2207, 2208, 2210,
+ 2212, 2215, 2217, 2219, 2221, 2223, 2224, 2225, 2227, 2229,
+ 2232, 2234, 2237, 2239, 2241, 2242, 2243, 2244, 2246, 2248,
+ 2249, 2250, 2251, 2252, 2254, 2256, 2258, 2260, 2262, 2264,
+ 2267, 2268, 2269, 2271, 2273, 2275, 2276, 2277, 2278, 2280,
+ 2282, 2285, 2289, 2290, 2291, 2293, 2296, 2299, 2301, 2303,
+ 2304, 2305, 2307, 2309, 2312, 2313, 2315, 2316, 2317, 2318,
+ 2319, 2321, 2322, 2324, 2326, 2329, 2330, 2331, 2332, 2333,
+ 2335, 2336, 2337, 2338, 2340, 2342, 2343, 2344, 2345, 2346,
+ 2347, 2349, 2350, 2352, 2355, 2356, 2357, 2358, 2361, 2362,
+ 2365, 2366, 2369, 2370, 2373, 2386, 2387, 2388, 2389, 2392,
+ 2397, 2404, 2406, 2409, 2411, 2414, 2418, 2419, 2420, 2421,
+ 2422, 2423, 2424, 2426, 2430, 2431, 2434, 2435, 2436, 2437,
+ 2438, 2439, 2440, 2441, 2444, 2445, 2446, 2447, 2448, 2449,
+ 2450, 2451, 2452, 2453, 2454, 2457, 2458, 2461, 2462, 2462,
+ 2465, 2466, 2467, 2468, 2471, 2472, 2475, 2476, 2479, 2483,
+ 2484, 2484, 2487, 2488, 2491, 2494, 2498, 2499, 2500, 2501,
+ 2504, 2505, 2506, 2507, 2510, 2512, 2513, 2518, 2520, 2521,
+ 2522, 2523, 2526, 2527, 2532, 2536, 2537, 2538, 2541, 2542,
+ 2544, 2545, 2548, 2550, 2551, 2552, 2555, 2556, 2557, 2558,
+ 2561, 2562, 2565, 2567, 2569, 2570, 2573, 2575, 2576, 2577,
+ 2580, 2581, 2584, 2585, 2586, 2589, 2590, 2591, 2592, 2593,
+ 2596, 2597, 2598, 2601, 2602, 2603, 2606, 2608, 2610, 2614,
+ 2615, 2616, 2619, 2620, 2621, 2624, 2625, 2626, 2629, 2631,
+ 2633, 2637, 2638, 2641, 2642, 2643, 2646, 2647, 2649, 2650,
+ 2652, 2655, 2656, 2659, 2660, 2663, 2665, 2666, 2667, 2668,
+ 2671, 2672, 2673, 2676, 2677, 2678, 2681, 2682, 2687, 2691,
+ 2698, 2699, 2701, 2706, 2709, 2712, 2713, 2714, 2715, 2717,
+ 2722
};
#endif
@@ -1873,23 +1877,23 @@ static const char *const yytname[] =
"wcsSystem", "internalSystem", "scaleType", "skyFrame", "skyFormat",
"skyDist", "contourClipMode", "shmType", "incrLoad", "layerType",
"compressType", "pointShape", "pointSize", "analysisMethod",
- "analysisParam", "endian", "threed", "threedHighlite", "bin", "binAbout",
- "binFactor", "binFunction", "binTo", "clip", "clipUser", "clipScope",
- "clipMode", "clipMinMax", "clipMinMaxMode", "clipZScale", "colormap",
- "colormapMotion", "colorscale", "contour", "contourAux", "contourCreate",
- "contourmethod", "crop", "crop3d", "crosshair", "fitsy", "get", "getBin",
- "getBinCols", "getClip", "getClipLimits", "getClipMinMax",
- "getClipZScale", "getColorbar", "getColorMap", "getColorMapLevel",
- "getColorScale", "getColorScaleLevel", "getContour", "getContourAux",
- "getContourClip", "getContourColorScale", "getCoord", "getCrop",
- "getCrosshair", "getCursor", "getData", "getInfo", "getiis",
- "getIISFileName", "getFits", "getFitsHeader", "getFitsDepth",
+ "analysisParam", "endian", "threed", "threedHighlite", "threedView",
+ "bin", "binAbout", "binFactor", "binFunction", "binTo", "clip",
+ "clipUser", "clipScope", "clipMode", "clipMinMax", "clipMinMaxMode",
+ "clipZScale", "colormap", "colormapMotion", "colorscale", "contour",
+ "contourAux", "contourCreate", "contourmethod", "crop", "crop3d",
+ "crosshair", "fitsy", "get", "getBin", "getBinCols", "getClip",
+ "getClipLimits", "getClipMinMax", "getClipZScale", "getColorbar",
+ "getColorMap", "getColorMapLevel", "getColorScale", "getColorScaleLevel",
+ "getContour", "getContourAux", "getContourClip", "getContourColorScale",
+ "getCoord", "getCrop", "getCrosshair", "getCursor", "getData", "getInfo",
+ "getiis", "getIISFileName", "getFits", "getFitsHeader", "getFitsDepth",
"getFitsFileName", "getFitsSlice", "getGrid", "getMask", "getPan",
"getRGB", "getRotate", "getSmooth", "getThreed", "getThreedHighlite",
- "getWCS", "getWCSAlign", "getZoom", "grid", "gridType", "has", "hasBin",
- "hasContour", "hasFits", "hasMarker", "hasWCS", "iis", "iisSetFileName",
- "iiscursor", "load", "loadArr", "loadArrRGBCube", "loadFits",
- "loadFitsSlice", "loadFitsExtCube", "loadFitsMosaic",
+ "getThreedView", "getWCS", "getWCSAlign", "getZoom", "grid", "gridType",
+ "has", "hasBin", "hasContour", "hasFits", "hasMarker", "hasWCS", "iis",
+ "iisSetFileName", "iiscursor", "load", "loadArr", "loadArrRGBCube",
+ "loadFits", "loadFitsSlice", "loadFitsExtCube", "loadFitsMosaic",
"loadFitsMosaicImageIRAF", "loadFitsMosaicIRAF",
"loadFitsMosaicImageWCS", "loadFitsMosaicWCS",
"loadFitsMosaicImageWFPC2", "loadFitsRGB", "loadFitsRGBCube",
@@ -1960,119 +1964,120 @@ static const yytype_uint16 yyr1[] =
337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
337, 337, 337, 337, 337, 337, 337, 337, 337, 337,
- 337, 337, 337, 337, 337, 337, 337, 338, 338, 339,
+ 337, 337, 337, 337, 337, 337, 337, 337, 338, 338,
339, 339, 339, 339, 339, 339, 339, 339, 339, 339,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 341,
- 341, 341, 341, 341, 342, 342, 342, 342, 342, 342,
- 342, 343, 343, 344, 344, 344, 345, 346, 347, 348,
- 348, 348, 348, 349, 349, 349, 349, 349, 350, 350,
+ 339, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ 341, 341, 341, 341, 341, 342, 342, 342, 342, 342,
+ 342, 342, 343, 343, 344, 344, 344, 345, 346, 347,
+ 348, 348, 348, 348, 349, 349, 349, 349, 349, 350,
350, 350, 350, 350, 350, 350, 350, 350, 350, 350,
350, 350, 350, 350, 350, 350, 350, 350, 350, 350,
- 350, 350, 350, 350, 350, 350, 351, 351, 352, 352,
- 352, 352, 352, 352, 352, 352, 353, 353, 353, 353,
- 353, 353, 353, 353, 353, 353, 353, 354, 354, 354,
- 355, 355, 355, 355, 356, 356, 356, 356, 356, 357,
- 357, 357, 358, 358, 358, 359, 359, 359, 360, 360,
- 360, 361, 361, 361, 361, 361, 361, 361, 361, 362,
- 362, 363, 363, 363, 364, 364, 364, 365, 365, 365,
- 366, 366, 366, 366, 366, 367, 367, 368, 368, 368,
- 368, 368, 368, 368, 368, 369, 369, 370, 370, 370,
- 370, 370, 370, 370, 370, 371, 371, 372, 372, 372,
- 372, 372, 373, 373, 373, 373, 373, 373, 374, 374,
- 374, 375, 375, 376, 376, 376, 376, 376, 377, 377,
- 378, 378, 378, 378, 378, 379, 379, 379, 380, 380,
- 380, 380, 380, 381, 381, 382, 382, 383, 383, 383,
- 383, 383, 383, 383, 383, 383, 383, 383, 384, 384,
- 384, 385, 385, 386, 386, 387, 387, 387, 387, 387,
- 387, 387, 388, 388, 388, 388, 388, 389, 389, 389,
- 389, 389, 389, 389, 389, 390, 391, 391, 391, 391,
- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
- 391, 391, 391, 391, 391, 391, 391, 391, 391, 391,
- 391, 392, 392, 392, 392, 392, 392, 392, 392, 393,
- 393, 393, 394, 394, 394, 394, 394, 394, 394, 395,
- 395, 395, 395, 395, 395, 396, 396, 397, 397, 397,
- 398, 398, 399, 400, 400, 400, 401, 401, 401, 402,
- 403, 403, 403, 403, 403, 403, 403, 403, 403, 403,
- 403, 404, 404, 404, 405, 405, 406, 406, 407, 407,
- 407, 407, 407, 408, 408, 408, 409, 409, 409, 410,
- 410, 411, 411, 411, 412, 412, 412, 413, 413, 413,
- 413, 413, 414, 414, 414, 415, 415, 415, 415, 415,
- 415, 415, 415, 415, 415, 415, 415, 415, 415, 416,
- 416, 416, 417, 417, 418, 418, 418, 419, 419, 420,
- 420, 421, 421, 421, 422, 423, 423, 423, 424, 425,
- 425, 426, 426, 426, 426, 427, 427, 428, 428, 428,
- 429, 429, 430, 431, 431, 432, 432, 433, 433, 433,
- 433, 433, 433, 433, 433, 433, 433, 433, 433, 433,
- 433, 433, 433, 434, 435, 435, 436, 436, 436, 436,
- 437, 437, 437, 437, 438, 438, 438, 438, 438, 439,
- 439, 439, 439, 439, 439, 439, 439, 440, 440, 441,
- 441, 441, 442, 442, 442, 442, 443, 443, 443, 443,
- 443, 443, 443, 443, 443, 443, 444, 444, 444, 444,
- 444, 444, 444, 444, 444, 445, 445, 445, 445, 445,
+ 350, 350, 350, 350, 350, 350, 350, 351, 351, 352,
+ 352, 352, 352, 352, 352, 352, 352, 353, 353, 353,
+ 353, 353, 353, 353, 353, 353, 353, 353, 354, 354,
+ 354, 355, 355, 355, 355, 356, 356, 356, 356, 356,
+ 357, 357, 357, 358, 358, 358, 359, 359, 359, 360,
+ 360, 360, 361, 361, 361, 361, 361, 361, 361, 361,
+ 362, 362, 363, 363, 363, 364, 364, 364, 365, 365,
+ 365, 366, 366, 366, 366, 367, 367, 368, 368, 369,
+ 369, 369, 369, 369, 369, 369, 369, 370, 370, 371,
+ 371, 371, 371, 371, 371, 371, 371, 372, 372, 373,
+ 373, 373, 373, 373, 374, 374, 374, 374, 374, 374,
+ 375, 375, 375, 376, 376, 377, 377, 377, 377, 377,
+ 378, 378, 379, 379, 379, 379, 379, 380, 380, 380,
+ 381, 381, 381, 381, 381, 382, 382, 383, 383, 384,
+ 384, 384, 384, 384, 384, 384, 384, 384, 384, 384,
+ 385, 385, 385, 386, 386, 387, 387, 388, 388, 388,
+ 388, 388, 388, 388, 389, 389, 389, 389, 389, 390,
+ 390, 390, 390, 390, 390, 390, 390, 391, 392, 392,
+ 392, 392, 392, 392, 392, 392, 392, 392, 392, 392,
+ 392, 392, 392, 392, 392, 392, 392, 392, 392, 392,
+ 392, 392, 392, 392, 392, 392, 392, 392, 392, 392,
+ 392, 392, 392, 392, 393, 393, 393, 393, 393, 393,
+ 393, 393, 394, 394, 394, 395, 395, 395, 395, 395,
+ 395, 395, 396, 396, 396, 396, 396, 396, 397, 397,
+ 398, 398, 398, 399, 399, 400, 401, 401, 401, 402,
+ 402, 402, 403, 404, 404, 404, 404, 404, 404, 404,
+ 404, 404, 404, 404, 405, 405, 405, 406, 406, 407,
+ 407, 408, 408, 408, 408, 408, 409, 409, 409, 410,
+ 410, 410, 411, 411, 412, 412, 412, 413, 413, 413,
+ 414, 414, 414, 414, 414, 415, 415, 415, 416, 416,
+ 416, 416, 416, 416, 416, 416, 416, 416, 416, 416,
+ 416, 416, 417, 417, 417, 418, 418, 419, 419, 419,
+ 420, 420, 421, 421, 422, 422, 422, 423, 424, 424,
+ 424, 425, 426, 426, 427, 427, 427, 428, 428, 429,
+ 429, 430, 430, 430, 431, 431, 432, 433, 433, 434,
+ 434, 435, 435, 435, 435, 435, 435, 435, 435, 435,
+ 435, 435, 435, 435, 435, 435, 435, 436, 437, 437,
+ 438, 438, 438, 438, 439, 439, 439, 439, 440, 440,
+ 440, 440, 440, 441, 441, 441, 441, 441, 441, 441,
+ 441, 442, 442, 443, 443, 443, 444, 444, 444, 444,
445, 445, 445, 445, 445, 445, 445, 445, 445, 445,
- 446, 446, 446, 446, 446, 446, 446, 446, 446, 446,
- 446, 447, 447, 447, 447, 447, 447, 447, 447, 447,
+ 446, 446, 446, 446, 446, 446, 446, 446, 446, 447,
+ 447, 447, 447, 447, 447, 447, 447, 447, 447, 447,
+ 447, 447, 447, 447, 448, 448, 448, 448, 448, 448,
448, 448, 448, 448, 448, 449, 449, 449, 449, 449,
- 449, 449, 449, 449, 450, 450, 450, 450, 450, 450,
- 450, 450, 450, 450, 450, 451, 451, 451, 451, 451,
- 451, 451, 451, 451, 452, 452, 452, 452, 452, 452,
- 452, 452, 452, 452, 452, 453, 453, 453, 453, 453,
- 453, 453, 453, 453, 454, 454, 455, 455, 455, 455,
- 455, 455, 455, 455, 455, 455, 455, 456, 456, 456,
- 456, 456, 456, 456, 456, 456, 457, 457, 458, 458,
- 458, 459, 460, 460, 460, 460, 460, 460, 460, 461,
- 461, 461, 461, 461, 461, 462, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 461, 461, 461, 461, 461,
- 461, 461, 461, 461, 461, 463, 463, 463, 463, 463,
+ 449, 449, 449, 449, 450, 450, 450, 450, 450, 451,
+ 451, 451, 451, 451, 451, 451, 451, 451, 452, 452,
+ 452, 452, 452, 452, 452, 452, 452, 452, 452, 453,
+ 453, 453, 453, 453, 453, 453, 453, 453, 454, 454,
+ 454, 454, 454, 454, 454, 454, 454, 454, 454, 455,
+ 455, 455, 455, 455, 455, 455, 455, 455, 456, 456,
+ 457, 457, 457, 457, 457, 457, 457, 457, 457, 457,
+ 457, 458, 458, 458, 458, 458, 458, 458, 458, 458,
+ 459, 459, 460, 460, 460, 461, 462, 462, 462, 462,
+ 462, 462, 462, 463, 463, 463, 463, 463, 463, 464,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
- 463, 463, 463, 463, 463, 463, 464, 464, 464, 464,
- 464, 464, 465, 465, 465, 465, 465, 465, 465, 465,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 463,
+ 463, 463, 463, 463, 463, 463, 463, 463, 463, 465,
465, 465, 465, 465, 465, 465, 465, 465, 465, 465,
- 465, 465, 465, 465, 465, 465, 465, 466, 466, 466,
- 466, 467, 468, 468, 468, 469, 469, 469, 469, 469,
- 469, 469, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 470, 470, 470, 470, 470, 470, 470, 470, 470, 470,
- 471, 471, 471, 471, 472, 472, 473, 473, 474, 474,
- 475, 476, 476, 476, 476, 477, 477, 478, 478, 478,
- 478, 478, 479, 479, 479, 479, 479, 479, 479, 479,
- 480, 480, 481, 481, 481, 481, 481, 481, 481, 481,
- 482, 482, 482, 482, 482, 482, 482, 482, 482, 482,
- 482, 483, 483, 484, 485, 484, 486, 486, 486, 486,
- 487, 487, 488, 488, 489, 490, 491, 490, 492, 492,
- 493, 494, 495, 495, 495, 495, 496, 496, 496, 496,
- 497, 497, 497, 497, 497, 497, 497, 497, 498, 498,
- 498, 499, 499, 499, 500, 500, 500, 500, 501, 501,
- 501, 501, 502, 502, 502, 502, 503, 503, 504, 504,
- 504, 504, 505, 505, 505, 505, 506, 506, 507, 507,
- 507, 508, 508, 508, 508, 508, 509, 509, 509, 510,
- 510, 510, 511, 511, 511, 512, 512, 512, 513, 513,
- 513, 514, 514, 514, 515, 515, 515, 516, 516, 517,
- 517, 517, 518, 518, 518, 518, 518, 519, 519, 520,
- 520, 521, 521, 521, 521, 521, 522, 522, 522, 523,
- 523, 523, 524, 524, 524, 525, 526, 526, 526, 526,
- 526, 527, 527, 527, 527, 527, 527
+ 465, 465, 465, 465, 465, 465, 465, 465, 465, 465,
+ 466, 466, 466, 466, 466, 466, 467, 467, 467, 467,
+ 467, 467, 467, 467, 467, 467, 467, 467, 467, 467,
+ 467, 467, 467, 467, 467, 467, 467, 467, 467, 467,
+ 467, 468, 468, 468, 468, 469, 470, 470, 470, 471,
+ 471, 471, 471, 471, 471, 471, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 472, 472, 472, 472, 472, 472,
+ 472, 472, 472, 472, 473, 473, 473, 473, 474, 474,
+ 475, 475, 476, 476, 477, 478, 478, 478, 478, 479,
+ 479, 480, 480, 480, 480, 480, 481, 481, 481, 481,
+ 481, 481, 481, 481, 482, 482, 483, 483, 483, 483,
+ 483, 483, 483, 483, 484, 484, 484, 484, 484, 484,
+ 484, 484, 484, 484, 484, 485, 485, 486, 487, 486,
+ 488, 488, 488, 488, 489, 489, 490, 490, 491, 492,
+ 493, 492, 494, 494, 495, 496, 497, 497, 497, 497,
+ 498, 498, 498, 498, 499, 499, 499, 499, 499, 499,
+ 499, 499, 500, 500, 500, 501, 501, 501, 502, 502,
+ 502, 502, 503, 503, 503, 503, 504, 504, 504, 504,
+ 505, 505, 506, 506, 506, 506, 507, 507, 507, 507,
+ 508, 508, 509, 509, 509, 510, 510, 510, 510, 510,
+ 511, 511, 511, 512, 512, 512, 513, 513, 513, 514,
+ 514, 514, 515, 515, 515, 516, 516, 516, 517, 517,
+ 517, 518, 518, 519, 519, 519, 520, 520, 520, 520,
+ 520, 521, 521, 522, 522, 523, 523, 523, 523, 523,
+ 524, 524, 524, 525, 525, 525, 526, 526, 526, 527,
+ 528, 528, 528, 528, 528, 529, 529, 529, 529, 529,
+ 529
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -2082,119 +2087,120 @@ static const yytype_uint8 yyr2[] =
2, 2, 2, 2, 2, 2, 2, 2, 2, 1,
2, 2, 2, 2, 2, 3, 2, 3, 2, 2,
2, 2, 1, 3, 2, 2, 2, 1, 2, 2,
- 1, 2, 1, 2, 2, 2, 2, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 0, 2, 2, 1, 1, 2,
- 2, 0, 1, 1, 1, 1, 1, 1, 1, 2,
- 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 2, 1, 2, 1, 2, 2, 2, 2, 1, 1,
+ 1, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 2, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 1, 1, 1, 0, 2, 2, 1, 1,
+ 2, 2, 0, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 2, 2, 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, 1, 1, 1, 0, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 0, 1, 1, 0, 1, 1, 0, 1,
- 1, 0, 1, 1, 1, 1, 1, 1, 1, 0,
- 1, 1, 1, 1, 0, 1, 1, 0, 1, 1,
- 3, 2, 2, 2, 2, 1, 2, 2, 4, 2,
- 2, 2, 3, 2, 2, 1, 2, 1, 2, 4,
- 5, 2, 3, 5, 6, 1, 1, 1, 7, 11,
- 8, 12, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 1, 1, 1, 1, 1, 1, 1, 2, 2,
- 1, 1, 1, 1, 1, 2, 2, 2, 7, 10,
- 1, 2, 1, 7, 10, 1, 2, 2, 2, 3,
- 2, 2, 1, 2, 7, 7, 4, 2, 1, 1,
- 4, 12, 2, 1, 1, 0, 6, 8, 2, 3,
- 3, 3, 0, 3, 4, 4, 4, 3, 3, 1,
- 3, 5, 4, 4, 3, 3, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 1, 2,
- 2, 3, 7, 2, 2, 1, 3, 2, 2, 1,
- 2, 8, 2, 2, 2, 2, 1, 4, 7, 2,
- 2, 1, 1, 1, 2, 1, 1, 2, 1, 0,
- 2, 2, 1, 1, 1, 2, 2, 2, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 0, 1, 2, 1, 4, 5, 0, 2, 1, 5,
- 2, 2, 2, 1, 1, 1, 2, 1, 2, 1,
- 1, 1, 1, 1, 0, 1, 0, 1, 5, 6,
- 3, 4, 4, 3, 6, 2, 1, 4, 1, 1,
- 4, 6, 7, 5, 1, 1, 4, 5, 1, 1,
- 1, 3, 0, 1, 2, 1, 5, 1, 2, 1,
- 4, 3, 2, 1, 2, 1, 5, 2, 1, 1,
- 3, 2, 0, 1, 1, 4, 2, 0, 1, 0,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 1, 1, 2, 1, 1, 0, 1, 0, 2, 2,
- 0, 1, 1, 6, 1, 1, 1, 1, 2, 2,
- 1, 1, 1, 1, 2, 1, 1, 1, 2, 1,
- 1, 2, 2, 2, 0, 1, 0, 1, 1, 1,
- 1, 1, 1, 1, 1, 2, 2, 1, 2, 3,
- 1, 2, 2, 4, 6, 1, 10, 1, 2, 3,
- 3, 2, 2, 2, 2, 2, 4, 4, 4, 3,
- 3, 5, 4, 4, 4, 3, 3, 3, 3, 2,
- 2, 4, 3, 3, 3, 4, 4, 4, 4, 5,
- 4, 6, 7, 4, 4, 5, 2, 3, 2, 2,
+ 1, 1, 1, 1, 1, 1, 1, 1, 0, 1,
+ 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 1, 0, 1, 1, 0, 1, 1, 0,
+ 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 0, 1, 1, 1, 1, 0, 1, 1, 0, 1,
+ 1, 2, 2, 2, 2, 1, 2, 2, 6, 2,
+ 4, 2, 2, 2, 3, 2, 2, 1, 2, 1,
+ 2, 4, 5, 2, 3, 5, 6, 1, 1, 1,
+ 7, 11, 8, 12, 2, 2, 2, 2, 2, 2,
+ 2, 2, 2, 1, 1, 1, 1, 1, 1, 1,
+ 2, 2, 1, 1, 1, 1, 1, 2, 2, 2,
+ 7, 10, 1, 2, 1, 7, 10, 1, 2, 2,
+ 2, 3, 2, 2, 1, 2, 7, 7, 4, 2,
+ 1, 1, 4, 12, 2, 1, 1, 0, 6, 8,
+ 2, 3, 3, 3, 0, 3, 4, 4, 4, 3,
+ 3, 1, 3, 5, 4, 4, 3, 3, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+ 1, 2, 2, 3, 7, 2, 2, 1, 3, 2,
+ 2, 1, 2, 8, 2, 2, 2, 1, 2, 1,
+ 4, 7, 2, 2, 1, 1, 1, 2, 1, 1,
+ 2, 1, 0, 2, 2, 1, 1, 1, 2, 2,
+ 2, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 0, 1, 2, 1, 4, 5, 0,
+ 2, 1, 5, 2, 2, 2, 1, 1, 1, 2,
+ 1, 2, 1, 1, 1, 1, 1, 0, 1, 0,
+ 1, 5, 6, 3, 4, 4, 3, 6, 2, 1,
+ 4, 1, 1, 4, 6, 7, 5, 1, 1, 4,
+ 5, 1, 1, 1, 3, 0, 1, 2, 1, 5,
+ 1, 2, 1, 4, 3, 2, 1, 2, 1, 5,
+ 2, 1, 1, 3, 2, 0, 1, 1, 4, 2,
+ 0, 1, 0, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 2, 2, 1, 0, 1, 0,
+ 1, 0, 2, 2, 0, 1, 1, 6, 1, 1,
+ 1, 1, 2, 2, 1, 1, 1, 1, 2, 1,
+ 1, 1, 2, 1, 1, 2, 2, 2, 0, 1,
+ 0, 1, 1, 1, 1, 1, 1, 1, 1, 2,
+ 2, 1, 2, 3, 1, 2, 2, 4, 6, 1,
+ 10, 1, 2, 3, 3, 2, 2, 2, 2, 2,
+ 4, 4, 4, 3, 3, 5, 4, 4, 4, 3,
+ 3, 3, 3, 2, 2, 4, 3, 3, 3, 4,
+ 4, 4, 4, 5, 4, 6, 7, 4, 4, 5,
+ 2, 3, 2, 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, 2, 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, 2, 2, 3, 3, 3, 3,
- 4, 3, 5, 6, 3, 3, 4, 3, 3, 3,
- 3, 3, 5, 3, 3, 4, 2, 3, 6, 6,
- 1, 1, 1, 2, 2, 2, 3, 3, 2, 2,
- 2, 1, 3, 4, 2, 0, 3, 1, 1, 2,
- 2, 2, 2, 4, 4, 4, 4, 5, 3, 4,
- 5, 7, 8, 6, 8, 9, 6, 6, 7, 10,
- 11, 12, 9, 5, 5, 6, 3, 5, 5, 5,
- 6, 5, 4, 9, 10, 11, 9, 6, 6, 6,
- 6, 6, 6, 6, 6, 6, 7, 2, 4, 4,
- 4, 4, 5, 4, 4, 5, 3, 4, 4, 4,
- 6, 7, 8, 9, 6, 10, 11, 12, 9, 3,
- 2, 3, 5, 6, 7, 4, 3, 3, 6, 6,
- 6, 7, 4, 4, 6, 9, 4, 3, 6, 7,
- 7, 2, 3, 3, 3, 4, 2, 2, 4, 7,
- 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, 5, 6, 4,
- 2, 3, 2, 2, 4, 3, 3, 2, 3, 1,
- 3, 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, 5, 6,
- 6, 6, 6, 6, 6, 6, 10, 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, 3, 3, 7, 5, 3,
- 3, 2, 2, 3, 4, 4, 5, 4, 5, 4,
- 5, 3, 4, 5, 4, 5, 3, 5, 4, 5,
- 2, 3, 3, 4, 5, 3, 3, 3, 4, 5,
- 4, 5, 4, 5, 4, 5, 3, 4, 5, 4,
- 5, 2, 2, 3, 5, 4, 6, 6, 3, 3,
- 4, 6, 5, 4, 5, 2, 3, 5, 4, 6,
- 3, 2, 2, 3, 2, 3, 2, 3, 5, 4,
- 6, 2, 2, 2, 1, 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, 7, 8, 2, 4, 2,
- 4, 6, 2, 1, 1, 3, 3, 1, 3, 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, 1, 1, 1, 1, 2, 2, 3, 3,
- 1, 2, 3, 3, 1, 2, 1, 1, 2, 2,
- 4, 1, 2, 2, 2, 3, 1, 1, 1, 2,
- 2, 2, 3, 3, 3, 2, 2, 2, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 2, 1, 1,
- 1, 1, 0, 5, 1, 6, 3, 1, 2, 2,
- 3, 3, 2, 2, 2, 2, 2, 2, 3, 2,
- 2, 3, 1, 3, 3, 1, 2, 5, 6, 6,
- 2, 1, 2, 2, 5, 6, 6
+ 2, 3, 6, 6, 1, 1, 1, 2, 2, 2,
+ 3, 3, 2, 2, 2, 1, 3, 4, 2, 0,
+ 3, 1, 1, 2, 2, 2, 2, 4, 4, 4,
+ 4, 5, 3, 4, 5, 7, 8, 6, 8, 9,
+ 6, 6, 7, 10, 11, 12, 9, 5, 5, 6,
+ 3, 5, 5, 5, 6, 5, 4, 9, 10, 11,
+ 9, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+ 7, 2, 4, 4, 4, 4, 5, 4, 4, 5,
+ 3, 4, 4, 4, 6, 7, 8, 9, 6, 10,
+ 11, 12, 9, 3, 2, 3, 5, 6, 7, 4,
+ 3, 3, 6, 6, 6, 7, 4, 4, 6, 9,
+ 4, 3, 6, 7, 7, 2, 3, 3, 3, 4,
+ 2, 2, 4, 7, 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, 5, 6, 4, 2, 3, 2, 2, 4, 3,
+ 3, 2, 3, 1, 3, 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, 5, 6, 6, 6, 6, 6, 6, 6,
+ 10, 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, 3,
+ 3, 7, 5, 3, 3, 2, 2, 3, 4, 4,
+ 5, 4, 5, 4, 5, 3, 4, 5, 4, 5,
+ 3, 5, 4, 5, 2, 3, 3, 4, 5, 3,
+ 3, 3, 4, 5, 4, 5, 4, 5, 4, 5,
+ 3, 4, 5, 4, 5, 2, 2, 3, 5, 4,
+ 6, 6, 3, 3, 4, 6, 5, 4, 5, 2,
+ 3, 5, 4, 6, 3, 2, 2, 3, 2, 3,
+ 2, 3, 5, 4, 6, 2, 2, 2, 1, 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, 7,
+ 8, 2, 4, 2, 4, 6, 2, 1, 1, 3,
+ 3, 1, 3, 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, 1, 1, 1, 1,
+ 2, 2, 3, 3, 1, 2, 3, 3, 1, 2,
+ 1, 1, 2, 2, 4, 1, 2, 2, 2, 3,
+ 1, 1, 1, 2, 2, 2, 3, 3, 3, 2,
+ 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
+ 3, 2, 1, 1, 1, 1, 0, 5, 1, 6,
+ 3, 1, 2, 2, 3, 3, 2, 2, 2, 2,
+ 2, 2, 3, 2, 2, 3, 1, 3, 3, 1,
+ 2, 5, 6, 6, 2, 1, 2, 2, 5, 6,
+ 6
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2203,1645 +2209,1629 @@ static const yytype_uint8 yyr2[] =
static const yytype_uint16 yydefact[] =
{
0, 0, 0, 5, 6, 0, 0, 0, 0, 0,
- 275, 0, 0, 0, 0, 0, 0, 0, 19, 0,
- 0, 0, 0, 0, 991, 0, 0, 0, 0, 0,
- 0, 991, 32, 0, 0, 0, 37, 0, 0, 40,
- 1132, 42, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3, 0, 0, 0,
- 0, 0, 0, 7, 0, 0, 250, 252, 0, 0,
- 9, 133, 135, 128, 129, 130, 134, 131, 132, 255,
- 10, 0, 0, 0, 0, 0, 262, 0, 0, 0,
- 0, 11, 47, 48, 0, 0, 0, 0, 282, 0,
- 12, 60, 96, 0, 126, 95, 68, 93, 0, 65,
- 67, 63, 127, 94, 64, 0, 98, 99, 100, 101,
+ 277, 0, 0, 0, 0, 0, 0, 0, 19, 0,
+ 0, 0, 0, 0, 995, 0, 0, 0, 0, 0,
+ 0, 995, 32, 0, 0, 0, 37, 0, 0, 0,
+ 41, 1136, 43, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 3, 0, 0,
+ 0, 0, 0, 0, 7, 0, 0, 252, 254, 0,
+ 0, 9, 134, 136, 129, 130, 131, 135, 132, 133,
+ 257, 10, 0, 0, 0, 0, 0, 264, 0, 0,
+ 0, 0, 11, 48, 49, 0, 0, 0, 0, 284,
+ 0, 12, 61, 97, 0, 127, 96, 69, 94, 0,
+ 66, 68, 64, 128, 95, 65, 0, 99, 100, 101,
102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 61, 62, 66, 289, 136, 97,
- 0, 13, 14, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2, 49, 0, 15, 0, 0, 349,
- 360, 0, 366, 0, 0, 0, 0, 0, 0, 308,
- 0, 439, 0, 0, 0, 0, 991, 0, 315, 0,
- 319, 0, 0, 0, 69, 0, 0, 326, 0, 0,
- 457, 69, 16, 0, 464, 17, 467, 0, 484, 470,
- 471, 472, 473, 486, 475, 476, 477, 0, 479, 480,
- 0, 0, 18, 20, 0, 500, 0, 0, 0, 505,
- 0, 21, 0, 0, 0, 0, 22, 651, 23, 0,
- 0, 0, 0, 0, 0, 652, 24, 994, 992, 993,
- 0, 1052, 0, 0, 0, 26, 0, 1059, 1058, 1057,
- 1056, 28, 0, 0, 0, 0, 0, 136, 0, 29,
- 0, 1077, 0, 1074, 30, 0, 0, 0, 0, 31,
- 0, 0, 0, 0, 34, 0, 0, 1101, 35, 0,
- 0, 0, 36, 1129, 1128, 1130, 1131, 38, 0, 0,
- 0, 0, 0, 0, 39, 0, 0, 1134, 41, 0,
- 0, 43, 0, 0, 0, 0, 136, 44, 1155, 45,
- 0, 0, 46, 1, 4, 205, 0, 197, 0, 0,
- 199, 0, 207, 200, 204, 215, 216, 201, 217, 0,
- 203, 0, 0, 224, 234, 237, 236, 235, 233, 223,
- 227, 231, 232, 222, 0, 0, 0, 225, 0, 0,
- 0, 226, 8, 0, 0, 0, 251, 0, 256, 268,
- 269, 0, 257, 258, 136, 0, 990, 260, 261, 263,
- 0, 0, 0, 267, 0, 86, 87, 88, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 278,
- 0, 0, 0, 0, 0, 139, 145, 137, 138, 140,
- 143, 146, 142, 141, 144, 0, 0, 50, 55, 56,
- 57, 58, 51, 52, 53, 59, 54, 0, 296, 0,
- 339, 335, 331, 332, 336, 333, 338, 297, 351, 344,
- 348, 343, 354, 353, 352, 350, 298, 342, 361, 300,
- 0, 299, 0, 368, 301, 0, 384, 373, 386, 374,
- 375, 377, 0, 379, 380, 136, 302, 0, 0, 0,
- 0, 303, 0, 0, 136, 304, 398, 136, 396, 305,
- 136, 399, 306, 0, 136, 0, 307, 419, 0, 417,
- 432, 0, 0, 0, 423, 415, 0, 425, 437, 428,
- 309, 440, 310, 0, 0, 0, 408, 0, 410, 409,
- 313, 404, 405, 0, 314, 0, 441, 442, 443, 317,
- 318, 444, 320, 0, 445, 446, 447, 322, 70, 71,
- 73, 72, 448, 323, 449, 450, 324, 455, 453, 454,
- 451, 325, 0, 0, 460, 0, 329, 462, 330, 136,
- 0, 468, 485, 469, 487, 488, 489, 474, 490, 492,
- 491, 493, 478, 481, 497, 0, 0, 0, 494, 482,
- 0, 0, 502, 501, 0, 0, 0, 0, 0, 0,
- 512, 0, 0, 0, 0, 0, 513, 0, 650, 0,
- 514, 0, 0, 515, 0, 655, 654, 653, 0, 658,
- 0, 0, 836, 0, 0, 0, 661, 665, 667, 668,
- 0, 0, 0, 772, 0, 0, 0, 809, 0, 0,
- 0, 0, 0, 0, 0, 811, 0, 0, 0, 25,
- 1053, 1054, 1055, 27, 0, 0, 0, 0, 1066, 1067,
- 0, 136, 0, 1064, 1061, 0, 0, 0, 136, 1082,
- 1085, 1083, 1084, 1078, 1079, 1080, 1081, 0, 0, 33,
- 1098, 1099, 0, 1106, 1108, 1107, 1103, 1104, 1102, 0,
- 0, 0, 1109, 0, 0, 0, 1110, 1111, 1127, 0,
- 195, 191, 1097, 1096, 192, 193, 194, 0, 0, 0,
- 0, 0, 1139, 1152, 1142, 0, 0, 1145, 0, 0,
- 1144, 1143, 147, 1161, 0, 1160, 1156, 206, 202, 0,
- 211, 0, 208, 0, 240, 243, 244, 242, 241, 238,
- 239, 230, 229, 228, 245, 247, 246, 0, 0, 0,
- 0, 0, 259, 0, 1031, 272, 0, 0, 136, 279,
- 92, 89, 90, 91, 136, 281, 280, 0, 0, 0,
- 0, 0, 0, 0, 294, 0, 290, 288, 287, 295,
- 334, 0, 0, 337, 355, 356, 345, 346, 357, 359,
- 358, 347, 363, 362, 0, 367, 381, 382, 383, 371,
- 385, 372, 387, 378, 376, 370, 0, 0, 0, 0,
- 0, 136, 395, 147, 147, 147, 136, 0, 0, 136,
- 433, 418, 0, 74, 429, 0, 422, 424, 136, 438,
- 427, 311, 0, 0, 412, 0, 0, 0, 0, 883,
- 884, 0, 984, 0, 964, 0, 966, 0, 986, 988,
- 0, 979, 316, 0, 456, 452, 0, 0, 461, 458,
- 459, 147, 483, 496, 495, 498, 0, 511, 499, 0,
- 0, 0, 0, 0, 0, 165, 165, 159, 0, 0,
- 0, 0, 0, 0, 0, 0, 162, 162, 159, 0,
- 0, 159, 0, 0, 0, 0, 0, 548, 573, 0,
- 0, 549, 0, 546, 0, 0, 646, 0, 656, 657,
+ 122, 123, 124, 125, 126, 62, 63, 67, 291, 137,
+ 98, 0, 13, 14, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2, 50, 0, 15, 0, 0,
+ 352, 363, 0, 369, 0, 0, 0, 0, 0, 0,
+ 310, 0, 442, 0, 0, 0, 0, 995, 0, 317,
+ 0, 321, 0, 0, 0, 70, 0, 327, 0, 329,
+ 0, 0, 461, 70, 16, 0, 468, 17, 471, 0,
+ 488, 474, 475, 476, 477, 490, 479, 480, 481, 0,
+ 483, 484, 0, 0, 18, 20, 0, 504, 0, 0,
+ 0, 509, 0, 21, 0, 0, 0, 0, 22, 655,
+ 23, 0, 0, 0, 0, 0, 0, 656, 24, 998,
+ 996, 997, 0, 1056, 0, 0, 0, 26, 0, 1063,
+ 1062, 1061, 1060, 28, 0, 0, 0, 0, 0, 137,
+ 0, 29, 0, 1081, 0, 1078, 30, 0, 0, 0,
+ 0, 31, 0, 0, 0, 0, 34, 0, 0, 1105,
+ 35, 0, 0, 0, 36, 1133, 1132, 1134, 1135, 38,
+ 0, 39, 0, 0, 0, 0, 40, 0, 0, 1138,
+ 42, 0, 0, 44, 0, 0, 0, 0, 137, 45,
+ 1159, 46, 0, 0, 47, 1, 4, 207, 0, 199,
+ 0, 0, 201, 0, 209, 202, 206, 217, 218, 203,
+ 219, 0, 205, 0, 0, 226, 236, 239, 238, 237,
+ 235, 225, 229, 233, 234, 224, 0, 0, 0, 227,
+ 0, 0, 0, 228, 8, 0, 0, 0, 253, 0,
+ 258, 270, 271, 0, 259, 260, 137, 0, 994, 262,
+ 263, 265, 0, 0, 0, 269, 0, 87, 88, 89,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 717, 0, 0, 0, 0, 0, 740,
- 0, 0, 0, 0, 0, 0, 0, 0, 761, 0,
- 0, 766, 767, 0, 0, 0, 788, 790, 789, 0,
- 792, 0, 0, 800, 802, 803, 837, 0, 0, 0,
- 0, 659, 660, 877, 875, 880, 879, 878, 876, 881,
- 0, 664, 0, 669, 0, 874, 0, 670, 671, 672,
- 0, 0, 0, 0, 0, 774, 0, 0, 775, 1004,
- 0, 1007, 1003, 0, 0, 0, 776, 0, 777, 1023,
- 1028, 1025, 1024, 1022, 1029, 1026, 1020, 1027, 1021, 1030,
- 0, 0, 782, 0, 0, 0, 1036, 0, 1038, 785,
- 0, 1040, 786, 807, 0, 0, 0, 812, 813, 814,
- 1065, 0, 0, 1072, 1068, 0, 0, 0, 1063, 1062,
- 1076, 1075, 0, 1090, 0, 0, 1086, 0, 1094, 0,
- 0, 1087, 0, 1105, 187, 187, 187, 0, 0, 0,
- 1115, 0, 0, 0, 1117, 0, 0, 0, 1116, 196,
- 190, 0, 1137, 1136, 0, 1140, 0, 136, 1146, 1147,
- 0, 1149, 1150, 0, 148, 149, 1141, 1162, 1163, 0,
- 198, 0, 212, 0, 0, 0, 0, 0, 0, 0,
- 0, 136, 0, 0, 0, 0, 0, 0, 0, 0,
- 1032, 1011, 0, 1018, 1019, 0, 0, 266, 0, 0,
- 0, 0, 283, 0, 293, 0, 292, 341, 340, 0,
- 0, 0, 0, 0, 136, 390, 0, 147, 393, 69,
- 69, 0, 0, 0, 147, 0, 78, 77, 434, 421,
- 0, 431, 150, 0, 0, 48, 0, 411, 0, 0,
- 892, 0, 0, 0, 0, 0, 0, 910, 0, 0,
- 0, 0, 0, 0, 931, 932, 0, 0, 0, 0,
- 945, 0, 951, 952, 954, 956, 0, 961, 971, 972,
- 973, 0, 975, 980, 982, 983, 981, 882, 0, 963,
- 0, 962, 891, 0, 0, 967, 969, 0, 968, 989,
- 970, 977, 0, 0, 327, 0, 0, 509, 510, 0,
- 507, 503, 0, 165, 165, 165, 166, 167, 519, 520,
- 161, 160, 0, 165, 165, 165, 0, 525, 162, 165,
- 165, 165, 163, 164, 165, 165, 0, 165, 165, 0,
- 162, 0, 547, 0, 0, 0, 572, 0, 571, 0,
- 0, 624, 0, 625, 0, 0, 0, 0, 162, 162,
- 159, 0, 0, 159, 0, 0, 0, 647, 184, 182,
- 183, 181, 0, 0, 84, 85, 83, 678, 0, 0,
- 0, 0, 0, 830, 828, 823, 0, 833, 817, 834,
- 820, 832, 826, 815, 829, 818, 816, 835, 831, 0,
- 0, 696, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 280, 0, 0, 0, 0, 0, 140, 146, 138,
+ 139, 141, 144, 147, 143, 142, 145, 0, 0, 51,
+ 56, 57, 58, 59, 52, 53, 54, 60, 55, 0,
+ 298, 0, 342, 338, 334, 335, 339, 336, 341, 299,
+ 354, 347, 351, 346, 357, 356, 355, 353, 300, 345,
+ 364, 302, 0, 301, 0, 371, 303, 0, 387, 376,
+ 389, 377, 378, 380, 0, 382, 383, 137, 304, 0,
+ 0, 0, 0, 305, 0, 0, 137, 306, 401, 137,
+ 399, 307, 137, 402, 308, 0, 137, 0, 309, 422,
+ 0, 420, 435, 0, 0, 0, 426, 418, 0, 428,
+ 440, 431, 311, 443, 312, 0, 0, 0, 411, 0,
+ 413, 412, 315, 407, 408, 0, 316, 0, 444, 445,
+ 446, 319, 320, 447, 322, 0, 448, 449, 450, 324,
+ 71, 72, 74, 73, 451, 325, 452, 453, 326, 457,
+ 456, 459, 328, 0, 0, 464, 0, 332, 466, 333,
+ 137, 0, 472, 489, 473, 491, 492, 493, 478, 494,
+ 496, 495, 497, 482, 485, 501, 0, 0, 0, 498,
+ 486, 0, 0, 506, 505, 0, 0, 0, 0, 0,
+ 0, 516, 0, 0, 0, 0, 0, 517, 0, 654,
+ 0, 518, 0, 0, 519, 0, 659, 658, 657, 0,
+ 662, 0, 0, 840, 0, 0, 0, 665, 669, 671,
+ 672, 0, 0, 0, 776, 0, 0, 0, 813, 0,
+ 0, 0, 0, 0, 0, 0, 815, 0, 0, 0,
+ 25, 1057, 1058, 1059, 27, 0, 0, 0, 0, 1070,
+ 1071, 0, 137, 0, 1068, 1065, 0, 0, 0, 137,
+ 1086, 1089, 1087, 1088, 1082, 1083, 1084, 1085, 0, 0,
+ 33, 1102, 1103, 0, 1110, 1112, 1111, 1107, 1108, 1106,
+ 0, 0, 0, 1113, 0, 0, 0, 1114, 1115, 1131,
+ 0, 195, 192, 1101, 1100, 193, 194, 0, 0, 191,
+ 0, 0, 0, 0, 1143, 1156, 1146, 0, 0, 1149,
+ 0, 0, 1148, 1147, 148, 1165, 0, 1164, 1160, 208,
+ 204, 0, 213, 0, 210, 0, 242, 245, 246, 244,
+ 243, 240, 241, 232, 231, 230, 247, 249, 248, 0,
+ 0, 0, 0, 0, 261, 0, 1035, 274, 0, 0,
+ 137, 281, 93, 90, 91, 92, 137, 283, 282, 0,
+ 0, 0, 0, 0, 0, 0, 296, 0, 292, 290,
+ 289, 297, 337, 0, 0, 340, 358, 359, 348, 349,
+ 360, 362, 361, 350, 366, 365, 0, 370, 384, 385,
+ 386, 374, 388, 375, 390, 381, 379, 373, 0, 0,
+ 0, 0, 0, 137, 398, 148, 148, 148, 137, 0,
+ 0, 137, 436, 421, 0, 75, 432, 0, 425, 427,
+ 137, 441, 430, 313, 0, 0, 415, 0, 0, 0,
+ 0, 887, 888, 0, 988, 0, 968, 0, 970, 0,
+ 990, 992, 0, 983, 318, 0, 458, 455, 460, 454,
+ 0, 0, 465, 462, 463, 148, 487, 500, 499, 502,
+ 0, 515, 503, 0, 0, 0, 0, 0, 0, 166,
+ 166, 160, 0, 0, 0, 0, 0, 0, 0, 0,
+ 163, 163, 160, 0, 0, 160, 0, 0, 0, 0,
+ 0, 552, 577, 0, 0, 553, 0, 550, 0, 0,
+ 650, 0, 660, 661, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 721, 0, 0,
+ 0, 0, 0, 744, 0, 0, 0, 0, 0, 0,
+ 0, 0, 765, 0, 0, 770, 771, 0, 0, 0,
+ 792, 794, 793, 0, 796, 0, 0, 804, 806, 807,
+ 841, 0, 0, 0, 0, 663, 664, 881, 879, 884,
+ 883, 882, 880, 885, 0, 668, 0, 673, 0, 878,
+ 0, 674, 675, 676, 0, 0, 0, 0, 0, 778,
+ 0, 0, 779, 1008, 0, 1011, 1007, 0, 0, 0,
+ 780, 0, 781, 1027, 1032, 1029, 1028, 1026, 1033, 1030,
+ 1024, 1031, 1025, 1034, 0, 0, 786, 0, 0, 0,
+ 1040, 0, 1042, 789, 0, 1044, 790, 811, 0, 0,
+ 0, 816, 817, 818, 1069, 0, 0, 1076, 1072, 0,
+ 0, 0, 1067, 1066, 1080, 1079, 0, 1094, 0, 0,
+ 1090, 0, 1098, 0, 0, 1091, 0, 1109, 188, 188,
+ 188, 0, 0, 0, 1119, 0, 0, 0, 1121, 0,
+ 0, 0, 1120, 196, 0, 197, 0, 1141, 1140, 0,
+ 1144, 0, 137, 1150, 1151, 0, 1153, 1154, 0, 149,
+ 150, 1145, 1166, 1167, 0, 200, 0, 214, 0, 0,
+ 0, 0, 0, 0, 0, 0, 137, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1036, 1015, 0, 1022, 1023,
+ 0, 0, 268, 0, 0, 0, 0, 285, 0, 295,
+ 0, 294, 344, 343, 0, 0, 0, 0, 0, 137,
+ 393, 0, 148, 396, 70, 70, 0, 0, 0, 148,
+ 0, 79, 78, 437, 424, 0, 434, 151, 0, 0,
+ 49, 0, 414, 0, 0, 896, 0, 0, 0, 0,
+ 0, 0, 914, 0, 0, 0, 0, 0, 0, 935,
+ 936, 0, 0, 0, 0, 949, 0, 955, 956, 958,
+ 960, 0, 965, 975, 976, 977, 0, 979, 984, 986,
+ 987, 985, 886, 0, 967, 0, 966, 895, 0, 0,
+ 971, 973, 0, 972, 993, 974, 981, 0, 0, 330,
+ 0, 0, 513, 514, 0, 511, 507, 0, 166, 166,
+ 166, 167, 168, 523, 524, 162, 161, 0, 166, 166,
+ 166, 0, 529, 163, 166, 166, 166, 164, 165, 166,
+ 166, 0, 166, 166, 0, 163, 0, 551, 0, 0,
+ 0, 576, 0, 575, 0, 0, 628, 0, 629, 0,
+ 0, 0, 0, 163, 163, 160, 0, 0, 160, 0,
+ 0, 0, 651, 185, 183, 184, 182, 0, 0, 85,
+ 86, 84, 682, 0, 0, 0, 0, 0, 834, 832,
+ 827, 0, 837, 821, 838, 824, 836, 830, 819, 833,
+ 822, 820, 839, 835, 0, 0, 700, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 726, 0, 0, 0, 0, 739, 741,
- 0, 0, 747, 746, 0, 0, 171, 0, 0, 136,
- 0, 0, 757, 0, 0, 762, 763, 764, 0, 0,
- 0, 771, 787, 791, 793, 796, 795, 0, 0, 0,
- 801, 838, 840, 0, 839, 662, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 990, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 730, 0,
+ 0, 0, 0, 743, 745, 0, 0, 751, 750, 0,
+ 0, 172, 0, 0, 137, 0, 0, 761, 0, 0,
+ 766, 767, 768, 0, 0, 0, 775, 791, 795, 797,
+ 800, 799, 0, 0, 0, 805, 842, 844, 0, 843,
+ 666, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 994, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 670, 0, 0, 0, 0,
+ 777, 0, 137, 0, 1003, 1001, 0, 0, 137, 0,
+ 1006, 814, 782, 0, 0, 0, 788, 0, 0, 1045,
+ 809, 810, 0, 812, 1075, 1077, 1074, 1073, 1064, 0,
+ 0, 1095, 0, 0, 1099, 1104, 189, 190, 1117, 1116,
+ 1118, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 0, 0, 1142, 0, 1158, 1157, 1152, 1155, 0, 0,
+ 137, 0, 0, 0, 211, 0, 0, 0, 0, 0,
+ 0, 0, 0, 272, 276, 275, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1014, 0, 0, 0, 0, 286,
+ 288, 287, 137, 293, 0, 0, 0, 394, 395, 148,
+ 137, 0, 400, 403, 0, 0, 0, 70, 423, 77,
+ 81, 76, 80, 439, 0, 433, 153, 154, 152, 70,
+ 0, 0, 417, 409, 893, 0, 0, 894, 137, 897,
+ 0, 0, 0, 905, 0, 137, 910, 0, 915, 916,
+ 0, 919, 920, 921, 0, 0, 0, 930, 0, 937,
+ 0, 0, 0, 942, 943, 0, 0, 0, 950, 0,
+ 0, 954, 957, 959, 961, 0, 0, 978, 980, 889,
+ 989, 890, 0, 991, 982, 0, 0, 469, 470, 0,
+ 0, 512, 0, 520, 521, 522, 166, 526, 527, 528,
+ 0, 0, 0, 533, 534, 160, 0, 0, 0, 166,
+ 539, 540, 541, 542, 544, 163, 547, 548, 0, 166,
+ 0, 0, 0, 163, 163, 160, 0, 0, 0, 0,
+ 574, 0, 578, 0, 0, 0, 0, 0, 163, 163,
+ 160, 0, 0, 160, 0, 0, 0, 0, 0, 163,
+ 163, 160, 0, 0, 160, 0, 0, 0, 0, 0,
+ 163, 163, 160, 0, 0, 160, 0, 0, 0, 0,
+ 163, 163, 160, 0, 0, 0, 163, 554, 555, 556,
+ 557, 559, 0, 562, 563, 0, 163, 0, 0, 186,
+ 187, 680, 137, 679, 137, 683, 0, 0, 0, 0,
+ 0, 0, 0, 826, 823, 829, 828, 825, 831, 0,
+ 0, 0, 0, 0, 137, 706, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 722, 723,
+ 724, 0, 728, 725, 727, 0, 732, 731, 733, 0,
+ 0, 0, 0, 0, 0, 137, 0, 137, 0, 749,
+ 178, 174, 179, 173, 176, 175, 177, 756, 757, 0,
+ 0, 0, 760, 137, 0, 137, 769, 772, 137, 0,
+ 137, 0, 798, 803, 845, 667, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 869, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 666, 0, 0, 0, 0, 773, 0, 136, 0, 999,
- 997, 0, 0, 136, 0, 1002, 810, 778, 0, 0,
- 0, 784, 0, 0, 1041, 805, 806, 0, 808, 1071,
- 1073, 1070, 1069, 1060, 0, 0, 1091, 0, 0, 1095,
- 1100, 188, 189, 1113, 1112, 1114, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 0, 1138, 0, 1154, 1153,
- 1148, 1151, 0, 0, 136, 0, 0, 0, 209, 0,
- 0, 0, 0, 0, 0, 0, 0, 270, 274, 273,
- 0, 0, 0, 0, 0, 0, 0, 0, 1010, 0,
- 0, 0, 0, 284, 286, 285, 136, 291, 0, 0,
- 0, 391, 392, 147, 136, 0, 397, 400, 0, 0,
- 0, 69, 420, 76, 80, 75, 79, 436, 0, 430,
- 152, 153, 151, 69, 0, 0, 414, 406, 889, 0,
- 0, 890, 136, 893, 0, 0, 0, 901, 0, 136,
- 906, 0, 911, 912, 0, 915, 916, 917, 0, 0,
- 0, 926, 0, 933, 0, 0, 0, 938, 939, 0,
- 0, 0, 946, 0, 0, 950, 953, 955, 957, 0,
- 0, 974, 976, 885, 985, 886, 0, 987, 978, 0,
- 0, 465, 466, 0, 0, 508, 0, 516, 517, 518,
- 165, 522, 523, 524, 0, 0, 0, 529, 530, 159,
- 0, 0, 0, 165, 535, 536, 537, 538, 540, 162,
- 543, 544, 0, 165, 0, 0, 0, 162, 162, 159,
- 0, 0, 0, 0, 570, 0, 574, 0, 0, 0,
- 0, 0, 162, 162, 159, 0, 0, 159, 0, 0,
- 0, 0, 0, 162, 162, 159, 0, 0, 159, 0,
- 0, 0, 0, 0, 162, 162, 159, 0, 0, 159,
- 0, 0, 0, 0, 162, 162, 159, 0, 0, 0,
- 162, 550, 551, 552, 553, 555, 0, 558, 559, 0,
- 162, 0, 0, 185, 186, 676, 136, 675, 136, 679,
- 0, 0, 0, 0, 0, 0, 0, 822, 819, 825,
- 824, 821, 827, 0, 0, 0, 0, 0, 136, 702,
+ 870, 0, 0, 0, 0, 0, 677, 678, 137, 148,
+ 0, 137, 137, 1009, 1010, 0, 1012, 0, 784, 0,
+ 137, 1041, 1043, 808, 1092, 1093, 1096, 1097, 171, 170,
+ 1123, 1122, 1124, 1129, 1128, 1130, 1126, 1125, 1127, 0,
+ 1137, 0, 0, 137, 0, 1161, 0, 0, 215, 0,
+ 212, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1017, 0, 1020, 1054, 1021, 1019, 1016, 137, 137, 0,
+ 278, 130, 0, 367, 0, 391, 148, 151, 0, 0,
+ 406, 419, 0, 429, 0, 410, 0, 0, 898, 151,
+ 899, 151, 903, 151, 901, 137, 906, 151, 908, 148,
+ 151, 912, 151, 917, 137, 922, 151, 924, 151, 926,
+ 151, 928, 137, 931, 151, 933, 151, 137, 939, 0,
+ 151, 137, 944, 151, 947, 151, 137, 952, 151, 137,
+ 963, 969, 0, 0, 467, 508, 0, 525, 530, 531,
+ 532, 0, 536, 537, 538, 543, 166, 163, 549, 565,
+ 566, 567, 568, 569, 0, 571, 572, 163, 0, 0,
+ 0, 163, 163, 160, 0, 0, 0, 0, 0, 0,
+ 163, 163, 160, 0, 0, 0, 0, 0, 0, 163,
+ 163, 160, 0, 0, 0, 163, 166, 166, 166, 166,
+ 166, 0, 166, 166, 0, 163, 163, 166, 166, 166,
+ 166, 166, 0, 166, 166, 0, 163, 163, 630, 631,
+ 632, 633, 635, 0, 638, 639, 0, 163, 641, 642,
+ 643, 644, 645, 0, 647, 648, 163, 558, 163, 0,
+ 564, 0, 0, 681, 684, 151, 0, 0, 151, 0,
+ 0, 0, 697, 151, 698, 701, 702, 151, 703, 705,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 718, 719, 720, 0, 724, 721, 723, 0,
- 728, 727, 729, 0, 0, 0, 0, 0, 0, 136,
- 0, 136, 0, 745, 177, 173, 178, 172, 175, 174,
- 176, 752, 753, 0, 0, 0, 756, 136, 0, 136,
- 765, 768, 136, 0, 136, 0, 794, 799, 841, 663,
+ 0, 0, 726, 729, 0, 151, 0, 0, 0, 746,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 865, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 866, 0, 0, 0, 0, 0,
- 673, 674, 136, 147, 0, 136, 136, 1005, 1006, 0,
- 1008, 0, 780, 0, 136, 1037, 1039, 804, 1088, 1089,
- 1092, 1093, 170, 169, 1119, 1118, 1120, 1125, 1124, 1126,
- 1122, 1121, 1123, 1133, 0, 0, 136, 0, 1157, 0,
- 0, 213, 0, 210, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1013, 0, 1016, 1050, 1017, 1015, 1012,
- 136, 136, 0, 276, 129, 0, 364, 0, 388, 147,
- 150, 0, 0, 403, 416, 0, 426, 0, 407, 0,
- 0, 894, 150, 895, 150, 899, 150, 897, 136, 902,
- 150, 904, 147, 150, 908, 150, 913, 136, 918, 150,
- 920, 150, 922, 150, 924, 136, 927, 150, 929, 150,
- 136, 935, 0, 150, 136, 940, 150, 943, 150, 136,
- 948, 150, 136, 959, 965, 0, 0, 463, 504, 0,
- 521, 526, 527, 528, 0, 532, 533, 534, 539, 165,
- 162, 545, 561, 562, 563, 564, 565, 0, 567, 568,
- 162, 0, 0, 0, 162, 162, 159, 0, 0, 0,
- 0, 0, 0, 162, 162, 159, 0, 0, 0, 0,
- 0, 0, 162, 162, 159, 0, 0, 0, 162, 165,
- 165, 165, 165, 165, 0, 165, 165, 0, 162, 162,
- 165, 165, 165, 165, 165, 0, 165, 165, 0, 162,
- 162, 626, 627, 628, 629, 631, 0, 634, 635, 0,
- 162, 637, 638, 639, 640, 641, 0, 643, 644, 162,
- 554, 162, 0, 560, 0, 0, 677, 680, 150, 0,
- 0, 150, 0, 0, 0, 693, 150, 694, 697, 698,
- 150, 699, 701, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 722, 725, 0, 150, 0,
- 0, 0, 742, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 797, 0, 0, 0,
+ 0, 0, 0, 801, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 136, 0,
- 0, 81, 0, 0, 872, 873, 147, 0, 0, 0,
- 1000, 998, 1009, 779, 781, 147, 1135, 1164, 0, 0,
- 1159, 1158, 214, 0, 0, 0, 248, 0, 0, 0,
- 0, 0, 1014, 264, 265, 150, 365, 369, 389, 394,
- 0, 401, 435, 312, 0, 888, 896, 900, 898, 903,
- 905, 907, 909, 914, 919, 921, 923, 925, 928, 930,
- 934, 147, 150, 942, 147, 944, 947, 147, 958, 147,
- 0, 328, 0, 531, 541, 165, 162, 569, 165, 165,
- 165, 165, 165, 0, 165, 165, 162, 615, 616, 617,
- 618, 619, 0, 621, 622, 162, 165, 165, 165, 165,
- 165, 0, 165, 165, 162, 165, 584, 585, 586, 587,
- 589, 162, 592, 593, 0, 165, 165, 604, 605, 606,
- 607, 609, 162, 612, 613, 0, 165, 630, 162, 0,
- 636, 162, 645, 556, 162, 648, 649, 683, 0, 150,
- 687, 686, 0, 136, 0, 695, 700, 136, 0, 707,
- 708, 709, 710, 714, 715, 711, 712, 713, 0, 150,
- 730, 734, 0, 136, 0, 0, 743, 749, 748, 150,
- 750, 0, 754, 0, 758, 150, 0, 0, 798, 0,
- 179, 179, 0, 0, 179, 0, 179, 990, 0, 0,
- 179, 179, 0, 0, 0, 0, 0, 0, 0, 867,
- 0, 0, 0, 990, 82, 0, 179, 0, 1034, 871,
- 0, 0, 1166, 1165, 0, 0, 218, 0, 253, 0,
- 0, 0, 1051, 277, 402, 0, 936, 937, 941, 949,
- 960, 321, 0, 542, 566, 575, 576, 577, 578, 579,
- 162, 581, 582, 165, 162, 623, 595, 596, 597, 598,
- 599, 162, 601, 602, 165, 588, 165, 162, 594, 608,
- 165, 162, 614, 632, 162, 642, 557, 150, 681, 688,
- 0, 0, 0, 0, 0, 716, 731, 0, 0, 0,
- 744, 751, 0, 759, 760, 150, 769, 0, 180, 990,
- 990, 81, 0, 990, 0, 990, 842, 136, 0, 990,
- 990, 81, 0, 0, 990, 990, 0, 0, 870, 868,
- 869, 848, 990, 990, 1034, 1045, 0, 1001, 783, 0,
- 0, 220, 0, 0, 0, 887, 0, 165, 583, 620,
- 165, 603, 590, 165, 610, 165, 633, 682, 150, 684,
- 150, 0, 150, 0, 150, 732, 150, 0, 150, 0,
- 990, 854, 850, 990, 0, 855, 0, 849, 990, 0,
- 852, 851, 990, 0, 0, 846, 845, 990, 136, 847,
- 853, 1045, 995, 0, 0, 1035, 1043, 0, 0, 0,
- 249, 155, 158, 157, 156, 154, 0, 506, 580, 600,
- 591, 611, 685, 692, 0, 706, 703, 733, 738, 0,
- 755, 0, 859, 844, 81, 0, 857, 0, 843, 81,
- 0, 858, 0, 996, 1047, 1049, 0, 1042, 0, 0,
- 254, 0, 689, 136, 704, 735, 770, 990, 0, 0,
- 990, 0, 150, 1048, 1044, 219, 0, 0, 136, 690,
- 705, 136, 736, 861, 0, 990, 860, 0, 990, 221,
- 271, 691, 737, 81, 862, 81, 856, 990, 990, 864,
- 863
+ 0, 0, 0, 0, 0, 137, 0, 0, 82, 0,
+ 0, 876, 877, 148, 0, 0, 0, 1004, 1002, 1013,
+ 783, 785, 148, 0, 1139, 1168, 0, 0, 1163, 1162,
+ 216, 0, 0, 0, 250, 0, 0, 0, 0, 0,
+ 1018, 266, 267, 151, 368, 372, 392, 397, 0, 404,
+ 438, 314, 0, 892, 900, 904, 902, 907, 909, 911,
+ 913, 918, 923, 925, 927, 929, 932, 934, 938, 148,
+ 151, 946, 148, 948, 951, 148, 962, 148, 0, 331,
+ 0, 535, 545, 166, 163, 573, 166, 166, 166, 166,
+ 166, 0, 166, 166, 163, 619, 620, 621, 622, 623,
+ 0, 625, 626, 163, 166, 166, 166, 166, 166, 0,
+ 166, 166, 163, 166, 588, 589, 590, 591, 593, 163,
+ 596, 597, 0, 166, 166, 608, 609, 610, 611, 613,
+ 163, 616, 617, 0, 166, 634, 163, 0, 640, 163,
+ 649, 560, 163, 652, 653, 687, 0, 151, 691, 690,
+ 0, 137, 0, 699, 704, 137, 0, 711, 712, 713,
+ 714, 718, 719, 715, 716, 717, 0, 151, 734, 738,
+ 0, 137, 0, 0, 747, 753, 752, 151, 754, 0,
+ 758, 0, 762, 151, 0, 0, 802, 0, 180, 180,
+ 0, 0, 180, 0, 180, 994, 0, 0, 180, 180,
+ 0, 0, 0, 0, 0, 0, 0, 871, 0, 0,
+ 0, 994, 83, 0, 180, 0, 1038, 875, 0, 0,
+ 198, 1170, 1169, 0, 0, 220, 0, 255, 0, 0,
+ 0, 1055, 279, 405, 0, 940, 941, 945, 953, 964,
+ 323, 0, 546, 570, 579, 580, 581, 582, 583, 163,
+ 585, 586, 166, 163, 627, 599, 600, 601, 602, 603,
+ 163, 605, 606, 166, 592, 166, 163, 598, 612, 166,
+ 163, 618, 636, 163, 646, 561, 151, 685, 692, 0,
+ 0, 0, 0, 0, 720, 735, 0, 0, 0, 748,
+ 755, 0, 763, 764, 151, 773, 0, 181, 994, 994,
+ 82, 0, 994, 0, 994, 846, 137, 0, 994, 994,
+ 82, 0, 0, 994, 994, 0, 0, 874, 872, 873,
+ 852, 994, 994, 1038, 1049, 0, 1005, 787, 0, 0,
+ 222, 0, 0, 0, 891, 0, 166, 587, 624, 166,
+ 607, 594, 166, 614, 166, 637, 686, 151, 688, 151,
+ 0, 151, 0, 151, 736, 151, 0, 151, 0, 994,
+ 858, 854, 994, 0, 859, 0, 853, 994, 0, 856,
+ 855, 994, 0, 0, 850, 849, 994, 137, 851, 857,
+ 1049, 999, 0, 0, 1039, 1047, 0, 0, 0, 251,
+ 156, 159, 158, 157, 155, 0, 510, 584, 604, 595,
+ 615, 689, 696, 0, 710, 707, 737, 742, 0, 759,
+ 0, 863, 848, 82, 0, 861, 0, 847, 82, 0,
+ 862, 0, 1000, 1051, 1053, 0, 1046, 0, 0, 256,
+ 0, 693, 137, 708, 739, 774, 994, 0, 0, 994,
+ 0, 151, 1052, 1048, 221, 0, 0, 137, 694, 709,
+ 137, 740, 865, 0, 994, 864, 0, 994, 223, 273,
+ 695, 741, 82, 866, 82, 860, 994, 994, 868, 867
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 46, 388, 163, 147, 532, 1128, 2283, 2284, 389,
- 390, 391, 392, 148, 149, 150, 79, 415, 1066, 1503,
- 2466, 1212, 1224, 1208, 1804, 1731, 2369, 1263, 1665, 1423,
- 304, 681, 56, 327, 333, 337, 340, 63, 357, 353,
- 349, 343, 719, 361, 70, 366, 80, 91, 372, 377,
- 1460, 100, 399, 151, 166, 202, 437, 763, 446, 447,
- 766, 771, 449, 451, 773, 454, 775, 466, 779, 781,
- 783, 471, 475, 479, 482, 486, 514, 510, 1137, 500,
- 806, 801, 1129, 810, 502, 519, 522, 527, 533, 536,
- 541, 835, 546, 839, 548, 205, 1563, 222, 551, 553,
- 557, 562, 569, 231, 1201, 572, 236, 580, 1217, 586,
- 883, 1232, 877, 1604, 1238, 1236, 878, 1606, 881, 1241,
- 1243, 593, 590, 238, 246, 629, 952, 1289, 941, 1380,
- 1774, 2089, 957, 950, 832, 1177, 1181, 1188, 1190, 734,
- 250, 965, 968, 976, 1090, 1091, 1092, 735, 2395, 2396,
- 999, 1002, 2455, 2456, 2452, 2453, 2494, 1093, 1094, 255,
- 261, 269, 643, 638, 274, 279, 653, 659, 1026, 1031,
- 684, 284, 288, 666, 292, 672, 676, 1040, 1048, 1044,
- 297, 298, 308, 1053, 311, 317, 697, 700, 694, 319,
- 322, 705
+ -1, 47, 390, 164, 148, 534, 1133, 2291, 2292, 391,
+ 392, 393, 394, 149, 150, 151, 80, 417, 1071, 1509,
+ 2475, 1217, 1229, 1213, 1810, 1737, 2378, 1268, 1671, 1428,
+ 306, 682, 689, 57, 329, 335, 339, 342, 64, 359,
+ 355, 351, 345, 721, 363, 71, 368, 81, 92, 374,
+ 379, 1466, 101, 401, 152, 167, 204, 439, 765, 448,
+ 449, 768, 773, 451, 453, 775, 456, 777, 468, 781,
+ 783, 785, 473, 477, 481, 484, 488, 516, 512, 1142,
+ 502, 808, 803, 1134, 812, 504, 521, 524, 529, 535,
+ 538, 542, 837, 839, 547, 843, 549, 207, 1569, 224,
+ 552, 554, 558, 563, 570, 233, 1206, 573, 238, 581,
+ 1222, 587, 887, 1237, 881, 1610, 1243, 1241, 882, 1612,
+ 885, 1246, 1248, 594, 591, 240, 248, 630, 956, 1294,
+ 945, 1385, 1780, 2096, 961, 954, 834, 1182, 1186, 1193,
+ 1195, 736, 252, 969, 972, 980, 1095, 1096, 1097, 737,
+ 2404, 2405, 1003, 1006, 2464, 2465, 2461, 2462, 2503, 1098,
+ 1099, 257, 263, 271, 644, 639, 276, 281, 654, 660,
+ 1030, 1035, 685, 286, 290, 667, 294, 673, 677, 1044,
+ 1052, 1048, 299, 300, 310, 1058, 313, 319, 699, 702,
+ 696, 321, 324, 707
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -2338
+#define YYPACT_NINF -2348
static const yytype_int16 yypact[] =
{
- 4921, 55, 638, -2338, -2338, 708, -142, 371, 519, 402,
- 425, 3602, 168, 10, 45, 4968, 94, 1696, -2338, 168,
- 658, 53, -69, 49, -38, 92, 89, 358, 3152, 120,
- 688, -38, -2338, 141, 27, 408, -2338, 47, 747, -2338,
- 96, -2338, 30, 3780, -41, 37, 214, 225, 510, 220,
- 478, 489, 54, 490, -5, 618, -2338, -71, 66, 168,
- -23, 470, 512, -2338, 504, 900, -2338, -2338, 32, 900,
- -2338, -2338, -2338, -2338, 900, -2338, -2338, -2338, -2338, -2338,
- -2338, 334, 521, 4636, 57, 520, 542, 531, 541, 558,
- 564, -2338, -2338, -2338, 900, 1107, 900, 900, 749, 900,
- -2338, -2338, -2338, 388, -2338, -2338, -2338, -2338, 4409, -2338,
- -2338, -2338, -2338, -2338, -2338, 900, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, 1364, -2338,
- 900, -2338, -2338, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, -2338, -2338, 476, -2338, 535, 983, 40,
- 341, 450, 315, 4042, 25, 4460, 4378, 4409, 3738, -2338,
- 801, 438, 643, 571, 15, 460, -38, 39, -2338, 627,
- -2338, 472, 463, 146, 362, 311, 734, -2338, 33, 648,
- 31, 362, -2338, 4636, -2338, -2338, -2338, 667, 709, -2338,
- -2338, -2338, -2338, 56, -2338, -2338, -2338, 619, -2338, -2338,
- 4636, 4008, -2338, -2338, 484, -2338, 742, 745, 113, -2338,
- 900, -2338, 44, 328, 711, 14, -2338, -2338, -2338, 761,
- 803, 168, 168, 900, 900, -2338, -2338, -2338, -2338, -2338,
- 790, -2338, 805, 815, 900, -2338, 816, -2338, -2338, -2338,
- -2338, -2338, 900, 830, 168, 1613, 900, 1364, 900, -2338,
- 820, -2338, 4522, -2338, -2338, 529, 823, 828, 900, -2338,
- -47, 839, 4636, 845, -2338, 903, 900, 758, -2338, 142,
- 576, 855, -2338, -2338, -2338, -2338, -2338, -2338, 861, 3,
- 448, 864, 900, 900, -2338, 900, 624, 867, -2338, 900,
- 900, -2338, 878, 13, 62, 880, 1364, -2338, -2338, -2338,
- 772, 900, -2338, -2338, -2338, -2338, 900, -2338, 889, 891,
- -2338, 900, 595, -2338, -2338, -2338, -2338, -2338, -2338, 900,
- -2338, 559, 895, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, 900, 900, 900, -2338, 900, 914,
- 918, -2338, -2338, 900, 900, 900, -2338, 900, -2338, -2338,
- -2338, 926, -2338, -2338, 1364, 929, -2338, -2338, -2338, -2338,
- 943, 971, 4636, -2338, 900, -2338, -2338, -2338, 900, 975,
- 978, 978, 4636, 900, 900, 900, 900, 900, 900, -2338,
- 900, 4409, 1107, 900, 900, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, 1107, 900, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, 986, -2338, 743,
- 72, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -28, -2338,
- -2338, -2338, 836, -2338, 543, -2338, -2338, -2338, -2338, -2338,
- 1006, -2338, 1025, -2338, -2338, -16, 850, -2338, 868, -2338,
- -2338, -2338, 883, -2338, -2338, 1364, -2338, 900, 900, 3658,
- 900, -2338, 4636, 4636, 1364, -2338, -2338, 1364, -2338, -2338,
- 1364, -2338, -2338, 4636, 1364, 900, -2338, -2338, 4636, -2338,
- 1038, 33, 862, 2, -2338, -2338, 865, 4636, 1044, -2338,
- -2338, -2338, -2338, 1052, 1055, 1072, -2338, 875, -2338, -2338,
- -2338, -2338, -2338, 900, -2338, 436, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, 33, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, 1021, -2338, -2338,
- -2338, -2338, 900, 1087, 888, 4522, -2338, -2338, -2338, 1364,
- 1089, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, 4636, 4636, 4636, -2338, -2338,
- 1105, 168, -2338, -2338, 1109, 1115, 937, 900, 305, 1056,
- -2338, 335, 1061, 3863, -8, 1140, -2338, 1143, -2338, 1144,
- -2338, 1154, 1175, -2338, 1177, -2338, -2338, -2338, 900, -2338,
- 4347, 1437, 590, 1182, 475, 1093, -2338, -2338, -2338, 1165,
- 645, 1190, 50, 900, 431, 546, 100, 4636, 168, 1191,
- 662, 11, 74, 212, 17, -2338, 1167, 1183, 1192, -2338,
- -2338, -2338, -2338, -2338, 900, 900, 900, 900, -2338, -2338,
- 900, 1364, 900, -2338, 900, 1107, 900, 1195, 1364, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, 539, 622, -2338,
- -2338, -2338, 1199, -2338, -2338, -2338, -2338, 1111, -2338, 1200,
- 1202, 1204, -2338, 304, 387, 465, -2338, -2338, -2338, 1209,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, 900, 900, 1213,
- 900, 900, -2338, 3543, -2338, 545, 1215, -2338, 904, 1217,
- -2338, -2338, -13, 900, 900, -2338, 1214, -2338, -2338, 1220,
- 958, 900, 1216, 516, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, 1225, 900, 900,
- 900, 4636, -2338, 1227, 1892, -2338, 1229, 1233, 1364, -2338,
- -2338, -2338, -2338, -2338, 1364, -2338, -2338, 900, 900, 900,
- 4636, 900, 1107, 900, -2338, 900, -2338, -2338, -2338, -2338,
- -2338, 1234, 1235, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, 397, -2338, 900, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, 4636, 4636, 4636, 1237,
- 900, 1364, -2338, -13, -13, -13, 1364, 1107, 900, 1364,
- -2338, -2338, 900, -48, 1079, 1238, -2338, -2338, 1364, -2338,
- -2338, -2338, 1241, 1244, 938, 900, 3115, 88, 441, -2338,
- -2338, 900, 360, 501, -2338, 1007, -2338, 1191, 447, 980,
- 81, -2338, -2338, 900, -2338, -2338, 900, 1248, -2338, -2338,
- -2338, -13, -2338, -2338, -2338, -2338, 4494, -2338, -2338, 1258,
- 1259, 900, 1261, 1262, 1263, 16, 16, -64, 1265, 1266,
- 1269, 1270, 1017, 1271, 1272, 1274, 35, 35, -64, 1277,
- 1278, -64, 1284, 1285, 4579, 1288, 1289, -2338, -2338, 1290,
- 1291, -2338, 959, -2338, 1295, 1296, -2338, 1304, -2338, -2338,
- 781, 1168, 1088, 1090, 1092, 1210, 432, 1097, 1308, -2,
- 1172, 1221, 751, 1179, 1293, 1101, 1104, 1231, 1329, 1136,
- 160, 127, -68, 1108, 4409, 1191, 1300, -78, 1141, 1334,
- 105, -2338, -2338, 200, 1338, 1339, -2338, -2338, -2338, 1340,
- 1147, 163, 1191, 1149, -2338, -2338, -2338, 168, 1351, 1353,
- 900, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -1, -2338, 625, -2338, 900, -2338, 900, -2338, -2338, -2338,
- 900, 900, 900, 475, 4636, -2338, 1365, 999, -2338, -2338,
- 900, -2338, -2338, 900, 4409, 900, -2338, 4636, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- 168, 900, -2338, 900, 475, 1370, -2338, 900, 900, -2338,
- 168, -2338, -2338, -2338, 131, 1371, 1375, -2338, -2338, -2338,
- -2338, 900, 900, -2338, -2338, 1107, 900, 900, -2338, -2338,
- -2338, -2338, 900, -2338, 900, 1264, -2338, 900, -2338, 900,
- 1281, -2338, 1379, -2338, 58, 58, 58, 1385, 1386, 1391,
- -2338, 1393, 1394, 1392, -2338, 1396, 1397, 1402, -2338, -2338,
- -2338, 900, 1406, -2338, 900, -2338, 4522, 1364, -2338, -2338,
- 1407, -2338, -2338, 1408, -2338, -2338, -2338, -2338, 1404, 1613,
- -2338, 900, 1405, 900, 900, 900, 925, 1413, 1410, 900,
- 900, 1364, 104, 1091, 1094, 1095, 1096, 1103, 1106, 1113,
- 1892, -2338, 1116, -2338, -2338, 1416, 1418, -2338, 900, 1424,
- 1439, 1446, -2338, 4636, -2338, 900, -2338, -2338, -2338, 900,
- 900, 900, 1448, 1452, 1364, -2338, 4636, -13, -2338, 362,
- 362, 1107, 900, 1453, -13, 900, -15, -9, 68, -2338,
- 1417, -2338, 98, 900, 1456, 1464, 900, -2338, 1460, 712,
- 4409, 1243, 1246, 1247, 117, 4409, 1250, -2338, 242, 1343,
- 123, 1251, 1252, 173, -2338, -2338, 29, 1307, 320, 306,
- 1191, 692, -2338, 1473, 1249, -2338, 458, -2338, -2338, -2338,
- -2338, 1191, 1292, -2338, -2338, -2338, -2338, -2338, 900, -2338,
- 900, -2338, -2338, 900, 900, -2338, -2338, 900, -2338, -2338,
- -2338, -2338, 1299, 900, -2338, 900, 48, -2338, -2338, 1476,
- 1485, -2338, 900, 16, 16, 16, -2338, -2338, -2338, -2338,
- -2338, -2338, 1488, 16, 16, 16, 357, -2338, 35, 16,
- 16, 16, -2338, -2338, 16, 16, 1489, 16, 16, 1491,
- 35, 527, -2338, 1492, 1495, 1496, -2338, 1041, -2338, 1063,
- 1070, -2338, 698, -2338, 1242, 1497, 1499, 1500, 35, 35,
- -64, 1502, 1503, -64, 1504, 1507, 1508, -2338, 42, -2338,
- -2338, -2338, 4636, 168, -2338, -2338, -2338, 4409, 1077, 900,
- 1086, 964, 401, -2338, -2338, -2338, 536, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, 1509,
- 900, -2338, 168, 1510, 900, 4636, 168, 1157, 1294, 1301,
- 208, 222, 1303, 244, 1224, 1513, 1515, 1516, 432, 1519,
- 1520, 1525, 1245, 1020, 1526, 900, 1102, 1186, -2338, -2338,
- 168, 4409, -2338, -2338, 4409, 900, 34, 1529, 900, 1364,
- 1107, 168, -2338, 4409, 4636, -2338, -2338, -2338, 168, 168,
- 4409, -2338, -2338, -2338, -2338, -2338, -2338, 4409, 900, 168,
- -2338, -2338, -2338, 900, -2338, -2338, 1530, 900, 1321, 166,
- 900, 1323, 900, 178, 900, -2338, 900, 1325, 1326, 900,
- 900, 900, 900, 900, 900, 900, 8, 900, 900, 1327,
- -2338, 900, 900, 900, 900, -2338, 4636, 1364, 1536, 4636,
- 4636, 900, 900, 1364, 1107, -2338, -2338, 900, 900, 900,
- 4636, -2338, 900, 900, -2338, -2338, -2338, 1537, -2338, -2338,
- -2338, -2338, -2338, -2338, 900, 900, -2338, 900, 900, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -31, -31, -31, -31,
- -31, -31, -31, -31, -31, 900, -2338, 900, -2338, -2338,
- -2338, -2338, 1613, 900, 1364, 900, 900, 900, -2338, 900,
- 900, 1538, 900, 1539, 1542, 900, 900, -2338, -2338, -2338,
- 1540, 432, 1546, 1548, 1549, 1550, 1554, 1556, -2338, 168,
- 4636, 4636, 900, -2338, -2338, -2338, 1364, -2338, 870, 900,
- 870, -2338, -2338, -13, 1364, 4636, -2338, -2338, 900, 900,
- 1558, 362, -2338, -2338, -2338, -2338, -2338, -2338, 900, -2338,
- -2338, -2338, -2338, 362, 900, 1560, -2338, -2338, -2338, 1564,
- 1565, -2338, 1364, -2338, 4409, 4409, 4409, 4409, 4409, 1364,
- -2338, 4409, -2338, -2338, 4409, -2338, -2338, 4409, 4409, 4409,
- 4409, 4409, 4409, -2338, 4636, 4409, 900, -2338, -2338, 4636,
- 4409, 4409, -2338, 4636, 4409, -2338, -2338, -2338, -2338, 4636,
- 4409, -2338, -2338, -2338, -2338, -2338, 900, -2338, -2338, 1567,
- 900, -2338, -2338, 1568, 1570, -2338, 900, -2338, -2338, -2338,
- 16, -2338, -2338, -2338, 1571, 1572, 1573, -2338, -2338, -64,
- 1576, 1578, 1579, 16, -2338, -2338, -2338, -2338, -2338, 35,
- -2338, -2338, 1582, 16, 1583, 1584, 1585, 35, 35, -64,
- 1587, 1588, 1589, 922, -2338, 1016, -2338, 1197, 1254, 1590,
- 1592, 1593, 35, 35, -64, 1595, 1596, -64, 1597, 1318,
- 1600, 1601, 1602, 35, 35, -64, 1604, 1605, -64, 1607,
- 1333, 1608, 1610, 1614, 35, 35, -64, 1616, 1617, -64,
- 1619, 1620, 1621, 1624, 35, 35, -64, 1618, 1626, 1630,
- 35, -2338, -2338, -2338, -2338, -2338, 1627, -2338, -2338, 1632,
- 35, 1634, 1636, -2338, -2338, -2338, 1364, -2338, 1364, -2338,
- 4636, 900, 900, 4636, 900, 1637, 1168, -2338, -2338, -2338,
- -2338, -2338, -2338, 1640, 4409, 168, 1641, 4409, 1364, -2338,
- 1642, 1168, 900, 900, 900, 900, 900, 900, 900, 900,
- 900, 1646, -2338, -2338, -2338, 1647, -2338, -2338, -2338, 1649,
- -2338, -2338, -2338, 900, 4636, 900, 1654, 1168, 168, 1364,
- 1107, 1364, 900, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, 900, 1107, 1107, -2338, 1364, 1107, 1364,
- -2338, -2338, 1364, 1107, 1364, 1107, -2338, -2338, -2338, -2338,
- 900, 900, 900, 900, 900, 900, 900, 900, 900, 900,
- -2338, 900, 900, 900, 900, 900, 900, 900, 900, 900,
- 900, 3658, 1655, 900, -2338, 900, 900, 900, 1650, 1659,
- -2338, -2338, 1364, -13, 1663, 1364, 1364, -2338, -2338, 1107,
- -2338, 900, -2338, 1664, 1364, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, 900, 900, 1364, 900, -2338, 1107,
- 900, -2338, 900, -2338, 1541, 1665, 1666, 1669, 1569, 900,
- 900, 1670, 1671, -2338, 1673, -2338, -2338, -2338, -2338, -2338,
- 1364, 1364, 4636, -2338, -2338, 900, -2338, 900, -2338, -13,
- 98, 900, 1674, -2338, -2338, 900, -2338, 33, -2338, 1686,
- 1687, -2338, 98, -2338, 98, -2338, 98, -2338, 1364, -2338,
- 98, -2338, -13, 98, -2338, 98, -2338, 1364, -2338, 98,
- -2338, 98, -2338, 98, -2338, 1364, -2338, 98, -2338, 98,
- 1364, -2338, 4636, 98, 1364, -2338, 98, -2338, 98, 1364,
- -2338, 98, 1364, -2338, -2338, 1689, 33, -2338, -2338, 900,
- -2338, -2338, -2338, -2338, 1691, -2338, -2338, -2338, -2338, 16,
- 35, -2338, -2338, -2338, -2338, -2338, -2338, 1692, -2338, -2338,
- 35, 1693, 1694, 1699, 35, 35, -64, 1697, 1704, 1708,
- 1709, 1711, 1712, 35, 35, -64, 1705, 1714, 1715, 1717,
- 1719, 1720, 35, 35, -64, 1722, 1723, 1724, 35, 16,
- 16, 16, 16, 16, 1726, 16, 16, 1727, 35, 35,
- 16, 16, 16, 16, 16, 1728, 16, 16, 1729, 35,
- 35, -2338, -2338, -2338, -2338, -2338, 1731, -2338, -2338, 1733,
- 35, -2338, -2338, -2338, -2338, -2338, 1734, -2338, -2338, 35,
- -2338, 35, 1735, -2338, 1746, 1764, -2338, -2338, 98, 1766,
- 4409, 98, 900, 4636, 1769, -2338, 98, -2338, -2338, -2338,
- 98, -2338, -2338, 4636, 1771, 900, 900, 900, 900, 900,
- 900, 900, 900, 900, 900, -2338, -2338, 4409, 98, 900,
- 4636, 1773, -2338, 1107, 1107, 1107, 900, 4409, 1107, 900,
- 1107, 1107, 4636, 1107, 900, 1107, -2338, 900, 900, 900,
- 900, 900, 900, 1168, 900, 900, 900, 1168, 900, 900,
- 900, 900, 1168, 900, 900, 900, 900, 900, 1364, 900,
- 1313, 1168, 900, 900, -2338, -2338, -13, 168, 1774, 1776,
- -2338, -2338, -2338, -2338, -2338, -13, -2338, -2338, 1107, 900,
- -2338, -2338, -2338, 996, 1778, 1779, -2338, 1781, 900, 1784,
- 870, 1785, -2338, -2338, -2338, 98, -2338, -2338, -2338, -2338,
- 1789, -2338, -2338, -2338, 1790, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -13, 98, -2338, -13, -2338, -2338, -13, -2338, -13,
- 1791, -2338, 900, -2338, -2338, 16, 35, -2338, 16, 16,
- 16, 16, 16, 1793, 16, 16, 35, -2338, -2338, -2338,
- -2338, -2338, 1794, -2338, -2338, 35, 16, 16, 16, 16,
- 16, 1795, 16, 16, 35, 16, -2338, -2338, -2338, -2338,
- -2338, 35, -2338, -2338, 1796, 16, 16, -2338, -2338, -2338,
- -2338, -2338, 35, -2338, -2338, 1799, 16, -2338, 35, 1802,
- -2338, 35, -2338, -2338, 35, -2338, -2338, -2338, 4409, 98,
- -2338, -2338, 1804, 1364, 900, -2338, -2338, 1364, 900, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, 900, 98,
- -2338, -2338, 1805, 1364, 900, 1107, -2338, -2338, -2338, 98,
- -2338, 900, -2338, 1107, -2338, 98, 4636, 1168, -2338, 900,
- 1809, 1809, 900, 900, 1809, 1168, 1809, -2338, 4636, 1168,
- 1809, 1809, 900, 900, 1168, 900, 900, 900, 900, -2338,
- 1107, 900, 1810, -2338, -2338, 900, 1809, 168, 23, -2338,
- 1812, 168, -2338, -2338, 1813, 900, -2338, 1816, -2338, 1819,
- 1577, 900, -2338, -2338, -2338, 1820, -2338, -2338, -2338, -2338,
- -2338, -2338, 900, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- 35, -2338, -2338, 16, 35, -2338, -2338, -2338, -2338, -2338,
- -2338, 35, -2338, -2338, 16, -2338, 16, 35, -2338, -2338,
- 16, 35, -2338, -2338, 35, -2338, -2338, 98, -2338, -2338,
- 4409, 4636, 900, 4636, 900, -2338, -2338, 4409, 4636, 900,
- -2338, -2338, 4636, -2338, -2338, 98, -2338, 1822, -2338, -2338,
- -2338, 1168, 900, -2338, 1823, -2338, -2338, 1364, 1825, -2338,
- -2338, 1168, 900, 1827, -2338, -2338, 900, 4636, -2338, -2338,
- -2338, -2338, -2338, -2338, 23, 1350, 1191, -2338, -2338, 1828,
- 1829, -2338, 1635, 1832, 125, -2338, 1835, 16, -2338, -2338,
- 16, -2338, -2338, 16, -2338, 16, -2338, -2338, 98, -2338,
- 98, 900, 98, 1836, 98, -2338, 98, 900, 98, 900,
- -2338, -2338, -2338, -2338, 1838, -2338, 900, -2338, -2338, 900,
- -2338, -2338, -2338, 1839, 900, -2338, -2338, -2338, 1364, -2338,
- -2338, 1350, -2338, 1383, 1479, 1191, -2338, 1841, 1842, 1844,
- -2338, -2338, -2338, -2338, -2338, -2338, 900, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, 1845, -2338, 4409, -2338, -2338, 1846,
- -2338, 1168, -2338, -2338, 1168, 900, -2338, 900, -2338, 1168,
- 900, -2338, 4636, -2338, 1383, -2338, 168, -2338, 1848, 1849,
- -2338, 900, 4409, 1364, -2338, 4409, -2338, -2338, 900, 1847,
- -2338, 900, 98, -2338, -2338, -2338, 1850, 1851, 1364, -2338,
- -2338, 1364, -2338, -2338, 1853, -2338, -2338, 1854, -2338, -2338,
- -2338, -2338, -2338, 1168, -2338, 1168, -2338, -2338, -2338, -2338,
- -2338
+ 4810, -4, 1046, -2348, -2348, 757, -163, 299, 622, 92,
+ 375, 2700, 91, 378, 109, 4857, 654, 2071, -2348, 91,
+ 424, 101, -87, 36, -44, 283, 71, 611, 3539, 208,
+ 441, -44, -2348, -40, 65, 573, -2348, 306, 435, 589,
+ -2348, 59, -2348, 73, 1685, 231, 75, 473, 492, 891,
+ 240, 496, 508, 89, 516, 19, 118, -2348, 288, 68,
+ 91, 1, 511, 543, -2348, 526, 540, -2348, -2348, 63,
+ 540, -2348, -2348, -2348, -2348, 540, -2348, -2348, -2348, -2348,
+ -2348, -2348, 311, 548, 4525, 107, 521, 579, 595, 619,
+ 634, 719, -2348, -2348, -2348, 540, 1023, 540, 540, 515,
+ 540, -2348, -2348, -2348, 489, -2348, -2348, -2348, -2348, 4334,
+ -2348, -2348, -2348, -2348, -2348, -2348, 540, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 1387,
+ -2348, 540, -2348, -2348, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, -2348, -2348, 626, -2348, 709, 1134,
+ 10, 518, 636, 563, 3936, 58, 4410, 4291, 4334, 3674,
+ -2348, -13, 588, 807, 731, 20, 748, -44, 304, -2348,
+ 756, -2348, 609, 570, 128, 723, -43, -2348, -3, -2348,
+ 361, 765, 9, 723, -2348, 4525, -2348, -2348, -2348, 774,
+ 822, -2348, -2348, -2348, -2348, 749, -2348, -2348, -2348, 324,
+ -2348, -2348, 4525, 3854, -2348, -2348, 40, -2348, 851, 854,
+ 479, -2348, 540, -2348, 45, 216, 803, 14, -2348, -2348,
+ -2348, 859, 875, 91, 91, 540, 540, -2348, -2348, -2348,
+ -2348, -2348, 2981, -2348, 879, 885, 540, -2348, 886, -2348,
+ -2348, -2348, -2348, -2348, 540, 903, 91, 3167, 540, 1387,
+ 540, -2348, 895, -2348, 4495, -2348, -2348, 644, 900, 916,
+ 540, -2348, 280, 930, 4525, 933, -2348, 949, 540, 846,
+ -2348, 459, 307, 937, -2348, -2348, -2348, -2348, -2348, -2348,
+ 953, -2348, 82, 195, 540, 160, -2348, 540, 718, 958,
+ -2348, 540, 540, -2348, 961, 11, 12, 971, 1387, -2348,
+ -2348, -2348, 689, 540, -2348, -2348, -2348, -2348, 540, -2348,
+ 973, 974, -2348, 540, 956, -2348, -2348, -2348, -2348, -2348,
+ -2348, 540, -2348, 410, 1003, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, 540, 540, 540, -2348,
+ 540, 1005, 1009, -2348, -2348, 540, 540, 540, -2348, 540,
+ -2348, -2348, -2348, 1012, -2348, -2348, 1387, 1016, -2348, -2348,
+ -2348, -2348, 1018, 1031, 4525, -2348, 540, -2348, -2348, -2348,
+ 540, 1032, 1037, 1037, 4525, 540, 540, 540, 540, 540,
+ 540, -2348, 540, 4334, 1023, 540, 540, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, 1023, 540, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 1052,
+ -2348, 799, 380, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ 517, -2348, -2348, -2348, 922, -2348, 544, -2348, -2348, -2348,
+ -2348, -2348, 1061, -2348, 1087, -2348, -2348, -17, 908, -2348,
+ 928, -2348, -2348, -2348, 947, -2348, -2348, 1387, -2348, 540,
+ 540, 3621, 540, -2348, 4525, 4525, 1387, -2348, -2348, 1387,
+ -2348, -2348, 1387, -2348, -2348, 4525, 1387, 540, -2348, -2348,
+ 4525, -2348, 1095, 361, 927, 4, -2348, -2348, 931, 4525,
+ 1111, -2348, -2348, -2348, -2348, 1117, 1118, 1120, -2348, 939,
+ -2348, -2348, -2348, -2348, -2348, 540, -2348, 448, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, 361, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 1071,
+ -2348, 934, -2348, 540, 1136, 925, 4495, -2348, -2348, -2348,
+ 1387, 1141, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, 4525, 4525, 4525, -2348,
+ -2348, 1144, 91, -2348, -2348, 1149, 1150, 975, 540, 536,
+ 1080, -2348, 523, 1081, 4859, 18, 1160, -2348, 1166, -2348,
+ 1170, -2348, 1172, 1175, -2348, 1177, -2348, -2348, -2348, 540,
+ -2348, 4241, 1034, 440, 1180, 386, 1091, -2348, -2348, -2348,
+ 1182, 487, 1184, 15, 540, 228, 148, 77, 4525, 91,
+ 1689, 551, 7, 31, 93, 42, -2348, 1187, 1189, 1190,
+ -2348, -2348, -2348, -2348, -2348, 540, 540, 540, 540, -2348,
+ -2348, 540, 1387, 540, -2348, 540, 1023, 540, 1204, 1387,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 451, 476,
+ -2348, -2348, -2348, 1205, -2348, -2348, -2348, -2348, 1123, -2348,
+ 1206, 1208, 1213, -2348, 520, 541, 554, -2348, -2348, -2348,
+ 1216, -2348, -2348, -2348, -2348, -2348, -2348, 540, 540, -2348,
+ 540, 1221, 540, 540, -2348, 1324, -2348, 733, 1222, -2348,
+ 863, 1223, -2348, -2348, -2, 540, 540, -2348, 1198, -2348,
+ -2348, 1224, 1000, 540, 1219, 149, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 1229,
+ 540, 540, 540, 4525, -2348, 1230, 2202, -2348, 1232, 1236,
+ 1387, -2348, -2348, -2348, -2348, -2348, 1387, -2348, -2348, 540,
+ 540, 540, 4525, 540, 1023, 540, -2348, 540, -2348, -2348,
+ -2348, -2348, -2348, 1238, 1240, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, 439, -2348, 540, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 4525, 4525,
+ 4525, 1244, 540, 1387, -2348, -2, -2, -2, 1387, 1023,
+ 540, 1387, -2348, -2348, 540, 35, 1069, 1248, -2348, -2348,
+ 1387, -2348, -2348, -2348, 1249, 1252, 906, 540, 4293, 712,
+ 373, -2348, -2348, 540, 464, 980, -2348, 1011, -2348, 1689,
+ 491, 988, 83, -2348, -2348, 540, -2348, -2348, -2348, -2348,
+ 540, 1256, -2348, -2348, -2348, -2, -2348, -2348, -2348, -2348,
+ 4467, -2348, -2348, 1258, 1262, 540, 1263, 1264, 1265, 341,
+ 341, -22, 1267, 1270, 1271, 1276, 1030, 1281, 1282, 1286,
+ 465, 465, -22, 1290, 1291, -22, 1294, 1296, 4894, 1299,
+ 1300, -2348, -2348, 1301, 1302, -2348, 640, -2348, 1305, 1309,
+ -2348, 1312, -2348, -2348, 841, 986, 1090, 1097, 1102, 1218,
+ 444, 1104, 1334, 108, 1217, 1246, 866, 751, 1313, 1125,
+ 1127, 1259, 1348, 1163, 28, 50, -104, 1135, 4334, 1689,
+ 1338, -68, 1181, 1369, 33, -2348, -2348, 32, 1379, 1380,
+ -2348, -2348, -2348, 1383, 1185, 115, 1689, 1191, -2348, -2348,
+ -2348, 91, 1385, 1391, 540, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, 17, -2348, 2587, -2348, 540, -2348,
+ 540, -2348, -2348, -2348, 540, 540, 540, 386, 4525, -2348,
+ 1396, 911, -2348, -2348, 540, -2348, -2348, 540, 4334, 540,
+ -2348, 4525, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, 91, 540, -2348, 540, 386, 1397,
+ -2348, 540, 540, -2348, 91, -2348, -2348, -2348, 135, 1399,
+ 1401, -2348, -2348, -2348, -2348, 540, 540, -2348, -2348, 1023,
+ 540, 540, -2348, -2348, -2348, -2348, 540, -2348, 540, 1295,
+ -2348, 540, -2348, 540, 1306, -2348, 1392, -2348, 27, 27,
+ 27, 1402, 1410, 1412, -2348, 1419, 1420, 1422, -2348, 1423,
+ 1424, 1428, -2348, -2348, 540, -2348, 540, 1430, -2348, 540,
+ -2348, 4495, 1387, -2348, -2348, 1431, -2348, -2348, 1432, -2348,
+ -2348, -2348, -2348, 1415, 3167, -2348, 540, 1437, 540, 540,
+ 540, 926, 1429, 1436, 540, 540, 1387, 61, 1109, 1115,
+ 1119, 1124, 1130, 1131, 1137, 2202, -2348, 1138, -2348, -2348,
+ 1448, 1449, -2348, 540, 1454, 1456, 1458, -2348, 4525, -2348,
+ 540, -2348, -2348, -2348, 540, 540, 540, 1466, 1467, 1387,
+ -2348, 4525, -2, -2348, 723, 723, 1023, 540, 1470, -2,
+ 540, -8, 0, 431, -2348, 1471, -2348, 126, 540, 1473,
+ 1478, 540, -2348, 1475, 784, 4334, 1257, 1266, 1268, 96,
+ 4334, 1269, -2348, 111, 1353, 113, 1272, 1273, 134, -2348,
+ -2348, 402, 1322, 274, 374, 1689, -67, -2348, 1482, 1255,
+ -2348, 449, -2348, -2348, -2348, -2348, 1689, 1303, -2348, -2348,
+ -2348, -2348, -2348, 540, -2348, 540, -2348, -2348, 540, 540,
+ -2348, -2348, 540, -2348, -2348, -2348, -2348, 1304, 540, -2348,
+ 540, 205, -2348, -2348, 1491, 1495, -2348, 540, 341, 341,
+ 341, -2348, -2348, -2348, -2348, -2348, -2348, 1497, 341, 341,
+ 341, 820, -2348, 465, 341, 341, 341, -2348, -2348, 341,
+ 341, 1498, 341, 341, 1499, 465, 904, -2348, 1503, 1504,
+ 1505, -2348, 670, -2348, 833, 855, -2348, 985, -2348, 1260,
+ 1506, 1507, 1510, 465, 465, -22, 1512, 1513, -22, 1514,
+ 1516, 1517, -2348, 41, -2348, -2348, -2348, 4525, 91, -2348,
+ -2348, -2348, 4334, 1025, 540, 1035, 1275, 633, -2348, -2348,
+ -2348, 668, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, 1518, 540, -2348, 91, 1519, 540,
+ 4525, 91, 1337, 1298, 1307, 157, 185, 1310, 196, 1226,
+ 1521, 1523, 1524, 444, 1525, 1526, 1531, 1245, 1058, 1532,
+ 540, 1056, 1414, -2348, -2348, 91, 4334, -2348, -2348, 4334,
+ 540, -24, 1534, 540, 1387, 1023, 91, -2348, 4334, 4525,
+ -2348, -2348, -2348, 91, 91, 4334, -2348, -2348, -2348, -2348,
+ -2348, -2348, 4334, 540, 91, -2348, -2348, -2348, 540, -2348,
+ -2348, 1535, 540, 1326, 428, 540, 1329, 540, 433, 540,
+ -2348, 540, 1330, 1332, 540, 540, 540, 540, 540, 540,
+ 540, 26, 540, 540, 1333, -2348, 540, 540, 540, 540,
+ -2348, 4525, 1387, 1542, 4525, 4525, 540, 540, 1387, 1023,
+ -2348, -2348, 540, 540, 540, 4525, -2348, 540, 540, -2348,
+ -2348, -2348, 1543, -2348, -2348, -2348, -2348, -2348, -2348, 540,
+ 540, -2348, 540, 540, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -31, -31, -31, -31, -31, -31, -31, -31, -31,
+ 540, 540, -2348, 540, -2348, -2348, -2348, -2348, 3167, 540,
+ 1387, 540, 540, 540, -2348, 540, 540, 1544, 540, 1545,
+ 1548, 540, 540, -2348, -2348, -2348, 1546, 444, 1550, 1553,
+ 1554, 1555, 1556, 1559, -2348, 91, 4525, 4525, 540, -2348,
+ -2348, -2348, 1387, -2348, 662, 540, 662, -2348, -2348, -2,
+ 1387, 4525, -2348, -2348, 540, 540, 1560, 723, -2348, -2348,
+ -2348, -2348, -2348, -2348, 540, -2348, -2348, -2348, -2348, 723,
+ 540, 1561, -2348, -2348, -2348, 1562, 1563, -2348, 1387, -2348,
+ 4334, 4334, 4334, 4334, 4334, 1387, -2348, 4334, -2348, -2348,
+ 4334, -2348, -2348, 4334, 4334, 4334, 4334, 4334, 4334, -2348,
+ 4525, 4334, 540, -2348, -2348, 4525, 4334, 4334, -2348, 4525,
+ 4334, -2348, -2348, -2348, -2348, 4525, 4334, -2348, -2348, -2348,
+ -2348, -2348, 540, -2348, -2348, 1566, 540, -2348, -2348, 1570,
+ 1572, -2348, 540, -2348, -2348, -2348, 341, -2348, -2348, -2348,
+ 1574, 1575, 1576, -2348, -2348, -22, 1573, 1578, 1579, 341,
+ -2348, -2348, -2348, -2348, -2348, 465, -2348, -2348, 1582, 341,
+ 1583, 1584, 1585, 465, 465, -22, 1587, 1591, 1592, 1041,
+ -2348, 1068, -2348, 1200, 1344, 1594, 1597, 1600, 465, 465,
+ -22, 1602, 1603, -22, 1604, 1354, 1605, 1606, 1607, 465,
+ 465, -22, 1609, 1610, -22, 1643, 1361, 1644, 1645, 1647,
+ 465, 465, -22, 1649, 1650, -22, 1651, 1652, 1653, 1654,
+ 465, 465, -22, 1656, 1657, 1658, 465, -2348, -2348, -2348,
+ -2348, -2348, 1660, -2348, -2348, 1661, 465, 1662, 1665, -2348,
+ -2348, -2348, 1387, -2348, 1387, -2348, 4525, 540, 540, 4525,
+ 540, 1666, 986, -2348, -2348, -2348, -2348, -2348, -2348, 1668,
+ 4334, 91, 1669, 4334, 1387, -2348, 1670, 986, 540, 540,
+ 540, 540, 540, 540, 540, 540, 540, 1672, -2348, -2348,
+ -2348, 1675, -2348, -2348, -2348, 1673, -2348, -2348, -2348, 540,
+ 4525, 540, 1676, 986, 91, 1387, 1023, 1387, 540, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 540,
+ 1023, 1023, -2348, 1387, 1023, 1387, -2348, -2348, 1387, 1023,
+ 1387, 1023, -2348, -2348, -2348, -2348, 540, 540, 540, 540,
+ 540, 540, 540, 540, 540, 540, -2348, 540, 540, 540,
+ 540, 540, 540, 540, 540, 540, 540, 3621, 1677, 540,
+ -2348, 540, 540, 540, 1679, 1680, -2348, -2348, 1387, -2,
+ 1681, 1387, 1387, -2348, -2348, 1023, -2348, 540, -2348, 1682,
+ 1387, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 540,
+ -2348, 540, 540, 1387, 540, -2348, 1023, 540, -2348, 540,
+ -2348, 1571, 1692, 1693, 1695, 1552, 540, 540, 1696, 1697,
+ -2348, 1699, -2348, -2348, -2348, -2348, -2348, 1387, 1387, 4525,
+ -2348, -2348, 540, -2348, 540, -2348, -2, 126, 540, 1700,
+ -2348, -2348, 540, -2348, 361, -2348, 1701, 1702, -2348, 126,
+ -2348, 126, -2348, 126, -2348, 1387, -2348, 126, -2348, -2,
+ 126, -2348, 126, -2348, 1387, -2348, 126, -2348, 126, -2348,
+ 126, -2348, 1387, -2348, 126, -2348, 126, 1387, -2348, 4525,
+ 126, 1387, -2348, 126, -2348, 126, 1387, -2348, 126, 1387,
+ -2348, -2348, 1706, 361, -2348, -2348, 540, -2348, -2348, -2348,
+ -2348, 1708, -2348, -2348, -2348, -2348, 341, 465, -2348, -2348,
+ -2348, -2348, -2348, -2348, 1710, -2348, -2348, 465, 1711, 1712,
+ 1714, 465, 465, -22, 1716, 1717, 1718, 1719, 1720, 1721,
+ 465, 465, -22, 1723, 1724, 1725, 1726, 1727, 1728, 465,
+ 465, -22, 1730, 1731, 1732, 465, 341, 341, 341, 341,
+ 341, 1734, 341, 341, 1735, 465, 465, 341, 341, 341,
+ 341, 341, 1736, 341, 341, 1737, 465, 465, -2348, -2348,
+ -2348, -2348, -2348, 1738, -2348, -2348, 1739, 465, -2348, -2348,
+ -2348, -2348, -2348, 1740, -2348, -2348, 465, -2348, 465, 1741,
+ -2348, 1752, 1764, -2348, -2348, 126, 1766, 4334, 126, 540,
+ 4525, 1770, -2348, 126, -2348, -2348, -2348, 126, -2348, -2348,
+ 4525, 1771, 540, 540, 540, 540, 540, 540, 540, 540,
+ 540, 540, -2348, -2348, 4334, 126, 540, 4525, 1773, -2348,
+ 1023, 1023, 1023, 540, 4334, 1023, 540, 1023, 1023, 4525,
+ 1023, 540, 1023, -2348, 540, 540, 540, 540, 540, 540,
+ 986, 540, 540, 540, 986, 540, 540, 540, 540, 986,
+ 540, 540, 540, 540, 540, 1387, 540, 1278, 986, 540,
+ 540, -2348, -2348, -2, 91, 1774, 1776, -2348, -2348, -2348,
+ -2348, -2348, -2, 540, -2348, -2348, 1023, 540, -2348, -2348,
+ -2348, 970, 1777, 1778, -2348, 1781, 540, 1784, 662, 1786,
+ -2348, -2348, -2348, 126, -2348, -2348, -2348, -2348, 1787, -2348,
+ -2348, -2348, 1788, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2,
+ 126, -2348, -2, -2348, -2348, -2, -2348, -2, 1789, -2348,
+ 540, -2348, -2348, 341, 465, -2348, 341, 341, 341, 341,
+ 341, 1791, 341, 341, 465, -2348, -2348, -2348, -2348, -2348,
+ 1792, -2348, -2348, 465, 341, 341, 341, 341, 341, 1793,
+ 341, 341, 465, 341, -2348, -2348, -2348, -2348, -2348, 465,
+ -2348, -2348, 1795, 341, 341, -2348, -2348, -2348, -2348, -2348,
+ 465, -2348, -2348, 1796, 341, -2348, 465, 1797, -2348, 465,
+ -2348, -2348, 465, -2348, -2348, -2348, 4334, 126, -2348, -2348,
+ 1798, 1387, 540, -2348, -2348, 1387, 540, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, 540, 126, -2348, -2348,
+ 1799, 1387, 540, 1023, -2348, -2348, -2348, 126, -2348, 540,
+ -2348, 1023, -2348, 126, 4525, 986, -2348, 540, 1800, 1800,
+ 540, 540, 1800, 986, 1800, -2348, 4525, 986, 1800, 1800,
+ 540, 540, 986, 540, 540, 540, 540, -2348, 1023, 540,
+ 1802, -2348, -2348, 540, 1800, 91, 5, -2348, 1803, 91,
+ -2348, -2348, -2348, 1805, 540, -2348, 1808, -2348, 1801, 1581,
+ 540, -2348, -2348, -2348, 1810, -2348, -2348, -2348, -2348, -2348,
+ -2348, 540, -2348, -2348, -2348, -2348, -2348, -2348, -2348, 465,
+ -2348, -2348, 341, 465, -2348, -2348, -2348, -2348, -2348, -2348,
+ 465, -2348, -2348, 341, -2348, 341, 465, -2348, -2348, 341,
+ 465, -2348, -2348, 465, -2348, -2348, 126, -2348, -2348, 4334,
+ 4525, 540, 4525, 540, -2348, -2348, 4334, 4525, 540, -2348,
+ -2348, 4525, -2348, -2348, 126, -2348, 1812, -2348, -2348, -2348,
+ 986, 540, -2348, 1814, -2348, -2348, 1387, 1816, -2348, -2348,
+ 986, 540, 1817, -2348, -2348, 540, 4525, -2348, -2348, -2348,
+ -2348, -2348, -2348, 5, 1447, 1689, -2348, -2348, 1818, 1820,
+ -2348, 1698, 1824, 125, -2348, 1825, 341, -2348, -2348, 341,
+ -2348, -2348, 341, -2348, 341, -2348, -2348, 126, -2348, 126,
+ 540, 126, 1826, 126, -2348, 126, 540, 126, 540, -2348,
+ -2348, -2348, -2348, 1828, -2348, 540, -2348, -2348, 540, -2348,
+ -2348, -2348, 1829, 540, -2348, -2348, -2348, 1387, -2348, -2348,
+ 1447, -2348, 1468, 1320, 1689, -2348, 1830, 1831, 1833, -2348,
+ -2348, -2348, -2348, -2348, -2348, 540, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, 1834, -2348, 4334, -2348, -2348, 1836, -2348,
+ 986, -2348, -2348, 986, 540, -2348, 540, -2348, 986, 540,
+ -2348, 4525, -2348, 1468, -2348, 91, -2348, 1838, 1841, -2348,
+ 540, 4334, 1387, -2348, 4334, -2348, -2348, 540, 1837, -2348,
+ 540, 126, -2348, -2348, -2348, 1842, 1844, 1387, -2348, -2348,
+ 1387, -2348, -2348, 1846, -2348, -2348, 1847, -2348, -2348, -2348,
+ -2348, -2348, 986, -2348, 986, -2348, -2348, -2348, -2348, -2348
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -2338, -2338, -10, -2338, 265, -200, -2338, -1507, -854, 1280,
- -2338, 741, 370, 1390, -35, 1058, -1475, 1758, -686, 785,
- -2338, -808, 1373, 1606, -277, -2338, -1128, -2338, -2338, 99,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -1235, -2338, -2338,
- -2338, -2338, -2338, -605, -2338, -2338, -2338, -2338, -2338, -2338,
- 52, -2338, -2338, -2338, -2338, 585, -617, -736, -716, -2338,
- -2338, -2338, -2338, -727, -627, -2338, -2338, -2337, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338, -2338,
- -2338, -2338
+ -2348, -2348, -10, -2348, 600, -201, -2348, -1595, -874, 1331,
+ -2348, 680, -148, 1395, -37, 1060, -1480, 1819, -688, -1685,
+ -2348, -759, 1176, 1615, -101, -2348, -1142, -2348, -2348, 39,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -1276,
+ -2348, -2348, -2348, -2348, -2348, -605, -2348, -2348, -2348, -2348,
+ -2348, -2348, 44, -2348, -2348, -2348, -2348, 686, -619, -1244,
+ -581, -2348, -2348, -2348, -2348, -640, -607, -2348, -2348, -2347,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348, -2348,
+ -2348, -2348, -2348, -2348
};
/* 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 -1047
+#define YYTABLE_NINF -1051
static const yytype_int16 yytable[] =
{
- 99, 547, 990, 1845, 1355, 1847, 804, 101, 316, 964,
- 967, 92, 93, 1771, 101, 247, 994, 695, 266, 591,
- 1493, 505, 1003, -1033, 287, 1292, 1495, 335, 92, 93,
- 92, 93, 310, 92, 93, 321, 364, 1267, 326, 153,
- 92, 93, 332, 92, 93, 339, 776, 544, 348, 578,
- 154, 356, 1222, 101, 239, 363, 1533, 92, 93, 367,
- 1226, 1724, 375, 1229, 368, 679, 698, 959, 1561, 92,
- 93, 777, 1497, 1705, 1663, 879, 1126, 104, 1725, 232,
- 1064, 1726, 155, 280, 384, 104, 393, 394, 398, 400,
- 156, 996, 1727, 293, 1210, 657, 554, 1421, 1191, 506,
- 305, 516, 1802, 92, 93, 404, 351, 1118, 1119, 1120,
- 1337, 240, 1004, 341, 106, 1728, 2495, 47, 1005, 575,
- 104, 106, 1500, 1501, 101, 270, 64, 507, 92, 93,
- 92, 93, 1729, 241, 969, 1333, 1405, 970, 1517, 555,
- 416, 880, 294, 157, 1527, 352, 1458, 467, 1406, 237,
- 1168, 256, 251, 508, 252, 1196, 764, 2513, 1293, 445,
- 106, 1322, 1803, 342, 469, 1206, 92, 93, 233, 92,
- 93, 761, 101, 203, 295, 1192, 248, 318, 1326, 242,
- 165, 92, 93, 1127, 1327, 1211, 1223, 1320, 1334, 204,
- 1534, 1502, 1207, 158, 1531, 109, 658, 1345, 281, 669,
- 110, 111, 109, 524, 234, 971, 765, 110, 111, 1169,
- 1185, 306, 285, 517, 323, 159, 101, 160, 545, 438,
- 577, 1422, 1294, 972, 439, 576, 1832, 1339, 112, 1694,
- 324, 106, 1065, 598, 599, 1170, 112, 648, 515, 556,
- 161, 109, 1535, 1696, 632, 344, 110, 111, 249, 960,
- 1323, 762, 634, 637, 670, 640, 644, 1494, 646, 440,
- 336, 235, 365, 1496, 1295, 1699, 253, 592, 656, 1522,
- 1562, 112, 376, 997, 579, 665, 667, 152, 164, 106,
- 995, 441, 114, 696, 223, 973, 1346, 1356, 245, 114,
- 307, -1033, 686, 687, 273, 688, 1772, 805, 1331, 691,
- 692, 468, 1006, 286, 2461, 162, 309, 1664, 778, 1171,
- 704, 706, 109, 320, 518, 1349, 707, 110, 111, 852,
- 853, 710, 712, 106, 350, 296, 442, 961, 114, 713,
- 331, 144, 699, 581, 243, 145, 146, 1338, 144, 509,
- 862, 1518, 145, 146, 721, 722, 723, 1528, 724, 863,
- 864, 998, 345, 727, 728, 729, 1172, 730, 1386, 1459,
- 109, 1037, 854, 92, 93, 110, 111, 254, 1730, 443,
- 444, 1574, 1575, 1321, 739, 65, 974, 144, 740, 1752,
- 244, 145, 146, 745, 746, 747, 748, 749, 750, 1400,
- 751, 1757, 865, 755, 756, 346, 347, 1532, 671, 114,
- 92, 93, 1523, 1324, 109, 271, 758, 282, 66, 110,
- 111, 2462, 525, 1340, 1576, 272, 1038, 1676, 417, 418,
- 419, 420, 421, 422, 423, 424, 425, 426, 92, 93,
- 283, 1485, 1695, 81, 289, 526, 534, 582, 1491, 1347,
- 816, 817, 1656, 1691, 1041, 1659, 1697, 114, 144, 104,
- 92, 93, 145, 146, 2463, 2464, 528, 786, 787, 788,
- 790, 682, 94, 1717, 82, 511, 1524, 1539, 1700, 1272,
- 369, 1173, 328, 92, 93, 798, 67, 452, 83, 529,
- 95, 84, 1000, 329, 453, 1548, 855, 856, 570, 85,
- 943, 114, 818, 330, 1273, 334, 144, 86, 819, 1042,
- 145, 146, 1677, 815, 92, 93, 596, 597, 1525, 362,
- 840, 583, 104, 92, 93, 530, 866, 867, 1182, 1540,
- 1075, 512, 1045, 290, 378, 370, 373, 1274, 1076, 639,
- 96, 944, 836, 1275, 943, 535, 380, 1276, 1577, 1578,
- 144, 1594, 1595, 1542, 145, 146, 381, 71, 876, 1058,
- 1059, 257, 857, 1277, 1551, 1179, 68, 820, 584, 379,
- 1039, 858, 859, 382, 680, 325, 1537, 851, 383, 87,
- 821, 371, 1538, 401, 1278, 944, 1022, 1046, 822, 649,
- 1541, 585, 868, 823, 1596, 427, 358, 1678, 889, 714,
- 1279, 869, 870, 860, 936, 1174, 871, 428, 92, 93,
- 112, 69, 531, 962, 1579, 943, 975, 711, 88, 448,
- 97, 354, 450, 1580, 1581, 650, 291, 768, 1280, 1549,
- 937, 92, 93, 872, 1010, 1011, 1012, 1013, 683, 1760,
- 1014, 824, 1016, 1679, 1017, 2301, 1019, 1680, 501, 89,
- 355, 1175, 1186, 1043, 1023, 1582, 944, 1357, 503, 715,
- 48, 825, 1358, 1281, 945, 826, 504, 827, 1057, 1027,
- 651, 966, 72, 112, 1282, 1176, 946, 947, 571, 1359,
- 1360, 1550, 1361, 1362, 963, 1283, 359, 1050, 1051, 828,
- 1054, 1055, 954, 1363, 73, 258, 829, 49, 74, 520,
- 259, 521, 260, 1067, 1068, 1364, 1365, 98, 945, 991,
- 1072, 1073, 1284, 1366, 830, 50, 1367, 769, 1597, 1598,
- 946, 947, 1641, 1642, 1285, 716, 1286, 1287, 1078, 1079,
- 1080, 1047, 1681, 1368, 1024, 673, 90, 1028, 1369, 1370,
- 523, 1371, 338, 543, 51, 550, 75, 1099, 1100, 1101,
- 552, 1103, 224, 1105, 938, 1106, 360, 573, 52, 574,
- 955, 53, 92, 93, 275, 1643, 1288, 948, 949, 652,
- 831, 558, 1109, 54, 1111, 594, 225, 992, 1682, 945,
- 76, 1914, 754, 1298, 1599, 92, 93, 770, 77, 78,
- 1116, 946, 947, 1600, 1601, 757, 395, 1025, 1123, 1372,
- 939, 1927, 1125, 717, 600, 601, 1299, 1848, 718, 1300,
- 587, 948, 949, 674, 1136, 1138, 1964, 1029, 595, 1967,
- 630, 1178, 1180, 1183, 940, 1602, 588, 1975, 1187, 631,
- 1978, 633, 2014, 1193, 647, 559, 1194, 654, 1986, 1301,
- 956, 1989, 655, 92, 93, 226, 847, 2024, 1996, 1235,
- 1373, 1202, 487, 675, 660, 1374, 602, 993, 227, 662,
- 276, 668, 603, 1543, 396, 1302, 488, 1303, 1375, 604,
- 677, 605, 560, 2041, 2433, 678, 606, 635, 685, 607,
- 1030, 690, 948, 949, 2442, 608, 537, 689, 489, 1644,
- 1645, 1266, 693, 978, 701, 609, 703, 57, 1001, 299,
- 589, 610, 58, 708, 1376, 1377, 709, 490, 71, 720,
- 561, 1325, 228, 92, 93, 1544, 92, 93, 1061, 1062,
- 491, 611, 538, 492, 55, 1378, 1508, 277, 725, 1486,
- 1487, 1348, 726, 1509, 1510, 300, 278, 59, 92, 93,
- 1354, 731, 612, 733, 397, 636, 1931, 1932, 493, 494,
- 663, 92, 1135, 229, 1381, 1646, 1382, 736, 613, 60,
- 1383, 1384, 1385, 230, 1647, 1648, 614, 615, 1545, 1379,
- 1391, 92, 93, 1392, 1244, 1395, 1304, 92, 93, 1675,
- 1071, 1264, 1265, 1245, 1246, 737, 616, 2507, 1511, 1933,
- 1451, 1398, 2510, 1399, 385, 1258, 1649, 1402, 1403, 387,
- 495, 759, 1259, 1260, 61, 760, 617, 496, 767, 92,
- 93, 1409, 1410, 1389, 1390, 539, 1412, 1413, 664, 618,
- 772, 619, 1414, 72, 1415, 1018, 1247, 1417, 301, 1418,
- 302, 1438, 620, 540, 1710, 1711, 2537, 621, 2538, 774,
- 1940, 1941, 429, 622, 780, 73, 303, 782, 62, 1844,
- 623, 1435, 800, 1261, 1437, 784, 1608, 1262, 809, 803,
- 430, 2294, 807, 497, 498, 1609, 1610, 811, 624, 1443,
- 812, 1446, 814, 1448, 1449, 1450, 1452, 431, 1619, 1455,
- 1456, 625, 626, 1942, 627, 1630, 813, 1620, 1621, 432,
- 92, 93, 1670, 834, 1631, 1632, 268, 75, 1472, 92,
- 93, 1673, 837, 433, 842, 1477, 434, 2087, 1611, 1478,
- 1479, 1480, 838, 1934, 1935, 92, 93, 1714, 435, 846,
- 92, 93, 1489, 848, 628, 1492, 385, 386, 387, 849,
- 1622, 76, 1104, 1504, 850, 499, 1506, 1633, 2163, 77,
- 78, 742, 743, 2370, 1424, 1425, 2373, 2172, 2375, 861,
- 1248, 1249, 2379, 2380, 873, 882, 2181, 884, 885, 436,
- 1805, 1806, 1807, 1808, 1809, 1810, 1811, 1812, 2393, 886,
- 92, 93, 1690, 2118, 1264, 1265, 403, 1122, 1553, 1936,
- 1554, 92, 93, 1555, 1556, 1264, 1265, 1557, 1937, 1938,
- 887, 888, 953, 1559, 1007, 1560, 2131, 942, 951, 92,
- 93, 1716, 1566, 1264, 1265, 958, 1009, 1943, 1944, 1020,
- 1008, 1305, 1351, 1032, 1033, 1034, 1250, 1035, 1036, 2265,
- 1939, 1949, 1950, 2269, 1049, 1251, 1252, 1052, 2274, 1060,
- 1253, 1063, 1612, 1613, 1306, 1070, 1069, 1307, 1074, 1077,
- 1308, 1082, 470, 1095, 478, 481, 485, 1096, 1130, 1107,
- 1108, 1115, 1131, 513, 1623, 1624, 1133, 1254, 1134, 1184,
- 1189, 1634, 1635, 1195, 1951, 1397, 542, 1309, 1671, 1672,
- 1674, 1266, 1199, 1945, 1200, 1404, 1203, 1204, 1205, 1213,
- 1214, 1218, 1946, 1947, 1215, 1216, 1219, 1220, 979, 1221,
- 1684, 1227, 1228, 1310, 1687, 1311, 980, 1266, 1614, 1230,
- 1231, 1854, 981, 1237, 1239, 1240, 1242, 1615, 1616, 1255,
- 1256, 1296, 1617, 1856, 1948, 1713, 1715, 1266, 982, 1257,
- 1625, 1271, 1268, 1291, 1269, 1723, 1270, 1636, 1733, 1626,
- 1627, 1290, 1297, 642, 1628, 1315, 1637, 1638, 1316, 1618,
- 1314, 1639, 1317, 983, 1318, 1319, 1328, 1332, 1746, 1336,
- 1335, 984, 1341, 1748, 1342, 1343, 1344, 1750, 1350, 1753,
- 1754, 1629, 1756, 1758, 1759, 1352, 1761, 1353, 1640, 1764,
- 1765, 1766, 1767, 1768, 1769, 1770, 1773, 1775, 1776, 1416,
- 1388, 1778, 1779, 1780, 1781, 1401, 1407, 985, 1952, 1953,
- 1408, 1787, 1788, 1420, 986, 1411, 1419, 1791, 1792, 1793,
- 1426, 1427, 1795, 1796, 1312, 1428, 1431, 405, 1429, 1430,
- 2287, 1432, 1433, 2366, 1798, 1799, 1434, 1800, 1801, 2291,
- 1436, 2374, 1440, 1441, 1454, 2378, 1442, 1447, 267, 1453,
- 2383, 1470, 1499, 987, 1471, 1813, 1461, 1814, 1473, 1462,
- 1463, 1464, 1815, 1818, 988, 1820, 1821, 1822, 1465, 1823,
- 1824, 1466, 1826, 1474, 1954, 1829, 1830, 1313, 1467, 989,
- 1475, 1469, 1481, 1955, 1956, 2306, 1482, 1490, 2308, 753,
- 1505, 2309, 1842, 2310, -413, 1507, 406, 1514, 1536, 1846,
- 1515, 1516, 1526, 374, 1521, 1529, 1530, 1546, 1851, 1852,
- 1564, 1547, 407, 408, 409, 1957, 1558, 1552, 1855, 1565,
- 410, 1488, 1570, 1589, 1857, 1592, 1650, 1603, 402, 925,
- 1605, 1607, 1651, 411, 1652, 1653, 1657, 1658, 1958, 1660,
- 412, 1661, 1662, 926, 1683, 1686, 1701, 1702, 1692, 1703,
- 1704, 413, 927, 1706, 1707, 1693, 1892, 1698, 1667, 1708,
- 1712, 2376, 928, 1732, 1751, 1749, 1755, 1709, 1762, 1763,
- 1777, 1784, 1797, 1825, 1831, 1827, 1904, 2391, 1828, 802,
- 1906, 1833, 1834, 2103, 1835, 1836, 1909, 1685, 929, 1837,
- 1838, 1689, 1853, 465, 1858, 474, 477, 480, 484, 1859,
- 1860, 1905, 1969, 1907, 1908, 2107, 1911, 1912, 1913, 930,
- 1915, 833, 1916, 2403, 1917, 1718, 1920, 1980, 1922, 1923,
- 1924, 1928, 1929, 549, 1930, 1959, 1736, 1960, 1961, 1965,
- 1966, 2282, 1968, 1740, 1741, 1970, 1971, 1972, 1976, 1977,
- 563, 568, 1979, 1981, 1747, 1982, 92, 93, -1046, 1983,
- 1987, 1988, 1997, 931, 1990, 1991, 1992, 2506, 414, 1993,
- 1998, 2001, 102, 2431, 2432, 1999, 2002, 2435, 2004, 2437,
- 2005, 2459, 2013, 2440, 2441, 2015, 2019, 2023, 2445, 2446,
- 2034, 1087, 2035, 2036, 2084, 641, 2449, 2450, 932, 2040,
- 2079, 2009, 2010, 2085, 2012, 104, 1266, 2088, 2094, 741,
- 2104, 2105, 661, 2106, 2110, 1468, 2111, 2112, 2451, 2121,
- 933, 1266, 2025, 2026, 2027, 2028, 2029, 2030, 2031, 2032,
- 2033, 2124, 2125, 2150, 2482, 2153, 2156, 2483, 2158, 2159,
- 1735, 2164, 2486, 2037, 2160, 2039, 2488, 1266, 2165, 2173,
- 105, 2491, 2046, 2166, 2167, 206, 2168, 2169, 2174, 934,
- 2175, 935, 2176, 2047, 2177, 2178, 2182, 2183, 2497, 2184,
- 2191, 2194, 2202, 2205, 1839, 2208, 207, 2209, 2211, 2214,
- 2057, 2058, 2059, 2060, 2061, 2062, 2063, 2064, 2065, 2066,
- 2215, 2067, 2068, 2069, 2070, 2071, 2072, 2073, 2074, 2075,
- 2076, 2077, 107, 2080, 1790, 2081, 2082, 2083, 2216, 208,
- 2218, 2523, 738, 2224, 2526, 2228, 209, 2244, 2289, 2454,
- 2290, 2093, 744, 2296, 2297, 2298, 210, 211, 2300, 2534,
- 2302, 752, 2536, 212, 2304, 2305, 2311, 2320, 2324, 2331,
- 2337, 2539, 2540, 2341, 2096, 2097, 2344, 2099, 2350, 2357,
- 2101, 213, 2102, 2368, 2496, 2390, 112, 2397, 2399, 2108,
- 2109, 2401, 113, 2402, 2493, 2405, 2430, 2436, 214, 2439,
- 1110, 2444, 0, 2457, 2458, 2116, 2460, 2117, 2454, 2467,
- 2476, 2120, 2484, 2489, 215, 2122, 2498, 2499, 2500, 2502,
- 2505, 2525, 216, 2515, 2516, 2529, 2530, 2533, 2535, 789,
- 0, 0, 791, 792, 0, 0, 0, 0, 0, 0,
- 0, 217, 0, 796, 0, 0, 0, 0, 799, 0,
- 0, 0, 0, 0, 0, 0, 0, 808, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2152,
- 0, 0, 0, 0, 0, 218, 0, 0, 116, 117,
+ 100, 994, 548, 1730, 1852, -1037, 1854, 318, 806, 249,
+ 968, 971, 998, 93, 94, 697, 700, 283, 268, 592,
+ 1731, 1272, 1360, 1732, 289, 545, 507, 1499, 489, 93,
+ 94, 1777, 963, 312, 1733, 1501, 323, 1711, 1342, 328,
+ 102, 241, 490, 334, 571, 778, 341, 1007, 1000, 350,
+ 579, 337, 358, 93, 94, 1325, 365, 1734, 48, 1344,
+ 369, 93, 94, 307, 491, 370, 1426, 366, 93, 94,
+ 779, 93, 94, 1669, 1735, 282, 93, 94, 93, 94,
+ 93, 94, 536, 492, 1327, 386, 102, 395, 396, 400,
+ 402, 1069, 93, 94, 1549, 102, 493, 102, 242, 494,
+ 1196, 883, 1808, 1464, 508, 65, 406, 1123, 1124, 1125,
+ 105, 973, 377, 1231, 974, 2504, 1234, 1523, 93, 94,
+ 243, 93, 94, 82, 495, 496, 1766, 234, 93, 94,
+ 353, 239, 509, 258, 1533, 1297, 1215, 1008, 1528, 539,
+ 1410, 418, 1331, 1009, 680, 1338, 1550, 107, 1332, 1350,
+ 1506, 1507, 1411, 1080, 83, 1537, 2522, 1201, 510, 1131,
+ 447, 1081, 1809, 93, 94, 471, 244, 884, 84, 354,
+ 250, 85, 2127, 1328, 308, 540, 497, 1197, 1700, 86,
+ 469, 537, 975, 498, 2134, 526, 2135, 87, 2136, 440,
+ 1427, 1839, 2138, 107, 441, 2140, 546, 2141, 1339, 1551,
+ 976, 2143, 107, 2144, 107, 2145, 1702, 947, 683, 2147,
+ 1190, 2148, 102, 272, 964, 2151, 235, 1705, 2153, 1508,
+ 2154, 582, 578, 2156, 572, 1567, 284, 1216, 110, 442,
+ 1001, 517, 340, 111, 112, 599, 600, 649, 1351, 499,
+ 500, 1326, 251, 1070, 166, 1345, 633, 346, 948, 285,
+ 287, 443, 236, 309, 635, 638, 756, 641, 645, 88,
+ 647, 113, 977, 970, 1500, 1343, 1132, 593, 1298, 759,
+ 657, 1529, 1502, -1037, 110, 580, 999, 666, 668, 111,
+ 112, 698, 701, 110, 338, 110, 541, 947, 111, 112,
+ 111, 112, 965, 367, 686, 688, 444, 690, 89, 807,
+ 1336, 693, 694, 66, 2470, 1361, 1670, 780, 1002, 237,
+ 1736, 501, 706, 708, 1778, 115, 1465, 1354, 709, 107,
+ 1524, 245, 378, 712, 714, 583, 1329, 1010, 948, 90,
+ 2225, 715, 1299, 2229, 470, 1530, 67, 1534, 2233, 445,
+ 446, 288, 2234, 253, 511, 254, 723, 724, 725, 311,
+ 726, 322, 295, 978, 347, 729, 730, 731, 1538, 732,
+ 2249, 115, 1391, 1004, 145, 333, 518, 246, 146, 147,
+ 115, 949, 115, 687, 1300, 684, 741, 1531, 93, 94,
+ 742, 1701, 102, 950, 951, 747, 748, 749, 750, 751,
+ 752, 1352, 753, 1405, 527, 757, 758, 348, 349, 584,
+ 110, 296, 1682, 1178, 68, 111, 112, 154, 760, 1703,
+ 145, 2471, 95, 105, 146, 147, 91, 528, 155, 145,
+ 1706, 145, 658, 146, 147, 146, 147, 1568, 1697, 1539,
+ 96, 93, 94, 297, 1491, 1503, 93, 94, 2312, 301,
+ 716, 1497, 93, 94, 940, 947, 585, 371, 1723, 320,
+ 156, 949, 818, 819, 2472, 2473, 674, 255, 157, 788,
+ 789, 790, 792, 950, 951, 2316, 559, 93, 94, 586,
+ 941, 967, 343, 325, 952, 953, 1554, 800, 519, 763,
+ 97, 1277, 1227, 105, 69, 576, 948, 115, 1026, 107,
+ 1211, 105, 330, 273, 93, 94, 1662, 326, 1022, 1665,
+ 717, 331, 372, 274, 820, 817, 1278, 277, 226, 844,
+ 821, 158, 332, 1031, 93, 94, 670, 1212, 93, 94,
+ 1543, 336, 344, 659, 958, 380, 1544, 1179, 866, 70,
+ 560, 364, 227, 840, 675, 1545, 145, 867, 868, 1279,
+ 146, 147, 2358, 93, 94, 1280, 1548, 880, 373, 1281,
+ 856, 857, 397, 375, 952, 953, 1027, 1557, 256, 764,
+ 98, 159, 2365, 1540, 113, 1282, 718, 561, 855, 822,
+ 110, 671, 2370, 1180, 676, 111, 112, 1041, 2373, 520,
+ 869, 1032, 823, 160, 298, 161, 1283, 1546, 995, 893,
+ 824, 577, 959, 858, 942, 825, 381, 1181, 1045, 291,
+ 382, 228, 1284, 278, 966, 562, 1109, 979, 162, 949,
+ 1555, 1049, 153, 165, 229, 1541, 1228, 360, 770, 225,
+ 398, 950, 951, 247, 383, 1014, 1015, 1016, 1017, 275,
+ 1285, 1018, 1042, 1020, 113, 1021, 1028, 1023, 2310, 384,
+ 943, 1758, 113, 826, 719, 1249, 1763, 99, 1547, 720,
+ 72, 1127, 356, 1046, 1250, 1251, 996, 115, 1062, 1184,
+ 352, 1033, 1556, 827, 944, 1286, 1050, 828, 230, 829,
+ 279, 2426, 960, 163, 403, 1614, 1287, 1054, 1055, 280,
+ 1056, 357, 1059, 1060, 1615, 1616, 1191, 1288, 292, 2438,
+ 72, 830, 93, 94, 650, 1072, 1073, 1252, 831, 1029,
+ 399, 766, 1077, 1078, 870, 871, 145, 361, 771, 231,
+ 146, 147, 952, 953, 1289, 672, 832, 859, 860, 232,
+ 1083, 1084, 1085, 385, 1034, 454, 1290, 1617, 1291, 1292,
+ 651, 302, 455, 205, 1683, 429, 997, 1063, 1064, 1104,
+ 1105, 1106, 2481, 1108, 2482, 1110, 2484, 1111, 2486, 206,
+ 2487, 767, 2489, 513, 419, 420, 421, 422, 423, 424,
+ 425, 426, 427, 428, 1114, 73, 1116, 303, 1293, 1686,
+ 872, 430, 833, 1310, 1173, 652, 1043, 362, 772, 873,
+ 874, 293, 1121, 861, 875, 2442, 450, 74, 503, 555,
+ 1128, 75, 862, 863, 1130, 2451, 1311, 1047, 452, 1312,
+ 105, 1855, 1313, 705, 259, 73, 1141, 1143, 2021, 514,
+ 1051, 876, 505, 1183, 1185, 1188, 506, 530, 522, 1684,
+ 1192, 1253, 1254, 2031, 864, 1198, 1921, 74, 523, 1314,
+ 1199, 1851, 556, 1174, 1580, 1581, 2537, 525, 1625, 76,
+ 531, 1240, 551, 597, 598, 1207, 1934, 1626, 1627, 2048,
+ 544, 1618, 1619, 553, 1687, 1315, 574, 1316, 575, 1175,
+ 1636, 1971, 304, 595, 1974, 1685, 640, 1066, 1067, 1637,
+ 1638, 1416, 1982, 77, 653, 1985, 532, 1582, 305, 76,
+ 596, 78, 79, 1993, 631, 1271, 1996, 1255, 1303, 632,
+ 1628, 634, 588, 2003, 93, 94, 1256, 1257, 2516, 648,
+ 1688, 1258, 681, 2519, 655, 1330, 93, 94, 589, 93,
+ 1140, 1304, 1639, 77, 1305, 1394, 1395, 1620, 1600, 1601,
+ 656, 78, 79, 1492, 1493, 1353, 1621, 1622, 1259, 93,
+ 94, 1623, 557, 1176, 1359, 661, 58, 663, 260, 669,
+ 636, 59, 678, 261, 1306, 262, 327, 2546, 1386, 2547,
+ 1387, 113, 93, 94, 1388, 1389, 1390, 679, 1624, 93,
+ 94, 1602, 692, 533, 1396, 695, 1317, 1397, 713, 1400,
+ 1307, 691, 1308, 93, 94, 703, 60, 710, 1494, 711,
+ 1177, 1457, 590, 93, 94, 1403, 664, 1404, 1514, 93,
+ 94, 1407, 1408, 1269, 1270, 1515, 1516, 1187, 61, 1647,
+ 1648, 1583, 1584, 93, 94, 1414, 1415, 722, 637, 727,
+ 1417, 1418, 1076, 728, 1629, 1630, 1419, 733, 1420, 1318,
+ 735, 1422, 738, 1423, 1444, 2303, 93, 94, 93, 94,
+ 1676, 2385, 387, 388, 389, 739, 1640, 1641, 93, 94,
+ 1679, 387, 1649, 62, 1440, 1263, 1441, 2400, 389, 1443,
+ 1517, 762, 1264, 1265, 665, 1938, 1939, 761, 49, 93,
+ 94, 1720, 1716, 1717, 1449, 774, 1452, 1585, 1454, 1455,
+ 1456, 1458, 744, 745, 1461, 1462, 1586, 1587, 1429, 1430,
+ 1631, 1309, 1947, 1948, 769, 1603, 1604, 63, 270, 1632,
+ 1633, 776, 782, 1478, 1634, 50, 929, 784, 1940, 802,
+ 1483, 2094, 1642, 1266, 1484, 1485, 1486, 1267, 1588, 786,
+ 930, 1643, 1644, 51, 805, 811, 1645, 1495, 809, 931,
+ 1498, 1635, 813, 814, 815, 1949, 816, 2379, 1510, 932,
+ 2382, 1512, 2384, 836, 2440, 2441, 2388, 2389, 2444, 842,
+ 2446, 841, 52, 1646, 2449, 2450, 846, 838, 850, 2454,
+ 2455, 1605, 2402, 852, 853, 933, 53, 2458, 2459, 54,
+ 1606, 1607, 854, 865, 877, 886, 1650, 1651, 2126, 405,
+ 888, 55, 851, 1559, 889, 1560, 934, 890, 1561, 1562,
+ 891, 892, 1563, 431, 2171, 946, 955, 1741, 1565, 962,
+ 1566, 2139, 1608, 2180, 1013, 2491, 2273, 1572, 2492, 957,
+ 2277, 432, 2189, 2495, 1011, 2282, 1012, 2497, 1024, 1036,
+ 1074, 1038, 2500, 1039, 1956, 1957, 1037, 1040, 433, 982,
+ 935, 1053, 1941, 1942, 1005, 1057, 1065, 1068, 1135, 1075,
+ 434, 1079, 1652, 1082, 1087, 472, 1100, 480, 483, 487,
+ 1101, 1653, 1654, 1112, 435, 1113, 515, 436, 1120, 1950,
+ 1951, 1796, 1136, 1189, 1138, 936, 1139, 1958, 1194, 437,
+ 543, 1200, 1204, 1677, 1678, 1680, 1271, 1205, 1208, 1209,
+ 1210, 1218, 2532, 1655, 1219, 2535, 1220, 937, 93, 94,
+ 1681, 1221, 1269, 1270, 1223, 1690, 1224, 1225, 1943, 1693,
+ 2543, 1226, 1271, 2545, 1232, 1233, 1861, 1944, 1945, 1235,
+ 438, 1236, 2548, 2549, 1242, 1244, 1245, 1247, 1863, 1260,
+ 1719, 1721, 1271, 1261, 1273, 1952, 938, 1262, 939, 1276,
+ 1729, 1274, 56, 1739, 1953, 1954, 1275, 643, 1295, 1946,
+ 1061, 1811, 1812, 1813, 1814, 1815, 1816, 1817, 1818, 1296,
+ 93, 94, 1696, 1752, 1269, 1270, 1301, 1302, 1754, 1320,
+ 1319, 1321, 1756, 1323, 1759, 1760, 1955, 1762, 1764, 1765,
+ 1322, 1767, 1324, 1333, 1770, 1771, 1772, 1773, 1774, 1775,
+ 1776, 1779, 1781, 1782, 1341, 1337, 1784, 1785, 1786, 1787,
+ 1340, 1959, 1960, 1346, 1349, 1347, 1793, 1794, 1348, 1357,
+ 1355, 2375, 1797, 1798, 1799, 1358, 1425, 1801, 1802, 2383,
+ 1421, 1393, 1406, 2387, 1412, 2295, 1413, 1431, 2392, 1804,
+ 1805, 1424, 1806, 1807, 2299, 1432, 1433, 93, 94, 1722,
+ 407, 1269, 1270, 269, 1434, 1435, 1436, 1448, 1437, 1438,
+ 1819, 1820, 1439, 1821, 1442, 1459, 1446, 1447, 1822, 1825,
+ 1460, 1827, 1828, 1829, 1467, 1830, 1831, 1961, 1833, 1453,
+ 1468, 1836, 1837, 1476, 1469, 1477, 1962, 1963, 1479, 1470,
+ 1480, 2315, 1481, 755, 2317, 1471, 1472, 2318, 1849, 2319,
+ 1487, 1488, 1473, 1475, 1496, 1853, 1505, 1511, -416, 376,
+ 1513, 1520, 1532, 1542, 1858, 1859, 1552, 1553, 1964, 408,
+ 1521, 1564, 1522, 1527, 1862, 1570, 1535, 1536, 1558, 1571,
+ 1864, 1576, 1595, 1598, 404, 409, 410, 411, 1609, 1611,
+ 1613, 1657, 1658, 412, 1656, 1659, 1663, 1664, 1707, 1666,
+ 1667, 1668, 1698, 1689, 1692, 1708, 413, 1709, 1710, 1712,
+ 1713, 1699, 1899, 414, 1704, 1714, 1718, 1715, 1738, 1757,
+ 1755, 1356, 1761, 1768, 415, 1769, 1783, 1790, 1803, 1832,
+ 1838, 1834, 1911, 804, 1835, 1840, 1913, 1841, 2115, 1842,
+ 1843, 1844, 1916, 1845, 1860, 1865, 2290, 1866, 1867, 467,
+ 1912, 476, 479, 482, 486, 1914, 1915, 1922, 2051, 1918,
+ 1919, 1920, 1923, 2111, 1924, 835, 1927, 2412, 1929, 1930,
+ 1931, 1935, 2055, 2056, 1402, 1936, 2058, 1937, 1965, 1966,
+ 550, 2061, 1967, 2063, 1409, 1968, 1972, 1973, 1976, 1975,
+ 1977, 1978, 1979, 1983, 1984, 1987, 2515, 564, 569, 117,
118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 0, 0, 0, 0,
- 0, 0, 0, 1083, 0, 0, 0, 0, 0, 0,
- 2018, 219, 0, 0, 1084, 843, 844, 845, 0, 0,
- 0, 0, 220, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1330, 0, 0, 0, 0, 0, 0, 979,
- 1085, 0, 0, 2042, 0, 0, 0, 980, 0, 0,
- 0, 221, 0, 981, 0, 0, 0, 0, 0, 0,
- 0, 0, 2222, 0, 0, 0, 0, 977, 0, 982,
- 0, 0, 0, 1086, 0, 2229, 2230, 2231, 2232, 2233,
- 2234, 2235, 2236, 2237, 2238, 645, 0, 0, 0, 2242,
- 0, 0, 1394, 0, 983, 0, 2248, 0, 0, 2252,
- 0, 0, 984, 0, 2257, 0, 0, 2259, 2260, 2261,
- 2262, 2263, 2264, 1266, 2266, 2267, 2268, 1266, 2270, 2271,
- 2272, 2273, 1266, 2275, 2276, 2277, 2278, 2279, 0, 2281,
- 0, 1266, 2285, 2286, 702, 0, 0, 0, 985, 0,
- 0, 0, 0, 0, 0, 986, 0, 0, 0, 2293,
- 2044, 0, 0, 2295, 0, 0, 0, 0, 2299, 0,
- 0, 0, 0, 0, 2048, 2049, 0, 0, 2051, 0,
- 0, 0, 0, 2054, 0, 2056, 0, 0, 0, 0,
- 0, 1081, 0, 0, 987, 0, 0, 1445, 0, 0,
- 0, 0, 732, 0, 0, 988, 0, 0, 0, 0,
- 1102, 0, 2312, 0, 0, 0, 0, 0, 0, 0,
- 989, 0, 0, 0, 0, 0, 0, 0, 0, 2092,
- 1087, 0, 1088, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1112, 1113, 1114, 0,
- 0, 0, 0, 0, 0, 0, 1498, 0, 0, 2100,
- 0, 0, 0, 0, 0, 0, 0, 0, 1513, 0,
- 0, 0, 0, 1520, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 2352, 0, 1089, 0, 2354, 0,
- 0, 0, 0, 785, 0, 0, 0, 0, 2355, 0,
- 0, 0, 793, 0, 2359, 794, 1198, 0, 795, 0,
- 1225, 2362, 797, 0, 0, 0, 0, 1266, 0, 2367,
- 0, 0, 2371, 2372, 0, 1266, 0, 0, 0, 1266,
- 0, 0, 2381, 2382, 1266, 2384, 2385, 2386, 2387, 0,
- 0, 2389, 0, 0, 0, 2392, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2400, 0, 0, 0, 0,
- 0, 2404, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2406, 0, 1329, 0, 0, 841, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1669, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2421, 0, 2423, 0, 0, 0, 0, 2427,
- 0, 0, 2288, 0, 1387, 0, 0, 0, 0, 0,
- 0, 1266, 2434, 0, 1393, 0, 0, 1396, 0, 0,
- 0, 1266, 2443, 0, 0, 0, 2447, 0, 0, 1720,
- 0, 0, 1722, 0, 0, 0, 0, 0, 0, 0,
- 0, 1738, 0, 0, 2465, 0, 0, 0, 1743, 1015,
- 0, 0, 0, 0, 0, 1745, 1021, 0, 0, 0,
- 0, 2474, 0, 2245, 2246, 2247, 0, 2479, 2251, 2481,
- 2253, 2254, 0, 2256, 0, 2258, 2485, 0, 0, 2487,
- 0, 0, 0, 0, 2490, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2501, 0, 0, 1444,
- 0, 0, 1209, 0, 0, 0, 0, 0, 2292, 0,
- 0, 1266, 0, 0, 1266, 2508, 0, 2509, 0, 1266,
- 2511, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2517, 0, 1476, 0, 0, 1097, 0, 2524, 0,
- 1817, 2527, 1098, 0, 0, 0, 1484, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1266, 0, 1266, 0, 0, 0, 0,
- 1512, 0, 0, 0, 0, 1519, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 1117,
- 0, 0, 2394, 0, 1121, 0, 2398, 1124, 0, 0,
- 0, 0, 0, 0, 0, 0, 1132, 0, 0, 0,
- 0, 0, 1863, 1865, 1867, 1869, 1871, 0, 0, 1874,
- 0, 0, 1876, 0, 0, 1878, 1880, 1882, 1884, 1886,
- 1888, 1583, 0, 1891, 0, 0, 0, 0, 1895, 1897,
- 0, 0, 1900, 1593, 0, 0, 0, 0, 1903, 0,
- 0, 0, 0, 0, 0, 2360, 0, 0, 0, 0,
- 0, 1654, 1655, 2363, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2119, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2126, 0, 2127,
- 2388, 2128, 1666, 0, 0, 2130, 0, 1668, 2132, 0,
- 2133, 0, 0, 0, 2135, 0, 2136, 0, 2137, 0,
- 0, 0, 2139, 0, 2140, 0, 0, 0, 2143, 0,
- 0, 2145, 0, 2146, 0, 1688, 2148, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1719, 0, 0, 1721, 0, 0, 0, 0, 0,
- 0, 0, 0, 1737, 1739, 0, 0, 0, 0, 0,
- 1742, 0, 0, 0, 0, 0, 0, 1744, 0, 0,
- 0, 0, 2017, 0, 0, 2021, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2514, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1782, 0, 0, 1785,
- 1786, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1794, 0, 0, 2217, 0, 0, 2221, 0, 0, 0,
- 0, 2225, 0, 0, 0, 2226, 0, 0, 0, 1567,
- 1568, 1569, 0, 0, 0, 1439, 0, 0, 0, 1571,
- 1572, 1573, 0, 2241, 0, 1584, 1585, 1586, 0, 0,
- 1587, 1588, 1816, 1590, 1591, 0, 0, 0, 0, 1457,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1840, 1841, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1483, 0, 0, 1850, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 138, 139, 140, 141, 142, 143, 144, 2099, 1986, 1988,
+ 1989, 416, 1990, 1994, 1995, 2505, 1997, 1998, 1999, 2000,
+ 2004, 2005, 642, 2006, 2008, 2009, 2011, 2016, 2017, 2012,
+ 2019, 2020, 1271, 2022, 2026, 2030, 2041, 2043, 2108, 662,
+ 2042, 2047, 2086, 2091, 2092, 2095, 2101, 1271, 2032, 2033,
+ 2034, 2035, 2036, 2037, 2038, 2039, 2040, 2112, 2113, 2114,
+ 2118, 314, 2119, 2120, 2468, 2129, 2132, 2133, 315, 2044,
+ 2158, 2046, 2161, 1271, 2164, -1050, 2166, 2167, 2053, 2168,
+ 2172, 2173, 743, 2174, 2175, 2176, 2177, 2181, 2182, 2054,
+ 2183, 2184, 2185, 2186, 2190, 2191, 1092, 2192, 2199, 2202,
+ 2210, 2213, 2216, 2217, 2219, 2222, 2064, 2065, 2066, 2067,
+ 2068, 2069, 2070, 2071, 2072, 2073, 2223, 2074, 2075, 2076,
+ 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2224, 2087,
+ 2226, 2088, 2089, 2090, 2232, 2236, 983, 2252, 2297, 740,
+ 2298, 1474, 2305, 2306, 984, 2307, 2463, 2100, 2309, 746,
+ 985, 2311, 2313, 2314, 2320, 2329, 2333, 2340, 754, 2346,
+ 2350, 2353, 2359, 2366, 2377, 2411, 986, 2399, 2406, 2103,
+ 2408, 2104, 2105, 2410, 2107, 2414, 2439, 2109, 2445, 2110,
+ 2448, 2453, 2460, 2466, 2506, 2467, 2116, 2117, 2469, 2476,
+ 2485, 987, 2493, 2498, 1115, 2507, 2508, 2509, 2511, 988,
+ 2514, 2534, 2124, 2524, 2125, 2463, 2525, 2538, 2128, 2539,
+ 2542, 2544, 2130, 2502, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 791, 0, 1673, 793,
+ 794, 0, 0, 0, 0, 989, 0, 0, 0, 0,
+ 798, 0, 990, 0, 0, 801, 0, 0, 0, 0,
+ 0, 0, 0, 0, 810, 0, 0, 1691, 0, 0,
+ 0, 1695, 2253, 2254, 2255, 0, 2160, 2259, 0, 2261,
+ 2262, 316, 2264, 317, 2266, 0, 0, 0, 0, 0,
+ 0, 991, 0, 0, 0, 1724, 0, 0, 0, 0,
+ 0, 0, 992, 0, 0, 0, 1742, 0, 0, 0,
+ 0, 0, 0, 1746, 1747, 0, 0, 993, 0, 0,
+ 0, 0, 0, 0, 1753, 0, 0, 0, 2301, 0,
+ 0, 847, 848, 849, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1335, 0,
+ 117, 118, 119, 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, 0, 2230,
+ 0, 0, 0, 981, 0, 0, 0, 0, 0, 0,
+ 0, 0, 2237, 2238, 2239, 2240, 2241, 2242, 2243, 2244,
+ 2245, 2246, 0, 0, 0, 0, 2250, 0, 1399, 0,
+ 0, 0, 0, 2256, 0, 0, 2260, 1230, 0, 0,
+ 0, 2265, 0, 0, 2267, 2268, 2269, 2270, 2271, 2272,
+ 1271, 2274, 2275, 2276, 1271, 2278, 2279, 2280, 2281, 1271,
+ 2283, 2284, 2285, 2286, 2287, 1846, 2289, 0, 1271, 2293,
+ 2294, 0, 0, 0, 0, 0, 0, 0, 646, 0,
+ 208, 0, 0, 2300, 0, 0, 0, 2302, 0, 0,
+ 0, 2304, 0, 0, 0, 2369, 2308, 0, 0, 0,
+ 0, 209, 0, 2372, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1086, 0,
+ 0, 0, 0, 0, 1451, 0, 0, 704, 0, 0,
+ 2397, 0, 0, 0, 210, 0, 0, 1107, 0, 0,
+ 2321, 211, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 212, 213, 0, 0, 0, 0, 0, 214, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2303, 0, 0, 0, 1862, 1864, 1866, 1868, 1870, 0,
- 0, 1873, 0, 0, 1875, 2123, 0, 1877, 1879, 1881,
- 1883, 1885, 1887, 0, 1889, 1890, 0, 2307, 0, 1893,
- 1894, 1896, 0, 1898, 1899, 0, 0, 0, 0, 1901,
- 1902, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1117, 1118, 1119, 215, 0, 0, 0,
+ 0, 0, 0, 1504, 0, 734, 0, 0, 0, 0,
+ 0, 0, 0, 216, 0, 1519, 0, 0, 0, 0,
+ 1526, 0, 0, 0, 0, 0, 0, 0, 0, 217,
+ 0, 0, 2361, 0, 0, 0, 2363, 218, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2364, 0, 0, 0,
+ 0, 0, 2368, 0, 0, 1203, 219, 0, 0, 2371,
+ 0, 0, 0, 1088, 0, 1271, 0, 2376, 0, 0,
+ 2380, 2381, 0, 1271, 1089, 0, 0, 1271, 0, 0,
+ 2390, 2391, 1271, 2393, 2394, 2395, 2396, 0, 0, 2398,
+ 220, 0, 0, 2401, 0, 0, 787, 0, 0, 983,
+ 1090, 2025, 0, 0, 2409, 795, 0, 984, 796, 0,
+ 2413, 797, 0, 985, 0, 799, 0, 0, 0, 0,
+ 0, 2415, 0, 1334, 0, 0, 0, 0, 0, 986,
+ 0, 0, 0, 1091, 2049, 0, 221, 0, 0, 0,
+ 0, 0, 1675, 0, 0, 0, 0, 222, 0, 0,
+ 0, 0, 0, 0, 987, 0, 0, 0, 0, 0,
+ 0, 2430, 988, 2432, 0, 0, 0, 0, 2436, 0,
+ 0, 0, 0, 1392, 0, 0, 223, 0, 0, 845,
+ 1271, 2443, 0, 1398, 0, 0, 1401, 0, 0, 0,
+ 1271, 2452, 0, 0, 0, 2456, 1726, 0, 989, 1728,
+ 0, 0, 0, 0, 0, 990, 0, 0, 1744, 1589,
+ 0, 0, 0, 2474, 0, 1749, 0, 0, 0, 0,
+ 0, 1599, 1751, 0, 0, 0, 0, 0, 0, 0,
+ 2483, 0, 0, 0, 0, 0, 2488, 0, 2490, 1660,
+ 1661, 0, 0, 0, 991, 2494, 0, 0, 2496, 0,
+ 0, 0, 0, 2499, 0, 992, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 1919, 0, 2151, 0, 0, 0, 0, 0,
- 1925, 1926, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1962, 1963, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1973, 1974, 0, 0,
- 0, 0, 0, 0, 2349, 0, 0, 1984, 1985, 0,
- 0, 0, 0, 0, 0, 0, 0, 1994, 1995, 0,
- 0, 0, 0, 2000, 2356, 0, 0, 0, 0, 0,
- 0, 0, 0, 2003, 2361, 0, 0, 0, 0, 0,
- 2364, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 993, 1019, 0, 0, 0, 2510, 0, 0, 1025, 1450,
+ 1092, 0, 1093, 0, 0, 1214, 0, 0, 0, 0,
+ 1271, 0, 0, 1271, 2517, 0, 2518, 0, 1271, 2520,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2008, 0, 0, 2011, 0, 0, 0, 0, 2220, 0,
- 0, 0, 0, 0, 2016, 0, 0, 2020, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 1734, 0, 0,
- 0, 0, 0, 0, 0, 2240, 0, 0, 0, 0,
- 0, 0, 0, 0, 2038, 2250, 0, 0, 0, 0,
+ 2526, 0, 0, 1482, 0, 0, 0, 2533, 1824, 0,
+ 2536, 0, 0, 0, 0, 0, 1490, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 1094, 0, 0, 0,
+ 0, 0, 1271, 0, 1271, 0, 0, 0, 0, 0,
+ 1518, 0, 0, 0, 0, 1525, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 1102,
+ 0, 0, 0, 0, 0, 1103, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 1870, 1872, 1874, 1876, 1878, 0, 0, 1881, 0, 0,
+ 1883, 0, 0, 1885, 1887, 1889, 1891, 1893, 1895, 0,
+ 0, 1898, 0, 0, 0, 0, 1902, 1904, 0, 1362,
+ 1907, 0, 1122, 0, 1363, 0, 1910, 1126, 0, 0,
+ 1129, 0, 0, 0, 0, 0, 0, 0, 0, 1137,
+ 0, 1364, 1365, 0, 1366, 1367, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1368, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1369, 1370, 0,
+ 0, 0, 1672, 0, 0, 1371, 0, 1674, 1372, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2417, 0, 0, 1139, 1140, 1141, 0, 0,
- 0, 0, 0, 0, 0, 1783, 0, 0, 0, 0,
- 2429, 1789, 0, 0, 0, 92, 93, 0, 0, 1142,
- 1143, 2078, 0, 1144, 0, 0, 0, 0, 0, 0,
- 1145, 102, 0, 1146, 0, 0, 1910, 1147, 0, 0,
- 0, 0, 0, 0, 0, 1148, 1149, 0, 262, 1918,
- 0, 0, 0, 1150, 0, 0, 0, 0, 0, 1921,
- 0, 0, 1819, 2472, 104, 2473, 0, 2475, 0, 2477,
- 0, 2478, 0, 2480, 0, 0, 0, 0, 1151, 1152,
- 0, 1153, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2115, 0, 1843, 0, 1154, 0, 0, 0,
- 0, 0, 1849, 0, 0, 0, 0, 0, 0, 105,
- 0, 0, 0, 0, 0, 0, 0, 1155, 0, 0,
+ 0, 0, 0, 0, 0, 1373, 0, 0, 0, 0,
+ 1374, 1375, 0, 1376, 2296, 1694, 0, 0, 0, 0,
+ 0, 0, 0, 0, 102, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 103,
+ 0, 1725, 0, 0, 1727, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1743, 1745, 0, 0, 104, 0, 0,
+ 1748, 0, 0, 0, 0, 0, 0, 1750, 0, 0,
+ 2024, 1377, 105, 2028, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1861, 0, 0, 0, 0, 0, 2348, 1872, 0, 1156,
- 0, 0, 2142, 0, 0, 0, 0, 0, 1157, 0,
- 0, 0, 0, 2155, 0, 0, 0, 2528, 0, 0,
- 0, 107, 0, 2157, 0, 0, 0, 2161, 2162, 0,
- 0, 0, 0, 0, 0, 0, 2170, 2171, 0, 0,
- 0, 0, 0, 0, 0, 2179, 2180, 0, 1158, 0,
- 0, 2185, 0, 0, 0, 1159, 1160, 263, 0, 0,
- 0, 2195, 2196, 0, 0, 0, 0, 0, 1161, 0,
- 0, 0, 2206, 2207, 0, 112, 0, 0, 1162, 0,
- 0, 113, 0, 2210, 0, 0, 0, 0, 0, 0,
- 0, 264, 2212, 0, 2213, 0, 0, 0, 0, 0,
- 0, 0, 0, 1163, 0, 1164, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1165, 0, 0, 0, 0,
- 2219, 0, 0, 2223, 0, 1166, 0, 0, 2419, 0,
- 0, 0, 0, 2227, 0, 2425, 0, 0, 0, 0,
- 0, 0, 0, 0, 2006, 0, 2007, 2239, 265, 0,
- 2243, 0, 0, 0, 0, 0, 0, 2249, 0, 1167,
- 0, 0, 2255, 0, 0, 0, 2022, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 0, 0, 2043, 0, 2045,
+ 0, 1926, 0, 0, 0, 0, 0, 0, 0, 1932,
+ 1933, 0, 0, 0, 0, 0, 1788, 0, 0, 1791,
+ 1792, 0, 0, 0, 1969, 1970, 0, 106, 0, 0,
+ 1800, 0, 1378, 0, 0, 1980, 1981, 1379, 0, 0,
+ 0, 107, 0, 0, 0, 0, 1991, 1992, 0, 0,
+ 1380, 0, 0, 1573, 1574, 1575, 2001, 2002, 0, 0,
+ 0, 0, 2007, 1577, 1578, 1579, 0, 0, 0, 1590,
+ 1591, 1592, 2010, 1823, 1593, 1594, 0, 1596, 1597, 108,
+ 0, 0, 0, 0, 0, 0, 1381, 1382, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2050, 0, 2052, 0, 0,
- 2053, 0, 2055, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1847, 1848, 0, 0, 0, 0, 1383, 0, 0,
+ 0, 1445, 0, 0, 0, 109, 1857, 0, 0, 0,
+ 0, 0, 110, 0, 0, 2403, 0, 111, 112, 2407,
+ 0, 0, 0, 113, 0, 1463, 0, 0, 0, 114,
+ 0, 0, 0, 0, 0, 1869, 1871, 1873, 1875, 1877,
+ 0, 1384, 1880, 0, 2131, 1882, 0, 0, 1884, 1886,
+ 1888, 1890, 1892, 1894, 0, 1896, 1897, 0, 1489, 0,
+ 1900, 1901, 1903, 0, 1905, 1906, 0, 0, 0, 0,
+ 1908, 1909, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2154, 0, 0, 0, 2314,
- 0, 0, 0, 0, 2504, 0, 0, 0, 0, 2323,
- 2086, 0, 0, 2090, 2091, 0, 0, 0, 2325, 1056,
- 0, 0, 2095, 0, 0, 0, 0, 2334, 0, 0,
- 2519, 0, 0, 2522, 2336, 2186, 2187, 2188, 2189, 2190,
- 0, 2192, 2193, 0, 2098, 2340, 2197, 2198, 2199, 2200,
- 2201, 2343, 2203, 2204, 2345, 0, 0, 2346, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 2113, 2114,
- 0, 0, 0, 0, 0, 0, 101, 0, 2347, 0,
+ 0, 0, 0, 2159, 0, 0, 0, 0, 0, 115,
+ 0, 0, 0, 0, 0, 601, 602, 0, 0, 0,
+ 0, 0, 0, 0, 116, 117, 118, 119, 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, 0, 0, 0, 0, 0, 145, 0,
+ 0, 0, 146, 147, 0, 0, 0, 603, 0, 0,
+ 0, 0, 0, 604, 0, 0, 0, 0, 0, 0,
+ 605, 0, 606, 0, 0, 0, 0, 607, 0, 0,
+ 608, 0, 0, 0, 0, 0, 609, 0, 0, 0,
+ 0, 2015, 0, 0, 2018, 0, 610, 2228, 0, 0,
+ 0, 0, 611, 0, 0, 2023, 0, 0, 2027, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 102, 0, 0, 0, 0, 2129, 0, 0, 0,
- 0, 0, 0, 0, 0, 2134, 0, 0, 0, 103,
- 0, 0, 0, 2138, 0, 0, 2365, 0, 2141, 0,
- 0, 0, 2144, 0, 104, 0, 0, 2147, 2377, 0,
- 2149, 92, 93, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 102, 0, 0,
+ 0, 0, 612, 2163, 2248, 2523, 0, 0, 0, 0,
+ 0, 0, 0, 2165, 2258, 2045, 0, 2169, 2170, 0,
+ 0, 0, 0, 613, 0, 0, 2178, 2179, 0, 0,
+ 0, 0, 0, 0, 0, 2187, 2188, 0, 0, 614,
+ 0, 2193, 0, 0, 0, 0, 0, 615, 616, 0,
+ 0, 2203, 2204, 1740, 0, 0, 0, 0, 0, 0,
+ 0, 0, 2214, 2215, 0, 0, 0, 617, 0, 0,
+ 93, 94, 2085, 2218, 0, 0, 0, 0, 0, 0,
+ 0, 0, 2220, 0, 2221, 0, 103, 618, 0, 0,
+ 0, 1917, 0, 0, 0, 0, 0, 0, 0, 0,
+ 619, 0, 620, 0, 1925, 0, 0, 0, 0, 0,
+ 0, 1789, 0, 621, 1928, 0, 0, 1795, 622, 105,
+ 0, 0, 0, 0, 623, 0, 0, 0, 0, 0,
+ 0, 624, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2123, 0, 0, 0, 0, 625,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 2407, 0, 0, 0, 2409, 0, 105,
- 0, 0, 0, 0, 2410, 0, 0, 0, 0, 0,
- 2413, 0, 0, 106, 2415, 0, 0, 2416, 0, 0,
+ 0, 0, 626, 627, 106, 628, 0, 0, 0, 1826,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2357, 0, 0, 0,
+ 0, 0, 0, 0, 2150, 0, 0, 0, 0, 0,
+ 0, 1850, 0, 0, 0, 629, 0, 0, 0, 1856,
+ 0, 0, 0, 0, 0, 0, 108, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2418, 2420, 483, 2422, 0, 0, 0, 2424, 2426, 0,
- 0, 107, 2428, 0, 0, 105, 0, 102, 0, 0,
- 0, 2313, 0, 0, 2315, 2316, 2317, 2318, 2319, 0,
- 2321, 2322, 0, 0, 0, 0, 0, 2448, 0, 0,
- 0, 0, 2326, 2327, 2328, 2329, 2330, 108, 2332, 2333,
- 104, 2335, 0, 0, 109, 0, 312, 0, 0, 110,
- 111, 2338, 2339, 313, 0, 112, 0, 107, 0, 0,
- 0, 113, 2342, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1868, 0, 0,
+ 2323, 0, 0, 0, 1879, 0, 0, 0, 0, 0,
+ 2332, 0, 0, 0, 0, 0, 0, 0, 0, 2334,
+ 0, 0, 0, 0, 0, 0, 0, 0, 2343, 0,
+ 113, 0, 0, 0, 0, 2345, 114, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2349, 0, 0, 0,
+ 0, 0, 2352, 0, 0, 2354, 0, 0, 2355, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 105, 2280, 0, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 2503, 113, 0, 0,
+ 0, 0, 2227, 0, 0, 2231, 0, 0, 0, 2428,
+ 0, 0, 0, 0, 0, 2235, 2434, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2247,
+ 0, 0, 2251, 0, 0, 0, 0, 0, 0, 2257,
+ 0, 0, 0, 0, 2263, 0, 0, 0, 0, 0,
+ 0, 0, 117, 118, 119, 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,
+ 0, 2013, 0, 2014, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 2416, 0, 0, 0, 2418,
+ 0, 0, 0, 2029, 0, 0, 2419, 0, 0, 0,
+ 0, 0, 2422, 0, 0, 0, 2424, 0, 0, 2425,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 114, 2512, 0, 0, 0, 0, 107, 0, 0,
- 0, 0, 2518, 0, 0, 2521, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 0, 0, 0, 0, 2408,
- 144, 0, 0, 0, 145, 146, 0, 0, 0, 0,
- 2411, 112, 2412, 0, 0, 0, 2414, 113, 0, 0,
- 0, 0, 0, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 2351, 0, 0, 0, 2353, 0, 0, 0, 0,
+ 0, 2162, 93, 94, 2050, 2513, 2052, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 103, 0,
+ 0, 0, 2057, 0, 2059, 0, 0, 2060, 0, 2062,
+ 0, 2528, 0, 0, 2531, 264, 0, 0, 0, 0,
+ 0, 2194, 2195, 2196, 2197, 2198, 0, 2200, 2201, 0,
+ 0, 105, 2205, 2206, 2207, 2208, 2209, 0, 2211, 2212,
+ 0, 0, 0, 0, 0, 0, 0, 2093, 0, 0,
+ 2097, 2098, 0, 0, 0, 0, 0, 0, 0, 2102,
+ 0, 2356, 0, 0, 93, 94, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 106, 0, 0, 0,
+ 103, 0, 2106, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2374,
+ 0, 0, 0, 0, 0, 0, 2121, 2122, 0, 0,
+ 0, 2386, 0, 0, 0, 0, 0, 0, 485, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 108, 0,
+ 0, 0, 0, 103, 2137, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2142, 0, 0, 0, 0, 0, 0,
+ 0, 2146, 0, 0, 0, 0, 2149, 0, 106, 0,
+ 2152, 0, 0, 0, 265, 2155, 105, 0, 2157, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2358, 0, 0, 0, 0, 314, 0, 315, 0,
- 0, 0, 874, 2468, 0, 0, 2469, 0, 875, 2470,
- 0, 2471, 0, 0, 0, 0, 564, 102, 0, 0,
- 0, 0, 0, 116, 117, 118, 119, 120, 121, 122,
+ 0, 0, 113, 0, 0, 0, 0, 0, 114, 0,
+ 0, 0, 0, 0, 2427, 2429, 0, 2431, 266, 0,
+ 0, 2433, 2435, 0, 0, 0, 2437, 0, 0, 0,
+ 108, 106, 0, 0, 0, 0, 0, 0, 2322, 0,
+ 0, 2324, 2325, 2326, 2327, 2328, 0, 2330, 2331, 0,
+ 0, 2457, 0, 0, 0, 0, 0, 0, 0, 2335,
+ 2336, 2337, 2338, 2339, 0, 2341, 2342, 0, 2344, 0,
+ 0, 0, 0, 0, 0, 267, 0, 0, 2347, 2348,
+ 0, 0, 0, 108, 0, 0, 0, 0, 0, 2351,
+ 114, 0, 0, 0, 117, 118, 119, 120, 121, 122,
123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 102, 565, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 455, 0, 116, 117, 118, 119, 120,
+ 143, 144, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 565, 103, 0, 0, 0, 113, 0, 0,
+ 2512, 0, 0, 114, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2521, 0, 0, 0,
+ 0, 0, 0, 0, 2288, 0, 2527, 0, 566, 2530,
+ 0, 0, 0, 0, 0, 0, 117, 118, 119, 120,
121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 456, 457, 105, 0, 458, 0, 0,
- 0, 0, 0, 0, 0, 566, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 459,
- 0, 0, 0, 0, 0, 2438, 0, 0, 0, 105,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 116, 117,
+ 141, 142, 143, 144, 0, 0, 0, 2417, 0, 0,
+ 0, 106, 0, 0, 0, 103, 0, 0, 2420, 0,
+ 2421, 567, 0, 0, 2423, 0, 0, 457, 0, 117,
118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
128, 129, 130, 131, 132, 133, 134, 135, 136, 137,
- 138, 139, 140, 141, 142, 143, 0, 0, 0, 0,
- 0, 107, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 460, 0, 2492, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 113, 0, 0,
- 461, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 462, 0, 0,
+ 138, 139, 140, 141, 142, 143, 144, 458, 459, 0,
+ 0, 460, 0, 108, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 113, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 2520, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2531, 0, 0, 2532,
- 567, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 463, 0, 0,
- 0, 0, 0, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 0, 0, 0, 0, 0, 0, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 0, 464, 890, 891, 892,
+ 0, 0, 0, 461, 0, 0, 0, 0, 0, 0,
+ 0, 2477, 0, 106, 2478, 0, 0, 2479, 0, 2480,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 2360, 0, 0, 0, 2362, 0, 0, 0, 0, 0,
+ 0, 0, 0, 114, 0, 0, 0, 0, 0, 0,
+ 2367, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 108, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 462, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 893, 894, 0, 0, 895, 0, 102, 896, 0,
- 0, 0, 0, 0, 0, 897, 0, 0, 0, 898,
- 0, 0, 0, 0, 0, 0, 0, 899, 900, 0,
- 0, 0, 0, 0, 0, 901, 902, 0, 102, 0,
- 104, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 903, 0, 0, 0, 0, 0, 904, 0,
- 905, 906, 0, 907, 0, 0, 0, 0, 0, 0,
- 0, 104, 0, 0, 0, 0, 0, 0, 908, 0,
- 0, 0, 0, 0, 0, 105, 0, 0, 0, 102,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 909,
+ 0, 0, 0, 0, 463, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 568, 0, 0, 0,
+ 0, 464, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 114, 0, 0, 0, 117,
+ 118, 119, 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, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 105, 0, 0, 0,
- 0, 910, 0, 102, 0, 472, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 107, 0, 0,
- 0, 0, 0, 911, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1197, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 105, 107, 0,
- 912, 0, 913, 0, 0, 0, 0, 914, 915, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 916,
- 917, 112, 0, 0, 0, 0, 0, 113, 0, 0,
- 918, 105, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 107,
- 0, 0, 112, 0, 0, 919, 0, 920, 113, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 921,
- 0, 922, 0, 0, 0, 0, 0, 923, 0, 0,
- 0, 476, 0, 107, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 102, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 113,
- 0, 924, 0, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 135, 136, 137, 138, 139, 140, 141, 142,
- 143, 0, 0, 113, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 473, 105, 1233, 0, 0, 0, 0, 0,
+ 0, 465, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 2447, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 116, 117, 118, 119, 120,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 117, 118, 119, 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, 0,
+ 466, 894, 895, 896, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 2501, 0, 0, 0,
+ 0, 0, 0, 0, 0, 897, 898, 0, 0, 899,
+ 0, 0, 900, 0, 0, 0, 0, 0, 0, 901,
+ 0, 0, 0, 902, 0, 0, 0, 0, 0, 0,
+ 103, 903, 904, 1144, 1145, 1146, 0, 0, 0, 905,
+ 906, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 2529, 0, 0, 0, 0, 907, 1147, 1148, 0,
+ 0, 1149, 908, 105, 909, 910, 2540, 911, 1150, 2541,
+ 0, 1151, 0, 103, 0, 1152, 0, 0, 0, 0,
+ 0, 0, 912, 1153, 1154, 0, 0, 0, 0, 0,
+ 0, 1155, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 913, 0, 0, 105, 0, 106, 0,
+ 0, 0, 0, 0, 0, 0, 1156, 1157, 0, 1158,
+ 0, 0, 0, 0, 0, 914, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1159, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 915, 0, 103,
+ 0, 106, 0, 0, 0, 1160, 0, 0, 0, 0,
+ 108, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 916, 0, 917, 1161, 0, 0,
+ 0, 918, 919, 0, 0, 474, 1162, 0, 0, 0,
+ 0, 0, 0, 920, 921, 0, 0, 0, 0, 0,
+ 0, 0, 0, 108, 922, 0, 103, 0, 0, 0,
+ 0, 0, 0, 0, 113, 0, 0, 0, 0, 0,
+ 114, 0, 0, 0, 0, 0, 1163, 106, 0, 923,
+ 0, 924, 0, 1164, 1165, 0, 0, 0, 0, 1202,
+ 0, 0, 0, 925, 0, 926, 1166, 0, 0, 0,
+ 0, 927, 0, 0, 0, 0, 1167, 113, 0, 0,
+ 0, 0, 0, 114, 103, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 478, 0, 0, 0, 0, 108,
+ 0, 1168, 0, 1169, 106, 928, 0, 0, 0, 0,
+ 0, 0, 0, 1170, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1171, 0, 0, 117, 118, 119, 120,
121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
131, 132, 133, 134, 135, 136, 137, 138, 139, 140,
- 141, 142, 143, 0, 0, 107, 0, 0, 0, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
- 137, 138, 139, 140, 141, 142, 143, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
- 139, 140, 141, 142, 143, 113, 0, 0, 0, 0,
+ 141, 142, 143, 144, 0, 0, 108, 1172, 0, 114,
+ 0, 0, 106, 0, 0, 0, 0, 0, 0, 117,
+ 118, 119, 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, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 108, 0, 114, 0, 0, 0,
+ 0, 0, 475, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 116, 117, 118, 119, 120, 121,
+ 0, 0, 0, 0, 0, 117, 118, 119, 120, 121,
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
132, 133, 134, 135, 136, 137, 138, 139, 140, 141,
- 142, 143, 1234, 0, 0, 0, 0, 0, 0, 0,
+ 142, 143, 144, 0, 114, 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, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 0, 0, 117, 118, 119, 120, 121, 122, 123, 124,
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 135, 136, 137, 138, 139, 140, 141, 142, 143, 1,
- 0, 2, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 3, 0, 0, 0,
- 0, 4, 5, 0, 6, 7, 8, 0, 0, 0,
- 0, 0, 0, 0, 9, 0, 0, 0, 0, 0,
- 0, 10, 0, 11, 0, 0, 167, 0, 168, 0,
- 0, 0, 12, 13, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 169,
- 0, 170, 171, 172, 0, 0, 0, 14, 0, 0,
- 0, 173, 0, 174, 0, 0, 0, 0, 175, 15,
- 176, 0, 177, 16, 0, 0, 17, 178, 0, 179,
- 0, 18, 0, 19, 0, 0, 0, 0, 0, 20,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 180, 0, 0, 0, 0, 21, 0,
- 0, 0, 22, 23, 0, 0, 24, 25, 0, 0,
- 181, 0, 0, 0, 0, 0, 0, 0, 0, 26,
- 0, 0, 182, 183, 0, 0, 184, 0, 0, 0,
- 185, 0, 27, 28, 29, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 30, 0, 0,
- 0, 0, 0, 186, 187, 0, 31, 188, 0, 32,
- 0, 33, 0, 34, 0, 0, 189, 0, 35, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 190,
- 191, 36, 0, 0, 0, 0, 37, 0, 192, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 38, 0, 0, 0, 0, 193, 0,
- 194, 0, 0, 0, 39, 0, 40, 0, 0, 0,
- 0, 0, 41, 0, 0, 42, 43, 0, 0, 0,
- 0, 0, 0, 195, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 196, 0, 0, 0, 0, 0, 44, 0, 197, 0,
- 0, 0, 45, 0, 0, 198, 0, 0, 0, 0,
- 0, 199, 0, 200, 0, 0, 0, 0, 0, 0,
+ 135, 136, 137, 138, 139, 140, 141, 142, 143, 144,
+ 117, 118, 119, 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, 0, 0,
+ 117, 118, 119, 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, 1, 0,
+ 2, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 3, 0, 0, 0, 0,
+ 4, 5, 0, 6, 7, 8, 0, 0, 0, 0,
+ 0, 0, 0, 9, 0, 0, 0, 0, 0, 0,
+ 10, 0, 11, 0, 0, 168, 0, 169, 0, 0,
+ 0, 12, 13, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 170, 0,
+ 171, 172, 173, 0, 0, 0, 14, 0, 0, 0,
+ 174, 0, 175, 0, 0, 0, 0, 176, 15, 177,
+ 0, 178, 16, 0, 0, 17, 179, 0, 180, 0,
+ 18, 0, 19, 0, 0, 0, 0, 0, 20, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 181, 0, 0, 0, 0, 21, 0, 0,
+ 0, 22, 23, 0, 0, 24, 25, 0, 0, 182,
+ 0, 0, 0, 0, 0, 0, 0, 0, 26, 0,
+ 0, 183, 184, 0, 0, 185, 0, 0, 878, 186,
+ 0, 27, 28, 29, 879, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 30, 0, 0, 0,
+ 0, 0, 187, 188, 0, 31, 189, 0, 32, 0,
+ 33, 0, 34, 0, 0, 190, 0, 35, 0, 1238,
+ 0, 0, 0, 0, 0, 0, 0, 0, 191, 192,
+ 36, 0, 0, 0, 0, 37, 0, 193, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 201
+ 0, 38, 39, 0, 0, 0, 0, 194, 0, 195,
+ 0, 0, 0, 40, 0, 41, 0, 0, 0, 0,
+ 0, 42, 0, 0, 43, 44, 0, 0, 0, 0,
+ 0, 0, 196, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 197, 198,
+ 0, 0, 0, 0, 0, 45, 0, 199, 0, 0,
+ 0, 46, 0, 0, 200, 0, 0, 0, 0, 0,
+ 201, 0, 202, 0, 117, 118, 119, 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, 0, 0, 0, 0, 0, 0, 203, 117,
+ 118, 119, 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, 1239
};
static const yytype_int16 yycheck[] =
{
- 10, 201, 619, 1478, 5, 1480, 4, 4, 43, 614,
- 615, 3, 4, 5, 4, 53, 5, 4, 28, 5,
- 35, 6, 5, 0, 34, 27, 35, 32, 3, 4,
- 3, 4, 42, 3, 4, 45, 4, 891, 48, 29,
- 3, 4, 52, 3, 4, 55, 62, 16, 58, 5,
- 40, 61, 17, 4, 5, 65, 27, 3, 4, 69,
- 868, 27, 5, 871, 74, 62, 4, 17, 20, 3,
- 4, 87, 4, 1308, 32, 83, 124, 52, 44, 26,
- 93, 47, 72, 31, 94, 52, 96, 97, 98, 99,
- 80, 17, 58, 46, 158, 142, 40, 39, 17, 84,
- 4, 62, 133, 3, 4, 115, 129, 793, 794, 795,
- 5, 62, 95, 184, 111, 81, 2453, 62, 101, 6,
- 52, 111, 24, 25, 4, 5, 268, 112, 3, 4,
- 3, 4, 98, 84, 34, 213, 5, 37, 21, 83,
- 150, 149, 95, 133, 21, 168, 42, 122, 17, 218,
- 62, 62, 60, 138, 62, 841, 184, 2494, 160, 169,
- 111, 34, 193, 234, 174, 149, 3, 4, 115, 3,
- 4, 99, 4, 79, 127, 94, 214, 218, 246, 130,
- 135, 3, 4, 231, 252, 249, 151, 27, 266, 95,
- 161, 93, 176, 183, 21, 192, 243, 34, 57, 57,
- 197, 198, 192, 57, 151, 105, 234, 197, 198, 121,
- 827, 115, 185, 174, 0, 205, 4, 207, 187, 179,
- 230, 163, 224, 123, 184, 112, 1461, 27, 203, 21,
- 5, 111, 245, 243, 244, 147, 203, 272, 186, 183,
- 230, 192, 213, 21, 254, 179, 197, 198, 286, 199,
- 123, 179, 262, 263, 112, 265, 266, 272, 268, 219,
- 265, 208, 230, 272, 266, 21, 174, 253, 278, 27,
- 222, 203, 215, 199, 230, 285, 286, 12, 13, 111,
- 269, 241, 279, 270, 19, 185, 123, 288, 23, 279,
- 194, 268, 302, 303, 29, 305, 288, 295, 915, 309,
- 310, 276, 285, 276, 179, 295, 276, 265, 324, 221,
- 320, 321, 192, 276, 275, 932, 326, 197, 198, 14,
- 15, 331, 332, 111, 59, 278, 286, 277, 279, 339,
- 276, 328, 270, 5, 285, 332, 333, 232, 328, 324,
- 5, 224, 332, 333, 354, 355, 356, 224, 358, 14,
- 15, 277, 286, 363, 364, 365, 268, 367, 963, 255,
- 192, 57, 57, 3, 4, 197, 198, 275, 334, 329,
- 330, 14, 15, 213, 384, 4, 276, 328, 388, 213,
- 331, 332, 333, 393, 394, 395, 396, 397, 398, 994,
- 400, 213, 57, 403, 404, 329, 330, 224, 256, 279,
- 3, 4, 160, 276, 192, 285, 416, 266, 37, 197,
- 198, 286, 266, 213, 57, 295, 112, 1271, 153, 154,
- 155, 156, 157, 158, 159, 160, 161, 162, 3, 4,
- 289, 1117, 224, 31, 26, 289, 125, 109, 1124, 276,
- 4, 5, 1250, 1297, 57, 1253, 224, 279, 328, 52,
- 3, 4, 332, 333, 329, 330, 94, 467, 468, 469,
- 470, 13, 37, 1317, 62, 5, 224, 161, 224, 37,
- 136, 30, 252, 3, 4, 485, 105, 162, 76, 117,
- 55, 79, 270, 5, 169, 27, 181, 182, 4, 87,
- 59, 279, 56, 4, 62, 5, 328, 95, 62, 112,
- 332, 333, 101, 513, 3, 4, 241, 242, 266, 5,
- 545, 183, 52, 3, 4, 153, 181, 182, 17, 213,
- 4, 61, 57, 115, 4, 191, 5, 95, 12, 264,
- 105, 100, 542, 101, 59, 224, 5, 105, 181, 182,
- 328, 14, 15, 1160, 332, 333, 5, 28, 583, 4,
- 5, 193, 247, 121, 1171, 195, 185, 121, 230, 17,
- 256, 256, 257, 5, 299, 55, 246, 577, 4, 167,
- 134, 237, 252, 185, 142, 100, 37, 112, 142, 50,
- 274, 253, 247, 147, 57, 109, 74, 186, 598, 30,
- 158, 256, 257, 288, 4, 154, 261, 62, 3, 4,
- 203, 230, 240, 613, 247, 59, 616, 12, 206, 268,
- 185, 141, 162, 256, 257, 86, 208, 74, 186, 161,
- 30, 3, 4, 288, 634, 635, 636, 637, 180, 1365,
- 640, 195, 642, 232, 644, 2110, 646, 101, 200, 237,
- 170, 200, 195, 256, 105, 288, 100, 22, 5, 90,
- 12, 215, 27, 221, 223, 219, 85, 221, 693, 37,
- 131, 115, 143, 203, 232, 224, 235, 236, 184, 44,
- 45, 213, 47, 48, 243, 243, 164, 687, 688, 243,
- 690, 691, 37, 58, 165, 327, 250, 49, 169, 62,
- 332, 219, 334, 703, 704, 70, 71, 272, 223, 37,
- 710, 711, 270, 78, 268, 67, 81, 164, 181, 182,
- 235, 236, 14, 15, 282, 156, 284, 285, 728, 729,
- 730, 256, 186, 98, 185, 149, 324, 105, 103, 104,
- 267, 106, 114, 85, 96, 68, 217, 747, 748, 749,
- 31, 751, 84, 753, 154, 755, 234, 5, 110, 4,
- 105, 113, 3, 4, 66, 57, 324, 326, 327, 230,
- 324, 142, 772, 125, 774, 4, 108, 105, 232, 223,
- 251, 1579, 402, 22, 247, 3, 4, 234, 259, 260,
- 790, 235, 236, 256, 257, 415, 37, 248, 798, 164,
- 200, 1599, 802, 234, 4, 5, 45, 1483, 239, 48,
- 89, 326, 327, 227, 814, 815, 1614, 185, 5, 1617,
- 5, 821, 822, 823, 224, 288, 105, 1625, 828, 4,
- 1628, 5, 1676, 833, 4, 206, 836, 4, 1636, 78,
- 185, 1639, 4, 3, 4, 177, 571, 1691, 1646, 874,
- 215, 851, 41, 267, 5, 220, 56, 185, 190, 4,
- 162, 93, 62, 161, 105, 104, 55, 106, 233, 69,
- 5, 71, 243, 1717, 2371, 4, 76, 37, 4, 79,
- 248, 4, 326, 327, 2381, 85, 142, 253, 77, 181,
- 182, 891, 4, 618, 4, 95, 114, 179, 623, 142,
- 179, 101, 184, 4, 269, 270, 5, 96, 28, 4,
- 281, 911, 244, 3, 4, 213, 3, 4, 4, 5,
- 109, 121, 178, 112, 276, 290, 204, 229, 4, 1119,
- 1120, 931, 4, 211, 212, 178, 238, 219, 3, 4,
- 940, 5, 142, 4, 185, 105, 14, 15, 137, 138,
- 37, 3, 4, 285, 954, 247, 956, 4, 158, 241,
- 960, 961, 962, 295, 256, 257, 166, 167, 266, 334,
- 970, 3, 4, 973, 5, 975, 215, 3, 4, 5,
- 12, 7, 8, 14, 15, 4, 186, 2484, 266, 57,
- 55, 991, 2489, 993, 9, 204, 288, 997, 998, 11,
- 189, 5, 211, 212, 286, 252, 206, 196, 162, 3,
- 4, 1011, 1012, 4, 5, 271, 1016, 1017, 105, 219,
- 4, 221, 1022, 143, 1024, 645, 57, 1027, 271, 1029,
- 273, 1056, 232, 289, 4, 5, 2533, 237, 2535, 4,
- 14, 15, 49, 243, 184, 165, 289, 169, 330, 169,
- 250, 1051, 4, 262, 1054, 162, 5, 266, 4, 187,
- 67, 55, 187, 252, 253, 14, 15, 5, 268, 1069,
- 5, 1071, 187, 1073, 1074, 1075, 1076, 84, 5, 1079,
- 1080, 281, 282, 57, 284, 5, 4, 14, 15, 96,
- 3, 4, 5, 62, 14, 15, 28, 217, 1098, 3,
- 4, 5, 5, 110, 5, 1105, 113, 1783, 57, 1109,
- 1110, 1111, 214, 181, 182, 3, 4, 5, 125, 4,
- 3, 4, 1122, 4, 324, 1125, 9, 10, 11, 4,
- 57, 251, 752, 1133, 187, 324, 1136, 57, 1936, 259,
- 260, 390, 391, 2261, 1035, 1036, 2264, 1945, 2266, 83,
- 181, 182, 2270, 2271, 83, 5, 1954, 4, 4, 166,
- 1427, 1428, 1429, 1430, 1431, 1432, 1433, 1434, 2286, 5,
- 3, 4, 5, 1849, 7, 8, 108, 797, 1178, 247,
- 1180, 3, 4, 1183, 1184, 7, 8, 1187, 256, 257,
- 5, 4, 17, 1193, 17, 1195, 1872, 5, 95, 3,
- 4, 5, 1202, 7, 8, 5, 4, 181, 182, 4,
- 17, 22, 937, 4, 93, 5, 247, 5, 4, 2063,
- 288, 14, 15, 2067, 5, 256, 257, 4, 2072, 4,
- 261, 4, 181, 182, 45, 5, 12, 48, 12, 4,
- 51, 4, 174, 4, 176, 177, 178, 4, 159, 5,
- 5, 4, 4, 185, 181, 182, 5, 288, 4, 242,
- 270, 181, 182, 5, 57, 990, 198, 78, 1268, 1269,
- 1270, 1271, 4, 247, 5, 1000, 5, 5, 5, 4,
- 4, 254, 256, 257, 5, 5, 5, 5, 87, 5,
- 1290, 4, 4, 104, 1294, 106, 95, 1297, 247, 5,
- 5, 1491, 101, 5, 5, 5, 5, 256, 257, 4,
- 4, 129, 261, 1503, 288, 1315, 1316, 1317, 117, 5,
- 247, 101, 224, 5, 224, 1325, 224, 247, 1328, 256,
- 257, 224, 101, 265, 261, 224, 256, 257, 224, 288,
- 37, 261, 101, 142, 5, 199, 228, 37, 1348, 5,
- 199, 150, 4, 1353, 5, 5, 199, 1357, 199, 1359,
- 1360, 288, 1362, 1363, 1364, 4, 1366, 4, 288, 1369,
- 1370, 1371, 1372, 1373, 1374, 1375, 1376, 1377, 1378, 105,
- 5, 1381, 1382, 1383, 1384, 5, 5, 186, 181, 182,
- 5, 1391, 1392, 4, 193, 1015, 105, 1397, 1398, 1399,
- 5, 5, 1402, 1403, 215, 4, 4, 33, 5, 5,
- 2086, 5, 5, 2257, 1414, 1415, 4, 1417, 1418, 2095,
- 4, 2265, 5, 5, 4, 2269, 12, 12, 28, 6,
- 2274, 5, 5, 232, 6, 1435, 335, 1437, 4, 335,
- 335, 335, 1442, 1443, 243, 1445, 1446, 1447, 335, 1449,
- 1450, 335, 1452, 4, 247, 1455, 1456, 268, 335, 258,
- 4, 335, 4, 256, 257, 2141, 4, 4, 2144, 401,
- 4, 2147, 1472, 2149, 0, 5, 102, 224, 161, 1479,
- 224, 224, 129, 83, 224, 224, 224, 4, 1488, 1489,
- 4, 232, 118, 119, 120, 288, 187, 195, 1498, 4,
- 126, 1121, 4, 4, 1504, 4, 254, 5, 108, 62,
- 5, 5, 5, 139, 5, 5, 4, 4, 254, 5,
- 146, 4, 4, 76, 5, 5, 292, 4, 224, 4,
- 4, 157, 85, 4, 4, 224, 1536, 224, 1263, 4,
- 4, 2267, 95, 4, 213, 5, 213, 292, 213, 213,
- 213, 5, 5, 5, 4, 6, 1556, 2283, 6, 491,
- 1560, 5, 4, 12, 5, 5, 1566, 1292, 121, 5,
- 4, 1296, 4, 173, 4, 175, 176, 177, 178, 5,
- 5, 4, 254, 5, 4, 6, 5, 5, 5, 142,
- 4, 523, 4, 6, 5, 1320, 4, 254, 5, 5,
- 5, 4, 4, 203, 5, 5, 1331, 5, 5, 4,
- 4, 288, 5, 1338, 1339, 5, 5, 5, 4, 4,
- 220, 221, 5, 5, 1349, 5, 3, 4, 268, 5,
- 4, 4, 4, 186, 5, 5, 5, 2481, 264, 5,
- 4, 4, 19, 2369, 2370, 5, 4, 2373, 4, 2375,
- 4, 6, 5, 2379, 2380, 5, 5, 5, 2384, 2385,
- 4, 268, 5, 4, 4, 265, 2392, 2393, 221, 5,
- 5, 1671, 1672, 4, 1674, 52, 1676, 4, 4, 389,
- 5, 5, 282, 4, 4, 1090, 5, 4, 2394, 5,
- 243, 1691, 1692, 1693, 1694, 1695, 1696, 1697, 1698, 1699,
- 1700, 5, 5, 4, 2430, 4, 4, 2433, 5, 5,
- 1330, 4, 2438, 1713, 5, 1715, 2442, 1717, 4, 4,
- 97, 2447, 1722, 5, 5, 19, 5, 5, 4, 282,
- 5, 284, 5, 1733, 5, 5, 4, 4, 2455, 5,
- 4, 4, 4, 4, 1469, 4, 40, 4, 4, 4,
- 1750, 1751, 1752, 1753, 1754, 1755, 1756, 1757, 1758, 1759,
- 4, 1761, 1762, 1763, 1764, 1765, 1766, 1767, 1768, 1769,
- 1770, 1771, 149, 1773, 1394, 1775, 1776, 1777, 4, 73,
- 4, 2507, 382, 4, 2510, 4, 80, 4, 4, 2396,
- 4, 1791, 392, 5, 5, 4, 90, 91, 4, 2525,
- 5, 401, 2528, 97, 5, 5, 5, 4, 4, 4,
- 4, 2537, 2538, 4, 1814, 1815, 4, 1817, 4, 4,
- 1820, 115, 1822, 4, 335, 5, 203, 5, 5, 1829,
- 1830, 5, 209, 4, 2451, 5, 4, 4, 132, 4,
- 772, 4, -1, 5, 5, 1845, 4, 1847, 2455, 4,
- 4, 1851, 4, 4, 148, 1855, 5, 5, 4, 4,
- 4, 4, 156, 5, 5, 5, 5, 4, 4, 469,
- -1, -1, 472, 473, -1, -1, -1, -1, -1, -1,
- -1, 175, -1, 483, -1, -1, -1, -1, 488, -1,
- -1, -1, -1, -1, -1, -1, -1, 497, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 1909,
- -1, -1, -1, -1, -1, 209, -1, -1, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 320, 321, 322, -1, -1, -1, -1,
- -1, -1, -1, 51, -1, -1, -1, -1, -1, -1,
- 1685, 255, -1, -1, 62, 565, 566, 567, -1, -1,
- -1, -1, 266, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 914, -1, -1, -1, -1, -1, -1, 87,
- 88, -1, -1, 1718, -1, -1, -1, 95, -1, -1,
- -1, 295, -1, 101, -1, -1, -1, -1, -1, -1,
- -1, -1, 2012, -1, -1, -1, -1, 617, -1, 117,
- -1, -1, -1, 121, -1, 2025, 2026, 2027, 2028, 2029,
- 2030, 2031, 2032, 2033, 2034, 267, -1, -1, -1, 2039,
- -1, -1, 974, -1, 142, -1, 2046, -1, -1, 2049,
- -1, -1, 150, -1, 2054, -1, -1, 2057, 2058, 2059,
- 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069,
- 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, -1, 2079,
- -1, 2081, 2082, 2083, 316, -1, -1, -1, 186, -1,
- -1, -1, -1, -1, -1, 193, -1, -1, -1, 2099,
- 1720, -1, -1, 2103, -1, -1, -1, -1, 2108, -1,
- -1, -1, -1, -1, 1734, 1735, -1, -1, 1738, -1,
- -1, -1, -1, 1743, -1, 1745, -1, -1, -1, -1,
- -1, 731, -1, -1, 232, -1, -1, 1069, -1, -1,
- -1, -1, 374, -1, -1, 243, -1, -1, -1, -1,
- 750, -1, 2152, -1, -1, -1, -1, -1, -1, -1,
- 258, -1, -1, -1, -1, -1, -1, -1, -1, 1789,
- 268, -1, 270, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 786, 787, 788, -1,
- -1, -1, -1, -1, -1, -1, 1128, -1, -1, 1819,
- -1, -1, -1, -1, -1, -1, -1, -1, 1140, -1,
- -1, -1, -1, 1145, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 2224, -1, 324, -1, 2228, -1,
- -1, -1, -1, 465, -1, -1, -1, -1, 2238, -1,
- -1, -1, 474, -1, 2244, 477, 846, -1, 480, -1,
- 867, 2251, 484, -1, -1, -1, -1, 2257, -1, 2259,
- -1, -1, 2262, 2263, -1, 2265, -1, -1, -1, 2269,
- -1, -1, 2272, 2273, 2274, 2275, 2276, 2277, 2278, -1,
- -1, 2281, -1, -1, -1, 2285, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 2295, -1, -1, -1, -1,
- -1, 2301, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2312, -1, 914, -1, -1, 549, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1267, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2352, -1, 2354, -1, -1, -1, -1, 2359,
- -1, -1, 2087, -1, 964, -1, -1, -1, -1, -1,
- -1, 2371, 2372, -1, 974, -1, -1, 977, -1, -1,
- -1, 2381, 2382, -1, -1, -1, 2386, -1, -1, 1321,
- -1, -1, 1324, -1, -1, -1, -1, -1, -1, -1,
- -1, 1333, -1, -1, 2404, -1, -1, -1, 1340, 641,
- -1, -1, -1, -1, -1, 1347, 648, -1, -1, -1,
- -1, 2421, -1, 2043, 2044, 2045, -1, 2427, 2048, 2429,
- 2050, 2051, -1, 2053, -1, 2055, 2436, -1, -1, 2439,
- -1, -1, -1, -1, 2444, -1, -1, -1, -1, -1,
+ 10, 620, 203, 27, 1484, 0, 1486, 44, 4, 53,
+ 615, 616, 5, 3, 4, 4, 4, 57, 28, 5,
+ 44, 895, 5, 47, 34, 16, 6, 35, 41, 3,
+ 4, 5, 17, 43, 58, 35, 46, 1313, 5, 49,
+ 4, 5, 55, 53, 4, 62, 56, 5, 17, 59,
+ 5, 32, 62, 3, 4, 27, 66, 81, 62, 27,
+ 70, 3, 4, 4, 77, 75, 39, 4, 3, 4,
+ 87, 3, 4, 32, 98, 31, 3, 4, 3, 4,
+ 3, 4, 125, 96, 34, 95, 4, 97, 98, 99,
+ 100, 93, 3, 4, 161, 4, 109, 4, 62, 112,
+ 17, 83, 133, 42, 84, 268, 116, 795, 796, 797,
+ 52, 34, 5, 872, 37, 2462, 875, 21, 3, 4,
+ 84, 3, 4, 31, 137, 138, 1370, 26, 3, 4,
+ 129, 218, 112, 62, 21, 27, 158, 95, 27, 142,
+ 5, 151, 246, 101, 62, 213, 213, 111, 252, 34,
+ 24, 25, 17, 4, 62, 21, 2503, 845, 138, 124,
+ 170, 12, 193, 3, 4, 175, 130, 149, 76, 168,
+ 214, 79, 1857, 123, 115, 178, 189, 94, 21, 87,
+ 122, 224, 105, 196, 1869, 57, 1871, 95, 1873, 179,
+ 163, 1467, 1877, 111, 184, 1880, 187, 1882, 266, 266,
+ 123, 1886, 111, 1888, 111, 1890, 21, 59, 13, 1894,
+ 829, 1896, 4, 5, 199, 1900, 115, 21, 1903, 93,
+ 1905, 5, 232, 1908, 184, 20, 266, 249, 192, 219,
+ 199, 187, 114, 197, 198, 245, 246, 274, 123, 252,
+ 253, 213, 286, 245, 135, 213, 256, 179, 100, 289,
+ 185, 241, 151, 194, 264, 265, 404, 267, 268, 167,
+ 270, 203, 185, 115, 272, 232, 231, 253, 160, 417,
+ 280, 160, 272, 268, 192, 230, 269, 287, 288, 197,
+ 198, 270, 270, 192, 265, 192, 289, 59, 197, 198,
+ 197, 198, 277, 230, 304, 305, 286, 307, 206, 295,
+ 919, 311, 312, 4, 179, 288, 265, 324, 277, 208,
+ 334, 324, 322, 323, 288, 279, 255, 936, 328, 111,
+ 224, 285, 215, 333, 334, 109, 276, 285, 100, 237,
+ 2015, 341, 224, 2018, 276, 224, 37, 224, 2023, 329,
+ 330, 276, 2027, 60, 324, 62, 356, 357, 358, 276,
+ 360, 276, 46, 276, 286, 365, 366, 367, 224, 369,
+ 2045, 279, 967, 270, 328, 276, 62, 331, 332, 333,
+ 279, 223, 279, 213, 266, 180, 386, 266, 3, 4,
+ 390, 224, 4, 235, 236, 395, 396, 397, 398, 399,
+ 400, 276, 402, 998, 266, 405, 406, 329, 330, 183,
+ 192, 95, 1276, 30, 105, 197, 198, 29, 418, 224,
+ 328, 286, 37, 52, 332, 333, 324, 289, 40, 328,
+ 224, 328, 142, 332, 333, 332, 333, 222, 1302, 27,
+ 55, 3, 4, 127, 1122, 4, 3, 4, 2123, 4,
+ 30, 1129, 3, 4, 4, 59, 230, 136, 1322, 218,
+ 72, 223, 4, 5, 329, 330, 149, 174, 80, 469,
+ 470, 471, 472, 235, 236, 2150, 142, 3, 4, 253,
+ 30, 243, 184, 0, 326, 327, 27, 487, 174, 99,
+ 105, 37, 17, 52, 185, 6, 100, 279, 37, 111,
+ 149, 52, 252, 285, 3, 4, 1255, 5, 646, 1258,
+ 90, 5, 191, 295, 56, 515, 62, 66, 84, 546,
+ 62, 133, 4, 37, 3, 4, 57, 176, 3, 4,
+ 246, 5, 234, 243, 37, 4, 252, 154, 5, 230,
+ 206, 5, 108, 543, 227, 161, 328, 14, 15, 95,
+ 332, 333, 2227, 3, 4, 101, 1165, 584, 237, 105,
+ 14, 15, 37, 5, 326, 327, 105, 1176, 275, 179,
+ 185, 183, 2247, 161, 203, 121, 156, 243, 578, 121,
+ 192, 112, 2257, 200, 267, 197, 198, 57, 2263, 275,
+ 57, 105, 134, 205, 278, 207, 142, 213, 37, 599,
+ 142, 112, 105, 57, 154, 147, 17, 224, 57, 26,
+ 5, 177, 158, 162, 614, 281, 754, 617, 230, 223,
+ 161, 57, 12, 13, 190, 213, 151, 74, 74, 19,
+ 105, 235, 236, 23, 5, 635, 636, 637, 638, 29,
+ 186, 641, 112, 643, 203, 645, 185, 647, 2118, 5,
+ 200, 213, 203, 195, 234, 5, 213, 272, 274, 239,
+ 28, 799, 141, 112, 14, 15, 105, 279, 695, 195,
+ 60, 185, 213, 215, 224, 221, 112, 219, 244, 221,
+ 229, 2356, 185, 295, 185, 5, 232, 687, 688, 238,
+ 690, 170, 692, 693, 14, 15, 195, 243, 115, 2374,
+ 28, 243, 3, 4, 50, 705, 706, 57, 250, 248,
+ 185, 184, 712, 713, 181, 182, 328, 164, 164, 285,
+ 332, 333, 326, 327, 270, 256, 268, 181, 182, 295,
+ 730, 731, 732, 4, 248, 162, 282, 57, 284, 285,
+ 86, 142, 169, 79, 101, 109, 185, 4, 5, 749,
+ 750, 751, 2427, 753, 2429, 755, 2431, 757, 2433, 95,
+ 2435, 234, 2437, 5, 154, 155, 156, 157, 158, 159,
+ 160, 161, 162, 163, 774, 143, 776, 178, 324, 101,
+ 247, 62, 324, 22, 62, 131, 256, 234, 234, 256,
+ 257, 208, 792, 247, 261, 2380, 268, 165, 200, 40,
+ 800, 169, 256, 257, 804, 2390, 45, 256, 162, 48,
+ 52, 1489, 51, 114, 193, 143, 816, 817, 1682, 61,
+ 256, 288, 5, 823, 824, 825, 85, 94, 62, 186,
+ 830, 181, 182, 1697, 288, 835, 1585, 165, 219, 78,
+ 840, 169, 83, 121, 14, 15, 2521, 267, 5, 217,
+ 117, 878, 68, 243, 244, 855, 1605, 14, 15, 1723,
+ 85, 181, 182, 31, 186, 104, 5, 106, 4, 147,
+ 5, 1620, 273, 4, 1623, 232, 266, 4, 5, 14,
+ 15, 1019, 1631, 251, 230, 1634, 153, 57, 289, 217,
+ 5, 259, 260, 1642, 5, 895, 1645, 247, 22, 4,
+ 57, 5, 89, 1652, 3, 4, 256, 257, 2493, 4,
+ 232, 261, 302, 2498, 4, 915, 3, 4, 105, 3,
+ 4, 45, 57, 251, 48, 4, 5, 247, 14, 15,
+ 4, 259, 260, 1124, 1125, 935, 256, 257, 288, 3,
+ 4, 261, 183, 221, 944, 5, 179, 4, 327, 93,
+ 37, 184, 5, 332, 78, 334, 55, 2542, 958, 2544,
+ 960, 203, 3, 4, 964, 965, 966, 4, 288, 3,
+ 4, 57, 4, 240, 974, 4, 215, 977, 12, 979,
+ 104, 253, 106, 3, 4, 4, 219, 4, 1126, 5,
+ 268, 55, 179, 3, 4, 995, 37, 997, 204, 3,
+ 4, 1001, 1002, 7, 8, 211, 212, 17, 241, 14,
+ 15, 181, 182, 3, 4, 1015, 1016, 4, 105, 4,
+ 1020, 1021, 12, 4, 181, 182, 1026, 5, 1028, 268,
+ 4, 1031, 4, 1033, 1061, 55, 3, 4, 3, 4,
+ 5, 2275, 9, 10, 11, 4, 181, 182, 3, 4,
+ 5, 9, 57, 286, 1054, 204, 1056, 2291, 11, 1059,
+ 266, 252, 211, 212, 105, 14, 15, 5, 12, 3,
+ 4, 5, 4, 5, 1074, 4, 1076, 247, 1078, 1079,
+ 1080, 1081, 392, 393, 1084, 1085, 256, 257, 1039, 1040,
+ 247, 215, 14, 15, 162, 181, 182, 330, 28, 256,
+ 257, 4, 184, 1103, 261, 49, 62, 169, 57, 4,
+ 1110, 1789, 247, 262, 1114, 1115, 1116, 266, 288, 162,
+ 76, 256, 257, 67, 187, 4, 261, 1127, 187, 85,
+ 1130, 288, 5, 5, 4, 57, 187, 2269, 1138, 95,
+ 2272, 1141, 2274, 62, 2378, 2379, 2278, 2279, 2382, 214,
+ 2384, 5, 96, 288, 2388, 2389, 5, 213, 4, 2393,
+ 2394, 247, 2294, 4, 4, 121, 110, 2401, 2402, 113,
+ 256, 257, 187, 83, 83, 5, 181, 182, 1856, 109,
+ 4, 125, 572, 1183, 4, 1185, 142, 5, 1188, 1189,
+ 5, 4, 1192, 49, 1943, 5, 95, 1335, 1198, 5,
+ 1200, 1879, 288, 1952, 4, 2439, 2070, 1207, 2442, 17,
+ 2074, 67, 1961, 2447, 17, 2079, 17, 2451, 4, 4,
+ 12, 5, 2456, 5, 14, 15, 93, 4, 84, 619,
+ 186, 5, 181, 182, 624, 4, 4, 4, 159, 5,
+ 96, 12, 247, 4, 4, 175, 4, 177, 178, 179,
+ 4, 256, 257, 5, 110, 5, 186, 113, 4, 181,
+ 182, 1399, 4, 242, 5, 221, 4, 57, 270, 125,
+ 200, 5, 4, 1273, 1274, 1275, 1276, 5, 5, 5,
+ 5, 4, 2516, 288, 4, 2519, 5, 243, 3, 4,
+ 5, 5, 7, 8, 254, 1295, 5, 5, 247, 1299,
+ 2534, 5, 1302, 2537, 4, 4, 1497, 256, 257, 5,
+ 166, 5, 2546, 2547, 5, 5, 5, 5, 1509, 4,
+ 1320, 1321, 1322, 4, 224, 247, 282, 5, 284, 101,
+ 1330, 224, 276, 1333, 256, 257, 224, 267, 224, 288,
+ 6, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, 5,
+ 3, 4, 5, 1353, 7, 8, 129, 101, 1358, 224,
+ 37, 224, 1362, 5, 1364, 1365, 288, 1367, 1368, 1369,
+ 101, 1371, 199, 228, 1374, 1375, 1376, 1377, 1378, 1379,
+ 1380, 1381, 1382, 1383, 5, 37, 1386, 1387, 1388, 1389,
+ 199, 181, 182, 4, 199, 5, 1396, 1397, 5, 4,
+ 199, 2265, 1402, 1403, 1404, 4, 4, 1407, 1408, 2273,
+ 105, 5, 5, 2277, 5, 2093, 5, 5, 2282, 1419,
+ 1420, 105, 1422, 1423, 2102, 5, 4, 3, 4, 5,
+ 33, 7, 8, 28, 5, 5, 4, 12, 5, 5,
+ 1440, 1441, 4, 1443, 4, 6, 5, 5, 1448, 1449,
+ 4, 1451, 1452, 1453, 335, 1455, 1456, 247, 1458, 12,
+ 335, 1461, 1462, 5, 335, 6, 256, 257, 4, 335,
+ 4, 2149, 4, 403, 2152, 335, 335, 2155, 1478, 2157,
+ 4, 4, 335, 335, 4, 1485, 5, 4, 0, 84,
+ 5, 224, 129, 161, 1494, 1495, 4, 232, 288, 102,
+ 224, 187, 224, 224, 1504, 4, 224, 224, 195, 4,
+ 1510, 4, 4, 4, 109, 118, 119, 120, 5, 5,
+ 5, 5, 5, 126, 254, 5, 4, 4, 292, 5,
+ 4, 4, 224, 5, 5, 4, 139, 4, 4, 4,
+ 4, 224, 1542, 146, 224, 4, 4, 292, 4, 213,
+ 5, 941, 213, 213, 157, 213, 213, 5, 5, 5,
+ 4, 6, 1562, 493, 6, 5, 1566, 4, 6, 5,
+ 5, 5, 1572, 4, 4, 4, 288, 5, 5, 174,
+ 4, 176, 177, 178, 179, 5, 4, 4, 1726, 5,
+ 5, 5, 4, 12, 5, 525, 4, 6, 5, 5,
+ 5, 4, 1740, 1741, 994, 4, 1744, 5, 254, 5,
+ 205, 1749, 5, 1751, 1004, 5, 4, 4, 254, 5,
+ 5, 5, 5, 4, 4, 254, 2490, 222, 223, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, 317, 318, 319, 320, 321, 322, 1795, 5, 5,
+ 5, 264, 5, 4, 4, 335, 5, 5, 5, 5,
+ 4, 4, 267, 5, 4, 4, 4, 1677, 1678, 4,
+ 1680, 5, 1682, 5, 5, 5, 4, 4, 1826, 284,
+ 5, 5, 5, 4, 4, 4, 4, 1697, 1698, 1699,
+ 1700, 1701, 1702, 1703, 1704, 1705, 1706, 5, 5, 4,
+ 4, 16, 5, 4, 6, 5, 5, 5, 23, 1719,
+ 4, 1721, 4, 1723, 4, 268, 5, 5, 1728, 5,
+ 4, 4, 391, 5, 5, 5, 5, 4, 4, 1739,
+ 5, 5, 5, 5, 4, 4, 268, 5, 4, 4,
+ 4, 4, 4, 4, 4, 4, 1756, 1757, 1758, 1759,
+ 1760, 1761, 1762, 1763, 1764, 1765, 4, 1767, 1768, 1769,
+ 1770, 1771, 1772, 1773, 1774, 1775, 1776, 1777, 4, 1779,
+ 4, 1781, 1782, 1783, 4, 4, 87, 4, 4, 384,
+ 4, 1095, 5, 5, 95, 4, 2405, 1797, 4, 394,
+ 101, 5, 5, 5, 5, 4, 4, 4, 403, 4,
+ 4, 4, 4, 4, 4, 4, 117, 5, 5, 1819,
+ 5, 1821, 1822, 5, 1824, 5, 4, 1827, 4, 1829,
+ 4, 4, 2403, 5, 2464, 5, 1836, 1837, 4, 4,
+ 4, 142, 4, 4, 774, 5, 5, 4, 4, 150,
+ 4, 4, 1852, 5, 1854, 2464, 5, 5, 1858, 5,
+ 4, 4, 1862, 2460, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 471, -1, 1268, 474,
+ 475, -1, -1, -1, -1, 186, -1, -1, -1, -1,
+ 485, -1, 193, -1, -1, 490, -1, -1, -1, -1,
+ -1, -1, -1, -1, 499, -1, -1, 1297, -1, -1,
+ -1, 1301, 2050, 2051, 2052, -1, 1916, 2055, -1, 2057,
+ 2058, 226, 2060, 228, 2062, -1, -1, -1, -1, -1,
+ -1, 232, -1, -1, -1, 1325, -1, -1, -1, -1,
+ -1, -1, 243, -1, -1, -1, 1336, -1, -1, -1,
+ -1, -1, -1, 1343, 1344, -1, -1, 258, -1, -1,
+ -1, -1, -1, -1, 1354, -1, -1, -1, 2106, -1,
+ -1, 566, 567, 568, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 918, -1,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 320, 321, 322, -1, 2019,
+ -1, -1, -1, 618, -1, -1, -1, -1, -1, -1,
+ -1, -1, 2032, 2033, 2034, 2035, 2036, 2037, 2038, 2039,
+ 2040, 2041, -1, -1, -1, -1, 2046, -1, 978, -1,
+ -1, -1, -1, 2053, -1, -1, 2056, 871, -1, -1,
+ -1, 2061, -1, -1, 2064, 2065, 2066, 2067, 2068, 2069,
+ 2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079,
+ 2080, 2081, 2082, 2083, 2084, 1475, 2086, -1, 2088, 2089,
+ 2090, -1, -1, -1, -1, -1, -1, -1, 269, -1,
+ 19, -1, -1, 2103, -1, -1, -1, 2107, -1, -1,
+ -1, 2111, -1, -1, -1, 2253, 2116, -1, -1, -1,
+ -1, 40, -1, 2261, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 733, -1,
+ -1, -1, -1, -1, 1074, -1, -1, 318, -1, -1,
+ 2288, -1, -1, -1, 73, -1, -1, 752, -1, -1,
+ 2160, 80, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 90, 91, -1, -1, -1, -1, -1, 97, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2466, -1, -1, 1069,
- -1, -1, 856, -1, -1, -1, -1, -1, 2098, -1,
- -1, 2481, -1, -1, 2484, 2485, -1, 2487, -1, 2489,
- 2490, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2501, -1, 1103, -1, -1, 738, -1, 2508, -1,
- 1442, 2511, 744, -1, -1, -1, 1116, -1, -1, -1,
+ -1, -1, -1, 788, 789, 790, 115, -1, -1, -1,
+ -1, -1, -1, 1133, -1, 376, -1, -1, -1, -1,
+ -1, -1, -1, 132, -1, 1145, -1, -1, -1, -1,
+ 1150, -1, -1, -1, -1, -1, -1, -1, -1, 148,
+ -1, -1, 2232, -1, -1, -1, 2236, 156, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2246, -1, -1, -1,
+ -1, -1, 2252, -1, -1, 850, 175, -1, -1, 2259,
+ -1, -1, -1, 51, -1, 2265, -1, 2267, -1, -1,
+ 2270, 2271, -1, 2273, 62, -1, -1, 2277, -1, -1,
+ 2280, 2281, 2282, 2283, 2284, 2285, 2286, -1, -1, 2289,
+ 209, -1, -1, 2293, -1, -1, 467, -1, -1, 87,
+ 88, 1691, -1, -1, 2304, 476, -1, 95, 479, -1,
+ 2310, 482, -1, 101, -1, 486, -1, -1, -1, -1,
+ -1, 2321, -1, 918, -1, -1, -1, -1, -1, 117,
+ -1, -1, -1, 121, 1724, -1, 255, -1, -1, -1,
+ -1, -1, 1272, -1, -1, -1, -1, 266, -1, -1,
+ -1, -1, -1, -1, 142, -1, -1, -1, -1, -1,
+ -1, 2361, 150, 2363, -1, -1, -1, -1, 2368, -1,
+ -1, -1, -1, 968, -1, -1, 295, -1, -1, 550,
+ 2380, 2381, -1, 978, -1, -1, 981, -1, -1, -1,
+ 2390, 2391, -1, -1, -1, 2395, 1326, -1, 186, 1329,
+ -1, -1, -1, -1, -1, 193, -1, -1, 1338, 1223,
+ -1, -1, -1, 2413, -1, 1345, -1, -1, -1, -1,
+ -1, 1235, 1352, -1, -1, -1, -1, -1, -1, -1,
+ 2430, -1, -1, -1, -1, -1, 2436, -1, 2438, 1253,
+ 1254, -1, -1, -1, 232, 2445, -1, -1, 2448, -1,
+ -1, -1, -1, 2453, -1, 243, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 2533, -1, 2535, -1, -1, -1, -1,
- 1140, -1, -1, -1, -1, 1145, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 791,
- -1, -1, 2287, -1, 796, -1, 2291, 799, -1, -1,
- -1, -1, -1, -1, -1, -1, 808, -1, -1, -1,
- -1, -1, 1514, 1515, 1516, 1517, 1518, -1, -1, 1521,
- -1, -1, 1524, -1, -1, 1527, 1528, 1529, 1530, 1531,
- 1532, 1218, -1, 1535, -1, -1, -1, -1, 1540, 1541,
- -1, -1, 1544, 1230, -1, -1, -1, -1, 1550, -1,
- -1, -1, -1, -1, -1, 2245, -1, -1, -1, -1,
- -1, 1248, 1249, 2253, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1850, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1862, -1, 1864,
- 2280, 1866, 1262, -1, -1, 1870, -1, 1267, 1873, -1,
- 1875, -1, -1, -1, 1879, -1, 1881, -1, 1883, -1,
- -1, -1, 1887, -1, 1889, -1, -1, -1, 1893, -1,
- -1, 1896, -1, 1898, -1, 1295, 1901, -1, -1, -1,
+ 258, 642, -1, -1, -1, 2475, -1, -1, 649, 1074,
+ 268, -1, 270, -1, -1, 860, -1, -1, -1, -1,
+ 2490, -1, -1, 2493, 2494, -1, 2496, -1, 2498, 2499,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 2510, -1, -1, 1108, -1, -1, -1, 2517, 1448, -1,
+ 2520, -1, -1, -1, -1, -1, 1121, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 324, -1, -1, -1,
+ -1, -1, 2542, -1, 2544, -1, -1, -1, -1, -1,
+ 1145, -1, -1, -1, -1, 1150, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 740,
+ -1, -1, -1, -1, -1, 746, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 1321, -1, -1, 1324, -1, -1, -1, -1, -1,
- -1, -1, -1, 1333, 1334, -1, -1, -1, -1, -1,
- 1340, -1, -1, -1, -1, -1, -1, 1347, -1, -1,
- -1, -1, 1684, -1, -1, 1687, -1, -1, -1, -1,
+ 1520, 1521, 1522, 1523, 1524, -1, -1, 1527, -1, -1,
+ 1530, -1, -1, 1533, 1534, 1535, 1536, 1537, 1538, -1,
+ -1, 1541, -1, -1, -1, -1, 1546, 1547, -1, 22,
+ 1550, -1, 793, -1, 27, -1, 1556, 798, -1, -1,
+ 801, -1, -1, -1, -1, -1, -1, -1, -1, 810,
+ -1, 44, 45, -1, 47, 48, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 58, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 70, 71, -1,
+ -1, -1, 1267, -1, -1, 78, -1, 1272, 81, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2496, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 1386, -1, -1, 1389,
- 1390, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1400, -1, -1, 2008, -1, -1, 2011, -1, -1, -1,
- -1, 2016, -1, -1, -1, 2020, -1, -1, -1, 1203,
- 1204, 1205, -1, -1, -1, 1057, -1, -1, -1, 1213,
- 1214, 1215, -1, 2038, -1, 1219, 1220, 1221, -1, -1,
- 1224, 1225, 1442, 1227, 1228, -1, -1, -1, -1, 1081,
+ -1, -1, -1, -1, -1, 98, -1, -1, -1, -1,
+ 103, 104, -1, 106, 2094, 1300, -1, -1, -1, -1,
+ -1, -1, -1, -1, 4, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 19,
+ -1, 1326, -1, -1, 1329, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1338, 1339, -1, -1, 37, -1, -1,
+ 1345, -1, -1, -1, -1, -1, -1, 1352, -1, -1,
+ 1690, 164, 52, 1693, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 1595, -1, -1, -1, -1, -1, -1, -1, 1603,
+ 1604, -1, -1, -1, -1, -1, 1391, -1, -1, 1394,
+ 1395, -1, -1, -1, 1618, 1619, -1, 97, -1, -1,
+ 1405, -1, 215, -1, -1, 1629, 1630, 220, -1, -1,
+ -1, 111, -1, -1, -1, -1, 1640, 1641, -1, -1,
+ 233, -1, -1, 1208, 1209, 1210, 1650, 1651, -1, -1,
+ -1, -1, 1656, 1218, 1219, 1220, -1, -1, -1, 1224,
+ 1225, 1226, 1666, 1448, 1229, 1230, -1, 1232, 1233, 149,
+ -1, -1, -1, -1, -1, -1, 269, 270, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1470, 1471, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1114, -1, -1, 1485, -1, -1, -1, -1,
+ -1, 1476, 1477, -1, -1, -1, -1, 290, -1, -1,
+ -1, 1062, -1, -1, -1, 185, 1491, -1, -1, -1,
+ -1, -1, 192, -1, -1, 2295, -1, 197, 198, 2299,
+ -1, -1, -1, 203, -1, 1086, -1, -1, -1, 209,
+ -1, -1, -1, -1, -1, 1520, 1521, 1522, 1523, 1524,
+ -1, 334, 1527, -1, 1864, 1530, -1, -1, 1533, 1534,
+ 1535, 1536, 1537, 1538, -1, 1540, 1541, -1, 1119, -1,
+ 1545, 1546, 1547, -1, 1549, 1550, -1, -1, -1, -1,
+ 1555, 1556, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1913, -1, -1, -1, -1, -1, 279,
+ -1, -1, -1, -1, -1, 4, 5, -1, -1, -1,
+ -1, -1, -1, -1, 294, 295, 296, 297, 298, 299,
+ 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 320, 321, 322, -1, -1, -1, -1, -1, 328, -1,
+ -1, -1, 332, 333, -1, -1, -1, 56, -1, -1,
+ -1, -1, -1, 62, -1, -1, -1, -1, -1, -1,
+ 69, -1, 71, -1, -1, -1, -1, 76, -1, -1,
+ 79, -1, -1, -1, -1, -1, 85, -1, -1, -1,
+ -1, 1676, -1, -1, 1679, -1, 95, 2017, -1, -1,
+ -1, -1, 101, -1, -1, 1690, -1, -1, 1693, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2115, -1, -1, -1, 1514, 1515, 1516, 1517, 1518, -1,
- -1, 1521, -1, -1, 1524, 1857, -1, 1527, 1528, 1529,
- 1530, 1531, 1532, -1, 1534, 1535, -1, 2142, -1, 1539,
- 1540, 1541, -1, 1543, 1544, -1, -1, -1, -1, 1549,
- 1550, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 121, 1927, 2044, 2505, -1, -1, -1, -1,
+ -1, -1, -1, 1937, 2054, 1720, -1, 1941, 1942, -1,
+ -1, -1, -1, 142, -1, -1, 1950, 1951, -1, -1,
+ -1, -1, -1, -1, -1, 1959, 1960, -1, -1, 158,
+ -1, 1965, -1, -1, -1, -1, -1, 166, 167, -1,
+ -1, 1975, 1976, 1334, -1, -1, -1, -1, -1, -1,
+ -1, -1, 1986, 1987, -1, -1, -1, 186, -1, -1,
+ 3, 4, 1777, 1997, -1, -1, -1, -1, -1, -1,
+ -1, -1, 2006, -1, 2008, -1, 19, 206, -1, -1,
+ -1, 1576, -1, -1, -1, -1, -1, -1, -1, -1,
+ 219, -1, 221, -1, 1589, -1, -1, -1, -1, -1,
+ -1, 1392, -1, 232, 1599, -1, -1, 1398, 237, 52,
+ -1, -1, -1, -1, 243, -1, -1, -1, -1, -1,
+ -1, 250, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 1849, -1, -1, -1, -1, 268,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1589, -1, 1906, -1, -1, -1, -1, -1,
- 1597, 1598, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1612, 1613, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 1623, 1624, -1, -1,
- -1, -1, -1, -1, 2219, -1, -1, 1634, 1635, -1,
- -1, -1, -1, -1, -1, -1, -1, 1644, 1645, -1,
- -1, -1, -1, 1650, 2239, -1, -1, -1, -1, -1,
- -1, -1, -1, 1660, 2249, -1, -1, -1, -1, -1,
- 2255, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 281, 282, 97, 284, -1, -1, -1, 1450,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1670, -1, -1, 1673, -1, -1, -1, -1, 2010, -1,
- -1, -1, -1, -1, 1684, -1, -1, 1687, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 1329, -1, -1,
- -1, -1, -1, -1, -1, 2037, -1, -1, -1, -1,
- -1, -1, -1, -1, 1714, 2047, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2226, -1, -1, -1,
+ -1, -1, -1, -1, 1899, -1, -1, -1, -1, -1,
+ -1, 1482, -1, -1, -1, 324, -1, -1, -1, 1490,
+ -1, -1, -1, -1, -1, -1, 149, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 1518, -1, -1,
+ 2164, -1, -1, -1, 1525, -1, -1, -1, -1, -1,
+ 2174, -1, -1, -1, -1, -1, -1, -1, -1, 2183,
+ -1, -1, -1, -1, -1, -1, -1, -1, 2192, -1,
+ 203, -1, -1, -1, -1, 2199, 209, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2210, -1, -1, -1,
+ -1, -1, 2216, -1, -1, 2219, -1, -1, 2222, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2347, -1, -1, 20, 21, 22, -1, -1,
- -1, -1, -1, -1, -1, 1387, -1, -1, -1, -1,
- 2365, 1393, -1, -1, -1, 3, 4, -1, -1, 44,
- 45, 1771, -1, 48, -1, -1, -1, -1, -1, -1,
- 55, 19, -1, 58, -1, -1, 1570, 62, -1, -1,
- -1, -1, -1, -1, -1, 70, 71, -1, 36, 1583,
- -1, -1, -1, 78, -1, -1, -1, -1, -1, 1593,
- -1, -1, 1444, 2418, 52, 2420, -1, 2422, -1, 2424,
- -1, 2426, -1, 2428, -1, -1, -1, -1, 103, 104,
- -1, 106, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 1842, -1, 1476, -1, 121, -1, -1, -1,
- -1, -1, 1484, -1, -1, -1, -1, -1, -1, 97,
- -1, -1, -1, -1, -1, -1, -1, 142, -1, -1,
+ -1, -1, 2017, -1, -1, 2020, -1, -1, -1, 2359,
+ -1, -1, -1, -1, -1, 2030, 2366, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2044,
+ -1, -1, 2047, -1, -1, -1, -1, -1, -1, 2054,
+ -1, -1, -1, -1, 2059, -1, -1, -1, -1, -1,
+ -1, -1, 295, 296, 297, 298, 299, 300, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322,
+ -1, 1672, -1, 1674, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 2329, -1, -1, -1, 2333,
+ -1, -1, -1, 1694, -1, -1, 2340, -1, -1, -1,
+ -1, -1, 2346, -1, -1, -1, 2350, -1, -1, 2353,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1512, -1, -1, -1, -1, -1, 2218, 1519, -1, 164,
- -1, -1, 1892, -1, -1, -1, -1, -1, 173, -1,
- -1, -1, -1, 1920, -1, -1, -1, 2512, -1, -1,
- -1, 149, -1, 1930, -1, -1, -1, 1934, 1935, -1,
- -1, -1, -1, -1, -1, -1, 1943, 1944, -1, -1,
- -1, -1, -1, -1, -1, 1952, 1953, -1, 213, -1,
- -1, 1958, -1, -1, -1, 220, 221, 185, -1, -1,
- -1, 1968, 1969, -1, -1, -1, -1, -1, 233, -1,
- -1, -1, 1979, 1980, -1, 203, -1, -1, 243, -1,
- -1, 209, -1, 1990, -1, -1, -1, -1, -1, -1,
- -1, 219, 1999, -1, 2001, -1, -1, -1, -1, -1,
- -1, -1, -1, 268, -1, 270, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 280, -1, -1, -1, -1,
- 2010, -1, -1, 2013, -1, 290, -1, -1, 2350, -1,
- -1, -1, -1, 2023, -1, 2357, -1, -1, -1, -1,
- -1, -1, -1, -1, 1666, -1, 1668, 2037, 276, -1,
- 2040, -1, -1, -1, -1, -1, -1, 2047, -1, 324,
- -1, -1, 2052, -1, -1, -1, 1688, 295, 296, 297,
- 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 320, 321, 322, -1, -1, 1719, -1, 1721,
+ -1, 1926, 3, 4, 1725, 2485, 1727, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 19, -1,
+ -1, -1, 1743, -1, 1745, -1, -1, 1748, -1, 1750,
+ -1, 2511, -1, -1, 2514, 36, -1, -1, -1, -1,
+ -1, 1966, 1967, 1968, 1969, 1970, -1, 1972, 1973, -1,
+ -1, 52, 1977, 1978, 1979, 1980, 1981, -1, 1983, 1984,
+ -1, -1, -1, -1, -1, -1, -1, 1788, -1, -1,
+ 1791, 1792, -1, -1, -1, -1, -1, -1, -1, 1800,
+ -1, 2226, -1, -1, 3, 4, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 97, -1, -1, -1,
+ 19, -1, 1823, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2264,
+ -1, -1, -1, -1, -1, -1, 1847, 1848, -1, -1,
+ -1, 2276, -1, -1, -1, -1, -1, -1, 4, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 149, -1,
+ -1, -1, -1, 19, 1875, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1884, -1, -1, -1, -1, -1, -1,
+ -1, 1892, -1, -1, -1, -1, 1897, -1, 97, -1,
+ 1901, -1, -1, -1, 185, 1906, 52, -1, 1909, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1737, -1, 1739, -1, -1,
- 1742, -1, 1744, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 203, -1, -1, -1, -1, -1, 209, -1,
+ -1, -1, -1, -1, 2359, 2360, -1, 2362, 219, -1,
+ -1, 2366, 2367, -1, -1, -1, 2371, -1, -1, -1,
+ 149, 97, -1, -1, -1, -1, -1, -1, 2163, -1,
+ -1, 2166, 2167, 2168, 2169, 2170, -1, 2172, 2173, -1,
+ -1, 2396, -1, -1, -1, -1, -1, -1, -1, 2184,
+ 2185, 2186, 2187, 2188, -1, 2190, 2191, -1, 2193, -1,
+ -1, -1, -1, -1, -1, 276, -1, -1, 2203, 2204,
+ -1, -1, -1, 149, -1, -1, -1, -1, -1, 2214,
+ 209, -1, -1, -1, 295, 296, 297, 298, 299, 300,
+ 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
+ 321, 322, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 18, 19, -1, -1, -1, 203, -1, -1,
+ 2485, -1, -1, 209, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2501, -1, -1, -1,
+ -1, -1, -1, -1, 2085, -1, 2511, -1, 54, 2514,
+ -1, -1, -1, -1, -1, -1, 295, 296, 297, 298,
+ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+ 319, 320, 321, 322, -1, -1, -1, 2332, -1, -1,
+ -1, 97, -1, -1, -1, 19, -1, -1, 2343, -1,
+ 2345, 107, -1, -1, 2349, -1, -1, 31, -1, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, 317, 318, 319, 320, 321, 322, 61, 62, -1,
+ -1, 65, -1, 149, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 1919, -1, -1, -1, 2156,
- -1, -1, -1, -1, 2476, -1, -1, -1, -1, 2166,
- 1782, -1, -1, 1785, 1786, -1, -1, -1, 2175, 6,
- -1, -1, 1794, -1, -1, -1, -1, 2184, -1, -1,
- 2502, -1, -1, 2505, 2191, 1959, 1960, 1961, 1962, 1963,
- -1, 1965, 1966, -1, 1816, 2202, 1970, 1971, 1972, 1973,
- 1974, 2208, 1976, 1977, 2211, -1, -1, 2214, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 1840, 1841,
- -1, -1, -1, -1, -1, -1, 4, -1, 2218, -1,
+ -1, -1, -1, 87, -1, -1, -1, -1, -1, -1,
+ -1, 2416, -1, 97, 2419, -1, -1, 2422, -1, 2424,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 19, -1, -1, -1, -1, 1868, -1, -1, -1,
- -1, -1, -1, -1, -1, 1877, -1, -1, -1, 37,
- -1, -1, -1, 1885, -1, -1, 2256, -1, 1890, -1,
- -1, -1, 1894, -1, 52, -1, -1, 1899, 2268, -1,
- 1902, 3, 4, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 19, -1, -1,
+ 2231, -1, -1, -1, 2235, -1, -1, -1, -1, -1,
+ -1, -1, -1, 209, -1, -1, -1, -1, -1, -1,
+ 2251, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 149, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 162, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 2320, -1, -1, -1, 2324, -1, 97,
- -1, -1, -1, -1, 2331, -1, -1, -1, -1, -1,
- 2337, -1, -1, 111, 2341, -1, -1, 2344, -1, -1,
+ -1, -1, -1, -1, 178, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 272, -1, -1, -1,
+ -1, 195, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 209, -1, -1, -1, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, 317, 318, 319, 320, 321, 322, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 255, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 2386, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2350, 2351, 4, 2353, -1, -1, -1, 2357, 2358, -1,
- -1, 149, 2362, -1, -1, 97, -1, 19, -1, -1,
- -1, 2155, -1, -1, 2158, 2159, 2160, 2161, 2162, -1,
- 2164, 2165, -1, -1, -1, -1, -1, 2387, -1, -1,
- -1, -1, 2176, 2177, 2178, 2179, 2180, 185, 2182, 2183,
- 52, 2185, -1, -1, 192, -1, 16, -1, -1, 197,
- 198, 2195, 2196, 23, -1, 203, -1, 149, -1, -1,
- -1, 209, 2206, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 97, 2078, -1, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 320, 321, 322, 2476, 209, -1, -1,
+ -1, 295, 296, 297, 298, 299, 300, 301, 302, 303,
+ 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, 317, 318, 319, 320, 321, 322, -1,
+ 324, 20, 21, 22, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 2457, -1, -1, -1,
+ -1, -1, -1, -1, -1, 44, 45, -1, -1, 48,
+ -1, -1, 51, -1, -1, -1, -1, -1, -1, 58,
+ -1, -1, -1, 62, -1, -1, -1, -1, -1, -1,
+ 19, 70, 71, 20, 21, 22, -1, -1, -1, 78,
+ 79, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 2512, -1, -1, -1, -1, 95, 44, 45, -1,
+ -1, 48, 101, 52, 103, 104, 2527, 106, 55, 2530,
+ -1, 58, -1, 19, -1, 62, -1, -1, -1, -1,
+ -1, -1, 121, 70, 71, -1, -1, -1, -1, -1,
+ -1, 78, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 142, -1, -1, 52, -1, 97, -1,
+ -1, -1, -1, -1, -1, -1, 103, 104, -1, 106,
+ -1, -1, -1, -1, -1, 164, -1, -1, -1, -1,
+ -1, -1, -1, -1, 121, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 186, -1, 19,
+ -1, 97, -1, -1, -1, 142, -1, -1, -1, -1,
+ 149, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 213, -1, 215, 164, -1, -1,
+ -1, 220, 221, -1, -1, 55, 173, -1, -1, -1,
+ -1, -1, -1, 232, 233, -1, -1, -1, -1, -1,
+ -1, -1, -1, 149, 243, -1, 19, -1, -1, -1,
+ -1, -1, -1, -1, 203, -1, -1, -1, -1, -1,
+ 209, -1, -1, -1, -1, -1, 213, 97, -1, 268,
+ -1, 270, -1, 220, 221, -1, -1, -1, -1, 52,
+ -1, -1, -1, 282, -1, 284, 233, -1, -1, -1,
+ -1, 290, -1, -1, -1, -1, 243, 203, -1, -1,
+ -1, -1, -1, 209, 19, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 263, -1, -1, -1, -1, 149,
+ -1, 268, -1, 270, 97, 324, -1, -1, -1, -1,
+ -1, -1, -1, 280, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 290, -1, -1, 295, 296, 297, 298,
+ 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+ 319, 320, 321, 322, -1, -1, 149, 324, -1, 209,
+ -1, -1, 97, -1, -1, -1, -1, -1, -1, 295,
+ 296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, 317, 318, 319, 320, 321, 322, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 279, 2492, -1, -1, -1, -1, 149, -1, -1,
- -1, -1, 2502, -1, -1, 2505, 294, 295, 296, 297,
- 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 320, 321, 322, -1, -1, -1, -1, 2323,
- 328, -1, -1, -1, 332, 333, -1, -1, -1, -1,
- 2334, 203, 2336, -1, -1, -1, 2340, 209, -1, -1,
- -1, -1, -1, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
- 322, 2223, -1, -1, -1, 2227, -1, -1, -1, -1,
+ -1, -1, -1, -1, 149, -1, 209, -1, -1, -1,
+ -1, -1, 272, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2243, -1, -1, -1, -1, 226, -1, 228, -1,
- -1, -1, 149, 2407, -1, -1, 2410, -1, 155, 2413,
- -1, 2415, -1, -1, -1, -1, 18, 19, -1, -1,
- -1, -1, -1, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
- 322, 19, 54, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 31, -1, 295, 296, 297, 298, 299,
+ -1, -1, -1, -1, -1, 295, 296, 297, 298, 299,
300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 320, 321, 322, 61, 62, 97, -1, 65, -1, -1,
- -1, -1, -1, -1, -1, 107, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 87,
- -1, -1, -1, -1, -1, 2377, -1, -1, -1, 97,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 149, 295, 296,
- 297, 298, 299, 300, 301, 302, 303, 304, 305, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 320, 321, 322, -1, -1, -1, -1,
- -1, 149, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 162, -1, 2448, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 209, -1, -1,
- 178, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 195, -1, -1,
+ 320, 321, 322, -1, 209, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 209, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 2503, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2518, -1, -1, 2521,
- 272, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 255, -1, -1,
- -1, -1, -1, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
- 322, -1, -1, -1, -1, -1, -1, 295, 296, 297,
- 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 320, 321, 322, -1, 324, 20, 21, 22,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 295, 296, 297, 298, 299, 300, 301, 302,
+ 303, 304, 305, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 320, 321, 322,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 320, 321, 322, -1, -1,
+ 295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
+ 305, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 320, 321, 322, 38, -1,
+ 40, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 55, -1, -1, -1, -1,
+ 60, 61, -1, 63, 64, 65, -1, -1, -1, -1,
+ -1, -1, -1, 73, -1, -1, -1, -1, -1, -1,
+ 80, -1, 82, -1, -1, 38, -1, 40, -1, -1,
+ -1, 91, 92, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 61, -1,
+ 63, 64, 65, -1, -1, -1, 116, -1, -1, -1,
+ 73, -1, 75, -1, -1, -1, -1, 80, 128, 82,
+ -1, 84, 132, -1, -1, 135, 89, -1, 91, -1,
+ 140, -1, 142, -1, -1, -1, -1, -1, 148, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 44, 45, -1, -1, 48, -1, 19, 51, -1,
- -1, -1, -1, -1, -1, 58, -1, -1, -1, 62,
- -1, -1, -1, -1, -1, -1, -1, 70, 71, -1,
- -1, -1, -1, -1, -1, 78, 79, -1, 19, -1,
- 52, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 95, -1, -1, -1, -1, -1, 101, -1,
- 103, 104, -1, 106, -1, -1, -1, -1, -1, -1,
- -1, 52, -1, -1, -1, -1, -1, -1, 121, -1,
- -1, -1, -1, -1, -1, 97, -1, -1, -1, 19,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 142,
+ -1, -1, 115, -1, -1, -1, -1, 167, -1, -1,
+ -1, 171, 172, -1, -1, 175, 176, -1, -1, 132,
+ -1, -1, -1, -1, -1, -1, -1, -1, 188, -1,
+ -1, 144, 145, -1, -1, 148, -1, -1, 149, 152,
+ -1, 201, 202, 203, 155, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 216, -1, -1, -1,
+ -1, -1, 175, 176, -1, 225, 179, -1, 228, -1,
+ 230, -1, 232, -1, -1, 188, -1, 237, -1, 155,
+ -1, -1, -1, -1, -1, -1, -1, -1, 201, 202,
+ 250, -1, -1, -1, -1, 255, -1, 210, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 97, -1, -1, -1,
- -1, 164, -1, 19, -1, 55, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 149, -1, -1,
- -1, -1, -1, 186, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 52, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 97, 149, -1,
- 213, -1, 215, -1, -1, -1, -1, 220, 221, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 232,
- 233, 203, -1, -1, -1, -1, -1, 209, -1, -1,
- 243, 97, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 149,
- -1, -1, 203, -1, -1, 268, -1, 270, 209, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 282,
- -1, 284, -1, -1, -1, -1, -1, 290, -1, -1,
- -1, 263, -1, 149, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 19, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 209,
- -1, 324, -1, 295, 296, 297, 298, 299, 300, 301,
- 302, 303, 304, 305, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
- 322, -1, -1, 209, 295, 296, 297, 298, 299, 300,
+ -1, 271, 272, -1, -1, -1, -1, 230, -1, 232,
+ -1, -1, -1, 283, -1, 285, -1, -1, -1, -1,
+ -1, 291, -1, -1, 294, 295, -1, -1, -1, -1,
+ -1, -1, 255, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 271, 272,
+ -1, -1, -1, -1, -1, 325, -1, 280, -1, -1,
+ -1, 331, -1, -1, 287, -1, -1, -1, -1, -1,
+ 293, -1, 295, -1, 295, 296, 297, 298, 299, 300,
301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
- 321, 322, 272, 97, 155, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 295, 296, 297, 298, 299,
- 300, 301, 302, 303, 304, 305, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 320, 321, 322, -1, -1, 149, -1, -1, -1, 295,
+ 321, 322, -1, -1, -1, -1, -1, -1, 331, 295,
296, 297, 298, 299, 300, 301, 302, 303, 304, 305,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 320, 321, 322, 295, 296, 297,
- 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 320, 321, 322, 209, -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, 295, 296, 297, 298, 299, 300,
- 301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
- 321, 322, 323, -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, 295, 296, 297, 298, 299, 300, 301, 302, 303,
- 304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 317, 318, 319, 320, 321, 322, 38,
- -1, 40, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 55, -1, -1, -1,
- -1, 60, 61, -1, 63, 64, 65, -1, -1, -1,
- -1, -1, -1, -1, 73, -1, -1, -1, -1, -1,
- -1, 80, -1, 82, -1, -1, 38, -1, 40, -1,
- -1, -1, 91, 92, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 61,
- -1, 63, 64, 65, -1, -1, -1, 116, -1, -1,
- -1, 73, -1, 75, -1, -1, -1, -1, 80, 128,
- 82, -1, 84, 132, -1, -1, 135, 89, -1, 91,
- -1, 140, -1, 142, -1, -1, -1, -1, -1, 148,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 115, -1, -1, -1, -1, 167, -1,
- -1, -1, 171, 172, -1, -1, 175, 176, -1, -1,
- 132, -1, -1, -1, -1, -1, -1, -1, -1, 188,
- -1, -1, 144, 145, -1, -1, 148, -1, -1, -1,
- 152, -1, 201, 202, 203, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 216, -1, -1,
- -1, -1, -1, 175, 176, -1, 225, 179, -1, 228,
- -1, 230, -1, 232, -1, -1, 188, -1, 237, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 201,
- 202, 250, -1, -1, -1, -1, 255, -1, 210, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 272, -1, -1, -1, -1, 230, -1,
- 232, -1, -1, -1, 283, -1, 285, -1, -1, -1,
- -1, -1, 291, -1, -1, 294, 295, -1, -1, -1,
- -1, -1, -1, 255, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 272, -1, -1, -1, -1, -1, 325, -1, 280, -1,
- -1, -1, 331, -1, -1, 287, -1, -1, -1, -1,
- -1, 293, -1, 295, -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, 331
+ 316, 317, 318, 319, 320, 321, 322, 323
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -3851,258 +3841,258 @@ static const yytype_uint16 yystos[] =
0, 38, 40, 55, 60, 61, 63, 64, 65, 73,
80, 82, 91, 92, 116, 128, 132, 135, 140, 142,
148, 167, 171, 172, 175, 176, 188, 201, 202, 203,
- 216, 225, 228, 230, 232, 237, 250, 255, 272, 283,
- 285, 291, 294, 295, 325, 331, 337, 62, 12, 49,
- 67, 96, 110, 113, 125, 276, 368, 179, 184, 219,
- 241, 286, 330, 373, 268, 4, 37, 105, 185, 230,
- 380, 28, 143, 165, 169, 217, 251, 259, 260, 352,
- 382, 31, 62, 76, 79, 87, 95, 167, 206, 237,
- 324, 383, 3, 4, 37, 55, 105, 185, 272, 338,
- 387, 4, 19, 37, 52, 97, 111, 149, 185, 192,
- 197, 198, 203, 209, 279, 294, 295, 296, 297, 298,
- 299, 300, 301, 302, 303, 304, 305, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 320, 321, 322, 328, 332, 333, 340, 349, 350,
- 351, 389, 340, 29, 40, 72, 80, 133, 183, 205,
- 207, 230, 295, 339, 340, 135, 390, 38, 40, 61,
- 63, 64, 65, 73, 75, 80, 82, 84, 89, 91,
- 115, 132, 144, 145, 148, 152, 175, 176, 179, 188,
- 201, 202, 210, 230, 232, 255, 272, 280, 287, 293,
- 295, 331, 391, 79, 95, 431, 19, 40, 73, 80,
- 90, 91, 97, 115, 132, 148, 156, 175, 209, 255,
- 266, 295, 433, 340, 84, 108, 177, 190, 244, 285,
- 295, 439, 26, 115, 151, 208, 442, 218, 459, 5,
- 62, 84, 130, 285, 331, 340, 460, 53, 214, 286,
- 476, 60, 62, 174, 275, 495, 62, 193, 327, 332,
- 334, 496, 36, 185, 219, 276, 338, 349, 351, 497,
- 5, 285, 295, 340, 500, 66, 162, 229, 238, 501,
- 476, 57, 266, 289, 507, 185, 276, 338, 508, 26,
- 115, 208, 510, 46, 95, 127, 278, 516, 517, 142,
- 178, 271, 273, 289, 366, 4, 115, 194, 518, 276,
- 338, 520, 16, 23, 226, 228, 350, 521, 218, 525,
- 276, 338, 526, 0, 5, 55, 338, 369, 252, 5,
- 4, 276, 338, 370, 5, 32, 265, 371, 114, 338,
- 372, 184, 234, 377, 179, 286, 329, 330, 338, 376,
- 340, 129, 168, 375, 141, 170, 338, 374, 74, 164,
- 234, 379, 5, 338, 4, 230, 381, 338, 338, 136,
- 191, 237, 384, 5, 349, 5, 215, 385, 4, 17,
- 5, 5, 5, 4, 338, 9, 10, 11, 338, 345,
- 346, 347, 348, 338, 338, 37, 105, 185, 338, 388,
- 338, 185, 349, 351, 338, 33, 102, 118, 119, 120,
- 126, 139, 146, 157, 264, 353, 338, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 109, 62, 49,
- 67, 84, 96, 110, 113, 125, 166, 392, 179, 184,
- 219, 241, 286, 329, 330, 338, 394, 395, 268, 398,
- 162, 399, 162, 169, 401, 31, 61, 62, 65, 87,
- 162, 178, 195, 255, 324, 349, 403, 122, 276, 338,
- 351, 407, 55, 272, 349, 408, 263, 349, 351, 409,
- 349, 351, 410, 4, 349, 351, 411, 41, 55, 77,
- 96, 109, 112, 137, 138, 189, 196, 252, 253, 324,
- 415, 200, 420, 5, 85, 6, 84, 112, 138, 324,
- 413, 5, 61, 351, 412, 476, 62, 174, 275, 421,
- 62, 219, 422, 267, 57, 266, 289, 423, 94, 117,
- 153, 240, 341, 424, 125, 224, 425, 142, 178, 271,
- 289, 426, 351, 85, 16, 187, 428, 341, 430, 349,
- 68, 434, 31, 435, 40, 83, 183, 436, 142, 206,
- 243, 281, 437, 349, 18, 54, 107, 272, 349, 438,
- 4, 184, 441, 5, 4, 6, 112, 338, 5, 230,
- 443, 5, 109, 183, 230, 253, 445, 89, 105, 179,
- 458, 5, 253, 457, 4, 5, 340, 340, 338, 338,
- 4, 5, 56, 62, 69, 71, 76, 79, 85, 95,
- 101, 121, 142, 158, 166, 167, 186, 206, 219, 221,
- 232, 237, 243, 250, 268, 281, 282, 284, 324, 461,
- 5, 4, 338, 5, 338, 37, 105, 338, 499, 340,
- 338, 349, 351, 498, 338, 353, 338, 4, 350, 50,
- 86, 131, 230, 502, 4, 4, 338, 142, 243, 503,
- 5, 349, 4, 37, 105, 338, 509, 338, 93, 57,
- 112, 256, 511, 149, 227, 267, 512, 5, 4, 62,
- 340, 367, 13, 180, 506, 4, 338, 338, 338, 253,
- 4, 338, 338, 4, 524, 4, 270, 522, 4, 270,
- 523, 4, 353, 114, 338, 527, 338, 338, 4, 5,
- 338, 12, 338, 338, 30, 90, 156, 234, 239, 378,
- 4, 338, 338, 338, 338, 4, 4, 338, 338, 338,
- 338, 5, 353, 4, 475, 483, 4, 4, 349, 338,
- 338, 345, 347, 347, 349, 338, 338, 338, 338, 338,
- 338, 338, 349, 351, 348, 338, 338, 348, 338, 5,
- 252, 99, 179, 393, 184, 234, 396, 162, 74, 164,
- 234, 397, 4, 400, 4, 402, 62, 87, 324, 404,
- 184, 405, 169, 406, 162, 353, 338, 338, 338, 349,
- 338, 349, 349, 353, 353, 353, 349, 353, 338, 349,
- 4, 417, 351, 187, 4, 295, 416, 187, 349, 4,
- 419, 5, 5, 4, 187, 338, 4, 5, 56, 62,
- 121, 134, 142, 147, 195, 215, 219, 221, 243, 250,
- 268, 324, 470, 351, 62, 427, 338, 5, 214, 429,
- 350, 353, 5, 349, 349, 349, 4, 340, 4, 4,
- 187, 338, 14, 15, 57, 181, 182, 247, 256, 257,
- 288, 83, 5, 14, 15, 57, 181, 182, 247, 256,
- 257, 261, 288, 83, 149, 155, 350, 448, 452, 83,
- 149, 454, 5, 446, 4, 4, 5, 5, 4, 338,
- 20, 21, 22, 44, 45, 48, 51, 58, 62, 70,
- 71, 78, 79, 95, 101, 103, 104, 106, 121, 142,
- 164, 186, 213, 215, 220, 221, 232, 233, 243, 268,
- 270, 282, 284, 290, 324, 62, 76, 85, 95, 121,
- 142, 186, 221, 243, 282, 284, 4, 30, 154, 200,
- 224, 464, 5, 59, 100, 223, 235, 236, 326, 327,
- 469, 95, 462, 17, 37, 105, 185, 468, 5, 17,
- 199, 277, 338, 243, 469, 477, 115, 469, 478, 34,
- 37, 105, 123, 185, 276, 338, 479, 349, 340, 87,
- 95, 101, 117, 142, 150, 186, 193, 232, 243, 258,
- 482, 37, 105, 185, 5, 269, 17, 199, 277, 486,
- 270, 340, 487, 5, 95, 101, 285, 17, 17, 4,
- 338, 338, 338, 338, 338, 353, 338, 338, 348, 338,
- 4, 353, 37, 105, 185, 248, 504, 37, 105, 185,
- 248, 505, 4, 93, 5, 5, 4, 57, 112, 256,
- 513, 57, 112, 256, 515, 57, 112, 256, 514, 5,
- 338, 338, 4, 519, 338, 338, 6, 350, 4, 5,
- 4, 4, 5, 4, 93, 245, 354, 338, 338, 12,
- 5, 12, 338, 338, 12, 4, 12, 4, 338, 338,
- 338, 349, 4, 51, 62, 88, 121, 268, 270, 324,
- 480, 481, 482, 493, 494, 4, 4, 353, 353, 338,
- 338, 338, 349, 338, 348, 338, 338, 5, 5, 338,
- 351, 338, 349, 349, 349, 4, 338, 353, 354, 354,
- 354, 353, 348, 338, 353, 338, 124, 231, 342, 418,
- 159, 4, 353, 5, 4, 4, 338, 414, 338, 20,
- 21, 22, 44, 45, 48, 55, 58, 62, 70, 71,
- 78, 103, 104, 106, 121, 142, 164, 173, 213, 220,
- 221, 233, 243, 268, 270, 280, 290, 324, 62, 121,
- 147, 221, 268, 30, 154, 200, 224, 471, 338, 195,
- 338, 472, 17, 338, 242, 482, 195, 338, 473, 270,
- 474, 17, 94, 338, 338, 5, 354, 52, 349, 4,
- 5, 440, 338, 5, 5, 5, 149, 176, 359, 359,
- 158, 249, 357, 4, 4, 5, 5, 444, 254, 5,
- 5, 5, 17, 151, 358, 358, 357, 4, 4, 357,
- 5, 5, 447, 155, 323, 350, 451, 5, 450, 5,
- 5, 455, 5, 456, 5, 14, 15, 57, 181, 182,
- 247, 256, 257, 261, 288, 4, 4, 5, 204, 211,
- 212, 262, 266, 363, 7, 8, 338, 344, 224, 224,
- 224, 101, 37, 62, 95, 101, 105, 121, 142, 158,
- 186, 221, 232, 243, 270, 282, 284, 285, 324, 463,
- 224, 5, 27, 160, 224, 266, 129, 101, 22, 45,
- 48, 78, 104, 106, 215, 22, 45, 48, 51, 78,
- 104, 106, 215, 268, 37, 224, 224, 101, 5, 199,
- 27, 213, 34, 123, 276, 338, 246, 252, 228, 349,
- 351, 482, 37, 213, 266, 199, 5, 5, 232, 27,
- 213, 4, 5, 5, 199, 34, 123, 276, 338, 482,
- 199, 340, 4, 4, 338, 5, 288, 22, 27, 44,
- 45, 47, 48, 58, 70, 71, 78, 81, 98, 103,
- 104, 106, 164, 215, 220, 233, 269, 270, 290, 334,
- 465, 338, 338, 338, 338, 338, 469, 349, 5, 4,
- 5, 338, 338, 349, 351, 338, 349, 340, 338, 338,
- 469, 5, 338, 338, 340, 5, 17, 5, 5, 338,
- 338, 348, 338, 338, 338, 338, 105, 338, 338, 105,
- 4, 39, 163, 365, 365, 365, 5, 5, 4, 5,
- 5, 4, 5, 5, 4, 338, 4, 338, 350, 353,
- 5, 5, 12, 338, 349, 351, 338, 12, 338, 338,
- 338, 55, 338, 6, 4, 338, 338, 353, 42, 255,
- 386, 335, 335, 335, 335, 335, 335, 335, 481, 335,
- 5, 6, 338, 4, 4, 4, 349, 338, 338, 338,
- 338, 4, 4, 353, 349, 354, 341, 341, 348, 338,
- 4, 354, 338, 35, 272, 35, 272, 4, 351, 5,
- 24, 25, 93, 355, 338, 4, 338, 5, 204, 211,
- 212, 266, 349, 351, 224, 224, 224, 21, 224, 349,
- 351, 224, 27, 160, 224, 266, 129, 21, 224, 224,
- 224, 21, 224, 27, 161, 213, 161, 246, 252, 161,
- 213, 274, 482, 161, 213, 266, 4, 232, 27, 161,
- 213, 482, 195, 338, 338, 338, 338, 338, 187, 338,
- 338, 20, 222, 432, 4, 4, 338, 359, 359, 359,
- 4, 359, 359, 359, 14, 15, 57, 181, 182, 247,
- 256, 257, 288, 358, 359, 359, 359, 359, 359, 4,
- 359, 359, 4, 358, 14, 15, 57, 181, 182, 247,
- 256, 257, 288, 5, 449, 5, 453, 5, 5, 14,
- 15, 57, 181, 182, 247, 256, 257, 261, 288, 5,
+ 216, 225, 228, 230, 232, 237, 250, 255, 271, 272,
+ 283, 285, 291, 294, 295, 325, 331, 337, 62, 12,
+ 49, 67, 96, 110, 113, 125, 276, 369, 179, 184,
+ 219, 241, 286, 330, 374, 268, 4, 37, 105, 185,
+ 230, 381, 28, 143, 165, 169, 217, 251, 259, 260,
+ 352, 383, 31, 62, 76, 79, 87, 95, 167, 206,
+ 237, 324, 384, 3, 4, 37, 55, 105, 185, 272,
+ 338, 388, 4, 19, 37, 52, 97, 111, 149, 185,
+ 192, 197, 198, 203, 209, 279, 294, 295, 296, 297,
+ 298, 299, 300, 301, 302, 303, 304, 305, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 320, 321, 322, 328, 332, 333, 340, 349,
+ 350, 351, 390, 340, 29, 40, 72, 80, 133, 183,
+ 205, 207, 230, 295, 339, 340, 135, 391, 38, 40,
+ 61, 63, 64, 65, 73, 75, 80, 82, 84, 89,
+ 91, 115, 132, 144, 145, 148, 152, 175, 176, 179,
+ 188, 201, 202, 210, 230, 232, 255, 271, 272, 280,
+ 287, 293, 295, 331, 392, 79, 95, 433, 19, 40,
+ 73, 80, 90, 91, 97, 115, 132, 148, 156, 175,
+ 209, 255, 266, 295, 435, 340, 84, 108, 177, 190,
+ 244, 285, 295, 441, 26, 115, 151, 208, 444, 218,
+ 461, 5, 62, 84, 130, 285, 331, 340, 462, 53,
+ 214, 286, 478, 60, 62, 174, 275, 497, 62, 193,
+ 327, 332, 334, 498, 36, 185, 219, 276, 338, 349,
+ 351, 499, 5, 285, 295, 340, 502, 66, 162, 229,
+ 238, 503, 478, 57, 266, 289, 509, 185, 276, 338,
+ 510, 26, 115, 208, 512, 46, 95, 127, 278, 518,
+ 519, 4, 142, 178, 273, 289, 366, 4, 115, 194,
+ 520, 276, 338, 522, 16, 23, 226, 228, 350, 523,
+ 218, 527, 276, 338, 528, 0, 5, 55, 338, 370,
+ 252, 5, 4, 276, 338, 371, 5, 32, 265, 372,
+ 114, 338, 373, 184, 234, 378, 179, 286, 329, 330,
+ 338, 377, 340, 129, 168, 376, 141, 170, 338, 375,
+ 74, 164, 234, 380, 5, 338, 4, 230, 382, 338,
+ 338, 136, 191, 237, 385, 5, 349, 5, 215, 386,
+ 4, 17, 5, 5, 5, 4, 338, 9, 10, 11,
+ 338, 345, 346, 347, 348, 338, 338, 37, 105, 185,
+ 338, 389, 338, 185, 349, 351, 338, 33, 102, 118,
+ 119, 120, 126, 139, 146, 157, 264, 353, 338, 340,
+ 340, 340, 340, 340, 340, 340, 340, 340, 340, 109,
+ 62, 49, 67, 84, 96, 110, 113, 125, 166, 393,
+ 179, 184, 219, 241, 286, 329, 330, 338, 395, 396,
+ 268, 399, 162, 400, 162, 169, 402, 31, 61, 62,
+ 65, 87, 162, 178, 195, 255, 324, 349, 404, 122,
+ 276, 338, 351, 408, 55, 272, 349, 409, 263, 349,
+ 351, 410, 349, 351, 411, 4, 349, 351, 412, 41,
+ 55, 77, 96, 109, 112, 137, 138, 189, 196, 252,
+ 253, 324, 416, 200, 421, 5, 85, 6, 84, 112,
+ 138, 324, 414, 5, 61, 351, 413, 478, 62, 174,
+ 275, 422, 62, 219, 423, 267, 57, 266, 289, 424,
+ 94, 117, 153, 240, 341, 425, 125, 224, 426, 142,
+ 178, 289, 427, 351, 85, 16, 187, 430, 341, 432,
+ 349, 68, 436, 31, 437, 40, 83, 183, 438, 142,
+ 206, 243, 281, 439, 349, 18, 54, 107, 272, 349,
+ 440, 4, 184, 443, 5, 4, 6, 112, 338, 5,
+ 230, 445, 5, 109, 183, 230, 253, 447, 89, 105,
+ 179, 460, 5, 253, 459, 4, 5, 340, 340, 338,
+ 338, 4, 5, 56, 62, 69, 71, 76, 79, 85,
+ 95, 101, 121, 142, 158, 166, 167, 186, 206, 219,
+ 221, 232, 237, 243, 250, 268, 281, 282, 284, 324,
+ 463, 5, 4, 338, 5, 338, 37, 105, 338, 501,
+ 340, 338, 349, 351, 500, 338, 353, 338, 4, 350,
+ 50, 86, 131, 230, 504, 4, 4, 338, 142, 243,
+ 505, 5, 349, 4, 37, 105, 338, 511, 338, 93,
+ 57, 112, 256, 513, 149, 227, 267, 514, 5, 4,
+ 62, 340, 367, 13, 180, 508, 338, 213, 338, 368,
+ 338, 253, 4, 338, 338, 4, 526, 4, 270, 524,
+ 4, 270, 525, 4, 353, 114, 338, 529, 338, 338,
+ 4, 5, 338, 12, 338, 338, 30, 90, 156, 234,
+ 239, 379, 4, 338, 338, 338, 338, 4, 4, 338,
+ 338, 338, 338, 5, 353, 4, 477, 485, 4, 4,
+ 349, 338, 338, 345, 347, 347, 349, 338, 338, 338,
+ 338, 338, 338, 338, 349, 351, 348, 338, 338, 348,
+ 338, 5, 252, 99, 179, 394, 184, 234, 397, 162,
+ 74, 164, 234, 398, 4, 401, 4, 403, 62, 87,
+ 324, 405, 184, 406, 169, 407, 162, 353, 338, 338,
+ 338, 349, 338, 349, 349, 353, 353, 353, 349, 353,
+ 338, 349, 4, 418, 351, 187, 4, 295, 417, 187,
+ 349, 4, 420, 5, 5, 4, 187, 338, 4, 5,
+ 56, 62, 121, 134, 142, 147, 195, 215, 219, 221,
+ 243, 250, 268, 324, 472, 351, 62, 428, 213, 429,
+ 338, 5, 214, 431, 350, 353, 5, 349, 349, 349,
+ 4, 340, 4, 4, 187, 338, 14, 15, 57, 181,
+ 182, 247, 256, 257, 288, 83, 5, 14, 15, 57,
+ 181, 182, 247, 256, 257, 261, 288, 83, 149, 155,
+ 350, 450, 454, 83, 149, 456, 5, 448, 4, 4,
+ 5, 5, 4, 338, 20, 21, 22, 44, 45, 48,
+ 51, 58, 62, 70, 71, 78, 79, 95, 101, 103,
+ 104, 106, 121, 142, 164, 186, 213, 215, 220, 221,
+ 232, 233, 243, 268, 270, 282, 284, 290, 324, 62,
+ 76, 85, 95, 121, 142, 186, 221, 243, 282, 284,
+ 4, 30, 154, 200, 224, 466, 5, 59, 100, 223,
+ 235, 236, 326, 327, 471, 95, 464, 17, 37, 105,
+ 185, 470, 5, 17, 199, 277, 338, 243, 471, 479,
+ 115, 471, 480, 34, 37, 105, 123, 185, 276, 338,
+ 481, 349, 340, 87, 95, 101, 117, 142, 150, 186,
+ 193, 232, 243, 258, 484, 37, 105, 185, 5, 269,
+ 17, 199, 277, 488, 270, 340, 489, 5, 95, 101,
+ 285, 17, 17, 4, 338, 338, 338, 338, 338, 353,
+ 338, 338, 348, 338, 4, 353, 37, 105, 185, 248,
+ 506, 37, 105, 185, 248, 507, 4, 93, 5, 5,
+ 4, 57, 112, 256, 515, 57, 112, 256, 517, 57,
+ 112, 256, 516, 5, 338, 338, 338, 4, 521, 338,
+ 338, 6, 350, 4, 5, 4, 4, 5, 4, 93,
+ 245, 354, 338, 338, 12, 5, 12, 338, 338, 12,
+ 4, 12, 4, 338, 338, 338, 349, 4, 51, 62,
+ 88, 121, 268, 270, 324, 482, 483, 484, 495, 496,
+ 4, 4, 353, 353, 338, 338, 338, 349, 338, 348,
+ 338, 338, 5, 5, 338, 351, 338, 349, 349, 349,
+ 4, 338, 353, 354, 354, 354, 353, 348, 338, 353,
+ 338, 124, 231, 342, 419, 159, 4, 353, 5, 4,
+ 4, 338, 415, 338, 20, 21, 22, 44, 45, 48,
+ 55, 58, 62, 70, 71, 78, 103, 104, 106, 121,
+ 142, 164, 173, 213, 220, 221, 233, 243, 268, 270,
+ 280, 290, 324, 62, 121, 147, 221, 268, 30, 154,
+ 200, 224, 473, 338, 195, 338, 474, 17, 338, 242,
+ 484, 195, 338, 475, 270, 476, 17, 94, 338, 338,
+ 5, 354, 52, 349, 4, 5, 442, 338, 5, 5,
+ 5, 149, 176, 359, 359, 158, 249, 357, 4, 4,
+ 5, 5, 446, 254, 5, 5, 5, 17, 151, 358,
+ 358, 357, 4, 4, 357, 5, 5, 449, 155, 323,
+ 350, 453, 5, 452, 5, 5, 457, 5, 458, 5,
14, 15, 57, 181, 182, 247, 256, 257, 261, 288,
- 5, 14, 15, 57, 181, 182, 247, 256, 257, 261,
- 288, 14, 15, 57, 181, 182, 247, 256, 257, 288,
- 254, 5, 5, 5, 358, 358, 357, 4, 4, 357,
- 5, 4, 4, 32, 265, 364, 349, 340, 349, 351,
- 5, 338, 338, 5, 338, 5, 344, 101, 186, 232,
- 101, 186, 232, 5, 338, 340, 5, 338, 349, 340,
- 5, 344, 224, 224, 21, 224, 21, 224, 224, 21,
- 224, 292, 4, 4, 4, 463, 4, 4, 4, 292,
- 4, 5, 4, 338, 5, 338, 5, 344, 340, 349,
- 351, 349, 351, 338, 27, 44, 47, 58, 81, 98,
- 334, 361, 4, 338, 353, 348, 340, 349, 351, 349,
- 340, 340, 349, 351, 349, 351, 338, 340, 338, 5,
- 338, 213, 213, 338, 338, 213, 338, 213, 338, 338,
- 483, 338, 213, 213, 338, 338, 338, 338, 338, 338,
- 338, 5, 288, 338, 466, 338, 338, 213, 338, 338,
- 338, 338, 349, 353, 5, 349, 349, 338, 338, 353,
- 348, 338, 338, 338, 349, 338, 338, 5, 338, 338,
- 338, 338, 133, 193, 360, 360, 360, 360, 360, 360,
- 360, 360, 360, 338, 338, 338, 349, 351, 338, 353,
- 338, 338, 338, 338, 338, 5, 338, 6, 6, 338,
- 338, 4, 463, 5, 4, 5, 5, 5, 4, 340,
- 349, 349, 338, 353, 169, 352, 338, 352, 354, 353,
- 349, 338, 338, 4, 341, 338, 341, 338, 4, 5,
- 5, 353, 349, 351, 349, 351, 349, 351, 349, 351,
- 349, 351, 353, 349, 351, 349, 351, 349, 351, 349,
- 351, 349, 351, 349, 351, 349, 351, 349, 351, 349,
- 349, 351, 338, 349, 349, 351, 349, 351, 349, 349,
- 351, 349, 349, 351, 338, 4, 338, 5, 4, 338,
- 359, 5, 5, 5, 357, 4, 4, 5, 359, 358,
- 4, 359, 5, 5, 5, 358, 358, 357, 4, 4,
- 5, 14, 15, 57, 181, 182, 247, 256, 257, 288,
- 14, 15, 57, 181, 182, 247, 256, 257, 288, 14,
- 15, 57, 181, 182, 247, 256, 257, 288, 254, 5,
- 5, 5, 358, 358, 357, 4, 4, 357, 5, 254,
- 5, 5, 5, 358, 358, 357, 4, 4, 357, 5,
- 254, 5, 5, 5, 358, 358, 357, 4, 4, 357,
- 5, 5, 5, 5, 358, 358, 357, 4, 4, 5,
- 358, 4, 4, 358, 4, 4, 353, 353, 349, 338,
- 338, 349, 338, 5, 344, 5, 349, 351, 340, 5,
- 349, 351, 353, 5, 344, 338, 338, 338, 338, 338,
- 338, 338, 338, 338, 4, 5, 4, 338, 349, 338,
- 5, 344, 340, 353, 348, 353, 338, 338, 348, 348,
- 353, 348, 353, 353, 348, 353, 348, 338, 338, 338,
+ 4, 4, 5, 204, 211, 212, 262, 266, 363, 7,
+ 8, 338, 344, 224, 224, 224, 101, 37, 62, 95,
+ 101, 105, 121, 142, 158, 186, 221, 232, 243, 270,
+ 282, 284, 285, 324, 465, 224, 5, 27, 160, 224,
+ 266, 129, 101, 22, 45, 48, 78, 104, 106, 215,
+ 22, 45, 48, 51, 78, 104, 106, 215, 268, 37,
+ 224, 224, 101, 5, 199, 27, 213, 34, 123, 276,
+ 338, 246, 252, 228, 349, 351, 484, 37, 213, 266,
+ 199, 5, 5, 232, 27, 213, 4, 5, 5, 199,
+ 34, 123, 276, 338, 484, 199, 340, 4, 4, 338,
+ 5, 288, 22, 27, 44, 45, 47, 48, 58, 70,
+ 71, 78, 81, 98, 103, 104, 106, 164, 215, 220,
+ 233, 269, 270, 290, 334, 467, 338, 338, 338, 338,
+ 338, 471, 349, 5, 4, 5, 338, 338, 349, 351,
+ 338, 349, 340, 338, 338, 471, 5, 338, 338, 340,
+ 5, 17, 5, 5, 338, 338, 348, 338, 338, 338,
+ 338, 105, 338, 338, 105, 4, 39, 163, 365, 365,
+ 365, 5, 5, 4, 5, 5, 4, 5, 5, 4,
+ 338, 338, 4, 338, 350, 353, 5, 5, 12, 338,
+ 349, 351, 338, 12, 338, 338, 338, 55, 338, 6,
+ 4, 338, 338, 353, 42, 255, 387, 335, 335, 335,
+ 335, 335, 335, 335, 483, 335, 5, 6, 338, 4,
+ 4, 4, 349, 338, 338, 338, 338, 4, 4, 353,
+ 349, 354, 341, 341, 348, 338, 4, 354, 338, 35,
+ 272, 35, 272, 4, 351, 5, 24, 25, 93, 355,
+ 338, 4, 338, 5, 204, 211, 212, 266, 349, 351,
+ 224, 224, 224, 21, 224, 349, 351, 224, 27, 160,
+ 224, 266, 129, 21, 224, 224, 224, 21, 224, 27,
+ 161, 213, 161, 246, 252, 161, 213, 274, 484, 161,
+ 213, 266, 4, 232, 27, 161, 213, 484, 195, 338,
+ 338, 338, 338, 338, 187, 338, 338, 20, 222, 434,
+ 4, 4, 338, 359, 359, 359, 4, 359, 359, 359,
+ 14, 15, 57, 181, 182, 247, 256, 257, 288, 358,
+ 359, 359, 359, 359, 359, 4, 359, 359, 4, 358,
+ 14, 15, 57, 181, 182, 247, 256, 257, 288, 5,
+ 451, 5, 455, 5, 5, 14, 15, 57, 181, 182,
+ 247, 256, 257, 261, 288, 5, 14, 15, 57, 181,
+ 182, 247, 256, 257, 261, 288, 5, 14, 15, 57,
+ 181, 182, 247, 256, 257, 261, 288, 14, 15, 57,
+ 181, 182, 247, 256, 257, 288, 254, 5, 5, 5,
+ 358, 358, 357, 4, 4, 357, 5, 4, 4, 32,
+ 265, 364, 349, 340, 349, 351, 5, 338, 338, 5,
+ 338, 5, 344, 101, 186, 232, 101, 186, 232, 5,
+ 338, 340, 5, 338, 349, 340, 5, 344, 224, 224,
+ 21, 224, 21, 224, 224, 21, 224, 292, 4, 4,
+ 4, 465, 4, 4, 4, 292, 4, 5, 4, 338,
+ 5, 338, 5, 344, 340, 349, 351, 349, 351, 338,
+ 27, 44, 47, 58, 81, 98, 334, 361, 4, 338,
+ 353, 348, 340, 349, 351, 349, 340, 340, 349, 351,
+ 349, 351, 338, 340, 338, 5, 338, 213, 213, 338,
+ 338, 213, 338, 213, 338, 338, 485, 338, 213, 213,
+ 338, 338, 338, 338, 338, 338, 338, 5, 288, 338,
+ 468, 338, 338, 213, 338, 338, 338, 338, 349, 353,
+ 5, 349, 349, 338, 338, 353, 348, 338, 338, 338,
+ 349, 338, 338, 5, 338, 338, 338, 338, 133, 193,
+ 360, 360, 360, 360, 360, 360, 360, 360, 360, 338,
+ 338, 338, 338, 349, 351, 338, 353, 338, 338, 338,
+ 338, 338, 5, 338, 6, 6, 338, 338, 4, 465,
+ 5, 4, 5, 5, 5, 4, 340, 349, 349, 338,
+ 353, 169, 352, 338, 352, 354, 353, 349, 338, 338,
+ 4, 341, 338, 341, 338, 4, 5, 5, 353, 349,
+ 351, 349, 351, 349, 351, 349, 351, 349, 351, 353,
+ 349, 351, 349, 351, 349, 351, 349, 351, 349, 351,
+ 349, 351, 349, 351, 349, 351, 349, 349, 351, 338,
+ 349, 349, 351, 349, 351, 349, 349, 351, 349, 349,
+ 351, 338, 4, 338, 5, 4, 338, 359, 5, 5,
+ 5, 357, 4, 4, 5, 359, 358, 4, 359, 5,
+ 5, 5, 358, 358, 357, 4, 4, 5, 14, 15,
+ 57, 181, 182, 247, 256, 257, 288, 14, 15, 57,
+ 181, 182, 247, 256, 257, 288, 14, 15, 57, 181,
+ 182, 247, 256, 257, 288, 254, 5, 5, 5, 358,
+ 358, 357, 4, 4, 357, 5, 254, 5, 5, 5,
+ 358, 358, 357, 4, 4, 357, 5, 254, 5, 5,
+ 5, 358, 358, 357, 4, 4, 357, 5, 5, 5,
+ 5, 358, 358, 357, 4, 4, 5, 358, 4, 4,
+ 358, 4, 4, 353, 353, 349, 338, 338, 349, 338,
+ 5, 344, 5, 349, 351, 340, 5, 349, 351, 353,
+ 5, 344, 338, 338, 338, 338, 338, 338, 338, 338,
+ 338, 4, 5, 4, 338, 349, 338, 5, 344, 340,
+ 353, 348, 353, 338, 338, 348, 348, 353, 348, 353,
+ 353, 348, 353, 348, 338, 338, 338, 338, 338, 338,
338, 338, 338, 338, 338, 338, 338, 338, 338, 338,
- 338, 338, 338, 338, 338, 338, 338, 338, 349, 5,
- 338, 338, 338, 338, 4, 4, 353, 354, 4, 467,
- 353, 353, 348, 338, 4, 353, 338, 338, 353, 338,
- 348, 338, 338, 12, 5, 5, 4, 6, 338, 338,
- 4, 5, 4, 353, 353, 349, 338, 338, 354, 355,
- 338, 5, 338, 351, 5, 5, 355, 355, 355, 353,
- 355, 354, 355, 355, 353, 355, 355, 355, 353, 355,
- 355, 353, 349, 355, 353, 355, 355, 353, 355, 353,
- 4, 351, 338, 4, 359, 358, 4, 358, 5, 5,
- 5, 358, 358, 357, 4, 4, 5, 5, 5, 5,
- 358, 358, 357, 4, 4, 5, 5, 5, 5, 358,
- 358, 357, 4, 4, 5, 358, 359, 359, 359, 359,
- 359, 4, 359, 359, 4, 358, 358, 359, 359, 359,
- 359, 359, 4, 359, 359, 4, 358, 358, 4, 4,
- 358, 4, 358, 358, 4, 4, 4, 355, 4, 349,
- 351, 355, 338, 349, 4, 355, 355, 349, 4, 338,
- 338, 338, 338, 338, 338, 338, 338, 338, 338, 349,
- 351, 355, 338, 349, 4, 348, 348, 348, 338, 349,
- 351, 348, 338, 348, 348, 349, 348, 338, 348, 338,
- 338, 338, 338, 338, 338, 344, 338, 338, 338, 344,
- 338, 338, 338, 338, 344, 338, 338, 338, 338, 338,
- 353, 338, 288, 343, 344, 338, 338, 354, 340, 4,
- 4, 354, 348, 338, 55, 338, 5, 5, 4, 338,
- 4, 352, 5, 355, 5, 5, 354, 355, 354, 354,
- 354, 5, 338, 359, 358, 359, 359, 359, 359, 359,
- 4, 359, 359, 358, 4, 358, 359, 359, 359, 359,
- 359, 4, 359, 359, 358, 359, 358, 4, 359, 359,
- 358, 4, 359, 358, 4, 358, 358, 349, 351, 355,
- 4, 353, 338, 353, 338, 338, 355, 4, 353, 338,
- 348, 355, 338, 348, 355, 349, 344, 338, 4, 362,
- 362, 338, 338, 362, 344, 362, 483, 349, 344, 362,
- 362, 338, 338, 344, 338, 338, 338, 338, 348, 338,
- 5, 483, 338, 362, 340, 484, 485, 5, 340, 5,
- 338, 5, 4, 6, 338, 5, 338, 358, 359, 358,
- 358, 359, 359, 358, 359, 358, 358, 355, 349, 351,
- 349, 338, 349, 338, 349, 351, 349, 338, 349, 355,
- 4, 483, 483, 343, 338, 483, 4, 483, 353, 4,
- 483, 483, 343, 338, 4, 483, 483, 338, 349, 483,
- 483, 484, 490, 491, 482, 488, 489, 5, 5, 6,
- 4, 179, 286, 329, 330, 338, 356, 4, 359, 359,
- 359, 359, 355, 355, 338, 355, 4, 355, 355, 338,
- 355, 338, 483, 483, 4, 338, 483, 338, 483, 4,
- 338, 483, 353, 490, 492, 493, 335, 489, 5, 5,
- 4, 338, 4, 349, 351, 4, 344, 343, 338, 338,
- 343, 338, 349, 493, 340, 5, 5, 338, 349, 351,
- 353, 349, 351, 483, 338, 4, 483, 338, 355, 5,
- 5, 353, 353, 4, 483, 4, 483, 343, 343, 483,
- 483
+ 338, 338, 338, 338, 338, 349, 5, 338, 338, 338,
+ 338, 4, 4, 353, 354, 4, 469, 353, 353, 348,
+ 338, 4, 353, 338, 338, 338, 353, 338, 348, 338,
+ 338, 12, 5, 5, 4, 6, 338, 338, 4, 5,
+ 4, 353, 353, 349, 338, 338, 354, 355, 338, 5,
+ 338, 351, 5, 5, 355, 355, 355, 353, 355, 354,
+ 355, 355, 353, 355, 355, 355, 353, 355, 355, 353,
+ 349, 355, 353, 355, 355, 353, 355, 353, 4, 351,
+ 338, 4, 359, 358, 4, 358, 5, 5, 5, 358,
+ 358, 357, 4, 4, 5, 5, 5, 5, 358, 358,
+ 357, 4, 4, 5, 5, 5, 5, 358, 358, 357,
+ 4, 4, 5, 358, 359, 359, 359, 359, 359, 4,
+ 359, 359, 4, 358, 358, 359, 359, 359, 359, 359,
+ 4, 359, 359, 4, 358, 358, 4, 4, 358, 4,
+ 358, 358, 4, 4, 4, 355, 4, 349, 351, 355,
+ 338, 349, 4, 355, 355, 349, 4, 338, 338, 338,
+ 338, 338, 338, 338, 338, 338, 338, 349, 351, 355,
+ 338, 349, 4, 348, 348, 348, 338, 349, 351, 348,
+ 338, 348, 348, 349, 348, 338, 348, 338, 338, 338,
+ 338, 338, 338, 344, 338, 338, 338, 344, 338, 338,
+ 338, 338, 344, 338, 338, 338, 338, 338, 353, 338,
+ 288, 343, 344, 338, 338, 354, 340, 4, 4, 354,
+ 338, 348, 338, 55, 338, 5, 5, 4, 338, 4,
+ 352, 5, 355, 5, 5, 354, 355, 354, 354, 354,
+ 5, 338, 359, 358, 359, 359, 359, 359, 359, 4,
+ 359, 359, 358, 4, 358, 359, 359, 359, 359, 359,
+ 4, 359, 359, 358, 359, 358, 4, 359, 359, 358,
+ 4, 359, 358, 4, 358, 358, 349, 351, 355, 4,
+ 353, 338, 353, 338, 338, 355, 4, 353, 338, 348,
+ 355, 338, 348, 355, 349, 344, 338, 4, 362, 362,
+ 338, 338, 362, 344, 362, 485, 349, 344, 362, 362,
+ 338, 338, 344, 338, 338, 338, 338, 348, 338, 5,
+ 485, 338, 362, 340, 486, 487, 5, 340, 5, 338,
+ 5, 4, 6, 338, 5, 338, 358, 359, 358, 358,
+ 359, 359, 358, 359, 358, 358, 355, 349, 351, 349,
+ 338, 349, 338, 349, 351, 349, 338, 349, 355, 4,
+ 485, 485, 343, 338, 485, 4, 485, 353, 4, 485,
+ 485, 343, 338, 4, 485, 485, 338, 349, 485, 485,
+ 486, 492, 493, 484, 490, 491, 5, 5, 6, 4,
+ 179, 286, 329, 330, 338, 356, 4, 359, 359, 359,
+ 359, 355, 355, 338, 355, 4, 355, 355, 338, 355,
+ 338, 485, 485, 4, 338, 485, 338, 485, 4, 338,
+ 485, 353, 492, 494, 495, 335, 491, 5, 5, 4,
+ 338, 4, 349, 351, 4, 344, 343, 338, 338, 343,
+ 338, 349, 495, 340, 5, 5, 338, 349, 351, 353,
+ 349, 351, 485, 338, 4, 485, 338, 355, 5, 5,
+ 353, 353, 4, 485, 4, 485, 343, 343, 485, 485
};
#define yyerrok (yyerrstatus = 0)
@@ -4979,89 +4969,89 @@ yyreduce:
{fr->showCmd();;}
break;
- case 40:
-#line 476 "parser.Y"
- {fr->unloadFitsCmd();;}
+ case 39:
+#line 475 "parser.Y"
+ {fr->threadsCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 42:
-#line 478 "parser.Y"
- {fr->msg("Frame 1.0");;}
+ case 41:
+#line 477 "parser.Y"
+ {fr->unloadFitsCmd();;}
break;
- case 47:
-#line 485 "parser.Y"
- {(yyval.real)=(yyvsp[(1) - (1)].real);;}
+ case 43:
+#line 479 "parser.Y"
+ {fr->msg("Frame 1.0");;}
break;
case 48:
#line 486 "parser.Y"
- {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
+ {(yyval.real)=(yyvsp[(1) - (1)].real);;}
break;
case 49:
-#line 489 "parser.Y"
- {yydebug=(yyvsp[(1) - (1)].integer);;}
+#line 487 "parser.Y"
+ {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
break;
case 50:
#line 490 "parser.Y"
- {DebugAST=(yyvsp[(2) - (2)].integer);;}
+ {yydebug=(yyvsp[(1) - (1)].integer);;}
break;
case 51:
#line 491 "parser.Y"
- {DebugMosaic=(yyvsp[(2) - (2)].integer);;}
+ {DebugAST=(yyvsp[(2) - (2)].integer);;}
break;
case 52:
#line 492 "parser.Y"
- {yydebug=(yyvsp[(2) - (2)].integer);;}
+ {DebugMosaic=(yyvsp[(2) - (2)].integer);;}
break;
case 53:
#line 493 "parser.Y"
- {DebugPerf=(yyvsp[(2) - (2)].integer);;}
+ {yydebug=(yyvsp[(2) - (2)].integer);;}
break;
case 54:
#line 494 "parser.Y"
- {DebugWCS=(yyvsp[(2) - (2)].integer);;}
+ {DebugPerf=(yyvsp[(2) - (2)].integer);;}
break;
case 55:
#line 495 "parser.Y"
- {DebugBin=(yyvsp[(2) - (2)].integer);;}
+ {DebugWCS=(yyvsp[(2) - (2)].integer);;}
break;
case 56:
#line 496 "parser.Y"
- {DebugCompress=(yyvsp[(2) - (2)].integer);}
+ {DebugBin=(yyvsp[(2) - (2)].integer);;}
break;
case 57:
#line 497 "parser.Y"
- {DebugCrop=(yyvsp[(2) - (2)].integer);}
+ {DebugCompress=(yyvsp[(2) - (2)].integer);}
break;
case 58:
#line 498 "parser.Y"
- {DebugGZ=(yyvsp[(2) - (2)].integer);;}
+ {DebugCrop=(yyvsp[(2) - (2)].integer);}
break;
case 59:
#line 499 "parser.Y"
- {DebugRGB=(yyvsp[(2) - (2)].integer);;}
+ {DebugGZ=(yyvsp[(2) - (2)].integer);;}
break;
case 60:
-#line 502 "parser.Y"
- {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;}
+#line 500 "parser.Y"
+ {DebugRGB=(yyvsp[(2) - (2)].integer);;}
break;
case 61:
-#line 504 "parser.Y"
- {(yyval.integer)=1;;}
+#line 503 "parser.Y"
+ {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;}
break;
case 62:
@@ -5080,8 +5070,8 @@ yyreduce:
break;
case 65:
-#line 509 "parser.Y"
- {(yyval.integer)=0;;}
+#line 508 "parser.Y"
+ {(yyval.integer)=1;;}
break;
case 66:
@@ -5100,8 +5090,8 @@ yyreduce:
break;
case 69:
-#line 515 "parser.Y"
- {(yyval.integer) = Base::DEFAULT;;}
+#line 513 "parser.Y"
+ {(yyval.integer)=0;;}
break;
case 70:
@@ -5111,22 +5101,22 @@ yyreduce:
case 71:
#line 517 "parser.Y"
- {(yyval.integer) = Base::FIXED;;}
+ {(yyval.integer) = Base::DEFAULT;;}
break;
case 72:
#line 518 "parser.Y"
- {(yyval.integer) = Base::SCIENTIFIC;;}
+ {(yyval.integer) = Base::FIXED;;}
break;
case 73:
#line 519 "parser.Y"
- {(yyval.integer) = Base::INTEGER;;}
+ {(yyval.integer) = Base::SCIENTIFIC;;}
break;
case 74:
-#line 522 "parser.Y"
- {(yyval.integer) = Base::ROOTBASE;;}
+#line 520 "parser.Y"
+ {(yyval.integer) = Base::INTEGER;;}
break;
case 75:
@@ -5136,42 +5126,42 @@ yyreduce:
case 76:
#line 524 "parser.Y"
- {(yyval.integer) = Base::FULLBASE;;}
+ {(yyval.integer) = Base::ROOTBASE;;}
break;
case 77:
#line 525 "parser.Y"
- {(yyval.integer) = Base::ROOT;;}
+ {(yyval.integer) = Base::FULLBASE;;}
break;
case 78:
#line 526 "parser.Y"
- {(yyval.integer) = Base::FULL;;}
+ {(yyval.integer) = Base::ROOT;;}
break;
case 79:
#line 527 "parser.Y"
- {(yyval.integer) = Base::ROOT3D;;}
+ {(yyval.integer) = Base::FULL;;}
break;
case 80:
#line 528 "parser.Y"
- {(yyval.integer) = Base::FULL3D;;}
+ {(yyval.integer) = Base::ROOT3D;;}
break;
case 81:
-#line 531 "parser.Y"
- {(yyval.real) = 0;;}
+#line 529 "parser.Y"
+ {(yyval.integer) = Base::FULL3D;;}
break;
case 82:
#line 532 "parser.Y"
- {(yyval.real) = (yyvsp[(1) - (1)].real);;}
+ {(yyval.real) = 0;;}
break;
case 83:
-#line 535 "parser.Y"
- {(yyval.real) = degToRad((yyvsp[(1) - (1)].real));;}
+#line 533 "parser.Y"
+ {(yyval.real) = (yyvsp[(1) - (1)].real);;}
break;
case 84:
@@ -5181,26 +5171,31 @@ yyreduce:
case 85:
#line 537 "parser.Y"
- {(yyval.real)=(yyvsp[(1) - (1)].real);;}
+ {(yyval.real) = degToRad((yyvsp[(1) - (1)].real));;}
break;
case 86:
-#line 540 "parser.Y"
- {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
+#line 538 "parser.Y"
+ {(yyval.real)=(yyvsp[(1) - (1)].real);;}
break;
case 87:
-#line 543 "parser.Y"
- {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
+#line 541 "parser.Y"
+ {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
break;
case 88:
-#line 546 "parser.Y"
- {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
+#line 544 "parser.Y"
+ {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
break;
case 89:
-#line 550 "parser.Y"
+#line 547 "parser.Y"
+ {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
+ break;
+
+ case 90:
+#line 551 "parser.Y"
{
Vector r;
if (currentSky == Coord::GALACTIC || currentSky == Coord::ECLIPTIC)
@@ -5214,8 +5209,8 @@ yyreduce:
;}
break;
- case 90:
-#line 562 "parser.Y"
+ case 91:
+#line 563 "parser.Y"
{
Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));
(yyval.vector)[0] = r[0];
@@ -5224,8 +5219,8 @@ yyreduce:
;}
break;
- case 91:
-#line 569 "parser.Y"
+ case 92:
+#line 570 "parser.Y"
{
Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));
(yyval.vector)[0] = r[0];
@@ -5234,8 +5229,8 @@ yyreduce:
;}
break;
- case 92:
-#line 576 "parser.Y"
+ case 93:
+#line 577 "parser.Y"
{
(yyval.vector)[0] = (yyvsp[(1) - (2)].real);
(yyval.vector)[1] = (yyvsp[(2) - (2)].real);
@@ -5243,244 +5238,239 @@ yyreduce:
;}
break;
- case 93:
-#line 583 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::IMAGE;;}
- break;
-
case 94:
#line 584 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::PHYSICAL;;}
+ {(yyval.integer) = currentCoord = Coord::IMAGE;;}
break;
case 95:
#line 585 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::DETECTOR;;}
+ {(yyval.integer) = currentCoord = Coord::PHYSICAL;;}
break;
case 96:
#line 586 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::AMPLIFIER;;}
+ {(yyval.integer) = currentCoord = Coord::DETECTOR;;}
break;
case 97:
#line 587 "parser.Y"
- {(yyval.integer) = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
+ {(yyval.integer) = currentCoord = Coord::AMPLIFIER;;}
break;
case 98:
-#line 590 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCS;;}
+#line 588 "parser.Y"
+ {(yyval.integer) = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
break;
case 99:
#line 591 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSA;;}
+ {(yyval.integer) = currentCoord = Coord::WCS;;}
break;
case 100:
#line 592 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSB;;}
+ {(yyval.integer) = currentCoord = Coord::WCSA;;}
break;
case 101:
#line 593 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSC;;}
+ {(yyval.integer) = currentCoord = Coord::WCSB;;}
break;
case 102:
#line 594 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSD;;}
+ {(yyval.integer) = currentCoord = Coord::WCSC;;}
break;
case 103:
#line 595 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSE;;}
+ {(yyval.integer) = currentCoord = Coord::WCSD;;}
break;
case 104:
#line 596 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSF;;}
+ {(yyval.integer) = currentCoord = Coord::WCSE;;}
break;
case 105:
#line 597 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSG;;}
+ {(yyval.integer) = currentCoord = Coord::WCSF;;}
break;
case 106:
#line 598 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSH;;}
+ {(yyval.integer) = currentCoord = Coord::WCSG;;}
break;
case 107:
#line 599 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSI;;}
+ {(yyval.integer) = currentCoord = Coord::WCSH;;}
break;
case 108:
#line 600 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSJ;;}
+ {(yyval.integer) = currentCoord = Coord::WCSI;;}
break;
case 109:
#line 601 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSK;;}
+ {(yyval.integer) = currentCoord = Coord::WCSJ;;}
break;
case 110:
#line 602 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSL;;}
+ {(yyval.integer) = currentCoord = Coord::WCSK;;}
break;
case 111:
#line 603 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSM;;}
+ {(yyval.integer) = currentCoord = Coord::WCSL;;}
break;
case 112:
#line 604 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSN;;}
+ {(yyval.integer) = currentCoord = Coord::WCSM;;}
break;
case 113:
#line 605 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSO;;}
+ {(yyval.integer) = currentCoord = Coord::WCSN;;}
break;
case 114:
#line 606 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSP;;}
+ {(yyval.integer) = currentCoord = Coord::WCSO;;}
break;
case 115:
#line 607 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSQ;;}
+ {(yyval.integer) = currentCoord = Coord::WCSP;;}
break;
case 116:
#line 608 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSR;;}
+ {(yyval.integer) = currentCoord = Coord::WCSQ;;}
break;
case 117:
#line 609 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSS;;}
+ {(yyval.integer) = currentCoord = Coord::WCSR;;}
break;
case 118:
#line 610 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCST;;}
+ {(yyval.integer) = currentCoord = Coord::WCSS;;}
break;
case 119:
#line 611 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSU;;}
+ {(yyval.integer) = currentCoord = Coord::WCST;;}
break;
case 120:
#line 612 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSV;;}
+ {(yyval.integer) = currentCoord = Coord::WCSU;;}
break;
case 121:
#line 613 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSW;;}
+ {(yyval.integer) = currentCoord = Coord::WCSV;;}
break;
case 122:
#line 614 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSX;;}
+ {(yyval.integer) = currentCoord = Coord::WCSW;;}
break;
case 123:
#line 615 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSY;;}
+ {(yyval.integer) = currentCoord = Coord::WCSX;;}
break;
case 124:
#line 616 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCSZ;;}
+ {(yyval.integer) = currentCoord = Coord::WCSY;;}
break;
case 125:
#line 617 "parser.Y"
- {(yyval.integer) = currentCoord = Coord::WCS0;;}
+ {(yyval.integer) = currentCoord = Coord::WCSZ;;}
break;
case 126:
-#line 620 "parser.Y"
- {(yyval.integer) = Coord::CANVAS;;}
+#line 618 "parser.Y"
+ {(yyval.integer) = currentCoord = Coord::WCS0;;}
break;
case 127:
#line 621 "parser.Y"
- {(yyval.integer) = Coord::PANNER;;}
+ {(yyval.integer) = Coord::CANVAS;;}
break;
case 128:
-#line 624 "parser.Y"
- {(yyval.integer) = FrScale::LINEARSCALE;;}
+#line 622 "parser.Y"
+ {(yyval.integer) = Coord::PANNER;;}
break;
case 129:
#line 625 "parser.Y"
- {(yyval.integer) = FrScale::LOGSCALE;;}
+ {(yyval.integer) = FrScale::LINEARSCALE;;}
break;
case 130:
#line 626 "parser.Y"
- {(yyval.integer) = FrScale::POWSCALE;;}
+ {(yyval.integer) = FrScale::LOGSCALE;;}
break;
case 131:
#line 627 "parser.Y"
- {(yyval.integer) = FrScale::SQRTSCALE;;}
+ {(yyval.integer) = FrScale::POWSCALE;;}
break;
case 132:
#line 628 "parser.Y"
- {(yyval.integer) = FrScale::SQUAREDSCALE;;}
+ {(yyval.integer) = FrScale::SQRTSCALE;;}
break;
case 133:
#line 629 "parser.Y"
- {(yyval.integer) = FrScale::ASINHSCALE;;}
+ {(yyval.integer) = FrScale::SQUAREDSCALE;;}
break;
case 134:
#line 630 "parser.Y"
- {(yyval.integer) = FrScale::SINHSCALE;;}
+ {(yyval.integer) = FrScale::ASINHSCALE;;}
break;
case 135:
#line 631 "parser.Y"
- {(yyval.integer) = FrScale::HISTEQUSCALE;;}
+ {(yyval.integer) = FrScale::SINHSCALE;;}
break;
case 136:
-#line 634 "parser.Y"
- {(yyval.integer) = currentSky = Coord::FK5;;}
+#line 632 "parser.Y"
+ {(yyval.integer) = FrScale::HISTEQUSCALE;;}
break;
case 137:
#line 635 "parser.Y"
- {(yyval.integer) = currentSky = Coord::FK4;;}
+ {(yyval.integer) = currentSky = Coord::FK5;;}
break;
case 138:
#line 636 "parser.Y"
- {(yyval.integer) = currentSky = Coord::FK4_NO_E;;}
+ {(yyval.integer) = currentSky = Coord::FK4;;}
break;
case 139:
#line 637 "parser.Y"
- {(yyval.integer) = currentSky = Coord::FK4;;}
+ {(yyval.integer) = currentSky = Coord::FK4_NO_E;;}
break;
case 140:
#line 638 "parser.Y"
- {(yyval.integer) = currentSky = Coord::FK5;;}
+ {(yyval.integer) = currentSky = Coord::FK4;;}
break;
case 141:
@@ -5490,32 +5480,32 @@ yyreduce:
case 142:
#line 640 "parser.Y"
- {(yyval.integer) = currentSky = Coord::ICRS;;}
+ {(yyval.integer) = currentSky = Coord::FK5;;}
break;
case 143:
#line 641 "parser.Y"
- {(yyval.integer) = currentSky = Coord::GALACTIC;;}
+ {(yyval.integer) = currentSky = Coord::ICRS;;}
break;
case 144:
#line 642 "parser.Y"
- {(yyval.integer) = currentSky = Coord::SUPERGALACTIC;;}
+ {(yyval.integer) = currentSky = Coord::GALACTIC;;}
break;
case 145:
#line 643 "parser.Y"
- {(yyval.integer) = currentSky = Coord::ECLIPTIC;;}
+ {(yyval.integer) = currentSky = Coord::SUPERGALACTIC;;}
break;
case 146:
#line 644 "parser.Y"
- {(yyval.integer) = currentSky = Coord::HELIOECLIPTIC;;}
+ {(yyval.integer) = currentSky = Coord::ECLIPTIC;;}
break;
case 147:
-#line 647 "parser.Y"
- {(yyval.integer)=Coord::DEGREES;;}
+#line 645 "parser.Y"
+ {(yyval.integer) = currentSky = Coord::HELIOECLIPTIC;;}
break;
case 148:
@@ -5525,12 +5515,12 @@ yyreduce:
case 149:
#line 649 "parser.Y"
- {(yyval.integer)=Coord::SEXAGESIMAL;;}
+ {(yyval.integer)=Coord::DEGREES;;}
break;
case 150:
-#line 652 "parser.Y"
- {(yyval.integer)=Coord::DEGREE;;}
+#line 650 "parser.Y"
+ {(yyval.integer)=Coord::SEXAGESIMAL;;}
break;
case 151:
@@ -5540,42 +5530,42 @@ yyreduce:
case 152:
#line 654 "parser.Y"
- {(yyval.integer)=Coord::ARCMIN;;}
+ {(yyval.integer)=Coord::DEGREE;;}
break;
case 153:
#line 655 "parser.Y"
- {(yyval.integer)=Coord::ARCSEC;;}
+ {(yyval.integer)=Coord::ARCMIN;;}
break;
case 154:
-#line 658 "parser.Y"
- {(yyval.real) = (yyvsp[(1) - (1)].real);;}
+#line 656 "parser.Y"
+ {(yyval.integer)=Coord::ARCSEC;;}
break;
case 155:
#line 659 "parser.Y"
- {(yyval.real) = FrScale::MINMAX;;}
+ {(yyval.real) = (yyvsp[(1) - (1)].real);;}
break;
case 156:
#line 660 "parser.Y"
- {(yyval.real) = FrScale::ZSCALE;;}
+ {(yyval.real) = FrScale::MINMAX;;}
break;
case 157:
#line 661 "parser.Y"
- {(yyval.real) = FrScale::ZMAX;;}
+ {(yyval.real) = FrScale::ZSCALE;;}
break;
case 158:
#line 662 "parser.Y"
- {(yyval.real) = FrScale::USERCLIP;;}
+ {(yyval.real) = FrScale::ZMAX;;}
break;
case 159:
-#line 665 "parser.Y"
- {(yyval.integer) = Base::SHMID;;}
+#line 663 "parser.Y"
+ {(yyval.real) = FrScale::USERCLIP;;}
break;
case 160:
@@ -5585,12 +5575,12 @@ yyreduce:
case 161:
#line 667 "parser.Y"
- {(yyval.integer) = Base::KEY;;}
+ {(yyval.integer) = Base::SHMID;;}
break;
case 162:
-#line 670 "parser.Y"
- {(yyval.integer) = Base::LOADALL;;}
+#line 668 "parser.Y"
+ {(yyval.integer) = Base::KEY;;}
break;
case 163:
@@ -5600,12 +5590,12 @@ yyreduce:
case 164:
#line 672 "parser.Y"
- {(yyval.integer) = Base::INCR;;}
+ {(yyval.integer) = Base::LOADALL;;}
break;
case 165:
-#line 675 "parser.Y"
- {(yyval.integer) = Base::IMG;;}
+#line 673 "parser.Y"
+ {(yyval.integer) = Base::INCR;;}
break;
case 166:
@@ -5615,12 +5605,12 @@ yyreduce:
case 167:
#line 677 "parser.Y"
- {(yyval.integer) = Base::MASK;;}
+ {(yyval.integer) = Base::IMG;;}
break;
case 168:
-#line 680 "parser.Y"
- {(yyval.integer) = Base::NOCOMPRESS;;}
+#line 678 "parser.Y"
+ {(yyval.integer) = Base::MASK;;}
break;
case 169:
@@ -5630,12 +5620,12 @@ yyreduce:
case 170:
#line 682 "parser.Y"
- {(yyval.integer) = Base::GZ;;}
+ {(yyval.integer) = Base::NOCOMPRESS;;}
break;
case 171:
-#line 685 "parser.Y"
- {(yyval.integer) = Point::CIRCLE;;}
+#line 683 "parser.Y"
+ {(yyval.integer) = Base::GZ;;}
break;
case 172:
@@ -5645,62 +5635,62 @@ yyreduce:
case 173:
#line 687 "parser.Y"
- {(yyval.integer) = Point::BOX;;}
+ {(yyval.integer) = Point::CIRCLE;;}
break;
case 174:
#line 688 "parser.Y"
- {(yyval.integer) = Point::DIAMOND;;}
+ {(yyval.integer) = Point::BOX;;}
break;
case 175:
#line 689 "parser.Y"
- {(yyval.integer) = Point::CROSS;;}
+ {(yyval.integer) = Point::DIAMOND;;}
break;
case 176:
#line 690 "parser.Y"
- {(yyval.integer) = Point::EX;;}
+ {(yyval.integer) = Point::CROSS;;}
break;
case 177:
#line 691 "parser.Y"
- {(yyval.integer) = Point::ARROW;;}
+ {(yyval.integer) = Point::EX;;}
break;
case 178:
#line 692 "parser.Y"
- {(yyval.integer) = Point::BOXCIRCLE;;}
+ {(yyval.integer) = Point::ARROW;;}
break;
case 179:
-#line 695 "parser.Y"
- {(yyval.integer) = POINTSIZE;;}
+#line 693 "parser.Y"
+ {(yyval.integer) = Point::BOXCIRCLE;;}
break;
case 180:
#line 696 "parser.Y"
- {(yyval.integer) = (yyvsp[(1) - (1)].integer);;}
+ {(yyval.integer) = POINTSIZE;;}
break;
case 181:
-#line 699 "parser.Y"
- {(yyval.integer) = Marker::STATS;;}
+#line 697 "parser.Y"
+ {(yyval.integer) = (yyvsp[(1) - (1)].integer);;}
break;
case 182:
#line 700 "parser.Y"
- {(yyval.integer) = Marker::PLOT2D;;}
+ {(yyval.integer) = Marker::STATS;;}
break;
case 183:
#line 701 "parser.Y"
- {(yyval.integer) = Marker::PLOT3D;;}
+ {(yyval.integer) = Marker::PLOT2D;;}
break;
case 184:
-#line 704 "parser.Y"
- {(yyval.integer) = Marker::AVERAGE;;}
+#line 702 "parser.Y"
+ {(yyval.integer) = Marker::PLOT3D;;}
break;
case 185:
@@ -5710,12 +5700,12 @@ yyreduce:
case 186:
#line 706 "parser.Y"
- {(yyval.integer) = Marker::SUM;;}
+ {(yyval.integer) = Marker::AVERAGE;;}
break;
case 187:
-#line 709 "parser.Y"
- {(yyval.integer) = FitsFile::BIGENDIAN;;}
+#line 707 "parser.Y"
+ {(yyval.integer) = Marker::SUM;;}
break;
case 188:
@@ -5725,22 +5715,17 @@ yyreduce:
case 189:
#line 711 "parser.Y"
- {(yyval.integer) = FitsFile::LITTLEENDIAN;;}
+ {(yyval.integer) = FitsFile::BIGENDIAN;;}
break;
case 190:
-#line 714 "parser.Y"
- {fr->set3dViewCmd((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real));;}
- break;
-
- case 192:
-#line 716 "parser.Y"
- {fr->set3dRenderMethodCmd((yyvsp[(2) - (2)].integer));;}
+#line 712 "parser.Y"
+ {(yyval.integer) = FitsFile::LITTLEENDIAN;;}
break;
case 193:
#line 717 "parser.Y"
- {fr->set3dThreadsCmd((yyvsp[(2) - (2)].integer));;}
+ {fr->set3dRenderMethodCmd((yyvsp[(2) - (2)].integer));;}
break;
case 194:
@@ -5758,741 +5743,756 @@ yyreduce:
{fr->set3dHighliteColorCmd((yyvsp[(2) - (2)].str));;}
break;
- case 198:
-#line 727 "parser.Y"
- {fr->binColsCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;}
+ case 197:
+#line 726 "parser.Y"
+ {fr->set3dViewCmd((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));;}
break;
- case 199:
+ case 198:
#line 728 "parser.Y"
- {fr->binDepthCmd((yyvsp[(2) - (2)].integer));;}
+ {fr->set3dViewPointCmd(Vector3d((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 202:
-#line 731 "parser.Y"
- {fr->binBufferSizeCmd((yyvsp[(3) - (3)].integer));;}
+ case 200:
+#line 732 "parser.Y"
+ {fr->binColsCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;}
break;
- case 204:
+ case 201:
#line 733 "parser.Y"
- {fr->binFilterCmd((yyvsp[(2) - (2)].str));;}
+ {fr->binDepthCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 205:
+ case 204:
#line 736 "parser.Y"
- {fr->binAboutCmd();;}
+ {fr->binBufferSizeCmd((yyvsp[(3) - (3)].integer));;}
break;
case 206:
-#line 737 "parser.Y"
- {fr->binAboutCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
+#line 738 "parser.Y"
+ {fr->binFilterCmd((yyvsp[(2) - (2)].str));;}
break;
case 207:
-#line 740 "parser.Y"
- {fr->binFactorCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;}
+#line 741 "parser.Y"
+ {fr->binAboutCmd();;}
break;
case 208:
-#line 741 "parser.Y"
- {fr->binFactorCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
+#line 742 "parser.Y"
+ {fr->binAboutCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
case 209:
-#line 743 "parser.Y"
- {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(1) - (4)].real)), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
+#line 745 "parser.Y"
+ {fr->binFactorCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;}
break;
case 210:
-#line 745 "parser.Y"
- {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
+#line 746 "parser.Y"
+ {fr->binFactorCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
case 211:
-#line 746 "parser.Y"
- {fr->binFactorToCmd(Vector((yyvsp[(2) - (2)].real),(yyvsp[(2) - (2)].real)));;}
+#line 748 "parser.Y"
+ {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(1) - (4)].real)), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
case 212:
-#line 747 "parser.Y"
- {fr->binFactorToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
+#line 750 "parser.Y"
+ {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
break;
case 213:
-#line 749 "parser.Y"
- {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
+#line 751 "parser.Y"
+ {fr->binFactorToCmd(Vector((yyvsp[(2) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
case 214:
-#line 751 "parser.Y"
- {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
+#line 752 "parser.Y"
+ {fr->binFactorToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
case 215:
#line 754 "parser.Y"
- {fr->binFunctionCmd(FitsHist::AVERAGE);;}
+ {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
break;
case 216:
-#line 755 "parser.Y"
- {fr->binFunctionCmd(FitsHist::SUM);;}
+#line 756 "parser.Y"
+ {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
case 217:
-#line 758 "parser.Y"
- {fr->binToFitCmd();;}
+#line 759 "parser.Y"
+ {fr->binFunctionCmd(FitsHist::AVERAGE);;}
break;
case 218:
#line 760 "parser.Y"
- {fr->binCmd(Vector((yyvsp[(1) - (7)].real),(yyvsp[(2) - (7)].real)), (yyvsp[(5) - (7)].str), (yyvsp[(6) - (7)].str), (yyvsp[(7) - (7)].str));;}
+ {fr->binFunctionCmd(FitsHist::SUM);;}
break;
case 219:
#line 763 "parser.Y"
- {fr->binCmd(Vector((yyvsp[(1) - (11)].real),(yyvsp[(2) - (11)].real)), (yyvsp[(3) - (11)].integer), Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)), (yyvsp[(8) - (11)].str), (yyvsp[(9) - (11)].str), (yyvsp[(10) - (11)].str), (yyvsp[(11) - (11)].str));;}
+ {fr->binToFitCmd();;}
break;
case 220:
#line 765 "parser.Y"
- {fr->binCmd(Vector((yyvsp[(1) - (8)].real),(yyvsp[(2) - (8)].real)), Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (yyvsp[(6) - (8)].str), (yyvsp[(7) - (8)].str), (yyvsp[(8) - (8)].str));;}
+ {fr->binCmd(Vector((yyvsp[(1) - (7)].real),(yyvsp[(2) - (7)].real)), (yyvsp[(5) - (7)].str), (yyvsp[(6) - (7)].str), (yyvsp[(7) - (7)].str));;}
break;
case 221:
#line 768 "parser.Y"
+ {fr->binCmd(Vector((yyvsp[(1) - (11)].real),(yyvsp[(2) - (11)].real)), (yyvsp[(3) - (11)].integer), Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)), (yyvsp[(8) - (11)].str), (yyvsp[(9) - (11)].str), (yyvsp[(10) - (11)].str), (yyvsp[(11) - (11)].str));;}
+ break;
+
+ case 222:
+#line 770 "parser.Y"
+ {fr->binCmd(Vector((yyvsp[(1) - (8)].real),(yyvsp[(2) - (8)].real)), Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (yyvsp[(6) - (8)].str), (yyvsp[(7) - (8)].str), (yyvsp[(8) - (8)].str));;}
+ break;
+
+ case 223:
+#line 773 "parser.Y"
{fr->binCmd(Vector((yyvsp[(1) - (12)].real),(yyvsp[(2) - (12)].real)), (yyvsp[(3) - (12)].integer), Vector((yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real)), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)),
(yyvsp[(9) - (12)].str), (yyvsp[(10) - (12)].str), (yyvsp[(11) - (12)].str), (yyvsp[(12) - (12)].str));;}
break;
- case 227:
-#line 777 "parser.Y"
+ case 229:
+#line 782 "parser.Y"
{fr->clipPreserveCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 228:
-#line 780 "parser.Y"
+ case 230:
+#line 785 "parser.Y"
{fr->clipUserCmd((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));;}
break;
- case 229:
-#line 781 "parser.Y"
+ case 231:
+#line 786 "parser.Y"
{fr->clipUserLowCmd((yyvsp[(2) - (2)].real));;}
break;
- case 230:
-#line 782 "parser.Y"
+ case 232:
+#line 787 "parser.Y"
{fr->clipUserHighCmd((yyvsp[(2) - (2)].real));;}
break;
- case 231:
-#line 785 "parser.Y"
+ case 233:
+#line 790 "parser.Y"
{fr->clipScopeCmd(FrScale::GLOBAL);;}
break;
- case 232:
-#line 786 "parser.Y"
+ case 234:
+#line 791 "parser.Y"
{fr->clipScopeCmd(FrScale::LOCAL);;}
break;
- case 233:
-#line 789 "parser.Y"
+ case 235:
+#line 794 "parser.Y"
{fr->clipModeCmd((yyvsp[(1) - (1)].real));;}
break;
- case 234:
-#line 790 "parser.Y"
+ case 236:
+#line 795 "parser.Y"
{fr->clipModeCmd(FrScale::MINMAX);;}
break;
- case 235:
-#line 791 "parser.Y"
+ case 237:
+#line 796 "parser.Y"
{fr->clipModeCmd(FrScale::ZSCALE);;}
break;
- case 236:
-#line 792 "parser.Y"
+ case 238:
+#line 797 "parser.Y"
{fr->clipModeCmd(FrScale::ZMAX);;}
break;
- case 237:
-#line 793 "parser.Y"
+ case 239:
+#line 798 "parser.Y"
{fr->clipModeCmd(FrScale::USERCLIP);;}
break;
- case 239:
-#line 797 "parser.Y"
+ case 241:
+#line 802 "parser.Y"
{fr->clipMinMaxSampleCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 240:
-#line 800 "parser.Y"
+ case 242:
+#line 805 "parser.Y"
{fr->clipMinMaxModeCmd(FrScale::AUTOSCAN);;}
break;
- case 241:
-#line 801 "parser.Y"
+ case 243:
+#line 806 "parser.Y"
{fr->clipMinMaxModeCmd(FrScale::SCAN);;}
break;
- case 242:
-#line 802 "parser.Y"
+ case 244:
+#line 807 "parser.Y"
{fr->clipMinMaxModeCmd(FrScale::SAMPLE);;}
break;
- case 243:
-#line 803 "parser.Y"
+ case 245:
+#line 808 "parser.Y"
{fr->clipMinMaxModeCmd(FrScale::DATAMIN);;}
break;
- case 244:
-#line 804 "parser.Y"
+ case 246:
+#line 809 "parser.Y"
{fr->clipMinMaxModeCmd(FrScale::IRAFMIN);;}
break;
- case 245:
-#line 807 "parser.Y"
+ case 247:
+#line 812 "parser.Y"
{fr->clipZScaleContrastCmd((yyvsp[(2) - (2)].real));;}
break;
- case 246:
-#line 808 "parser.Y"
+ case 248:
+#line 813 "parser.Y"
{fr->clipZScaleSampleCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 247:
-#line 809 "parser.Y"
+ case 249:
+#line 814 "parser.Y"
{fr->clipZScaleLineCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 248:
-#line 813 "parser.Y"
+ case 250:
+#line 818 "parser.Y"
{fr->colormapCmd((yyvsp[(1) - (7)].integer), (yyvsp[(2) - (7)].real), (yyvsp[(3) - (7)].real), (yyvsp[(4) - (7)].integer), (unsigned short*)(yyvsp[(5) - (7)].ptr),
(unsigned char*)(yyvsp[(6) - (7)].ptr), (yyvsp[(7) - (7)].integer));;}
break;
- case 249:
-#line 816 "parser.Y"
+ case 251:
+#line 821 "parser.Y"
{fr->colormapCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;}
break;
- case 250:
-#line 817 "parser.Y"
+ case 252:
+#line 822 "parser.Y"
{fr->colormapBeginCmd();;}
break;
- case 252:
-#line 819 "parser.Y"
+ case 254:
+#line 824 "parser.Y"
{fr->colormapEndCmd();;}
break;
- case 253:
-#line 823 "parser.Y"
+ case 255:
+#line 828 "parser.Y"
{fr->colormapMotionCmd((yyvsp[(1) - (7)].integer), (yyvsp[(2) - (7)].real), (yyvsp[(3) - (7)].real), (yyvsp[(4) - (7)].integer), (unsigned short*)(yyvsp[(5) - (7)].ptr),
(unsigned char*)(yyvsp[(6) - (7)].ptr), (yyvsp[(7) - (7)].integer));;}
break;
- case 254:
-#line 826 "parser.Y"
+ case 256:
+#line 831 "parser.Y"
{fr->colormapMotionCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),
(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;}
break;
- case 255:
-#line 829 "parser.Y"
+ case 257:
+#line 834 "parser.Y"
{fr->colorScaleCmd((FrScale::ColorScaleType)(yyvsp[(1) - (1)].integer));;}
break;
- case 256:
-#line 830 "parser.Y"
+ case 258:
+#line 835 "parser.Y"
{fr->colorScaleLogCmd((yyvsp[(2) - (2)].real));;}
break;
- case 258:
-#line 834 "parser.Y"
+ case 260:
+#line 839 "parser.Y"
{fr->contourSetColorCmd((yyvsp[(2) - (2)].str));;}
break;
- case 259:
-#line 836 "parser.Y"
+ case 261:
+#line 841 "parser.Y"
{fr->contourCopyCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;}
break;
- case 261:
-#line 838 "parser.Y"
+ case 263:
+#line 843 "parser.Y"
{fr->contourSetDashCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 262:
-#line 839 "parser.Y"
+ case 264:
+#line 844 "parser.Y"
{fr->contourDeleteCmd();;}
break;
- case 263:
-#line 840 "parser.Y"
+ case 265:
+#line 845 "parser.Y"
{fr->contourDeleteAllCmd();;}
break;
- case 264:
-#line 842 "parser.Y"
+ case 266:
+#line 847 "parser.Y"
{fr->contourLoadCmd((yyvsp[(2) - (7)].str), (yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].str), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::SkyFrame)(yyvsp[(7) - (7)].integer));;}
break;
- case 265:
-#line 844 "parser.Y"
+ case 267:
+#line 849 "parser.Y"
{fr->contourPasteCmd((yyvsp[(2) - (7)].str), (yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].ptr), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::SkyFrame)(yyvsp[(7) - (7)].integer));;}
break;
- case 266:
-#line 846 "parser.Y"
+ case 268:
+#line 851 "parser.Y"
{fr->contourSaveCmd((yyvsp[(2) - (4)].str), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
break;
- case 267:
-#line 847 "parser.Y"
+ case 269:
+#line 852 "parser.Y"
{fr->contourSetLineWidthCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 268:
-#line 850 "parser.Y"
+ case 270:
+#line 855 "parser.Y"
{fr->contourAuxHeadCmd();;}
break;
- case 269:
-#line 851 "parser.Y"
+ case 271:
+#line 856 "parser.Y"
{fr->contourAuxNextCmd();;}
break;
- case 270:
-#line 853 "parser.Y"
+ case 272:
+#line 858 "parser.Y"
{fr->contourAuxSaveCmd((yyvsp[(2) - (4)].str), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
break;
- case 271:
-#line 857 "parser.Y"
+ case 273:
+#line 862 "parser.Y"
{fr->contourCreateCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].integer),(yyvsp[(3) - (12)].integer),(FVContour::Method)(yyvsp[(4) - (12)].integer),(yyvsp[(5) - (12)].integer),(yyvsp[(6) - (12)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (12)].integer),(yyvsp[(8) - (12)].real),(yyvsp[(9) - (12)].real),Vector((yyvsp[(10) - (12)].real),(yyvsp[(11) - (12)].real)),(yyvsp[(12) - (12)].str));;}
break;
- case 272:
-#line 859 "parser.Y"
+ case 274:
+#line 864 "parser.Y"
{fr->createContourPolygonCmd(currentColor,currentDash,currentWidth,
currentFont, currentText, currentProps, NULL, taglist,cblist);;}
break;
- case 273:
-#line 863 "parser.Y"
+ case 275:
+#line 868 "parser.Y"
{(yyval.integer) = FVContour::SMOOTH;;}
break;
- case 274:
-#line 864 "parser.Y"
+ case 276:
+#line 869 "parser.Y"
{(yyval.integer) = FVContour::BLOCK;;}
break;
- case 275:
-#line 867 "parser.Y"
+ case 277:
+#line 872 "parser.Y"
{fr->cropCmd();;}
break;
- case 276:
-#line 869 "parser.Y"
+ case 278:
+#line 874 "parser.Y"
{fr->cropCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),
(Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyFrame)(yyvsp[(6) - (6)].integer));;}
break;
- case 277:
-#line 872 "parser.Y"
+ case 279:
+#line 877 "parser.Y"
{fr->cropCenterCmd(Vector((yyvsp[(2) - (8)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer),
Vector((yyvsp[(5) - (8)].real),(yyvsp[(6) - (8)].real)), (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::SkyDist)(yyvsp[(8) - (8)].integer));;}
break;
- case 279:
-#line 875 "parser.Y"
+ case 281:
+#line 880 "parser.Y"
{fr->cropBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 280:
-#line 876 "parser.Y"
+ case 282:
+#line 881 "parser.Y"
{fr->cropMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 281:
-#line 877 "parser.Y"
+ case 283:
+#line 882 "parser.Y"
{fr->cropEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 282:
-#line 880 "parser.Y"
+ case 284:
+#line 885 "parser.Y"
{fr->crop3dCmd();;}
break;
- case 283:
-#line 881 "parser.Y"
+ case 285:
+#line 886 "parser.Y"
{fr->crop3dCmd((yyvsp[(1) - (3)].real), (yyvsp[(2) - (3)].real), (Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
break;
- case 284:
-#line 882 "parser.Y"
+ case 286:
+#line 887 "parser.Y"
{fr->crop3dBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
break;
- case 285:
-#line 883 "parser.Y"
+ case 287:
+#line 888 "parser.Y"
{fr->crop3dMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
break;
- case 286:
-#line 884 "parser.Y"
+ case 288:
+#line 889 "parser.Y"
{fr->crop3dEndCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
break;
- case 287:
-#line 888 "parser.Y"
+ case 289:
+#line 893 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)), (Coord::InternalSystem)(yyvsp[(1) - (3)].integer));;}
break;
- case 288:
-#line 890 "parser.Y"
+ case 290:
+#line 895 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
break;
- case 289:
-#line 891 "parser.Y"
+ case 291:
+#line 896 "parser.Y"
{fr->crosshairCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 290:
-#line 892 "parser.Y"
+ case 292:
+#line 897 "parser.Y"
{fr->crosshairWarpCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 291:
-#line 895 "parser.Y"
+ case 293:
+#line 900 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)), (Coord::InternalSystem)(yyvsp[(3) - (5)].integer));;}
break;
- case 292:
-#line 897 "parser.Y"
+ case 294:
+#line 902 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
break;
- case 293:
-#line 899 "parser.Y"
+ case 295:
+#line 904 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer));;}
break;
- case 294:
-#line 901 "parser.Y"
+ case 296:
+#line 906 "parser.Y"
{fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer));;}
break;
- case 295:
-#line 904 "parser.Y"
+ case 297:
+#line 909 "parser.Y"
{fr->fitsyHasExtCmd((yyvsp[(3) - (3)].str));;}
break;
- case 296:
-#line 907 "parser.Y"
+ case 298:
+#line 912 "parser.Y"
{fr->getBgColorCmd();;}
break;
- case 308:
-#line 919 "parser.Y"
+ case 310:
+#line 924 "parser.Y"
{fr->getDATASECCmd();;}
break;
- case 311:
-#line 922 "parser.Y"
+ case 313:
+#line 927 "parser.Y"
{fr->getHistogramCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;}
break;
- case 312:
-#line 924 "parser.Y"
+ case 314:
+#line 929 "parser.Y"
{fr->getHorzCutCmd((yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),Vector((yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].real)),(Coord::InternalSystem)(yyvsp[(7) - (7)].integer));;}
break;
- case 315:
-#line 927 "parser.Y"
+ case 317:
+#line 932 "parser.Y"
{fr->getMinMaxCmd();;}
break;
- case 318:
-#line 930 "parser.Y"
+ case 320:
+#line 935 "parser.Y"
{fr->getNANColorCmd();;}
break;
- case 319:
-#line 931 "parser.Y"
+ case 321:
+#line 936 "parser.Y"
{fr->getOrientCmd();;}
break;
- case 321:
-#line 934 "parser.Y"
+ case 323:
+#line 939 "parser.Y"
{fr->getPixelTableCmd(Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (Coord::InternalSystem)(yyvsp[(3) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(7) - (8)].integer), (yyvsp[(8) - (8)].str));;}
break;
- case 326:
-#line 939 "parser.Y"
+ case 327:
+#line 943 "parser.Y"
+ {fr->getThreadsCmd();;}
+ break;
+
+ case 329:
+#line 945 "parser.Y"
{fr->getTypeCmd();;}
break;
- case 327:
-#line 941 "parser.Y"
+ case 330:
+#line 947 "parser.Y"
{fr->getValueCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
break;
- case 328:
-#line 943 "parser.Y"
+ case 331:
+#line 949 "parser.Y"
{fr->getVertCutCmd((yyvsp[(3) - (7)].str),(yyvsp[(4) - (7)].str),Vector((yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].real)),(Coord::InternalSystem)(yyvsp[(7) - (7)].integer));;}
break;
- case 331:
-#line 948 "parser.Y"
+ case 334:
+#line 954 "parser.Y"
{fr->getBinDepthCmd();;}
break;
- case 332:
-#line 949 "parser.Y"
+ case 335:
+#line 955 "parser.Y"
{fr->getBinFactorCmd();;}
break;
- case 333:
-#line 950 "parser.Y"
+ case 336:
+#line 956 "parser.Y"
{fr->getBinFunctionCmd();;}
break;
- case 334:
-#line 951 "parser.Y"
+ case 337:
+#line 957 "parser.Y"
{fr->getBinBufferSizeCmd();;}
break;
- case 335:
-#line 952 "parser.Y"
+ case 338:
+#line 958 "parser.Y"
{fr->getBinCursorCmd();;}
break;
- case 336:
-#line 953 "parser.Y"
+ case 339:
+#line 959 "parser.Y"
{fr->getBinFilterCmd();;}
break;
- case 338:
-#line 955 "parser.Y"
+ case 341:
+#line 961 "parser.Y"
{fr->getBinListCmd();;}
break;
- case 339:
-#line 958 "parser.Y"
+ case 342:
+#line 964 "parser.Y"
{fr->getBinColsCmd();;}
break;
- case 340:
-#line 959 "parser.Y"
+ case 343:
+#line 965 "parser.Y"
{fr->getBinColsMinMaxCmd((yyvsp[(2) - (2)].str));;}
break;
- case 341:
-#line 960 "parser.Y"
+ case 344:
+#line 966 "parser.Y"
{fr->getBinColsDimCmd((yyvsp[(2) - (2)].str));;}
break;
- case 343:
-#line 964 "parser.Y"
+ case 346:
+#line 970 "parser.Y"
{fr->getClipScopeCmd();;}
break;
- case 344:
-#line 965 "parser.Y"
+ case 347:
+#line 971 "parser.Y"
{fr->getClipModeCmd();;}
break;
- case 346:
-#line 967 "parser.Y"
+ case 349:
+#line 973 "parser.Y"
{fr->getClipUserCmd();;}
break;
- case 348:
-#line 969 "parser.Y"
+ case 351:
+#line 975 "parser.Y"
{fr->getClipPreserveCmd();;}
break;
- case 349:
-#line 972 "parser.Y"
+ case 352:
+#line 978 "parser.Y"
{fr->getClipCmd();;}
break;
- case 350:
-#line 973 "parser.Y"
+ case 353:
+#line 979 "parser.Y"
{fr->getClipCmd((yyvsp[(1) - (1)].real));;}
break;
- case 351:
-#line 974 "parser.Y"
+ case 354:
+#line 980 "parser.Y"
{fr->getClipCmd(FrScale::MINMAX);;}
break;
- case 352:
-#line 975 "parser.Y"
+ case 355:
+#line 981 "parser.Y"
{fr->getClipCmd(FrScale::ZSCALE);;}
break;
- case 353:
-#line 976 "parser.Y"
+ case 356:
+#line 982 "parser.Y"
{fr->getClipCmd(FrScale::ZMAX);;}
break;
- case 354:
-#line 977 "parser.Y"
+ case 357:
+#line 983 "parser.Y"
{fr->getClipCmd(FrScale::USERCLIP);;}
break;
- case 355:
-#line 980 "parser.Y"
+ case 358:
+#line 986 "parser.Y"
{fr->getClipMinMaxModeCmd();;}
break;
- case 356:
-#line 981 "parser.Y"
+ case 359:
+#line 987 "parser.Y"
{fr->getClipMinMaxSampleCmd();;}
break;
- case 357:
-#line 984 "parser.Y"
+ case 360:
+#line 990 "parser.Y"
{fr->getClipZScaleContrastCmd();;}
break;
- case 358:
-#line 985 "parser.Y"
+ case 361:
+#line 991 "parser.Y"
{fr->getClipZScaleSampleCmd();;}
break;
- case 359:
-#line 986 "parser.Y"
+ case 362:
+#line 992 "parser.Y"
{fr->getClipZScaleLineCmd();;}
break;
- case 360:
-#line 989 "parser.Y"
+ case 363:
+#line 995 "parser.Y"
{fr->getColorbarCmd();;}
break;
- case 361:
-#line 990 "parser.Y"
+ case 364:
+#line 996 "parser.Y"
{fr->getColorbarTagCmd();;}
break;
- case 363:
-#line 996 "parser.Y"
+ case 366:
+#line 1002 "parser.Y"
{fr->getColorMapLevelCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 364:
-#line 998 "parser.Y"
+ case 367:
+#line 1004 "parser.Y"
{fr->getColorMapLevelCmd((yyvsp[(1) - (4)].integer),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
break;
- case 365:
-#line 1000 "parser.Y"
+ case 368:
+#line 1006 "parser.Y"
{fr->getColorMapLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;}
break;
- case 366:
-#line 1003 "parser.Y"
+ case 369:
+#line 1009 "parser.Y"
{fr->getColorScaleCmd();;}
break;
- case 368:
-#line 1005 "parser.Y"
+ case 371:
+#line 1011 "parser.Y"
{fr->getColorScaleLogCmd();;}
break;
- case 369:
-#line 1009 "parser.Y"
+ case 372:
+#line 1015 "parser.Y"
{fr->getColorScaleLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;}
break;
- case 370:
-#line 1013 "parser.Y"
+ case 373:
+#line 1019 "parser.Y"
{fr->getContourCmd((Coord::CoordSystem)(yyvsp[(1) - (2)].integer),(Coord::SkyFrame)(yyvsp[(2) - (2)].integer));;}
break;
- case 373:
-#line 1016 "parser.Y"
+ case 376:
+#line 1022 "parser.Y"
{fr->getContourColorNameCmd();;}
break;
- case 374:
-#line 1017 "parser.Y"
+ case 377:
+#line 1023 "parser.Y"
{fr->getContourDashCmd();;}
break;
- case 375:
-#line 1018 "parser.Y"
+ case 378:
+#line 1024 "parser.Y"
{fr->getContourLevelCmd();;}
break;
- case 376:
-#line 1019 "parser.Y"
+ case 379:
+#line 1025 "parser.Y"
{fr->getContourNumLevelCmd();;}
break;
- case 377:
-#line 1020 "parser.Y"
+ case 380:
+#line 1026 "parser.Y"
{fr->getContourMethodCmd();;}
break;
- case 379:
-#line 1022 "parser.Y"
+ case 382:
+#line 1028 "parser.Y"
{fr->getContourSmoothCmd();;}
break;
- case 380:
-#line 1023 "parser.Y"
+ case 383:
+#line 1029 "parser.Y"
{fr->getContourLineWidthCmd();;}
break;
- case 381:
-#line 1026 "parser.Y"
+ case 384:
+#line 1032 "parser.Y"
{fr->getContourAuxColorNameCmd();;}
break;
- case 382:
-#line 1027 "parser.Y"
+ case 385:
+#line 1033 "parser.Y"
{fr->getContourAuxDashCmd();;}
break;
- case 383:
-#line 1028 "parser.Y"
+ case 386:
+#line 1034 "parser.Y"
{fr->getContourAuxLineWidthCmd();;}
break;
- case 384:
-#line 1031 "parser.Y"
+ case 387:
+#line 1037 "parser.Y"
{fr->getContourClipCmd();;}
break;
- case 385:
-#line 1032 "parser.Y"
+ case 388:
+#line 1038 "parser.Y"
{fr->getContourClipModeCmd();;}
break;
- case 386:
-#line 1035 "parser.Y"
+ case 389:
+#line 1041 "parser.Y"
{fr->getContourScaleCmd();;}
break;
- case 387:
-#line 1036 "parser.Y"
+ case 390:
+#line 1042 "parser.Y"
{fr->getContourScaleLogCmd();;}
break;
- case 388:
-#line 1040 "parser.Y"
+ case 391:
+#line 1046 "parser.Y"
{fr->getCoordCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer),
(Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;}
break;
- case 389:
-#line 1043 "parser.Y"
+ case 392:
+#line 1049 "parser.Y"
{
// backward compatibility
fr->getCoordCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer),
@@ -6500,1231 +6500,1231 @@ yyreduce:
;}
break;
- case 390:
-#line 1049 "parser.Y"
+ case 393:
+#line 1055 "parser.Y"
{fr->getCoordFromRefCmd((yyvsp[(1) - (3)].real), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 391:
-#line 1051 "parser.Y"
+ case 394:
+#line 1057 "parser.Y"
{fr->getCoordFromRefCmd((yyvsp[(2) - (4)].real), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;}
break;
- case 392:
-#line 1053 "parser.Y"
+ case 395:
+#line 1059 "parser.Y"
{fr->getCoordToRefCmd((yyvsp[(2) - (4)].real), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;}
break;
- case 393:
-#line 1057 "parser.Y"
+ case 396:
+#line 1063 "parser.Y"
{fr->getCropCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
break;
- case 394:
-#line 1059 "parser.Y"
+ case 397:
+#line 1065 "parser.Y"
{fr->getCropCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (6)].integer), (Coord::SkyFrame)(yyvsp[(3) - (6)].integer), (Coord::SkyFormat)(yyvsp[(4) - (6)].integer),
(Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 395:
-#line 1061 "parser.Y"
+ case 398:
+#line 1067 "parser.Y"
{fr->getCrop3dCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 396:
-#line 1064 "parser.Y"
+ case 399:
+#line 1070 "parser.Y"
{fr->getCrosshairCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;}
break;
- case 397:
-#line 1066 "parser.Y"
+ case 400:
+#line 1072 "parser.Y"
{fr->getCrosshairCmd((Coord::CoordSystem)(yyvsp[(1) - (4)].integer), (Coord::SkyFrame)(yyvsp[(2) - (4)].integer), (Coord::SkyFormat)(yyvsp[(3) - (4)].integer),
(Base::Precision)(yyvsp[(4) - (4)].integer));}
break;
- case 398:
-#line 1068 "parser.Y"
+ case 401:
+#line 1074 "parser.Y"
{fr->getCrosshairStatusCmd();;}
break;
- case 399:
-#line 1071 "parser.Y"
+ case 402:
+#line 1077 "parser.Y"
{fr->getCursorCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;}
break;
- case 400:
-#line 1073 "parser.Y"
+ case 403:
+#line 1079 "parser.Y"
{fr->getCursorCmd((Coord::CoordSystem)(yyvsp[(1) - (4)].integer), (Coord::SkyFrame)(yyvsp[(2) - (4)].integer), (Coord::SkyFormat)(yyvsp[(3) - (4)].integer),
(Base::Precision)(yyvsp[(4) - (4)].integer));;}
break;
- case 401:
-#line 1078 "parser.Y"
+ case 404:
+#line 1084 "parser.Y"
{fr->getDataValuesCmd(1, Vector((yyvsp[(3) - (6)].vector)),
(Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), (yyvsp[(6) - (6)].str));;}
break;
- case 402:
-#line 1081 "parser.Y"
+ case 405:
+#line 1087 "parser.Y"
{fr->getDataValuesCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].vector)),
(Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), Vector((yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].real)), (yyvsp[(7) - (7)].str));;}
break;
- case 403:
-#line 1084 "parser.Y"
+ case 406:
+#line 1090 "parser.Y"
{fr->getDataValuesCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),(Coord::InternalSystem)(yyvsp[(1) - (5)].integer),
Vector((yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer)));;}
break;
- case 404:
-#line 1088 "parser.Y"
+ case 407:
+#line 1094 "parser.Y"
{fr->getInfoCmd((yyvsp[(1) - (1)].str));;}
break;
- case 405:
-#line 1089 "parser.Y"
+ case 408:
+#line 1095 "parser.Y"
{fr->getInfoClipCmd();;}
break;
- case 406:
-#line 1091 "parser.Y"
+ case 409:
+#line 1097 "parser.Y"
{fr->getInfoCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)), (Coord::InternalSystem)(yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;}
break;
- case 407:
-#line 1094 "parser.Y"
+ case 410:
+#line 1100 "parser.Y"
{fr->iisGetCmd((char*)(yyvsp[(1) - (5)].ptr),(yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
break;
- case 408:
-#line 1095 "parser.Y"
+ case 411:
+#line 1101 "parser.Y"
{fr->iisGetCursorCmd();;}
break;
- case 409:
-#line 1096 "parser.Y"
+ case 412:
+#line 1102 "parser.Y"
{fr->getWidthCmd();;}
break;
- case 410:
-#line 1097 "parser.Y"
+ case 413:
+#line 1103 "parser.Y"
{fr->getHeightCmd();;}
break;
- case 412:
-#line 1101 "parser.Y"
+ case 415:
+#line 1107 "parser.Y"
{fr->iisGetFileNameCmd();;}
break;
- case 413:
-#line 1102 "parser.Y"
+ case 416:
+#line 1108 "parser.Y"
{fr->iisGetFileNameCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 414:
-#line 1103 "parser.Y"
+ case 417:
+#line 1109 "parser.Y"
{fr->iisGetFileNameCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 415:
-#line 1106 "parser.Y"
+ case 418:
+#line 1112 "parser.Y"
{fr->getFitsNAxesCmd();;}
break;
- case 416:
-#line 1108 "parser.Y"
+ case 419:
+#line 1114 "parser.Y"
{fr->getFitsCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (5)].integer),(Coord::SkyFrame)(yyvsp[(3) - (5)].integer),(Coord::SkyFormat)(yyvsp[(4) - (5)].integer),
(Base::Precision)(yyvsp[(5) - (5)].integer));;}
break;
- case 417:
-#line 1110 "parser.Y"
+ case 420:
+#line 1116 "parser.Y"
{fr->getFitsCountCmd();;}
break;
- case 419:
-#line 1112 "parser.Y"
+ case 422:
+#line 1118 "parser.Y"
{fr->getBitpixCmd();;}
break;
- case 420:
-#line 1114 "parser.Y"
+ case 423:
+#line 1120 "parser.Y"
{fr->getFitsExtCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;}
break;
- case 423:
-#line 1117 "parser.Y"
+ case 426:
+#line 1123 "parser.Y"
{fr->getHeightCmd();;}
break;
- case 424:
-#line 1118 "parser.Y"
+ case 427:
+#line 1124 "parser.Y"
{fr->getFitsObjectNameCmd();;}
break;
- case 425:
-#line 1119 "parser.Y"
+ case 428:
+#line 1125 "parser.Y"
{fr->getFitsSizeCmd();;}
break;
- case 426:
-#line 1121 "parser.Y"
+ case 429:
+#line 1127 "parser.Y"
{fr->getFitsSizeCmd((Coord::CoordSystem)(yyvsp[(2) - (5)].integer),(Coord::SkyFrame)(yyvsp[(3) - (5)].integer),(Coord::SkyDist)(yyvsp[(4) - (5)].integer),
(Base::Precision)(yyvsp[(5) - (5)].integer));;}
break;
- case 428:
-#line 1124 "parser.Y"
+ case 431:
+#line 1130 "parser.Y"
{fr->getWidthCmd();;}
break;
- case 429:
-#line 1127 "parser.Y"
+ case 432:
+#line 1133 "parser.Y"
{fr->getFitsHeaderCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 430:
-#line 1128 "parser.Y"
+ case 433:
+#line 1134 "parser.Y"
{fr->getFitsHeaderKeywordCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 431:
-#line 1129 "parser.Y"
+ case 434:
+#line 1135 "parser.Y"
{fr->getFitsHeaderWCSCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 432:
-#line 1132 "parser.Y"
+ case 435:
+#line 1138 "parser.Y"
{fr->getFitsDepthCmd(2);;}
break;
- case 433:
-#line 1133 "parser.Y"
+ case 436:
+#line 1139 "parser.Y"
{fr->getFitsDepthCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 434:
-#line 1137 "parser.Y"
+ case 437:
+#line 1143 "parser.Y"
{fr->getFitsFileNameCmd((Base::FileNameType)(yyvsp[(1) - (1)].integer));;}
break;
- case 435:
-#line 1139 "parser.Y"
+ case 438:
+#line 1145 "parser.Y"
{fr->getFitsFileNameCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer),
(Base::FileNameType)(yyvsp[(1) - (4)].integer));;}
break;
- case 436:
-#line 1142 "parser.Y"
+ case 439:
+#line 1148 "parser.Y"
{fr->getFitsFileNameCmd((yyvsp[(2) - (2)].integer), (Base::FileNameType)(yyvsp[(1) - (2)].integer));;}
break;
- case 437:
-#line 1145 "parser.Y"
+ case 440:
+#line 1151 "parser.Y"
{fr->getFitsSliceCmd(2);;}
break;
- case 438:
-#line 1146 "parser.Y"
+ case 441:
+#line 1152 "parser.Y"
{fr->getFitsSliceCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 439:
-#line 1149 "parser.Y"
+ case 442:
+#line 1155 "parser.Y"
{fr->getGridCmd();;}
break;
- case 440:
-#line 1150 "parser.Y"
+ case 443:
+#line 1156 "parser.Y"
{fr->getGridOptionCmd();;}
break;
- case 441:
-#line 1153 "parser.Y"
+ case 444:
+#line 1159 "parser.Y"
{fr->getMaskColorCmd();;}
break;
- case 442:
-#line 1154 "parser.Y"
+ case 445:
+#line 1160 "parser.Y"
{fr->getMaskMarkCmd();;}
break;
- case 443:
-#line 1155 "parser.Y"
+ case 446:
+#line 1161 "parser.Y"
{fr->getMaskTransparencyCmd();;}
break;
- case 444:
-#line 1158 "parser.Y"
+ case 447:
+#line 1164 "parser.Y"
{fr->getPanPreserveCmd();;}
break;
- case 445:
-#line 1161 "parser.Y"
+ case 448:
+#line 1167 "parser.Y"
{fr->getRGBChannelCmd();;}
break;
- case 446:
-#line 1162 "parser.Y"
+ case 449:
+#line 1168 "parser.Y"
{fr->getRGBSystemCmd();;}
break;
- case 447:
-#line 1163 "parser.Y"
+ case 450:
+#line 1169 "parser.Y"
{fr->getRGBViewCmd();;}
break;
- case 448:
-#line 1166 "parser.Y"
+ case 451:
+#line 1172 "parser.Y"
{fr->getRotateCmd((Base::Precision)(yyvsp[(1) - (1)].integer));;}
break;
- case 449:
-#line 1169 "parser.Y"
+ case 452:
+#line 1175 "parser.Y"
{fr->getSmoothFunctionCmd();;}
break;
- case 450:
-#line 1170 "parser.Y"
+ case 453:
+#line 1176 "parser.Y"
{fr->getSmoothRadiusCmd();;}
break;
- case 451:
-#line 1173 "parser.Y"
- {fr->get3dViewCmd();;}
+ case 456:
+#line 1181 "parser.Y"
+ {fr->get3dRenderMethodCmd();;}
break;
- case 453:
-#line 1175 "parser.Y"
- {fr->get3dRenderMethodCmd();;}
+ case 457:
+#line 1184 "parser.Y"
+ {fr->get3dHighliteCmd();;}
break;
- case 454:
-#line 1176 "parser.Y"
- {fr->get3dThreadsCmd();;}
+ case 458:
+#line 1185 "parser.Y"
+ {fr->get3dHighliteColorCmd();;}
break;
- case 455:
-#line 1179 "parser.Y"
- {fr->get3dHighliteCmd();;}
+ case 459:
+#line 1188 "parser.Y"
+ {fr->get3dViewCmd();;}
break;
- case 456:
-#line 1180 "parser.Y"
- {fr->get3dHighliteColorCmd();;}
+ case 460:
+#line 1189 "parser.Y"
+ {fr->get3dViewPointCmd();;}
break;
- case 457:
-#line 1183 "parser.Y"
+ case 461:
+#line 1192 "parser.Y"
{fr->getWCSCmd();;}
break;
- case 459:
-#line 1185 "parser.Y"
+ case 463:
+#line 1194 "parser.Y"
{fr->getWCSNameCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 460:
-#line 1188 "parser.Y"
+ case 464:
+#line 1197 "parser.Y"
{fr->getWCSAlignCmd();;}
break;
- case 461:
-#line 1189 "parser.Y"
+ case 465:
+#line 1198 "parser.Y"
{fr->getWCSAlignPointerCmd();;}
break;
- case 462:
-#line 1192 "parser.Y"
+ case 466:
+#line 1201 "parser.Y"
{fr->getZoomCmd((Base::Precision)(yyvsp[(1) - (1)].integer));;}
break;
- case 463:
-#line 1196 "parser.Y"
+ case 467:
+#line 1205 "parser.Y"
{fr->gridCmd((Coord::CoordSystem)(yyvsp[(2) - (6)].integer), (Coord::SkyFrame)(yyvsp[(3) - (6)].integer), (Coord::SkyFormat)(yyvsp[(4) - (6)].integer),
(Grid2d::GridType)(yyvsp[(5) - (6)].integer), (yyvsp[(6) - (6)].str));;}
break;
- case 464:
-#line 1198 "parser.Y"
+ case 468:
+#line 1207 "parser.Y"
{fr->gridDeleteCmd();;}
break;
- case 465:
-#line 1201 "parser.Y"
+ case 469:
+#line 1210 "parser.Y"
{(yyval.integer)=Grid2d::ANALYSIS;;}
break;
- case 466:
-#line 1202 "parser.Y"
+ case 470:
+#line 1211 "parser.Y"
{(yyval.integer)=Grid2d::PUBLICATION;;}
break;
- case 467:
-#line 1205 "parser.Y"
+ case 471:
+#line 1214 "parser.Y"
{fr->hasAmplifierCmd();;}
break;
- case 470:
-#line 1208 "parser.Y"
+ case 474:
+#line 1217 "parser.Y"
{fr->hasCropCmd();;}
break;
- case 471:
-#line 1209 "parser.Y"
+ case 475:
+#line 1218 "parser.Y"
{fr->hasDATAMINCmd();;}
break;
- case 472:
-#line 1210 "parser.Y"
+ case 476:
+#line 1219 "parser.Y"
{fr->hasDATASECCmd();;}
break;
- case 473:
-#line 1211 "parser.Y"
+ case 477:
+#line 1220 "parser.Y"
{fr->hasDetectorCmd();;}
break;
- case 475:
-#line 1213 "parser.Y"
+ case 479:
+#line 1222 "parser.Y"
{fr->hasGridCmd();;}
break;
- case 476:
-#line 1214 "parser.Y"
+ case 480:
+#line 1223 "parser.Y"
{fr->hasIISCmd();;}
break;
- case 477:
-#line 1215 "parser.Y"
+ case 481:
+#line 1224 "parser.Y"
{fr->hasIRAFMINCmd();;}
break;
- case 479:
-#line 1217 "parser.Y"
+ case 483:
+#line 1226 "parser.Y"
{fr->hasPhysicalCmd();;}
break;
- case 480:
-#line 1218 "parser.Y"
+ case 484:
+#line 1227 "parser.Y"
{fr->hasSmoothCmd();;}
break;
- case 481:
-#line 1219 "parser.Y"
+ case 485:
+#line 1228 "parser.Y"
{fr->hasSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 483:
-#line 1223 "parser.Y"
+ case 487:
+#line 1232 "parser.Y"
{fr->hasBinColCmd((yyvsp[(2) - (2)].str));;}
break;
- case 484:
-#line 1226 "parser.Y"
+ case 488:
+#line 1235 "parser.Y"
{fr->hasContourCmd();;}
break;
- case 485:
-#line 1227 "parser.Y"
+ case 489:
+#line 1236 "parser.Y"
{fr->hasContourAuxCmd();;}
break;
- case 486:
-#line 1230 "parser.Y"
+ case 490:
+#line 1239 "parser.Y"
{fr->hasFitsCmd();;}
break;
- case 487:
-#line 1231 "parser.Y"
+ case 491:
+#line 1240 "parser.Y"
{fr->hasFitsBinCmd();;}
break;
- case 488:
-#line 1232 "parser.Y"
+ case 492:
+#line 1241 "parser.Y"
{fr->hasFitsCubeCmd();;}
break;
- case 489:
-#line 1233 "parser.Y"
+ case 493:
+#line 1242 "parser.Y"
{fr->hasFitsMosaicCmd();;}
break;
- case 490:
-#line 1236 "parser.Y"
+ case 494:
+#line 1245 "parser.Y"
{fr->hasMarkerHighlitedCmd();;}
break;
- case 491:
-#line 1237 "parser.Y"
+ case 495:
+#line 1246 "parser.Y"
{fr->hasMarkerSelectedCmd();;}
break;
- case 492:
-#line 1238 "parser.Y"
+ case 496:
+#line 1247 "parser.Y"
{fr->hasMarkerPasteCmd();;}
break;
- case 493:
-#line 1239 "parser.Y"
+ case 497:
+#line 1248 "parser.Y"
{fr->hasMarkerUndoCmd();;}
break;
- case 494:
-#line 1242 "parser.Y"
+ case 498:
+#line 1251 "parser.Y"
{fr->hasWCSCmd((Coord::CoordSystem)(yyvsp[(1) - (1)].integer));;}
break;
- case 495:
-#line 1243 "parser.Y"
+ case 499:
+#line 1252 "parser.Y"
{fr->hasWCSEquCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 496:
-#line 1244 "parser.Y"
+ case 500:
+#line 1253 "parser.Y"
{fr->hasWCSCelCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 497:
-#line 1245 "parser.Y"
+ case 501:
+#line 1254 "parser.Y"
{fr->hasWCSAltCmd();;}
break;
- case 498:
-#line 1246 "parser.Y"
+ case 502:
+#line 1255 "parser.Y"
{fr->hasWCSxCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 499:
-#line 1249 "parser.Y"
+ case 503:
+#line 1258 "parser.Y"
{fr->iisCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 500:
-#line 1250 "parser.Y"
+ case 504:
+#line 1259 "parser.Y"
{fr->iisEraseCmd();;}
break;
- case 501:
-#line 1251 "parser.Y"
+ case 505:
+#line 1260 "parser.Y"
{fr->iisMessageCmd((yyvsp[(2) - (2)].str));;}
break;
- case 504:
-#line 1255 "parser.Y"
+ case 508:
+#line 1264 "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));;}
break;
- case 505:
-#line 1256 "parser.Y"
+ case 509:
+#line 1265 "parser.Y"
{fr->iisUpdateCmd();;}
break;
- case 506:
-#line 1259 "parser.Y"
+ case 510:
+#line 1268 "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 507:
-#line 1262 "parser.Y"
+ case 511:
+#line 1271 "parser.Y"
{fr->iisSetFileNameCmd((yyvsp[(1) - (1)].str));;}
break;
- case 508:
-#line 1263 "parser.Y"
+ case 512:
+#line 1272 "parser.Y"
{fr->iisSetFileNameCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].integer));;}
break;
- case 509:
-#line 1267 "parser.Y"
+ case 513:
+#line 1276 "parser.Y"
{fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),Coord::CANVAS);;}
break;
- case 510:
-#line 1269 "parser.Y"
+ case 514:
+#line 1278 "parser.Y"
{fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),(Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
break;
- case 511:
-#line 1270 "parser.Y"
+ case 515:
+#line 1279 "parser.Y"
{fr->iisCursorModeCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 516:
-#line 1280 "parser.Y"
+ case 520:
+#line 1289 "parser.Y"
{fr->loadArrAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 517:
-#line 1282 "parser.Y"
+ case 521:
+#line 1291 "parser.Y"
{fr->loadArrAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 518:
-#line 1284 "parser.Y"
+ case 522:
+#line 1293 "parser.Y"
{fr->loadArrChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 519:
-#line 1286 "parser.Y"
+ case 523:
+#line 1295 "parser.Y"
{fr->loadArrMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;}
break;
- case 520:
-#line 1288 "parser.Y"
+ case 524:
+#line 1297 "parser.Y"
{fr->loadArrMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;}
break;
- case 521:
-#line 1290 "parser.Y"
+ case 525:
+#line 1299 "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 522:
-#line 1293 "parser.Y"
+ case 526:
+#line 1302 "parser.Y"
{fr->loadArrSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 523:
-#line 1295 "parser.Y"
+ case 527:
+#line 1304 "parser.Y"
{fr->loadArrSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 524:
-#line 1297 "parser.Y"
+ case 528:
+#line 1306 "parser.Y"
{fr->loadArrVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 526:
-#line 1301 "parser.Y"
+ case 530:
+#line 1310 "parser.Y"
{fr->loadArrRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 527:
-#line 1302 "parser.Y"
+ case 531:
+#line 1311 "parser.Y"
{fr->loadArrRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 528:
-#line 1303 "parser.Y"
+ case 532:
+#line 1312 "parser.Y"
{fr->loadArrRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 529:
-#line 1304 "parser.Y"
+ case 533:
+#line 1313 "parser.Y"
{fr->loadArrRGBCubeMMapCmd((yyvsp[(1) - (2)].str));;}
break;
- case 530:
-#line 1305 "parser.Y"
+ case 534:
+#line 1314 "parser.Y"
{fr->loadArrRGBCubeMMapIncrCmd((yyvsp[(1) - (2)].str));;}
break;
- case 531:
-#line 1307 "parser.Y"
+ case 535:
+#line 1316 "parser.Y"
{fr->loadArrRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer), (yyvsp[(1) - (4)].str));;}
break;
- case 532:
-#line 1308 "parser.Y"
+ case 536:
+#line 1317 "parser.Y"
{fr->loadArrRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 533:
-#line 1309 "parser.Y"
+ case 537:
+#line 1318 "parser.Y"
{fr->loadArrRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 534:
-#line 1310 "parser.Y"
+ case 538:
+#line 1319 "parser.Y"
{fr->loadArrRGBCubeVarCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 535:
-#line 1314 "parser.Y"
+ case 539:
+#line 1323 "parser.Y"
{fr->loadFitsAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 536:
-#line 1316 "parser.Y"
+ case 540:
+#line 1325 "parser.Y"
{fr->loadFitsAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 537:
-#line 1318 "parser.Y"
+ case 541:
+#line 1327 "parser.Y"
{fr->loadFitsChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 538:
-#line 1320 "parser.Y"
+ case 542:
+#line 1329 "parser.Y"
{fr->loadFitsMMapCmd((yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer),
(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 539:
-#line 1323 "parser.Y"
+ case 543:
+#line 1332 "parser.Y"
{fr->loadFitsSMMapCmd((yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str),(Base::LoadMethod)(yyvsp[(4) - (5)].integer),
(Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 540:
-#line 1326 "parser.Y"
+ case 544:
+#line 1335 "parser.Y"
{fr->loadFitsMMapIncrCmd((yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer),
(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 541:
-#line 1329 "parser.Y"
+ case 545:
+#line 1338 "parser.Y"
{fr->loadFitsShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str),
(Base::LoadMethod)(yyvsp[(5) - (6)].integer),(Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 542:
-#line 1332 "parser.Y"
+ case 546:
+#line 1341 "parser.Y"
{fr->loadFitsSShareCmd((Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str),
(Base::LoadMethod)(yyvsp[(6) - (7)].integer),(Base::LayerType)(yyvsp[(7) - (7)].integer));;}
break;
- case 543:
-#line 1335 "parser.Y"
+ case 547:
+#line 1344 "parser.Y"
{fr->loadFitsSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 544:
-#line 1337 "parser.Y"
+ case 548:
+#line 1346 "parser.Y"
{fr->loadFitsSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 545:
-#line 1339 "parser.Y"
+ case 549:
+#line 1348 "parser.Y"
{fr->loadFitsVarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer),
(Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 550:
-#line 1348 "parser.Y"
+ case 554:
+#line 1357 "parser.Y"
{fr->loadSliceAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 551:
-#line 1350 "parser.Y"
+ case 555:
+#line 1359 "parser.Y"
{fr->loadSliceAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 552:
-#line 1352 "parser.Y"
+ case 556:
+#line 1361 "parser.Y"
{fr->loadSliceChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 553:
-#line 1354 "parser.Y"
+ case 557:
+#line 1363 "parser.Y"
{fr->loadSliceMMapCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 554:
-#line 1356 "parser.Y"
+ case 558:
+#line 1365 "parser.Y"
{fr->loadSliceSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 555:
-#line 1358 "parser.Y"
+ case 559:
+#line 1367 "parser.Y"
{fr->loadSliceMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 556:
-#line 1360 "parser.Y"
+ case 560:
+#line 1369 "parser.Y"
{fr->loadSliceShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LoadMethod)(yyvsp[(5) - (5)].integer));;}
break;
- case 557:
-#line 1362 "parser.Y"
+ case 561:
+#line 1371 "parser.Y"
{fr->loadSliceSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LoadMethod)(yyvsp[(6) - (6)].integer));;}
break;
- case 558:
-#line 1364 "parser.Y"
+ case 562:
+#line 1373 "parser.Y"
{fr->loadSliceSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 559:
-#line 1366 "parser.Y"
+ case 563:
+#line 1375 "parser.Y"
{fr->loadSliceSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 560:
-#line 1368 "parser.Y"
+ case 564:
+#line 1377 "parser.Y"
{fr->loadSliceVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 561:
-#line 1372 "parser.Y"
+ case 565:
+#line 1381 "parser.Y"
{fr->loadExtCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 562:
-#line 1374 "parser.Y"
+ case 566:
+#line 1383 "parser.Y"
{fr->loadExtCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 563:
-#line 1376 "parser.Y"
+ case 567:
+#line 1385 "parser.Y"
{fr->loadExtCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 564:
-#line 1378 "parser.Y"
+ case 568:
+#line 1387 "parser.Y"
{fr->loadExtCubeMMapCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 565:
-#line 1380 "parser.Y"
+ case 569:
+#line 1389 "parser.Y"
{fr->loadExtCubeMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 566:
-#line 1382 "parser.Y"
+ case 570:
+#line 1391 "parser.Y"
{fr->loadExtCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str),
(Base::LoadMethod)(yyvsp[(5) - (5)].integer));;}
break;
- case 567:
-#line 1385 "parser.Y"
+ case 571:
+#line 1394 "parser.Y"
{fr->loadExtCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 568:
-#line 1387 "parser.Y"
+ case 572:
+#line 1396 "parser.Y"
{fr->loadExtCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 569:
-#line 1389 "parser.Y"
+ case 573:
+#line 1398 "parser.Y"
{fr->loadExtCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 575:
-#line 1400 "parser.Y"
+ case 579:
+#line 1409 "parser.Y"
{fr->loadMosaicImageAllocCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 576:
-#line 1403 "parser.Y"
+ case 580:
+#line 1412 "parser.Y"
{fr->loadMosaicImageAllocGZCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 577:
-#line 1406 "parser.Y"
+ case 581:
+#line 1415 "parser.Y"
{fr->loadMosaicImageChannelCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 578:
-#line 1409 "parser.Y"
+ case 582:
+#line 1418 "parser.Y"
{fr->loadMosaicImageMMapCmd(Base::IRAF, Coord::WCS,
(yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 579:
-#line 1412 "parser.Y"
+ case 583:
+#line 1421 "parser.Y"
{fr->loadMosaicImageMMapIncrCmd(Base::IRAF, Coord::WCS,
(yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 580:
-#line 1415 "parser.Y"
+ case 584:
+#line 1424 "parser.Y"
{fr->loadMosaicImageShareCmd(Base::IRAF, Coord::WCS,
(Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LoadMethod)(yyvsp[(5) - (6)].integer),
(Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 581:
-#line 1419 "parser.Y"
+ case 585:
+#line 1428 "parser.Y"
{fr->loadMosaicImageSocketCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 582:
-#line 1422 "parser.Y"
+ case 586:
+#line 1431 "parser.Y"
{fr->loadMosaicImageSocketGZCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 583:
-#line 1425 "parser.Y"
+ case 587:
+#line 1434 "parser.Y"
{fr->loadMosaicImageVarCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 584:
-#line 1430 "parser.Y"
+ case 588:
+#line 1439 "parser.Y"
{fr->loadMosaicAllocCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 585:
-#line 1433 "parser.Y"
+ case 589:
+#line 1442 "parser.Y"
{fr->loadMosaicAllocGZCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 586:
-#line 1436 "parser.Y"
+ case 590:
+#line 1445 "parser.Y"
{fr->loadMosaicChannelCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 587:
-#line 1439 "parser.Y"
+ case 591:
+#line 1448 "parser.Y"
{fr->loadMosaicMMapCmd(Base::IRAF, Coord::WCS,
(yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 588:
-#line 1442 "parser.Y"
+ case 592:
+#line 1451 "parser.Y"
{fr->loadMosaicSMMapCmd(Base::IRAF, Coord::WCS,
(yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str),(Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 589:
-#line 1445 "parser.Y"
+ case 593:
+#line 1454 "parser.Y"
{fr->loadMosaicMMapIncrCmd(Base::IRAF, Coord::WCS,
(yyvsp[(1) - (4)].str),(Base::LoadMethod)(yyvsp[(3) - (4)].integer), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 590:
-#line 1448 "parser.Y"
+ case 594:
+#line 1457 "parser.Y"
{fr->loadMosaicShareCmd(Base::IRAF, Coord::WCS,
(Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LoadMethod)(yyvsp[(5) - (6)].integer),
(Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 591:
-#line 1452 "parser.Y"
+ case 595:
+#line 1461 "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::LoadMethod)(yyvsp[(6) - (7)].integer),
(Base::LayerType)(yyvsp[(7) - (7)].integer));;}
break;
- case 592:
-#line 1456 "parser.Y"
+ case 596:
+#line 1465 "parser.Y"
{fr->loadMosaicSocketCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 593:
-#line 1459 "parser.Y"
+ case 597:
+#line 1468 "parser.Y"
{fr->loadMosaicSocketGZCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;}
break;
- case 594:
-#line 1462 "parser.Y"
+ case 598:
+#line 1471 "parser.Y"
{fr->loadMosaicVarCmd(Base::IRAF, Coord::WCS,
(yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 595:
-#line 1467 "parser.Y"
+ case 599:
+#line 1476 "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 596:
-#line 1470 "parser.Y"
+ case 600:
+#line 1479 "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 597:
-#line 1473 "parser.Y"
+ case 601:
+#line 1482 "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 598:
-#line 1476 "parser.Y"
+ case 602:
+#line 1485 "parser.Y"
{fr->loadMosaicImageMMapCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
(yyvsp[(2) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 599:
-#line 1479 "parser.Y"
+ case 603:
+#line 1488 "parser.Y"
{fr->loadMosaicImageMMapIncrCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
(yyvsp[(2) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 600:
-#line 1482 "parser.Y"
+ case 604:
+#line 1491 "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::LoadMethod)(yyvsp[(6) - (7)].integer),
(Base::LayerType)(yyvsp[(7) - (7)].integer));;}
break;
- case 601:
-#line 1486 "parser.Y"
+ case 605:
+#line 1495 "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 602:
-#line 1489 "parser.Y"
+ case 606:
+#line 1498 "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 603:
-#line 1492 "parser.Y"
+ case 607:
+#line 1501 "parser.Y"
{fr->loadMosaicImageVarCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
(yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LoadMethod)(yyvsp[(5) - (6)].integer), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 604:
-#line 1497 "parser.Y"
+ case 608:
+#line 1506 "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 605:
-#line 1500 "parser.Y"
+ case 609:
+#line 1509 "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 606:
-#line 1503 "parser.Y"
+ case 610:
+#line 1512 "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 607:
-#line 1506 "parser.Y"
+ case 611:
+#line 1515 "parser.Y"
{fr->loadMosaicMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
(yyvsp[(2) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 608:
-#line 1509 "parser.Y"
+ case 612:
+#line 1518 "parser.Y"
{fr->loadMosaicSMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
(yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (Base::LoadMethod)(yyvsp[(5) - (6)].integer), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 609:
-#line 1512 "parser.Y"
+ case 613:
+#line 1521 "parser.Y"
{fr->loadMosaicMMapIncrCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer),
(yyvsp[(2) - (5)].str), (Base::LoadMethod)(yyvsp[(4) - (5)].integer), (Base::LayerType)(yyvsp[(5) - (5)].integer));;}
break;
- case 610:
-#line 1515 "parser.Y"
+ case 614:
+#line 1524 "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::LoadMethod)(yyvsp[(6) - (7)].integer),
(Base::LayerType)(yyvsp[(7) - (7)].integer));;}
break;
- case 611:
-#line 1519 "parser.Y"
+ case 615:
+#line 1528 "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::LoadMethod)(yyvsp[(7) - (8)].integer),
(Base::LayerType)(yyvsp[(8) - (8)].integer));;}
break;
- case 612:
-#line 1523 "parser.Y"
+ case 616:
+#line 1532 "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 613:
-#line 1526 "parser.Y"
+ case 617:
+#line 1535 "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 614:
-#line 1529 "parser.Y"
+ case 618:
+#line 1538 "parser.Y"
{fr->loadMosaicVarCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer),
(yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LoadMethod)(yyvsp[(5) - (6)].integer), (Base::LayerType)(yyvsp[(6) - (6)].integer));;}
break;
- case 615:
-#line 1534 "parser.Y"
+ case 619:
+#line 1543 "parser.Y"
{fr->loadMosaicImageWFPC2AllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 616:
-#line 1536 "parser.Y"
+ case 620:
+#line 1545 "parser.Y"
{fr->loadMosaicImageWFPC2AllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 617:
-#line 1538 "parser.Y"
+ case 621:
+#line 1547 "parser.Y"
{fr->loadMosaicImageWFPC2ChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 618:
-#line 1540 "parser.Y"
+ case 622:
+#line 1549 "parser.Y"
{fr->loadMosaicImageWFPC2MMapCmd((yyvsp[(1) - (3)].str),(Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 619:
-#line 1542 "parser.Y"
+ case 623:
+#line 1551 "parser.Y"
{fr->loadMosaicImageWFPC2MMapIncrCmd((yyvsp[(1) - (3)].str),(Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 620:
-#line 1544 "parser.Y"
+ case 624:
+#line 1553 "parser.Y"
{fr->loadMosaicImageWFPC2ShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer),
(yyvsp[(1) - (5)].str), (Base::LoadMethod)(yyvsp[(5) - (5)].integer));;}
break;
- case 621:
-#line 1547 "parser.Y"
+ case 625:
+#line 1556 "parser.Y"
{fr->loadMosaicImageWFPC2SocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 622:
-#line 1549 "parser.Y"
+ case 626:
+#line 1558 "parser.Y"
{fr->loadMosaicImageWFPC2SocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 623:
-#line 1551 "parser.Y"
+ case 627:
+#line 1560 "parser.Y"
{fr->loadMosaicImageWFPC2VarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 626:
-#line 1557 "parser.Y"
+ case 630:
+#line 1566 "parser.Y"
{fr->loadRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 627:
-#line 1558 "parser.Y"
+ case 631:
+#line 1567 "parser.Y"
{fr->loadRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 628:
-#line 1559 "parser.Y"
+ case 632:
+#line 1568 "parser.Y"
{fr->loadRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 629:
-#line 1561 "parser.Y"
+ case 633:
+#line 1570 "parser.Y"
{fr->loadRGBCubeMMapCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 630:
-#line 1563 "parser.Y"
+ case 634:
+#line 1572 "parser.Y"
{fr->loadRGBCubeSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 631:
-#line 1565 "parser.Y"
+ case 635:
+#line 1574 "parser.Y"
{fr->loadRGBCubeMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 632:
-#line 1567 "parser.Y"
+ case 636:
+#line 1576 "parser.Y"
{fr->loadRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str),
(Base::LoadMethod)(yyvsp[(5) - (5)].integer));;}
break;
- case 633:
-#line 1570 "parser.Y"
+ case 637:
+#line 1579 "parser.Y"
{fr->loadRGBCubeSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str),
(Base::LoadMethod)(yyvsp[(6) - (6)].integer));;}
break;
- case 634:
-#line 1572 "parser.Y"
+ case 638:
+#line 1581 "parser.Y"
{fr->loadRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 635:
-#line 1573 "parser.Y"
+ case 639:
+#line 1582 "parser.Y"
{fr->loadRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 636:
-#line 1575 "parser.Y"
+ case 640:
+#line 1584 "parser.Y"
{fr->loadRGBCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 637:
-#line 1578 "parser.Y"
+ case 641:
+#line 1587 "parser.Y"
{fr->loadRGBImageAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 638:
-#line 1579 "parser.Y"
+ case 642:
+#line 1588 "parser.Y"
{fr->loadRGBImageAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 639:
-#line 1580 "parser.Y"
+ case 643:
+#line 1589 "parser.Y"
{fr->loadRGBImageChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;}
break;
- case 640:
-#line 1582 "parser.Y"
+ case 644:
+#line 1591 "parser.Y"
{fr->loadRGBImageMMapCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 641:
-#line 1584 "parser.Y"
+ case 645:
+#line 1593 "parser.Y"
{fr->loadRGBImageMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LoadMethod)(yyvsp[(3) - (3)].integer));;}
break;
- case 642:
-#line 1586 "parser.Y"
+ case 646:
+#line 1595 "parser.Y"
{fr->loadRGBImageShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str),
(Base::LoadMethod)(yyvsp[(5) - (5)].integer));;}
break;
- case 643:
-#line 1588 "parser.Y"
+ case 647:
+#line 1597 "parser.Y"
{fr->loadRGBImageSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 644:
-#line 1589 "parser.Y"
+ case 648:
+#line 1598 "parser.Y"
{fr->loadRGBImageSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;}
break;
- case 645:
-#line 1591 "parser.Y"
+ case 649:
+#line 1600 "parser.Y"
{fr->loadRGBImageVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LoadMethod)(yyvsp[(4) - (4)].integer));;}
break;
- case 646:
-#line 1594 "parser.Y"
+ case 650:
+#line 1603 "parser.Y"
{fr->loadPhotoCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));;}
break;
- case 647:
-#line 1595 "parser.Y"
+ case 651:
+#line 1604 "parser.Y"
{fr->loadSlicePhotoCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;}
break;
- case 648:
-#line 1598 "parser.Y"
+ case 652:
+#line 1607 "parser.Y"
{fr->loadIncrDataCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;}
break;
- case 649:
-#line 1599 "parser.Y"
+ case 653:
+#line 1608 "parser.Y"
{fr->loadIncrMinMaxCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;}
break;
- case 650:
-#line 1600 "parser.Y"
+ case 654:
+#line 1609 "parser.Y"
{fr->loadIncrEndCmd();;}
break;
- case 651:
-#line 1603 "parser.Y"
+ case 655:
+#line 1612 "parser.Y"
{
#ifdef _MACOSX
fr->macosxPrintCmd();
@@ -7732,960 +7732,960 @@ yyreduce:
;}
break;
- case 652:
-#line 1610 "parser.Y"
+ case 656:
+#line 1619 "parser.Y"
{fr->magnifierCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 653:
-#line 1611 "parser.Y"
+ case 657:
+#line 1620 "parser.Y"
{fr->magnifierGraphicsCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 654:
-#line 1612 "parser.Y"
+ case 658:
+#line 1621 "parser.Y"
{fr->magnifierCursorCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 655:
-#line 1613 "parser.Y"
+ case 659:
+#line 1622 "parser.Y"
{fr->magnifierColorCmd((yyvsp[(2) - (2)].str));;}
break;
- case 656:
-#line 1614 "parser.Y"
+ case 660:
+#line 1623 "parser.Y"
{fr->magnifierCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 657:
-#line 1615 "parser.Y"
+ case 661:
+#line 1624 "parser.Y"
{fr->updateMagnifierCmd(Vector((yyvsp[(2) - (3)].real), (yyvsp[(3) - (3)].real)));;}
break;
- case 658:
-#line 1616 "parser.Y"
+ case 662:
+#line 1625 "parser.Y"
{fr->magnifierZoomCmd((yyvsp[(2) - (2)].real));;}
break;
- case 660:
-#line 1620 "parser.Y"
+ case 664:
+#line 1629 "parser.Y"
{fr->markerColorCmd((yyvsp[(2) - (2)].str));;}
break;
- case 661:
-#line 1621 "parser.Y"
+ case 665:
+#line 1630 "parser.Y"
{fr->markerCopyCmd();;}
break;
- case 662:
-#line 1623 "parser.Y"
+ case 666:
+#line 1632 "parser.Y"
{fr->markerCommandCmd((Base::MarkerFormat)(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 663:
-#line 1625 "parser.Y"
+ case 667:
+#line 1634 "parser.Y"
{fr->markerCommandVarCmd((Base::MarkerFormat)(yyvsp[(2) - (4)].integer),(yyvsp[(4) - (4)].str));;}
break;
- case 664:
-#line 1626 "parser.Y"
+ case 668:
+#line 1635 "parser.Y"
{fr->markerCompositeDeleteCmd();;}
break;
- case 665:
-#line 1627 "parser.Y"
+ case 669:
+#line 1636 "parser.Y"
{maperr =0;;}
break;
- case 667:
-#line 1628 "parser.Y"
+ case 671:
+#line 1637 "parser.Y"
{fr->markerCutCmd();;}
break;
- case 668:
-#line 1629 "parser.Y"
+ case 672:
+#line 1638 "parser.Y"
{fr->markerDeleteCmd();;}
break;
- case 669:
-#line 1630 "parser.Y"
+ case 673:
+#line 1639 "parser.Y"
{fr->markerDeleteAllCmd();;}
break;
- case 671:
-#line 1632 "parser.Y"
+ case 675:
+#line 1641 "parser.Y"
{fr->markerFontCmd((yyvsp[(2) - (2)].str));;}
break;
- case 672:
-#line 1634 "parser.Y"
+ case 676:
+#line 1643 "parser.Y"
{fr->markerHighliteAllCmd();;}
break;
- case 673:
-#line 1636 "parser.Y"
+ case 677:
+#line 1645 "parser.Y"
{fr->markerHighliteOnlyCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 674:
-#line 1638 "parser.Y"
+ case 678:
+#line 1647 "parser.Y"
{fr->markerHighliteToggleCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 675:
-#line 1641 "parser.Y"
+ case 679:
+#line 1650 "parser.Y"
{fr->markerAnalysisCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisMethod)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;}
break;
- case 676:
-#line 1643 "parser.Y"
+ case 680:
+#line 1652 "parser.Y"
{fr->markerAnalysisParamCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisParamType)(yyvsp[(4) - (4)].integer));;}
break;
- case 677:
-#line 1645 "parser.Y"
+ case 681:
+#line 1654 "parser.Y"
{fr->markerAnalysisSystemCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
break;
- case 678:
-#line 1647 "parser.Y"
+ case 682:
+#line 1656 "parser.Y"
{fr->markerAngleCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].real));;}
break;
- case 679:
-#line 1648 "parser.Y"
+ case 683:
+#line 1657 "parser.Y"
{fr->markerAngleCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].real));;}
break;
- case 680:
-#line 1650 "parser.Y"
+ case 684:
+#line 1659 "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 681:
-#line 1653 "parser.Y"
+ case 685:
+#line 1662 "parser.Y"
{fr->markerAnnulusRadiusCmd((yyvsp[(1) - (7)].integer), (yyvsp[(4) - (7)].real), (yyvsp[(5) - (7)].real), (yyvsp[(6) - (7)].integer), (Coord::InternalSystem)(yyvsp[(7) - (7)].integer));;}
break;
- case 682:
-#line 1655 "parser.Y"
+ case 686:
+#line 1664 "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::SkyDist)(yyvsp[(8) - (8)].integer));;}
break;
- case 683:
-#line 1658 "parser.Y"
+ case 687:
+#line 1667 "parser.Y"
{fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 684:
-#line 1661 "parser.Y"
+ case 688:
+#line 1670 "parser.Y"
{fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (8)].integer), Vector((yyvsp[(4) - (8)].real), (yyvsp[(5) - (8)].real)),
Vector((yyvsp[(6) - (8)].real), (yyvsp[(6) - (8)].real)*(yyvsp[(5) - (8)].real)/(yyvsp[(4) - (8)].real)), (yyvsp[(7) - (8)].integer), (Coord::InternalSystem)(yyvsp[(8) - (8)].integer));;}
break;
- case 685:
-#line 1665 "parser.Y"
+ case 689:
+#line 1674 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 686:
-#line 1668 "parser.Y"
+ case 690:
+#line 1677 "parser.Y"
{fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 687:
-#line 1671 "parser.Y"
+ case 691:
+#line 1680 "parser.Y"
{fr->markerBoxRadiusCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), (Coord::InternalSystem)(yyvsp[(6) - (6)].integer));;}
break;
- case 688:
-#line 1673 "parser.Y"
+ case 692:
+#line 1682 "parser.Y"
{fr->markerBoxRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
(Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::SkyDist)(yyvsp[(7) - (7)].integer));;}
break;
- case 689:
-#line 1676 "parser.Y"
+ case 693:
+#line 1685 "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 690:
-#line 1680 "parser.Y"
+ case 694:
+#line 1689 "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 691:
-#line 1684 "parser.Y"
+ case 695:
+#line 1693 "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 692:
-#line 1689 "parser.Y"
+ case 696:
+#line 1698 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 693:
-#line 1693 "parser.Y"
+ case 697:
+#line 1702 "parser.Y"
{fr->markerCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;}
break;
- case 694:
-#line 1695 "parser.Y"
+ case 698:
+#line 1704 "parser.Y"
{fr->markerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].real), (Coord::InternalSystem)(yyvsp[(5) - (5)].integer));;}
break;
- case 695:
-#line 1697 "parser.Y"
+ case 699:
+#line 1706 "parser.Y"
{fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 696:
-#line 1698 "parser.Y"
+ case 700:
+#line 1707 "parser.Y"
{fr->markerColorCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 697:
-#line 1700 "parser.Y"
+ case 701:
+#line 1709 "parser.Y"
{fr->markerCompassArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
break;
- case 698:
-#line 1702 "parser.Y"
+ case 702:
+#line 1711 "parser.Y"
{fr->markerCompassLabelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;}
break;
- case 699:
-#line 1704 "parser.Y"
+ case 703:
+#line 1713 "parser.Y"
{fr->markerCompassRadiusCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].real),(Coord::InternalSystem)(yyvsp[(5) - (5)].integer));;}
break;
- case 700:
-#line 1706 "parser.Y"
+ case 704:
+#line 1715 "parser.Y"
{fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 701:
-#line 1708 "parser.Y"
+ case 705:
+#line 1717 "parser.Y"
{fr->markerCompassSystemCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
break;
- case 702:
-#line 1709 "parser.Y"
+ case 706:
+#line 1718 "parser.Y"
{fr->markerCompositeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 703:
-#line 1711 "parser.Y"
+ case 707:
+#line 1720 "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 704:
-#line 1713 "parser.Y"
+ case 708:
+#line 1722 "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 705:
-#line 1716 "parser.Y"
+ case 709:
+#line 1725 "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 706:
-#line 1720 "parser.Y"
+ case 710:
+#line 1729 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 707:
-#line 1724 "parser.Y"
+ case 711:
+#line 1733 "parser.Y"
{fr->markerAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 708:
-#line 1726 "parser.Y"
+ case 712:
+#line 1735 "parser.Y"
{fr->markerBoxAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 709:
-#line 1728 "parser.Y"
+ case 713:
+#line 1737 "parser.Y"
{fr->markerBpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 710:
-#line 1730 "parser.Y"
+ case 714:
+#line 1739 "parser.Y"
{fr->markerBpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 711:
-#line 1732 "parser.Y"
+ case 715:
+#line 1741 "parser.Y"
{fr->markerEllipseAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 712:
-#line 1734 "parser.Y"
+ case 716:
+#line 1743 "parser.Y"
{fr->markerEpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 713:
-#line 1736 "parser.Y"
+ case 717:
+#line 1745 "parser.Y"
{fr->markerEpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 714:
-#line 1738 "parser.Y"
+ case 718:
+#line 1747 "parser.Y"
{fr->markerCpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 715:
-#line 1740 "parser.Y"
+ case 719:
+#line 1749 "parser.Y"
{fr->markerCpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;}
break;
- case 716:
-#line 1742 "parser.Y"
+ case 720:
+#line 1751 "parser.Y"
{fr->markerPolygonCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;}
break;
- case 717:
-#line 1744 "parser.Y"
+ case 721:
+#line 1753 "parser.Y"
{fr->markerDeleteCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 718:
-#line 1746 "parser.Y"
+ case 722:
+#line 1755 "parser.Y"
{fr->markerAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 719:
-#line 1748 "parser.Y"
+ case 723:
+#line 1757 "parser.Y"
{fr->markerBoxAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 720:
-#line 1749 "parser.Y"
+ case 724:
+#line 1758 "parser.Y"
{fr->markerBpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 721:
-#line 1751 "parser.Y"
+ case 725:
+#line 1760 "parser.Y"
{fr->markerEllipseAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 722:
-#line 1753 "parser.Y"
+ case 726:
+#line 1762 "parser.Y"
{fr->markerDeleteCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].str));;}
break;
- case 723:
-#line 1754 "parser.Y"
+ case 727:
+#line 1763 "parser.Y"
{fr->markerEpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 724:
-#line 1755 "parser.Y"
+ case 728:
+#line 1764 "parser.Y"
{fr->markerCpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 725:
-#line 1757 "parser.Y"
+ case 729:
+#line 1766 "parser.Y"
{fr->markerPolygonDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
break;
- case 726:
-#line 1758 "parser.Y"
+ case 730:
+#line 1767 "parser.Y"
{fr->markerDeleteTagCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 727:
-#line 1759 "parser.Y"
+ case 731:
+#line 1768 "parser.Y"
{fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].str));;}
break;
- case 728:
-#line 1760 "parser.Y"
+ case 732:
+#line 1769 "parser.Y"
{fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 729:
-#line 1762 "parser.Y"
+ case 733:
+#line 1771 "parser.Y"
{fr->markerEditBeginCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 730:
-#line 1764 "parser.Y"
+ case 734:
+#line 1773 "parser.Y"
{fr->markerEllipseRadiusCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(4) - (6)].real), (yyvsp[(5) - (6)].real)), (Coord::InternalSystem)(yyvsp[(6) - (6)].integer));;}
break;
- case 731:
-#line 1766 "parser.Y"
+ case 735:
+#line 1775 "parser.Y"
{fr->markerEllipseRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real), (yyvsp[(5) - (7)].real)),
(Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::SkyDist)(yyvsp[(7) - (7)].integer));;}
break;
- case 732:
-#line 1770 "parser.Y"
+ case 736:
+#line 1779 "parser.Y"
{fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (8)].integer), Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)),
Vector((yyvsp[(6) - (8)].real),(yyvsp[(6) - (8)].real)*(yyvsp[(5) - (8)].real)/(yyvsp[(4) - (8)].real)), (yyvsp[(7) - (8)].integer), (Coord::InternalSystem)(yyvsp[(8) - (8)].integer));;}
break;
- case 733:
-#line 1774 "parser.Y"
+ case 737:
+#line 1783 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 734:
-#line 1777 "parser.Y"
+ case 738:
+#line 1786 "parser.Y"
{fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),
(Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 735:
-#line 1780 "parser.Y"
+ case 739:
+#line 1789 "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 736:
-#line 1784 "parser.Y"
+ case 740:
+#line 1793 "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 737:
-#line 1788 "parser.Y"
+ case 741:
+#line 1797 "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 738:
-#line 1793 "parser.Y"
+ case 742:
+#line 1802 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 739:
-#line 1797 "parser.Y"
+ case 743:
+#line 1806 "parser.Y"
{fr->markerFontCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 740:
-#line 1798 "parser.Y"
+ case 744:
+#line 1807 "parser.Y"
{fr->markerHighliteCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 741:
-#line 1799 "parser.Y"
+ case 745:
+#line 1808 "parser.Y"
{fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 742:
-#line 1801 "parser.Y"
+ case 746:
+#line 1810 "parser.Y"
{fr->markerLineArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;}
break;
- case 743:
-#line 1803 "parser.Y"
+ case 747:
+#line 1812 "parser.Y"
{fr->markerLineCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(5) - (6)].vector)), Vector((yyvsp[(6) - (6)].vector)), (Coord::InternalSystem)(yyvsp[(4) - (6)].integer));;}
break;
- case 744:
-#line 1805 "parser.Y"
+ case 748:
+#line 1814 "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 745:
-#line 1809 "parser.Y"
+ case 749:
+#line 1818 "parser.Y"
{fr->markerMoveCmd((yyvsp[(1) - (4)].integer), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 746:
-#line 1810 "parser.Y"
+ case 750:
+#line 1819 "parser.Y"
{fr->markerFrontCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 747:
-#line 1811 "parser.Y"
+ case 751:
+#line 1820 "parser.Y"
{fr->markerBackCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 748:
-#line 1813 "parser.Y"
+ case 752:
+#line 1822 "parser.Y"
{fr->markerMoveToCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)), (Coord::InternalSystem)(yyvsp[(4) - (6)].integer));;}
break;
- case 749:
-#line 1815 "parser.Y"
+ case 753:
+#line 1824 "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 750:
-#line 1818 "parser.Y"
+ case 754:
+#line 1827 "parser.Y"
{fr->markerPolygonResetCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),(Coord::InternalSystem)(yyvsp[(6) - (6)].integer));;}
break;
- case 751:
-#line 1820 "parser.Y"
+ case 755:
+#line 1829 "parser.Y"
{fr->markerPolygonResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),
(Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::SkyDist)(yyvsp[(7) - (7)].integer));;}
break;
- case 752:
-#line 1823 "parser.Y"
+ case 756:
+#line 1832 "parser.Y"
{fr->markerPointShapeCmd((yyvsp[(1) - (4)].integer),(Point::PointShape)(yyvsp[(4) - (4)].integer));;}
break;
- case 753:
-#line 1824 "parser.Y"
+ case 757:
+#line 1833 "parser.Y"
{fr->markerPointSizeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 754:
-#line 1827 "parser.Y"
+ case 758:
+#line 1836 "parser.Y"
{fr->markerProjectionCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(4) - (6)].vector)), Vector((yyvsp[(5) - (6)].vector)),
(Coord::InternalSystem)(yyvsp[(3) - (6)].integer), (yyvsp[(6) - (6)].real));;}
break;
- case 755:
-#line 1831 "parser.Y"
+ case 759:
+#line 1840 "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::SkyDist)(yyvsp[(9) - (9)].integer));;}
break;
- case 756:
-#line 1835 "parser.Y"
+ case 760:
+#line 1844 "parser.Y"
{fr->markerPropertyCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 757:
-#line 1837 "parser.Y"
+ case 761:
+#line 1846 "parser.Y"
{fr->markerRotateBeginCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 758:
-#line 1839 "parser.Y"
+ case 762:
+#line 1848 "parser.Y"
{fr->markerRulerPointCmd((yyvsp[(1) - (6)].integer), Vector((yyvsp[(5) - (6)].vector)), Vector((yyvsp[(6) - (6)].vector)),
(Coord::InternalSystem)(yyvsp[(4) - (6)].integer));;}
break;
- case 759:
-#line 1842 "parser.Y"
+ case 763:
+#line 1851 "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 760:
-#line 1845 "parser.Y"
+ case 764:
+#line 1854 "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::SkyDist)(yyvsp[(7) - (7)].integer));;}
break;
- case 761:
-#line 1848 "parser.Y"
+ case 765:
+#line 1857 "parser.Y"
{fr->markerSelectCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 762:
-#line 1849 "parser.Y"
+ case 766:
+#line 1858 "parser.Y"
{fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 763:
-#line 1851 "parser.Y"
+ case 767:
+#line 1860 "parser.Y"
{fr->markerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 764:
-#line 1852 "parser.Y"
+ case 768:
+#line 1861 "parser.Y"
{fr->markerTextCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 765:
-#line 1853 "parser.Y"
+ case 769:
+#line 1862 "parser.Y"
{fr->markerTextRotateCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 766:
-#line 1855 "parser.Y"
+ case 770:
+#line 1864 "parser.Y"
{fr->markerUnhighliteCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 767:
-#line 1856 "parser.Y"
+ case 771:
+#line 1865 "parser.Y"
{fr->markerUnselectCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 768:
-#line 1858 "parser.Y"
+ case 772:
+#line 1867 "parser.Y"
{fr->markerVectorArrowCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 769:
-#line 1860 "parser.Y"
+ case 773:
+#line 1869 "parser.Y"
{fr->markerVectorCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(5) - (7)].vector)), (Coord::InternalSystem)(yyvsp[(4) - (7)].integer), (yyvsp[(6) - (7)].real), (yyvsp[(7) - (7)].real));;}
break;
- case 770:
-#line 1863 "parser.Y"
+ case 774:
+#line 1872 "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::SkyDist)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;}
break;
- case 771:
-#line 1866 "parser.Y"
+ case 775:
+#line 1875 "parser.Y"
{fr->markerLineWidthCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 772:
-#line 1868 "parser.Y"
+ case 776:
+#line 1877 "parser.Y"
{fr->markerKeyCmd();;}
break;
- case 773:
-#line 1869 "parser.Y"
+ case 777:
+#line 1878 "parser.Y"
{fr->markerKeyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 777:
-#line 1874 "parser.Y"
+ case 781:
+#line 1883 "parser.Y"
{fr->markerPreserveCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 778:
-#line 1875 "parser.Y"
+ case 782:
+#line 1884 "parser.Y"
{fr->markerPropertyCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 779:
-#line 1877 "parser.Y"
+ case 783:
+#line 1886 "parser.Y"
{fr->markerPropertyCmd((yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
break;
- case 780:
-#line 1879 "parser.Y"
+ case 784:
+#line 1888 "parser.Y"
{fr->markerRotateBeginCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 781:
-#line 1881 "parser.Y"
+ case 785:
+#line 1890 "parser.Y"
{fr->markerRotateMotionCmd(Vector((yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real)),(yyvsp[(5) - (5)].integer));;}
break;
- case 782:
-#line 1882 "parser.Y"
+ case 786:
+#line 1891 "parser.Y"
{fr->markerRotateEndCmd();;}
break;
- case 783:
-#line 1884 "parser.Y"
+ case 787:
+#line 1893 "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));;}
break;
- case 784:
-#line 1886 "parser.Y"
+ case 788:
+#line 1895 "parser.Y"
{fr->markerSaveTemplateCmd((yyvsp[(3) - (3)].str));;}
break;
- case 787:
-#line 1891 "parser.Y"
+ case 791:
+#line 1900 "parser.Y"
{fr->markerColorCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;}
break;
- case 788:
-#line 1892 "parser.Y"
+ case 792:
+#line 1901 "parser.Y"
{fr->markerCopyCmd((yyvsp[(1) - (2)].str));;}
break;
- case 789:
-#line 1893 "parser.Y"
+ case 793:
+#line 1902 "parser.Y"
{fr->markerDeleteCmd((yyvsp[(1) - (2)].str));;}
break;
- case 790:
-#line 1894 "parser.Y"
+ case 794:
+#line 1903 "parser.Y"
{fr->markerCutCmd((yyvsp[(1) - (2)].str));;}
break;
- case 791:
-#line 1895 "parser.Y"
+ case 795:
+#line 1904 "parser.Y"
{fr->markerFontCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;}
break;
- case 792:
-#line 1896 "parser.Y"
+ case 796:
+#line 1905 "parser.Y"
{fr->markerHighliteCmd((yyvsp[(1) - (2)].str));;}
break;
- case 793:
-#line 1897 "parser.Y"
+ case 797:
+#line 1906 "parser.Y"
{fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].str));;}
break;
- case 794:
-#line 1898 "parser.Y"
+ case 798:
+#line 1907 "parser.Y"
{fr->markerMoveCmd((yyvsp[(1) - (4)].str),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 795:
-#line 1899 "parser.Y"
+ case 799:
+#line 1908 "parser.Y"
{fr->markerFrontCmd((yyvsp[(1) - (3)].str));;}
break;
- case 796:
-#line 1900 "parser.Y"
+ case 800:
+#line 1909 "parser.Y"
{fr->markerBackCmd((yyvsp[(1) - (3)].str));;}
break;
- case 797:
-#line 1902 "parser.Y"
+ case 801:
+#line 1911 "parser.Y"
{fr->markerMoveToCmd((yyvsp[(1) - (5)].str),Vector((yyvsp[(5) - (5)].vector)),(Coord::InternalSystem)(yyvsp[(4) - (5)].integer));;}
break;
- case 798:
-#line 1904 "parser.Y"
+ case 802:
+#line 1913 "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 799:
-#line 1906 "parser.Y"
+ case 803:
+#line 1915 "parser.Y"
{fr->markerPropertyCmd((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 800:
-#line 1907 "parser.Y"
+ case 804:
+#line 1916 "parser.Y"
{fr->markerSelectCmd((yyvsp[(1) - (2)].str));;}
break;
- case 801:
-#line 1908 "parser.Y"
+ case 805:
+#line 1917 "parser.Y"
{fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].str));;}
break;
- case 802:
-#line 1909 "parser.Y"
+ case 806:
+#line 1918 "parser.Y"
{fr->markerUnhighliteCmd((yyvsp[(1) - (2)].str));;}
break;
- case 803:
-#line 1910 "parser.Y"
+ case 807:
+#line 1919 "parser.Y"
{fr->markerUnselectCmd((yyvsp[(1) - (2)].str));;}
break;
- case 804:
-#line 1912 "parser.Y"
+ case 808:
+#line 1921 "parser.Y"
{fr->markerTagEditCmd((yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;}
break;
- case 805:
-#line 1913 "parser.Y"
+ case 809:
+#line 1922 "parser.Y"
{fr->markerTagDeleteCmd((yyvsp[(3) - (3)].str));;}
break;
- case 806:
-#line 1914 "parser.Y"
+ case 810:
+#line 1923 "parser.Y"
{fr->markerTagDeleteAllCmd();;}
break;
- case 807:
-#line 1915 "parser.Y"
+ case 811:
+#line 1924 "parser.Y"
{fr->markerTagCmd((yyvsp[(2) - (2)].str));;}
break;
- case 808:
-#line 1916 "parser.Y"
+ case 812:
+#line 1925 "parser.Y"
{fr->markerTagUpdateCmd((yyvsp[(3) - (3)].str));;}
break;
- case 809:
-#line 1918 "parser.Y"
+ case 813:
+#line 1927 "parser.Y"
{fr->markerPasteCmd();;}
break;
- case 810:
-#line 1920 "parser.Y"
+ case 814:
+#line 1929 "parser.Y"
{fr->markerPasteCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
break;
- case 811:
-#line 1921 "parser.Y"
+ case 815:
+#line 1930 "parser.Y"
{fr->markerUndoCmd();;}
break;
- case 812:
-#line 1922 "parser.Y"
+ case 816:
+#line 1931 "parser.Y"
{fr->markerUnhighliteAllCmd();;}
break;
- case 813:
-#line 1923 "parser.Y"
+ case 817:
+#line 1932 "parser.Y"
{fr->markerUnselectAllCmd();;}
break;
- case 814:
-#line 1924 "parser.Y"
+ case 818:
+#line 1933 "parser.Y"
{fr->markerLineWidthCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 815:
-#line 1927 "parser.Y"
+ case 819:
+#line 1936 "parser.Y"
{(yyval.integer) = CallBack::SELECTCB;;}
break;
- case 816:
-#line 1928 "parser.Y"
+ case 820:
+#line 1937 "parser.Y"
{(yyval.integer) = CallBack::UNSELECTCB;;}
break;
- case 817:
-#line 1929 "parser.Y"
+ case 821:
+#line 1938 "parser.Y"
{(yyval.integer) = CallBack::HIGHLITECB;;}
break;
- case 818:
-#line 1930 "parser.Y"
+ case 822:
+#line 1939 "parser.Y"
{(yyval.integer) = CallBack::UNHIGHLITECB;;}
break;
- case 819:
-#line 1931 "parser.Y"
+ case 823:
+#line 1940 "parser.Y"
{(yyval.integer) = CallBack::MOVEBEGINCB;;}
break;
- case 820:
-#line 1932 "parser.Y"
+ case 824:
+#line 1941 "parser.Y"
{(yyval.integer) = CallBack::MOVECB;;}
break;
- case 821:
-#line 1933 "parser.Y"
+ case 825:
+#line 1942 "parser.Y"
{(yyval.integer) = CallBack::MOVEENDCB;;}
break;
- case 822:
-#line 1934 "parser.Y"
+ case 826:
+#line 1943 "parser.Y"
{(yyval.integer) = CallBack::EDITBEGINCB;;}
break;
- case 823:
-#line 1935 "parser.Y"
+ case 827:
+#line 1944 "parser.Y"
{(yyval.integer) = CallBack::EDITCB;;}
break;
- case 824:
-#line 1936 "parser.Y"
+ case 828:
+#line 1945 "parser.Y"
{(yyval.integer) = CallBack::EDITENDCB;;}
break;
- case 825:
-#line 1937 "parser.Y"
+ case 829:
+#line 1946 "parser.Y"
{(yyval.integer) = CallBack::ROTATEBEGINCB;;}
break;
- case 826:
-#line 1938 "parser.Y"
+ case 830:
+#line 1947 "parser.Y"
{(yyval.integer) = CallBack::ROTATECB;;}
break;
- case 827:
-#line 1939 "parser.Y"
+ case 831:
+#line 1948 "parser.Y"
{(yyval.integer) = CallBack::ROTATEENDCB;;}
break;
- case 828:
-#line 1940 "parser.Y"
+ case 832:
+#line 1949 "parser.Y"
{(yyval.integer) = CallBack::DELETECB;;}
break;
- case 829:
-#line 1941 "parser.Y"
+ case 833:
+#line 1950 "parser.Y"
{(yyval.integer) = CallBack::TEXTCB;;}
break;
- case 830:
-#line 1942 "parser.Y"
+ case 834:
+#line 1951 "parser.Y"
{(yyval.integer) = CallBack::COLORCB;;}
break;
- case 831:
-#line 1943 "parser.Y"
+ case 835:
+#line 1952 "parser.Y"
{(yyval.integer) = CallBack::LINEWIDTHCB;;}
break;
- case 832:
-#line 1944 "parser.Y"
+ case 836:
+#line 1953 "parser.Y"
{(yyval.integer) = CallBack::PROPERTYCB;;}
break;
- case 833:
-#line 1945 "parser.Y"
+ case 837:
+#line 1954 "parser.Y"
{(yyval.integer) = CallBack::FONTCB;;}
break;
- case 834:
-#line 1946 "parser.Y"
+ case 838:
+#line 1955 "parser.Y"
{(yyval.integer) = CallBack::KEYCB;;}
break;
- case 835:
-#line 1947 "parser.Y"
+ case 839:
+#line 1956 "parser.Y"
{(yyval.integer) = CallBack::UPDATECB;;}
break;
- case 836:
-#line 1950 "parser.Y"
+ case 840:
+#line 1959 "parser.Y"
{fr->markerCentroidCmd();;}
break;
- case 837:
-#line 1951 "parser.Y"
+ case 841:
+#line 1960 "parser.Y"
{fr->markerCentroidCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 838:
-#line 1952 "parser.Y"
+ case 842:
+#line 1961 "parser.Y"
{fr->markerCentroidAutoCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 839:
-#line 1953 "parser.Y"
+ case 843:
+#line 1962 "parser.Y"
{fr->markerCentroidRadiusCmd((yyvsp[(2) - (2)].real));;}
break;
- case 840:
-#line 1954 "parser.Y"
+ case 844:
+#line 1963 "parser.Y"
{fr->markerCentroidIterationCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 841:
-#line 1955 "parser.Y"
+ case 845:
+#line 1964 "parser.Y"
{
fr->markerCentroidIterationCmd((yyvsp[(2) - (3)].integer));
fr->markerCentroidRadiusCmd((yyvsp[(3) - (3)].real));
;}
break;
- case 842:
-#line 1965 "parser.Y"
+ case 846:
+#line 1974 "parser.Y"
{fr->createCircleCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS),
(yyvsp[(4) - (5)].real),
currentColor,currentDash,currentWidth,currentFont,
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 843:
-#line 1973 "parser.Y"
+ case 847:
+#line 1982 "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),
@@ -8693,8 +8693,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 844:
-#line 1982 "parser.Y"
+ case 848:
+#line 1991 "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),
@@ -8702,16 +8702,16 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 845:
-#line 1990 "parser.Y"
+ case 849:
+#line 1999 "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)),
currentColor,currentDash,currentWidth,currentFont,
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 846:
-#line 1997 "parser.Y"
+ case 850:
+#line 2006 "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,
@@ -8719,8 +8719,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 847:
-#line 2005 "parser.Y"
+ case 851:
+#line 2014 "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,
@@ -8728,72 +8728,72 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 848:
-#line 2013 "parser.Y"
+ case 852:
+#line 2022 "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 849:
-#line 2018 "parser.Y"
+ case 853:
+#line 2027 "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 850:
-#line 2023 "parser.Y"
+ case 854:
+#line 2032 "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 851:
-#line 2028 "parser.Y"
+ case 855:
+#line 2037 "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 852:
-#line 2033 "parser.Y"
+ case 856:
+#line 2042 "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 853:
-#line 2038 "parser.Y"
+ case 857:
+#line 2047 "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 854:
-#line 2043 "parser.Y"
+ case 858:
+#line 2052 "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 855:
-#line 2048 "parser.Y"
+ case 859:
+#line 2057 "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 856:
-#line 2057 "parser.Y"
+ case 860:
+#line 2066 "parser.Y"
{fr->createRulerCmd(fr->mapToRef(Vector((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real)),Coord::CANVAS),
fr->mapToRef(Vector((yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real)),Coord::CANVAS),
(Coord::CoordSystem)(yyvsp[(6) - (10)].integer), (Coord::SkyFrame)(yyvsp[(7) - (10)].integer), (Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyDist)(yyvsp[(9) - (10)].integer),
@@ -8801,8 +8801,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 857:
-#line 2066 "parser.Y"
+ case 861:
+#line 2075 "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,
@@ -8811,8 +8811,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 858:
-#line 2076 "parser.Y"
+ case 862:
+#line 2085 "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),
@@ -8820,16 +8820,16 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 859:
-#line 2085 "parser.Y"
+ case 863:
+#line 2094 "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 860:
-#line 2093 "parser.Y"
+ case 864:
+#line 2102 "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),
@@ -8838,8 +8838,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 861:
-#line 2103 "parser.Y"
+ case 865:
+#line 2112 "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),
@@ -8847,8 +8847,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 862:
-#line 2113 "parser.Y"
+ case 866:
+#line 2122 "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),
@@ -8856,8 +8856,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 863:
-#line 2123 "parser.Y"
+ case 867:
+#line 2132 "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)),
@@ -8867,8 +8867,8 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 864:
-#line 2135 "parser.Y"
+ case 868:
+#line 2144 "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)),
@@ -8878,621 +8878,621 @@ yyreduce:
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 865:
-#line 2144 "parser.Y"
+ case 869:
+#line 2153 "parser.Y"
{fr->createCompositeCmd(
currentColor,currentDash,currentWidth,currentFont,
currentText,currentProps,NULL,taglist,cblist);;}
break;
- case 867:
-#line 2152 "parser.Y"
+ case 871:
+#line 2161 "parser.Y"
{fr->createTemplateCmd(fr->mapToRef(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),Coord::CANVAS), (yyvsp[(1) - (3)].str));;}
break;
- case 868:
-#line 2154 "parser.Y"
+ case 872:
+#line 2163 "parser.Y"
{fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),Coord::CANVAS), (yyvsp[(2) - (4)].str));;}
break;
- case 869:
-#line 2156 "parser.Y"
+ case 873:
+#line 2165 "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 870:
-#line 2161 "parser.Y"
+ case 874:
+#line 2170 "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 871:
-#line 2164 "parser.Y"
+ case 875:
+#line 2173 "parser.Y"
{(yyval.dash)[0] = (yyvsp[(1) - (2)].integer); (yyval.dash)[1] = (yyvsp[(2) - (2)].integer);;}
break;
- case 872:
-#line 2168 "parser.Y"
+ case 876:
+#line 2177 "parser.Y"
{fr->markerEditBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
break;
- case 873:
-#line 2170 "parser.Y"
+ case 877:
+#line 2179 "parser.Y"
{fr->markerEditMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;}
break;
- case 874:
-#line 2171 "parser.Y"
+ case 878:
+#line 2180 "parser.Y"
{fr->markerEditEndCmd();;}
break;
- case 875:
-#line 2174 "parser.Y"
+ case 879:
+#line 2183 "parser.Y"
{(yyval.integer) = Base::DS9;;}
break;
- case 876:
-#line 2175 "parser.Y"
+ case 880:
+#line 2184 "parser.Y"
{(yyval.integer) = Base::XML;;}
break;
- case 877:
-#line 2176 "parser.Y"
+ case 881:
+#line 2185 "parser.Y"
{(yyval.integer) = Base::CIAO;;}
break;
- case 878:
-#line 2177 "parser.Y"
+ case 882:
+#line 2186 "parser.Y"
{(yyval.integer) = Base::SAOTNG;;}
break;
- case 879:
-#line 2178 "parser.Y"
+ case 883:
+#line 2187 "parser.Y"
{(yyval.integer) = Base::SAOIMAGE;;}
break;
- case 880:
-#line 2179 "parser.Y"
+ case 884:
+#line 2188 "parser.Y"
{(yyval.integer) = Base::PROS;;}
break;
- case 881:
-#line 2180 "parser.Y"
+ case 885:
+#line 2189 "parser.Y"
{(yyval.integer) = Base::RAWXY;;}
break;
- case 883:
-#line 2184 "parser.Y"
+ case 887:
+#line 2193 "parser.Y"
{fr->getMarkerColorCmd();;}
break;
- case 884:
-#line 2185 "parser.Y"
+ case 888:
+#line 2194 "parser.Y"
{fr->getMarkerFontCmd();;}
break;
- case 885:
-#line 2186 "parser.Y"
+ case 889:
+#line 2195 "parser.Y"
{fr->getMarkerHandleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 886:
-#line 2187 "parser.Y"
+ case 890:
+#line 2196 "parser.Y"
{fr->getMarkerIdCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 887:
-#line 2190 "parser.Y"
+ case 891:
+#line 2199 "parser.Y"
{fr->getMarkerAnalysisPlot2dCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(yyvsp[(7) - (7)].str));;}
break;
- case 888:
-#line 2192 "parser.Y"
+ case 892:
+#line 2201 "parser.Y"
{fr->getMarkerAnalysisPlot3dCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;}
break;
- case 889:
-#line 2193 "parser.Y"
+ case 893:
+#line 2202 "parser.Y"
{fr->getMarkerAnalysisParamCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 890:
-#line 2194 "parser.Y"
+ case 894:
+#line 2203 "parser.Y"
{fr->getMarkerAnalysisSystemCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 891:
-#line 2196 "parser.Y"
+ case 895:
+#line 2205 "parser.Y"
{fr->getMarkerIdAllCmd();;}
break;
- case 892:
-#line 2197 "parser.Y"
+ case 896:
+#line 2206 "parser.Y"
{fr->getMarkerAngleCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 893:
-#line 2198 "parser.Y"
+ case 897:
+#line 2207 "parser.Y"
{fr->getMarkerAngleCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 894:
-#line 2200 "parser.Y"
+ case 898:
+#line 2209 "parser.Y"
{fr->getMarkerAngleCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;}
break;
- case 895:
-#line 2202 "parser.Y"
+ case 899:
+#line 2211 "parser.Y"
{fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 896:
-#line 2204 "parser.Y"
+ case 900:
+#line 2213 "parser.Y"
{fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 897:
-#line 2207 "parser.Y"
+ case 901:
+#line 2216 "parser.Y"
{fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (4)].integer),(Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 898:
-#line 2209 "parser.Y"
+ case 902:
+#line 2218 "parser.Y"
{fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 899:
-#line 2211 "parser.Y"
+ case 903:
+#line 2220 "parser.Y"
{fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (4)].integer),(Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 900:
-#line 2213 "parser.Y"
+ case 904:
+#line 2222 "parser.Y"
{fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 901:
-#line 2214 "parser.Y"
+ case 905:
+#line 2223 "parser.Y"
{fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 902:
-#line 2215 "parser.Y"
+ case 906:
+#line 2224 "parser.Y"
{fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
break;
- case 903:
-#line 2217 "parser.Y"
+ case 907:
+#line 2226 "parser.Y"
{fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
break;
- case 904:
-#line 2219 "parser.Y"
+ case 908:
+#line 2228 "parser.Y"
{fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 905:
-#line 2221 "parser.Y"
+ case 909:
+#line 2230 "parser.Y"
{fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 906:
-#line 2224 "parser.Y"
+ case 910:
+#line 2233 "parser.Y"
{fr->getMarkerCenterCmd((yyvsp[(1) - (3)].integer), (Coord::InternalSystem)(yyvsp[(3) - (3)].integer));;}
break;
- case 907:
-#line 2226 "parser.Y"
+ case 911:
+#line 2235 "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 908:
-#line 2229 "parser.Y"
+ case 912:
+#line 2238 "parser.Y"
{fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 909:
-#line 2231 "parser.Y"
+ case 913:
+#line 2240 "parser.Y"
{fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 910:
-#line 2232 "parser.Y"
+ case 914:
+#line 2241 "parser.Y"
{fr->getMarkerColorCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 911:
-#line 2233 "parser.Y"
+ case 915:
+#line 2242 "parser.Y"
{fr->getMarkerCompassArrowCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 912:
-#line 2234 "parser.Y"
+ case 916:
+#line 2243 "parser.Y"
{fr->getMarkerCompassLabelCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 913:
-#line 2236 "parser.Y"
+ case 917:
+#line 2245 "parser.Y"
{fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 914:
-#line 2238 "parser.Y"
+ case 918:
+#line 2247 "parser.Y"
{fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 915:
-#line 2239 "parser.Y"
+ case 919:
+#line 2248 "parser.Y"
{fr->getMarkerCompassSystemCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 916:
-#line 2240 "parser.Y"
+ case 920:
+#line 2249 "parser.Y"
{fr->getMarkerCompositeCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 917:
-#line 2241 "parser.Y"
+ case 921:
+#line 2250 "parser.Y"
{fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 918:
-#line 2242 "parser.Y"
+ case 922:
+#line 2251 "parser.Y"
{fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
break;
- case 919:
-#line 2244 "parser.Y"
+ case 923:
+#line 2253 "parser.Y"
{fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
break;
- case 920:
-#line 2246 "parser.Y"
+ case 924:
+#line 2255 "parser.Y"
{fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 921:
-#line 2248 "parser.Y"
+ case 925:
+#line 2257 "parser.Y"
{fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 922:
-#line 2250 "parser.Y"
+ case 926:
+#line 2259 "parser.Y"
{fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 923:
-#line 2252 "parser.Y"
+ case 927:
+#line 2261 "parser.Y"
{fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 924:
-#line 2254 "parser.Y"
+ case 928:
+#line 2263 "parser.Y"
{fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 925:
-#line 2256 "parser.Y"
+ case 929:
+#line 2265 "parser.Y"
{fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer),
(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 926:
-#line 2258 "parser.Y"
+ case 930:
+#line 2267 "parser.Y"
{fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 927:
-#line 2259 "parser.Y"
+ case 931:
+#line 2268 "parser.Y"
{fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (4)].integer));;}
break;
- case 928:
-#line 2261 "parser.Y"
+ case 932:
+#line 2270 "parser.Y"
{fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;}
break;
- case 929:
-#line 2263 "parser.Y"
+ case 933:
+#line 2272 "parser.Y"
{fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 930:
-#line 2265 "parser.Y"
+ case 934:
+#line 2274 "parser.Y"
{fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 931:
-#line 2266 "parser.Y"
+ case 935:
+#line 2275 "parser.Y"
{fr->getMarkerFontCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 932:
-#line 2267 "parser.Y"
+ case 936:
+#line 2276 "parser.Y"
{fr->getMarkerHighlitedCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 933:
-#line 2268 "parser.Y"
+ case 937:
+#line 2277 "parser.Y"
{fr->getMarkerLineArrowCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 934:
-#line 2270 "parser.Y"
+ case 938:
+#line 2279 "parser.Y"
{fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
-
- case 935:
-#line 2272 "parser.Y"
+
+ case 939:
+#line 2281 "parser.Y"
{fr->getMarkerLineCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 936:
-#line 2274 "parser.Y"
+ case 940:
+#line 2283 "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 937:
-#line 2277 "parser.Y"
+ case 941:
+#line 2286 "parser.Y"
{fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real),
(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyDist)(yyvsp[(6) - (6)].integer));;}
break;
- case 938:
-#line 2280 "parser.Y"
+ case 942:
+#line 2289 "parser.Y"
{fr->getMarkerPointShapeCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 939:
-#line 2281 "parser.Y"
+ case 943:
+#line 2290 "parser.Y"
{fr->getMarkerPointSizeCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 940:
-#line 2283 "parser.Y"
+ case 944:
+#line 2292 "parser.Y"
{fr->getMarkerProjectionPointsCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 941:
-#line 2285 "parser.Y"
+ case 945:
+#line 2294 "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 942:
-#line 2288 "parser.Y"
+ case 946:
+#line 2297 "parser.Y"
{fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer),
(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 943:
-#line 2291 "parser.Y"
+ case 947:
+#line 2300 "parser.Y"
{fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 944:
-#line 2293 "parser.Y"
+ case 948:
+#line 2302 "parser.Y"
{fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 945:
-#line 2294 "parser.Y"
+ case 949:
+#line 2303 "parser.Y"
{fr->getMarkerPropertyCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 946:
-#line 2295 "parser.Y"
+ case 950:
+#line 2304 "parser.Y"
{fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 947:
-#line 2297 "parser.Y"
+ case 951:
+#line 2306 "parser.Y"
{fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 948:
-#line 2299 "parser.Y"
+ case 952:
+#line 2308 "parser.Y"
{fr->getMarkerRulerPointCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 949:
-#line 2301 "parser.Y"
+ case 953:
+#line 2310 "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 950:
-#line 2303 "parser.Y"
+ case 954:
+#line 2312 "parser.Y"
{fr->getMarkerRulerSystemCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 951:
-#line 2304 "parser.Y"
+ case 955:
+#line 2313 "parser.Y"
{fr->getMarkerSelectedCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 952:
-#line 2306 "parser.Y"
+ case 956:
+#line 2315 "parser.Y"
{fr->getMarkerTagCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 953:
-#line 2307 "parser.Y"
+ case 957:
+#line 2316 "parser.Y"
{fr->getMarkerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 954:
-#line 2308 "parser.Y"
+ case 958:
+#line 2317 "parser.Y"
{fr->getMarkerTextCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 955:
-#line 2309 "parser.Y"
+ case 959:
+#line 2318 "parser.Y"
{fr->getMarkerTextRotateCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 956:
-#line 2310 "parser.Y"
+ case 960:
+#line 2319 "parser.Y"
{fr->getMarkerTypeCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 957:
-#line 2312 "parser.Y"
+ case 961:
+#line 2321 "parser.Y"
{fr->getMarkerVectorArrowCmd((yyvsp[(1) - (3)].integer));;}
break;
- case 958:
-#line 2314 "parser.Y"
+ case 962:
+#line 2323 "parser.Y"
{fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyDist)(yyvsp[(5) - (5)].integer));;}
break;
- case 959:
-#line 2316 "parser.Y"
+ case 963:
+#line 2325 "parser.Y"
{fr->getMarkerVectorCmd((yyvsp[(1) - (4)].integer), (Coord::InternalSystem)(yyvsp[(4) - (4)].integer));;}
break;
- case 960:
-#line 2318 "parser.Y"
+ case 964:
+#line 2327 "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 961:
-#line 2320 "parser.Y"
+ case 965:
+#line 2329 "parser.Y"
{fr->getMarkerLineWidthCmd((yyvsp[(1) - (2)].integer));;}
break;
- case 963:
-#line 2322 "parser.Y"
+ case 967:
+#line 2331 "parser.Y"
{fr->getMarkerHighlitedNumberCmd();;}
break;
- case 964:
-#line 2323 "parser.Y"
+ case 968:
+#line 2332 "parser.Y"
{fr->getMarkerNumberCmd();;}
break;
- case 965:
-#line 2325 "parser.Y"
+ case 969:
+#line 2334 "parser.Y"
{fr->getMarkerPolygonSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 966:
-#line 2326 "parser.Y"
+ case 970:
+#line 2335 "parser.Y"
{fr->getMarkerPreserveCmd();;}
break;
- case 967:
-#line 2327 "parser.Y"
+ case 971:
+#line 2336 "parser.Y"
{fr->getMarkerPropertyCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 969:
-#line 2329 "parser.Y"
+ case 973:
+#line 2338 "parser.Y"
{fr->getMarkerSelectedNumberCmd();;}
break;
- case 971:
-#line 2333 "parser.Y"
+ case 975:
+#line 2342 "parser.Y"
{fr->getMarkerColorCmd((yyvsp[(1) - (2)].str));;}
break;
- case 972:
-#line 2334 "parser.Y"
+ case 976:
+#line 2343 "parser.Y"
{fr->getMarkerFontCmd((yyvsp[(1) - (2)].str));;}
break;
- case 973:
-#line 2335 "parser.Y"
+ case 977:
+#line 2344 "parser.Y"
{fr->getMarkerIdCmd((yyvsp[(1) - (2)].str));;}
break;
- case 974:
-#line 2336 "parser.Y"
+ case 978:
+#line 2345 "parser.Y"
{fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].integer));;}
break;
- case 975:
-#line 2337 "parser.Y"
+ case 979:
+#line 2346 "parser.Y"
{fr->getMarkerTagCmd((yyvsp[(1) - (2)].str));;}
break;
- case 976:
-#line 2338 "parser.Y"
+ case 980:
+#line 2347 "parser.Y"
{fr->getMarkerTagNumberCmd((yyvsp[(1) - (3)].str));;}
break;
- case 977:
-#line 2340 "parser.Y"
+ case 981:
+#line 2349 "parser.Y"
{fr->getMarkerTagsCmd();;}
break;
- case 978:
-#line 2341 "parser.Y"
+ case 982:
+#line 2350 "parser.Y"
{fr->getMarkerTagDefaultNameCmd();;}
break;
- case 979:
-#line 2343 "parser.Y"
+ case 983:
+#line 2352 "parser.Y"
{fr->getMarkerLineWidthCmd();;}
break;
- case 980:
-#line 2346 "parser.Y"
+ case 984:
+#line 2355 "parser.Y"
{fr->getMarkerCentroidAutoCmd();;}
break;
- case 981:
-#line 2347 "parser.Y"
+ case 985:
+#line 2356 "parser.Y"
{fr->getMarkerCentroidRadiusCmd();;}
break;
- case 982:
-#line 2348 "parser.Y"
+ case 986:
+#line 2357 "parser.Y"
{fr->getMarkerCentroidIterationCmd();;}
break;
- case 983:
-#line 2349 "parser.Y"
+ case 987:
+#line 2358 "parser.Y"
{fr->getMarkerCentroidOptionCmd();;}
break;
- case 984:
-#line 2352 "parser.Y"
+ case 988:
+#line 2361 "parser.Y"
{fr->getMarkerHighlitedCmd();;}
break;
- case 985:
-#line 2353 "parser.Y"
+ case 989:
+#line 2362 "parser.Y"
{fr->getMarkerHighlitedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 986:
-#line 2356 "parser.Y"
+ case 990:
+#line 2365 "parser.Y"
{fr->getMarkerSelectedCmd();;}
break;
- case 987:
-#line 2357 "parser.Y"
+ case 991:
+#line 2366 "parser.Y"
{fr->getMarkerSelectedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 988:
-#line 2360 "parser.Y"
+ case 992:
+#line 2369 "parser.Y"
{fr->getMarkerShowCmd();;}
break;
- case 989:
-#line 2361 "parser.Y"
+ case 993:
+#line 2370 "parser.Y"
{fr->getMarkerShowTextCmd();;}
break;
- case 990:
-#line 2364 "parser.Y"
+ case 994:
+#line 2373 "parser.Y"
{
strncpy(currentFont, "helvetica 10 normal roman", 32);
strncpy(currentColor, "green", 16);
@@ -9506,714 +9506,714 @@ yyreduce:
;}
break;
- case 991:
-#line 2377 "parser.Y"
+ case 995:
+#line 2386 "parser.Y"
{fr->markerLayerCmd(Base::USER);;}
break;
- case 992:
-#line 2378 "parser.Y"
+ case 996:
+#line 2387 "parser.Y"
{fr->markerLayerCmd(Base::USER);;}
break;
- case 993:
-#line 2379 "parser.Y"
+ case 997:
+#line 2388 "parser.Y"
{fr->markerLayerCmd(Base::USER);;}
break;
- case 994:
-#line 2380 "parser.Y"
+ case 998:
+#line 2389 "parser.Y"
{fr->markerLayerCmd(Base::CATALOG);;}
break;
- case 995:
-#line 2385 "parser.Y"
+ case 999:
+#line 2394 "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 996:
-#line 2390 "parser.Y"
+ case 1000:
+#line 2399 "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 997:
-#line 2396 "parser.Y"
+ case 1001:
+#line 2405 "parser.Y"
{fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
break;
- case 998:
-#line 2398 "parser.Y"
+ case 1002:
+#line 2407 "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 999:
-#line 2401 "parser.Y"
+ case 1003:
+#line 2410 "parser.Y"
{fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
break;
- case 1000:
-#line 2403 "parser.Y"
+ case 1004:
+#line 2412 "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 1001:
-#line 2406 "parser.Y"
+ case 1005:
+#line 2415 "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 1002:
-#line 2409 "parser.Y"
+ case 1006:
+#line 2418 "parser.Y"
{fr->markerMoveCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1003:
-#line 2410 "parser.Y"
+ case 1007:
+#line 2419 "parser.Y"
{fr->markerFrontCmd();;}
break;
- case 1004:
-#line 2411 "parser.Y"
+ case 1008:
+#line 2420 "parser.Y"
{fr->markerBackCmd();;}
break;
- case 1005:
-#line 2412 "parser.Y"
+ case 1009:
+#line 2421 "parser.Y"
{fr->markerMoveBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1006:
-#line 2413 "parser.Y"
+ case 1010:
+#line 2422 "parser.Y"
{fr->markerMoveMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1007:
-#line 2414 "parser.Y"
+ case 1011:
+#line 2423 "parser.Y"
{fr->markerMoveEndCmd();;}
break;
- case 1008:
-#line 2416 "parser.Y"
+ case 1012:
+#line 2425 "parser.Y"
{fr->markerMoveToCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::InternalSystem)(yyvsp[(2) - (3)].integer));;}
break;
- case 1009:
-#line 2418 "parser.Y"
+ case 1013:
+#line 2427 "parser.Y"
{fr->markerMoveToCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (4)].integer), (Coord::SkyFrame)(yyvsp[(3) - (4)].integer));;}
break;
- case 1012:
-#line 2425 "parser.Y"
+ case 1016:
+#line 2434 "parser.Y"
{setProps(¤tProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 1013:
-#line 2426 "parser.Y"
+ case 1017:
+#line 2435 "parser.Y"
{strncpy(currentColor,(yyvsp[(3) - (3)].str),16);;}
break;
- case 1014:
-#line 2427 "parser.Y"
+ case 1018:
+#line 2436 "parser.Y"
{currentDash[0]=(yyvsp[(3) - (4)].integer);currentDash[1]=(yyvsp[(4) - (4)].integer);;}
break;
- case 1015:
-#line 2428 "parser.Y"
+ case 1019:
+#line 2437 "parser.Y"
{currentWidth = (yyvsp[(3) - (3)].integer);;}
break;
- case 1016:
-#line 2429 "parser.Y"
+ case 1020:
+#line 2438 "parser.Y"
{strncpy(currentFont,(yyvsp[(3) - (3)].str),32);;}
break;
- case 1017:
-#line 2430 "parser.Y"
+ case 1021:
+#line 2439 "parser.Y"
{strncpy(currentText,(yyvsp[(3) - (3)].str),80);;}
break;
- case 1020:
-#line 2435 "parser.Y"
+ case 1024:
+#line 2444 "parser.Y"
{(yyval.integer) = Marker::NONE;;}
break;
- case 1021:
-#line 2436 "parser.Y"
+ case 1025:
+#line 2445 "parser.Y"
{(yyval.integer) = Marker::SELECT;;}
break;
- case 1022:
-#line 2437 "parser.Y"
+ case 1026:
+#line 2446 "parser.Y"
{(yyval.integer) = Marker::HIGHLITE;;}
break;
- case 1023:
-#line 2438 "parser.Y"
+ case 1027:
+#line 2447 "parser.Y"
{(yyval.integer) = Marker::DASH;;}
break;
- case 1024:
-#line 2439 "parser.Y"
+ case 1028:
+#line 2448 "parser.Y"
{(yyval.integer) = Marker::FIXED;;}
break;
- case 1025:
-#line 2440 "parser.Y"
+ case 1029:
+#line 2449 "parser.Y"
{(yyval.integer) = Marker::EDIT;;}
break;
- case 1026:
-#line 2441 "parser.Y"
+ case 1030:
+#line 2450 "parser.Y"
{(yyval.integer) = Marker::MOVE;;}
break;
- case 1027:
-#line 2442 "parser.Y"
+ case 1031:
+#line 2451 "parser.Y"
{(yyval.integer) = Marker::ROTATE;;}
break;
- case 1028:
-#line 2443 "parser.Y"
+ case 1032:
+#line 2452 "parser.Y"
{(yyval.integer) = Marker::DELETE;;}
break;
- case 1029:
-#line 2444 "parser.Y"
+ case 1033:
+#line 2453 "parser.Y"
{(yyval.integer) = Marker::INCLUDE;;}
break;
- case 1030:
-#line 2445 "parser.Y"
+ case 1034:
+#line 2454 "parser.Y"
{(yyval.integer) = Marker::SOURCE;;}
break;
- case 1033:
-#line 2452 "parser.Y"
+ case 1037:
+#line 2461 "parser.Y"
{propQMask=0;propQValue=0;;}
break;
- case 1034:
-#line 2453 "parser.Y"
+ case 1038:
+#line 2462 "parser.Y"
{propQMask=0;propQValue=0;;}
break;
- case 1036:
-#line 2456 "parser.Y"
+ case 1040:
+#line 2465 "parser.Y"
{fr->markerSelectAllCmd();;}
break;
- case 1037:
-#line 2457 "parser.Y"
+ case 1041:
+#line 2466 "parser.Y"
{fr->markerSelectOnlyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1038:
-#line 2458 "parser.Y"
+ case 1042:
+#line 2467 "parser.Y"
{fr->markerSelectToggleCmd();;}
break;
- case 1039:
-#line 2459 "parser.Y"
+ case 1043:
+#line 2468 "parser.Y"
{fr->markerSelectToggleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1040:
-#line 2462 "parser.Y"
+ case 1044:
+#line 2471 "parser.Y"
{fr->markerShowCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 1041:
-#line 2463 "parser.Y"
+ case 1045:
+#line 2472 "parser.Y"
{fr->markerShowTextCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1044:
-#line 2471 "parser.Y"
+ case 1048:
+#line 2480 "parser.Y"
{propQMask |= (yyvsp[(1) - (3)].integer); setProps(&propQValue,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;}
break;
- case 1045:
-#line 2474 "parser.Y"
+ case 1049:
+#line 2483 "parser.Y"
{taglist.deleteAll();}
break;
- case 1046:
-#line 2475 "parser.Y"
+ case 1050:
+#line 2484 "parser.Y"
{taglist.deleteAll();}
break;
- case 1050:
-#line 2482 "parser.Y"
+ case 1054:
+#line 2491 "parser.Y"
{taglist.append(new Tag((yyvsp[(3) - (3)].str)));;}
break;
- case 1051:
-#line 2485 "parser.Y"
+ case 1055:
+#line 2494 "parser.Y"
{cblist.append(
new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;}
break;
- case 1052:
-#line 2489 "parser.Y"
+ case 1056:
+#line 2498 "parser.Y"
{fr->maskClearCmd();;}
break;
- case 1053:
-#line 2490 "parser.Y"
+ case 1057:
+#line 2499 "parser.Y"
{fr->maskColorCmd((yyvsp[(2) - (2)].str));;}
break;
- case 1054:
-#line 2491 "parser.Y"
+ case 1058:
+#line 2500 "parser.Y"
{fr->maskMarkCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1055:
-#line 2492 "parser.Y"
+ case 1059:
+#line 2501 "parser.Y"
{fr->maskTransparencyCmd((yyvsp[(2) - (2)].real));;}
break;
- case 1056:
-#line 2495 "parser.Y"
+ case 1060:
+#line 2504 "parser.Y"
{fr->orientCmd(Coord::XX);;}
break;
- case 1057:
-#line 2496 "parser.Y"
+ case 1061:
+#line 2505 "parser.Y"
{fr->orientCmd(Coord::YY);;}
break;
- case 1058:
-#line 2497 "parser.Y"
+ case 1062:
+#line 2506 "parser.Y"
{fr->orientCmd(Coord::XY);;}
break;
- case 1059:
-#line 2498 "parser.Y"
+ case 1063:
+#line 2507 "parser.Y"
{fr->orientCmd(Coord::NORMAL);;}
break;
- case 1060:
-#line 2502 "parser.Y"
+ case 1064:
+#line 2511 "parser.Y"
{fr->panCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;}
break;
- case 1061:
-#line 2503 "parser.Y"
+ case 1065:
+#line 2512 "parser.Y"
{fr->panCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1062:
-#line 2505 "parser.Y"
+ case 1066:
+#line 2514 "parser.Y"
{
// backward compatibility
fr->panCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));
;}
break;
- case 1063:
-#line 2510 "parser.Y"
+ case 1067:
+#line 2519 "parser.Y"
{fr->panCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
break;
- case 1065:
-#line 2512 "parser.Y"
+ case 1069:
+#line 2521 "parser.Y"
{fr->panBBoxCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1067:
-#line 2514 "parser.Y"
+ case 1071:
+#line 2523 "parser.Y"
{fr->panPreserveCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1068:
-#line 2517 "parser.Y"
+ case 1072:
+#line 2526 "parser.Y"
{fr->panToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1069:
-#line 2519 "parser.Y"
+ case 1073:
+#line 2528 "parser.Y"
{
// backward compatibility
fr->panToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));
;}
break;
- case 1070:
-#line 2524 "parser.Y"
+ case 1074:
+#line 2533 "parser.Y"
{fr->panToCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;}
break;
- case 1071:
-#line 2527 "parser.Y"
+ case 1075:
+#line 2536 "parser.Y"
{fr->panBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1072:
-#line 2528 "parser.Y"
+ case 1076:
+#line 2537 "parser.Y"
{fr->panMotionCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1073:
-#line 2529 "parser.Y"
+ case 1077:
+#line 2538 "parser.Y"
{fr->panEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1074:
-#line 2532 "parser.Y"
+ case 1078:
+#line 2541 "parser.Y"
{fr->pannerCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 1075:
-#line 2534 "parser.Y"
+ case 1079:
+#line 2543 "parser.Y"
{fr->pannerCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer),(Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;}
break;
- case 1076:
-#line 2535 "parser.Y"
+ case 1080:
+#line 2544 "parser.Y"
{fr->pannerCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 1077:
-#line 2536 "parser.Y"
+ case 1081:
+#line 2545 "parser.Y"
{fr->updatePannerCmd();;}
break;
- case 1078:
-#line 2540 "parser.Y"
+ case 1082:
+#line 2549 "parser.Y"
{fr->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;}
break;
- case 1079:
-#line 2541 "parser.Y"
+ case 1083:
+#line 2550 "parser.Y"
{fr->psLevelCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1080:
-#line 2542 "parser.Y"
+ case 1084:
+#line 2551 "parser.Y"
{fr->psResolutionCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1081:
-#line 2543 "parser.Y"
+ case 1085:
+#line 2552 "parser.Y"
{fr->psScaleCmd((yyvsp[(2) - (2)].real));;}
break;
- case 1082:
-#line 2546 "parser.Y"
+ case 1086:
+#line 2555 "parser.Y"
{(yyval.integer) = Widget::BW;;}
break;
- case 1083:
-#line 2547 "parser.Y"
+ case 1087:
+#line 2556 "parser.Y"
{(yyval.integer) = Widget::GRAY;;}
break;
- case 1084:
-#line 2548 "parser.Y"
+ case 1088:
+#line 2557 "parser.Y"
{(yyval.integer) = Widget::RGB;;}
break;
- case 1085:
-#line 2549 "parser.Y"
+ case 1089:
+#line 2558 "parser.Y"
{(yyval.integer) = Widget::CMYK;;}
break;
- case 1088:
-#line 2557 "parser.Y"
+ case 1092:
+#line 2566 "parser.Y"
{fr->regionHighliteBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1089:
-#line 2559 "parser.Y"
+ case 1093:
+#line 2568 "parser.Y"
{fr->regionHighliteMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1090:
-#line 2560 "parser.Y"
+ case 1094:
+#line 2569 "parser.Y"
{fr->regionHighliteEndCmd();;}
break;
- case 1091:
-#line 2561 "parser.Y"
+ case 1095:
+#line 2570 "parser.Y"
{fr->regionHighliteShiftEndCmd();;}
break;
- case 1092:
-#line 2565 "parser.Y"
+ case 1096:
+#line 2574 "parser.Y"
{fr->regionSelectBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1093:
-#line 2566 "parser.Y"
+ case 1097:
+#line 2575 "parser.Y"
{fr->regionSelectMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1094:
-#line 2567 "parser.Y"
+ case 1098:
+#line 2576 "parser.Y"
{fr->regionSelectEndCmd();;}
break;
- case 1095:
-#line 2568 "parser.Y"
+ case 1099:
+#line 2577 "parser.Y"
{fr->regionSelectShiftEndCmd();;}
break;
- case 1096:
-#line 2571 "parser.Y"
+ case 1100:
+#line 2580 "parser.Y"
{(yyval.integer) = Frame3dBase::MIP;;}
break;
- case 1097:
-#line 2572 "parser.Y"
+ case 1101:
+#line 2581 "parser.Y"
{(yyval.integer) = Frame3dBase::AIP;;}
break;
- case 1098:
-#line 2575 "parser.Y"
+ case 1102:
+#line 2584 "parser.Y"
{fr->setRGBChannelCmd((yyvsp[(2) - (2)].str));;}
break;
- case 1099:
-#line 2576 "parser.Y"
+ case 1103:
+#line 2585 "parser.Y"
{fr->setRGBSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;}
break;
- case 1100:
-#line 2577 "parser.Y"
+ case 1104:
+#line 2586 "parser.Y"
{fr->setRGBViewCmd((yyvsp[(2) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;}
break;
- case 1101:
-#line 2580 "parser.Y"
+ case 1105:
+#line 2589 "parser.Y"
{fr->rotateCmd(degToRad((yyvsp[(1) - (1)].real)));;}
break;
- case 1102:
-#line 2581 "parser.Y"
+ case 1106:
+#line 2590 "parser.Y"
{fr->rotateCmd(degToRad((yyvsp[(1) - (2)].real)));;}
break;
- case 1104:
-#line 2583 "parser.Y"
+ case 1108:
+#line 2592 "parser.Y"
{fr->rotateToCmd(degToRad((yyvsp[(2) - (2)].real)));;}
break;
- case 1105:
-#line 2584 "parser.Y"
+ case 1109:
+#line 2593 "parser.Y"
{fr->rotateToCmd(degToRad((yyvsp[(2) - (3)].real)));;}
break;
- case 1106:
-#line 2587 "parser.Y"
+ case 1110:
+#line 2596 "parser.Y"
{fr->rotateBeginCmd();;}
break;
- case 1107:
-#line 2588 "parser.Y"
+ case 1111:
+#line 2597 "parser.Y"
{fr->rotateMotionCmd(degToRad((yyvsp[(1) - (1)].real)));;}
break;
- case 1108:
-#line 2589 "parser.Y"
+ case 1112:
+#line 2598 "parser.Y"
{fr->rotateEndCmd();;}
break;
- case 1111:
-#line 2594 "parser.Y"
+ case 1115:
+#line 2603 "parser.Y"
{fr->savePhotoCmd((yyvsp[(2) - (2)].str));;}
break;
- case 1112:
-#line 2598 "parser.Y"
+ case 1116:
+#line 2607 "parser.Y"
{fr->saveArrayFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
break;
- case 1113:
-#line 2600 "parser.Y"
+ case 1117:
+#line 2609 "parser.Y"
{fr->saveArrayChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
break;
- case 1114:
-#line 2602 "parser.Y"
+ case 1118:
+#line 2611 "parser.Y"
{fr->saveArraySocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;}
break;
- case 1118:
-#line 2610 "parser.Y"
+ case 1122:
+#line 2619 "parser.Y"
{fr->saveFitsImageFileCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1119:
-#line 2611 "parser.Y"
+ case 1123:
+#line 2620 "parser.Y"
{fr->saveFitsImageChannelCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1120:
-#line 2612 "parser.Y"
+ case 1124:
+#line 2621 "parser.Y"
{fr->saveFitsImageSocketCmd((yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 1121:
-#line 2615 "parser.Y"
+ case 1125:
+#line 2624 "parser.Y"
{fr->saveFitsTableFileCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1122:
-#line 2616 "parser.Y"
+ case 1126:
+#line 2625 "parser.Y"
{fr->saveFitsTableChannelCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1123:
-#line 2617 "parser.Y"
+ case 1127:
+#line 2626 "parser.Y"
{fr->saveFitsTableSocketCmd((yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 1124:
-#line 2621 "parser.Y"
+ case 1128:
+#line 2630 "parser.Y"
{fr->saveFitsResampleFileCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1125:
-#line 2623 "parser.Y"
+ case 1129:
+#line 2632 "parser.Y"
{fr->saveFitsResampleChannelCmd((yyvsp[(2) - (3)].str), (yyvsp[(3) - (3)].integer));;}
break;
- case 1126:
-#line 2625 "parser.Y"
+ case 1130:
+#line 2634 "parser.Y"
{fr->saveFitsResampleSocketCmd((yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;}
break;
- case 1127:
-#line 2628 "parser.Y"
+ case 1131:
+#line 2637 "parser.Y"
{fr->smoothCmd((FitsImage::SmoothFunction)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
break;
- case 1128:
-#line 2629 "parser.Y"
+ case 1132:
+#line 2638 "parser.Y"
{fr->smoothDeleteCmd();;}
break;
- case 1129:
-#line 2632 "parser.Y"
+ case 1133:
+#line 2641 "parser.Y"
{(yyval.integer) = FitsImage::BOXCAR;;}
break;
- case 1130:
-#line 2633 "parser.Y"
+ case 1134:
+#line 2642 "parser.Y"
{(yyval.integer) = FitsImage::GAUSSIAN;;}
break;
- case 1131:
-#line 2634 "parser.Y"
+ case 1135:
+#line 2643 "parser.Y"
{(yyval.integer) = FitsImage::TOPHAT;;}
break;
- case 1132:
-#line 2637 "parser.Y"
+ case 1136:
+#line 2646 "parser.Y"
{fr->updateFitsCmd(0);;}
break;
- case 1133:
-#line 2639 "parser.Y"
+ case 1137:
+#line 2648 "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 1134:
-#line 2640 "parser.Y"
+ case 1138:
+#line 2649 "parser.Y"
{fr->updateFitsCmd(1);;}
break;
- case 1135:
-#line 2642 "parser.Y"
+ case 1139:
+#line 2651 "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 1137:
-#line 2646 "parser.Y"
+ case 1141:
+#line 2655 "parser.Y"
{fr->sliceCmd(2, (yyvsp[(1) - (1)].integer));;}
break;
- case 1138:
-#line 2647 "parser.Y"
+ case 1142:
+#line 2656 "parser.Y"
{fr->sliceCmd((yyvsp[(1) - (2)].integer), (yyvsp[(2) - (2)].integer));;}
break;
- case 1139:
-#line 2650 "parser.Y"
+ case 1143:
+#line 2659 "parser.Y"
{fr->warpCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1140:
-#line 2651 "parser.Y"
+ case 1144:
+#line 2660 "parser.Y"
{fr->warpToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;}
break;
- case 1141:
-#line 2655 "parser.Y"
+ case 1145:
+#line 2664 "parser.Y"
{fr->wcsCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;}
break;
- case 1143:
-#line 2657 "parser.Y"
+ case 1147:
+#line 2666 "parser.Y"
{fr->wcsResetCmd((yyvsp[(2) - (2)].integer));;}
break;
- case 1146:
-#line 2662 "parser.Y"
+ case 1150:
+#line 2671 "parser.Y"
{fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
break;
- case 1147:
-#line 2663 "parser.Y"
+ case 1151:
+#line 2672 "parser.Y"
{fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
break;
- case 1148:
-#line 2664 "parser.Y"
+ case 1152:
+#line 2673 "parser.Y"
{fr->wcsAppendTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 1149:
-#line 2667 "parser.Y"
+ case 1153:
+#line 2676 "parser.Y"
{fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;}
break;
- case 1150:
-#line 2668 "parser.Y"
+ case 1154:
+#line 2677 "parser.Y"
{fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;}
break;
- case 1151:
-#line 2669 "parser.Y"
+ case 1155:
+#line 2678 "parser.Y"
{fr->wcsReplaceTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;}
break;
- case 1152:
-#line 2672 "parser.Y"
+ case 1156:
+#line 2681 "parser.Y"
{fr->wcsAlignCmd((yyvsp[(1) - (1)].integer));;}
break;
- case 1153:
-#line 2674 "parser.Y"
+ case 1157:
+#line 2683 "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 1154:
-#line 2679 "parser.Y"
+ case 1158:
+#line 2688 "parser.Y"
{fr->wcsAlignCmd((yyvsp[(1) - (3)].integer), (FitsImage*)(yyvsp[(2) - (3)].ptr), (Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;}
break;
- case 1155:
-#line 2682 "parser.Y"
+ case 1159:
+#line 2691 "parser.Y"
{
#ifdef _WIN32
fr->win32PrintCmd();
@@ -10221,60 +10221,60 @@ yyreduce:
;}
break;
- case 1156:
-#line 2689 "parser.Y"
+ case 1160:
+#line 2698 "parser.Y"
{fr->zoomCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1157:
-#line 2691 "parser.Y"
+ case 1161:
+#line 2700 "parser.Y"
{fr->zoomAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
break;
- case 1158:
-#line 2693 "parser.Y"
+ case 1162:
+#line 2702 "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 1159:
-#line 2698 "parser.Y"
+ case 1163:
+#line 2707 "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 1161:
-#line 2703 "parser.Y"
+ case 1165:
+#line 2712 "parser.Y"
{fr->zoomToFitCmd(1);;}
break;
- case 1162:
-#line 2704 "parser.Y"
+ case 1166:
+#line 2713 "parser.Y"
{fr->zoomToFitCmd((yyvsp[(2) - (2)].real));;}
break;
- case 1163:
-#line 2705 "parser.Y"
+ case 1167:
+#line 2714 "parser.Y"
{fr->zoomToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;}
break;
- case 1164:
-#line 2707 "parser.Y"
+ case 1168:
+#line 2716 "parser.Y"
{fr->zoomToAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;}
break;
- case 1165:
-#line 2709 "parser.Y"
+ case 1169:
+#line 2718 "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 1166:
-#line 2714 "parser.Y"
+ case 1170:
+#line 2723 "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;
@@ -10495,7 +10495,7 @@ yyreturn:
}
-#line 2718 "parser.Y"
+#line 2727 "parser.Y"
static void setProps(unsigned short* props, unsigned short prop, int value)
diff --git a/saotk/frame/parser.Y b/saotk/frame/parser.Y
index 79cffc7..9e2e6af 100644
--- a/saotk/frame/parser.Y
+++ b/saotk/frame/parser.Y
@@ -472,6 +472,7 @@ command : DEBUG_ debug
| SAVE_ save
| SHOW_ {fr->showCmd();}
| SMOOTH_ smooth
+ | THREADS_ INT {fr->threadsCmd($2);}
| THREED_ threed
| UNLOAD_ {fr->unloadFitsCmd();}
| UPDATE_ update
@@ -711,10 +712,9 @@ endian : /* empty */ {$$ = FitsFile::BIGENDIAN;}
| LITTLEENDIAN_ {$$ = FitsFile::LITTLEENDIAN;}
;
-threed : VIEW_ numeric numeric {fr->set3dViewCmd($2,$3);}
+threed : VIEW_ threedView
| HIGHLITE_ threedHighlite
| METHOD_ renderMethod {fr->set3dRenderMethodCmd($2);}
- | THREADS_ INT {fr->set3dThreadsCmd($2);}
| THRESHOLD_ numeric
{/* needed for compatibility with old version of backup */}
;
@@ -723,6 +723,11 @@ threedHighlite : yesno {fr->set3dHighliteCmd($1);}
| COLOR_ STRING {fr->set3dHighliteColorCmd($2);}
;
+threedView : numeric numeric {fr->set3dViewCmd($1,$2);}
+ | POINT_ numeric numeric numeric numeric numeric
+ {fr->set3dViewPointCmd(Vector3d($2,$3,$4),Vector($5,$6));}
+ ;
+
bin : ABOUT_ binAbout
| COLS_ STRING STRING STRING {fr->binColsCmd($2,$3,$4);}
| DEPTH_ INT {fr->binDepthCmd($2);}
@@ -935,6 +940,7 @@ get : BG_ COLOR_ {fr->getBgColorCmd();}
| RGB_ getRGB
| ROTATE_ getRotate
| SMOOTH_ getSmooth
+ | THREADS_ {fr->getThreadsCmd();}
| THREED_ getThreed
| TYPE_ {fr->getTypeCmd();}
| VALUE_ internalSystem numeric numeric
@@ -1170,16 +1176,19 @@ getSmooth : FUNCTION_ {fr->getSmoothFunctionCmd();}
| RADIUS_ {fr->getSmoothRadiusCmd();}
;
-getThreed : VIEW_ {fr->get3dViewCmd();}
+getThreed : VIEW_ getThreedView
| HIGHLITE_ getThreedHighlite
| METHOD_ {fr->get3dRenderMethodCmd();}
- | THREADS_ {fr->get3dThreadsCmd();}
;
getThreedHighlite : {fr->get3dHighliteCmd();}
| COLOR_ {fr->get3dHighliteColorCmd();}
;
+getThreedView : {fr->get3dViewCmd();}
+ | POINT_ {fr->get3dViewPointCmd();}
+ ;
+
getWCS : /* empty */ {fr->getWCSCmd();}
| ALIGN_ getWCSAlign
| NAME_ wcsSystem {fr->getWCSNameCmd((Coord::CoordSystem)$2);}
diff --git a/src/3d.tcl b/src/3d.tcl
index 7cbef5f..131f74b 100644
--- a/src/3d.tcl
+++ b/src/3d.tcl
@@ -19,7 +19,6 @@ proc 3DDef {} {
set threed(highlite) 1
set threed(highlite,color) cyan
- set pthreed(threads) 8
set pthreed(method) $threed(method)
set pthreed(highlite) $threed(highlite)
set pthreed(highlite,color) $threed(highlite,color)
@@ -201,17 +200,6 @@ proc 3DHighliteColor {} {
}
}
-proc 3DThreads {} {
- global pthreed
- global ds9
-
- foreach ff $ds9(frames) {
- $ff 3d threads $pthreed(threads)
- }
-
- return true
-}
-
# Prefs
proc PrefsDialog3d {} {
@@ -222,15 +210,10 @@ proc PrefsDialog3d {} {
$dprefs(list) insert end [msgcat::mc {3D}]
lappend dprefs(tabs) [ttk::frame $w.threed]
- set f [ttk::labelframe $w.threed.misc -text [msgcat::mc {General}]]
- ttk::label $f.tthreads -text [msgcat::mc {Number of Threads}]
- ttk::entry $f.threads -textvariable pthreed(threads) \
- -validate focusout -validatecommand 3DThreads -width 8
- ttk::label $f.tmethod -text [msgcat::mc {Method}]
+ set f [ttk::labelframe $w.threed.misc -text [msgcat::mc {Method}]]
ttk::menubutton $f.method -textvariable pthreed(method) -menu $f.method.menu
- grid $f.tthreads $f.threads -padx 2 -pady 2 -sticky w
- grid $f.tmethod $f.method -padx 2 -pady 2 -sticky w
+ grid $f.method -padx 2 -pady 2 -sticky w
set m $f.method.menu
menu $m
diff --git a/src/backup.tcl b/src/backup.tcl
index b16029e..de4e9c8 100644
--- a/src/backup.tcl
+++ b/src/backup.tcl
@@ -192,7 +192,7 @@ proc Restore {fn} {
# and update it
UpdateGraphGrid
LayoutOrient
- DisplayMode
+ UpdateActiveFrames
ChangeMode
UpdateDS9
}
@@ -654,6 +654,11 @@ proc BackupGUI {ch} {
global panalysis
puts $ch "global panalysis"
puts $ch "array set panalysis \{ [array get panalysis] \}"
+
+ global active
+ puts $ch "global active"
+ puts $ch "array set active \{ [array get active] \}"
+
}
proc ProcessBackupCmd {varname iname} {
@@ -661,8 +666,12 @@ proc ProcessBackupCmd {varname iname} {
upvar $iname i
set fn [lindex $var $i]
- FileLast backupfbox $fn
- Backup $fn
+ if {$fn != {}} {
+ FileLast backupfbox $fn
+ Backup $fn
+ } else {
+ Error [msgcat::mc {Unable to open file}]
+ }
}
proc ProcessRestoreCmd {varname iname} {
@@ -670,6 +679,10 @@ proc ProcessRestoreCmd {varname iname} {
upvar $iname i
set fn [lindex $var $i]
- FileLast backupfbox $fn
- Restore $fn
+ if {$fn != {}} {
+ FileLast backupfbox $fn
+ Restore $fn
+ } else {
+ Error [msgcat::mc {Unable to open file}]
+ }
}
diff --git a/src/comm.tcl b/src/comm.tcl
index a115388..bdb35fb 100644
--- a/src/comm.tcl
+++ b/src/comm.tcl
@@ -105,6 +105,8 @@ proc CommSet {fn paramlist} {
source {ProcessSourceCmd param i}
tcl {ProcessTclCmd param i {} $fn}
theme {ProcessThemeCmd param i}
+ threads -
+ thread {ProcessThreadsCmd param i}
tile {ProcessTileCmd param i}
update {ProcessUpdateCmd param i}
version {}
@@ -211,6 +213,8 @@ proc CommGet {proc id paramlist fn} {
source {}
tcl {}
theme {ProcessSendThemeCmd $proc $id $param}
+ threads -
+ thread {ProcessSendThreadCmd $proc $id $param}
tile {ProcessSendTileCmd $proc $id $param}
update {}
version {ProcessSendVersionCmd $proc $id $param}
diff --git a/src/command.tcl b/src/command.tcl
index a82bd23..407c074 100644
--- a/src/command.tcl
+++ b/src/command.tcl
@@ -367,6 +367,8 @@ proc ProcessCommand {argv argc} {
-source {incr i; ProcessSourceCmd argv i}
-tcl {incr i; set pds9(tcl) [FromYesNo [lindex $argv $i]]}
-theme {incr i; ProcessThemeCmd argv i}
+ -threads -
+ -thread {incr i; ProcessThreadsCmd argv i}
-tile {incr i; ProcessTileCmd argv i}
-title {
#already processed
diff --git a/src/dialog.tcl b/src/dialog.tcl
index ed440ea..120c252 100644
--- a/src/dialog.tcl
+++ b/src/dialog.tcl
@@ -222,12 +222,21 @@ proc EntryPaste {top} {
set w [focus -displayof $top]
catch {$w delete sel.first sel.last}
- if {![catch {$w insert insert \
- [selection get -displayof $w -selection CLIPBOARD]}]} {
+ if {![catch {$w insert insert [GetSelection $w]}]} {
tk::EntrySeeInsert $w
}
}
+proc GetSelection {w} {
+ if {
+ ![catch {selection get -displayof $w -type UTF8_STRING} txt] ||
+ ![catch {selection get -displayof $w} txt] ||
+ ![catch {selection get -displayof $w -selection CLIPBOARD} txt]
+ } {
+ return $txt
+ }
+}
+
# Simple Text Dialog
proc SimpleTextDialog {varname title width height action pos txt
diff --git a/src/ds9.tcl b/src/ds9.tcl
index f70ea17..e54661d 100755
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
@@ -7,7 +7,7 @@ proc DS9Def {} {
global pds9
set ds9(title) "$ds9(app)"
- set ds9(version) {7.0 beta 20}
+ set ds9(version) {7.0 beta 21}
set ds9(top) .
set ds9(mb) .mb
@@ -160,6 +160,7 @@ proc DS9Def {} {
set pds9(language,dir) {}
set pds9(theme) native
+ set pds9(threads) 8
}
# who are we?
diff --git a/src/frame.tcl b/src/frame.tcl
index 39edcf8..a8ca91d 100644
--- a/src/frame.tcl
+++ b/src/frame.tcl
@@ -147,6 +147,7 @@ proc CreateNameNumberFrame {which type} {
$ds9(next) bg color $pds9(bg)
$ds9(next) nan color $pds9(nan)
+ $ds9(next) threads $pds9(threads)
$ds9(next) marker show $marker(show)
$ds9(next) marker show text $marker(show,text)
@@ -160,7 +161,6 @@ proc CreateNameNumberFrame {which type} {
base -
rgb {}
3d {
- $ds9(next) 3d threads $pthreed(threads)
$ds9(next) 3d method $pthreed(method)
$ds9(next) 3d highlite $pthreed(highlite)
$ds9(next) 3d highlite color $pthreed(highlite,color)
diff --git a/src/grid.tcl b/src/grid.tcl
index b9ddfdd..3aa244a 100644
--- a/src/grid.tcl
+++ b/src/grid.tcl
@@ -99,7 +99,7 @@ proc GridUpdate {} {
if {$grid(view) && [$current(frame) has fits]} {
$current(frame) grid create $grid(system) $grid(sky) \
- $grid(skyformat) $grid(type) [GridOptions]
+ $grid(skyformat) $grid(type) [GridBuildOptions]
} else {
$current(frame) grid delete
}
@@ -152,7 +152,7 @@ proc GridAdjustOptions {} {
}
}
-proc GridOptions {} {
+proc GridBuildOptions {} {
global grid
global current
@@ -432,7 +432,7 @@ proc GridOptions {} {
global debug
if {$debug(tcl,grid)} {
- puts stderr "GridOptions"
+ puts stderr "GridBuildOptions"
puts stderr "$opt"
}
@@ -449,208 +449,167 @@ proc GridParseOptions {opt} {
puts stderr "$opt"
}
- set dummy {}
-
- # Grid
- strtok " Grid=%d," opt grid(grid)
- set cc {}
- strtok " Colour(grid)=%d," opt cc
- set grid(grid,color) [GridAst2Color $cc]
- strtok " Width(grid)=%d," opt grid(grid,width)
- strtok " Style(grid)=%d," opt grid(grid,style)
-
- # Axes
- strtok " DrawAxes=%d," opt grid(axes)
- set cc {}
- strtok " Colour(axes)=%d," opt cc
- set grid(axes,color) [GridAst2Color $cc]
- strtok " Width(axes)=%d," opt grid(axes,width)
- strtok " Style(axes)=%d," opt grid(axes,style)
-
- # Format
- set format1 {}
- strtok { Format(1)=%[^,]} opt format1
- if {[GridDefaultFormat1] != $format1} {
- set grid(format1) $format1
- } else {
- set grid(format1) {}
- }
- set format2 {}
- strtok { Format(2)=%[^,]} opt format2
- if {[GridDefaultFormat2] != $format2} {
- set grid(format2) $format2
- } else {
- set grid(format2) {}
- }
-
- # Ticks
- set grid(tick) 1
- strtok " MajTickLen=%d," opt grid(tick)
- strtok " MinTick(1)=%d," opt grid(tick)
- strtok " MinTick(2)=%d," opt grid(tick)
- switch -- $grid(type) {
- analysis {}
- publication {
- switch -- [$current(frame) get type] {
- base -
- rgb {}
- 3d {strtok " MinTick(3)=%d," opt grid(tick)}
- }
- }
- }
-
- set cc {}
- strtok " Colour(ticks)=%d," opt cc
- set grid(tick,color) [GridAst2Color $cc]
- strtok " Width(ticks)=%d," opt grid(tick,width)
- strtok " Style(ticks)=%d," opt grid(tick,style)
-
- # Border
- strtok " Border=%d," opt grid(border)
- set cc {}
- strtok " Colour(border)=%d," opt cc
- set grid(border,color) [GridAst2Color $cc]
- strtok " Width(border)=%d," opt grid(border,width)
- strtok " Style(border)=%d," opt grid(border,style)
-
- # Labels
- strtok { Labelling=%[^,],} opt grid(axes,type)
- switch -- [$current(frame) get type] {
- base -
- rgb {strtok " LabelUp=%d," opt grid(numlab,vertical)}
- 3d {strtok " LabelUp=%d," opt dummy}
- }
-
- # Numlab
- strtok " NumLab=%d," opt grid(numlab)
- set numlabFont 0
- strtok " Font(numlab)=%d," opt numlabFont
- GridAst2Font $numlabFont grid(numlab,font) grid(numlab,weight) \
- grid(numlab,slant)
-
- strtok " Size(numlab)=%d," opt grid(numlab,size)
- set cc {}
- strtok " Colour(numlab)=%d," opt cc
- set grid(numlab,color) [GridAst2Color $cc]
-
- # Textlab
- switch -- $grid(type) {
- analysis {strtok " TextLab=%d," opt dummy}
- publication {strtok " TextLab=%d," opt grid(textlab)}
- }
- set grid(textlab,def1) [expr ![strtok { Label(1)=%[^,],} opt grid(textlab,text1)]]
- set grid(textlab,def2) [expr ![strtok { Label(2)=%[^,],} opt grid(textlab,text2)]]
-
- set textlabFont 0
- strtok " Font(textlab)=%d," opt textlabFont
- GridAst2Font $textlabFont grid(textlab,font) grid(textlab,weight) \
- grid(textlab,slant)
-
- strtok " Size(textlab)=%d," opt grid(textlab,size)
- set cc {}
- strtok " Colour(textlab)=%d," opt cc
- set grid(textlab,color) [GridAst2Color $cc]
-
- # Title
- switch -- $grid(type) {
- analysis {strtok " DrawTitle=%d," opt dummy}
- publication {strtok " DrawTitle=%d," opt grid(title)}
- }
- strtok { Title=%[^,],} opt grid(title,text)
-
- set titleFont 0
- strtok " Font(title)=%d," opt titleFont
- GridAst2Font $titleFont grid(title,font) grid(title,weight) \
- grid(title,slant)
-
- strtok " Size(title)=%d," opt grid(title,size)
- set cc {}
- strtok " Colour(title)=%d" opt cc
- set grid(title,color) [GridAst2Color $cc]
-
- # Spacing
- set gap1 {}
- strtok { Gap(1)=%[^,]} opt gap1
- if {($gap1 != {}) && ($grid(grid,gapunit1) == "degrees")} {
- set grid(grid,gap1) [expr 180.*$gap1/3.14159]
- } else {
- set grid(grid,gap1) $gap1
- }
-
- set gap2 {}
- strtok { Gap(2)=%[^,]} opt gap2
- if {($gap2 != {}) && ($grid(grid,gapunit2) == "degrees")} {
- set grid(grid,gap2) [expr 180.*$gap2/3.14159]
- } else {
- set grid(grid,gap2) $gap2
- }
-
- switch -- [$current(frame) get type] {
- base -
- rgb {}
- 3d {
- set gap3 {}
- strtok { Gap(3)=%[^,]} opt gap3
- if {($gap3 != {}) && ($grid(grid,gapunit3) == "degrees")} {
- set grid(grid,gap3) [expr 180.*$gap3/3.14159]
- } else {
- set grid(grid,gap3) $gap3
- }
- }
- }
+ # defaults
+ set grid(textlab,def1) 1
+ set grid(textlab,def2) 1
- # Gaps
- strtok " NumLabGap(1)=%f," opt dummy
- strtok " NumLabGap(2)=%f," opt dummy
- strtok " TextLabGap(1)=%f," opt dummy
- strtok " TextLabGap(2)=%f," opt dummy
- strtok " TitleGap=%f," opt dummy
+ foreach oo [split $opt ,] {
+ foreach {key value} [split $oo {=}] {
+ switch -- [string trim $key] {
+
+ Grid {set grid(grid) $value}
+ Colour(grid) {set grid(grid,color) [GridAst2Color $value]}
+ Width(grid) {set grid(grid,width) $value}
+ Style(grid) {set grid(grid,style) $value}
+
+ DrawAxes {set grid(axes) $value}
+ Colour(axes) {set grid(axes,color) [GridAst2Color $value]}
+ Width(axes) {set grid(axes,width) $value}
+ Style(axes) {set grid(axes,style) $value}
+
+ Format(1) {
+ if {[GridDefaultFormat1] != $value} {
+ set grid(format1) $value
+ } else {
+ set grid(format1) {}
+ }
+ }
+ Format(2) {
+ if {[GridDefaultFormat2] != $value} {
+ set grid(format2) $value
+ } else {
+ set grid(format2) {}
+ }
+ }
- # Orientation
- strtok { Edge(1)=%[^,],} opt dummy
- strtok { Edge(2)=%[^,],} opt dummy
- strtok { RootCorner=%[^,],} opt dummy
+ MajTickLen {}
+ MinTick(1) {set grid(tick) $value}
+ MinTick(2) {}
+ MinTick(3) {}
+ Colour(ticks) {set grid(tick,color) [GridAst2Color $value]}
+ Width(ticks) {set grid(tick,width) $value}
+ Style(ticks) {set grid(tick,style) $value}
+
+ Border {set grid(border) $value}
+ Colour(border) {set grid(border,color) [GridAst2Color $value]}
+ Width(border) {set grid(border,width) $value}
+ Style(border) {set grid(border,style) $value}
+
+ Labelling {set grid(axes,type) $value}
+ LabelUp {
+ switch -- [$current(frame) get type] {
+ base -
+ rgb {set grid(numlab,vertical) $value}
+ 3d {}
+ }
+ }
- # 3D Normal
- switch -- $grid(type) {
- analysis {}
- publication {
- switch -- [$current(frame) get type] {
- base -
- rgb {}
- 3d {
- set aa {}
- set bb {}
- set cc {}
- strtok " Norm(1)=%f," opt aa
- strtok " Norm(2)=%f," opt bb
- strtok " Norm(3)=%f," opt cc
+ NumLab {set grid(numlab) $value}
+ Font(numlab) {
+ GridAst2Font $value grid(numlab,font) \
+ grid(numlab,weight) grid(numlab,slant)
+ }
+ Size(numlab) {set grid(numlab,size) $value}
+ Colour(numlab) {set grid(numlab,color) [GridAst2Color $value]}
+
+ TextLab -
+ TextLab(1) {
+ switch -- $grid(type) {
+ analysis {}
+ publication {set grid(textlab) $value}
+ }
+ }
+ TextLab(2) {}
+ Label(1) {
+ set grid(textlab,text1) $value
+ set grid(textlab,def1) 0
+ }
+ Label(2) {
+ set grid(textlab,text2) $value
+ set grid(textlab,def2) 0
+ }
+ Font(textlab) {
+ GridAst2Font $value grid(textlab,font) \
+ grid(textlab,weight) grid(textlab,slant)
+ }
+ Size(textlab) {set grid(textlab,size) $value}
+ Colour(textlab) {set grid(textlab,color) [GridAst2Color $value]}
+
+ DrawTitle {
+ switch -- $grid(type) {
+ analysis {}
+ publication {
+ switch -- [$current(frame) get type] {
+ base -
+ rgb {set grid(title) $value}
+ 3d {}
+ }
+ }
+ }
+ }
+ Title {set titleFont $value}
+ Font(title) {
+ GridAst2Font $value grid(title,font) \
+ grid(title,weight) grid(title,slant)
+ }
+ Size(title) {set grid(title,size) $value}
+ Colour(title) {set grid(title,color) [GridAst2Color $value]}
+
+ Gap(1) {
+ if {($value != {}) && ($grid(grid,gapunit1) == "degrees")} {
+ set grid(grid,gap1) [expr 180.*$value/3.14159]
+ } else {
+ set grid(grid,gap1) $value
+ }
+ }
+ Gap(2) {
+ if {($value != {}) && ($grid(grid,gapunit2) == "degrees")} {
+ set grid(grid,gap2) [expr 180.*$value/3.14159]
+ } else {
+ set grid(grid,gap2) $value
+ }
+ }
+ Gap(3) {
+ switch -- [$current(frame) get type] {
+ base -
+ rgb {}
+ 3d {set grid(grid,gap3) $value}
+ }
}
- }
- }
- }
-}
-proc strtok {tmp strvar varvar} {
- upvar $strvar str
- upvar $varvar var
- global debug
+ NumLabGap(1) {}
+ NumLabGap(2) {}
+ TextLabGap(1) {}
+ TextLabGap(2) {}
+ TitleGap {}
+
+ Edge(1) {}
+ Edge(2) {}
+ RootCorner {
+ switch -- [$current(frame) get type] {
+ base -
+ rgb {}
+ 3d {
+ switch -- $grid(type) {
+ analysis {}
+ publication {set grid(axes,origin) $value}
+ }
+ }
+ }
+ }
- set r [scan $str $tmp var]
- if {$r} {
- set i [string first "," $str]
- set str [string range $str [expr $i+1] end]
+ Norm(1) {}
+ Norm(2) {}
+ Norm(3) {}
- if {$debug(tcl,grid)} {
- puts stderr "Grid strtok: Success parse $tmp"
- }
- } else {
- if {$debug(tcl,grid)} {
- puts stderr "Grid strtok: Failed to parse $tmp"
+ default {
+ if {$debug(tcl,grid)} {
+ puts stderr "Unknown keyword: $key=$value"
+ }
+ }
+ }
}
}
-
- return $r
}
proc GridAst2Color {ast} {
@@ -1080,7 +1039,16 @@ proc UpdateGridMenu {} {
set grid(skyformat) [lindex $ll 2]
set grid(type) [lindex $ll 3]
+# GridParseOptions [$current(frame) get grid option]
GridParseOptions [$current(frame) get grid option]
+
+ if {0} {
+ foreach {key value} [array get gridd] {
+ if {$grid($key) != $gridd($key)} {
+ puts stderr "grid($key)=$grid($key) gridd($key)=$gridd($key)"
+ }
+ }
+ }
} else {
# can be changed by wcs
SetCoordSystem grid system sky skyformat
diff --git a/src/marker.tcl b/src/marker.tcl
index c931c3c..96c39b5 100644
--- a/src/marker.tcl
+++ b/src/marker.tcl
@@ -39,7 +39,7 @@ proc MarkerDef {} {
set marker(preserve) 0
set marker(plot2d) 0
- set marker(plot3d) 0
+ set marker(plot3d) 1
set marker(copy) {}
set marker(copy,system) {}
diff --git a/src/markeranalysisplot2d.tcl b/src/markeranalysisplot2d.tcl
index 02caeec..86f3e33 100644
--- a/src/markeranalysisplot2d.tcl
+++ b/src/markeranalysisplot2d.tcl
@@ -118,7 +118,10 @@ proc MarkerAnalysisPlot2dCB {frame id} {
set tt [string totitle [$frame get marker $id type]]
APDialog $varname $tt $tt $ed(pcoord) Counts
- $var(graph) xaxis configure -command "MarkerAnalysisPlot2dXAxis $frame $id"
+ # setup our own formatting
+ set var(format) 0
+ $var(graph) xaxis configure \
+ -command "MarkerAnalysisPlot2dXAxis $frame $id"
set var(xdata) $xx
set var(ydata) $yy
@@ -163,12 +166,12 @@ proc MarkerAnalysisPlot2dXAxisTitle {frame id} {
image -
physical -
amplifier -
- detector {set title "$system coordinates"}
+ detector {set title "$system"}
default {
if {[$frame has wcs equatorial $system]} {
- set title "$sky coordinates"
+ set title "$sky"
} else {
- set title "[$frame get wcs name $system] coordinates"
+ set title "[$frame get wcs name $system]"
}
}
}
diff --git a/src/markeranalysisplot3d.tcl b/src/markeranalysisplot3d.tcl
index 19b3a5f..b6c20f6 100644
--- a/src/markeranalysisplot3d.tcl
+++ b/src/markeranalysisplot3d.tcl
@@ -153,14 +153,14 @@ proc MarkerAnalysisPlot3dXAxisTitle {frame id} {
image -
physical -
amplifier -
- detector {set title "$sys coordinates"}
+ detector {set title "$sys"}
default {
set w [string range $sys 3 3]
set tt [string trim [$frame get fits header 1 keyword \{CTYPE3$w\}]]
if {$tt != {}} {
- set title "$tt coordinates"
+ set title "$tt"
} else {
- set title "$sys coordinates"
+ set title "$sys"
}
}
}
diff --git a/src/movie.tcl b/src/movie.tcl
index 68ce42d..401f315 100644
--- a/src/movie.tcl
+++ b/src/movie.tcl
@@ -15,14 +15,14 @@ proc MovieDef {} {
set movie(action) slice
# must be >=5, or sometimes will generate bad data
- set movie(quality) 10
+ set movie(quality) 5
set movie(num) 24
set movie(az,from) 45
set movie(az,to) -45
set movie(el,from) 30
set movie(el,to) 30
set movie(sl,from) 1
- set movie(sl,to) 10
+ set movie(sl,to) 1
set movie(repeat) oscillate
set movie(repeat,num) 0
@@ -213,7 +213,7 @@ proc Movie3d {fn} {
set azincr [expr 1.*($movie(az,to)-$movie(az,from))/$movie(num)]
set elincr [expr 1.*($movie(el,to)-$movie(el,from))/$movie(num)]
- set slincr [expr ($movie(sl,to)-$movie(sl,from))/$movie(num)]
+ set slincr [expr 1.*($movie(sl,to)-$movie(sl,from))/$movie(num)]
# loop over az/el/slice
set movie(status) 0
@@ -241,7 +241,7 @@ proc Movie3d {fn} {
}
set az [expr $az+$azincr]
set el [expr $el+$elincr]
- incr sl $slincr
+ set sl [expr $sl+$slincr]
}
switch $movie(repeat) {
repeat {
@@ -310,17 +310,8 @@ proc Movie3dDialog {} {
set ed2(az,to) $movie(az,to)
set ed2(el,from) $movie(el,from)
set ed2(el,to) $movie(el,to)
- set ed2(sl,from) $movie(sl,from)
-
- if {$cube(axis)==2} {
- set ss [$current(frame) get crop 3d image]
- set ed2(sl,from) [lindex $ss 0]
- set ed2(sl,to) [lindex $ss 1]
- } else {
- set ed2(sl,from) 1
- set ed2(sl,to) [$current(frame) get fits depth $cube(axis)]
- }
-
+ set ed2(sl,from) [$current(frame) get fits slice $cube(axis)]
+ set ed2(sl,to) $ed2(sl,from)
set ed2(repeat) $movie(repeat)
set ed2(repeat,num) $movie(repeat,num)
diff --git a/src/pagesetup.tcl b/src/pagesetup.tcl
index e681555..33e4ca0 100644
--- a/src/pagesetup.tcl
+++ b/src/pagesetup.tcl
@@ -90,90 +90,6 @@ proc PSPageSetup {} {
return $rr
}
-proc APPageSetup {} {
- global ps
- global ed
-
- set ed(ok) 0
- array set ed [array get ps]
-
- set w {.pagesetup}
-
- DialogCreate $w [msgcat::mc {Page Setup}] ed(ok)
-
- # Layout
- set f [ttk::labelframe $w.layout -text {Layout}]
-
- ttk::label $f.torient -text [msgcat::mc {Orientation}]
- ttk::radiobutton $f.portrait -text [msgcat::mc {Portrait}] \
- -variable ed(orient) -value portrait
- ttk::radiobutton $f.landscape -text [msgcat::mc {Landscape}] \
- -variable ed(orient) -value landscape
-
- grid $f.torient $f.portrait $f.landscape -padx 2 -pady 2 -sticky w
-
- # Page Size
- set f [ttk::labelframe $w.size -text {Page Size}]
-
- ttk::radiobutton $f.letter -text "[msgcat::mc {Letter}](8.5 x 11 in)"\
- -variable ed(size) -value letter
- ttk::radiobutton $f.legal -text "[msgcat::mc {Legal}](8.5 x 14 in)"\
- -variable ed(size) -value legal
- ttk::radiobutton $f.tabloid -text "[msgcat::mc {Tabloid}](11 x 17 in)"\
- -variable ed(size) -value tabloid
- ttk::radiobutton $f.poster -text "[msgcat::mc {Poster}](36 x 48 in)"\
- -variable ed(size) -value poster
- ttk::radiobutton $f.a4 -text {A4(210 x 297 mm)} \
- -variable ed(size) -value a4
- ttk::radiobutton $f.other -text "[msgcat::mc {Other}] (inches)" \
- -variable ed(size) -value other
- ttk::radiobutton $f.othermm -text "[msgcat::mc {Other}] (mm)" \
- -variable ed(size) -value othermm
-
- ttk::label $f.title3 -text [msgcat::mc {Width}]
- ttk::entry $f.width -textvariable ed(width) -width 10
-
- ttk::label $f.title4 -text [msgcat::mc {Height}]
- ttk::entry $f.height -textvariable ed(height) -width 10
-
- grid $f.letter -padx 2 -pady 2 -sticky w
- grid $f.legal -padx 2 -pady 2 -sticky w
- grid $f.tabloid -padx 2 -pady 2 -sticky w
- grid $f.poster -padx 2 -pady 2 -sticky w
- grid $f.a4 -padx 2 -pady 2 -sticky w
- grid $f.other $f.title3 $f.width -padx 2 -pady 2 -sticky w
- grid $f.othermm $f.title4 $f.height -padx 2 -pady 2 -sticky w
-
- # Buttons
- set f [ttk::frame $w.buttons]
- ttk::button $f.ok -text [msgcat::mc {OK}] -command {set ed(ok) 1} \
- -default active
- ttk::button $f.cancel -text [msgcat::mc {Cancel}] -command {set ed(ok) 0}
- pack $f.ok $f.cancel -side left -expand true -padx 2 -pady 4
-
- bind $w <Return> {set ed(ok) 1}
-
- # Fini
- grid $w.layout -sticky news
- grid $w.size -sticky news
- grid $w.buttons -sticky ew
- grid rowconfigure $w 0 -weight 1
- grid rowconfigure $w 1 -weight 1
- grid columnconfigure $w 0 -weight 1
-
- DialogCenter $w
- DialogWait $w ed(ok) $w.buttons.ok
- DialogDismiss $w
-
- if {$ed(ok)} {
- array set ps [array get ed]
- }
-
- set rr $ed(ok)
- unset ed
- return $rr
-}
-
proc PrefsDialogPageSetup {} {
global dprefs
diff --git a/src/panzoom.tcl b/src/panzoom.tcl
index a1abb88..a1d2b1e 100644
--- a/src/panzoom.tcl
+++ b/src/panzoom.tcl
@@ -665,6 +665,9 @@ proc PanZoomBackup {ch which} {
puts $ch "$which pan preserve [$which get pan preserve]"
puts $ch "$which pan to physical [$which get cursor physical]"
+ # this must come after pan to
+ puts $ch "$which 3d view point [$which get 3d view point]"
+
puts $ch "$which zoom to [$which get zoom]"
puts $ch "$which rotate to [$which get rotate]"
puts $ch "$which orient [$which get orient]"
diff --git a/src/plot.tcl b/src/plot.tcl
index f68a300..b4c055f 100644
--- a/src/plot.tcl
+++ b/src/plot.tcl
@@ -114,6 +114,10 @@ proc APDialog {varname wtt title xaxis yaxis} {
set var(graph,y,min) {}
set var(graph,y,max) {}
+ set var(format) 1
+ set var(format,x) {}
+ set var(format,y) {}
+
set var(grid) $pap(grid)
set var(grid,log) $pap(grid,log)
@@ -188,14 +192,14 @@ proc APDialog {varname wtt title xaxis yaxis} {
x11 {
$var(mb).file add command \
-label "[msgcat::mc {Page Setup}]..." \
- -command APPageSetup
+ -command PSPageSetup
$var(mb).file add command -label "[msgcat::mc {Print}]..." \
-command [list APPSPrint $varname]
}
win32 {
$var(mb).file add command \
-label "[msgcat::mc {Postscript Page Setup}]..." \
- -command APPageSetup
+ -command PSPageSetup
$var(mb).file add command \
-label "[msgcat::mc {Postscript Print}]..." \
-command [list APPSPrint $varname]
@@ -227,7 +231,8 @@ proc APDialog {varname wtt title xaxis yaxis} {
menu $var(mb).graph
$var(mb).graph add checkbutton -label [msgcat::mc {Grid}] \
- -variable ${varname}(grid) -command "APUpdateGraph $varname"
+ -variable ${varname}(grid) \
+ -command "APUpdateGraph $varname"
$var(mb).graph add separator
$var(mb).graph add radiobutton \
-label "[msgcat::mc {Linear}]-[msgcat::mc {Linear}]" \
@@ -246,8 +251,8 @@ proc APDialog {varname wtt title xaxis yaxis} {
-variable ${varname}(grid,log) -value loglog \
-command "APUpdateGraph $varname"
$var(mb).graph add separator
- $var(mb).graph add command -label "[msgcat::mc {Axis Range}]..." \
- -command "APRange $varname"
+ $var(mb).graph add command -label "[msgcat::mc {Axes}]..." \
+ -command "APAxes $varname"
$var(mb).graph add command -label "[msgcat::mc {Labels}]..." \
-command "APTitle $varname"
@@ -415,6 +420,13 @@ proc APDestroy {varname} {
unset $varname
}
+proc APAxisFormat {varname axis w nn} {
+ upvar #0 $varname var
+ global $varname
+
+ return [format $var(format,$axis) $nn]
+}
+
proc APCurrentData {varname} {
upvar #0 $varname var
global $varname
@@ -742,12 +754,16 @@ proc APPSaveConfig {varname filename} {
set analysisplot(numlabWeight) $var(numlabWeight)
set analysisplot(numlabSlant) $var(numlabSlant)
+ set analysisplot(format) 1
+ set analysisplot(format,x) $var(format,x)
+ set analysisplot(format,y) $var(format,y)
+
puts $ch "array set analysisplot \{ [array get analysisplot] \}"
close $ch
}
}
-proc APRange {varname} {
+proc APAxes {varname} {
upvar #0 $varname var
global $varname
@@ -762,25 +778,34 @@ proc APRange {varname} {
set ed(yauto) $var(graph,y,auto)
set ed(ymin) $var(graph,y,min)
set ed(ymax) $var(graph,y,max)
+ set ed(format,x) $var(format,x)
+ set ed(format,y) $var(format,y)
- DialogCreate $w [msgcat::mc {Range}] ed(ok)
+ DialogCreate $w [msgcat::mc {Axes}] ed(ok)
# Param
set f [ttk::frame $w.param]
- ttk::label $f.xlabel -text [msgcat::mc {X Axis}]
+ ttk::label $f.taxis -text [msgcat::mc {Axis}]
+ ttk::label $f.tto -text [msgcat::mc {To}]
+ ttk::label $f.tfrom -text [msgcat::mc {From}]
+ ttk::label $f.tformat -text [msgcat::mc {Format}]
+ ttk::label $f.tauto -text [msgcat::mc {Automatic}]
+
+ ttk::label $f.tx -text [msgcat::mc {X}]
ttk::entry $f.xmin -textvariable ed(xmin) -width 12
- ttk::label $f.xlabel2 -text [msgcat::mc {To}]
ttk::entry $f.xmax -textvariable ed(xmax) -width 12
- ttk::checkbutton $f.xauto -text [msgcat::mc {Automatic}] -variable ed(xauto)
+ ttk::entry $f.xformat -textvariable ed(format,x) -width 8
+ ttk::checkbutton $f.xauto -variable ed(xauto)
- ttk::label $f.ylabel -text [msgcat::mc {Y Axis}]
+ ttk::label $f.ty -text [msgcat::mc {Y}]
ttk::entry $f.ymin -textvariable ed(ymin) -width 12
- ttk::label $f.ylabel2 -text [msgcat::mc {To}]
ttk::entry $f.ymax -textvariable ed(ymax) -width 12
- ttk::checkbutton $f.yauto -text [msgcat::mc {Automatic}] -variable ed(yauto)
+ ttk::entry $f.yformat -textvariable ed(format,y) -width 8
+ ttk::checkbutton $f.yauto -variable ed(yauto)
- grid $f.xlabel $f.xmin $f.xlabel2 $f.xmax $f.xauto -padx 2 -pady 2 -sticky w
- grid $f.ylabel $f.ymin $f.ylabel2 $f.ymax $f.yauto -padx 2 -pady 2 -sticky w
+ grid $f.taxis $f.tto $f.tfrom $f.tformat $f.tauto -padx 2 -pady 2 -sticky w
+ grid $f.tx $f.xmin $f.xmax $f.xformat $f.xauto -padx 2 -pady 2 -sticky w
+ grid $f.ty $f.ymin $f.ymax $f.yformat $f.yauto -padx 2 -pady 2 -sticky w
# Buttons
set f [ttk::frame $w.buttons]
@@ -807,6 +832,8 @@ proc APRange {varname} {
set var(graph,y,auto) $ed(yauto)
set var(graph,y,min) $ed(ymin)
set var(graph,y,max) $ed(ymax)
+ set var(format,x) $ed(format,x)
+ set var(format,y) $ed(format,y)
APUpdateGraph $varname
}
@@ -932,6 +959,7 @@ proc APPostScript {varname} {
global $varname
global ps
+ global ds9
global debug
if {$debug(tcl,idletasks)} {
@@ -939,44 +967,59 @@ proc APPostScript {varname} {
}
update idletasks
- set options "-decorations false "
+ # set postscript fonts
+ $var(graph) configure \
+ -font "$var(titleFont) $var(titleSize) $var(titleWeight) $var(titleSlant)"
+ $var(graph) xaxis configure \
+ -tickfont "$var(numlabFont) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ -titlefont "$var(textlabFont) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+ $var(graph) yaxis configure \
+ -tickfont "$var(numlabFont) $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ -titlefont "$var(textlabFont) $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
- # Orientation
- switch -- $ps(orient) {
- portrait {append options "-landscape false "}
- landscape {append options "-landscape true "}
- }
+ set options "-decorations false"
# Color
switch -- $ps(color) {
rgb -
- cmyk {append options "-greyscale no "}
- gray {append options "-greyscale yes "}
+ cmyk {append options " -greyscale no"}
+ gray {append options " -greyscale yes"}
}
+ # Size
+ set ww [expr [winfo width $var(top)]*$ps(scale)/100./[tk scaling]]
+ set hh [expr [winfo height $var(top)]*$ps(scale)/100./[tk scaling]]
+ append options " -width $ww -height $hh"
+
# Page size
switch -- $ps(size) {
- letter {append options "-paperwidth 8.5i -paperheight 11.i"}
- legal {append options "-paperwidth 8.5i -paperheight 14.i"}
- tabloid {append options "-paperwidth 11i -paperheight 17.i"}
- poster {append options "-paperwidth 36.i -paperheight 48.i"}
- a4 {append options "-paperwidth 195m -paperheight 282m"}
- other {
- if {$ps(width) != {} && $ps(height) != {}} {
- set w [expr $ps(width)]
- set h [expr $ps(height)]
- append options \
- "-paperwidth [append $w i] -paperheight [append $h i]"
- }
- }
- othermm {
- if {$ps(width) != {} && $ps(height) != {}} {
- set w [expr $ps(width)]
- set h [expr $ps(height)]
- append options \
- "-paperwidth [append $w m] -paperheight [append $h m]"
- }
- }
+ letter {append options " -paperwidth 8.5i -paperheight 11.i"}
+ legal {append options " -paperwidth 8.5i -paperheight 14.i"}
+ tabloid {append options " -paperwidth 11i -paperheight 17.i"}
+ poster {append options " -paperwidth 36.i -paperheight 48.i"}
+ a4 {append options " -paperwidth 195m -paperheight 282m"}
+ other {
+ if {$ps(width) != {} && $ps(height) != {}} {
+ set w [expr $ps(width)]
+ set h [expr $ps(height)]
+ append options \
+ " -paperwidth [append $w i] -paperheight [append $h i]"
+ }
+ }
+ othermm {
+ if {$ps(width) != {} && $ps(height) != {}} {
+ set w [expr $ps(width)]
+ set h [expr $ps(height)]
+ append options \
+ " -paperwidth [append $w m] -paperheight [append $h m]"
+ }
+ }
+ }
+
+ # Orientation
+ switch -- $ps(orient) {
+ portrait {append options " -landscape false"}
+ landscape {append options " -landscape true"}
}
if {$ps(dest) == "file" && $ps(filename) != {}} {
@@ -986,6 +1029,17 @@ proc APPostScript {varname} {
puts $ch [eval $var(graph) postscript output $options]
close $ch
}
+
+ # reset fonts
+ $var(graph) configure \
+ -font "{$ds9($var(titleFont))} $var(titleSize) $var(titleWeight) $var(titleSlant)"
+ $var(graph) xaxis configure \
+ -tickfont "{$ds9($var(numlabFont))} $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ -titlefont "{$ds9($var(textlabFont))} $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+ $var(graph) yaxis configure \
+ -tickfont "{$ds9($var(numlabFont))} $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
+ -titlefont "{$ds9($var(textlabFont))} $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+
}
# Windows/Aqua
@@ -1277,6 +1331,13 @@ proc APProcessGraph {varname xarname iname} {
switch -- [string tolower [lindex $xar $i]] {
grid {incr i; set var(grid) [FromYesNo [lindex $xar $i]]}
scale {incr i; set var(grid,log) [lindex $xar $i]}
+ format {
+ incr i
+ switch -- [string tolower [lindex $xar $i]] {
+ x {incr i; set var(format,x) [lindex $xar $i]}
+ y {incr i; set var(format,y) [lindex $xar $i]}
+ }
+ }
range {
incr i
switch -- [string tolower [lindex $xar $i]] {
diff --git a/src/plotsup.tcl b/src/plotsup.tcl
index 45df35f..f665db8 100644
--- a/src/plotsup.tcl
+++ b/src/plotsup.tcl
@@ -406,6 +406,19 @@ proc APUpdateGraph {varname} {
-tickfont "{$ds9($var(numlabFont))} $var(numlabSize) $var(numlabWeight) $var(numlabSlant)" \
-titlefont "{$ds9($var(textlabFont))} $var(textlabSize) $var(textlabWeight) $var(textlabSlant)"
+ if {$var(format)} {
+ if {$var(format,x) != {}} {
+ $var(graph) xaxis configure -command [list APAxisFormat $varname x]
+ } else {
+ $var(graph) xaxis configure -command {}
+ }
+ if {$var(format,y) != {}} {
+ $var(graph) yaxis configure -command [list APAxisFormat $varname y]
+ } else {
+ $var(graph) yaxis configure -command {}
+ }
+ }
+
# windows: we're on top of the image window, so set focus to this window
global ds9
switch $ds9(wm) {
diff --git a/src/prefsdialog.tcl b/src/prefsdialog.tcl
index 712def6..ee849c8 100644
--- a/src/prefsdialog.tcl
+++ b/src/prefsdialog.tcl
@@ -180,10 +180,14 @@ proc PrefsDialogGeneral {} {
ttk::checkbutton $f.confirm \
-text [msgcat::mc {Enable Confirmation Dialogs}] \
-variable pds9(confirm)
+ ttk::label $f.tthreads -text [msgcat::mc {Number of Threads}]
+ ttk::entry $f.threads -textvariable pds9(threads) \
+ -validate focusout -validatecommand PrefsThreads -width 8
grid $f.backup -padx 2 -pady 2 -sticky w
grid $f.auto -padx 2 -pady 2 -sticky w
grid $f.confirm -padx 2 -pady 2 -sticky w
+ grid $f.tthreads $f.threads -padx 2 -pady 2 -sticky w
# Theme
set f [ttk::labelframe $w.general.theme -text [msgcat::mc {Theme}]]
diff --git a/src/util.tcl b/src/util.tcl
index 3f7893c..9127775 100644
--- a/src/util.tcl
+++ b/src/util.tcl
@@ -948,6 +948,16 @@ proc PrefsNanColor {} {
}
}
+proc PrefsThreads {} {
+ global ds9
+ global pds9
+
+ foreach ff $ds9(frames) {
+ $ff threads $pds9(threads)
+ }
+ return true
+}
+
proc DisplayLog {item} {
SimpleTextDialog ftptxt [msgcat::mc {Message Log}] 80 40 append bottom $item
}
@@ -1265,6 +1275,12 @@ proc ProcessPrefsCmd {varname iname} {
set pds9(nan) [lindex $var $i]
PrefsNanColor
}
+ threads {
+ # backward compatibility
+ incr i
+ set pds9(threads) [lindex $var $i]
+ PrefsThreads
+ }
}
}
@@ -1308,6 +1324,21 @@ proc ProcessSendNanCmd {proc id param} {
$proc $id "$pds9(nan)\n"
}
+proc ProcessThreadsCmd {varname iname} {
+ upvar $varname var
+ upvar $iname i
+
+ global pds9
+ set pds9(threads) [lindex $var $i]
+ PrefsThreads
+}
+
+proc ProcessSendThreadsCmd {proc id param} {
+ global pds9
+
+ $proc $id "$pds9(threads)\n"
+}
+
proc ProcessCDCmd {varname iname} {
upvar $varname var
upvar $iname i
diff --git a/src/xpa.tcl b/src/xpa.tcl
index a8b241f..4585eb6 100644
--- a/src/xpa.tcl
+++ b/src/xpa.tcl
@@ -448,6 +448,11 @@ proc CreateXPA {} {
XPASendTheme {} {} \
XPARcvdTheme {} "fillbuf=false"
+ xpacmdadd $xpa threads \
+ {} \
+ XPASendThreads {} {} \
+ XPARcvdThreads {} {}
+
xpacmdadd $xpa tile \
{} \
XPASendTile {} {} \
@@ -1345,6 +1350,19 @@ proc XPARcvdTheme {xpa cdata param buf len} {
XPACatchError $xpa
}
+proc XPASendThreads {xpa cdata param} {
+ InitError xpa
+ catch {ProcessSendThreadsCmd xpasetbuf $xpa $param}
+ XPACatchError $xpa
+}
+
+proc XPARcvdThreads {xpa cdata param buf len} {
+ XPADebug "XPARcvdThreads" $param
+ InitError xpa
+ catch {set i 0; ProcessThreadsCmd param i}
+ XPACatchError $xpa
+}
+
proc XPASendTile {xpa cdata param} {
InitError xpa
catch {ProcessSendTileCmd xpasetbuf $xpa $param}
diff --git a/tests/command.sh b/tests/command.sh
index e9cb525..65d099d 100755
--- a/tests/command.sh
+++ b/tests/command.sh
@@ -1387,6 +1387,12 @@ testit "-theme native"
doit
fi
+if [ "$1" = "threads" -o -z "$1" ]; then
+initit "threads"
+testit "-threads 8"
+doit
+fi
+
if [ "$1" = "title" -o -z "$1" ]; then
initit "title"
testit "-title foobar"
diff --git a/tests/samp.sh b/tests/samp.sh
index 92e0365..9fa68d0 100755
--- a/tests/samp.sh
+++ b/tests/samp.sh
@@ -117,6 +117,7 @@ doit "$1" smooth
doit "$1" source
doit "$1" tcl
doit "$1" theme
+doit "$1" threads
doit "$1" update
doit "$1" version
doit "$1" view
diff --git a/tests/samp/threads.samp b/tests/samp/threads.samp
new file mode 100644
index 0000000..d25cca4
--- /dev/null
+++ b/tests/samp/threads.samp
@@ -0,0 +1,3 @@
+get threads
+set {} threads 8
+set {} raise
diff --git a/tests/xpa.sh b/tests/xpa.sh
index 866253a..40c71d1 100755
--- a/tests/xpa.sh
+++ b/tests/xpa.sh
@@ -1823,6 +1823,14 @@ xpaset -p ds9 theme native
testit $tt
fi
+if [ "$1" = "threads" -o -z "$1" ]; then
+tt="threads"
+xpaget ds9 threads >> ${tt}.out
+xpaset -p ds9 threads 8
+xpaset -p ds9 prefs threads 8
+testit $tt
+fi
+
if [ "$1" = "update" -o -z "$1" ]; then
tt="update"
xpaset -p ds9 update
diff --git a/tests/xpa/threads.xpa b/tests/xpa/threads.xpa
new file mode 100644
index 0000000..45a4fb7
--- /dev/null
+++ b/tests/xpa/threads.xpa
@@ -0,0 +1 @@
+8
diff --git a/win/tkwin32.C b/win/tkwin32.C
index c403b13..6c0b577 100755
--- a/win/tkwin32.C
+++ b/win/tkwin32.C
@@ -638,27 +638,20 @@ void TkWin32::width(float ww)
void TkWin32::dash(float* dd, int nn)
{
int i;
- if( nn ){
+ if(nn){
penStyle = PS_USERSTYLE;
- if( lpStyle ) free(lpStyle);
- if( (lpStyle = (DWORD *)calloc(nn, sizeof(DWORD))) ){
+ if(lpStyle)
+ free(lpStyle);
+ if((lpStyle = (DWORD *)calloc(nn, sizeof(DWORD)))) {
dwStyleCount = nn;
- for(i=0; i<nn; i++){
- if( (i%2) == 0 ){
- lpStyle[i] = (DWORD)dd[i];
- }
- // why do we need a fudge factor to make spaces long enough???
- else{
- lpStyle[i] = (DWORD)(dd[i] * 1.33);
- }
- // and why do we need a fudge factor to make the length correct???
- lpStyle[i] *= 2.25;
- }
+ for(i=0; i<nn; i++)
+ lpStyle[i] = (DWORD)dd[i];
}
}
else{
penStyle = PS_SOLID;
- if( lpStyle ) free(lpStyle);
+ if(lpStyle)
+ free(lpStyle);
lpStyle = NULL;
dwStyleCount = 0;
}
diff --git a/win/win32lib.C b/win/win32lib.C
index 1aeb2cf..2e48731 100755
--- a/win/win32lib.C
+++ b/win/win32lib.C
@@ -47,11 +47,12 @@ void win32Dash(float* d, int n)
dd[i] = d[i] * tkwin32->getPageScale();
}
}
- else{
+ else
dd = d;
- }
+
tkwin32->dash(dd,n);
- if( dd ) free(dd);
+ if(dd)
+ free(dd);
}
}
--
image display tool for astronomy
More information about the debian-science-commits
mailing list